Updates before 3.1.3 release

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

ChangeLog.proto

@@ -0,0 +1,16 @@
+2007-12-01 Your Name <youremail@domain.com>
+
+	* pkgver-pkgrel :
+	new upstream release.
+	Reason we changed stuff.
+	Another reason we changed stuff.
+
+	* gcc-4.1.patch :
+	Removed, no longer needed.
+
+2007-11-01 Your Name <youremail@domain.com>
+
+	* 1.0-5 :
+	added ChangeLog.
+	the last line should end with just one newline.
+	you can cat the file to check it displays fine.

Makefile.am

@@ -9,7 +9,7 @@ EXTRA_DIST = HACKING
 
 # Sample makepkg prototype files
 pkgdatadir = ${datadir}/${PACKAGE}
-dist_pkgdata_DATA = PKGBUILD.proto proto.install
+dist_pkgdata_DATA = PKGBUILD.proto proto.install ChangeLog.proto
 
 # run the pactest test suite
 check-local:  src/pacman

NEWS

@@ -1,5 +1,43 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.1.3         - major updates to i18n output in frontend (all UTF-8 characters
+                should now work with varying byte and char widths)
+              - new Simplified Chinese translation
+              - updates to testpkg utility
+              - updates to PKGBUILD.vim
+              - internal updates for translations - use c-format on all
+                strings, get rid of needless line numbers
+3.1.2         - updates to proto.install, add ChangeLog.proto (FS#7231)
+              - add 'force' option to packages, and have repo-add respect it
+              - mark gensync and updatesync as deprecated
+              - fix pacman -Qo behavior on symlinks (FS#9473)
+              - fix segfault on a broken symlinks in backup code (FS#9235)
+              - ensure filename is determined correctly for a pkg (FS#9547)
+              - fix conflict progress bar with UTF-8 chars (FS#6437)
+              - fix chk_fileconflicts brokenness, ensure it reads entire list
+              - ensure -Sc operation locks DB, only checks DBs (FS#9609)
+              - minor documentation and message updates
+              - moved some translations to their more generic lang codes
+              - allow scripts to be run without gettext installed
+              - makepkg:
+                - check to ensure we have non-URL sources (FS#9208)
+                - ensure we strip binaries in /opt/ dirs (FS#9342)
+                - check for VCS executable before using (FS#9230)
+                - set sane umask before source extraction (FS#9242, FS#9362)
+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
@@ -437,7 +475,7 @@ VERSION         DESCRIPTION
 2.2           - More bugfixes
               - Added --downloadonly switch to --sync
 2.1           - Lots of bugfixes
-              - Added support for multiple respositories
+              - Added support for multiple repositories
               - Improved the config file layout
               - Improved dependency resolution and sorting
 2.0           - Added dependency functionality
@@ -465,4 +503,4 @@ VERSION         DESCRIPTION
               - Changed db_find_conflicts() to ignore directories
 1.0           - Initial Release
 
-vim: set et:
+vim: set et spell spelllang=en_us:

TRANSLATORS

@@ -10,27 +10,33 @@ 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.
 
+Czech (cs):
+	Vojtěch Gondžala <vojtech.gondzala@gmail.com>
 German (de):
-	Pierre Schmitz <pierre@archlinux.de>
+	Matthias Gorissen <matthias@archlinux.de>
+	Benjamin Andresen <benny@in-ulm.de>
 British English (en_GB):
 	Jeff Bailes <thepizzaking@gmail.com>
 Spanish (es):
-	Juan Pablo González Tognarelli <jotapesan@gmail.com>
+	Fernando Lagos <fernando@zerial.org>
+	Juan Pablo Gonzalez <jotapesan@gmail.com>
 French (fr):
-	solsTiCe d'Hiver <solstice.dhiver@laposte.net>
+	Chantry Xavier <shiningxc@gmail.com>
 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>
-	Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>
-Polish (pl_PL):
+Polish (pl):
+	Mateusz Herych <heniekk@gmail.com>
+	Jaroslaw Swierczynski <swiergot@gmail.com>
 	Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
-	Douglas Soares de Andrade <douglas@archlinux-br.org>
-	Hugo Doria <hugodoria@archlinux-br.org>
-	Lincoln de Sousa <lincoln@archlinux-br.org>
-	Leandro Inácio <leandro@archlinux-br.org>
-Russian (ru_RU):
+	<none>
+Russian (ru):
+	Sergey Tereschenko <serg.partizan@gmail.com>
+	Vitaly Dolgov <ferhiord@gmail.com>
+	Oleg Finkelshteyn <olegfink@gmail.com>
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
+Simplified Chinese (zh_CN):
+	甘露(Lu.Gan) <rhythm.gan@gmail.com>
 

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], [5])
 m4_define([lib_revision], [0])
-m4_define([lib_age], [0])
+m4_define([lib_age], [3])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_micro], [3])
 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/PKGBUILD.vim

@@ -9,7 +9,7 @@
 if version < 600
 	syntax clear
 elseif exists("b:current_syntax")
-    finish
+	finish
 endif
 
 let b:main_syntax = "sh"
@@ -57,32 +57,38 @@ syn keyword pb_k_license license contained
 syn keyword pbLicense  APACHE CDDL EPL FDL GPL LGPL MPL PHP RUBY ZLIB ISC MIT BSD contained
 syn match pbLicenseCustom /custom\(:[[:alnum:]]*\)*/ contained
 syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense
-syn match pbLicenseGroup /^license=.*/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense,shDoubleQuote,shSingleQuote
+syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense,shDoubleQuote,shSingleQuote
 
 " backup
 syn keyword pb_k_backup backup contained
 syn match pbValidBackup   /\.\?[[:alpha:]]*\/[[:alnum:]\{\}+._$-]*]*/ contained
-syn match pbBackupGroup /^backup=.*/ contains=pb_k_backup,pbValidBackup,shDoubleQuote,shSingleQuote
+syn region pbBackupGroup start=/^backup=(/ end=/)/ contains=pb_k_backup,pbValidBackup,shDoubleQuote,shSingleQuote
 
 " arch
 syn keyword pb_k_arch arch contained
 syn keyword pbArch i686 x86_64 ppc contained
 syn match pbIllegalArch /[^='() ]/ contained contains=pbArch
-syn match pbArchGroup /^arch=.*/ contains=pb_k_arch,pbArch,pbIllegalArch,shDoubleQuote,shSingleQuote
+syn region pbArchGroup start=/^arch=(/ end=/)/ contains=pb_k_arch,pbArch,pbIllegalArch,shDoubleQuote,shSingleQuote
 
-" makedepends
-syn keyword pb_k_makedepends makedepends contained
-syn match pbValidMakedepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
-syn region pbMakedependsGroup start=/^makedepends=(/ end=/)/ contains=pb_k_makedepends,pbValidMakedepends,shDoubleQuote,shSingleQuote
+" groups
+syn keyword pb_k_groups groups contained
+syn match pbValidGroups /\([[:alnum:]]\|+\|-\|_\)*/ contained
+syn region pbGroupsGroup start=/^groups=(/ end=/)/ contains=pb_k_groups,pbValidGroups,shDoubleQuote,shSingleQuote
 
 " depends
 syn keyword pb_k_depends depends contained
 syn match pbValidDepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
 syn region pbDependsGroup start=/^depends=(/ end=/)/ contains=pb_k_depends,pbValidDepends,shDoubleQuote,shSingleQuote
 
-" XXX little hack to color conflicts/provides/replaces keyword even without =()
-syn match  pbkw /^\(conflicts\|provides\|replaces\)/ contains=pb_k_conflicts,pb_k_provides,pb_k_replaces
-hi def link pbkw keyword
+" makedepends
+syn keyword pb_k_makedepends makedepends contained
+syn match pbValidMakedepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
+syn region pbMakedependsGroup start=/^makedepends=(/ end=/)/ contains=pb_k_makedepends,pbValidMakedepends,shDoubleQuote,shSingleQuote
+
+" optdepends
+syn keyword pb_k_optdepends optdepends contained
+syn match pbValidOptdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
+syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote
 
 " conflicts
 syn keyword pb_k_conflicts conflicts contained
@@ -100,7 +106,7 @@ syn match pbValidReplaces /\([[:alnum:]]\|+\|-\|_\)*/ contained
 syn region pbReplacesGroup start=/^replaces=(/  end=/)/ contains=pb_k_replaces,pbValidReplaces,shDoubleQuote,shSingleQuote
 
 " install
-" XXX remove install from bashStatement, fix strage bug
+" XXX remove install from bashStatement, fix strange bug
 syn clear bashStatement
 syn keyword bashStatement chmod clear complete du egrep expr fgrep find gnufind gnugrep grep less ls mkdir mv rm rmdir rpm sed sleep sort strip tail touch
 
@@ -110,7 +116,7 @@ syn match pbIllegalInstall /[^=]/ contained contains=pbValidInstall
 syn match pbInstallGroup /^install=.*/ contains=pb_k_install,pbValidInstall,pbIllegalInstall,shDeref,shDoubleQuote,shSingleQuote
 
 " source:
-" XXX remove source from shStatement, fixstrange bug
+" XXX remove source from shStatement, fix strange bug
 syn clear shStatement
 syn keyword shStatement xxx wait getopts return autoload whence printf true popd nohup enable r trap readonly fc fg kill ulimit umask disown stop pushd read history logout times local exit test pwd time eval integer suspend dirs shopt hash false newgrp bg print jobs continue functions exec help cd break unalias chdir type shift builtin let bind
 
@@ -195,7 +201,9 @@ hi def link pb_k_backup pbKeywords
 hi def link pb_k_arch pbKeywords
 hi def link pbIllegalArch Error
 
+hi def link pb_k_groups pbKeywords
 hi def link pb_k_makedepends pbKeywords
+hi def link pb_k_optdepends pbKeywords
 hi def link pb_k_depends pbKeywords
 hi def link pb_k_replaces pbKeywords
 hi def link pb_k_conflicts pbKeywords

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

@@ -28,8 +28,18 @@ build the package, install the package into a temporary root, make
 customizations, generate meta-info, and package the whole thing up for pacman
 to use.
 
+NOTE: makepkg uses your current locale by default and does not unset it when
+building packages. If you wish to share your build output with others when
+seeking help or for other purposes, you may wish to run "`LC_ALL=C makepkg`" so
+your logs and output are not localized.
+
 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,20 +78,37 @@ 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
 	generated are determined by the value of the INTEGRITY_CHECK array in
 	linkman:makepkg.conf[5]. This output can be redirected into your
-	PKGBUILD for source validation (`makepkg -g >> PKGBUILD`).
+	PKGBUILD for source validation using "`makepkg -g >> PKGBUILD`".
 
 *-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].
 
+*-L, \--log*::
+	Enable makepkg build logging. This will use the *tee* program to send
+	output of the `build()` function to both the console and to a text file in
+	the build directory named `pkgname-pkgver-pkgrel-arch.log`. As mentioned
+	above, the build log will be localized so you may want to set your locale
+	accordingly if sharing the log output with others.
+
 *-m, \--nocolor*::
 	Disable color in output messages.
 
@@ -108,11 +135,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/makepkg.conf.in

@@ -71,7 +71,7 @@ OPTIONS=(strip !docs libtool emptydirs)
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
 #-- Info and doc directories to remove (if option set correctly above)
-DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc})
+DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc})
 
 #########################################################################
 # PACKAGE OUTPUT

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/add.c

@@ -361,14 +361,12 @@ static int extract_single_file(struct archive *archive,
 	 *      links, etc.
 	 *  12- skip extraction, dir already exists.
 	 */
-	struct stat lsbuf;
-	if(_alpm_lstat(filename, &lsbuf) != 0) {
+
+	/* do both a lstat and a stat, so we can see what symlinks point to */
+	struct stat lsbuf, sbuf;
+	if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) {
 		/* cases 1,2,3: couldn't stat an existing file, skip all backup checks */
 	} else {
-		/* do a stat as well, so we can see what symlinks point to */
-		struct stat sbuf;
-		stat(filename, &sbuf);
-
 		if(S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) {
 			/* case 12: existing dir, ignore it */
 			if(lsbuf.st_mode != entrymode) {

lib/libalpm/alpm.c

@@ -81,4 +81,9 @@ int SYMEXPORT alpm_release(void)
  * @brief Various libalpm functions
  */
 
+/* Get the version of library */
+const char SYMEXPORT *alpm_version(void) {
+	return(LIB_VERSION);
+}
+
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/alpm.h

@@ -60,6 +60,7 @@ typedef struct __pmgraph_t pmgraph_t;
 
 int alpm_initialize(void);
 int alpm_release(void);
+const char *alpm_version(void);
 
 /*
  * Logging facilities

lib/libalpm/be_files.c

@@ -297,10 +297,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			}
 			_alpm_strtrim(line);
 			if(!strcmp(line, "%FILENAME%")) {
-				/* filename is _new_ - it provides the real name of the package, on the
-				 * server, to allow for us to not tie the name of the actual file to the
-				 * data of the package
-				 */
 				if(fgets(info->filename, sizeof(info->filename), fp) == NULL) {
 					goto error;
 				}

lib/libalpm/conflict.c

@@ -251,10 +251,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
 	alpm_list_t *ret = NULL;
 	alpm_list_t *pA = filesA, *pB = filesB;
 
-	if(pB == NULL) {
-		return(alpm_list_strdup(pA));
-	}
-
+	/* if both filesA and filesB have entries, do this loop */
 	while(pA && pB) {
 		const char *strA = pA->data;
 		const char *strB = pB->data;
@@ -279,6 +276,15 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
 			}
 	  }
 	}
+	/* ensure we have completely emptied pA */
+	while(pA) {
+		const char *strA = pA->data;
+		/* skip directories */
+		if(strA[strlen(strA)-1] != '/') {
+			ret = alpm_list_add(ret, strdup(strA));
+		}
+		pA = pA->next;
+	}
 
 	return(ret);
 }

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,16 +336,15 @@ 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
 					&& strcmp(provname, dep->name) == 0);
 		} else {
-			/* replace the space with a NULL byte, and advance ptr the version */
 			*provver = '\0';
 			provver += 1;
 			satisfy = (strcmp(provname, dep->name) == 0

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

@@ -162,11 +162,12 @@ const char SYMEXPORT *alpm_pkg_get_filename(pmpkg_t *pkg)
 	ASSERT(handle != NULL, return(NULL));
 	ASSERT(pkg != NULL, return(NULL));
 
+	if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
+		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
+	}
+
 	if(!strlen(pkg->filename)) {
 		/* construct the file name, it's not in the desc file */
-		if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
-			_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
-		}
 		if(pkg->arch && strlen(pkg->arch) > 0) {
 			snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s-%s" PKGEXT,
 			         pkg->name, pkg->version, pkg->arch);
@@ -825,7 +826,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;
 
@@ -1079,7 +1080,7 @@ pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full)
 
 	if(!config) {
 		_alpm_log(PM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile);
-		goto error;
+		goto pkg_invalid;
 	}
 
   archive_read_finish(archive);

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/LINGUAS

@@ -1,11 +1,12 @@
 # Set of available languages.
-cs_CZ
+cs
 de
 en_GB
 es
 fr
 hu
 it
-pl_PL
+pl
 pt_BR
-ru_RU
+ru
+zh_CN

lib/libalpm/po/Makevars

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

lib/libalpm/po/cs.po

@@ -1,676 +1,585 @@
-# translation of cs_CZ.po to Čeština
+# translation of cs.po to Čeština
 # 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 <vojtech.gondzala@gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: cs_CZ\n"
+"Project-Id-Version: cs\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"
-"Last-Translator: Vojtěch Gondžala <vogo@seznam.cz>\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-12 09:28+0100\n"
+"Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:88
 #, 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
 #, 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
+#, c-format
 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
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nemůžete instalovat dva konfliktní balíčky současně\n"
+msgstr "nemůžete instalovat dva konfliktní balíčky společně\n"
 
-#: lib/libalpm/add.c:172
+#, c-format
 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
+#, c-format
 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
 #, 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 %s se neshodují\n"
 "souborový systém: %o  balíček: %o\n"
 
-#: lib/libalpm/add.c:392
 #, 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
 #, 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
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nelze rozbalit %s (%s)\n"
 
-#: lib/libalpm/add.c:505
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "nelze přejmenovat %s (%s)\n"
 
-#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 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
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s uložen jako %s\n"
 
-#: lib/libalpm/add.c:556
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "nelze nainstalovat %s jako %s: %s\n"
 
-#: lib/libalpm/add.c:559
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s nainstalován jako %s\n"
 
-#: lib/libalpm/add.c:576
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "rozbaluji %s jako %s.pacnew\n"
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "nelze určit aktuální pracovní adresář\n"
 
-#: lib/libalpm/add.c:765
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "nastal problém při aktualizaci %s\n"
 
-#: lib/libalpm/add.c:770
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "nastal problém při instalaci %s\n"
 
-#: lib/libalpm/add.c:785
 #, 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
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "nelze přidat položku '%s' do keše\n"
+msgstr "nelze přidat položku '%s' do cache\n"
 
-#: lib/libalpm/be_files.c:223
 #, 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
 #, 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
 #, 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
+#, c-format
 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
+#, c-format
 msgid "database path is undefined\n"
 msgstr "cesta k databázi nebyla určena\n"
 
-#: lib/libalpm/deps.c:173
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "zjištěna cyklická závislost:\n"
 
-#: lib/libalpm/deps.c:175
 #, 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
 #, 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
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nemohu získat \"%s\", závislost \"%s\"\n"
+msgstr "nemohu vyřešit \"%s\", závislost \"%s\"\n"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "out of memory!"
 msgstr "nedostatek paměti!"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "unexpected system error"
 msgstr "neočekávaná systémová chyba"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "insufficient privileges"
 msgstr "nedostatečná oprávnění"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read file"
 msgstr "nelze najít nebo číst soubor"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "could not find or read directory"
 msgstr "nelze najít nebo číst adresář"
 
-#: lib/libalpm/error.c:53
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "předán chybný nebo NULL argument"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library not initialized"
 msgstr "knihovna nebyla inicializována"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "library already initialized"
 msgstr "knihovna inicializována"
 
-#: lib/libalpm/error.c:60
+#, c-format
 msgid "unable to lock database"
 msgstr "nelze zamknout databázi"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not open database"
 msgstr "nelze otevřít databázi"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "could not create database"
 msgstr "nelze vytvořit databázi"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database not initialized"
 msgstr "databáze nebyla inicializována"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "database already registered"
 msgstr "databáze zaregistrována"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not find database"
 msgstr "nelze nalézt databázi"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not update database"
 msgstr "nelze aktualizovat databázi"
 
-#: lib/libalpm/error.c:75
+#, c-format
 msgid "could not remove database entry"
-msgstr "nelze odstranit položku databáze"
+msgstr "nelze odstranit záznam v databázi"
 
-#: lib/libalpm/error.c:78
+#, c-format
 msgid "invalid url for server"
 msgstr "nesprávná url pro server"
 
-#: lib/libalpm/error.c:85
+#, c-format
 msgid "could not set parameter"
 msgstr "nelze nastavit parametr"
 
-#: lib/libalpm/error.c:88
+#, c-format
 msgid "transaction already initialized"
 msgstr "transakce inicializována"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not initialized"
 msgstr "transakce neinicializována"
 
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "duplicate target"
 msgstr "duplicitní cíl"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction not prepared"
 msgstr "transakce nepřipravena"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "transaction aborted"
 msgstr "transakce zrušena"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operace není kompatibilní s typem transakce"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not commit transaction"
 msgstr "nelze provést transakci"
 
-#: lib/libalpm/error.c:104
+#, c-format
 msgid "could not download all files"
 msgstr "nelze stáhnout všechny soubory"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "could not find or read package"
 msgstr "nelze nalézt nebo přečíst balíček"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "neplatný nebo poškozený balíček"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot open package file"
 msgstr "nelze otevřít soubor balíčku"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "cannot load package data"
 msgstr "nelze načíst data z balíčku"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package already installed"
 msgstr "balíček je již nainstalován"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "balíček není nainstalovaný nebo má nižší verzi"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "nelze odstranit všechny soubory balíčku"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "package name is not valid"
 msgstr "jméno balíčku není platné"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "corrupted package"
 msgstr "poškozený balíček"
 
-#: lib/libalpm/error.c:125
+#, c-format
 msgid "no such repository"
 msgstr "není žádný takový repositář"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "corrupted delta"
-msgstr "poškozený rozdíl"
+msgstr "poškozený delta rozdíl"
 
-#: lib/libalpm/error.c:130
+#, c-format
 msgid "delta patch failed"
-msgstr "rozdílová záplata selhala"
+msgstr "aplikace delta rozdílu selhala"
 
-#: lib/libalpm/error.c:133
+#, c-format
 msgid "group not found"
 msgstr "skupina nenalezena"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "nelze vyřešit závislosti"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting dependencies"
 msgstr "konfliktní závislosti"
 
-#: lib/libalpm/error.c:140
+#, c-format
 msgid "conflicting files"
 msgstr "konfliktní soubory"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "user aborted the operation"
 msgstr "uživatel zrušil operaci"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "internal error"
 msgstr "interní chyba"
 
-#: lib/libalpm/error.c:147
+#, c-format
 msgid "libarchive error"
 msgstr "chyba knihovny libarchive"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "not confirmed"
 msgstr "nepotvrzeno"
 
-#: lib/libalpm/error.c:152
+#, c-format
 msgid "invalid regular expression"
 msgstr "nesprávný regulární výraz"
 
-#: lib/libalpm/error.c:155
+#, c-format
 msgid "connection to remote host failed"
-msgstr "spojení ke vzdálenému hostiteli selhalo"
+msgstr "spojení se vzdáleným hostitelem selhalo"
 
-#: lib/libalpm/error.c:158
+#, c-format
 msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
-#: lib/libalpm/package.c:124
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "nelze zjistit md5 kontrolní součet balíčku %s-%s\n"
 
-#: lib/libalpm/package.c:133
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "md5 kontrolní součet balíčku %s-%s nesouhlasí\n"
 
-#: lib/libalpm/package.c:737
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: vynucená aktualizace na verzi %s\n"
 
-#: lib/libalpm/package.c:742
 #, 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
 #, 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
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "nelze získat soubor s popisem balíčku z %s\n"
+msgstr "nelze zpracovat soubor s popisem balíčku v %s\n"
 
-#: lib/libalpm/package.c:936
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "chybí jméno balíčku v %s\n"
 
-#: lib/libalpm/package.c:940
 #, 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
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nelze odstranit soubor '%s': %s\n"
 
-#: lib/libalpm/remove.c:337
 #, 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
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "nelze odstranit položku '%s' z keše\n"
+msgstr "nelze odstranit položku '%s' z cache\n"
 
-#: lib/libalpm/server.c:56
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "url '%s' je chybná, ignoruji\n"
 
-#: lib/libalpm/server.c:60
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "schéma url nedefinováno, předpokládám http\n"
 
-#: lib/libalpm/server.c:241
+#, c-format
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/server.c:245
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "selhalo získávání souboru '%s' z %s: %s\n"
+msgstr "selhalo získání souboru '%s' z %s: %s\n"
 
-#: lib/libalpm/server.c:275
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "nelze navázat stahování, začínám znovu\n"
 
-#: lib/libalpm/server.c:288
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "nelze zapisovat do souboru '%s'\n"
 
-#: lib/libalpm/server.c:307
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "chyba při stahování '%s': %s\n"
 
-#: lib/libalpm/server.c:319
 #, 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
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "nelze změnit adresář na %s\n"
 
-#: lib/libalpm/server.c:394
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "spouštím XferCommand: větvení selhalo!\n"
 
-#: lib/libalpm/server.c:445
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr "URL neobsahuje stahovaný soubor\n"
+msgstr "URL neobsahuje soubor pro stažení\n"
 
-#: lib/libalpm/server.c:458
 #, c-format
 msgid "failed to download %s\n"
 msgstr "selhalo stahování %s\n"
 
-#: lib/libalpm/sync.c:135
 #, 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
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repositář '%s' nenalezen\n"
 
-#: lib/libalpm/sync.c:354
 #, 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
 #, 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
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
 
-#: lib/libalpm/sync.c:628
 #, 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
 #, c-format
 msgid "command: %s\n"
 msgstr "příkaz: %s\n"
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
 #, 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 získat md5 kontrolní součet pro soubor %s\n"
 
-#: lib/libalpm/sync.c:910
 #, 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
 #, 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
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "nelze vytvořit transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1143
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "nelze inicializovat transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1165
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "nelze připravit transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1171
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nelze provést transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1182
+#, c-format
 msgid "could not create transaction\n"
 msgstr "nelze vytvořit transakci\n"
 
-#: lib/libalpm/sync.c:1187
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "nelze inicializovat transakci\n"
 
-#: lib/libalpm/sync.c:1214
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "nelze připravit transakci\n"
 
-#: lib/libalpm/sync.c:1219
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "nelze provést transakci\n"
 
-#: lib/libalpm/trans.c:214
 #, 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 "V rodičovském prostředí chybí /bin/sh, ruším provádění skriptů\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "nelze vytvořit dočasný adresář\n"
 
-#: lib/libalpm/trans.c:536
 #, 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
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "nelze spustit nový proces (%s)\n"
 
-#: lib/libalpm/trans.c:564
 #, 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
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "nelze změnit adresář na / (%s)\n"
 
-#: lib/libalpm/trans.c:578
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "volání popen selhalo (%s)"
 
-#: lib/libalpm/trans.c:597
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "volání waitpid selhalo (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "správné spuštění skriptu selhalo\n"
 
-#: lib/libalpm/trans.c:615
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nelze odstranit dočasný adresář %s\n"
 
-#: lib/libalpm/util.c:204
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "selhalo vytvoření cesty '%s': %s\n"
 
-#: lib/libalpm/util.c:389
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "nelze otevřít %s: %s\n"
 
-#: lib/libalpm/util.c:573
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "neexistuje keš %s, vytvářím...\n"
+msgstr "neexistuje cache %s, vytvářím...\n"
 
-#: lib/libalpm/util.c:593
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "nelze vytvořit keš balíčků, používám /tmp\n"
+msgstr "nelze vytvořit cache balíčků, používám /tmp\n"
 
-#: lib/libalpm/util.c:643
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s nemohl být otevřen\n"
 
-#: lib/libalpm/util.c:645
 #, c-format
 msgid "md5: %s can't be read\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-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-15 09:26+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -21,33 +21,32 @@ 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
 #, 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
 #, 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
+#, c-format
 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
+#, c-format
 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"
+msgstr ""
+"Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit "
+"installieren\n"
 
-#: lib/libalpm/add.c:172
+#, c-format
 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
+#, c-format
 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
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -56,679 +55,538 @@ msgstr ""
 "Verzeichnis-Berechtigungen unterscheiden sich für %s\n"
 "Dateisystem: %o Paket: %o\n"
 
-#: lib/libalpm/add.c:392
 #, 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
 #, 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
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "Konnte %s nicht entpacken (%s)\n"
 
-#: lib/libalpm/add.c:505
 #, 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/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
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gespeichert als %s\n"
 
-#: lib/libalpm/add.c:556
 #, 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
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installiert als %s\n"
 
-#: lib/libalpm/add.c:576
 #, 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
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln\n"
 
-#: lib/libalpm/add.c:765
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "Fehler traten auf, während %s aktualisiert wurde\n"
 
-#: lib/libalpm/add.c:770
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "Fehler traten bei der Installation von %s auf\n"
 
-#: lib/libalpm/add.c:785
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren\n"
 
-#: lib/libalpm/add.c:793
 #, 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
 #, 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
 #, 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
 #, 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
+#, c-format
 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
+#, c-format
 msgid "database path is undefined\n"
 msgstr "Datenbank-Pfad ist nicht definiert\n"
 
-#: lib/libalpm/deps.c:173
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "Abhängigkeits-Zyklus entdeckt:\n"
 
-#: lib/libalpm/deps.c:175
 #, 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
 #, 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
 #, 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
+#, c-format
 msgid "out of memory!"
 msgstr "Speicher ist voll!"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "unexpected system error"
 msgstr "Unerwarteter Systemfehler"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "insufficient privileges"
 msgstr "Unzureichende Rechte"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read file"
 msgstr "Konnte Datei nicht finden oder lesen"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "could not find or read directory"
 msgstr "Konnte Verzeichnis nicht finden oder lesen"
 
-#: lib/libalpm/error.c:53
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "Falsches oder NULL-Argument übergeben"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library not initialized"
 msgstr "Bibliothek nicht initialisiert"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "library already initialized"
 msgstr "Bibliothek bereits initialisiert"
 
-#: lib/libalpm/error.c:60
+#, c-format
 msgid "unable to lock database"
 msgstr "Kann Datenbank nicht sperren"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not open database"
 msgstr "Konnte Datenbank nicht öffnen"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "could not create database"
 msgstr "Konnte Datenbank nicht erstellen"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database not initialized"
 msgstr "Datenbank nicht initialisiert"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "database already registered"
 msgstr "Datenbank bereits registriert"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not find database"
 msgstr "Konnte Datenbank nicht finden"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not update database"
 msgstr "Konnte Datenbank nicht aktualisieren"
 
-#: lib/libalpm/error.c:75
+#, c-format
 msgid "could not remove database entry"
 msgstr "Konnte Datenbank-Eintrag nicht entfernen"
 
-#: lib/libalpm/error.c:78
+#, c-format
 msgid "invalid url for server"
 msgstr "Ungültige URL für den Server"
 
-#: lib/libalpm/error.c:85
+#, c-format
 msgid "could not set parameter"
 msgstr "Konnte Parameter nicht setzen"
 
-#: lib/libalpm/error.c:88
+#, c-format
 msgid "transaction already initialized"
 msgstr "Vorgang bereits gestartet"
 
-#: lib/libalpm/error.c:90
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not initialized"
 msgstr "Vorgang nicht gestartet"
 
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "duplicate target"
 msgstr "Doppelte Ziele"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction not prepared"
 msgstr "Vorgang nicht vorbereitet"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "transaction aborted"
 msgstr "Vorgang abgebrochen"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not commit transaction"
 msgstr "Konnte den Vorgang nicht durchführen"
 
-#: lib/libalpm/error.c:104
+#, c-format
 msgid "could not download all files"
 msgstr "Konnte nicht alle Dateien herunterladen"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "could not find or read package"
 msgstr "Konnte Paket nicht finden oder lesen"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "Ungültiges oder beschädigtes Paket"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot open package file"
 msgstr "Kann Paketdatei nicht öffnen"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "cannot load package data"
 msgstr "Kann Paketdaten nicht laden"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package already installed"
 msgstr "Paket ist bereits installiert"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "Paket ist nicht installiert oder ältere Version"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "Konnte nicht alle Dateien des Paketes entfernen"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "package name is not valid"
 msgstr "Paketname ist nicht gültig"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "corrupted package"
 msgstr "Beschädigtes Paket"
 
-#: lib/libalpm/error.c:125
+#, c-format
 msgid "no such repository"
 msgstr "Kein solches Repositorium"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "corrupted delta"
 msgstr "Beschädigtes Delta"
 
-#: lib/libalpm/error.c:130
+#, c-format
 msgid "delta patch failed"
 msgstr "Delta-Patch versagte"
 
-#: lib/libalpm/error.c:133
+#, c-format
 msgid "group not found"
 msgstr "Gruppe nicht gefunden"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "Kann Abhängigkeiten nicht erfüllen"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting dependencies"
 msgstr "In Konflikt stehende Abhängigkeiten"
 
-#: lib/libalpm/error.c:140
+#, c-format
 msgid "conflicting files"
 msgstr "In Konflikt stehende Dateien"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "user aborted the operation"
 msgstr "Benutzer brach die Aktion ab"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "internal error"
 msgstr "Interner Fehler"
 
-#: lib/libalpm/error.c:147
+#, c-format
 msgid "libarchive error"
 msgstr "libarchive-Fehler"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "not confirmed"
 msgstr "Nicht bestätigt"
 
-#: lib/libalpm/error.c:152
+#, c-format
 msgid "invalid regular expression"
 msgstr "Ungültiger Regulärer Ausdruck"
 
-#: lib/libalpm/error.c:155
+#, c-format
 msgid "connection to remote host failed"
 msgstr "Verbindung zum Server fehlgeschlagen"
 
-#: lib/libalpm/error.c:158
+#, c-format
 msgid "unexpected error"
 msgstr "Unerwarteter Fehler"
 
-#: lib/libalpm/package.c:124
 #, 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
 #, 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
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: Erzwungene Aktualisierung auf Version %s\n"
 
-#: lib/libalpm/package.c:742
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "Fehlender Paketname in %s\n"
 
-#: lib/libalpm/package.c:940
 #, 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
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "Fehler beim Lesen des Paketes %s: %s\n"
 
-#: lib/libalpm/package.c:1005
 #, 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
 #, 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
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "Kann Datei '%s' nicht entfernen: %s\n"
 
-#: lib/libalpm/remove.c:337
 #, 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
 #, 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
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "URL '%s' ist ungültig, wird ignoriert\n"
 
-#: lib/libalpm/server.c:60
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "URL-Schema nicht spezifiziert, vermute http\n"
 
-#: lib/libalpm/server.c:241
+#, c-format
 msgid "disk"
 msgstr "Platte"
 
-#: lib/libalpm/server.c:245
 #, 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
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "Kann den Download nicht wieder aufnehmen, starte neu\n"
 
-#: lib/libalpm/server.c:288
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "Kann Datei '%s' nicht beschreiben\n"
 
-#: lib/libalpm/server.c:307
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "Fehler beim Download von '%s': %s\n"
 
-#: lib/libalpm/server.c:319
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "Fehler beim Beschreiben von Datei '%s': %s\n"
 
-#: lib/libalpm/server.c:387
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln\n"
 
-#: lib/libalpm/server.c:394
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "Nutze XferCommand: Zweig versagte!\n"
 
-#: lib/libalpm/server.c:445
+#, c-format
 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
 #, c-format
 msgid "failed to download %s\n"
 msgstr "Konnte %s nicht herunterladen\n"
 
-#: lib/libalpm/sync.c:135
 #, 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
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "Repositorium '%s' nicht gefunden\n"
 
-#: lib/libalpm/sync.c:354
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s ist aktuell -- Überspringe\n"
 
-#: lib/libalpm/sync.c:358
 #, 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
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "Nicht lösbare Paketkonflikte gefunden\n"
 
-#: lib/libalpm/sync.c:628
 #, 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
 #, c-format
 msgid "command: %s\n"
 msgstr "Befehl: %s\n"
 
-#: lib/libalpm/sync.c:888
-#: lib/libalpm/sync.c:896
 #, 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
 #, 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
 #, 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
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "Konnte den Lösch-Vorgang nicht erstellen\n"
 
-#: lib/libalpm/sync.c:1143
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "Konnte den Lösch-Vorgang nicht beginnen\n"
 
-#: lib/libalpm/sync.c:1165
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht vorbereiten\n"
 
-#: lib/libalpm/sync.c:1171
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht durchführen\n"
 
-#: lib/libalpm/sync.c:1182
+#, c-format
 msgid "could not create transaction\n"
 msgstr "Konnte den Vorgang nicht erstellen\n"
 
-#: lib/libalpm/sync.c:1187
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "Konnte den Vorgang nicht beginnen\n"
 
-#: lib/libalpm/sync.c:1214
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "Konnte den Vorgang nicht vorbereiten\n"
 
-#: lib/libalpm/sync.c:1219
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "Konnte den Vorgang nicht durchführen\n"
 
-#: lib/libalpm/trans.c:214
 #, 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
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "Konnte temporäres Verzeichnis nicht erstellen\n"
 
-#: lib/libalpm/trans.c:536
 #, 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
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "Konnte keinen neuen Prozess starten (%s)\n"
 
-#: lib/libalpm/trans.c:564
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "Konnte Root-Verzeichnis nicht wechseln (%s)\n"
 
-#: lib/libalpm/trans.c:569
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n"
 
-#: lib/libalpm/trans.c:578
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "Aufruf von 'popen' fehlgeschlagen (%s)"
 
-#: lib/libalpm/trans.c:597
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "Skript konnte nicht korrekt ausgeführt werden\n"
 
-#: lib/libalpm/trans.c:615
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
 
-#: lib/libalpm/util.c:204
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "Konnte Pfad '%s' nicht erstellen: %s\n"
 
-#: lib/libalpm/util.c:389
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "Konnte Datei %s nicht öffnen: %s\n"
 
-#: lib/libalpm/util.c:573
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 
-#: lib/libalpm/util.c:593
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n"
 
-#: lib/libalpm/util.c:643
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s kann nicht geöffnet werden\n"
 
-#: lib/libalpm/util.c:645
 #, 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-03-03 20:03-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,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:88
 #, 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
 #, 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
+#, c-format
 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
+#, c-format
 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
+#, c-format
 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
+#, c-format
 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
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -51,678 +48,538 @@ msgstr ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 
-#: lib/libalpm/add.c:392
 #, 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
 #, 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
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "could not extract %s (%s)\n"
 
-#: lib/libalpm/add.c:505
 #, 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/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
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s saved as %s\n"
 
-#: lib/libalpm/add.c:556
 #, 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
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installed as %s\n"
 
-#: lib/libalpm/add.c:576
 #, 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
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: lib/libalpm/add.c:765
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "problem occurred while upgrading %s\n"
 
-#: lib/libalpm/add.c:770
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "problem occurred while installing %s\n"
 
-#: lib/libalpm/add.c:785
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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
+#, c-format
 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
+#, c-format
 msgid "database path is undefined\n"
 msgstr "database path is undefined\n"
 
-#: lib/libalpm/deps.c:173
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "dependency cycle detected:\n"
 
-#: lib/libalpm/deps.c:175
 #, 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
 #, 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
 #, 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
+#, c-format
 msgid "out of memory!"
 msgstr "out of memory!"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "unexpected system error"
 msgstr "unexpected system error"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "insufficient privileges"
 msgstr "insufficient privileges"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read file"
 msgstr "could not find or read file"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "could not find or read directory"
 msgstr "could not find or read directory"
 
-#: lib/libalpm/error.c:53
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "wrong or NULL argument passed"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library not initialized"
 msgstr "library not initialised"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "library already initialized"
 msgstr "library already initialised"
 
-#: lib/libalpm/error.c:60
+#, c-format
 msgid "unable to lock database"
 msgstr "unable to lock database"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not open database"
 msgstr "could not open database"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "could not create database"
 msgstr "could not create database"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database not initialized"
 msgstr "database not initialised"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "database already registered"
 msgstr "database already registered"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not find database"
 msgstr "could not find database"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not update database"
 msgstr "could not update database"
 
-#: lib/libalpm/error.c:75
+#, c-format
 msgid "could not remove database entry"
 msgstr "could not remove database entry"
 
-#: lib/libalpm/error.c:78
+#, c-format
 msgid "invalid url for server"
 msgstr "invalid url for server"
 
-#: lib/libalpm/error.c:85
+#, c-format
 msgid "could not set parameter"
 msgstr "could not set parameter"
 
-#: lib/libalpm/error.c:88
+#, c-format
 msgid "transaction already initialized"
 msgstr "transaction already initialised"
 
-#: lib/libalpm/error.c:90
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not initialized"
 msgstr "transaction not initialised"
 
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "duplicate target"
 msgstr "duplicate target"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction not prepared"
 msgstr "transaction not prepared"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "transaction aborted"
 msgstr "transaction aborted"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operation not compatible with the transaction type"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not commit transaction"
 msgstr "could not commit transaction"
 
-#: lib/libalpm/error.c:104
+#, c-format
 msgid "could not download all files"
 msgstr "could not download all files"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "could not find or read package"
 msgstr "could not find or read package"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "invalid or corrupted package"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot open package file"
 msgstr "cannot open package file"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "cannot load package data"
 msgstr "cannot load package data"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package already installed"
 msgstr "package already installed"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "package not installed or lesser version"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "cannot remove all files for package"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "package name is not valid"
 msgstr "package name is not valid"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "corrupted package"
 msgstr "corrupted package"
 
-#: lib/libalpm/error.c:125
+#, c-format
 msgid "no such repository"
 msgstr "no such repository"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "corrupted delta"
 msgstr "corrupted delta"
 
-#: lib/libalpm/error.c:130
+#, c-format
 msgid "delta patch failed"
 msgstr "delta patch failed"
 
-#: lib/libalpm/error.c:133
+#, c-format
 msgid "group not found"
 msgstr "group not found"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "could not satisfy dependencies"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting dependencies"
 msgstr "conflicting dependencies"
 
-#: lib/libalpm/error.c:140
+#, c-format
 msgid "conflicting files"
 msgstr "conflicting files"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "user aborted the operation"
 msgstr "user aborted the operation"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "internal error"
 msgstr "internal error"
 
-#: lib/libalpm/error.c:147
+#, c-format
 msgid "libarchive error"
 msgstr "libarchive error"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "not confirmed"
 msgstr "not confirmed"
 
-#: lib/libalpm/error.c:152
+#, c-format
 msgid "invalid regular expression"
 msgstr "invalid regular expression"
 
-#: lib/libalpm/error.c:155
+#, c-format
 msgid "connection to remote host failed"
 msgstr "connection to remote host failed"
 
-#: lib/libalpm/error.c:158
+#, c-format
 msgid "unexpected error"
 msgstr "unexpected error"
 
-#: lib/libalpm/package.c:124
 #, 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
 #, 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
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: forcing upgrade to version %s\n"
 
-#: lib/libalpm/package.c:742
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "missing package name in %s\n"
 
-#: lib/libalpm/package.c:940
 #, 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
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "error while reading package %s: %s\n"
 
-#: lib/libalpm/package.c:1005
 #, 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
 #, 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
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "cannot remove file '%s': %s\n"
 
-#: lib/libalpm/remove.c:337
 #, 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
 #, 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
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "URL '%s' is invalid, ignoring\n"
 
-#: lib/libalpm/server.c:60
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "URL scheme not specified, assuming http\n"
 
-#: lib/libalpm/server.c:241
+#, c-format
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/server.c:245
 #, 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
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "cannot resume download, starting over\n"
 
-#: lib/libalpm/server.c:288
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "cannot write to file '%s'\n"
 
-#: lib/libalpm/server.c:307
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "error downloading '%s': %s\n"
 
-#: lib/libalpm/server.c:319
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "error writing to file '%s': %s\n"
 
-#: lib/libalpm/server.c:387
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "could not chdir to %s\n"
 
-#: lib/libalpm/server.c:394
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "running XferCommand: fork failed!\n"
 
-#: lib/libalpm/server.c:445
+#, c-format
 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
 #, c-format
 msgid "failed to download %s\n"
 msgstr "failed to download %s\n"
 
-#: lib/libalpm/sync.c:135
 #, 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
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoring package upgrade (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repository '%s' not found\n"
 
-#: lib/libalpm/sync.c:354
 #, 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
 #, 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
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "unresolvable package conflicts detected\n"
 
-#: lib/libalpm/sync.c:628
 #, 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
 #, c-format
 msgid "command: %s\n"
 msgstr "command: %s\n"
 
-#: lib/libalpm/sync.c:888
-#: lib/libalpm/sync.c:896
 #, 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
 #, 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
 #, 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
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "could not create removal transaction\n"
 
-#: lib/libalpm/sync.c:1143
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "could not initialise the removal transaction\n"
 
-#: lib/libalpm/sync.c:1165
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "could not prepare removal transaction\n"
 
-#: lib/libalpm/sync.c:1171
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "could not commit removal transaction\n"
 
-#: lib/libalpm/sync.c:1182
+#, c-format
 msgid "could not create transaction\n"
 msgstr "could not create transaction\n"
 
-#: lib/libalpm/sync.c:1187
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "could not initialise transaction\n"
 
-#: lib/libalpm/sync.c:1214
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "could not prepare transaction\n"
 
-#: lib/libalpm/sync.c:1219
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "could not commit transaction\n"
 
-#: lib/libalpm/trans.c:214
 #, 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
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "could not create temp directory\n"
 
-#: lib/libalpm/trans.c:536
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "could not change directory to / (%s)\n"
 
-#: lib/libalpm/trans.c:578
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "call to popen failed (%s)"
 
-#: lib/libalpm/trans.c:597
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "call to waitpid failed (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "scriptlet failed to execute correctly\n"
 
-#: lib/libalpm/trans.c:615
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "could not remove tmpdir %s\n"
 
-#: lib/libalpm/util.c:204
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "failed to make path '%s' : %s\n"
 
-#: lib/libalpm/util.c:389
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "could not open %s: %s\n"
 
-#: lib/libalpm/util.c:573
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "no %s cache exists, creating...\n"
 
-#: lib/libalpm/util.c:593
+#, c-format
 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
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s can't be opened\n"
 
-#: lib/libalpm/util.c:645
 #, 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/es.po

@@ -1,741 +1,591 @@
+# translation of es.po to
+# Juan Pablo Gonzalez <jotapesan@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: libalpm\n"
+"Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
-"PO-Revision-Date: 2007-04-20 21:19-0300\n"
-"Last-Translator: Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>\n"
-"Language-Team: juan pablo gonzález tognarelli <lord_jotape@yahoo.com.ar>\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-01-16 16:04-0300\n"
+"Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
+"Language-Team:  <es@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: CHILE\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:88
-#, fuzzy, c-format
+#, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "reemplazando la versión antigua  %s-%s por %s en la lista de objetivos"
+msgstr ""
+"reemplazando la versión antigua  %s-%s por %s en la lista de objetivos\n"
 
-#: lib/libalpm/add.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr ""
-"una nueva versión  %s-%s esta en la lista de objetivos list -- saltándola"
+"una nueva versión  %s-%s esta en la lista de objetivos list -- saltándola\n"
 
-#: lib/libalpm/add.c:168
+#, c-format
 msgid "conflicting packages were found in the target list\n"
-msgstr ""
+msgstr "paquetes con conflictos fueron encontrados en la lista\n"
 
-#: lib/libalpm/add.c:169
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
+"usted no puede instalar simultáneamente dos paquetes que poseen conflictos "
+"entre si\n"
 
-#: lib/libalpm/add.c:172
-#, fuzzy
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "el reemplazo de paqutes con -A y -U aún no esta soportado"
+msgstr "el reemplazo de paquetes con -A y -U aún no esta soportado\n"
 
-#: lib/libalpm/add.c:173
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
+msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
 
-#: lib/libalpm/add.c:365
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
+"los permisos de directorio difieren en %s\n"
+"sistema de archivos: %o paquete: %o\n"
 
-#: lib/libalpm/add.c:392
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr ""
+msgstr "extract: el link simbólico %s no apunta al directorio\n"
 
-#: lib/libalpm/add.c:399
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr ""
+msgstr "extract: no sobrescribiendo el dir. con el archivo %s\n"
 
-#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "no se pudo extraer %s (%s)"
+msgstr "no se pudo extraer %s (%s)\n"
 
-#: lib/libalpm/add.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "no se pudo renombrar %s (%s)"
+msgstr "no se pudo renombrar %s (%s)\n"
 
-#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
-#, fuzzy, c-format
+#, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "no se pudo copiar el archivo temporal a %s (%s)"
+msgstr "no se pudo copiar el archivo temporal a %s (%s)\n"
 
-#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "%s saved as %s\n"
-msgstr "%s guardado como %s"
+msgstr "%s guardado como %s\n"
 
-#: lib/libalpm/add.c:556
-#, fuzzy, c-format
+#, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "no se pudo instalar %s como %s: %s"
+msgstr "no se pudo instalar %s como %s: %s\n"
 
-#: lib/libalpm/add.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "%s installed as %s\n"
-msgstr "%s instalado como %s"
+msgstr "%s instalado como %s\n"
 
-#: lib/libalpm/add.c:576
-#, fuzzy, c-format
+#, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "descomprimiendo %s como %s.pacnew"
+msgstr "descomprimiendo %s como %s.pacnew\n"
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
-#, fuzzy
+#, c-format
 msgid "could not get current working directory\n"
-msgstr "no se pudo obtener el directorio de trabajo actual"
+msgstr "no se pudo obtener el directorio de trabajo actual\n"
 
-#: lib/libalpm/add.c:765
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "ocurrieron errores mientras  %s %s"
+msgstr "ocurrieron errores mientras actualizando %s\n"
 
-#: lib/libalpm/add.c:770
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "ocurrieron errores mientras  %s %s"
+msgstr "ocurrieron errores mientras  instalando %s\n"
 
-#: lib/libalpm/add.c:785
-#, fuzzy, c-format
+#, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "no se pudo actualizar en la base de datos la entrada %s-%s"
+msgstr "no se pudo actualizar en la base de datos la entrada %s-%s\n"
 
-#: lib/libalpm/add.c:793
-#, fuzzy, c-format
+#, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "no se pudo agregar '%s' en la cache"
+msgstr "no se pudo agregar '%s' en la cache\n"
 
-#: lib/libalpm/be_files.c:223
-#, fuzzy, c-format
+#, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "nombre invalido para la entrada de la base de datos '%s'"
+msgstr "nombre invalido para la entrada de la base de datos '%s'\n"
 
-#: lib/libalpm/be_files.c:275
-#, fuzzy, c-format
-msgid "loading package data for %s : level=%d\n"
-msgstr "cargando la información del paquete para %s : nivel=%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
-#, fuzzy, c-format
+#, c-format
 msgid "could not open file %s: %s\n"
-msgstr "no se pudo abrir el archivo %s: %s"
+msgstr "no se pudo abrir el archivo %s: %s\n"
 
-#: lib/libalpm/cache.c:62
-#, fuzzy, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr "agregando '%s' a la cache de paquetes para la base '%s'"
-
-#: lib/libalpm/db.c:285
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database entry %s%s\n"
-msgstr "no se pudo quitar la entrada en la base de datos %s%s"
+msgstr "no se pudo quitar la entrada %s%s en la base de datos\n"
 
-#: lib/libalpm/db.c:553
-#, fuzzy
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
-msgstr "intento para re-registrar la base de datos 'local'"
+msgstr "intento para re-registrar la base de datos 'local'\n"
 
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
-#, fuzzy
+#, c-format
 msgid "database path is undefined\n"
-msgstr "base de datos no inicializada"
+msgstr "ruta para la base de datos no es definido\n"
 
-#: lib/libalpm/deps.c:173
-#, fuzzy
+#, c-format
 msgid "dependency cycle detected:\n"
-msgstr "ciclo de dependencias detectado: %s"
+msgstr "ciclo de dependencias detectado:\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr ""
+msgstr "%s será quitado tras su dependencia %s\n"
 
-#: lib/libalpm/deps.c:177
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr ""
+msgstr "%s será instalado antes de su dependencia %s\n"
 
-#: lib/libalpm/deps.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "no se pudo resolver las dependencias para \"%s\""
+msgstr "no se pudo resolver \"%s\", una dependencia para \"%s\"\n"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "out of memory!"
 msgstr "no hay memoria!"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "unexpected system error"
 msgstr "error de sistema inesperado"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "insufficient privileges"
 msgstr "privilegios insuficientes"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read file"
 msgstr "no se pudo encontrar o leer el archivo"
 
-#: lib/libalpm/error.c:51
-#, fuzzy
+#, c-format
 msgid "could not find or read directory"
-msgstr "no se pudo encontrar o leer el archivo"
+msgstr "no se pudo leer el directorio"
 
-#: lib/libalpm/error.c:53
+#, c-format
 msgid "wrong or NULL argument passed"
-msgstr "argumento erroneo o núlo"
+msgstr "argumento erroneo o NULO"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library not initialized"
 msgstr "librería no inicializada"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "library already initialized"
 msgstr "la librería ya fue inicializada"
 
-#: lib/libalpm/error.c:60
+#, c-format
 msgid "unable to lock database"
 msgstr "no se pudo bloquear la base de datos"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not open database"
 msgstr "no se pudo abrir la base de datos"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "could not create database"
 msgstr "no se pudo crear la base de datos"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database not initialized"
 msgstr "base de datos no inicializada"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "database already registered"
 msgstr "base de datos ya registrada"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not find database"
 msgstr "no se pudo encontrar la base de datos"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not update database"
 msgstr "no se pudo actualizar la base de datos"
 
-#: lib/libalpm/error.c:75
+#, c-format
 msgid "could not remove database entry"
 msgstr "no se pudo quitar la entrada de la base de datos"
 
-#: lib/libalpm/error.c:78
+#, c-format
 msgid "invalid url for server"
 msgstr "dirección inválida para el servidor"
 
-#: lib/libalpm/error.c:85
+#, c-format
 msgid "could not set parameter"
 msgstr "no se pudo fijar el parámetro"
 
-#: lib/libalpm/error.c:88
+#, c-format
 msgid "transaction already initialized"
 msgstr "la operación ya se inicializó"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not initialized"
 msgstr "operación no inicializada"
 
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "duplicate target"
 msgstr "objetivo duplicado"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction not prepared"
 msgstr "operación no lista"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "transaction aborted"
 msgstr "operación abortada"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "la operación no es compatible con el tipo de transacción"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not commit transaction"
 msgstr "no se pudo hacer la transacción"
 
-#: lib/libalpm/error.c:104
+#, c-format
 msgid "could not download all files"
 msgstr "no se pudo descargar todos los archivos"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "could not find or read package"
 msgstr "no se pudo encontrar o leer el paquete"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "paquete invalido o corrupto"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot open package file"
 msgstr "no se pudo abrir el archivo de paquetes"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "cannot load package data"
 msgstr "no se pudo cargar la información del paquete"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package already installed"
 msgstr "el paquete ya está instalado"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "el paquete no está instalado o es una versión menor"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "no se pudo quitar todos los archivos del paquete"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "package name is not valid"
 msgstr "el nombre del paquete no es válido"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "corrupted package"
 msgstr "paquete corrupto"
 
-#: lib/libalpm/error.c:125
+#, c-format
 msgid "no such repository"
 msgstr "no existe el repositorio"
 
-#: lib/libalpm/error.c:128
-#, fuzzy
+#, c-format
 msgid "corrupted delta"
-msgstr "paquete corrupto"
+msgstr "delta corrupto"
 
-#: lib/libalpm/error.c:130
+#, c-format
 msgid "delta patch failed"
-msgstr ""
+msgstr "parche delta fallado"
 
-#: lib/libalpm/error.c:133
+#, c-format
 msgid "group not found"
 msgstr "grupo no encontrado"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "no se pudieron satisfacer las dependencias"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting dependencies"
 msgstr "dependencias en conflicto"
 
-#: lib/libalpm/error.c:140
+#, c-format
 msgid "conflicting files"
 msgstr "archivos en conflicto"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "user aborted the operation"
 msgstr "el usuario abortó la operación"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "internal error"
 msgstr "error interno"
 
-#: lib/libalpm/error.c:147
+#, c-format
 msgid "libarchive error"
 msgstr "error de libarchive"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "not confirmed"
 msgstr "no confirmado"
 
-#: lib/libalpm/error.c:152
+#, c-format
 msgid "invalid regular expression"
 msgstr "expresión regular inválida"
 
-#: lib/libalpm/error.c:155
+#, c-format
 msgid "connection to remote host failed"
 msgstr "falló la conexión con el host remoto"
 
-#: lib/libalpm/error.c:158
+#, c-format
 msgid "unexpected error"
 msgstr "error inesperado"
 
-#: lib/libalpm/package.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "no se pudo obtener la verificación md5 para %s-%s"
+msgstr "no se pudo obtener la verificación md5 para %s-%s\n"
 
-#: lib/libalpm/package.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "la verificación md5 para el paquete %s-%s no concuerda"
+msgstr "la verificación md5 para el paquete %s-%s no concuerda\n"
 
-#: lib/libalpm/package.c:737
-#, fuzzy, c-format
+#, c-format
 msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forzando la actualización a la versión %s"
+msgstr "%s: forzando la actualización a la versión %s\n"
 
-#: lib/libalpm/package.c:742
-#, fuzzy, c-format
+#, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) es más nuevo que %s (%s)"
+msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
 
-#: lib/libalpm/package.c:750
-#, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: aplazando la actualización del paquete (%s)"
+#, c-format
+msgid "error extracting package description file to %s\n"
+msgstr "error descomprimiendo el paquete de descripción a %s\n"
 
-#: lib/libalpm/package.c:931
-#, fuzzy, c-format
+#, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "no se pudo interpretar el archivo de descripción"
+msgstr "no se pudo interpretar el archivo de descripción en %s\n"
 
-#: lib/libalpm/package.c:936
-#, fuzzy, c-format
+#, c-format
 msgid "missing package name in %s\n"
-msgstr "nombre de paquete perdido en %s"
+msgstr "nombre de paquete perdido en %s\n"
 
-#: lib/libalpm/package.c:940
-#, fuzzy, c-format
+#, c-format
 msgid "missing package version in %s\n"
-msgstr "versión de paquete perdida en %s"
+msgstr "versión de paquete perdida en %s\n"
 
-#: lib/libalpm/package.c:970
-#, fuzzy, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "no se pudo quitar el archivo temporal %s"
-
-#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
-#, fuzzy, c-format
+#, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "error mientras se leía el paquete : %s"
+msgstr "error mientras se leía el paquete %s: %s\n"
 
-#: lib/libalpm/package.c:1005
-#, fuzzy, c-format
+#, c-format
 msgid "missing package metadata in %s\n"
-msgstr "falta la metadata del paquete "
+msgstr "faltan los metadatos del paquete en %s\n"
 
-#: lib/libalpm/package.c:1012
-#, fuzzy, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr "falta la lita de paquetes en %s. generando una"
-
-#: lib/libalpm/remove.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "no se pudo encontrar %s en la base de datos -- saltando"
+msgstr "no se pudo encontrar %s en la base de datos -- saltando\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "no se pudo quitar el archivo '%s': %s"
+msgstr "no se pudo quitar el archivo '%s': %s\n"
 
-#: lib/libalpm/remove.c:337
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "no se pudo quitar de la base de datos %s-%s"
+msgstr "no se pudo quitar de la base de datos %s-%s\n"
 
-#: lib/libalpm/remove.c:342
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "no se pudo quitar la entrada '%s' de la cache"
+msgstr "no se pudo quitar la entrada '%s' de la cache\n"
 
-#: lib/libalpm/server.c:56
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr ""
+msgstr "la url %s no es válida, ignorando\n"
 
-#: lib/libalpm/server.c:60
+#, c-format
 msgid "url scheme not specified, assuming http\n"
-msgstr ""
+msgstr "no fue especificado el esquema de url, asumiendo http\n"
 
-#: lib/libalpm/server.c:241
+#, c-format
 msgid "disk"
-msgstr ""
+msgstr "disco"
 
-#: lib/libalpm/server.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "fallo al descargar algunos archivos desde %s\n"
+msgstr "fallo al obtener archivo '%s' desde %s: %s\n"
 
-#: lib/libalpm/server.c:275
+#, c-format
 msgid "cannot resume download, starting over\n"
-msgstr ""
+msgstr "no se puede resumir la descarga, empezando de nuevo\n"
 
-#: lib/libalpm/server.c:288
-#, fuzzy, c-format
+#, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "no se pudo quitar el archivo '%s': %s"
+msgstr "no se pudo escribir al archivo '%s'\n"
 
-#: lib/libalpm/server.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "error mientras se leía el paquete : %s"
+msgstr "error descargando %s: %s\n"
 
-#: lib/libalpm/server.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr "no se pudo quitar el archivo '%s': %s"
+msgstr "no se pudo escribir al archivo '%s': %s\n"
 
-#: lib/libalpm/server.c:387
-#, fuzzy, c-format
+#, c-format
 msgid "could not chdir to %s\n"
-msgstr "no se pudo cambiar el directorio a / (%s)"
+msgstr "no se pudo cambiar el directorio a %s\n"
 
-#: lib/libalpm/server.c:394
+#, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr ""
+msgstr "ejecutando XferCommand: fallo en el fork\n"
 
-#: lib/libalpm/server.c:445
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr ""
+msgstr "la URL no contiene un archivo para descargar\n"
 
-#: lib/libalpm/server.c:458
-#, fuzzy, c-format
+#, c-format
 msgid "failed to download %s\n"
-msgstr "no se pudo descargar todos los archivos"
+msgstr "no se pudo descargar %s\n"
 
-#: lib/libalpm/sync.c:135
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
-"%s-%s: ignorando la actualización del paquete(para ser reemplazado por %s-%s)"
+"%s-%s: ignorando la actualización del paquete (para ser reemplazado por %s-%"
+"s)\n"
 
-#: lib/libalpm/sync.c:250
-#, fuzzy, c-format
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s-%s: ignorando la actualización del paquete (%s)"
+msgstr "%s: ignorando la actualización del paquete (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "repository '%s' not found\n"
-msgstr "repositorio '%s' no encontrado"
+msgstr "repositorio '%s' no encontrado\n"
 
-#: lib/libalpm/sync.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s esta al día -- saltando"
+msgstr "%s-%s esta al día -- saltando\n"
 
-#: lib/libalpm/sync.c:358
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s esta al día -- saltando"
+msgstr "%s-%s esta al día -- re-instalando\n"
 
-#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
-#, fuzzy
+#, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "se han detectado paquetes con conflictos no resueltos"
+msgstr "se han detectado paquetes con conflictos no resueltos\n"
 
-#: lib/libalpm/sync.c:628
-#, fuzzy, c-format
+#, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "falla en malloc: no se pudo alocar %d bytes"
+msgstr "falla en malloc: no se pudo alocar %zd bytes\n"
 
-#: lib/libalpm/sync.c:825
 #, c-format
 msgid "command: %s\n"
-msgstr ""
+msgstr "comando: %s\n"
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "no se pudo verificar md5 o sha1 para el paquete %s\n"
+msgstr "no se pudo verificar md5 para el paquete %s\n"
 
-#: lib/libalpm/sync.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr ""
-"el archivo %s estaba corrupto (no coincidió la verificación MD5 o SHA1)\n"
+msgstr "el archivo %s estaba corrupto (no coincidió la verificación MD5)\n"
 
-#: lib/libalpm/sync.c:1056
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "fallo al descargar algunos archivos desde %s\n"
 
-#: lib/libalpm/sync.c:1137
-#, fuzzy
-msgid "could not create removal transaction\n"
-msgstr "no se pudo crear la operación de eliminación"
-
-#: lib/libalpm/sync.c:1143
-#, fuzzy
-msgid "could not initialize the removal transaction\n"
-msgstr "no se pudo iniciar la operación de eliminación"
-
-#: lib/libalpm/sync.c:1165
-#, fuzzy
-msgid "could not prepare removal transaction\n"
-msgstr "no se pudo preparar la operación de eliminación"
-
-#: lib/libalpm/sync.c:1171
-#, fuzzy
-msgid "could not commit removal transaction\n"
-msgstr "no se pudo asignar la operación de quitado"
-
-#: lib/libalpm/sync.c:1182
-#, fuzzy
-msgid "could not create transaction\n"
-msgstr "no se pudo crear la operación"
-
-#: lib/libalpm/sync.c:1187
-#, fuzzy
-msgid "could not initialize transaction\n"
-msgstr "no se pudo iniciar la operación"
-
-#: lib/libalpm/sync.c:1214
-#, fuzzy
-msgid "could not prepare transaction\n"
-msgstr "no se pudo preparar la transacción"
-
-#: lib/libalpm/sync.c:1219
-#, fuzzy
-msgid "could not commit transaction\n"
-msgstr "no se pudo hacer la transacción"
-
-#: lib/libalpm/trans.c:214
-#, fuzzy, c-format
-msgid "could not remove lock file %s\n"
-msgstr "no se pudo quitar el archivo de bloqueo %s"
-
-#: lib/libalpm/trans.c:483
 #, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
-msgstr ""
+msgid "could not create removal transaction\n"
+msgstr "no se pudo crear la operación de eliminación\n"
 
-#: lib/libalpm/trans.c:494
-#, fuzzy
+#, c-format
+msgid "could not initialize the removal transaction\n"
+msgstr "no se pudo iniciar la operación de eliminación\n"
+
+#, c-format
+msgid "could not prepare removal transaction\n"
+msgstr "no se pudo preparar la operación de eliminación\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "no se pudo enviar la operación de eliminación\n"
+
+#, c-format
+msgid "could not create transaction\n"
+msgstr "no se pudo crear la operación\n"
+
+#, c-format
+msgid "could not initialize transaction\n"
+msgstr "no se pudo iniciar la operación\n"
+
+#, c-format
+msgid "could not prepare transaction\n"
+msgstr "no se pudo preparar la transacción\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "no se pudo asignar la transacción\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "no se pudo eliminar el archivo de bloqueo %s\n"
+
+#, c-format
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "No existe /bin/sh en el ambiente padre, abortando los scripts\n"
+
+#, c-format
 msgid "could not create temp directory\n"
-msgstr "no se puede crear el directorio temporal "
+msgstr "no se puede crear el directorio temporal\n"
 
-#: lib/libalpm/trans.c:536
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "no se pudo cambiar el directorio a %s (%s)"
+msgstr "no se pudo cambiar el directorio a %s (%s)\n"
 
-#: lib/libalpm/trans.c:554
-#, fuzzy, c-format
+#, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "no se pudo crear un nuevo proceso (%s)"
+msgstr "no se pudo crear un nuevo proceso (%s)\n"
 
-#: lib/libalpm/trans.c:564
-#, fuzzy, c-format
+#, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "no se pudo cambiar el directorio raíz (%s)"
+msgstr "no se pudo cambiar el directorio raíz (%s)\n"
 
-#: lib/libalpm/trans.c:569
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to / (%s)\n"
-msgstr "no se pudo cambiar el directorio a / (%s)"
+msgstr "no se pudo cambiar el directorio a / (%s)\n"
 
-#: lib/libalpm/trans.c:578
-#, fuzzy, c-format
+#, c-format
 msgid "call to popen failed (%s)"
-msgstr "llamada a waitpid fallida (%s)"
+msgstr "llamada a popen fallida (%s)"
 
-#: lib/libalpm/trans.c:597
-#, fuzzy, c-format
+#, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "llamada a waitpid fallida (%s)"
+msgstr "llamada a waitpid fallida (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr ""
+msgstr "scriplet falló en ejecutarse correctamente\n"
 
-#: lib/libalpm/trans.c:615
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "no se pudo quitar el directorio temporal %s"
+msgstr "no se pudo eliminar el directorio temporal %s\n"
 
-#: lib/libalpm/util.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "failed to make path '%s' : %s\n"
-msgstr "fallo al crear la ruta '%s' : %s"
+msgstr "fallo al crear la ruta '%s' : %s\n"
 
-#: lib/libalpm/util.c:389
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "no se pudo abrir %s: %s\n"
 
-#: lib/libalpm/util.c:573
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "no existe la cache %s, creando...\n"
 
-#: lib/libalpm/util.c:593
-#, fuzzy
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
 
-#: lib/libalpm/util.c:643
-#, fuzzy, c-format
+#, c-format
 msgid "md5: %s can't be opened\n"
-msgstr "%s no puede ser abierto\n"
+msgstr "md5: no se puede abrir %s\n"
 
-#: lib/libalpm/util.c:645
-#, fuzzy, c-format
+#, c-format
 msgid "md5: %s can't be read\n"
-msgstr "%s no puede ser abierto\n"
-
-#~ msgid "please remove '%s' first, using -Rd"
-#~ msgstr "por favor quitar '%s' primero, usando -Rd"
-
-#~ msgid "could not extract %s (%s)"
-#~ msgstr "no se pudo extraer %s (%s)"
-
-#~ msgid "could not update provision '%s' from '%s'"
-#~ msgstr "no se pudo actualizar la provisión '%s' desde '%s'"
-
-#, fuzzy
-#~ msgid "%s: description file is missing"
-#~ msgstr "%s: error de sintaxis en la linea de descripción de archivos %d"
-
-#~ msgid "malloc failed: could not allocate %d bytes"
-#~ msgstr "malloc falló: no se pudo alocar %d bytes"
-
-#~ msgid ""
-#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
-#~ msgstr ""
-#~ "no se pudo resolver dependecias para \"%s\" (\"%s\" no está en las listas "
-#~ "de paquetes)"
-
-# canonicalize.. no supe traducirla bien
-#~ msgid "cannot canonicalize specified root path '%s'"
-#~ msgstr "no se pudo obtener el la ruta canonica de la raiz especificada '%s'"
-
-#~ msgid "could not get sha1sum for package %s-%s"
-#~ msgstr "no se pudo obtener la verificación sha1 para %s-%s"
-
-#~ msgid "sha1sums do not match for package %s-%s"
-#~ msgstr "la verificación sha1 no coincide para %s-%s"
-
-#~ msgid "cannot remove file %s: %s"
-#~ msgstr "no se pudo quitar el archivo %s: %s"
-
-#~ msgid "sha1: %s can't be opened\n"
-#~ msgstr "sha1: %s no puede ser abierto\n"
-
-#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-#~ msgstr "el archivo %s esta corrupto (verificación MD5 o SHA1 errónea)\n"
-
-#~ msgid "could not update requiredby for database entry %s-%s"
-#~ msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s"
-
-#~ msgid "could not update new database entry %s-%s"
-#~ msgstr "no se pudo actualizar la nueva entrada a la base de datos %s-%s"
-
-#~ msgid "could not update 'requiredby' database entry %s-%s"
-#~ msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s"
+msgstr "md5: no se puede leer %s\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-03-03 20:03-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"
@@ -15,33 +15,34 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: 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
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "Des paquets en conflit ont été trouvés dans la liste des cibles\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "vous ne pouvez pas installer deux paquets en conflit en même temps\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "remplacer un paquet avec -A ou -U n'est pas encore possible\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 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
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -50,646 +51,540 @@ 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
 #, 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
 #, 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
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "l'extraction de %s a échoué (%s)\n"
 
-#: lib/libalpm/add.c:503
 #, 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
 #, 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
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s enregistré en tant que %s\n"
 
-#: lib/libalpm/add.c:554
 #, 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
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installé en tant que %s\n"
 
-#: lib/libalpm/add.c:574
 #, 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
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "déterminer le répertoire courant a échoué\n"
 
-#: lib/libalpm/add.c:763
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "l'ajout au cache de l'entrée '%s' a échoué\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 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
 #, 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"
 msgstr "la suppression de l'entrée de base de données %s%s a échoué\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 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
+#, c-format
 msgid "database path is undefined\n"
 msgstr "base de données non initialisée\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "cycle de dépendances détecté:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s sera supprimé après sa dépendance %s\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 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
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "dépassement de mémoire!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "erreur système non prévue"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "autorisation insuffisante"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "trouver ou lire le fichier a échoué"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "trouver ou lire le répertoire a échoué"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "un argument erroné ou nul a été fourni"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "librairie non initialisée"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "librairie déjà initialisée"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "verrouillage de la base de données impossible"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "l'ouverture de la base de données a échoué"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "la création de la base de données a échoué"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "base de données non initialisée"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "base de données déjà enregistrée"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "trouver la base de données a échoué"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "la mise à jour de la base de données a échoué"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "la suppression de l'entrée de base de données a échoué"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "URL invalide pour le serveur"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "définir le paramètre a échoué"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "transaction déjà initialisée"
 
-#: lib/libalpm/error.c:88
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "transaction non initialisée"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "cible répétée"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "transaction non préparée"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "transaction annulée"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "opération incompatible avec le type de transaction"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "appliquer la transaction a échoué"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "tous les fichiers n'ont pas pu être téléchargés"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "trouver ou de lire le paquet a échoué"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "paquet invalide ou corrompu"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "ouverture du fichier paquet impossible"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "chargement des données du paquet impossible"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "paquet déjà installé"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "paquet non installé ou version plus ancienne"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "suppression de certains fichiers du paquet impossible"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "nom de paquet invalide"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "paquet corrompu"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "ce dépôt n'existe pas"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "delta corrompu"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "l'application du delta a échoué"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "groupe non trouvé"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "la satisfaction des dépendances a échoué"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "conflit de dépendances"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "conflit de fichiers"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "opération annulée par l'utilisateur"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "erreur interne"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "erreur de libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "non confirmé"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "expression régulière incorrecte"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "échec de connexion à l'hôte distant "
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "erreur non prévue"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "l'obtention du hache md5 pour le paquet %s-%s a échoué\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "les 'haches' md5 ne correspondent pas pour le paquet %s-%s\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: force la mise à jour à la version %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 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
 #, 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
 #, 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
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "nom de paquet manquant dans %s\n"
 
-#: lib/libalpm/package.c:1051
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "suppression du fichier '%s' impossible: %s\n"
 
-#: lib/libalpm/remove.c:335
 #, 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
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "la suppression du cache de l'entrée '%s' a échoué\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "l'url '%s' est invalide, ignorée\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "Le protocole n'a pas été spécifié dans l'url, assume http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disque"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "échec de récupération du fichier '%s' depuis %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "le téléchargement ne peut pas être repris, relance\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "écriture dans le fichier '%s' impossible\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "erreur lors du téléchargement de '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "écriture dans le fichier '%s' impossible: %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "changer de répertoire vers %s a échoué\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "lancement de XferCommand: le fork a échoué!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "l'URL ne contient pas un fichier à télécharger\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "le fichier %s n'a pas pu être téléchargé\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n"
 
-#: lib/libalpm/sync.c:318
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "dépôt '%s' non trouvé\n"
 
-#: lib/libalpm/sync.c:352
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s est à jour -- ignoré\n"
 
-#: lib/libalpm/sync.c:356
 #, 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
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 
-#: lib/libalpm/sync.c:626
 #, 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
 #, c-format
 msgid "command: %s\n"
 msgstr "commande: %s\n"
 
-#: lib/libalpm/sync.c:886
-#: lib/libalpm/sync.c:894
 #, 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
 #, 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
 #, 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
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "la création de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1141
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "l'initialisation de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1163
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "la préparation de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1169
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "appliquer la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not create transaction\n"
 msgstr "la création de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1185
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "l'initialisation de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "la préparation de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1217
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "appliquer la transaction a échoué\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "la suppression du fichier de verrouillage %s a échoué\n"
 
-#: lib/libalpm/trans.c:481
+#, c-format
 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
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "la création du répertoire temporaire a échoué\n"
 
-#: lib/libalpm/trans.c:531
 #, 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
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "call to popen failed (%s)"
 
-#: lib/libalpm/trans.c:592
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "call to waitpid failed (%s)\n"
 
-#: lib/libalpm/trans.c:601
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "le scriptlet n'a pas pu être exécuté correctement\n"
 
-#: lib/libalpm/trans.c:610
 #, 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
 #, 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
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "l'ouverture de %s: %s a échoué\n"
 
-#: lib/libalpm/util.c:572
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "le cache %s n'existe pas, création...\n"
 
-#: lib/libalpm/util.c:592
+#, c-format
 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
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: l'ouverture de %s a échoué\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: la lecture de %s a échoué\n"
-

lib/libalpm/po/hu.po

@@ -7,675 +7,580 @@ 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-03-03 20:03-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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "r<EFBFBD>gebbi verzi<EFBFBD> (%s-%s) lecser<EFBFBD>l<EFBFBD>se %s verzi<EFBFBD>ra a c<EFBFBD>l list<EFBFBD>ban\n"
+msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a cél listában\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "<EFBFBD>jabb verzi<EFBFBD> (%s-%s) m<EFBFBD>r megtal<EFBFBD>lhat<EFBFBD> a c<EFBFBD>l list<EFBFBD>ban -- kihagy<EFBFBD>s\n"
+msgstr "újabb verzió (%s-%s) már megtalálható a cél listában -- kihagyás\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
-msgstr "<EFBFBD>tk<EFBFBD>z<EFBFBD> csomagokat tal<EFBFBD>ltam a c<EFBFBD>l list<EFBFBD>ban\n"
+msgstr "ütköző csomagokat találtam a cél listában\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nem telep<EFBFBD>thet<EFBFBD> k<EFBFBD>t <EFBFBD>tk<EFBFBD>z<EFBFBD> csomag egyszerre\n"
+msgstr "nem telepíthető két ütköző csomag egyszerre\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "csomagok lecser<EFBFBD>l<EFBFBD>se m<EFBFBD>g nem t<EFBFBD>mogatott -A <EFBFBD>s -U eset<EFBFBD>n\n"
+msgstr "csomagok lecserélése még nem támogatott -A és -U esetén\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "a -Rd <EFBFBD>s -U haszn<EFBFBD>lat<EFBFBD>val elv<EFBFBD>gezhet<EFBFBD> a csere\n"
+msgstr "a -Rd és -U használatával elvégezhető a csere\n"
 
-#: lib/libalpm/add.c:363
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"elt<EFBFBD>r<EFBFBD> k<EFBFBD>nyvt<EFBFBD>r-jogosults<EFBFBD>gok: %s\n"
-"f<EFBFBD>jlrendszer: %o  csomag: %o\n"
+"eltérő könyvtár-jogosultságok: %s\n"
+"fájlrendszer: %o  csomag: %o\n"
 
-#: lib/libalpm/add.c:390
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr "kicsomagol<EFBFBD>s: %s szimbolikus link nem k<EFBFBD>nyvt<EFBFBD>rra mutat\n"
+msgstr "kicsomagolás: %s szimbolikus link nem könyvtárra mutat\n"
 
-#: lib/libalpm/add.c:397
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "kicsomagol<EFBFBD>s: nem <EFBFBD>rok fel<EFBFBD>l k<EFBFBD>nyvt<EFBFBD>rat a %s f<EFBFBD>jllal\n"
+msgstr "kicsomagolás: nem írok felül könyvtárat a %s fájllal\n"
 
-#: lib/libalpm/add.c:452 lib/libalpm/add.c:596 lib/libalpm/util.c:421
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt kicsomagolni: %s (%s)\n"
+msgstr "nem sikerült kicsomagolni: %s (%s)\n"
 
-#: lib/libalpm/add.c:503
 #, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt <EFBFBD>tnevezni: %s (%s)\n"
+msgstr "nem sikerült átnevezni: %s (%s)\n"
 
-#: lib/libalpm/add.c:510 lib/libalpm/add.c:530 lib/libalpm/trans.c:506
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt az ideiglenes f<EFBFBD>jlt ide m<EFBFBD>solni: %s (%s)\n"
+msgstr "nem sikerült az ideiglenes fájlt ide másolni: %s (%s)\n"
 
-#: lib/libalpm/add.c:515 lib/libalpm/remove.c:232
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s elmentve %s n<EFBFBD>ven\n"
+msgstr "%s elmentve %s néven\n"
 
-#: lib/libalpm/add.c:554
 #, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "nem siker<EFBFBD>lt %s telep<EFBFBD>t<EFBFBD>se %s n<EFBFBD>ven: %s\n"
+msgstr "nem sikerült %s telepítése %s néven: %s\n"
 
-#: lib/libalpm/add.c:557
 #, c-format
 msgid "%s installed as %s\n"
-msgstr "%s %s n<EFBFBD>ven lett telep<EFBFBD>tve\n"
+msgstr "%s %s néven lett telepítve\n"
 
-#: lib/libalpm/add.c:574
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "%s kicsomagol<EFBFBD>sa %s.pacnew n<EFBFBD>ven\n"
+msgstr "%s kicsomagolása %s.pacnew néven\n"
 
-#: lib/libalpm/add.c:709 lib/libalpm/trans.c:524
+#, c-format
 msgid "could not get current working directory\n"
-msgstr "a jelenlegi munkak<EFBFBD>nyvt<EFBFBD>r nem kaphat<EFBFBD> meg\n"
+msgstr "a jelenlegi munkakönyvtár nem kapható meg\n"
 
-#: lib/libalpm/add.c:763
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "hiba t<EFBFBD>rt<EFBFBD>nt a(z) %s friss<EFBFBD>t<EFBFBD>se k<EFBFBD>zben\n"
+msgstr "hiba történt a(z) %s frissítése közben\n"
 
-#: lib/libalpm/add.c:768
 #, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "hiba t<EFBFBD>rt<EFBFBD>nt a(z) %s telep<EFBFBD>t<EFBFBD>se k<EFBFBD>zben\n"
+msgstr "hiba történt a(z) %s telepítése közben\n"
 
-#: lib/libalpm/add.c:783
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "nem siker<EFBFBD>lt a(z) %s-%s adatb<EFBFBD>zisbejegyz<EFBFBD>s friss<EFBFBD>t<EFBFBD>se\n"
+msgstr "nem sikerült a(z) %s-%s adatbázisbejegyzés frissítése\n"
 
-#: lib/libalpm/add.c:791
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "sikertelen a '%s' bejegyz<EFBFBD>s hozz<EFBFBD>ad<EFBFBD>sa a gyors<EFBFBD>t<EFBFBD>t<EFBFBD>rhoz\n"
+msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "<EFBFBD>rv<EFBFBD>nytelen n<EFBFBD>v a '%s' adatb<EFBFBD>zis-bejegyz<EFBFBD>s sz<EFBFBD>m<EFBFBD>ra\n"
+msgstr "érvénytelen név a '%s' adatbázis-bejegyzés számá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
 #, c-format
 msgid "could not open file %s: %s\n"
-msgstr "nem siker<EFBFBD>lt megnyitni a %s f<EFBFBD>jlt: %s\n"
+msgstr "nem sikerü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"
-msgstr "sikertelen a %s%s adatb<EFBFBD>zis-bejegyz<EFBFBD>s elt<EFBFBD>vol<EFBFBD>t<EFBFBD>sa\n"
+msgstr "sikertelen a %s%s adatbázis-bejegyzés eltávolítása\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
-msgstr "k<EFBFBD>s<EFBFBD>rlet a 'local' adatb<EFBFBD>zis <EFBFBD>jraregisztr<EFBFBD>l<EFBFBD>s<EFBFBD>ra\n"
+msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
-msgstr "az adatb<EFBFBD>zis-<EFBFBD>tvonal nincs megadva\n"
+msgstr "az adatbázis-útvonal nincs megadva\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
-msgstr "k<EFBFBD>rk<EFBFBD>r<EFBFBD>s f<EFBFBD>gg<EFBFBD>s<EFBFBD>get <EFBFBD>szleltem:\n"
+msgstr "körkörös függőséget észleltem:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "a(z) %s csomag saj<EFBFBD>t %s f<EFBFBD>gg<EFBFBD>s<EFBFBD>ge ut<EFBFBD>n lesz elt<EFBFBD>vol<EFBFBD>tva\n"
+msgstr "a(z) %s csomag saját %s függősége után lesz eltávolítva\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr "a(z) %s csomag saj<EFBFBD>t %s f<EFBFBD>gg<EFBFBD>s<EFBFBD>ge el<EFBFBD>tt lesz telep<EFBFBD>tve\n"
+msgstr "a(z) %s csomag saját %s függősége előtt lesz telepítve\n"
 
-#: lib/libalpm/deps.c:584
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nem siker<EFBFBD>lt a(z) \"%s\" csomag \"%s\" f<EFBFBD>gg<EFBFBD>s<EFBFBD>g<EFBFBD>t feloldani\n"
+msgstr "nem sikerült a(z) \"%s\" csomag \"%s\" függőségét feloldani\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
-msgstr "elfogyott a mem<EFBFBD>ria!"
+msgstr "elfogyott a memória!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
-msgstr "nemv<EFBFBD>rt hiba"
+msgstr "nemvárt hiba"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
-msgstr "el<EFBFBD>gtelen jogosults<EFBFBD>gok"
+msgstr "elégtelen jogosultságok"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> vagy nem olvashat<EFBFBD> a f<EFBFBD>jl"
+msgstr "nem található vagy nem olvasható a fájl"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> vagy nem olvashat<EFBFBD> a k<EFBFBD>nyvt<EFBFBD>r"
+msgstr "nem található vagy nem olvasható a könyvtár"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
-msgstr "rossz vagy NULL argumentum <EFBFBD>rkezett"
+msgstr "rossz vagy NULL argumentum érkezett"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
-msgstr "a k<EFBFBD>nyvt<EFBFBD>r nem inicializ<EFBFBD>lt"
+msgstr "a könyvtár nem inicializált"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
-msgstr "a k<EFBFBD>nyvt<EFBFBD>r m<EFBFBD>r inicializ<EFBFBD>lt"
+msgstr "a könyvtár már inicializált"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
-msgstr "nem siker<EFBFBD>lt z<EFBFBD>rolni az adatb<EFBFBD>zist"
+msgstr "nem sikerült zárolni az adatbázist"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
-msgstr "nem siker<EFBFBD>lt megnyitni az adatb<EFBFBD>zist"
+msgstr "nem sikerült megnyitni az adatbázist"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni az adatb<EFBFBD>zist"
+msgstr "nem sikerült létrehozni az adatbázist"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
-msgstr "az adatb<EFBFBD>zis nem inicializ<EFBFBD>lt"
+msgstr "az adatbázis nem inicializált"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
-msgstr "az adatb<EFBFBD>zis m<EFBFBD>r regisztr<EFBFBD>lt"
+msgstr "az adatbázis már regisztrált"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> az adatb<EFBFBD>zis"
+msgstr "nem található az adatbázis"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
-msgstr "nem siker<EFBFBD>lt megnyitni az adatb<EFBFBD>zist"
+msgstr "nem sikerült megnyitni az adatbázist"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani az adatb<EFBFBD>zis-bejegyz<EFBFBD>st"
+msgstr "nem sikerült eltávolítani az adatbázis-bejegyzést"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
-msgstr "<EFBFBD>rv<EFBFBD>nytelen szerver-URL"
+msgstr "érvénytelen szerver-URL"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
-msgstr "nem siker<EFBFBD>lt be<EFBFBD>ll<EFBFBD>tani a param<EFBFBD>tert"
+msgstr "nem sikerült beállítani a paramétert"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
-msgstr "a tranzakci<EFBFBD> m<EFBFBD>r inicializ<EFBFBD>lt"
+msgstr "a tranzakció már inicializált"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
-msgstr "a tranzakci<EFBFBD> nem inicializ<EFBFBD>lt"
+msgstr "a tranzakció nem inicializált"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
-msgstr "k<EFBFBD>t azonos c<EFBFBD>lcsomag"
+msgstr "két azonos célcsomag"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
-msgstr "a tranzakci<EFBFBD> nincs el<EFBFBD>k<EFBFBD>sz<EFBFBD>tve"
+msgstr "a tranzakció nincs előkészítve"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
-msgstr "a tranzakci<EFBFBD> f<EFBFBD>lbeszak<EFBFBD>tva"
+msgstr "a tranzakció félbeszakítva"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
-msgstr "a m<EFBFBD>velet nem egyeztethet<EFBFBD> <20>ssze a jelenlegi tranzakci<EFBFBD>t<EFBFBD>pussal"
+msgstr "a művelet nem egyeztethető össze a jelenlegi tranzakciótípussal"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
-msgstr "nem siker<EFBFBD>lt v<EFBFBD>grahajtani a tranzakci<EFBFBD>t"
+msgstr "nem sikerült végrahajtani a tranzakciót"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
-msgstr "nem siker<EFBFBD>lt let<EFBFBD>lteni az <EFBFBD>sszes f<EFBFBD>jlt"
+msgstr "nem sikerült letölteni az összes fájlt"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> vagy nem olvashat<EFBFBD> a csomag"
+msgstr "nem található vagy nem olvasható a csomag"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
-msgstr "nem <EFBFBD>rv<EFBFBD>nyes vagy s<EFBFBD>r<EFBFBD>lt csomag"
+msgstr "nem érvényes vagy sérült csomag"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
-msgstr "nem siker<EFBFBD>lt megnyitni a csomagf<EFBFBD>jlt"
+msgstr "nem sikerült megnyitni a csomagfájlt"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
-msgstr "nem siker<EFBFBD>lt bet<EFBFBD>lteni a csomagadatokat"
+msgstr "nem sikerült betölteni a csomagadatokat"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
-msgstr "a csomag m<EFBFBD>r telep<EFBFBD>tve van"
+msgstr "a csomag már telepítve van"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
-msgstr "a csomag nincs telep<EFBFBD>tve vagy kisebb verzi<EFBFBD>j<EFBFBD>"
+msgstr "a csomag nincs telepítve vagy kisebb verziójú"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a csomag <EFBFBD>sszes f<EFBFBD>jlj<EFBFBD>t"
+msgstr "nem sikerült eltávolítani a csomag összes fájlját"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
-msgstr "nem <EFBFBD>rv<EFBFBD>nyes a csomagn<EFBFBD>v"
+msgstr "nem érvényes a csomagnév"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
-msgstr "s<EFBFBD>r<EFBFBD>lt csomag"
+msgstr "sérült csomag"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
-msgstr "nincs ilyen rep<EFBFBD>"
+msgstr "nincs ilyen repó"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
-msgstr "s<EFBFBD>r<EFBFBD>lt delta"
+msgstr "sérült delta"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
-msgstr "delta patchel<EFBFBD>s sikertelen"
+msgstr "delta patchelés sikertelen"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
-msgstr "a csoport nem tal<EFBFBD>lhat<EFBFBD>"
+msgstr "a csoport nem található"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
-msgstr "nem siker<EFBFBD>lt kiel<EFBFBD>g<EFBFBD>teni a f<EFBFBD>gg<EFBFBD>s<EFBFBD>geket"
+msgstr "nem sikerült kielégíteni a függőségeket"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
-msgstr "<EFBFBD>tk<EFBFBD>z<EFBFBD> f<EFBFBD>gg<EFBFBD>s<EFBFBD>gek"
+msgstr "ütköző függőségek"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
-msgstr "<EFBFBD>tk<EFBFBD>z<EFBFBD> f<EFBFBD>jlok"
+msgstr "ütköző fájlok"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
-msgstr "felhaszn<EFBFBD>l<EFBFBD>i megszak<EFBFBD>t<EFBFBD>s"
+msgstr "felhasználói megszakítás"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
-msgstr "bels<EFBFBD> hiba"
+msgstr "belső hiba"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "libarchive hiba"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
-msgstr "nem meger<EFBFBD>s<EFBFBD>tett"
+msgstr "nem megerősített"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
-msgstr "<EFBFBD>rv<EFBFBD>nytelen regul<EFBFBD>ris kifejez<EFBFBD>s"
+msgstr "érvénytelen reguláris kifejezés"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
-msgstr "nem siker<EFBFBD>lt csatlakozni a t<EFBFBD>voli g<EFBFBD>phez"
+msgstr "nem sikerült csatlakozni a távoli géphez"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
-msgstr "nemv<EFBFBD>rt hiba"
+msgstr "nemvárt hiba"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "nem siker<EFBFBD>lt meghat<EFBFBD>rozni a(z) %s-%s csomag md5 ellen<EFBFBD>rz<EFBFBD> <20>sszeg<EFBFBD>t\n"
+msgstr "nem sikerült meghatározni a(z) %s-%s csomag md5 ellenőrző összegét\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "a(z) %s-%s csomag md5 ellen<EFBFBD>rz<EFBFBD> <20>sszegei nem egyeznek meg\n"
+msgstr "a(z) %s-%s csomag md5 ellenőrző összegei nem egyeznek meg\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: er<EFBFBD>ltetett friss<EFBFBD>t<EFBFBD>s a %s verzi<EFBFBD>ra\n"
+msgstr "%s: erőltetett frissítés a %s verzióra\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: a helyi (%s) <EFBFBD>jabb, mint %s (%s)\n"
+msgstr "%s: a helyi (%s) ú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
 #, c-format
 msgid "error extracting package description file to %s\n"
-msgstr "nem siker<EFBFBD>lt kicsomagolni a csomagle<EFBFBD>r<EFBFBD> f<EFBFBD>jlt %s-k<EFBFBD>nt\n"
+msgstr "nem sikerült kicsomagolni a csomagleíró fájlt %s-ként\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "nem siker<EFBFBD>lt <EFBFBD>rtelmezni a(z) %s csomagle<EFBFBD>r<EFBFBD> f<EFBFBD>jlj<EFBFBD>t\n"
+msgstr "nem sikerült értelmezni a(z) %s csomagleíró fájlját\n"
 
-#: lib/libalpm/package.c:1047
 #, c-format
 msgid "missing package name in %s\n"
-msgstr "hi<EFBFBD>nyz<EFBFBD> csomagn<EFBFBD>v itt: %s\n"
+msgstr "hiányzó csomagnév itt: %s\n"
 
-#: lib/libalpm/package.c:1051
 #, c-format
 msgid "missing package version in %s\n"
-msgstr "hi<EFBFBD>nyz<EFBFBD> csomagverzi<EFBFBD> itt: %s\n"
+msgstr "hiányzó csomagverzió 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
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "hiba a(z) %s csomag olvas<EFBFBD>sa k<EFBFBD>zben: %s\n"
+msgstr "hiba a(z) %s csomag olvasása közben: %s\n"
 
-#: lib/libalpm/package.c:1116
 #, c-format
 msgid "missing package metadata in %s\n"
-msgstr "hi<EFBFBD>nyz<EFBFBD> csomaginform<EFBFBD>ci<EFBFBD>s f<EFBFBD>jl itt: %s\n"
+msgstr "hiányzó csomaginformáció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<EFBFBD>lhat<EFBFBD> a(z) %s az adatb<EFBFBD>zisban -- kihagy<EFBFBD>s\n"
+msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n"
 
-#: lib/libalpm/remove.c:170 lib/libalpm/remove.c:241
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a '%s' f<EFBFBD>jlt : %s\n"
+msgstr "nem sikerült eltávolítani a '%s' fájlt : %s\n"
 
-#: lib/libalpm/remove.c:335
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a(z) %s-%s adatb<EFBFBD>zis-bejegyz<EFBFBD>st\n"
+msgstr "nem sikerült eltávolítani a(z) %s-%s adatbázis-bejegyzést\n"
 
-#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a(z) '%s' bejegyz<EFBFBD>st a gyors<EFBFBD>t<EFBFBD>t<EFBFBD>rb<EFBFBD>l\n"
+msgstr "nem sikerült eltávolítani a(z) '%s' bejegyzést a gyorsítótárból\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr "a '%s' URL <EFBFBD>rv<EFBFBD>nytelen, figyelmen k<EFBFBD>v<EFBFBD>l hagyom\n"
+msgstr "a '%s' URL érvénytelen, figyelmen kívül hagyom\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
-msgstr "az URL s<EFBFBD>ma nem defini<EFBFBD>lt, http felt<EFBFBD>telez<EFBFBD>se\n"
+msgstr "az URL séma nem definiált, http feltételezése\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "diszk"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "nem siker<EFBFBD>lt a(z) '%s' f<EFBFBD>jlt let<EFBFBD>lteni a %s helyr<EFBFBD>l : %s\n"
+msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
-msgstr "nem tudom folytatni a let<EFBFBD>lt<EFBFBD>st, <EFBFBD>jrakezdem\n"
+msgstr "nem tudom folytatni a letöltést, újrakezdem\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "nem siker<EFBFBD>lt a(z) '%s' f<EFBFBD>jlba <EFBFBD>rni\n"
+msgstr "nem sikerült a(z) '%s' fájlba írni\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "hiba '%s' let<EFBFBD>lt<EFBFBD>se k<EFBFBD>zben: %s\n"
+msgstr "hiba '%s' letöltése közben: %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr "hiba a(z) '%s' f<EFBFBD>jl <EFBFBD>r<EFBFBD>sa sor<EFBFBD>n: %s\n"
+msgstr "hiba a(z) '%s' fájl írása során: %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
-msgstr "nem siker<EFBFBD>lt a k<EFBFBD>nyvt<EFBFBD>rv<EFBFBD>lt<EFBFBD>s ide: %s\n"
+msgstr "nem sikerült a könyvtárváltás ide: %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr "XferCommand futtat<EFBFBD>sa: sikertelen fork!\n"
+msgstr "XferCommand futtatása: sikertelen fork!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr "az URL nem tartalmaz let<EFBFBD>ltend<EFBFBD> f<EFBFBD>jlt\n"
+msgstr "az URL nem tartalmaz letöltendő fájlt\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
-msgstr "nem siker<EFBFBD>lt a(z) %s let<EFBFBD>lt<EFBFBD>se\n"
+msgstr "nem sikerült a(z) %s letöltése\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: csomagfriss<EFBFBD>t<EFBFBD>s kihagy<EFBFBD>sa (a(z) %s-%s le fogja cser<EFBFBD>lni)\n"
+msgstr "%s-%s: csomagfrissítés kihagyása (a(z) %s-%s le fogja cserélni)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: csomagfriss<EFBFBD>t<EFBFBD>s kihagy<EFBFBD>sa (%s => %s)\n"
+msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n"
 
-#: lib/libalpm/sync.c:318
 #, c-format
 msgid "repository '%s' not found\n"
-msgstr "a(z) '%s' rep<EFBFBD> nem tal<EFBFBD>lhat<EFBFBD>\n"
+msgstr "a(z) '%s' repó nem található\n"
 
-#: lib/libalpm/sync.c:352
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "a(z) %s-%s naprak<EFBFBD>sz -- kihagy<EFBFBD>s\n"
+msgstr "a(z) %s-%s naprakész -- kihagyás\n"
 
-#: lib/libalpm/sync.c:356
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "a(z) %s-%s naprak<EFBFBD>sz -- <EFBFBD>jratelep<EFBFBD>t<EFBFBD>s\n"
+msgstr "a(z) %s-%s naprakész -- újratelepítés\n"
 
-#: lib/libalpm/sync.c:611 lib/libalpm/sync.c:616
+#, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "feloldhatatlan csomag<EFBFBD>tk<EFBFBD>z<EFBFBD>seket tal<EFBFBD>ltam\n"
+msgstr "feloldhatatlan csomagütközéseket találtam\n"
 
-#: lib/libalpm/sync.c:626
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc hiba: nem siker<EFBFBD>lt lefoglalni %zd byte-ot\n"
+msgstr "malloc hiba: nem sikerült lefoglalni %zd byte-ot\n"
 
-#: lib/libalpm/sync.c:823
 #, c-format
 msgid "command: %s\n"
 msgstr "parancs: %s\n"
 
-#: lib/libalpm/sync.c:886 lib/libalpm/sync.c:894
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "nem siker<EFBFBD>lt meghat<EFBFBD>rozni a(z) %s f<EFBFBD>jl md5 ellen<EFBFBD>rz<EFBFBD> <20>sszeg<EFBFBD>t\n"
+msgstr "nem sikerült meghatározni a(z) %s fájl md5 ellenőrző összegét\n"
 
-#: lib/libalpm/sync.c:908
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "a(z) %s f<EFBFBD>jl s<EFBFBD>r<EFBFBD>lt volt (rossz MD5 <EFBFBD>sszeg)\n"
+msgstr "a(z) %s fájl sérült volt (rossz MD5 összeg)\n"
 
-#: lib/libalpm/sync.c:1054
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "nem siker<EFBFBD>lt n<EFBFBD>h<EFBFBD>ny f<EFBFBD>jlt let<EFBFBD>lteni innen: %s\n"
+msgstr "nem sikerült néhány fájlt letölteni innen: %s\n"
 
-#: lib/libalpm/sync.c:1135
+#, c-format
 msgid "could not create removal transaction\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült létrehozni az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1141
+#, c-format
 msgid "could not initialize the removal transaction\n"
-msgstr "nem siker<EFBFBD>lt inicializ<EFBFBD>lni az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült inicializálni az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1163
+#, c-format
 msgid "could not prepare removal transaction\n"
-msgstr "nem siker<EFBFBD>lt el<EFBFBD>k<EFBFBD>sz<EFBFBD>teni az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült előkészíteni az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1169
+#, c-format
 msgid "could not commit removal transaction\n"
-msgstr "nem siker<EFBFBD>lt v<EFBFBD>grehajtani az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült végrehajtani az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not create transaction\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült létrehozni a tranzakciót\n"
 
-#: lib/libalpm/sync.c:1185
+#, c-format
 msgid "could not initialize transaction\n"
-msgstr "nem siker<EFBFBD>lt inicializ<EFBFBD>lni a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült inicializálni a tranzakciót\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not prepare transaction\n"
-msgstr "nem siker<EFBFBD>lt el<EFBFBD>k<EFBFBD>sz<EFBFBD>teni a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült előkészíteni a tranzakciót\n"
 
-#: lib/libalpm/sync.c:1217
+#, c-format
 msgid "could not commit transaction\n"
-msgstr "nem siker<EFBFBD>lt v<EFBFBD>grehajtani a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült végrehajtani a tranzakciót\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr "nem siker<EFBFBD>lt a z<EFBFBD>rol<EFBFBD> f<EFBFBD>jl (%s) elt<EFBFBD>vol<EFBFBD>t<EFBFBD>sa\n"
+msgstr "nem sikerült a zároló fájl (%s) eltávolítása\n"
 
-#: lib/libalpm/trans.c:481
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Nincs /bin/sh a sz<EFBFBD>l<EFBFBD> k<EFBFBD>rnyezetben, szkript megszak<EFBFBD>t<EFBFBD>sa\n"
+msgstr "Nincs /bin/sh a szülő környezetben, szkript megszakítása\n"
 
-#: lib/libalpm/trans.c:492
+#, c-format
 msgid "could not create temp directory\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni az ideiglenes k<EFBFBD>nyvt<EFBFBD>rat\n"
+msgstr "nem sikerült létrehozni az ideiglenes könyvtárat\n"
 
-#: lib/libalpm/trans.c:531
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt a k<EFBFBD>nyvt<EFBFBD>rv<EFBFBD>lt<EFBFBD>s ide: %s (%s)\n"
+msgstr "nem sikerült a könyvtárváltás ide: %s (%s)\n"
 
-#: lib/libalpm/trans.c:549
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "nem siker<EFBFBD>lt forkolni egy <EFBFBD>j folyamatot (%s)\n"
+msgstr "nem sikerült forkolni egy új folyamatot (%s)\n"
 
-#: lib/libalpm/trans.c:559
 #, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "nem siker<EFBFBD>lt a chroot (%s)\n"
+msgstr "nem sikerült a chroot (%s)\n"
 
-#: lib/libalpm/trans.c:564
 #, c-format
 msgid "could not change directory to / (%s)\n"
-msgstr "nem siker<EFBFBD>lt a k<EFBFBD>nyvt<EFBFBD>rat a /-re v<EFBFBD>ltani (%s)\n"
+msgstr "nem sikerült a könyvtárat a /-re váltani (%s)\n"
 
-#: lib/libalpm/trans.c:573
 #, c-format
 msgid "call to popen failed (%s)"
-msgstr "popen h<EFBFBD>v<EFBFBD>s sikertelen (%s)"
+msgstr "popen hívás sikertelen (%s)"
 
-#: lib/libalpm/trans.c:592
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "waitpid h<EFBFBD>v<EFBFBD>s sikertelen (%s)\n"
+msgstr "waitpid hívás sikertelen (%s)\n"
 
-#: lib/libalpm/trans.c:601
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr "a szkript hib<EFBFBD>san futott\n"
+msgstr "a szkript hibásan futott\n"
 
-#: lib/libalpm/trans.c:610
 #, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a %s ideiglenes k<EFBFBD>nyvt<EFBFBD>rat\n"
+msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat\n"
 
-#: lib/libalpm/util.c:202
 #, c-format
 msgid "failed to make path '%s' : %s\n"
-msgstr "nem siker<EFBFBD>lt a '%s' <EFBFBD>tvonal l<EFBFBD>trehoz<EFBFBD>sa: %s\n"
+msgstr "nem sikerült a '%s' útvonal létrehozása: %s\n"
 
-#: lib/libalpm/util.c:387
 #, c-format
 msgid "could not open %s: %s\n"
-msgstr "nem siker<EFBFBD>lt megnyitni a %s f<EFBFBD>jlt: %s\n"
+msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
 
-#: lib/libalpm/util.c:572
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "nem l<EFBFBD>tezik a(z) %s gyors<EFBFBD>t<EFBFBD>t<EFBFBD>r. l<EFBFBD>trehoz<EFBFBD>s...\n"
+msgstr "nem létezik a(z) %s gyorsítótár. létrehozás...\n"
 
-#: lib/libalpm/util.c:592
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni a csomaggyors<EFBFBD>t<EFBFBD>t<EFBFBD>rat, a /tmp haszn<EFBFBD>lata\n"
+msgstr "nem sikerült létrehozni a csomaggyorsítótárat, a /tmp használata\n"
 
-#: lib/libalpm/util.c:642
 #, c-format
 msgid "md5: %s can't be opened\n"
-msgstr "md5: nem siker<EFBFBD>lt megnyitni a k<EFBFBD>vetkez<EFBFBD>t: %s\n"
+msgstr "md5: nem sikerült megnyitni a következőt: %s\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be read\n"
-msgstr "md5: nem siker<EFBFBD>lt olvasni a k<EFBFBD>vetkez<EFBFBD>t: %s\n"
+msgstr "md5: nem sikerült olvasni a következő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-03-03 20:03-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"
@@ -17,34 +17,31 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bitPlural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "la versione di %s-%s è più recente e sarà ignorata\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "sono stati individuati dei pacchetti che vanno in conflitto\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "impossibile installare due pacchetti che vanno in conflitto\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "la sostituzione dei pacchetti con -A e -U non è ancora supportata\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 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
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -53,650 +50,560 @@ msgstr ""
 "i permessi delle directory differiscono su %s\n"
 "filesystem: %o pacchetto: %o\n"
 
-#: lib/libalpm/add.c:390
 #, 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
 #, 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
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "impossibile estrarre %s (%s)\n"
 
-#: lib/libalpm/add.c:503
 #, 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
 #, 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
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s salvato come %s\n"
 
-#: lib/libalpm/add.c:554
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "impossibile installare %s come %s: %s\n"
 
-#: lib/libalpm/add.c:557
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installato come %s\n"
 
-#: lib/libalpm/add.c:574
 #, 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
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "impossibile ottenere la directory corrente\n"
 
-#: lib/libalpm/add.c:763
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "impossible includere la voce '%s' nella cache\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 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
 #, 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"
 msgstr "impossibile rimuovere la voce %s%s dal database\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "tentativo in corso di registrare di nuovo il database 'locale'\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "il percorso del database non è definito\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "individuato un possibile ciclo di dipendenze:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s sarà rimosso dopo la sua dipendenza %s\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 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
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "memoria insufficiente!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "errore di sistema inaspettato"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "privilegi insufficienti"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "impossibile trovare o leggere il file"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "impossibile trovare o leggere la directory"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "è stato passato un argomento sbagliato o NULL"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "libreria non inizializzata"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "libreria già inizializzata"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "impossibile bloccare il database"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "impossibile aprire il database"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "impossibile creare il database"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "database non inizializzato"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "il database è già registrato"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "impossibile trovare il database"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "impossibile aggiornare il database"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "impossibile rimuovere la voce dal database"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "url non valido per il server"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "impossibile impostare il parametro"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "operazione già inizializzata"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "operazione non inizializzata"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "pacchetto doppio"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "operazione non preparata"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "operazione annullata"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operazione incompatibile con il tipo di transazione"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "impossibile eseguire l'operazione"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "impossibile prelevare tutti i file"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "impossibile trovare o leggere il pacchetto"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "pacchetto non valido o corrotto"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "impossibile aprire il pacchetto"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "impossibile caricare i dati del pacchetto"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "pacchetto già installato"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "pacchetto non installato o una versione precedente"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "impossibile rimuovere tutti i file del pacchetto"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "il nome del pacchetto non è valido"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "pacchetto corrotto"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "nessun repository corrispondente"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "il delta è corrotto"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "si sono verificati degli errori con la patch di delta"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "gruppo non trovato"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "impossibile soddisfare le dipendenze"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "dipendenze in conflitto"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "file in conflitto"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "operazione annullata"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "errore interno"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "errore di libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "non confermato"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "espressione regolare non valida"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "impossibile stabilire una connessione con l'host remoto"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "errore inaspettato"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "impossibile recuperare la somma md5 del pacchetto %s-%s\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "la somma md5 del pacchetto %s-%s non corrisponde\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: aggiornamento forzato alla versione %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 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
 #, 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
 #, 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
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "manca il nome del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1051
 #, 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
 #, 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
 #, 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
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "impossibile rimuovere il file '%s': %s\n"
 
-#: lib/libalpm/remove.c:335
 #, 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
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "impossibile rimuovere la voce '%s' dalla cache\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "l'url '%s' non è corretto, sarà ignorato\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "il protocollo dell'url non è specificato, sarà usato http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disco"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "impossibile recuperare il file '%s' da %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "impossibile riprendere il download\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "impossibile scrivere nel file '%s'\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "si è verificato un errore durante il download di '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "si è verificato un errore durante la scrittura nel file '%s': %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "impossibile spostarsi nella directory %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "avvio di XferCommand: processo non riuscito!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "URL non contiene nessun file da scaricare\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "impossibile scaricare %s\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 "%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%"
 "s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n"
 
-#: lib/libalpm/sync.c:318
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "impossibile trovare il repository '%s'\n"
 
-#: lib/libalpm/sync.c:352
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s è aggiornato, sarà ignorato\n"
 
-#: lib/libalpm/sync.c:356
 #, 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
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "sono stati rilevati dei conflitti irrisolvibili\n"
 
-#: lib/libalpm/sync.c:626
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc failure: impossibile allocare %zd byte\n"
 
-#: lib/libalpm/sync.c:823
 #, c-format
 msgid "command: %s\n"
 msgstr "comando: %s\n"
 
-#: lib/libalpm/sync.c:886 lib/libalpm/sync.c:894
 #, 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
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "il file %s è corrotto (MD5 errato)\n"
 
-#: lib/libalpm/sync.c:1054
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "impossibile recuperare alcuni file da %s\n"
 
-#: lib/libalpm/sync.c:1135
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "impossibile avviare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1141
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "impossibile inizializzare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1163
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "impossibile preparare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1169
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "impossibile eseguire l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not create transaction\n"
 msgstr "impossibile avviare l'operazione\n"
 
-#: lib/libalpm/sync.c:1185
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "impossibile inizializzare l'operazione\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "impossibile preparare l'operazione\n"
 
-#: lib/libalpm/sync.c:1217
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "impossibile eseguire l'operazione\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "impossibile rimuovere il file di lock %s\n"
 
-#: lib/libalpm/trans.c:481
+#, c-format
 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
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "impossibile creare la directory temporanea\n"
 
-#: lib/libalpm/trans.c:531
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "impossibile spostarsi nella directory %s (%s)\n"
 
-#: lib/libalpm/trans.c:549
 #, 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
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "impossibile cambiare la root directory (%s)\n"
 
-#: lib/libalpm/trans.c:564
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "impossibile spostarsi nella directory / (%s)\n"
 
-#: lib/libalpm/trans.c:573
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "chiamata a popen non riuscita (%s)"
 
-#: lib/libalpm/trans.c:592
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "chiamata a waitpid non riuscita (%s)\n"
 
-#: lib/libalpm/trans.c:601
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "L'esecuzione dello scriptlet non è riuscita correttamente\n"
 
-#: lib/libalpm/trans.c:610
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "impossibile rimuovere la directory temporanea %s\n"
 
-#: lib/libalpm/util.c:202
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "impossibile seguire il percorso '%s' : %s\n"
 
-#: lib/libalpm/util.c:387
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "impossibile aprire %s: %s\n"
 
-#: lib/libalpm/util.c:572
 #, 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
+#, c-format
 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
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: impossibile aprire %s\n"
 
-#: lib/libalpm/util.c:644
 #, 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-03-03 20:03-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,568 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/libalpm/add.c:88
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:97
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/add.c:168
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:169
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
 
-#: lib/libalpm/add.c:172
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr ""
 
-#: lib/libalpm/add.c:173
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 
-#: lib/libalpm/add.c:365
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
 
-#: lib/libalpm/add.c:392
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr ""
 
-#: lib/libalpm/add.c:399
 #, 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
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:505
 #, 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
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:556
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:559
 #, c-format
 msgid "%s installed as %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:576
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr ""
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, c-format
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: lib/libalpm/add.c:765
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:770
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:785
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:793
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr ""
 
-#: lib/libalpm/be_files.c:223
 #, 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
 #, 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
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr ""
 
-#: lib/libalpm/db.c:553
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr ""
 
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+#, c-format
 msgid "database path is undefined\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:173
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:177
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:573
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr ""
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "out of memory!"
 msgstr ""
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "unexpected system error"
 msgstr ""
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "insufficient privileges"
 msgstr ""
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read file"
 msgstr ""
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "could not find or read directory"
 msgstr ""
 
-#: lib/libalpm/error.c:53
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr ""
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "library already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:60
+#, c-format
 msgid "unable to lock database"
 msgstr ""
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not open database"
 msgstr ""
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "could not create database"
 msgstr ""
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "database already registered"
 msgstr ""
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not find database"
 msgstr ""
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not update database"
 msgstr ""
 
-#: lib/libalpm/error.c:75
+#, c-format
 msgid "could not remove database entry"
 msgstr ""
 
-#: lib/libalpm/error.c:78
+#, c-format
 msgid "invalid url for server"
 msgstr ""
 
-#: lib/libalpm/error.c:85
+#, c-format
 msgid "could not set parameter"
 msgstr ""
 
-#: lib/libalpm/error.c:88
+#, c-format
 msgid "transaction already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "duplicate target"
 msgstr ""
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction not prepared"
 msgstr ""
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "transaction aborted"
 msgstr ""
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not commit transaction"
 msgstr ""
 
-#: lib/libalpm/error.c:104
+#, c-format
 msgid "could not download all files"
 msgstr ""
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "could not find or read package"
 msgstr ""
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "invalid or corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot open package file"
 msgstr ""
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "cannot load package data"
 msgstr ""
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package already installed"
 msgstr ""
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "package not installed or lesser version"
 msgstr ""
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "cannot remove all files for package"
 msgstr ""
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "package name is not valid"
 msgstr ""
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:125
+#, c-format
 msgid "no such repository"
 msgstr ""
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "corrupted delta"
 msgstr ""
 
-#: lib/libalpm/error.c:130
+#, c-format
 msgid "delta patch failed"
 msgstr ""
 
-#: lib/libalpm/error.c:133
+#, c-format
 msgid "group not found"
 msgstr ""
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:140
+#, c-format
 msgid "conflicting files"
 msgstr ""
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "user aborted the operation"
 msgstr ""
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "internal error"
 msgstr ""
 
-#: lib/libalpm/error.c:147
+#, c-format
 msgid "libarchive error"
 msgstr ""
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "not confirmed"
 msgstr ""
 
-#: lib/libalpm/error.c:152
+#, c-format
 msgid "invalid regular expression"
 msgstr ""
 
-#: lib/libalpm/error.c:155
+#, c-format
 msgid "connection to remote host failed"
 msgstr ""
 
-#: lib/libalpm/error.c:158
+#, c-format
 msgid "unexpected error"
 msgstr ""
 
-#: lib/libalpm/package.c:124
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:133
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:737
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:742
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/package.c:750
 #, 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
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:936
 #, c-format
 msgid "missing package name in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:940
 #, 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
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1005
 #, 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
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:337
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:342
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr ""
 
-#: lib/libalpm/server.c:56
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr ""
 
-#: lib/libalpm/server.c:60
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr ""
 
-#: lib/libalpm/server.c:241
+#, c-format
 msgid "disk"
 msgstr ""
 
-#: lib/libalpm/server.c:245
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:275
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr ""
 
-#: lib/libalpm/server.c:288
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr ""
 
-#: lib/libalpm/server.c:307
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:319
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:387
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:394
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr ""
 
-#: lib/libalpm/server.c:445
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr ""
 
-#: lib/libalpm/server.c:458
 #, c-format
 msgid "failed to download %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:135
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:250
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:320
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:354
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:358
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:628
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
 #, c-format
 msgid "command: %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:910
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1056
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1137
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1143
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1165
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1171
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1182
+#, c-format
 msgid "could not create transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1187
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1214
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1219
+#, c-format
 msgid "could not commit transaction\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:214
 #, 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
+#, c-format
 msgid "could not create temp directory\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:536
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:554
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:564
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:569
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:578
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""
 
-#: lib/libalpm/trans.c:597
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:606
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:615
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:204
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:389
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:573
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr ""
 
-#: lib/libalpm/util.c:593
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/util.c:643
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr ""
 
-#: lib/libalpm/util.c:645
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr ""

lib/libalpm/po/pl.po

@@ -0,0 +1,639 @@
+# Polish translations for Pacman package manager package
+# Polskie tłumaczenia dla pakietu Pacman package manager.
+# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
+# Mateusz Jędrasik <m.jedrasik@gmail.com>, 2007.
+# Mateusz Herych <heniekk@gmail.com>, 2008.
+# #
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.0.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-25 22:16+0100\n"
+"Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#, 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\n"
+
+#, 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\n"
+
+#, c-format
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+"konfliktujące pakiety znalazły się na liście pakietów do zainstalowania\n"
+
+#, c-format
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+"nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w tym "
+"samym czasie\n"
+
+#, c-format
+msgid "replacing packages with -A and -U is not supported yet\n"
+msgstr "zastępowanie pakietów za pomocą -A i -U nie jest jeszcze wspierane\n"
+
+#, c-format
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"Różne prawa dla %s\n"
+"system plików: %o pakiet: %o\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "rozpakowywanie: dowiązanie symboliczne %s nie kieruje do katalogu\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "rozpakowywanie: nie nadpisuję katalogu plikiem %s\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "nie udało się rozpakować %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s (%s)\n"
+msgstr "nie udało się zmienić nazwy %s (%s)\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s zachowane jako %s\n"
+
+#, c-format
+msgid "could not install %s as %s: %s\n"
+msgstr "nie udało się zainstalować %s jako %s: %s\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s zainstalowano jako %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "rozpakowywanie %s jako %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "nie można znaleźć obecnego katalogu\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "wystąpiły błędy podczas aktualizacji %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "wystąpiły błędy podczas instalacji %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "nie udało się otworzyć pliku %s: %s\n"
+
+#, c-format
+msgid "could not remove database entry %s%s\n"
+msgstr "nie udało się usunąć wpisu %s%s z bazy danych\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "ścieżka bazy danych jest niezdefiniowana\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "wykryto cykl zależności:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s zostanie usunięta po zależniościach %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s zostanie zainstalowane przed zależnościami %s\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "nie można rozwiązać \"%s\", zależności od \"%s\"\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "brak pamięci!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "niespodziewany błąd systemu"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "niewystarczające przywileje"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "nie udało się znaleźć bądź odczytać pliku"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "nie udało się znaleźć bądź odczytać katalogu"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "Dany został błędny bądź ZEROWY argument"
+
+#, c-format
+msgid "library not initialized"
+msgstr "biblioteka nie została zainicjowana"
+
+#, c-format
+msgid "library already initialized"
+msgstr "biblioteka już została zainicjowana"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "nie udało się zablokować bazy danych"
+
+#, c-format
+msgid "could not open database"
+msgstr "nie udało się otworzyć bazy danych"
+
+#, c-format
+msgid "could not create database"
+msgstr "nie udało się stworzyć bazy danych"
+
+#, c-format
+msgid "database not initialized"
+msgstr "baza danych nie została zainicjowana"
+
+#, c-format
+msgid "database already registered"
+msgstr "baza danych już zarejestrowana"
+
+#, c-format
+msgid "could not find database"
+msgstr "nie udało się odnaleźć bazy danych"
+
+#, c-format
+msgid "could not update database"
+msgstr "nie udało się zaktualizować bazy danych"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "nie udało się usunąć wpisu do bazy danych"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "nieprawidłowy url dla serwera"
+
+#, c-format
+msgid "could not set parameter"
+msgstr "nie udało się ustawić parametru"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "tranzakcja została już zainicjowana"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "tranzakcja nie została zainicjowana"
+
+#, c-format
+msgid "duplicate target"
+msgstr "duplikat celu"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "tranzakcja nie została przygotowana"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "tranzakcja zaniechana"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "operacja niekompatybilna z typem tranzakcji"
+
+#, c-format
+msgid "could not commit transaction"
+msgstr "nie udało się wykonać tranzakcji"
+
+#, c-format
+msgid "could not download all files"
+msgstr "nie udało się pobrać wszystkich plików"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "nie udało się znaleźć bądź odczytać pakietu"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "nieprawidłowy bądź uszkodzony pakiet"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "nie udało się otworzyć pliku pakietu"
+
+#, c-format
+msgid "cannot load package data"
+msgstr "nie udało się załadować danych pakietu"
+
+#, c-format
+msgid "package already installed"
+msgstr "pakiet został już zainstalowany"
+
+#, c-format
+msgid "package not installed or lesser version"
+msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "nie udało się usunąć wszystkich plików pakietu"
+
+#, c-format
+msgid "package name is not valid"
+msgstr "nieprawidłowa nazwa pakietu"
+
+#, c-format
+msgid "corrupted package"
+msgstr "uszkodzony pakiet"
+
+#, c-format
+msgid "no such repository"
+msgstr "nie ma takiego repozytorium"
+
+#, c-format
+msgid "corrupted delta"
+msgstr "Pakiet przyrostowy jest uszkodzony"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "Łatanie pakietem przyrostowym nie powiodło się"
+
+#, c-format
+msgid "group not found"
+msgstr "grupa nie została odnaleziona"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "nie udało się usatysfakcjonować zależności"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "konfliktujące zależności"
+
+#, c-format
+msgid "conflicting files"
+msgstr "konfliktujące pliki"
+
+#, c-format
+msgid "user aborted the operation"
+msgstr "użytkownik zaniechał operacji"
+
+#, c-format
+msgid "internal error"
+msgstr "błąd wewnętrzny"
+
+#, c-format
+msgid "libarchive error"
+msgstr "błąd libarchive"
+
+#, c-format
+msgid "not confirmed"
+msgstr "nie potwierdzono"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "nieprawidłowe wyrażenie regularne"
+
+#, c-format
+msgid "connection to remote host failed"
+msgstr "połączenie ze zdalnym hostem nieudane"
+
+#, c-format
+msgid "unexpected error"
+msgstr "niespodziewany błąd"
+
+#, c-format
+msgid "could not get md5sum for package %s-%s\n"
+msgstr "nie udało się otrzymać sumy md5 dla pakietu %s-%s\n"
+
+#, c-format
+msgid "md5sums do not match for package %s-%s\n"
+msgstr "sumy kontrolne md5 dla pakietu %s-%s nie zgadzają się\n"
+
+#, c-format
+msgid "%s: forcing upgrade to version %s\n"
+msgstr "%s: wymuszanie aktualizacji do wersji %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) jest nowsze niż %s (%s)\n"
+
+#, c-format
+msgid "error extracting package description file to %s\n"
+msgstr "nie udało się przeczytać opisu do %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "nie udało się przeczytać opisu pliku w %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "brak nazwy pakietu w %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "brak wersji pakietu w %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "błąd odczytywania pakietu: %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "brak metadanych pakietu w %s\n"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "nie udało się usunąć pliku '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "nie udało się usunąć wpisu %s-%s z bazy danych\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej\n"
+
+#, c-format
+msgid "url '%s' is invalid, ignoring\n"
+msgstr "url '%s' jest błędny, ignoruję\n"
+
+#, c-format
+msgid "url scheme not specified, assuming http\n"
+msgstr "schemat url nie został sprecyzowany, wybieranie http\n"
+
+#, c-format
+msgid "disk"
+msgstr "dysk"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
+
+#, c-format
+msgid "cannot resume download, starting over\n"
+msgstr "nie można kontynuować pobieranie, zaczynanie od początku\n"
+
+#, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "nie można zapisywać do pliku '%s'\n"
+
+#, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "błąd podczas pobierania '%s': %s\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "Błąd podczas zapisywania do pliku '%s': %s\n"
+
+#, c-format
+msgid "could not chdir to %s\n"
+msgstr "nie udało się zmienić katalogu na / %s\n"
+
+#, c-format
+msgid "running XferCommand: fork failed!\n"
+msgstr "uruchamianie XferCommand: klonowanie nieudane!\n"
+
+#, c-format
+msgid "URL does not contain a file for download\n"
+msgstr "URL nie wskazuje na plik do pobrania\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "nie udało się pobrać %s\n"
+
+#, 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)\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n"
+
+#, c-format
+msgid "repository '%s' not found\n"
+msgstr "repozytorium '%s' nie zostało znalezione\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "odkryto nierozwiązywalne konflikty pakietów\n"
+
+#, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "błąd malloc: nie udało się zaalokować %zd bajtów\n"
+
+#, c-format
+msgid "command: %s\n"
+msgstr "komenda: %s\n"
+
+#, c-format
+msgid "can't get md5 checksum for file %s\n"
+msgstr "nie udało się otrzymać sum kontrolnych md5 dla pliku %s\n"
+
+#, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
+msgstr "plik %s był uszkodzony (błąd sumy kontrolnej MD5)\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "nie udało się pobrać niektórych plików z %s\n"
+
+#, c-format
+msgid "could not create removal transaction\n"
+msgstr "nie udało się utworzyć tranzakcji usuwania\n"
+
+#, c-format
+msgid "could not initialize the removal transaction\n"
+msgstr "nie udało się zainicjować tranzakcji usuwania\n"
+
+#, c-format
+msgid "could not prepare removal transaction\n"
+msgstr "nie udało się przygotować tranzakcji usuwania\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "nie udało się wykonać tranzakcji usuwania\n"
+
+#, c-format
+msgid "could not create transaction\n"
+msgstr "nie udało się stworzyć tranzakcji\n"
+
+#, c-format
+msgid "could not initialize transaction\n"
+msgstr "nie udało się zainicjować tranzakcji\n"
+
+#, c-format
+msgid "could not prepare transaction\n"
+msgstr "nie udało się przygotować tranzakcji\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "nie udało się wykonać tranzakcji\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "nie udało się usunąć pliku blokującego %s\n"
+
+#, c-format
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "Brak /bin/sh w środowisku,  przerywanie wykonywania skryptu\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "nie udało się stworzyć katalogu tymczasowego\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "nie udało się zmienić katalogu na %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "nie udało się odwidlić nowego procesu (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "nie udało się zmienić katalogu głównego (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "nie udało się zmienić katalogu na / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)"
+msgstr "zawołanie do popen nieudane (%s)"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "zawołanie do waitpid nieudane (%s)\n"
+
+#, c-format
+msgid "scriptlet failed to execute correctly\n"
+msgstr "skrypt nie mógł zostać poprawnie wykonany\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
+
+#, c-format
+msgid "failed to make path '%s' : %s\n"
+msgstr "nie udało się stworzyć ścieżki '%s' : %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nie udało się otworzyć %s: %s\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr ""
+"nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+
+#, c-format
+msgid "md5: %s can't be opened\n"
+msgstr "md5: %s nie może zostać otwarte\n"
+
+#, c-format
+msgid "md5: %s can't be read\n"
+msgstr "md5: %s nie może zostać przeczytane\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"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "nie udało się rozpakować %s (%s)"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "nie udało się zaktualizować zasobu '%s' z '%s'"
+
+#, fuzzy
+#~ msgid "%s: description file is missing"
+#~ msgstr "%s: błąd składni w pliku opisu linia %d"
+
+#~ msgid "malloc failed: could not allocate %d bytes"
+#~ msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
+
+#~ msgid ""
+#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+#~ msgstr ""
+#~ "nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w "
+#~ "zbiorze pakietów)"
+
+#~ msgid "cannot canonicalize specified root path '%s'"
+#~ msgstr "nie udało się skanonizować podanej ścieżki docelowej '%s'"
+
+#~ 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 "could not update new database entry %s-%s"
+#~ msgstr "nie udało się zaktualizować nowego wpisu %s-%s w bazie danych"

lib/libalpm/po/pl_PL.po

@@ -1,745 +0,0 @@
-# Polish translations for Pacman package manager package
-# Polskie tłumaczenia dla pakietu Pacman package manager.
-# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the Pacman package manager package.
-# Mateusz Jędrasik <m.jedrasik@gmail.com>, 2007.
-#
-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"
-"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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"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
-#, 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
-#, 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
-msgid "conflicting packages were found in the target list\n"
-msgstr ""
-
-#: lib/libalpm/add.c:169
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-
-#: lib/libalpm/add.c:172
-#, 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
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-
-#: lib/libalpm/add.c:365
-#, c-format
-msgid ""
-"directory permissions differ on %s\n"
-"filesystem: %o  package: %o\n"
-msgstr ""
-
-#: lib/libalpm/add.c:392
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr ""
-
-#: lib/libalpm/add.c:399
-#, 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
-#, fuzzy, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "nie udało się rozpakować %s (%s)"
-
-#: lib/libalpm/add.c:505
-#, 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
-#, 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
-#, fuzzy, c-format
-msgid "%s saved as %s\n"
-msgstr "%s zachowane jako %s"
-
-#: lib/libalpm/add.c:556
-#, 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
-#, fuzzy, c-format
-msgid "%s installed as %s\n"
-msgstr "%s zainstalowano jako %s"
-
-#: lib/libalpm/add.c:576
-#, 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
-#, fuzzy
-msgid "could not get current working directory\n"
-msgstr "nie można znaleźć obecnego katalogu"
-
-#: lib/libalpm/add.c:765
-#, fuzzy, c-format
-msgid "problem occurred while upgrading %s\n"
-msgstr "wystąpiły błędy podczas %s %s"
-
-#: lib/libalpm/add.c:770
-#, fuzzy, c-format
-msgid "problem occurred while installing %s\n"
-msgstr "wystąpiły błędy podczas %s %s"
-
-#: lib/libalpm/add.c:785
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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
-#, fuzzy
-msgid "database path is undefined\n"
-msgstr "baza danych nie została zainicjowana"
-
-#: lib/libalpm/deps.c:173
-#, fuzzy
-msgid "dependency cycle detected:\n"
-msgstr "wykryto cykl zależności: %s"
-
-#: lib/libalpm/deps.c:175
-#, c-format
-msgid "%s will be removed after its %s dependency\n"
-msgstr ""
-
-#: lib/libalpm/deps.c:177
-#, c-format
-msgid "%s will be installed before its %s dependency\n"
-msgstr ""
-
-#: lib/libalpm/deps.c:573
-#, 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
-msgid "out of memory!"
-msgstr "brak pamięci!"
-
-#: lib/libalpm/error.c:45
-msgid "unexpected system error"
-msgstr "niespodziewany błąd systemu"
-
-#: lib/libalpm/error.c:47
-msgid "insufficient privileges"
-msgstr "niewystarczające przywileje"
-
-#: lib/libalpm/error.c:49
-msgid "could not find or read file"
-msgstr "nie udało się znaleźć bądź odczytać pliku"
-
-#: lib/libalpm/error.c:51
-#, fuzzy
-msgid "could not find or read directory"
-msgstr "nie udało się znaleźć bądź odczytać pliku"
-
-#: lib/libalpm/error.c:53
-msgid "wrong or NULL argument passed"
-msgstr "błędny bądź ZEROWY argument dany"
-
-#: lib/libalpm/error.c:56
-msgid "library not initialized"
-msgstr "biblioteka nie została zainicjowana"
-
-#: lib/libalpm/error.c:58
-msgid "library already initialized"
-msgstr "biblioteka już zainicjowana"
-
-#: lib/libalpm/error.c:60
-msgid "unable to lock database"
-msgstr "nie udało się zablokować bazy danych"
-
-#: lib/libalpm/error.c:63
-msgid "could not open database"
-msgstr "nie udało się otworzyć bazy danych"
-
-#: lib/libalpm/error.c:65
-msgid "could not create database"
-msgstr "nie udało się stworzyć bazy danych"
-
-#: lib/libalpm/error.c:67
-msgid "database not initialized"
-msgstr "baza danych nie została zainicjowana"
-
-#: lib/libalpm/error.c:69
-msgid "database already registered"
-msgstr "baza danych już zarejestrowana"
-
-#: lib/libalpm/error.c:71
-msgid "could not find database"
-msgstr "nie udało się odnaleźc bazy danych"
-
-#: lib/libalpm/error.c:73
-msgid "could not update database"
-msgstr "nie udało się zaktualizować bazy danych"
-
-#: lib/libalpm/error.c:75
-msgid "could not remove database entry"
-msgstr "nie udało się usunąć wpisu do bazy danych"
-
-#: lib/libalpm/error.c:78
-msgid "invalid url for server"
-msgstr "nieprawidłowy url dla serwera"
-
-#: lib/libalpm/error.c:85
-msgid "could not set parameter"
-msgstr "nie udało się ustawić parametru"
-
-#: lib/libalpm/error.c:88
-msgid "transaction already initialized"
-msgstr "tranzakcja już zainicjowana"
-
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
-msgid "transaction not initialized"
-msgstr "tranzakcja nie została zainicjowana"
-
-#: lib/libalpm/error.c:92
-msgid "duplicate target"
-msgstr "duplikat celu"
-
-#: lib/libalpm/error.c:96
-msgid "transaction not prepared"
-msgstr "tranzakcja nie została przygotowana"
-
-#: lib/libalpm/error.c:98
-msgid "transaction aborted"
-msgstr "tranzakcja zaniechana"
-
-#: lib/libalpm/error.c:100
-msgid "operation not compatible with the transaction type"
-msgstr "operacja niekompatybilna z typem tranzakcji"
-
-#: lib/libalpm/error.c:102
-msgid "could not commit transaction"
-msgstr "nie udało się wykonać tranzakcji"
-
-#: lib/libalpm/error.c:104
-msgid "could not download all files"
-msgstr "nie udało się pobrać wszystkich plików"
-
-#: lib/libalpm/error.c:107
-msgid "could not find or read package"
-msgstr "nie udało się znaleźć bądź odczytać pakietu"
-
-#: lib/libalpm/error.c:109
-msgid "invalid or corrupted package"
-msgstr "nieprawidłowy bądź skorumpowany pakiet"
-
-#: lib/libalpm/error.c:111
-msgid "cannot open package file"
-msgstr "nie udało się otworzyć pliku pakietu"
-
-#: lib/libalpm/error.c:113
-msgid "cannot load package data"
-msgstr "nie udało się załadować danych pakietu"
-
-#: lib/libalpm/error.c:115
-msgid "package already installed"
-msgstr "pakiet już zainstalowany"
-
-#: lib/libalpm/error.c:117
-msgid "package not installed or lesser version"
-msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
-
-#: lib/libalpm/error.c:119
-msgid "cannot remove all files for package"
-msgstr "nie udało się usunąć wszystkich plików pakietu"
-
-#: lib/libalpm/error.c:121
-msgid "package name is not valid"
-msgstr "nieprawidłowa nazwa pakietu"
-
-#: lib/libalpm/error.c:123
-msgid "corrupted package"
-msgstr "skorumpowany pakiet"
-
-#: lib/libalpm/error.c:125
-msgid "no such repository"
-msgstr "nie ma takiego repozytorium"
-
-#: lib/libalpm/error.c:128
-#, fuzzy
-msgid "corrupted delta"
-msgstr "skorumpowany pakiet"
-
-#: lib/libalpm/error.c:130
-msgid "delta patch failed"
-msgstr ""
-
-#: lib/libalpm/error.c:133
-msgid "group not found"
-msgstr "grupa nie została odnaleziona"
-
-#: lib/libalpm/error.c:136
-msgid "could not satisfy dependencies"
-msgstr "nie udało się usatysfakcjonować zależności"
-
-#: lib/libalpm/error.c:138
-msgid "conflicting dependencies"
-msgstr "konfliktujące zależności"
-
-#: lib/libalpm/error.c:140
-msgid "conflicting files"
-msgstr "konfliktujące pliki"
-
-#: lib/libalpm/error.c:143
-msgid "user aborted the operation"
-msgstr "użytkownik zaniechał operacji"
-
-#: lib/libalpm/error.c:145
-msgid "internal error"
-msgstr "błąd wewnętrzny"
-
-#: lib/libalpm/error.c:147
-msgid "libarchive error"
-msgstr "błąd libarchive"
-
-#: lib/libalpm/error.c:150
-msgid "not confirmed"
-msgstr "nie potwierdzono"
-
-#: lib/libalpm/error.c:152
-msgid "invalid regular expression"
-msgstr "nieprawidłowe wyrażenie regularne"
-
-#: lib/libalpm/error.c:155
-msgid "connection to remote host failed"
-msgstr "połączenie ze zdalnym hostem nieudane"
-
-#: lib/libalpm/error.c:158
-msgid "unexpected error"
-msgstr "niespodziewany błąd"
-
-#: lib/libalpm/package.c:124
-#, 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
-#, 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
-#, fuzzy, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: wymuszanie aktualizacji do wersji %s"
-
-#: lib/libalpm/package.c:742
-#, 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
-#, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: opóźnianie aktualizacji pakietu (%s)"
-
-#: lib/libalpm/package.c:931
-#, 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
-#, fuzzy, c-format
-msgid "missing package name in %s\n"
-msgstr "brak nazwy pakietu w %s"
-
-#: lib/libalpm/package.c:940
-#, 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
-#, fuzzy, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "błąd odczytywania pakietu: %s"
-
-#: lib/libalpm/package.c:1005
-#, 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
-#, 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
-#, fuzzy, c-format
-msgid "cannot remove file '%s': %s\n"
-msgstr "nie udało się usunąć pliku '%s': %s"
-
-#: lib/libalpm/remove.c:337
-#, 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
-#, 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
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr ""
-
-#: lib/libalpm/server.c:60
-msgid "url scheme not specified, assuming http\n"
-msgstr ""
-
-#: lib/libalpm/server.c:241
-msgid "disk"
-msgstr ""
-
-#: lib/libalpm/server.c:245
-#, 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
-msgid "cannot resume download, starting over\n"
-msgstr ""
-
-#: lib/libalpm/server.c:288
-#, fuzzy, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nie udało się usunąć pliku '%s': %s"
-
-#: lib/libalpm/server.c:307
-#, fuzzy, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "błąd odczytywania pakietu: %s"
-
-#: lib/libalpm/server.c:319
-#, 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
-#, fuzzy, c-format
-msgid "could not chdir to %s\n"
-msgstr "nie udało się zmienić katalogu na / (%s)"
-
-#: lib/libalpm/server.c:394
-msgid "running XferCommand: fork failed!\n"
-msgstr ""
-
-#: lib/libalpm/server.c:445
-msgid "URL does not contain a file for download\n"
-msgstr ""
-
-#: lib/libalpm/server.c:458
-#, fuzzy, c-format
-msgid "failed to download %s\n"
-msgstr "nie udało się pobrać wszystkich plików"
-
-#: lib/libalpm/sync.c:135
-#, 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
-#, fuzzy, c-format
-msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)"
-
-#: lib/libalpm/sync.c:320
-#, fuzzy, c-format
-msgid "repository '%s' not found\n"
-msgstr "repozytorium '%s' nie zostało znalezione"
-
-#: lib/libalpm/sync.c:354
-#, 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
-#, 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
-#, fuzzy
-msgid "unresolvable package conflicts detected\n"
-msgstr "odkryto nierozwiązywalne konflikty pakietów"
-
-#: lib/libalpm/sync.c:628
-#, 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
-#, c-format
-msgid "command: %s\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
-#, 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
-#, 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
-#, 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
-#, fuzzy
-msgid "could not create removal transaction\n"
-msgstr "nie udało się utworzyć tranzakcji usuwania"
-
-#: lib/libalpm/sync.c:1143
-#, fuzzy
-msgid "could not initialize the removal transaction\n"
-msgstr "nie udało się zainicjować tranzakcji usuwania"
-
-#: lib/libalpm/sync.c:1165
-#, fuzzy
-msgid "could not prepare removal transaction\n"
-msgstr "nie udało się przygotować tranzakcji usuwania"
-
-#: lib/libalpm/sync.c:1171
-#, fuzzy
-msgid "could not commit removal transaction\n"
-msgstr "nie udało się wykonać tranzakcji usuwania"
-
-#: lib/libalpm/sync.c:1182
-#, fuzzy
-msgid "could not create transaction\n"
-msgstr "nie udało się stworzyć tranzakcji"
-
-#: lib/libalpm/sync.c:1187
-#, fuzzy
-msgid "could not initialize transaction\n"
-msgstr "nie udało się zainicjować tranzakcji"
-
-#: lib/libalpm/sync.c:1214
-#, fuzzy
-msgid "could not prepare transaction\n"
-msgstr "nie udało się przygotować tranzakcji"
-
-#: lib/libalpm/sync.c:1219
-#, fuzzy
-msgid "could not commit transaction\n"
-msgstr "nie udało się wykonać tranzakcji"
-
-#: lib/libalpm/trans.c:214
-#, 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"
-msgstr ""
-
-#: lib/libalpm/trans.c:494
-#, fuzzy
-msgid "could not create temp directory\n"
-msgstr "nie udało się stworzyć katalogu tymczasowego"
-
-#: lib/libalpm/trans.c:536
-#, 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
-#, 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
-#, 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
-#, 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
-#, fuzzy, c-format
-msgid "call to popen failed (%s)"
-msgstr "zawołanie do waitpid nieudane (%s)"
-
-#: lib/libalpm/trans.c:597
-#, fuzzy, c-format
-msgid "call to waitpid failed (%s)\n"
-msgstr "zawołanie do waitpid nieudane (%s)"
-
-#: lib/libalpm/trans.c:606
-msgid "scriptlet failed to execute correctly\n"
-msgstr ""
-
-#: lib/libalpm/trans.c:615
-#, fuzzy, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "nie udało się usunąć katalogu tymczasowego %s"
-
-#: lib/libalpm/util.c:204
-#, 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
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nie udało się otworzyć %s: %s\n"
-
-#: lib/libalpm/util.c:573
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
-
-#: lib/libalpm/util.c:593
-#, 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
-#, fuzzy, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "%s nie może być otwarte\n"
-
-#: lib/libalpm/util.c:645
-#, fuzzy, c-format
-msgid "md5: %s can't be read\n"
-msgstr "%s nie może być otwarte\n"
-
-#~ msgid "please remove '%s' first, using -Rd"
-#~ msgstr "proszę usunąć pierw '%s', korzystając z -Rd"
-
-#~ msgid "could not extract %s (%s)"
-#~ msgstr "nie udało się rozpakować %s (%s)"
-
-#~ msgid "could not update provision '%s' from '%s'"
-#~ msgstr "nie udało się zaktualizować zasobu '%s' z '%s'"
-
-#, fuzzy
-#~ msgid "%s: description file is missing"
-#~ msgstr "%s: błąd składni w pliku opisu linia %d"
-
-#~ msgid "malloc failed: could not allocate %d bytes"
-#~ msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
-
-#~ msgid ""
-#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
-#~ msgstr ""
-#~ "nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w "
-#~ "zbiorze pakietów)"
-
-#~ 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/pt_BR.po

@@ -2,703 +2,589 @@
 # Portuguese translations for Pacman package manager package.
 # Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
-#
-#
-# (First author here) <(email here)>, 2007.
 # Lincoln de Sousa <lincoln@archlinux-br.org>, 2007.
-# Hugo Doria <hugodoria@archlinux-br.org>, 2007.
-# Douglas Soares de Andrade <dsandrade@gmail.com>, 2007.
+# Hugo Doria <hugodoria@archlinux-br.org>, 2008.
+# Douglas Soares de Andrade <dsandrade@gmail.com>, 2008.
+# João Felipe Santos <jfsantos@archlinux-br.org>, 2008.
+# Kayo Hamid <kayohf@archlinux-br.org>, 2008
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
-"PO-Revision-Date: 2007-03-07 01:18-0300\n"
-"Last-Translator: Douglas Soares de Andrade <dsandrade@gmail.com>\n"
-"Language-Team: Português do Brasil <pt@li.org>\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-01-18 08:04-0200\n"
+"Last-Translator: João Felipe Santos <jfsantos@archlinux-br.org>\n"
+"Language-Team: Português do Brasil <contato@archlinux-br.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:88
-#, fuzzy, c-format
+#, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "substituindo a versão antiga %s-%s por '%s' na lista de pacotes"
+msgstr "substituindo a versão antiga %s-%s por %s na lista de alvos\n"
 
-#: lib/libalpm/add.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "versão atualizada %s-%s está na lista de pacotes -- pulando"
+msgstr "versão atualizada %s-%s está na lista de alvos -- pulando\n"
 
-#: lib/libalpm/add.c:168
+#, c-format
 msgid "conflicting packages were found in the target list\n"
-msgstr ""
+msgstr "pacotes conflitantes foram encontrados na lista de alvos\n"
 
-#: lib/libalpm/add.c:169
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
+msgstr "você não pode instalar dois pacotes conflitantes ao mesmo tempo\n"
 
-#: lib/libalpm/add.c:172
-#, fuzzy
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "substituir pacotes com -A e -U ainda não é suportado"
+msgstr "substituir pacotes com -A e -U ainda não é suportado\n"
 
-#: lib/libalpm/add.c:173
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
+msgstr "você pode substituir pacotes manualmente usando as opções -Rd e -U\n"
 
-#: lib/libalpm/add.c:365
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
+"permissões de diretório diferem em %s\n"
+"sistema de arquivos: %o  pacote: %o\n"
 
-#: lib/libalpm/add.c:392
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr ""
+msgstr "extração: symlink %s não aponta para diretório\n"
 
-#: lib/libalpm/add.c:399
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr ""
+msgstr "extração: não sobrescrevendo diretório com arquivo %s\n"
 
-#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "não foi possível extrair %s (%s)"
+msgstr "não foi possível extrair %s (%s)\n"
 
-#: lib/libalpm/add.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "não foi possível renomear %s (%s)"
+msgstr "não foi possível renomear %s (%s)\n"
 
-#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
-#, fuzzy, c-format
+#, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "não foi possível copiar arquivo temporário para %s (%s)"
+msgstr "não foi possível copiar arquivo temporário para %s (%s)\n"
 
-#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "%s saved as %s\n"
-msgstr "%s salvo como %s"
+msgstr "%s salvo como %s\n"
 
-#: lib/libalpm/add.c:556
-#, fuzzy, c-format
+#, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "não foi possível instalar %s como %s: %s"
+msgstr "não foi possível instalar %s como %s: %s\n"
 
-#: lib/libalpm/add.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "%s installed as %s\n"
-msgstr "%s instalado como %s"
+msgstr "%s instalado como %s\n"
 
-#: lib/libalpm/add.c:576
-#, fuzzy, c-format
+#, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "extraindo %s como %s.pacnew"
+msgstr "extraindo %s como %s.pacnew\n"
 
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
-#, fuzzy
+#, c-format
 msgid "could not get current working directory\n"
-msgstr "não foi possível obter o diretório de trabalho atual"
+msgstr "não foi possível obter o diretório de trabalho atual\n"
 
-#: lib/libalpm/add.c:765
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "erros ocorreram durante %s %s"
+msgstr "erros ocorreram durante o upgrade de %s\n"
 
-#: lib/libalpm/add.c:770
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "erros ocorreram durante %s %s"
+msgstr "erros ocorreram durante a instalação de %s\n"
 
-#: lib/libalpm/add.c:785
-#, fuzzy, c-format
+#, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "não foi possível atualizar a entrada na base de dados %s-%s"
+msgstr "não foi possível atualizar a entrada na base de dados %s-%s\n"
 
-#: lib/libalpm/add.c:793
-#, fuzzy, c-format
+#, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "não foi possível adicionar a entrada '%s' ao cache"
+msgstr "não foi possível adicionar a entrada '%s' ao cache\n"
 
-#: lib/libalpm/be_files.c:223
-#, fuzzy, c-format
+#, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "nome inválido para a entrada na base de dados '%s'"
+msgstr "nome inválido para a entrada na base de dados '%s'\n"
 
-#: 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
-#, fuzzy, c-format
 msgid "could not open file %s: %s\n"
-msgstr "não foi possível abrir o arquivo %s: %s"
+msgstr "não foi possível abrir o arquivo %s: %s\n"
 
-#: lib/libalpm/cache.c:62
 #, c-format
-msgid "adding '%s' to package cache for db '%s'\n"
-msgstr ""
-
-#: lib/libalpm/db.c:285
-#, fuzzy, c-format
 msgid "could not remove database entry %s%s\n"
-msgstr "não foi possível remover a entrada da base de dados %s%s"
+msgstr "não foi possível remover a entrada da base de dados %s%s\n"
 
-#: lib/libalpm/db.c:553
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
-msgstr ""
+msgstr "tentativa de re-registrar a base de dados 'local'\n"
 
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
-#, fuzzy
+#, c-format
 msgid "database path is undefined\n"
-msgstr "base de dados não inicializada"
+msgstr "caminho da base de dados não definido\n"
 
-#: lib/libalpm/deps.c:173
+#, c-format
 msgid "dependency cycle detected:\n"
-msgstr ""
+msgstr "dependência cíclica detectada:\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr ""
+msgstr "%s será removido após sua dependência %s\n"
 
-#: lib/libalpm/deps.c:177
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr ""
+msgstr "%s será instalado antes de sua dependência %s\n"
 
-#: lib/libalpm/deps.c:573
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr ""
+msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "out of memory!"
-msgstr ""
+msgstr "sem memória!"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "unexpected system error"
-msgstr ""
+msgstr "erro inesperado do sistema"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "insufficient privileges"
-msgstr ""
+msgstr "privilégios insuficientes"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read file"
-msgstr ""
+msgstr "não foi possível encontrar ou ler o arquivo"
 
-#: lib/libalpm/error.c:51
-#, fuzzy
+#, c-format
 msgid "could not find or read directory"
-msgstr "não foi possível obter o diretório de trabalho atual"
+msgstr "não foi possível encontrar ou ler o diretório"
 
-#: lib/libalpm/error.c:53
+#, c-format
 msgid "wrong or NULL argument passed"
-msgstr ""
+msgstr "argumento errado ou NULO passado"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library not initialized"
 msgstr "biblioteca não inicializada"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "library already initialized"
 msgstr "biblioteca já inicializada"
 
-#: lib/libalpm/error.c:60
+#, c-format
 msgid "unable to lock database"
-msgstr ""
+msgstr "não foi possível travar a base de dados"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not open database"
 msgstr "não foi possível abrir a base de dados"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "could not create database"
 msgstr "não foi possível criar a base de dados"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database not initialized"
 msgstr "base de dados não inicializada"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "database already registered"
 msgstr "base de dados já registrada"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not find database"
 msgstr "não foi possível encontrar a base de dados"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not update database"
 msgstr "não foi possível atualizar a base de dados"
 
-#: lib/libalpm/error.c:75
+#, c-format
 msgid "could not remove database entry"
 msgstr "não foi possível remover a entrada da base de dados"
 
-#: lib/libalpm/error.c:78
+#, c-format
 msgid "invalid url for server"
-msgstr ""
+msgstr "url inválida para servidor"
 
-#: lib/libalpm/error.c:85
+#, c-format
 msgid "could not set parameter"
-msgstr ""
+msgstr "não foi possível setar parâmetro"
 
-#: lib/libalpm/error.c:88
+#, c-format
 msgid "transaction already initialized"
-msgstr ""
+msgstr "transação já inicializada"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not initialized"
-msgstr ""
+msgstr "transação não inicializada"
 
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "duplicate target"
 msgstr "alvo duplicado"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction not prepared"
-msgstr ""
+msgstr "transação não preparada"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "transaction aborted"
-msgstr ""
+msgstr "transação abortada"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "operation not compatible with the transaction type"
-msgstr ""
+msgstr "operação não compatível com tipo de transação"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not commit transaction"
-msgstr ""
+msgstr "não foi possível realizar transação"
 
-#: lib/libalpm/error.c:104
+#, c-format
 msgid "could not download all files"
-msgstr ""
+msgstr "não foi possível fazer o download de todos os arquivos"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "could not find or read package"
-msgstr ""
+msgstr "não foi possível ler ou escrever o pacote"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "pacote inválido ou corrompido"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot open package file"
-msgstr ""
+msgstr "não foi possível abrir arquivo do pacote"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "cannot load package data"
-msgstr ""
+msgstr "não foi possível carregar dados do pacote"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package already installed"
-msgstr ""
+msgstr "pacote já instalado"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "package not installed or lesser version"
-msgstr ""
+msgstr "pacote não instalado ou versão inferior"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "cannot remove all files for package"
-msgstr ""
+msgstr "não foi possível remover todos os arquivos para o pacote"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "package name is not valid"
 msgstr "o nome do pacote não é valido"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "corrupted package"
 msgstr "pacote corrompido"
 
-#: lib/libalpm/error.c:125
+#, c-format
 msgid "no such repository"
-msgstr ""
+msgstr "repositório não existe"
 
-#: lib/libalpm/error.c:128
-#, fuzzy
+#, c-format
 msgid "corrupted delta"
-msgstr "pacote corrompido"
+msgstr "delta corrompido"
 
-#: lib/libalpm/error.c:130
+#, c-format
 msgid "delta patch failed"
-msgstr ""
+msgstr "patch do delta falhou"
 
-#: lib/libalpm/error.c:133
+#, c-format
 msgid "group not found"
 msgstr "grupo não encontrado"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "could not satisfy dependencies"
-msgstr ""
+msgstr "não foi possível satisfazer as dependências"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting dependencies"
-msgstr ""
+msgstr "dependências conflitantes"
 
-#: lib/libalpm/error.c:140
+#, c-format
 msgid "conflicting files"
-msgstr ""
+msgstr "arquivos conflitantes"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "user aborted the operation"
-msgstr ""
+msgstr "usuário abortou a operação"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "internal error"
 msgstr "erro interno"
 
-#: lib/libalpm/error.c:147
+#, c-format
 msgid "libarchive error"
-msgstr ""
+msgstr "erro da libarchive"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "not confirmed"
-msgstr ""
+msgstr "não confirmado"
 
-#: lib/libalpm/error.c:152
+#, c-format
 msgid "invalid regular expression"
 msgstr "expressão regular inválida"
 
-#: lib/libalpm/error.c:155
+#, c-format
 msgid "connection to remote host failed"
-msgstr ""
+msgstr "conexão ao host remoto falhou"
 
-#: lib/libalpm/error.c:158
+#, c-format
 msgid "unexpected error"
 msgstr "erro inesperado"
 
-#: lib/libalpm/package.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "não foi possível conseguir a soma md5 para o pacote %s-%s"
+msgstr "não foi possível obter a soma md5 para o pacote %s-%s\n"
 
-#: lib/libalpm/package.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "somas md5 não coincidem para o pacote %s-%s"
+msgstr "somas md5 não coincidem para o pacote %s-%s\n"
 
-#: lib/libalpm/package.c:737
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
-msgstr ""
+msgstr "%s: forçando upgrade para a versão %s\n"
 
-#: lib/libalpm/package.c:742
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
+msgstr "%s: local (%s) é mais novo que %s (%s)\n"
 
-#: lib/libalpm/package.c:750
 #, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr ""
+msgid "error extracting package description file to %s\n"
+msgstr "erro ao extrair o arquivo de descrição do pacote para %s\n"
 
-#: lib/libalpm/package.c:931
-#, fuzzy, c-format
+#, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "não foi possível remover o arquivo de lock %s"
+msgstr "não foi possível interpretar o arquivo de descrição do pacote em %s\n"
 
-#: lib/libalpm/package.c:936
-#, fuzzy, c-format
+#, c-format
 msgid "missing package name in %s\n"
-msgstr "o nome do pacote não é valido"
+msgstr "faltando o nome do pacote em %s\n"
 
-#: lib/libalpm/package.c:940
 #, c-format
 msgid "missing package version in %s\n"
-msgstr ""
+msgstr "faltando a versão do pacote em %s\n"
 
-#: lib/libalpm/package.c:970
-#, fuzzy, c-format
-msgid "could not remove tempfile %s\n"
-msgstr "não foi possível remover o arquivo de lock %s"
-
-#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr ""
+msgstr "erro ao ler o pacote %s: %s\n"
 
-#: lib/libalpm/package.c:1005
 #, c-format
 msgid "missing package metadata in %s\n"
-msgstr ""
+msgstr "faltando metadata do pacote em %s\n"
 
-#: lib/libalpm/package.c:1012
 #, c-format
-msgid "missing package filelist in %s, generating one\n"
-msgstr ""
-
-#: lib/libalpm/remove.c:121
-#, fuzzy, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "não foi possível encontrar a base de dados"
+msgstr "não foi possível encontrar %s na base de dados - pulando\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "não foi possível abrir o arquivo %s: %s"
+msgstr "não foi possível remover o arquivo '%s': %s\n"
 
-#: lib/libalpm/remove.c:337
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "não foi possível remover a entrada da base de dados %s%s"
+msgstr "não foi possível remover a entrada da base de dados %s-%s\n"
 
-#: lib/libalpm/remove.c:342
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "não foi possível adicionar a entrada '%s' ao cache"
+msgstr "não foi possível remover a entrada '%s' da cache\n"
 
-#: lib/libalpm/server.c:56
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr ""
+msgstr "url '%s' é inválida, ignorando\n"
 
-#: lib/libalpm/server.c:60
+#, c-format
 msgid "url scheme not specified, assuming http\n"
-msgstr ""
+msgstr "esquema da url não especificado, assumindo http\n"
 
-#: lib/libalpm/server.c:241
+#, c-format
 msgid "disk"
-msgstr ""
+msgstr "disco"
 
-#: lib/libalpm/server.c:245
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr ""
+msgstr "falha ao obter arquivo '%s' de %s : %s\n"
 
-#: lib/libalpm/server.c:275
+#, c-format
 msgid "cannot resume download, starting over\n"
-msgstr ""
+msgstr "não foi possível resumir o download, reiniciando\n"
 
-#: lib/libalpm/server.c:288
-#, fuzzy, c-format
+#, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "não foi possível remover o arquivo de lock %s"
+msgstr "não foi possível escrever no arquivo '%s'\n"
 
-#: lib/libalpm/server.c:307
 #, c-format
 msgid "error downloading '%s': %s\n"
-msgstr ""
+msgstr "erro no download de '%s': %s\n"
 
-#: lib/libalpm/server.c:319
 #, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr ""
+msgstr "erro ao escrever no arquivo '%s': %s\n"
 
-#: lib/libalpm/server.c:387
-#, fuzzy, c-format
+#, c-format
 msgid "could not chdir to %s\n"
-msgstr "não foi possível extrair %s (%s)"
+msgstr "não foi possível mudar para o diretório %s\n"
 
-#: lib/libalpm/server.c:394
+#, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr ""
+msgstr "rodando XferCommand: fork falhou!\n"
 
-#: lib/libalpm/server.c:445
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr ""
+msgstr "URL não contém um arquivo para download\n"
 
-#: lib/libalpm/server.c:458
 #, c-format
 msgid "failed to download %s\n"
-msgstr ""
+msgstr "falha ao fazer o download de %s\n"
 
-#: lib/libalpm/sync.c:135
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr ""
+msgstr "%s-%s: ignorando upgrade do pacote (a ser substituido por %s-%s)\n"
 
-#: lib/libalpm/sync.c:250
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr ""
+msgstr "%s: ignorando upgrade do pacote (%s => %s)\n"
 
-#: lib/libalpm/sync.c:320
 #, c-format
 msgid "repository '%s' not found\n"
-msgstr ""
+msgstr "repositório '%s' não encontrado\n"
 
-#: lib/libalpm/sync.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "versão atualizada %s-%s está na lista de pacotes -- pulando"
+msgstr "%s-%s está atualizado -- pulando\n"
 
-#: lib/libalpm/sync.c:358
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr ""
+msgstr "%s-%s está atualizado -- reinstalando\n"
 
-#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr ""
+msgstr "conflito de pacotes não solucionável detectado\n"
 
-#: lib/libalpm/sync.c:628
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr ""
+msgstr "falha de malloc: não foi possível alocar %zd bytes\n"
 
-#: lib/libalpm/sync.c:825
 #, c-format
 msgid "command: %s\n"
-msgstr ""
+msgstr "comando: %s\n"
 
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "não foi possível conseguir a soma md5 para o pacote %s-%s"
+msgstr "não foi possível obter a soma md5 para o pacote %s\n"
 
-#: lib/libalpm/sync.c:910
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr ""
+msgstr "arquivo %s estava corrompido (checksum MD5 inválida)\n"
 
-#: lib/libalpm/sync.c:1056
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr ""
+msgstr "falha ao obter alguns arquivos de %s\n"
 
-#: lib/libalpm/sync.c:1137
-#, fuzzy
-msgid "could not create removal transaction\n"
-msgstr "não foi possível criar a base de dados"
-
-#: lib/libalpm/sync.c:1143
-msgid "could not initialize the removal transaction\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:1165
-#, fuzzy
-msgid "could not prepare removal transaction\n"
-msgstr "não foi possível criar a base de dados"
-
-#: lib/libalpm/sync.c:1171
-msgid "could not commit removal transaction\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:1182
-#, fuzzy
-msgid "could not create transaction\n"
-msgstr "não foi possível criar a base de dados"
-
-#: lib/libalpm/sync.c:1187
-msgid "could not initialize transaction\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:1214
-#, fuzzy
-msgid "could not prepare transaction\n"
-msgstr "não foi possível criar a base de dados"
-
-#: lib/libalpm/sync.c:1219
-msgid "could not commit transaction\n"
-msgstr ""
-
-#: lib/libalpm/trans.c:214
-#, fuzzy, c-format
-msgid "could not remove lock file %s\n"
-msgstr "não foi possível remover o arquivo de lock %s"
-
-#: lib/libalpm/trans.c:483
 #, c-format
-msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
-msgstr ""
+msgid "could not create removal transaction\n"
+msgstr "não foi possível criar transação de remoção\n"
 
-#: lib/libalpm/trans.c:494
-#, fuzzy
+#, c-format
+msgid "could not initialize the removal transaction\n"
+msgstr "não foi possível inicializar a transação de remoção\n"
+
+#, c-format
+msgid "could not prepare removal transaction\n"
+msgstr "não foi possível preparar a transação de remoção\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "não foi possível efetuar a transação de remoção\n"
+
+#, c-format
+msgid "could not create transaction\n"
+msgstr "não foi possível criar a transação\n"
+
+#, c-format
+msgid "could not initialize transaction\n"
+msgstr "não foi possível inicializar a transação\n"
+
+#, c-format
+msgid "could not prepare transaction\n"
+msgstr "não foi possível preparar a transação\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "não foi possível efetuar a transação\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "não foi possível remover o arquivo de trava %s\n"
+
+#, c-format
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "/bin/sh não encontrado no diretório pai, abortando scriptlet\n"
+
+#, c-format
 msgid "could not create temp directory\n"
-msgstr "não foi possível obter o diretório de trabalho atual"
+msgstr "não foi possível criar diretório temporário\n"
 
-#: lib/libalpm/trans.c:536
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "não foi possível extrair %s (%s)"
+msgstr "não foi possível mudar diretório para %s (%s)\n"
 
-#: lib/libalpm/trans.c:554
-#, fuzzy, c-format
+#, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "não foi possível renomear %s (%s)"
+msgstr "não foi possível fazer fork de um novo processo (%s)\n"
 
-#: lib/libalpm/trans.c:564
-#, fuzzy, c-format
+#, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "não foi possível obter o diretório de trabalho atual"
+msgstr "não foi possível mudar o diretório raiz (%s)\n"
 
-#: lib/libalpm/trans.c:569
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to / (%s)\n"
-msgstr "não foi possível extrair %s (%s)"
+msgstr "não foi possível mudar o diretório para / (%s)\n"
 
-#: lib/libalpm/trans.c:578
-#, fuzzy, c-format
+#, c-format
 msgid "call to popen failed (%s)"
-msgstr "não foi possível abrir o arquivo %s: %s"
+msgstr "chamada para popen falhou (%s)"
 
-#: lib/libalpm/trans.c:597
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr ""
+msgstr "chamada para waitpid falhou (%s)\n"
 
-#: lib/libalpm/trans.c:606
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr ""
+msgstr "scriptlet falhou em executar corretamente\n"
 
-#: lib/libalpm/trans.c:615
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "não foi possível remover o arquivo de lock %s"
+msgstr "não foi possível remover o diretório temporário %s\n"
 
-#: lib/libalpm/util.c:204
 #, c-format
 msgid "failed to make path '%s' : %s\n"
-msgstr ""
+msgstr "falha ao criar caminho '%s' : %s\n"
 
-#: lib/libalpm/util.c:389
 #, c-format
 msgid "could not open %s: %s\n"
-msgstr ""
+msgstr "não foi possível abrir %s : %s\n"
 
-#: lib/libalpm/util.c:573
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr ""
+msgstr "cache %s não existe, criando...\n"
 
-#: lib/libalpm/util.c:593
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr ""
+msgstr "não foi possível criar cache de pacotes, usando /tmp\n"
 
-#: lib/libalpm/util.c:643
 #, c-format
 msgid "md5: %s can't be opened\n"
-msgstr ""
+msgstr "md5: %s não pôde ser aberto\n"
 
-#: lib/libalpm/util.c:645
 #, c-format
 msgid "md5: %s can't be read\n"
-msgstr ""
-
-#~ msgid "please remove '%s' first, using -Rd"
-#~ msgstr "por favor, remova '%s' primeiro usando -Rd"
-
-#~ msgid "could not extract %s (%s)"
-#~ msgstr "não foi possível extrair %s (%s)"
-
-#~ msgid "could not update provision '%s' from '%s'"
-#~ msgstr "não foi possível atualizar a provisão '%s' para '%s'"
-
-#~ msgid "could not get sha1sum for package %s-%s"
-#~ msgstr "não foi possível conseguir a soma sha1 para o pacote %s-%s"
-
-#~ msgid "sha1sums do not match for package %s-%s"
-#~ msgstr "somas sha1 não coincidem para o pacote %s-%s"
+msgstr "md5: %s não pôde ser lido\n"

lib/libalpm/po/ru.po

@@ -0,0 +1,613 @@
+# Russian translations for Pacman package manager package.
+# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
+#  <4rayven@gmail.com>, 2007. <serg.partizan@gmail.com> 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.0.0\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-18 19:46+0300\n"
+"Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
+"Language-Team: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "заменяю устаревшую версию %s-%s на %s в списке целей\n"
+
+#, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
+msgstr "новая версия %s-%s в списке целей --  пропускаю\n"
+
+#, c-format
+msgid "conflicting packages were found in the target list\n"
+msgstr "в списке целей найдены конфликтующие пакеты\n"
+
+#, c-format
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr "вы не можете установить два конфликтующих пакета одновременно\n"
+
+#, c-format
+msgid "replacing packages with -A and -U is not supported yet\n"
+msgstr "замещение пакетов с использованием опций -A и -U еще не реализовано\n"
+
+#, c-format
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr "вы можете заменить пакеты вручную, используя -Rd и -U\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"права доступа различаются у директории %s\n"
+"файловая система: %o  пакет: %o\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "извлечение: символическая ссылка %s не указывает на директорию\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "извлечение: не перезаписываю директорию файлом %s\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "не могу извлечь %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s (%s)\n"
+msgstr "не могу переименовать %s (%s)\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "не могу скопировать временный файл в %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s сохранен как %s\n"
+
+#, c-format
+msgid "could not install %s as %s: %s\n"
+msgstr "не могу установить %s как %s: %s\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s установлен как %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "извлекаю %s как %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "не могу определить текущую рабочую директорию\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "обнаружена проблема во время обновления %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "обнаружена проблема во время установки %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "не могу обновить в базе данных запись %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "не могу добавить запись '%s' в кэш\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "неправильное имя для записи базы данных '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "не могу открыть файл %s: %s\n"
+
+#, c-format
+msgid "could not remove database entry %s%s\n"
+msgstr "не могу удалить из базы данных запись %s%s\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "попытка перерегистрировать локальную базу данных\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "путь к базе данных не определён\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "обнаружена циклическая зависимость:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s будет удалён после %s, как зависимость\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s будет установлен перед %s, как зависимость\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "не удается разрешить \"%s\", зависимость \"%s\"\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "недостаточно памяти!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "неожиданная ошибка"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "недостаточно привилегий"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "не могу найти или прочитать файл"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "не удается найти или прочитать директорию"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "неправильный или нулевой аргумент"
+
+#, c-format
+msgid "library not initialized"
+msgstr "библиотека не инициализирована"
+
+#, c-format
+msgid "library already initialized"
+msgstr "библиотека уже инициализирована"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "не удается заблокировать базу данных"
+
+#, c-format
+msgid "could not open database"
+msgstr "не удается открыть базу данных"
+
+#, c-format
+msgid "could not create database"
+msgstr "не удается создать базу данных"
+
+#, c-format
+msgid "database not initialized"
+msgstr "база данных не инициализирована"
+
+#, c-format
+msgid "database already registered"
+msgstr "база данных уже зарегистрирована"
+
+#, c-format
+msgid "could not find database"
+msgstr "не удается найти базу данных"
+
+#, c-format
+msgid "could not update database"
+msgstr "не удается обновить базу данных"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "не удается удалить запись в базе данных"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "неверный url"
+
+#, c-format
+msgid "could not set parameter"
+msgstr "ну могу установить параметр"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "запрос уже инициализирован"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "запрос не инициализирован"
+
+#, c-format
+msgid "duplicate target"
+msgstr "повторение целей"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "запрос не подготовлен"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "запрос отменён"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "операция не совместима с типом запроса"
+
+#, c-format
+msgid "could not commit transaction"
+msgstr "не могу совершить запрос"
+
+#, c-format
+msgid "could not download all files"
+msgstr "не могу загрузить все файлы"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "не удается найти или прочитать пакет"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "пакет неправильный или поврежден"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "не удается открыть файл пакета"
+
+#, c-format
+msgid "cannot load package data"
+msgstr "не удается загрузить данные пакета"
+
+#, c-format
+msgid "package already installed"
+msgstr "пакет уже установлен"
+
+#, c-format
+msgid "package not installed or lesser version"
+msgstr "пекет не установлен или ранней версии"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "не могу удалить все файлы пакета"
+
+#, c-format
+msgid "package name is not valid"
+msgstr "неверное имя пакета"
+
+#, c-format
+msgid "corrupted package"
+msgstr "пакет поврежден"
+
+#, c-format
+msgid "no such repository"
+msgstr "нет такого репозитория"
+
+#, c-format
+msgid "corrupted delta"
+msgstr "дельта-патчи повреждены"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "не удалось применить дельта-патч"
+
+#, c-format
+msgid "group not found"
+msgstr "группа не найдена"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "не удается удовлетворить зависимости"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "конфликтующие зависимости"
+
+#, c-format
+msgid "conflicting files"
+msgstr "конфликрующие файлы"
+
+#, c-format
+msgid "user aborted the operation"
+msgstr "пользователь прервал операцию"
+
+#, c-format
+msgid "internal error"
+msgstr "внутренняя ошибка"
+
+#, c-format
+msgid "libarchive error"
+msgstr "ошибка в libarchive"
+
+#, c-format
+msgid "not confirmed"
+msgstr "не подтверждено"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "неверное регулярное выражение"
+
+#, c-format
+msgid "connection to remote host failed"
+msgstr "не удалось подключиться к удаленному хосту"
+
+#, c-format
+msgid "unexpected error"
+msgstr "непредвиденная ошибка"
+
+#, c-format
+msgid "could not get md5sum for package %s-%s\n"
+msgstr "не могу получить контрольную сумму md5 для пакета %s-%s\n"
+
+#, c-format
+msgid "md5sums do not match for package %s-%s\n"
+msgstr "контрольные суммы md5 для пакета %s-%s не совпали\n"
+
+#, c-format
+msgid "%s: forcing upgrade to version %s\n"
+msgstr "%s: принудительно обновляю до версии %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n"
+
+#, c-format
+msgid "error extracting package description file to %s\n"
+msgstr "ошибка извлечения файла описания пакета в %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "не могу проанализировать файл с описанием пакета в %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "пропущено имя пакета в %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "пропущена версия пакета в %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "ошибка при чтении пакета %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "отсутствуют метаданые пакета в %s\n"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "не могу найти %s в базе данных --  пропускаю\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "не могу удалить файл '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "не могу удалить из базы данных запись %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "не могу удалить запись '%s' из кеша\n"
+
+#, c-format
+msgid "url '%s' is invalid, ignoring\n"
+msgstr "url '%s' недействительный, пропускаю\n"
+
+#, c-format
+msgid "url scheme not specified, assuming http\n"
+msgstr "url не определён, подразумевается http\n"
+
+#, c-format
+msgid "disk"
+msgstr "диск"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "не удалось получить файл '%s' из %s : %s\n"
+
+#, c-format
+msgid "cannot resume download, starting over\n"
+msgstr "не удалось продолжить закачку, начинаю заново\n"
+
+#, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "не могу записать в файл '%s'\n"
+
+#, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "ошибка загрузки '%s': %s\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "не могу записать в файл '%s': %s\n"
+
+#, c-format
+msgid "could not chdir to %s\n"
+msgstr "не могу изменить директорию на %s\n"
+
+#, c-format
+msgid "running XferCommand: fork failed!\n"
+msgstr "запуск XferCommand: неудача\n"
+
+#, c-format
+msgid "URL does not contain a file for download\n"
+msgstr "URL не содержит имени файла для загрузки\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "не могу загрузить %s\n"
+
+#, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: игнорирую обновление пакета (он будет заменен на %s-%s)\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: игнорирую обновление пакета (%s => %s)\n"
+
+#, c-format
+msgid "repository '%s' not found\n"
+msgstr "репозиторий '%s' не найден\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s не устарел --  пропускаю\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s не устарел --  переустанавливаю\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "обнаружен неразрешимый конфликт пакетов\n"
+
+#, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "сбой malloc: не удалось выделить %zd байт\n"
+
+#, c-format
+msgid "command: %s\n"
+msgstr "комманда: %s\n"
+
+#, c-format
+msgid "can't get md5 checksum for file %s\n"
+msgstr "не удалось получить md5 контрольную сумму для файла %s\n"
+
+#, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
+msgstr "архив %s поврежден (не сходятся контрольные MD5-суммы)\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "не удалось получить некоторые файлы с %s\n"
+
+#, c-format
+msgid "could not create removal transaction\n"
+msgstr "не удалось создать запрос на удаление\n"
+
+#, c-format
+msgid "could not initialize the removal transaction\n"
+msgstr "не удалось инициализировать запрос на удаление\n"
+
+#, c-format
+msgid "could not prepare removal transaction\n"
+msgstr "не удалось подготовить запрос на удаление\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "не удалось совершить запрос на удаление\n"
+
+#, c-format
+msgid "could not create transaction\n"
+msgstr "не удалось создать запрос\n"
+
+#, c-format
+msgid "could not initialize transaction\n"
+msgstr "не удалось инициализировать запрос\n"
+
+#, c-format
+msgid "could not prepare transaction\n"
+msgstr "не удалось подготовить запрос\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "не удалось совершить запрос\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "не могу удалить lock-файл %s\n"
+
+#, c-format
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "Нету /bin/sh в родительском окружении, отмена скрипта\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "не удалось создать временную директорию\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "не удалось изменить директорию на %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "не не удалось создать новый процесс (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "не удалось изменить корневую директорию (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "не удалось изменить директорию на / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)"
+msgstr "вызов popen не удался (%s)"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "вызов waitpid не удался (%s)\n"
+
+#, c-format
+msgid "scriptlet failed to execute correctly\n"
+msgstr "не удалось корректно выполнить скрипт\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "не могу удалить tmpdir %s\n"
+
+#, c-format
+msgid "failed to make path '%s' : %s\n"
+msgstr "не удалось создать путь '%s' : %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "не удалось откруть %s: %s\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "кэш %s не существует, создаю...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "не могу создать кэш пакетов, будет использован /tmp\n"
+
+#, c-format
+msgid "md5: %s can't be opened\n"
+msgstr "md5: %s не может быть открыт\n"
+
+#, c-format
+msgid "md5: %s can't be read\n"
+msgstr "md5: %s не может быть прочитан\n"
+
+#, fuzzy
+#~ msgid "loading package data for %s : level=%d\n"
+#~ msgstr "загружаю данные пакета %s : уровень=%d\n"
+
+#, fuzzy
+#~ msgid "could not remove tempfile %s\n"
+#~ msgstr "не могу удалить временный файл %s\n"
+
+#, fuzzy
+#~ msgid "missing package filelist in %s, generating one\n"
+#~ msgstr "отсутствует список файлов пакета в %s, генерирую его\n"
+
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "пожалуйста, уделите сначала '%s' используя -Rd\n"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "не могу извлечь %s (%s)"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "не могу обновить '%s' из '%s'"
+
+#~ msgid "cannot remove file %s: %s"
+#~ msgstr "не могу удалить файл %s: %s"
+
+#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+#~ msgstr "архив %s поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"

lib/libalpm/po/ru_RU.po

@@ -1,707 +0,0 @@
-# Russian translations for Pacman package manager package.
-# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the Pacman package manager package.
-#  <4rayven@gmail.com>, 2007.
-#
-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-03-16 02:52+1000\n"
-"Last-Translator:  Vladimir Bayrakovskiy <4rayven@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"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
-#, c-format
-msgid "replacing older version %s-%s by %s in target list\n"
-msgstr ""
-
-#: lib/libalpm/add.c:97
-#, fuzzy, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "%s-%s не устарел --  пропускаю"
-
-#: lib/libalpm/add.c:168
-msgid "conflicting packages were found in the target list\n"
-msgstr ""
-
-#: lib/libalpm/add.c:169
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-
-#: lib/libalpm/add.c:172
-#, fuzzy
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "замещение пакетов с использованием опций -A и -U еще не реализовано"
-
-#: lib/libalpm/add.c:173
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-
-#: lib/libalpm/add.c:365
-#, c-format
-msgid ""
-"directory permissions differ on %s\n"
-"filesystem: %o  package: %o\n"
-msgstr ""
-
-#: lib/libalpm/add.c:392
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr ""
-
-#: lib/libalpm/add.c:399
-#, 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
-#, fuzzy, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "не могу извлечь %s (%s)"
-
-#: lib/libalpm/add.c:505
-#, 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
-#, 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
-#, fuzzy, c-format
-msgid "%s saved as %s\n"
-msgstr "%s сохранен как %s"
-
-#: lib/libalpm/add.c:556
-#, fuzzy, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "не могу установить %s как %s: %s"
-
-#: lib/libalpm/add.c:559
-#, fuzzy, c-format
-msgid "%s installed as %s\n"
-msgstr "%s установлен как %s"
-
-#: lib/libalpm/add.c:576
-#, fuzzy, c-format
-msgid "extracting %s as %s.pacnew\n"
-msgstr "извлекаю %s как %s.pacnew"
-
-#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
-#, fuzzy
-msgid "could not get current working directory\n"
-msgstr "не могу определить текущую рабочую директорию"
-
-#: lib/libalpm/add.c:765
-#, fuzzy, c-format
-msgid "problem occurred while upgrading %s\n"
-msgstr "во время %s %s произошли ошибки"
-
-#: lib/libalpm/add.c:770
-#, fuzzy, c-format
-msgid "problem occurred while installing %s\n"
-msgstr "во время %s %s произошли ошибки"
-
-#: lib/libalpm/add.c:785
-#, fuzzy, c-format
-msgid "could not update database entry %s-%s\n"
-msgstr "не могу обновить в базе данных запись %s-%s"
-
-#: lib/libalpm/add.c:793
-#, fuzzy, c-format
-msgid "could not add entry '%s' in cache\n"
-msgstr "не могу добавить запись '%s' в кэш"
-
-#: lib/libalpm/be_files.c:223
-#, 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
-#, 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
-#, fuzzy, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "не могу удалить из базы данных запись %s%s"
-
-#: lib/libalpm/db.c:553
-msgid "attempt to re-register the 'local' DB\n"
-msgstr ""
-
-#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
-#, fuzzy
-msgid "database path is undefined\n"
-msgstr "база данных не инициализирована"
-
-#: lib/libalpm/deps.c:173
-#, fuzzy
-msgid "dependency cycle detected:\n"
-msgstr "обнаружена циклическая зависимость: %s"
-
-#: lib/libalpm/deps.c:175
-#, c-format
-msgid "%s will be removed after its %s dependency\n"
-msgstr ""
-
-#: lib/libalpm/deps.c:177
-#, c-format
-msgid "%s will be installed before its %s dependency\n"
-msgstr ""
-
-#: lib/libalpm/deps.c:573
-#, fuzzy, c-format
-msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "не удается удовлетворить зависимости для \"%s\""
-
-#: lib/libalpm/error.c:43
-msgid "out of memory!"
-msgstr ""
-
-#: lib/libalpm/error.c:45
-msgid "unexpected system error"
-msgstr ""
-
-#: lib/libalpm/error.c:47
-msgid "insufficient privileges"
-msgstr ""
-
-#: lib/libalpm/error.c:49
-msgid "could not find or read file"
-msgstr ""
-
-#: lib/libalpm/error.c:51
-#, fuzzy
-msgid "could not find or read directory"
-msgstr "не удается найти или прочитать пакет"
-
-#: lib/libalpm/error.c:53
-msgid "wrong or NULL argument passed"
-msgstr ""
-
-#: lib/libalpm/error.c:56
-msgid "library not initialized"
-msgstr ""
-
-#: lib/libalpm/error.c:58
-msgid "library already initialized"
-msgstr ""
-
-#: lib/libalpm/error.c:60
-msgid "unable to lock database"
-msgstr "не удается заблокировать базу данных"
-
-#: lib/libalpm/error.c:63
-msgid "could not open database"
-msgstr "не удается открыть базу данных"
-
-#: lib/libalpm/error.c:65
-msgid "could not create database"
-msgstr "не удается создать базу данных"
-
-#: lib/libalpm/error.c:67
-msgid "database not initialized"
-msgstr "база данных не инициализирована"
-
-#: lib/libalpm/error.c:69
-msgid "database already registered"
-msgstr "база данных уже зарегистрирована"
-
-#: lib/libalpm/error.c:71
-msgid "could not find database"
-msgstr "не удается найти базу данных"
-
-#: lib/libalpm/error.c:73
-msgid "could not update database"
-msgstr "не удается обновить базу данных"
-
-#: lib/libalpm/error.c:75
-msgid "could not remove database entry"
-msgstr "не удается удалить запись в базе данных"
-
-#: lib/libalpm/error.c:78
-msgid "invalid url for server"
-msgstr "неверный url"
-
-#: lib/libalpm/error.c:85
-msgid "could not set parameter"
-msgstr "ну могу установить параметр"
-
-#: lib/libalpm/error.c:88
-msgid "transaction already initialized"
-msgstr ""
-
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
-msgid "transaction not initialized"
-msgstr ""
-
-#: lib/libalpm/error.c:92
-msgid "duplicate target"
-msgstr ""
-
-#: lib/libalpm/error.c:96
-msgid "transaction not prepared"
-msgstr ""
-
-#: lib/libalpm/error.c:98
-msgid "transaction aborted"
-msgstr ""
-
-#: lib/libalpm/error.c:100
-msgid "operation not compatible with the transaction type"
-msgstr ""
-
-#: lib/libalpm/error.c:102
-msgid "could not commit transaction"
-msgstr ""
-
-#: lib/libalpm/error.c:104
-msgid "could not download all files"
-msgstr "не могу загрузить все файлы"
-
-#: lib/libalpm/error.c:107
-msgid "could not find or read package"
-msgstr "не удается найти или прочитать пакет"
-
-#: lib/libalpm/error.c:109
-msgid "invalid or corrupted package"
-msgstr "пакет неправильный или поврежден"
-
-#: lib/libalpm/error.c:111
-msgid "cannot open package file"
-msgstr "не удается открыть файл пакета"
-
-#: lib/libalpm/error.c:113
-msgid "cannot load package data"
-msgstr "не удается загрузить данные пакета"
-
-#: lib/libalpm/error.c:115
-msgid "package already installed"
-msgstr "пакет уже установлен"
-
-#: lib/libalpm/error.c:117
-msgid "package not installed or lesser version"
-msgstr ""
-
-#: lib/libalpm/error.c:119
-msgid "cannot remove all files for package"
-msgstr "не могу удалить все файлы пакета"
-
-#: lib/libalpm/error.c:121
-msgid "package name is not valid"
-msgstr "неверное имя пакета"
-
-#: lib/libalpm/error.c:123
-msgid "corrupted package"
-msgstr "пакет поврежден"
-
-#: lib/libalpm/error.c:125
-msgid "no such repository"
-msgstr "нет такого репозитория"
-
-#: lib/libalpm/error.c:128
-#, fuzzy
-msgid "corrupted delta"
-msgstr "пакет поврежден"
-
-#: lib/libalpm/error.c:130
-msgid "delta patch failed"
-msgstr ""
-
-#: lib/libalpm/error.c:133
-msgid "group not found"
-msgstr "группа не найдена"
-
-#: lib/libalpm/error.c:136
-msgid "could not satisfy dependencies"
-msgstr "не удается удовлетворить зависимости"
-
-#: lib/libalpm/error.c:138
-msgid "conflicting dependencies"
-msgstr ""
-
-#: lib/libalpm/error.c:140
-msgid "conflicting files"
-msgstr ""
-
-#: lib/libalpm/error.c:143
-msgid "user aborted the operation"
-msgstr "пользователь прервал операцию"
-
-#: lib/libalpm/error.c:145
-msgid "internal error"
-msgstr "внутренняя ошибка"
-
-#: lib/libalpm/error.c:147
-msgid "libarchive error"
-msgstr "ошибка в libarchive"
-
-#: lib/libalpm/error.c:150
-msgid "not confirmed"
-msgstr ""
-
-#: lib/libalpm/error.c:152
-msgid "invalid regular expression"
-msgstr "неверное регулярное выражение"
-
-#: lib/libalpm/error.c:155
-msgid "connection to remote host failed"
-msgstr "не удалось подключиться к удаленному хосту"
-
-#: lib/libalpm/error.c:158
-msgid "unexpected error"
-msgstr "непредвиденная ошибка"
-
-#: lib/libalpm/package.c:124
-#, fuzzy, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "не могу получить контрольную сумму md5sum для пакета %s-%s"
-
-#: lib/libalpm/package.c:133
-#, fuzzy, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "контрольные суммы md5sum для пакета %s-%s не совпали"
-
-#: lib/libalpm/package.c:737
-#, fuzzy, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: принудительно обновляю до версии %s"
-
-#: lib/libalpm/package.c:742
-#, fuzzy, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: установленная версия (%s) новее, чем в %s (%s)"
-
-#: lib/libalpm/package.c:750
-#, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s: принудительно обновляю до версии %s"
-
-#: lib/libalpm/package.c:931
-#, fuzzy, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "не могу удалить временный файл %s"
-
-#: lib/libalpm/package.c:936
-#, fuzzy, c-format
-msgid "missing package name in %s\n"
-msgstr "отсутствует список файлов пакета в %s, генерирую его"
-
-#: lib/libalpm/package.c:940
-#, 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
-#, fuzzy, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "ошибка при чтении пакета: %s"
-
-#: lib/libalpm/package.c:1005
-#, 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
-#, fuzzy, c-format
-msgid "could not find %s in database -- skipping\n"
-msgstr "не могу найти %s в базе данных --  пропускаю"
-
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
-#, fuzzy, c-format
-msgid "cannot remove file '%s': %s\n"
-msgstr "не могу удалить файл '%s': %s"
-
-#: lib/libalpm/remove.c:337
-#, fuzzy, c-format
-msgid "could not remove database entry %s-%s\n"
-msgstr "не могу удалить из базы данных запись %s%s"
-
-#: lib/libalpm/remove.c:342
-#, fuzzy, c-format
-msgid "could not remove entry '%s' from cache\n"
-msgstr "не могу добавить запись '%s' в кэш"
-
-#: lib/libalpm/server.c:56
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr ""
-
-#: lib/libalpm/server.c:60
-msgid "url scheme not specified, assuming http\n"
-msgstr ""
-
-#: lib/libalpm/server.c:241
-msgid "disk"
-msgstr ""
-
-#: lib/libalpm/server.c:245
-#, fuzzy, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "не удалось получить некоторые файлы с %s\n"
-
-#: lib/libalpm/server.c:275
-msgid "cannot resume download, starting over\n"
-msgstr ""
-
-#: lib/libalpm/server.c:288
-#, fuzzy, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "не могу удалить файл '%s': %s"
-
-#: lib/libalpm/server.c:307
-#, fuzzy, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "ошибка при чтении пакета: %s"
-
-#: lib/libalpm/server.c:319
-#, fuzzy, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "не могу удалить файл '%s': %s"
-
-#: lib/libalpm/server.c:387
-#, fuzzy, c-format
-msgid "could not chdir to %s\n"
-msgstr "не могу извлечь %s (%s)"
-
-#: lib/libalpm/server.c:394
-msgid "running XferCommand: fork failed!\n"
-msgstr ""
-
-#: lib/libalpm/server.c:445
-msgid "URL does not contain a file for download\n"
-msgstr ""
-
-#: lib/libalpm/server.c:458
-#, fuzzy, c-format
-msgid "failed to download %s\n"
-msgstr "не могу загрузить все файлы"
-
-#: lib/libalpm/sync.c:135
-#, 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
-#, fuzzy, c-format
-msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
-
-#: lib/libalpm/sync.c:320
-#, fuzzy, c-format
-msgid "repository '%s' not found\n"
-msgstr "репозиторий '%s' не найден"
-
-#: lib/libalpm/sync.c:354
-#, fuzzy, c-format
-msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s не устарел --  пропускаю"
-
-#: lib/libalpm/sync.c:358
-#, 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
-#, fuzzy
-msgid "unresolvable package conflicts detected\n"
-msgstr "обнаружен неразрешимый конфликт пакетов"
-
-#: lib/libalpm/sync.c:628
-#, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:825
-#, c-format
-msgid "command: %s\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
-#, fuzzy, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "не удалось получить md5 или sha1 контрольную сумму для пакета %s\n"
-
-#: lib/libalpm/sync.c:910
-#, fuzzy, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "архив %s был поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"
-
-#: lib/libalpm/sync.c:1056
-#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr "не удалось получить некоторые файлы с %s\n"
-
-#: lib/libalpm/sync.c:1137
-#, fuzzy
-msgid "could not create removal transaction\n"
-msgstr "не удается создать базу данных"
-
-#: lib/libalpm/sync.c:1143
-msgid "could not initialize the removal transaction\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:1165
-#, fuzzy
-msgid "could not prepare removal transaction\n"
-msgstr "не удается создать базу данных"
-
-#: lib/libalpm/sync.c:1171
-msgid "could not commit removal transaction\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:1182
-#, fuzzy
-msgid "could not create transaction\n"
-msgstr "не удается создать базу данных"
-
-#: lib/libalpm/sync.c:1187
-msgid "could not initialize transaction\n"
-msgstr ""
-
-#: lib/libalpm/sync.c:1214
-#, fuzzy
-msgid "could not prepare transaction\n"
-msgstr "не удается создать базу данных"
-
-#: lib/libalpm/sync.c:1219
-msgid "could not commit transaction\n"
-msgstr ""
-
-#: lib/libalpm/trans.c:214
-#, 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"
-msgstr ""
-
-#: lib/libalpm/trans.c:494
-#, fuzzy
-msgid "could not create temp directory\n"
-msgstr "не могу определить текущую рабочую директорию"
-
-#: lib/libalpm/trans.c:536
-#, fuzzy, c-format
-msgid "could not change directory to %s (%s)\n"
-msgstr "не могу извлечь %s (%s)"
-
-#: lib/libalpm/trans.c:554
-#, fuzzy, c-format
-msgid "could not fork a new process (%s)\n"
-msgstr "не могу переименовать %s (%s)"
-
-#: lib/libalpm/trans.c:564
-#, fuzzy, c-format
-msgid "could not change the root directory (%s)\n"
-msgstr "не могу определить текущую рабочую директорию"
-
-#: lib/libalpm/trans.c:569
-#, fuzzy, c-format
-msgid "could not change directory to / (%s)\n"
-msgstr "не могу извлечь %s (%s)"
-
-#: lib/libalpm/trans.c:578
-#, c-format
-msgid "call to popen failed (%s)"
-msgstr ""
-
-#: lib/libalpm/trans.c:597
-#, c-format
-msgid "call to waitpid failed (%s)\n"
-msgstr ""
-
-#: lib/libalpm/trans.c:606
-msgid "scriptlet failed to execute correctly\n"
-msgstr ""
-
-#: lib/libalpm/trans.c:615
-#, fuzzy, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "не могу удалить временный файл %s"
-
-#: lib/libalpm/util.c:204
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr ""
-
-#: lib/libalpm/util.c:389
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr ""
-
-#: lib/libalpm/util.c:573
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "кэш %s не существует, создаю...\n"
-
-#: lib/libalpm/util.c:593
-#, fuzzy
-msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "не могу создать кэш пакета, будет использован /tmp\n"
-
-#: lib/libalpm/util.c:643
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr ""
-
-#: lib/libalpm/util.c:645
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr ""
-
-#~ msgid "please remove '%s' first, using -Rd"
-#~ msgstr "пожалуйста, уделите сначала '%s' используя -Rd"
-
-#~ msgid "could not extract %s (%s)"
-#~ msgstr "не могу извлечь %s (%s)"
-
-#~ 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"
-
-#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-#~ msgstr "архив %s поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"

lib/libalpm/po/zh_CN.po

@@ -0,0 +1,586 @@
+# Chinese/Simplified translation of Pacman package manager package.
+# Copyright (C) 2008 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
+# 甘露(Lu.Gan) <rhythm.gan@gmail.com>, 2008.
+#
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.1.2\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-25 20:25+0100\n"
+"Last-Translator: 甘露(Lu.Gan) <rhythm.gan@gmail.com>\n"
+"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "正在替换老版本 %s-%s 通过在目标清单中的%s\n"
+
+#, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
+msgstr "较新版本 %s-%s 在目标清单中 -- 跳过\n"
+
+#, c-format
+msgid "conflicting packages were found in the target list\n"
+msgstr "目标清单中发现有冲突的软件包\n"
+
+#, c-format
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr "你不能同时安装有冲突的两个软件包\n"
+
+#, c-format
+msgid "replacing packages with -A and -U is not supported yet\n"
+msgstr "正在使用 -A 替代软件包， -U 目前尚不支持\n"
+
+#, c-format
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr "你可以使用 -Rd 及 -U 来手动替代软件包\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"目录权限不一致%s\n"
+"文件系统：%o  软件包：%o\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "解压缩：链接 %s 没有指向目录\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "解压缩：没有用 %s 覆盖目录\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "无法解压缩 %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s (%s)\n"
+msgstr "无法重命名 %s (%s)\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "无法复制临时文件到 %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s 已另存为 %s\n"
+
+#, c-format
+msgid "could not install %s as %s: %s\n"
+msgstr "无法安装 %s 作为 %s: %s\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s 已作为 %s 安装\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "正在解压缩 %s 作为 %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "无法得到当前的工作目录\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "更新 %s时出现错误\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "安装 %s时出现错误\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "无法更新数据库记录 %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "无法在缓存中添加记录 '%s' \n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "数据库记录'%s'名字无效\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "无法打开文件 %s: %s\n"
+
+#, c-format
+msgid "could not remove database entry %s%s\n"
+msgstr "无法删除数据库记录 %s%s\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "尝试重新登记“本地”数据库\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "没有指定数据库路径\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "探测到依赖关系循环：\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s将在它%s的依赖关系之后被删除\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s将在它%s的依赖关系之前被安装\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "无法解决\"%s\"，\"%s\"的依赖关系\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "没有内存可用！"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "未预计的系统错误"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "权限不充分"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "无法找到或读取文件"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "无法找到或读取目录"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "传递了错误的或空的参数"
+
+#, c-format
+msgid "library not initialized"
+msgstr "无法初始化函数库"
+
+#, c-format
+msgid "library already initialized"
+msgstr "函数库已初始化"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "无法锁定数据库"
+
+#, c-format
+msgid "could not open database"
+msgstr "无法打开数据库"
+
+#, c-format
+msgid "could not create database"
+msgstr "无法创建数据库"
+
+#, c-format
+msgid "database not initialized"
+msgstr "数据库无法初始化"
+
+#, c-format
+msgid "database already registered"
+msgstr "数据库已登记"
+
+#, c-format
+msgid "could not find database"
+msgstr "无法找到数据库"
+
+#, c-format
+msgid "could not update database"
+msgstr "无法更新数据库"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "无法删除数据库记录"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "无效的服务器url"
+
+#, c-format
+msgid "could not set parameter"
+msgstr "无法设置参数"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "处理已初始化"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "处理无法初始化"
+
+#, c-format
+msgid "duplicate target"
+msgstr "重复的目标"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "处理未准备好"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "处理已放弃"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "操作与处理类型不兼容"
+
+#, c-format
+msgid "could not commit transaction"
+msgstr "无法交付处理"
+
+#, c-format
+msgid "could not download all files"
+msgstr "无法下载全部文件"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "无法找到或读取软件包"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "无效的或已损坏的软件包"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "无法打开软件包文件"
+
+#, c-format
+msgid "cannot load package data"
+msgstr "无法加载软件包数据"
+
+#, c-format
+msgid "package already installed"
+msgstr "软件包已经安装"
+
+#, c-format
+msgid "package not installed or lesser version"
+msgstr "软件包没有安装或版本较低"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "无法删除软件包全部文件"
+
+#, c-format
+msgid "package name is not valid"
+msgstr "软件包名字无效"
+
+#, c-format
+msgid "corrupted package"
+msgstr "已损坏的软件包"
+
+#, c-format
+msgid "no such repository"
+msgstr "没有该软件库"
+
+#, c-format
+msgid "corrupted delta"
+msgstr "已损怀的delta"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "delta补丁失败"
+
+#, c-format
+msgid "group not found"
+msgstr "没有找到软件包组"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "无法满足依赖关系"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "有冲突的依赖关系"
+
+#, c-format
+msgid "conflicting files"
+msgstr "有冲突的文件"
+
+#, c-format
+msgid "user aborted the operation"
+msgstr "用户中断操作"
+
+#, c-format
+msgid "internal error"
+msgstr "内部错误"
+
+#, c-format
+msgid "libarchive error"
+msgstr "libarchive错误"
+
+#, c-format
+msgid "not confirmed"
+msgstr "不能确认"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "无效的常规表达式"
+
+#, c-format
+msgid "connection to remote host failed"
+msgstr "连接远端主机失败"
+
+#, c-format
+msgid "unexpected error"
+msgstr "未预期的错误"
+
+#, c-format
+msgid "could not get md5sum for package %s-%s\n"
+msgstr "无法得到软件包%s-%s的md5值\n"
+
+#, c-format
+msgid "md5sums do not match for package %s-%s\n"
+msgstr "软件包%s-%s的md5值不一致\n"
+
+#, c-format
+msgid "%s: forcing upgrade to version %s\n"
+msgstr "%s：强制更新至版本%s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s：本地（%s）比%s版本更新(%s)\n"
+
+#, c-format
+msgid "error extracting package description file to %s\n"
+msgstr "解压缩软件包描述文件到%s时发生错误\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "无法分析%s中的软件包描述文件\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "%s中缺少软件包名字\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "%s中缺少软件包版本号\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "读取软件包%s: %s发生错误\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "%s中缺少软件包元数据\n"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "无法在数据库中找到%s -- 跳过\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "无法删除文件'%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "无法删除数据库记录%s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "无法从缓存中删除记录'%s'\n"
+
+#, c-format
+msgid "url '%s' is invalid, ignoring\n"
+msgstr "url %s' 无效，忽略\n"
+
+#, c-format
+msgid "url scheme not specified, assuming http\n"
+msgstr "url scheme没有指定，假定为http\n"
+
+#, c-format
+msgid "disk"
+msgstr "硬盘"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "获取文件'%s'从%s : %s失败\n"
+
+#, c-format
+msgid "cannot resume download, starting over\n"
+msgstr "无法恢复下载，重新开始\n"
+
+#, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "无法写入文件'%s'\n"
+
+#, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "下载'%s': %s时出错\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "写入文件'%s': %s时出错\n"
+
+#, c-format
+msgid "could not chdir to %s\n"
+msgstr "无法改变目录到%s\n"
+
+#, c-format
+msgid "running XferCommand: fork failed!\n"
+msgstr "运行XferCommand:分支失败！\n"
+
+#, c-format
+msgid "URL does not contain a file for download\n"
+msgstr "URL没有包含可下载的文件\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "下载%s失败\n"
+
+#, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s：忽略软件包更新（%s => %s）\n"
+
+#, c-format
+msgid "repository '%s' not found\n"
+msgstr "没有找到软件库'%s'\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s已经为最新 -- 跳过\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s已经为最新 -- 重新安装\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "探测到无法解决的软件包冲突\n"
+
+#, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "内存分配错误：无法分配 %zd bytes\n"
+
+#, c-format
+msgid "command: %s\n"
+msgstr "命令：%s\n"
+
+#, c-format
+msgid "can't get md5 checksum for file %s\n"
+msgstr "无法得到文件%s的md5检查值\n"
+
+#, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
+msgstr "文件%s已损坏（坏的MD5检查值）\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "某些文件无法从%s取回\n"
+
+#, c-format
+msgid "could not create removal transaction\n"
+msgstr "无法生成可删除处理\n"
+
+#, c-format
+msgid "could not initialize the removal transaction\n"
+msgstr "无法初始化可删除处理\n"
+
+#, c-format
+msgid "could not prepare removal transaction\n"
+msgstr "无法准备可删除处理\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "无法交付可删除处理\n"
+
+#, c-format
+msgid "could not create transaction\n"
+msgstr "无法创建处理\n"
+
+#, c-format
+msgid "could not initialize transaction\n"
+msgstr "无法初始化处理\n"
+
+#, c-format
+msgid "could not prepare transaction\n"
+msgstr "无法准备处理\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "无法交付处理\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "无法删除锁定文件%s\n"
+
+#, c-format
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "父环境中没有/bin/sh，正在中断脚本\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "无法创建临时目录\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "无法更改目录到%s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "无法分支新进程(%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "无法更改根目录(%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "无法更改目录到/ (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)"
+msgstr "调用popen失败(%s)"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "调用waitpid失败(%s)\n"
+
+#, c-format
+msgid "scriptlet failed to execute correctly\n"
+msgstr "脚本没有被正确执行\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "无法删除临时目录%s\n"
+
+#, c-format
+msgid "failed to make path '%s' : %s\n"
+msgstr "无法创建路径'%s' : %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "无法打开%s: %s\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "没有%s缓存存在，正在创建……\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "无法创建软件包缓存，正在使用/tmp代替\n"
+
+#, c-format
+msgid "md5: %s can't be opened\n"
+msgstr "md5：%s无法打开\n"
+
+#, c-format
+msgid "md5: %s can't be read\n"
+msgstr "md5：%s无法读取\n"

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

@@ -170,7 +170,7 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 						sync->data = alpm_list_add(NULL, dummy);
 						*syncpkgs = alpm_list_add(*syncpkgs, sync);
 					}
-					_alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)\n",
+					_alpm_log(PM_LOG_DEBUG, "%s-%s elected for removal (to be replaced by %s-%s)\n",
 							alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
 							alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 				}
@@ -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,15 +330,17 @@ 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"),
 						alpm_pkg_get_name(local), alpm_pkg_get_version(local));
 				return(0);
 			} else {
-				_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
-						alpm_pkg_get_name(local), alpm_pkg_get_version(local));
+				if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) {
+					_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
+							alpm_pkg_get_name(local), alpm_pkg_get_version(local));
+				}
 			}
 		}
 	}

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/pmdb.py

@@ -119,7 +119,10 @@ class pmdb:
 
         # desc
         filename = os.path.join(path, "desc")
-        fd = file(filename, "r")
+        if not os.path.isfile(filename):
+            print "invalid db entry found (desc missing) for pkg", pkgname
+            return None
+        fd = open(filename, "r")
         while 1:
             line = fd.readline()
             if not line:
@@ -158,7 +161,10 @@ class pmdb:
 
         # files
         filename = os.path.join(path, "files")
-        fd = file(filename, "r")
+        if not os.path.isfile(filename):
+            print "invalid db entry found (files missing) for pkg", pkgname
+            return None
+        fd = open(filename, "r")
         while 1:
             line = fd.readline()
             if not line:
@@ -177,6 +183,9 @@ class pmdb:
 
         # depends
         filename = os.path.join(path, "depends")
+        if not os.path.isfile(filename):
+            print "invalid db entry found (depends missing) for pkg", pkgname
+            return None
         fd = file(filename, "r")
         while 1:
             line = fd.readline()
@@ -252,6 +261,7 @@ class pmdb:
             if pkg.reason:
                 data.append(_mksection("REASON", pkg.reason))
         else:
+            data.append(_mksection("FILENAME", pkg.filename()))
             if pkg.replaces:
                 data.append(_mksection("REPLACES", pkg.replaces))
             if pkg.force:

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")

pactest/tests/upgrade011.py

@@ -0,0 +1,16 @@
+self.description = "Upgrade a package with a filesystem conflict"
+
+p = pmpkg("dummy", "2.0-1")
+p.files = ["bin/dummy", "usr/share/file"]
+self.addpkg(p)
+
+lp = pmpkg("dummy", "1.0-1")
+lp.files = ["bin/dummy"]
+self.addpkg2db("local", lp)
+
+self.filesystem = ["usr/share/file"]
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=dummy|1.0-1")

pactest/tests/upgrade040.py

@@ -27,4 +27,5 @@ for p in p1, p2:
 	self.addrule("PKG_EXIST=%s" % p.name)
 self.addrule("FILE_MODIFIED=bin/dummy")
 self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
 self.addrule("FILE_MODIFIED=usr/share/file")

pactest/tests/upgrade041.py

@@ -4,7 +4,7 @@ lp1 = pmpkg("dummy")
 lp1.files = ["bin/dummy"]
 
 lp2 = pmpkg("foobar")
-lp2.files = ["bin/foobar"
+lp2.files = ["bin/foobar",
              "usr/share/file"]
 
 for p in lp1, lp2:
@@ -27,4 +27,5 @@ for p in p1, p2:
 	self.addrule("PKG_EXIST=%s" % p.name)
 self.addrule("FILE_MODIFIED=bin/dummy")
 self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
 self.addrule("FILE_MODIFIED=usr/share/file")

pactest/tests/upgrade045.py

@@ -0,0 +1,16 @@
+self.description = "FS#9235"
+
+lp = pmpkg("foo")
+lp.files = ["etc/foo.cfg -> etc/foo.cfg"]
+lp.backup = ["etc/foo.cfg"]
+self.addpkg2db("local", lp)
+
+p1 = pmpkg("foo", "1.0-2")
+p1.files = ["etc/foo.cfg*"]
+p1.backup = ["etc/foo.cfg"]
+self.addpkg(p1)
+
+self.args = "-U %s" % p1.filename()
+
+self.addrule("PKG_VERSION=foo|1.0-2")
+self.addrule("FILE_EXIST=etc/foo.cfg")

pactest/tests/upgrade046.py

@@ -0,0 +1,31 @@
+self.description = "File relocation between two packages (reverse order, --force)"
+
+lp1 = pmpkg("dummy")
+lp1.files = ["bin/dummy"]
+
+lp2 = pmpkg("foobar")
+lp2.files = ["bin/foobar",
+             "usr/share/file"]
+
+for p in lp1, lp2:
+	self.addpkg2db("local", p)
+
+p1 = pmpkg("dummy")
+p1.files = ["bin/dummy",
+            "usr/share/file"]
+
+p2 = pmpkg("foobar")
+p2.files = ["bin/foobar"]
+
+for p in p1, p2:
+	self.addpkg(p)
+
+self.args = "-Uf %s" % " ".join([p.filename() for p in p1, p2])
+
+self.addrule("PACMAN_RETCODE=0")
+for p in p1, p2:
+	self.addrule("PKG_EXIST=%s" % p.name)
+self.addrule("FILE_MODIFIED=bin/dummy")
+self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
+self.addrule("FILE_MODIFIED=usr/share/file")

pactest/util.py

@@ -196,6 +196,9 @@ def mkcfgfile(filename, root, option, db):
 def getmd5sum(filename):
     """
     """
+    if not os.path.isfile(filename):
+        print "file %s does not exist!" % filename
+        return ""
     fd = open(filename, "rb")
     checksum = md5.new()
     while 1:
@@ -223,6 +226,9 @@ def mkmd5sum(data):
 def getmtime(filename):
     """
     """
+    if not os.path.exists(filename):
+        print "path %s does not exist!" % filename
+        return 0, 0, 0
     st = os.stat(filename)
     return st[stat.ST_ATIME], st[stat.ST_MTIME], st[stat.ST_CTIME]
 

po/LINGUAS

@@ -1,11 +1,12 @@
 # Set of available languages.
-cs_CZ
+cs
 de
 en_GB
 es
 fr
 hu
 it
-pl_PL
+pl
 pt_BR
-ru_RU
+ru
+zh_CN

po/Makevars

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

proto.install

@@ -1,36 +1,37 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
+# This is a default template for a post-install scriptlet.
+# Uncomment only required functions and remove any functions
+# you don't need (and this header).
 
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
+## arg 1:  the new package version
+#pre_install() {
+  # do something here
+#}
 
-# arg 1:  the new package version
-post_install() {
-  /bin/true
-}
+## arg 1:  the new package version
+#post_install() {
+  # do something here
+#}
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
+## arg 1:  the new package version
+## arg 2:  the old package version
+#pre_upgrade() {
+  # do something here
+#}
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
+## arg 1:  the new package version
+## arg 2:  the old package version
+#post_upgrade() {
+  # do something here
+#}
 
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
+## arg 1:  the old package version
+#pre_remove() {
+  # do something here
+#}
 
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
+## arg 1:  the old package version
+#post_remove() {
+  # do something here
+#}
 
 # vim:set ts=2 sw=2 et:

scripts/gensync.sh.in

@@ -31,6 +31,9 @@ usage() {
 	printf "gensync (pacman) %s\n\n" "$myver"
 	printf "$(gettext "Usage: %s <root> <destfile> [package_directory]")\n\n" "$0"
 	printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
+	printf "$(gettext "\
 gensync will generate a sync database by reading all PKGBUILD files\n\
 from <root>. gensync builds the database in a temporary directory\n\
 and then compresses it to <destfile>.\n\n")"
@@ -77,6 +80,13 @@ check_force () {
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
 	exit 0
@@ -116,6 +126,10 @@ fi
 
 [ ! -d "$rootdir" ] && die "$(gettext "invalid root dir: %s")" $rootdir
 
+printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
+
 echo "$(gettext "gensync: building database entries, generating md5sums...")" >&2
 cd "$destdir"
 
@@ -130,13 +144,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.
@@ -463,6 +464,12 @@ download_sources() {
 			continue
 		fi
 
+		# if we get here, check to make sure it was a URL, else fail
+		if [ "$file" = "$netfile" ]; then
+			error "$(gettext "%s was not found in the build directory and is not a URL.")" "$netfile"
+			exit 1 # $E_MISSING_FILE
+		fi
+
 		# find the client we should use for this URL
 		local dlclient=$(get_downloadclient $netfile) || exit $?
 
@@ -668,9 +675,6 @@ run_build() {
 	msg "$(gettext "Starting build()...")"
 	cd "$srcdir"
 
-	# ensure we have a sane umask set
-	umask 0022
-
 	# ensure all necessary build variables are exported
 	export CFLAGS CXXFLAGS MAKEFLAGS CHOST
 
@@ -714,7 +718,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
@@ -747,7 +751,7 @@ tidy_install() {
 
 	if [ "$(check_option strip)" = "y" ]; then
 		msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")"
-		for file in $(find {,usr/{,local/},opt/}{bin,lib,sbin} -type f 2>/dev/null || true); do
+		for file in $(find {,usr/{,local/},opt/*/}{bin,lib,sbin} -type f 2>/dev/null || true); do
 			case "$(file -biz "$file")" in
 				*application/x-sharedlib*)  # Libraries
 					/usr/bin/strip --strip-debug "$file";;
@@ -803,6 +807,9 @@ create_package() {
 	if [ "$CARCH" != "" ]; then
 		echo "arch = $CARCH" >>.PKGINFO
 	fi
+	if [ "$(check_option force)" = "y" ]; then
+		echo "force = true" >> .PKGINFO
+	fi
 
 	local it
 	for it in "${license[@]}"; do
@@ -932,8 +939,8 @@ create_xdelta() {
 create_srcpackage() {
 	cd "$startdir"
 	msg "$(gettext "Creating source package...")"
-	local comp_files="PKGBUILD"
-	msg2 "$(gettext "Adding %s...")" "PKGBUILD"
+	local comp_files="$BUILDSCRIPT"
+	msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT"
 
 	if [ "$install" != "" ]; then
 		if [ -f $install ]; then
@@ -969,8 +976,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,28 +986,39 @@ 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
 		# calls to makepkg via fakeroot will explicitly pass the version
 		# number to avoid having to determine the version number twice.
+		# Also do a brief check to make sure we have the VCS tool available.
 		oldpkgver=$pkgver
 		if [ ! -z ${_darcstrunk} ] && [ ! -z ${_darcsmod} ] ; then
+			[ $(type -p darcs) ] || return 0
 			msg "$(gettext "Determining latest darcs revision...")"
 			newpkgver=$(date +%Y%m%d)
 		elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then
+			[ $(type -p cvs) ] || return 0
 			msg "$(gettext "Determining latest cvs revision...")"
 			newpkgver=$(date +%Y%m%d)
 		elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then
+			[ $(type -p git) ] || return 0
 			msg "$(gettext "Determining latest git revision...")"
 			newpkgver=$(date +%Y%m%d)
 		elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then
+			[ $(type -p svn) ] || return 0
 			msg "$(gettext "Determining latest svn revision...")"
-			newpkgver=$(svn log $_svntrunk --limit 1 | sed -n 's/^r\([^ ]*\) .*$/\1/p')
+			newpkgver=$(svn log $_svntrunk --limit 1 -q | sed -n 's/^r\([0-9]*\) .*$/\1/p')
 		elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then
+			[ $(type -p bzr) ] || return 0
 			msg "$(gettext "Determining latest bzr revision...")"
 			newpkgver=$(bzr revno ${_bzrtrunk})
 		elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then
+			[ $(type -p hg) ] || return 0
 			msg "$(gettext "Determining latest hg revision...")"
 			if [ -d ./src/$_hgrepo ] ; then
 				cd ./src/$_hgrepo
@@ -1070,6 +1087,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:")"
@@ -1089,6 +1107,15 @@ This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
 
+# PROGRAM START
+
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 ARGLIST=$@
 
 #preserve environment variables
@@ -1117,8 +1144,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 +1171,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 +1186,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 +1200,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 "\\0--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
@@ -1250,7 +1284,7 @@ if [ "$ASROOT" = "0" -a \( "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" \
 	fi
 fi
 
-unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force
+unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums
 unset replaces depends conflicts backup source install build makedepends
 unset optdepends options noextract
 
@@ -1312,11 +1346,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 +1371,6 @@ if [ "$INFAKEROOT" = "1" ]; then
 	if [ "$REPKG" = "1" ]; then
 		warning "$(gettext "Skipping build.")"
 	else
-		devel_update
 		run_build
 		tidy_install
 	fi
@@ -1386,6 +1423,9 @@ else
 	warning "$(gettext "pacman was not found in PATH; skipping dependency checks.")"
 fi
 
+# ensure we have a sane umask set
+umask 0022
+
 # get back to our src directory so we can begin with sources
 mkdir -p "$srcdir"
 cd "$srcdir"

scripts/pacman-optimize.sh.in

@@ -70,6 +70,15 @@ die_r() {
 	die "$@"
 }
 
+# PROGRAM START
+
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
 	exit 0

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
@@ -133,12 +136,12 @@ db_write_entry()
 	# blank out all variables and set pkgfile
 	local pkgfile=$(readlink -f "$1")
 	local pkgname pkgver pkgdesc url builddate packager csize size \
-		group depend backup license replaces provides conflict \
+		group depend backup license replaces provides conflict force \
 		_groups _depends _backups _licenses _replaces _provides _conflicts \
 		startdir
 
 	local OLDIFS="$IFS"
-	# IFS (field seperator) is only the newline character
+	# IFS (field separator) is only the newline character
 	IFS="
 "
 
@@ -206,7 +209,7 @@ db_write_entry()
 	[ -n "$builddate" ] && echo -e "%BUILDDATE%\n$builddate\n" >>desc
 	[ -n "$packager" ] && echo -e "%PACKAGER%\n$packager\n" >>desc
 	write_list_entry "REPLACES" "$_replaces" "desc"
-	[ $FORCE -eq 1 ] && echo -e "%FORCE%\n" >>desc
+	[ $FORCE -eq 1 -o -n "$force" ] && echo -e "%FORCE%\n" >>desc
 
 	# create depends entry
 	msg2 "$(gettext "Creating 'depends' db entry...")"
@@ -249,6 +252,13 @@ db_write_entry()
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 # check for help flags
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
@@ -285,7 +295,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 +325,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

@@ -25,7 +25,6 @@ export TEXTDOMAINDIR='@localedir@'
 myver='@PACKAGE_VERSION@'
 confdir='@sysconfdir@'
 
-FORCE=0
 REPO_DB_FILE=""
 
 msg() {
@@ -96,6 +95,13 @@ db_remove_entry() {
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 # check for help flags
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
@@ -132,7 +138,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 +160,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
@@ -169,6 +175,9 @@ if [ $success -eq 1 ]; then
 		esac
 
 		bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" *
+	else
+		error "$(gettext "All packages have been removed from the database. Deleting '%s'.")" "$REPO_DB_FILE"
+		rm "$REPO_DB_FILE"
 	fi
 
 	popd 2>&1 >/dev/null

scripts/updatesync.sh.in

@@ -32,6 +32,9 @@ usage() {
 	printf "updatesync (pacman) %s\n\n" "$myver"
 	printf "$(gettext "Usage: %s <action> <destfile> <option> [package_directory]")\n\n" "$0"
 	printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
+	printf "$(gettext "\
 updatesync will update a sync database by reading a PKGBUILD and\n\
 modifying the destfile. updatesync updates the database in a temporary\n\
 directory and then compresses it to <destfile>.\n\n")"
@@ -76,6 +79,13 @@ check_force () {
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
 	exit 0
@@ -116,21 +126,25 @@ if [ "$4" != "" ]; then
 fi
 opt_force=""
 
-if [ ! -f "$option" ]; then
-	die "$(gettext "%s not found")" $option
-fi
+printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
 
 if [ "$action" = "upd" ]; then # INSERT / UPDATE
+	if [ ! -f "$option" ]; then
+		die "$(gettext "%s not found")" $option
+	fi
+
 	unset pkgname pkgver pkgrel options
 
 	source $option || die "$(gettext "failed to parse %s")" $option
 	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
@@ -141,10 +155,14 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
 else # DELETE
 	fname="$(basename $option)"
 	if [ "$fname" = "PKGBUILD" ]; then
+		if [ ! -f "$option" ]; then
+			die "$(gettext "%s not found")" $option
+		fi
+
 		unset pkgname pkgver pkgrel options
 		source $option
 	else
-		pkgname=$1
+		pkgname=$option
 	fi
 
 	repo-remove "$pkgdb" "$pkgname"

src/pacman/add.c

@@ -111,17 +111,16 @@ int pacman_add(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = targets; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			fprintf(stderr, _("error: failed to add target '%s' (%s)"), targ,
-			        alpm_strerrorlast());
+			fprintf(stderr, _("error: '%s': %s\n"),
+					targ, alpm_strerrorlast());
 			add_cleanup();
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: "compute" the transaction based on targets and flags */
 	/* TODO: No, compute nothing. This is stupid. */
@@ -146,7 +145,7 @@ int pacman_add(alpm_list_t *targets)
 			case PM_ERR_CONFLICTING_DEPS:
 				for(i = data; i; i = alpm_list_next(i)) {
 					pmconflict_t *conflict = alpm_list_getdata(i);
-					printf(_(":: %s: conflicts with %s"),
+					printf(_(":: %s: conflicts with %s\n"),
 						alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict));
 				}
 				break;

src/pacman/callback.c

@@ -36,7 +36,6 @@
 
 /* TODO this should not have to be defined twice- trans.c & log.c */
 #define LOG_STR_LEN 256
-#define FILENAME_TRIM_LEN 23
 
 /* download progress bar */
 static float rate_last;
@@ -278,11 +277,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] "),
@@ -321,9 +328,11 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 
 	/* size of line to allocate for text printing (e.g. not progressbar) */
 	const int infolen = 50;
-	int tmp, digits, oprlen, textlen, pkglen;
+	int tmp, digits, textlen;
 	char *opr = NULL;
-	wchar_t *wcopr = NULL;
+	/* used for wide character width determination and printing */
+	int len, wclen, wcwid, padwid;
+	wchar_t *wcstr;
 
 	if(config->noprogressbar) {
 		return;
@@ -365,15 +374,6 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 			opr = _("checking for file conflicts");
 			break;
 	}
-	/* convert above strings to wide chars */
-	oprlen = strlen(opr);
-	wcopr = calloc(oprlen, sizeof(wchar_t));
-	if(!wcopr) {
-		fprintf(stderr, "malloc failure: could not allocate %zd bytes\n",
-		        strlen(opr) * sizeof(wchar_t));
-		return;
-	}
-	oprlen = mbstowcs(wcopr, opr, oprlen);
 
 	/* find # of digits in package counts to scale output */
 	digits = 1;
@@ -381,32 +381,40 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 	while((tmp /= 10)) {
 		++digits;
 	}
-
 	/* determine room left for non-digits text [not ( 1/12) part] */
 	textlen = infolen - 3 - (2 * digits);
-	/* room left for package name */
-	pkglen = textlen - oprlen - 1;
 
-	switch (event) {
-		case PM_TRANS_PROGRESS_ADD_START:
-		case PM_TRANS_PROGRESS_UPGRADE_START:
-		case PM_TRANS_PROGRESS_REMOVE_START:
-			/* old way of doing it, but ISO C does not recognize it
-			printf("(%2$*1$d/%3$*1$d) %4$s %6$-*5$.*5$s", digits, remain, howmany,
-			       opr, pkglen, pkgname);*/
-			printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany,
-			       opr, pkglen, pkglen, pkgname);
-			break;
-		case PM_TRANS_PROGRESS_CONFLICTS_START:
-			/* old way of doing it, but ISO C does not recognize it
-			printf("(%2$*1$d/%3$*1$d) %5$-*4$s", digits, remain, howmany,
-			       textlen, opr);*/
-			printf("(%*d/%*d) %-*s", digits, remain, digits, howmany,
-			       textlen, opr);
-			break;
+	/* In order to deal with characters from all locales, we have to worry
+	 * about wide characters and their column widths. A lot of stuff is
+	 * done here to figure out the actual number of screen columns used
+	 * by the output, and then pad it accordingly so we fill the terminal.
+	 */
+	/* len = opr len + pkgname len (if available) + space  + null */
+	len = strlen(opr) + ((pkgname) ? strlen(pkgname) : 0) + 2;
+	wcstr = calloc(len, sizeof(wchar_t));
+	/* print our strings to the alloc'ed memory */
+	wclen = swprintf(wcstr, len, L"%s %s", opr, pkgname);
+	wcwid = wcswidth(wcstr, wclen);
+	padwid = textlen - wcwid;
+	/* if padwid is < 0, we need to trim the string so padwid = 0 */
+	if(padwid < 0) {
+		int i = textlen - 3;
+		wchar_t *p = wcstr;
+		/* grab the max number of char columns we can fill */
+		while(i > 0 && wcwidth(*p) < i) {
+			i -= wcwidth(*p);
+			p++;
+		}
+		/* then add the ellipsis and fill out any extra padding */
+		wcscpy(p, L"...");
+		padwid = i;
+
 	}
 
-	free(wcopr);
+	printf("(%*d/%*d) %ls%-*s", digits, remain, digits, howmany,
+			wcstr, padwid, "");
+
+	free(wcstr);
 
 	/* call refactored fill progress function */
 	fill_progress(percent, percent, getcols() - infolen);
@@ -429,7 +437,11 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 		int list_xfered, int list_total)
 {
 	const int infolen = 50;
+	const int filenamelen = infolen - 27;
 	char *fname, *p;
+	/* used for wide character width determination and printing */
+	int len, wclen, wcwid, padwid;
+	wchar_t *wcfname;
 
 	float rate = 0.0, timediff = 0.0, f_xfered = 0.0;
 	unsigned int eta_h = 0, eta_m = 0, eta_s = 0;
@@ -509,8 +521,30 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 	if((p = strstr(fname, PKGEXT)) || (p = strstr(fname, DBEXT))) {
 			*p = '\0';
 	}
-	if(strlen(fname) > FILENAME_TRIM_LEN) {
-		strcpy(fname + FILENAME_TRIM_LEN -3,"...");
+	/* In order to deal with characters from all locales, we have to worry
+	 * about wide characters and their column widths. A lot of stuff is
+	 * done here to figure out the actual number of screen columns used
+	 * by the output, and then pad it accordingly so we fill the terminal.
+	 */
+	/* len = filename len + null */
+	len = strlen(filename) + 1;
+	wcfname = calloc(len, sizeof(wchar_t));
+	wclen = mbstowcs(wcfname, fname, len);
+	wcwid = wcswidth(wcfname, wclen);
+	padwid = filenamelen - wcwid;
+	/* if padwid is < 0, we need to trim the string so padwid = 0 */
+	if(padwid < 0) {
+		int i = filenamelen - 3;
+		wchar_t *p = wcfname;
+		/* grab the max number of char columns we can fill */
+		while(i > 0 && wcwidth(*p) < i) {
+			i -= wcwidth(*p);
+			p++;
+		}
+		/* then add the ellipsis and fill out any extra padding */
+		wcscpy(p, L"...");
+		padwid = i;
+
 	}
 
 	/* Awesome formatting for progress bar.  We need a mess of Kb->Mb->Gb stuff
@@ -540,10 +574,12 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 		}
 	}
 
-	printf(" %-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname,
-				 f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s);
+	printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname,
+			padwid, "", f_xfered, xfered_size,
+			rate, rate_size, eta_h, eta_m, eta_s);
 
 	free(fname);
+	free(wcfname);
 
 	/* The progress bar is based on the file percent regardless of the
 	 * TotalDownload option. */
@@ -556,7 +592,7 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 /* Callback to handle notifications from the library */
 void cb_log(pmloglevel_t level, char *fmt, va_list args)
 {
-	if(!strlen(fmt)) {
+	if(!fmt || strlen(fmt) == 0) {
 		return;
 	}
 

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/package.c

@@ -24,6 +24,7 @@
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>
+#include <wchar.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -48,6 +49,8 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	char bdatestr[50] = "", idatestr[50] = "";
 	const alpm_list_t *i;
 	alpm_list_t *requiredby = NULL, *depstrings = NULL;
+	wchar_t *wcstr;
+	int len;
 
 	if(pkg == NULL) {
 		return;
@@ -86,8 +89,6 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 		requiredby = alpm_pkg_compute_requiredby(pkg);
 	}
 
-	descheader = _("Description    : ");
-
 	/* actual output */
 	if(level == 0) {
 		string_display(_("Filename       :"), alpm_pkg_get_filename(pkg));
@@ -136,8 +137,16 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	}
 
 	/* printed using a variable to make i18n safe */
+	descheader = _("Description    : ");
+	/* len goes from # bytes -> # chars -> # cols */
+	len = strlen(descheader) + 1;
+	wcstr = calloc(len, sizeof(wchar_t));
+	len = mbstowcs(wcstr, descheader, len);
+	len = wcswidth(wcstr, len);
+	free(wcstr);
+	/* we can finally print the darn thing */
 	printf("%s", descheader);
-	indentprint(alpm_pkg_get_desc(pkg), mbstowcs(NULL, descheader, 0));
+	indentprint(alpm_pkg_get_desc(pkg), len);
 	printf("\n\n");
 
 	/* Print additional package info if info flag passed more than once */

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) {
@@ -150,8 +150,8 @@ static void usage(int op, const char * const myname)
 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(" .--.                  Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
+	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/%s (%s %s) libalpm/%s",
+			PACKAGE_VERSION, un.sysname, un.machine, alpm_version());
 	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 */
@@ -228,11 +227,11 @@ static void cleanup(int signum)
 	exit(signum);
 }
 
-/** Sets all libalpm required paths in one go. Called after the command line and
- * inital config file parsing. Once this is complete, we can see if any paths were
- * defined. If a rootdir was defined and nothing else, we want all of our paths to
- * live under the rootdir that was specified. Safe to call multiple times (will only
- * do anything the first time).
+/** Sets all libalpm required paths in one go. Called after the command line
+ * and inital config file parsing. Once this is complete, we can see if any
+ * paths were defined. If a rootdir was defined and nothing else, we want all
+ * of our paths to live under the rootdir that was specified. Safe to call
+ * multiple times (will only do anything the first time).
  */
 static void setlibpaths(void)
 {
@@ -241,6 +240,8 @@ static void setlibpaths(void)
 		int ret = 0;
 
 		pm_printf(PM_LOG_DEBUG, "setlibpaths() called\n");
+		/* Configure root path first. If it is set and dbpath/logfile were not
+		 * set, then set those as well to reside under the root. */
 		if(config->rootdir) {
 			char path[PATH_MAX];
 			ret = alpm_option_set_root(config->rootdir);
@@ -255,10 +256,12 @@ static void setlibpaths(void)
 			}
 			if(!config->logfile) {
 				snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE);
-				ret = alpm_option_set_dbpath(path);
 				config->logfile = strdup(path);
 			}
 		}
+		/* Set other paths if they were configured. Note that unless rootdir
+		 * was left undefined, these two paths (dbpath and logfile) will have
+		 * been set locally above, so the if cases below will now trigger. */
 		if(config->dbpath) {
 			ret = alpm_option_set_dbpath(config->dbpath);
 			if(ret != 0) {
@@ -325,7 +328,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 +464,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 +610,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

@@ -70,6 +70,7 @@ static int query_fileowner(alpm_list_t *targets)
 		int found = 0;
 		char *filename = alpm_list_getdata(t);
 		char *bname;
+		char *dname;
 		char *rpath;
 		struct stat buf;
 		alpm_list_t *i, *j;
@@ -88,10 +89,14 @@ static int query_fileowner(alpm_list_t *targets)
 		}
 
 		bname = mbasename(filename);
+		dname = mdirname(filename);
+		rpath = resolve_path(dname);
+		free(dname);
 
-		if(!(rpath = resolve_path(filename))) {
+		if(!rpath) {
 			fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"),
 					filename, strerror(errno));
+			free(rpath);
 			ret++;
 			continue;
 		}
@@ -100,7 +105,7 @@ static int query_fileowner(alpm_list_t *targets)
 			pmpkg_t *info = alpm_list_getdata(i);
 
 			for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) {
-				char path[PATH_MAX], *ppath;
+				char path[PATH_MAX], *ppath, *pdname;
 				snprintf(path, PATH_MAX, "%s%s",
 				         alpm_option_get_root(), (const char *)alpm_list_getdata(j));
 
@@ -109,10 +114,12 @@ static int query_fileowner(alpm_list_t *targets)
 					continue;
 				}
 
-				ppath = resolve_path(path);
+				pdname = mdirname(path);
+				ppath = resolve_path(pdname);
+				free(pdname);
 
 				if(ppath && strcmp(ppath, rpath) == 0) {
-					printf(_("%s is owned by %s %s\n"), rpath,
+					printf(_("%s is owned by %s %s\n"), filename,
 					       alpm_pkg_get_name(info), alpm_pkg_get_version(info));
 					found = 1;
 				}
@@ -263,7 +270,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 +296,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

@@ -103,19 +103,17 @@ int pacman_remove(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = finaltargs; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			printf("failed.\n");
-			fprintf(stderr, _("error: failed to add target '%s' (%s)\n"), targ,
-			        alpm_strerrorlast());
+			fprintf(stderr, _("error: '%s': %s\n"),
+					targ, alpm_strerrorlast());
 			remove_cleanup();
 			FREELIST(finaltargs);
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: prepare the transaction based on its type, targets and flags */
 	if(alpm_trans_prepare(&data) == -1) {
@@ -155,8 +153,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

@@ -25,6 +25,7 @@
 #include <limits.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <sys/stat.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -57,6 +58,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) {
 	/* step through the directory one file at a time */
 	while((ent = readdir(dir)) != NULL) {
 		char path[PATH_MAX];
+		struct stat buf;
 		alpm_list_t *syncdbs = NULL, *i;
 		int found = 0;
 		char *dname = ent->d_name;
@@ -68,6 +70,15 @@ static int sync_cleandb(const char *dbpath, int keep_used) {
 		if(!strcmp(dname, "sync") || !strcmp(dname, "local")) {
 			continue;
 		}
+
+		/* build the full path */
+		snprintf(path, PATH_MAX, "%s%s", dbpath, ent->d_name);
+		/* skip entries that are not dirs (lock file, etc.) */
+		stat(path, &buf);
+		if(!S_ISDIR(buf.st_mode)) {
+			continue;
+		}
+
 		if(keep_used) {
 			syncdbs = alpm_option_get_syncdbs();
 			for(i = syncdbs; i && !found; i = alpm_list_next(i)) {
@@ -78,9 +89,6 @@ static int sync_cleandb(const char *dbpath, int keep_used) {
 		/* We have a directory that doesn't match any syncdb.
 		 * Ask the user if he wants to remove it. */
 		if(!found) {
-			/* build the full path */
-			snprintf(path, PATH_MAX, "%s%s", dbpath, ent->d_name);
-
 			if(!yesno(_("Do you want to remove %s? [Y/n] "), path)) {
 				continue;
 			}
@@ -197,6 +205,28 @@ static int sync_cleancache(int level)
 	return(0);
 }
 
+static int sync_trans_init(pmtransflag_t flags) {
+	if(alpm_trans_init(PM_TRANS_TYPE_SYNC, flags, cb_trans_evt,
+				cb_trans_conv, cb_trans_progress) == -1) {
+		fprintf(stderr, _("error: failed to init transaction (%s)\n"),
+				alpm_strerrorlast());
+		if(pm_errno == PM_ERR_HANDLE_LOCK) {
+			printf(_("  if you're sure a package manager is not already\n"
+						"  running, you can remove %s.\n"), alpm_option_get_lockfile());
+		}
+		return(-1);
+	}
+	return(0);
+}
+
+static int sync_trans_release() {
+	if(alpm_trans_release() == -1) {
+		fprintf(stderr, _("error: failed to release transaction (%s)\n"),
+				alpm_strerrorlast());
+		return(-1);
+	}
+	return(0);
+}
 static int sync_synctree(int level, alpm_list_t *syncs)
 {
 	alpm_list_t *i;
@@ -476,14 +506,7 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
 	alpm_list_t *sync_dbs = alpm_option_get_syncdbs();
 
 	/* Step 1: create a new transaction... */
-	if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, cb_trans_evt,
-		 cb_trans_conv, cb_trans_progress) == -1) {
-		fprintf(stderr, _("error: failed to init transaction (%s)\n"),
-		        alpm_strerrorlast());
-		if(pm_errno == PM_ERR_HANDLE_LOCK) {
-			printf(_("  if you're sure a package manager is not already\n"
-			         "  running, you can remove %s.\n"), alpm_option_get_lockfile());
-		}
+	if(sync_trans_init(config->flags) == -1) {
 		return(1);
 	}
 
@@ -526,28 +549,18 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
 				 * an '-S pacman' operation */
 				if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) {
 					printf("\n");
-					printf(_(":: pacman has detected a newer version of itself.\n"
-					         ":: It is recommended that you upgrade pacman by itself\n"
-					         ":: using 'pacman -S pacman', and then rerun the current\n"
-					         ":: operation. If you wish to continue the operation and\n"
-					         ":: not upgrade pacman separately, answer no.\n"));
-					if(yesno(_(":: Cancel current operation? [Y/n] "))) {
-						if(alpm_trans_release() == -1) {
-							fprintf(stderr, _("error: failed to release transaction (%s)\n"),
-							    alpm_strerrorlast());
-							retval = 1;
-							goto cleanup;
+					printf(_(":: pacman has detected a newer version of itself.\n"));
+					if(yesno(_(":: Do you want to cancel the current operation\n"
+					           ":: and install the new pacman version now? [Y/n] "))) {
+						if(sync_trans_release() == -1) {
+							return(1);
 						}
-						if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags,
-						   cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) {
-							fprintf(stderr, _("error: failed to init transaction (%s)\n"),
-							    alpm_strerrorlast());
+						if(sync_trans_init(0) == -1) {
 							return(1);
 						}
 						if(alpm_trans_addtarget("pacman") == -1) {
 							fprintf(stderr, _("error: pacman: %s\n"), alpm_strerrorlast());
-							retval = 1;
-							goto cleanup;
+							return(1);
 						}
 						break;
 					}
@@ -571,7 +584,7 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
 				}
 				if(pm_errno != PM_ERR_PKG_NOT_FOUND) {
 					fprintf(stderr, _("error: '%s': %s\n"),
-					        (char *)i->data, alpm_strerrorlast());
+							targ, alpm_strerrorlast());
 					retval = 1;
 					goto cleanup;
 				}
@@ -605,9 +618,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;
+					}
 				}
 			}
 		}
@@ -719,9 +760,7 @@ cleanup:
 	if(data) {
 		FREELIST(data);
 	}
-	if(alpm_trans_release() == -1) {
-		fprintf(stderr, _("error: failed to release transaction (%s)\n"),
-		        alpm_strerrorlast());
+	if(sync_trans_release() == -1) {
 		retval = 1;
 	}
 
@@ -735,8 +774,19 @@ int pacman_sync(alpm_list_t *targets)
 
 	/* clean the cache */
 	if(config->op_s_clean) {
-		int ret = sync_cleancache(config->op_s_clean);
+		int ret = 0;
+
+		if(sync_trans_init(0) == -1) {
+			return(1);
+		}
+
+		ret += sync_cleancache(config->op_s_clean);
 		ret += sync_cleandb_all();
+
+		if(sync_trans_release() == -1) {
+			ret++;
+		}
+
 		return(ret);
 	}
 

src/pacman/util.c

@@ -34,6 +34,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <limits.h>
+#include <wchar.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -187,41 +188,82 @@ char *mbasename(const char *path)
 	return (char *)p;
 }
 
+/** Parse the dirname of a program from a path.
+* The path returned should be freed.
+* @param path path to parse dirname from
+*
+* @return everything preceding the final '/'
+*/
+char *mdirname(const char *path)
+{
+	char *ret, *last;
+
+	/* null or empty path */
+	if(path == NULL || path == '\0') {
+		return(strdup("."));
+	}
+
+	ret = strdup(path);
+	last = strrchr(ret, '/');
+
+	if(last != NULL) {
+		/* we found a '/', so terminate our string */
+		*last = '\0';
+		return(ret);
+	}
+	/* no slash found */
+	free(ret);
+	return(strdup("."));
+}
+
 /* output a string, but wrap words properly with a specified indentation
  */
 void indentprint(const char *str, int indent)
 {
-	const char *p = str;
-	int cidx = indent;
+	wchar_t *wcstr;
+	const wchar_t *p;
+	int len, cidx;
+
+	if(!str) {
+		return;
+	}
+
+	len = strlen(str) + 1;
+	wcstr = calloc(len, sizeof(wchar_t));
+	len = mbstowcs(wcstr, str, len);
+	p = wcstr;
+	cidx = indent;
 
 	while(*p) {
-		if(*p == ' ') {
-			const char *next = NULL;
-			int len;
+		if(*p == L' ') {
+			const wchar_t *q, *next;
 			p++;
-			if(p == NULL || *p == ' ') continue;
-			next = strchr(p, ' ');
+			if(p == NULL || *p == L' ') continue;
+			next = wcschr(p, L' ');
 			if(next == NULL) {
-				next = p + mbstowcs(NULL, p, 0);
+				next = p + wcslen(p);
+			}
+			/* len captures # cols */
+			len = 0;
+			q = p;
+			while(q < next) {
+				len += wcwidth(*q++);
 			}
-			len = next - p;
 			if(len > (getcols() - cidx - 1)) {
-				/* newline */
-				int i;
-				fprintf(stdout, "\n");
-				for(i = 0; i < indent; i++) {
-					fprintf(stdout, " ");
-				}
+				/* wrap to a newline and reindent */
+				fprintf(stdout, "\n%-*s", indent, "");
 				cidx = indent;
 			} else {
 				printf(" ");
 				cidx++;
 			}
+			continue;
 		}
-		fprintf(stdout, "%c", *p);
+		fprintf(stdout, "%lc", (wint_t)*p);
+		cidx += wcwidth(*p);
 		p++;
-		cidx++;
 	}
+	free(wcstr);
 }
 
 /* Convert a string to uppercase
@@ -361,14 +403,31 @@ void list_display(const char *title, const alpm_list_t *list)
 {
 	const alpm_list_t *i;
 	int cols, len;
+	wchar_t *wcstr;
 
-	len = mbstowcs(NULL, title, 0);
-	printf("%s ", title);
+	if(title) {
+		/* len goes from # bytes -> # chars -> # cols */
+		len = strlen(title) + 1;
+		wcstr = calloc(len, sizeof(wchar_t));
+		len = mbstowcs(wcstr, title, len);
+		len = wcswidth(wcstr, len);
+		free(wcstr);
+		printf("%s ", title);
+	} else {
+		len = 0;
+	}
 
 	if(list) {
 		for(i = list, cols = len; i; i = alpm_list_next(i)) {
 			char *str = alpm_list_getdata(i);
-			int s = mbstowcs(NULL, str, 0) + 2;
+			/* s goes from # bytes -> # chars -> # cols */
+			int s = strlen(str) + 1;
+			wcstr = calloc(s, sizeof(wchar_t));
+			s = mbstowcs(wcstr, str, s);
+			s = wcswidth(wcstr, s);
+			free(wcstr);
+			/* two additional spaces are added to the length */
+			s += 2;
 			int maxcols = getcols();
 			if(s + cols >= maxcols) {
 				int i;
@@ -540,7 +599,7 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list
 	/* print a prefix to the message */
 	switch(level) {
 		case PM_LOG_DEBUG:
-			asprintf(string, _("debug: %s"), msg);
+			asprintf(string, "debug: %s", msg);
 			break;
 		case PM_LOG_ERROR:
 			asprintf(string, _("error: %s"), msg);
@@ -587,7 +646,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar
 	/* print a prefix to the message */
 	switch(level) {
 		case PM_LOG_DEBUG:
-			fprintf(stream, _("debug: "));
+			fprintf(stream, "debug: ");
 			break;
 		case PM_LOG_ERROR:
 			fprintf(stream, _("error: "));

src/pacman/util.h

@@ -41,6 +41,7 @@ int getcols();
 int makepath(const char *path);
 int rmrf(const char *path);
 char *mbasename(const char *path);
+char *mdirname(const char *path);
 void indentprint(const char *str, int indent);
 char *strtoupper(char *str);
 char *strtrim(char *str);

src/util/testpkg.c

@@ -29,44 +29,58 @@
 
 static void output_cb(pmloglevel_t level, char *fmt, va_list args)
 {
-	if(strlen(fmt)) {
-        switch(level) {
-        case PM_LOG_ERROR: printf("error: "); break;
-        case PM_LOG_WARNING: printf("warning: "); break;
-		default: break;
-        }
-		vprintf(fmt, args);
-    }
+	if(fmt[0] == '\0') {
+		return;
+	}
+	switch(level) {
+		case PM_LOG_ERROR: printf("error: "); break;
+		case PM_LOG_WARNING: printf("warning: "); break;
+		default: return; /* skip other messages */
+	}
+	vprintf(fmt, args);
 }
 
 int main(int argc, char **argv)
 {
-    int retval = 1; /* default = false */
-    pmpkg_t *pkg = NULL;
+	int retval = 1; /* default = false */
+	pmpkg_t *pkg = NULL;
 
-    if(argc != 2) {
+	if(argc != 2) {
 		fprintf(stderr, "usage: %s <package file>\n", BASENAME);
 		return(1);
 	}
 
 	if(alpm_initialize() == -1) {
-		fprintf(stderr, "cannot initilize alpm: %s\n", alpm_strerrorlast());
-        return(1);
+		fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast());
+		return(1);
 	}
 
-    /* let us get log messages from libalpm */
+	/* let us get log messages from libalpm */
 	alpm_option_set_logcb(output_cb);
 
 	if(alpm_pkg_load(argv[1], 1, &pkg) == -1 || pkg == NULL) {
-        retval = 1;
+		switch(pm_errno) {
+			case PM_ERR_PKG_OPEN:
+				printf("Cannot open the given file.\n");
+				break;
+			case PM_ERR_LIBARCHIVE_ERROR:
+			case PM_ERR_PKG_INVALID:
+				printf("Package is invalid.\n");
+				break;
+			default:
+				printf("libalpm error: %s\n", alpm_strerrorlast());
+				break;
+		}
+		retval = 1;
 	} else {
 		alpm_pkg_free(pkg);
-        retval = 0;
+		printf("Package is valid.\n");
+		retval = 0;
 	}
 
 	if(alpm_release() == -1) {
 		fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast());
 	}
 
-    return(retval);
+	return(retval);
 }

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:*
+}