Final changes before 3.1.1 release

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

NEWS

@@ -1,5 +1,19 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.1.1         - fix versioned provisions handling- use '=' instead of ' ' which
+                differs from original spec but better in long run (FS#9171)
+              - rename query --orphans to --unrequired (FS#9144)
+              - fix segfault when cachedir is unusable (FS#9186)
+              - missing SYMEXPORT on libalpm functions (FS#9155)
+              - notify of package replacements when using --noconfirm (FS#5179)
+              - fix usage of PKGEXT by gensync/updatesync (FS#9190)
+              - ensure correct dir permissions in database (FS#9176)
+              - ensure /tmp is created with correct permissions (FS#9183)
+              - disallow NULL section in parseconfig (reported on forums)
+              - remove Arch-specific pacman.conf and mirrorlist from source
+              - makepkg: --holdver option for devel PKGBUILDs (FS#9194)
+              - documentation updates (FS# 9142, 9146, 9175, 9192, 9204)
+              - many translation updates
 3.1.0         - paths are now specified as absolute paths (or defaulting to
                 under the specified root directory)
               - all paths can be specified in pacman.conf or on command line

TRANSLATORS

@@ -10,23 +10,30 @@ 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.
 
+* indicates the last active translator.
+
+Czech (cs_CZ):
+	* Vojtěch Gondžala <vogo@seznam.cz>
 German (de):
+	* Matthias Gorissen <matthias@archlinux.de>
 	Pierre Schmitz <pierre@archlinux.de>
 British English (en_GB):
-	Jeff Bailes <thepizzaking@gmail.com>
+	* Jeff Bailes <thepizzaking@gmail.com>
 Spanish (es):
-	Juan Pablo González Tognarelli <jotapesan@gmail.com>
+	* Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
 French (fr):
+	* Chantry Xavier <shiningxc@gmail.com>
 	solsTiCe d'Hiver <solstice.dhiver@laposte.net>
 Hungarian (hu):
-	Nagy Gabor <ngaba@petra.hos.u-szeged.hu>
+	* Nagy Gabor <ngaba@bibl.u-szeged.hu>
 Italian (it):
-	Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
+	* Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
 	Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 	Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>
 Polish (pl_PL):
-	Mateusz Jędrasik <m.jedrasik@gmail.com>
+	* Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
+	* João Felipe Santos <joao.eel@gmail.com>
 	Douglas Soares de Andrade <douglas@archlinux-br.org>
 	Hugo Doria <hugodoria@archlinux-br.org>
 	Lincoln de Sousa <lincoln@archlinux-br.org>

configure.ac

@@ -46,13 +46,13 @@ AC_PREREQ(2.60)
 #     For code under development: [devel]
 #     For production releases:    []
 
-m4_define([lib_current], [2])
+m4_define([lib_current], [3])
 m4_define([lib_revision], [0])
-m4_define([lib_age], [0])
+m4_define([lib_age], [1])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_micro], [1])
 m4_define([pacman_version_suffix], [])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
@@ -69,7 +69,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 
-LIB_VERSION=`expr lib_current.lib_age`.lib_revision
+LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision
 LIB_VERSION_INFO="lib_current:lib_revision:lib_age"
 
 # Set subsitution values for version stuff in Makefiles and anywhere else,
@@ -315,7 +315,6 @@ src/util/Makefile
 scripts/Makefile
 doc/Makefile
 etc/Makefile
-etc/pacman.d/Makefile
 po/Makefile.in
 pactest/Makefile
 contrib/Makefile
@@ -343,6 +342,7 @@ pacman_display_version:
     Host Type              : ${CHOST}
 
     libalpm version        : ${LIB_VERSION}
+    libalpm version info   : ${LIB_VERSION_INFO}
     pacman version         : ${PACKAGE_VERSION}
 
   Directory and file information:

contrib/bash_completion

@@ -177,7 +177,7 @@ _pacman ()
           changelog) mod="${mod}c" ;;
           deps) mod="${mod}d" ;;
           explicit) mod="${mod}e" ;;
-          orphans) mod="${mod}t" ;;
+          unrequired) mod="${mod}t" ;;
           foreign) mod="${mod}m" ;;
           owns) mod="${mod}o" ;;
           file) mod="${mod}p" ;;
@@ -298,7 +298,7 @@ _pacman ()
           -o --owns \
           -p --file \
           -s --search \
-          -t --orphans \
+          -t --unrequired \
           -u --upgrades \
           --config \
           --logfile \

contrib/zsh_completion

@@ -38,7 +38,6 @@ _pacman_opts_pkgfile=(
 
 # options for passing to _arguments: subactions for --query command
 _pacman_opts_query_actions=(
-	'-e[List orphaned packages]:*:orphans:->query_orphans'
 	'-g[View all members of a package group]:*:package groups:->query_group'
 	'-o[Query the package that owns a file]:file:_files'
 	'-p[Package file to query]:*:package file:->query_file'
@@ -50,7 +49,6 @@ _pacman_opts_query_modifiers=(
 	'-c[List package changelog]'
 	'-d[List packages installed as dependencies]'
 	'-e[List packages explicitly installed]'
-	'-g[List all members of a package group]'
 	'-i[View package information]'
 	'-ii[View package information including backup files]'
 	'-l[List package contents]'
@@ -88,8 +86,10 @@ _pacman_opts_sync_modifiers=(
 	'-u[Upgrade all out-of-date packages]'
 	'-w[Download packages only]'
 	'-y[Download fresh package databases]'
-	'*--ignore[Ignore a package upgrade]:package:_pacman_completions_installed_packages'
-	'*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups'
+	'*--ignore[Ignore a package upgrade]:package:
+		_pacman_completions_all_packages'
+	'*--ignoregroup[Ignore a group upgrade]:package group:
+		_pacman_completions_all_groups'
 	'--asdeps[Install packages as non-explicitly installed]'
 )
 
@@ -135,11 +135,6 @@ _pacman_action_query() {
 				"$_pacman_opts_query_modifiers[@]" \
 				'*:groups:_pacman_completions_installed_groups'
 				;;
-		query_orphans)
-			_arguments -s : \
-				"$_pacman_opts_common[@]" \
-				"$_pacman_opts_query_modifiers[@]"
-				;;
 		query_owner)
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
@@ -294,17 +289,6 @@ _pacman_get_command() {
 
 # main dispatcher
 _pacman() {
-	# First check if --ignoregroup was the last command given. If so, complete
-	# all groups.
-	if [ "$words[-2]" = "--ignoregroup" ]; then
-		_arguments -s : \
-			"$_pacman_opts_common[@]" \
-			"$_pacman_opts_sync_modifiers[@]" \
-			'*:package group:_pacman_completions_all_groups'
-		return 0
-	fi
-
-	# Otherwise, complete on the given command.
 	case $words[2] in
 		-A*)  _pacman_action_add      ;;
 		-Q*g*) # ipkg groups
@@ -313,7 +297,7 @@ _pacman() {
 				"$_pacman_opts_query_modifiers[@]" \
 				'*:groups:_pacman_completions_installed_groups'
 				;;
-		-Q*o*) # file *.pkg.tar.gz
+		-Q*o*) # file
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
 				"$_pacman_opts_query_modifiers[@]" \

doc/PKGBUILD.5.txt

@@ -126,6 +126,15 @@ Options and Directives
 	needed at runtime. Packages in this list follow the same format as
 	depends.
 
+*optdepends (array)*::
+	An array of optional packages (and accompanying reasons) that are not
+	essential to the package, but would offer increased functionality or other
+	features when installed. optdepends are currently for informational
+	purposes only and are not utilized by pacman during dependency resolution.
+	The format should be similar to the following:
+
+	optdepends=('fakeroot: for makepkg usage as normal user')
+
 *conflicts (array)*::
 	An array of packages that will conflict with this package (i.e. they
 	cannot both be installed at the same time). This directive follows the
@@ -136,8 +145,9 @@ Options and Directives
 	a package to provide dependencies other than its own package name. For
 	example, the dcron package can provide 'cron', which allows packages to
 	depend on 'cron' rather than 'dcron OR fcron'.
-	Versioned provisions are also possible. For example, dcron can provide
-	'cron 2.0' to satisfy the 'cron>=2.0' dependency of other packages.
+	Versioned provisions are also possible, in the 'name=version' format.
+	For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0'
+	dependency of other packages.
 
 *replaces (array)*::
 	An array of packages that this package should replace, and can be used
@@ -261,7 +271,7 @@ from.
 	*_svntrunk*;;
 		The trunk of the SVN repository.
 
-	*_cvsmod*;;
+	*_svnmod*;;
 		The SVN module to fetch.
 
 *Git*::

doc/makepkg.8.txt

@@ -30,6 +30,11 @@ to use.
 
 Options
 -------
+*\--asroot*::
+	Allow makepkg to run as root. This is for security purposes as it is
+	normally dangerous to do so. This will also disable use of fakeroot and
+	sudo.
+
 *-A, \--ignorearch*::
 	Ignore a missing or incomplete arch field in the build script. This is
 	for rebuilding packages from source when the PKGBUILD may be slightly
@@ -68,6 +73,11 @@ Options
 	default to the current directory. This allows the built package to be
 	overwritten.
 
+*-forcever*::
+	This is a hidden option that should *not* be used unless you really know
+	what you are doing. makepkg uses this internally when calling itself to
+	set the new development pkgver of the package.
+
 *-g, \--geninteg*::
 	For each source file in the source array of PKGBUILD, download the file
 	if required and generate integrity checks. The integrity checks
@@ -78,6 +88,11 @@ Options
 *-h, \--help*::
 	Output syntax and command line options.
 
+*\--holdver*::
+	Useful when building development versions of packages. Prevents makepkg
+	from automatically bumping the pkgver to the latest revision number in
+	the package's development tree.
+
 *-i, \--install*::
 	Install or upgrade the package after a successful build using
 	linkman:pacman[8].
@@ -108,11 +123,6 @@ Options
 	dependencies are not found, pacman will try to resolve them. If
 	successful, the missing packages will be downloaded and installed.
 
-*\--asroot*::
-	Allow makepkg to run as root. This is for security purposes as it is
-	normally dangerous to do so. This will also disable use of fakeroot and
-	sudo.
-
 *\--source*::
 	Do not actually build the package, but build a source-only tarball. This
 	is useful for passing a single tarball to another program such as a

doc/pacman.8.txt

@@ -113,6 +113,9 @@ Options
 	not be used as a way to install software into ``/usr/local'' instead of
 	``/usr''. This option is used if you want to install a package on a
 	temporary mounted partition which is "owned" by another system.
+	*NOTE*: If database path or logfile are not specified on either the
+	command line or in linkman:pacman.conf[5], their default location will
+	be inside this root path.
 
 *-v, --verbose*::
 	Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
@@ -120,9 +123,9 @@ Options
 *\--cachedir* <'dir'>::
 	Specify an alternative package cache location (a typical default is
 	``/var/cache/pacman/pkg''). Multiple cache directories can be specified,
-	and they are tried in the order they are passed to pacman. *NOTE*: if
-	specified, this is an absolute path and the root path is not automatically
-	prepended. This behavior changed in pacman 3.1.0.
+	and they are tried in the order they are passed to pacman. *NOTE*: this
+	is an absolute path, the root path is not automatically prepended. This
+	behavior changed in pacman 3.1.0.
 
 *\--config* <'file'>::
 	Specify an alternate configuration file.
@@ -194,7 +197,7 @@ Query Options[[QO]]
 	This will search each locally-installed package for names or
 	descriptions that match `regexp`.
 
-*-t, \--orphans*::
+*-t, \--unrequired*::
 	Restrict or filter output to packages not required by any currently
 	installed package.
 
@@ -207,7 +210,8 @@ Remove Options[[RO]]
 --------------------
 *-c, \--cascade*::
 	Remove all target packages, as well as all packages that depend on one
-	or more target packages. This operation is recursive.
+	or more target packages. This operation is recursive, and must be used
+	with care since it can remove many potentially needed packages.
 
 *-k, \--keep*::
 	Removes the database entry only. Leaves all files in place.
@@ -218,23 +222,25 @@ Remove Options[[RO]]
 	file should be renamed with a ``.pacsave'' extension.
 
 *-s, \--recursive*::
-	Remove each target specified including all dependencies, provided that
-	(A) they are not required by other packages; and (B) they were not
-	explicitly installed by the user. This option is analogous to a
-	backwards '\--sync' operation.
+	Remove each target specified including all of their dependencies, provided
+	that (A) they are not required by other packages; and (B) they were not
+	explicitly installed by the user. This operation is recursive and analogous
+	to a backwards '\--sync' operation, and helps keep a clean system without
+	orphans.
 
 
 Sync Options[[SO]]
 ------------------
 *-c, \--clean*::
-	Remove old packages from the cache as well as unused sync databases to
-	free up disk space. When pacman	downloads packages, it saves them in a
-	cache directory. In addition, 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 old packages; use two to remove all packages from the cache.
-	In both cases, you will have a yes or no option to remove packages and/or
-	unused downloaded databases.
+	Remove packages that are no longer installed from the cache as well as
+	currently unused sync databases to free up disk space. When pacman
+	downloads packages, it saves them in a cache directory. In addition,
+	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
+	from the cache. In both cases, you will have a yes or no option to
+	remove packages and/or unused downloaded databases.
 
 *-e, \--dependsonly*::
 	Install all dependencies of a package, but not the specified package

doc/pacman.conf.5.txt

@@ -33,8 +33,8 @@ Example
 NoUpgrade = etc/passwd etc/group etc/shadow
 NoUpgrade = etc/fstab
 
-[current]
-Include = /etc/pacman.d/current
+[core]
+Include = /etc/pacman.d/core
 
 [custom]
 Server = file:///home/pkgs
@@ -47,6 +47,9 @@ Options
 	Set the default root directory for pacman to install to. This option is
 	used if you want to install a package on a temporary mounted partition
 	which is "owned" by another system, or for a chroot install.
+	*NOTE*: If database path or logfile are not specified on either the
+	command line or in linkman:pacman.conf[5], their default location will
+	be inside this root path.
 
 *DBPath =* path/to/db/dir::
 	Overrides the default location of the toplevel database directory.  A
@@ -59,9 +62,9 @@ Options
 	default is ``/var/cache/pacman/pkg/''. Multiple cache directories can be
 	specified, and they are tried in the order they are listed in the config
 	file. If a file is not found in any cache directory, it will be downloaded
-	to the first cache directory with write access. *NOTE*: if specified, this
-	is an absolute path and the root path is not automatically prepended. This
-	behavior changed in pacman 3.1.0.
+	to the first cache directory with write access. *NOTE*: this is an absolute
+	path, the root path is not automatically prepended. This behavior changed
+	in pacman 3.1.0.
 
 
 *LogFile =* '/path/to/file'::
@@ -137,9 +140,30 @@ defined with the 'Server' directive and follow a URL naming structure. If you
 want to use a local directory, you can specify the full path with a ``file://''
 prefix, as shown above.
 
-The order of repositories in the file matters; repositories listed first will
-take precedence over those listed later in the file when packages in two
-repositories have identical names, regardless of version number.
+A common way to define DB locations utilizes the 'Include' directive. For each
+repository defined in the configuration file, a single 'Include' directive can
+contain a file that lists the servers for that repository.
+
+--------
+[core]
+# use this repository first
+Server = ftp://ftp.archlinux.org/core/os/arch
+# next use servers as defined in the mirrorlist below
+Include = /etc/pacman.d/mirrorlist
+--------
+
+During parsing, pacman will define the `$repo` variable to the name of the
+current section. This is often utilized in files specified using the 'Include'
+directive so all repositories can use the same mirrorfile.
+
+--------
+Server = ftp://ftp.archlinux.org/$repo/os/arch
+--------
+
+The order of repositories in the configuration files matters; repositories
+listed first will take precedence over those listed later in the file when
+packages in two repositories have identical names, regardless of version
+number.
 
 Using Your Own Repository
 -------------------------

etc/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = pacman.d
-
 dist_sysconf_DATA = makepkg.conf pacman.conf
 EXTRA_DIST = makepkg.conf.in pacman.conf.in
 

etc/pacman.conf.in

@@ -1,7 +1,7 @@
 #
 # @sysconfdir@/pacman.conf
 #
-# See the pacman manpage for option directives
+# See the pacman.conf(5) manpage for option and repository directives
 
 #
 # GENERAL OPTIONS
@@ -23,24 +23,24 @@ HoldPkg     = pacman glibc
 #   - local/custom mirrors can be added here or in separate files
 #   - repositories listed first will take precedence when packages
 #     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
 #
-#[testing]
-#Include = @sysconfdir@/pacman.d/mirrorlist
 
-[core]
-# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/mirrorlist
-
-[extra]
-# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/mirrorlist
-
-[community]
-# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/mirrorlist
-
-#[unstable]
-# Add your preferred servers here, they will be used first
+# An example of a disabled remote package repository with multiple servers
+# available. To enable, uncomment the following lines. You can add preferred
+# servers immediately after the header and they will be used before the
+# default mirrors.
+#[core]
+#Server = ftp://ftp.example.com/foobar/$repo/os/i686/
+# The file referenced here should contain a list of 'Server = ' lines.
 #Include = @sysconfdir@/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

etc/pacman.d/.gitignore

@@ -1 +0,0 @@
-mirrorlist

etc/pacman.d/Makefile.am

@@ -1,17 +0,0 @@
-pkgsysconfdir = ${sysconfdir}/pacman.d
-dist_pkgsysconf_DATA = mirrorlist
-EXTRA_DIST = mirrorlist.in
-#
-# Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = $(dist_pkgsysconf_DATA)
-
-$(dist_pkgsysconf_DATA): Makefile
-	rm -f $@ $@.tmp
-	sed \
-		-e 's|@CARCH[@]|$(CARCH)|g' \
-		$(srcdir)/mirrorlist.in >$@.tmp
-	mv $@.tmp $@
-
-mirrorlist: $(srcdir)/mirrorlist.in
-
-# vim:set ts=2 sw=2 noet:

etc/pacman.d/mirrorlist.in

@@ -1,84 +0,0 @@
-#
-# $repo: Arch Linux @REPO@ repository
-#
-
-# United States
-Server = ftp://ftp.archlinux.org/$repo/os/@CARCH@
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/$repo/os/@CARCH@
-Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@CARCH@
-Server = ftp://mirrors.unixheads.org/archlinux/$repo/os/@CARCH@
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@CARCH@
-Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@CARCH@
-Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@CARCH@
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@CARCH@
-Server = http://holmes.umflint.edu/archlinux/$repo/os/@CARCH@
-
-# South America
-# - Brazil
-Server = http://archlinux.c3sl.ufpr.br/$repo/os/@CARCH@
-Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/@CARCH@
-
-# Europe
-# - Austria
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@CARCH@
-# - Belgium
-Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/@CARCH@
-# - Czech Republic
-Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@CARCH@
-# - Estonia
-Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@CARCH@
-# - Finland
-Server = ftp://ftp.sixnix.net/pub/archlinux/$repo/os/@CARCH@
-# - France
-Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@CARCH@
-Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@CARCH@
-Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@CARCH@
-Server = http://mir.archlinux.fr/$repo/os/@CARCH@
-Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
-# - Germany
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/$repo/os/@CARCH@
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@CARCH@
-Server = ftp://ftp.archlinuxppc.org/i686/$repo/os/@CARCH@
-# - Great Britain
-Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/@CARCH@
-# - Greece
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@CARCH@
-# - Hungary
-Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
-# - Ireland
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
-# - Italy
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@CARCH@
-# - Netherlands
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@CARCH@
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@CARCH@
-# - Poland
-Server = ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/archlinux/$repo/os/@CARCH@
-Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@CARCH@
-# - Portugal
-Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@CARCH@
-# - Romania
-Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@CARCH@
-# - Russia
-Server = ftp://archlinux.org.ru/pub/archlinux/$repo/os/@CARCH@
-Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@CARCH@
-Server = http://archlinux.freeside.ru/$repo/os/@CARCH@
-# - Sweden
-Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@CARCH@
-Server = ftp://ftp.gigabit.nu/$repo/os/@CARCH@
-# - Switzerland
-Server = ftp://archlinux.puzzle.ch/$repo/os/@CARCH@
-# - Turkey
-Server = http://server.elsistech.com/archlinux/$repo/os/@CARCH@
-# - Ukraine
-Server = ftp://hell.org.ua/archlinux/$repo/os/@CARCH@
-Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@CARCH@
-
-# Asia
-# - Israel
-Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@CARCH@
-
-# Australia
-Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@CARCH@
-Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/@CARCH@
-

lib/libalpm/db.c

@@ -650,7 +650,7 @@ int _alpm_prov_cmp(const void *provision, const void *needle)
 	char *tmpptr;
 	char *provname = strdup(provision);
 	int retval = 0;
-	tmpptr = strchr(provname, ' ');
+	tmpptr = strchr(provname, '=');
 
 	if(tmpptr != NULL) { /* provision-version */
 		*tmpptr='\0';

lib/libalpm/deps.c

@@ -226,7 +226,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 		alpm_list_t *remove, alpm_list_t *upgrade)
 {
 	alpm_list_t *i, *j;
-	alpm_list_t *joined, *dblist;
+	alpm_list_t *targets, *dblist = NULL, *modified = NULL;
 	alpm_list_t *baddeps = NULL;
 	pmdepmissing_t *miss = NULL;
 
@@ -236,9 +236,16 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 		return(NULL);
 	}
 
-	joined = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade));
-	dblist = alpm_list_diff(_alpm_db_get_pkgcache(db), joined, _alpm_pkg_cmp);
-	alpm_list_free(joined);
+	targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade));
+	for(i = _alpm_db_get_pkgcache(db); i; i = i->next) {
+		void *pkg = i->data;
+		if(alpm_list_find(targets, pkg, _alpm_pkg_cmp)) {
+			modified = alpm_list_add(modified, pkg);
+		} else {
+			dblist = alpm_list_add(dblist, pkg);
+		}
+	}
+	alpm_list_free(targets);
 
 	/* look for unsatisfied dependencies of the upgrade list */
 	for(i = upgrade; i; i = i->next) {
@@ -267,9 +274,6 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 	if(reversedeps) {
 		/* reversedeps handles the backwards dependencies, ie,
 		 * the packages listed in the requiredby field. */
-
-		alpm_list_t *modified = alpm_list_diff(_alpm_db_get_pkgcache(db), dblist, _alpm_pkg_cmp);
-
 		for(i = dblist; i; i = i->next) {
 			pmpkg_t *lp = i->data;
 			for(j = alpm_pkg_get_depends(lp); j; j = j->next) {
@@ -290,8 +294,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 				}
 			}
 		}
-		alpm_list_free(modified);
 	}
+	alpm_list_free(modified);
 	alpm_list_free(dblist);
 
 	return(baddeps);
@@ -332,10 +336,10 @@ int SYMEXPORT alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
 	satisfy = (strcmp(pkgname, dep->name) == 0
 			&& dep_vercmp(pkgversion, dep->mod, dep->version));
 
-	/* check provisions, format : "name version" */
+	/* check provisions, format : "name=version" */
 	for(i = alpm_pkg_get_provides(pkg); i && !satisfy; i = i->next) {
 		char *provname = strdup(i->data);
-		char *provver = strchr(provname, ' ');
+		char *provver = strchr(provname, '=');
 
 		if(provver == NULL) { /* no provision version */
 			satisfy = (dep->mod == PM_DEP_MOD_ANY

lib/libalpm/handle.c

@@ -488,7 +488,7 @@ void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg)
 	handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg));
 }
 
-void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
+void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
 {
 	if(handle->ignorepkg) FREELIST(handle->ignorepkg);
 	if(ignorepkgs) handle->ignorepkg = ignorepkgs;
@@ -534,7 +534,7 @@ void SYMEXPORT alpm_option_add_ignoregrp(const char *grp)
 	handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp));
 }
 
-void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
+void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
 {
 	if(handle->ignoregrp) FREELIST(handle->ignoregrp);
 	if(ignoregrps) handle->ignoregrp = ignoregrps;

lib/libalpm/package.c

@@ -825,7 +825,7 @@ void _alpm_pkg_free(pmpkg_t *pkg)
 }
 
 /* Is pkgB an upgrade for pkgA ? */
-int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
+int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
 {
 	int cmp = 0;
 

lib/libalpm/package.h

@@ -90,7 +90,7 @@ pmpkg_t* _alpm_pkg_new(const char *name, const char *version);
 pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg);
 void _alpm_pkg_free(pmpkg_t *pkg);
 int _alpm_pkg_cmp(const void *p1, const void *p2);
-int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg);
+int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg);
 pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full);
 pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack);
 int _alpm_pkg_should_ignore(pmpkg_t *pkg);

lib/libalpm/po/cs_CZ.po

@@ -2,13 +2,13 @@
 # Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Vojtěch Gondžala <vogo@seznam.cz>, 2007.
+# Vojtěch Gondžala <vogo@seznam.cz>, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: cs_CZ\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
-"PO-Revision-Date: 2007-12-21 14:26+0100\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"PO-Revision-Date: 2008-01-15 21:56+0100\n"
 "Last-Translator: Vojtěch Gondžala <vogo@seznam.cz>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
@@ -16,661 +16,640 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:88
+#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "v seznamu cílů nahrazuji starší verzi %s-%s za %s\n"
 
-#: lib/libalpm/add.c:97
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "v seznamu cílů je novější veze %s-%s -- přeskakuji\n"
 
-#: lib/libalpm/add.c:168
+#: lib/libalpm/add.c:166
 msgid "conflicting packages were found in the target list\n"
 msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
 
-#: lib/libalpm/add.c:169
+#: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "nemůžete instalovat dva konfliktní balíčky současně\n"
 
-#: lib/libalpm/add.c:172
+#: lib/libalpm/add.c:170
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "nahrazování balíčků pomocí -A a -U není nyní podporováno\n"
 
-#: lib/libalpm/add.c:173
+#: lib/libalpm/add.c:171
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "balíčky můžete nahradit ručně použitím -Rd a -U\n"
 
-#: lib/libalpm/add.c:365
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"přístupová práva adresáře v %s se neshodují\n"
+"přístupová práva adresáře v %s se liší\n"
 "souborový systém: %o  balíček: %o\n"
 
-#: lib/libalpm/add.c:392
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "rozbalení: symbolický odkaz %s neodkazuje na adresář\n"
 
-#: lib/libalpm/add.c:399
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "rozbalení: nepřepisuji adresář souborem %s\n"
 
-#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "nelze rozbalit %s (%s)\n"
+msgstr "%s nelze rozbalit (%s)\n"
 
-#: lib/libalpm/add.c:505
+#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "nelze přejmenovat %s (%s)\n"
+msgstr "%s nelze přejmenovat (%s)\n"
 
-#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nelze zkopírovat dočasný soubor do %s (%s)\n"
 
-#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s uložen jako %s\n"
 
-#: lib/libalpm/add.c:556
+#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "nelze nainstalovat %s jako %s: %s\n"
+msgstr "%s nelze nainstalovat jako %s: %s\n"
 
-#: lib/libalpm/add.c:559
+#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s nainstalován jako %s\n"
 
-#: lib/libalpm/add.c:576
+#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "rozbaluji %s jako %s.pacnew\n"
+msgstr "%s rozbaluji jako %s.pacnew\n"
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
 msgstr "nelze určit aktuální pracovní adresář\n"
 
-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "nastal problém při aktualizaci %s\n"
+msgstr "při aktualizaci %s nastal problém\n"
 
-#: lib/libalpm/add.c:770
+#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "nastal problém při instalaci %s\n"
+msgstr "při instalaci %s nastal problém\n"
 
-#: lib/libalpm/add.c:785
+#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "nelze aktualizovat záznam databáze %s-%s\n"
 
-#: lib/libalpm/add.c:793
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "nelze přidat položku '%s' do keše\n"
 
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "chybný název záznamu v databázi '%s'\n"
 
-#: lib/libalpm/be_files.c:275
-#, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "získávám informace o balíčku %s : úroveň=%d\n"
-
-#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
-#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
-#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
-#: lib/libalpm/package.c:787
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nelze otevřít soubor %s: %s\n"
 
-#: lib/libalpm/cache.c:62
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr "přidávám '%s' do keše balíčků pro databázi '%s'\n"
-
-#: lib/libalpm/db.c:285
+#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "nelze odstranit záznam v databázi %s%s\n"
 
-#: lib/libalpm/db.c:553
+#: lib/libalpm/db.c:551
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
 
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
 msgid "database path is undefined\n"
 msgstr "cesta k databázi nebyla určena\n"
 
-#: lib/libalpm/deps.c:173
+#: lib/libalpm/deps.c:171
 msgid "dependency cycle detected:\n"
 msgstr "zjištěna cyklická závislost:\n"
 
-#: lib/libalpm/deps.c:175
+#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s bude odstraněn po %s, na kterém závisí\n"
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s bude nainstalován před %s, na kterém závisí\n"
 
-#: lib/libalpm/deps.c:573
+#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nemohu získat \"%s\", závislost \"%s\"\n"
 
-#: lib/libalpm/error.c:43
+#: lib/libalpm/error.c:41
 msgid "out of memory!"
 msgstr "nedostatek paměti!"
 
-#: lib/libalpm/error.c:45
+#: lib/libalpm/error.c:43
 msgid "unexpected system error"
 msgstr "neočekávaná systémová chyba"
 
-#: lib/libalpm/error.c:47
+#: lib/libalpm/error.c:45
 msgid "insufficient privileges"
 msgstr "nedostatečná oprávnění"
 
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:47
 msgid "could not find or read file"
 msgstr "nelze najít nebo číst soubor"
 
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:49
 msgid "could not find or read directory"
 msgstr "nelze najít nebo číst adresář"
 
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:51
 msgid "wrong or NULL argument passed"
 msgstr "předán chybný nebo NULL argument"
 
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:54
 msgid "library not initialized"
 msgstr "knihovna nebyla inicializována"
 
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:56
 msgid "library already initialized"
 msgstr "knihovna inicializována"
 
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:58
 msgid "unable to lock database"
 msgstr "nelze zamknout databázi"
 
-#: lib/libalpm/error.c:63
+#: lib/libalpm/error.c:61
 msgid "could not open database"
 msgstr "nelze otevřít databázi"
 
-#: lib/libalpm/error.c:65
+#: lib/libalpm/error.c:63
 msgid "could not create database"
 msgstr "nelze vytvořit databázi"
 
-#: lib/libalpm/error.c:67
+#: lib/libalpm/error.c:65
 msgid "database not initialized"
 msgstr "databáze nebyla inicializována"
 
-#: lib/libalpm/error.c:69
+#: lib/libalpm/error.c:67
 msgid "database already registered"
 msgstr "databáze zaregistrována"
 
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:69
 msgid "could not find database"
 msgstr "nelze nalézt databázi"
 
-#: lib/libalpm/error.c:73
+#: lib/libalpm/error.c:71
 msgid "could not update database"
 msgstr "nelze aktualizovat databázi"
 
-#: lib/libalpm/error.c:75
+#: lib/libalpm/error.c:73
 msgid "could not remove database entry"
 msgstr "nelze odstranit položku databáze"
 
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:76
 msgid "invalid url for server"
-msgstr "nesprávná url pro server"
+msgstr "nesprávná URL pro server"
 
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:83
 msgid "could not set parameter"
 msgstr "nelze nastavit parametr"
 
-#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:86
 msgid "transaction already initialized"
 msgstr "transakce inicializována"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
 msgid "transaction not initialized"
 msgstr "transakce neinicializována"
 
-#: lib/libalpm/error.c:92
+#: lib/libalpm/error.c:90
 msgid "duplicate target"
 msgstr "duplicitní cíl"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
 msgid "transaction not prepared"
 msgstr "transakce nepřipravena"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:96
 msgid "transaction aborted"
 msgstr "transakce zrušena"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:98
 msgid "operation not compatible with the transaction type"
 msgstr "operace není kompatibilní s typem transakce"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:100
 msgid "could not commit transaction"
 msgstr "nelze provést transakci"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:102
 msgid "could not download all files"
 msgstr "nelze stáhnout všechny soubory"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:105
 msgid "could not find or read package"
 msgstr "nelze nalézt nebo přečíst balíček"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:107
 msgid "invalid or corrupted package"
 msgstr "neplatný nebo poškozený balíček"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:109
 msgid "cannot open package file"
 msgstr "nelze otevřít soubor balíčku"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:111
 msgid "cannot load package data"
 msgstr "nelze načíst data z balíčku"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:113
 msgid "package already installed"
 msgstr "balíček je již nainstalován"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:115
 msgid "package not installed or lesser version"
 msgstr "balíček není nainstalovaný nebo má nižší verzi"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:117
 msgid "cannot remove all files for package"
 msgstr "nelze odstranit všechny soubory balíčku"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:119
 msgid "package name is not valid"
 msgstr "jméno balíčku není platné"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:121
 msgid "corrupted package"
 msgstr "poškozený balíček"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:123
 msgid "no such repository"
 msgstr "není žádný takový repositář"
 
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:126
 msgid "corrupted delta"
 msgstr "poškozený rozdíl"
 
-#: lib/libalpm/error.c:130
+#: lib/libalpm/error.c:128
 msgid "delta patch failed"
-msgstr "rozdílová záplata selhala"
+msgstr "rozdílový patch selhal"
 
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:131
 msgid "group not found"
 msgstr "skupina nenalezena"
 
-#: lib/libalpm/error.c:136
+#: lib/libalpm/error.c:134
 msgid "could not satisfy dependencies"
 msgstr "nelze vyřešit závislosti"
 
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:136
 msgid "conflicting dependencies"
 msgstr "konfliktní závislosti"
 
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:138
 msgid "conflicting files"
 msgstr "konfliktní soubory"
 
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:141
 msgid "user aborted the operation"
 msgstr "uživatel zrušil operaci"
 
-#: lib/libalpm/error.c:145
+#: lib/libalpm/error.c:143
 msgid "internal error"
 msgstr "interní chyba"
 
-#: lib/libalpm/error.c:147
+#: lib/libalpm/error.c:145
 msgid "libarchive error"
 msgstr "chyba knihovny libarchive"
 
-#: lib/libalpm/error.c:150
+#: lib/libalpm/error.c:148
 msgid "not confirmed"
 msgstr "nepotvrzeno"
 
-#: lib/libalpm/error.c:152
+#: lib/libalpm/error.c:150
 msgid "invalid regular expression"
 msgstr "nesprávný regulární výraz"
 
-#: lib/libalpm/error.c:155
+#: lib/libalpm/error.c:153
 msgid "connection to remote host failed"
 msgstr "spojení ke vzdálenému hostiteli selhalo"
 
-#: lib/libalpm/error.c:158
+#: lib/libalpm/error.c:156
 msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
-#: lib/libalpm/package.c:124
+#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "nelze zjistit md5 kontrolní součet balíčku %s-%s\n"
+msgstr "nelze zjistit MD5 kontrolní součet balíčku %s-%s\n"
 
-#: lib/libalpm/package.c:133
+#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "md5 kontrolní součet balíčku %s-%s nesouhlasí\n"
+msgstr "MD5 kontrolní součet balíčku %s-%s nesouhlasí\n"
 
-#: lib/libalpm/package.c:737
+#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: vynucená aktualizace na verzi %s\n"
 
-#: lib/libalpm/package.c:742
+#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: lokální (%s) je novější než %s (%s)\n"
 
-#: lib/libalpm/package.c:750
+#: lib/libalpm/package.c:1027
 #, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: rozdílová aktualizace balíčku (%s)\n"
+msgid "error extracting package description file to %s\n"
+msgstr "nelze získat soubor s popisem balíčku k %s\n"
 
-#: lib/libalpm/package.c:931
+#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "nelze získat soubor s popisem balíčku z %s\n"
 
-#: lib/libalpm/package.c:936
+#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "chybí jméno balíčku v %s\n"
 
-#: lib/libalpm/package.c:940
+#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "chybí veze balíčku v %s\n"
 
-#: lib/libalpm/package.c:970
-#, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "nelze odstranit dočasný soubor %s\n"
-
-#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "chyba při čtení balíčku %s: %s\n"
 
-#: lib/libalpm/package.c:1005
+#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "chybí metadata balíčku v %s\n"
 
-#: lib/libalpm/package.c:1012
-#, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "chybí seznam souborů balíčku v %s, generuji jej\n"
-
-#: lib/libalpm/remove.c:121
+#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nelze nalézt %s v databázi -- přeskakuji\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nelze odstranit soubor '%s': %s\n"
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "nelze odstranit záznam databáze %s-%s\n"
 
-#: lib/libalpm/remove.c:342
+#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nelze odstranit položku '%s' z keše\n"
 
-#: lib/libalpm/server.c:56
+#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr "url '%s' je chybná, ignoruji\n"
+msgstr "URL '%s' je chybná, ignoruji\n"
 
-#: lib/libalpm/server.c:60
+#: lib/libalpm/server.c:58
 msgid "url scheme not specified, assuming http\n"
-msgstr "schéma url nedefinováno, předpokládám http\n"
+msgstr "schéma URL nedefinováno, předpokládám http\n"
 
-#: lib/libalpm/server.c:241
+#: lib/libalpm/server.c:239
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/server.c:245
+#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "selhalo získávání souboru '%s' z %s: %s\n"
 
-#: lib/libalpm/server.c:275
+#: lib/libalpm/server.c:273
 msgid "cannot resume download, starting over\n"
 msgstr "nelze navázat stahování, začínám znovu\n"
 
-#: lib/libalpm/server.c:288
+#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "nelze zapisovat do souboru '%s'\n"
 
-#: lib/libalpm/server.c:307
+#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "chyba při stahování '%s': %s\n"
 
-#: lib/libalpm/server.c:319
+#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "chyba při zápisu do souboru '%s': %s\n"
 
-#: lib/libalpm/server.c:387
+#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "nelze změnit adresář na %s\n"
 
-#: lib/libalpm/server.c:394
+#: lib/libalpm/server.c:392
 msgid "running XferCommand: fork failed!\n"
 msgstr "spouštím XferCommand: větvení selhalo!\n"
 
-#: lib/libalpm/server.c:445
+#: lib/libalpm/server.c:443
 msgid "URL does not contain a file for download\n"
 msgstr "URL neobsahuje stahovaný soubor\n"
 
-#: lib/libalpm/server.c:458
+#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "selhalo stahování %s\n"
 
-#: lib/libalpm/sync.c:135
+#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignoruji aktualizaci balíčku (bude nahrazen %s-%s)\n"
 
-#: lib/libalpm/sync.c:250
+#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
+#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repositář '%s' nenalezen\n"
 
-#: lib/libalpm/sync.c:354
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s je aktuální -- přeskakuji\n"
 
-#: lib/libalpm/sync.c:358
+#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s je aktuální -- přeinstalovávám\n"
 
-#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
-msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
+msgstr "zjištěn nerozlišitelný konflikt balíčků\n"
 
-#: lib/libalpm/sync.c:628
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "selhala alokace paměti: nelze alokovat %zd bytů\n"
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "příkaz: %s\n"
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "nelze zjistit md5 kontrolní součet pro soubor %s\n"
+msgstr "nelze zjistit MD5 kontrolní součet pro soubor %s\n"
 
-#: lib/libalpm/sync.c:910
+#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "soubor %s byl poškozen (nesouhlasí MD5 kontrolní součet)\n"
 
-#: lib/libalpm/sync.c:1056
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "selhalo stažení některých souborů z %s\n"
 
-#: lib/libalpm/sync.c:1137
+#: lib/libalpm/sync.c:1130
 msgid "could not create removal transaction\n"
 msgstr "nelze vytvořit transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1143
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr "nelze inicializovat transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1165
+#: lib/libalpm/sync.c:1158
 msgid "could not prepare removal transaction\n"
 msgstr "nelze připravit transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1171
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr "nelze provést transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1182
+#: lib/libalpm/sync.c:1175
 msgid "could not create transaction\n"
 msgstr "nelze vytvořit transakci\n"
 
-#: lib/libalpm/sync.c:1187
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr "nelze inicializovat transakci\n"
 
-#: lib/libalpm/sync.c:1214
+#: lib/libalpm/sync.c:1207
 msgid "could not prepare transaction\n"
 msgstr "nelze připravit transakci\n"
 
-#: lib/libalpm/sync.c:1219
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr "nelze provést transakci\n"
 
-#: lib/libalpm/trans.c:214
+#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "nelze odstranit zamykací soubor %s\n"
 
 #: lib/libalpm/trans.c:483
-#, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
-msgstr "V kořenovém adresáři není /bin/sh (%s), ruším provádění skriptů\n"
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "Nenalezen /bin/sh v rodičovském prostředí, ruším provádění skriptů\n"
 
 #: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
 msgstr "nelze vytvořit dočasný adresář\n"
 
-#: lib/libalpm/trans.c:536
+#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nelze změnit adresář na %s (%s)\n"
 
-#: lib/libalpm/trans.c:554
+#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "nelze spustit nový proces (%s)\n"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "nelze změnit kořenový adresář (%s)\n"
 
-#: lib/libalpm/trans.c:569
+#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "nelze změnit adresář na / (%s)\n"
 
-#: lib/libalpm/trans.c:578
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "volání popen selhalo (%s)"
 
-#: lib/libalpm/trans.c:597
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "volání waitpid selhalo (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
-msgstr "správné spuštění skriptu selhalo\n"
+msgstr "správné spouštění skriptu selhalo\n"
 
-#: lib/libalpm/trans.c:615
+#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nelze odstranit dočasný adresář %s\n"
 
-#: lib/libalpm/util.c:204
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "selhalo vytvoření cesty '%s': %s\n"
 
-#: lib/libalpm/util.c:389
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "nelze otevřít %s: %s\n"
 
-#: lib/libalpm/util.c:573
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "neexistuje keš %s, vytvářím...\n"
 
-#: lib/libalpm/util.c:593
+#: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "nelze vytvořit keš balíčků, používám /tmp\n"
 
-#: lib/libalpm/util.c:643
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
-msgstr "md5: %s nemohl být otevřen\n"
+msgstr "MD5: %s nemohl být otevřen\n"
 
-#: lib/libalpm/util.c:645
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
-msgstr "md5: %s nemohl být přečten\n"
+msgstr "MD5: %s nemohl být přečten\n"
 

lib/libalpm/po/de.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
-"PO-Revision-Date: 2008-01-05 19:15+0100\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"PO-Revision-Date: 2008-01-17 19:04+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -21,33 +21,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.4\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:88
+#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste\n"
 
-#: lib/libalpm/add.c:97
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "Neuere Version %s-%s ist in der Ziel-Liste -- Überspringe\n"
 
-#: lib/libalpm/add.c:168
+#: lib/libalpm/add.c:166
 msgid "conflicting packages were found in the target list\n"
 msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n"
 
-#: lib/libalpm/add.c:169
+#: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit installieren\n"
 
-#: lib/libalpm/add.c:172
+#: lib/libalpm/add.c:170
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "Das Ersetzen von Paketen mit -A und -U wird noch nicht unterstützt\n"
 
-#: lib/libalpm/add.c:173
+#: lib/libalpm/add.c:171
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "Sie können Pakete manuell mit -Rd und -U ersetzen\n"
 
-#: lib/libalpm/add.c:365
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -56,679 +56,619 @@ msgstr ""
 "Verzeichnis-Berechtigungen unterscheiden sich für %s\n"
 "Dateisystem: %o Paket: %o\n"
 
-#: lib/libalpm/add.c:392
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "Entpacken: Symlink %s zeigt nicht zum Verzeichnis\n"
 
-#: lib/libalpm/add.c:399
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "Entpacken: Überschreibe Verzeichnis nicht mit Datei %s\n"
 
-#: lib/libalpm/add.c:454
-#: lib/libalpm/add.c:598
-#: lib/libalpm/util.c:422
+#: lib/libalpm/add.c:466
+#: lib/libalpm/add.c:610
+#: lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "Konnte %s nicht entpacken (%s)\n"
 
-#: lib/libalpm/add.c:505
+#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "Konnte %s nicht umbenennen (%s)\n"
 
-#: lib/libalpm/add.c:512
-#: lib/libalpm/add.c:532
+#: lib/libalpm/add.c:524
+#: lib/libalpm/add.c:544
 #: lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "Konnte temporäre Datei nicht nach %s kopieren (%s)\n"
 
-#: lib/libalpm/add.c:517
-#: lib/libalpm/remove.c:234
+#: lib/libalpm/add.c:529
+#: lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gespeichert als %s\n"
 
-#: lib/libalpm/add.c:556
+#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "Konnte %s nicht als %s installieren: %s\n"
 
-#: lib/libalpm/add.c:559
+#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installiert als %s\n"
 
-#: lib/libalpm/add.c:576
+#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "Entpacke %s als %s.pacnew\n"
 
-#: lib/libalpm/add.c:711
-#: lib/libalpm/trans.c:529
+#: lib/libalpm/add.c:723
+#: lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln\n"
 
-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "Fehler traten auf, während %s aktualisiert wurde\n"
 
-#: lib/libalpm/add.c:770
+#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "Fehler traten bei der Installation von %s auf\n"
 
-#: lib/libalpm/add.c:785
+#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren\n"
 
-#: lib/libalpm/add.c:793
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n"
 
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "Ungültiger Name für Datenbank-Eintrag '%s'\n"
 
-#: lib/libalpm/be_files.c:275
-#, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "Lade Paket-Daten für %s : level=%d\n"
-
-#: lib/libalpm/be_files.c:292
-#: lib/libalpm/be_files.c:429
-#: lib/libalpm/be_files.c:452
-#: lib/libalpm/be_files.c:563
-#: lib/libalpm/be_files.c:641
-#: lib/libalpm/be_files.c:669
-#: lib/libalpm/package.c:787
+#: lib/libalpm/be_files.c:291
+#: lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451
+#: lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640
+#: lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "Konnte Datei %s nicht öffnen: %s\n"
 
-#: lib/libalpm/cache.c:62
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr "Füge '%s' zum Paketpuffer der Datenbank '%s' hinzu\n"
-
-#: lib/libalpm/db.c:285
+#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "Konnte Datenbank-Eintrag %s%s nicht entfernen\n"
 
-#: lib/libalpm/db.c:553
+#: lib/libalpm/db.c:551
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
 
-#: lib/libalpm/db.c:562
-#: lib/libalpm/db.c:613
+#: lib/libalpm/db.c:560
+#: lib/libalpm/db.c:611
 msgid "database path is undefined\n"
 msgstr "Datenbank-Pfad ist nicht definiert\n"
 
-#: lib/libalpm/deps.c:173
+#: lib/libalpm/deps.c:171
 msgid "dependency cycle detected:\n"
 msgstr "Abhängigkeits-Zyklus entdeckt:\n"
 
-#: lib/libalpm/deps.c:175
+#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s wird nach seiner Abhängigkeit %s entfernt werden\n"
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s wird vor seiner Abhängigkeit %s installiert werden\n"
 
-#: lib/libalpm/deps.c:573
+#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "Kann \"%s\" nicht auflösen (eine Abhängigkeit von \"%s\")\n"
 
-#: lib/libalpm/error.c:43
+#: lib/libalpm/error.c:41
 msgid "out of memory!"
 msgstr "Speicher ist voll!"
 
-#: lib/libalpm/error.c:45
+#: lib/libalpm/error.c:43
 msgid "unexpected system error"
 msgstr "Unerwarteter Systemfehler"
 
-#: lib/libalpm/error.c:47
+#: lib/libalpm/error.c:45
 msgid "insufficient privileges"
 msgstr "Unzureichende Rechte"
 
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:47
 msgid "could not find or read file"
 msgstr "Konnte Datei nicht finden oder lesen"
 
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:49
 msgid "could not find or read directory"
 msgstr "Konnte Verzeichnis nicht finden oder lesen"
 
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:51
 msgid "wrong or NULL argument passed"
 msgstr "Falsches oder NULL-Argument übergeben"
 
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:54
 msgid "library not initialized"
 msgstr "Bibliothek nicht initialisiert"
 
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:56
 msgid "library already initialized"
 msgstr "Bibliothek bereits initialisiert"
 
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:58
 msgid "unable to lock database"
 msgstr "Kann Datenbank nicht sperren"
 
-#: lib/libalpm/error.c:63
+#: lib/libalpm/error.c:61
 msgid "could not open database"
 msgstr "Konnte Datenbank nicht öffnen"
 
-#: lib/libalpm/error.c:65
+#: lib/libalpm/error.c:63
 msgid "could not create database"
 msgstr "Konnte Datenbank nicht erstellen"
 
-#: lib/libalpm/error.c:67
+#: lib/libalpm/error.c:65
 msgid "database not initialized"
 msgstr "Datenbank nicht initialisiert"
 
-#: lib/libalpm/error.c:69
+#: lib/libalpm/error.c:67
 msgid "database already registered"
 msgstr "Datenbank bereits registriert"
 
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:69
 msgid "could not find database"
 msgstr "Konnte Datenbank nicht finden"
 
-#: lib/libalpm/error.c:73
+#: lib/libalpm/error.c:71
 msgid "could not update database"
 msgstr "Konnte Datenbank nicht aktualisieren"
 
-#: lib/libalpm/error.c:75
+#: lib/libalpm/error.c:73
 msgid "could not remove database entry"
 msgstr "Konnte Datenbank-Eintrag nicht entfernen"
 
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:76
 msgid "invalid url for server"
 msgstr "Ungültige URL für den Server"
 
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:83
 msgid "could not set parameter"
 msgstr "Konnte Parameter nicht setzen"
 
-#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:86
 msgid "transaction already initialized"
 msgstr "Vorgang bereits gestartet"
 
-#: lib/libalpm/error.c:90
-#: lib/libalpm/error.c:94
+#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:92
 msgid "transaction not initialized"
 msgstr "Vorgang nicht gestartet"
 
-#: lib/libalpm/error.c:92
+#: lib/libalpm/error.c:90
 msgid "duplicate target"
 msgstr "Doppelte Ziele"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
 msgid "transaction not prepared"
 msgstr "Vorgang nicht vorbereitet"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:96
 msgid "transaction aborted"
 msgstr "Vorgang abgebrochen"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:98
 msgid "operation not compatible with the transaction type"
 msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:100
 msgid "could not commit transaction"
 msgstr "Konnte den Vorgang nicht durchführen"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:102
 msgid "could not download all files"
 msgstr "Konnte nicht alle Dateien herunterladen"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:105
 msgid "could not find or read package"
 msgstr "Konnte Paket nicht finden oder lesen"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:107
 msgid "invalid or corrupted package"
 msgstr "Ungültiges oder beschädigtes Paket"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:109
 msgid "cannot open package file"
 msgstr "Kann Paketdatei nicht öffnen"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:111
 msgid "cannot load package data"
 msgstr "Kann Paketdaten nicht laden"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:113
 msgid "package already installed"
 msgstr "Paket ist bereits installiert"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:115
 msgid "package not installed or lesser version"
 msgstr "Paket ist nicht installiert oder ältere Version"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:117
 msgid "cannot remove all files for package"
 msgstr "Konnte nicht alle Dateien des Paketes entfernen"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:119
 msgid "package name is not valid"
 msgstr "Paketname ist nicht gültig"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:121
 msgid "corrupted package"
 msgstr "Beschädigtes Paket"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:123
 msgid "no such repository"
 msgstr "Kein solches Repositorium"
 
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:126
 msgid "corrupted delta"
 msgstr "Beschädigtes Delta"
 
-#: lib/libalpm/error.c:130
+#: lib/libalpm/error.c:128
 msgid "delta patch failed"
 msgstr "Delta-Patch versagte"
 
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:131
 msgid "group not found"
 msgstr "Gruppe nicht gefunden"
 
-#: lib/libalpm/error.c:136
+#: lib/libalpm/error.c:134
 msgid "could not satisfy dependencies"
 msgstr "Kann Abhängigkeiten nicht erfüllen"
 
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:136
 msgid "conflicting dependencies"
 msgstr "In Konflikt stehende Abhängigkeiten"
 
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:138
 msgid "conflicting files"
 msgstr "In Konflikt stehende Dateien"
 
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:141
 msgid "user aborted the operation"
 msgstr "Benutzer brach die Aktion ab"
 
-#: lib/libalpm/error.c:145
+#: lib/libalpm/error.c:143
 msgid "internal error"
 msgstr "Interner Fehler"
 
-#: lib/libalpm/error.c:147
+#: lib/libalpm/error.c:145
 msgid "libarchive error"
 msgstr "libarchive-Fehler"
 
-#: lib/libalpm/error.c:150
+#: lib/libalpm/error.c:148
 msgid "not confirmed"
 msgstr "Nicht bestätigt"
 
-#: lib/libalpm/error.c:152
+#: lib/libalpm/error.c:150
 msgid "invalid regular expression"
 msgstr "Ungültiger Regulärer Ausdruck"
 
-#: lib/libalpm/error.c:155
+#: lib/libalpm/error.c:153
 msgid "connection to remote host failed"
 msgstr "Verbindung zum Server fehlgeschlagen"
 
-#: lib/libalpm/error.c:158
+#: lib/libalpm/error.c:156
 msgid "unexpected error"
 msgstr "Unerwarteter Fehler"
 
-#: lib/libalpm/package.c:124
+#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "Konnte MD5-Prüfsumme für Paket %s-%s nicht ermitteln\n"
 
-#: lib/libalpm/package.c:133
+#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "MD5-Prüfsummen für Paket %s-%s stimmen nicht überein\n"
 
-#: lib/libalpm/package.c:737
+#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: Erzwungene Aktualisierung auf Version %s\n"
 
-#: lib/libalpm/package.c:742
+#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
 
-#: lib/libalpm/package.c:750
+#: lib/libalpm/package.c:1027
 #, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: Verzögere die Aktualisierung von Paket (%s)\n"
+msgid "error extracting package description file to %s\n"
+msgstr "Fehler beim Entpacken der  Paket-Beschreibungsdatei nach %s\n"
 
-#: lib/libalpm/package.c:931
+#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "Konnte Paket-Beschreibungsdatei in %s nicht analysieren\n"
 
-#: lib/libalpm/package.c:936
+#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "Fehlender Paketname in %s\n"
 
-#: lib/libalpm/package.c:940
+#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "Fehlende Paket-Version in %s\n"
 
-#: lib/libalpm/package.c:970
-#, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "Konnte tempfile %s nicht entfernen\n"
-
-#: lib/libalpm/package.c:985
-#: lib/libalpm/package.c:998
+#: lib/libalpm/package.c:1061
+#: lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "Fehler beim Lesen des Paketes %s: %s\n"
 
-#: lib/libalpm/package.c:1005
+#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "Fehlende Paket-Metadaten in %s\n"
 
-#: lib/libalpm/package.c:1012
-#, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "Fehlende Paket-Dateiliste in %s, erstelle eine\n"
-
-#: lib/libalpm/remove.c:121
+#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n"
 
 #: lib/libalpm/remove.c:172
-#: lib/libalpm/remove.c:243
+#: lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "Kann Datei '%s' nicht entfernen: %s\n"
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "Konnte Datenbank-Eintrag %s-%s nicht entfernen\n"
 
-#: lib/libalpm/remove.c:342
+#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "Konnte Eintrag '%s' nicht aus dem Puffer entfernen\n"
 
-#: lib/libalpm/server.c:56
+#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "URL '%s' ist ungültig, wird ignoriert\n"
 
-#: lib/libalpm/server.c:60
+#: lib/libalpm/server.c:58
 msgid "url scheme not specified, assuming http\n"
 msgstr "URL-Schema nicht spezifiziert, vermute http\n"
 
-#: lib/libalpm/server.c:241
+#: lib/libalpm/server.c:239
 msgid "disk"
 msgstr "Platte"
 
-#: lib/libalpm/server.c:245
+#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
 
-#: lib/libalpm/server.c:275
+#: lib/libalpm/server.c:273
 msgid "cannot resume download, starting over\n"
 msgstr "Kann den Download nicht wieder aufnehmen, starte neu\n"
 
-#: lib/libalpm/server.c:288
+#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "Kann Datei '%s' nicht beschreiben\n"
 
-#: lib/libalpm/server.c:307
+#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "Fehler beim Download von '%s': %s\n"
 
-#: lib/libalpm/server.c:319
+#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "Fehler beim Beschreiben von Datei '%s': %s\n"
 
-#: lib/libalpm/server.c:387
+#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln\n"
 
-#: lib/libalpm/server.c:394
+#: lib/libalpm/server.c:392
 msgid "running XferCommand: fork failed!\n"
 msgstr "Nutze XferCommand: Zweig versagte!\n"
 
-#: lib/libalpm/server.c:445
+#: lib/libalpm/server.c:443
 msgid "URL does not contain a file for download\n"
 msgstr "Die URL enthält keine Datei zum Download\n"
 
-#: lib/libalpm/server.c:458
+#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "Konnte %s nicht herunterladen\n"
 
-#: lib/libalpm/sync.c:135
+#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: Ignoriere zu aktualisierendes Paket (zu ersetzen durch %s-%s)\n"
 
-#: lib/libalpm/sync.c:250
+#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
+#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "Repositorium '%s' nicht gefunden\n"
 
-#: lib/libalpm/sync.c:354
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s ist aktuell -- Überspringe\n"
 
-#: lib/libalpm/sync.c:358
+#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s ist aktuell -- Überspringe\n"
 
-#: lib/libalpm/sync.c:613
-#: lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:596
+#: lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
 msgstr "Nicht lösbare Paketkonflikte gefunden\n"
 
-#: lib/libalpm/sync.c:628
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc-Fehler: Konnte %zd Bytes nicht zuweisen\n"
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "Befehl: %s\n"
 
-#: lib/libalpm/sync.c:888
-#: lib/libalpm/sync.c:896
+#: lib/libalpm/sync.c:876
+#: lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "Kann MD5-Prüfsumme für Paket %s nicht ermitteln\n"
 
-#: lib/libalpm/sync.c:910
+#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "Datei %s war beschädigt (falsche MD5-Prüfsumme)\n"
 
-#: lib/libalpm/sync.c:1056
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "Konnte manche Dateien von %s nicht übertragen\n"
 
-#: lib/libalpm/sync.c:1137
+#: lib/libalpm/sync.c:1130
 msgid "could not create removal transaction\n"
 msgstr "Konnte den Lösch-Vorgang nicht erstellen\n"
 
-#: lib/libalpm/sync.c:1143
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr "Konnte den Lösch-Vorgang nicht beginnen\n"
 
-#: lib/libalpm/sync.c:1165
+#: lib/libalpm/sync.c:1158
 msgid "could not prepare removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht vorbereiten\n"
 
-#: lib/libalpm/sync.c:1171
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht durchführen\n"
 
-#: lib/libalpm/sync.c:1182
+#: lib/libalpm/sync.c:1175
 msgid "could not create transaction\n"
 msgstr "Konnte den Vorgang nicht erstellen\n"
 
-#: lib/libalpm/sync.c:1187
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr "Konnte den Vorgang nicht beginnen\n"
 
-#: lib/libalpm/sync.c:1214
+#: lib/libalpm/sync.c:1207
 msgid "could not prepare transaction\n"
 msgstr "Konnte den Vorgang nicht vorbereiten\n"
 
-#: lib/libalpm/sync.c:1219
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr "Konnte den Vorgang nicht durchführen\n"
 
-#: lib/libalpm/trans.c:214
+#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "Konnte Sperrdatei %s nicht entfernen\n"
 
 #: lib/libalpm/trans.c:483
-#, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
-msgstr "Kein /bin/sh im Root-Verzeichnis (%s), breche Skript ab\n"
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "Kein /bin/sh im übergeordneten Verzeichnis, breche Skript ab\n"
 
 #: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
 msgstr "Konnte temporäres Verzeichnis nicht erstellen\n"
 
-#: lib/libalpm/trans.c:536
+#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)\n"
 
-#: lib/libalpm/trans.c:554
+#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "Konnte keinen neuen Prozess starten (%s)\n"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "Konnte Root-Verzeichnis nicht wechseln (%s)\n"
 
-#: lib/libalpm/trans.c:569
+#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n"
 
-#: lib/libalpm/trans.c:578
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "Aufruf von 'popen' fehlgeschlagen (%s)"
 
-#: lib/libalpm/trans.c:597
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr "Skript konnte nicht korrekt ausgeführt werden\n"
 
-#: lib/libalpm/trans.c:615
+#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
 
-#: lib/libalpm/util.c:204
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "Konnte Pfad '%s' nicht erstellen: %s\n"
 
-#: lib/libalpm/util.c:389
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "Konnte Datei %s nicht öffnen: %s\n"
 
-#: lib/libalpm/util.c:573
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 
-#: lib/libalpm/util.c:593
+#: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n"
 
-#: lib/libalpm/util.c:643
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s kann nicht geöffnet werden\n"
 
-#: lib/libalpm/util.c:645
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: %s kann nicht gelesen werden\n"
-
-#~ msgid "please remove '%s' first, using -Rd"
-#~ msgstr "Entfernen Sie bitte zuerst '%s' mit -Rd"
-#~ msgid "could not extract %s (%s)"
-#~ msgstr "Konnte %s nicht entpacken (%s)"
-#~ msgid "could not update provision '%s' from '%s'"
-#~ msgstr "Konnte Bereitstellung '%s' von '%s' nicht aktualisieren"
-#~ msgid "%s: description file is missing"
-#~ msgstr "%s: Beschreibungsdatei fehlt"
-#~ msgid "%s: dependency file is missing"
-#~ msgstr "%s: Abhängige Datei fehlt"
-#~ msgid "%s: file list is missing"
-#~ msgstr "%s: Dateiliste fehlt"
-#~ msgid "malloc failed: could not allocate %d bytes"
-#~ msgstr "malloc fehlgeschlagen: Konnte %d Bytes nicht zuweisen"
-#~ msgid ""
-#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
-#~ msgstr ""
-#~ "Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in "
-#~ "Paketliste enthalten)"
-#~ msgid "cannot canonicalize specified root path '%s'"
-#~ msgstr "Kann das spezifizierte Wurzelverzeichnis '%s' nicht anerkennen"
-#~ msgid "could not get sha1sum for package %s-%s"
-#~ msgstr "Konnte SHA1-Prüfsumme für Paket %s-%s nicht ermitteln"
-#~ msgid "sha1sums do not match for package %s-%s"
-#~ msgstr "SHA1-Prüfsummen für Paket %s-%s stimmen nicht überein"
-#~ msgid "cannot remove file %s: %s"
-#~ msgstr "Kann Datei %s nicht entfernen: %s"
-#~ msgid "sha1: %s can't be opened\n"
-#~ msgstr "sha1: %s kann nicht geöffnet werden\n"
-#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-#~ msgstr "Archiv %s ist beschädigt (falsche MD5- oder SHA1-Prüfsumme)\n"
-#~ msgid "could not update requiredby for database entry %s-%s"
-#~ msgstr "Konnte requiredby für Datenbank-Eintrag %s-%s nicht aktualisieren"
-#~ msgid "could not update new database entry %s-%s"
-#~ msgstr "Konnte neuen Datenbank-Eintrag %s-%s nicht aktualisieren"
-#~ msgid "could not update 'requiredby' database entry %s-%s"
-#~ msgstr "Konnte requiredby-Eintrag %s-%s nicht aktualisieren"
-

lib/libalpm/po/en_GB.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
-"PO-Revision-Date: 2007-12-03 15:22+1000\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"PO-Revision-Date: 2008-01-16 10:40+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,33 +16,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:88
+#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "replacing older version %s-%s by %s in target list\n"
 
-#: lib/libalpm/add.c:97
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "newer version %s-%s is in the target list -- skipping\n"
 
-#: lib/libalpm/add.c:168
+#: lib/libalpm/add.c:166
 msgid "conflicting packages were found in the target list\n"
 msgstr "conflicting packages were found in the target list\n"
 
-#: lib/libalpm/add.c:169
+#: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "you cannot install two conflicting packages at the same time\n"
 
-#: lib/libalpm/add.c:172
+#: lib/libalpm/add.c:170
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "replacing packages with -A and -U is not supported yet\n"
 
-#: lib/libalpm/add.c:173
+#: lib/libalpm/add.c:171
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "you can replace packages manually using -Rd and -U\n"
 
-#: lib/libalpm/add.c:365
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -51,678 +51,620 @@ msgstr ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 
-#: lib/libalpm/add.c:392
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "extract: symlink %s does not point to dir\n"
 
-#: lib/libalpm/add.c:399
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extract: not overwriting dir with file %s\n"
 
-#: lib/libalpm/add.c:454
-#: lib/libalpm/add.c:598
-#: lib/libalpm/util.c:422
+#: lib/libalpm/add.c:466
+#: lib/libalpm/add.c:610
+#: lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "could not extract %s (%s)\n"
 
-#: lib/libalpm/add.c:505
+#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "could not rename %s (%s)\n"
 
-#: lib/libalpm/add.c:512
-#: lib/libalpm/add.c:532
+#: lib/libalpm/add.c:524
+#: lib/libalpm/add.c:544
 #: lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "could not copy tempfile to %s (%s)\n"
 
-#: lib/libalpm/add.c:517
-#: lib/libalpm/remove.c:234
+#: lib/libalpm/add.c:529
+#: lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s saved as %s\n"
 
-#: lib/libalpm/add.c:556
+#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "could not install %s as %s: %s\n"
 
-#: lib/libalpm/add.c:559
+#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installed as %s\n"
 
-#: lib/libalpm/add.c:576
+#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "extracting %s as %s.pacnew\n"
 
-#: lib/libalpm/add.c:711
-#: lib/libalpm/trans.c:529
+#: lib/libalpm/add.c:723
+#: lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "problem occurred while upgrading %s\n"
 
-#: lib/libalpm/add.c:770
+#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "problem occurred while installing %s\n"
 
-#: lib/libalpm/add.c:785
+#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "could not update database entry %s-%s\n"
 
-#: lib/libalpm/add.c:793
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "could not add entry '%s' in cache\n"
 
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "invalid name for database entry '%s'\n"
 
-#: lib/libalpm/be_files.c:275
-#, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "loading package data for %s : level=%d\n"
-
-#: lib/libalpm/be_files.c:292
-#: lib/libalpm/be_files.c:429
-#: lib/libalpm/be_files.c:452
-#: lib/libalpm/be_files.c:563
-#: lib/libalpm/be_files.c:641
-#: lib/libalpm/be_files.c:669
-#: lib/libalpm/package.c:787
+#: lib/libalpm/be_files.c:291
+#: lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451
+#: lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640
+#: lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "could not open file %s: %s\n"
 
-#: lib/libalpm/cache.c:62
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr "adding '%s' to package cache for db '%s'\n"
-
-#: lib/libalpm/db.c:285
+#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "could not remove database entry %s%s\n"
 
-#: lib/libalpm/db.c:553
+#: lib/libalpm/db.c:551
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "attempt to re-register the 'local' DB\n"
 
-#: lib/libalpm/db.c:562
-#: lib/libalpm/db.c:613
+#: lib/libalpm/db.c:560
+#: lib/libalpm/db.c:611
 msgid "database path is undefined\n"
 msgstr "database path is undefined\n"
 
-#: lib/libalpm/deps.c:173
+#: lib/libalpm/deps.c:171
 msgid "dependency cycle detected:\n"
 msgstr "dependency cycle detected:\n"
 
-#: lib/libalpm/deps.c:175
+#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s will be removed after its %s dependency\n"
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s will be installed before its %s dependency\n"
 
-#: lib/libalpm/deps.c:573
+#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n"
 
-#: lib/libalpm/error.c:43
+#: lib/libalpm/error.c:41
 msgid "out of memory!"
 msgstr "out of memory!"
 
-#: lib/libalpm/error.c:45
+#: lib/libalpm/error.c:43
 msgid "unexpected system error"
 msgstr "unexpected system error"
 
-#: lib/libalpm/error.c:47
+#: lib/libalpm/error.c:45
 msgid "insufficient privileges"
 msgstr "insufficient privileges"
 
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:47
 msgid "could not find or read file"
 msgstr "could not find or read file"
 
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:49
 msgid "could not find or read directory"
 msgstr "could not find or read directory"
 
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:51
 msgid "wrong or NULL argument passed"
 msgstr "wrong or NULL argument passed"
 
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:54
 msgid "library not initialized"
 msgstr "library not initialised"
 
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:56
 msgid "library already initialized"
 msgstr "library already initialised"
 
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:58
 msgid "unable to lock database"
 msgstr "unable to lock database"
 
-#: lib/libalpm/error.c:63
+#: lib/libalpm/error.c:61
 msgid "could not open database"
 msgstr "could not open database"
 
-#: lib/libalpm/error.c:65
+#: lib/libalpm/error.c:63
 msgid "could not create database"
 msgstr "could not create database"
 
-#: lib/libalpm/error.c:67
+#: lib/libalpm/error.c:65
 msgid "database not initialized"
 msgstr "database not initialised"
 
-#: lib/libalpm/error.c:69
+#: lib/libalpm/error.c:67
 msgid "database already registered"
 msgstr "database already registered"
 
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:69
 msgid "could not find database"
 msgstr "could not find database"
 
-#: lib/libalpm/error.c:73
+#: lib/libalpm/error.c:71
 msgid "could not update database"
 msgstr "could not update database"
 
-#: lib/libalpm/error.c:75
+#: lib/libalpm/error.c:73
 msgid "could not remove database entry"
 msgstr "could not remove database entry"
 
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:76
 msgid "invalid url for server"
 msgstr "invalid url for server"
 
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:83
 msgid "could not set parameter"
 msgstr "could not set parameter"
 
-#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:86
 msgid "transaction already initialized"
 msgstr "transaction already initialised"
 
-#: lib/libalpm/error.c:90
-#: lib/libalpm/error.c:94
+#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:92
 msgid "transaction not initialized"
 msgstr "transaction not initialised"
 
-#: lib/libalpm/error.c:92
+#: lib/libalpm/error.c:90
 msgid "duplicate target"
 msgstr "duplicate target"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
 msgid "transaction not prepared"
 msgstr "transaction not prepared"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:96
 msgid "transaction aborted"
 msgstr "transaction aborted"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:98
 msgid "operation not compatible with the transaction type"
 msgstr "operation not compatible with the transaction type"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:100
 msgid "could not commit transaction"
 msgstr "could not commit transaction"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:102
 msgid "could not download all files"
 msgstr "could not download all files"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:105
 msgid "could not find or read package"
 msgstr "could not find or read package"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:107
 msgid "invalid or corrupted package"
 msgstr "invalid or corrupted package"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:109
 msgid "cannot open package file"
 msgstr "cannot open package file"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:111
 msgid "cannot load package data"
 msgstr "cannot load package data"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:113
 msgid "package already installed"
 msgstr "package already installed"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:115
 msgid "package not installed or lesser version"
 msgstr "package not installed or lesser version"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:117
 msgid "cannot remove all files for package"
 msgstr "cannot remove all files for package"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:119
 msgid "package name is not valid"
 msgstr "package name is not valid"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:121
 msgid "corrupted package"
 msgstr "corrupted package"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:123
 msgid "no such repository"
 msgstr "no such repository"
 
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:126
 msgid "corrupted delta"
 msgstr "corrupted delta"
 
-#: lib/libalpm/error.c:130
+#: lib/libalpm/error.c:128
 msgid "delta patch failed"
 msgstr "delta patch failed"
 
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:131
 msgid "group not found"
 msgstr "group not found"
 
-#: lib/libalpm/error.c:136
+#: lib/libalpm/error.c:134
 msgid "could not satisfy dependencies"
 msgstr "could not satisfy dependencies"
 
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:136
 msgid "conflicting dependencies"
 msgstr "conflicting dependencies"
 
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:138
 msgid "conflicting files"
 msgstr "conflicting files"
 
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:141
 msgid "user aborted the operation"
 msgstr "user aborted the operation"
 
-#: lib/libalpm/error.c:145
+#: lib/libalpm/error.c:143
 msgid "internal error"
 msgstr "internal error"
 
-#: lib/libalpm/error.c:147
+#: lib/libalpm/error.c:145
 msgid "libarchive error"
 msgstr "libarchive error"
 
-#: lib/libalpm/error.c:150
+#: lib/libalpm/error.c:148
 msgid "not confirmed"
 msgstr "not confirmed"
 
-#: lib/libalpm/error.c:152
+#: lib/libalpm/error.c:150
 msgid "invalid regular expression"
 msgstr "invalid regular expression"
 
-#: lib/libalpm/error.c:155
+#: lib/libalpm/error.c:153
 msgid "connection to remote host failed"
 msgstr "connection to remote host failed"
 
-#: lib/libalpm/error.c:158
+#: lib/libalpm/error.c:156
 msgid "unexpected error"
 msgstr "unexpected error"
 
-#: lib/libalpm/package.c:124
+#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "could not get md5sum for package %s-%s\n"
 
-#: lib/libalpm/package.c:133
+#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "md5sums do not match for package %s-%s\n"
 
-#: lib/libalpm/package.c:737
+#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: forcing upgrade to version %s\n"
 
-#: lib/libalpm/package.c:742
+#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: local (%s) is newer than %s (%s)\n"
 
-#: lib/libalpm/package.c:750
+#: lib/libalpm/package.c:1027
 #, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: delaying upgrade of package (%s)\n"
+msgid "error extracting package description file to %s\n"
+msgstr "error extracting package description file to %s\n"
 
-#: lib/libalpm/package.c:931
+#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "could not parse package description file in %s\n"
 
-#: lib/libalpm/package.c:936
+#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "missing package name in %s\n"
 
-#: lib/libalpm/package.c:940
+#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "missing package version in %s\n"
 
-#: lib/libalpm/package.c:970
-#, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "could not remove tempfile %s\n"
-
-#: lib/libalpm/package.c:985
-#: lib/libalpm/package.c:998
+#: lib/libalpm/package.c:1061
+#: lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "error while reading package %s: %s\n"
 
-#: lib/libalpm/package.c:1005
+#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "missing package metadata in %s\n"
 
-#: lib/libalpm/package.c:1012
-#, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "missing package filelist in %s, generating one\n"
-
-#: lib/libalpm/remove.c:121
+#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
 
 #: lib/libalpm/remove.c:172
-#: lib/libalpm/remove.c:243
+#: lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "cannot remove file '%s': %s\n"
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "could not remove database entry %s-%s\n"
 
-#: lib/libalpm/remove.c:342
+#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "could not remove entry '%s' from cache\n"
 
-#: lib/libalpm/server.c:56
+#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "URL '%s' is invalid, ignoring\n"
 
-#: lib/libalpm/server.c:60
+#: lib/libalpm/server.c:58
 msgid "url scheme not specified, assuming http\n"
 msgstr "URL scheme not specified, assuming http\n"
 
-#: lib/libalpm/server.c:241
+#: lib/libalpm/server.c:239
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/server.c:245
+#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "failed retrieving file '%s' from %s : %s\n"
 
-#: lib/libalpm/server.c:275
+#: lib/libalpm/server.c:273
 msgid "cannot resume download, starting over\n"
 msgstr "cannot resume download, starting over\n"
 
-#: lib/libalpm/server.c:288
+#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "cannot write to file '%s'\n"
 
-#: lib/libalpm/server.c:307
+#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "error downloading '%s': %s\n"
 
-#: lib/libalpm/server.c:319
+#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "error writing to file '%s': %s\n"
 
-#: lib/libalpm/server.c:387
+#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "could not chdir to %s\n"
 
-#: lib/libalpm/server.c:394
+#: lib/libalpm/server.c:392
 msgid "running XferCommand: fork failed!\n"
 msgstr "running XferCommand: fork failed!\n"
 
-#: lib/libalpm/server.c:445
+#: lib/libalpm/server.c:443
 msgid "URL does not contain a file for download\n"
 msgstr "URL does not contain a file for download\n"
 
-#: lib/libalpm/server.c:458
+#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "failed to download %s\n"
 
-#: lib/libalpm/sync.c:135
+#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 
-#: lib/libalpm/sync.c:250
+#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoring package upgrade (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
+#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repository '%s' not found\n"
 
-#: lib/libalpm/sync.c:354
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s is up to date -- skipping\n"
 
-#: lib/libalpm/sync.c:358
+#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s is up to date -- reinstalling\n"
 
-#: lib/libalpm/sync.c:613
-#: lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:596
+#: lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
 msgstr "unresolvable package conflicts detected\n"
 
-#: lib/libalpm/sync.c:628
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc failure: could not allocate %zd bytes\n"
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "command: %s\n"
 
-#: lib/libalpm/sync.c:888
-#: lib/libalpm/sync.c:896
+#: lib/libalpm/sync.c:876
+#: lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "can't get md5 checksum for file %s\n"
 
-#: lib/libalpm/sync.c:910
+#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "file %s was corrupted (bad MD5 checksum)\n"
 
-#: lib/libalpm/sync.c:1056
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "failed to retrieve some files from %s\n"
 
-#: lib/libalpm/sync.c:1137
+#: lib/libalpm/sync.c:1130
 msgid "could not create removal transaction\n"
 msgstr "could not create removal transaction\n"
 
-#: lib/libalpm/sync.c:1143
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr "could not initialise the removal transaction\n"
 
-#: lib/libalpm/sync.c:1165
+#: lib/libalpm/sync.c:1158
 msgid "could not prepare removal transaction\n"
 msgstr "could not prepare removal transaction\n"
 
-#: lib/libalpm/sync.c:1171
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr "could not commit removal transaction\n"
 
-#: lib/libalpm/sync.c:1182
+#: lib/libalpm/sync.c:1175
 msgid "could not create transaction\n"
 msgstr "could not create transaction\n"
 
-#: lib/libalpm/sync.c:1187
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr "could not initialise transaction\n"
 
-#: lib/libalpm/sync.c:1214
+#: lib/libalpm/sync.c:1207
 msgid "could not prepare transaction\n"
 msgstr "could not prepare transaction\n"
 
-#: lib/libalpm/sync.c:1219
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr "could not commit transaction\n"
 
-#: lib/libalpm/trans.c:214
+#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "could not remove lock file %s\n"
 
 #: lib/libalpm/trans.c:483
-#, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
-msgstr "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "No /bin/sh in parent environment, aborting scriptlet\n"
 
 #: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
 msgstr "could not create temp directory\n"
 
-#: lib/libalpm/trans.c:536
+#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "could not change directory to %s (%s)\n"
 
-#: lib/libalpm/trans.c:554
+#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "could not fork a new process (%s)\n"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "could not change the root directory (%s)\n"
 
-#: lib/libalpm/trans.c:569
+#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "could not change directory to / (%s)\n"
 
-#: lib/libalpm/trans.c:578
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "call to popen failed (%s)"
 
-#: lib/libalpm/trans.c:597
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "call to waitpid failed (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr "scriptlet failed to execute correctly\n"
 
-#: lib/libalpm/trans.c:615
+#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "could not remove tmpdir %s\n"
 
-#: lib/libalpm/util.c:204
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "failed to make path '%s' : %s\n"
 
-#: lib/libalpm/util.c:389
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "could not open %s: %s\n"
 
-#: lib/libalpm/util.c:573
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "no %s cache exists, creating...\n"
 
-#: lib/libalpm/util.c:593
+#: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "couldn't create package cache, using /tmp instead\n"
 
-#: lib/libalpm/util.c:643
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s can't be opened\n"
 
-#: lib/libalpm/util.c:645
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: %s can't be read\n"
 
-#~ msgid "please remove '%s' first, using -Rd\n"
-#~ msgstr "please remove '%s' first, using -Rd\n"
-#~ msgid "cannot resolve dependencies for \"%s\"\n"
-#~ msgstr "cannot resolve dependencies for \"%s\"\n"
-#~ msgid "could not update requiredby for database entry %s-%s\n"
-#~ msgstr "could not update requiredby for database entry %s-%s\n"
-#~ msgid "could not update new database entry %s-%s\n"
-#~ msgstr "could not update new database entry %s-%s\n"
-#~ msgid "could not update 'requiredby' database entry %s-%s\n"
-#~ msgstr "could not update 'requiredby' database entry %s-%s\n"
-#~ msgid "could not extract %s (%s)"
-#~ msgstr "could not extract %s (%s)"
-#~ msgid "could not update provision '%s' from '%s'"
-#~ msgstr "could not update provision '%s' from '%s'"
-
-#, fuzzy
-#~ msgid "%s: description file is missing"
-#~ msgstr "%s: syntax error in description file line %d"
-#~ msgid "malloc failed: could not allocate %d bytes"
-#~ msgstr "malloc failed: could not allocate %d bytes"
-#~ msgid ""
-#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
-#~ msgstr ""
-#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
-#~ msgid "cannot canonicalize specified root path '%s'"
-#~ msgstr "cannot canonicalise specified root path '%s'"
-#~ msgid "could not get sha1sum for package %s-%s"
-#~ msgstr "could not get sha1sum for package %s-%s"
-#~ msgid "sha1sums do not match for package %s-%s"
-#~ msgstr "sha1sums do not match for package %s-%s"
-#~ msgid "cannot remove file %s: %s"
-#~ msgstr "cannot remove file %s: %s"
-#~ msgid "sha1: %s can't be opened\n"
-#~ msgstr "sha1: %s can't be opened\n"
-#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-#~ msgstr "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-

lib/libalpm/po/fr.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-21 11:06+0100\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
 "PO-Revision-Date: 2007-12-22 22:29+0100\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
@@ -18,12 +18,15 @@ msgstr ""
 #: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "remplacement de l'ancienne version %s-%s par %s dans la liste des cibles\n"
+msgstr ""
+"remplacement de l'ancienne version %s-%s par %s dans la liste des cibles\n"
 
 #: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "une version plus récente %s-%s est dans la liste des cibles -- paquet ignoré\n"
+msgstr ""
+"une version plus récente %s-%s est dans la liste des cibles -- paquet "
+"ignoré\n"
 
 #: lib/libalpm/add.c:166
 msgid "conflicting packages were found in the target list\n"
@@ -39,9 +42,10 @@ msgstr "remplacer un paquet avec -A ou -U n'est pas encore possible\n"
 
 #: lib/libalpm/add.c:171
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "vous pouvez remplacer les paquets manuellement en utilisant -Rd et -U\n"
+msgstr ""
+"vous pouvez remplacer les paquets manuellement en utilisant -Rd et -U\n"
 
-#: lib/libalpm/add.c:363
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -50,78 +54,72 @@ msgstr ""
 "Les permissions pour le répertoire %s sont différentes\n"
 "système de fichier: %o paquet : %o\n"
 
-#: lib/libalpm/add.c:390
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "extraction: le lien %s ne pointe pas vers un répertoire\n"
 
-#: lib/libalpm/add.c:397
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extraction: n'écrase pas le répertoire par le fichier %s\n"
 
-#: lib/libalpm/add.c:452
-#: lib/libalpm/add.c:596
-#: lib/libalpm/util.c:421
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "l'extraction de %s a échoué (%s)\n"
 
-#: lib/libalpm/add.c:503
+#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "renommer %s a échoué (%s)\n"
 
-#: lib/libalpm/add.c:510
-#: lib/libalpm/add.c:530
-#: lib/libalpm/trans.c:506
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "la copie du fichier temporaire vers %s a échoué (%s)\n"
 
-#: lib/libalpm/add.c:515
-#: lib/libalpm/remove.c:232
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s enregistré en tant que %s\n"
 
-#: lib/libalpm/add.c:554
+#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "l'installation de %s en tant que %s a échoué:  (%s)\n"
 
-#: lib/libalpm/add.c:557
+#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installé en tant que %s\n"
 
-#: lib/libalpm/add.c:574
+#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "extraction de %s comme %s.pacnew\n"
 
 # j'ai traduit chaque fois "could not" par "a échoué"
-#: lib/libalpm/add.c:709
-#: lib/libalpm/trans.c:524
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
 msgstr "déterminer le répertoire courant a échoué\n"
 
-#: lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "des erreurs sont survenues pendant la mise à jour de %s\n"
 
-#: lib/libalpm/add.c:768
+#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "des erreurs sont survenues pendant l'installation de %s\n"
 
-#: lib/libalpm/add.c:783
+#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "la mise à jour l'entrée de base de données %s-%s a échoué\n"
 
-#: lib/libalpm/add.c:791
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "l'ajout au cache de l'entrée '%s' a échoué\n"
@@ -131,27 +129,14 @@ msgstr "l'ajout au cache de l'entrée '%s' a échoué\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nom invalide pour l'entrée de base de données '%s'\n"
 
-#: lib/libalpm/be_files.c:273
-#, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "chargement des données du paquet %s : niveau=%d\n"
-
-#: lib/libalpm/be_files.c:290
-#: lib/libalpm/be_files.c:427
-#: lib/libalpm/be_files.c:450
-#: lib/libalpm/be_files.c:561
-#: lib/libalpm/be_files.c:639
-#: lib/libalpm/be_files.c:667
-#: lib/libalpm/package.c:894
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "l'ouverture du fichier %s a échoué: %s\n"
 
-#: lib/libalpm/cache.c:60
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr "ajout de '%s' au cache de paquets pour la base de données '%s'\n"
-
 #: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
@@ -161,8 +146,7 @@ msgstr "la suppression de l'entrée de base de données %s%s a échoué\n"
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "tentative de ré-enregistrer la base de données locale\n"
 
-#: lib/libalpm/db.c:560
-#: lib/libalpm/db.c:611
+#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
 msgid "database path is undefined\n"
 msgstr "base de données non initialisée\n"
 
@@ -180,7 +164,7 @@ msgstr "%s sera supprimé après sa dépendance %s\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s sera installé avant sa dépendance %s\n"
 
-#: lib/libalpm/deps.c:584
+#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n"
@@ -261,8 +245,7 @@ msgstr "définir le paramètre a échoué"
 msgid "transaction already initialized"
 msgstr "transaction déjà initialisée"
 
-#: lib/libalpm/error.c:88
-#: lib/libalpm/error.c:92
+#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
 msgid "transaction not initialized"
 msgstr "transaction non initialisée"
 
@@ -402,69 +385,52 @@ msgstr "%s: force la mise à jour à la version %s\n"
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n"
 
-#: lib/libalpm/package.c:857
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: retarde la mise à jour du paquet (%s)\n"
-
-#: lib/libalpm/package.c:1036
+#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "l'extraction du fichier de description vers %s a échoué\n"
 
-#: lib/libalpm/package.c:1042
+#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "l'analyse du fichier de description a échoué dans %s\n"
 
-#: lib/libalpm/package.c:1047
+#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "nom de paquet manquant dans %s\n"
 
-#: lib/libalpm/package.c:1051
+#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "version de paquet manquante dans %s\n"
 
-#: lib/libalpm/package.c:1081
-#, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "la suppression du fichier temporaire %s a échoué\n"
-
-#: lib/libalpm/package.c:1096
-#: lib/libalpm/package.c:1109
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "erreur lors de la lecture du paquet %s: %s\n"
 
-#: lib/libalpm/package.c:1116
+#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "méta-données du paquet manquantes dans %s\n"
 
-#: lib/libalpm/package.c:1123
-#, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "liste de fichiers absente du paquet %s, création\n"
-
 #: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "trouver %s dans la base de données a échoué -- ignoré\n"
 
-#: lib/libalpm/remove.c:170
-#: lib/libalpm/remove.c:241
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "suppression du fichier '%s' impossible: %s\n"
 
-#: lib/libalpm/remove.c:335
+#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "la suppression de l'entrée de base de données %s-%s a échoué\n"
 
-#: lib/libalpm/remove.c:340
+#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "la suppression du cache de l'entrée '%s' a échoué\n"
@@ -534,81 +500,79 @@ msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)\n"
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n"
 
-#: lib/libalpm/sync.c:318
+#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "dépôt '%s' non trouvé\n"
 
-#: lib/libalpm/sync.c:352
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s est à jour -- ignoré\n"
 
-#: lib/libalpm/sync.c:356
+#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s est à jour -- réinstalle\n"
 
-#: lib/libalpm/sync.c:611
-#: lib/libalpm/sync.c:616
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
 msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 
-#: lib/libalpm/sync.c:626
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "erreur malloc: n'a pas pu allouer %zd bytes\n"
 
-#: lib/libalpm/sync.c:823
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "commande: %s\n"
 
-#: lib/libalpm/sync.c:886
-#: lib/libalpm/sync.c:894
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "ne peut obtenir le 'hach' md5 pour le paquet %s\n"
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "l'archive %s était corrompue (mauvaise somme MD5)\n"
 
-#: lib/libalpm/sync.c:1054
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "échec de récupération de certains fichiers depuis %s\n"
 
-#: lib/libalpm/sync.c:1135
+#: lib/libalpm/sync.c:1130
 msgid "could not create removal transaction\n"
 msgstr "la création de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1141
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr "l'initialisation de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1163
+#: lib/libalpm/sync.c:1158
 msgid "could not prepare removal transaction\n"
 msgstr "la préparation de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1169
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr "appliquer la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1180
+#: lib/libalpm/sync.c:1175
 msgid "could not create transaction\n"
 msgstr "la création de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1185
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr "l'initialisation de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1212
+#: lib/libalpm/sync.c:1207
 msgid "could not prepare transaction\n"
 msgstr "la préparation de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1217
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr "appliquer la transaction a échoué\n"
 
@@ -617,79 +581,88 @@ msgstr "appliquer la transaction a échoué\n"
 msgid "could not remove lock file %s\n"
 msgstr "la suppression du fichier de verrouillage %s a échoué\n"
 
-#: lib/libalpm/trans.c:481
+#: lib/libalpm/trans.c:483
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Pas de /bin/sh dans l'environnement parent, interruption du scriptlet\n"
+msgstr ""
+"Pas de /bin/sh dans l'environnement parent, interruption du scriptlet\n"
 
-#: lib/libalpm/trans.c:492
+#: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
 msgstr "la création du répertoire temporaire a échoué\n"
 
-#: lib/libalpm/trans.c:531
+#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "changer de répertoire vers %s a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:549
+#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "la génération d'un nouveau processus a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:559
+#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "changer le répertoire racine a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "changer de répertoire vers / a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:573
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "call to popen failed (%s)"
 
-#: lib/libalpm/trans.c:592
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "call to waitpid failed (%s)\n"
 
-#: lib/libalpm/trans.c:601
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr "le scriptlet n'a pas pu être exécuté correctement\n"
 
-#: lib/libalpm/trans.c:610
+#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "la suppression du répertoire temporaire %s a échoué\n"
 
-#: lib/libalpm/util.c:202
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "échec de la création du chemin '%s' : %s\n"
 
-#: lib/libalpm/util.c:387
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "l'ouverture de %s: %s a échoué\n"
 
-#: lib/libalpm/util.c:572
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "le cache %s n'existe pas, création...\n"
 
-#: lib/libalpm/util.c:592
+#: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
 
-#: lib/libalpm/util.c:642
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: l'ouverture de %s a échoué\n"
 
-#: lib/libalpm/util.c:644
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: la lecture de %s a échoué\n"
 
+#~ msgid "loading package data for %s : level=%d\n"
+#~ msgstr "chargement des données du paquet %s : niveau=%d\n"
+
+#~ msgid "adding '%s' to package cache for db '%s'\n"
+#~ msgstr "ajout de '%s' au cache de paquets pour la base de données '%s'\n"
+
+#~ msgid "could not remove tempfile %s\n"
+#~ msgstr "la suppression du fichier temporaire %s a échoué\n"

lib/libalpm/po/hu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-20 12:35+0100\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
 "PO-Revision-Date: 2007-03-14 13:45+0100\n"
 "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team:  <hu@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "csomagok lecser
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "a -Rd <20>s -U haszn<7A>lat<61>val elv<6C>gezhet<65> a csere\n"
 
-#: lib/libalpm/add.c:363
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -52,71 +52,71 @@ msgstr ""
 "elt<6C>r<EFBFBD> k<>nyvt<76>r-jogosults<74>gok: %s\n"
 "f<>jlrendszer: %o  csomag: %o\n"
 
-#: lib/libalpm/add.c:390
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "kicsomagol<6F>s: %s szimbolikus link nem k<>nyvt<76>rra mutat\n"
 
-#: lib/libalpm/add.c:397
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "kicsomagol<6F>s: nem <20>rok fel<65>l k<>nyvt<76>rat a %s f<>jllal\n"
 
-#: lib/libalpm/add.c:452 lib/libalpm/add.c:596 lib/libalpm/util.c:421
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nem siker<65>lt kicsomagolni: %s (%s)\n"
 
-#: lib/libalpm/add.c:503
+#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "nem siker<65>lt <20>tnevezni: %s (%s)\n"
 
-#: lib/libalpm/add.c:510 lib/libalpm/add.c:530 lib/libalpm/trans.c:506
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nem siker<65>lt az ideiglenes f<>jlt ide m<>solni: %s (%s)\n"
 
-#: lib/libalpm/add.c:515 lib/libalpm/remove.c:232
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s elmentve %s n<>ven\n"
 
-#: lib/libalpm/add.c:554
+#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "nem siker<65>lt %s telep<65>t<EFBFBD>se %s n<>ven: %s\n"
 
-#: lib/libalpm/add.c:557
+#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s %s n<>ven lett telep<65>tve\n"
 
-#: lib/libalpm/add.c:574
+#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "%s kicsomagol<6F>sa %s.pacnew n<>ven\n"
 
-#: lib/libalpm/add.c:709 lib/libalpm/trans.c:524
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
 msgstr "a jelenlegi munkak<61>nyvt<76>r nem kaphat<61> meg\n"
 
-#: lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "hiba t<>rt<72>nt a(z) %s friss<73>t<EFBFBD>se k<>zben\n"
 
-#: lib/libalpm/add.c:768
+#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "hiba t<>rt<72>nt a(z) %s telep<65>t<EFBFBD>se k<>zben\n"
 
-#: lib/libalpm/add.c:783
+#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "nem siker<65>lt a(z) %s-%s adatb<74>zisbejegyz<79>s friss<73>t<EFBFBD>se\n"
 
-#: lib/libalpm/add.c:791
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "sikertelen a '%s' bejegyz<79>s hozz<7A>ad<61>sa a gyors<72>t<EFBFBD>t<EFBFBD>rhoz\n"
@@ -126,25 +126,14 @@ msgstr "sikertelen a '%s' bejegyz
 msgid "invalid name for database entry '%s'\n"
 msgstr "<22>rv<72>nytelen n<>v a '%s' adatb<74>zis-bejegyz<79>s sz<73>m<EFBFBD>ra\n"
 
-#: lib/libalpm/be_files.c:273
-#, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "a(z) %s csomag adatainak bet<65>lt<6C>se : szint=%d\n"
-
-#: lib/libalpm/be_files.c:290 lib/libalpm/be_files.c:427
-#: lib/libalpm/be_files.c:450 lib/libalpm/be_files.c:561
-#: lib/libalpm/be_files.c:639 lib/libalpm/be_files.c:667
-#: lib/libalpm/package.c:894
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nem siker<65>lt megnyitni a %s f<>jlt: %s\n"
 
-#: lib/libalpm/cache.c:60
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr ""
-"a(z) '%s' csomag hozz<7A>ad<61>sa a(z) '%s' adatb<74>zis csomaggyors<72>t<EFBFBD>t<EFBFBD>r<EFBFBD>hoz\n"
-
 #: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
@@ -172,7 +161,7 @@ msgstr "a(z) %s csomag saj
 msgid "%s will be installed before its %s dependency\n"
 msgstr "a(z) %s csomag saj<61>t %s f<>gg<67>s<EFBFBD>ge el<65>tt lesz telep<65>tve\n"
 
-#: lib/libalpm/deps.c:584
+#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nem siker<65>lt a(z) \"%s\" csomag \"%s\" f<>gg<67>s<EFBFBD>g<EFBFBD>t feloldani\n"
@@ -393,67 +382,52 @@ msgstr "%s: er
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: a helyi (%s) <20>jabb, mint %s (%s)\n"
 
-#: lib/libalpm/package.c:857
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: a csomag friss<73>t<EFBFBD>s<EFBFBD>nek k<>sleltet<65>se (%s)\n"
-
-#: lib/libalpm/package.c:1036
+#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "nem siker<65>lt kicsomagolni a csomagle<6C>r<EFBFBD> f<>jlt %s-k<>nt\n"
 
-#: lib/libalpm/package.c:1042
+#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "nem siker<65>lt <20>rtelmezni a(z) %s csomagle<6C>r<EFBFBD> f<>jlj<6C>t\n"
 
-#: lib/libalpm/package.c:1047
+#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "hi<68>nyz<79> csomagn<67>v itt: %s\n"
 
-#: lib/libalpm/package.c:1051
+#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "hi<68>nyz<79> csomagverzi<7A> itt: %s\n"
 
-#: lib/libalpm/package.c:1081
-#, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "nem siker<65>lt elt<6C>vol<6F>tani a %s ideiglenes f<>jlt\n"
-
-#: lib/libalpm/package.c:1096 lib/libalpm/package.c:1109
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "hiba a(z) %s csomag olvas<61>sa k<>zben: %s\n"
 
-#: lib/libalpm/package.c:1116
+#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "hi<68>nyz<79> csomaginform<72>ci<63>s f<>jl itt: %s\n"
 
-#: lib/libalpm/package.c:1123
-#, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "hi<68>nyzik a(z) %s csomag f<>jllist<73>ja, gener<65>l<EFBFBD>s\n"
-
 #: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nem tal<61>lhat<61> a(z) %s az adatb<74>zisban -- kihagy<67>s\n"
 
-#: lib/libalpm/remove.c:170 lib/libalpm/remove.c:241
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nem siker<65>lt elt<6C>vol<6F>tani a '%s' f<>jlt : %s\n"
 
-#: lib/libalpm/remove.c:335
+#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "nem siker<65>lt elt<6C>vol<6F>tani a(z) %s-%s adatb<74>zis-bejegyz<79>st\n"
 
-#: lib/libalpm/remove.c:340
+#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nem siker<65>lt elt<6C>vol<6F>tani a(z) '%s' bejegyz<79>st a gyors<72>t<EFBFBD>t<EFBFBD>rb<72>l\n"
@@ -523,79 +497,79 @@ msgstr "%s-%s: csomagfriss
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: csomagfriss<73>t<EFBFBD>s kihagy<67>sa (%s => %s)\n"
 
-#: lib/libalpm/sync.c:318
+#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "a(z) '%s' rep<65> nem tal<61>lhat<61>\n"
 
-#: lib/libalpm/sync.c:352
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "a(z) %s-%s naprak<61>sz -- kihagy<67>s\n"
 
-#: lib/libalpm/sync.c:356
+#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "a(z) %s-%s naprak<61>sz -- <20>jratelep<65>t<EFBFBD>s\n"
 
-#: lib/libalpm/sync.c:611 lib/libalpm/sync.c:616
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
 msgstr "feloldhatatlan csomag<61>tk<74>z<EFBFBD>seket tal<61>ltam\n"
 
-#: lib/libalpm/sync.c:626
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc hiba: nem siker<65>lt lefoglalni %zd byte-ot\n"
 
-#: lib/libalpm/sync.c:823
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "parancs: %s\n"
 
-#: lib/libalpm/sync.c:886 lib/libalpm/sync.c:894
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "nem siker<65>lt meghat<61>rozni a(z) %s f<>jl md5 ellen<65>rz<72> <20>sszeg<65>t\n"
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "a(z) %s f<>jl s<>r<EFBFBD>lt volt (rossz MD5 <20>sszeg)\n"
 
-#: lib/libalpm/sync.c:1054
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "nem siker<65>lt n<>h<EFBFBD>ny f<>jlt let<65>lteni innen: %s\n"
 
-#: lib/libalpm/sync.c:1135
+#: lib/libalpm/sync.c:1130
 msgid "could not create removal transaction\n"
 msgstr "nem siker<65>lt l<>trehozni az elt<6C>vol<6F>t<EFBFBD> tranzakci<63>t\n"
 
-#: lib/libalpm/sync.c:1141
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr "nem siker<65>lt inicializ<69>lni az elt<6C>vol<6F>t<EFBFBD> tranzakci<63>t\n"
 
-#: lib/libalpm/sync.c:1163
+#: lib/libalpm/sync.c:1158
 msgid "could not prepare removal transaction\n"
 msgstr "nem siker<65>lt el<65>k<EFBFBD>sz<73>teni az elt<6C>vol<6F>t<EFBFBD> tranzakci<63>t\n"
 
-#: lib/libalpm/sync.c:1169
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr "nem siker<65>lt v<>grehajtani az elt<6C>vol<6F>t<EFBFBD> tranzakci<63>t\n"
 
-#: lib/libalpm/sync.c:1180
+#: lib/libalpm/sync.c:1175
 msgid "could not create transaction\n"
 msgstr "nem siker<65>lt l<>trehozni a tranzakci<63>t\n"
 
-#: lib/libalpm/sync.c:1185
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr "nem siker<65>lt inicializ<69>lni a tranzakci<63>t\n"
 
-#: lib/libalpm/sync.c:1212
+#: lib/libalpm/sync.c:1207
 msgid "could not prepare transaction\n"
 msgstr "nem siker<65>lt el<65>k<EFBFBD>sz<73>teni a tranzakci<63>t\n"
 
-#: lib/libalpm/sync.c:1217
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr "nem siker<65>lt v<>grehajtani a tranzakci<63>t\n"
 
@@ -604,78 +578,78 @@ msgstr "nem siker
 msgid "could not remove lock file %s\n"
 msgstr "nem siker<65>lt a z<>rol<6F> f<>jl (%s) elt<6C>vol<6F>t<EFBFBD>sa\n"
 
-#: lib/libalpm/trans.c:481
+#: lib/libalpm/trans.c:483
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr "Nincs /bin/sh a sz<73>l<EFBFBD> k<>rnyezetben, szkript megszak<61>t<EFBFBD>sa\n"
 
-#: lib/libalpm/trans.c:492
+#: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
 msgstr "nem siker<65>lt l<>trehozni az ideiglenes k<>nyvt<76>rat\n"
 
-#: lib/libalpm/trans.c:531
+#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nem siker<65>lt a k<>nyvt<76>rv<72>lt<6C>s ide: %s (%s)\n"
 
-#: lib/libalpm/trans.c:549
+#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "nem siker<65>lt forkolni egy <20>j folyamatot (%s)\n"
 
-#: lib/libalpm/trans.c:559
+#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "nem siker<65>lt a chroot (%s)\n"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "nem siker<65>lt a k<>nyvt<76>rat a /-re v<>ltani (%s)\n"
 
-#: lib/libalpm/trans.c:573
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "popen h<>v<EFBFBD>s sikertelen (%s)"
 
-#: lib/libalpm/trans.c:592
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "waitpid h<>v<EFBFBD>s sikertelen (%s)\n"
 
-#: lib/libalpm/trans.c:601
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr "a szkript hib<69>san futott\n"
 
-#: lib/libalpm/trans.c:610
+#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nem siker<65>lt elt<6C>vol<6F>tani a %s ideiglenes k<>nyvt<76>rat\n"
 
-#: lib/libalpm/util.c:202
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "nem siker<65>lt a '%s' <20>tvonal l<>trehoz<6F>sa: %s\n"
 
-#: lib/libalpm/util.c:387
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "nem siker<65>lt megnyitni a %s f<>jlt: %s\n"
 
-#: lib/libalpm/util.c:572
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "nem l<>tezik a(z) %s gyors<72>t<EFBFBD>t<EFBFBD>r. l<>trehoz<6F>s...\n"
 
-#: lib/libalpm/util.c:592
+#: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "nem siker<65>lt l<>trehozni a csomaggyors<72>t<EFBFBD>t<EFBFBD>rat, a /tmp haszn<7A>lata\n"
 
-#: lib/libalpm/util.c:642
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: nem siker<65>lt megnyitni a k<>vetkez<65>t: %s\n"
 
-#: lib/libalpm/util.c:644
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: nem siker<65>lt olvasni a k<>vetkez<65>t: %s\n"

lib/libalpm/po/it.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-18 22:41+0100\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
 "PO-Revision-Date: 2007-12-18 23:30+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
@@ -44,7 +44,7 @@ msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 "è possibile sostituire manualmente i pacchetti, usando le opzioni -Rd e -U\n"
 
-#: lib/libalpm/add.c:363
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -53,71 +53,71 @@ msgstr ""
 "i permessi delle directory differiscono su %s\n"
 "filesystem: %o pacchetto: %o\n"
 
-#: lib/libalpm/add.c:390
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "estrazione: il link simbolico %s non punta alla directory\n"
 
-#: lib/libalpm/add.c:397
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "estrazione: non sovrascrivere la directory con il file %s\n"
 
-#: lib/libalpm/add.c:452 lib/libalpm/add.c:596 lib/libalpm/util.c:421
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "impossibile estrarre %s (%s)\n"
 
-#: lib/libalpm/add.c:503
+#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "impossibile rinominare %s (%s)\n"
 
-#: lib/libalpm/add.c:510 lib/libalpm/add.c:530 lib/libalpm/trans.c:506
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "impossibile copiare il file temporaneo in %s (%s)\n"
 
-#: lib/libalpm/add.c:515 lib/libalpm/remove.c:232
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s salvato come %s\n"
 
-#: lib/libalpm/add.c:554
+#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "impossibile installare %s come %s: %s\n"
 
-#: lib/libalpm/add.c:557
+#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installato come %s\n"
 
-#: lib/libalpm/add.c:574
+#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "estrazione di %s come %s.pacnew\n"
 
-#: lib/libalpm/add.c:709 lib/libalpm/trans.c:524
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
 msgstr "impossibile ottenere la directory corrente\n"
 
-#: lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "si sono verificati degli errori durante l'aggiornamento di %s\n"
 
-#: lib/libalpm/add.c:768
+#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "si sono verificati degli errori durante l'installazione di %s\n"
 
-#: lib/libalpm/add.c:783
+#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "impossibile aggiornare la voce %s-%s nel database\n"
 
-#: lib/libalpm/add.c:791
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "impossible includere la voce '%s' nella cache\n"
@@ -127,24 +127,14 @@ msgstr "impossible includere la voce '%s' nella cache\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nome non valido per la voce del database '%s'\n"
 
-#: lib/libalpm/be_files.c:273
-#, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "caricamento in corso dei dati del pacchetto %s : livello=%d\n"
-
-#: lib/libalpm/be_files.c:290 lib/libalpm/be_files.c:427
-#: lib/libalpm/be_files.c:450 lib/libalpm/be_files.c:561
-#: lib/libalpm/be_files.c:639 lib/libalpm/be_files.c:667
-#: lib/libalpm/package.c:894
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "impossibile aprire il file %s: %s\n"
 
-#: lib/libalpm/cache.c:60
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr "aggiunta di '%s' alla cache del pacchetto per il database '%s'\n"
-
 #: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
@@ -172,7 +162,7 @@ msgstr "%s sarà rimosso dopo la sua dipendenza %s\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s sarà installato prima della sua dipendenza %s\n"
 
-#: lib/libalpm/deps.c:573
+#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
@@ -394,67 +384,52 @@ msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr ""
 "%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
 
-#: lib/libalpm/package.c:857
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: ritardo durante l'aggiornamento del pacchetto (%s)\n"
-
-#: lib/libalpm/package.c:1036
+#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "impossibile estrarre il file di descrizione del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1042
+#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "impossibile analizzare il file di descrizione del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1047
+#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "manca il nome del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1051
+#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "manca la versione del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1081
-#, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "impossibile rimuovere il file temporaneo %s\n"
-
-#: lib/libalpm/package.c:1096 lib/libalpm/package.c:1109
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "si è verificato un errore durante la lettura del pacchetto %s: %s\n"
 
-#: lib/libalpm/package.c:1116
+#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "manca il metadata del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1123
-#, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "manca il filelist nel pacchetto %s, creazione in corso\n"
-
 #: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "impossibile trovare %s nel database, sarà ignorato\n"
 
-#: lib/libalpm/remove.c:170 lib/libalpm/remove.c:241
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "impossibile rimuovere il file '%s': %s\n"
 
-#: lib/libalpm/remove.c:335
+#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "impossibile rimuovere la voce %s-%s dal database\n"
 
-#: lib/libalpm/remove.c:340
+#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "impossibile rimuovere la voce '%s' dalla cache\n"
@@ -526,79 +501,79 @@ msgstr ""
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n"
 
-#: lib/libalpm/sync.c:318
+#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "impossibile trovare il repository '%s'\n"
 
-#: lib/libalpm/sync.c:352
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s è aggiornato, sarà ignorato\n"
 
-#: lib/libalpm/sync.c:356
+#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s è aggiornato, sarà reinstallato\n"
 
-#: lib/libalpm/sync.c:611 lib/libalpm/sync.c:616
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
 msgstr "sono stati rilevati dei conflitti irrisolvibili\n"
 
-#: lib/libalpm/sync.c:626
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc failure: impossibile allocare %zd byte\n"
 
-#: lib/libalpm/sync.c:823
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "comando: %s\n"
 
-#: lib/libalpm/sync.c:886 lib/libalpm/sync.c:894
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "impossibile recuperare il checksum md5 del file %s\n"
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "il file %s è corrotto (MD5 errato)\n"
 
-#: lib/libalpm/sync.c:1054
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "impossibile recuperare alcuni file da %s\n"
 
-#: lib/libalpm/sync.c:1135
+#: lib/libalpm/sync.c:1130
 msgid "could not create removal transaction\n"
 msgstr "impossibile avviare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1141
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr "impossibile inizializzare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1163
+#: lib/libalpm/sync.c:1158
 msgid "could not prepare removal transaction\n"
 msgstr "impossibile preparare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1169
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr "impossibile eseguire l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1180
+#: lib/libalpm/sync.c:1175
 msgid "could not create transaction\n"
 msgstr "impossibile avviare l'operazione\n"
 
-#: lib/libalpm/sync.c:1185
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr "impossibile inizializzare l'operazione\n"
 
-#: lib/libalpm/sync.c:1212
+#: lib/libalpm/sync.c:1207
 msgid "could not prepare transaction\n"
 msgstr "impossibile preparare l'operazione\n"
 
-#: lib/libalpm/sync.c:1217
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr "impossibile eseguire l'operazione\n"
 
@@ -607,96 +582,97 @@ msgstr "impossibile eseguire l'operazione\n"
 msgid "could not remove lock file %s\n"
 msgstr "impossibile rimuovere il file di lock %s\n"
 
-#: lib/libalpm/trans.c:481
+#: lib/libalpm/trans.c:483
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr "/bin/sh non è presente nell'ambiente, lo scriptlet sarà interrotto\n"
 
-#: lib/libalpm/trans.c:492
+#: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
 msgstr "impossibile creare la directory temporanea\n"
 
-#: lib/libalpm/trans.c:531
+#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "impossibile spostarsi nella directory %s (%s)\n"
 
-#: lib/libalpm/trans.c:549
+#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "impossibile effettuare il fork di un nuovo processo (%s)\n"
 
-#: lib/libalpm/trans.c:559
+#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "impossibile cambiare la root directory (%s)\n"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "impossibile spostarsi nella directory / (%s)\n"
 
-#: lib/libalpm/trans.c:573
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "chiamata a popen non riuscita (%s)"
 
-#: lib/libalpm/trans.c:592
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "chiamata a waitpid non riuscita (%s)\n"
 
-#: lib/libalpm/trans.c:601
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr "L'esecuzione dello scriptlet non è riuscita correttamente\n"
 
-#: lib/libalpm/trans.c:610
+#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "impossibile rimuovere la directory temporanea %s\n"
 
-#: lib/libalpm/util.c:202
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "impossibile seguire il percorso '%s' : %s\n"
 
-#: lib/libalpm/util.c:387
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "impossibile aprire %s: %s\n"
 
-#: lib/libalpm/util.c:572
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "la cache di %s non esiste, creazione in corso...\n"
 
-#: lib/libalpm/util.c:592
+#: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n"
 
-#: lib/libalpm/util.c:642
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: impossibile aprire %s\n"
 
-#: lib/libalpm/util.c:644
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: impossibile leggere %s\n"
 
+#~ msgid "loading package data for %s : level=%d\n"
+#~ msgstr "caricamento in corso dei dati del pacchetto %s : livello=%d\n"
+
+#~ msgid "adding '%s' to package cache for db '%s'\n"
+#~ msgstr "aggiunta di '%s' alla cache del pacchetto per il database '%s'\n"
+
+#~ msgid "could not remove tempfile %s\n"
+#~ msgstr "impossibile rimuovere il file temporaneo %s\n"
+
 #~ msgid "please remove '%s' first, using -Rd\n"
 #~ msgstr "Si consiglia di rimuovere prima '%s', usando l'opzione -Rd\n"
 
 #~ msgid "cannot resolve dependencies for \"%s\"\n"
 #~ msgstr "impossibile risolvere le dipendenze per \"%s\"\n"
 
-#~ msgid "could not update requiredby for database entry %s-%s\n"
-#~ msgstr ""
-#~ "impossibile aggiornare il campo richiesto da per la voce del database %s-%"
-#~ "s\n"
-
 #~ msgid "could not update new database entry %s-%s\n"
 #~ msgstr "impossibile aggiornare la nuova voce del database %s-%s\n"
-
-#~ msgid "could not update 'requiredby' database entry %s-%s\n"
-#~ msgstr "impossibile aggiornare la voce 'richiesto da' del database %s-%s\n"

lib/libalpm/po/libalpm.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
+"POT-Creation-Date: 2008-01-14 23:08-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"
@@ -16,658 +16,637 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/libalpm/add.c:88
+#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:97
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/add.c:168
+#: lib/libalpm/add.c:166
 msgid "conflicting packages were found in the target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:169
+#: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
 
-#: lib/libalpm/add.c:172
+#: lib/libalpm/add.c:170
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr ""
 
-#: lib/libalpm/add.c:173
+#: lib/libalpm/add.c:171
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 
-#: lib/libalpm/add.c:365
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
 
-#: lib/libalpm/add.c:392
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr ""
 
-#: lib/libalpm/add.c:399
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:505
+#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:556
+#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:559
+#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:576
+#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr ""
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:770
+#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:785
+#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:793
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr ""
 
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr ""
 
-#: lib/libalpm/be_files.c:275
-#, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr ""
-
-#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
-#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
-#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
-#: lib/libalpm/package.c:787
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/cache.c:62
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr ""
-
-#: lib/libalpm/db.c:285
+#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr ""
 
-#: lib/libalpm/db.c:553
+#: lib/libalpm/db.c:551
 msgid "attempt to re-register the 'local' DB\n"
 msgstr ""
 
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
 msgid "database path is undefined\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:173
+#: lib/libalpm/deps.c:171
 msgid "dependency cycle detected:\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:175
+#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:573
+#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr ""
 
-#: lib/libalpm/error.c:43
+#: lib/libalpm/error.c:41
 msgid "out of memory!"
 msgstr ""
 
-#: lib/libalpm/error.c:45
+#: lib/libalpm/error.c:43
 msgid "unexpected system error"
 msgstr ""
 
-#: lib/libalpm/error.c:47
+#: lib/libalpm/error.c:45
 msgid "insufficient privileges"
 msgstr ""
 
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:47
 msgid "could not find or read file"
 msgstr ""
 
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:49
 msgid "could not find or read directory"
 msgstr ""
 
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:51
 msgid "wrong or NULL argument passed"
 msgstr ""
 
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:54
 msgid "library not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:56
 msgid "library already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:58
 msgid "unable to lock database"
 msgstr ""
 
-#: lib/libalpm/error.c:63
+#: lib/libalpm/error.c:61
 msgid "could not open database"
 msgstr ""
 
-#: lib/libalpm/error.c:65
+#: lib/libalpm/error.c:63
 msgid "could not create database"
 msgstr ""
 
-#: lib/libalpm/error.c:67
+#: lib/libalpm/error.c:65
 msgid "database not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:69
+#: lib/libalpm/error.c:67
 msgid "database already registered"
 msgstr ""
 
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:69
 msgid "could not find database"
 msgstr ""
 
-#: lib/libalpm/error.c:73
+#: lib/libalpm/error.c:71
 msgid "could not update database"
 msgstr ""
 
-#: lib/libalpm/error.c:75
+#: lib/libalpm/error.c:73
 msgid "could not remove database entry"
 msgstr ""
 
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:76
 msgid "invalid url for server"
 msgstr ""
 
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:83
 msgid "could not set parameter"
 msgstr ""
 
-#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:86
 msgid "transaction already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
 msgid "transaction not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:92
+#: lib/libalpm/error.c:90
 msgid "duplicate target"
 msgstr ""
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
 msgid "transaction not prepared"
 msgstr ""
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:96
 msgid "transaction aborted"
 msgstr ""
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:98
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:100
 msgid "could not commit transaction"
 msgstr ""
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:102
 msgid "could not download all files"
 msgstr ""
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:105
 msgid "could not find or read package"
 msgstr ""
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:107
 msgid "invalid or corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:109
 msgid "cannot open package file"
 msgstr ""
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:111
 msgid "cannot load package data"
 msgstr ""
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:113
 msgid "package already installed"
 msgstr ""
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:115
 msgid "package not installed or lesser version"
 msgstr ""
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:117
 msgid "cannot remove all files for package"
 msgstr ""
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:119
 msgid "package name is not valid"
 msgstr ""
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:121
 msgid "corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:123
 msgid "no such repository"
 msgstr ""
 
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:126
 msgid "corrupted delta"
 msgstr ""
 
-#: lib/libalpm/error.c:130
+#: lib/libalpm/error.c:128
 msgid "delta patch failed"
 msgstr ""
 
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:131
 msgid "group not found"
 msgstr ""
 
-#: lib/libalpm/error.c:136
+#: lib/libalpm/error.c:134
 msgid "could not satisfy dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:136
 msgid "conflicting dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:138
 msgid "conflicting files"
 msgstr ""
 
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:141
 msgid "user aborted the operation"
 msgstr ""
 
-#: lib/libalpm/error.c:145
+#: lib/libalpm/error.c:143
 msgid "internal error"
 msgstr ""
 
-#: lib/libalpm/error.c:147
+#: lib/libalpm/error.c:145
 msgid "libarchive error"
 msgstr ""
 
-#: lib/libalpm/error.c:150
+#: lib/libalpm/error.c:148
 msgid "not confirmed"
 msgstr ""
 
-#: lib/libalpm/error.c:152
+#: lib/libalpm/error.c:150
 msgid "invalid regular expression"
 msgstr ""
 
-#: lib/libalpm/error.c:155
+#: lib/libalpm/error.c:153
 msgid "connection to remote host failed"
 msgstr ""
 
-#: lib/libalpm/error.c:158
+#: lib/libalpm/error.c:156
 msgid "unexpected error"
 msgstr ""
 
-#: lib/libalpm/package.c:124
+#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:133
+#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:737
+#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:742
+#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/package.c:750
+#: lib/libalpm/package.c:1027
 #, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
+msgid "error extracting package description file to %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:931
+#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:936
+#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:940
+#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:970
-#, c-format
-msgid "could not remove tempfile %s\n"
-msgstr ""
-
-#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1005
+#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1012
-#, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr ""
-
-#: lib/libalpm/remove.c:121
+#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:342
+#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr ""
 
-#: lib/libalpm/server.c:56
+#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr ""
 
-#: lib/libalpm/server.c:60
+#: lib/libalpm/server.c:58
 msgid "url scheme not specified, assuming http\n"
 msgstr ""
 
-#: lib/libalpm/server.c:241
+#: lib/libalpm/server.c:239
 msgid "disk"
 msgstr ""
 
-#: lib/libalpm/server.c:245
+#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:275
+#: lib/libalpm/server.c:273
 msgid "cannot resume download, starting over\n"
 msgstr ""
 
-#: lib/libalpm/server.c:288
+#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr ""
 
-#: lib/libalpm/server.c:307
+#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:319
+#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:387
+#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:394
+#: lib/libalpm/server.c:392
 msgid "running XferCommand: fork failed!\n"
 msgstr ""
 
-#: lib/libalpm/server.c:445
+#: lib/libalpm/server.c:443
 msgid "URL does not contain a file for download\n"
 msgstr ""
 
-#: lib/libalpm/server.c:458
+#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:135
+#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:250
+#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:320
+#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:354
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:358
+#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 msgid "unresolvable package conflicts detected\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:628
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:910
+#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1056
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1137
+#: lib/libalpm/sync.c:1130
 msgid "could not create removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1143
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1165
+#: lib/libalpm/sync.c:1158
 msgid "could not prepare removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1171
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1182
+#: lib/libalpm/sync.c:1175
 msgid "could not create transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1187
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1214
+#: lib/libalpm/sync.c:1207
 msgid "could not prepare transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1219
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:214
+#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr ""
 
 #: lib/libalpm/trans.c:483
-#, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr ""
 
 #: lib/libalpm/trans.c:494
 msgid "could not create temp directory\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:536
+#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:554
+#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:569
+#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:578
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""
 
-#: lib/libalpm/trans.c:597
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:606
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:615
+#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:204
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:389
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:573
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr ""
 
-#: lib/libalpm/util.c:593
+#: lib/libalpm/util.c:595
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/util.c:643
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr ""
 
-#: lib/libalpm/util.c:645
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr ""

lib/libalpm/po/pl_PL.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
 "PO-Revision-Date: 2007-04-12 04:23+0200\n"
 "Last-Translator: Mateusz Jędrasik <m.jedrasik@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,604 +18,583 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: lib/libalpm/add.c:88
+#: lib/libalpm/add.c:86
 #, fuzzy, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów"
 
-#: lib/libalpm/add.c:97
+#: lib/libalpm/add.c:95
 #, fuzzy, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "nowsza wersja %s-%s znajduje się w liście celów -- pomijam"
 
-#: lib/libalpm/add.c:168
+#: lib/libalpm/add.c:166
 msgid "conflicting packages were found in the target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:169
+#: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
 
-#: lib/libalpm/add.c:172
+#: lib/libalpm/add.c:170
 #, fuzzy
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "zastępowanie pakietów z -A i -U nie jest jeszcze wspierane"
 
-#: lib/libalpm/add.c:173
+#: lib/libalpm/add.c:171
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 
-#: lib/libalpm/add.c:365
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
 
-#: lib/libalpm/add.c:392
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr ""
 
-#: lib/libalpm/add.c:399
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, fuzzy, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nie udało się rozpakować %s (%s)"
 
-#: lib/libalpm/add.c:505
+#: lib/libalpm/add.c:517
 #, fuzzy, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "nie udało się zmienić nazwy %s (%s)"
 
-#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, fuzzy, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)"
 
-#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "%s zachowane jako %s"
 
-#: lib/libalpm/add.c:556
+#: lib/libalpm/add.c:568
 #, fuzzy, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "nie udało się zainstalować %s jako %s: %s"
 
-#: lib/libalpm/add.c:559
+#: lib/libalpm/add.c:571
 #, fuzzy, c-format
 msgid "%s installed as %s\n"
 msgstr "%s zainstalowano jako %s"
 
-#: lib/libalpm/add.c:576
+#: lib/libalpm/add.c:588
 #, fuzzy, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "rozpakowywanie %s jako %s.pacnew"
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 #, fuzzy
 msgid "could not get current working directory\n"
 msgstr "nie można znaleźć obecnego katalogu"
 
-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:777
 #, fuzzy, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "wystąpiły błędy podczas %s %s"
 
-#: lib/libalpm/add.c:770
+#: lib/libalpm/add.c:782
 #, fuzzy, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "wystąpiły błędy podczas %s %s"
 
-#: lib/libalpm/add.c:785
+#: lib/libalpm/add.c:797
 #, fuzzy, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s"
 
-#: lib/libalpm/add.c:793
+#: lib/libalpm/add.c:805
 #, fuzzy, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym"
 
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:221
 #, fuzzy, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'"
 
-#: lib/libalpm/be_files.c:275
-#, fuzzy, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "ładowanie danych pakietu dla %s : poziom=%d"
-
-#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
-#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
-#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
-#: lib/libalpm/package.c:787
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, fuzzy, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nie udało się otworzyć pliku %s: %s"
 
-#: lib/libalpm/cache.c:62
-#, fuzzy, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr "dodawanie '%s' do pamięci podręcznej pakietów dla bd '%s'"
-
-#: lib/libalpm/db.c:285
+#: lib/libalpm/db.c:283
 #, fuzzy, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "nie udało się usunąć wpisu %s%s z bazy danych"
 
-#: lib/libalpm/db.c:553
+#: lib/libalpm/db.c:551
 #, fuzzy
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "próba ponownej rejestracji 'lokalnej' BD"
 
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
 #, fuzzy
 msgid "database path is undefined\n"
 msgstr "baza danych nie została zainicjowana"
 
-#: lib/libalpm/deps.c:173
+#: lib/libalpm/deps.c:171
 #, fuzzy
 msgid "dependency cycle detected:\n"
 msgstr "wykryto cykl zależności: %s"
 
-#: lib/libalpm/deps.c:175
+#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:573
+#: lib/libalpm/deps.c:588
 #, fuzzy, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nie udało się rozwiązać zależności dla \"%s\""
 
-#: lib/libalpm/error.c:43
+#: lib/libalpm/error.c:41
 msgid "out of memory!"
 msgstr "brak pamięci!"
 
-#: lib/libalpm/error.c:45
+#: lib/libalpm/error.c:43
 msgid "unexpected system error"
 msgstr "niespodziewany błąd systemu"
 
-#: lib/libalpm/error.c:47
+#: lib/libalpm/error.c:45
 msgid "insufficient privileges"
 msgstr "niewystarczające przywileje"
 
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:47
 msgid "could not find or read file"
 msgstr "nie udało się znaleźć bądź odczytać pliku"
 
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:49
 #, fuzzy
 msgid "could not find or read directory"
 msgstr "nie udało się znaleźć bądź odczytać pliku"
 
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:51
 msgid "wrong or NULL argument passed"
 msgstr "błędny bądź ZEROWY argument dany"
 
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:54
 msgid "library not initialized"
 msgstr "biblioteka nie została zainicjowana"
 
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:56
 msgid "library already initialized"
 msgstr "biblioteka już zainicjowana"
 
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:58
 msgid "unable to lock database"
 msgstr "nie udało się zablokować bazy danych"
 
-#: lib/libalpm/error.c:63
+#: lib/libalpm/error.c:61
 msgid "could not open database"
 msgstr "nie udało się otworzyć bazy danych"
 
-#: lib/libalpm/error.c:65
+#: lib/libalpm/error.c:63
 msgid "could not create database"
 msgstr "nie udało się stworzyć bazy danych"
 
-#: lib/libalpm/error.c:67
+#: lib/libalpm/error.c:65
 msgid "database not initialized"
 msgstr "baza danych nie została zainicjowana"
 
-#: lib/libalpm/error.c:69
+#: lib/libalpm/error.c:67
 msgid "database already registered"
 msgstr "baza danych już zarejestrowana"
 
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:69
 msgid "could not find database"
 msgstr "nie udało się odnaleźc bazy danych"
 
-#: lib/libalpm/error.c:73
+#: lib/libalpm/error.c:71
 msgid "could not update database"
 msgstr "nie udało się zaktualizować bazy danych"
 
-#: lib/libalpm/error.c:75
+#: lib/libalpm/error.c:73
 msgid "could not remove database entry"
 msgstr "nie udało się usunąć wpisu do bazy danych"
 
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:76
 msgid "invalid url for server"
 msgstr "nieprawidłowy url dla serwera"
 
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:83
 msgid "could not set parameter"
 msgstr "nie udało się ustawić parametru"
 
-#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:86
 msgid "transaction already initialized"
 msgstr "tranzakcja już zainicjowana"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
 msgid "transaction not initialized"
 msgstr "tranzakcja nie została zainicjowana"
 
-#: lib/libalpm/error.c:92
+#: lib/libalpm/error.c:90
 msgid "duplicate target"
 msgstr "duplikat celu"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
 msgid "transaction not prepared"
 msgstr "tranzakcja nie została przygotowana"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:96
 msgid "transaction aborted"
 msgstr "tranzakcja zaniechana"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:98
 msgid "operation not compatible with the transaction type"
 msgstr "operacja niekompatybilna z typem tranzakcji"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:100
 msgid "could not commit transaction"
 msgstr "nie udało się wykonać tranzakcji"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:102
 msgid "could not download all files"
 msgstr "nie udało się pobrać wszystkich plików"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:105
 msgid "could not find or read package"
 msgstr "nie udało się znaleźć bądź odczytać pakietu"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:107
 msgid "invalid or corrupted package"
 msgstr "nieprawidłowy bądź skorumpowany pakiet"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:109
 msgid "cannot open package file"
 msgstr "nie udało się otworzyć pliku pakietu"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:111
 msgid "cannot load package data"
 msgstr "nie udało się załadować danych pakietu"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:113
 msgid "package already installed"
 msgstr "pakiet już zainstalowany"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:115
 msgid "package not installed or lesser version"
 msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:117
 msgid "cannot remove all files for package"
 msgstr "nie udało się usunąć wszystkich plików pakietu"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:119
 msgid "package name is not valid"
 msgstr "nieprawidłowa nazwa pakietu"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:121
 msgid "corrupted package"
 msgstr "skorumpowany pakiet"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:123
 msgid "no such repository"
 msgstr "nie ma takiego repozytorium"
 
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:126
 #, fuzzy
 msgid "corrupted delta"
 msgstr "skorumpowany pakiet"
 
-#: lib/libalpm/error.c:130
+#: lib/libalpm/error.c:128
 msgid "delta patch failed"
 msgstr ""
 
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:131
 msgid "group not found"
 msgstr "grupa nie została odnaleziona"
 
-#: lib/libalpm/error.c:136
+#: lib/libalpm/error.c:134
 msgid "could not satisfy dependencies"
 msgstr "nie udało się usatysfakcjonować zależności"
 
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:136
 msgid "conflicting dependencies"
 msgstr "konfliktujące zależności"
 
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:138
 msgid "conflicting files"
 msgstr "konfliktujące pliki"
 
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:141
 msgid "user aborted the operation"
 msgstr "użytkownik zaniechał operacji"
 
-#: lib/libalpm/error.c:145
+#: lib/libalpm/error.c:143
 msgid "internal error"
 msgstr "błąd wewnętrzny"
 
-#: lib/libalpm/error.c:147
+#: lib/libalpm/error.c:145
 msgid "libarchive error"
 msgstr "błąd libarchive"
 
-#: lib/libalpm/error.c:150
+#: lib/libalpm/error.c:148
 msgid "not confirmed"
 msgstr "nie potwierdzono"
 
-#: lib/libalpm/error.c:152
+#: lib/libalpm/error.c:150
 msgid "invalid regular expression"
 msgstr "nieprawidłowe wyrażenie regularne"
 
-#: lib/libalpm/error.c:155
+#: lib/libalpm/error.c:153
 msgid "connection to remote host failed"
 msgstr "połączenie ze zdalnym hostem nieudane"
 
-#: lib/libalpm/error.c:158
+#: lib/libalpm/error.c:156
 msgid "unexpected error"
 msgstr "niespodziewany błąd"
 
-#: lib/libalpm/package.c:124
+#: lib/libalpm/package.c:122
 #, fuzzy, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "nie udało się otrzymać sumy md5 dla pakietu %s-%s"
 
-#: lib/libalpm/package.c:133
+#: lib/libalpm/package.c:131
 #, fuzzy, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "sumy kontrolne md5 dla pakietu %s-%s nie zgadzają się"
 
-#: lib/libalpm/package.c:737
+#: lib/libalpm/package.c:844
 #, fuzzy, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: wymuszanie aktualizacji do wersji %s"
 
-#: lib/libalpm/package.c:742
+#: lib/libalpm/package.c:849
 #, fuzzy, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: local (%s) jest nowsze niż %s (%s)"
 
-#: lib/libalpm/package.c:750
+#: lib/libalpm/package.c:1027
 #, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: opóźnianie aktualizacji pakietu (%s)"
+msgid "error extracting package description file to %s\n"
+msgstr "nie udało się przeczytać pliku opisu"
 
-#: lib/libalpm/package.c:931
+#: lib/libalpm/package.c:1033
 #, fuzzy, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "nie udało się przeczytać pliku opisu"
 
-#: lib/libalpm/package.c:936
+#: lib/libalpm/package.c:1038
 #, fuzzy, c-format
 msgid "missing package name in %s\n"
 msgstr "brak nazwy pakietu w %s"
 
-#: lib/libalpm/package.c:940
+#: lib/libalpm/package.c:1042
 #, fuzzy, c-format
 msgid "missing package version in %s\n"
 msgstr "brak wersji pakietu w %s"
 
-#: lib/libalpm/package.c:970
-#, fuzzy, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "nie udało się usunąć pliku tymczasowego %s"
-
-#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, fuzzy, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "błąd odczytywania pakietu: %s"
 
-#: lib/libalpm/package.c:1005
+#: lib/libalpm/package.c:1081
 #, fuzzy, c-format
 msgid "missing package metadata in %s\n"
 msgstr "brak metadanych pakietu"
 
-#: lib/libalpm/package.c:1012
-#, fuzzy, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "brak listy plików pakietu w %s, generowanie"
-
-#: lib/libalpm/remove.c:121
+#: lib/libalpm/remove.c:119
 #, fuzzy, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, fuzzy, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nie udało się usunąć pliku '%s': %s"
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:341
 #, fuzzy, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "nie udało się usunąć wpisu %s-%s z bazy danych"
 
-#: lib/libalpm/remove.c:342
+#: lib/libalpm/remove.c:346
 #, fuzzy, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej"
 
-#: lib/libalpm/server.c:56
+#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr ""
 
-#: lib/libalpm/server.c:60
+#: lib/libalpm/server.c:58
 msgid "url scheme not specified, assuming http\n"
 msgstr ""
 
-#: lib/libalpm/server.c:241
+#: lib/libalpm/server.c:239
 msgid "disk"
 msgstr ""
 
-#: lib/libalpm/server.c:245
+#: lib/libalpm/server.c:243
 #, fuzzy, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "nie udało się pobrać niektórych plików z %s\n"
 
-#: lib/libalpm/server.c:275
+#: lib/libalpm/server.c:273
 msgid "cannot resume download, starting over\n"
 msgstr ""
 
-#: lib/libalpm/server.c:288
+#: lib/libalpm/server.c:286
 #, fuzzy, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "nie udało się usunąć pliku '%s': %s"
 
-#: lib/libalpm/server.c:307
+#: lib/libalpm/server.c:305
 #, fuzzy, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "błąd odczytywania pakietu: %s"
 
-#: lib/libalpm/server.c:319
+#: lib/libalpm/server.c:317
 #, fuzzy, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "nie udało się usunąć pliku '%s': %s"
 
-#: lib/libalpm/server.c:387
+#: lib/libalpm/server.c:385
 #, fuzzy, c-format
 msgid "could not chdir to %s\n"
 msgstr "nie udało się zmienić katalogu na / (%s)"
 
-#: lib/libalpm/server.c:394
+#: lib/libalpm/server.c:392
 msgid "running XferCommand: fork failed!\n"
 msgstr ""
 
-#: lib/libalpm/server.c:445
+#: lib/libalpm/server.c:443
 msgid "URL does not contain a file for download\n"
 msgstr ""
 
-#: lib/libalpm/server.c:458
+#: lib/libalpm/server.c:456
 #, fuzzy, c-format
 msgid "failed to download %s\n"
 msgstr "nie udało się pobrać wszystkich plików"
 
-#: lib/libalpm/sync.c:135
+#: lib/libalpm/sync.c:133
 #, fuzzy, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)"
 
-#: lib/libalpm/sync.c:250
+#: lib/libalpm/sync.c:248
 #, fuzzy, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)"
 
-#: lib/libalpm/sync.c:320
+#: lib/libalpm/sync.c:309
 #, fuzzy, c-format
 msgid "repository '%s' not found\n"
 msgstr "repozytorium '%s' nie zostało znalezione"
 
-#: lib/libalpm/sync.c:354
+#: lib/libalpm/sync.c:336
 #, fuzzy, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s jest w najnowszej wersji -- pomijanie"
 
-#: lib/libalpm/sync.c:358
+#: lib/libalpm/sync.c:340
 #, fuzzy, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s jest w najnowszej wersji -- pomijanie"
 
-#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 #, fuzzy
 msgid "unresolvable package conflicts detected\n"
 msgstr "odkryto nierozwiązywalne konflikty pakietów"
 
-#: lib/libalpm/sync.c:628
+#: lib/libalpm/sync.c:611
 #, fuzzy, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, fuzzy, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "nie udało się otrzymać sum kontrolnych md5 lub sha1 dla pakietu %s\n"
 
-#: lib/libalpm/sync.c:910
+#: lib/libalpm/sync.c:902
 #, fuzzy, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "archiwum %s było skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
 
-#: lib/libalpm/sync.c:1056
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "nie udało się pobrać niektórych plików z %s\n"
 
-#: lib/libalpm/sync.c:1137
+#: lib/libalpm/sync.c:1130
 #, fuzzy
 msgid "could not create removal transaction\n"
 msgstr "nie udało się utworzyć tranzakcji usuwania"
 
-#: lib/libalpm/sync.c:1143
+#: lib/libalpm/sync.c:1136
 #, fuzzy
 msgid "could not initialize the removal transaction\n"
 msgstr "nie udało się zainicjować tranzakcji usuwania"
 
-#: lib/libalpm/sync.c:1165
+#: lib/libalpm/sync.c:1158
 #, fuzzy
 msgid "could not prepare removal transaction\n"
 msgstr "nie udało się przygotować tranzakcji usuwania"
 
-#: lib/libalpm/sync.c:1171
+#: lib/libalpm/sync.c:1164
 #, fuzzy
 msgid "could not commit removal transaction\n"
 msgstr "nie udało się wykonać tranzakcji usuwania"
 
-#: lib/libalpm/sync.c:1182
+#: lib/libalpm/sync.c:1175
 #, fuzzy
 msgid "could not create transaction\n"
 msgstr "nie udało się stworzyć tranzakcji"
 
-#: lib/libalpm/sync.c:1187
+#: lib/libalpm/sync.c:1180
 #, fuzzy
 msgid "could not initialize transaction\n"
 msgstr "nie udało się zainicjować tranzakcji"
 
-#: lib/libalpm/sync.c:1214
+#: lib/libalpm/sync.c:1207
 #, fuzzy
 msgid "could not prepare transaction\n"
 msgstr "nie udało się przygotować tranzakcji"
 
-#: lib/libalpm/sync.c:1219
+#: lib/libalpm/sync.c:1212
 #, fuzzy
 msgid "could not commit transaction\n"
 msgstr "nie udało się wykonać tranzakcji"
 
-#: lib/libalpm/trans.c:214
+#: lib/libalpm/trans.c:212
 #, fuzzy, c-format
 msgid "could not remove lock file %s\n"
 msgstr "nie udało się usunąć pliku blokującego %s"
 
 #: lib/libalpm/trans.c:483
-#, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr ""
 
 #: lib/libalpm/trans.c:494
@@ -623,76 +602,88 @@ msgstr ""
 msgid "could not create temp directory\n"
 msgstr "nie udało się stworzyć katalogu tymczasowego"
 
-#: lib/libalpm/trans.c:536
+#: lib/libalpm/trans.c:533
 #, fuzzy, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nie udało się zmienić katalogu na %s (%s)"
 
-#: lib/libalpm/trans.c:554
+#: lib/libalpm/trans.c:551
 #, fuzzy, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "nie udało się odwidlić nowego procesu (%s)"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:561
 #, fuzzy, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "nie udało się zmienić katalogu głównego (%s)"
 
-#: lib/libalpm/trans.c:569
+#: lib/libalpm/trans.c:566
 #, fuzzy, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "nie udało się zmienić katalogu na / (%s)"
 
-#: lib/libalpm/trans.c:578
+#: lib/libalpm/trans.c:575
 #, fuzzy, c-format
 msgid "call to popen failed (%s)"
 msgstr "zawołanie do waitpid nieudane (%s)"
 
-#: lib/libalpm/trans.c:597
+#: lib/libalpm/trans.c:594
 #, fuzzy, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "zawołanie do waitpid nieudane (%s)"
 
-#: lib/libalpm/trans.c:606
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:615
+#: lib/libalpm/trans.c:612
 #, fuzzy, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nie udało się usunąć katalogu tymczasowego %s"
 
-#: lib/libalpm/util.c:204
+#: lib/libalpm/util.c:207
 #, fuzzy, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "nie udało się stworzyć ścieżki '%s' : %s"
 
-#: lib/libalpm/util.c:389
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "nie udało się otworzyć %s: %s\n"
 
-#: lib/libalpm/util.c:573
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
 
-#: lib/libalpm/util.c:593
+#: lib/libalpm/util.c:595
 #, fuzzy
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian\n"
 
-#: lib/libalpm/util.c:643
+#: lib/libalpm/util.c:644
 #, fuzzy, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "%s nie może być otwarte\n"
 
-#: lib/libalpm/util.c:645
+#: lib/libalpm/util.c:646
 #, fuzzy, c-format
 msgid "md5: %s can't be read\n"
 msgstr "%s nie może być otwarte\n"
 
+#, fuzzy
+#~ msgid "loading package data for %s : level=%d\n"
+#~ msgstr "ładowanie danych pakietu dla %s : poziom=%d"
+
+#, fuzzy
+#~ msgid "adding '%s' to package cache for db '%s'\n"
+#~ msgstr "dodawanie '%s' do pamięci podręcznej pakietów dla bd '%s'"
+
+#, fuzzy
+#~ msgid "could not remove tempfile %s\n"
+#~ msgstr "nie udało się usunąć pliku tymczasowego %s"
+
 #~ msgid "please remove '%s' first, using -Rd"
 #~ msgstr "proszę usunąć pierw '%s', korzystając z -Rd"
 
@@ -718,28 +709,11 @@ msgstr "%s nie może być otwarte\n"
 #~ msgid "cannot canonicalize specified root path '%s'"
 #~ msgstr "nie udało się skanonizować podanej ścieżki docelowej '%s'"
 
-#~ msgid "could not get sha1sum for package %s-%s"
-#~ msgstr "nie udało się otrzymać sumy sha1 dla pakietu %s-%s"
-
-#~ msgid "sha1sums do not match for package %s-%s"
-#~ msgstr "sumy kontrolne sha1 dla pakietu %s-%s nie zgadzają się"
-
 #~ msgid "cannot remove file %s: %s"
 #~ msgstr "nie udało się usunąć pliku %s: %s"
 
 #~ msgid "sha1: %s can't be opened\n"
 #~ msgstr "sha1: %s nie może zostać otwarty\n"
 
-#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-#~ msgstr "archiwum %s jest skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
-
-#~ msgid "could not update requiredby for database entry %s-%s"
-#~ msgstr ""
-#~ "nie udało się zaktualizować requiredby dla wpisu %s-%s w bazie danych"
-
 #~ msgid "could not update new database entry %s-%s"
 #~ msgstr "nie udało się zaktualizować nowego wpisu %s-%s w bazie danych"
-
-#~ msgid "could not update 'requiredby' database entry %s-%s"
-#~ msgstr ""
-#~ "nie udało się zaktualizować wpisu do bazy danych 'requiredby' dla %s-%s"

lib/libalpm/po/ru_RU.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
+"POT-Creation-Date: 2008-01-14 23:08-0600\n"
 "PO-Revision-Date: 2007-03-16 02:52+1000\n"
 "Last-Translator:  Vladimir Bayrakovskiy <4rayven@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,599 +16,578 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: lib/libalpm/add.c:88
+#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:97
+#: lib/libalpm/add.c:95
 #, fuzzy, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "%s-%s не устарел --  пропускаю"
 
-#: lib/libalpm/add.c:168
+#: lib/libalpm/add.c:166
 msgid "conflicting packages were found in the target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:169
+#: lib/libalpm/add.c:167
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
 
-#: lib/libalpm/add.c:172
+#: lib/libalpm/add.c:170
 #, fuzzy
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "замещение пакетов с использованием опций -A и -U еще не реализовано"
 
-#: lib/libalpm/add.c:173
+#: lib/libalpm/add.c:171
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 
-#: lib/libalpm/add.c:365
+#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
 
-#: lib/libalpm/add.c:392
+#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr ""
 
-#: lib/libalpm/add.c:399
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, fuzzy, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "не могу извлечь %s (%s)"
 
-#: lib/libalpm/add.c:505
+#: lib/libalpm/add.c:517
 #, fuzzy, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "не могу переименовать %s (%s)"
 
-#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, fuzzy, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "не могу скопировать временный файл в %s (%s)"
 
-#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "%s сохранен как %s"
 
-#: lib/libalpm/add.c:556
+#: lib/libalpm/add.c:568
 #, fuzzy, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "не могу установить %s как %s: %s"
 
-#: lib/libalpm/add.c:559
+#: lib/libalpm/add.c:571
 #, fuzzy, c-format
 msgid "%s installed as %s\n"
 msgstr "%s установлен как %s"
 
-#: lib/libalpm/add.c:576
+#: lib/libalpm/add.c:588
 #, fuzzy, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "извлекаю %s как %s.pacnew"
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
 #, fuzzy
 msgid "could not get current working directory\n"
 msgstr "не могу определить текущую рабочую директорию"
 
-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:777
 #, fuzzy, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "во время %s %s произошли ошибки"
 
-#: lib/libalpm/add.c:770
+#: lib/libalpm/add.c:782
 #, fuzzy, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "во время %s %s произошли ошибки"
 
-#: lib/libalpm/add.c:785
+#: lib/libalpm/add.c:797
 #, fuzzy, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "не могу обновить в базе данных запись %s-%s"
 
-#: lib/libalpm/add.c:793
+#: lib/libalpm/add.c:805
 #, fuzzy, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "не могу добавить запись '%s' в кэш"
 
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:221
 #, fuzzy, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "не могу удалить из базы данных запись %s%s"
 
-#: lib/libalpm/be_files.c:275
-#, fuzzy, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "загружаю данные пакета %s : уровень=%d"
-
-#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
-#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
-#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
-#: lib/libalpm/package.c:787
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
 #, fuzzy, c-format
 msgid "could not open file %s: %s\n"
 msgstr "не могу скопировать временный файл в %s (%s)"
 
-#: lib/libalpm/cache.c:62
-#, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr ""
-
-#: lib/libalpm/db.c:285
+#: lib/libalpm/db.c:283
 #, fuzzy, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "не могу удалить из базы данных запись %s%s"
 
-#: lib/libalpm/db.c:553
+#: lib/libalpm/db.c:551
 msgid "attempt to re-register the 'local' DB\n"
 msgstr ""
 
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
 #, fuzzy
 msgid "database path is undefined\n"
 msgstr "база данных не инициализирована"
 
-#: lib/libalpm/deps.c:173
+#: lib/libalpm/deps.c:171
 #, fuzzy
 msgid "dependency cycle detected:\n"
 msgstr "обнаружена циклическая зависимость: %s"
 
-#: lib/libalpm/deps.c:175
+#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:573
+#: lib/libalpm/deps.c:588
 #, fuzzy, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "не удается удовлетворить зависимости для \"%s\""
 
-#: lib/libalpm/error.c:43
+#: lib/libalpm/error.c:41
 msgid "out of memory!"
 msgstr ""
 
-#: lib/libalpm/error.c:45
+#: lib/libalpm/error.c:43
 msgid "unexpected system error"
 msgstr ""
 
-#: lib/libalpm/error.c:47
+#: lib/libalpm/error.c:45
 msgid "insufficient privileges"
 msgstr ""
 
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:47
 msgid "could not find or read file"
 msgstr ""
 
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:49
 #, fuzzy
 msgid "could not find or read directory"
 msgstr "не удается найти или прочитать пакет"
 
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:51
 msgid "wrong or NULL argument passed"
 msgstr ""
 
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:54
 msgid "library not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:56
 msgid "library already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:58
 msgid "unable to lock database"
 msgstr "не удается заблокировать базу данных"
 
-#: lib/libalpm/error.c:63
+#: lib/libalpm/error.c:61
 msgid "could not open database"
 msgstr "не удается открыть базу данных"
 
-#: lib/libalpm/error.c:65
+#: lib/libalpm/error.c:63
 msgid "could not create database"
 msgstr "не удается создать базу данных"
 
-#: lib/libalpm/error.c:67
+#: lib/libalpm/error.c:65
 msgid "database not initialized"
 msgstr "база данных не инициализирована"
 
-#: lib/libalpm/error.c:69
+#: lib/libalpm/error.c:67
 msgid "database already registered"
 msgstr "база данных уже зарегистрирована"
 
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:69
 msgid "could not find database"
 msgstr "не удается найти базу данных"
 
-#: lib/libalpm/error.c:73
+#: lib/libalpm/error.c:71
 msgid "could not update database"
 msgstr "не удается обновить базу данных"
 
-#: lib/libalpm/error.c:75
+#: lib/libalpm/error.c:73
 msgid "could not remove database entry"
 msgstr "не удается удалить запись в базе данных"
 
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:76
 msgid "invalid url for server"
 msgstr "неверный url"
 
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:83
 msgid "could not set parameter"
 msgstr "ну могу установить параметр"
 
-#: lib/libalpm/error.c:88
+#: lib/libalpm/error.c:86
 msgid "transaction already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
 msgid "transaction not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:92
+#: lib/libalpm/error.c:90
 msgid "duplicate target"
 msgstr ""
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
 msgid "transaction not prepared"
 msgstr ""
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:96
 msgid "transaction aborted"
 msgstr ""
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:98
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:100
 msgid "could not commit transaction"
 msgstr ""
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:102
 msgid "could not download all files"
 msgstr "не могу загрузить все файлы"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:105
 msgid "could not find or read package"
 msgstr "не удается найти или прочитать пакет"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:107
 msgid "invalid or corrupted package"
 msgstr "пакет неправильный или поврежден"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:109
 msgid "cannot open package file"
 msgstr "не удается открыть файл пакета"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:111
 msgid "cannot load package data"
 msgstr "не удается загрузить данные пакета"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:113
 msgid "package already installed"
 msgstr "пакет уже установлен"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:115
 msgid "package not installed or lesser version"
 msgstr ""
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:117
 msgid "cannot remove all files for package"
 msgstr "не могу удалить все файлы пакета"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:119
 msgid "package name is not valid"
 msgstr "неверное имя пакета"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:121
 msgid "corrupted package"
 msgstr "пакет поврежден"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:123
 msgid "no such repository"
 msgstr "нет такого репозитория"
 
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:126
 #, fuzzy
 msgid "corrupted delta"
 msgstr "пакет поврежден"
 
-#: lib/libalpm/error.c:130
+#: lib/libalpm/error.c:128
 msgid "delta patch failed"
 msgstr ""
 
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:131
 msgid "group not found"
 msgstr "группа не найдена"
 
-#: lib/libalpm/error.c:136
+#: lib/libalpm/error.c:134
 msgid "could not satisfy dependencies"
 msgstr "не удается удовлетворить зависимости"
 
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:136
 msgid "conflicting dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:138
 msgid "conflicting files"
 msgstr ""
 
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:141
 msgid "user aborted the operation"
 msgstr "пользователь прервал операцию"
 
-#: lib/libalpm/error.c:145
+#: lib/libalpm/error.c:143
 msgid "internal error"
 msgstr "внутренняя ошибка"
 
-#: lib/libalpm/error.c:147
+#: lib/libalpm/error.c:145
 msgid "libarchive error"
 msgstr "ошибка в libarchive"
 
-#: lib/libalpm/error.c:150
+#: lib/libalpm/error.c:148
 msgid "not confirmed"
 msgstr ""
 
-#: lib/libalpm/error.c:152
+#: lib/libalpm/error.c:150
 msgid "invalid regular expression"
 msgstr "неверное регулярное выражение"
 
-#: lib/libalpm/error.c:155
+#: lib/libalpm/error.c:153
 msgid "connection to remote host failed"
 msgstr "не удалось подключиться к удаленному хосту"
 
-#: lib/libalpm/error.c:158
+#: lib/libalpm/error.c:156
 msgid "unexpected error"
 msgstr "непредвиденная ошибка"
 
-#: lib/libalpm/package.c:124
+#: lib/libalpm/package.c:122
 #, fuzzy, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "не могу получить контрольную сумму md5sum для пакета %s-%s"
 
-#: lib/libalpm/package.c:133
+#: lib/libalpm/package.c:131
 #, fuzzy, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "контрольные суммы md5sum для пакета %s-%s не совпали"
 
-#: lib/libalpm/package.c:737
+#: lib/libalpm/package.c:844
 #, fuzzy, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: принудительно обновляю до версии %s"
 
-#: lib/libalpm/package.c:742
+#: lib/libalpm/package.c:849
 #, fuzzy, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: установленная версия (%s) новее, чем в %s (%s)"
 
-#: lib/libalpm/package.c:750
+#: lib/libalpm/package.c:1027
 #, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s: принудительно обновляю до версии %s"
+msgid "error extracting package description file to %s\n"
+msgstr "не могу удалить временный файл %s"
 
-#: lib/libalpm/package.c:931
+#: lib/libalpm/package.c:1033
 #, fuzzy, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "не могу удалить временный файл %s"
 
-#: lib/libalpm/package.c:936
+#: lib/libalpm/package.c:1038
 #, fuzzy, c-format
 msgid "missing package name in %s\n"
 msgstr "отсутствует список файлов пакета в %s, генерирую его"
 
-#: lib/libalpm/package.c:940
+#: lib/libalpm/package.c:1042
 #, fuzzy, c-format
 msgid "missing package version in %s\n"
 msgstr "отсутствует список файлов пакета в %s, генерирую его"
 
-#: lib/libalpm/package.c:970
-#, fuzzy, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "не могу удалить временный файл %s"
-
-#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, fuzzy, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "ошибка при чтении пакета: %s"
 
-#: lib/libalpm/package.c:1005
+#: lib/libalpm/package.c:1081
 #, fuzzy, c-format
 msgid "missing package metadata in %s\n"
 msgstr "отсутствует список файлов пакета в %s, генерирую его"
 
-#: lib/libalpm/package.c:1012
-#, fuzzy, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "отсутствует список файлов пакета в %s, генерирую его"
-
-#: lib/libalpm/remove.c:121
+#: lib/libalpm/remove.c:119
 #, fuzzy, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "не могу найти %s в базе данных --  пропускаю"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, fuzzy, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "не могу удалить файл '%s': %s"
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:341
 #, fuzzy, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "не могу удалить из базы данных запись %s%s"
 
-#: lib/libalpm/remove.c:342
+#: lib/libalpm/remove.c:346
 #, fuzzy, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "не могу добавить запись '%s' в кэш"
 
-#: lib/libalpm/server.c:56
+#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr ""
 
-#: lib/libalpm/server.c:60
+#: lib/libalpm/server.c:58
 msgid "url scheme not specified, assuming http\n"
 msgstr ""
 
-#: lib/libalpm/server.c:241
+#: lib/libalpm/server.c:239
 msgid "disk"
 msgstr ""
 
-#: lib/libalpm/server.c:245
+#: lib/libalpm/server.c:243
 #, fuzzy, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "не удалось получить некоторые файлы с %s\n"
 
-#: lib/libalpm/server.c:275
+#: lib/libalpm/server.c:273
 msgid "cannot resume download, starting over\n"
 msgstr ""
 
-#: lib/libalpm/server.c:288
+#: lib/libalpm/server.c:286
 #, fuzzy, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "не могу удалить файл '%s': %s"
 
-#: lib/libalpm/server.c:307
+#: lib/libalpm/server.c:305
 #, fuzzy, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "ошибка при чтении пакета: %s"
 
-#: lib/libalpm/server.c:319
+#: lib/libalpm/server.c:317
 #, fuzzy, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "не могу удалить файл '%s': %s"
 
-#: lib/libalpm/server.c:387
+#: lib/libalpm/server.c:385
 #, fuzzy, c-format
 msgid "could not chdir to %s\n"
 msgstr "не могу извлечь %s (%s)"
 
-#: lib/libalpm/server.c:394
+#: lib/libalpm/server.c:392
 msgid "running XferCommand: fork failed!\n"
 msgstr ""
 
-#: lib/libalpm/server.c:445
+#: lib/libalpm/server.c:443
 msgid "URL does not contain a file for download\n"
 msgstr ""
 
-#: lib/libalpm/server.c:458
+#: lib/libalpm/server.c:456
 #, fuzzy, c-format
 msgid "failed to download %s\n"
 msgstr "не могу загрузить все файлы"
 
-#: lib/libalpm/sync.c:135
+#: lib/libalpm/sync.c:133
 #, fuzzy, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
 
-#: lib/libalpm/sync.c:250
+#: lib/libalpm/sync.c:248
 #, fuzzy, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
 
-#: lib/libalpm/sync.c:320
+#: lib/libalpm/sync.c:309
 #, fuzzy, c-format
 msgid "repository '%s' not found\n"
 msgstr "репозиторий '%s' не найден"
 
-#: lib/libalpm/sync.c:354
+#: lib/libalpm/sync.c:336
 #, fuzzy, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s не устарел --  пропускаю"
 
-#: lib/libalpm/sync.c:358
+#: lib/libalpm/sync.c:340
 #, fuzzy, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s не устарел --  пропускаю"
 
-#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
 #, fuzzy
 msgid "unresolvable package conflicts detected\n"
 msgstr "обнаружен неразрешимый конфликт пакетов"
 
-#: lib/libalpm/sync.c:628
+#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, fuzzy, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "не удалось получить md5 или sha1 контрольную сумму для пакета %s\n"
 
-#: lib/libalpm/sync.c:910
+#: lib/libalpm/sync.c:902
 #, fuzzy, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "архив %s был поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"
 
-#: lib/libalpm/sync.c:1056
+#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "не удалось получить некоторые файлы с %s\n"
 
-#: lib/libalpm/sync.c:1137
+#: lib/libalpm/sync.c:1130
 #, fuzzy
 msgid "could not create removal transaction\n"
 msgstr "не удается создать базу данных"
 
-#: lib/libalpm/sync.c:1143
+#: lib/libalpm/sync.c:1136
 msgid "could not initialize the removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1165
+#: lib/libalpm/sync.c:1158
 #, fuzzy
 msgid "could not prepare removal transaction\n"
 msgstr "не удается создать базу данных"
 
-#: lib/libalpm/sync.c:1171
+#: lib/libalpm/sync.c:1164
 msgid "could not commit removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1182
+#: lib/libalpm/sync.c:1175
 #, fuzzy
 msgid "could not create transaction\n"
 msgstr "не удается создать базу данных"
 
-#: lib/libalpm/sync.c:1187
+#: lib/libalpm/sync.c:1180
 msgid "could not initialize transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1214
+#: lib/libalpm/sync.c:1207
 #, fuzzy
 msgid "could not prepare transaction\n"
 msgstr "не удается создать базу данных"
 
-#: lib/libalpm/sync.c:1219
+#: lib/libalpm/sync.c:1212
 msgid "could not commit transaction\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:214
+#: lib/libalpm/trans.c:212
 #, fuzzy, c-format
 msgid "could not remove lock file %s\n"
 msgstr "не могу удалить lock-файл %s"
 
 #: lib/libalpm/trans.c:483
-#, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr ""
 
 #: lib/libalpm/trans.c:494
@@ -616,75 +595,87 @@ msgstr ""
 msgid "could not create temp directory\n"
 msgstr "не могу определить текущую рабочую директорию"
 
-#: lib/libalpm/trans.c:536
+#: lib/libalpm/trans.c:533
 #, fuzzy, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "не могу извлечь %s (%s)"
 
-#: lib/libalpm/trans.c:554
+#: lib/libalpm/trans.c:551
 #, fuzzy, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "не могу переименовать %s (%s)"
 
-#: lib/libalpm/trans.c:564
+#: lib/libalpm/trans.c:561
 #, fuzzy, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "не могу определить текущую рабочую директорию"
 
-#: lib/libalpm/trans.c:569
+#: lib/libalpm/trans.c:566
 #, fuzzy, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "не могу извлечь %s (%s)"
 
-#: lib/libalpm/trans.c:578
+#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""
 
-#: lib/libalpm/trans.c:597
+#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:606
+#: lib/libalpm/trans.c:603
 msgid "scriptlet failed to execute correctly\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:615
+#: lib/libalpm/trans.c:612
 #, fuzzy, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "не могу удалить временный файл %s"
 
-#: lib/libalpm/util.c:204
+#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:389
+#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:573
+#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "кэш %s не существует, создаю...\n"
 
-#: lib/libalpm/util.c:593
+#: lib/libalpm/util.c:595
 #, fuzzy
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "не могу создать кэш пакета, будет использован /tmp\n"
 
-#: lib/libalpm/util.c:643
+#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr ""
 
-#: lib/libalpm/util.c:645
+#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "loading package data for %s : level=%d\n"
+#~ msgstr "загружаю данные пакета %s : уровень=%d"
+
+#, fuzzy
+#~ msgid "could not remove tempfile %s\n"
+#~ msgstr "не могу удалить временный файл %s"
+
+#, fuzzy
+#~ msgid "missing package filelist in %s, generating one\n"
+#~ msgstr "отсутствует список файлов пакета в %s, генерирую его"
+
 #~ msgid "please remove '%s' first, using -Rd"
 #~ msgstr "пожалуйста, уделите сначала '%s' используя -Rd"
 
@@ -694,12 +685,6 @@ msgstr ""
 #~ msgid "could not update provision '%s' from '%s'"
 #~ msgstr "не могу обновить '%s' из '%s'"
 
-#~ msgid "could not get sha1sum for package %s-%s"
-#~ msgstr "не могу получить контрольную сумму sha1sum для пакета %s-%s"
-
-#~ msgid "sha1sums do not match for package %s-%s"
-#~ msgstr "контрольные суммы sha1sum для пакета %s-%s не совпали"
-
 #~ msgid "cannot remove file %s: %s"
 #~ msgstr "не могу удалить файл %s: %s"
 

lib/libalpm/remove.c

@@ -97,9 +97,9 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 		return(0);
 	}
 
-	EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
-
 	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
+		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
+
 		_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
 		lp = alpm_checkdeps(db, 1, trans->packages, NULL);
 		if(lp != NULL) {
@@ -146,7 +146,9 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 		_alpm_recursedeps(db, trans->packages, 0);
 	}
 
-	EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
+	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
+		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
+	}
 
 	return(0);
 }

lib/libalpm/sync.c

@@ -238,7 +238,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans,
 		}
 
 		/* compare versions and see if we need to upgrade */
-		if(alpm_pkg_compare_versions(local, spkg)) {
+		if(_alpm_pkg_compare_versions(local, spkg)) {
 			_alpm_log(PM_LOG_DEBUG, "%s elected for upgrade (%s => %s)\n",
 					alpm_pkg_get_name(local), alpm_pkg_get_version(local),
 					alpm_pkg_get_version(spkg));
@@ -301,16 +301,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 				repo_found = 1;
 				spkg = _alpm_db_get_pkgfromcache(db, targ);
 				if(spkg == NULL) {
-					/* Search provides */
-					_alpm_log(PM_LOG_DEBUG, "target '%s' not found in db '%s' -- looking for provisions\n", targ, db->treename);
-					alpm_list_t *p = _alpm_db_whatprovides(db, targ);
-					if(!p) {
-						RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
-					}
-					spkg = (pmpkg_t *) p->data;
-					_alpm_log(PM_LOG_DEBUG, "found '%s' as a provision for '%s'\n",
-							alpm_pkg_get_name(spkg), targ);
-					alpm_list_free(p);
+					RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
 				}
 			}
 		}
@@ -325,25 +316,10 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 			spkg = _alpm_db_get_pkgfromcache(db, targ);
 		}
 		if(spkg == NULL) {
-			/* Search provides */
-			_alpm_log(PM_LOG_DEBUG, "target '%s' not found -- looking for provisions\n", targ);
-			for(j = dbs_sync; j && !spkg; j = j->next) {
-				pmdb_t *db = j->data;
-				alpm_list_t *p = _alpm_db_whatprovides(db, targ);
-				if(p) {
-					spkg = (pmpkg_t *) p->data;
-					_alpm_log(PM_LOG_DEBUG, "found '%s' as a provision for '%s' in db '%s'\n",
-							alpm_pkg_get_name(spkg), targ, db->treename);
-					alpm_list_free(p);
-				}
-			}
+			RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
 		}
 	}
 
-	if(spkg == NULL) {
-		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
-	}
-
 	if(_alpm_pkg_should_ignore(spkg)) {
 		int resp;
 		QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, spkg, NULL, NULL, &resp);
@@ -354,7 +330,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 
 	local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg));
 	if(local) {
-		if(alpm_pkg_compare_versions(local, spkg) == 0) {
+		if(_alpm_pkg_compare_versions(local, spkg) == 0) {
 			/* spkg is NOT an upgrade */
 			if(trans->flags & PM_TRANS_FLAG_NEEDED) {
 				_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"),

lib/libalpm/trans.c

@@ -487,7 +487,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 	/* creates a directory in $root/tmp/ for copying/extracting the scriptlet */
 	snprintf(tmpdir, PATH_MAX, "%stmp/", root);
 	if(stat(tmpdir, &buf)) {
-		_alpm_makepath(tmpdir);
+		_alpm_makepath_mode(tmpdir, 01777);
 	}
 	snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", root);
 	if(mkdtemp(tmpdir) == NULL) {

lib/libalpm/util.c

@@ -178,8 +178,13 @@ char* strsep(char** str, const char* delims)
 }
 #endif
 
-/* does the same thing as 'mkdir -p' */
 int _alpm_makepath(const char *path)
+{
+	return(_alpm_makepath_mode(path, 0755));
+}
+
+/* does the same thing as 'mkdir -p' */
+int _alpm_makepath_mode(const char *path, mode_t mode)
 {
 	char *orig, *str, *ptr;
 	char full[PATH_MAX] = "";
@@ -196,7 +201,7 @@ int _alpm_makepath(const char *path)
 			strcat(full, "/");
 			strcat(full, ptr);
 			if(stat(full, &buf)) {
-				if(mkdir(full, 0755)) {
+				if(mkdir(full, mode)) {
 					FREE(orig);
 					umask(oldmask);
 					_alpm_log(PM_LOG_ERROR, _("failed to make path '%s' : %s\n"),
@@ -399,6 +404,8 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
 		
 		if(S_ISREG(st->st_mode)) {
 			archive_entry_set_mode(entry, 0644);
+		} else if(S_ISDIR(st->st_mode)) {
+			archive_entry_set_mode(entry, 0755);
 		}
 
 		if (fn && strcmp(fn, entryname)) {
@@ -582,9 +589,7 @@ const char *_alpm_filecache_setup(void)
 	}
 
 	/* we didn't find a valid cache directory. use /tmp. */
-	i = alpm_option_get_cachedirs();
 	tmp = alpm_list_add(NULL, strdup("/tmp/"));
-	FREELIST(i);
 	alpm_option_set_cachedirs(tmp);
 	_alpm_log(PM_LOG_DEBUG, "using cachedir: %s", "/tmp/\n");
 	_alpm_log(PM_LOG_WARNING, _("couldn't create package cache, using /tmp instead\n"));

lib/libalpm/util.h

@@ -50,6 +50,7 @@
 #define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
 
 int _alpm_makepath(const char *path);
+int _alpm_makepath_mode(const char *path, mode_t mode);
 int _alpm_copyfile(const char *src, const char *dest);
 char *_alpm_strtrim(char *str);
 char *_alpm_strreplace(const char *str, const char *needle, const char *replace);

pactest/tests/provision001.py

@@ -1,7 +1,7 @@
 self.description = "-S provision"
 
 sp = pmpkg("pkg1")
-sp.provides = ["provision 1.0-1"]
+sp.provides = ["provision=1.0-1"]
 self.addpkg2db("sync", sp)
 
 self.args = "-S provision"

pactest/tests/provision002.py

@@ -0,0 +1,15 @@
+self.description = "-S provision"
+
+sp = pmpkg("pkg1")
+sp.provides = ["provision=1.0-1"]
+self.addpkg2db("sync", sp)
+
+sp = pmpkg("pkg2")
+sp.provides = ["provision=1.0-1"]
+self.addpkg2db("sync", sp)
+
+self.args = "-S provision"
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("!PKG_EXIST=pkg2")

pactest/tests/provision010.py

@@ -8,7 +8,7 @@ lp = pmpkg("pkg2", "1.0-2")
 lp.provides = ["provision"]
 self.addpkg2db("local", lp)
 
-self.args = "-A %s" % p.filename()
+self.args = "-U %s" % p.filename()
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")

pactest/tests/provision011.py

@@ -5,10 +5,10 @@ p.depends = ["provision>=1.0-2"]
 self.addpkg(p)
 
 lp = pmpkg("pkg2", "1.0-2")
-lp.provides = ["provision 1.0-2"]
+lp.provides = ["provision=1.0-2"]
 self.addpkg2db("local", lp)
 
-self.args = "-A %s" % p.filename()
+self.args = "-U %s" % p.filename()
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")

pactest/tests/provision012.py

@@ -5,10 +5,10 @@ p.depends = ["provision>=1.0-2"]
 self.addpkg(p)
 
 lp = pmpkg("pkg2", "1.0-2")
-lp.provides = ["provision 1.0-1"]
+lp.provides = ["provision=1.0-1"]
 self.addpkg2db("local", lp)
 
-self.args = "-A %s" % p.filename()
+self.args = "-U %s" % p.filename()
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")

pactest/tests/provision020.py

@@ -0,0 +1,15 @@
+self.description = "provision>=1.0-2 dependency"
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["provision>=1.0-2"]
+self.addpkg2db("sync", p)
+
+lp = pmpkg("pkg2", "1.0-2")
+lp.provides = ["provision"]
+self.addpkg2db("local", lp)
+
+self.args = "-S %s" % p.name
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("PKG_EXIST=pkg2")

pactest/tests/provision021.py

@@ -0,0 +1,15 @@
+self.description = "provision>=1.0-2 dependency (2)"
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["provision>=1.0-2"]
+self.addpkg2db("sync", p)
+
+lp = pmpkg("pkg2", "1.0-2")
+lp.provides = ["provision=1.0-2"]
+self.addpkg2db("local", lp)
+
+self.args = "-S %s" % p.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_EXIST=pkg1")
+self.addrule("PKG_EXIST=pkg2")

pactest/tests/provision022.py

@@ -0,0 +1,15 @@
+self.description = "provision>=1.0-2 dependency (3)"
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["provision>=1.0-2"]
+self.addpkg2db("sync", p)
+
+lp = pmpkg("pkg2", "1.0-2")
+lp.provides = ["provision=1.0-1"]
+self.addpkg2db("local", lp)
+
+self.args = "-S %s" % p.name
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("PKG_EXIST=pkg2")

scripts/gensync.sh.in

@@ -130,13 +130,13 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do
 		CARCH='any'
 	fi
 	if [ "$pkgdir" != "" ]; then
-		pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
+		pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
 	else
-		pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
+		pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
 	fi
 
 	if [ ! -f "$pkgfile" ]; then
-		error "$(gettext "could not find %s-%s-%s-%s.%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
+		error "$(gettext "could not find %s-%s-%s-%s%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
 	else
 		if check_force; then
 			forcepkgs="$forcepkgs $pkgfile"

scripts/makepkg.sh.in

@@ -57,6 +57,7 @@ REPKG=0
 LOGGING=0
 SOURCEONLY=0
 IGNOREARCH=0
+HOLDVER=0
 
 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call
 # when dealing with svn/cvs/etc PKGBUILDs.
@@ -714,7 +715,7 @@ tidy_install() {
 
 	msg2 "$(gettext "Compressing man pages...")"
 	local manpage mandirs ext file link hardlinks hl
-	mandirs="usr/man usr/local/man usr/share/man opt/*/man"
+	mandirs="usr/man usr/share/man usr/local/man usr/local/share/man opt/*/man"
 	find ${mandirs} -type f 2>/dev/null | while read manpage ; do
 		# check file still exists (potentially compressed with hard link)
 		if [ -f ${manpage} ]; then
@@ -969,8 +970,7 @@ create_srcpackage() {
 
 install_package() {
 	[ "$INSTALL" = "0" ] && return
-
-	msg "$(gettext "Installing package with pacman -U...")"
+	msg "$(gettext "Installing package ${pkgname} with pacman -U...")"
 	if [ "$ASROOT" = "0" ]; then
 		sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $?
 	else
@@ -980,6 +980,10 @@ install_package() {
 
 devel_check() {
 	newpkgver=""
+	# Only update pkgver if --holdver is not set
+	if [ "$HOLDVER" = "1" ]; then
+		return
+	fi
 	if [ "$FORCE_VER" = "" ]; then
 		# Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so.
 		# This will only be used on the first call to makepkg; subsequent
@@ -1070,6 +1074,7 @@ usage() {
 	echo "$(gettext "  -R, --repackage  Repackage contents of pkg/ without building")"
 	echo "$(gettext "  -s, --syncdeps   Install missing dependencies with pacman")"
 	echo "$(gettext "      --asroot     Allow makepkg to run as root user")"
+	echo "$(gettext "      --holdver    Prevent automatic version bumping for development PKGBUILDs")"
 	echo "$(gettext "      --source     Do not build package; generate a source-only tarball")"
 	echo
 	echo "$(gettext "These options can be passed to pacman:")"
@@ -1117,8 +1122,8 @@ SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined
 
 # Parse Command Line Options.
 OPT_SHORT="AbcCdefFghiLmop:rRsSV"
-OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,geninteg,help,install,log"
-OPT_LONG="$OPT_LONG,nocolor,nobuild,rmdeps,repackage,source,syncdeps,usesudo,version,forcever:"
+OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,forcever:,geninteg,help,holdver"
+OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source,syncdeps,usesudo,version"
 # Pacman Options
 OPT_LONG="$OPT_LONG,noconfirm,noprogressbar"
 OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')"
@@ -1144,8 +1149,11 @@ while true; do
 		-d|--nodeps)      NODEPS=1 ;;
 		-e|--noextract)   NOEXTRACT=1 ;;
 		-f|--force)       FORCE=1 ;;
+		#hidden opt used by fakeroot call for svn/cvs/etc PKGBUILDs to set pkgver
+		--forcever)       shift; FORCE_VER=$1;;
 		-F)               INFAKEROOT=1 ;;
 		-g|--geninteg)    GENINTEG=1 ;;
+		--holdver)        HOLDVER=1 ;;
 		-i|--install)     INSTALL=1 ;;
 		-L|--log)         LOGGING=1 ;;
 		-m|--nocolor)     USE_COLOR='n' ;;
@@ -1156,9 +1164,6 @@ while true; do
 		--source)         SOURCEONLY=1 ;;
 		-s|--syncdeps)    DEP_BIN=1 ;;
 
-		# Hidden option used by fakeroot call for svn/cvs/etc PKGBUILDs to set the pkgver
-		--forcever)       shift; FORCE_VER=$1;;
-
 		# BEGIN DEPRECATED
 		-S|--usesudo)
 			warning "$(gettext "Sudo is used by default now. The --usesudo option is deprecated!")" ;;
@@ -1173,6 +1178,13 @@ while true; do
 	shift
 done
 
+if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then
+	# The extra '--' is here to prevent gettext from thinking --holdver is
+	# an option
+	error "$(gettext -- "--holdver and --forcever cannot both be specified")"
+	exit 1
+fi
+
 if [ "$CLEANCACHE" = "1" ]; then
 	#fix flyspray feature request #5223
 	if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then
@@ -1312,11 +1324,15 @@ if [ "$install" -a ! -f "$install" ]; then
 	exit 1
 fi
 
+# We need to run devel_update regardless of whether we are in the fakeroot
+# build process so that if the user runs makepkg --forcever manually, we
+# 1) output the correct pkgver, and 2) use the correct filename when
+# checking if the package file already exists - fixes FS #9194
 devel_check
+devel_update
 
 if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
-     -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" \
-     -a "$FORCE_VER" = "" ]; then
+     -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" ]; then
 	if [ "$INSTALL" = "1" ]; then
 		warning "$(gettext "A package has already been built, installing existing package...")"
 		install_package
@@ -1333,7 +1349,6 @@ if [ "$INFAKEROOT" = "1" ]; then
 	if [ "$REPKG" = "1" ]; then
 		warning "$(gettext "Skipping build.")"
 	else
-		devel_update
 		run_build
 		tidy_install
 	fi

scripts/repo-add.sh.in

@@ -28,6 +28,9 @@ confdir='@sysconfdir@'
 FORCE=0
 REPO_DB_FILE=""
 
+# ensure we have a sane umask set
+umask 0022
+
 msg() {
 	local mesg=$1; shift
 	printf "==> ${mesg}\n" "$@" >&1
@@ -77,7 +80,7 @@ test_repo_db_file () {
 			return 0 # YES
 		fi
 	else
-		return 0 # YES - No database file is also aloud.
+		return 0 # YES - No database file is also allowed
 	fi
 
 	return 1 # NO
@@ -138,7 +141,7 @@ db_write_entry()
 		startdir
 
 	local OLDIFS="$IFS"
-	# IFS (field seperator) is only the newline character
+	# IFS (field separator) is only the newline character
 	IFS="
 "
 
@@ -285,7 +288,7 @@ gstmpdir=$(mktemp -d /tmp/repo-add.XXXXXXXXXX) || (\
 	exit 1)
 
 success=0
-# parse arguements
+# parse arguments
 for arg in "$@"; do
 	if [ "$arg" == "--force" -o "$arg" == "-f" ]; then
 		FORCE=1
@@ -315,7 +318,7 @@ for arg in "$@"; do
 	fi
 done
 
-# if all operations were a success, rezip database
+# if all operations were a success, re-zip database
 if [ $success -eq 1 ]; then
 	msg "$(gettext "Creating updated database file %s")" "$REPO_DB_FILE"
 	pushd "$gstmpdir" 2>&1 >/dev/null

scripts/repo-remove.sh.in

@@ -132,7 +132,7 @@ gstmpdir=$(mktemp -d /tmp/repo-remove.XXXXXXXXXX) || (\
 	exit 1)
 
 success=0
-# parse arguements
+# parse arguments
 for arg in "$@"; do
 	if [ -z "$REPO_DB_FILE" ]; then
 		REPO_DB_FILE=$(readlink -f "$arg")
@@ -154,7 +154,7 @@ for arg in "$@"; do
 	fi
 done
 
-# if all operations were a success, rezip database
+# if all operations were a success, re-zip database
 if [ $success -eq 1 ]; then
 	msg "$(gettext "Creating updated database file '%s'...")" "$REPO_DB_FILE"
 	pushd "$gstmpdir" 2>&1 >/dev/null

scripts/updatesync.sh.in

@@ -127,10 +127,10 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
 	if [ "$arch" = 'any' ]; then
 		CARCH='any'
 	fi
-	pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
+	pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
 
 	if [ ! -f "$pkgfile" ]; then
-		die "$(gettext "could not find %s-%s-%s-%s.%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
+		die "$(gettext "could not find %s-%s-%s-%s%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
 	fi
 
 	if check_force; then

src/pacman/callback.c

@@ -278,11 +278,19 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
 			*response = yesno(str);
 			break;
 		case PM_TRANS_CONV_REPLACE_PKG:
-			snprintf(str, LOG_STR_LEN, _(":: Replace %s with %s/%s? [Y/n] "),
-					alpm_pkg_get_name(data1),
-					(char *)data3,
-					alpm_pkg_get_name(data2));
-			*response = yesno(str);
+			if(!config->noconfirm) {
+				snprintf(str, LOG_STR_LEN, _(":: Replace %s with %s/%s? [Y/n] "),
+						alpm_pkg_get_name(data1),
+						(char *)data3,
+						alpm_pkg_get_name(data2));
+				*response = yesno(str);
+			} else {
+				printf(_("Replacing %s with %s/%s\n."),
+						alpm_pkg_get_name(data1),
+						(char *)data3,
+						alpm_pkg_get_name(data2));
+				*response = 1;
+			}
 			break;
 		case PM_TRANS_CONV_CONFLICT_PKG:
 			snprintf(str, LOG_STR_LEN, _(":: %s conflicts with %s. Remove %s? [Y/n] "),

src/pacman/conf.h

@@ -44,7 +44,7 @@ typedef struct __config_t {
 	unsigned short op_q_info;
 	unsigned short op_q_list;
 	unsigned short op_q_foreign;
-	unsigned short op_q_orphans;
+	unsigned short op_q_unrequired;
 	unsigned short op_q_deps;
 	unsigned short op_q_explicit;
 	unsigned short op_q_owns;

src/pacman/pacman.c

@@ -1,7 +1,7 @@
 /*
  *  pacman.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2002-2008 by Judd Vinet <jvinet@zeroflux.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
@@ -108,7 +108,7 @@ static void usage(int op, const char * const myname)
 			printf(_("  -o, --owns <file>    query the package that owns <file>\n"));
 			printf(_("  -p, --file <package> query a package file instead of the database\n"));
 			printf(_("  -s, --search <regex> search locally-installed packages for matching strings\n"));
-			printf(_("  -t, --orphans        list all packages not required by any package\n"));
+			printf(_("  -t, --unrequired     list all packages not required by any package\n"));
 			printf(_("  -u, --upgrades       list all packages that can be upgraded\n"));
 			printf(_("  -q, --quiet          show less information for query and search\n"));
 		} else if(op == PM_OP_SYNC) {
@@ -151,7 +151,7 @@ static void version(void)
 {
 	printf("\n");
 	printf(" .--.                  Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, LIB_VERSION);
-	printf("/ _.-' .-.  .-.  .-.   Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>\n");
+	printf("/ _.-' .-.  .-.  .-.   Copyright (C) 2002-2008 Judd Vinet <jvinet@zeroflux.org>\n");
 	printf("\\  '-. '-'  '-'  '-'\n");
 	printf(" '--'\n");
 	printf(_("                       This program may be freely redistributed under\n"
@@ -179,14 +179,12 @@ static void localize(void)
  */
 static void setuseragent(void)
 {
-	const char *pacman = "Pacman/" PACKAGE_VERSION;
-	const char *libalpm = "libalpm/" LIB_VERSION;
 	char agent[101];
 	struct utsname un;
 
 	uname(&un);
-	snprintf(agent, 100, "%s (%s %s %s; %s) %s", pacman, un.sysname,
-	         un.machine, un.release, setlocale(LC_MESSAGES, NULL), libalpm);
+	snprintf(agent, 100, "pacman/" PACKAGE_VERSION " (%s %s) libalpm/" LIB_VERSION,
+			un.sysname, un.machine);
 	setenv("HTTP_USER_AGENT", agent, 0);
 }
 
@@ -207,10 +205,11 @@ static void cleanup(int signum)
 		if(alpm_trans_interrupt() == 0) {
 			/* a transaction is being interrupted, don't exit pacman yet. */
 			return;
-		} else {
-			/* no commiting transaction, we can release it now and then exit pacman */
-			alpm_trans_release();
 		}
+		/* no commiting transaction, we can release it now and then exit pacman */
+		alpm_trans_release();
+		/* output a newline to be sure we clear any line we may be on */
+		printf("\n");
 	}
 
 	/* free alpm library resources */
@@ -325,7 +324,7 @@ static int parseargs(int argc, char *argv[])
 		{"root",       required_argument, 0, 'r'},
 		{"recursive",  no_argument,       0, 's'},
 		{"search",     no_argument,       0, 's'},
-		{"orphans",    no_argument,       0, 't'},
+		{"unrequired", no_argument,       0, 't'},
 		{"upgrades",   no_argument,       0, 'u'},
 		{"sysupgrade", no_argument,       0, 'u'},
 		{"verbose",    no_argument,       0, 'v'},
@@ -461,7 +460,7 @@ static int parseargs(int argc, char *argv[])
 				config->flags |= PM_TRANS_FLAG_RECURSE;
 				break;
 			case 't':
-				config->op_q_orphans = 1;
+				config->op_q_unrequired = 1;
 				break;
 			case 'u':
 				config->op_s_upgrade = 1;
@@ -607,8 +606,8 @@ static int _parseconfig(const char *file, const char *givensection,
 			 * follow the toupper() rules we may expect, e.g. tr_TR where i != I.
 			 */
 			upperkey = strtoupper(strdup(key));
-			if(section == NULL && (strcmp(key, "Include") == 0 || strcmp(upperkey, "INCLUDE") == 0)) {
-				pm_printf(PM_LOG_ERROR, _("config file %s, line %d: 'Include' directive must belong to a section.\n"),
+			if(section == NULL) {
+				pm_printf(PM_LOG_ERROR, _("config file %s, line %d: All directives must belong to a section.\n"),
 						file, linenum);
 				return(1);
 			}

src/pacman/query.c

@@ -263,7 +263,7 @@ static int is_foreign(pmpkg_t *pkg)
 	return(0);
 }
 
-static int is_orphan(pmpkg_t *pkg)
+static int is_unrequired(pmpkg_t *pkg)
 {
 	alpm_list_t *requiredby = alpm_pkg_compute_requiredby(pkg);
 	if(requiredby == NULL) {
@@ -289,8 +289,8 @@ static int filter(pmpkg_t *pkg)
 	if(config->op_q_foreign && !is_foreign(pkg)) {
 		return(0);
 	}
-	/* check if this pkg is orphaned */
-	if(config->op_q_orphans && !is_orphan(pkg)) {
+	/* check if this pkg is unrequired */
+	if(config->op_q_unrequired && !is_unrequired(pkg)) {
 		return(0);
 	}
 	return(1);

src/pacman/remove.c

@@ -155,8 +155,7 @@ int pacman_remove(alpm_list_t *targets)
 		list_display(_("Targets:"), lst);
 		FREELIST(lst);
 		/* get confirmation */
-		if(!config->noconfirm
-				&& yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) {
+		if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) {
 			remove_cleanup();
 			FREELIST(finaltargs);
 			return(1);

src/pacman/sync.c

@@ -605,9 +605,37 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
 					}
 				}
 				if(!found) {
-					fprintf(stderr, _("error: '%s': not found in sync db\n"), targ);
-					retval = 1;
-					goto cleanup;
+					/* targ not found in sync db, searching for providers... */
+					alpm_list_t *prov = NULL;
+					for(j = sync_dbs; j; j = alpm_list_next(j)) {
+						pmdb_t *db = alpm_list_getdata(j);
+						prov = alpm_list_join(prov, alpm_db_whatprovides(db, targ));
+					}
+					if(prov != NULL) {
+						if(alpm_list_count(prov) == 1) {
+							const char *pname = NULL;
+							pmpkg_t *pkg = alpm_list_getdata(prov);
+							pname = alpm_pkg_get_name(pkg);
+							alpm_list_free(prov);
+							printf(_("Warning: %s provides %s\n"), pname, targ);
+							targets = alpm_list_add(targets, strdup(pname));
+						} else {
+							alpm_list_t *k;
+							fprintf(stderr, _("error: several packages provide %s, please specify one :\n"), targ);
+							for(k = prov; k; k = alpm_list_next(k)) {
+								pmpkg_t *pkg = alpm_list_getdata(k);
+								printf("%s ", alpm_pkg_get_name(pkg));
+							}
+							printf("\n");
+							alpm_list_free(prov);
+							retval = 1;
+							goto cleanup;
+						}
+					} else {
+						fprintf(stderr, _("error: '%s': not found in sync db\n"), targ);
+						retval = 1;
+						goto cleanup;
+					}
 				}
 			}
 		}

valgrind.supp

@@ -1,5 +1,8 @@
 # pacman suppressions for valgrind.
-#   right now, I really just care about those stupid dl_relocates
+#
+# To have valgrind use this file (and have pactest use it as well),
+# just create a ~/.valgrindrc containing the following line:
+# --suppressions=/full/path/to/valgrind.supp
 #
 # Format of this file is:
 # {
@@ -29,3 +32,16 @@
    obj:*ld-2.?.so
 }
 
+{
+   pacman-msgsnd
+   Memcheck:Param
+   msgsnd(msgp->mtext)
+   fun:*
+}
+
+{
+   pacman-utimensat
+   Memcheck:Param
+   utimensat(filename)
+   fun:*
+}