4.0.2 release updates

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

Makefile.am

@@ -36,4 +36,9 @@ install-data-local:
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 
+update-po:
+	$(MAKE) -C lib/libalpm/po update-po
+	$(MAKE) -C scripts/po update-po
+	$(MAKE) -C src/pacman/po update-po
+
 # vim:set ts=2 sw=2 noet:

NEWS

@@ -1,5 +1,121 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+4.0.2         - allow comments after a repository header in pacman.conf
+              - search for and import PGP subkeys if necessary (FS#27612)
+              - fix rare segfault on removal operations (FS#27805, FS#28195)
+              - skip all unknown files when cleaning package cache
+              - restore looking for files in cache before downloading via -U
+              - ensure '[removal]' is displayed in transaction confirmation (FS#27981)
+              - implement disk space checking code for Illumos
+              - use TCP keepalive in download to prevent dropped connections
+              - round and show -0.00 values as 0.00 (FS#27924)
+              - makepkg:
+                - ensure all source files are included in --source (FS#26580)
+                - fix locale sort/comm related issues (FS#26580)
+                - abort on missing download agent
+                - restrict flags passed to pacman (FS#28012)
+                - work around certain zipman glob/existence issues
+                - fix non-writable SRCPKGDEST error message (FS#28197)
+                - fix printf interpreting gettext string as arg (FS#28069)
+                - don't abort on non-zero hg return codes (FS#28248)
+                - disable extglob when sourcing BUILDSCRIPT (FS#27780)
+              - pacman-key: improve return codes of operations (FS#26730)
+              - repo-add: enforce maximum signature file size (FS#27453)
+              - contrib/paclist: support --help (FS#27258)
+              - contrib/pacsysclean: new script
+              - contrib/*_completion: fix completion for uncompressed packages
+              - translations: extensive updates and corrections
+4.0.1         - ensure VerbosePkgList table display supports multibyte chars
+              - always use stderr for warning/error messages (FS#26555)
+              - add guidance message for users when public keyring not found
+              - fix edge case in download progress bar rounding (FS#26853)
+              - ensure downloads started as tempfiles have correct umask
+              - ensure unowned symlinks are not overwritten incorrectly
+              - allow -U operation even without sync databases (FS#26899)
+              - update libtool files and update fix for -Wl,-as-needed
+              - fix build when using --disable-static (FS#26652)
+              - pacman-key: add a keyserver timeout value in --init
+              - repo-add: fix race condition around lock file removal
+              - makepkg:
+                - accept changelog= or install= without a value
+                - trim trailing whitespace from sensitive variables
+                - handle PGP signatures with a .sign extension
+                - delay attachment of signal traps (FS#26196)
+              - translations: multiple updates and corrections
+4.0.0         - well-integrated and powerful signed packages and databases
+                support in pacman, the library, and scripts (FS#5331)
+              - over 800 commits to pacman.git since 3.5.4 release
+              - many code cleanup commits across library/binaries/scripts
+              - many performance improvement commits across library/binaries
+              - add new -S --recursive operation to upgrade a full dep chain
+              - report upgrade size on sync operations (FS#12566)
+              - early terminal input is flushed before question prompts
+              - remove duplicate code shared in sync and upgrade operations
+              - remove ShowSize; replaced with VerbosePkgLists (FS#15772)
+              - print callback (warning, error) messages to stderr (FS#25099)
+              - download progress callback has more room for filenames
+              - fix selection entry for long values (FS#25253)
+              - make config parsing two-pass process, enhance error messages
+              - print helpful tips on -Qi <filename> or -S <filename>
+              - replace libfetch with libcurl for backend download library
+                - timeout when mirror is not responding (FS#15369)
+                - full HTTPS protocol support (FS#22435)
+                - support of non-traditional/redirected URLs (FS#22645)
+                - ensure downloads are only resumed if appropriate (FS#23803)
+              - only remove empty directories if no remaining owner (FS#25141)
+              - better cache directory choosing and honor $TMPDIR (FS#25435)
+              - replaces are parsed as dependency-style strings (FS#23410)
+              - split package verification and load stages
+              - sync database reading refactor for performance
+              - use a larger buffer for package checksum validation
+              - filelists now have a dedicated type with metadata
+              - diskspace check no longer requires iterating package archives
+              - update and add checksum routines from PolarSSL
+              - validate sync database sha256sum if available
+              - correctly parse sizes in database > 2GiB
+              - API: several type renames from pm* to alpm_* prefix
+              - API: several enum constant renames from PM to ALPM_* prefix
+              - API: several types are now public exposed structs
+              - API: handle is no longer a single global variable
+              - API: more changes than can be mentioned here, see README
+              - much improved API documentation for use by Doxygen
+              - pactest: several performance/checking improvements
+              - scripts:
+                - refactor some common components into shared bash library
+                - split translations into pacman-scripts catalog (FS#15148)
+              - makepkg:
+                - allow signing packages after creation
+                - allow verifying source file signatures (FS#20448)
+                - add auto-versioned libdepends/libprovides support
+                - support UPX compression of executables (FS#17213)
+                - allow usage of an alternate build directory (FS#22308)
+                - cleancache option has been removed; use shell instead
+                - improved variable sanity checking (FS#16004)
+                - better handling of package extensions (.tar.Z or invalid)
+                - allow PKGEXT/SRCEXT environment overrides (FS#19860)
+                - only check for writable PKGDEST if necessary (FS#24735)
+                - check_software function exits early if missing req'd binaries
+                - do source packaging in fakeroot (FS#24330)
+                - be more POSIX-compatible in use of `ln` (FS#24893)
+                - handle spaces with filenames in noextract (FS#25100)
+                - allow epoch-versioned optdepends
+              - pacman-key: new keyring management tool for signed data
+              - pacsort: new utility, sort version numbers as pacman does
+              - pactree: support sync databases with -s option
+              - pkgdelta: add a manpage
+              - repo-add:
+                - handle and include package signatures in databases
+                - verify database signature before modification
+                - sign database after creation/modification
+                - general script cleanup and bash-ification
+                - add sha256sums to database (FS#23103)
+              - contrib/bacman: code cleanups and small bug fixes
+              - contrib/bash_completion: updates for new options/commands
+              - contrib/paccache: new, pacman cache cleanup script
+              - contrib/paclist: rewrite using bash
+              - contrib/paclog-pkglist: new, recover from missing local DB
+              - documentation: extensive updates to all manpages
+              - translations: extensive updates, new languages: lt, zh_TW
 3.5.4         - fix display of lists on non-TTYs and other output fixes
               - fix group selection entry for large inputs (FS#24253)
               - fix divide by zero when downloading zero length files

TRANSLATORS

@@ -1,14 +1,13 @@
-Thanks to all of those who have helped translate pacman, both in the past
-and currently. Here are some of the current translators (past translators
-can be found by looking in the GIT history).
+Thanks to all of those who have helped translate pacman, both in the past and
+currently. Our translations are currently maintained in Transifex; please read
+doc/translation-help.txt for more details.
 
-If your language is listed here and you are interested in helping translate,
-contact either the pacman mailing list at pacman-dev@archlinux.org, or one
-of the translators listed above.
+Below is a list of past translators before we switched to Transifex; more can
+be found by looking in the GIT history.
 
-If your language is not listed here and you wish it was, let the pacman mailing
-list know you are interested in making a translation. We will be happy to add
-your language to the mix.
+If your language is not already in the various po/ subdirectories and you wish
+it was, set up a team in Transifex for your language and we will be happy to
+add your language to the mix.
 
 Catalan (ca):
 	Manuel Tortosa <manutortosa@chakra-project.org>

configure.ac

@@ -42,12 +42,12 @@ AC_PREREQ(2.62)
 #     pacman_version_micro += 1
 
 m4_define([lib_current], [7])
-m4_define([lib_revision], [0])
+m4_define([lib_revision], [2])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [4])
 m4_define([pacman_version_minor], [0])
-m4_define([pacman_version_micro], [0rc1])
+m4_define([pacman_version_micro], [2])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
@@ -173,7 +173,9 @@ AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"])
 
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h float.h glob.h libintl.h limits.h locale.h \
-                  mntent.h stddef.h string.h sys/ioctl.h sys/mount.h \
+                  mntent.h netinet/in.h netinet/tcp.h \
+                  stddef.h string.h sys/ioctl.h \
+                  sys/mnttab.h sys/mount.h \
                   sys/param.h sys/statvfs.h sys/time.h sys/types.h \
                   sys/ucred.h syslog.h termios.h wchar.h])
 

contrib/.gitignore

@@ -6,5 +6,6 @@ paclist
 paclog-pkglist
 pacscripts
 pacsearch
+pacsysclean
 wget-xdelta.sh
 zsh_completion

contrib/Makefile.am

@@ -5,7 +5,8 @@ OURSCRIPTS = \
 	paclist \
 	paclog-pkglist \
 	pacscripts \
-	pacsearch
+	pacsearch \
+	pacsysclean
 
 OURFILES = \
 	bash_completion \
@@ -21,6 +22,7 @@ EXTRA_DIST = \
 	paclist.in \
 	pacscripts.in \
 	pacsearch.in \
+	pacsysclean.in \
 	vimprojects \
 	zsh_completion.in \
 	README
@@ -59,6 +61,7 @@ paclist: $(srcdir)/paclist.in
 paclog-pkglist: $(srcdir)/paclog-pkglist.in
 pacscripts: $(srcdir)/pacscripts.in
 pacsearch: $(srcdir)/pacsearch.in
+pacsysclean: $(srcdir)/pacsysclean.in
 pactree: $(srcdir)/pactree.in
 zsh_completion: $(srcdir)/zsh_completion.in
 

contrib/PKGBUILD.vim

@@ -220,6 +220,9 @@ hi def link pb_k_pkgrel pbKeywords
 hi def link pbIllegalPkgdesc Error
 hi def link pb_k_desc pbKeywords
 
+hi def link pbIllegalEpoch Error
+hi def link pb_k_epoch pbKeywords
+
 hi def link pbIllegalUrl Error
 hi def link pb_k_url pbKeywords
 

contrib/bacman.in

@@ -20,69 +20,72 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+shopt -s extglob
+shopt -s nullglob
+
 readonly progname="bacman"
 readonly progver="0.2.1"
 
 #
 # User Friendliness
 #
-function usage(){
-    echo "This program recreates a package using pacman's db and system files"
-    echo "Usage:   $progname <installed package name>"
-    echo "Example: $progname kernel26"
+usage() {
+	echo "This program recreates a package using pacman's db and system files"
+	echo "Usage:   $progname <installed package name>"
+	echo "Example: $progname kernel26"
 }
 
-if [ $# -ne 1 ] ; then
-    usage
-    exit 1
+if (( $# != 1 )); then
+	usage
+	exit 1
 fi
 
-if [ "$1" = "--help" -o "$1" = "-h" ] ; then
-    usage
-    exit 0
+if [[ $1 == "--help" || $1 == "-h" ]]; then
+	usage
+	exit 0
 fi
 
-if [ "$1" = "--version" -o "$1" = "-v" ]; then
-    echo "$progname version $progver"
-    echo "Copyright (C) 2008 locci"
-    exit 0
+if [[ $1 == "--version" || $1 == "-v" ]]; then
+	echo "$progname version $progver"
+	echo "Copyright (C) 2008 locci"
+	exit 0
 fi
 
 #
 # Fakeroot support
 #
-if [ $EUID -gt 0 ]; then
-    if [ -f /usr/bin/fakeroot ]; then
-        echo "Entering fakeroot environment"
-        export INFAKEROOT="1"
-        /usr/bin/fakeroot -u -- $0 $1
-        exit $?
-    else
-        echo "WARNING: installing fakeroot or running ${progname} as root is required to"
-        echo "         preserve the ownership permissions of files in some packages"
-        echo ""
-    fi
+if (( EUID )); then
+	if [[ -f /usr/bin/fakeroot ]]; then
+		echo "Entering fakeroot environment"
+		export INFAKEROOT="1"
+		/usr/bin/fakeroot -u -- "$0" "$@"
+		exit $?
+	else
+		echo "WARNING: installing fakeroot or running ${progname} as root is required to"
+		echo "         preserve the ownership permissions of files in some packages"
+		echo ""
+	fi
 fi
 
 #
 # Setting environmental variables
 #
-if [ ! -r @sysconfdir@/pacman.conf ]; then
-    echo "ERROR: unable to read @sysconfdir@/pacman.conf"
-    exit 1
+if [[ ! -r @sysconfdir@/pacman.conf ]]; then
+	echo "ERROR: unable to read @sysconfdir@/pacman.conf"
+	exit 1
 fi
 
 eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf)
 pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local"
 
-if [ ! -r @sysconfdir@/makepkg.conf ]; then
-    echo "ERROR: unable to read @sysconfdir@/makepkg.conf"
-    exit 1
+if [[ ! -r @sysconfdir@/makepkg.conf ]]; then
+	echo "ERROR: unable to read @sysconfdir@/makepkg.conf"
+	exit 1
 fi
 
 source "@sysconfdir@/makepkg.conf"
-if [ -r ~/.makepkg.conf ]; then
-    source ~/.makepkg.conf
+if [[ -r ~/.makepkg.conf ]]; then
+	source ~/.makepkg.conf
 fi
 
 pkg_arch=${CARCH:-'unknown'}
@@ -90,27 +93,35 @@ pkg_dest="${PKGDEST:-$PWD}"
 pkg_pkger=${PACKAGER:-'Unknown Packager'}
 
 pkg_name="$1"
-pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)"
-pkg_namver="${pkg_dir##*/}"
+pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-]))
+pkg_namver=("${pkg_dir[@]##*/}")
 
 #
 # Checks everything is in place
 #
-if [ ! -d "$pac_db" ] ; then
-    echo "ERROR: pacman database directory ${pac_db} not found"
-    exit 1
+if [[ ! -d $pac_db ]]; then
+	echo "ERROR: pacman database directory ${pac_db} not found"
+	exit 1
 fi
 
-if [ ! -d "$pkg_dir" ] ; then
-    echo "ERROR: package ${pkg_name} not found in pacman database"
-    exit 1
+if (( ${#pkg_dir[@]} != 1 )); then
+	printf "ERROR: %d entries for package %s found in pacman database\n" \
+		${#pkg_dir[@]} "${pkg_name}"
+	printf "%s\n" "${pkg_dir[@]}"
+	exit 1
+fi
+
+if [[ ! -d $pkg_dir ]]; then
+	printf "ERROR: package %s is found in pacman database,\n" "${pkg_name}"
+	printf "       but \`%s' is not a directory\n" "${pkg_dir}"
+	exit 1
 fi
 
 #
 # Begin
 #
-echo Package: ${pkg_namver}
-work_dir=$(mktemp -d -p /tmp)
+echo "Package: ${pkg_namver}"
+work_dir=$(mktemp -d --tmpdir bacman.XXXXXXXXXX)
 cd "$work_dir" || exit 1
 
 #
@@ -120,136 +131,135 @@ echo "Copying package files..."
 
 cat "$pkg_dir"/files |
 while read i; do
-    if [ -z "$i" ] ; then
-        continue
-    fi
+	if [[ -z $i ]]; then
+		continue
+	fi
 
-    if [[ "$i" =~ %[A-Z]*% ]] ; then
-        current=$i
-        continue
-    fi
+	if [[ $i == %+([A-Z])% ]]; then
+		current=$i
+		continue
+	fi
 
-    case $current in
-        %FILES%)
-            ret=0
-            if [ -e "/$i" ]; then
-                bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf -
+	case "$current" in
+		%FILES%)
+			ret=0
+			if [[ -e /$i ]]; then
+				bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf -
 
-                # Workaround to bsdtar not reporting a missing file as an error
-                if [ ! -e "$work_dir/$i" -a ! -L "$work_dir/$i" ]; then
-                    echo ""
-                    echo "ERROR: unable to add /$i to the package"
-                    echo "       If your user does not have permssion to read this file then"
-                    echo "       you will need to run $progname as root"
-                    rm -rf "$work_dir"
-                    exit 1
-                fi
-            else
-                echo ""
-                echo "WARNING: package file /$i is missing"
-                echo ""
-            fi
-
-
-        ;;
-    esac
+				# Workaround to bsdtar not reporting a missing file as an error
+				if ! [[ -e $work_dir/$i || -L $work_dir/$i ]]; then
+					echo ""
+					echo "ERROR: unable to add /$i to the package"
+					echo "       If your user does not have permssion to read this file then"
+					echo "       you will need to run $progname as root"
+					rm -rf "$work_dir"
+					exit 1
+				fi
+			else
+				echo ""
+				echo "WARNING: package file /$i is missing"
+				echo ""
+			fi
+			;;
+	esac
 done
 
 ret=$?
-if [ $ret -ne 0 ]; then
-    rm -rf "$work_dir"
-    exit 1
+if (( ret )); then
+	rm -rf "$work_dir"
+	exit 1
 fi
 
 pkg_size=$(du -sk | awk '{print $1 * 1024}')
 
 #
 # .PKGINFO stuff
+# TODO adopt makepkg's write_pkginfo() into this or scripts/library
 #
 echo Generating .PKGINFO metadata...
 echo "# Generated by $progname $progver"    > .PKGINFO
-if [ "$INFAKEROOT" = "1" ]; then
-    echo "# Using $(fakeroot -v)"    >> .PKGINFO
+if [[ $INFAKEROOT == "1" ]]; then
+	echo "# Using $(fakeroot -v)"    >> .PKGINFO
 fi
 echo "# $(LC_ALL=C date)"            >> .PKGINFO
 echo "#"                    >> .PKGINFO
 
 cat "$pkg_dir"/{desc,files} |
 while read i; do
-    if [[ -z "$i" ]]; then
-        continue;
-    fi
+	if [[ -z $i ]]; then
+		continue;
+	fi
 
-    if [[ "$i" =~ %[A-Z]*% ]] ; then
-        current=$i
-        continue
-    fi
+	if [[ $i == %+([A-Z])% ]]; then
+		current=$i
+		continue
+	fi
 
-    case "$current" in
-        # desc
-        %NAME%)
-            echo "pkgname = $i"    >> .PKGINFO
-        ;;
-        %VERSION%)
-            echo "pkgver = $i"    >> .PKGINFO
-        ;;
-        %DESC%)
-            echo "pkgdesc = $i"    >> .PKGINFO
-        ;;
-        %URL%)
-            echo "url = $i"    >> .PKGINFO
-        ;;
-        %LICENSE%)
-            echo "license = $i"    >> .PKGINFO
-        ;;
-        %ARCH%)
-            echo "arch = $i"    >> .PKGINFO
-        ;;
-        %BUILDDATE%)
-            echo "builddate = $(date -u "+%s")"    >> .PKGINFO
-        ;;
-        %PACKAGER%)
-            echo "packager = $pkg_pkger"        >> .PKGINFO
-        ;;
-        %SIZE%)
-            echo "size = $pkg_size"        >> .PKGINFO
-        ;;
-        %GROUPS%)
-            echo "group = $i"    >> .PKGINFO
-        ;;
-        %REPLACES%)
-            echo "replaces = $i"    >> .PKGINFO
-        ;;
-        %DEPENDS%)
-            echo "depend = $i"   >> .PKGINFO
-        ;;
-        %OPTDEPENDS%)
-            echo "optdepend = $i" >> .PKGINFO
-        ;;
-        %CONFLICTS%)
-            echo "conflict = $i" >> .PKGINFO
-        ;;
-        %PROVIDES%)
-            echo "provides = $i"  >> .PKGINFO
-        ;;
+	case "$current" in
+		# desc
+		%NAME%)
+			echo "pkgname = $i"    >> .PKGINFO
+			;;
+		%VERSION%)
+			echo "pkgver = $i"    >> .PKGINFO
+			;;
+		%DESC%)
+			echo "pkgdesc = $i"    >> .PKGINFO
+			;;
+		%URL%)
+			echo "url = $i"    >> .PKGINFO
+			;;
+		%LICENSE%)
+			echo "license = $i"    >> .PKGINFO
+			;;
+		%ARCH%)
+			echo "arch = $i"    >> .PKGINFO
+			;;
+		%BUILDDATE%)
+			echo "builddate = $(date -u "+%s")"    >> .PKGINFO
+			;;
+		%PACKAGER%)
+			echo "packager = $pkg_pkger"        >> .PKGINFO
+			;;
+		%SIZE%)
+			echo "size = $pkg_size"        >> .PKGINFO
+			;;
+		%GROUPS%)
+			echo "group = $i"    >> .PKGINFO
+			;;
+		%REPLACES%)
+			echo "replaces = $i"    >> .PKGINFO
+			;;
+		%DEPENDS%)
+			echo "depend = $i"   >> .PKGINFO
+			;;
+		%OPTDEPENDS%)
+			echo "optdepend = $i" >> .PKGINFO
+			;;
+		%CONFLICTS%)
+			echo "conflict = $i" >> .PKGINFO
+			;;
+		%PROVIDES%)
+			echo "provides = $i"  >> .PKGINFO
+			;;
 
-        # files
-        %BACKUP%)
-            # strip the md5sum after the tab
-            echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
-        ;;
-    esac
+		# files
+		%BACKUP%)
+			# strip the md5sum after the tab
+			echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
+			;;
+	esac
 done
 
 comp_files=".PKGINFO"
 
-if [ -f "$pkg_dir/install" ] ; then
-    cp "$pkg_dir/install" "$work_dir/.INSTALL"
-    comp_files+=" .INSTALL"
+if [[ -f $pkg_dir/install ]]; then
+	cp "$pkg_dir/install" "$work_dir/.INSTALL"
+	comp_files+=" .INSTALL"
 fi
-if  [ -f $pkg_dir/changelog ] ; then
-    cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
-    comp_files+=" .CHANGELOG"
+if [[ -f $pkg_dir/changelog ]]; then
+	cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
+	comp_files+=" .CHANGELOG"
 fi
 
 #
@@ -263,36 +273,27 @@ chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
 #
 echo "Generating the package..."
 
-case "$PKGEXT" in
-	*tar.gz)  EXT=${PKGEXT%.gz} ;;
-	*tar.bz2) EXT=${PKGEXT%.bz2} ;;
-	*tar.xz)  EXT=${PKGEXT%.xz} ;;
-	*tar)     EXT=${PKGEXT} ;;
-	*) echo "WARNING: '%s' is not a valid archive extension." \
-	"$PKGEXT" ; EXT=$PKGEXT ;;
-esac
-
 pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}"
 ret=0
 
-# when fileglobbing, we want * in an empty directory to expand to
-# the null string rather than itself
-shopt -s nullglob
 # TODO: Maybe this can be set globally for robustness
 shopt -s -o pipefail
 bsdtar -cf - $comp_files * |
 case "$PKGEXT" in
-    *tar.gz)  gzip -c -f -n ;;
-    *tar.bz2) bzip2 -c -f ;;
-    *tar.xz)  xz -c -z - ;;
-    *tar)     cat ;;
-esac > ${pkg_file} || ret=$?
+	*tar.gz)  gzip -c -f -n ;;
+	*tar.bz2) bzip2 -c -f ;;
+	*tar.xz)  xz -c -z - ;;
+	*tar.Z)   compress -c -f ;;
+	*tar)     cat ;;
+	*) echo "WARNING: '%s' is not a valid archive extension." \
+	"$PKGEXT" >&2; cat ;;
+esac > "${pkg_file}"; ret=$?
 
-if [ $ret -ne 0 ]; then
-    echo "ERROR: unable to write package to $pkg_dest"
-    echo "       Maybe the disk is full or you do not have write access"
-    rm -rf "$work_dir"
-    exit 1
+if (( ret )); then
+	echo "ERROR: unable to write package to $pkg_dest"
+	echo "       Maybe the disk is full or you do not have write access"
+	rm -rf "$work_dir"
+	exit 1
 fi
 
 rm -rf "$work_dir"

contrib/bash_completion.in

@@ -27,6 +27,21 @@ _arch_incomp() {
   local r="\s-(-${1#* }\s|\w*${1% *})"; [[ $COMP_LINE =~ $r ]]
 }
 
+_pacman_key() {
+  local cur opts prev
+  COMPREPLY=()
+  _get_comp_words_by_ref cur prev
+  if [[ $cur = -* &&
+      $prev != -@(a|-add|c|-config|g|-gpgdir|h|-help|import?(-trustdb)) ]]; then
+    opts=('add delete export finger help list-keys recv-keys updatedb verify version
+           config edit-key gpgdir import import-trustdb init keyserver list-sigs
+           lsign-key populate refresh-keys'
+          'a d e f h l r u v V')
+    _arch_ptr2comp opts
+  fi
+  true
+}
+
 _makepkg() {
   local cur opts prev
   COMPREPLY=()
@@ -44,9 +59,9 @@ _makepkg() {
 _pacman_pkg() {
   _arch_compgen "$(
     if [[ $2 ]]; then
-      \pacman -$1 | \cut -d' ' -f1 | \sort -u
+      \pacman -$1 2>/dev/null | \cut -d' ' -f1 | \sort -u
     else
-      \pacman -$1
+      \pacman -$1 2>/dev/null
     fi
   )"
 }
@@ -98,16 +113,17 @@ _pacman() {
 
 if [[ $(type -t compopt) = "builtin" ]]; then
   _pacman_file() {
-    compopt -o filenames; _filedir 'pkg.tar.*'
+    compopt -o filenames; _filedir 'pkg.tar*'
   }
   complete -F _pacman -o default pacman
 else
   _pacman_file() {
-    _filedir 'pkg.tar.*'
+    _filedir 'pkg.tar*'
   }
   complete -F _pacman -o filenames -o default pacman
 fi
 
 complete -F _makepkg -o default makepkg
+complete -F _pacman_key -o default pacman-key
 
 # ex:et ts=2 sw=2 ft=sh

contrib/paccache.in

@@ -21,8 +21,8 @@
 shopt -s extglob
 
 declare -a candidates=() cmdopts=() whitelist=() blacklist=()
-declare -i delete=0 dryrun=0 filecount=0 keep=3 move=0 totalsaved=0
-declare    cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' movedir= scanarch=
+declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0
+declare    cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch=
 
 msg() {
 	local mesg=$1; shift
@@ -153,7 +153,8 @@ summarize() {
 			while read -r pkg; do
 				if (( verbose >= 3 )); then
 					[[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]}
-					if [[ -z $seen || $seenarch != $arch || $seen != $name ]]; then
+					if [[ -z $seen || $seenarch != "$arch" || $seen != "$name" ]]; then
+						seen=$name seenarch=$arch
 						printf '%s (%s):\n' "$name" "$arch"
 					fi
 					printf '  %s\n' "$pkg"
@@ -220,8 +221,10 @@ while getopts ':a:c:dfhi:k:m:rsuvz' opt; do
 			 blacklist+=("${ign[@]}")
 			unset i ign ;;
 		k) keep=$OPTARG
-			if [[ $keep != $OPTARG ]] || (( keep < 0 )); then
+			if [[ -z $keep || -n ${keep//[0-9]/} ]]; then
 				die 'argument to option -k must be a non-negative integer'
+			else
+				keep=$(( 10#$keep ))
 			fi ;;
 		m) move=1 movedir=$OPTARG ;;
 		r) delete=1 ;;
@@ -258,7 +261,7 @@ if (( move || delete )); then
 fi
 
 # unlikely that this will fail, but better make sure
-cd "$cachedir" || die "failed to chdir to \`%s'" "$cachedir"
+cd "$cachedir" >/dev/null || die "failed to chdir to \`%s'" "$cachedir"
 
 # note that these results are returned in an arbitrary order from awk, but
 # they'll be resorted (in summarize) iff we have a verbosity level set.
@@ -296,3 +299,5 @@ elif (( move )); then
 fi
 
 summarize "$pkgcount" "${candidates[@]}"
+
+# vim: set ts=2 sw=2 noet:

contrib/paclist.in

@@ -27,7 +27,7 @@ if ! type gettext &>/dev/null; then
 	}
 fi
 
-if [[ -z $1 ]]; then
+if [[ -z $1 || $1 = -@(h|-help) ]]; then
 	printf '%s - List all packages installed from a given repo\n' "${0##*/}"
 	printf 'Usage:   %s <repo>\n' "${0##*/}"
 	printf 'Example: %s testing\n' "${0##*/}"

contrib/pacsysclean.in

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up.
+
+PACMAN_OPTS=
+
+usage() {
+       echo "pacsysclean - Sort installed packages by decreasing installed size."
+       echo
+       echo "Usage: pacsysclean [options]"
+       echo
+       echo "Options:"
+       echo "  -o <options>     Specify custom pacman query options (e.g., dt)"
+       echo "  -h, --help       Show this help message and exit"
+}
+
+
+if [ -n "$1" ]; then
+       case "$1" in
+               -o) PACMAN_OPTS="${2}" ;;
+               -h|--help) usage; exit 0 ;;
+               *) usage; exit 1 ;;
+       esac
+fi
+
+IFS=$'\n'
+name="^Name.*: (.*)$"
+size="^Installed Size.*: (.*) KiB$"
+for line in $(LANG=C pacman -Qi $PACMAN_OPTS); do
+       if [[ $line =~ $name ]]; then
+               printf "%s\t" ${BASH_REMATCH[1]}
+       elif [[ $line =~ $size ]]; then
+               printf "%s\n" ${BASH_REMATCH[1]}
+       fi
+done | sort -g -k2 | awk '
+BEGIN {
+       split("KiB MiB GiB TiB PiB EiB ZiB YiB", suffix)
+}
+function format_size(size) {
+       count = 1
+       while (size + 0 > 1024) {
+               size /= 1024
+               count++
+       }
+       sizestr = sprintf("%.2f %s", size, suffix[count])
+       return sizestr
+}
+{
+       printf("%s\t%s\n", format_size($2), $1);
+}'

contrib/zsh_completion.in

@@ -36,7 +36,7 @@ _pacman_opts_pkgfile=(
 	'--dbonly[Only remove database entry, do not remove files]'
 	'--needed[Do not reinstall up to date packages]'
 	'--recursive[Reinstall all dependencies of target packages]'
-	'*:package file:_files -g "*.pkg.tar.*(.)"'
+	'*:package file:_files -g "*.pkg.tar*(.)"'
 )
 
 # options for passing to _arguments: subactions for --query command
@@ -127,7 +127,7 @@ _pacman_action_query() {
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
 				"$_pacman_opts_query_modifiers[@]" \
-				'*:package file:_files -g "*.pkg.tar.*"'
+				'*:package file:_files -g "*.pkg.tar*"'
 				;;
 		query_group)
 			_arguments -s : \
@@ -276,7 +276,7 @@ _pacman_completions_repositories() {
 # $cmd must be declared by calling function
 _pacman_get_command() {
 	# this is mostly nicked from _perforce
-	cmd=( "pacman" )
+	cmd=( "pacman" "2>/dev/null")
 	integer i
 	for (( i = 2; i < CURRENT - 1; i++ )); do
 		if [[ ${words[i]} = "--config" || ${words[i]} = "--root" ]]; then
@@ -300,11 +300,11 @@ _pacman() {
 				"$_pacman_opts_query_modifiers[@]" \
 				'*:package file:_files'
 				;;
-		-Q*p*) # file *.pkg.tar.*
+		-Q*p*) # file *.pkg.tar*
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
 				"$_pacman_opts_query_modifiers[@]" \
-				'*:package file:_files -g "*.pkg.tar.*"'
+				'*:package file:_files -g "*.pkg.tar*"'
 				;;
 		-Q*)  _pacman_action_query    ;;
 		-R*)  _pacman_action_remove   ;;

doc/.gitignore

@@ -9,7 +9,9 @@ pkgdelta.8
 repo-add.8
 repo-remove.8
 vercmp.8
-*.css
+asciidoc-manpage.css
+asciidoc.css
+asciidoc.js
 *.html
 *.xml
 man3

doc/Doxyfile

@@ -1,11 +1,13 @@
-# Doxyfile 1.5.5
+# Doxyfile 1.7.5.1
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = libalpm
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         =
+PROJECT_BRIEF          = "Arch Linux Package Manager Library"
+PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = ./
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -25,27 +27,31 @@ ABBREVIATE_BRIEF       = "The $name class" \
 ALWAYS_DETAILED_SEC    = YES
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 4
-ALIASES                = 
+ALIASES                =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
+EXTENSION_MAPPING      =
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
 TYPEDEF_HIDES_STRUCT   = NO
+SYMBOL_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -63,20 +69,27 @@ INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 SHOW_INCLUDE_FILES     = YES
+FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
 SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -86,25 +99,26 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ../lib/libalpm/
 INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          = 
+FILE_PATTERNS          =
 RECURSIVE              = NO
-EXCLUDE                = 
+EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           = 
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -121,31 +135,58 @@ VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = NO
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_TIMESTAMP         = YES
 HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
+HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 DOCSET_BUNDLE_ID       = org.doxygen.Project
-HTML_DYNAMIC_SECTIONS  = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
+USE_INLINE_TREES       = NO
 TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+MATHJAX_EXTENSIONS     =
+SEARCHENGINE           = NO
+SERVER_BASED_SEARCH    = NO
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -154,13 +195,16 @@ LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
+PAPER_TYPE             = letter
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
+LATEX_BIB_STYLE        = plain
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -168,8 +212,8 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -182,8 +226,8 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
+XML_SCHEMA             =
+XML_DTD                =
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
@@ -195,9 +239,9 @@ GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
@@ -207,24 +251,31 @@ INCLUDE_PATH           = ../..
 INCLUDE_FILE_PATTERNS  = *.h
 PREDEFINED             = HAVE_CONFIG_H= \
                          SYMHIDDEN= \
-                         SYMEXPORT=
-EXPAND_AS_DEFINED      = 
+                         SYMEXPORT= \
+                         HAVE_LIBARCHIVE \
+                         HAVE_LIBCURL \
+                         HAVE_LIBGPGME
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
+TAGFILES               =
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = NO
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           = Helvetica
+DOT_FONTSIZE           = 10
+DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
@@ -237,15 +288,13 @@ CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+MSCFILE_DIRS           =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 3
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO

doc/Makefile.am

@@ -41,6 +41,7 @@ HTML_DOCS = \
 
 EXTRA_DIST = \
 	asciidoc.conf \
+	asciidoc-override.css \
 	pacman.8.txt \
 	makepkg.8.txt \
 	repo-add.8.txt \
@@ -91,8 +92,9 @@ html: $(HTML_DOCS)
 
 website: html
 	bsdtar czf website.tar.gz $(HTML_DOCS) \
+		asciidoc-override.css \
 		-C /etc/asciidoc/stylesheets/ \
-		asciidoc.css asciidoc-manpage.css \
+		asciidoc.css \
 		-C /etc/asciidoc/javascripts/ \
 		asciidoc.js \
 		-C /etc/asciidoc/ \
@@ -116,7 +118,7 @@ A2X_OPTS = \
 	--destination-dir='./'
 
 # These rules are due to the includes and files of the asciidoc text
-$(ASCIIDOC_MANS): asciidoc.conf footer.txt
+$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am
 	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt
 
 %.html: %.txt
@@ -128,9 +130,9 @@ HACKING.html: ../HACKING
 	dos2unix $@
 
 # Customizations for certain HTML docs
-$(HTML_MANPAGES): asciidoc.conf footer.txt
-$(HTML_OTHER): asciidoc.conf
-%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons
+$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile.am
+$(HTML_OTHER): asciidoc.conf Makefile.am
+%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css
 %.8.html: ASCIIDOC_OPTS += -d manpage
 %.5.html: ASCIIDOC_OPTS += -d manpage
 %.3.html: ASCIIDOC_OPTS += -d manpage

doc/PKGBUILD.5.txt

@@ -87,7 +87,7 @@ similar to `$_basekernver`.
 	Specifies a special install script that is to be included in the package.
 	This file should reside in the same directory as the PKGBUILD, and will
 	be copied into the package by makepkg. It does not need to be included
-	in the source array (e.g., `install=pkgname.install`).
+	in the source array (e.g., `install=$pkgname.install`).
 
 *changelog*::
 	Specifies a changelog file that is to be included in the package.
@@ -107,6 +107,10 @@ similar to `$_basekernver`.
 It is also possible to change the name of the downloaded file, which is helpful
 with weird URLs and for handling multiple source files with the same
 name. The syntax is: `source=('filename::url')`.
++
+Files in the source array with extensions `.sig`, `.sign` or `.asc` are recognized by
+makepkg as PGP signatures and will be automatically used to verify the integrity
+of the corresponding source file.
 
 *noextract (array)*::
 	An array of filenames corresponding to those from the source array. Files

doc/asciidoc-override.css

@@ -0,0 +1,7 @@
+table th, table td {
+	padding: 0.2em 1em;
+}
+
+table td p.table {
+	margin: 0;
+}

doc/index.txt

@@ -28,6 +28,9 @@ being able to handle a much wider variety of cases. The switch to a
 library-based program should also make it easier in the future to develop
 alternative front ends.
 
+Version 4.0 added package signing and verification capabilities to the entire
+makepkg/repo-add/pacman toolchain via GNUPG and GPGME.
+
 Documentation
 -------------
 
@@ -62,47 +65,99 @@ contain the biggest changes in a format more concise than the commit log.
 Releases
 --------
 
-`------------`-------
-Date         Version
----------------------
-2011-08-10   v3.5.4
-2011-06-07   v3.5.3
-2011-04-18   v3.5.2
-2011-03-23   v3.5.1
-2011-03-16   v3.5.0
-2011-01-22   v3.4.3
-2010-12-29   v3.4.2
-2010-09-03   v3.4.1
-2010-06-16   v3.4.0
-2009-11-10   v3.3.3
-2009-10-05   v3.3.2
-2009-09-22   v3.3.1
-2009-08-02   v3.3.0
-2009-01-05   v3.2.2
-2008-08-26   v3.2.1
-2008-07-30   v3.2.0
-2008-04-01   v3.1.4
-2008-03-06   v3.1.3
-2008-02-20   v3.1.2
-2008-01-20   v3.1.1
-2008-01-09   v3.1.0
-2007-09-16   v3.0.6
-2007-06-17   v3.0.5
-2007-05-08   v3.0.4
-2007-04-28   v3.0.3
-2007-04-23   v3.0.2
-2007-04-04   v3.0.1
-2007-03-25   v3.0.0
-2006-02-02   v2.9.8
-2005-09-16   v2.9.7
-2005-06-10   v2.9.6
-2005-01-11   v2.9.5
-2004-12-19   v2.9.4
-2004-12-18   v2.9.3
-2004-09-25   v2.9.2
-2004-09-24   v2.9.1
-2004-09-18   v2.9
----------------------
+[frame="none",grid="none",options="autowidth",cols="3*a"]
+|======
+|
+[frame="topbot",grid="none",options="header,autowidth"]
+!======
+!Version !Date
+!4.0.2 !2011-02-11
+!4.0.1 !2011-11-20
+!4.0.0 !2011-10-13
+!4.0.0rc2 !2011-09-22
+!4.0.0rc1 !2011-08-11
+!3.5.4 !2011-08-10
+!3.5.3 !2011-06-07
+!3.5.2 !2011-04-18
+!3.5.1 !2011-03-23
+!3.5.0 !2011-03-16
+!3.4.3 !2011-01-22
+!3.4.2 !2010-12-29
+!3.4.1 !2010-09-03
+!3.4.0 !2010-06-16
+!3.3.3 !2009-11-10
+!3.3.2 !2009-10-05
+!3.3.1 !2009-09-22
+!3.3.0 !2009-08-02
+!3.2.2 !2009-01-05
+!3.2.1 !2008-08-26
+!3.2.0 !2008-07-30
+!3.1.4 !2008-04-01
+!3.1.3 !2008-03-06
+!3.1.2 !2008-02-20
+!3.1.1 !2008-01-20
+!3.1.0 !2008-01-09
+!======
+|
+[frame="topbot",grid="none",options="header,autowidth"]
+!======
+!Version !Date
+!2.9.8 !2006-02-02
+!2.9.7 !2005-09-16
+!2.9.7-TEST3 !2005-09-11
+!2.9.7-TEST2 !2005-09-07
+!2.9.7-TEST !2005-08-19
+!2.9.6 !2005-06-10
+!2.9.5 !2005-01-11
+!2.9.4 !2004-12-20
+!2.9.3 !2004-12-19
+!2.9.2 !2004-09-25
+!2.9.1 !2004-09-25
+!2.9 !2004-09-18
+!2.8.4 !2004-08-23
+!2.8.3 !2004-08-04
+!2.8.2 !2004-07-22
+!2.8.1 !2004-07-17
+!2.8 !2004-07-03
+!2.7.9 !2004-04-30
+!2.7.8 !2004-04-29
+!2.7.7 !2004-04-15
+!2.7.6 !2004-04-04
+!2.7.5 !2004-03-02
+!2.7.4 !2004-02-18
+!2.7.3 !2004-02-07
+!======
+|
+[frame="topbot",grid="none",options="header,autowidth"]
+!======
+!Version !Date
+!2.7.2 !2004-01-04
+!2.7.1 !2003-12-21
+!2.7 !2003-11-25
+!2.6.4 !2003-10-17
+!2.6.3 !2003-10-01
+!2.6.2 !2003-09-29
+!2.6.1 !2003-09-15
+!2.6 !2003-09-03
+!2.5.1 !2003-07-12
+!2.5 !2003-05-30
+!2.4.1 !2003-04-19
+!2.4 !2003-04-11
+!2.3.2 !2003-03-17
+!2.3.1 !2003-03-14
+!2.3 !2003-02-27
+!2.2 !2002-12-11
+!2.1 !2002-09-16
+!2.0 !2002-08-09
+!1.23 !2002-04-30
+!1.22 !2002-04-12
+!1.21 !2002-04-03
+!1.2 !2002-03-18
+!1.1 !2002-03-10
+!1.0 !2002-02-25
+!======
+
+|======
 
 Source code for all releases is available at
 link:ftp://ftp.archlinux.org/other/pacman/[]. To install, download the newest
@@ -202,7 +257,7 @@ Pacman/libalpm frontends:
 
 Copyright
 ---------
-pacman is Copyright (C) 2006-2011 Pacman Development Team
+pacman is Copyright (C) 2006-2012 Pacman Development Team
 <pacman-dev@archlinux.org> and Copyright (C) 2002-2006 Judd Vinet
 <jvinet@zeroflux.org> and is licensed through the GNU General Public License,
 version 2 or later.

doc/makepkg.conf.5.txt

@@ -215,7 +215,7 @@ Options
 
 **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz"::
 	Sets the compression used when making compiled or source packages. The
-	current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2`, `.tar.xz`, and
+	current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and
 	`.tar.Z`.
 	Do not touch these unless you know what you are doing.
 

doc/pacman-key.8.txt

@@ -61,11 +61,12 @@ Options
 	Output syntax and command line options.
 
 *\--import* <dir(s)>::
-	Adds keys from pubring.gpg into pacman's keyring and imports ownertrust
-	values from trustdb.gpg in the specified directories.
+	Imports keys from `pubring.gpg` into the public keyring from the specified
+	directories.
 
-*\--import-dirs* <dir(s)> ::
-	Imports ownertrust values from trustdb.gpg in the specified directories.
+*\--import-trustdb* <dir(s)> ::
+	Imports ownertrust values from `trustdb.gpg` into the shared trust database
+	from the specified directories.
 
 *\--init*::
 	Ensure the keyring is properly initialized and has the required access
@@ -117,8 +118,10 @@ PGP keyring file `foo.gpg` that contains the keys for the foo keyring in the
 directory +{pkgdatadir}/keyrings+.
 
 Optionally, the file `foo-trusted` can be provided containing a list of trusted
-key IDs for that keyring. This file will inform the user which keys a user
-needs to verify and sign to build a local web of trust.
+key IDs for that keyring. This is a file in a format compatible with 'gpg
+\--export-ownertrust' output. This file will inform the user which keys a user
+needs to verify and sign to build a local web of trust, in addition to
+assigning provided owner trust values.
 
 Also optionally, the file `foo-revoked` can be provided containing a list of
 revoked key IDs for that keyring. Revoked is defined as "no longer valid for

doc/pacman.8.txt

@@ -349,7 +349,7 @@ Sync Options[[SO]]
 	databases are saved for every sync DB you download from, and are not
 	deleted even if they are removed from the configuration file
 	linkman:pacman.conf[5]. Use one '\--clean' switch to only remove
-	packages that are no longer installed; use two to remove all packages
+	packages that are no longer installed; use two to remove all files
 	from the cache. In both cases, you will have a yes or no option to
 	remove packages and/or unused downloaded databases.
 +

doc/vercmp.8.txt

@@ -6,7 +6,7 @@ vercmp(8)
 
 Name
 ----
-vercmp - version comparsion utility
+vercmp - version comparison utility
 
 
 Synopsis
@@ -23,7 +23,7 @@ numbers. It outputs values as follows:
 *  = 0 : if ver1 == ver2
 *  > 0 : if ver1 > ver2
 
-Version comparsion operates as follows:
+Version comparison operates as follows:
 
   Alphanumeric:
     1.0a < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0 < 1.0.a < 1.0.1
@@ -35,6 +35,11 @@ overrule any version comparison (unless the epoch values are equal). This is
 specified in an `epoch:version-rel` format. For example, `2:1.0-1` is always
 greater than `1:3.6-1`.
 
+Keep in mind that the 'pkgrel' is only compared if it is available on both
+versions given to this tool. For example, comparing `1.5-1` and `1.5` will
+yield 0; comparing `1.5-1` and `1.5-2` will yield < 0 as expected. This is
+mainly for supporting versioned dependencies that do not include the 'pkgrel'.
+
 
 Options
 -------

etc/makepkg.conf.in

@@ -11,7 +11,7 @@
 DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
           'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync -z %u %o'
+          'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:

etc/pacman.conf.in

@@ -17,8 +17,8 @@
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -29,11 +29,11 @@ Architecture = auto
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
 #UseDelta
 #TotalDownload
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 
 # PGP signature checking

lib/libalpm/add.c

@@ -452,17 +452,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 		size_t pkg_current, size_t pkg_count)
 {
 	int i, ret = 0, errors = 0;
-	char scriptlet[PATH_MAX];
-	int is_upgrade = 0;
+	int is_upgrade;
 	alpm_pkg_t *oldpkg = NULL;
 	alpm_db_t *db = handle->db_local;
 	alpm_trans_t *trans = handle->trans;
+	const char *pkgfile;
 
 	ASSERT(trans != NULL, return -1);
 
-	snprintf(scriptlet, PATH_MAX, "%s%s-%s/install",
-			_alpm_db_path(db), newpkg->name, newpkg->version);
-
 	/* see if this is an upgrade. if so, remove the old package first */
 	alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name);
 	if(local) {
@@ -474,30 +471,25 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 			goto cleanup;
 		}
 
-		EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local);
-		_alpm_log(handle, ALPM_LOG_DEBUG, "upgrading package %s-%s\n",
-				newpkg->name, newpkg->version);
-
 		/* copy over the install reason */
 		newpkg->reason = alpm_pkg_get_reason(local);
 
-		/* pre_upgrade scriptlet */
-		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
-			_alpm_runscriptlet(handle, newpkg->origin_data.file,
-					"pre_upgrade", newpkg->version, local->version);
-		}
+		EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local);
 	} else {
 		is_upgrade = 0;
-
 		EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL);
-		_alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s\n",
-				newpkg->name, newpkg->version);
+	}
 
-		/* pre_install scriptlet */
-		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
-			_alpm_runscriptlet(handle, newpkg->origin_data.file,
-					"pre_install", newpkg->version, NULL);
-		}
+	pkgfile = newpkg->origin_data.file;
+
+	_alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n",
+			is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version);
+		/* pre_install/pre_upgrade scriptlet */
+	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);
 	}
 
 	/* we override any pre-set reason if we have alldeps or allexplicit set */
@@ -542,9 +534,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 		archive_read_support_compression_all(archive);
 		archive_read_support_format_all(archive);
 
-		_alpm_log(handle, ALPM_LOG_DEBUG, "archive: %s\n", newpkg->origin_data.file);
-		if(archive_read_open_filename(archive, newpkg->origin_data.file,
-					ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "archive: %s\n", pkgfile);
+		if(archive_read_open_filename(archive, pkgfile,
+					ALPM_BUFFER_SIZE) != ARCHIVE_OK) {
 			handle->pm_errno = ALPM_ERR_PKG_OPEN;
 			ret = -1;
 			goto cleanup;
@@ -661,13 +653,12 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 	/* run the post-install script if it exists  */
 	if(alpm_pkg_has_scriptlet(newpkg)
 			&& !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
-		if(is_upgrade) {
-			_alpm_runscriptlet(handle, scriptlet, "post_upgrade",
-					newpkg->version, oldpkg ? oldpkg->version : NULL);
-		} else {
-			_alpm_runscriptlet(handle, scriptlet, "post_install",
-					newpkg->version, NULL);
-		}
+		char *scriptlet = _alpm_local_db_pkgpath(db, newpkg, "install");
+		const char *scriptlet_name = is_upgrade ? "post_upgrade" : "post_install";
+
+		_alpm_runscriptlet(handle, scriptlet, scriptlet_name,
+				newpkg->version, oldpkg ? oldpkg->version : NULL, 0);
+		free(scriptlet);
 	}
 
 	if(is_upgrade) {

lib/libalpm/alpm.c

@@ -78,11 +78,6 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
 	bindtextdomain("libalpm", LOCALEDIR);
 #endif
 
-#ifdef HAVE_LIBCURL
-	curl_global_init(CURL_GLOBAL_SSL);
-	myhandle->curl = curl_easy_init();
-#endif
-
 	return myhandle;
 
 cleanup:
@@ -96,7 +91,7 @@ cleanup:
 /** Release the library.  This should be the last alpm call you make.
  * After this returns, handle should be considered invalid and cannot be reused
  * in any way.
- * @param handle the context handle
+ * @param myhandle the context handle
  * @return 0 on success, -1 on error
  */
 int SYMEXPORT alpm_release(alpm_handle_t *myhandle)

lib/libalpm/alpm.h

@@ -226,15 +226,18 @@ typedef struct _alpm_pgpkey_t {
 	time_t expires;
 } alpm_pgpkey_t;
 
-/** Signature result. Contains the number of signatures found and pointers to
- * arrays containing key and status info. All contained arrays have size
- * #count.*/
+/** Signature result. Contains the key, status, and validity of a given
+ * signature.
+ */
 typedef struct _alpm_sigresult_t {
 	alpm_pgpkey_t key;
 	alpm_sigstatus_t status;
 	alpm_sigvalidity_t validity;
 } alpm_sigresult_t;
 
+/** Signature list. Contains the number of signatures found and a pointer to an
+ * array of results.  The array is of size count.
+ */
 typedef struct _alpm_siglist_t {
 	size_t count;
 	alpm_sigresult_t *results;
@@ -310,7 +313,7 @@ typedef enum _alpm_event_t {
 	ALPM_EVENT_LOAD_START,
 	/** Target package is finished loading. */
 	ALPM_EVENT_LOAD_DONE,
-	/** Target deltas's integrity will be checked. */
+	/** Target delta's integrity will be checked. */
 	ALPM_EVENT_DELTA_INTEGRITY_START,
 	/** Target delta's integrity was checked. */
 	ALPM_EVENT_DELTA_INTEGRITY_DONE,
@@ -678,7 +681,7 @@ int alpm_db_set_pkgreason(alpm_handle_t *handle, alpm_pkg_t *pkg,
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
 int alpm_pkg_load(alpm_handle_t *handle, const char *filename, int full,
-		alpm_siglevel_t, alpm_pkg_t **pkg);
+		alpm_siglevel_t level, alpm_pkg_t **pkg);
 
 /** Free a package.
  * @param pkg package pointer to free
@@ -731,7 +734,7 @@ const char *alpm_pkg_get_name(alpm_pkg_t *pkg);
 const char *alpm_pkg_get_version(alpm_pkg_t *pkg);
 
 /** Returns the origin of the package.
- * @return a #alpm_pkgfrom_t constant, -1 on error
+ * @return an alpm_pkgfrom_t constant, -1 on error
  */
 alpm_pkgfrom_t alpm_pkg_get_origin(alpm_pkg_t *pkg);
 
@@ -878,7 +881,7 @@ alpm_list_t *alpm_pkg_get_backup(alpm_pkg_t *pkg);
  */
 alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg);
 
-/** Retuns the base64 encoded package signature.
+/** Returns the base64 encoded package signature.
  * @param pkg a pointer to package
  * @return a reference to an internal string
  */
@@ -1029,7 +1032,7 @@ int alpm_trans_prepare(alpm_handle_t *handle, alpm_list_t **data);
 /** Commit a transaction.
  * @param handle the context handle
  * @param data the address of an alpm_list where detailed description
- * of an error can be dumped (ie. list of conflicting files)
+ * of an error can be dumped (i.e. list of conflicting files)
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
 int alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data);

lib/libalpm/alpm_list.c

@@ -89,7 +89,7 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data)
 {
 	alpm_list_t *ptr, *lp;
 
-	ptr = calloc(1, sizeof(alpm_list_t));
+	ptr = malloc(sizeof(alpm_list_t));
 	if(ptr == NULL) {
 		return list;
 	}
@@ -127,7 +127,7 @@ alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_
 	} else {
 		alpm_list_t *add = NULL, *prev = NULL, *next = list;
 
-		add = calloc(1, sizeof(alpm_list_t));
+		add = malloc(sizeof(alpm_list_t));
 		if(add == NULL) {
 			return list;
 		}
@@ -279,8 +279,11 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn
 		alpm_list_t *left = list;
 		alpm_list_t *lastleft = alpm_list_nth(list, n/2 - 1);
 		alpm_list_t *right = lastleft->next;
-		/* terminate first list */
+
+		/* tidy new lists */
 		lastleft->next = NULL;
+		right->prev = left->prev;
+		left->prev = lastleft;
 
 		left = alpm_list_msort(left, n/2, fn);
 		right = alpm_list_msort(right, n - (n/2), fn);
@@ -470,7 +473,7 @@ alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list,
 	const alpm_list_t *lp = list;
 	alpm_list_t *newlist = NULL;
 	while(lp) {
-		void *newdata = calloc(1, size);
+		void *newdata = malloc(size);
 		if(newdata) {
 			memcpy(newdata, lp->data, size);
 			newlist = alpm_list_add(newlist, newdata);
@@ -548,7 +551,6 @@ inline alpm_list_t SYMEXPORT *alpm_list_next(const alpm_list_t *node)
  * @brief Get the previous element of a list.
  *
  * @param list the list head
- * @param node the list node
  *
  * @return the previous element, or NULL when no previous element exist
  */
@@ -776,7 +778,7 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n,
 		return NULL;
 	}
 
-	array = calloc(n, size);
+	array = malloc(n * size);
 	if(array == NULL) {
 		return NULL;
 	}

lib/libalpm/be_local.c

@@ -173,11 +173,11 @@ static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg)
  */
 static void *_cache_changelog_open(alpm_pkg_t *pkg)
 {
-	char clfile[PATH_MAX];
 	alpm_db_t *db = alpm_pkg_get_db(pkg);
-	snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog",
-			pkg->handle->dbpath, db->treename, pkg->name, pkg->version);
-	return fopen(clfile, "r");
+	char *clfile = _alpm_local_db_pkgpath(db, pkg, "changelog");
+	FILE *f = fopen(clfile, "r");
+	free(clfile);
+	return f;
 }
 
 /**
@@ -475,7 +475,7 @@ static int local_db_populate(alpm_db_t *db)
 }
 
 /* Note: the return value must be freed by the caller */
-static char *get_pkgpath(alpm_db_t *db, alpm_pkg_t *info, const char *filename)
+char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info, const char *filename)
 {
 	size_t len;
 	char *pkgpath;
@@ -544,7 +544,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
 	_alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n",
 			info->name, inforeq);
 
-	pkgpath = get_pkgpath(db, info, NULL);
+	pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
 	if(!pkgpath || access(pkgpath, F_OK)) {
 		/* directory doesn't exist or can't be opened */
 		_alpm_log(db->handle, ALPM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n",
@@ -558,7 +558,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
 
 	/* DESC */
 	if(inforeq & INFRQ_DESC && !(info->infolevel & INFRQ_DESC)) {
-		char *path = get_pkgpath(db, info, "desc");
+		char *path = _alpm_local_db_pkgpath(db, info, "desc");
 		if(!path || (fp = fopen(path, "r")) == NULL) {
 			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
 			free(path);
@@ -628,7 +628,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
 
 	/* FILES */
 	if(inforeq & INFRQ_FILES && !(info->infolevel & INFRQ_FILES)) {
-		char *path = get_pkgpath(db, info, "files");
+		char *path = _alpm_local_db_pkgpath(db, info, "files");
 		if(!path || (fp = fopen(path, "r")) == NULL) {
 			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
 			free(path);
@@ -685,7 +685,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
 
 	/* INSTALL */
 	if(inforeq & INFRQ_SCRIPTLET && !(info->infolevel & INFRQ_SCRIPTLET)) {
-		char *path = get_pkgpath(db, info, "install");
+		char *path = _alpm_local_db_pkgpath(db, info, "install");
 		if(access(path, F_OK) == 0) {
 			info->scriptlet = 1;
 		}
@@ -714,7 +714,7 @@ int _alpm_local_db_prepare(alpm_db_t *db, alpm_pkg_t *info)
 	}
 
 	oldmask = umask(0000);
-	pkgpath = get_pkgpath(db, info, NULL);
+	pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
 
 	if((retval = mkdir(pkgpath, 0755)) != 0) {
 		_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not create directory %s: %s\n"),
@@ -746,7 +746,7 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq
 		char *path;
 		_alpm_log(db->handle, ALPM_LOG_DEBUG, "writing %s-%s DESC information back to db\n",
 				info->name, info->version);
-		path = get_pkgpath(db, info, "desc");
+		path = _alpm_local_db_pkgpath(db, info, "desc");
 		if(!path || (fp = fopen(path, "w")) == NULL) {
 			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"),
 					path, strerror(errno));
@@ -857,7 +857,7 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq
 		char *path;
 		_alpm_log(db->handle, ALPM_LOG_DEBUG, "writing %s-%s FILES information back to db\n",
 				info->name, info->version);
-		path = get_pkgpath(db, info, "files");
+		path = _alpm_local_db_pkgpath(db, info, "files");
 		if(!path || (fp = fopen(path, "w")) == NULL) {
 			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"),
 					path, strerror(errno));
@@ -903,8 +903,9 @@ cleanup:
 int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info)
 {
 	int ret = 0;
-	char *pkgpath = get_pkgpath(db, info, NULL);
+	char *pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
 
+	/* TODO explicit file removes and then an rmdir? */
 	ret = _alpm_rmrf(pkgpath);
 	free(pkgpath);
 	if(ret != 0) {

lib/libalpm/be_package.c

@@ -59,7 +59,7 @@ static void *_package_changelog_open(alpm_pkg_t *pkg)
 	archive_read_support_format_all(archive);
 
 	if(archive_read_open_filename(archive, pkgfile,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+				ALPM_BUFFER_SIZE) != ARCHIVE_OK) {
 		RET_ERR(pkg->handle, ALPM_ERR_PKG_OPEN, NULL);
 	}
 
@@ -390,7 +390,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 	archive_read_support_format_all(archive);
 
 	if(archive_read_open_filename(archive, pkgfile,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+				ALPM_BUFFER_SIZE) != ARCHIVE_OK) {
 		alpm_pkg_free(newpkg);
 		RET_ERR(handle, ALPM_ERR_PKG_OPEN, NULL);
 	}
@@ -482,17 +482,19 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 	newpkg->origin_data.file = strdup(pkgfile);
 	newpkg->ops = get_file_pkg_ops();
 	newpkg->handle = handle;
+	newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET;
 
 	if(full) {
-		/* attempt to hand back any memory we don't need */
-		files = realloc(files, sizeof(alpm_file_t) * files_count);
-		/* "checking for conflicts" requires a sorted list, ensure that here */
-		_alpm_log(handle, ALPM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile);
-		newpkg->files.files = files_msort(files, files_count);
+		if(files) {
+			/* attempt to hand back any memory we don't need */
+			files = realloc(files, sizeof(alpm_file_t) * files_count);
+			/* "checking for conflicts" requires a sorted list, ensure that here */
+			_alpm_log(handle, ALPM_LOG_DEBUG,
+					"sorting package filelist for %s\n", pkgfile);
+			newpkg->files.files = files_msort(files, files_count);
+		}
 		newpkg->files.count = files_count;
-		newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_FILES | INFRQ_SCRIPTLET;
-	} else {
-		newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET;
+		newpkg->infolevel |= INFRQ_FILES;
 	}
 
 	return newpkg;

lib/libalpm/be_sync.c

@@ -75,6 +75,7 @@ static int sync_db_validate(alpm_db_t *db)
 		return 0;
 	}
 	if(db->status & DB_STATUS_INVALID) {
+		db->handle->pm_errno = ALPM_ERR_DB_INVALID_SIG;
 		return -1;
 	}
 
@@ -117,6 +118,8 @@ static int sync_db_validate(alpm_db_t *db)
 		} while(retry);
 
 		if(ret) {
+			db->status &= ~DB_STATUS_VALID;
+			db->status |= DB_STATUS_INVALID;
 			db->handle->pm_errno = ALPM_ERR_DB_INVALID_SIG;
 			return 1;
 		}
@@ -198,24 +201,25 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 
 	for(i = db->servers; i; i = i->next) {
 		const char *server = i->data;
-		struct dload_payload *payload;
+		struct dload_payload payload;
 		size_t len;
 		int sig_ret = 0;
 
-		CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+		memset(&payload, 0, sizeof(struct dload_payload));
 
 		/* set hard upper limit of 25MiB */
-		payload->max_size = 25 * 1024 * 1024;
+		payload.max_size = 25 * 1024 * 1024;
 
-		/* print server + filename into a buffer (leave space for .sig) */
-		len = strlen(server) + strlen(db->treename) + 9;
-		CALLOC(payload->fileurl, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
-		snprintf(payload->fileurl, len, "%s/%s.db", server, db->treename);
-		payload->handle = handle;
-		payload->force = force;
-		payload->unlink_on_fail = 1;
+		/* print server + filename into a buffer */
+		len = strlen(server) + strlen(db->treename) + 5;
+		MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+		snprintf(payload.fileurl, len, "%s/%s.db", server, db->treename);
+		payload.handle = handle;
+		payload.force = force;
+		payload.unlink_on_fail = 1;
 
-		ret = _alpm_download(payload, syncpath, NULL);
+		ret = _alpm_download(&payload, syncpath, NULL);
+		_alpm_dload_payload_reset(&payload);
 
 		if(ret == 0 && (level & ALPM_SIG_DATABASE)) {
 			/* an existing sig file is no good at this point */
@@ -228,20 +232,23 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 			free(sigpath);
 
 			/* if we downloaded a DB, we want the .sig from the same server */
-			snprintf(payload->fileurl, len, "%s/%s.db.sig", server, db->treename);
-			payload->handle = handle;
-			payload->force = 1;
-			payload->errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL);
+			/* print server + filename into a buffer (leave space for .sig) */
+			len = strlen(server) + strlen(db->treename) + 9;
+			MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+			snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename);
+			payload.handle = handle;
+			payload.force = 1;
+			payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL);
 
 			/* set hard upper limit of 16KiB */
-			payload->max_size = 16 * 1024;
+			payload.max_size = 16 * 1024;
 
-			sig_ret = _alpm_download(payload, syncpath, NULL);
+			sig_ret = _alpm_download(&payload, syncpath, NULL);
 			/* errors_ok suppresses error messages, but not the return code */
-			sig_ret = payload->errors_ok ? 0 : sig_ret;
+			sig_ret = payload.errors_ok ? 0 : sig_ret;
+			_alpm_dload_payload_reset(&payload);
 		}
 
-		_alpm_dload_payload_free(payload);
 		if(ret != -1 && sig_ret != -1) {
 			break;
 		}
@@ -433,7 +440,7 @@ static int sync_db_populate(alpm_db_t *db)
 	_alpm_log(db->handle, ALPM_LOG_DEBUG, "opening database archive %s\n", dbpath);
 
 	if(archive_read_open_filename(archive, dbpath,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+				ALPM_BUFFER_SIZE) != ARCHIVE_OK) {
 		_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), dbpath,
 				archive_error_string(archive));
 		archive_read_finish(archive);
@@ -451,11 +458,8 @@ static int sync_db_populate(alpm_db_t *db)
 	}
 
 	while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
-		const struct stat *st;
-
-		st = archive_entry_stat(entry);
-
-		if(S_ISDIR(st->st_mode)) {
+		mode_t mode = archive_entry_mode(entry);
+		if(S_ISDIR(mode)) {
 			continue;
 		} else {
 			/* we have desc, depends or deltas - parse it */

lib/libalpm/conflict.c

@@ -276,30 +276,29 @@ static alpm_list_t *filelist_operation(alpm_filelist_t *filesA,
 	return ret;
 }
 
-/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, type
- * (either ALPM_FILECONFLICT_TARGET or ALPM_FILECONFLICT_FILESYSTEM), a file
- * string, and either two package names or one package name and NULL. This is
- * a wrapper for former functionality that was done inline.
+/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, the
+ * conflicting file path, and either two packages or one package and NULL.
  */
 static alpm_list_t *add_fileconflict(alpm_handle_t *handle,
-		alpm_list_t *conflicts, alpm_fileconflicttype_t type, const char *filestr,
-		const char *name1, const char *name2)
+		alpm_list_t *conflicts, const char *filestr,
+		alpm_pkg_t *pkg1, alpm_pkg_t *pkg2)
 {
 	alpm_fileconflict_t *conflict;
 	MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error);
 
-	conflict->type = type;
-	STRDUP(conflict->target, name1, goto error);
+	STRDUP(conflict->target, pkg1->name, goto error);
 	STRDUP(conflict->file, filestr, goto error);
-	if(name2) {
-		STRDUP(conflict->ctarget, name2, goto error);
+	if(pkg2) {
+		conflict->type = ALPM_FILECONFLICT_TARGET;
+		STRDUP(conflict->ctarget, pkg2->name, goto error);
 	} else {
+		conflict->type = ALPM_FILECONFLICT_FILESYSTEM;
 		STRDUP(conflict->ctarget, "", goto error);
 	}
 
 	conflicts = alpm_list_add(conflicts, conflict);
 	_alpm_log(handle, ALPM_LOG_DEBUG, "found file conflict %s, packages %s and %s\n",
-	          filestr, name1, name2 ? name2 : "(filesystem)");
+	          filestr, pkg1->name, pkg2 ? pkg2->name : "(filesystem)");
 
 	return conflicts;
 
@@ -416,9 +415,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 				alpm_list_t *k;
 				char path[PATH_MAX];
 				for(k = common_files; k; k = k->next) {
-					snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data);
-					conflicts = add_fileconflict(handle, conflicts,
-							ALPM_FILECONFLICT_TARGET, path, p1->name, p2->name);
+					alpm_file_t *file = k->data;
+					snprintf(path, PATH_MAX, "%s%s", handle->root, file->name);
+					conflicts = add_fileconflict(handle, conflicts, path, p1, p2);
 					if(handle->pm_errno == ALPM_ERR_MEMORY) {
 						FREELIST(conflicts);
 						FREELIST(common_files);
@@ -470,16 +469,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 				continue;
 			}
 
+			_alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);
+
 			if(S_ISDIR(file->mode)) {
 				struct stat sbuf;
 				if(S_ISDIR(lsbuf.st_mode)) {
-					_alpm_log(handle, ALPM_LOG_DEBUG, "%s is a directory, not a conflict\n", path);
+					_alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n");
 					continue;
 				}
 				stat(path, &sbuf);
 				if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) {
 					_alpm_log(handle, ALPM_LOG_DEBUG,
-							"%s is a symlink to a dir, hopefully not a conflict\n", path);
+							"file is a symlink to a dir, hopefully not a conflict\n");
 					continue;
 				}
 				/* if we made it to here, we want all subsequent path comparisons to
@@ -488,7 +489,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 				path[strlen(path) - 1] = '\0';
 			}
 
-			_alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);
 			relative_path = path + strlen(handle->root);
 
 			/* Check remove list (will we remove the conflicting local file?) */
@@ -497,7 +497,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 				if(rempkg && _alpm_filelist_contains(alpm_pkg_get_files(rempkg),
 							relative_path)) {
 					_alpm_log(handle, ALPM_LOG_DEBUG,
-							"local file will be removed, not a conflict: %s\n", path);
+							"local file will be removed, not a conflict\n");
 					resolved_conflict = 1;
 				}
 			}
@@ -518,7 +518,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 					handle->trans->skip_remove =
 						alpm_list_add(handle->trans->skip_remove, strdup(filestr));
 					_alpm_log(handle, ALPM_LOG_DEBUG,
-							"file changed packages, adding to remove skiplist: %s\n", path);
+							"file changed packages, adding to remove skiplist\n");
 					resolved_conflict = 1;
 				}
 			}
@@ -536,16 +536,20 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 				free(dir);
 			}
 
-			if(!resolved_conflict && dbpkg) {
+			/* check if a component of the filepath was a link. canonicalize the path
+			 * and look for it in the old package. note that the actual file under
+			 * consideration cannot itself be a link, as it might be unowned- path
+			 * components can be safely checked as all directories are "unowned". */
+			if(!resolved_conflict && dbpkg && !S_ISLNK(lsbuf.st_mode)) {
 				char *rpath = calloc(PATH_MAX, sizeof(char));
 				const char *relative_rpath;
-				if(!realpath(path, rpath)) {
-					free(rpath);
-					continue;
-				}
-				relative_rpath = rpath + strlen(handle->root);
-				if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), relative_rpath)) {
-					resolved_conflict = 1;
+				if(realpath(path, rpath)) {
+					relative_rpath = rpath + strlen(handle->root);
+					if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), relative_rpath)) {
+						_alpm_log(handle, ALPM_LOG_DEBUG,
+								"package contained the resolved realpath\n");
+						resolved_conflict = 1;
+					}
 				}
 				free(rpath);
 			}
@@ -561,14 +565,13 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 				}
 				if(!found) {
 					_alpm_log(handle, ALPM_LOG_DEBUG,
-							"file was unowned but in new backup list: %s\n", path);
+							"file was unowned but in new backup list\n");
 					resolved_conflict = 1;
 				}
 			}
 
 			if(!resolved_conflict) {
-				conflicts = add_fileconflict(handle, conflicts,
-						ALPM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL);
+				conflicts = add_fileconflict(handle, conflicts, path, p1, NULL);
 				if(handle->pm_errno == ALPM_ERR_MEMORY) {
 					FREELIST(conflicts);
 					if(dbpkg) {

lib/libalpm/db.c

@@ -429,7 +429,7 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
 				for(k = alpm_pkg_get_provides(pkg); k; k = k->next) {
 					alpm_depend_t *provide = k->data;
 					if(regexec(&reg, provide->name, 0, 0, 0) == 0) {
-						matched = k->data;
+						matched = provide->name;
 						break;
 					}
 				}
@@ -445,8 +445,8 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
 			}
 
 			if(matched != NULL) {
-				_alpm_log(db->handle, ALPM_LOG_DEBUG, "    search target '%s' matched '%s'\n",
-				          targ, matched);
+				_alpm_log(db->handle, ALPM_LOG_DEBUG,
+						"search target '%s' matched '%s'\n", targ, matched);
 				ret = alpm_list_add(ret, pkg);
 			}
 		}

lib/libalpm/db.h

@@ -93,6 +93,7 @@ void _alpm_db_unregister(alpm_db_t *db);
 int _alpm_local_db_prepare(alpm_db_t *db, alpm_pkg_t *info);
 int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq);
 int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info);
+char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info, const char *filename);
 
 /* cache bullshit */
 /* packages */

lib/libalpm/deps.c

@@ -409,14 +409,14 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep)
 alpm_depend_t *_alpm_splitdep(const char *depstring)
 {
 	alpm_depend_t *depend;
-	const char *ptr, *version = NULL;
+	const char *ptr, *version;
 	size_t deplen;
 
 	if(depstring == NULL) {
 		return NULL;
 	}
 
-	CALLOC(depend, 1, sizeof(alpm_depend_t), return NULL);
+	MALLOC(depend, sizeof(alpm_depend_t), return NULL);
 	deplen = strlen(depstring);
 
 	/* Find a version comparator if one exists. If it does, set the type and
@@ -442,8 +442,10 @@ alpm_depend_t *_alpm_splitdep(const char *depstring)
 		depend->mod = ALPM_DEP_MOD_EQ;
 		version = ptr + 1;
 	} else {
-		/* no version specified, leave version and ptr NULL */
+		/* no version specified, leave ptr NULL and set version to NULL */
 		depend->mod = ALPM_DEP_MOD_ANY;
+		depend->version = NULL;
+		version = NULL;
 	}
 
 	/* copy the right parts to the right places */
@@ -629,7 +631,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep,
 	/* first check if one provider is already installed locally */
 	for(i = providers; i; i = i->next) {
 		alpm_pkg_t *pkg = i->data;
-		if(_alpm_pkghash_find(_alpm_db_get_pkgcache_hash(handle->db_local), pkg->name)) {
+		if(_alpm_db_get_pkgfromcache(handle->db_local, pkg->name)) {
 			alpm_list_free(providers);
 			return pkg;
 		}
@@ -693,6 +695,7 @@ alpm_pkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_handle_t *handle,
  * @param handle the context handle
  * @param localpkgs is the list of local packages
  * @param pkg is the package to resolve
+ * @param preferred packages to prefer when resolving
  * @param packages is a pointer to a list of packages which will be
  *        searched first for any dependency packages needed to complete the
  *        resolve, and to which will be added any [pkg] and all of its

lib/libalpm/diskspace.c

@@ -1,7 +1,7 @@
 /*
  *  diskspace.c
  *
- *  Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,10 +19,15 @@
 
 #include "config.h"
 
+#include <stdio.h>
 #include <errno.h>
+
 #if defined(HAVE_MNTENT_H)
 #include <mntent.h>
 #endif
+#if defined(HAVE_SYS_MNTTAB_H)
+#include <sys/mnttab.h>
+#endif
 #if defined(HAVE_SYS_STATVFS_H)
 #include <sys/statvfs.h>
 #endif
@@ -60,10 +65,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle)
 	alpm_list_t *mount_points = NULL, *ptr;
 	alpm_mountpoint_t *mp;
 
-#if defined HAVE_GETMNTENT
+#if defined(HAVE_GETMNTENT) && defined(HAVE_MNTENT_H)
+	/* Linux */
 	struct mntent *mnt;
 	FILE *fp;
-	struct statvfs fsp;
 
 	fp = setmntent(MOUNTED, "r");
 
@@ -72,8 +77,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle)
 	}
 
 	while((mnt = getmntent(fp))) {
+		struct statvfs fsp;
 		if(!mnt) {
-			_alpm_log(handle, ALPM_LOG_WARNING, _("could not get filesystem information\n"));
+			_alpm_log(handle, ALPM_LOG_WARNING,
+					_("could not get filesystem information\n"));
 			continue;
 		}
 		if(statvfs(mnt->mnt_dir, &fsp) != 0) {
@@ -93,7 +100,44 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle)
 	}
 
 	endmntent(fp);
-#elif defined HAVE_GETMNTINFO
+#elif defined(HAVE_GETMNTENT) && defined(HAVE_MNTTAB_H)
+	/* Solaris, Illumos */
+	struct mnttab mnt;
+	FILE *fp;
+	int ret;
+
+	fp = fopen("/etc/mnttab", "r");
+
+	if(fp == NULL) {
+		return NULL;
+	}
+
+	while((ret = getmntent(fp, &mnt)) == 0) {
+		struct statvfs fsp;
+		if(statvfs(mnt->mnt_mountp, &fsp) != 0) {
+			_alpm_log(handle, ALPM_LOG_WARNING,
+					_("could not get filesystem information for %s: %s\n"),
+					mnt->mnt_mountp, strerror(errno));
+			continue;
+		}
+
+		CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+		mp->mount_dir = strdup(mnt->mnt_mountp);
+		mp->mount_dir_len = strlen(mp->mount_dir);
+		memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs));
+		mp->read_only = fsp.f_flag & ST_RDONLY;
+
+		mount_points = alpm_list_add(mount_points, mp);
+	}
+	/* -1 == EOF */
+	if(ret != -1) {
+		_alpm_log(handle, ALPM_LOG_WARNING,
+				_("could not get filesystem information\n"));
+	}
+
+	fclose(fp);
+#elif defined(HAVE_GETMNTINFO)
+	/* FreeBSD (statfs), NetBSD (statvfs), OpenBSD (statfs), OS X (statfs) */
 	int entries;
 	FSSTATSTYPE *fsp;
 

lib/libalpm/dload.c

@@ -1,7 +1,7 @@
 /*
  *  download.c
  *
- *  Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,11 +25,19 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/socket.h> /* setsockopt, SO_KEEPALIVE */
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
 
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h> /* IPPROTO_TCP */
+#endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h> /* TCP_KEEPINTVL, TCP_KEEPIDLE */
+#endif
+
 #ifdef HAVE_LIBCURL
 #include <curl/curl.h>
 #endif
@@ -43,8 +51,6 @@
 #include "handle.h"
 
 #ifdef HAVE_LIBCURL
-static off_t prevprogress; /* last download amount */
-
 static const char *get_filename(const char *url)
 {
 	char *filename = strrchr(url, '/');
@@ -60,12 +66,21 @@ static char *get_fullpath(const char *path, const char *filename,
 	char *filepath;
 	/* len = localpath len + filename len + suffix len + null */
 	size_t len = strlen(path) + strlen(filename) + strlen(suffix) + 1;
-	CALLOC(filepath, len, sizeof(char), return NULL);
+	MALLOC(filepath, len, return NULL);
 	snprintf(filepath, len, "%s%s%s", path, filename, suffix);
 
 	return filepath;
 }
 
+static CURL *get_libcurl_handle(alpm_handle_t *handle)
+{
+	if(!handle->curl) {
+		curl_global_init(CURL_GLOBAL_SSL);
+		handle->curl = curl_easy_init();
+	}
+	return handle->curl;
+}
+
 enum {
 	ABORT_SIGINT = 1,
 	ABORT_OVER_MAXFILESIZE
@@ -77,7 +92,7 @@ static void inthandler(int UNUSED signum)
 	dload_interrupted = ABORT_SIGINT;
 }
 
-static int curl_progress(void *file, double dltotal, double dlnow,
+static int dload_progress_cb(void *file, double dltotal, double dlnow,
 		double UNUSED ultotal, double UNUSED ulnow)
 {
 	struct dload_payload *payload = (struct dload_payload *)file;
@@ -103,30 +118,31 @@ static int curl_progress(void *file, double dltotal, double dlnow,
 
 	total_size = payload->initial_size + (off_t)dltotal;
 
-	if(DOUBLE_EQ(dltotal, 0.0) || prevprogress == total_size) {
+	if(DOUBLE_EQ(dltotal, 0.0) || payload->prevprogress == total_size) {
 		return 0;
 	}
 
 	/* initialize the progress bar here to avoid displaying it when
 	 * a repo is up to date and nothing gets downloaded */
-	if(prevprogress == 0) {
+	if(payload->prevprogress == 0) {
 		payload->handle->dlcb(payload->remote_name, 0, (off_t)dltotal);
 	}
 
 	payload->handle->dlcb(payload->remote_name, current_size, total_size);
 
-	prevprogress = current_size;
+	payload->prevprogress = current_size;
 
 	return 0;
 }
 
-static int curl_gethost(const char *url, char *buffer)
+static int curl_gethost(const char *url, char *buffer, size_t buf_len)
 {
 	size_t hostlen;
 	char *p, *q;
 
 	if(strncmp(url, "file://", 7) == 0) {
-		strcpy(buffer, _("disk"));
+		p = _("disk");
+		hostlen = strlen(p);
 	} else {
 		p = strstr(url, "//");
 		if(!p) {
@@ -147,14 +163,15 @@ static int curl_gethost(const char *url, char *buffer)
 			hostlen -= q - p + 1;
 			p = q + 1;
 		}
-
-		if(hostlen > 255) {
-			/* buffer overflow imminent */
-			return 1;
-		}
-		snprintf(buffer, hostlen + 1, "%s", p);
 	}
 
+	if(hostlen > buf_len - 1) {
+		/* buffer overflow imminent */
+		return 1;
+	}
+	memcpy(buffer, p, hostlen);
+	buffer[hostlen] = '\0';
+
 	return 0;
 }
 
@@ -169,7 +186,15 @@ static int utimes_long(const char *path, long seconds)
 	return 0;
 }
 
-static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user)
+/* prefix to avoid possible future clash with getumask(3) */
+static mode_t _getumask(void)
+{
+	mode_t mask = umask(0);
+	umask(mask);
+	return mask;
+}
+
+static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *user)
 {
 	size_t realsize = size * nmemb;
 	const char *fptr, *endptr = NULL;
@@ -200,8 +225,49 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user)
 	return realsize;
 }
 
+static int dload_sockopt_cb(void *userdata, curl_socket_t curlfd,
+		curlsocktype purpose)
+{
+	alpm_handle_t *handle = userdata;
+	int optval = 1;
+
+	/* this whole method is to prevent FTP control connections from going sour
+	 * during a long data transfer; crappy firewalls love to drop otherwise idle
+	 * connections if there is no traffic. */
+	if(purpose != CURLSOCKTYPE_IPCXN) {
+		return 0;
+	}
+
+	/* don't abort operation if any setsockopt fails, just log to debug */
+	if(setsockopt(curlfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&optval,
+				sizeof(optval)) < 0) {
+		_alpm_log(handle, ALPM_LOG_DEBUG,
+				"Failed to set SO_KEEPALIVE on fd %d\n", curlfd);
+	}
+	else {
+#ifdef TCP_KEEPIDLE
+		optval = 60;
+		if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&optval,
+					sizeof(optval)) < 0) {
+			_alpm_log(handle, ALPM_LOG_DEBUG,
+					"Failed to set TCP_KEEPIDLE on fd %d\n", curlfd);
+		}
+#endif
+#ifdef TCP_KEEPINTVL
+		optval = 60;
+		if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&optval,
+					sizeof(optval)) < 0) {
+			_alpm_log(handle, ALPM_LOG_DEBUG,
+					"Failed to set TCP_KEEPINTVL on fd %d\n", curlfd);
+		}
+#endif
+	}
+
+	return 0;
+}
+
 static void curl_set_handle_opts(struct dload_payload *payload,
-		char *error_buffer)
+		CURL *curl, char *error_buffer)
 {
 	alpm_handle_t *handle = payload->handle;
 	const char *useragent = getenv("HTTP_USER_AGENT");
@@ -209,47 +275,48 @@ static void curl_set_handle_opts(struct dload_payload *payload,
 
 	/* the curl_easy handle is initialized with the alpm handle, so we only need
 	 * to reset the handle's parameters for each time it's used. */
-	curl_easy_reset(handle->curl);
-	curl_easy_setopt(handle->curl, CURLOPT_URL, payload->fileurl);
-	curl_easy_setopt(handle->curl, CURLOPT_FAILONERROR, 1L);
-	curl_easy_setopt(handle->curl, CURLOPT_ERRORBUFFER, error_buffer);
-	curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10L);
-	curl_easy_setopt(handle->curl, CURLOPT_FILETIME, 1L);
-	curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 0L);
-	curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1L);
-	curl_easy_setopt(handle->curl, CURLOPT_PROGRESSFUNCTION, curl_progress);
-	curl_easy_setopt(handle->curl, CURLOPT_PROGRESSDATA, (void *)payload);
-	curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_LIMIT, 1024L);
-	curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_TIME, 10L);
-	curl_easy_setopt(handle->curl, CURLOPT_HEADERFUNCTION, parse_headers);
-	curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload);
-	curl_easy_setopt(handle->curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
+	curl_easy_reset(curl);
+	curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl);
+	curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
+	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);
+	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
+	curl_easy_setopt(curl, CURLOPT_FILETIME, 1L);
+	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
+	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+	curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, dload_progress_cb);
+	curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload);
+	curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024L);
+	curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L);
+	curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb);
+	curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload);
+	curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
+	curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, dload_sockopt_cb);
+	curl_easy_setopt(curl, CURLOPT_SOCKOPTDATA, (void *)handle);
 
 	_alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl);
 
 	if(payload->max_size) {
 		_alpm_log(handle, ALPM_LOG_DEBUG, "maxsize: %jd\n",
 				(intmax_t)payload->max_size);
-		curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE_LARGE,
+		curl_easy_setopt(curl, CURLOPT_MAXFILESIZE_LARGE,
 				(curl_off_t)payload->max_size);
 	}
 
 	if(useragent != NULL) {
-		curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent);
+		curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent);
 	}
 
 	if(!payload->allow_resume && !payload->force && payload->destfile_name &&
 			stat(payload->destfile_name, &st) == 0) {
 		/* start from scratch, but only download if our local is out of date. */
-		curl_easy_setopt(handle->curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
-		curl_easy_setopt(handle->curl, CURLOPT_TIMEVALUE, (long)st.st_mtime);
+		curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+		curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime);
 		_alpm_log(handle, ALPM_LOG_DEBUG,
 				"using time condition: %lu\n", (long)st.st_mtime);
 	} else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) {
 		/* a previous partial download exists, resume from end of file. */
 		payload->tempfile_openmode = "ab";
-		curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM_LARGE,
-				(curl_off_t)st.st_size);
+		curl_easy_setopt(curl, CURLOPT_RESUME_FROM_LARGE, (curl_off_t)st.st_size);
 		_alpm_log(handle, ALPM_LOG_DEBUG,
 				"tempfile found, attempting continuation from %jd bytes\n",
 				(intmax_t)st.st_size);
@@ -279,34 +346,44 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat
 {
 	int fd;
 	FILE *fp;
-	char randpath[PATH_MAX];
-	alpm_handle_t *handle = payload->handle;
+	char *randpath;
+	size_t len;
 
 	/* create a random filename, which is opened with O_EXCL */
-	snprintf(randpath, PATH_MAX, "%salpmtmp.XXXXXX", localpath);
+	len = strlen(localpath) + 14 + 1;
+	MALLOC(randpath, len, RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL));
+	snprintf(randpath, len, "%salpmtmp.XXXXXX", localpath);
 	if((fd = mkstemp(randpath)) == -1 ||
+			fchmod(fd, ~(_getumask()) & 0666) ||
 			!(fp = fdopen(fd, payload->tempfile_openmode))) {
 		unlink(randpath);
-		close(fd);
-		_alpm_log(handle, ALPM_LOG_ERROR,
+		if(fd >= 0) {
+			close(fd);
+		}
+		_alpm_log(payload->handle, ALPM_LOG_ERROR,
 				_("failed to create temporary file for download\n"));
 		return NULL;
 	}
 	/* fp now points to our alpmtmp.XXXXXX */
-	STRDUP(payload->tempfile_name, randpath, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
-	payload->remote_name = strrchr(randpath, '/') + 1;
+	free(payload->tempfile_name);
+	payload->tempfile_name = randpath;
+	free(payload->remote_name);
+	STRDUP(payload->remote_name, strrchr(randpath, '/') + 1,
+			RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL));
 
 	return fp;
 }
 
+/* RFC1123 states applications should support this length */
+#define HOSTNAME_SIZE 256
+
 static int curl_download_internal(struct dload_payload *payload,
 		const char *localpath, char **final_file)
 {
 	int ret = -1;
 	FILE *localf = NULL;
 	char *effective_url;
-	/* RFC1123 states applications should support this length */
-	char hostname[256];
+	char hostname[HOSTNAME_SIZE];
 	char error_buffer[CURL_ERROR_SIZE] = {0};
 	struct stat st;
 	long timecond, respcode = 0, remote_time = -1;
@@ -314,13 +391,15 @@ static int curl_download_internal(struct dload_payload *payload,
 	struct sigaction orig_sig_pipe, orig_sig_int;
 	/* shortcut to our handle within the payload */
 	alpm_handle_t *handle = payload->handle;
+	CURL *curl = get_libcurl_handle(handle);
 	handle->pm_errno = 0;
 
 	payload->tempfile_openmode = "wb";
 	if(!payload->remote_name) {
-		payload->remote_name = get_filename(payload->fileurl);
+		STRDUP(payload->remote_name, get_filename(payload->fileurl),
+				RET_ERR(handle, ALPM_ERR_MEMORY, -1));
 	}
-	if(!payload->remote_name || curl_gethost(payload->fileurl, hostname) != 0) {
+	if(curl_gethost(payload->fileurl, hostname, sizeof(hostname)) != 0) {
 		_alpm_log(handle, ALPM_LOG_ERROR, _("url '%s' is invalid\n"), payload->fileurl);
 		RET_ERR(handle, ALPM_ERR_SERVER_BAD_URL, -1);
 	}
@@ -342,7 +421,7 @@ static int curl_download_internal(struct dload_payload *payload,
 		}
 	}
 
-	curl_set_handle_opts(payload, error_buffer);
+	curl_set_handle_opts(payload, curl, error_buffer);
 
 	if(localf == NULL) {
 		localf = fopen(payload->tempfile_name, payload->tempfile_openmode);
@@ -355,46 +434,56 @@ static int curl_download_internal(struct dload_payload *payload,
 			"opened tempfile for download: %s (%s)\n", payload->tempfile_name,
 			payload->tempfile_openmode);
 
-	curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, localf);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, localf);
 
 	/* ignore any SIGPIPE signals- these may occur if our FTP socket dies or
 	 * something along those lines. Store the old signal handler first. */
 	mask_signal(SIGPIPE, SIG_IGN, &orig_sig_pipe);
 	mask_signal(SIGINT, &inthandler, &orig_sig_int);
 
-	/* Progress 0 - initialize */
-	prevprogress = 0;
-
 	/* perform transfer */
-	handle->curlerr = curl_easy_perform(handle->curl);
+	payload->curlerr = curl_easy_perform(curl);
+	_alpm_log(handle, ALPM_LOG_DEBUG, "curl returned error %d from transfer\n",
+			payload->curlerr);
 
-	/* immediately unhook the progress callback */
-	curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 1L);
+	/* disconnect relationships from the curl handle for things that might go out
+	 * of scope, but could still be touched on connection teardown.  This really
+	 * only applies to FTP transfers. See FS#26327 for an example. */
+	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
+	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL);
 
 	/* was it a success? */
-	switch(handle->curlerr) {
+	switch(payload->curlerr) {
 		case CURLE_OK:
 			/* get http/ftp response code */
-			curl_easy_getinfo(handle->curl, CURLINFO_RESPONSE_CODE, &respcode);
-			if(respcode >=400) {
+			curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &respcode);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", respcode);
+			if(respcode >= 400) {
 				payload->unlink_on_fail = 1;
+				/* non-translated message is same as libcurl */
+				snprintf(error_buffer, sizeof(error_buffer),
+						"The requested URL returned error: %ld", respcode);
+				_alpm_log(handle, ALPM_LOG_ERROR,
+						_("failed retrieving file '%s' from %s : %s\n"),
+						payload->remote_name, hostname, error_buffer);
 				goto cleanup;
 			}
 			break;
 		case CURLE_ABORTED_BY_CALLBACK:
 			/* handle the interrupt accordingly */
 			if(dload_interrupted == ABORT_OVER_MAXFILESIZE) {
-				handle->curlerr = CURLE_FILESIZE_EXCEEDED;
+				payload->curlerr = CURLE_FILESIZE_EXCEEDED;
 				handle->pm_errno = ALPM_ERR_LIBCURL;
-				/* the hardcoded 'size exceeded' message is same as libcurl's normal */
+				/* use the 'size exceeded' message from libcurl */
 				_alpm_log(handle, ALPM_LOG_ERROR,
 						_("failed retrieving file '%s' from %s : %s\n"),
-						payload->remote_name, hostname, "Maximum file size exceeded");
+						payload->remote_name, hostname,
+						curl_easy_strerror(CURLE_FILESIZE_EXCEEDED));
 			}
 			goto cleanup;
 		default:
 			/* delete zero length downloads */
-			if(stat(payload->tempfile_name, &st) == 0 && st.st_size == 0) {
+			if(fstat(fileno(localf), &st) == 0 && st.st_size == 0) {
 				payload->unlink_on_fail = 1;
 			}
 			if(!payload->errors_ok) {
@@ -411,11 +500,11 @@ static int curl_download_internal(struct dload_payload *payload,
 	}
 
 	/* retrieve info about the state of the transfer */
-	curl_easy_getinfo(handle->curl, CURLINFO_FILETIME, &remote_time);
-	curl_easy_getinfo(handle->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &remote_size);
-	curl_easy_getinfo(handle->curl, CURLINFO_SIZE_DOWNLOAD, &bytes_dl);
-	curl_easy_getinfo(handle->curl, CURLINFO_CONDITION_UNMET, &timecond);
-	curl_easy_getinfo(handle->curl, CURLINFO_EFFECTIVE_URL, &effective_url);
+	curl_easy_getinfo(curl, CURLINFO_FILETIME, &remote_time);
+	curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &remote_size);
+	curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &bytes_dl);
+	curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &timecond);
+	curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
 
 	/* time condition was met and we didn't download anything. we need to
 	 * clean up the 0 byte .part file that's left behind. */
@@ -526,14 +615,30 @@ int _alpm_download(struct dload_payload *payload, const char *localpath,
 	}
 }
 
+static char *filecache_find_url(alpm_handle_t *handle, const char *url)
+{
+	const char *basename = strrchr(url, '/');
+
+	if(basename == NULL) {
+		return NULL;
+	}
+
+	basename++;
+	if(basename == '\0') {
+		return NULL;
+	}
+
+	return _alpm_filecache_find(handle, basename);
+}
+
 /** Fetch a remote pkg. */
 char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
 {
 	char *filepath;
 	const char *cachedir;
 	char *final_file = NULL;
-	struct dload_payload *payload;
-	int ret;
+	struct dload_payload payload;
+	int ret = 0;
 
 	CHECK_HANDLE(handle, return NULL);
 	ASSERT(url, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL));
@@ -541,62 +646,78 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
 	/* find a valid cache dir to download to */
 	cachedir = _alpm_filecache_setup(handle);
 
-	CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
-	payload->handle = handle;
-	STRDUP(payload->fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
-	payload->allow_resume = 1;
+	memset(&payload, 0, sizeof(struct dload_payload));
 
-	/* download the file */
-	ret = _alpm_download(payload, cachedir, &final_file);
-	if(ret == -1) {
-		_alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url);
-		return NULL;
+	/* attempt to find the file in our pkgcache */
+	filepath = filecache_find_url(handle, url);
+	if(filepath == NULL) {
+		STRDUP(payload.fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+		payload.allow_resume = 1;
+		payload.handle = handle;
+
+		/* download the file */
+		ret = _alpm_download(&payload, cachedir, &final_file);
+		_alpm_dload_payload_reset(&payload);
+		if(ret == -1) {
+			_alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url);
+			free(final_file);
+			return NULL;
+		}
+		_alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", url);
 	}
-	_alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", url);
 
 	/* attempt to download the signature */
 	if(ret == 0 && (handle->siglevel & ALPM_SIG_PACKAGE)) {
-		char *sig_final_file = NULL;
+		char *sig_filepath, *sig_final_file = NULL;
 		size_t len;
-		struct dload_payload *sig_payload;
 
-		CALLOC(sig_payload, 1, sizeof(*sig_payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
 		len = strlen(url) + 5;
-		CALLOC(sig_payload->fileurl, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
-		snprintf(sig_payload->fileurl, len, "%s.sig", url);
-		sig_payload->handle = handle;
-		sig_payload->force = 1;
-		sig_payload->errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL);
+		MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+		snprintf(payload.fileurl, len, "%s.sig", url);
 
-		ret = _alpm_download(sig_payload, cachedir, &sig_final_file);
-		if(ret == -1 && !sig_payload->errors_ok) {
-			_alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), sig_payload->fileurl);
-			/* Warn now, but don't return NULL. We will fail later during package
-			 * load time. */
-		} else if(ret == 0) {
-			_alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", sig_payload->fileurl);
+		sig_filepath = filecache_find_url(handle, payload.fileurl);
+		if(sig_filepath == NULL) {
+			payload.handle = handle;
+			payload.force = 1;
+			payload.errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL);
+
+			/* set hard upper limit of 16KiB */
+			payload.max_size = 16 * 1024;
+
+			ret = _alpm_download(&payload, cachedir, &sig_final_file);
+			if(ret == -1 && !payload.errors_ok) {
+				_alpm_log(handle, ALPM_LOG_WARNING,
+						_("failed to download %s\n"), payload.fileurl);
+				/* Warn now, but don't return NULL. We will fail later during package
+				 * load time. */
+			} else if(ret == 0) {
+				_alpm_log(handle, ALPM_LOG_DEBUG,
+						"successfully downloaded %s\n", payload.fileurl);
+			}
+			FREE(sig_final_file);
 		}
-		FREE(sig_final_file);
-		_alpm_dload_payload_free(sig_payload);
+		free(sig_filepath);
+		_alpm_dload_payload_reset(&payload);
 	}
 
 	/* we should be able to find the file the second time around */
-	filepath = _alpm_filecache_find(handle, final_file);
-	FREE(final_file);
-	_alpm_dload_payload_free(payload);
+	if(filepath == NULL) {
+		filepath = _alpm_filecache_find(handle, final_file);
+	}
+	free(final_file);
 
 	return filepath;
 }
 
-void _alpm_dload_payload_free(struct dload_payload *payload) {
+void _alpm_dload_payload_reset(struct dload_payload *payload)
+{
 	ASSERT(payload, return);
 
-	FREE(payload->fileurl);
-	FREE(payload->content_disp_name);
+	FREE(payload->remote_name);
 	FREE(payload->tempfile_name);
 	FREE(payload->destfile_name);
-	FREE(payload);
-
+	FREE(payload->content_disp_name);
+	FREE(payload->fileurl);
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/dload.h

@@ -27,21 +27,25 @@
 
 struct dload_payload {
 	alpm_handle_t *handle;
-	const char *remote_name;
 	const char *tempfile_openmode;
+	char *remote_name;
 	char *tempfile_name;
 	char *destfile_name;
 	char *content_disp_name;
 	char *fileurl;
 	off_t initial_size;
 	off_t max_size;
+	off_t prevprogress;
 	int force;
 	int allow_resume;
 	int errors_ok;
 	int unlink_on_fail;
+#ifdef HAVE_LIBCURL
+	CURLcode curlerr;       /* last error produced by curl */
+#endif
 };
 
-void _alpm_dload_payload_free(struct dload_payload *payload);
+void _alpm_dload_payload_reset(struct dload_payload *payload);
 
 int _alpm_download(struct dload_payload *payload, const char *localpath,
 		char **final_file);

lib/libalpm/handle.h

@@ -60,7 +60,6 @@ struct __alpm_handle_t {
 #ifdef HAVE_LIBCURL
 	/* libcurl handle */
 	CURL *curl;             /* reusable curl_easy handle */
-	CURLcode curlerr;       /* last error produced by curl */
 #endif
 
 	/* callback functions */

lib/libalpm/package.c

@@ -641,7 +641,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2)
 {
 	const alpm_pkg_t *pkg1 = p1;
 	const alpm_pkg_t *pkg2 = p2;
-	return strcoll(pkg1->name, pkg2->name);
+	return strcmp(pkg1->name, pkg2->name);
 }
 
 /* Test for existence of a package in a alpm_list_t*

lib/libalpm/pkghash.c

@@ -159,19 +159,19 @@ static alpm_pkghash_t *pkghash_add_pkg(alpm_pkghash_t *hash, alpm_pkg_t *pkg, in
 
 	position = get_hash_position(pkg->name_hash, hash);
 
-	ptr = calloc(1, sizeof(alpm_list_t));
+	ptr = malloc(sizeof(alpm_list_t));
 	if(ptr == NULL) {
 		return hash;
 	}
 
 	ptr->data = pkg;
-	ptr->next = NULL;
 	ptr->prev = ptr;
+	ptr->next = NULL;
 
 	hash->hash_table[position] = ptr;
-	if(!sorted){
+	if(!sorted) {
 		hash->list = alpm_list_join(hash->list, ptr);
-	}else{
+	} else {
 		hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp);
 	}
 

lib/libalpm/po/ca.po

@@ -5,12 +5,13 @@
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Hector Mtz-Seara <hseara@gmail.com>, 2011.
+#   <jpreales@gmail.com>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-11 14:03+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/ca/)\n"
@@ -84,9 +85,9 @@ msgstr "no es pot obtenir el directori de treball actual\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "no s'ha pogut canviar el directori a %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "no es pot obtenir el directori de treball actual\n"
+msgstr "no s'ha pogut restaurar el directori de treball (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -138,7 +139,7 @@ msgstr "no s'ha pogut crear el directori %s: %s\n"
 
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "no s'ha pogut analitzar el fitxers de descripció de paquet en %s\n"
+msgstr "no s'ha pogut analitzar el fitxer de descripció de paquet en %s\n"
 
 #, c-format
 msgid "missing package name in %s\n"
@@ -167,6 +168,8 @@ msgstr "no s'ha pogut eliminar el fitxer de bloqueig %s\n"
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
+"no s'ha pogut analitzar el fitxer de descripció de paquet '%s' de la base de "
+"dades '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -216,11 +219,11 @@ msgstr "no s'ha pogut determinar punt de muntatge de root %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "La partició %s està muntat només en mode lectura\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
 msgstr ""
-"La partició %s està molt plena: nombre de blocs requerits %ld, nombre de "
-"blocs lliures %ld\n"
+"La partició %s està molt plena: nombre de blocs requerits %jd, nombre de "
+"blocs lliures %jd\n"
 
 #, c-format
 msgid "disk"
@@ -228,7 +231,7 @@ msgstr "disc"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "ha fallat en crear un arxiu temporal per la baixada\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -308,11 +311,11 @@ msgstr "no s'ha pogut trobar la base de dades"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "base de dades invàlida o corrupta"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "base de dades invàlida o corrupta (signatura PGP)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -373,15 +376,15 @@ msgstr "operació cancel·lada degut a ignorepkg"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "paquet invàlid o corrupte"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "base de dades invàlida o corrupta (checksum)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "paquet invàlid o corrupte (signatura PGP)"
 
 #, c-format
 msgid "cannot open package file"
@@ -405,11 +408,11 @@ msgstr "no s'ha pogut trobar el repositori per l'objectiu"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "falta signatura PGP"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "signatura PGP invàlida"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -449,7 +452,7 @@ msgstr "error de la llibreria de baixades"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "error de gpgme"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -459,9 +462,9 @@ msgstr "error en invocar el baixador extern"
 msgid "unexpected error"
 msgstr "error inesperat"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "no s'ha pogut trobar o llegir el paquet"
+msgstr "no s'ha pogut carregar completament les metadades pel paquet %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -477,7 +480,7 @@ msgstr "no s'ha pogut eliminar el fitxer '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "no es pot eliminar %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -541,6 +544,10 @@ msgstr "no s'ha pogut crear el directori temporal\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "no s'ha pogut copiar el fitxer temporal a %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "no s'ha pogut eliminar %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "no s'ha pogut eliminar el directori temporal %s\n"
@@ -559,7 +566,7 @@ msgstr "no s'ha pogut canviar el directori arrel (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr "la crida a execve ha fallat (%s)\n"
+msgstr "la crida a execv ha fallat (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -577,6 +584,7 @@ msgstr "l'ordre a fallat a executar-se correctament\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "no existeix memòria cau %s, s'està creant...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "no s'ha pogut crear la memòria cau del paquet, s'usarà /tmp\n"
+msgstr ""
+"no s'ha trobat o creat packet de memòria cau, usant alternativaent %s\n"

lib/libalpm/po/cs.po

@@ -5,14 +5,15 @@
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # David Kolibáč <david@kolibac.cz>, 2011.
+#   <markotahal@gmail.com>, 2011.
 # Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-15 08:43+0000\n"
+"Last-Translator: vogo <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/cs/)\n"
 "Language: cs\n"
@@ -85,9 +86,9 @@ msgstr "nelze určit aktuální pracovní adresář\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "nelze změnit adresář na %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "nelze určit aktuální pracovní adresář\n"
+msgstr "nelze obnovit pracovní adresář (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -167,7 +168,7 @@ msgstr "nelze odstranit zamykací soubor %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "nelze načíst soubor s popisem balíčku '%s' z databáze '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -217,10 +218,9 @@ msgstr "nepodařilo se určit kořen přípojného bodu %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Diskový oddíl %s je připojen jen pro čtení\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Diskový oddíl %s je příliš plný: je potřeba %ld bloků, %ld bloků je volných\n"
+msgstr "Oddíl %s je plný: je potřeba %jd bloků, ale k dispozici je jen %jd\n"
 
 #, c-format
 msgid "disk"
@@ -228,7 +228,7 @@ msgstr "disk"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "nepodařilo se vytvořit dočasný soubor pro stahování\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -308,11 +308,11 @@ msgstr "nelze nalézt databázi"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "neplatná nebo poškozená databáze"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "neplatná nebo poškozená databáze (PGP podpisy)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -372,15 +372,15 @@ msgstr "operace byla zrušena kvůli ignorovanému balíčku"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "neplatný nebo poškozený balíček"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "neplatná nebo poškozená databáze (kontrolní součty)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "neplatný nebo poškozený balíček (PGP podpis)"
 
 #, c-format
 msgid "cannot open package file"
@@ -404,11 +404,11 @@ msgstr "nelze nalézt repositář cíle"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "chybějící podpis PGP"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "neplatný podpis PGP"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -448,7 +448,7 @@ msgstr "chyba knihovny pro stahování souborů"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "chyba v gpgme"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -458,9 +458,9 @@ msgstr "chyba volání externího programu pro stahování souborů"
 msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "nelze nalézt nebo přečíst balíček"
+msgstr "nelze zcela načíst metadata pro balíček %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -476,7 +476,7 @@ msgstr "nelze odstranit soubor '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "nelze odstranit %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -538,6 +538,10 @@ msgstr "nelze vytvořit dočasný adresář\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nelze zkopírovat dočasný soubor do %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "nelze odstranit %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nelze odstranit dočasný adresář %s\n"
@@ -574,6 +578,8 @@ msgstr "příkaz se nepodařilo spustit správně\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "neexistuje mezipaměť %s, vytváří se...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "nelze vytvořit mezipaměť balíčků, používá se /tmp\n"
+msgstr ""
+"nepodařilo se najít nebo vytvořit mezipaměť pro balíčky, používám místo toho "
+"%s\n"

lib/libalpm/po/da.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: 2011-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 03:39+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/da/)\n"
@@ -83,9 +83,9 @@ msgstr "kunne ikke hente aktuelt arbejdsmappe\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "kunne ikke ændre mappe til %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "kunne ikke hente aktuelt arbejdsmappe\n"
+msgstr ""
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -455,9 +455,9 @@ msgstr "fejl under opstart af ekstern hentningsprogram"
 msgid "unexpected error"
 msgstr "uventet fejl"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "kunne ikke finde eller læse pakke"
+msgstr ""
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -535,6 +535,10 @@ msgstr "kunne ikke oprette midlertidig mappe\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "kunne ikke kopier midlertidig fil til %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr ""
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "kunne ikke fjerne tmpdir %s\n"
@@ -571,6 +575,6 @@ msgstr "kommando kunne ikke udføres korrekt\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "intet %s-mellemlager findes, opretter...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "kunne ikke oprette pakkemellemlager, bruger /tmp i steden for\n"
+msgstr ""

lib/libalpm/po/de.po

@@ -9,9 +9,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-11 22:23+0000\n"
-"Last-Translator: jakob <jakob.matthes@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-07 09:26+0000\n"
+"Last-Translator: tlaloc <matthias@archlinux.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/de/)\n"
 "Language: de\n"
@@ -84,9 +84,9 @@ msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln\n"
+msgstr "Konnte das Arbeitsverzeichnis (%s) nicht wiederherstellen\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -221,10 +221,11 @@ msgstr "Konnte den Root-Einhängepunkt %s nicht ermitteln\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Die Partition %s ist so eingehängt, daß sie nur gelesen werden kann\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
 msgstr ""
-"Partition %s überfüllt: %ld Blöcke werden benötigt, %ld Blöcke sind frei\n"
+"Partition %s ist überfüllt: %jd Blöcke werden benötigt, %jd Blöcke sind "
+"frei\n"
 
 #, c-format
 msgid "disk"
@@ -463,9 +464,9 @@ msgstr "Fehler beim Aufruf eines externen Downloaders"
 msgid "unexpected error"
 msgstr "Unerwarteter Fehler"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "Konnte Paket nicht finden oder lesen"
+msgstr "Konnte die Metadaten für Paket %s-%s nicht vollständig laden\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -543,6 +544,10 @@ msgstr "Konnte temporäres Verzeichnis nicht erstellen\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "Konnte temporäre Datei nicht nach %s kopieren (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "Konnte %s nicht entfernen\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
@@ -579,6 +584,7 @@ msgstr "Befehl konnte nicht korrekt ausgeführt werden\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n"
+msgstr ""
+"Konnte den Paket-Puffer nicht finden oder erstellen, benutze stattdessen %s\n"

lib/libalpm/po/el.po

@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Christos Nouskas <nous@archlinux.us>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # nous <nous@archlinux.us>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-15 00:07+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 10:43+0000\n"
 "Last-Translator: nous <nous@archlinux.us>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/el/)\n"
@@ -84,9 +85,9 @@ msgstr "αδυναμία χρήσης τρέχοντος καταλόγου\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "αδυναμία μετάβασης στον κατάλογο %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "αδυναμία χρήσης τρέχοντος καταλόγου\n"
+msgstr "αδυναμία επαναφοράς καταλόγου εργασίας (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -216,9 +217,9 @@ msgstr "αδυναμία καθορισμού ριζικού σημείου πρ
 msgid "Partition %s is mounted read only\n"
 msgstr "Kατάτμηση %s: προσαρτημένη μόνο για ανάγνωση\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "Kατάτμηση %s πλήρης: %ld blocks απαιτούνται, %ld ελεύθερα\n"
+msgstr "Κατάτμηση %s πλήρης: %jd ελεύθερα μπλοκ, %jd απαιτούνται\n"
 
 #, c-format
 msgid "disk"
@@ -456,9 +457,9 @@ msgstr "σφάλμα κλήσης προγράμματος λήψης"
 msgid "unexpected error"
 msgstr "απροσδόκητο σφάλμα"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "αδυναμία εύρεσης ή ανάγνωσης πακέτου"
+msgstr "αδυναμία πλήρους φόρτωσης μεταδεδομένων πακέτου %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -537,6 +538,10 @@ msgstr "αδυναμία δημιουργίας προσωρινού καταλ
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "αδυναμία αντιγραφής προσωρινού αρχείου στο %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "αδυναμία διαγραφής %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "αδυναμία διαγραφής προσωρινού καταλόγου %s\n"
@@ -573,6 +578,6 @@ msgstr "αποτυχία σωστής εκτέλεσης εντολής\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "δημιουργία κρύπτης %s...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "αδυναμία δημιουργίας κρύπτης πακέτων, χρήση /tmp\n"
+msgstr "αδυναμία εύρεσης ή δημιουργίας κρύπτης πακέτων, χρήση %s\n"

lib/libalpm/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: 2011-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:08+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 03:57+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -82,9 +82,9 @@ msgstr "could not get current working directory\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "could not change directory to %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "could not get current working directory\n"
+msgstr "could not restore working directory (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -214,9 +214,9 @@ msgstr "could not determine root mount point %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Partition %s is mounted read only\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "Partition %s too full: %ld blocks needed, %ld blocks free\n"
+msgstr "Partition %s too full: %jd blocks needed, %jd blocks free\n"
 
 #, c-format
 msgid "disk"
@@ -454,9 +454,9 @@ msgstr "error invoking external downloader"
 msgid "unexpected error"
 msgstr "unexpected error"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "could not find or read package"
+msgstr "could not fully load metadata for package %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -534,6 +534,10 @@ msgstr "could not create temp directory\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "could not copy tempfile to %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "could not remove %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "could not remove tmpdir %s\n"
@@ -570,6 +574,6 @@ msgstr "command failed to execute correctly\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "no %s cache exists, creating...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "couldn't create package cache, using /tmp instead\n"
+msgstr "couldn't find or create package cache, using %s instead\n"

lib/libalpm/po/es.po

@@ -6,14 +6,15 @@
 # Angel Velasquez <angvp@archlinux.org>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Juan Antonio Cánovas Pérez <traumness@gmail.com>, 2011.
+#   <juantascon@gmail.com>, 2011.
 # neiko <neikokz+tsfx@gmail.com>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-09-02 18:19+0000\n"
-"Last-Translator: neiko <neikokz+tsfx@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 16:10+0000\n"
+"Last-Translator: juantascon <juantascon@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/es/)\n"
 "Language: es\n"
@@ -86,9 +87,9 @@ msgstr "no se pudo obtener el directorio de trabajo actual\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "no se pudo cambiar el directorio a %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "no se pudo obtener el directorio de trabajo actual\n"
+msgstr "no se pudo restaurar el directorio de trabajo (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -226,11 +227,11 @@ msgstr "no se pudo determinar el punto de montaje de la raiz %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "La partición %s está montada como sólo lectura\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
 msgstr ""
-"La partición %s está muy llena: %ld bloques necesarios, %ld bloques "
-"disponibles\n"
+"Partición %s demasiado llena: %jd bloques son necesarios, %jd bloques "
+"libres\n"
 
 #, c-format
 msgid "disk"
@@ -469,9 +470,9 @@ msgstr "error invocando el descargador externo"
 msgid "unexpected error"
 msgstr "error inesperado"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "no se pudo encontrar o leer el paquete"
+msgstr "no se pudo cargar completamente los metadatos para el paquete %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -551,6 +552,10 @@ msgstr "no se puede crear el directorio temporal\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "no se pudo copiar el archivo temporal a %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "no se pudo eliminar %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "no se pudo eliminar el directorio temporal %s\n"
@@ -587,6 +592,7 @@ msgstr "el comando falló al ejecutarse\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "no existe la caché %s, creando...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
+msgstr ""
+"no se pudo encontrar o crear la caché del paquete, en lugar se utilizará %s\n"

lib/libalpm/po/fi.po

@@ -13,9 +13,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-15 20:31+0000\n"
-"Last-Translator: Larso <larso@gmx.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-07 18:48+0000\n"
+"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/fi/)\n"
 "Language: fi\n"
@@ -88,9 +88,9 @@ msgstr "nykyisen kansion sijaintia ei voitu määrittää\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "ei voitu vaihtaa kansioon %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "nykyisen kansion sijaintia ei voitu määrittää\n"
+msgstr "työhakemistoa ei voitu palauttaa (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -220,9 +220,9 @@ msgstr "juuren %s liitospistettä ei voitu selvittää\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Osio %s on liitetty vain lukutilassa\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "osio %s on liian täynnä: %ld lohkoa tarvitaan, %ld lohkoa vapaana\n"
+msgstr "Osio %s on liian täynnä: %jd lohkoa tarvitaan, %jd lohkoa vapaana\n"
 
 #, c-format
 msgid "disk"
@@ -460,9 +460,9 @@ msgstr "virhe kutsuttaessa ulkoista latausohjelmaa"
 msgid "unexpected error"
 msgstr "odottamaton virhe"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "pakettia ei löytynyt tai voitu lukea"
+msgstr "paketin %s-%s metadataa ei voitu ladata täysin\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -542,6 +542,10 @@ msgstr "väliaikaiskansiota ei voitu luoda\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "väliaikaistiedostoa ei voitu kopioida kansioon %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "%s ei voitu poistaa\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "väliaikaiskansiota %s ei voitu poistaa\n"
@@ -578,6 +582,8 @@ msgstr "komento päättyi virheeseen\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "välimuistia %s ei ole olemassa, luodaan...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "pakettivälimuistia ei voitu luoda, käytetään /tmp:tä sen sijasta\n"
+msgstr ""
+"pakettivälimuistia ei ollut olemassa eikä sitä voitu luoda. Käytetään %s sen "
+"sijaan\n"

lib/libalpm/po/fr.po

@@ -4,14 +4,15 @@
 #
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
-#   <ma.jiehong@gmail.com>, 2011.
+#   <ma.jiehong@gmail.com>, 2011, 2012.
 # shining <chantry.xavier@gmail.com>, 2011.
+# Xavier Devlamynck <magicrhesus@ouranos.be>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-09-06 05:55+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2012-02-06 20:08+0000\n"
 "Last-Translator: jiehong <ma.jiehong@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/fr/)\n"
@@ -85,9 +86,9 @@ msgstr "déterminer le répertoire courant a échoué\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "changer de répertoire vers %s a échoué (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "déterminer le répertoire courant a échoué\n"
+msgstr "Impossible de restaurer le répertoire de travail (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -169,8 +170,8 @@ msgstr "la suppression du fichier de verrouillage %s a échoué\n"
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
-"impossible d'analyser le fichier '%s' de description du paquet depuis la "
-"base de données '%s'\n"
+"impossible d'analyser le fichier « %s » de description du paquet depuis la "
+"base de données « %s »\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -194,7 +195,7 @@ msgstr "ignore le paquet %s-%s\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n"
+msgstr "impossible de résoudre « %s », une dépendance de « %s »\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
@@ -221,11 +222,9 @@ msgstr "impossible de déterminer le point de montage de la racine %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "La partition %s est en lecture seule\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"La partition %s n'a pas assez d'espace libre : besoin de %ld blocs mais "
-"seulement %ld libres\n"
+msgstr "La partition %s est pleine : %jd blocs nécessaires, %jd blocs libres\n"
 
 #, c-format
 msgid "disk"
@@ -237,11 +236,11 @@ msgstr "échec de création d'un fichier temporaire pour le téléchargement\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "l'url '%s' est invalide\n"
+msgstr "l'url « %s » est invalide\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "échec de récupération du fichier '%s' depuis %s : %s\n"
+msgstr "échec de récupération du fichier « %s » depuis %s : %s\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
@@ -321,7 +320,7 @@ msgstr "base de données invalide ou corrompue (Signature PGP)"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr "la base de données n'est pas à la bonne version"
+msgstr "la version de la base de donnée n'est pas la bonne"
 
 #, c-format
 msgid "could not update database"
@@ -465,9 +464,11 @@ msgstr "erreur en invoquant le client externe de téléchargement"
 msgid "unexpected error"
 msgstr "erreur non prévue"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "impossible de trouver ou de lire le paquet"
+msgstr ""
+"Les métadonnées pour le paquet %s-%s n'ont pas pu êtres totalement "
+"chargées.\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -479,7 +480,7 @@ msgstr "supprime %s de la liste de cible\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "suppression du fichier '%s' impossible : %s\n"
+msgstr "suppression du fichier « %s » impossible : %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
@@ -491,7 +492,7 @@ msgstr "la suppression de l'entrée de base de données %s-%s a échoué\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "la suppression du cache de l'entrée '%s' a échoué\n"
+msgstr "la suppression du cache de l'entrée « %s » a échoué\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
@@ -523,7 +524,8 @@ msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "supprime '%s' de la liste de cible car il est en conflit avec '%s'\n"
+msgstr ""
+"supprime « %s » de la liste de cible car il est en conflit avec « %s »\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -545,6 +547,10 @@ msgstr "la création du répertoire temporaire a échoué\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "la copie du fichier temporaire vers %s a échoué (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "la suppression de %s a échoué\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "la suppression du répertoire temporaire %s a échoué\n"
@@ -581,6 +587,8 @@ msgstr "la commande n'a pas pu être exécutée correctement\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "le cache %s n'existe pas, création…\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
+msgstr ""
+"Impossible de trouver ou de créer le cache des paquets, utilisation de %s à "
+"la place\n"

lib/libalpm/po/hu.po

@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# György Balló <ballogy@freestart.hu>, 2011.
 # ngaba <ngaba@bibl.u-szeged.hu>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-08 10:04+0000\n"
+"Last-Translator: Citybusz <ballogy@freestart.hu>\n"
 "Language-Team: Hungarian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/hu/)\n"
 "Language: hu\n"
@@ -33,27 +34,27 @@ msgstr "visszatérés egy régebbi %s verzióhoz (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr "figyelmeztetés a %s kicsomagolása közben (%s)\n"
+msgstr "figyelmeztetés a(z) %s kibontása közben (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "nem sikerült kicsomagolni: %s (%s)\n"
+msgstr "nem sikerült kibontani: %s (%s)\n"
 
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"eltérő könyvtár-jogosultságok: %s\n"
+"eltérő könyvtárjogosultságok: %s\n"
 "fájlrendszer: %o  csomag: %o\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "kicsomagolás: nem írok felül könyvtárat a %s fájllal\n"
+msgstr "kibontás: nem írok felül könyvtárat a %s fájllal\n"
 
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr "kicsomagolás: %s szimbolikus link nem könyvtárra mutat\n"
+msgstr "kibontás: %s szimbolikus link nem könyvtárra mutat\n"
 
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
@@ -73,7 +74,7 @@ msgstr "%s %s néven lett telepítve\n"
 
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "%s kicsomagolása %s.pacnew néven\n"
+msgstr "%s kibontása %s.pacnew néven\n"
 
 #, c-format
 msgid "could not get current working directory\n"
@@ -83,9 +84,9 @@ msgstr "a jelenlegi munkakönyvtár nem kapható meg\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "nem sikerült a könyvtárváltás ide: %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "a jelenlegi munkakönyvtár nem kapható meg\n"
+msgstr "nem sikerült visszalépni a munkakönyvárba (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -97,11 +98,11 @@ msgstr "hiba történt a(z) %s telepítése közben\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "nem sikerült a(z) %s-%s adatbázisbejegyzés frissítése\n"
+msgstr "nem sikerült a(z) %s-%s adatbázis-bejegyzés frissítése\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n"
+msgstr "nem sikerült a(z) '%s' bejegyzés hozzáadása a gyorsítótárhoz\n"
 
 #, c-format
 msgid "removing invalid database: %s\n"
@@ -109,7 +110,7 @@ msgstr "hibás adatbázis eltávolítása: %s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "hibás név a '%s' adatbázis-bejegyzés számára\n"
+msgstr "hibás név a(z) '%s' adatbázis-bejegyzés számára\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
@@ -161,11 +162,13 @@ msgstr "hibás fájl eltávolítása: %s\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr "nem sikerült a zároló fájl (%s) eltávolítása\n"
+msgstr "nem sikerült a zárolófájl (%s) eltávolítása\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
+"nem sikerült értelmezni a(z) '%s' csomagleíró fájlját a(z) '%s' "
+"adatbázisból\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -215,19 +218,18 @@ msgstr "nem sikerült meghatározni a %s gyökérkönyvtár csatolási pontját\
 msgid "Partition %s is mounted read only\n"
 msgstr "A %s partíció csak olvashatóként van csatolva\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
 msgstr ""
-"Nincs elég szabad hely a %s partíción: %ld blokk szükséges, %ld blokk "
-"szabad\n"
+"A %s partíció túlságosan tele van: %jd blokk szükséges, %jd blokk szabad\n"
 
 #, c-format
 msgid "disk"
-msgstr "diszk"
+msgstr "lemez"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "nem sikerült létrehozni ideiglenes fájlt a letöltéshez\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -251,7 +253,7 @@ msgstr "elfogyott a memória!"
 
 #, c-format
 msgid "unexpected system error"
-msgstr "nemvárt hiba"
+msgstr "nem várt hiba"
 
 #, c-format
 msgid "insufficient privileges"
@@ -275,11 +277,11 @@ msgstr "nincs elég szabad lemezterület"
 
 #, c-format
 msgid "library not initialized"
-msgstr "a könyvtár nem inicializált"
+msgstr "a függvénytár nem inicializált"
 
 #, c-format
 msgid "library already initialized"
-msgstr "a könyvtár már inicializált"
+msgstr "a függvénytár már inicializált"
 
 #, c-format
 msgid "unable to lock database"
@@ -307,11 +309,11 @@ msgstr "nem található az adatbázis"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "érvénytelen vagy sérült adatbázis"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "hibás vagy sérült adatbázis (PGP aláírás)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -319,7 +321,7 @@ msgstr "hibás verziójú az adatbázis"
 
 #, c-format
 msgid "could not update database"
-msgstr "nem sikerült megnyitni az adatbázist"
+msgstr "nem sikerült frissíteni az adatbázist"
 
 #, c-format
 msgid "could not remove database entry"
@@ -331,7 +333,7 @@ msgstr "hibás szerver-URL"
 
 #, c-format
 msgid "no servers configured for repository"
-msgstr "a repóhoz nincs szerver beállítva"
+msgstr "a tárolóhoz nincs szerver beállítva"
 
 #, c-format
 msgid "transaction already initialized"
@@ -359,7 +361,7 @@ msgstr "a művelet nem egyeztethető össze a jelenlegi tranzakciótípussal"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr "tranzakció végrehajtási kísérlet nem zárolt adatbázis mellett"
+msgstr "tranzakció-végrehajtási kísérlet nem zárolt adatbázis mellett"
 
 #, c-format
 msgid "could not find or read package"
@@ -367,19 +369,19 @@ msgstr "nem található vagy nem olvasható a csomag"
 
 #, c-format
 msgid "operation cancelled due to ignorepkg"
-msgstr "művelet megszakítva ignorepkg miatt"
+msgstr "a művelet megszakítva ignorepkg miatt"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "hibás vagy sérült csomag"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "hibás vagy sérült csomag (ellenőrzőösszeg)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "hibás vagy sérült csomag (PGP aláírás)"
 
 #, c-format
 msgid "cannot open package file"
@@ -387,7 +389,7 @@ msgstr "nem sikerült megnyitni a csomagfájlt"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "nem sikerült eltávolítani a csomag összes fájlját"
+msgstr "nem távolítható el a csomag összes fájlja"
 
 #, c-format
 msgid "package filename is not valid"
@@ -395,19 +397,19 @@ msgstr "érvénytelen csomagnév"
 
 #, c-format
 msgid "package architecture is not valid"
-msgstr "érvénytelen csomag-architektúra"
+msgstr "érvénytelen csomagarchitektúra"
 
 #, c-format
 msgid "could not find repository for target"
-msgstr "nem található repó a célcsomaghoz"
+msgstr "nem található tároló a célcsomaghoz"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "hiányzó PGP aláírás"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "érvénytelen PGP aláírás"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -415,7 +417,7 @@ msgstr "hibás vagy sérült delta"
 
 #, c-format
 msgid "delta patch failed"
-msgstr "delta patchelés sikertelen"
+msgstr "delta foltozás sikertelen"
 
 #, c-format
 msgid "could not satisfy dependencies"
@@ -443,11 +445,11 @@ msgstr "libarchive hiba"
 
 #, c-format
 msgid "download library error"
-msgstr "letöltőkönyvtár hiba"
+msgstr "letöltőfüggvénytár hiba"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "gpgme hiba"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -455,19 +457,20 @@ msgstr "hiba a külső letöltő meghívásakor"
 
 #, c-format
 msgid "unexpected error"
-msgstr "nemvárt hiba"
+msgstr "nem várt hiba"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "nem található vagy nem olvasható a csomag"
+msgstr ""
+"nem sikerült teljesen betölteni az információs fájlt a(z) %s-%s csomaghoz\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n"
+msgstr "nem található %s az adatbázisban -- kihagyás\n"
 
 #, c-format
 msgid "removing %s from target list\n"
-msgstr "%s eltávolítása a cél listából\n"
+msgstr "%s eltávolítása a céllistából\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
@@ -475,7 +478,7 @@ msgstr "nem sikerült eltávolítani a '%s' fájlt : %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "%s nem távolítható el (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -491,19 +494,19 @@ msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n"
 
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr "%s: csomag downgrade kihagyása (%s => %s)\n"
+msgstr "%s: csomag visszafejlesztésének kihagyása (%s => %s)\n"
 
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
-msgstr "%s: visszatérés a %s verióról a régebbi %s verzióhoz\n"
+msgstr "%s: visszatérés a(z) %s verzióról a régebbi %s verzióhoz\n"
 
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
+msgstr "%s: a helyi (%s) újabb, mint a(z) %s (%s)\n"
 
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
-msgstr "csomag-lecserélés kihagyása (%s-%s => %s-%s)\n"
+msgstr "csomaglecserélés kihagyása (%s-%s => %s-%s)\n"
 
 #, c-format
 msgid "cannot replace %s by %s\n"
@@ -537,21 +540,25 @@ msgstr "nem sikerült létrehozni az ideiglenes könyvtárat\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nem sikerült az ideiglenes fájlt ide másolni: %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "%s nem távolítható el\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr "nem sikerült a pipe létrehozása (%s)\n"
+msgstr "nem sikerült az adatcsatorna létrehozása (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "nem sikerült forkolni egy új folyamatot (%s)\n"
+msgstr "nem sikerült indítani egy új folyamatot (%s)\n"
 
 #, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "nem sikerült a chroot (%s)\n"
+msgstr "nem sikerült gyökérkönyvtárat váltani (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
@@ -559,20 +566,22 @@ msgstr "sikertelen execv hívás (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "waitpid hívás sikertelen (%s)\n"
+msgstr "sikertelen waitpid hívás (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr "nem sikerült a pipe megnyitása (%s)\n"
+msgstr "nem sikerült az adatcsatorna megnyitása (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"
-msgstr "a parancs nem futott le sikeresen\n"
+msgstr "a parancs nem futott le helyesen\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "nem létezik a(z) %s gyorsítótár. létrehozás...\n"
+msgstr "nem létezik a(z) %s gyorsítótár, létrehozás...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "nem sikerült létrehozni a csomaggyorsítótárat, a /tmp használata\n"
+msgstr ""
+"nem található vagy nem hozható létre a csomaggyorsítótár, a %s könyvtárat "
+"használom helyette\n"

lib/libalpm/po/it.po

@@ -9,9 +9,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-13 09:41+0000\n"
-"Last-Translator: bash <andrea@archlinux.org>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 15:43+0000\n"
+"Last-Translator: giovanni <giovanni@archlinux.org>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/it/)\n"
 "Language: it\n"
@@ -86,9 +86,9 @@ msgstr "impossibile determinare la directory corrente\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "impossibile spostarsi nella directory %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "impossibile determinare la directory corrente\n"
+msgstr "impossibile ripristinare la directory di lavoro (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -222,11 +222,10 @@ msgstr "impossibile determinare il mount point di root %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "La partizione %s è montata in sola lettura\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
 msgstr ""
-"La partizione %s è troppo piena: sono necessari %ld blocchi e ci sono solo "
-"%ld blocchi liberi\n"
+"La partizione %s è troppo piena: %jd blocchi necessari, %jd blocchi liberi\n"
 
 #, c-format
 msgid "disk"
@@ -464,9 +463,9 @@ msgstr "si è verificato un errore lanciando il downloader esterno"
 msgid "unexpected error"
 msgstr "errore inaspettato"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "impossibile trovare o leggere il pacchetto"
+msgstr "impossibile caricare tutti i metadata del pacchetto %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -546,6 +545,10 @@ msgstr "impossibile creare la directory temporanea\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "impossibile copiare il file temporaneo in %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "impossibile rimuovere %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "impossibile rimuovere la directory temporanea %s\n"
@@ -582,7 +585,8 @@ msgstr "l'esecuzione del comando non è riuscita correttamente\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "la cache di %s non esiste, creazione in corso...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr ""
-"impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n"
+"impossibile trovare o creare la cache del pacchetto, al suo posto sto usando "
+"%s\n"

lib/libalpm/po/kk.po

@@ -9,8 +9,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: 2011-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 03:39+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/kk/)\n"
@@ -84,9 +84,9 @@ msgstr "ағымдағы жұмыс бумасын анықтау мүмкін
 msgid "could not change directory to %s (%s)\n"
 msgstr "%s бумасына ауысу мүмкін емес (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "ағымдағы жұмыс бумасын анықтау мүмкін емес\n"
+msgstr ""
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -216,9 +216,9 @@ msgstr ""
 msgid "Partition %s is mounted read only\n"
 msgstr "%s бөлімі тек оқу үшін тіркелген\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "%s бөлімі тым толық: %ld блок керек, %ld блок бос\n"
+msgstr ""
 
 #, c-format
 msgid "disk"
@@ -456,9 +456,9 @@ msgstr "сыртқы жүктемелер менеджерін шақыру қа
 msgid "unexpected error"
 msgstr "күтпеген қате кетті"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "дестені табу не оқу мүмкін емес"
+msgstr ""
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -537,6 +537,10 @@ msgstr "уақытша буманы құру мүмкін емес\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "уақытша файлды %s ішіне көшіру мүмкін емес (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr ""
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "%s уақытша бумасын өшіру мүмкін емес\n"
@@ -573,6 +577,6 @@ msgstr "команда дұрыс орындалмады\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "%s кэші жоқ болып тұр, құрылады...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "дестелер кэшін құру мүмкін емес, оның орнына /tmp қолданылады\n"
+msgstr ""

lib/libalpm/po/libalpm.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 4.0.0rc1\n"
+"Project-Id-Version: pacman 4.0.1\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-09-22 11:32-0500\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\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"
@@ -531,6 +531,10 @@ msgstr ""
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr ""
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr ""
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr ""

lib/libalpm/po/lt.po

@@ -4,13 +4,15 @@
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
+# toofishes <dpmcgee@gmail.com>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-22 15:52+0000\n"
-"Last-Translator: gymka_ltu <gymka@mail.ru>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2012-02-05 07:37+0000\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/lt/)\n"
 "Language: lt\n"
@@ -84,9 +86,9 @@ msgstr "nepavyko nustatyt dabartinio aplanko\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "nepavyko pakeist aplanko į %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "nepavyko nustatyt dabartinio aplanko\n"
+msgstr "nepavyko atstatyt darbinio aplanko (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -102,7 +104,7 @@ msgstr "nepavyko atnaujint duomenų bazės įrašo %s-%s\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "nepavyko pridėti '%s' podėlin\n"
+msgstr "į podėlį pridėti „%s“ nepavyko\n"
 
 #, c-format
 msgid "removing invalid database: %s\n"
@@ -110,15 +112,15 @@ msgstr "šalinama neteisinga duomenų bazė: %s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "neteisingas duomenų bazės įrašo pavadinimas '%s'\n"
+msgstr "neteisingas duomenų bazės įrašo pavadinimas „%s“\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "toks pavadinimas jau yra '%s'\n"
+msgstr "toks pavadinimas jau yra „%s“\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "duomenų bazės įrašas sugadintas '%s'\n"
+msgstr "duomenų bazės įrašas sugadintas „%s“\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -168,7 +170,7 @@ msgstr "nepavyko pašalinti užrakinto failo %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr "nepavyko perskaityt paketo aprašymo failo %s iš duomenų bazės '%s'\n"
+msgstr "nepavyko perskaityt paketo aprašymo failo %s iš duomenų bazės „%s“\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -176,7 +178,7 @@ msgstr "nenurodytas duomenų bazės kelias\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
-msgstr "rastas priklausomybių ciklas:\n"
+msgstr "aptiktas priklausomybių ciklas:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
@@ -188,11 +190,11 @@ msgstr "%s bus įdiegta prieš jo priklausomybę %s\n"
 
 #, c-format
 msgid "ignoring package %s-%s\n"
-msgstr "ignoruojamas paketas %s-%s\n"
+msgstr "paketas nepaisomas %s-%s\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "negaliu išspręsti \"%s\", \"%s\" priklausomybė\n"
+msgstr "nepavyko išspręsti „%s“, „%s“ priklausomybė\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
@@ -218,9 +220,9 @@ msgstr "nepavyko nustatyt šakninio prijungimo taško %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Skirsnis %s prijungtas tik skaitymui\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "Skirsnis %s perpildytas: reikia %ld blokų, laisvi %ld\n"
+msgstr "Skirsnis %s perpildytas: reikia %jd blokų, laisvi %jd\n"
 
 #, c-format
 msgid "disk"
@@ -232,11 +234,11 @@ msgstr "nepavyko sukurti laikino failo parsiuntimui\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "neteisingas url '%s'\n"
+msgstr "neteisingas url „%s“\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "nepavyko gauti failo '%s' iš %s : %s\n"
+msgstr "nepavyko gauti failo „%s“ iš %s : %s\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
@@ -360,7 +362,7 @@ msgstr "operacija nesuderinama su perdavimo tipu"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr "bandoma perduoti kol duomenų bazė neužrakinta"
+msgstr "bandoma perduoti kai duomenų bazė neužrakinta"
 
 #, c-format
 msgid "could not find or read package"
@@ -436,7 +438,7 @@ msgstr "nepavyko gauti kai kurių failų"
 
 #, c-format
 msgid "invalid regular expression"
-msgstr "neteisinga regular expression"
+msgstr "netinkamos reguliariosios išraiškos"
 
 #, c-format
 msgid "libarchive error"
@@ -458,9 +460,9 @@ msgstr "klaida iškviečiant išorinį parsiuntėją"
 msgid "unexpected error"
 msgstr "netikėta klaida"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "nepavyko rasti ar perskaityti paketo"
+msgstr "paketui %s-%s nepavyko įkrauti visų meta duomenų\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -472,7 +474,7 @@ msgstr "šalinamas %s iš objektų sąrašo\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "nepavyko pašalinti failo '%s': %s\n"
+msgstr "nepavyko pašalinti failo „%s“: %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
@@ -484,7 +486,7 @@ msgstr "nepavyko pašalinti duomenų bazės įrašo %s-%s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "iš podėlio nepavyko pašalinti įrašo '%s'\n"
+msgstr "iš podėlio nepavyko pašalinti įrašo „%s“\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
@@ -516,7 +518,7 @@ msgstr "aptikti neišsprendžiami paketų nesuderinamumai\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "iš objektų sąrašo šalinamas '%s' dėl konfliktų su '%s'\n"
+msgstr "iš objektų sąrašo šalinamas „%s“ dėl konfliktų su „%s“\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -524,11 +526,11 @@ msgstr "nepavyko gauti kai kurių failų iš %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "nepavyko įvykdyt šalinimo perdavimo\n"
+msgstr "nepavyko įvykdyti šalinimo perdavimo\n"
 
 #, c-format
 msgid "could not commit transaction\n"
-msgstr "nepavyko įvykdyt perdavimo\n"
+msgstr "nepavyko įvykdyti perdavimo\n"
 
 #, c-format
 msgid "could not create temp directory\n"
@@ -536,7 +538,11 @@ msgstr "nepavyko sukurti lakino aplanko\n"
 
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "negaliu nukopijuoti laikiną failą į %s (%s)\n"
+msgstr "negaliu nukopijuoti laikino failo į %s (%s)\n"
+
+#, c-format
+msgid "could not remove %s\n"
+msgstr "nepavyko pašalinti %s\n"
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
@@ -574,6 +580,6 @@ msgstr "nepavyko teisingai įvykdyti komandos\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "%s podėlis neegzistuoja, kuriamas...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "nepavyko sukurti paketo podėlio. vietoj jo naudojama /tmp\n"
+msgstr "nepavyko rasti ar sukurti podėlio paketui, vietoj jo naudojama %s\n"

lib/libalpm/po/nb.po

@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Alexander Rødseth <rodseth@gmail.com>, 2011.
 # Jon Gjengset <jon@thesquareplanet.com>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-14 16:36+0000\n"
+"Last-Translator: xyproto <rodseth@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/nb/)\n"
 "Language: nb\n"
@@ -33,7 +34,7 @@ msgstr "nedgraderer pakke %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr "feilmelding gitt under utpakkingen av %s (%s)\n"
+msgstr "fikk advarsel under utpakkingen av %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -49,15 +50,15 @@ msgstr ""
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "utpakking: skriver ikke over mappe med fil %s\n"
+msgstr "utpakking: overskriver ikke mappe med fil %s\n"
 
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr "utpakking: symlink %s viser ikke til mappe\n"
+msgstr "utpakking: symbolsk lenke %s peker ikke til mappe\n"
 
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
-msgstr "kunne ikke døpe om %s til %s (%s)\n"
+msgstr "kunne ikke omdøpe %s til %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
@@ -77,15 +78,15 @@ msgstr "pakker ut %s som %s.pacnew\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr "kunne ikke motta nåværende mappe\n"
+msgstr "kunne ikke finne gjeldende mappe\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "kunne ikke endre mappe til %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "kunne ikke motta nåværende mappe\n"
+msgstr "kunne ikke gjenopprette gjeldende mappe (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -97,11 +98,11 @@ msgstr "problem oppstod under installasjon av %s\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "kunne ikke oppdatere databaseelement %s-%s\n"
+msgstr "kunne ikke oppdatere databaseoppføring %s-%s\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "kunne ikke legge til '%s' i cache\n"
+msgstr "kunne ikke legge til oppføringen '%s' i mellomlageret\n"
 
 #, c-format
 msgid "removing invalid database: %s\n"
@@ -109,15 +110,15 @@ msgstr "fjerner ugyldig database: %s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "ugyldig navn for databaseelement '%s'\n"
+msgstr "ugyldig navn for databaseoppføring '%s'\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "gjentatt databaseelement '%s'\n"
+msgstr "duplikat databaseoppføring '%s'\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "korrupt databaseelement '%s'\n"
+msgstr "korrupt databaseoppføring '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -125,11 +126,11 @@ msgstr "kunne ikke åpne fil %s: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr "%s database er ukonsistent: navn samsvarer ikke med pakke %s\n"
+msgstr "%s databasen er ikke konsistent: navn samsvarer ikke med pakke %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr "%s database er ukonsistent: versjon samsvarer ikke med pakke %s\n"
+msgstr "%s databasen er ikke konsistent: versjon samsvarer ikke med pakke %s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -137,7 +138,7 @@ msgstr "kunne ikke opprette mappe %s: %s\n"
 
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "kunne ikke analysere pakkebeskrivelse i fil %s\n"
+msgstr "kunne ikke tolke filen med pakkebeskrivelse i %s\n"
 
 #, c-format
 msgid "missing package name in %s\n"
@@ -149,7 +150,7 @@ msgstr "mangler pakkeversjon i %s\n"
 
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "feil oppstod under lesing av pakke: %s: %s\n"
+msgstr "feil oppstod ved lesing av pakke: %s: %s\n"
 
 #, c-format
 msgid "missing package metadata in %s\n"
@@ -161,15 +162,15 @@ msgstr "fjerner ugyldig fil: %s\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr "kunne ikke fjerne låsingsfil %s\n"
+msgstr "kunne ikke fjerne låsefil %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "kunne ikke tolke filen med pakkebeskrivelse '%s' fra databasen '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr "databaseplassering er udefinert\n"
+msgstr "stien til databasen er udefinert\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
@@ -189,15 +190,15 @@ msgstr "ignorerer pakke %s-%s\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "kan ikke avgjøre \"%s\", en avhengighet av \"%s\"\n"
+msgstr "kan ikke finne \"%s\", en avhengighet av \"%s\"\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr "kunne ikke hente filsysteminformasjon\n"
+msgstr "kunne ikke finne filsysteminformasjon\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr "kunne ikke hente filsysteminformasjon for %s: %s\n"
+msgstr "kunne ikke finne filsysteminformasjon for %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
@@ -209,16 +210,15 @@ msgstr "kunne ikke avgjøre monteringspunkt for filsystem\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr "kunne ikke avgjøre rotmonteringspunkt %s\n"
+msgstr "kunne ikke avgjøre monteringspunkt for root %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr "Partisjonen %s er kun tilgjengelig for skriving\n"
+msgstr "Partisjonen %s kan bare leses fra\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Partisjonen %s er for full: %ld blokker trengs, %ld blokker tilgjengelig\n"
+msgstr "Partisjonen %s er for full: %jd blokker trengs, %jd blokker er ledig\n"
 
 #, c-format
 msgid "disk"
@@ -226,7 +226,7 @@ msgstr "disk"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "kunne ikke opprette midlertidig fil i sammengeng med nedlasting\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -234,19 +234,19 @@ msgstr "url '%s' er ugyldig\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "mottakelse av fil '%s' fra %s : %s feilet\n"
+msgstr "kunne ikke hente filen '%s' fra %s : %s\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr "%s ser ut til å være trunkert: %jd/%jd bytes\n"
+msgstr "%s ser ut til å være avkortet: %jd/%jd bytes\n"
 
 #, c-format
 msgid "failed to download %s\n"
-msgstr "nedlasting av %s feilet\n"
+msgstr "kunne ikke laste ned %s\n"
 
 #, c-format
 msgid "out of memory!"
-msgstr "ikke mer minne!"
+msgstr "tom for minne!"
 
 #, c-format
 msgid "unexpected system error"
@@ -254,7 +254,7 @@ msgstr "uventet systemfeil"
 
 #, c-format
 msgid "insufficient privileges"
-msgstr "ikke nok rettigheter"
+msgstr "utilstrekkelige tilgangsrettigheter"
 
 #, c-format
 msgid "could not find or read file"
@@ -274,43 +274,43 @@ msgstr "ikke nok ledig diskplass"
 
 #, c-format
 msgid "library not initialized"
-msgstr "bibliotek ikke initialisert"
+msgstr "bibliotek har ikke blitt initialisert"
 
 #, c-format
 msgid "library already initialized"
-msgstr "bibliotek allerede initialisert"
+msgstr "bibliotek har allerede blitt initialisert"
 
 #, c-format
 msgid "unable to lock database"
-msgstr "kunne ikke låse database"
+msgstr "kunne ikke låse databasen"
 
 #, c-format
 msgid "could not open database"
-msgstr "kunne ikke åpne database"
+msgstr "kunne ikke åpne databasen"
 
 #, c-format
 msgid "could not create database"
-msgstr "kunne ikke opprette database"
+msgstr "kunne ikke opprette databasen"
 
 #, c-format
 msgid "database not initialized"
-msgstr "database ikke initialisert"
+msgstr "databasen har ikke blitt initialisert"
 
 #, c-format
 msgid "database already registered"
-msgstr "database allerede registret"
+msgstr "databasen har allerede blitt registrert"
 
 #, c-format
 msgid "could not find database"
-msgstr "kunne ikke finne database"
+msgstr "kunne ikke finne databasen"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "ugyldig eller korrupt database"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "ugyldig eller korrupt database (PGP signatur)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -318,47 +318,47 @@ msgstr "databasen har feil versjonsnummer"
 
 #, c-format
 msgid "could not update database"
-msgstr "kunne ikke oppdatere database"
+msgstr "kunne ikke oppdatere databasen"
 
 #, c-format
 msgid "could not remove database entry"
-msgstr "kunne ikke fjerne databaseelement"
+msgstr "kunne ikke fjerne databaseoppføring"
 
 #, c-format
 msgid "invalid url for server"
-msgstr "ugyldig url for server"
+msgstr "ugyldig url for tjener"
 
 #, c-format
 msgid "no servers configured for repository"
-msgstr "ingen servere konfigurert for pakkebrønn"
+msgstr "ingen tjenere har blitt satt opp for pakkebrønn"
 
 #, c-format
 msgid "transaction already initialized"
-msgstr "transaksjon allerede initialisert"
+msgstr "transaksjonen har allerede blitt initialisert"
 
 #, c-format
 msgid "transaction not initialized"
-msgstr "transaksjon ikke initialisert"
+msgstr "transaksjonen har ikke blitt initialisert"
 
 #, c-format
 msgid "duplicate target"
-msgstr "klonet mål"
+msgstr "duplikate mål"
 
 #, c-format
 msgid "transaction not prepared"
-msgstr "transaksjon ikke forberedt"
+msgstr "transaksjonen er ikke forberedt"
 
 #, c-format
 msgid "transaction aborted"
-msgstr "transaksjon avsluttet"
+msgstr "transaksjon avbrutt"
 
 #, c-format
 msgid "operation not compatible with the transaction type"
-msgstr "operasjon ikke kompatibel med transaksjonstypen"
+msgstr "handlingen er ikke kompatibel med transaksjonstypen"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr "førsøk på utføring av transaksjon mens databasen ikke er lukket"
+msgstr "forsøkte å utføre transaksjon med ulåst database"
 
 #, c-format
 msgid "could not find or read package"
@@ -366,35 +366,35 @@ msgstr "kunne ikke finne eller lese pakke"
 
 #, c-format
 msgid "operation cancelled due to ignorepkg"
-msgstr "operasjon avsluttet grunnet ignorepkg"
+msgstr "handling avbrutt pga ignorepkg"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "ugyldig eller korrupt pakke"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "ugyldig eller korrupt pakke (sjekksum)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "ugyldig eller korrupt pakke (PGP signatur)"
 
 #, c-format
 msgid "cannot open package file"
-msgstr "kan ikke åpne pakkefil"
+msgstr "kunne ikke åpne pakkefil"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "kan ikke fjerne alle filer for pakke"
+msgstr "kunne ikke fjerne alle filer for pakke"
 
 #, c-format
 msgid "package filename is not valid"
-msgstr "pakkens filnavn er ikke gyldig"
+msgstr "pakkefilnavn er ugyldig"
 
 #, c-format
 msgid "package architecture is not valid"
-msgstr "pakkearkitekturen er ikke gyldig"
+msgstr "pakkearkitektur er ugyldig"
 
 #, c-format
 msgid "could not find repository for target"
@@ -402,19 +402,19 @@ msgstr "fant ikke pakkebrønn for mål"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "mangler PGP signatur"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "ugyldig PGP signatur"
 
 #, c-format
 msgid "invalid or corrupted delta"
-msgstr "invalid"
+msgstr "ugyldig eller korrupt filforskjell"
 
 #, c-format
 msgid "delta patch failed"
-msgstr "delta-patch feilet"
+msgstr "fiks av filforskjell feilet"
 
 #, c-format
 msgid "could not satisfy dependencies"
@@ -422,19 +422,19 @@ msgstr "kunne ikke tilfredstille avhengigheter"
 
 #, c-format
 msgid "conflicting dependencies"
-msgstr "modstridige avhengigheter"
+msgstr "motstridende avhengigheter"
 
 #, c-format
 msgid "conflicting files"
-msgstr "modstridige filer"
+msgstr "motstridende filer"
 
 #, c-format
 msgid "failed to retrieve some files"
-msgstr "mottagelsen av noen filer feilet"
+msgstr "noen filer kunne ikke hentes"
 
 #, c-format
 msgid "invalid regular expression"
-msgstr "ugyldig uttrykk"
+msgstr "ugyldig regulært uttrykk"
 
 #, c-format
 msgid "libarchive error"
@@ -446,19 +446,19 @@ msgstr "feil i nedlastingsbibliotek"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "gpgme feil"
 
 #, c-format
 msgid "error invoking external downloader"
-msgstr "påkalling av ekstern nedlaster feilet"
+msgstr "feil ved bruk av eksternt nedlastningsprogram"
 
 #, c-format
 msgid "unexpected error"
-msgstr "uforventet feil"
+msgstr "uventet feil"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "kunne ikke finne eller lese pakke"
+msgstr "kunne ikke laste all metadata for pakken %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -470,19 +470,19 @@ msgstr "fjerner %s fra målliste\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "kan ikke fjerne fil '%s': %s\n"
+msgstr "kunne ikke fjerne fil '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "kunne ikke fjerne %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "kunne ikke fjerne databaseelement %s-%s\n"
+msgstr "kunne ikke fjerne databaseoppføring %s-%s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "kunne ikke fjerne element '%s' fra cache\n"
+msgstr "kunne ikke fjerne oppføring '%s' fra mellomlageret\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
@@ -494,7 +494,7 @@ msgstr "%s: ignorerer pakkenedgradering (%s => %s)\n"
 
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
-msgstr "%s: nedgradering fra versjon %s til versjon %s\n"
+msgstr "%s: nedgraderer fra versjon %s til versjon %s\n"
 
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
@@ -502,11 +502,11 @@ msgstr "%s: lokal (%s) er nyere enn %s (%s)\n"
 
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
-msgstr "ignorerer utbytting av pakke (%s-%s => %s-%s)\n"
+msgstr "ignorerer erstatning for pakke (%s-%s => %s-%s)\n"
 
 #, c-format
 msgid "cannot replace %s by %s\n"
-msgstr "kan ikke bytte ut %s med %s\n"
+msgstr "kunne ikke erstatte %s med %s\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
@@ -514,39 +514,43 @@ msgstr "uløselige pakkekonflikter oppdaget\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "fjerner '%s' fra mållisten fordi den strider mot '%s'\n"
+msgstr "fjerner '%s' fra mållisten fordi den er i konflikt med '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "feilet å motta noen filer fra %s\n"
+msgstr "kunne ikke motta alle filer fra %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "kunne ikke begå fjerningstransaksjon\n"
+msgstr "kunne ikke utføre transaksjon (fjerning)\n"
 
 #, c-format
 msgid "could not commit transaction\n"
-msgstr "kunne ikke begå transaksjon\n"
+msgstr "kunne ikke utføre transaksjon\n"
 
 #, c-format
 msgid "could not create temp directory\n"
-msgstr "kunne ikke opprette midlertidig mappe\n"
+msgstr "kunne ikke lage midlertidig mappe\n"
 
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "kunne ikke kopiere midertidig fil til %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "kunne ikke fjerne %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "kunne ikke fjerne midlertidig mappe %s\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr "kunne ikke opprette filter (%s)\n"
+msgstr "kunne ikke opprette dataledning (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "kunne ikke skille ut en ny prosess (%s)\n"
+msgstr "kunne ikke føde en ny prosess (%s)\n"
 
 #, c-format
 msgid "could not change the root directory (%s)\n"
@@ -558,20 +562,22 @@ msgstr "kall til execv feilet (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "kall på waitpid feilet (%s)\n"
+msgstr "kall til waitpid feilet (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr "kunne ikke opprette filter (%s)\n"
+msgstr "kunne ikke åpne dataledning (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"
-msgstr "kommando feilet å kjøre korrekt\n"
+msgstr "kommandoen feilet\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "ingen %s cache eksisterer, lager en ...\n"
+msgstr "mellomlageret %s eksisterer ikke, oppretter...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "kunne ikke danne pakke-cache, bruker /tmp istedenfor\n"
+msgstr ""
+"kunne ikke finne eller opprette mellomlager for pakker, bruker %s "
+"istedenfor\n"

lib/libalpm/po/pl.po

@@ -8,9 +8,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-08 09:10+0000\n"
+"Last-Translator: Barthalion <barthalion@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/pl/)\n"
 "Language: pl\n"
@@ -45,7 +45,7 @@ msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"Różne prawa dla %s\n"
+"Różne uprawnienia dla katalogu dla %s\n"
 "system plików: %o pakiet: %o\n"
 
 #, c-format
@@ -84,9 +84,9 @@ msgstr "nie można znaleźć obecnego katalogu\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "nie udało się zmienić katalogu na %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "nie można znaleźć obecnego katalogu\n"
+msgstr "nie można powrócić do katalogu roboczego (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -138,7 +138,7 @@ msgstr "nie można stworzyć katalogu %s: %s\n"
 
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "nie udało się przeczytać opisu pliku w %s\n"
+msgstr "nie udało się odczytać pliku opisowego w %s\n"
 
 #, c-format
 msgid "missing package name in %s\n"
@@ -166,7 +166,7 @@ msgstr "nie udało się usunąć pliku blokującego %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "nie można odczytać pliku opisowego pakietu '%s' z bazy '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -178,7 +178,7 @@ msgstr "wykryto cykl zależności:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "%s zostanie usunięta po zależniościach %s\n"
+msgstr "%s zostanie usunięta po zależnościach %s\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
@@ -216,10 +216,9 @@ msgstr "nie można określić punktu montowania partycji systemowej %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Partycja %s jest zamontowana tylko do odczytu\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Partycja %s jest zapełniona: %ld potrzebnych bloków, %ld wolnych bloków\n"
+msgstr "Partycja %s jest zbyt pełna: potrzebne jest %jd bloków, %jd wolnych\n"
 
 #, c-format
 msgid "disk"
@@ -227,7 +226,7 @@ msgstr "dysk"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "nie udało się stworzyć tymczasowego pliku pobierania\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -267,7 +266,7 @@ msgstr "nie udało się znaleźć bądź odczytać katalogu"
 
 #, c-format
 msgid "wrong or NULL argument passed"
-msgstr "Dany został błędny bądź ZEROWY argument"
+msgstr "Dany został błędny bądź pusty argument"
 
 #, c-format
 msgid "not enough free disk space"
@@ -307,11 +306,11 @@ msgstr "nie udało się odnaleźć bazy danych"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "Niepoprawna lub uszkodzona baza danych"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "Niepoprawna lub uszkodzona baza danych (podpis PGP)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -371,15 +370,15 @@ msgstr "operacja anulowana przez ignorepkg"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "Niepoprawny lub uszkodzony pakiet"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "Niepoprawny lub uszkodzony pakiet (suma kontrolna)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "Niepoprawny lub uszkodzony pakiet (podpis PGP)"
 
 #, c-format
 msgid "cannot open package file"
@@ -403,11 +402,11 @@ msgstr "nie mogę znaleźć repozytorium dla celu"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "brakujący podpis PGP"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "niepoprawny podpis PGP"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -447,7 +446,7 @@ msgstr "błąd pobierania biblioteki"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "błąd gpgme"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -458,9 +457,9 @@ msgstr ""
 msgid "unexpected error"
 msgstr "niespodziewany błąd"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "nie udało się znaleźć bądź odczytać pakietu"
+msgstr "nie można w pełni załadować metadanych dla pakietu %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -476,7 +475,7 @@ msgstr "nie udało się usunąć pliku '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "nie można usunąć %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -524,11 +523,11 @@ msgstr "nie udało się pobrać niektórych plików z %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "nie udało się wykonać tranzakcji usuwania\n"
+msgstr "nie udało się wykonać transakcji usuwania\n"
 
 #, c-format
 msgid "could not commit transaction\n"
-msgstr "nie udało się wykonać tranzakcji\n"
+msgstr "nie udało się wykonać transakcji\n"
 
 #, c-format
 msgid "could not create temp directory\n"
@@ -538,6 +537,10 @@ msgstr "nie udało się stworzyć katalogu tymczasowego\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "nie można usunąć %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
@@ -574,7 +577,8 @@ msgstr "komenda nie wykonała się poprawnie\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr ""
-"nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+"nie można odnaleźć lub stworzyć pamięci podręcznej pakietu, używam %s w "
+"zamian\n"

lib/libalpm/po/pt.po

@@ -8,9 +8,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-12 13:05+0000\n"
+"Last-Translator: ArchGalileu <omeuviolino@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/pt/)\n"
 "Language: pt\n"
@@ -83,9 +83,9 @@ msgstr "não foi possível obter o diretório de trabalho actual\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "não foi possível mudar o diretório para %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "não foi possível obter o diretório de trabalho actual\n"
+msgstr "não é possível restaurar diretório em trabalho (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -167,6 +167,7 @@ msgstr "não foi possível remover o ficheiro bloqueado %s\n"
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
+"não é possível analisar descrição do pacote '%s' da base de dados '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -218,11 +219,9 @@ msgstr "não é possível determinar o ponto de montagem do \"root\" %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "A partição %s está montada somente para leitura\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"A partição %s está cheia: são necessários %ld blocos, estão livres %ld "
-"blocos\n"
+msgstr "Partição %s sem espaço: Necessário %jd blocos, livre %jd blocos\n"
 
 #, c-format
 msgid "disk"
@@ -230,7 +229,7 @@ msgstr "disco"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "Erro ao criar ficheiro temporário para download\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -310,11 +309,11 @@ msgstr "não foi possível encontrar a base de dados"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "base de dados inválida ou corrompida"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "base de dados inválida ou corrompida (assinatura PGP)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -374,15 +373,15 @@ msgstr "operação cancelada devido a ignorepkg"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "pacote inválido ou corrompido"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "pacote inválido ou corrompido (checksum)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "pacote inválido ou corrompido (assinatura PGP)"
 
 #, c-format
 msgid "cannot open package file"
@@ -406,11 +405,11 @@ msgstr "não foi possível encontrar o repositório para o pacote"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "assinatura PGP em falta"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "assinatura PGP inválida"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -450,7 +449,7 @@ msgstr "erro na biblioteca de descargas"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "erro GPGME"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -460,9 +459,10 @@ msgstr "erro ao invocar o programa de descargas externo"
 msgid "unexpected error"
 msgstr "erro inesperado"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "não foi possível ler ou escrever o pacote"
+msgstr ""
+"não é possível apresentar na totalidade metadados para o pacote %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -478,7 +478,7 @@ msgstr "não foi possível remover o ficheiro '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "Não é possível remover%s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -540,6 +540,10 @@ msgstr "não foi possível criar diretório temporário\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "não foi possível copiar ficheiro temporário para %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "não é possível remover%s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "não foi possível remover o diretório temporário %s\n"
@@ -576,7 +580,8 @@ msgstr "comando não executado corretamente\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "cache %s não existe, a criar...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr ""
-"não foi possível criar cache de pacotes, a usar /tmp como alternativa\n"
+"não é possível encontrar ou criar cache do pacote, em uso %s como "
+"alternativa\n"

lib/libalpm/po/pt_BR.po

@@ -11,8 +11,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: 2011-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-09-06 16:45+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 03:50+0000\n"
 "Last-Translator: rafaelff1 <rafael.f.f1@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/pt_BR/)\n"
@@ -86,9 +86,9 @@ msgstr "não foi possível obter o diretório de trabalho atual\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "não foi possível mudar para o diretório %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "não foi possível obter o diretório de trabalho atual\n"
+msgstr "Falha em recuperar diretório de trabalho (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -171,7 +171,7 @@ msgstr "não foi possível remover o arquivo de trava %s\n"
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
-"não foi possível analisar arquivo de descrição de pacote '%s' do banco de "
+"não foi possível analisar arquivo de descrição de pacote '%s' da base de "
 "dados '%s'\n"
 
 #, c-format
@@ -224,10 +224,10 @@ msgstr "não foi possível determinar o ponto de montagem da raiz %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Partição %s está montada somente para leitura\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
 msgstr ""
-"A partição %s está cheia: %ld bloco(s) necessário(s), %ld bloco(s) livre(s)\n"
+"Partição %s está cheia: %jd blocos necessários, %jd blocos disponíveis\n"
 
 #, c-format
 msgid "disk"
@@ -315,11 +315,11 @@ msgstr "não foi possível encontrar a base de dados"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr "banco de dados inválido ou corrompido"
+msgstr "base de dados inválida ou corrompida"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr "banco de dados inválido ou corrompido (assinatura PGP)"
+msgstr "base de dados inválida ou corrompida (assinatura PGP)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -465,9 +465,9 @@ msgstr "erro ao chamar o programa de download externo"
 msgid "unexpected error"
 msgstr "erro inesperado"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "não foi possível ler ou escrever o pacote"
+msgstr "falha em carregar completamente os metadados para o pacote %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -545,6 +545,10 @@ msgstr "não foi possível criar diretório temporário\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "não foi possível copiar arquivo temporário para %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "não foi possível remover %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "não foi possível remover o diretório temporário %s\n"
@@ -581,6 +585,7 @@ msgstr "comando não executado corretamente\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "cache %s não existe, criando...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "não foi possível criar cache de pacotes, usando /tmp em seu lugar\n"
+msgstr ""
+"falha em encontrar ou criar cache do pacote, usando %s em substituição.\n"

lib/libalpm/po/ro.po

@@ -11,8 +11,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: 2011-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-10 13:54+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 17:25+0000\n"
 "Last-Translator: z0id <mihai@m1x.ro>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/ro/)\n"
@@ -89,9 +89,9 @@ msgstr ""
 "nu s-a putut intra în directorul %s (%s)\n"
 "\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "nu s-a putut determina directorul de lucru curent\n"
+msgstr "nu s-a putut reveni la directorul de lucru curent (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -227,9 +227,9 @@ msgstr "nu s-a putut determina locul de montare al partiției root %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "partiția %s este montată numai citire\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "Partiția %s e plină: %ld blocuri necesare, %ld blocuri disponibile\n"
+msgstr "Partiția %s prea plină: %jd blocuri necesare,%jd blocuri libere\n"
 
 #, c-format
 msgid "disk"
@@ -467,9 +467,9 @@ msgstr "eroare la invocarea descărcătorului extern"
 msgid "unexpected error"
 msgstr "eroare neașteptată"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "pachetul nu poate fi găsit sau citit"
+msgstr "nu s-au putut încărca complet metadatele pentru pachetul %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -547,6 +547,10 @@ msgstr "nu poate fi creat directorul temp\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nu se poate copia tempfile la %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "nu s-a putut elimina %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nu poate fi eliminat tmpdir %s\n"
@@ -583,6 +587,7 @@ msgstr "executarea corectă a comenzii a eșuat\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "nu există cache %s, se crează...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "nu se poate crea cache pachet, se folosește /tmp în schimb\n"
+msgstr ""
+"nu s-a putut găsi sau creea cache pentru pachet; se folosește %s în schimb.\n"

lib/libalpm/po/ru.po

@@ -6,13 +6,14 @@
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Ivan Yurasov <vdk@gmx.us>, 2011.
 # partizan <serg.partizan@gmail.com>, 2011.
+#   <serg.partizan@gmail.com>, 2012.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2012-01-17 16:22+0000\n"
+"Last-Translator: partizan <serg.partizan@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/ru/)\n"
 "Language: ru\n"
@@ -86,9 +87,9 @@ msgstr "не удалось определить текущий рабочий
 msgid "could not change directory to %s (%s)\n"
 msgstr "не удалось изменить каталог на %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "не удалось определить текущий рабочий каталог\n"
+msgstr "не удалось восстановить рабочий каталог (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -170,7 +171,7 @@ msgstr "не удалось удалить блокировочный файл %
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "не удалось разобрать файл описания '%s' из базы '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -220,11 +221,9 @@ msgstr "не удалось определить точку монтирован
 msgid "Partition %s is mounted read only\n"
 msgstr "Раздел %s смонтирован только для чтения\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Раздел %s заполнен полностью: необходимо %ld блоков, доступно %ld блоков\n"
-"\n"
+msgstr "Раздел %s переполнен: %jd блоков требуется, %jd блоков свободно\n"
 
 #, c-format
 msgid "disk"
@@ -232,7 +231,7 @@ msgstr "диск"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "не удалось создать временный файл для загрузки\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -312,11 +311,11 @@ msgstr "не удалось найти базу данных"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "неверная или поврежденная база данных"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "неверная или поврежденная база данных(PGP-подпись)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -376,15 +375,15 @@ msgstr "операция прервана из-за ignorepkg"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "неверный или поврежденный пакет"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "неверный или поврежденный пакет(контрольная сумма)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "неверный или поврежденный пакет(PGP-подпись)"
 
 #, c-format
 msgid "cannot open package file"
@@ -408,11 +407,11 @@ msgstr "не удалось репозиторий для цели"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "не хватает PGP-подписи"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "недействительная PGP-подпись"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -452,7 +451,7 @@ msgstr "ошибка в библиотеке загрузки"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "ошибка gpgme"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -462,9 +461,9 @@ msgstr "ошибка вызова внешнего менеджера загру
 msgid "unexpected error"
 msgstr "непредвиденная ошибка"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "не удалось найти или прочитать пакет"
+msgstr "не удалось загрузить все метаданные для пакета %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -480,7 +479,7 @@ msgstr "не удалось удалить файл '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "не удается удалить %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -542,6 +541,10 @@ msgstr "не удалось создать временный каталог\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "не удалось скопировать временный файл в %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "не удалось удалить %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "не удалось удалить временный каталог %s\n"
@@ -578,6 +581,6 @@ msgstr "не удалось корректно выполнить команду
 msgid "no %s cache exists, creating...\n"
 msgstr "кэш %s не существует, создается...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "не удалось создать кэш пакетов, будет использован /tmp\n"
+msgstr "не удалось найти или создать кеш пакета, используется %s\n"

lib/libalpm/po/sk.po

@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Dušan Lago <dusan.lago@gmail.com>, 2011.
+#   <jose1711@gmail.com>, 2011.
 # jose1711 <jose1711@gmail.com>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-08 19:38+0000\n"
+"Last-Translator: jose1711 <jose1711@gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/sk/)\n"
 "Language: sk\n"
@@ -83,9 +85,9 @@ msgstr "nie je možné zistiť aktuálny pracovný adresár\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "nie je možné prepnúť sa do adresára %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "nie je možné zistiť aktuálny pracovný adresár\n"
+msgstr "nie je možné obnoviť pracovný adresár (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -165,7 +167,7 @@ msgstr "nie je možné odstrániť zamykací súbor %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "nie je možné nájsť súbor s popisom balíčku '%s' z databázy '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -215,10 +217,9 @@ msgstr "nepodarilo sa určiť bod pripojenia pre koreň %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Partícia %s je pripojená iba v režime na čítanie\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Partícia %s je príliš plná: %ld blokov potrebných, %ld blokov voľných\n"
+msgstr "Oddiel %s je plný:  bloky %jd sú potrebné, bloky %jd sú k dispozícií\n"
 
 #, c-format
 msgid "disk"
@@ -226,7 +227,7 @@ msgstr "disk"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "chyba pri vytváraní dočasného súboru pre sťahovanie\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -306,11 +307,11 @@ msgstr "nemožno nájsť databázu"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "neplatná alebo poškodená databáza"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "neplatná alebo poškodená databáza (PGP podpis)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -370,15 +371,15 @@ msgstr "operácia bola zrušená kvôli ignorovanému balíčku"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "neplatný alebo poškodený balíček"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "neplatný alebo poškodený balíček (kontrolný súčet)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "neplatný alebo poškodený balíček (PGP podpis)"
 
 #, c-format
 msgid "cannot open package file"
@@ -402,11 +403,11 @@ msgstr "nie je možné nájsť repozitár cieľa"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "chýba PGP podpis"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "neplatný PGP podpis"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -446,7 +447,7 @@ msgstr "chyba knižnice pre sťahovanie súborov"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "chyba v gpgme"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -456,9 +457,9 @@ msgstr "chyba volania externého programu pre sťahovanie súborov"
 msgid "unexpected error"
 msgstr "neočakávaná chyba"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "nie je možné nájsť alebo prečítať balíček"
+msgstr "nie je možné poriadne načítať metadata pre balíček %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -474,7 +475,7 @@ msgstr "nie je možné odstrániť súbor '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "nie je možné vymazať %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -536,6 +537,10 @@ msgstr "nie je možné vytvoriť dočasný adresár\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nie je možné skopírovať dočasný súbor do %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "%s nie je možné vymazať\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nie je možné odstrániť dočasný adresár %s\n"
@@ -572,6 +577,8 @@ msgstr "príkaz sa nepodarilo spustiť správne\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "neexistuje cache %s, vytváram...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "nie je možné vytvoriť cache balíčkov, použijem /tmp\n"
+msgstr ""
+"nie je možné nájsť alebo vytvoriť cache pre balíček,  miesto toho sa používa "
+"%s\n"

lib/libalpm/po/sr.po

@@ -8,9 +8,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-11 17:15+0000\n"
+"Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/sr/)\n"
 "Language: sr\n"
@@ -84,9 +84,9 @@ msgstr "не могу да одредим радну фасциклу\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "не могу да променим фасциклу у %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "не могу да одредим радну фасциклу\n"
+msgstr "не могу да повратим радну фасциклу (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -166,7 +166,7 @@ msgstr "не могу да уклоним фајл браве %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "не могу да обрадим фајл описа пакета „%s“ из базе „%s“\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -216,10 +216,9 @@ msgstr "не могу да утврдим корену тачку монтира
 msgid "Partition %s is mounted read only\n"
 msgstr "Партиција %s је монтирана само за читање\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Партиција %s је препуна: потребно је %ld блокова, али је %ld слободно\n"
+msgstr "Партиција %s је препуна: потребно је %jd блокова, а слободно је %jd\n"
 
 #, c-format
 msgid "disk"
@@ -227,7 +226,7 @@ msgstr "диск"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "неуспело стварање привременог фајла преузимања\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -307,11 +306,11 @@ msgstr "не могу да нађем базу"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "неисправна или покварена база"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "неисправна или покварена база (ПГП потпис)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -371,15 +370,15 @@ msgstr "радња је отказана због игнорисаног пак
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "неисправан или покварен пакет"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "неисправан или покварен пакет (сума за проверу)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "неисправан или покварен пакет (ПГП потпис)"
 
 #, c-format
 msgid "cannot open package file"
@@ -403,11 +402,11 @@ msgstr "не могу да нађем ризницу циља"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "недостаје ПГП потпис"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "неисправан ПГП потпис "
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -447,7 +446,7 @@ msgstr "грешка у библиотеци преузимања"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "грешка гпгмија"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -457,9 +456,9 @@ msgstr "грешка при покретању спољног програма
 msgid "unexpected error"
 msgstr "неочекивана грешка"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "не могу да нађем или прочитам пакет"
+msgstr "не могу у потпуности да учитам метаподатке пакета %s—%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -475,7 +474,7 @@ msgstr "не могу да уклоним фајл „%s“: %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "не могу да уклоним %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -537,6 +536,10 @@ msgstr "не могу да направим привремену фасцикл
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "не могу да копирам привремени фајл у %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "не могу да уклоним %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "не могу да уклоним привремену фасциклу %s\n"
@@ -573,6 +576,6 @@ msgstr "неуспешно правилно извршавање наредбе\
 msgid "no %s cache exists, creating...\n"
 msgstr "не постоји кеш за %s; правим....\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "не могу да направим кеш пакета; користим /tmp као замену\n"
+msgstr "не могу да нађем или направим кеш пакета, као замену корисим %s\n"

lib/libalpm/po/sr@latin.po

@@ -8,9 +8,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-12 15:08+0000\n"
+"Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/sr@latin/)\n"
 "Language: sr@latin\n"
@@ -84,9 +84,9 @@ msgstr "ne mogu da odredim radnu fasciklu\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "ne mogu da promenim fasciklu u %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "ne mogu da odredim radnu fasciklu\n"
+msgstr "ne mogu da povratim radnu fasciklu (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -166,7 +166,7 @@ msgstr "ne mogu da uklonim fajl brave %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "ne mogu da obradim fajl opisa paketa „%s“ iz baze „%s“\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -216,10 +216,9 @@ msgstr "ne mogu da utvrdim korenu tačku montiranja %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Particija %s je montirana samo za čitanje\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
-"Particija %s je prepuna: potrebno je %ld blokova, ali je %ld slobodno\n"
+msgstr "Particija %s je prepuna: potrebno je %jd blokova, a slobodno je %jd\n"
 
 #, c-format
 msgid "disk"
@@ -227,7 +226,7 @@ msgstr "disk"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "neuspelo stvaranje privremenog fajla preuzimanja\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -307,11 +306,11 @@ msgstr "ne mogu da nađem bazu"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "neispravna ili pokvarena baza"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "neispravna ili pokvarena baza (PGP potpis)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -371,15 +370,15 @@ msgstr "radnja je otkazana zbog ignorisanog paketa"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "neispravan ili pokvaren paket"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "neispravan ili pokvaren paket (suma za proveru)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "neispravan ili pokvaren paket (PGP potpis)"
 
 #, c-format
 msgid "cannot open package file"
@@ -403,11 +402,11 @@ msgstr "ne mogu da nađem riznicu cilja"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "nedostaje PGP potpis"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "neispravan PGP potpis "
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -439,7 +438,7 @@ msgstr "neispravan regularni izraz"
 
 #, c-format
 msgid "libarchive error"
-msgstr "greška libarchivea"
+msgstr "greška libarhajva"
 
 #, c-format
 msgid "download library error"
@@ -447,7 +446,7 @@ msgstr "greška u biblioteci preuzimanja"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "greška gpgmija"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -457,9 +456,9 @@ msgstr "greška pri pokretanju spoljnog programa za preuzimanje"
 msgid "unexpected error"
 msgstr "neočekivana greška"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "ne mogu da nađem ili pročitam paket"
+msgstr "ne mogu u potpunosti da učitam metapodatke paketa %s—%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -475,7 +474,7 @@ msgstr "ne mogu da uklonim fajl „%s“: %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "ne mogu da uklonim %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -537,6 +536,10 @@ msgstr "ne mogu da napravim privremenu fasciklu\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "ne mogu da kopiram privremeni fajl u %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "ne mogu da uklonim %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "ne mogu da uklonim privremenu fasciklu %s\n"
@@ -573,6 +576,6 @@ msgstr "neuspešno pravilno izvršavanje naredbe\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "ne postoji keš za %s; pravim....\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "ne mogu da napravim keš paketa; koristim /tmp kao zamenu\n"
+msgstr "ne mogu da nađem ili napravim keš paketa, kao zamenu korisim %s\n"

lib/libalpm/po/sv.po

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# , 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-11-15 15:42+0000\n"
+"Last-Translator: Gazpachian <f.halldal@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/sv/)\n"
 "Language: sv\n"
@@ -32,7 +33,7 @@ msgstr "nedgraderar paketet %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "varning given vid extrahering av %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -82,9 +83,9 @@ msgstr "kunde inte hitta nuvarande sökväg\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "kunde inte byta katalog till %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "kunde inte hitta nuvarande sökväg\n"
+msgstr "Kunde ej återställa arbetskatalogen (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -156,7 +157,7 @@ msgstr "saknar metadata för paketet i %s\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "Tar bort ogiltig fil: %s\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
@@ -164,7 +165,7 @@ msgstr "kunde inte ta bort låsningsfil %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "Kunde ej finna paketbeskrivningsfilen '%s' från databasen '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -192,31 +193,31 @@ msgstr "kan inte lösa \"%s\", beroende till \"%s\", \n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "Kunde ej hämta filsysteminformation\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "Kunde ej hämta filsysteminformation för %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "Kunde ej bestämma monteringspunkt för fil %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "Kunde ej bestämma filsystemmonteringspunkter\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "Kunde ej bestämma rootmonteringspunkt %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "Partition %s är monterad utan skrivrättigheter\n"
 
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
+msgstr "Partition %s för full: %jd block behövs, %jd block fria\n"
 
 #, c-format
 msgid "disk"
@@ -224,7 +225,7 @@ msgstr "disk"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "Kunde ej skapa temporär fil för nedladdning\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -268,7 +269,7 @@ msgstr "fel eller inga argument angivna"
 
 #, c-format
 msgid "not enough free disk space"
-msgstr ""
+msgstr "ej tillräckligt fritt diskutrymme"
 
 #, c-format
 msgid "library not initialized"
@@ -304,15 +305,15 @@ msgstr "kunde inte hitta databas"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "ogiltig eller korrupt databas"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "ogiltig eller korrupt databas (PGP-signatur)"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr ""
+msgstr "databas är av felaktig version"
 
 #, c-format
 msgid "could not update database"
@@ -368,15 +369,15 @@ msgstr "operationen avbryten på grund av ignorepkg"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "ogiltigt eller korrupt paket"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "ogiltigt eller korrupt paket (checksum)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "ogiltigt eller korrupt paket (PGP-signatur)"
 
 #, c-format
 msgid "cannot open package file"
@@ -400,11 +401,11 @@ msgstr "givet förråd finns inte"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "saknad PGP-signatur"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "ogiltig PGP-signatur"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -444,7 +445,7 @@ msgstr "fel vid nerladdning av bibliotek"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "gpgme-fel"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -454,9 +455,9 @@ msgstr "fel vid anrop av extern nerladdare"
 msgid "unexpected error"
 msgstr "oväntat fel"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "kunde inte hitta eller förbereda paket"
+msgstr "kunde ej ladda metadata för paket %s-%s fullständigt\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -472,7 +473,7 @@ msgstr "kan inte ta bort '%s': %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "kunde ej ta bort %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -534,13 +535,17 @@ msgstr "kunde inte skapa temporär katalog\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "kunde inte kopiera temporär fil till %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "kunde ej ta bort %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "kunde inte ta bort tmpdir %s\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "kunde ej skapa pipe (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -552,7 +557,7 @@ msgstr "kunde inte byta rootkatalogen (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "anrop till execv misslyckades (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -560,7 +565,7 @@ msgstr "anrop till waitpid misslyckades (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "kunde ej öppna pipe (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"
@@ -570,6 +575,6 @@ msgstr "kommando misslyckades att exekveras korrekt\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "ingen %s cache existerar, skapar...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "kunde inte skapa paket-cache, använder /tmp istället\n"
+msgstr "kunde ej hitta eller skapa paketcache, använder %s istället\n"

lib/libalpm/po/tr.po

@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Atilla Öntaş <tarakbumba@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Samed Beyribey <ras0ir@eventualis.org>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-23 09:34+0000\n"
+"Last-Translator: tarakbumba <tarakbumba@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/tr/)\n"
 "Language: tr\n"
@@ -84,9 +85,9 @@ msgstr "üzerinde çalışılan dizin algılanamadı\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "%s dizinine geçilemedi (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "üzerinde çalışılan dizin algılanamadı\n"
+msgstr "çalışılan dizin (%s) geri yüklenemiyor\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -166,7 +167,7 @@ msgstr "kilit dosyası %s silinemedi\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "'%s' paket açıklama dosyası '%s' veritabanından ayrıştırılamıyor\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -216,9 +217,9 @@ msgstr "%s kök bağlama noktası belirlenemedi\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "%s bölümü salt okunur olarak bağlandı\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "%s bölümü dolu: %ld blok gerekiyor, %ld blok boş\n"
+msgstr "%s disk bölümü çok dolu: %jd blok gerekli, %jd blok boş\n"
 
 #, c-format
 msgid "disk"
@@ -226,7 +227,7 @@ msgstr "disk"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "indirilecek geçici dosya oluşturulamıyor\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -306,11 +307,11 @@ msgstr "veritabanı bulunamadı"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "geçersiz veya bozuk veritabanı"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "geçersiz veya bozuk veritabanı (PGP imzası)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -370,15 +371,15 @@ msgstr "ignorepkg nedeniyle işlem iptal edildi"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "geçersiz veya bozuk paket"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "geçersiz veya bozuk paket (doğrulama)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "geçersiz veya bozuk paket (PGP imzası)"
 
 #, c-format
 msgid "cannot open package file"
@@ -402,11 +403,11 @@ msgstr "hedef için depo bulunamadı"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "kayıp PGP imzası"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "geçersiz PGP imzası"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -446,7 +447,7 @@ msgstr "indirme kütüphanesi hatası"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "gpgme hatası"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -456,9 +457,9 @@ msgstr "harici indiriciyi çağırırken hata oluştu"
 msgid "unexpected error"
 msgstr "beklenmedik hata"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "paket bulunamadı veya okunamadı"
+msgstr "%s-%s paketi için meta verisi tam olarak yüklenemiyor\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -474,7 +475,7 @@ msgstr "'%s' dosyası silinemiyor: %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "%s(%s) kaldırılamıyor\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -537,6 +538,10 @@ msgstr "geçici dizin oluşturulamadı\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "geçici dosya %s üzerine kopyalanamadı (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "%s kaldırılamıyor\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "geçici dizin %s kaldırılamadı\n"
@@ -573,6 +578,7 @@ msgstr "komut düzgün çalıştırılamadı\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "%s önbelleği yok, oluşturuluyor...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "paket önbelleği oluşturulamadı, /tmp kullanılacak\n"
+msgstr ""
+"paket önbelleği oluşturulamıyor veya bulunamıyor, yerine %s kullanılıyor\n"

lib/libalpm/po/uk.po

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Yarema aka Knedlyk <yupadmin@gmail.com>, 2011.
 # Данило Коростіль <ted.korostiled@gmail.com>, 2011.
 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-17 21:05+0000\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-10 20:43+0000\n"
 "Last-Translator: Wiseacre <ted.korostiled@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/uk/)\n"
@@ -84,9 +85,9 @@ msgstr "неможливо одержати поточний робочий ка
 msgid "could not change directory to %s (%s)\n"
 msgstr "неможливо змінити каталог на %s (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "неможливо одержати поточний робочий каталог\n"
+msgstr "неможливо відновити робочий каталог (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -216,9 +217,9 @@ msgstr "неможливо визначити корінь точки монту
 msgid "Partition %s is mounted read only\n"
 msgstr "Розділ %s змонтовано лише для читання\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "Розділ %s переповнений: потрібно %ld блоків, %ld блоків вільно\n"
+msgstr "Розділ %s — надто повний; %jd блоків потрібно, %jd блоків вільно\n"
 
 #, c-format
 msgid "disk"
@@ -378,7 +379,7 @@ msgstr "неправильний або пошкоджений пакунок (
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr "неправильний або пошкоджений пакунок ("
+msgstr "неправильний або пошкоджений пакунок (підпис PGP)"
 
 #, c-format
 msgid "cannot open package file"
@@ -456,9 +457,9 @@ msgstr "помилка виклику зовнішнього звантажув
 msgid "unexpected error"
 msgstr "неочікувана помилка"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "неможливо знайти чи прочитати пакунок"
+msgstr "неможливо повністю завантажити метадані для пакунка %s-%s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -536,6 +537,10 @@ msgstr "неможливо створити тимчасовий каталог\
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "неможливо скопіювати тимчасовий файл до %s (%s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "неможливо вилучити %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "неможливо вилучити тимчасовий каталог %s\n"
@@ -572,6 +577,7 @@ msgstr "команда не змогла виконатись коректно\n
 msgid "no %s cache exists, creating...\n"
 msgstr "кеш %s не існує, створюється…\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "неможливо створити кеш пакунка, використовуватиметься /tmp\n"
+msgstr ""
+"неможливо знайти або створити кеш пакунків, використовуючи %s натомість\n"

lib/libalpm/po/zh_CN.po

@@ -10,9 +10,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-09 21:02+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-11-15 02:39+0000\n"
+"Last-Translator: ganlu <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -85,9 +85,9 @@ msgstr "无法得到当前的工作目录\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "无法更改目录到 %1$s (%2$s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "无法得到当前的工作目录\n"
+msgstr "无法恢复工作目录 (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -167,7 +167,7 @@ msgstr "无法删除锁定文件 %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "无法解析软件包描述文件 '%s' 从数据库 '%s'\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -219,9 +219,9 @@ msgstr ""
 "分区 %s 为只读\n"
 "\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "分区 %s 无可用空间：需要 %ld 盘区，可用 %ld 盘区\n"
+msgstr "分区 %s 太满：需要 %jd 区块，可用 %jd 区块\n"
 
 #, c-format
 msgid "disk"
@@ -229,7 +229,7 @@ msgstr "硬盘"
 
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "无法创建下载用的临时文件\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
@@ -309,11 +309,11 @@ msgstr "无法找到数据库"
 
 #, c-format
 msgid "invalid or corrupted database"
-msgstr ""
+msgstr "无效或已损坏的数据库"
 
 #, c-format
 msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "无效或已损坏的数据库 (PGP 签名)"
 
 #, c-format
 msgid "database is incorrect version"
@@ -373,15 +373,15 @@ msgstr "由于 ignorepkg 指定，操作已取消"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "无效或已损坏的软件包"
 
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "无效或已损坏的软件包 (检验值)"
 
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "无效或已损坏的软件包 (PGP 签名)"
 
 #, c-format
 msgid "cannot open package file"
@@ -405,11 +405,11 @@ msgstr "无法为目标找到软件库"
 
 #, c-format
 msgid "missing PGP signature"
-msgstr ""
+msgstr "缺失 PGP 签名"
 
 #, c-format
 msgid "invalid PGP signature"
-msgstr ""
+msgstr "无效 PGP 签名"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -449,7 +449,7 @@ msgstr "下载函数库出错"
 
 #, c-format
 msgid "gpgme error"
-msgstr ""
+msgstr "pgpme 错误"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -459,9 +459,9 @@ msgstr "调用外部下载程序时出错"
 msgid "unexpected error"
 msgstr "未预期的错误"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "无法找到或读取软件包"
+msgstr "无法完全加载软件包 %s 的元数据 - %s\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -477,7 +477,7 @@ msgstr "无法删除文件 '%1$s': %2$s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "无法删除 %s (%s)\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
@@ -493,7 +493,7 @@ msgstr "%1$s：忽略软件包更新（%2$s => %3$s）\n"
 
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr "%1$s：正在忽略软件包经济（%2$s => %3$s）\n"
+msgstr "%1$s：正在忽略软件包降级（%2$s => %3$s）\n"
 
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
@@ -539,6 +539,10 @@ msgstr "无法创建临时目录\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "无法复制临时文件到 %1$s (%2$s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr "无法删除 %s\n"
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "无法删除临时目录 %s\n"
@@ -575,6 +579,6 @@ msgstr "命令未能被正确执行\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "没有 %s 缓存存在，正在创建...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
+msgstr "无法找到或创建软件包缓存，使用 %s 中\n"

lib/libalpm/po/zh_TW.po

@@ -8,9 +8,9 @@ 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-09-22 11:32-0500\n"
-"PO-Revision-Date: 2011-08-18 16:47+0000\n"
-"Last-Translator: dlin <dlin.tw@gmail.com>\n"
+"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"PO-Revision-Date: 2011-10-06 03:39+0000\n"
+"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/zh_TW/)\n"
 "Language: zh_TW\n"
@@ -83,9 +83,9 @@ msgstr "無法得到當前的工作目錄\n"
 msgid "could not change directory to %s (%s)\n"
 msgstr "無法更改目錄到 %1$s (%2$s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr "無法得到當前的工作目錄\n"
+msgstr ""
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -217,9 +217,9 @@ msgstr ""
 "分區 %s 爲只讀\n"
 "\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "分區 %s 無可用空間：需要 %ld 盤區，可用 %ld 盤區\n"
+msgstr ""
 
 #, c-format
 msgid "disk"
@@ -457,9 +457,9 @@ msgstr "調用外部下載程序時出錯"
 msgid "unexpected error"
 msgstr "未預期的錯誤"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr "無法找到或讀取軟件包"
+msgstr ""
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -537,6 +537,10 @@ msgstr "無法創建臨時目錄\n"
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "無法複製臨時文件到 %1$s (%2$s)\n"
 
+#, c-format
+msgid "could not remove %s\n"
+msgstr ""
+
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "無法刪除臨時目錄 %s\n"
@@ -573,6 +577,6 @@ msgstr "命令未能被正確執行\n"
 msgid "no %s cache exists, creating...\n"
 msgstr "沒有 %s 緩存存在，正在創建...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr "無法創建軟件包緩存，正在使用 /tmp 代替\n"
+msgstr ""

lib/libalpm/remove.c

@@ -1,7 +1,7 @@
 /*
  *  remove.c
  *
- *  Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -317,17 +317,21 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *info,
 				int cmp = filehash ? strcmp(filehash, backup->hash) : 0;
 				FREE(filehash);
 				if(cmp != 0) {
-					char newpath[PATH_MAX];
-					snprintf(newpath, PATH_MAX, "%s.pacsave", file);
+					char *newpath;
+					size_t len = strlen(file) + 8 + 1;
+					MALLOC(newpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+					snprintf(newpath, len, "%s.pacsave", file);
 					if(rename(file, newpath)) {
 						_alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
 								file, newpath, strerror(errno));
 						alpm_logaction(handle, "error: could not rename %s to %s (%s)\n",
 								file, newpath, strerror(errno));
+						free(newpath);
 						return -1;
 					}
 					_alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath);
 					alpm_logaction(handle, "warning: %s saved as %s\n", file, newpath);
+					free(newpath);
 					return 0;
 				}
 			}
@@ -355,7 +359,6 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
 	const char *pkgname = oldpkg->name;
 	const char *pkgver = oldpkg->version;
 	alpm_filelist_t *filelist;
-	char scriptlet[PATH_MAX];
 	size_t i;
 
 	if(newpkg) {
@@ -366,13 +369,13 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
 		_alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n",
 				pkgname, pkgver);
 
-		snprintf(scriptlet, PATH_MAX, "%s%s-%s/install",
-				_alpm_db_path(handle->db_local), pkgname, pkgver);
-
 		/* run the pre-remove scriptlet if it exists  */
 		if(alpm_pkg_has_scriptlet(oldpkg) &&
 				!(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
-			_alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL);
+			char *scriptlet = _alpm_local_db_pkgpath(handle->db_local,
+					oldpkg, "install");
+			_alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0);
+			free(scriptlet);
 		}
 	}
 
@@ -449,13 +452,15 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
 		/* run the post-remove script if it exists  */
 		if(alpm_pkg_has_scriptlet(oldpkg) &&
 				!(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
-			_alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL);
+			char *scriptlet = _alpm_local_db_pkgpath(handle->db_local,
+					oldpkg, "install");
+			_alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0);
+			free(scriptlet);
 		}
 	}
 
 db:
 	/* remove the package from the database */
-	_alpm_log(handle, ALPM_LOG_DEBUG, "updating database\n");
 	_alpm_log(handle, ALPM_LOG_DEBUG, "removing database entry '%s'\n", pkgname);
 	if(_alpm_local_db_remove(handle->db_local, oldpkg) == -1) {
 		_alpm_log(handle, ALPM_LOG_ERROR, _("could not remove database entry %s-%s\n"),

lib/libalpm/signing.c

@@ -1,7 +1,7 @@
 /*
  *  signing.c
  *
- *  Copyright (c) 2008-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2008-2012 Pacman Development Team <pacman-dev@archlinux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -120,7 +120,7 @@ static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum)
  * Initialize the GPGME library.
  * This can be safely called multiple times; however it is not thread-safe.
  * @param handle the context handle
- * @return 0 on success, 1 on error
+ * @return 0 on success, -1 on error
  */
 static int init_gpgme(alpm_handle_t *handle)
 {
@@ -136,10 +136,13 @@ static int init_gpgme(alpm_handle_t *handle)
 
 	sigdir = handle->gpgdir;
 
-	if (_alpm_access(handle, sigdir, "pubring.gpg", R_OK)
+	if(_alpm_access(handle, sigdir, "pubring.gpg", R_OK)
 			|| _alpm_access(handle, sigdir, "trustdb.gpg", R_OK)) {
 		handle->pm_errno = ALPM_ERR_NOT_A_FILE;
 		_alpm_log(handle, ALPM_LOG_DEBUG, "Signature verification will fail!\n");
+		_alpm_log(handle, ALPM_LOG_WARNING,
+				_("Public keyring not found; have you run '%s'?\n"),
+				"pacman-key --init");
 	}
 
 	/* calling gpgme_check_version() returns the current version and runs
@@ -175,7 +178,7 @@ static int init_gpgme(alpm_handle_t *handle)
 
 error:
 	_alpm_log(handle, ALPM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err));
-	RET_ERR(handle, ALPM_ERR_GPGME, 1);
+	RET_ERR(handle, ALPM_ERR_GPGME, -1);
 }
 
 /**
@@ -221,7 +224,7 @@ error:
  * @param handle the context handle
  * @param fpr the fingerprint key ID to look up
  * @param pgpkey storage location for the given key if found
- * @return 0 on success, 1 on error or key not found
+ * @return 1 on success, 0 on key not found, -1 on error
  */
 static int key_search(alpm_handle_t *handle, const char *fpr,
 		alpm_pgpkey_t *pgpkey)
@@ -230,6 +233,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
 	gpgme_ctx_t ctx;
 	gpgme_keylist_mode_t mode;
 	gpgme_key_t key;
+	int ret = -1;
 
 	memset(&ctx, 0, sizeof(ctx));
 	err = gpgme_new(&ctx);
@@ -247,10 +251,25 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
 	err = gpgme_get_key(ctx, fpr, &key, 0);
 	if(gpg_err_code(err) == GPG_ERR_EOF) {
 		_alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n");
-	} else if(gpg_err_code(err) != GPG_ERR_NO_ERROR) {
-		_alpm_log(handle, ALPM_LOG_DEBUG,
-				"gpg error: %s\n", gpgme_strerror(err));
-		CHECK_ERR();
+		/* Try an alternate lookup using the 8 character fingerprint value, since
+		 * busted-ass keyservers can't support lookups using subkeys with the full
+		 * value as of now. This is why 2012 is not the year of PGP encryption. */
+		if(strlen(fpr) > 8) {
+			const char *short_fpr = fpr + strlen(fpr) - 8;
+			_alpm_log(handle, ALPM_LOG_DEBUG,
+					"looking up key %s remotely\n", short_fpr);
+			err = gpgme_get_key(ctx, short_fpr, &key, 0);
+			if(gpg_err_code(err) == GPG_ERR_EOF) {
+				_alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n");
+				ret = 0;
+			}
+		} else {
+			ret = 0;
+		}
+	}
+
+	if(gpg_err_code(err) != GPG_ERR_NO_ERROR) {
+		goto error;
 	}
 
 	/* should only get here if key actually exists */
@@ -265,23 +284,34 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
 	pgpkey->email = key->uids->email;
 	pgpkey->created = key->subkeys->timestamp;
 	pgpkey->expires = key->subkeys->expires;
+	gpgme_release(ctx);
+	return 1;
 
 error:
+	_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
 	gpgme_release(ctx);
-	return gpg_err_code(err) == GPG_ERR_NO_ERROR;
+	return ret;
 }
 
 /**
  * Import a key into the local keyring.
  * @param handle the context handle
  * @param key the key to import, likely retrieved from #key_search
- * @return 0 on success, 1 on error
+ * @return 0 on success, -1 on error
  */
 static int key_import(alpm_handle_t *handle, alpm_pgpkey_t *key)
 {
 	gpgme_error_t err;
 	gpgme_ctx_t ctx;
 	gpgme_key_t keys[2];
+	gpgme_import_result_t result;
+	int ret = -1;
+
+	if(_alpm_access(handle, handle->gpgdir, "pubring.gpg", W_OK)) {
+		/* no chance of import succeeding if pubring isn't writable */
+		_alpm_log(handle, ALPM_LOG_ERROR, _("keyring is not writable\n"));
+		return -1;
+	}
 
 	memset(&ctx, 0, sizeof(ctx));
 	err = gpgme_new(&ctx);
@@ -293,10 +323,22 @@ static int key_import(alpm_handle_t *handle, alpm_pgpkey_t *key)
 	keys[1] = NULL;
 	err = gpgme_op_import_keys(ctx, keys);
 	CHECK_ERR();
+	result = gpgme_op_import_result(ctx);
+	CHECK_ERR();
+	/* we know we tried to import exactly one key, so check for this */
+	if(result->considered != 1 || !result->imports) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "could not import key, 0 results\n");
+		ret = -1;
+	} else if(result->imports->result != GPG_ERR_NO_ERROR) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
+		ret = -1;
+	} else {
+		ret = 0;
+	}
 
 error:
 	gpgme_release(ctx);
-	return gpg_err_code(err) != GPG_ERR_NO_ERROR;
+	return ret;
 }
 
 /**
@@ -304,7 +346,7 @@ error:
  * @param base64_data the signature to attempt to decode
  * @param data the decoded data; must be freed by the caller
  * @param data_len the length of the returned data
- * @return 0 on success, 1 on failure to properly decode
+ * @return 0 on success, -1 on failure to properly decode
  */
 static int decode_signature(const char *base64_data,
 		unsigned char **data, size_t *data_len) {
@@ -323,7 +365,7 @@ static int decode_signature(const char *base64_data,
 error:
 	*data = NULL;
 	*data_len = 0;
-	return 1;
+	return -1;
 }
 
 /**
@@ -335,7 +377,7 @@ error:
  * The return value will be 0 if nothing abnormal happened during the signature
  * check, and -1 if an error occurred while checking signatures or if a
  * signature could not be found; pm_errno will be set. Note that "abnormal"
- * does not include a failed signature; the value in #siglist should be checked
+ * does not include a failed signature; the value in siglist should be checked
  * to determine if the signature(s) are good.
  * @param handle the context handle
  * @param path the full path to a file
@@ -347,7 +389,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 		const char *base64_sig, alpm_siglist_t *siglist)
 {
 	int ret = -1, sigcount;
-	gpgme_error_t err;
+	gpgme_error_t err = 0;
 	gpgme_ctx_t ctx;
 	gpgme_data_t filedata, sigdata;
 	gpgme_verify_result_t verify_result;
@@ -371,9 +413,27 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 		_alpm_access(handle, NULL, sigpath, R_OK);
 	}
 
+	/* does the file we are verifying exist? */
+	file = fopen(path, "rb");
+	if(file == NULL) {
+		handle->pm_errno = ALPM_ERR_NOT_A_FILE;
+		goto error;
+	}
+
+	/* does the sig file exist (if we didn't get the data directly)? */
+	if(!base64_sig) {
+		sigfile = fopen(sigpath, "rb");
+		if(sigfile == NULL) {
+			_alpm_log(handle, ALPM_LOG_DEBUG, "sig path %s could not be opened\n",
+					sigpath);
+			handle->pm_errno = ALPM_ERR_SIG_MISSING;
+			goto error;
+		}
+	}
+
 	if(init_gpgme(handle)) {
 		/* pm_errno was set in gpgme_init() */
-		return -1;
+		goto error;
 	}
 
 	_alpm_log(handle, ALPM_LOG_DEBUG, "checking signature for %s\n", path);
@@ -386,11 +446,6 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 	CHECK_ERR();
 
 	/* create our necessary data objects to verify the signature */
-	file = fopen(path, "rb");
-	if(file == NULL) {
-		handle->pm_errno = ALPM_ERR_NOT_A_FILE;
-		goto error;
-	}
 	err = gpgme_data_new_from_stream(&filedata, file);
 	CHECK_ERR();
 
@@ -402,19 +457,12 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 				&decoded_sigdata, &data_len);
 		if(decode_ret) {
 			handle->pm_errno = ALPM_ERR_SIG_INVALID;
-			goto error;
+			goto gpg_error;
 		}
 		err = gpgme_data_new_from_mem(&sigdata,
 				(char *)decoded_sigdata, data_len, 0);
 	} else {
 		/* file-based, it is on disk */
-		sigfile = fopen(sigpath, "rb");
-		if(sigfile == NULL) {
-			_alpm_log(handle, ALPM_LOG_DEBUG, "sig path %s could not be opened\n",
-					sigpath);
-			handle->pm_errno = ALPM_ERR_SIG_MISSING;
-			goto error;
-		}
 		err = gpgme_data_new_from_stream(&sigdata, sigfile);
 	}
 	CHECK_ERR();
@@ -427,14 +475,14 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 	if(!verify_result || !verify_result->signatures) {
 		_alpm_log(handle, ALPM_LOG_DEBUG, "no signatures returned\n");
 		handle->pm_errno = ALPM_ERR_SIG_MISSING;
-		goto error;
+		goto gpg_error;
 	}
 	for(gpgsig = verify_result->signatures, sigcount = 0;
 			gpgsig; gpgsig = gpgsig->next, sigcount++);
 	_alpm_log(handle, ALPM_LOG_DEBUG, "%d signatures returned\n", sigcount);
 
 	CALLOC(siglist->results, sigcount, sizeof(alpm_sigresult_t),
-			handle->pm_errno = ALPM_ERR_MEMORY; goto error);
+			handle->pm_errno = ALPM_ERR_MEMORY; goto gpg_error);
 	siglist->count = sigcount;
 
 	for(gpgsig = verify_result->signatures, sigcount = 0; gpgsig;
@@ -465,7 +513,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 			err = GPG_ERR_NO_ERROR;
 			/* we dupe the fpr in this case since we have no key to point at */
 			STRDUP(result->key.fingerprint, gpgsig->fpr,
-					handle->pm_errno = ALPM_ERR_MEMORY; goto error);
+					handle->pm_errno = ALPM_ERR_MEMORY; goto gpg_error);
 		} else {
 			CHECK_ERR();
 			if(key->uids) {
@@ -532,10 +580,12 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 
 	ret = 0;
 
-error:
+gpg_error:
 	gpgme_data_release(sigdata);
 	gpgme_data_release(filedata);
 	gpgme_release(ctx);
+
+error:
 	if(sigfile) {
 		fclose(sigfile);
 	}
@@ -550,13 +600,18 @@ error:
 	}
 	return ret;
 }
-#else
+
+#else  /* HAVE_LIBGPGME */
+static int key_in_keychain(alpm_handle_t UNUSED *handle, const char UNUSED *fpr)
+{
+	return -1;
+}
 int _alpm_gpgme_checksig(alpm_handle_t UNUSED *handle, const char UNUSED *path,
 		const char UNUSED *base64_sig, alpm_siglist_t UNUSED *siglist)
 {
 	return -1;
 }
-#endif
+#endif /* HAVE_LIBGPGME */
 
 /**
  * Form a signature path given a file path.
@@ -603,7 +658,6 @@ int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path,
 	CALLOC(siglist, 1, sizeof(alpm_siglist_t),
 			RET_ERR(handle, ALPM_ERR_MEMORY, -1));
 
-	_alpm_log(handle, ALPM_LOG_DEBUG, "checking signatures for %s\n", path);
 	ret = _alpm_gpgme_checksig(handle, path, base64_sig, siglist);
 	if(ret && handle->pm_errno == ALPM_ERR_SIG_MISSING) {
 		if(optional) {
@@ -695,7 +749,6 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier,
 	for(i = 0; i < siglist->count; i++) {
 		alpm_sigresult_t *result = siglist->results + i;
 		const char *name = result->key.uid ? result->key.uid : result->key.fingerprint;
-		int answer;
 		switch(result->status) {
 			case ALPM_SIGSTATUS_VALID:
 			case ALPM_SIGSTATUS_KEY_EXPIRED:
@@ -733,24 +786,39 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier,
 				}
 				_alpm_log(handle, ALPM_LOG_ERROR,
 						_("%s: key \"%s\" is unknown\n"), identifier, name);
+#ifdef HAVE_LIBGPGME
 				{
+					int answer;
 					alpm_pgpkey_t fetch_key;
 					memset(&fetch_key, 0, sizeof(fetch_key));
 
-					if(key_search(handle, result->key.fingerprint, &fetch_key)) {
+					if(key_search(handle, result->key.fingerprint, &fetch_key) == 1) {
 						_alpm_log(handle, ALPM_LOG_DEBUG,
 								"unknown key, found %s on keyserver\n", fetch_key.uid);
-						QUESTION(handle, ALPM_QUESTION_IMPORT_KEY,
-								&fetch_key, NULL, NULL, &answer);
-						if(answer && !key_import(handle, &fetch_key)) {
-							retry = 1;
+						if(!_alpm_access(handle, handle->gpgdir, "pubring.gpg", W_OK)) {
+							QUESTION(handle, ALPM_QUESTION_IMPORT_KEY,
+									&fetch_key, NULL, NULL, &answer);
+							if(answer) {
+								if(key_import(handle, &fetch_key) == 0) {
+									retry = 1;
+								} else {
+									_alpm_log(handle, ALPM_LOG_ERROR,
+											_("key \"%s\" could not be imported\n"), fetch_key.uid);
+								}
+							}
+						} else {
+							/* keyring directory was not writable, so we don't even try */
+							_alpm_log(handle, ALPM_LOG_WARNING,
+									_("key %s, \"%s\" found on keyserver, keyring is not writable\n"),
+									fetch_key.fingerprint, fetch_key.uid);
 						}
 					} else {
-						_alpm_log(handle, ALPM_LOG_DEBUG,
-								"key could not be looked up remotely\n");
+						_alpm_log(handle, ALPM_LOG_ERROR,
+								_("key \"%s\" could not be looked up remotely\n"), name);
 					}
 					gpgme_key_unref(fetch_key.data);
 				}
+#endif
 				break;
 			case ALPM_SIGSTATUS_KEY_DISABLED:
 				_alpm_log(handle, ALPM_LOG_ERROR,
@@ -806,7 +874,7 @@ int SYMEXPORT alpm_db_check_pgp_signature(alpm_db_t *db,
 
 /**
  * Clean up and free a signature result list.
- * Note that this does not free the #alpm_siglist_t object itself in case that
+ * Note that this does not free the siglist object itself in case that
  * was allocated on the stack; this is the responsibility of the caller.
  * @param siglist a pointer to storage for signature results
  * @return 0 on success, -1 on error

lib/libalpm/sync.c

@@ -240,7 +240,7 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
  * If a member exists in several databases, only the first database is used.
  * IgnorePkg is also handled.
  * @param dbs the list of alpm_db_t *
- * @pram name the name of the group
+ * @param name the name of the group
  * @return the list of alpm_pkg_t * (caller is responsible for alpm_list_free)
  */
 alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs,
@@ -288,6 +288,7 @@ static int compute_download_size(alpm_pkg_t *newpkg)
 	char *fpath, *fnamepart = NULL;
 	off_t size = 0;
 	alpm_handle_t *handle = newpkg->handle;
+	int ret = 0;
 
 	if(newpkg->origin != PKG_FROM_SYNCDB) {
 		newpkg->infolevel |= INFRQ_DSIZE;
@@ -316,6 +317,9 @@ static int compute_download_size(alpm_pkg_t *newpkg)
 			size = newpkg->size - st.st_size;
 			size = size < 0 ? 0 : size;
 		}
+
+		/* tell the caller that we have a partial */
+		ret = 1;
 	} else if(handle->usedelta) {
 		off_t dltsize;
 
@@ -345,7 +349,7 @@ finish:
 	FREE(fpath);
 	FREE(fnamepart);
 
-	return 0;
+	return ret;
 }
 
 int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
@@ -353,7 +357,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 	alpm_list_t *i, *j;
 	alpm_list_t *deps = NULL;
 	alpm_list_t *unresolvable = NULL;
-	alpm_list_t *remove = NULL;
+	size_t from_sync = 0;
 	int ret = 0;
 	alpm_trans_t *trans = handle->trans;
 
@@ -361,19 +365,27 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 		*data = NULL;
 	}
 
-	/* ensure all sync database are valid since we will be using them */
+	for(i = trans->add; i; i = i->next) {
+		alpm_pkg_t *spkg = i->data;
+		from_sync += (spkg->origin == PKG_FROM_SYNCDB);
+	}
+
+	/* ensure all sync database are valid if we will be using them */
 	for(i = handle->dbs_sync; i; i = i->next) {
 		const alpm_db_t *db = i->data;
 		if(db->status & DB_STATUS_INVALID) {
 			RET_ERR(handle, ALPM_ERR_DB_INVALID, -1);
 		}
-		if(db->status & DB_STATUS_MISSING) {
+		/* missing databases are not allowed if we have sync targets */
+		if(from_sync && db->status & DB_STATUS_MISSING) {
 			RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1);
 		}
 	}
 
 	if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {
-		alpm_list_t *resolved = NULL; /* target list after resolvedeps */
+		alpm_list_t *resolved = NULL;
+		alpm_list_t *remove = NULL;
+		alpm_list_t *localpkgs;
 
 		/* Build up list by repeatedly resolving each transaction package */
 		/* Resolve targets dependencies */
@@ -390,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 
 		/* Compute the fake local database for resolvedeps (partial fix for the
 		 * phonon/qt issue) */
-		alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local),
+		localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local),
 				trans->add, _alpm_pkg_cmp);
 
 		/* Resolve packages in the transaction one at a time, in addition
@@ -405,11 +417,13 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 			   dependencies not already on the list */
 		}
 		alpm_list_free(localpkgs);
+		alpm_list_free(remove);
 
 		/* If there were unresolvable top-level packages, prompt the user to
 		   see if they'd like to ignore them rather than failing the sync */
 		if(unresolvable != NULL) {
 			int remove_unresolvable = 0;
+			enum _alpm_errno_t saved_err = handle->pm_errno;
 			QUESTION(handle, ALPM_QUESTION_REMOVE_PKGS, unresolvable,
 					NULL, NULL, &remove_unresolvable);
 			if(remove_unresolvable) {
@@ -417,14 +431,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 				   transaction. The packages will be removed from the actual
 				   transaction when the transaction packages are replaced with a
 				   dependency-reordered list below */
-				handle->pm_errno = 0; /* pm_errno was set by resolvedeps */
+				handle->pm_errno = 0;
 				if(data) {
 					alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free);
 					alpm_list_free(*data);
 					*data = NULL;
 				}
 			} else {
-				/* pm_errno is set by resolvedeps */
+				/* pm_errno was set by resolvedeps, callback may have overwrote it */
+				handle->pm_errno = saved_err;
 				alpm_list_free(resolved);
 				ret = -1;
 				goto cleanup;
@@ -439,9 +454,11 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 			}
 		}
 
-		/* Unresolvable packages will be removed from the target list, so
-		   we free the transaction specific fields */
-		alpm_list_free_inner(unresolvable, (alpm_list_fn_free)_alpm_pkg_free_trans);
+		/* Unresolvable packages will be removed from the target list; set these
+		 * aside in the transaction as a list we won't operate on. If we free them
+		 * before the end of the transaction, we may kill pointers the frontend
+		 * holds to package objects. */
+		trans->unresolvable = unresolvable;
 
 		/* re-order w.r.t. dependencies */
 		alpm_list_free(trans->add);
@@ -508,7 +525,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 					_("removing '%s' from target list because it conflicts with '%s'\n"),
 					rsync->name, sync->name);
 			trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL);
-			_alpm_pkg_free_trans(rsync); /* rsync is not transaction target anymore */
+			/* rsync is not a transaction target anymore */
+			trans->unresolvable = alpm_list_add(trans->unresolvable, rsync);
 			continue;
 		}
 
@@ -603,16 +621,13 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 	for(i = trans->add; i; i = i->next) {
 		/* update download size field */
 		alpm_pkg_t *spkg = i->data;
-		if(compute_download_size(spkg) != 0) {
+		if(compute_download_size(spkg) < 0) {
 			ret = -1;
 			goto cleanup;
 		}
 	}
 
 cleanup:
-	alpm_list_free(unresolvable);
-	alpm_list_free(remove);
-
 	return ret;
 }
 
@@ -815,14 +830,6 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas)
 	for(i = handle->dbs_sync; i; i = i->next) {
 		alpm_db_t *current = i->data;
 
-		if(!current->servers) {
-			handle->pm_errno = ALPM_ERR_SERVER_NONE;
-			_alpm_log(handle, ALPM_LOG_ERROR, "%s: %s\n",
-					alpm_strerror(handle->pm_errno), current->treename);
-			errors++;
-			continue;
-		}
-
 		for(j = handle->trans->add; j; j = j->next) {
 			alpm_pkg_t *spkg = j->data;
 
@@ -861,6 +868,14 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas)
 		}
 
 		if(files) {
+			if(!current->servers) {
+				handle->pm_errno = ALPM_ERR_SERVER_NONE;
+				_alpm_log(handle, ALPM_LOG_ERROR, "%s: %s\n",
+						alpm_strerror(handle->pm_errno), current->treename);
+				errors++;
+				continue;
+			}
+
 			EVENT(handle, ALPM_EVENT_RETRIEVE_START, current->treename, NULL);
 			for(j = files; j; j = j->next) {
 				struct dload_payload *payload = j->data;
@@ -872,7 +887,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas)
 
 					/* print server + filename into a buffer */
 					len = strlen(server_url) + strlen(payload->remote_name) + 2;
-					CALLOC(payload->fileurl, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+					MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
 					snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name);
 					payload->handle = handle;
 					payload->allow_resume = 1;
@@ -889,9 +904,8 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas)
 				}
 			}
 
-			alpm_list_free_inner(files, (alpm_list_fn_free)_alpm_dload_payload_free);
-			alpm_list_free(files);
-			files = NULL;
+			alpm_list_free_inner(files, (alpm_list_fn_free)_alpm_dload_payload_reset);
+			FREELIST(files);
 		}
 	}
 
@@ -1026,9 +1040,12 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data,
 			continue;
 		}
 		free(filepath);
-		pkgfile->reason = spkg->reason; /* copy over install reason */
+		/* copy over the install reason */
+		pkgfile->reason = spkg->reason;
 		i->data = pkgfile;
-		_alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */
+		/* spkg has been removed from the target list, so we can free the
+		 * sync-specific fields */
+		_alpm_pkg_free_trans(spkg);
 	}
 
 	PROGRESS(handle, ALPM_PROGRESS_LOAD_START, "", 100,

lib/libalpm/trans.c

@@ -236,6 +236,9 @@ void _alpm_trans_free(alpm_trans_t *trans)
 		return;
 	}
 
+	alpm_list_free_inner(trans->unresolvable,
+			(alpm_list_fn_free)_alpm_pkg_free_trans);
+	alpm_list_free(trans->unresolvable);
 	alpm_list_free_inner(trans->add, (alpm_list_fn_free)_alpm_pkg_free_trans);
 	alpm_list_free(trans->add);
 	alpm_list_free_inner(trans->remove, (alpm_list_fn_free)_alpm_pkg_free);
@@ -272,40 +275,50 @@ static int grep(const char *fn, const char *needle)
 	return 0;
 }
 
-int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn,
-		const char *script, const char *ver, const char *oldver)
+int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath,
+		const char *script, const char *ver, const char *oldver, int is_archive)
 {
-	char scriptfn[PATH_MAX];
 	char cmdline[PATH_MAX];
-	char tmpdir[PATH_MAX];
 	char *argv[] = { "sh", "-c", cmdline, NULL };
-	char *scriptpath;
+	char *tmpdir, *scriptfn = NULL, *scriptpath;
 	int retval = 0;
+	size_t len;
 
-	if(_alpm_access(handle, NULL, installfn, R_OK) != 0) {
-		_alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn);
+	if(_alpm_access(handle, NULL, filepath, R_OK) != 0) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", filepath);
 		return 0;
 	}
 
-	/* creates a directory in $root/tmp/ for copying/extracting the scriptlet */
-	snprintf(tmpdir, PATH_MAX, "%stmp/", handle->root);
+	if(!is_archive && !grep(filepath, script)) {
+		/* script not found in scriptlet file; we can only short-circuit this early
+		 * if it is an actual scriptlet file and not an archive.  */
+		return 0;
+	}
+
+	/* create a directory in $root/tmp/ for copying/extracting the scriptlet */
+	len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1;
+	MALLOC(tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+	snprintf(tmpdir, len, "%stmp/", handle->root);
 	if(access(tmpdir, F_OK) != 0) {
 		_alpm_makepath_mode(tmpdir, 01777);
 	}
-	snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", handle->root);
+	snprintf(tmpdir, len, "%stmp/alpm_XXXXXX", handle->root);
 	if(mkdtemp(tmpdir) == NULL) {
 		_alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n"));
+		free(tmpdir);
 		return 1;
 	}
 
 	/* either extract or copy the scriptlet */
-	snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir);
-	if(strcmp(script, "pre_upgrade") == 0 || strcmp(script, "pre_install") == 0) {
-		if(_alpm_unpack_single(handle, installfn, tmpdir, ".INSTALL")) {
+	len += strlen("/.INSTALL");
+	MALLOC(scriptfn, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+	snprintf(scriptfn, len, "%s/.INSTALL", tmpdir);
+	if(is_archive) {
+		if(_alpm_unpack_single(handle, filepath, tmpdir, ".INSTALL")) {
 			retval = 1;
 		}
 	} else {
-		if(_alpm_copyfile(installfn, scriptfn)) {
+		if(_alpm_copyfile(filepath, scriptfn)) {
 			_alpm_log(handle, ALPM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno));
 			retval = 1;
 		}
@@ -314,8 +327,8 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn,
 		goto cleanup;
 	}
 
-	if(!grep(scriptfn, script)) {
-		/* script not found in scriptlet file */
+	if(is_archive && !grep(scriptfn, script)) {
+		/* script not found in extracted scriptlet file */
 		goto cleanup;
 	}
 
@@ -335,10 +348,17 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn,
 	retval = _alpm_run_chroot(handle, "/bin/sh", argv);
 
 cleanup:
-	if(_alpm_rmrf(tmpdir)) {
-		_alpm_log(handle, ALPM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir);
+	if(scriptfn && unlink(scriptfn)) {
+		_alpm_log(handle, ALPM_LOG_WARNING,
+				_("could not remove %s\n"), scriptfn);
+	}
+	if(rmdir(tmpdir)) {
+		_alpm_log(handle, ALPM_LOG_WARNING,
+				_("could not remove tmpdir %s\n"), tmpdir);
 	}
 
+	free(scriptfn);
+	free(tmpdir);
 	return retval;
 }
 

lib/libalpm/trans.h

@@ -39,15 +39,16 @@ typedef enum _alpm_transstate_t {
 struct __alpm_trans_t {
 	alpm_transflag_t flags;
 	alpm_transstate_t state;
-	alpm_list_t *add;      /* list of (alpm_pkg_t *) */
-	alpm_list_t *remove;      /* list of (alpm_pkg_t *) */
+	alpm_list_t *unresolvable;  /* list of (alpm_pkg_t *) */
+	alpm_list_t *add;           /* list of (alpm_pkg_t *) */
+	alpm_list_t *remove;        /* list of (alpm_pkg_t *) */
 	alpm_list_t *skip_remove;   /* list of (char *) */
 };
 
 void _alpm_trans_free(alpm_trans_t *trans);
 int _alpm_trans_init(alpm_trans_t *trans, alpm_transflag_t flags);
-int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn,
-		const char *script, const char *ver, const char *oldver);
+int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath,
+		const char *script, const char *ver, const char *oldver, int is_archive);
 
 #endif /* _ALPM_TRANS_H */
 

lib/libalpm/util.c

@@ -1,7 +1,7 @@
 /*
  *  util.c
  *
- *  Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -129,8 +129,6 @@ int _alpm_makepath_mode(const char *path, mode_t mode)
 	return ret;
 }
 
-#define CPBUFSIZE 8 * 1024
-
 int _alpm_copyfile(const char *src, const char *dest)
 {
 	FILE *in, *out;
@@ -148,10 +146,10 @@ int _alpm_copyfile(const char *src, const char *dest)
 		return 1;
 	}
 
-	CALLOC(buf, (size_t)CPBUFSIZE, (size_t)1, ret = 1; goto cleanup;);
+	MALLOC(buf, (size_t)ALPM_BUFFER_SIZE, ret = 1; goto cleanup);
 
 	/* do the actual file copy */
-	while((len = fread(buf, 1, CPBUFSIZE, in))) {
+	while((len = fread(buf, 1, ALPM_BUFFER_SIZE, in))) {
 		size_t nwritten = 0;
 		nwritten = fwrite(buf, 1, len, out);
 		if((nwritten != len) || ferror(out)) {
@@ -174,7 +172,7 @@ int _alpm_copyfile(const char *src, const char *dest)
 cleanup:
 	fclose(in);
 	fclose(out);
-	FREE(buf);
+	free(buf);
 	return ret;
 }
 
@@ -223,7 +221,7 @@ char *_alpm_strtrim(char *str)
 size_t _alpm_strip_newline(char *str)
 {
 	size_t len;
-	if(str == '\0') {
+	if(*str == '\0') {
 		return 0;
 	}
 	len = strlen(str);
@@ -288,7 +286,7 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix,
 	archive_read_support_format_all(_archive);
 
 	if(archive_read_open_filename(_archive, archive,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+				ALPM_BUFFER_SIZE) != ARCHIVE_OK) {
 		_alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), archive,
 				archive_error_string(_archive));
 		RET_ERR(handle, ALPM_ERR_PKG_OPEN, 1);
@@ -383,7 +381,6 @@ int _alpm_rmrf(const char *path)
 	int errflag = 0;
 	struct dirent *dp;
 	DIR *dirp;
-	char name[PATH_MAX];
 	struct stat st;
 
 	if(_alpm_lstat(path, &st) == 0) {
@@ -403,9 +400,10 @@ int _alpm_rmrf(const char *path)
 				return 1;
 			}
 			for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
-				if(dp->d_ino) {
-					sprintf(name, "%s/%s", path, dp->d_name);
+				if(dp->d_name) {
 					if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) {
+						char name[PATH_MAX];
+						sprintf(name, "%s/%s", path, dp->d_name);
 						errflag += _alpm_rmrf(name);
 					}
 				}
@@ -624,7 +622,7 @@ int _alpm_ldconfig(alpm_handle_t *handle)
 		snprintf(line, PATH_MAX, "%ssbin/ldconfig", handle->root);
 		if(access(line, X_OK) == 0) {
 			char *argv[] = { "ldconfig", NULL };
-			_alpm_run_chroot(handle, "/sbin/ldconfig", argv);
+			return _alpm_run_chroot(handle, "/sbin/ldconfig", argv);
 		}
 	}
 
@@ -748,7 +746,7 @@ static int md5_file(const char *path, unsigned char output[16])
 	MD5_CTX ctx;
 	unsigned char *buf;
 
-	CALLOC(buf, 8192, sizeof(unsigned char), return 1);
+	CALLOC(buf, ALPM_BUFFER_SIZE, sizeof(unsigned char), return 1);
 
 	if((f = fopen(path, "rb")) == NULL) {
 		free(buf);
@@ -757,7 +755,7 @@ static int md5_file(const char *path, unsigned char output[16])
 
 	MD5_Init(&ctx);
 
-	while((n = fread(buf, 1, sizeof(buf), f)) > 0) {
+	while((n = fread(buf, 1, ALPM_BUFFER_SIZE, f)) > 0) {
 		MD5_Update(&ctx, buf, n);
 	}
 
@@ -783,7 +781,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224)
 	SHA256_CTX ctx;
 	unsigned char *buf;
 
-	CALLOC(buf, 8192, sizeof(unsigned char), return 1);
+	CALLOC(buf, ALPM_BUFFER_SIZE, sizeof(unsigned char), return 1);
 
 	if((f = fopen(path, "rb")) == NULL) {
 		free(buf);
@@ -796,7 +794,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224)
 		SHA256_Init(&ctx);
 	}
 
-	while((n = fread(buf, 1, sizeof(buf), f)) > 0) {
+	while((n = fread(buf, 1, ALPM_BUFFER_SIZE, f)) > 0) {
 		if(is224) {
 			SHA224_Update(&ctx, buf, n);
 		} else {
@@ -1002,7 +1000,7 @@ cleanup:
 	{
 		int ret = b->ret;
 		FREE(b->line);
-		memset(b, 0, sizeof(b));
+		memset(b, 0, sizeof(struct archive_read_buffer));
 		return ret;
 	}
 }
@@ -1087,7 +1085,7 @@ off_t _alpm_strtoofft(const char *line)
 	errno = 0;
 
 	/* we are trying to parse bare numbers only, no leading anything */
-	if(line[0] < '1' || line[0] > '9') {
+	if(!isdigit((unsigned char)line[0])) {
 		return (off_t)-1;
 	}
 	result = strtoull(line, &end, 10);

lib/libalpm/util.h

@@ -75,6 +75,13 @@
 
 #define CHECK_HANDLE(handle, action) do { if(!(handle)) { action; } (handle)->pm_errno = 0; } while(0)
 
+/** Standard buffer size used throughout the library. */
+#ifdef BUFSIZ
+#define ALPM_BUFFER_SIZE BUFSIZ
+#else
+#define ALPM_BUFFER_SIZE 8192
+#endif
+
 /**
  * Used as a buffer/state holder for _alpm_archive_fgets().
  */

ltmain.sh

@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1118,6 +1115,10 @@ esac
 			;;
       --no-silent|--no-quiet)
 			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
 func_append preserve_args " $opt"
 			;;
       --no-verbose)
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -5060,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5646,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -5790,9 +5800,12 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;
 
-      -Wl,--as-needed|-Wl,--no-as-needed)
-	deplibs="$deplibs $arg"
-	continue
+      -Wl,*--as-needed*)
+	deplibs="$deplibs $wl--as-needed"
+	;;
+
+      -Wl,*--no-as-needed*)
+	deplibs="$deplibs $wl--no-as-needed"
 	;;
 
       -Wl,*)
@@ -6164,7 +6177,8 @@ func_mode_link ()
 	  fi
 	  continue
 	  ;;
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6848,7 +6862,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7333,6 +7347,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7449,7 +7464,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8037,6 +8052,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8067,7 +8087,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8075,11 +8095,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9169,6 +9185,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9278,7 +9296,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

m4/ltversion.m4

@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])

scripts/makepkg.sh.in

@@ -3,7 +3,7 @@
 #   makepkg - make packages compatible for use with pacman
 #   @configure_input@
 #
-#   Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>
 #   Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
 #   Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
 #   Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -174,15 +174,6 @@ clean_up() {
 }
 
 
-##
-# Signal Traps
-##
-set -E
-trap 'clean_up' 0
-trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT
-trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
-trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
-
 enter_fakeroot() {
 	msg "$(gettext "Entering %s environment...")" "fakeroot"
 
@@ -343,7 +334,7 @@ in_array() {
 source_has_signatures(){
 	local file
 	for file in "${source[@]}"; do
-		if [[ $file = *.@(sig|asc) ]]; then
+		if [[ $file = *.@(sig?(n)|asc) ]]; then
 			return 0
 		fi
 	done
@@ -414,14 +405,18 @@ download_file() {
 	fi
 
 	# rename the temporary download file to the final destination
-	if [[ $dlfile != $file ]]; then
+	if [[ $dlfile != "$file" ]]; then
 		mv -f "$SRCDEST/$dlfile" "$SRCDEST/$file"
 	fi
 }
 
 run_pacman() {
 	local cmd
-	printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
+	if [[ ! $1 = -@(T|Qq) ]]; then
+		printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
+	else
+		printf -v cmd "%q " "$PACMAN" "$@"
+	fi
 	if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then
 		if type -p sudo >/dev/null; then
 			cmd="sudo $cmd"
@@ -515,15 +510,18 @@ remove_deps() {
 
 	# check for packages removed during dependency install (e.g. due to conflicts)
 	# removing all installed packages is risky in this case
-	if [[ -n  $(comm -23 <(printf "%s\n" "${original_pkglist[@]}") \
-			<(printf "%s\n" "${current_pkglist[@]}")) ]]; then
-	  warning "$(gettext "Failed to remove installed dependencies.")"
-	  return 0
+	if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \
+			<(printf '%s\n' "${original_packagelist[@]}") || true) ]]; then
+		warning "$(gettext "Failed to remove installed dependencies.")"
+		return 0
 	fi
 
-	local deplist=($(comm -13  <(printf "%s\n" "${original_pkglist[@]}") \
-			<(printf "%s\n" "${current_pkglist[@]}")))
-	(( ${#deplist[@]} == 0 )) && return
+	local deplist
+	deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \
+			<(printf "%s\n" "${current_pkglist[@]}") || true))
+	if [[ -z deplist ]]; then
+		return
+	fi
 
 	msg "Removing installed dependencies..."
 	# exit cleanly on failure to remove deps as package has been built successfully
@@ -558,7 +556,8 @@ download_sources() {
 		fi
 
 		# find the client we should use for this URL
-		local dlclient=$(get_downloadclient "$url") || exit $?
+		local dlclient
+		dlclient=$(get_downloadclient "$url") || exit $?
 
 		msg2 "$(gettext "Downloading %s...")" "$file"
 		# fix flyspray bug #3289
@@ -631,7 +630,8 @@ generate_checksums() {
 
 		local netfile
 		for netfile in "${source[@]}"; do
-			local file="$(get_filepath "$netfile")" || missing_source_file "$netfile"
+			local file
+			file="$(get_filepath "$netfile")" || missing_source_file "$netfile"
 			local sum="$(openssl dgst -${integ} "$file")"
 			sum=${sum##* }
 			(( ct )) && echo -n "$indent"
@@ -664,7 +664,7 @@ check_checksums() {
 				echo -n "    $file ... " >&2
 
 				if ! file="$(get_filepath "$file")"; then
-					echo "$(gettext "NOT FOUND")" >&2
+					printf -- "$(gettext "NOT FOUND")\n" >&2
 					errors=1
 					found=0
 				fi
@@ -674,9 +674,9 @@ check_checksums() {
 					local realsum="$(openssl dgst -${integ} "$file")"
 					realsum="${realsum##* }"
 					if [[ $expectedsum = $realsum ]]; then
-						echo "$(gettext "Passed")" >&2
+						printf -- "$(gettext "Passed")\n" >&2
 					else
-						echo "$(gettext "FAILED")" >&2
+						printf -- "$(gettext "FAILED")\n" >&2
 						errors=1
 					fi
 				fi
@@ -713,7 +713,7 @@ check_pgpsigs() {
 
 	for file in "${source[@]}"; do
 		file="$(get_filename "$file")"
-		if [[ ! $file = *.@(sig|asc) ]]; then
+		if [[ ! $file = *.@(sig?(n)|asc) ]]; then
 			continue
 		fi
 
@@ -999,7 +999,8 @@ tidy_install() {
 					#   the '|| true' part keeps the script from bailing on the EOF returned
 					#   by read at the end of the find output
 					IFS=$'\n' read -rd '' -a hardlinks < \
-						<(find "${MAN_DIRS[@]}" \! -name "$file" -samefile "$manpage" 2>/dev/null) || true
+						<(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" \
+								2>/dev/null || true) || true
 					rm -f "${hardlinks[@]}"
 					# compress the original
 					gzip -9 "$manpage"
@@ -1134,7 +1135,7 @@ write_pkginfo() {
 	[[ $license ]]    && printf "license = %s\n"   "${license[@]}"
 	[[ $replaces ]]   && printf "replaces = %s\n"  "${replaces[@]}"
 	[[ $groups ]]     && printf "group = %s\n"     "${groups[@]}"
-	[[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]}"
+	[[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }"
 	[[ $conflicts ]]  && printf "conflict = %s\n"  "${conflicts[@]}"
 	[[ $backup ]]     && printf "backup = %s\n"    "${backup[@]}"
 
@@ -1256,17 +1257,6 @@ create_package() {
 	# tar it up
 	msg2 "$(gettext "Compressing package...")"
 
-	local EXT
-	case "$PKGEXT" in
-		*tar.gz)  EXT=${PKGEXT%.gz} ;;
-		*tar.bz2) EXT=${PKGEXT%.bz2} ;;
-		*tar.xz)  EXT=${PKGEXT%.xz} ;;
-		*tar.Z)   EXT=${PKGEXT%.Z} ;;
-		*tar)     EXT=${PKGEXT} ;;
-		*) warning "$(gettext "'%s' is not a valid archive extension.")" \
-		"$PKGEXT" ; EXT=$PKGEXT ;;
-	esac
-
 	local fullver=$(get_full_version)
 	local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${PKGARCH}${PKGEXT}"
 	local ret=0
@@ -1279,13 +1269,18 @@ create_package() {
 	shopt -s nullglob
 	# TODO: Maybe this can be set globally for robustness
 	shopt -s -o pipefail
+	# bsdtar's gzip compression always saves the time stamp, making one
+	# archive created using the same command line distinct from another.
+	# Disable bsdtar compression and use gzip -n for now.
 	bsdtar -cf - $comp_files * |
 	case "$PKGEXT" in
-	    *tar.gz)  gzip -c -f -n ;;
-	    *tar.bz2) bzip2 -c -f ;;
-	    *tar.xz)  xz -c -z - ;;
-	    *tar.Z)   compress -c -f ;;
-	    *tar)     cat ;;
+		*tar.gz)  gzip -c -f -n ;;
+		*tar.bz2) bzip2 -c -f ;;
+		*tar.xz)  xz -c -z - ;;
+		*tar.Z)   compress -c -f ;;
+		*tar)     cat ;;
+		*) warning "$(gettext "'%s' is not a valid archive extension.")" \
+			"$PKGEXT"; cat ;;
 	esac > "${pkg_file}" || ret=$?
 
 	shopt -u nullglob
@@ -1337,6 +1332,7 @@ create_signature() {
 }
 
 create_srcpackage() {
+	local ret=0
 	msg "$(gettext "Creating source package...")"
 	local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)"
 	mkdir "${srclinks}"/${pkgbase}
@@ -1346,11 +1342,9 @@ create_srcpackage() {
 
 	local file
 	for file in "${source[@]}"; do
-		if [[ -f $file ]]; then
-			msg2 "$(gettext "Adding %s...")" "$file"
-			ln -s "${startdir}/$file" "$srclinks/$pkgbase"
-		elif (( SOURCEONLY == 2 )); then
-			local absfile=$(get_filepath "$file") || missing_source_file "$file"
+		if [[ "$file" == $(get_filename "$file") ]] || (( SOURCEONLY == 2 )); then
+			local absfile
+			absfile=$(get_filepath "$file") || missing_source_file "$file"
 			msg2 "$(gettext "Adding %s...")" "${absfile##*/}"
 			ln -s "$absfile" "$srclinks/$pkgbase"
 		fi
@@ -1362,7 +1356,7 @@ create_srcpackage() {
 		while read -r file; do
 			# evaluate any bash variables used
 			eval file=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$file")\"
-			if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then
+			if [[ $file && ! -f "${srclinks}/${pkgbase}/$file" ]]; then
 				msg2 "$(gettext "Adding %s file (%s)...")" "$i" "${file}"
 				ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/"
 			fi
@@ -1374,6 +1368,7 @@ create_srcpackage() {
 		*tar.gz)  TAR_OPT="z" ;;
 		*tar.bz2) TAR_OPT="j" ;;
 		*tar.xz)  TAR_OPT="J" ;;
+		*tar.Z)   TAR_OPT="Z" ;;
 		*tar)     TAR_OPT=""  ;;
 		*) warning "$(gettext "'%s' is not a valid archive extension.")" \
 		"$SRCEXT" ;;
@@ -1390,7 +1385,7 @@ create_srcpackage() {
 		exit 1 # TODO: error code
 	fi
 
-	if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then
+	if [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then
 		rm -f "${pkg_file/$SRCPKGDEST/$startdir}"
 		ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"
 		ret=$?
@@ -1452,18 +1447,18 @@ check_sanity() {
 		ret=1
 	fi
 
-	awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" |
+	awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" |
 	while IFS='=' read -r _ i; do
-		eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\"
+		eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\"
 		if [[ $i = *[[:space:]:-]* ]]; then
 			error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver"
 			return 1
 		fi
 	done || ret=1
 
-	awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" |
+	awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" |
 	while IFS='=' read -r _ i; do
-		eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\"
+		eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\"
 		if [[ $i = *[[:space:]-]* ]]; then
 			error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel"
 			return 1
@@ -1472,7 +1467,7 @@ check_sanity() {
 
 	awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" |
 	while IFS='=' read -r _ i; do
-		eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\"
+		eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\"
 		if [[ $i != *([[:digit:]]) ]]; then
 			error "$(gettext "%s must be an integer.")" "epoch"
 			return 1
@@ -1509,7 +1504,7 @@ check_sanity() {
 	eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \
 		sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//')
 	for i in ${provides_list[@]}; do
-		if [[ $i != ${i//</} || $i != ${i//>/} ]]; then
+		if [[ $i == *['<>']* ]]; then
 			error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides"
 			ret=1
 		fi
@@ -1529,8 +1524,9 @@ check_sanity() {
 	eval $(awk '/^[[:space:]]*optdepends=\(/,/\)[[:space:]]*(#.*)?$/' "$BUILDFILE" | \
 		sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//')
 	for i in "${optdepends_list[@]}"; do
-		local pkg=${i%%:*}
-		if [[ $pkg != +([[:alnum:]><=.+_-]) ]]; then
+		local pkg=${i%%:[[:space:]]*}
+		# the '-' character _must_ be first or last in the character range
+		if [[ $pkg != +([-[:alnum:]><=.+_:]) ]]; then
 			error "$(gettext "Invalid syntax for %s : '%s'")" "optdepend" "$i"
 			ret=1
 		fi
@@ -1734,8 +1730,13 @@ devel_check() {
 			msg "$(gettext "Determining latest %s revision...")" 'hg'
 			if [[ -d ./src/$_hgrepo ]] ; then
 				cd ./src/$_hgrepo
-				hg pull
-				hg update
+				local ret=0
+				hg pull || ret=$?
+				if (( ! ret )); then
+					hg update
+				elif (( ret != 1 )); then
+					return 1
+				fi
 			else
 				[[ ! -d ./src/ ]] && mkdir ./src/
 				hg clone $_hgroot/$_hgrepo ./src/$_hgrepo
@@ -1766,7 +1767,7 @@ devel_update() {
 	#  _foo=pkgver
 	#
 	if [[ -n $newpkgver ]]; then
-		if [[ $newpkgver != $pkgver ]]; then
+		if [[ $newpkgver != "$pkgver" ]]; then
 			if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then
 				@SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE"
 				@SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE"
@@ -1831,52 +1832,52 @@ m4_include(library/parse_options.sh)
 usage() {
 	printf "makepkg (pacman) %s\n" "$myver"
 	echo
-	printf "$(gettext "Usage: %s [options]")\n" "$0"
+	printf -- "$(gettext "Usage: %s [options]")\n" "$0"
 	echo
-	echo "$(gettext "Options:")"
-	printf "$(gettext "  -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT"
-	echo "$(gettext "  -c, --clean      Clean up work files after build")"
-	echo "$(gettext "  -d, --nodeps     Skip all dependency checks")"
-	printf "$(gettext "  -e, --noextract  Do not extract source files (use existing %s dir)")\n" "src/"
-	echo "$(gettext "  -f, --force      Overwrite existing package")"
-	echo "$(gettext "  -g, --geninteg   Generate integrity checks for source files")"
-	echo "$(gettext "  -h, --help       Show this help message and exit")"
-	echo "$(gettext "  -i, --install    Install package after successful build")"
-	echo "$(gettext "  -L, --log        Log package build process")"
-	echo "$(gettext "  -m, --nocolor    Disable colorized output messages")"
-	echo "$(gettext "  -o, --nobuild    Download and extract files only")"
-	printf "$(gettext "  -p <file>        Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT"
-	echo "$(gettext "  -r, --rmdeps     Remove installed dependencies after a successful build")"
-	echo "$(gettext "  -R, --repackage  Repackage contents of the package without rebuilding")"
-	printf "$(gettext "  -s, --syncdeps   Install missing dependencies with %s")\n" "pacman"
-	echo "$(gettext "  -S, --source     Generate a source-only tarball without downloaded sources")"
-	echo "$(gettext "  --allsource      Generate a source-only tarball including downloaded sources")"
-	printf "$(gettext "  --asroot         Allow %s to run as root user")\n" "makepkg"
-	printf "$(gettext "  --check          Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT"
-	printf "$(gettext "  --config <file>  Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf"
-	printf "$(gettext "  --holdver        Prevent automatic version bumping for development %ss")\n" "$BUILDSCRIPT"
-	printf "$(gettext "  --key <key>      Specify a key to use for %s signing instead of the default")\n" "gpg"
-	printf "$(gettext "  --nocheck        Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT"
-	echo "$(gettext "  --nosign         Do not create a signature for the package")"
-	echo "$(gettext "  --pkg <list>     Only build listed packages from a split package")"
-	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")"
+	printf -- "$(gettext "Options:")\n"
+	printf -- "$(gettext "  -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT"
+	printf -- "$(gettext "  -c, --clean      Clean up work files after build")\n"
+	printf -- "$(gettext "  -d, --nodeps     Skip all dependency checks")\n"
+	printf -- "$(gettext "  -e, --noextract  Do not extract source files (use existing %s dir)")\n" "src/"
+	printf -- "$(gettext "  -f, --force      Overwrite existing package")\n"
+	printf -- "$(gettext "  -g, --geninteg   Generate integrity checks for source files")\n"
+	printf -- "$(gettext "  -h, --help       Show this help message and exit")\n"
+	printf -- "$(gettext "  -i, --install    Install package after successful build")\n"
+	printf -- "$(gettext "  -L, --log        Log package build process")\n"
+	printf -- "$(gettext "  -m, --nocolor    Disable colorized output messages")\n"
+	printf -- "$(gettext "  -o, --nobuild    Download and extract files only")\n"
+	printf -- "$(gettext "  -p <file>        Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT"
+	printf -- "$(gettext "  -r, --rmdeps     Remove installed dependencies after a successful build")\n"
+	printf -- "$(gettext "  -R, --repackage  Repackage contents of the package without rebuilding")\n"
+	printf -- "$(gettext "  -s, --syncdeps   Install missing dependencies with %s")\n" "pacman"
+	printf -- "$(gettext "  -S, --source     Generate a source-only tarball without downloaded sources")\n"
+	printf -- "$(gettext "  --allsource      Generate a source-only tarball including downloaded sources")\n"
+	printf -- "$(gettext "  --asroot         Allow %s to run as root user")\n" "makepkg"
+	printf -- "$(gettext "  --check          Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT"
+	printf -- "$(gettext "  --config <file>  Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf"
+	printf -- "$(gettext "  --holdver        Prevent automatic version bumping for development %ss")\n" "$BUILDSCRIPT"
+	printf -- "$(gettext "  --key <key>      Specify a key to use for %s signing instead of the default")\n" "gpg"
+	printf -- "$(gettext "  --nocheck        Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT"
+	printf -- "$(gettext "  --nosign         Do not create a signature for the package")\n"
+	printf -- "$(gettext "  --pkg <list>     Only build listed packages from a split package")\n"
+	printf -- "$(gettext "  --sign           Sign the resulting package with %s")\n" "gpg"
+	printf -- "$(gettext "  --skipchecksums  Do not verify checksums of the source files")\n"
+	printf -- "$(gettext "  --skipinteg      Do not perform any verification checks on source files")\n"
+	printf -- "$(gettext "  --skippgpcheck   Do not verify source files with PGP signatures")\n"
 	echo
-	printf "$(gettext "These options can be passed to %s:")\n" "pacman"
+	printf -- "$(gettext "These options can be passed to %s:")\n" "pacman"
 	echo
-	echo "$(gettext "  --noconfirm      Do not ask for confirmation when resolving dependencies")"
-	echo "$(gettext "  --noprogressbar  Do not show a progress bar when downloading files")"
+	printf -- "$(gettext "  --noconfirm      Do not ask for confirmation when resolving dependencies")\n"
+	printf -- "$(gettext "  --noprogressbar  Do not show a progress bar when downloading files")\n"
 	echo
-	printf "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT"
+	printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT"
 	echo
 }
 
 version() {
 	printf "makepkg (pacman) %s\n" "$myver"
-	printf "$(gettext "\
-Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>.\n\
+	printf -- "$(gettext "\
+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")"
@@ -1957,6 +1958,15 @@ while true; do
 	shift
 done
 
+# setup signal traps
+trap 'clean_up' 0
+for signal in TERM HUP QUIT; do
+	trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal"
+done
+trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
+trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
+set -E
+
 # preserve environment variables and canonicalize path
 [[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST})
 [[ -n ${SRCDEST} ]] && _SRCDEST=$(canonicalize_path ${SRCDEST})
@@ -2043,6 +2053,11 @@ fi
 
 SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST}
 SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined
+if (( SOURCEONLY )) && [[ ! -w $SRCPKGDEST ]]; then
+	error "$(gettext "You do not have write permission to store source tarballs in %s.")" "$SRCPKGDEST"
+	plain "$(gettext "Aborting...")"
+	exit 1
+fi
 
 PKGEXT=${_PKGEXT:-$PKGEXT}
 SRCEXT=${_SRCEXT:-$SRCEXT}
@@ -2091,7 +2106,9 @@ if [[ ! -f $BUILDFILE ]]; then
 	else
 		# PKGBUILD passed through a pipe
 		BUILDFILE=/dev/stdin
+		shopt -u extglob
 		source "$BUILDFILE"
+		shopt -s extglob
 	fi
 else
 	crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true)
@@ -2103,7 +2120,9 @@ else
 	if [[ ${BUILDFILE:0:1} != "/" ]]; then
 		BUILDFILE="$startdir/$BUILDFILE"
 	fi
+	shopt -u extglob
 	source "$BUILDFILE"
+	shopt -s extglob
 fi
 
 # set defaults if they weren't specified in buildfile
@@ -2289,7 +2308,7 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then
 		warning "$(gettext "Skipping dependency checks.")"
 	fi
 elif type -p "${PACMAN%% *}" >/dev/null; then
-	if (( RMDEPS )); then
+	if (( RMDEPS && ! INSTALL )); then
 		original_pkglist=($(run_pacman -Qq))    # required by remove_dep
 	fi
 	deperr=0
@@ -2297,6 +2316,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then
 	msg "$(gettext "Checking runtime dependencies...")"
 	resolve_deps ${depends[@]} || deperr=1
 
+	if (( RMDEPS && INSTALL )); then
+		original_pkglist=($(run_pacman -Qq))    # required by remove_dep
+	fi
+
 	msg "$(gettext "Checking buildtime dependencies...")"
 	resolve_deps ${makedepends[@]} || deperr=1
 

scripts/pacman-db-upgrade.sh.in

@@ -3,7 +3,7 @@
 #   pacman-db-upgrade - upgrade the local pacman db to a newer format
 #   @configure_input@
 #
-#   Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -32,13 +32,13 @@ m4_include(library/output_format.sh)
 
 usage() {
 	printf "pacman-db-upgrade (pacman) %s\n\n" "$myver"
-	printf "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
+	printf -- "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
 }
 
 version() {
 	printf "pacman-db-upgrade (pacman) %s\n" "$myver"
-	printf "$(gettext "\
-Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>.\n\
+	printf -- "$(gettext "\
+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")"
 }

scripts/pacman-key.sh.in

@@ -1,10 +1,10 @@
-#!/bin/bash -e
+#!/bin/bash
 #
 #   pacman-key - manages pacman's keyring
 #                Based on apt-key, from Debian
 #   @configure_input@
 #
-#   Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -54,48 +54,49 @@ m4_include(library/parse_options.sh)
 usage() {
 	printf "pacman-key (pacman) %s\n" ${myver}
 	echo
-	printf "$(gettext "Usage: %s [options]")\n" $(basename $0)
+	printf -- "$(gettext "Usage: %s [options]")\n" $(basename $0)
 	echo
-	printf "$(gettext "Manage pacman\'s list of trusted keys")\n"
+	printf -- "$(gettext "Manage pacman's list of trusted keys")\n"
 	echo
-	echo "$(gettext "Options:")"
-	echo "$(gettext "  -a, --add [file(s)]       Add the specified keys (empty for stdin)")"
-	echo "$(gettext "  -d, --delete <keyid(s)>   Remove the specified keyids")"
-	echo "$(gettext "  -e, --export [keyid(s)]   Export the specified or all keyids")"
-	echo "$(gettext "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids")"
-	echo "$(gettext "  -h, --help                Show this help message and exit")"
-	echo "$(gettext "  -l, --list-keys [keyid(s)] List the specified or all keys")"
-	echo "$(gettext "  -r, --recv-keys <keyid(s)> Fetch the specified keyids")"
-	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")"
-	printf "$(gettext "  --config <file>           Use an alternate config file (instead of\n\
+	printf -- "$(gettext "Options:")\n"
+	printf -- "$(gettext "  -a, --add [file(s)]       Add the specified keys (empty for stdin)")\n"
+	printf -- "$(gettext "  -d, --delete <keyid(s)>   Remove the specified keyids")\n"
+	printf -- "$(gettext "  -e, --export [keyid(s)]   Export the specified or all keyids")\n"
+	printf -- "$(gettext "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids")\n"
+	printf -- "$(gettext "  -h, --help                Show this help message and exit")\n"
+	printf -- "$(gettext "  -l, --list-keys [keyid(s)] List the specified or all keys")\n"
+	printf -- "$(gettext "  -r, --recv-keys <keyid(s)> Fetch the specified keyids")\n"
+	printf -- "$(gettext "  -u, --updatedb            Update the trustdb of pacman")\n"
+	printf -- "$(gettext "  -v, --verify <signature>  Verify the file specified by the signature")\n"
+	printf -- "$(gettext "  -V, --version             Show program version")\n"
+	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")"
-	printf "$(gettext "  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\n\
+	printf -- "$(gettext "  --edit-key <keyid(s)>     Present a menu for key management task on keyids")\n"
+	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")"
-	echo "$(gettext "  --keyserver               Specify a keyserver to use if necessary")"
-	echo "$(gettext "  --list-sigs [keyid(s)]    List keys and their signatures")"
-	echo "$(gettext "  --lsign-key <keyid>       Locally sign the specified keyid")"
-	printf "$(gettext "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings\n\
+	printf -- "$(gettext "  --import <dir(s)>         Imports pubring.gpg from dir(s)")\n"
+	printf -- "$(gettext "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")\n"
+	printf -- "$(gettext "  --init                    Ensure the keyring is properly initialized")\n"
+	printf -- "$(gettext "  --keyserver               Specify a keyserver to use if necessary")\n"
+	printf -- "$(gettext "  --list-sigs [keyid(s)]    List keys and their signatures")\n"
+	printf -- "$(gettext "  --lsign-key <keyid>       Locally sign the specified keyid")\n"
+	printf -- "$(gettext "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings\n\
                             in '%s'")\n" "@pkgdatadir@/keyrings"
-	echo "$(gettext "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver")"
+	printf -- "$(gettext "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver")\n"
 }
 
 version() {
 	printf "pacman-key (pacman) %s\n" "${myver}"
-	printf "$(gettext "\
-Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>.\n\
+	printf -- "$(gettext "\
+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")"
 }
 
 # read the config file "$1" which has key=value pairs, and return the key which
 # matches "$2". the equals sign between pairs may be surrounded by any amount
-# of whitespace.
+# of whitespace. Optionally, "$3" can be specified which is the default value
+# when no key is found.
 get_from() {
 	while IFS='=' read -r key value; do
 		[[ -z $key || ${key:0:1} = '#' ]] && continue
@@ -105,6 +106,10 @@ get_from() {
 			return 0
 		fi
 	done < "$1"
+	if [[ -n "$3" ]]; then
+		printf '%s\n' "$3"
+		return 0
+	fi
 	return 1
 }
 
@@ -131,13 +136,25 @@ secret_keys_available() {
 # Note that if we find it commented out, we won't add the option.
 # args: $1 conffile, $2 option-name, $3 (optional) option-value
 add_gpg_conf_option() {
-	local confline
+	local conffile=$1; shift
 	# looking for the option 'bare', only leading spaces or # chars allowed,
 	# followed by at least one space and any other text or the end of line.
-	if ! grep -q "^[[:space:]#]*$2\([[:space:]].*\)*$" "$1" &>/dev/null; then
-		confline="$2"
-		[[ -n $3 ]] && confline="$2 $3"
-		echo "$confline" >> "$1"
+	if ! grep -q "^[[:space:]#]*$1\([[:space:]].*\)*$" "$conffile" &>/dev/null; then
+		printf '%s\n' "$*" >> "$conffile"
+	fi
+}
+
+check_keyids_exist() {
+	local ret=0
+	for key in "${KEYIDS[@]}"; do
+		# Verify if the key exists in pacman's keyring
+		if ! "${GPG_PACMAN[@]}" --list-keys "$key" &>/dev/null ; then
+			error "$(gettext "The key identified by %s could not be found locally.")" "$key"
+			ret=1
+		fi
+	done
+	if (( ret )); then
+		exit 1
 	fi
 }
 
@@ -163,6 +180,7 @@ initialize() {
 	add_gpg_conf_option "$conffile" 'lock-never'
 	keyserv=${KEYSERVER:-$DEFAULT_KEYSERVER}
 	add_gpg_conf_option "$conffile" 'keyserver' "$keyserv"
+	add_gpg_conf_option "$conffile" 'keyserver-options' 'timeout=10'
 
 	# set up a private signing key (if none available)
 	if [[ $(secret_keys_available) -lt 1 ]]; then
@@ -174,14 +192,14 @@ initialize() {
 check_keyring() {
 	if [[ ! -r ${PACMAN_KEYRING_DIR}/pubring.gpg || \
 			! -r ${PACMAN_KEYRING_DIR}/trustdb.gpg ]]; then
-		error "$(gettext "You do not have sufficient permissions to read the %s keyring...")" "pacman"
+		error "$(gettext "You do not have sufficient permissions to read the %s keyring.")" "pacman"
 		msg "$(gettext "Use '%s' to correct the keyring permissions.")" "pacman-key --init"
 		exit 1
 	fi
 
 	if (( (EXPORT || FINGER || LIST || VERIFY) && EUID != 0 )); then
 		if ! grep -q "^[[:space:]]*lock-never[[:space:]]*$" ${PACMAN_KEYRING_DIR}/gpg.conf &>/dev/null; then
-			error "$(gettext "You do not have sufficient permissions to run this command...")"
+			error "$(gettext "You do not have sufficient permissions to run this command.")"
 			msg "$(gettext "Use '%s' to correct the keyring permissions.")" "pacman-key --init"
 			exit 1
 		fi
@@ -212,7 +230,7 @@ verify_keyring_input() {
 	local ret=0;
 	local KEYRING_IMPORT_DIR='@pkgdatadir@/keyrings'
 
-	# Verify signatures of keyring files and association revocation files if they exist
+	# Verify signatures of keyring files and trusted/revoked files if they exist
 	msg "$(gettext "Verifying keyring file signatures...")"
 	local keyring keyfile
 	for keyring in "${KEYRINGIDS[@]}"; do
@@ -275,14 +293,18 @@ populate_keyring() {
 		"${GPG_PACMAN[@]}" --import "${KEYRING_IMPORT_DIR}/${keyring}.gpg"
 	done
 
-	# Read the trusted key IDs to an array. The conversion from whatever is inside the file
-	# to key ids is important, because key ids are the only guarantee of identification
-	# for the keys.
+	# Read the trusted key IDs to an array. Because this is an ownertrust
+	# file, we know we have the full 40 hex digit fingerprint values.
+	# Format of ownertrust dump file:
+	#  40CHARFINGERPRINTXXXXXXXXXXXXXXXXXXXXXXX:6:
+	#  40CHARFINGERPRINTXXXXXXXXXXXXXXXXXXXXXXX:5:
 	local -A trusted_ids
 	for keyring in "${KEYRINGIDS[@]}"; do
 		if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
 			while read key; do
-				key_id="$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" 2>/dev/null | grep ^pub | cut -d: -f5)"
+				# skip comments; these are valid in this file
+				[[ $key = \#* ]] && continue
+				key_id="${key%%:*}"
 				if [[ -n ${key_id} ]]; then
 					# Mark this key to be lsigned
 					trusted_ids[$key_id]="${keyring}"
@@ -297,9 +319,17 @@ populate_keyring() {
 			msg2 "$(gettext "Locally signing key %s...")" "${key_id}"
 			"${GPG_PACMAN[@]}" --quiet --lsign-key "${key_id}"
 		done
+		msg "$(gettext "Importing owner trust values...")"
+		for keyring in "${KEYRINGIDS[@]}"; do
+			if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
+				"${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted"
+			fi
+		done
 	fi
 
-	# Read the revoked key IDs to an array.
+	# Read the revoked key IDs to an array. The conversion from whatever is
+	# inside the file to key ids is important, because key ids are the only
+	# guarantee of identification for the keys.
 	local -A revoked_ids
 	for keyring in "${KEYRINGIDS[@]}"; do
 		if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then
@@ -322,48 +352,144 @@ populate_keyring() {
 	fi
 }
 
+add_keys() {
+	if ! "${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}" ; then
+		error "$(gettext "A specified keyfile could not be added to the gpg keychain.")"
+		exit 1
+	fi
+}
+
+delete_keys() {
+	check_keyids_exist
+	if ! "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}" ; then
+		error "$(gettext "A specified key could not be removed from the gpg keychain.")"
+		exit 1
+	fi
+}
+
 edit_keys() {
-	local errors=0;
+	check_keyids_exist
+	local ret=0
 	for key in "${KEYIDS[@]}"; do
-		# Verify if the key exists in pacman's keyring
-		if ! "${GPG_PACMAN[@]}" --list-keys "$key" &>/dev/null; then
-			error "$(gettext "The key identified by %s does not exist")" "$key"
-			errors=1;
+		if ! "${GPG_PACMAN[@]}" --edit-key "$key" ; then
+			error "$(gettext "The key identified by %s could not be edited.")" "$key"
+			ret=1
 		fi
 	done
-	(( errors )) && exit 1;
+	if (( ret )); then
+		exit 1
+	fi
+}
 
-	for key in "${KEYIDS[@]}"; do
-		"${GPG_PACMAN[@]}" --edit-key "$key"
-	done
+export_keys() {
+	check_keyids_exist
+	if ! "${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}" ; then
+		error "$(gettext "A specified key could not be exported from the gpg keychain.")"
+		exit 1
+	fi
+}
+
+finger_keys() {
+	check_keyids_exist
+	if ! "${GPG_PACMAN[@]}" --batch --fingerprint "${KEYIDS[@]}" ; then
+		error "$(gettext "The fingerprint of a specified key could not be determined.")"
+		exit 1
+	fi
 }
 
 import_trustdb() {
 	local importdir
-	local trustdb=$(mktemp)
-	"${GPG_PACMAN[@]}" --export-ownertrust > ${trustdb}
-
+	local ret=0
 	for importdir in "${IMPORT_DIRS[@]}"; do
 		if [[ -f "${importdir}/trustdb.gpg" ]]; then
-			gpg --homedir "${importdir}" --export-ownertrust >> ${trustdb}
+			gpg --homedir "${importdir}" --export-ownertrust | \
+				"${GPG_PACMAN[@]}" --import-ownertrust -
+			if (( PIPESTATUS )); then
+				error "$(gettext "%s could not be imported.")" "${importdir}/trustdb.gpg"
+				ret=1
+			fi
+		else
+			error "$(gettext "File %s does not exist and could not be imported.")" "${importdir}/trustdb.gpg"
+			ret=1
 		fi
 	done
-
-	"${GPG_PACMAN[@]}" --import-ownertrust ${trustdb}
-	rm -f ${trustdb}
+	if (( ret )); then
+		exit 1
+	fi
 }
 
 import() {
 	local importdir
-
-	# Imports public keys, then import trustdbs
+	local ret=0
 	for importdir in "${IMPORT_DIRS[@]}"; do
 		if [[ -f "${importdir}/pubring.gpg" ]]; then
-			"${GPG_PACMAN[@]}" --quiet --batch --import "${importdir}/pubring.gpg"
+			if ! "${GPG_PACMAN[@]}" --quiet --batch --import "${importdir}/pubring.gpg" ; then
+				error "$(gettext "%s could not be imported.")" "${importdir}/pubring.gpg"
+				ret=1
+			fi
+		else
+			error "$(gettext "File %s does not exist and could not be imported.")" "${importdir}/pubring.gpg"
+			ret=1
 		fi
 	done
+	if (( ret )); then
+		exit 1
+	fi
+}
 
-	import_trustdb
+list_keys() {
+	check_keyids_exist
+	if ! "${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}" ; then
+		error "$(gettext "A specified key could not be listed.")"
+		exit 1
+	fi
+}
+
+list_sigs() {
+	check_keyids_exist
+	if ! "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}" ; then
+		error "$(gettext "A specified signature could not be listed.")"
+		exit 1
+	fi
+}
+
+lsign_keys() {
+	check_keyids_exist
+	printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${KEYIDS[@]}" 2>/dev/null
+	if (( PIPESTATUS[1] )); then
+		error "$(gettext "A specified key could not be locally signed.")"
+		exit 1
+	fi
+}
+
+receive_keys() {
+	if ! "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}" ; then
+		error "$(gettext "Remote key not fetched correctly from keyserver.")"
+		exit 1
+	fi
+}
+
+refresh_keys() {
+	check_keyids_exist
+	if ! "${GPG_PACMAN[@]}" --refresh-keys "${KEYIDS[@]}" ; then
+		error "$(gettext "A specified local key could not be updated from a keyserver.")"
+		exit 1
+	fi
+}
+
+verify_sig() {
+	if ! "${GPG_PACMAN[@]}" --verify $SIGNATURE ; then
+		error "$(gettext "The signature identified by %s could not be verified.")" "$SIGNATURE"
+		exit 1
+	fi
+}
+
+updatedb() {
+	msg "$(gettext "Updating trust database...")"
+	if ! "${GPG_PACMAN[@]}" --batch --check-trustdb ; then
+		error "$(gettext "Trust database could not be updated.")"
+		exit 1
+	fi
 }
 
 # PROGRAM START
@@ -439,11 +565,11 @@ fi
 
 # if PACMAN_KEYRING_DIR isn't assigned, try to get it from the config
 # file, falling back on a hard default
-PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" || echo "@sysconfdir@/pacman.d/gnupg")}
+PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" "@sysconfdir@/pacman.d/gnupg")}
 
-GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning)
+GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
 if [[ -n ${KEYSERVER} ]]; then
-	GPG_PACMAN+=(--keyserver ${KEYSERVER})
+	GPG_PACMAN+=(--keyserver "${KEYSERVER}")
 fi
 
 # check only a single operation has been given
@@ -459,35 +585,32 @@ case $numopt in
 		fi
 		;;
 	[!1])
-		error "$(gettext "Multiple operations specified")"
-		printf "$(gettext "Please run %s with each operation separately\n")" "pacman-key"
+		error "$(gettext "Multiple operations specified.")"
+		msg "$(gettext "Please run %s with each operation separately.")" "pacman-key"
 		exit 1
 		;;
 esac
 
 (( ! INIT )) && check_keyring
 
-(( ADD )) && "${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}"
-(( DELETE )) && "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}"
+(( ADD )) && add_keys
+(( DELETE )) && delete_keys
 (( EDITKEY )) && edit_keys
-(( EXPORT )) && "${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}"
-(( FINGER )) && "${GPG_PACMAN[@]}" --batch --fingerprint "${KEYIDS[@]}"
+(( EXPORT )) && export_keys
+(( FINGER )) && finger_keys
 (( IMPORT )) && import
 (( IMPORT_TRUSTDB)) && import_trustdb
 (( INIT )) && initialize
-(( LISTKEYS )) && "${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}"
-(( LISTSIGS )) && "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}"
-if (( LSIGNKEY )); then
-	printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${KEYIDS[@]}" 2>/dev/null
-fi
+(( LISTKEYS )) && list_keys
+(( LISTSIGS )) && list_sigs
+(( LSIGNKEY )) && lsign_keys
 (( POPULATE )) && populate_keyring
-(( RECEIVE )) && "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}"
-(( REFRESH )) && "${GPG_PACMAN[@]}" --refresh-keys "${KEYIDS[@]}"
-(( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE
+(( RECEIVE )) && receive_keys
+(( REFRESH )) && refresh_keys
+(( VERIFY )) && verify_sig
 
-if (( UPDATEDB )); then
-	msg "$(gettext "Updating trust database...")"
-	"${GPG_PACMAN[@]}" --batch --check-trustdb
-fi
+(( UPDATEDB )) && updatedb
+
+exit 0
 
 # vim: set ts=2 sw=2 noet:

scripts/pacman-optimize.sh.in

@@ -3,7 +3,7 @@
 #   pacman-optimize
 #   @configure_input@
 #
-#   Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>
 #   Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -33,11 +33,11 @@ m4_include(library/output_format.sh)
 
 usage() {
 	printf "pacman-optimize (pacman) %s\n\n" "$myver"
-	printf "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
-	printf "$(gettext "\
+	printf -- "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
+	printf -- "$(gettext "\
 pacman-optimize is a little hack that should improve the performance\n\
 of pacman when reading/writing to its filesystem-based database.\n\n")"
-	printf "$(gettext "\
+	printf -- "$(gettext "\
 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\
@@ -48,8 +48,8 @@ does not have to move around the disk as much.\n")"
 
 version() {
 	printf "pacman-optimize (pacman) %s\n" "$myver"
-	printf "$(gettext "\
-Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>.\n\
+	printf -- "$(gettext "\
+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")"

scripts/pkgdelta.sh.in

@@ -38,16 +38,16 @@ m4_include(library/output_format.sh)
 # print usage instructions
 usage() {
 	printf "pkgdelta (pacman) %s\n\n" "$myver"
-	printf "$(gettext "Usage: pkgdelta [-q] <package1> <package2>\n")"
-	printf "$(gettext "\
+	printf -- "$(gettext "Usage: pkgdelta [-q] <package1> <package2>\n")"
+	printf -- "$(gettext "\
 	pkgdelta will create a delta file between two packages.\n\
 This delta file can then be added to a database using repo-add.\n\n")"
-	echo "$(gettext "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")"
+	printf -- "$(gettext "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n"
 }
 
 version() {
 	printf "pkgdelta (pacman) %s\n\n" "$myver"
-	printf "$(gettext "\
+	printf -- "$(gettext "\
 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")"
@@ -93,17 +93,17 @@ create_xdelta()
 	newver="$pkgver"
 	newarch="$arch"
 
-	if [[ $oldname != $newname ]]; then
+	if [[ $oldname != "$newname" ]]; then
 		error "$(gettext "The package names don't match : '%s' and '%s'")" "$oldname" "$newname"
 		return 1
 	fi
 
-	if [[ $oldarch != $newarch ]]; then
+	if [[ $oldarch != "$newarch" ]]; then
 		error "$(gettext "The package architectures don't match : '%s' and '%s'")" "$oldarch" "$newarch"
 		return 1
 	fi
 
-	if [[ $oldver == $newver ]]; then
+	if [[ $oldver == "$newver" ]]; then
 		error "$(gettext "Both packages have the same version : '%s'")" "$newver"
 		return 1
 	fi

scripts/po/Makevars

@@ -8,9 +8,7 @@ subdir = scripts/po
 top_builddir = ../../
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --no-location \
-  --keyword=_ --flag=_:1:c-format \
-  --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format
+XGETTEXT_OPTIONS = --no-location
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

scripts/po/cs.po

@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Dan McGee <dpmcgee@gmail.com>, 2011.
+# Marek Otahal <markotahalREMOVETHIS@gmail.com>, 2011.
+#   <markotahal@gmail.com>, 2011.
+# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2011.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-08-15 21:10+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 06:07+0000\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/cs/)\n"
 "Language: cs\n"
@@ -25,16 +29,16 @@ msgid "ERROR:"
 msgstr "CHYBA:"
 
 msgid "Cleaning up..."
-msgstr "Probíhá vyčištění..."
+msgstr "Probíhá čištění..."
 
 msgid "Entering %s environment..."
-msgstr ""
+msgstr "Vstupuje se do %s prostředí..."
 
 msgid "Unable to find source file %s."
 msgstr "Nepodařilo se nalézt zdrojový soubor %s."
 
 msgid "Aborting..."
-msgstr "Probíhá rušení..."
+msgstr "Rušení..."
 
 msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "Použitý agent neumí zacházet s %s URL. Zkontrolujte %s."
@@ -74,10 +78,10 @@ msgid "Failure while downloading %s"
 msgstr "Selhalo stažení %s"
 
 msgid "Generating checksums for source files..."
-msgstr "Generují se kontrolní součty zdrojových souborů..."
+msgstr "Počítají se kontrolní součty zdrojových souborů..."
 
 msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
+msgstr "Nelze nalézt soubor %s potřebný pro vytvoření kontrolních součtů."
 
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Zadán chybný algoritmus '%s' pro kontrolu integrity."
@@ -104,43 +108,43 @@ msgid "Integrity checks are missing."
 msgstr "Kontrolní součty nebyly nalezeny."
 
 msgid "Verifying source file signatures with %s..."
-msgstr ""
+msgstr "Kontrola podpisů zdrojových souborů pomocí %s..."
 
 msgid "SIGNATURE NOT FOUND"
-msgstr ""
+msgstr "PODPIS NENALEZEN"
 
 msgid "SOURCE FILE NOT FOUND"
-msgstr ""
+msgstr "ZDROJOVÝ SOUBOR NENALEZEN"
 
 msgid "unknown public key"
-msgstr ""
+msgstr "neznámý veřejný klíč"
 
 msgid "the key has been revoked."
-msgstr ""
+msgstr "tento klíč byl odvolán. "
 
 msgid "the signature has expired."
-msgstr ""
+msgstr "platnost podpisu vypršela."
 
 msgid "the key has expired."
-msgstr ""
+msgstr "platnost klíče vypršela."
 
 msgid "One or more PGP signatures could not be verified!"
-msgstr ""
+msgstr "Jeden nebo více podpisů PGP se nepodařilo ověřit!"
 
 msgid "Warnings have occurred while verifying the signatures."
-msgstr ""
+msgstr "Během kontroly podpisů nastala varování."
 
 msgid "Please make sure you really trust them."
-msgstr ""
+msgstr "Prosím ověřte, že jim skutečně důvěřujete."
 
 msgid "Skipping all source file integrity checks."
-msgstr ""
+msgstr "Vynechává se kontrola integrity."
 
 msgid "Skipping verification of source file checksums."
-msgstr ""
+msgstr "Vynechává se ověřování kontrolních součtů."
 
 msgid "Skipping verification of source file PGP signatures."
-msgstr ""
+msgstr "Vynechává se ověřování PGP podpisů zdrojových souborů."
 
 msgid "Extracting Sources..."
 msgstr "Rozbalují se zdrojové soubory..."
@@ -158,13 +162,13 @@ msgid "Starting %s()..."
 msgstr "Spouští se %s()..."
 
 msgid "Tidying install..."
-msgstr "Uklízí se instalace..."
+msgstr "Pročišťuje se instalace..."
 
 msgid "Removing doc files..."
 msgstr "Odstraňují se doc soubory..."
 
 msgid "Purging unwanted files..."
-msgstr ""
+msgstr "Promazávají se zbytečné soubory..."
 
 msgid "Compressing man and info pages..."
 msgstr "Komprimují se man a info stránky..."
@@ -174,37 +178,37 @@ msgstr ""
 "Odstraňují se nepotřebné ladící informace z binárních souborů a knihoven..."
 
 msgid "Removing %s files..."
-msgstr ""
+msgstr "Odstraňují se %s soubory..."
 
 msgid "Removing empty directories..."
 msgstr "Odstraňují se prázdné adresáře..."
 
 msgid "Compressing binaries with %s..."
-msgstr ""
+msgstr "Kompimují se soubory (%s)..."
 
 msgid "Could not compress binary : %s"
-msgstr ""
+msgstr "Nepodařilo se komprimovat soubor: %s"
 
 msgid "Generating %s file..."
-msgstr ""
+msgstr "Vytváření %s souboru..."
 
 msgid "Cannot find library listed in %s: %s"
-msgstr ""
+msgstr "Nelze nalézt knihovnu ovedenou v %s: %s"
 
 msgid "Please add a license line to your %s!"
 msgstr "Přidejte, prosím, informace o licenci do vašeho %s!"
 
 msgid "Example for GPL'ed software: %s."
-msgstr ""
+msgstr "Ukázka pro software pod GPL licencí: %s."
 
 msgid "%s entry file not in package : %s"
-msgstr ""
+msgstr "%s soubor není v balíčku: %s"
 
 msgid "Package contains reference to %s"
 msgstr "Balíček obsahuje odkaz na %s"
 
 msgid "Missing %s directory."
-msgstr ""
+msgstr "Chybí složka %s."
 
 msgid "Creating package..."
 msgstr "Vytváří se balíček..."
@@ -225,13 +229,13 @@ msgid "Failed to create symlink to package file."
 msgstr "Selhalo vytváření symbolického odkazu na soubor balíčku."
 
 msgid "Signing package..."
-msgstr ""
+msgstr "Podepisování balíčku..."
 
 msgid "Created signature file %s."
-msgstr ""
+msgstr "Vytvořen podpisový soubor %s."
 
 msgid "Failed to sign package file."
-msgstr ""
+msgstr "Selhalo podepisování balíčku."
 
 msgid "Creating source package..."
 msgstr "Vytváří se zdrojový balíček..."
@@ -252,10 +256,10 @@ msgid "Failed to create symlink to source package file."
 msgstr "Nepodařilo se vytvořit symbolický odkaz na soubor zdrojového balíčku."
 
 msgid "Installing package %s with %s..."
-msgstr ""
+msgstr "Instaluje se balíček %s pomocí %s ..."
 
 msgid "Installing %s package group with %s..."
-msgstr ""
+msgstr "Instaluje se skupina balíčků %s pomocí %s ..."
 
 msgid "Failed to install built package(s)."
 msgstr "Selhala instalace vytvořeného balíčku."
@@ -267,10 +271,10 @@ msgid "%s is not allowed to start with a hyphen."
 msgstr "%s nemůže začínat pomlčkou."
 
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
-msgstr ""
+msgstr "%s nesmí obsahovat dvojtečky, pomlčky nebo mezery."
 
 msgid "%s is not allowed to contain hyphens or whitespace."
-msgstr ""
+msgstr "%s nemůže obsahovat pomlčky nebo mezery."
 
 msgid "%s must be an integer."
 msgstr "%s musí být celé číslo."
@@ -282,61 +286,64 @@ msgid "Note that many packages may need a line added to their %s"
 msgstr "Všimněte si, že mnohé balíčky potřebují přidat řádek do %s,"
 
 msgid "such as %s."
-msgstr ""
+msgstr "jako %s."
 
 msgid "%s array cannot contain comparison (< or >) operators."
-msgstr ""
+msgstr "Pole %s nemůže obsahovat operátory porovnání (< nebo >)."
 
 msgid "%s entry should not contain leading slash : %s"
-msgstr ""
+msgstr "%s by neměl obsahovat počáteční lomítko: %s"
 
 msgid "Invalid syntax for %s : '%s'"
-msgstr ""
+msgstr "Neplatná syntaxe pro %s: '%s'"
 
 msgid "%s file (%s) does not exist."
 msgstr "Instalační skript %s (%s) neexistuje."
 
 msgid "%s array contains unknown option '%s'"
-msgstr ""
+msgstr "seznam %s obsahuje neznámou volbu '%s'"
 
 msgid "Missing %s function for split package '%s'"
-msgstr ""
+msgstr "chybí funkce balíčku %s pro rozdělení balíčku '%s'"
 
 msgid "Requested package %s is not provided in %s"
-msgstr ""
+msgstr "Požadovaný balíček %s není poskytovaný balíčkem %s"
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
 msgstr "Sudo nebylo nalezeno. K získání práv roota bude použito su."
 
 msgid "Cannot find the %s binary required for building as non-root user."
 msgstr ""
+"Nelze najít program %s požadovaný pro sestavení jako non-root uživatel."
 
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
+msgstr "Nelze najít program %s požadovaný k podepisování balíčků."
 
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
+msgstr "Nelze najít program %s požadovaný k ověření zdrojových souborů."
 
 msgid "Cannot find the %s binary required for validating sourcefile checksums."
 msgstr ""
+"Nelze najít program %s nutný k ověření kontrolních součtů u zdrojových "
+"souborů."
 
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
+msgstr "Nelze najít program %s nutný pro kompresi souborů."
 
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
+msgstr "Nelze najít program %s nutný pro distribuovanou kompilaci."
 
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
+msgstr "Nelze najít program %s nutný pro použití compiler cache."
 
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
+msgstr "Nelze najít program %s nutný ke \"stripování object souborů\"."
 
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
+msgstr "Nelze najít program %s nutný ke kompresi man a info stránek."
 
 msgid "Cannot find the %s binary required to determine latest %s revision."
-msgstr ""
+msgstr "Nelze nalézt program %s nutný k rozpoznání poslední %s revize."
 
 msgid "Determining latest %s revision..."
 msgstr "Určuje se poslední revize %s..."
@@ -351,7 +358,7 @@ msgid "Options:"
 msgstr "Volby:"
 
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
-msgstr ""
+msgstr "  -A, --ignorearch Ignorovat nekompletní pole %s v %s"
 
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Odstranit pracovní soubory po sestavení"
@@ -361,6 +368,8 @@ msgstr "  -d, --nodeps     Přeskočit všechny kontroly závislostí"
 
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
 msgstr ""
+"  -e, --noextract  Nerozbalovat zdrojové soubory (použít existující %s "
+"složku)"
 
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      Přepsat existující balíček"
@@ -369,7 +378,7 @@ msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Vygenerovat kontrolní součty zdrojových souborů"
 
 msgid "  -h, --help       Show this help message and exit"
-msgstr ""
+msgstr "  -h, --help       Vypsat nápovědu"
 
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Po úspěšném sestavení nainstalovat balíček"
@@ -395,12 +404,11 @@ msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Znovu zabalit obsah balícku bez sestavení"
 
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
-msgstr ""
+msgstr "  -s, --syncdeps   Nainstalovat chybějící závislosti pomocí %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr "  --source         Vytvořit zdrojový archiv, bez stahovaných souborů"
+msgstr "  -S, --source    Vytvoří zdrojový archiv, bez stahovaných souborů"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -409,10 +417,10 @@ msgstr ""
 "  --allsource      Vytvořit zdrojový archiv, včetně stahovaných souborů"
 
 msgid "  --asroot         Allow %s to run as root user"
-msgstr ""
+msgstr "  --asroot         Spustit %s pod uživatelem root"
 
 msgid "  --check          Run the %s function in the %s"
-msgstr ""
+msgstr "  --check          Spustí funkci %s v %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
@@ -425,33 +433,33 @@ msgstr ""
 
 msgid ""
 "  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
+msgstr "  --key <klíč>    Určí klíč pro podepisování %s namísto výchozího"
 
 msgid "  --nocheck        Do not run the %s function in the %s"
-msgstr ""
+msgstr "  --nocheck        Nespouštět funkci %s v %s"
 
 msgid "  --nosign         Do not create a signature for the package"
-msgstr ""
+msgstr "  --nosign    Nepodepisovat balíček"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr ""
 "  --pkg <list>     Sestavit jen vyjmenované balíčky z rozděleného balíčku"
 
 msgid "  --sign           Sign the resulting package with %s"
-msgstr ""
+msgstr "  --sign      Podepsat výsledný balíček pomocí %s"
 
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr ""
+msgstr "  --skipchecksums   Neověřuje kontrolní součty na zdrojových souborech"
 
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
+msgstr "  --skipinteg     Neověřuje integritu (pokud chybí kontrol. součty)"
 
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
-msgstr ""
+msgstr "  --skippgpcheck   Neověřovat PGP podpisy u zdrojových souborů"
 
 msgid "These options can be passed to %s:"
-msgstr ""
+msgstr "Tyto volby se předají %s:"
 
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
@@ -461,24 +469,29 @@ msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  Nezobrazovat průběh stahování souborů"
 
 msgid "If %s is not specified, %s will look for '%s'"
-msgstr ""
+msgstr "Když není zadáno %s, %s bude hledat '%s'"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nToto je "
-"svobodný software; vizte zdrojový kód pro podmínky kopírování.\\nNejsou "
-"poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
+
+msgid "%s signal caught. Exiting..."
+msgstr ""
+
+msgid "Aborted by user! Exiting..."
+msgstr ""
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr ""
 
 msgid "%s not found."
 msgstr "%s nebyl nalezen."
 
 msgid "You do not have write permission to create packages in %s."
-msgstr ""
+msgstr "Nemáte práva zápisu k uložení balíčků do %s."
 
 msgid "You do not have write permission to store packages in %s."
 msgstr "Nemáte práva zápisu k uložení stažených balíčků do %s."
@@ -486,62 +499,72 @@ msgstr "Nemáte práva zápisu k uložení stažených balíčků do %s."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Nemáte práva zápisu k uložení stažených souborů do %s."
 
-msgid "\\0%s and %s cannot both be specified"
+msgid "You do not have write permission to store source tarballs in %s."
 msgstr ""
 
+msgid "\\0%s and %s cannot both be specified"
+msgstr "\\0%s a %s nemohou být zadány současně"
+
 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 ""
+"Spouštění %s jako root je ŠPATNÝ nápad a může způsobit trvalou,\\n\n"
+"katastrofickou škodu na vašem systému. Pokud si opravdu přejete spustit to "
+"jako root, \\npoužijte volnu %s. "
 
 msgid ""
 "The %s option is meant for the root user only. Please\\nrerun %s without the "
 "%s flag."
 msgstr ""
+"Volba %s je pouze pro root uživatele. Prosím\\nspusťte bez přepínače %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 ""
+"Spušťení %s jako neprivilegovaný uživatel způsobí ne-rootovská vlastnická "
+"práva k souborům v balíčku.\\n Zkuste použít prostředí %s \\n přidáním %s do "
+"pole %s v %s."
 
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr ""
+msgstr "Nepoužívejte volbu %s. Tato volba je použitelná jen pro %s."
 
 msgid "%s does not exist."
 msgstr "%s neexistuje."
 
 msgid "%s contains %s characters and cannot be sourced."
-msgstr ""
+msgstr "%s obsahuje %s znaky a nemůže být načten."
 
 msgid "The key %s does not exist in your keyring."
-msgstr ""
+msgstr "Klíč %s neexistuje ve vaší klíčence."
 
 msgid "There is no key in your keyring."
-msgstr ""
+msgstr "Ve vaší klíčence není žádný klíč."
 
 msgid "A package has already been built, installing existing package..."
 msgstr "Balíček je již sestaven, instaluje se existující balíček..."
 
 msgid "A package has already been built. (use %s to overwrite)"
-msgstr ""
+msgstr "Balíček je již sestaven. (použijte %s pro přepsání)"
 
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr "Skupina balíčků je již sestavena, instalují se existující balíčky..."
 
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
+msgstr "Skupina balíčků je již sestavena. (použijte %s pro přepsání)"
 
 msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
+msgstr "Část skupiny balíčků je již sestavena. (použijte %s pro přepsání)"
 
 msgid "Leaving %s environment."
-msgstr ""
+msgstr "Opouští se prostředí %s."
 
 msgid "Repackaging without the use of a %s function is deprecated."
-msgstr ""
+msgstr "Znovu-zabalení bez použití funkce %s je zastaralé."
 
 msgid "File permissions may not be preserved."
 msgstr "Přístupová práva souborů nemusí být zachována."
@@ -550,7 +573,7 @@ msgid "Making package: %s"
 msgstr "Vytváří se balíček: %s"
 
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
+msgstr "Zdrojový balíček je již sestaven. (použijte %s pro přepsání)"
 
 msgid "Source package created: %s"
 msgstr "Zdrojový balíček vytvořen: %s"
@@ -568,16 +591,16 @@ msgid "Could not resolve all dependencies."
 msgstr "Nelze vyřešit všechny závislosti."
 
 msgid "%s was not found in %s; skipping dependency checks."
-msgstr ""
+msgstr "%s nebyl nalezen v %s, přeskakuje se kontrola závislostí."
 
 msgid "Skipping source retrieval        -- using existing %s tree"
-msgstr ""
+msgstr "Neprovádí se hledání zdrojů       -- používá se existující %s strom"
 
 msgid "Skipping source integrity checks -- using existing %s tree"
-msgstr ""
+msgstr "Neprovádí se kontrola integrity   -- používá se existující %s strom"
 
 msgid "Skipping source extraction       -- using existing %s tree"
-msgstr ""
+msgstr "Neprovádí se rozbalení zdrojů      -- používá se existující %s strom"
 
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "Zdrojový adresář je prázdný, není co sestavovat!"
@@ -589,7 +612,7 @@ msgid "Sources are ready."
 msgstr "Zdroje jsou připraveny."
 
 msgid "Removing existing %s directory..."
-msgstr ""
+msgstr "Odstraňuje se existující adresář %s ..."
 
 msgid "Finished making: %s"
 msgstr "Dokončeno vytváření: %s"
@@ -598,13 +621,10 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Použití: %s [kořen_databáze_pacmana]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nToto je svobodný software; vizte zdrojový kód pro podmínky kopírování."
-"\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s neexistuje, nebo není adresář."
@@ -625,158 +645,214 @@ msgid "Done."
 msgstr "Hotovo."
 
 msgid "Manage pacman's list of trusted keys"
-msgstr ""
+msgstr "Správa seznamu důvěryhodných klíčů pro pacman"
 
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
-msgstr ""
+msgstr "  -a, --add [soubor(y)]     Přidá uvedené klíče (prázdné pro stdin)"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
-msgstr ""
+msgstr "  -d, --delete <id klíče\\čů>     Odstraní zadaná id klíčů"
 
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
-msgstr ""
+msgstr "  -e, --exporrt [keyid(s)]    Exportuje uvedené, nebo všechny, keyids"
 
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
+"  -f, --finger [keyid(s)]      Vypíše otisky uvedených (nebo všech) klíčů"
 
 msgid "  -h, --help                Show this help message and exit"
-msgstr ""
+msgstr "  -h, --help       Vypsat nápovědu"
 
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
-msgstr ""
+msgstr "  -l, --list-keys [keyid(s)]   Vypíše uvedené (nebo všechny) klíče"
 
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
-msgstr ""
+msgstr "  -r, --recv-keys <keyid(s)>   Stáhne uvedené klíče"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr ""
+"  -u, --updatedb      Aktualizuje databázi důvěry (trustdb) v pacmanovi"
 
 msgid "  -v, --verify <signature>  Verify the file specified by the signature"
-msgstr ""
+msgstr "  -v, --verify <podpis>   Ověří soubor podpisu"
 
 msgid "  -V, --version             Show program version"
-msgstr ""
+msgstr "  -V, --version      Verze programu"
 
 msgid ""
 "  --config <file>           Use an alternate config file (instead of"
 "\\n                            '%s')"
 msgstr ""
+"  --config <soubor>    Použije zadaný konfigurační soubor (namísto"
+"\\n                                                         '%s')"
 
 msgid ""
 "  --edit-key <keyid(s)>     Present a menu for key management task on keyids"
-msgstr ""
+msgstr "  --edit-key <id klíče\\čů>     Zobrazí menu pro správu těchto klíčů"
 
 msgid ""
 "  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
 "\\n                            of '%s')"
 msgstr ""
+"  --gpgdir <složka>     nastaví vlastní adresář pro GnuPG (namísto "
+"\\n                                                                                        "
+"'%s')"
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
-msgstr ""
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
+msgstr "  --import <adresář(e)>     Načte pupring.gpg ze adresáře(ů)"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
 "(s)"
 msgstr ""
+"  --import-trustdb <složka\\ky>   Načte \"důvěryhodnost vlastníků\" z "
+"trustdb.gpg ze zadaných složek "
 
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
+msgstr " --init      Zajistí správnou inicializaci klíčenky"
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
 msgstr ""
+"  --keyserver           Určí, který server s klíči se má v případě potřeby "
+"použít"
 
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr ""
+msgstr "  --list-sigs [keyid(s)]    Výpis klíčů a jejich podpisů"
 
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
-msgstr ""
+msgstr "  --lsign-key <keyid>   Lokálně podepíše uvedené keyid"
 
 msgid ""
 "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
 "\\n                            in '%s'"
 msgstr ""
+"  --populate [keyring(s)]    Znovu načte výchozí klíče z (zadaných) klíčenek"
+"\\n                                              v '%s'"
 
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
+"  --refresh-keys [keyid(s)]   Aktualizuje uvedené (nebo všechny) klíče ze "
+"serveru s klíči."
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
+msgid "The key identified by %s could not be found locally."
 msgstr ""
 
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr "Nemáte dostatečná oprávnění pro čteni klíčenky %s."
+
 msgid "Use '%s' to correct the keyring permissions."
-msgstr ""
+msgstr "Použije '%s' k opravě práv klíčenky."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr ""
+msgid "You do not have sufficient permissions to run this command."
+msgstr "Nemáte dostatečná oprávnění spouštět tento příkaz."
 
 msgid "There is no secret key available to sign with."
-msgstr ""
+msgstr "Neexistuje žádný soukromý klíč, kterým by se dalo podepsat. "
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Použijte '%s' pro vytvoření výchozího soukromého klíče."
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Přidává se %s..."
+msgstr "Ověřuji %s ...."
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "Soubor %s je nepodepsaný, nelze pokračovat dále."
 
 msgid "The signature of file %s is not valid."
-msgstr ""
+msgstr "Podpis souboru %s je neplatný."
 
 msgid "Verifying keyring file signatures..."
-msgstr ""
+msgstr "Ověřování podpisu klíčenky..."
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "V %s nejsou žádné soubory s klíčenkou."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "Instalační skript %s (%s) neexistuje."
+msgstr "Soubor s klíčenkou %s neexistuje."
 
 msgid "Appending keys from %s.gpg..."
-msgstr ""
+msgstr "Přídávám klíče z %s.gpg..."
 
 msgid "Locally signing trusted keys in keyring..."
-msgstr ""
+msgstr "Lokálně podepisuji důvěřované klíče v klíčence..."
 
 msgid "Locally signing key %s..."
-msgstr ""
+msgstr "Lokálně podepisuji klíč %s..."
+
+msgid "Importing owner trust values..."
+msgstr "Načítání důvěry vlastníků..."
 
 msgid "Disabling revoked keys in keyring..."
-msgstr ""
+msgstr "Rušení odvolaných klíčů v klíčence..."
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Balí se %s pomocí tar..."
+msgstr "Rušení klíče %s..."
 
-msgid "The key identified by %s does not exist"
+msgid "A specified keyfile could not be added to the gpg keychain."
 msgstr ""
 
-msgid "Cannot find the %s binary required for all %s operations."
+msgid "A specified key could not be removed from the gpg keychain."
 msgstr ""
 
-msgid "%s needs to be run as root for this operation."
+msgid "The key identified by %s could not be edited."
 msgstr ""
 
-msgid "%s configuration file '%s' not found."
+msgid "A specified key could not be exported from the gpg keychain."
 msgstr ""
 
-msgid "no operation specified (use -h for help)"
+msgid "The fingerprint of a specified key could not be determined."
 msgstr ""
 
-msgid "Multiple operations specified"
+msgid "%s could not be imported."
 msgstr ""
 
-msgid "Please run %s with each operation separately\\n"
+msgid "File %s does not exist and could not be imported."
+msgstr ""
+
+msgid "A specified key could not be listed."
+msgstr ""
+
+msgid "A specified signature could not be listed."
+msgstr ""
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+msgid "The signature identified by %s could not be verified."
 msgstr ""
 
 msgid "Updating trust database..."
+msgstr "Aktualizuje se databáze důvěry..."
+
+msgid "Trust database could not be updated."
 msgstr ""
 
+msgid "Cannot find the %s binary required for all %s operations."
+msgstr "Nelze nalézt program %s nutný ke všem %s operacím."
+
+msgid "%s needs to be run as root for this operation."
+msgstr "%s musí být spuštěn jako root pro tuto operaci."
+
+msgid "%s configuration file '%s' not found."
+msgstr "%s konfigurační soubor '%s' nenalezen."
+
+msgid "no operation specified (use -h for help)"
+msgstr "nezadána žádná operace ( -h pro nápovědu)"
+
+msgid "Multiple operations specified."
+msgstr "Uvedeno více operací."
+
+msgid "Please run %s with each operation separately."
+msgstr "Prosím spusťte %s pro každou operaci samostatně."
+
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
@@ -805,7 +881,7 @@ msgid "You must have correct permissions to optimize the database."
 msgstr "Musíte mít správná oprávnění k optimalizaci databáze."
 
 msgid "Can not create temp directory for database building."
-msgstr ""
+msgstr "Nelze vytvořit dočasný adresář pro sestavení databáze."
 
 msgid "MD5sum'ing the old database..."
 msgstr "Počítá se MD5 součtu staré databáze..."
@@ -887,62 +963,60 @@ msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "Nelze nalézt příkaz xdelta3! Je xdelta3 nainstalován?"
 
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
+msgstr "Použití: repo-add [volby] <cesta-k-databázi> <balíček|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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add aktualizuje databázi balíčků pomocí čtení souboru balíčku.\\nNa "
-"příkazové řádce může být uvedeno více balíčků pro přidání.\\n\\n"
 
 msgid "Options:\\n"
-msgstr ""
+msgstr "Volby:\\n"
 
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
+msgstr "  -d, --delta    vytvoří a přidá rozdíly (delta) pro update balíčků\\n"
 
 msgid "  -f, --files       update database's file list\\n"
 msgstr ""
+"  -f/--files přepínač k aktualizaci databáze včetně záznamů o souborech.\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 
 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"
+"\\npackages to remove can be specified on the command line.\\n"
+msgstr ""
+
+msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
-"repo-remove aktualizuje databázi balíčků odstraňováním balíčků podle jména"
-"\\nuvedeného na příkazové řádce z dané databáze. Na příkazové řádce může být"
-"\\nuvedeno více balíčků pro odebrání.\\n\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
-msgstr ""
+msgstr "  -q, --quiet    omezí výpisy\\n"
 
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
+msgstr "  -s, --sign    po update podepíše databázi pomocí GnuPG\\n"
 
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
+msgstr "  -k, --key <klíč>    podepíše databázi tímto klíčem\\n"
 
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
+msgstr "  -v, --verify    ověří podpis databáze před aktualizací\\n"
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr "Příklad:  repo-remove /path/to/repo.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
@@ -957,25 +1031,25 @@ msgid "Removing existing entry '%s'..."
 msgstr "Odstraňuje se existující záznam '%s'..."
 
 msgid "Cannot find the gpg binary! Is GnuPG installed?"
-msgstr ""
+msgstr "Nelze najít program gpg! Máte nainstalované GnuPG?"
 
 msgid "Signing database..."
-msgstr ""
+msgstr "Podepisování databáze..."
 
 msgid "Failed to sign package database."
-msgstr ""
+msgstr "Nepodařilo se podepsat databázi balíčků."
 
 msgid "Verifying database signature..."
-msgstr ""
+msgstr "Ověřuje se podpis databáze..."
 
 msgid "No existing signature found, skipping verification."
-msgstr ""
+msgstr "Nenalezen žádný podpis, přeskakuji ověřování."
 
 msgid "Database signature file verified."
-msgstr ""
+msgstr "Soubor s podpisem databáze ověřen."
 
 msgid "Database signature was NOT valid!"
-msgstr ""
+msgstr "Podpis databáze NEBYL platný!"
 
 msgid "'%s' does not have a valid archive extension."
 msgstr "'%s' nemá platnou příponu archivu."
@@ -983,11 +1057,14 @@ msgstr "'%s' nemá platnou příponu archivu."
 msgid "An entry for '%s' already existed"
 msgstr "Záznam pro '%s' již existuje"
 
-msgid "Computing checksums..."
+msgid "Invalid package signature file '%s'."
 msgstr ""
 
 msgid "Adding package signature..."
-msgstr ""
+msgstr "Přidávání podpisu balíčku..."
+
+msgid "Computing checksums..."
+msgstr "Vytváření kontrolních součtů..."
 
 msgid "Creating '%s' db entry..."
 msgstr "Vytváření záznamu databáze '%s'..."
@@ -1053,7 +1130,7 @@ msgid "No packages modified, nothing to do."
 msgstr "Nebyl změněn žádný balíček, není co dělat."
 
 msgid "option %s requires an argument\\n"
-msgstr ""
+msgstr "volba %s vyžaduje nějaký argument\\n"
 
 msgid "unrecognized option"
-msgstr ""
+msgstr "neznámá volba"

scripts/po/da.po

@@ -7,9 +7,9 @@ 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-08-15 21:10+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 06:07+0000\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/da/)\n"
 "Language: da\n"
@@ -400,10 +400,9 @@ msgstr "  -R, --repackage  Pak indholdet af pakken om uden at kompilere igen"
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr "  --source         Opret en tarball kun for kilde uden hentede kilder"
+msgstr ""
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -467,12 +466,21 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
 
+msgid "%s signal caught. Exiting..."
+msgstr ""
+
+msgid "Aborted by user! Exiting..."
+msgstr ""
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr ""
+
 msgid "%s not found."
 msgstr "%s blev ikke fundet."
 
@@ -485,6 +493,9 @@ msgstr "Du har ikke skriverettigheder til at gemme pakker i %s."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Du har ikke skriverettigheder til at gemme overførsler i %s."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr ""
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr ""
 
@@ -600,7 +611,7 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Brug: %s  [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
@@ -671,8 +682,7 @@ msgid ""
 "\\n                            of '%s')"
 msgstr ""
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr ""
 
 msgid ""
@@ -701,13 +711,16 @@ msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
+msgid "The key identified by %s could not be found locally."
+msgstr ""
+
+msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr ""
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr ""
 
-msgid "You do not have sufficient permissions to run this command..."
+msgid "You do not have sufficient permissions to run this command."
 msgstr ""
 
 msgid "There is no secret key available to sign with."
@@ -716,9 +729,8 @@ msgstr ""
 msgid "Use '%s' to generate a default secret key."
 msgstr ""
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Tilføjer %s..."
+msgstr ""
 
 msgid "File %s is unsigned, cannot continue."
 msgstr ""
@@ -732,9 +744,8 @@ msgstr ""
 msgid "No keyring files exist in %s."
 msgstr ""
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "%s fil (%s) findes ikke."
+msgstr ""
 
 msgid "Appending keys from %s.gpg..."
 msgstr ""
@@ -745,14 +756,58 @@ msgstr ""
 msgid "Locally signing key %s..."
 msgstr ""
 
+msgid "Importing owner trust values..."
+msgstr ""
+
 msgid "Disabling revoked keys in keyring..."
 msgstr ""
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Udpakker %s med Tar..."
+msgstr ""
 
-msgid "The key identified by %s does not exist"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+
+msgid "The key identified by %s could not be edited."
+msgstr ""
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+msgid "%s could not be imported."
+msgstr ""
+
+msgid "File %s does not exist and could not be imported."
+msgstr ""
+
+msgid "A specified key could not be listed."
+msgstr ""
+
+msgid "A specified signature could not be listed."
+msgstr ""
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+msgid "The signature identified by %s could not be verified."
+msgstr ""
+
+msgid "Updating trust database..."
+msgstr ""
+
+msgid "Trust database could not be updated."
 msgstr ""
 
 msgid "Cannot find the %s binary required for all %s operations."
@@ -767,13 +822,10 @@ msgstr ""
 msgid "no operation specified (use -h for help)"
 msgstr ""
 
-msgid "Multiple operations specified"
+msgid "Multiple operations specified."
 msgstr ""
 
-msgid "Please run %s with each operation separately\\n"
-msgstr ""
-
-msgid "Updating trust database..."
+msgid "Please run %s with each operation separately."
 msgstr ""
 
 msgid ""
@@ -886,10 +938,8 @@ msgstr ""
 
 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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add til opdatere en pakkedatabase ved at læse en pakkefil.\\nFlere "
-"pakker at tilføje kan angives på kommandlinjen.\\n\\n"
 
 msgid "Options:\\n"
 msgstr ""
@@ -900,17 +950,17 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr ""
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 
 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"
+"\\npackages to remove can be specified on the command line.\\n"
+msgstr ""
+
+msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
-"repo-remove vil opdatatere en pakkedatabase ved at fjerne pakkenavnet"
-"\\nspecificeret på kommandolinjen fra den angive arkivdatabase. Flere"
-"\\npakker til fjernelse kan specificeres på kommandolinje.\\n\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr ""
@@ -926,18 +976,17 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr "Eksempel: repo-remove /sti/til/repo.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
@@ -978,12 +1027,15 @@ msgstr "»%s« har ikke en gyldig arkivfilendelse."
 msgid "An entry for '%s' already existed"
 msgstr "Et punkt for »%s« findes allerede"
 
-msgid "Computing checksums..."
+msgid "Invalid package signature file '%s'."
 msgstr ""
 
 msgid "Adding package signature..."
 msgstr ""
 
+msgid "Computing checksums..."
+msgstr ""
+
 msgid "Creating '%s' db entry..."
 msgstr ""
 

scripts/po/de.po

@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+#   <martin.kalcher@googlemail.com>, 2012.
+# Matthias Gorissen <matthias@archlinux.de>, 2012.
+#   <pierre@archlinux.de>, 2011.
 # Simon Schneider <SPAM.schneida@gmail.com>, 2011.
+# Thomas Scholzen <thomasdodo@arcor.de>, 2012.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-08-26 13:24+0000\n"
-"Last-Translator: jakob <jakob.matthes@gmail.com>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 20:34+0000\n"
+"Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/de/)\n"
 "Language: de\n"
@@ -117,21 +121,17 @@ msgstr "SIGNATUR NICHT GEFUNDEN"
 msgid "SOURCE FILE NOT FOUND"
 msgstr "QUELL-DATEI NICHT GEFUNDEN"
 
-#, fuzzy
 msgid "unknown public key"
-msgstr "Unbekannter öffentlicher Schlüssel"
+msgstr "unbekannter öffentlicher Schlüssel"
 
-#, fuzzy
 msgid "the key has been revoked."
-msgstr "Warnung: Der Schlüssel wurde widerrufen."
+msgstr "Der Schlüssel wurde widerrufen."
 
-#, fuzzy
 msgid "the signature has expired."
-msgstr "Warnung: Die Signatur ist abgelaufen."
+msgstr "Die Gültigkeit der Signatur ist abgelaufen."
 
-#, fuzzy
 msgid "the key has expired."
-msgstr "Warnung: Der Schlüssel ist abgelaufen."
+msgstr "Die Gültigkeit des Schlüssels ist abgelaufen."
 
 msgid "One or more PGP signatures could not be verified!"
 msgstr "Eine oder mehrere PGP-Signaturen konnten nicht überprüft werden."
@@ -431,11 +431,10 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Installiere fehlende Abhängigkeiten mit %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source         Erstellt einen Quell-Tarball ohne die heruntergeladenen "
+"  -S, --source     Erstelle einen Quell-Tarball ohne die heruntergeladenen "
 "Quellen"
 
 msgid ""
@@ -512,15 +511,24 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Falls %s nicht angegeben, wird %s nach '%s' suchen"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDies ist "
-"Freie Software, vgl. den Quellcode zu den Kopierbestimmungen.\\nEs gibt "
-"KEINE GARANTIE, soweit das Gesetz dies erlaubt.\\n"
+"freie Software, vgl. den Quellcode zu den Kopierbedingungen.\\n Es gibt "
+"KEINERLEI GARANTIE, soweit das Gesetz dies erlaubt.\\n"
+
+msgid "%s signal caught. Exiting..."
+msgstr "%s Signal empfangen. Beende..."
+
+msgid "Aborted by user! Exiting..."
+msgstr "Durch Nutzer abgebrochen! Beende..."
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr "Ein unbekannter Fehler ist aufgetreten. Beende..."
 
 msgid "%s not found."
 msgstr "%s nicht gefunden."
@@ -534,6 +542,9 @@ msgstr "Sie haben keine Schreib-Berechtigung, um Pakete in %s zu lagern."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Sie haben keine Schreib-Berechtigung, um Downloads in %s zu lagern."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr "Du hast keine Schreibrechte um den Quell Tarball in %s zu speichern."
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s und %s können nicht beide festgelegt sein."
 
@@ -663,13 +674,13 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Verwendung: %s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nDies ist Freie Software, vgl. den Quellcode zu den Kopierbestimmungen."
-"\\nEs gibt KEINE GARANTIE, soweit das Gesetz dies erlaubt.\\n"
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nDies ist freie Software, vgl. den Quellcode zu den Kopierbedingungen.\\n "
+"Es gibt KEINERLEI GARANTIE, soweit das Gesetz dies erlaubt.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s existiert nicht oder ist kein Verzeichnis"
@@ -694,41 +705,34 @@ msgstr "Fertig."
 msgid "Manage pacman's list of trusted keys"
 msgstr "Verwaltet die Liste der Trusted-Keys von pacman"
 
-#, fuzzy
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
 msgstr ""
-"  -a, --add [<file(s)>]     Füge die angegebenen Schlüssel hinzu (leer für "
+"  -a, --add [Datei(en)]       Fügt die angegebenen Schlüssel hinzu (leer für "
 "stdin)"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgstr "  -d, --delete <keyid(s)>   Lösche die angegebene Schlüssel-Kennungen"
 
-#, fuzzy
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
 msgstr ""
-"  -e, --export [<keyid(s)>] Exportie die angegebenen oder alle Schlüssel-"
-"Kennungen"
+"  -e, --export [keyid(s)]   Exportiert die angegebenen oder alle keyids"
 
-#, fuzzy
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
-"  -f, --finger [<keyid(s)>] Liste alle Fingerabdrücke der angegebenen oder "
-"aller Schlüssel-Kennungen auf"
+"  -f, --finger [keyid(s)]   Erstellt eine Liste der Fingeraberdrücke für die "
+"angegebenen oder alle keyids"
 
 msgid "  -h, --help                Show this help message and exit"
 msgstr "  -h, --help                Zeige diesen Hilfe und beende"
 
-#, fuzzy
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
 msgstr ""
-"  -l, --list-keys [<keyid(s)>] Liste die angegebenen oder alle Schlüssel auf"
+"  -l, --list-keys [keyid(s)] Erstellt eine Liste der angegebenen oder aller "
+"keyids"
 
-#, fuzzy
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
-msgstr ""
-"  -r, --receive <keyserver> <keyid(s)> Hole die angegebenen Schlüssel-"
-"Kennungen"
+msgstr "  -r, --recv-keys <keyid(s)> Holt die angegebenen keyids"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr ""
@@ -760,11 +764,10 @@ msgstr ""
 "  --gpgdir <dir>            Setze ein alternatives Verzeichnis für GnuPG (an "
 "Stelle\\n                            von '%s')"
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr ""
-"  --import <dir(s)>         Importiere pubring.gpg und trustdb.gpg aus den "
-"Verzeichnissen dir(s)"
+"  -r, --recv-keys <keyid(s)>        Importiert pubring.gpg aus den "
+"angegebenen Verzeichnissen"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
@@ -780,89 +783,147 @@ msgstr ""
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
 msgstr ""
+"  --keyserver               Spezifiert den zu nutzenden keyserver, falls "
+"erforderlich"
 
-#, fuzzy
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr "  --list-sigs [<keyid(s)>]  Liste Schlüssel und ihre Signaturen auf"
+msgstr ""
+"  --list-sigs [keyid(s)]    Erstellt eine Liste der Schlüssel und ihrer "
+"Signaturen"
 
-#, fuzzy
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
-msgstr "  -d, --delete <keyid(s)>   Lösche die angegebene Schlüssel-Kennungen"
+msgstr "  --lsign-key <keyid>       Signiert die angegebene keyid lokal"
 
 msgid ""
 "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
 "\\n                            in '%s'"
 msgstr ""
+"  --populate [keyring(s)]   Lädt die Standard-Schlüssel von den "
+"(angegebenen) Schlüsselbunden\\n                                   in '%s' "
+"neu"
 
-#, fuzzy
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
-"  -l, --list-keys [<keyid(s)>] Liste die angegebenen oder alle Schlüssel auf"
+"  --refresh-keys [keyid(s)] Aktualisiert angegebene oder alle Schlüssel von "
+"einen Schlüsselserver"
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
+msgid "The key identified by %s could not be found locally."
 msgstr ""
-"Sie haben nicht ausreichende Berechtigungen um den Schlüsselbund %s zu lesen."
+"Der von %s identifizierte Schlüssel konnte lokal nicht gefunden werden."
+
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr ""
+"Sie haben nicht genügend Berechtigungen, um den Schlüsselbund %s zu lesen."
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr ""
 "Benutzen Sie '%s', um die Berechtigungen des Schlüsselbundes zu korrigieren."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr "Sie haben ungenügende Berechtigungen, um diesen Befehl auszuführen..."
+msgid "You do not have sufficient permissions to run this command."
+msgstr "Sie haben nicht genügend Berechtigungen, um diesen Befehl auszuführen."
 
 msgid "There is no secret key available to sign with."
 msgstr ""
+"Es ist kein geheimer Schlüssel vorhanden, mit dem signiert werden kann."
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Verwenden Sie '&s', um einen Standard-Geheimschlüssel zu erstellen."
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Füge %s hinzu ... "
+msgstr "Verifiziere %s..."
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "Datei %s ist unsigniert, kann nicht fortfahren."
 
 msgid "The signature of file %s is not valid."
 msgstr "Die Signatur der Datei %s ist ungütig."
 
-#, fuzzy
 msgid "Verifying keyring file signatures..."
-msgstr "Überprüfe Signatur der gelöschten Schlüssel..."
+msgstr "Verifziere Datei-Signaturen des Schlüsselbunds..."
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "In %s existieren keine Schlüsselbund-Dateien."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "Der Schlüssel mit der Kennung %s existiert nicht"
+msgstr "Die Schlüsselbund-Datei %s existiert nicht."
 
-#, fuzzy
 msgid "Appending keys from %s.gpg..."
-msgstr "Hänge offizielle Schlüssel an..."
+msgstr "Füge Schlüssel aus %s.gpg hinzu ..."
 
-#, fuzzy
 msgid "Locally signing trusted keys in keyring..."
-msgstr "Entferne gelöschte Schlüssel aus dem Schlüsselbund..."
+msgstr "Signiere die vertrauenswürdigen Schlüssel im Schlüsselbund lokal ..."
 
 msgid "Locally signing key %s..."
-msgstr ""
+msgstr "Signiere Schlüssel %s lokal ..."
+
+msgid "Importing owner trust values..."
+msgstr "Importiere die Vertrauenswerte des Benutzers ..."
 
-#, fuzzy
 msgid "Disabling revoked keys in keyring..."
-msgstr "Entferne gelöschte Schlüssel aus dem Schlüsselbund..."
+msgstr "Mache widerrufene Schlüssel im Schlüsselbund unbrauchbar ..."
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Erstelle Tarball aus %s..."
+msgstr "Mache  Schlüssel %s unbrauchbar ..."
 
-msgid "The key identified by %s does not exist"
-msgstr "Der Schlüssel mit der Kennung %s existiert nicht"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+"Eine bestimmte Schlüsseldatei konnte nicht zum GPG Schlüsselbund hinzugefügt "
+"werden."
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+"Ein bestimmter Schlüssel konnte nicht vom GPG Schlüsselbund entfernt werden."
+
+msgid "The key identified by %s could not be edited."
+msgstr "Der von %s identifizierte Schlüssel konnte nicht bearbeitet werden."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+"Ein bestimmter Schlüssel konnte nicht vom GPG Schlüsselbund exportiert "
+"werden."
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+"Der Fingerabdruck eines bestimmten Schlüssels konnte nicht ermittelt werden."
+
+msgid "%s could not be imported."
+msgstr "%s konnte nicht importiert werden."
+
+msgid "File %s does not exist and could not be imported."
+msgstr "Die Datei %s existiert nicht und konnte nicht importiert werden."
+
+msgid "A specified key could not be listed."
+msgstr "Ein bestimmter Schlüssel konnte nicht aufgeführt werden."
+
+msgid "A specified signature could not be listed."
+msgstr "Eine bestimmte Signatur konnte nicht aufgeführt werden."
+
+msgid "A specified key could not be locally signed."
+msgstr "Ein bestimmter Schlüssel konnte nicht lokal signiert werden."
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+"Entfernter Schlüssel konnte nicht korrekt vom Schlüssel-Server abgerufen "
+"werden."
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+"Ein bestimmter lokaler Schlüssel konnte nicht vom Schlüssel-Server "
+"aktualisiert werden."
+
+msgid "The signature identified by %s could not be verified."
+msgstr "Die von %s identifizierte Signatur konnte nicht verifziert werden."
+
+msgid "Updating trust database..."
+msgstr "Aktualisiere Trust-Datenbank"
+
+msgid "Trust database could not be updated."
+msgstr "Vertrauensdatenbank konnte nicht aktualisiert werden."
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
-"Kan das Programm %s nicht finden, das für alle %s Operationen benötigt wird."
+"Kann das Programm %s nicht finden, das für alle %s Operationen benötigt wird."
 
 msgid "%s needs to be run as root for this operation."
 msgstr "%s muss für diese Operation als root ausgeführt werden."
@@ -873,14 +934,11 @@ msgstr "%s Konfigurationsdatei '%s' nicht gefunden."
 msgid "no operation specified (use -h for help)"
 msgstr "keine Operation angegeben (benutzen Sie -h für die Hilfe)"
 
-msgid "Multiple operations specified"
-msgstr "mehrere Operationen angegeben"
+msgid "Multiple operations specified."
+msgstr "Mehrfache Operationen spezifiziert."
 
-msgid "Please run %s with each operation separately\\n"
-msgstr "Bitte führen Sie %s einzeln mit jeder Operation aus\\n"
-
-msgid "Updating trust database..."
-msgstr "Aktualisiere Trust-Datenbank"
+msgid "Please run %s with each operation separately."
+msgstr "Bitte rufen Sie %s für jede Operation getrennt auf."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -1000,11 +1058,11 @@ msgstr "Aufruf: repo-add [Optionen] <Pfad-zur-Datenbank> <Paket|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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add wird eine Paket-DB aktualisieren, indem es eine Paket-Datei liest."
-"\\nMehrere Pakete zum Hinzufügen können über Kommandozeile spezifiziert "
-"werden.\\n\\n"
+"repo-add wird eine Paket-Datenbank aktualiesieren, indem es eine Paket-Datei "
+"ausliest.\\nWenn mehrere Pakete hinzugefügt werden sollen, kann dies auf der "
+"Kommando-Zeile spezifiziert werden.\\n"
 
 msgid "Options:\\n"
 msgstr "Optionen:\\n"
@@ -1016,18 +1074,22 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       aktualisiere die Dateiliste der Datenbank"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
-"Verwendung: repo-remove [Optionen] <Pfad-zur-DB> <Paketname|Delta> ...\\n\\n"
+"Verwendung: repo-remove [Options] <Pfad-zur-db> <Paketname|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\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
-"repo-remove wird eine Paket-DB aktualisieren, indem es den auf der Kommando-"
-"\\nzeile der jeweiligen Repo-DB angegebenen Paket-Namen entfernt. Mehrere"
-"\\nPakete zum Entfernen können auf der Kommandozeile angegeben werden.\\n\\n"
+"repo-remove wird eine Paket-Daten aktualisieren, indem der auf der Kommando-"
+"Zeile\\nspezifierte Paketname von der Datenbank des angegebenen Repos "
+"entfernt wird.\\nMehrere zu entfernende Pakete können auf der Kommando-Zeile "
+"angegeben werden.\\n"
+
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr "Bitte weiter gehen. Hier gibt es nichts zu sehen.\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       minimiere Ausgaben\\n"
@@ -1046,27 +1108,26 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 "\\nSiehe %s(8) für mehr Details und Beschreibungen der verfügbaren Optionen."
-"\\n\\n"
+"\\n"
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
-"Beispiel:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Beispiel:  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"
-msgstr "Beispiel: repo-remove /Pfad/zum/Repo.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr "Beispiel: repo-remove /Pfad/zum/Repo.db.tar.gz kernel26\\n"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nDieses Program ist freie Software; siehe Kopierbedingungen im Quelltext."
-"\\nKeine Garantie nach geltendem Recht.\\n"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\n\\nDies ist freie Software, vgl. den Quellcode zu den Kopierbedingungen."
+"\\n Es gibt KEINERLEI GARANTIE, soweit das Gesetz dies erlaubt.\\n"
 
 msgid "No database entry for package '%s'."
 msgstr "Kein Datenbank-Eintrag für das Paket '%s'."
@@ -1104,12 +1165,15 @@ msgstr "'%s' hat keine gültige Archiv-Endung."
 msgid "An entry for '%s' already existed"
 msgstr "Ein Eintrag für '%s' existierte bereits"
 
-msgid "Computing checksums..."
-msgstr "Berechne Prüfsumme..."
+msgid "Invalid package signature file '%s'."
+msgstr "Ungültige Paket-Signaturdatei '%s'"
 
 msgid "Adding package signature..."
 msgstr "Füge Paket-Signatur hinzu..."
 
+msgid "Computing checksums..."
+msgstr "Berechne Prüfsumme..."
+
 msgid "Creating '%s' db entry..."
 msgstr "Erstelle '%s' Datenbank-Eintrag"
 
@@ -1178,20 +1242,3 @@ msgstr "Option %s benötigt ein Argument\\n"
 
 msgid "unrecognized option"
 msgstr "unbekannte Option"
-
-#~ msgid "  --reload                  Reload the default keys"
-#~ msgstr "  --reload                  Lade die Standard-Schlüssel erneut"
-
-#~ msgid "Verifying official keys file signature..."
-#~ msgstr "Überprüfe Signatur der offiziellen Schlüssel..."
-
-#~ msgid "Verifying deprecated keys file signature..."
-#~ msgstr "Überprüfe Signatur der veralteten Schlüssel..."
-
-#~ msgid "Appending deprecated keys..."
-#~ msgstr "Hänge veraltete Schlüssel an..."
-
-#~ msgid "You need to specify the keyserver and at least one key identifier"
-#~ msgstr ""
-#~ "Sie müssen den Schlüssel-Server und mindestens eine Schlüsselkennung "
-#~ "festlegen"

scripts/po/el.po

@@ -4,14 +4,14 @@
 #
 # Translators:
 # Axilleas P <markeleas@gmail.com>, 2011.
-# Christos Nouskas <nous@archlinux.us>, 2011.
+# Christos Nouskas <nous@archlinux.us>, 2011, 2012.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-08-16 21:51+0000\n"
-"Last-Translator: nous <nous@archlinux.us>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 08:19+0000\n"
+"Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/el/)\n"
 "Language: el\n"
@@ -30,7 +30,7 @@ msgid "Cleaning up..."
 msgstr "Αποκατάσταση..."
 
 msgid "Entering %s environment..."
-msgstr "Είσχώρηση σε περιβάλλον %s..."
+msgstr "Εισχώρηση σε περιβάλλον %s..."
 
 msgid "Unable to find source file %s."
 msgstr "Αδυναμία εύρεσης πηγαίου αρχείου %s."
@@ -114,21 +114,17 @@ msgstr "ΔΕΝ ΒΡΕΘΗΚΕ ΥΠΟΓΡΑΦΗ"
 msgid "SOURCE FILE NOT FOUND"
 msgstr "ΔΕΝ ΒΡΕΘΗΚΕ ΠΗΓΑΙΟ ΑΡΧΕΙΟ"
 
-#, fuzzy
 msgid "unknown public key"
-msgstr "Άγνωστο δημόσιο κλειδί"
+msgstr "άγνωστο δημόσιο κλειδί"
 
-#, fuzzy
 msgid "the key has been revoked."
-msgstr "Προσοχή: το κλειδί έχει ανακληθεί."
+msgstr "το κλειδί έχει ανακληθεί."
 
-#, fuzzy
 msgid "the signature has expired."
-msgstr "Προσοχή: η υπογραφή έχει λήξει."
+msgstr "η υπογραφή έχει λήξει."
 
-#, fuzzy
 msgid "the key has expired."
-msgstr "Προσοχή: το κλειδί έχει λήξει."
+msgstr "το κλειδί έχει λήξει."
 
 msgid "One or more PGP signatures could not be verified!"
 msgstr "Μια ή περισσότερες υπογραφές PGP δεν επικυρώθηκαν!"
@@ -416,11 +412,10 @@ msgstr "  -R, --repackage  Ανασύνθεση πακέτου χωρίς ανα
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Εγκατάσταση απουσών εξαρτήσεων με %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source         Δημιουργία πηγαίου αρχείου tar χωρίς τις ληφθείσες πηγές"
+"  -S, --source     Δημιουργία πηγαίου αρχείου tar χωρίς ληφθείσες πηγές"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -458,7 +453,7 @@ msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <list>     Δημιουργία πακέτων λίστας από διαιρεμένο πακέτο"
 
 msgid "  --sign           Sign the resulting package with %s"
-msgstr "  --sign           Υπογραφή δημιουργηθέντος πακέτου με %s"
+msgstr "  --sign                    Υπογραφή δημιουργηθέντος πακέτου με %s"
 
 msgid "  --skipchecksums  Do not verify checksums of the source files"
 msgstr "  --skipchecksums  Χωρίς επικύρωση αθροισμάτων ελέγχου πηγαίων αρχείων"
@@ -484,17 +479,26 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Εάν το %s δεν καθοριστεί, το %s θα αναζητήσει το '%s'"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Πνευματική ιδιοκτησία (c) 2006-2011 Ομάδα Ανάπτυξης Pacman <pacman-"
+"Πνευματική ιδιοκτησία (c) 2006-2012 Ομάδα Ανάπτυξης Pacman <pacman-"
 "dev@archlinux.org>.\\nΠνευματική ιδιοκτησία (c) 2002-2006 Judd Vinet "
-"<jvinet@zeroflux.org>.\\n\\nΑυτό είναι ελεύθερο λογισμικό, οι όροι "
+"\\n<jvinet@zeroflux.org>.\\nΑυτό είναι ελεύθερο λογισμικό, οι όροι "
 "αντιγραφής βρίσκονται στον πηγαίο κώδικα.\\nΚΑΜΜΙΑ ΕΓΓΥΗΣΗ δεν δίδεται, στον "
 "βαθμό που δια νόμου επιτρέπεται.\\n"
 
+msgid "%s signal caught. Exiting..."
+msgstr "Λήψη σήματος %s. Έξοδος..."
+
+msgid "Aborted by user! Exiting..."
+msgstr "Ματαίωση από τον χρήστη! Έξοδος..."
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr "Προέκυψε άγνωστο σφάλμα. Έξοδος..."
+
 msgid "%s not found."
 msgstr "Το %s δεν βρέθηκε."
 
@@ -507,6 +511,9 @@ msgstr "Δεν έχεις δικαίωμα εγγραφής στο %s για α
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Δεν έχεις δικαίωμα εγγραφής στο %s για αποθήκευση λήψεων."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr "Δεν υπάρχει άδεια εγγραφής στο %s για αποθήκευση πηγαίων αρχείων tar."
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0Τα %s και %s δεν μπορούν να οριστούν ταυτόχρονα"
 
@@ -628,12 +635,12 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Χρήση: %s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Πνευματική ιδιοκτησία (c) 2006-2011 Ομάδα Ανάπτυξης Pacman <pacman-"
-"dev@archlinux.org>\\nΑυτό είναι ελεύθερο λογισμικό, οι όροι αντιγραφής "
+"Πνευματική ιδιοκτησία (c) 2010-2012 Ομάδα Ανάπτυξης Pacman <pacman-"
+"dev@archlinux.org>.\\nΑυτό είναι ελεύθερο λογισμικό, οι όροι αντιγραφής "
 "βρίσκονται στον πηγαίο κώδικα.\\nΚΑΜΜΙΑ ΕΓΓΥΗΣΗ δεν δίδεται, στον βαθμό που "
 "δια νόμου επιτρέπεται.\\n"
 
@@ -660,36 +667,30 @@ msgstr "Πέρας."
 msgid "Manage pacman's list of trusted keys"
 msgstr "Διαχείριση λίστας έμπιστων κλειδιών του pacman"
 
-#, fuzzy
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
 msgstr ""
-"  -a, --add [<file(s)>]     Προσθήκη καθορισμένων κλειδιών (κενό για stdin)"
+"  -a, --add [file(s)]       Προσθήκη καθορισμένων κλειδιών (κενό για stdin)"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgstr "  -d, --delete <keyid(s)>   Κατάργηση καθορισμένων keyids"
 
-#, fuzzy
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
-msgstr "  -e, --export [<keyid(s)>] Εξαγωγή καθορισμένων ή όλων των keyids"
+msgstr "  -e, --export [keyid(s)]   Εξαγωγή καθορισμένων ή όλων των keyids"
 
-#, fuzzy
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
-"  -f, --finger [<keyid(s)>] Εμφάνιση αποτυπώματος καθορισμένων ή όλων των "
+"  -f, --finger [keyid(s)]   Προβολή αποτυπωμάτων καθορισμένων ή όλων των "
 "keyids"
 
 msgid "  -h, --help                Show this help message and exit"
 msgstr "  -h, --help                Εμφάνιση αυτού του μηνύματος και έξοδος"
 
-#, fuzzy
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
-msgstr ""
-"  -l, --list-keys [<keyid(s)>] Εμφάνιση καθορισμένων ή όλων των κλειδιών"
+msgstr "  -l, --list-keys [keyid(s)] Προβολή καθορισμένων ή όλων των keyids"
 
-#, fuzzy
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
-msgstr "  -r, --receive <keyserver> <keyid(s)> Λήψη των καθορισμένων κλειδιών"
+msgstr "  -r, --recv-keys <keyid(s)> Λήψη καθορισμένων keyids"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr "  -u, --updatedb            Ενημέρωση της trustdb του pacman"
@@ -720,11 +721,8 @@ msgstr ""
 "  --gpgdir <dir>            Ορισμός εναλλακτικού καταλόγου GnuPG (αντί του "
 "'%s')"
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
-msgstr ""
-"  --import <dir(s)>         Εισαγωγή των pubring.gpg και trustdb.gpg από "
-"κατάλογο"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
+msgstr "  --import <dir(s)>         Εισαγωγή pubring.gpg από κατάλογο(-ους)"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
@@ -737,84 +735,125 @@ msgid "  --init                    Ensure the keyring is properly initialized"
 msgstr "  --init                    Εξασφάλιση αρχικοποίησης κλειδοθήκης"
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
-msgstr ""
+msgstr "  --keyserver               Χρήση διακομιστή κλειδιών, αν απαιτείται"
 
-#, fuzzy
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr "  --list-sigs [<keyid(s)>]  Εμφάνιση κλειδιών και υπογραφών"
+msgstr "  --list-sigs [keyid(s)]    Προβολή κλειδιών και υπογραφών τους"
 
-#, fuzzy
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
-msgstr "  -d, --delete <keyid(s)>   Κατάργηση καθορισμένων keyids"
+msgstr "  --lsign-key <keyid>       Τοπική υπογραφή καθορισμένου keyid"
 
 msgid ""
 "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
 "\\n                            in '%s'"
 msgstr ""
+"  --populate [keyring(s)]   Ανανέωση προεπιλεγμένων κλειδιών από (δοθείσες) "
+"κλειδοθήκες\\n                            στο '%s'"
 
-#, fuzzy
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
-"  -l, --list-keys [<keyid(s)>] Εμφάνιση καθορισμένων ή όλων των κλειδιών"
+"  --refresh-keys [keyid(s)] Ενημέρωση καθορισμένων ή όλων των κλειδιών από "
+"διακομιστή"
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "Ανεπαρκή δικαιώματα ανάγνωσης κλειδοθήκης %s..."
+msgid "The key identified by %s could not be found locally."
+msgstr "Αδυναμία τοπικής ευρέσεως κλειδιού %s."
+
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr "Ανεπαρκή δικαιώματα ανάγνωσης κλειδούχου %s."
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr "Τρέξε το '%s' για ρύθμιση των αδειών της κλειδοθήκης."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr "Ανεπαρκή δικαιώματα για εκτέλεση αυτής της εντολής..."
+msgid "You do not have sufficient permissions to run this command."
+msgstr "Ανεπαρκή δικαιώματα εκτέλεσης εντολής."
 
 msgid "There is no secret key available to sign with."
-msgstr ""
+msgstr "Μη διαθέσιμο κρυφό κλειδί για υπογραφή."
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Δημιούργησε ένα τυπικό κρυφό κλειδί με το '%s'"
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Προσθήκη %s..."
+msgstr "Επιβεβαίωση %s..."
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "Το αρχείο %s είναι ανυπόγραφο, αδυναμία συνέχισης."
 
 msgid "The signature of file %s is not valid."
 msgstr "Η υπογραφή του %s δεν είναι έγκυρη."
 
-#, fuzzy
 msgid "Verifying keyring file signatures..."
-msgstr "Επικύρωση διαγραφείσας υπογραφής αρχείου κλειδιών..."
+msgstr "Επικύρωση υπογραφών κλειδοθήκης..."
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "Δεν υπάρχουν κλειδοθήκες στο %s."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "Το αναγνωριστικό κλειδιού %s δεν υπάρχει"
+msgstr "Ανύπαρκτο αρχείο κλειδοθήκης %s."
 
-#, fuzzy
 msgid "Appending keys from %s.gpg..."
-msgstr "Προσάρτηση επίσημων κλειδιών..."
+msgstr "Προσάρτηση κλειδιών από %s.gpg"
 
-#, fuzzy
 msgid "Locally signing trusted keys in keyring..."
-msgstr "Κατάργηση διαγραφέντων κλειδιών από κλειδοθήκη..."
+msgstr "Τοπική υπογραφή έμπιστων κλειδιών στην κλειδοθήκη..."
 
 msgid "Locally signing key %s..."
-msgstr ""
+msgstr "Τοπική υπογραφή κλειδιού %s"
+
+msgid "Importing owner trust values..."
+msgstr "Εισαγωγή τιμών εμπιστοσύνης ιδιοκτήτη..."
 
-#, fuzzy
 msgid "Disabling revoked keys in keyring..."
-msgstr "Κατάργηση διαγραφέντων κλειδιών από κλειδοθήκη..."
+msgstr "Απενεργοποίηση ανακληθέντων κλειδιών στην κλειδοθήκη..."
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Δημιουργία tar από %s..."
+msgstr "Απενεργοποίηση κλειδιού %s..."
 
-msgid "The key identified by %s does not exist"
-msgstr "Το αναγνωριστικό κλειδιού %s δεν υπάρχει"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr "Αδυναμία προσθήκης αρχείου κλειδιών στην κλειδοθήκη gpg."
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr "Αδυναμία διαγραφής κλειδιού από την κλειδοθήκη gpg."
+
+msgid "The key identified by %s could not be edited."
+msgstr "Αδυναμία επεξεργασίας κλειδιού %s."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr "Αδυναμία εξαγωγής κλειδιού από την κλειδοθήκη gpg."
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr "Αδυναμία προσδιορισμού αποτυπώματος κλειδιού."
+
+msgid "%s could not be imported."
+msgstr "Αδυναμία εισαγωγής %s."
+
+msgid "File %s does not exist and could not be imported."
+msgstr "Το αρχείο %s δεν υπάρχει και δεν εισήχθη."
+
+msgid "A specified key could not be listed."
+msgstr "Αδυναμία παράθεσης κλειδιού."
+
+msgid "A specified signature could not be listed."
+msgstr "Αδυναμία παράθεσης υπογραφής. "
+
+msgid "A specified key could not be locally signed."
+msgstr "Αδυναμία τοπικής υπογραφής κλειδιού."
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr "Αδυναμία λήψης απομεμακρυσμένου κλειδιού από διακομιστή."
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr "Αδυναμία ενημέρωσης κλειδιού από διακομιστή."
+
+msgid "The signature identified by %s could not be verified."
+msgstr "Αδυναμία επικύρωσης υπογραφής %s."
+
+msgid "Updating trust database..."
+msgstr "Ενημέρωση βάσης εμπιστοσύνης..."
+
+msgid "Trust database could not be updated."
+msgstr "Αδυναμία ενημέρωσης βάσης εμπιστοσύνης."
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
@@ -829,14 +868,11 @@ msgstr "Το αρχείο ρυθμίσεων '%s' του %s δεν βρέθηκ
 msgid "no operation specified (use -h for help)"
 msgstr "Ακαθόριστη λειτουργία (δώσε -h για βοήθεια)"
 
-msgid "Multiple operations specified"
-msgstr "Ζητήθηκαν πολλαπλές λειτουργίες"
+msgid "Multiple operations specified."
+msgstr "Ορίσθηκαν πολλαπλές διεργασίες."
 
-msgid "Please run %s with each operation separately\\n"
-msgstr "Τρέξε τον %s για κάθε λειτουργία ξεχωριστά.\\n"
-
-msgid "Updating trust database..."
-msgstr "Ενημέρωση βάσης εμπιστοσύνης..."
+msgid "Please run %s with each operation separately."
+msgstr "Τρέξε τον %s με κάθε διεργασία χωριστά."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -954,10 +990,10 @@ msgstr "Χρήση: 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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"Το repo-add ενημερώνει μια βάση πακέτων διαβάζοντας ένα αρχείο πακέτων."
-"\\nΜπορούν να ορισθούν πολλαπλά πακέτα στην γραμμή εντολών.\\n\\n"
+"Το repo-add ενημερώνει μια βάση διαβάζοντας ένα αρχείο πακέτου.\\nΜπορούν να "
+"καθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς προσθήκη.\\n"
 
 msgid "Options:\\n"
 msgstr "Επιλογές:\\n"
@@ -969,18 +1005,20 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       ενημέρωση λίστας αρχείων βάσης\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
-msgstr ""
-"Χρήση: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
+msgstr "Χρήση: repo-remove [επιλογές] <διαδρομή-βάσης> <πακέτο|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\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
-"το repo-add ενημερώνει μια βάση πακέτων διαγράφοντας το αρχείο πακέτων. "
-"\\nπου ορίζεται στην γραμμή εντολών από την δοθείσα βάση αποθήκης. "
-"\\nΜπορούν να ορισθούν πολλαπλά πακέτα στην γραμμή εντολών.\\n\\n"
+"Το repo-remove ενημερώνει μια βάση διαγράφοντας το πακέτο που ορίσθηκε"
+"\\nστην γραμμή εντολών από μια δοθείσα βάση αποθήκης. Μπορούν να"
+"\\nκαθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς διαγραφή.\\n"
+
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr "Συνέχισε παρακάτω, δεν υπάρχει τίποτε να δεις εδώ.\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       περιστολή πληροφορίας\\n"
@@ -997,26 +1035,25 @@ msgstr "  -v, --verify      επικύρωση υπογραφής βάσης π
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
-"\\nΔες την %s(8) για περισσότερες πληροφορίες και περιγραφές των διαθέσιμων "
-"επιλογών.\\n\\n"
+"\\nΔες %s(8) για λεπτομέρειες και περιγραφή των διαθέσιμων επιλογών.\\n"
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
-"Παράδειγμα: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Παράδειγμα:  repo-add /διαδρομή/προς/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"
-msgstr "Παράδειγμα: repo-remove /διαδρομή/προς/repo.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr "Παράδειγμα:  repo-remove /διαδρομή/προς/repo.db.tar.gz kernel26\\n"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
-"Πνευματική ιδιοκτησία (c) 2006-2011 Ομάδα Ανάπτυξης Pacman <pacman-"
-"dev@archlinux.org>.\\nΑυτό είναι ελεύθερο λογισμικό, οι όροι αντιγραφής "
+"Πνευματική ιδιοκτησία (c) 2010-2012 Ομάδα Ανάπτυξης Pacman <pacman-"
+"dev@archlinux.org>\\nΑυτό είναι ελεύθερο λογισμικό· οι όροι αντιγραφής "
 "βρίσκονται στον πηγαίο κώδικα.\\nΚΑΜΜΙΑ ΕΓΓΥΗΣΗ δεν δίδεται, στον βαθμό που "
 "δια νόμου επιτρέπεται.\\n"
 
@@ -1030,7 +1067,7 @@ msgid "Removing existing entry '%s'..."
 msgstr "Διαγραφή υπάρχουσας εγγραφής '%s'..."
 
 msgid "Cannot find the gpg binary! Is GnuPG installed?"
-msgstr "Δε βρήκα το εκτελέσιμο gpg! Είναι εγκατεστημένο το GnuPG?"
+msgstr "Δε βρέθηκε το gpg! Είναι εγκατεστημένο το GnuPG?"
 
 msgid "Signing database..."
 msgstr "Υπογραφή βάσης..."
@@ -1056,11 +1093,14 @@ msgstr "Το '%s' δεν έχει έγκυρη επέκταση συμπιεσμ
 msgid "An entry for '%s' already existed"
 msgstr "Υπήρχε ήδη εγγραφή για το '%s'"
 
-msgid "Computing checksums..."
-msgstr "Υπολογισμός αθροισμάτων ελέγχου..."
+msgid "Invalid package signature file '%s'."
+msgstr "Άκυρο αρχείο υπογραφών πακέτων '%s'."
 
 msgid "Adding package signature..."
-msgstr "Πρόσθεση υπογραφής πακέτου..."
+msgstr "Προσθήκη υπογραφής πακέτου..."
+
+msgid "Computing checksums..."
+msgstr "Υπολογισμός αθροισμάτων ελέγχου..."
 
 msgid "Creating '%s' db entry..."
 msgstr "Δημιουργία εγγραφής '%s' στην βάση..."
@@ -1130,20 +1170,3 @@ msgstr "η επιλογή %s απαιτεί όρισμα\\n"
 
 msgid "unrecognized option"
 msgstr "άγνωστη επιλογή"
-
-#~ msgid "  --reload                  Reload the default keys"
-#~ msgstr "  --reload                  Ανανέωση προεπιλεγμένων κλειδιών"
-
-#~ msgid "Verifying official keys file signature..."
-#~ msgstr "Επικύρωση επίσημης υπογραφής αρχείου κλειδιών..."
-
-#~ msgid "Verifying deprecated keys file signature..."
-#~ msgstr "Επικύρωση παρωχημένης υπογραφής αρχείου κλειδιών..."
-
-#~ msgid "Appending deprecated keys..."
-#~ msgstr "Προσάρτηση παρωχημένων κλειδιών..."
-
-#~ msgid "You need to specify the keyserver and at least one key identifier"
-#~ msgstr ""
-#~ "Απαιτείται ο καθορισμός του διακομιστή κλειδιών και τουλάχιστον ενός "
-#~ "αναγνωριστικού κλειδιού"

scripts/po/en_GB.po

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Dan McGee <dpmcgee@gmail.com>, 2011.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-08-15 21:10+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 00:08-0600\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -111,21 +112,17 @@ msgstr "SIGNATURE NOT FOUND"
 msgid "SOURCE FILE NOT FOUND"
 msgstr "SOURCE FILE NOT FOUND"
 
-#, fuzzy
 msgid "unknown public key"
-msgstr "Unknown public key"
+msgstr "unknown public key"
 
-#, fuzzy
 msgid "the key has been revoked."
-msgstr "Warning: the key has been revoked."
+msgstr "the key has been revoked."
 
-#, fuzzy
 msgid "the signature has expired."
-msgstr "Warning: the signature has expired."
+msgstr "the signature has expired."
 
-#, fuzzy
 msgid "the key has expired."
-msgstr "Warning: the key has expired."
+msgstr "the key has expired."
 
 msgid "One or more PGP signatures could not be verified!"
 msgstr "One or more PGP signatures could not be verified!"
@@ -401,11 +398,10 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Install missing dependencies with %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source         Generate a source-only tarball without downloaded sources"
+"  -S, --source     Generate a source-only tarball without downloaded sources"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -471,16 +467,25 @@ 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-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 
+msgid "%s signal caught. Exiting..."
+msgstr "%s signal caught. Exiting..."
+
+msgid "Aborted by user! Exiting..."
+msgstr "Aborted by user! Exiting..."
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr "An unknown error has occurred. Exiting..."
+
 msgid "%s not found."
 msgstr "%s not found."
 
@@ -493,6 +498,9 @@ 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."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr "You do not have write permission to store source tarballs in %s."
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s and %s cannot both be specified"
 
@@ -615,11 +623,11 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Usage: %s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 
@@ -644,33 +652,28 @@ msgstr "Done."
 msgid "Manage pacman's list of trusted keys"
 msgstr "Manage pacman's list of trusted keys"
 
-#, fuzzy
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
-msgstr "  -a, --add [<file(s)>]     Add the specified keys (empty for stdin)"
+msgstr "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgstr "  -d, --delete <keyid(s)>   Remove the specified keyids"
 
-#, fuzzy
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
-msgstr "  -e, --export [<keyid(s)>] Export the specified or all keyids"
+msgstr "  -e, --export [keyid(s)]   Export the specified or all keyids"
 
-#, fuzzy
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
-"  -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids"
+"  -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"
 
-#, fuzzy
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
-msgstr "  -l, --list-keys [<keyid(s)>] List the specified or all keys"
+msgstr "  -l, --list-keys [keyid(s)] List the specified or all keys"
 
-#, fuzzy
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
-msgstr "  -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids"
+msgstr "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr "  -u, --updatedb            Update the trustdb of pacman"
@@ -700,10 +703,8 @@ msgstr ""
 "  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
 "\\n                            of '%s')"
 
-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 <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"
@@ -716,83 +717,124 @@ msgid "  --init                    Ensure the keyring is properly initialized"
 msgstr "  --init                    Ensure the keyring is properly initialised"
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
-msgstr ""
+msgstr "  --keyserver               Specify a keyserver to use if necessary"
 
-#, fuzzy
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr "  --list-sigs [<keyid(s)>]  List keys and their signatures"
+msgstr "  --list-sigs [keyid(s)]    List keys and their signatures"
 
-#, fuzzy
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
-msgstr "  -d, --delete <keyid(s)>   Remove the specified keyids"
+msgstr "  --lsign-key <keyid>       Locally sign the specified keyid"
 
 msgid ""
 "  --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'"
 
-#, fuzzy
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
-msgstr "  -l, --list-keys [<keyid(s)>] List the specified or all keys"
+msgstr ""
+"  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "You do not have sufficient permissions to read the %s keyring..."
+msgid "The key identified by %s could not be found locally."
+msgstr "The key identified by %s could not be found locally."
+
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr "You do not have sufficient permissions to read the %s keyring."
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr "Use '%s' to correct the keyring permissions."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr "You do not have sufficient permissions to run this command..."
+msgid "You do not have sufficient permissions to run this command."
+msgstr "You do not have sufficient permissions to run this command."
 
 msgid "There is no secret key available to sign with."
-msgstr ""
+msgstr "There is no secret key available to sign with."
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Use '%s' to generate a default secret key."
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Adding %s..."
+msgstr "Verifying %s..."
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "File %s is unsigned, cannot continue."
 
 msgid "The signature of file %s is not valid."
 msgstr "The signature of file %s is not valid."
 
-#, fuzzy
 msgid "Verifying keyring file signatures..."
-msgstr "Verifying deleted keys file signature..."
+msgstr "Verifying keyring file signatures..."
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "No keyring files exist in %s."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "The key identified by %s does not exist"
+msgstr "The keyring file %s does not exist."
 
-#, fuzzy
 msgid "Appending keys from %s.gpg..."
-msgstr "Appending official keys..."
+msgstr "Appending keys from %s.gpg..."
 
-#, fuzzy
 msgid "Locally signing trusted keys in keyring..."
-msgstr "Removing deleted keys from keyring..."
+msgstr "Locally signing trusted keys in keyring..."
 
 msgid "Locally signing key %s..."
-msgstr ""
+msgstr "Locally signing key %s..."
+
+msgid "Importing owner trust values..."
+msgstr "Importing owner trust values..."
 
-#, fuzzy
 msgid "Disabling revoked keys in keyring..."
-msgstr "Removing deleted keys from keyring..."
+msgstr "Disabling revoked keys in keyring..."
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Tar'ing up %s..."
+msgstr "Disabling key %s..."
 
-msgid "The key identified by %s does not exist"
-msgstr "The key identified by %s does not exist"
+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 key could not be removed from the gpg keychain."
+msgstr "A specified key could not be removed from the gpg keychain."
+
+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 "The fingerprint of a specified key could not be determined."
+msgstr "The fingerprint of a specified key could not be determined."
+
+msgid "%s could not be imported."
+msgstr "%s could not be imported."
+
+msgid "File %s does not exist and could not be imported."
+msgstr "File %s does not exist and could not be imported."
+
+msgid "A specified key could not be listed."
+msgstr "A specified key could not be listed."
+
+msgid "A specified signature could not be listed."
+msgstr "A specified signature could not be listed."
+
+msgid "A specified key could not be locally signed."
+msgstr "A specified key could not be locally signed."
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr "Remote key not fetched correctly from keyserver."
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr "A specified local key could not be updated from a keyserver."
+
+msgid "The signature identified by %s could not be verified."
+msgstr "The signature identified by %s could not be verified."
+
+msgid "Updating trust database..."
+msgstr "Updating trust database..."
+
+msgid "Trust database could not be updated."
+msgstr "Trust database could not be updated."
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr "Cannot find the %s binary required for all %s operations."
@@ -806,14 +848,11 @@ msgstr "%s configuration file '%s' not found."
 msgid "no operation specified (use -h for help)"
 msgstr "no operation specified (use -h for help)"
 
-msgid "Multiple operations specified"
-msgstr "Multiple operations specified"
+msgid "Multiple operations specified."
+msgstr "Multiple operations specified."
 
-msgid "Please run %s with each operation separately\\n"
-msgstr "Please run %s with each operation separately\\n"
-
-msgid "Updating trust database..."
-msgstr "Updating trust database..."
+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 "
@@ -930,10 +969,10 @@ 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\\n"
+"\\nMultiple 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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 
 msgid "Options:\\n"
 msgstr "Options:\\n"
@@ -944,18 +983,20 @@ msgstr "  -d, --delta       generate and add delta for package update\\n"
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       update database's file list\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
-msgstr ""
-"Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+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\\n"
+"\\npackages 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\\n"
+"\\npackages 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"
@@ -971,25 +1012,23 @@ 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"
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"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"
+"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"
-msgstr "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+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-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 
@@ -1029,11 +1068,14 @@ msgstr "'%s' does not have a valid archive extension."
 msgid "An entry for '%s' already existed"
 msgstr "An entry for '%s' already existed"
 
-msgid "Computing checksums..."
-msgstr "Computing checksums..."
+msgid "Invalid package signature file '%s'."
+msgstr "Invalid package signature file '%s'."
 
 msgid "Adding package signature..."
-msgstr ""
+msgstr "Adding package signature..."
+
+msgid "Computing checksums..."
+msgstr "Computing checksums..."
 
 msgid "Creating '%s' db entry..."
 msgstr "Creating '%s' db entry..."
@@ -1103,18 +1145,3 @@ msgstr "option %s requires an argument\\n"
 
 msgid "unrecognized option"
 msgstr "unrecognised option"
-
-#~ msgid "  --reload                  Reload the default keys"
-#~ msgstr "  --reload                  Reload the default keys"
-
-#~ msgid "Verifying official keys file signature..."
-#~ msgstr "Verifying official keys file signature..."
-
-#~ msgid "Verifying deprecated keys file signature..."
-#~ msgstr "Verifying deprecated keys file signature..."
-
-#~ msgid "Appending deprecated keys..."
-#~ msgstr "Appending deprecated keys..."
-
-#~ msgid "You need to specify the keyserver and at least one key identifier"
-#~ msgstr "You need to specify the keyserver and at least one key identifier"

scripts/po/es.po

@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+#   <jcmm986@gmail.com>, 2012.
+#   <juantascon@gmail.com>, 2011.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-09-02 18:45+0000\n"
-"Last-Translator: neiko <neikokz+tsfx@gmail.com>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 18:47+0000\n"
+"Last-Translator: j3nnn1 <jcmm986@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/es/)\n"
 "Language: es\n"
@@ -115,21 +117,17 @@ msgstr "FIRMA NO ENCONTRADA"
 msgid "SOURCE FILE NOT FOUND"
 msgstr "FUENTES NO ENCONTRADAS"
 
-#, fuzzy
 msgid "unknown public key"
-msgstr "Clave pública desconocida"
+msgstr "llave pública desconocida"
 
-#, fuzzy
 msgid "the key has been revoked."
-msgstr "Atención: la clave ha sido revocada."
+msgstr "la clave ha sido rechazada."
 
-#, fuzzy
 msgid "the signature has expired."
-msgstr "Atención: la firma ha caducado."
+msgstr "la firma ha caducado."
 
-#, fuzzy
 msgid "the key has expired."
-msgstr "Atención: la clave ha caducado."
+msgstr "la clave ha caducado."
 
 msgid "One or more PGP signatures could not be verified!"
 msgstr "¡Una o más firmas PGP no pudieron ser verificadas!"
@@ -424,11 +422,10 @@ msgstr "  -R, --repackage  Vuelve a crear el paquete sin recompilar"
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Instalar las dependencias faltantes para %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     Genera un paquete de fuentes, sin incluir las fuentes "
+"  -S, --source     Genera unpaquete de sólo fuentes sin las fuentes "
 "descargadas"
 
 msgid ""
@@ -505,15 +502,20 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Si %s no es especificado, %s buscará '%s'"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Equipo de Desarrollo de Pacman <pacman-dev@archlinux."
-"org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nEste "
-"software es libre; mira las fuentes para condiciones de copias.\\nNo tiene "
-"GARANTÍA, en la medida permitida por la ley.\\n"
+
+msgid "%s signal caught. Exiting..."
+msgstr "%s detectado. Saliendo..."
+
+msgid "Aborted by user! Exiting..."
+msgstr "¡Abortado por el usario! Saliendo..."
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr "Ha ocurrido un error desconocido. Saliendo..."
 
 msgid "%s not found."
 msgstr "no fue encontrado %s."
@@ -527,6 +529,9 @@ msgstr "No tiene permisos de escritura para guardar las descargas en %s."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "No tiene permiso de escritura para guardar las descargas en %s."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr ""
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s y %s no pueden ser especificados a la vez"
 
@@ -649,13 +654,10 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Uso: %s [raíz_bd_pacman]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 Equipo de Desarrollo Pacman <pacman-dev@archlinux."
-"org>.\\nEste software es libre; mira las fuentes para condiciones de copias."
-"\\nNo tiene GARANTÍA, en la medida permitida por la ley.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "'%s' no existe o no es un directorio."
@@ -680,36 +682,35 @@ msgstr "Hecho."
 msgid "Manage pacman's list of trusted keys"
 msgstr "Administrar la lista de claves confiadas por pacman"
 
-#, fuzzy
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
 msgstr ""
-"  -a, --add [<archivo(s)>]  Añade las claves especificadas (vacío para stdin)"
+"  -a, --add [archivo(s)]       Añade las llaves especificadas (vacio para "
+"stdin)"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgstr "  -d, --delete <keyid(s)>   Elimina las keyids especificadas"
 
-#, fuzzy
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
-msgstr "  -e, --export [<keyid(s)>] Exporta los keyids especificados o todos"
+msgstr ""
+"  -e, --export [códigollave(s)]   Exporta todos o los especificados códigos "
+"de llaves"
 
-#, fuzzy
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
-"  -f, --finger [<keyid(s)>] Lista las huellas de los keyids especificados o "
-"todos"
+"  -f, --finger [códigollave(s)]   Listaq las huellas dactilares para todos o "
+"los especificados códigos de llaves"
 
 msgid "  -h, --help                Show this help message and exit"
 msgstr "  -h, --help                Mostrar este mensaje de ayuda y salir"
 
-#, fuzzy
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
-msgstr "  -l, --list-keys [<keyid(s)>] Lista los keyids especificados o todos"
+msgstr ""
+"  -l, --list-keys [códigollave(s)] Lista todas las llaves o las especificadas"
 
-#, fuzzy
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
 msgstr ""
-"  -r, --receive <keyserver> <keyid(s)> Obtiene los keyids especificados"
+"  -r, --recv-keys <códigollave(s)> Trae los códigos de llave especificados"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr "  -u, --updatedb            Actualizar la trustdb de pacman"
@@ -741,10 +742,9 @@ msgstr ""
 "  --gpgdir <dir>            Configura un directorio alternativo para GnuPG"
 "\\n                            (en lugar de '%s')"
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr ""
-"  --import <dir(s)>         Importa pubring.gpg y trustdb.gpg de dir(s)"
+"  --import <directorio(s)>         Importa pubring.gpg desde directorio(s)"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
@@ -760,82 +760,128 @@ msgstr ""
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
 msgstr ""
+"  --keyserver               Especifica un servidor de llaves para utilizar "
+"cuando sea necesario"
 
-#, fuzzy
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr "  --list-sigs [<keyid(s)>]  Muestra las claves y sus firmas"
+msgstr "  --list-sigs [códigollave(s)]    Lista las llaves y sus firmas"
 
-#, fuzzy
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
-msgstr "  -d, --delete <keyid(s)>   Elimina las keyids especificadas"
+msgstr ""
+"  --lsign-key <keyid>       Firma localmente los códigos de llaves "
+"especificados"
 
 msgid ""
 "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
 "\\n                            in '%s'"
 msgstr ""
+"  --populate [códigollave(s)]   Recarga las llaves por defecto de los "
+"llaveros dados en '%s'"
 
-#, fuzzy
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
-msgstr "  -l, --list-keys [<keyid(s)>] Lista los keyids especificados o todos"
+msgstr ""
+"  --refresh-keys [códigollave(s)] Actualiza desde el servidor de llaves "
+"todas las llaves o las especificadas"
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "No tiene permisos suficientes para leer el llavero %s..."
+msgid "The key identified by %s could not be found locally."
+msgstr ""
+
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr "Usted no tiene permisos suficientes para leer el llavero %s."
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr "Use '%s' para corregir los permisos del llavero."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr "No tiene permisos suficientes para ejecutar este comando..."
+msgid "You do not have sufficient permissions to run this command."
+msgstr "No tiene los permisos necesarios para ejecutar este comando."
 
 msgid "There is no secret key available to sign with."
-msgstr ""
+msgstr "No hay ninguna clave secreta con la cual firmar."
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Use '%s' para generar una clave secreta por defecto."
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Añadiendo %s... "
+msgstr "Verificando %s..."
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "El fichero %s no está firmado, no puede continuar."
 
 msgid "The signature of file %s is not valid."
 msgstr "La firma del archivo %s no es válida."
 
-#, fuzzy
 msgid "Verifying keyring file signatures..."
-msgstr "Verificando la firma del archivo de claves eliminadas..."
+msgstr "Verificando firmas de archivo de llavero..."
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "No existen archivos de llavero en %s."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "La clave identificada por %s no existe"
+msgstr "El archivo de llavero %s no existe."
 
-#, fuzzy
 msgid "Appending keys from %s.gpg..."
-msgstr "Añadiendo claves oficiales..."
+msgstr "Añadiendo las claves de %s.gpg..."
 
-#, fuzzy
 msgid "Locally signing trusted keys in keyring..."
-msgstr "Quitando las claves eliminadas del llavero..."
+msgstr "Firmando localmente las llaves confiadas en el llavero..."
 
 msgid "Locally signing key %s..."
+msgstr "Firmando localmente la llave %s..."
+
+msgid "Importing owner trust values..."
+msgstr "Importando valores de confianza del propietario..."
+
+msgid "Disabling revoked keys in keyring..."
+msgstr "Desactivación de las llaves revocadas en llavero ..."
+
+msgid "Disabling key %s..."
+msgstr "Deshabilitando llave %s..."
+
+msgid "A specified keyfile could not be added to the gpg keychain."
 msgstr ""
 
-#, fuzzy
-msgid "Disabling revoked keys in keyring..."
-msgstr "Quitando las claves eliminadas del llavero..."
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
 
-#, fuzzy
-msgid "Disabling key %s..."
-msgstr "Empaquetando %s..."
+msgid "The key identified by %s could not be edited."
+msgstr ""
 
-msgid "The key identified by %s does not exist"
-msgstr "La clave identificada por %s no existe"
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+msgid "%s could not be imported."
+msgstr "%s no se pudo importar."
+
+msgid "File %s does not exist and could not be imported."
+msgstr ""
+
+msgid "A specified key could not be listed."
+msgstr ""
+
+msgid "A specified signature could not be listed."
+msgstr ""
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+msgid "The signature identified by %s could not be verified."
+msgstr ""
+
+msgid "Updating trust database..."
+msgstr "Actualizando la base de datos de claves en las que se confía..."
+
+msgid "Trust database could not be updated."
+msgstr ""
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
@@ -850,14 +896,11 @@ msgstr "El archivo de configuración '%s' de %s no fue encontrado."
 msgid "no operation specified (use -h for help)"
 msgstr "no se especificó ninguna operación (use -h para obtener ayuda)"
 
-msgid "Multiple operations specified"
-msgstr "Se especificaron varias operaciones"
+msgid "Multiple operations specified."
+msgstr "Múltiples operaciones especificadas."
 
-msgid "Please run %s with each operation separately\\n"
-msgstr "Por favor, ejecute %s con cada operación por separado\\n"
-
-msgid "Updating trust database..."
-msgstr "Actualizando la base de datos de claves en las que se confía..."
+msgid "Please run %s with each operation separately."
+msgstr "Por favor, ejecute %s con cada operación por separado."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -974,11 +1017,8 @@ msgstr "Uso: repo-add [opciones] <ruta-a-la-bd> <paquete|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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add actualizará la base de datos leyendo un archivo de paquetes."
-"\\nPueden especificarse varios paquetes para añadir en la linea de comandos."
-"\\n\\n"
 
 msgid "Options:\\n"
 msgstr "Opciones:\\n"
@@ -992,19 +1032,17 @@ msgid "  -f, --files       update database's file list\\n"
 msgstr ""
 "  -f, --files       actualiza la lista de archivos de la base de datos\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
-"Uso: repo-remove [opciones] <ruta-a-la-bd> <nombre-del-paquete|delta> ...\\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"
+"\\npackages to remove can be specified on the command line.\\n"
+msgstr ""
+
+msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
-"repo-remove actualizará una base de datos eliminando de ella el paquete"
-"\\nespecificado en la línea de comandos. Varios paquetes\\n pueden "
-"eliminarse especificándolos en la línea de comandos.\\n\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       reducir salida\\n"
@@ -1026,28 +1064,20 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
-"\\nVea %s(8) para obtener más detalles y una descripción de las opciones"
-"\\ndisponibles.\\n"
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
-"Ejemplo:  repo-add /ruta/al/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 "Ejemplo: repo-remove /ruta/al/repo.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 el equipo de desarrollo de pacman <pacman-"
-"dev@archlinux.org>\\n\\nEsto es software libre; vea las fuentes para ver las "
-"condiciones de copia.\\nNO HAY GARANTÍA, en la medida permitida por la ley."
-"\\n"
 
 msgid "No database entry for package '%s'."
 msgstr "No hay registros en la base de datos para el paquete '%s'."
@@ -1085,12 +1115,15 @@ msgstr "'%s' no tiene una extensión de archivo válida."
 msgid "An entry for '%s' already existed"
 msgstr "Una entrada para '%s' ya existía"
 
-msgid "Computing checksums..."
-msgstr "Calculando sumas de verificación..."
+msgid "Invalid package signature file '%s'."
+msgstr ""
 
 msgid "Adding package signature..."
 msgstr "Añadiendo la firma al paquete..."
 
+msgid "Computing checksums..."
+msgstr "Calculando sumas de verificación..."
+
 msgid "Creating '%s' db entry..."
 msgstr "Creando entradas en la bd de '%s'"
 
@@ -1159,20 +1192,3 @@ msgstr "la opción %s requiere un argumento\\n"
 
 msgid "unrecognized option"
 msgstr "opción desconocida"
-
-#~ msgid "  --reload                  Reload the default keys"
-#~ msgstr "  --reload                  Recarga las claves por defecto"
-
-#~ msgid "Verifying official keys file signature..."
-#~ msgstr "Verificando la firma del archivo de claves oficiales..."
-
-#~ msgid "Verifying deprecated keys file signature..."
-#~ msgstr "Verificando la firma del archivo de claves obsoletas..."
-
-#~ msgid "Appending deprecated keys..."
-#~ msgstr "Añadiendo claves obsoletas..."
-
-#~ msgid "You need to specify the keyserver and at least one key identifier"
-#~ msgstr ""
-#~ "Debe especificar el servidor de claves y al menos un identificador de "
-#~ "clave"

scripts/po/fr.po

@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Cedric Girard <girard.cedric@gmail.com>, 2012.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
-#   <ma.jiehong@gmail.com>, 2011.
+#   <ma.jiehong@gmail.com>, 2011, 2012.
+# Niels Martignène <niels.martignene@gmail.com>, 2012.
 # shining <chantry.xavier@gmail.com>, 2011.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-09-01 12:42+0000\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-06 21:04+0000\n"
 "Last-Translator: jiehong <ma.jiehong@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/fr/)\n"
@@ -46,13 +48,13 @@ msgid "The download program %s is not installed."
 msgstr "Le programme de téléchargement %s n'est pas installé."
 
 msgid "'%s' returned a fatal error (%i): %s"
-msgstr "'%s' a rencontré une erreur fatale (%i) : %s"
+msgstr "« %s » a rencontré une erreur fatale (%i) : %s"
 
 msgid "Installing missing dependencies..."
 msgstr "Installation des dépendances manquantes... "
 
 msgid "'%s' failed to install missing dependencies."
-msgstr "'%s' n'a pas pu installer les dépendances manquantes."
+msgstr "« %s » n'a pas pu installer les dépendances manquantes."
 
 msgid "Missing Dependencies:"
 msgstr "Dépendances manquantes :"
@@ -85,7 +87,7 @@ msgstr ""
 "fichiers sources, n'a pas pu être trouvé."
 
 msgid "Invalid integrity algorithm '%s' specified."
-msgstr "L'algorithme d'intégrité '%s' spécifié est invalide."
+msgstr "L'algorithme d'intégrité « %s » spécifié est invalide."
 
 msgid "Validating source files with %s..."
 msgstr "Validation des fichiers sources avec %s..."
@@ -97,7 +99,7 @@ msgid "Passed"
 msgstr "Réussite"
 
 msgid "FAILED"
-msgstr "ECHEC"
+msgstr "ÉCHEC"
 
 msgid "One or more files did not pass the validity check!"
 msgstr "Un ou plusieurs fichiers sont invalides !"
@@ -117,21 +119,17 @@ msgstr "SIGNATURE INTROUVABLE"
 msgid "SOURCE FILE NOT FOUND"
 msgstr "FICHIER SOURCE INTROUVABLE"
 
-#, fuzzy
 msgid "unknown public key"
 msgstr "Clef publique inconnue"
 
-#, fuzzy
 msgid "the key has been revoked."
-msgstr "Attention : la clef a été révoqué."
+msgstr "la clef a été révoqué."
 
-#, fuzzy
 msgid "the signature has expired."
-msgstr "Attention : la signature a expiré."
+msgstr "la signature a expiré."
 
-#, fuzzy
 msgid "the key has expired."
-msgstr "Attention : la clef a expiré."
+msgstr "la clef a expiré."
 
 msgid "One or more PGP signatures could not be verified!"
 msgstr "Une ou plusieurs signatures PGP n'ont pas pu être vérifiées."
@@ -182,7 +180,7 @@ msgstr "Compression des pages de man/info..."
 
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr ""
-"Netoyage des symboles inutiles dans les fichiers binaires et les "
+"Nettoyage des symboles inutiles dans les fichiers binaires et les "
 "bibliothèques..."
 
 msgid "Removing %s files..."
@@ -216,7 +214,7 @@ msgid "Package contains reference to %s"
 msgstr "Le paquet contient une référence à %s"
 
 msgid "Missing %s directory."
-msgstr "Le Répertoire %s est manquant."
+msgstr "Le répertoire %s est manquant."
 
 msgid "Creating package..."
 msgstr "Création du paquet... "
@@ -288,7 +286,7 @@ msgid "%s must be an integer."
 msgstr "%s doit être un entier."
 
 msgid "%s is not available for the '%s' architecture."
-msgstr "%s n'est pas disponible pour l'architecture '%s'."
+msgstr "%s n'est pas disponible pour l'architecture « %s »."
 
 msgid "Note that many packages may need a line added to their %s"
 msgstr "Notez que beaucoup de paquets peuvent avoir besoin d'une ligne dans %s"
@@ -305,16 +303,16 @@ msgid "%s entry should not contain leading slash : %s"
 msgstr "%s ne doit pas commencer par une barre oblique (« / ») : %s"
 
 msgid "Invalid syntax for %s : '%s'"
-msgstr "Syntaxe invalide pour %s : '%s'"
+msgstr "Syntaxe invalide pour %s : « %s »"
 
 msgid "%s file (%s) does not exist."
 msgstr "Le fichier %s (%s) n'existe pas."
 
 msgid "%s array contains unknown option '%s'"
-msgstr "Le champ %s contient une option inconnue : '%s'"
+msgstr "Le champ %s contient une option inconnue : « %s »"
 
 msgid "Missing %s function for split package '%s'"
-msgstr "Fonction %s manquante dans le sous-paquet '%s'"
+msgstr "Fonction %s manquante dans le sous-paquet « %s »"
 
 msgid "Requested package %s is not provided in %s"
 msgstr "Le paquet demandé (%s) n'est pas présent dans %s."
@@ -423,7 +421,7 @@ msgstr ""
 "                   et l'extraction des fichiers"
 
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr "  -p <file>        Utiliser un script alternatif (au lieu de '%s')"
+msgstr "  -p <file>        Utiliser un script alternatif (au lieu de « %s »)"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
@@ -437,11 +435,11 @@ msgstr "  -R, --repackage  Recréer le paquet sans re-compiler"
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Installer les dépendances manquantes avec %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source         Générer une archive source sans les sources téléchargées"
+"  -S, --source     Génère une archive (tarball) source sans les sources "
+"téléchargées"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -458,7 +456,7 @@ msgstr "  --check          Exécute la fonction %s dans %s"
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
 "  --config <file>  Utilise un fichier de configuration alternatif (au lieu "
-"de '%s')"
+"de « %s »)"
 
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
@@ -513,18 +511,27 @@ msgstr ""
 "téléchargement"
 
 msgid "If %s is not specified, %s will look for '%s'"
-msgstr "Si %s n'est pas spécifié, %s cherchera '%s'"
+msgstr "Si %s n'est pas spécifié, %s cherchera « %s »"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 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>."
+"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nCeci est "
+"un logiciel libre ; voir les sources pour les conditions sur la copie.\\nIl "
+"n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
+
+msgid "%s signal caught. Exiting..."
+msgstr "Signal %s reçu. Abandon…"
+
+msgid "Aborted by user! Exiting..."
+msgstr "Terminé par l'utilisateur ! Arrêt du programme…"
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr "Une erreur inconnue est survenue. Arrêt du programme…"
 
 msgid "%s not found."
 msgstr "%s est introuvable."
@@ -544,6 +551,11 @@ msgstr ""
 "Vous n'avez pas les permissions nécessaires (accès en écriture) pour "
 "enregistrer les téléchargements dans %s."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr ""
+"Vous n'avez pas l'autorisation en écriture pour stocker les archives sources "
+"dans %s."
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s et %s sont incompatibles"
 
@@ -675,13 +687,13 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Utilisation : %s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 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>."
+"\\nCeci est un logiciel libre ; voir les sources pour les conditions sur la "
+"copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "'%s' n'existe pas ou n'est pas un dossier."
@@ -710,43 +722,36 @@ msgstr "Effectué(e)."
 msgid "Manage pacman's list of trusted keys"
 msgstr "Gérer la liste des clefs de confiance de pacman"
 
-#, fuzzy
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
 msgstr ""
-"  -a, --add [<file(s)>]     Ajouter les clefs spécifiées dans les fichiers "
-"file(s)  (vide pour stdin)"
+"  -a, --add [file(s)]       Ajoute les clefs spécifiées dans le(s) fichier"
+"(s) « file(s) » (vide pour utiliser l'entrée standard (stdin))"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgstr ""
 "  -d, --delete <keyid(s)>   Suppression des identidés des clefs spécifiées"
 
-#, fuzzy
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
 msgstr ""
-"  -e, --export [<keyid(s)>] Exportation des identités des clefs spécifiées "
-"ou de toutes les identités."
+"  -e, --export [keyid(s)]   Exporte les identités des clefs spécifiées ou "
+"toutes les identités."
 
-#, fuzzy
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
-"  -f, --finger [<keyid(s)>] Liste des empreintes des identités des clefs "
-"spécifiées ou de toutes les identités."
+"  -f, --finger [keyid(s)]   Liste les empreintes des identités des clefs "
+"spécifiés ou de toutes les identités"
 
 msgid "  -h, --help                Show this help message and exit"
 msgstr "  -h, --help                Afficher ce message d'aide et quitte"
 
-#, fuzzy
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
 msgstr ""
-"  -l, --list-keys [<keyid(s)>] Liste des clefs spécifiées ou de toutes les "
-"clefs."
+"  -l, --list-keys [keyid(s)] Liste de toutes les clefs ou seulement de "
+"celles spécifiées"
 
-#, fuzzy
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
-msgstr ""
-"  -r, --receive <keyserver> <keyid(s)> Récupére les identités des clefs "
-"spécifiées"
+msgstr "  -r, --recv-keys <keyid(s)> Récupère les clefs spécifiées"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr ""
@@ -765,7 +770,7 @@ msgid ""
 "\\n                            '%s')"
 msgstr ""
 "  --config <file>           Utilisation d'une fichier de configuration "
-"alternatif (à la place de\\n                            '%s')"
+"alternatif (à la place de\\n                            « %s »)"
 
 msgid ""
 "  --edit-key <keyid(s)>     Present a menu for key management task on keyids"
@@ -778,13 +783,12 @@ msgid ""
 "\\n                            of '%s')"
 msgstr ""
 "  --gpgdir <dir>            Indiquer un répertoire alternatif pour GnuPG (à "
-"la palce de\\n                            '%s')"
+"la palce de\\n                            « %s »)"
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr ""
-"  --import <dir(s)>         Importer pubring.gpg et trustdb.gpg à partir des "
-"dossiers dir(s)"
+"  --import <dir(s)>         Importe le fichier pubring.gpg des répertoires « "
+"dir(s) »"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
@@ -799,85 +803,133 @@ msgstr ""
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
 msgstr ""
+"  --keyserver               Spécifier un serveur de clefs à utiliser en cas "
+"de nécessité"
 
-#, fuzzy
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr "  --list-sigs [<keyid(s)>]  Liste les clefs et leurs signatures"
+msgstr "  --list-sigs [keyid(s)]    Liste des clefs et de leurs signatures"
 
-#, fuzzy
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
 msgstr ""
-"  -d, --delete <keyid(s)>   Suppression des identidés des clefs spécifiées"
+"  --lsign-key <keyid>       Signer les identités des clefs spécifiées "
+"localement"
 
 msgid ""
 "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
 "\\n                            in '%s'"
 msgstr ""
+"  --populate [keyring(s)]   Recharge les clefs par défauts du porte-clefs "
+"(donné)\\n                            dans '%s'"
 
-#, fuzzy
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
-"  -l, --list-keys [<keyid(s)>] Liste des clefs spécifiées ou de toutes les "
-"clefs."
+"  --refresh-keys [keyid(s)] Mise à jours de toutes les identités des clefs "
+"(ou uniquement de celles spécifiées) depuis un serveur de clefs"
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "Vous n'avez pas les droits suffisants pour lire le porte-clefs %s…"
+msgid "The key identified by %s could not be found locally."
+msgstr "La clef identifiée par %s n'a pas pu être trouvée localement."
+
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr "Vous n'avez pas les droits suffisants pour lire le porte-clefs %s."
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr "Utilisez '%s' pour corriger les permissions du porte-clefs."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr "Vous n'avez pas les droits suffisants pour lancer cette commande…"
+msgid "You do not have sufficient permissions to run this command."
+msgstr "Vous n'avez pas les droits suffisants pour lancer cette commande."
 
 msgid "There is no secret key available to sign with."
-msgstr ""
+msgstr "Aucune clef secrète n'est disponible pour la signature. "
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Utiliser « %s » pour générer un clef secrète par defaut."
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Ajoute %s..."
+msgstr "Vérification de %s…"
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "Le fichier %s n'est pas signé, abandon."
 
 msgid "The signature of file %s is not valid."
 msgstr "La signature du fichier %s n'est pas valide."
 
-#, fuzzy
 msgid "Verifying keyring file signatures..."
-msgstr "Vérification de la signature des fichiers de clefs supprimés…"
+msgstr "Vérification des signatures du fichier du porte-clefs…"
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "Aucun fichier de porte-clefs n'existe dans %s."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "La clef idenditifiée par %s n'existe pas"
+msgstr "Le fichier de porte-clefs %s n'existe pas."
 
-#, fuzzy
 msgid "Appending keys from %s.gpg..."
-msgstr "Reception des clefs officielles…"
+msgstr "Ajout des clefs depuis %s.gpg…"
 
-#, fuzzy
 msgid "Locally signing trusted keys in keyring..."
-msgstr "Suppression des clefs supprimées du porte-clefs…"
+msgstr "Signature locale des clefs de confiance dans le porte-clefs…"
 
 msgid "Locally signing key %s..."
-msgstr ""
+msgstr "Signature locale de la clef %s…"
+
+msgid "Importing owner trust values..."
+msgstr "Importation des valeurs des propriétaires de confiance…"
 
-#, fuzzy
 msgid "Disabling revoked keys in keyring..."
-msgstr "Suppression des clefs supprimées du porte-clefs…"
+msgstr "Désactivation des clefs révoquées du porte-clefs…"
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Archive %s... "
+msgstr "Désactivation de la clef %s…"
 
-msgid "The key identified by %s does not exist"
-msgstr "La clef idenditifiée par %s n'existe pas"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+"Un fichier de clefs spécifié n'a pas pu être ajouté au porte-clefs GPG."
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+"Un fichier de clefs spécifié n'a pas pu être supprimé du porte-clefs GPG."
+
+msgid "The key identified by %s could not be edited."
+msgstr "La clef identifiée par %s n'a pas pu être éditée."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr "Une clef spécifiée n'a pas pu être exporté du porte-clef GPG."
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr "L'empreinte de la clef spécifiée n'a pas pu être déterminée."
+
+msgid "%s could not be imported."
+msgstr "%s n'a pas pu être importé."
+
+msgid "File %s does not exist and could not be imported."
+msgstr "Le fichier %s n'existe pas et n'a pas pu être importé."
+
+msgid "A specified key could not be listed."
+msgstr "Une des clefs spécifiées n'a pas pu être listée."
+
+msgid "A specified signature could not be listed."
+msgstr "Une des signatures spécifiées n'a pas pu être listée."
+
+msgid "A specified key could not be locally signed."
+msgstr "Une des clefs spécifiées n'a pas pu être localement signée."
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+"La clef distance n'a pas correctement pu être atteinte depuis leserveur de "
+"clefs."
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+"Une clef locale spécifiée n'a pas pu être mise à jour depuis le serveur."
+
+msgid "The signature identified by %s could not be verified."
+msgstr "La signature identifié par « %s » n'a pas pu être vérifiée."
+
+msgid "Updating trust database..."
+msgstr "Mise à jour de la base de données de confiance…"
+
+msgid "Trust database could not be updated."
+msgstr "La base de données de confiance n'a pas pu être mise à jour."
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
@@ -890,19 +942,16 @@ msgstr ""
 "cette opération."
 
 msgid "%s configuration file '%s' not found."
-msgstr "%s Le fichier de configuration '%s' n'a pas été trouvé."
+msgstr "%s Le fichier de configuration « %s » n'a pas été trouvé."
 
 msgid "no operation specified (use -h for help)"
 msgstr "aucune tâche spécifiée (utilisez -h pour obtenir de l'aide)"
 
-msgid "Multiple operations specified"
-msgstr "Tâches multiples spécifiées"
+msgid "Multiple operations specified."
+msgstr "Tâches multiples spécifiées."
 
-msgid "Please run %s with each operation separately\\n"
-msgstr "Veuillez lancer %s pour chaque opértation séparément\\n"
-
-msgid "Updating trust database..."
-msgstr "Mise à jour de la base de données de confiance…"
+msgid "Please run %s with each operation separately."
+msgstr "Veuillez lancer %s pour chaque opértation séparément."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -949,7 +998,7 @@ msgid "Tar'ing up %s failed."
 msgstr "L'archivage de %s a échoué."
 
 msgid "Making and MD5sum'ing the new database..."
-msgstr "Création de la nouvelle base de données et calcul du md5sum..."
+msgstr "Création de la nouvelle base de données et calcul de la somme MD5..."
 
 msgid "Untar'ing %s failed."
 msgstr "L'extraction de %s a échoué."
@@ -994,16 +1043,16 @@ msgstr ""
 "the extent permitted by law.\\n"
 
 msgid "Invalid package file '%s'."
-msgstr "Le paquet '%s' est invalide."
+msgstr "Le paquet « %s » est invalide."
 
 msgid "The package names don't match : '%s' and '%s'"
-msgstr "Le nom du paquet n'est pas cohérent : '%s' et '%s'"
+msgstr "Les nom du paquet n'est pas cohérent : « %s » et « %s »"
 
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr "L'architecture du paquet n'est pas cohérente : '%s' et '%s'"
+msgstr "L'architecture du paquet n'est pas cohérente : « %s » et « %s »"
 
 msgid "Both packages have the same version : '%s'"
-msgstr "Les deux paquets ont la même version : '%s'"
+msgstr "Les deux paquets ont la même version : « %s »"
 
 msgid "Generating delta from version %s to version %s"
 msgstr "Génération du delta de la version %s vers la version %s"
@@ -1012,10 +1061,10 @@ msgid "Delta could not be created."
 msgstr "Impossible de créer le delta."
 
 msgid "Generated delta : '%s'"
-msgstr "Delta généré : '%s'"
+msgstr "Delta généré : « %s »"
 
 msgid "File '%s' does not exist"
-msgstr "Fichier '%s' introuvable"
+msgstr "Fichier « %s » introuvable"
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr ""
@@ -1028,10 +1077,10 @@ msgstr ""
 
 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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add va mettre à jour un dépôt en lisant un paquet.\\nIl est possible de "
-"spécifier plusieurs paquets à ajouter.\\n\\n"
+"« repo-add » va mêttre à jour un dépot à partir d'un paquet.\\nIl est "
+"possible de spécifier plusieurs paquets à ajouter.\\n"
 
 msgid "Options:\\n"
 msgstr "Options :\\n"
@@ -1046,19 +1095,22 @@ msgstr ""
 "  -f, --files       mise à jour de la liste des fichiers de la base de "
 "données\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 "Utilisation : repo-remove [options] <chemin de la base de données> <nom du "
-"paquet|delta> ...\\n\\n"
+"paquet|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\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
-"repo-remove va mettre un jour un dépôt en supprimant le paquet\\nspécifié en "
-"ligne de commande pour un dépôt donné. Plusieurs\\npaquets à supprimer "
-"peuvent être spécifiés.\\n\\n"
+"« repo-remove » va mettre un jour un dépôt en supprimant le paquet"
+"\\nspécifié en ligne de commande pour un dépôt donné. Plusieurs\\npaquets à "
+"supprimer peuvent être spécifiés.\\n\\n"
+
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr "Veuillez partir, il n'y a rien à voir ici.\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       minimise la sortie\\n"
@@ -1080,35 +1132,33 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
-msgstr "\\nVoir %s(8) pour plus de détails sur les options disponibles.\\n\\n"
+msgstr "\\nVoir %s(8) pour plus de détails sur les options disponibles.\\n"
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
-"Exemple :  repo-add /chemin/vers/depot.db.tar.gz pacman-3.0.0-1-i686.pkg.tar."
-"gz"
+"Exemple:  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"
-msgstr "Exemple :  repo-remove /chemin/vers/depot.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr "Exemple:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
-"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"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"\\nCeci est un logiciel libre ; voir les sources pour les conditions sur la "
+"copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
 
 msgid "No database entry for package '%s'."
-msgstr "Pas d'entrée pour le paquet '%s'."
+msgstr "Pas d'entrée pour le paquet « %s »."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr "Ajout de l'entrée 'deltas' : %s -> %s"
+msgstr "Ajout de l'entrée « deltas » : %s -> %s"
 
 msgid "Removing existing entry '%s'..."
-msgstr "Suppression de l'entrée existante '%s'..."
+msgstr "Suppression de l'entrée existante « %s »..."
 
 msgid "Cannot find the gpg binary! Is GnuPG installed?"
 msgstr "GPG n'a pas pu être trouvé. Est-il installé ?"
@@ -1133,19 +1183,22 @@ msgid "Database signature was NOT valid!"
 msgstr "La signature de la base de données n'était PAS valide !"
 
 msgid "'%s' does not have a valid archive extension."
-msgstr "'%s' n'a pas une extension valide pour une archive."
+msgstr "« %s » n'a pas une extension valide pour une archive."
 
 msgid "An entry for '%s' already existed"
-msgstr "Une entrée pour '%s' existait déjà"
+msgstr "Une entrée pour « %s » existait déjà"
 
-msgid "Computing checksums..."
-msgstr "Calcul des sommes de contrôle…"
+msgid "Invalid package signature file '%s'."
+msgstr "Fichier de signature de paquet invalide : %s"
 
 msgid "Adding package signature..."
 msgstr "Ajout de la signature des paquets…"
 
+msgid "Computing checksums..."
+msgstr "Calcul des sommes de contrôle…"
+
 msgid "Creating '%s' db entry..."
-msgstr "Création de l'entrée '%s'..."
+msgstr "Création de l'entrée « %s »..."
 
 msgid "Old package file not found: %s"
 msgstr "Ancien paquet introuvable : %s"
@@ -1157,43 +1210,43 @@ msgid "Held by process %s"
 msgstr "Occupé par le processus %s"
 
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr "Le fichier de dépôt '%s' n'est pas un dépôt pacman valide."
+msgstr "Le fichier de dépôt « %s » n'est pas un dépôt pacman valide."
 
 msgid "Extracting database to a temporary location..."
 msgstr "Extraction de la base de données vers un répertoire temporaire..."
 
 msgid "Repository file '%s' was not found."
-msgstr "Le fichier de dépôt '%s' n'a pas été trouvé."
+msgstr "Le fichier de dépôt « %s » n'a pas été trouvé."
 
 msgid "Repository file '%s' could not be created."
-msgstr "Le fichier de dépôt '%s' n'a pas pu être créé."
+msgstr "Le fichier de dépôt « %s » n'a pas pu être créé."
 
 msgid "File '%s' not found."
-msgstr "Le fichier '%s' n'a pas été trouvé."
+msgstr "Le fichier « %s » n'a pas été trouvé."
 
 msgid "Adding delta '%s'"
-msgstr "Ajout du delta '%s'"
+msgstr "Ajout du delta « %s »"
 
 msgid "'%s' is not a package file, skipping"
-msgstr "'%s' n'est pas un paquet, ignore"
+msgstr "« %s » n'est pas un paquet, ignore"
 
 msgid "Adding package '%s'"
-msgstr "Ajoute le paquet '%s'"
+msgstr "Ajoute le paquet « %s »"
 
 msgid "Searching for delta '%s'..."
-msgstr "Recherche le delta '%s'..."
+msgstr "Recherche le delta « %s »..."
 
 msgid "Delta matching '%s' not found."
-msgstr "aucun delta correspondant à '%s' n'a été trouvé."
+msgstr "aucun delta correspondant à « %s » n'a été trouvé."
 
 msgid "Searching for package '%s'..."
-msgstr "Recherche le paquet '%s'..."
+msgstr "Recherche le paquet « %s »..."
 
 msgid "Package matching '%s' not found."
-msgstr "le paquet '%s' n'a pas été trouvé."
+msgstr "le paquet « %s » n'a pas été trouvé."
 
 msgid "Invalid command name '%s' specified."
-msgstr "La commande '%s' spécifiée est invalide."
+msgstr "La commande « %s » spécifiée est invalide."
 
 msgid "Cannot create temp directory for database building."
 msgstr ""
@@ -1201,7 +1254,7 @@ msgstr ""
 "données."
 
 msgid "Creating updated database file '%s'"
-msgstr "Création du nouveau fichier de dépôt '%s'"
+msgstr "Création du nouveau fichier de dépôt « %s »"
 
 msgid "No packages remain, creating empty database."
 msgstr "Plus de paquets, création d'un dépôt vide."
@@ -1214,20 +1267,3 @@ msgstr "L'option %s a besoin d'un argument\\n"
 
 msgid "unrecognized option"
 msgstr "Option non reconnue"
-
-#~ msgid "  --reload                  Reload the default keys"
-#~ msgstr "  --reload                  Recharge les clefs par defaut"
-
-#~ msgid "Verifying official keys file signature..."
-#~ msgstr "Vérification de la signature du fichier de clefs officielles…"
-
-#~ msgid "Verifying deprecated keys file signature..."
-#~ msgstr "Vérification de la signature de fichier de clefs obsolètes…"
-
-#~ msgid "Appending deprecated keys..."
-#~ msgstr "Réception des clefs obsolètes…"
-
-#~ msgid "You need to specify the keyserver and at least one key identifier"
-#~ msgstr ""
-#~ "Vous devez indiquer le serveur de clefs ainsi qu'un identifiant de clefs "
-#~ "(minimum)"

scripts/po/it.po

@@ -4,14 +4,14 @@
 #
 # Translators:
 # Andrea Scarpino <andrea@archlinux.org>, 2011.
-# Giovanni Scafora <giovanni@archlinux.org>, 2011.
+# Giovanni Scafora <giovanni@archlinux.org>, 2011, 2012.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-09-07 02:22+0000\n"
-"Last-Translator: giovanni <giovanni@archlinux.org>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-06 12:49+0000\n"
+"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/it/)\n"
 "Language: it\n"
@@ -118,21 +118,17 @@ msgstr "FIRMA NON TROVATA"
 msgid "SOURCE FILE NOT FOUND"
 msgstr "FILE SORGENTE NON TROVATO"
 
-#, fuzzy
 msgid "unknown public key"
-msgstr "Chiave pubblica sconosciuta"
+msgstr "chiave pubblica sconosciuta"
 
-#, fuzzy
 msgid "the key has been revoked."
-msgstr "Attenzione: la chiave è stata revocata."
+msgstr "la chiave è stata revocata."
 
-#, fuzzy
 msgid "the signature has expired."
-msgstr "Attenzione: la firma è scaduta."
+msgstr "la firma è scaduta."
 
-#, fuzzy
 msgid "the key has expired."
-msgstr "Attenzione: la chiave è scaduta."
+msgstr "la chiave è scaduta."
 
 msgid "One or more PGP signatures could not be verified!"
 msgstr "Una o più firme PGP non possono essere verificate!"
@@ -427,11 +423,9 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Installa le dipendenze mancanti con %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  --source         Genera solo un archivio che esclude i sorgenti scaricati"
+msgstr "  -S, --source     Genera il tarball senza scaricare i sorgenti"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -504,16 +498,25 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Se %s non è stato specificato, %s cercherà '%s'"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 
+msgid "%s signal caught. Exiting..."
+msgstr "Ho ricevuto il segnale %s. Esco..."
+
+msgid "Aborted by user! Exiting..."
+msgstr "Annullato dall'utente! Uscita in corso..."
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr "Si è verificato un errore sconosciuto. Uscita in corso..."
+
 msgid "%s not found."
 msgstr "Impossibile trovare %s."
 
@@ -527,6 +530,9 @@ msgstr ""
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Non si dispone dei permessi in scrittura per salvare i download in %s."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr "Non disponi del permesso di scrittura per salvare i sorgenti in %s."
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s e %s non possono essere entrambi specificati"
 
@@ -661,11 +667,11 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Uso: %s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 
@@ -694,38 +700,33 @@ msgstr "Fatto."
 msgid "Manage pacman's list of trusted keys"
 msgstr "Gestisce la lista delle chiavi attendibili di pacman"
 
-#, fuzzy
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
 msgstr ""
-"  -a, --add [<file(s)>]     Aggiunge la chiave specificata (vuota per stdin)"
+"  -a, --add [file(s)]       Aggiunge la chiave specificata (vuoto per stdin)"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgstr "  -d, --delete <keyid(s)>   Rimuove le keyid specificate"
 
-#, fuzzy
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
 msgstr ""
-"  -e, --export [<keyid(s)>] Esporta la chiave specificata o tutte le keyids"
+"  -e, --export [keyid(s)]   Esporta la chiave specificata o tutti i keyids"
 
-#, fuzzy
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
-"  -f, --finger [<keyid(s)>] Elenca le impronte digitali delle keyid "
-"specificate o di tutte"
+"  -f, --finger [keyid(s)]   Elenca i fingerprint di tutti o dei keyids "
+"specificati"
 
 msgid "  -h, --help                Show this help message and exit"
 msgstr ""
 "  -h, --help                Mostra questo messaggio di help message ed esce"
 
-#, fuzzy
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
 msgstr ""
-"  -l, --list-keys [<keyid(s)>] Elenca le chiavi specificate o tutte le chiavi"
+"  -l, --list-keys [keyid(s)] Elenca tutte le chiavi o quella specificata"
 
-#, fuzzy
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
-msgstr "  -r, --receive <keyserver> <keyid(s)> Preleva le keyids specificate"
+msgstr "  -r, --recv-keys <keyid(s)> Preleva i keyids specificati"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr "  -u, --updatedb            Aggiorna il database di pacman"
@@ -755,11 +756,8 @@ msgstr ""
 "  --gpgdir <dir>            Imposta una directory alternativa per GnuPG "
 "(invece\\n                            di '%s')"
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
-msgstr ""
-"  --import <dir(s)>         Importa pubring.gpg e trustdb.gpg dalla(e) "
-"directory"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
+msgstr "  --import <dir(s)>         Importa pubring.gpg dalla(e) directory"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
@@ -775,83 +773,128 @@ msgstr ""
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
 msgstr ""
+"  --keyserver               Se necessario, specifica un keyserver da "
+"utilizzare"
 
-#, fuzzy
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr "  --list-sigs [<keyid(s)>]  Elenca le chiavi e le rispettive firme"
+msgstr "  --list-sigs [keyid(s)]    Elenca le chiavi e le rispettive firme"
 
-#, fuzzy
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
-msgstr "  -d, --delete <keyid(s)>   Rimuove le keyid specificate"
+msgstr "  --lsign-key <keyid>       Firma localmente il keyid specificato"
 
 msgid ""
 "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
 "\\n                            in '%s'"
 msgstr ""
+"  --populate [keyring(s)]   Ricarica le chiavi di default dai (specificati) "
+"keyrings\\n                            in '%s'"
 
-#, fuzzy
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
-"  -l, --list-keys [<keyid(s)>] Elenca le chiavi specificate o tutte le chiavi"
+"  --refresh-keys [keyid(s)] Aggiorna la chiave specificata o tutte le chiavi "
+"da keyserver"
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "Non hai permessi sufficienti per leggere il keyring di %s..."
+msgid "The key identified by %s could not be found locally."
+msgstr "La chiave identificata da %s non esiste."
+
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr "Non hai permessi sufficienti per leggere il keyring %s."
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr "Usa '%s' per correggere i permessi del keyring."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr "Non hai permessi sufficienti per avviare questo comando..."
+msgid "You do not have sufficient permissions to run this command."
+msgstr "Non hai permessi sufficienti per avviare questo comando."
 
 msgid "There is no secret key available to sign with."
-msgstr ""
+msgstr "Non c'è nessuna chiave segreta disponibile per firmare."
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Usa '%s' per generare una chiave segreta di default."
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Aggiunta di %s in corso..."
+msgstr "Verifica di %s in corso..."
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "Il file %s non è firmato, impossibile continuare."
 
 msgid "The signature of file %s is not valid."
 msgstr "La firma del file %s non è valida."
 
-#, fuzzy
 msgid "Verifying keyring file signatures..."
-msgstr "Verifica della firma delle chiavi eliminate in corso..."
+msgstr "Verifica del keyring delle firme dei file in corso..."
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "Non esiste nessun file di keyring in %s."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "La chiave identificata da %s non esiste"
+msgstr "Il file di keyring %s non esiste."
 
-#, fuzzy
 msgid "Appending keys from %s.gpg..."
-msgstr "Aggiunta delle chiavi ufficiali in corso..."
+msgstr "Aggiunta delle chiavi da %s.gpg in corso..."
 
-#, fuzzy
 msgid "Locally signing trusted keys in keyring..."
-msgstr "Rimozione delle chiavi eliminate dal keyring in corso..."
+msgstr "Sto firmando localmente le chiavi verificate nel keyring..."
 
 msgid "Locally signing key %s..."
-msgstr ""
+msgstr "Sto firmando localmente la chiave %s..."
+
+msgid "Importing owner trust values..."
+msgstr "Sto importando i valori..."
 
-#, fuzzy
 msgid "Disabling revoked keys in keyring..."
-msgstr "Rimozione delle chiavi eliminate dal keyring in corso..."
+msgstr "Disabilitazione delle chiavi revocate nel keyring in corso..."
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Compressione di %s in corso..."
+msgstr "Disabilitazione della chiave %s in corso..."
 
-msgid "The key identified by %s does not exist"
-msgstr "La chiave identificata da %s non esiste"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr "Un keyfile specificato non può essere aggiunto al portachiavi gpg."
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr "Un keyfile specificato non può essere rimosso dal portachiavi gpg."
+
+msgid "The key identified by %s could not be edited."
+msgstr "La chiave identificata da %s non può essere modificata."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr "Un keyfile specificato non può essere esportato dal portachiavi gpg."
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+"L'impronta digitale di una chiave specificata non può essere determinata."
+
+msgid "%s could not be imported."
+msgstr "%s non può essere importata."
+
+msgid "File %s does not exist and could not be imported."
+msgstr "Il file %s non esiste e non può essere importato."
+
+msgid "A specified key could not be listed."
+msgstr "Una chiave specificata non può essere elencata."
+
+msgid "A specified signature could not be listed."
+msgstr "Una firma specificata non può essere elencata."
+
+msgid "A specified key could not be locally signed."
+msgstr "Una chiave specificata non può essere firmata localmente."
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr "La chiave remota non è stata correttamente scaricata dal keyserver."
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+"Una chiave locale specificata non può essere aggiornata da un keyserver."
+
+msgid "The signature identified by %s could not be verified."
+msgstr "La firma identificata da %s non può essere verificata."
+
+msgid "Updating trust database..."
+msgstr "Aggiornamento del database in corso..."
+
+msgid "Trust database could not be updated."
+msgstr "Il database non può essere aggiornato."
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
@@ -866,14 +909,11 @@ msgstr "Impossibile trovare il file di configurazione '%s' di %s."
 msgid "no operation specified (use -h for help)"
 msgstr "nessuna operazione è stata specificata (usa -h per un aiuto)"
 
-msgid "Multiple operations specified"
-msgstr "Sono state specificate operazioni multiple"
+msgid "Multiple operations specified."
+msgstr "Operazioni multiple specificate."
 
-msgid "Please run %s with each operation separately\\n"
-msgstr "Avviare separatamente %s per ciascuna operazione\\n"
-
-msgid "Updating trust database..."
-msgstr "Aggiornamento del database in corso..."
+msgid "Please run %s with each operation separately."
+msgstr "Si prega di avviare %s separatamente per ciascuna operazione."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -993,11 +1033,10 @@ msgstr "Uso: repo-add [opzioni] <path-del-db> <pacchetto|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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add aggiornerà un database dei pacchetti leggendo un file del pacchetto."
-"\\nL'aggiunta di pacchetti multipli può essere specificata dalla linea di "
-"comando.\\n\\n"
+"repo-add aggiornerà un database leggendo i file di un pacchetto.\\nPacchetti "
+"multipli da aggiungere, possono essere specificati dalla linea di comando.\\n"
 
 msgid "Options:\\n"
 msgstr "Opzioni:\\n"
@@ -1010,19 +1049,21 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       aggiorna la lista dei file del database\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
-msgstr ""
-"Uso: repo-remove [opzioni] <path-del-db> <nomepacchetto|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
+msgstr "Uso: repo-remove [opzioni] <path-del-db> <nomepacchetto|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\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
-"repo-remove aggiornerà un database, rimuovendo il nome del pacchetto"
-"\\nspecificato dalla linea di comando dal database del repo dato. La"
-"\\nrimozione dei pacchetti multipli può essere specificata dalla linea di "
-"comando.\\n\\n"
+"repo-remove aggiornerà il database di un pacchetto, rimuovendo il nome del "
+"pacchetto\\nspecificato dalla linea di comando dal database del repository. "
+"Pacchetti\\nmultipli da rimuovere, possono essere specificati dalla linea di "
+"comando.\\n"
+
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr "Stai alla larga, non c'è niente da vedere qui.\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       minimizza l'output\\n"
@@ -1042,25 +1083,24 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
-"\\nVedi %s(8) per maggiori dettagli e descrizioni delle opzioni disponibili."
-"\\n\\n"
+"\\nVedere %s(8) per maggiori dettagli e descrizioni delle opzioni "
+"disponibili.\\n"
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
-"Esempio:  repo-add /path/di/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Esempio:  repo-add /path/al/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"
-msgstr "Esempio:  repo-remove /path/di/repo.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr "Esempio:  repo-remove /path/al/repo.db.tar.gz kernel26\\n"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 
@@ -1102,12 +1142,15 @@ msgstr "'%s' non è una valida estensione di un archivio."
 msgid "An entry for '%s' already existed"
 msgstr "Già esiste una voce per '%s'"
 
-msgid "Computing checksums..."
-msgstr "Calcolo dei controlli dell'integrità in corso..."
+msgid "Invalid package signature file '%s'."
+msgstr "Firma non valida per il pacchetto '%s'."
 
 msgid "Adding package signature..."
 msgstr "Aggiunta della firma del pacchetto in corso..."
 
+msgid "Computing checksums..."
+msgstr "Calcolo dei controlli dell'integrità in corso..."
+
 msgid "Creating '%s' db entry..."
 msgstr "Creazione della voce del db '%s' in corso..."
 
@@ -1176,19 +1219,3 @@ msgstr "l'opzione %s richiede un argomento\\n"
 
 msgid "unrecognized option"
 msgstr "opzione sconosciuta"
-
-#~ msgid "  --reload                  Reload the default keys"
-#~ msgstr "  --reload                  Ricarica le chiavi di default"
-
-#~ msgid "Verifying official keys file signature..."
-#~ msgstr "Verifica della firma delle chiavi ufficiali in corso..."
-
-#~ msgid "Verifying deprecated keys file signature..."
-#~ msgstr "Verifica della firma delle chiavi deprecate in corso..."
-
-#~ msgid "Appending deprecated keys..."
-#~ msgstr "Aggiunta delle chiavi deprecate in corso..."
-
-#~ msgid "You need to specify the keyserver and at least one key identifier"
-#~ msgstr ""
-#~ "Devi specificare il keyserver ed almeno un identificatore della chiave"

scripts/po/kk.po

@@ -7,9 +7,9 @@ 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-08-15 21:10+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 06:08+0000\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/kk/)\n"
 "Language: kk\n"
@@ -400,12 +400,9 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source         Бастапқы кодтары бар, жүктеліп алынған файлдары жоқ, "
-"архивті жасау"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -468,15 +465,20 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nБұл еркін "
-"бағдарламалық қамтама; көшірме жасау шарттарын кодтан қараңыз.\\nЗаңмен "
-"рұқсат етілген шегінде ешбір КЕПІЛДЕМЕ берілмейді.\\n"
+
+msgid "%s signal caught. Exiting..."
+msgstr ""
+
+msgid "Aborted by user! Exiting..."
+msgstr ""
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr ""
 
 msgid "%s not found."
 msgstr "%s табылмады."
@@ -490,6 +492,9 @@ msgstr "Дестелерді %s ішінде сақтау үшін жазу құ
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Жүктеліп алынған файлдарды %s ішіне сақтау үшін жазу құқығыңыз жоқ."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr ""
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr ""
 
@@ -602,13 +607,10 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Қолданылуы: %s [pacman_ДҚ_түбірі]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nБұл еркін бағдарламалық қамтама; көшірме жасау шарттарын кодтан қараңыз."
-"\\nЗаңмен рұқсат етілген шегінде ешбір КЕПІЛДЕМЕ берілмейді.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s жоқ болып тұр немесе ол бума емес."
@@ -678,8 +680,7 @@ msgid ""
 "\\n                            of '%s')"
 msgstr ""
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr ""
 
 msgid ""
@@ -708,13 +709,16 @@ msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
+msgid "The key identified by %s could not be found locally."
+msgstr ""
+
+msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr ""
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr ""
 
-msgid "You do not have sufficient permissions to run this command..."
+msgid "You do not have sufficient permissions to run this command."
 msgstr ""
 
 msgid "There is no secret key available to sign with."
@@ -723,9 +727,8 @@ msgstr ""
 msgid "Use '%s' to generate a default secret key."
 msgstr ""
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "%s қосылуда... "
+msgstr ""
 
 msgid "File %s is unsigned, cannot continue."
 msgstr ""
@@ -739,9 +742,8 @@ msgstr ""
 msgid "No keyring files exist in %s."
 msgstr ""
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "%s файлы (%s) жоқ болып тұр."
+msgstr ""
 
 msgid "Appending keys from %s.gpg..."
 msgstr ""
@@ -752,14 +754,58 @@ msgstr ""
 msgid "Locally signing key %s..."
 msgstr ""
 
+msgid "Importing owner trust values..."
+msgstr ""
+
 msgid "Disabling revoked keys in keyring..."
 msgstr ""
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "%s tar көмегімен сығу ..."
+msgstr ""
 
-msgid "The key identified by %s does not exist"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+
+msgid "The key identified by %s could not be edited."
+msgstr ""
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+msgid "%s could not be imported."
+msgstr ""
+
+msgid "File %s does not exist and could not be imported."
+msgstr ""
+
+msgid "A specified key could not be listed."
+msgstr ""
+
+msgid "A specified signature could not be listed."
+msgstr ""
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+msgid "The signature identified by %s could not be verified."
+msgstr ""
+
+msgid "Updating trust database..."
+msgstr ""
+
+msgid "Trust database could not be updated."
 msgstr ""
 
 msgid "Cannot find the %s binary required for all %s operations."
@@ -774,13 +820,10 @@ msgstr ""
 msgid "no operation specified (use -h for help)"
 msgstr ""
 
-msgid "Multiple operations specified"
+msgid "Multiple operations specified."
 msgstr ""
 
-msgid "Please run %s with each operation separately\\n"
-msgstr ""
-
-msgid "Updating trust database..."
+msgid "Please run %s with each operation separately."
 msgstr ""
 
 msgid ""
@@ -898,10 +941,8 @@ msgstr ""
 
 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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add десте файлдың ақпаратың оқу арқылы дестелердің дерекқорын жаңартады."
-"\\nБірнеше дестені қосу үшін олардың барлығын көрсетіңіз.\\n\\n"
 
 msgid "Options:\\n"
 msgstr ""
@@ -912,16 +953,17 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr ""
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 
 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"
+"\\npackages to remove can be specified on the command line.\\n"
+msgstr ""
+
+msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
-"repo-remove көрсетілген дерекқордан көрсетілген дестені өшіріп,\\nдерекқорды "
-"жаңартады. Бірнеше дестені көрсете аласыз\\n\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr ""
@@ -937,18 +979,17 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr "Мысалы:  repo-remove /репозиторийге/дейінгі/жол.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
@@ -989,12 +1030,15 @@ msgstr "'%s' дұрыс архив кеңейтілуіне ие емес."
 msgid "An entry for '%s' already existed"
 msgstr "'%s' үшін жазба бар болып тұр"
 
-msgid "Computing checksums..."
+msgid "Invalid package signature file '%s'."
 msgstr ""
 
 msgid "Adding package signature..."
 msgstr ""
 
+msgid "Computing checksums..."
+msgstr ""
+
 msgid "Creating '%s' db entry..."
 msgstr "Дерекқорда '%s' жазбасын жасау..."
 

scripts/po/lt.po

@@ -4,14 +4,16 @@
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
 # FULL NAME <EMAIL@ADDRESS>, 2011.
+# toofishes <dpmcgee@gmail.com>, 2011.
 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-09-22 11:33-0500\n"
-"PO-Revision-Date: 2011-08-24 06:02+0000\n"
-"Last-Translator: gymka_ltu <gymka@mail.ru>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-05 07:27+0000\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/lt/)\n"
 "Language: lt\n"
@@ -34,7 +36,7 @@ msgid "Entering %s environment..."
 msgstr "Įeinama į %s aplinką..."
 
 msgid "Unable to find source file %s."
-msgstr "Nerastas pradinio kodo failas %s."
+msgstr "Pradinio kodo failas %s nerastas."
 
 msgid "Aborting..."
 msgstr "Nutraukiama..."
@@ -46,13 +48,13 @@ msgid "The download program %s is not installed."
 msgstr "Parsiuntimo programa %s neįdiegta."
 
 msgid "'%s' returned a fatal error (%i): %s"
-msgstr "'%s' grąžino kritinę klaidą (%i): %s"
+msgstr "„%s“ grąžino kritinę klaidą (%i): %s"
 
 msgid "Installing missing dependencies..."
 msgstr "Įdiegiamos trūkstamos priklausomybės..."
 
 msgid "'%s' failed to install missing dependencies."
-msgstr "'%s' nepavyko įdiegti trūkstamų priklausomybių."
+msgstr "„%s“ nepavyko įdiegti trūkstamų priklausomybių."
 
 msgid "Missing Dependencies:"
 msgstr "Trūkstamos priklausomybės:"
@@ -76,7 +78,7 @@ msgid "Failure while downloading %s"
 msgstr "Įvyko klaida siunčiant %s"
 
 msgid "Generating checksums for source files..."
-msgstr "Kuriamos kontrolinės sumos pradinio kodo failams..."
+msgstr "Kuriamos pradinio kodo failų kontrolinės sumos ..."
 
 msgid "Cannot find the %s binary required for generating sourcefile checksums."
 msgstr ""
@@ -84,10 +86,10 @@ msgstr ""
 "kodo kontrolinę sumą."
 
 msgid "Invalid integrity algorithm '%s' specified."
-msgstr "Nurodytas neteisingas vientisumo algoritmas '%s'."
+msgstr "Nurodytas neteisingas vientisumo algoritmas „%s“."
 
 msgid "Validating source files with %s..."
-msgstr "Tikrinu pradinio kodo failus su %s..."
+msgstr "Pradinio kodo failai tikrinami su %s..."
 
 msgid "NOT FOUND"
 msgstr "NERASTA"
@@ -116,30 +118,26 @@ msgstr "PARAŠAS NERASTAS"
 msgid "SOURCE FILE NOT FOUND"
 msgstr "PRADINIO KODO FAILAS NERASTAS"
 
-#, fuzzy
 msgid "unknown public key"
-msgstr "Nežinomas viešas raktas"
+msgstr "nežinomas viešas raktas"
 
-#, fuzzy
 msgid "the key has been revoked."
-msgstr "Įspėjimas: raktas buvo atšauktas."
+msgstr "raktas buvo atšauktas."
 
-#, fuzzy
 msgid "the signature has expired."
-msgstr "Įspėjimas: parašas pasibaigęs."
+msgstr "parašo galiojimas baigėsi."
 
-#, fuzzy
 msgid "the key has expired."
-msgstr "Įspėjimas: raktas pasibaigė."
+msgstr "rakto galiojimas baigėsi."
 
 msgid "One or more PGP signatures could not be verified!"
 msgstr "Neįmanoma patikrinti vieno ar kelių PGP parašų!"
 
 msgid "Warnings have occurred while verifying the signatures."
-msgstr "Tikrinant parašus buvo įspėjimų."
+msgstr "Tikrinant parašus buvo gauta įspėjimų."
 
 msgid "Please make sure you really trust them."
-msgstr "Įsitikink jog tikrai pasitiki jais."
+msgstr "Įsitikinkite jog jais tikrai pasitikite."
 
 msgid "Skipping all source file integrity checks."
 msgstr "Praleidžiama visų pradinių kodų vientisumo patikra."
@@ -157,7 +155,7 @@ msgid "Extracting %s with %s"
 msgstr "Išarchyvuojama %s su %s"
 
 msgid "Failed to extract %s"
-msgstr "Nepavyko išarchyvuoti %s"
+msgstr "%s išarchyvuoti nepavyko"
 
 msgid "A failure occurred in %s()."
 msgstr "Kilo bėdų su %s()."
@@ -175,7 +173,7 @@ msgid "Purging unwanted files..."
 msgstr "Šalinami nepageidaujami failai..."
 
 msgid "Compressing man and info pages..."
-msgstr "Archyvuojami man ir info puslapiai..."
+msgstr "Archyvuojami „man“ ir „info“ puslapiai..."
 
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr ""
@@ -188,25 +186,25 @@ msgid "Removing empty directories..."
 msgstr "Šalinami tušti aplankai..."
 
 msgid "Compressing binaries with %s..."
-msgstr "Archyvuojama sukompiliuota programa su %s..."
+msgstr "Sukompiliuota programa archyvuojama su %s..."
 
 msgid "Could not compress binary : %s"
-msgstr "Nepavyko suarchyvuoti sukompiliuotos programos : %s"
+msgstr "Nepavyko suarchyvuoti sukompiliuotos programos: %s"
 
 msgid "Generating %s file..."
 msgstr "Generuojamas %s failas..."
 
 msgid "Cannot find library listed in %s: %s"
-msgstr "Nepavyko rasti bibliotekos išvardintos %s: %s"
+msgstr "Nepavyko rasti bibliotekos esančios sąraše %s: %s"
 
 msgid "Please add a license line to your %s!"
-msgstr "Pridėk licencijos eilutę prie savo %s!"
+msgstr "Pridėkite licencijos eilutę prie savo %s!"
 
 msgid "Example for GPL'ed software: %s."
 msgstr "Pavyzdys programai su GPL licencija: %s."
 
 msgid "%s entry file not in package : %s"
-msgstr "įrašo failo %s pakete nėra : %s"
+msgstr "Įrašo failo %s pakete nėra : %s"
 
 msgid "Package contains reference to %s"
 msgstr "Paketas turi nuorodą į %s"
@@ -224,7 +222,7 @@ msgid "Compressing package..."
 msgstr "Archyvuojamas paketas..."
 
 msgid "'%s' is not a valid archive extension."
-msgstr "'%s' nėra teisingas archyvo plėtinys."
+msgstr "„%s“ nėra tinkamas archyvo plėtinys."
 
 msgid "Failed to create package file."
 msgstr "Nepavyko sukurti paketo."
@@ -269,22 +267,22 @@ msgid "Failed to install built package(s)."
 msgstr "Nepavyko įdiegti sukurto paketo(-ų)."
 
 msgid "%s is not allowed to be empty."
-msgstr "%s negali būt tuščias."
+msgstr "%s negali būti tuščias."
 
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s negali prasidėt brūkšniu."
 
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
-msgstr "%s negali turėt dvitaškių, brūkšnių ar tarpų."
+msgstr "%s negali turėti dvitaškių, brūkšnių ar tarpų."
 
 msgid "%s is not allowed to contain hyphens or whitespace."
-msgstr "%s negali turėt brūkšnių ar tarpų."
+msgstr "%s negali turėti brūkšnių ar tarpų."
 
 msgid "%s must be an integer."
 msgstr "%s turi būti skaičius."
 
 msgid "%s is not available for the '%s' architecture."
-msgstr "%s negalimas '%s' architektūrai."
+msgstr "%s negalimas „%s“ architektūrai."
 
 msgid "Note that many packages may need a line added to their %s"
 msgstr "Turėk omeny jog daugumai paketų reikia pridėt eilutę prie jų %s"
@@ -299,27 +297,27 @@ msgid "%s entry should not contain leading slash : %s"
 msgstr "%s įrašas negali prasidėt paverstu brūkšniu : %s"
 
 msgid "Invalid syntax for %s : '%s'"
-msgstr "Netinkama sintaksė %s : '%s'"
+msgstr "Netinkama sintaksė %s : „%s“"
 
 msgid "%s file (%s) does not exist."
 msgstr "%s failas (%s) neegzistuoja."
 
 msgid "%s array contains unknown option '%s'"
-msgstr "%s masyvas turi nežinomą pasirinktį '%s'"
+msgstr "%s masyvas turi nežinomą pasirinktį „%s“"
 
 msgid "Missing %s function for split package '%s'"
-msgstr "Trūksta %s funkcijos atskiram paketui '%s'"
+msgstr "Trūksta %s funkcijos atskiram paketui „%s“"
 
 msgid "Requested package %s is not provided in %s"
 msgstr "Užklausto paketo %s nėra %s"
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
-msgstr "Sudo nerastas. Bus naudojama su gauti root teises."
+msgstr "„Sudo“ nerastas. Gauti „root“ teises bus naudojama „su“."
 
 msgid "Cannot find the %s binary required for building as non-root user."
 msgstr ""
-"Negalima rasti %s sukompiliuotos programos reikalingos kompiliuoti kaip ne-"
-"root vartotojui."
+"Sukompiliuota programa %s, reikalinga kompiliuoti kaip ne-root naudotojas, "
+"nerasta."
 
 msgid "Cannot find the %s binary required for signing packages."
 msgstr ""
@@ -376,7 +374,7 @@ msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
 msgstr "  -A, --ignorearch Ignoruoti nepilnus %s laukus %s"
 
 msgid "  -c, --clean      Clean up work files after build"
-msgstr "  -c, --clean      Ištrinti darbinius failus po darbo"
+msgstr "  -c, --clean      Po darbo ištrinti darbinius failus"
 
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Praleisti visas priklausomybių patikras"
@@ -397,7 +395,7 @@ msgid "  -h, --help       Show this help message and exit"
 msgstr "  -h, --help       Parodyti šį pagalbos pranešimą ir išeiti"
 
 msgid "  -i, --install    Install package after successful build"
-msgstr "  -i, --install    Įdiegti paketą po sėkmingo sukūrimo"
+msgstr "  -i, --install    Po sėkmingo sukūrimo įdiegti paketą"
 
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Registruoti paketo kūrimo procesą"
@@ -410,7 +408,7 @@ msgstr "  -o, --nobuild    Failus tik parsiųsti ir išarchyvuoti"
 
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr ""
-"  -p <failas>        Naudoti alternatyvų kūrimo scenarijų (vietoj '%s')"
+"  -p <failas>        Naudoti alternatyvų kūrimo scenarijų (vietoj „%s“)"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
@@ -423,29 +421,28 @@ msgstr "  -R, --repackage  Perpakuoti paketo turinį neperkuriant"
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Įdiegti trūkstamas priklausomybes su %s"
 
-#, fuzzy
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source         Sukurti tik-pradinio kodo tarball be parsiųstų pradinio "
-"kodo failų"
+"  -S, --source     Sukuria tik tai pradinio kodo archyvą be parsiųstų "
+"išeities kodų"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
-"  --allsource      Sukurti tik pradinio kodo tarball pridedant parsiųstus "
+"  --allsource      Sukurti tik pradinio kodo „tarball“ pridedant parsiųstus "
 "pradinius kodus "
 
 msgid "  --asroot         Allow %s to run as root user"
-msgstr "  --asroot         Leisti %s veikti kaip root vartotojui"
+msgstr "  --asroot         Leisti %s veikti kaip root naudotojui"
 
 msgid "  --check          Run the %s function in the %s"
 msgstr "  --check          Paleisti funkciją %s %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
-"  --config <failas>  Naudoti alternatyvų konfigūracijos failą (vietoj '%s')"
+"  --config <failas>  Naudoti alternatyvų konfigūracijos failą (vietoj „%s“)"
 
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
@@ -481,43 +478,55 @@ msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgstr "  --skippgpcheck   Netikrinti pradinio kodo failų PGP parašų"
 
 msgid "These options can be passed to %s:"
-msgstr "Šios pasirinktys gali būt pateiktos %s:"
+msgstr "Šios pasirinktys gali būti pateiktos %s:"
 
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "  --noconfirm      Neprašyti patvirtinimo sprendžiant priklausomybes"
 
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr "  --noprogressbar  Nerodyti pažangos juostos kol parsiunčiami failai"
+msgstr "  --noprogressbar  Nerodyti pažangos juostos parsiunčiant failus"
 
 msgid "If %s is not specified, %s will look for '%s'"
-msgstr "Jei %s nenurodytas, %s ieškos '%s'"
+msgstr "Jei %s nenurodytas, %s ieškos „%s“"
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman kūrėjų komanda <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nTai "
-"nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra JOKIOS "
-"GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
+"Autorinės teisės (c) 2006-2012 Pacman kūrėjų komanda <pacman-dev@archlinux."
+"org>.\\nAutorinės teisės (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n"
+"\\nTai nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra "
+"JOKIOS GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
+
+msgid "%s signal caught. Exiting..."
+msgstr "%s signalas pagautas. Išeinama..."
+
+msgid "Aborted by user! Exiting..."
+msgstr "Naudotojas nutraukė! Išeinama..."
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr "Kilo nežinoma klaida. Išeinama..."
 
 msgid "%s not found."
 msgstr "%s nerasta."
 
 msgid "You do not have write permission to create packages in %s."
-msgstr "Neturi rašymo teisės reikalingos sukurti paketus %s."
+msgstr "Neturite rašymo teisės reikalingos sukurti paketus %s."
 
 msgid "You do not have write permission to store packages in %s."
-msgstr "Neturi rašymo teisės saugoti paketus %s."
+msgstr "Neturite rašymo teisės saugoti paketus %s."
 
 msgid "You do not have write permission to store downloads in %s."
-msgstr "Neturi rašymo teisės saugoti parsiuntimus %s."
+msgstr "Neturite rašymo teisės saugoti parsiuntimus %s."
+
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr "Neturite teisės saugoti pradinio kodo „tarballs“ %s."
 
 msgid "\\0%s and %s cannot both be specified"
-msgstr "\\0%s ir %s abu negali būt nurodyti"
+msgstr "\\0%s ir %s negali būti nurodyti kartu"
 
 msgid ""
 "Running %s as root is a BAD idea and can cause permanent,\\ncatastrophic "
@@ -531,15 +540,15 @@ msgstr ""
 msgid ""
 "The %s option is meant for the root user only. Please\\nrerun %s without the "
 "%s flag."
-msgstr "%s skirta tik root vartotojui. \\nPerleisk %s be %s parametro."
+msgstr "%s skirta tik root naudotojui. \\nPerleisk %s be %s parametro."
 
 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 ""
-"Vykdant %s su eilinio vartotojo teisėm\\n sukurs paketo failus kurie "
-"priklausys eiliniam vartotojui. Bandyk %s aplinką\\nįrašydamas %s %s masyve "
+"Vykdant %s su eilinio naudotojo teisėm\\n sukurs paketo failus kurie "
+"priklausys eiliniam naudotojui. Bandyk %s aplinką\\nįrašydamas %s %s masyve "
 "%s."
 
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -604,21 +613,21 @@ msgid "Could not resolve all dependencies."
 msgstr "Neįmanoma išspręsti visų priklausomybių."
 
 msgid "%s was not found in %s; skipping dependency checks."
-msgstr "%s nerastas %s; praleidžiama priklausomybių patikra."
+msgstr "%s nerastas %s; priklausomybių patikra praleidžiama."
 
 msgid "Skipping source retrieval        -- using existing %s tree"
 msgstr ""
-"Praleidžiama pradinio kodo gavimas        -- naudojamas egzistuojantis %s "
+"Pradinio kodo gavimas praleidžiamas        -- naudojamas egzistuojantis %s "
 "medis"
 
 msgid "Skipping source integrity checks -- using existing %s tree"
 msgstr ""
-"Praleidžiama pradinio kodo vientisumo patikra -- naudojamas egzistuojantis "
+"Pradinio kodo vientisumo patikra praleidžiama -- naudojamas egzistuojantis "
 "%s medis"
 
 msgid "Skipping source extraction       -- using existing %s tree"
 msgstr ""
-"Praleidžiama pradinio kodo išarchyvavimas            -- naudojamas "
+"Pradinio kodo išarchyvavimas praleidžiamas            -- naudojamas "
 "egzistuojantis %s medis"
 
 msgid "The source directory is empty, there is nothing to build!"
@@ -631,22 +640,22 @@ msgid "Sources are ready."
 msgstr "Pradiniai kodai paruošti."
 
 msgid "Removing existing %s directory..."
-msgstr "Šalinama egzistuojantis %s aplankas..."
+msgstr "Šalinamas egzistuojantis %s aplankas..."
 
 msgid "Finished making: %s"
-msgstr "Baigta gaminti: %s"
+msgstr "Sukurta: %s"
 
 msgid "Usage: %s [pacman_db_root]"
 msgstr "Naudojimas: %s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
-"Copyright (c) 2010-2011 Pacman kūrėjų komanda <pacman-dev@archlinux.org>."
-"\\nTai nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra "
-"JOKIOS GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
+"Autorinės teisės (c) 2010-2011 Pacman kūrėjų komanda <pacman-dev@archlinux."
+"org>.\\nTai nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom."
+"\\nNėra JOKIOS GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s neegzistuoja arba tai ne aplankas."
@@ -661,43 +670,37 @@ msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr "Rastas Pacman užrakinimo failas. Negaliu veikti kol pacman veikia."
 
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr "Aptiktas pre-3.5 duomenų bazės formatas  - atnaujinama..."
+msgstr "Aptiktas pre-3.5 duomenų bazės formatas - atnaujinama..."
 
 msgid "Done."
-msgstr "Baigta."
+msgstr "Atlikta."
 
 msgid "Manage pacman's list of trusted keys"
-msgstr "Pacman'o patikimų raktų sąrašo tvarkymas."
+msgstr "Pacman patikimų raktų sąrašo tvarkymas."
 
-#, fuzzy
 msgid "  -a, --add [file(s)]       Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add [<failą(-us)>]     Pridėti nurodytus raktus (tuščias stdin)"
+msgstr "  -a, --add [failas(ai)]       Pridėti nurodytus raktus (tuščia stdin)"
 
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgstr "  -d, --delete <keyid(s)>   Pašalinti nurodytus keyids"
 
-#, fuzzy
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
-msgstr "  -e, --export [<keyid(s)>] Eksportuoti nurodytus ar visus keyids"
+msgstr "  -e, --export [keyid(s)]   Eksportuoti nurodytus arba visus keyids"
 
-#, fuzzy
 msgid ""
 "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 msgstr ""
-"  -f, --finger [<keyid(s)>] Išvardinti fingerprint nurodytiems arba visiem "
-"keyid"
+"  -f, --finger [keyid(s)]   Parodyti fingerprint sąrašą nurodytiems arba "
+"visiems keyid"
 
 msgid "  -h, --help                Show this help message and exit"
 msgstr "  -h, --help                Parodyti šį pagalbos pranešimą ir išeiti"
 
-#, fuzzy
 msgid "  -l, --list-keys [keyid(s)] List the specified or all keys"
-msgstr "  -l, --list-keys [<keyid(s)>] Išvardinti nurodytus ar visus raktus"
+msgstr "  -l, --list-keys [keyid(s)] Parodyti nurodytų arba visų raktų sąrašą"
 
-#, fuzzy
 msgid "  -r, --recv-keys <keyid(s)> Fetch the specified keyids"
-msgstr "  -r, --receive <keyserver> <keyid(s)> Gauti nurodytus keyids"
+msgstr "  -r, --recv-keys <keyid(s)> Gauti nurodytus keyid"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr "  -u, --updatedb            Atnaujinti patikimas pacman duomenų bazes"
@@ -713,7 +716,7 @@ msgid ""
 "\\n                            '%s')"
 msgstr ""
 "  --config <failas>           Naudoti alternatyvų konfigūracijos failą "
-"(vietoj\\n                            '%s')"
+"(vietoj\\n                    „%s“)"
 
 msgid ""
 "  --edit-key <keyid(s)>     Present a menu for key management task on keyids"
@@ -724,13 +727,11 @@ msgid ""
 "\\n                            of '%s')"
 msgstr ""
 "  --gpgdir <dir>            Nurodyti alternatyvų GnuPG aplanką (vietoj"
-"\\n                             '%s')"
+"\\n                             „%s“)"
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr ""
-"  --import <aplankas(-ai)>         Importuoja viešą gpg ir trustdb.gpg iš "
-"aplanko(-ų)"
+"  --import <aplankas(ai)>         Importuoja pubring.gpg iš aplanko(-ų)"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
@@ -744,104 +745,143 @@ msgstr ""
 "  --init                    Užtikrinti jog raktų saugykla tinkamai inicijuota"
 
 msgid "  --keyserver               Specify a keyserver to use if necessary"
-msgstr ""
+msgstr "  --keyserver               Jei reikia nurodyti keyserver"
 
-#, fuzzy
 msgid "  --list-sigs [keyid(s)]    List keys and their signatures"
-msgstr "  --list-sigs [<keyid(s)>]  Išvardinti raktus ir jų parašus"
+msgstr "  --list-sigs [keyid(s)]    Parodyti raktų ir jų parašų sąrašą"
 
-#, fuzzy
 msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
-msgstr "  -d, --delete <keyid(s)>   Pašalinti nurodytus keyids"
+msgstr "  --lsign-key <keyid>       Nurodytą keyid pasirašyti lokaliai "
 
 msgid ""
 "  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
 "\\n                            in '%s'"
 msgstr ""
+"  --populate [keyring(s)]   Perkrauti nurodytus raktus iš (duotosios) "
+"raktinės\\n                         „%s“"
 
-#, fuzzy
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
-msgstr "  -l, --list-keys [<keyid(s)>] Išvardinti nurodytus ar visus raktus"
+msgstr ""
+"  --refresh-keys [keyid(s)] Atnaujinti nurodytus arba visus raktus iš raktų "
+"serverio"
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "Neturi reikiamų teisių peržiūrėti %s raktų saugyklą..."
+msgid "The key identified by %s could not be found locally."
+msgstr "Atpažintas %s, nerastas lokaliai."
+
+msgid "You do not have sufficient permissions to read the %s keyring."
+msgstr "Neturi pakankamų teisių skaityti %s raktinę."
 
 msgid "Use '%s' to correct the keyring permissions."
-msgstr "Naudok %s ištaisyti raktų saugyklos teises."
+msgstr "Naudokite %s ištaisyti raktinės teises."
 
-msgid "You do not have sufficient permissions to run this command..."
-msgstr "Neturi reikiamų teisių peržiūrėti vykdyti šią komandą..."
+msgid "You do not have sufficient permissions to run this command."
+msgstr "Neturite pakankamų teisių vykdyti šią komandą."
 
 msgid "There is no secret key available to sign with."
-msgstr ""
+msgstr "Nėra prieinamo slapto rakto kuriuo galima būtų pasirašyti."
 
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
+msgstr "Naudokite „%s“ sukurti numatytąjį slaptą raktą."
 
-#, fuzzy
 msgid "Verifying %s..."
-msgstr "Pridedama %s..."
+msgstr "Tikrinama %s..."
 
 msgid "File %s is unsigned, cannot continue."
-msgstr ""
+msgstr "Failas %s nepasirašytas, negaliu tęsti."
 
 msgid "The signature of file %s is not valid."
 msgstr "%s failo parašai netinkami."
 
-#, fuzzy
 msgid "Verifying keyring file signatures..."
-msgstr "Tikrinami ištrintų raktų failo parašai..."
+msgstr "Tikrinami raktinės failo parašai..."
 
 msgid "No keyring files exist in %s."
-msgstr ""
+msgstr "Aplanke %s raktinės failų nėra."
 
-#, fuzzy
 msgid "The keyring file %s does not exist."
-msgstr "%s atpažintas raktas neegzistuoja"
+msgstr "Raktinės failas %s neegzistuoja."
 
-#, fuzzy
 msgid "Appending keys from %s.gpg..."
-msgstr "Įrašomi oficialūs raktai..."
+msgstr "Pridedami raktai iš %s.gpg..."
 
-#, fuzzy
 msgid "Locally signing trusted keys in keyring..."
-msgstr "Šalinami ištrinti raktai iš raktų saugyklos..."
+msgstr "Patikimi raktai pasirašomi lokaliai raktinėj..."
 
 msgid "Locally signing key %s..."
-msgstr ""
+msgstr "Lokaliai pasirašomas raktas %s..."
+
+msgid "Importing owner trust values..."
+msgstr "Importuojamos patikimos savininko reikšmės..."
 
-#, fuzzy
 msgid "Disabling revoked keys in keyring..."
-msgstr "Šalinami ištrinti raktai iš raktų saugyklos..."
+msgstr "Raktinėj išjungiami atšaukti raktai ..."
 
-#, fuzzy
 msgid "Disabling key %s..."
-msgstr "Kuriamas archyvas %s..."
+msgstr "Uždraudžiamas raktas %s..."
 
-msgid "The key identified by %s does not exist"
-msgstr "%s atpažintas raktas neegzistuoja"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr "Pridėti nurodyto rakto failo, į gpg raktų grandinę, nepavyko."
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr "Pašalinti nurodyto rakto, iš gpg raktų grandinės, nepavyko."
+
+msgid "The key identified by %s could not be edited."
+msgstr "Negalima redaguoti rakto atpažinto kaip %s."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr "Rakto nurodyto gpg raktų grandinėje eksportuoti neįmanoma."
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr "Nurodyto rakto pirštų antspaudai nenustatyti."
+
+msgid "%s could not be imported."
+msgstr "Nepavyko importuoti %s."
+
+msgid "File %s does not exist and could not be imported."
+msgstr "Failas %s neegzistuoja ir negali būti importuotas."
+
+msgid "A specified key could not be listed."
+msgstr "Parodyti nurodyto failo nepavyko."
+
+msgid "A specified signature could not be listed."
+msgstr "Parodyti nurodyto parašo nepavyko."
+
+msgid "A specified key could not be locally signed."
+msgstr "Nurodytas raktas negali būti pasirašytas lokaliai."
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr "Gauti nutolusio rakto iš raktų serverio nepavyko."
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr "Nurodytas vietinis raktas negalėjo būti atnaujintas iš raktų serverio."
+
+msgid "The signature identified by %s could not be verified."
+msgstr "Atpažintas parašas %s negalėjo būti patikrintas."
+
+msgid "Updating trust database..."
+msgstr "Atnaujinama patikima duomenų bazė..."
+
+msgid "Trust database could not be updated."
+msgstr "Atnaujinti patikimos duomenų bazės nepavyko."
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr "Negaliu rasti %s sukompiliuotos programos reikalingos atlikti %s."
 
 msgid "%s needs to be run as root for this operation."
-msgstr "%s turi būt įvykdyta kaip su root vartotojo teisėm."
+msgstr "%s turi būti įvykdytasu root naudotojo teisėm."
 
 msgid "%s configuration file '%s' not found."
-msgstr "%s konfigūracijos failas '%s' nerastas."
+msgstr "%s konfigūracijos failas „%s“ nerastas."
 
 msgid "no operation specified (use -h for help)"
 msgstr "nenurodyta užduotis (naudok -h pagalbai)"
 
-msgid "Multiple operations specified"
-msgstr "Nurodytos kelios užduotys"
+msgid "Multiple operations specified."
+msgstr "Nurodytos kelios operacijos."
 
-msgid "Please run %s with each operation separately\\n"
-msgstr "Prašau vykdyti %s su kiekviena komanda atskirai\\n"
-
-msgid "Updating trust database..."
-msgstr "Atnaujinama patikima duomenų bazė..."
+msgid "Please run %s with each operation separately."
+msgstr "Prašom vykdyti %s su kiekviena užduotimi atskirai."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -858,7 +898,7 @@ msgid ""
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
 msgstr ""
-"Pacman sekti paketam naudoja daug mažų failų,\\nyra tikimybė jog tie failai "
+"Pacman paketų sekimui naudoja daug mažų failų,\\nyra tikimybė jog tie failai "
 "laikui bėgant bus fragmentuoti.\\nŠis scenarijus pabandys perkelti tuos "
 "failus į vieną\\nfailą kuris bus vientisas. Ko pasekoje kietasis diskas "
 "turėtų sugebėt greičiau juos perskaityt, nes kietojo disko galvutei"
@@ -921,33 +961,33 @@ msgid ""
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nTai nemokama "
-"programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra JOKIOS "
+"Autorinės teisės (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nTai "
+"nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra JOKIOS "
 "GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
 
 msgid "Invalid package file '%s'."
-msgstr "Neteisingas paketo failas '%s'."
+msgstr "Netinkamas paketo failas „%s“."
 
 msgid "The package names don't match : '%s' and '%s'"
-msgstr "Paketų pavadinimai nesutampa : '%s' ir '%s'"
+msgstr "Paketų pavadinimai nesutampa: „%s“ ir „%s“"
 
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr "Paketų architektūros nesutampa : '%s' ir '%s'"
+msgstr "Paketų architektūros nesutampa: „%s“ ir „%s“"
 
 msgid "Both packages have the same version : '%s'"
-msgstr "Abu paketai tos pačios versijos : '%s'"
+msgstr "Abu paketai tos pačios versijos: „%s“"
 
 msgid "Generating delta from version %s to version %s"
 msgstr "Kuriama delta iš versijos %s į %s"
 
 msgid "Delta could not be created."
-msgstr "Delta negalėjo būt sukurta."
+msgstr "Delta negalėjo būti sukurta."
 
 msgid "Generated delta : '%s'"
-msgstr "Kuriama delta : '%s'"
+msgstr "Kuriama delta: „%s“"
 
 msgid "File '%s' does not exist"
-msgstr "Failas '%s' neegzistuoja"
+msgstr "Failas „%s“ neegzistuoja"
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "Negaliu rasti xdelta3 programos! Ar xdelta3 įdiegta?"
@@ -958,10 +998,10 @@ msgstr ""
 
 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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
-"repo-add atnaujins paketų duomenų bazę perskaitęs failą.\\nGali būt nurodyti "
-"keli paketai.\\n\\n"
+"repo-add atnaujins paketų duomenų bazę perskaitęs paketo failą."
+"\\nKomandinėje eilutėje gali būti nurodyti keli paketai pridėjimui.\\n\\n"
 
 msgid "Options:\\n"
 msgstr "Pasirinktys:\\n"
@@ -972,19 +1012,22 @@ msgstr "  -d, --delta       sukurti ir pridėti delta paketo atnaujinimui\\n"
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       atnaujinti duomenų bazės failų sąrašą\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
-"Naudojimas: repo-remove [pasirinktys] <kelias-iki-db> <paketo_pavadinimas|"
-"delta>...\\n\\n"
+"Naudojimas: repo-remove [parintys] <kelias-iki_db> <paketo_vardas|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\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 "repo-remove atnaujins paketų duomenų bazę pašalindamas\\npaketą nurodytą "
-"komandinėj eilutės iš nurodytos duomenų bazės. Gali\\nbūt nurodyti keli "
-"paketai pašalinimui\\n\\n"
+"komandinėj eilutėj iš nurodytos repo duomenų bazės. Gali\\nbūti nurodyti "
+"keli paketai pašalinimui\\n\\n"
+
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr "Tęskite, čia nėra ką žiūrėti.\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       minimali išvestis\\n"
@@ -1002,36 +1045,36 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
+msgstr ""
+"\\nPeržiūrėkite %s(8) detalesniai informacijai bei galimų pasirinkčių "
+"aprašymus.\\n"
+
+msgid ""
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr ""
+"Pavyzdys:  repo-add /kelias/iki/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
 "\\n"
-msgstr ""
-"\\nPažiūrėk %s(8) detalesniai informacijai bei galimų pasirinkčių aprašymus."
-"\\n\\n"
+
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
+msgstr "Pavyzdys:  repo-remove /kelias/iki/repo.db.tar.gz kernel26\\n"
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
-msgstr ""
-"Pavyzdys:  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 "Pavyzdys:  repo-remove /path/to/repo.db.tar.gz kernel26"
-
-msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nTai nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra "
-"JOKIOS GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
+"Autorinės teisės (c) 2006-2012 Pacman kūrėjų komanda <pacman-dev@archlinux."
+"org>\\n\\nTai nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom."
+"\\nNėra JOKIOS GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
 
 msgid "No database entry for package '%s'."
-msgstr "Duomenų bazėj nėra įrašo apie paketą '%s'."
+msgstr "Duomenų bazėj nėra įrašo apie paketą „%s“."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr "Pridedamos 'delta' įrašas : %s -> %s"
+msgstr "Pridedamas „delta“ įrašas : %s -> %s"
 
 msgid "Removing existing entry '%s'..."
-msgstr "Šalinamas egzistuojantis įrašas '%s'..."
+msgstr "Šalinamas egzistuojantis įrašas „%s“..."
 
 msgid "Cannot find the gpg binary! Is GnuPG installed?"
 msgstr "Negaliu rasti gpg programos! Ar GnuPG įdiegta?"
@@ -1040,10 +1083,10 @@ msgid "Signing database..."
 msgstr "Pasirašoma duomenų bazė..."
 
 msgid "Failed to sign package database."
-msgstr "nepavyko pasirašyt paketo duomenų bazės."
+msgstr "Nepavyko pasirašyt paketų duomenų bazės."
 
 msgid "Verifying database signature..."
-msgstr "Tikrinama duomenų bazės parašas..."
+msgstr "Tikrinamas duomenų bazės parašas..."
 
 msgid "No existing signature found, skipping verification."
 msgstr "Nerasta jokio parašo, tikrinimas praleidžiamas."
@@ -1055,19 +1098,22 @@ msgid "Database signature was NOT valid!"
 msgstr "Duomenų bazės parašas NETINKAMAS!"
 
 msgid "'%s' does not have a valid archive extension."
-msgstr "'%s' neturi reikiamo archyvo plėtinio."
+msgstr "„%s“ neturi tinkamo archyvo plėtinio."
 
 msgid "An entry for '%s' already existed"
-msgstr "Įrašas apie '%s' jau yra"
+msgstr "Įrašas apie „%s“ jau yra"
 
-msgid "Computing checksums..."
-msgstr "Skaičiuojamos kontrolinės sumos..."
+msgid "Invalid package signature file '%s'."
+msgstr "Netinkamas paketo parašo failas „%s“."
 
 msgid "Adding package signature..."
 msgstr "Pridedamas paketo parašas..."
 
+msgid "Computing checksums..."
+msgstr "Skaičiuojamos kontrolinės sumos..."
+
 msgid "Creating '%s' db entry..."
-msgstr "Kuriamas '%s' duomenų bazės įrašas..."
+msgstr "Kuriamas „%s“ duomenų bazės įrašas..."
 
 msgid "Old package file not found: %s"
 msgstr "Senas paketo failas nerastas: %s"
@@ -1079,49 +1125,49 @@ msgid "Held by process %s"
 msgstr "Laikomas proceso %s"
 
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr "Saugyklos failas '%s' nėra tinkamas duomenų bazei."
+msgstr "Saugyklos failas „%s“ nėra tinkamas duomenų bazei."
 
 msgid "Extracting database to a temporary location..."
 msgstr "Duomenų bazė išarchyvuojama į laikiną vietą..."
 
 msgid "Repository file '%s' was not found."
-msgstr "Saugyklos failas '%s' nerastas."
+msgstr "Saugyklos failas „%s“ nerastas."
 
 msgid "Repository file '%s' could not be created."
-msgstr "Saugyklos failas '%s' nesukurtas."
+msgstr "Saugyklos failas „%s“ nesukurtas."
 
 msgid "File '%s' not found."
-msgstr "Failas '%s' nerastas."
+msgstr "Failas „%s“ nerastas."
 
 msgid "Adding delta '%s'"
-msgstr "Pridedama delta '%s'"
+msgstr "Pridedama delta „%s“"
 
 msgid "'%s' is not a package file, skipping"
-msgstr "'%s' nėra paketo failas, praleidžiama"
+msgstr "„%s“ nėra paketo failas, praleidžiama"
 
 msgid "Adding package '%s'"
-msgstr "Pridedamas paketas '%s'"
+msgstr "Pridedamas paketas „%s“"
 
 msgid "Searching for delta '%s'..."
-msgstr "Ieškoma delta '%s'..."
+msgstr "Ieškoma delta „%s“..."
 
 msgid "Delta matching '%s' not found."
-msgstr "Delta atitinkanti '%s' nerasta."
+msgstr "Delta atitinkanti „%s“ nerasta."
 
 msgid "Searching for package '%s'..."
-msgstr "Ieškomas paketas '%s'..."
+msgstr "Ieškomas paketas „%s“..."
 
 msgid "Package matching '%s' not found."
-msgstr "Paketas atitinkantis '%s' nerastas."
+msgstr "Paketas atitinkantis „%s“ nerastas."
 
 msgid "Invalid command name '%s' specified."
-msgstr "Nurodytas netinkamas komandos pavadinimas '%s'."
+msgstr "Nurodytas netinkamas komandos pavadinimas „%s“."
 
 msgid "Cannot create temp directory for database building."
 msgstr "Nepavyko sukurti laikino aplanko duomenų bazės kūrimui."
 
 msgid "Creating updated database file '%s'"
-msgstr "Kuriamas atnaujintas duomenų bazės failas '%s'"
+msgstr "Kuriamas atnaujintas duomenų bazės failas „%s“"
 
 msgid "No packages remain, creating empty database."
 msgstr "Paketų neliko, kuriama tuščia duomenų bazė."
@@ -1134,18 +1180,3 @@ msgstr "pasirinktis %s reikalauja argumento\\n"
 
 msgid "unrecognized option"
 msgstr "neatpažinta pasirinktis"
-
-#~ msgid "  --reload                  Reload the default keys"
-#~ msgstr "  --reload                  Perkrauti numatytuosius raktus"
-
-#~ msgid "Verifying official keys file signature..."
-#~ msgstr "Tikrinami oficialaus raktų failo parašai..."
-
-#~ msgid "Verifying deprecated keys file signature..."
-#~ msgstr "Tikrinami pasenusių raktų failo parašai..."
-
-#~ msgid "Appending deprecated keys..."
-#~ msgstr "Įrašomi pasenę raktai..."
-
-#~ msgid "You need to specify the keyserver and at least one key identifier"
-#~ msgstr "Turi nurodyti raktų serverį ir bent vieną raktų identifikatorių"

scripts/po/pacman-scripts.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 4.0.0rc1\n"
+"Project-Id-Version: pacman 4.0.1\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-09-22 11:33-0500\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\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"
@@ -455,12 +455,21 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
 
+msgid "%s signal caught. Exiting..."
+msgstr ""
+
+msgid "Aborted by user! Exiting..."
+msgstr ""
+
+msgid "An unknown error has occurred. Exiting..."
+msgstr ""
+
 msgid "%s not found."
 msgstr ""
 
@@ -473,6 +482,9 @@ msgstr ""
 msgid "You do not have write permission to store downloads in %s."
 msgstr ""
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr ""
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr ""
 
@@ -585,7 +597,7 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr ""
 
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"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"
 msgstr ""
@@ -656,8 +668,7 @@ msgid ""
 "\\n                            of '%s')"
 msgstr ""
 
-msgid ""
-"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
+msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr ""
 
 msgid ""
@@ -686,13 +697,16 @@ msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
 
-msgid "You do not have sufficient permissions to read the %s keyring..."
+msgid "The key identified by %s could not be found locally."
+msgstr ""
+
+msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr ""
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr ""
 
-msgid "You do not have sufficient permissions to run this command..."
+msgid "You do not have sufficient permissions to run this command."
 msgstr ""
 
 msgid "There is no secret key available to sign with."
@@ -728,13 +742,58 @@ msgstr ""
 msgid "Locally signing key %s..."
 msgstr ""
 
+msgid "Importing owner trust values..."
+msgstr ""
+
 msgid "Disabling revoked keys in keyring..."
 msgstr ""
 
 msgid "Disabling key %s..."
 msgstr ""
 
-msgid "The key identified by %s does not exist"
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+
+msgid "The key identified by %s could not be edited."
+msgstr ""
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+msgid "%s could not be imported."
+msgstr ""
+
+msgid "File %s does not exist and could not be imported."
+msgstr ""
+
+msgid "A specified key could not be listed."
+msgstr ""
+
+msgid "A specified signature could not be listed."
+msgstr ""
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+msgid "The signature identified by %s could not be verified."
+msgstr ""
+
+msgid "Updating trust database..."
+msgstr ""
+
+msgid "Trust database could not be updated."
 msgstr ""
 
 msgid "Cannot find the %s binary required for all %s operations."
@@ -749,13 +808,10 @@ msgstr ""
 msgid "no operation specified (use -h for help)"
 msgstr ""
 
-msgid "Multiple operations specified"
+msgid "Multiple operations specified."
 msgstr ""
 
-msgid "Please run %s with each operation separately\\n"
-msgstr ""
-
-msgid "Updating trust database..."
+msgid "Please run %s with each operation separately."
 msgstr ""
 
 msgid ""
@@ -860,7 +916,7 @@ msgstr ""
 
 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\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
 msgid "Options:\\n"
@@ -872,13 +928,16 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr ""
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 
 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"
+"\\npackages to remove can be specified on the command line.\\n"
+msgstr ""
+
+msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
 
 msgid "  -q, --quiet       minimize output\\n"
@@ -895,18 +954,17 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr ""
 
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"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"
 msgstr ""
@@ -947,12 +1005,15 @@ msgstr ""
 msgid "An entry for '%s' already existed"
 msgstr ""
 
-msgid "Computing checksums..."
+msgid "Invalid package signature file '%s'."
 msgstr ""
 
 msgid "Adding package signature..."
 msgstr ""
 
+msgid "Computing checksums..."
+msgstr ""
+
 msgid "Creating '%s' db entry..."
 msgstr ""