Update Czech translation

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

HACKING

@@ -12,10 +12,10 @@ Coding style
 1.  All code should be indented with tabs. (Ignore the use of only spaces in
     this file) By default, source files contain the following VIM modeline:
 +
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /* vim: set ts=2 sw=2 noet: */
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 2.  When opening new blocks such as 'while', 'if', or 'for', leave the opening
     brace on the same line as the beginning of the codeblock. The closing brace
@@ -24,8 +24,8 @@ code~~~~~~~~~~
     braces, even if it's just a one-line block. This reduces future error when
     blocks are expanded beyond one line.
 +
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 for(lp = list; lp; lp = lp->next) {
   newlist = _alpm_list_add(newlist, strdup(lp->data));
 }
@@ -40,14 +40,14 @@ while(it) {
   free(it);
   it = ptr;
 }
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 3.  When declaring a new function, put the opening and closing braces on their
     own line. Also, when declaring a pointer, do not put a space between the
     asterisk and the variable name.
 +
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
 {
   alpm_list_t *ptr, *lp;
@@ -58,7 +58,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
   }
   ...
 }
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 4.  Comments should be ANSI-C89 compliant. That means no `// Comment` style;
     use only `/* Comment */` style.
@@ -101,37 +101,37 @@ Currently our #include usage is in messy shape, but this is no reason to
 continue down this messy path. When adding an include to a file, follow this
 general pattern, including blank lines:
 
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #include "config.h"
 
 #include <standardheader.h>
 #include <another.h>
 #include <...>
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Follow this with some more headers, depending on whether the file is in libalpm
 or pacman proper. For libalpm:
 
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /* libalpm */
 #include "yourfile.h"
 #include "alpm_list.h"
 #include "anythingelse.h"
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For pacman:
 
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #include <alpm.h>
 #include <alpm_list.h>
 
 /* pacman */
 #include "yourfile.h"
 #include "anythingelse.h"
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 /////
 vim: set ts=2 sw=2 syntax=asciidoc et:

Makefile.am

@@ -3,6 +3,9 @@ if WANT_DOC
 SUBDIRS += doc
 endif
 
+# Make sure we test and build manpages when doing distcheck
+DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version
+
 # Some files automatically included, so they aren't specified below:
 #   AUTHORS, COPYING, NEWS, README
 EXTRA_DIST = HACKING

NEWS

@@ -1,7 +1,39 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
-3.2.0
-              - removed -A/--add option from pacman frontend
+3.2.2         - log pacsave warnings to pacman.log (FS#12531)
+              - separate local DB creation and writing (FS#12263)
+              - pacman-optimize: rewrite and refresh (FS#11767)
+              - repo-add: use openssl instead of md5sum
+              - simplify doc building process for ease of development
+              - ensure correct handling of syscall interruptions
+              - readd missing newline on -Qi/-Si output (FS#11331)
+              - fix TotalDownload regression (FS#11339)
+              - makepkg:
+                - replace getopt with an internal function
+                - detect incorrect usage of provides (FS#12540)
+                - fix bash substitution to work in older versions
+                - fix updating PKGBUILD and simplify logic for SCM packages
+                - save/restore shell options before/after build() (FS#12344)
+              - documentation updates and asciidoc build fix
+              - existing translation updates
+3.2.1         - drop special handling of file:// URLs
+              - display optdepends on install and upgrade
+              - fix segfault on x86_64 when using UseSyslog (FS#11096)
+              - fix detection of TotalDownload (FS#11180)
+              - fix "No such file" error during --force installs (FS#11218)
+              - better handling of progressbar when behind a proxy (FS#8725)
+              - repo-add: fix whitespace handling (FS#9171, FS#10630)
+              - repo-add: add optdepends to the sync DB (FS#10630)
+              - makepkg:
+                - allow specifying a download filename (related to FS#11292)
+                - fix download functions with weird URLs (FS#11076)
+                - fix creation of source package with local files (FS#11149)
+                - fix error when sourcing profile scripts (FS#11179)
+                - perform case-insensitive checksum comparison (FS#11283)
+              - documentation and help updates (including fix for FS#11203)
+              - new Ukrainian translation
+              - existing translation updates
+3.2.0         - removed -A/--add option from pacman frontend
               - added --asexplicit option
               - new remove option --unneeded
               - add -Rss option to remove all dependencies

PKGBUILD.proto

@@ -14,6 +14,7 @@ license=('GPL')
 groups=()
 depends=()
 makedepends=()
+optdepends=()
 provides=()
 conflicts=()
 replaces=()

TRANSLATORS

@@ -18,8 +18,8 @@ German (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):
 	Chantry Xavier <shiningxc@gmail.com>
 Hungarian (hu):
@@ -31,8 +31,8 @@ Polish (pl):
 	Jaroslaw Swierczynski <swiergot@gmail.com>
 	Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
-	Armando M. Baratti <ambaratti@archlinux-br.org>
 	Hugo Doria <hugo@archlinux.org>
+	Armando M. Baratti <ambaratti@archlinux-br.org>
 	Leandro Inacio <leandro@archlinux-br.org>
 Russian (ru):
 	Sergey Tereschenko <serg.partizan@gmail.com>
@@ -42,5 +42,8 @@ Russian (ru):
 Turkish (tr):
 	Samed Beyribey <ras0ir@eventualis.org>
 	Alper KANAT <alperkanat@gmail.com>
+Ukrainian (uk):
+	Roman Kyrylych (Роман Кирилич) <roman.kyrylych@gmail.com>
+	Ivan Kovnatsky (Іван Ковнацький) <sevenfourk@gmail.com>
 Simplified Chinese (zh_CN):
 	甘露(Lu.Gan) <rhythm.gan@gmail.com>

configure.ac

@@ -41,13 +41,13 @@ AC_PREREQ(2.60)
 #   Bugfix releases:
 #     pacman_version_micro += 1
 
-m4_define([lib_current], [3])
-m4_define([lib_revision], [0])
-m4_define([lib_age], [0])
+m4_define([lib_current], [4])
+m4_define([lib_revision], [1])
+m4_define([lib_age], [1])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [2])
-m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_micro], [2])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
@@ -103,11 +103,6 @@ AC_ARG_ENABLE(doxygen,
 	AS_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]),
 	[wantdoxygen=$enableval], [wantdoxygen=no])
 
-# Help line for asciidoc
-AC_ARG_ENABLE(asciidoc,
-	AS_HELP_STRING([--enable-asciidoc], [build your own manpages with Asciidoc]),
-	[wantasciidoc=$enableval], [wantasciidoc=no])
-
 # Help line for debug
 AC_ARG_ENABLE(debug,
 	AS_HELP_STRING([--enable-debug], [enable debugging support]),
@@ -182,18 +177,24 @@ GCC_VISIBILITY_CC
 GCC_GNU89_INLINE_CC
 
 # Host-dependant definitions
+SIZECMD="stat -c %s"
 case "${host_os}" in
+	*bsd*)
+		SIZECMD="stat -f %z"
+		;;
 	cygwin*)
 		host_os_cygwin=yes
 		CFLAGS="$CFLAGS -DCYGWIN"
 		;;
 	darwin*)
 		host_os_darwin=yes
+		SIZECMD="stat -f %z"
 		;;
 esac
 
 AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
 AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
+AC_SUBST(SIZECMD)
 
 # Check for architecture, used in default makepkg.conf
 # (Note single space left after CARCHFLAGS)
@@ -267,23 +268,6 @@ else
 fi
 AM_CONDITIONAL(USE_DOXYGEN, test "x$usedoxygen" = "xyes")
 
-# Check for asciidoc support and status
-AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
-AC_MSG_CHECKING([for asciidoc])
-if test "x$wantasciidoc" = "xyes" ; then
-	if test $ASCIIDOC ; then
-		AC_MSG_RESULT([yes])
-		useasciidoc=yes
-	else
-		AC_MSG_RESULT([no, asciidoc missing])
-		useasciidoc=no
-	fi
-else
-	AC_MSG_RESULT([no, disabled by configure])
-	useasciidoc=no
-fi
-AM_CONDITIONAL(USE_ASCIIDOC, test "x$useasciidoc" = "xyes")
-
 # Enable or disable debug code
 AC_MSG_CHECKING(for debug mode request)
 if test "x$debug" = "xyes" ; then
@@ -365,6 +349,7 @@ ${PACKAGE_NAME}:
     Architecture           : ${CARCH}
     Architecture flags     : ${CARCHFLAGS}
     Host Type              : ${CHOST}
+    Filesize command       : ${SIZECMD}
 
     libalpm version        : ${LIB_VERSION}
     libalpm version info   : ${LIB_VERSION_INFO}
@@ -381,7 +366,6 @@ ${PACKAGE_NAME}:
     Run make in doc/ dir   : ${wantdoc}
     Use download library   : ${internaldownload}
     Doxygen support        : ${usedoxygen}
-    Asciidoc support       : ${useasciidoc}
     debug support          : ${debug}
 "
 

contrib/pactree

@@ -208,11 +208,10 @@ for (( n=0 ; n < $len_options ; n++ )); do
 		continue
 	fi
 
-	if [[ "${options[$n]}" =~ -d[[:digit:]]* || "${options[$n]}" == "--depth" ]]; then
+	if [[ "${options[$n]}" =~ -d[[:digit:]]+ || "${options[$n]}" == "--depth" ]]; then
 		if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then
 			max_depth="${options[$n]#-d}"
 		elif [[ ${options[$((n+1))]} =~ [[:digit:]]+ ]]; then
-#		if [ ${options[$((n+1))]} -eq ${options[$((n+1))]} 2>/dev/null ]; then
 			max_depth="${options[$((n+1))]}"
 			unset options[$((n+1))]
 			((++n))

doc/Makefile.am

@@ -15,6 +15,7 @@ ASCIIDOC_MANS = \
 DOXYGEN_MANS = $(wildcard man3/*.3)
 
 EXTRA_DIST = \
+	asciidoc.conf \
 	pacman.8.txt \
 	makepkg.8.txt \
 	repo-add.8.txt \
@@ -29,8 +30,12 @@ EXTRA_DIST = \
 	$(DOXYGEN_MANS)
 
 # Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = *.xml
-MAINTAINERCLEANFILES = $(ASCIIDOC_MANS)
+MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS)
+
+# Ensure manpages are fresh when building a dist tarball
+dist-hook:
+	$(MAKE) $(AM_MAKEFLAGS) clean
+	$(MAKE) $(AM_MAKEFLAGS) all
 
 if USE_GIT_VERSION
 GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty
@@ -39,36 +44,34 @@ else
 REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
 endif
 
-
 man_MANS =
 dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8
 
 if USE_DOXYGEN
 man_MANS += $(DOXYGEN_MANS)
 
-all: doxygen.in
+all-local: doxygen.in
 
 doxygen.in:
 	$(DOXYGEN) $(srcdir)/Doxyfile
 endif
 
-if USE_ASCIIDOC
 ASCIIDOC_OPTS = \
 	-f asciidoc.conf \
 	-a pacman_version="$(REAL_PACKAGE_VERSION)" \
 	-a pacman_date="`date +%Y-%m-%d`" \
 	-a sysconfdir=$(sysconfdir)
 A2X_OPTS = \
+	--no-xmllint \
 	-d manpage \
 	-f manpage \
 	--xsltproc-opts='-param man.endnotes.list.enabled 0' \
 	--xsltproc-opts='-param man.endnotes.are.numbered 0'
 
-$(ASCIIDOC_MANS):
-	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
-
 # These rules are due to the includes and files of the asciidoc text
 $(ASCIIDOC_MANS): asciidoc.conf footer.txt
+	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
+
 pacman.8: pacman.8.txt
 makepkg.8: makepkg.8.txt
 repo-add.8: repo-add.8.txt
@@ -78,7 +81,7 @@ pacman.conf.5: pacman.conf.5.txt
 libalpm.3: libalpm.3.txt
 # this one is just a symlink
 repo-remove.8: repo-add.8
-	ln -s repo-add.8 repo-remove.8
-endif
+	rm -f repo-remove.8
+	$(LN_S) repo-add.8 repo-remove.8
 
 # vim:set ts=2 sw=2 noet:

doc/PKGBUILD.5.txt

@@ -87,6 +87,10 @@ similar to `$_basekernver`.
 	variables if possible when specifying the download location. Any files
 	that are compressed will automatically be extracted, unless found in
 	the noextract array listed below.
++
+It is also possible to specify an optional filename, which is helpful
+with weird URLs and for handling multiple source files with the same
+name. The syntax is: `$$source=('filename::url')$$`
 
 *noextract (array)*::
 	An array of filenames corresponding to those from the source array. Files
@@ -156,7 +160,9 @@ similar to `$_basekernver`.
 	depend on 'cron' rather than 'dcron OR fcron'.
 	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.
+	dependency of other packages. Provisions involving the '>' and '<'
+	operators are invalid as only specifc versions of a package may be
+	provided.
 
 *replaces (array)*::
 	An array of packages that this package should replace, and can be used
@@ -363,11 +369,10 @@ The following is an example PKGBUILD for the 'patch' package. For more
 examples, look through the build files of your distribution's packages. For
 those using Arch Linux, consult the ABS tree.
 
-[sh]
-source~~~~~
+[source,sh]
+-------------------------------
 include::PKGBUILD-example.txt[]
-source~~~~~
-
+-------------------------------
 
 See Also
 --------

doc/makepkg.8.txt

@@ -116,7 +116,7 @@ Options
 
 *-r, \--rmdeps*::
 	Upon successful build, remove any dependencies installed by makepkg
-	during dependency auto-resolution (using `-b` or `-s`).
+	during dependency auto-resolution and installation when using `-s`.
 
 *-R, \--repackage*::
 	Repackage contents of pkg/ without rebuilding the package. This is
@@ -128,10 +128,18 @@ Options
 	dependencies are not found, pacman will try to resolve them. If
 	successful, the missing packages will be downloaded and installed.
 
+*\--allsource*::
+	Do not actually build the package, but build a source-only tarball that
+	includes all sources, including those that are normally download via
+	makepkg. This is useful for passing a single tarball to another program
+	such as a chroot or remote builder. It will also satisfy requirements of
+	the GPL when distributing binary packages.
+
 *\--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
-	chroot, remote builder, or an AUR upload.
+	Do not actually build the package, but build a source-only tarball that
+	does not include sources that can be fetched via a download URL. This is
+	useful for passing a single tarball to another program such as a chroot,
+	remote builder, or a tarball upload.
 
 *\--noconfirm*::
 	(Passed to pacman) Prevent pacman from waiting for user input before

doc/makepkg.conf.5.txt

@@ -34,12 +34,13 @@ Options
 **DLAGENTS=(**\'protocol::/path/to/command [options]' ...**)**::
 	Sets the download agents used to fetch source files specified with a URL in
 	the linkman:PKGBUILD[5] file. Options can be specified for each command as
-	well; the download URL is placed on the end of the command. This is more
-	flexible than the former `FTPAGENT` variable, as any protocol can have a
-	download agent. Several examples are provided in the default makepkg.conf.
-	All instances of `%u` will be replaced with the download URL. If present,
-	instances of `%o` will be replaced with the local filename, plus a ``.part''
-	extension, which allows to do file resumes properly.
+	well, and any protocol can have a download agent. Several examples are provided
+	in the default makepkg.conf.
+	+
+	If present, `%u` will be replaced with the download URL. Otherwise, the
+	download URL will be placed on the end of the command. If present, `%o` will
+	be replaced with the local filename, plus a ``.part'' extension, which allows
+	makepkg to handle resuming file downloads.
 
 **CARCH=**"carch"::
 	Specifies your computer architecture; possible values include such things

doc/pacman.8.txt

@@ -308,7 +308,7 @@ linkman:pacman.conf[5].
 	to date.
 
 *\--needed*::
-	Only install the targets that are not already installed and up-to-date.
+	Don't reinstall the targets that are already up-to-date.
 
 *\--ignore* <'package'>::
 	Directs pacman to ignore upgrades of package even if there is one

doc/pacman.conf.5.txt

@@ -40,8 +40,9 @@ Include = /etc/pacman.d/core
 Server = file:///home/pkgs
 --------
 
-*NOTE*: Each directive must be in CamelCase. If the case isn't respected, the directive
-won't be recognized. For example. noupgrade or NOUPGRADE will not work.
+NOTE: Each directive must be in CamelCase. If the case isn't respected, the
+directive won't be recognized. For example. noupgrade or NOUPGRADE will not
+work.
 
 Options
 -------

doc/repo-add.8.txt

@@ -16,9 +16,9 @@ repo-add - package database maintenance utility
 
 Synopsis
 --------
-repo-add [-q] <path-to-db> <package> ...
+repo-add [-q] <path-to-db> <package1> [<package2> ...]
 
-repo-remove [-q] <path-to-db> <packagename> ...
+repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...]
 
 
 Description

etc/pacman.conf.in

@@ -17,6 +17,7 @@ HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl %u > %o
 #CleanMethod = KeepInstalled
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

lib/libalpm/add.c

@@ -656,6 +656,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 
 		/* we'll need to save some record for backup checks later */
 		oldpkg = _alpm_pkg_dup(local);
+		/* make sure all infos are loaded because the database entry
+		 * will be removed soon */
+		_alpm_db_read(oldpkg->origin_data.db, oldpkg, INFRQ_ALL);
 		/* copy over the install reason */
 		newpkg->reason = alpm_pkg_get_reason(local);
 
@@ -693,6 +696,16 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		}
 	}
 
+	/* prepare directory for database entries so permission are correct after
+	   changelog/install script installation (FS#12263) */
+	if(_alpm_db_prepare(db, newpkg)) {
+		alpm_logaction("error: could not create database entry %s-%s\n",
+				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+		pm_errno = PM_ERR_DB_WRITE;
+		ret = -1;
+		goto cleanup;
+	}
+
 	if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) {
 		struct archive *archive;
 		struct archive_entry *entry;

lib/libalpm/alpm.h

@@ -224,6 +224,7 @@ size_t alpm_pkg_changelog_read(void *ptr, size_t size,
 /*int alpm_pkg_changelog_feof(const pmpkg_t *pkg, void *fp);*/
 int alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp);
 unsigned short alpm_pkg_has_scriptlet(pmpkg_t *pkg);
+unsigned short alpm_pkg_has_force(pmpkg_t *pkg);
 
 off_t alpm_pkg_download_size(pmpkg_t *newpkg);
 

lib/libalpm/be_files.c

@@ -51,7 +51,7 @@
  * Return the last update time as number of seconds from the epoch.
  * Returns 0 if the value is unknown or can't be read.
  */
-time_t getlastupdate(const pmdb_t *db)
+static time_t getlastupdate(const pmdb_t *db)
 {
 	FILE *fp;
 	char *file;
@@ -85,7 +85,7 @@ time_t getlastupdate(const pmdb_t *db)
 /*
  * writes the dbpath/.lastupdate file with the value in time
  */
-int setlastupdate(const pmdb_t *db, time_t time)
+static int setlastupdate(const pmdb_t *db, time_t time)
 {
 	FILE *fp;
 	char *file;
@@ -500,7 +500,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 				if(fgets(line, 512, fp) == NULL) {
 					goto error;
 				}
-				info->reason = atol(_alpm_strtrim(line));
+				info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line));
 			} else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) {
 				/* NOTE: the CSIZE and SIZE fields both share the "size" field
 				 *       in the pkginfo_t struct.  This can be done b/c CSIZE
@@ -618,7 +618,10 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 				_alpm_strtrim(line);
 				if(strcmp(line, "%DELTAS%") == 0) {
 					while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
-						info->deltas = alpm_list_add(info->deltas, _alpm_delta_parse(line));
+						pmdelta_t *delta = _alpm_delta_parse(line);
+						if(delta) {
+							info->deltas = alpm_list_add(info->deltas, delta);
+						}
 					}
 				}
 			}
@@ -649,6 +652,26 @@ error:
 	return(-1);
 }
 
+int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info)
+{
+	mode_t oldmask;
+	int retval = 0;
+	char *pkgpath = NULL;
+
+	oldmask = umask(0000);
+
+	pkgpath = get_pkgpath(db, info);
+
+	if((retval = mkdir(pkgpath, 0755)) != 0) {
+		_alpm_log(PM_LOG_ERROR, _("could not create directory %s: %s\n"), pkgpath, strerror(errno));
+	}
+
+	free(pkgpath);
+	umask(oldmask);
+
+	return(retval);
+}
+
 int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 {
 	FILE *fp = NULL;
@@ -667,10 +690,8 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 
 	pkgpath = get_pkgpath(db, info);
 
-	oldmask = umask(0000);
-	mkdir(pkgpath, 0755);
 	/* make sure we have a sane umask */
-	umask(0022);
+	oldmask = umask(0022);
 
 	if(strcmp(db->treename, "local") == 0) {
 		local = 1;

lib/libalpm/cache.c

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

lib/libalpm/conflict.c

@@ -25,7 +25,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>

lib/libalpm/db.c

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -170,6 +169,8 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
 {
 	alpm_list_t *i;
 	int found = 0;
+	char *newurl;
+	int len = 0;
 
 	ALPM_LOG_FUNC;
 
@@ -186,10 +187,18 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
 		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
 	}
 
-	if(url && strlen(url)) {
-		db->servers = alpm_list_add(db->servers, strdup(url));
+	if(url) {
+		len = strlen(url);
+	}
+	if(len) {
+		newurl = strdup(url);
+		/* strip the trailing slash if one exists */
+		if(newurl[len - 1] == '/') {
+			newurl[len - 1] = '\0';
+		}
+		db->servers = alpm_list_add(db->servers, newurl);
 		_alpm_log(PM_LOG_DEBUG, "adding new server URL to database '%s': %s\n",
-				db->treename, url);
+				db->treename, newurl);
 	} else {
 		FREELIST(db->servers);
 		_alpm_log(PM_LOG_DEBUG, "serverlist flushed for '%s'\n", db->treename);
@@ -348,8 +357,8 @@ void _alpm_db_free(pmdb_t *db)
 
 int _alpm_db_cmp(const void *d1, const void *d2)
 {
-	pmdb_t *db1 = (pmdb_t *)db1;
-	pmdb_t *db2 = (pmdb_t *)db2;
+	pmdb_t *db1 = (pmdb_t *)d1;
+	pmdb_t *db2 = (pmdb_t *)d2;
 	return(strcmp(db1->treename, db2->treename));
 }
 

lib/libalpm/db.h

@@ -50,7 +50,7 @@ struct __pmdb_t {
 /* db.c, database general calls */
 pmdb_t *_alpm_db_new(const char *dbpath, const char *treename);
 void _alpm_db_free(pmdb_t *db);
-int _alpm_db_cmp(const void *db1, const void *db2);
+int _alpm_db_cmp(const void *d1, const void *d2);
 alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles);
 pmdb_t *_alpm_db_register_local(void);
 pmdb_t *_alpm_db_register_sync(const char *treename);
@@ -60,6 +60,7 @@ int _alpm_db_open(pmdb_t *db);
 void _alpm_db_close(pmdb_t *db);
 int _alpm_db_populate(pmdb_t *db);
 int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
+int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info);
 int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
 int _alpm_db_remove(pmdb_t *db, pmpkg_t *info);
 

lib/libalpm/delta.c

@@ -22,6 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
+#include <sys/types.h>
+#include <regex.h>
 
 /* libalpm */
 #include "delta.h"
@@ -257,6 +259,19 @@ pmdelta_t *_alpm_delta_parse(char *line)
 {
 	pmdelta_t *delta;
 	char *tmp = line, *tmp2;
+	regex_t reg;
+
+	regcomp(&reg,
+			"^[^[:space:]]* [[:xdigit:]]{32}"
+			" [^[:space:]]* [[:xdigit:]]{32}"
+			" [^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*$",
+			REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
+	if(regexec(&reg, line, 0, 0, 0) != 0) {
+		/* delta line is invalid, return NULL */
+		regfree(&reg);
+		return(NULL);
+	}
+	regfree(&reg);
 
 	CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL));
 

lib/libalpm/dload.c

@@ -111,11 +111,11 @@ static int download_internal(const char *url, const char *localpath,
 	FILE *dlf, *localf = NULL;
 	struct url_stat ust;
 	struct stat st;
-	int chk_resume = 0;
-	size_t dl_thisfile = 0;
+	int chk_resume = 0, ret = 0;
+	size_t dl_thisfile = 0, nread = 0;
 	char *tempfile, *destfile, *filename;
-	int ret = 0;
 	struct url *fileurl = url_for_string(url);
+	char buffer[PM_DLBUF_LEN];
 
 	if(!fileurl) {
 		return(-1);
@@ -142,6 +142,12 @@ static int download_internal(const char *url, const char *localpath,
 		dl_thisfile = 0;
 	}
 
+	/* print proxy info for debug purposes */
+	_alpm_log(PM_LOG_DEBUG, "HTTP_PROXY: %s\n", getenv("HTTP_PROXY"));
+	_alpm_log(PM_LOG_DEBUG, "http_proxy: %s\n", getenv("http_proxy"));
+	_alpm_log(PM_LOG_DEBUG, "FTP_PROXY:  %s\n", getenv("FTP_PROXY"));
+	_alpm_log(PM_LOG_DEBUG, "ftp_proxy:  %s\n", getenv("ftp_proxy"));
+
 	/* libdownload does not reset the error code, reset it in
 	 * the case of previous errors */
 	downloadLastErrCode = 0;
@@ -200,9 +206,8 @@ static int download_internal(const char *url, const char *localpath,
 		handle->dlcb(filename, 0, ust.size);
 	}
 
-	size_t nread = 0;
-	char buffer[PM_DLBUF_LEN];
 	while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) {
+		size_t nwritten = 0;
 		if(ferror(dlf)) {
 			pm_errno = PM_ERR_LIBDOWNLOAD;
 			_alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s\n"),
@@ -211,7 +216,6 @@ static int download_internal(const char *url, const char *localpath,
 			goto cleanup;
 		}
 
-		size_t nwritten = 0;
 		while(nwritten < nread) {
 			nwritten += fwrite(buffer, 1, (nread - nwritten), localf);
 			if(ferror(localf)) {
@@ -340,21 +344,6 @@ cleanup:
 static int download(const char *url, const char *localpath,
 		time_t mtimeold, time_t *mtimenew) {
 	int ret;
-	const char *proto = "file://";
-	int len = strlen(proto);
-	if(strncmp(url, proto, len) == 0) {
-		/* we can simply grab an absolute path from the file:// url by starting
-		 * our path at the char following the proto (the root '/')
-		 */
-		const char *sourcefile = url + len;
-		const char *filename = get_filename(url);
-		char *destfile = get_destfile(localpath, filename);
-
-		ret = _alpm_copyfile(sourcefile, destfile);
-		FREE(destfile);
-		/* copyfile returns 1 on failure, we want to return -1 on failure */
-		return(ret ? -1 : 0);
-	}
 
 	/* We have a few things to take into account here.
 	 * 1. If we have both internal/external available, choose based on
@@ -380,6 +369,7 @@ static int download(const char *url, const char *localpath,
  *     than mtimeold.
  *   - if *mtimenew is non-NULL, it will be filled with the mtime of the remote
  *     file.
+ *   - servers must be a list of urls WITHOUT trailing slashes.
  *
  * RETURN:  0 for successful download
  *          1 if the mtimes are identical

lib/libalpm/package.c

@@ -30,7 +30,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 /* libarchive */
 #include <archive.h>
@@ -295,6 +294,20 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_groups(pmpkg_t *pkg)
 	return pkg->groups;
 }
 
+unsigned short SYMEXPORT alpm_pkg_has_force(pmpkg_t *pkg)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, return(-1));
+	ASSERT(pkg != NULL, return(-1));
+
+	if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
+		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
+	}
+	return pkg->force;
+}
+
 alpm_list_t SYMEXPORT *alpm_pkg_get_depends(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
@@ -827,32 +840,18 @@ void _alpm_pkg_free(pmpkg_t *pkg)
 	FREE(pkg);
 }
 
-/* Is pkgB an upgrade for pkgA ? */
-int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
+/* Is spkg an upgrade for locapkg? */
+int _alpm_pkg_compare_versions(pmpkg_t *spkg, pmpkg_t *localpkg)
 {
 	int cmp = 0;
 
 	ALPM_LOG_FUNC;
 
-	if(pkg->origin == PKG_FROM_CACHE) {
-		/* ensure we have the /desc file, which contains the 'force' option */
-		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
-	}
+	cmp = alpm_pkg_vercmp(alpm_pkg_get_version(spkg),
+			alpm_pkg_get_version(localpkg));
 
-	/* compare versions and see if we need to upgrade */
-	cmp = alpm_pkg_vercmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg));
-
-	if(cmp != 0 && pkg->force) {
+	if(cmp < 0 && alpm_pkg_has_force(spkg)) {
 		cmp = 1;
-		_alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s\n"),
-							alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-	} else if(cmp < 0) {
-		/* local version is newer */
-		pmdb_t *db = pkg->origin_data.db;
-		_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
-							alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
-							alpm_db_get_name(db), alpm_pkg_get_version(pkg));
-		cmp = 0;
 	}
 
 	return(cmp);

lib/libalpm/po/LINGUAS

@@ -10,4 +10,5 @@ pl
 pt_BR
 ru
 tr
+uk
 zh_CN

lib/libalpm/po/cs.po

@@ -2,27 +2,28 @@
 # Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2007, 2008.
+# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-19 08:45+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2009-01-04 21:59+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"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #, 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"
+msgstr "v seznamu cílů nahrazena starší verze %s-%s za %s\n"
 
 #, c-format
 msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "přeskakuji %s-%s protože v seznamu cílů je novější veze %s\n"
+msgstr "vynechává se %s-%s, protože v seznamu cílů je novější veze %s\n"
 
 #, c-format
 msgid "conflicting packages were found in the target list\n"
@@ -30,7 +31,7 @@ msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
 
 #, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nemůžete instalovat dva konfliktní balíčky společně\n"
+msgstr "nelze instalovat dva konfliktní balíčky současně\n"
 
 #, c-format
 msgid "replacing packages with -U is not supported yet\n"
@@ -38,7 +39,7 @@ msgstr "nahrazování balíčků pomocí -U není nyní podporováno\n"
 
 #, 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"
+msgstr "balíčky lze nahradit ručně použitím -Rd a -U\n"
 
 #, c-format
 msgid ""
@@ -66,19 +67,19 @@ msgstr "nelze přejmenovat %s na %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s uložen jako %s\n"
+msgstr "%s byl uložen jako %s\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
-msgstr "nelze nainstalovat %s jako %s (%s)\n"
+msgstr "%s nelze nainstalovat jako %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
-msgstr "%s nainstalován jako %s\n"
+msgstr "%s byl nainstalován jako %s\n"
 
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "rozbaluji %s jako %s.pacnew\n"
+msgstr "%s byl rozbalen jako %s.pacnew\n"
 
 #, c-format
 msgid "could not get current working directory\n"
@@ -150,7 +151,7 @@ msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr "cesta k databázi nebyla určena\n"
+msgstr "cesta k databázi není definována\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
@@ -170,15 +171,15 @@ msgstr "byl vybrán nahrazující balíček (%s poskytuje %s)\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nemohu vyřešit \"%s\", závislost \"%s\"\n"
+msgstr "nelze vyřešit \"%s\", závislost \"%s\"\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "url '%s' je chybná\n"
+msgstr "URL '%s' je chybná\n"
 
 #, c-format
 msgid "url scheme not specified, assuming HTTP\n"
-msgstr "schéma url nedefinováno, předpokládám HTTP\n"
+msgstr "schéma URL nedefinováno, předpokládá se HTTP\n"
 
 #, c-format
 msgid "disk"
@@ -190,7 +191,7 @@ msgstr "selhalo získání souboru '%s' z %s: %s\n"
 
 #, c-format
 msgid "cannot resume download, starting over\n"
-msgstr "nelze navázat stahování, začínám znovu\n"
+msgstr "nelze navázat stahování, začíná se znovu\n"
 
 #, c-format
 msgid "cannot write to file '%s'\n"
@@ -210,7 +211,7 @@ msgstr "nelze změnit adresář na %s\n"
 
 #, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr "spouštím XferCommand: větvení selhalo!\n"
+msgstr "spouští se XferCommand: větvení selhalo!\n"
 
 #, c-format
 msgid "failed to download %s\n"
@@ -230,11 +231,11 @@ msgstr "nedostatečná oprávnění"
 
 #, c-format
 msgid "could not find or read file"
-msgstr "nelze najít nebo číst soubor"
+msgstr "nelze nalézt nebo číst soubor"
 
 #, c-format
 msgid "could not find or read directory"
-msgstr "nelze najít nebo číst adresář"
+msgstr "nelze nalézt nebo číst adresář"
 
 #, c-format
 msgid "wrong or NULL argument passed"
@@ -282,7 +283,7 @@ msgstr "nelze odstranit záznam v databázi"
 
 #, c-format
 msgid "invalid url for server"
-msgstr "nesprávná url pro server"
+msgstr "nesprávná URL pro server"
 
 #, c-format
 msgid "transaction already initialized"
@@ -298,11 +299,11 @@ msgstr "duplicitní cíl"
 
 #, c-format
 msgid "transaction not prepared"
-msgstr "transakce nepřipravena"
+msgstr "transakce není připravena"
 
 #, c-format
 msgid "transaction aborted"
-msgstr "transakce zrušena"
+msgstr "transakce byla zrušena"
 
 #, c-format
 msgid "operation not compatible with the transaction type"
@@ -346,11 +347,11 @@ msgstr "jméno souboru balíčku není platné"
 
 #, c-format
 msgid "no such repository"
-msgstr "není žádný takový repositář"
+msgstr "takový repositář není nastaven"
 
 #, c-format
 msgid "invalid or corrupted delta"
-msgstr "neplatný nebo poškozený rozdíl"
+msgstr "neplatný nebo poškozený delta rozdíl"
 
 #, c-format
 msgid "delta patch failed"
@@ -358,7 +359,7 @@ msgstr "aplikace delta rozdílu selhala"
 
 #, c-format
 msgid "group not found"
-msgstr "skupina nenalezena"
+msgstr "skupina nebyla nalezena"
 
 #, c-format
 msgid "could not satisfy dependencies"
@@ -404,17 +405,9 @@ msgstr "chyba volání externího programu pro stahování souborů"
 msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: vynucená aktualizace na verzi %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: lokální (%s) je novější než %s (%s)\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "nelze nalézt %s v databázi -- přeskakuji\n"
+msgstr "nelze nalézt %s v databázi -- vynechat\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
@@ -430,23 +423,31 @@ msgstr "nelze odstranit položku '%s' z cache\n"
 
 #, 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"
+msgstr "%s-%s: ignoruje se aktualizace balíčku (měl být nahrazen %s-%s)\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: lokální verze (%s) je novější než v %s (%s)\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
+msgstr "%s: ignoruje se aktualizace balíčku (%s => %s)\n"
 
 #, c-format
 msgid "repository '%s' not found\n"
-msgstr "repositář '%s' nenalezen\n"
+msgstr "repositář '%s' nebyl nalezen\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s je aktuální -- přeskakuji\n"
+msgstr "%s-%s je aktuální -- vynechat\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s je aktuální -- přeinstalovávám\n"
+msgstr "%s-%s je aktuální -- přeinstalovat\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "ponížení verze balíčku %s (%s => %s)\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
@@ -454,7 +455,7 @@ msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "odstraňuji '%s' ze seznamu cílů, protože je konfliktní s '%s'\n"
+msgstr "'%s' odstraněn ze seznamu cílů, protože je konfliktní s '%s'\n"
 
 #, c-format
 msgid "command: %s\n"
@@ -462,7 +463,7 @@ msgstr "příkaz: %s\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "selhalo stažení některých souborů z %s\n"
+msgstr "selhalo získání některých souborů z %s\n"
 
 #, c-format
 msgid "could not create removal transaction\n"
@@ -502,7 +503,7 @@ msgstr "nelze odstranit zamykací soubor %s\n"
 
 #, c-format
 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"
+msgstr "V rodičovském prostředí chybí /bin/sh, ruší se provádění skriptů\n"
 
 #, c-format
 msgid "could not create temp directory\n"
@@ -538,7 +539,7 @@ msgstr "volání waitpid selhalo (%s)\n"
 
 #, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr "správné spuštění skriptu selhalo\n"
+msgstr "skript se nepodařilo spustit správně\n"
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
@@ -550,8 +551,8 @@ msgstr "nelze otevřít %s: %s\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "neexistuje cache %s, vytvářím...\n"
+msgstr "neexistuje cache %s, vytváří se...\n"
 
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "nelze vytvořit cache balíčků, používám /tmp\n"
+msgstr "nelze vytvořit cache balíčků, používá se /tmp\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: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-16 13:30+0100\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2009-01-03 11:58+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -415,14 +415,6 @@ msgstr "Fehler beim Aufruf eines externen Downloaders"
 msgid "unexpected error"
 msgstr "Unerwarteter Fehler"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: Erzwungene Aktualisierung auf Version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n"
@@ -443,6 +435,10 @@ msgstr "Konnte Eintrag '%s' nicht aus dem Puffer entfernen\n"
 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"
 
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n"
@@ -459,6 +455,10 @@ msgstr "%s-%s ist aktuell -- Überspringe\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s ist aktuell -- Reinstalliere\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "Downgrade des Paketes %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "Nicht lösbare Paketkonflikte gefunden\n"

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: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-19 17:31+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-23 23:38+0200\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -404,14 +404,6 @@ msgstr "error invoking external downloader"
 msgid "unexpected error"
 msgstr "unexpected error"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forcing upgrade to version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) is newer than %s (%s)\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
@@ -432,6 +424,10 @@ msgstr "could not remove entry '%s' from cache\n"
 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"
 
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) is newer than %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoring package upgrade (%s => %s)\n"
@@ -448,6 +444,10 @@ msgstr "%s-%s is up to date -- skipping\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s is up to date -- reinstalling\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "downgrading package %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "unresolvable package conflicts detected\n"
@@ -555,3 +555,4 @@ msgstr "no %s cache exists, creating...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "couldn't create package cache, using /tmp instead\n"
+

lib/libalpm/po/es.po

@@ -1,21 +1,20 @@
-# translation of libalpm.po to
-# Juan Pablo Gonzalez <jotapesan@gmail.com>, 2008.
-# translation of es.po to
+# Juan Pablo González Tognarelli <jotapesan@gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: libalpm\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-16 09:26-0400\n"
-"Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
-"Language-Team:  <es@li.org>\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2009-01-03 03:18-0300\n"
+"Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n"
+"Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\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"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
@@ -38,7 +37,7 @@ msgstr ""
 
 #, c-format
 msgid "replacing packages with -U is not supported yet\n"
-msgstr "reemplazar paquetes  con -U aún no esta soportado\n"
+msgstr "reemplazar paquetes con -U aún no esta soportado\n"
 
 #, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
@@ -134,15 +133,15 @@ msgstr ""
 
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "no se pudo analizar sintácticamente el archivo de descripción en %s\n"
+msgstr "no se pudo interpretar el archivo de descripción en %s\n"
 
 #, c-format
 msgid "missing package name in %s\n"
-msgstr "nombre de paquete ausente en %s\n"
+msgstr "falta el nombre de paquete en %s\n"
 
 #, c-format
 msgid "missing package version in %s\n"
-msgstr "forzando la versión del paquete en %s\n"
+msgstr "falta la versión del paquete en %s\n"
 
 #, c-format
 msgid "error while reading package %s: %s\n"
@@ -150,7 +149,7 @@ msgstr "error mientras se leía el paquete %s: %s\n"
 
 #, c-format
 msgid "missing package metadata in %s\n"
-msgstr "metadatos del paquete faltantes en %s\n"
+msgstr "faltan los metadatos del paquete en %s\n"
 
 #, c-format
 msgid "attempt to re-register the 'local' DB\n"
@@ -158,7 +157,7 @@ msgstr "intento para re-registrar la base de datos 'local'\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr "ruta para la base de datos no es definido\n"
+msgstr "la ruta para la base de datos no está definida\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
@@ -166,7 +165,7 @@ msgstr "ciclo de dependencias detectado:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "%s será quitado tras su dependencia %s\n"
+msgstr "%s será quitado luego de su dependencia %s\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
@@ -202,11 +201,11 @@ msgstr "no se puede resumir la descarga, empezando de nuevo\n"
 
 #, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "no se pudo escribir al archivo '%s'\n"
+msgstr "no se puede escribir en el archivo '%s'\n"
 
 #, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "error descargando %s: %s\n"
+msgstr "error descargando '%s': %s\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -226,7 +225,7 @@ msgstr "no se pudo descargar %s\n"
 
 #, c-format
 msgid "out of memory!"
-msgstr "no hay memoria!"
+msgstr "memoria insuficiente!"
 
 #, c-format
 msgid "unexpected system error"
@@ -250,11 +249,11 @@ msgstr "argumento erroneo o NULO"
 
 #, c-format
 msgid "library not initialized"
-msgstr "librería no inicializada"
+msgstr "biblioteca no inicializada"
 
 #, c-format
 msgid "library already initialized"
-msgstr "la librería ya fue inicializada"
+msgstr "la biblioteca ya fue inicializada"
 
 #, c-format
 msgid "unable to lock database"
@@ -350,7 +349,7 @@ msgstr "no se pudo quitar todos los archivos del paquete"
 
 #, c-format
 msgid "package filename is not valid"
-msgstr "nombre de archivo del paquete no es válido"
+msgstr "el nombre de archivo del paquete no es válido"
 
 #, c-format
 msgid "no such repository"
@@ -402,7 +401,7 @@ msgstr "error de libarchive"
 
 #, c-format
 msgid "download library error"
-msgstr "error de descarga de librería"
+msgstr "error de descarga de biblioteca"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -412,14 +411,6 @@ msgstr "error invocando el descargador externo"
 msgid "unexpected error"
 msgstr "error inesperado"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forzando la actualización a la versión %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "no se pudo encontrar %s en la base de datos -- saltando\n"
@@ -442,6 +433,10 @@ msgstr ""
 "%s-%s: ignorando la actualización del paquete (para ser reemplazado por %s-%"
 "s)\n"
 
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorando la actualización del paquete (%s => %s)\n"
@@ -458,6 +453,10 @@ msgstr "%s-%s esta al día -- saltando\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s esta al día -- re-instalando\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "decrementando la versión del paquete %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "se han detectado paquetes con conflictos no resueltos\n"
@@ -567,3 +566,4 @@ msgstr "no existe la cache %s, creando...\n"
 #, 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/po/fr.po

@@ -5,8 +5,8 @@ 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-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-16 22:50+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-23 22:51+0200\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
 "MIME-Version: 1.0\n"
@@ -408,14 +408,6 @@ msgstr "erreur en invoquant le client externe de téléchargement"
 msgid "unexpected error"
 msgstr "erreur non prévue"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: force la mise à jour à la version %s\n"
-
-#, 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"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "trouver %s dans la base de données a échoué -- ignoré\n"
@@ -436,6 +428,10 @@ msgstr "la suppression du cache de l'entrée '%s' a échoué\n"
 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"
 
+#, 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"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n"
@@ -452,6 +448,10 @@ msgstr "%s-%s est à jour -- ignoré\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s est à jour -- réinstalle\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "retourne à la version antérieure du paquet %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
@@ -560,3 +560,4 @@ msgstr "le cache %s n'existe pas, création...\n"
 #, 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/po/hu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\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"
@@ -405,14 +405,6 @@ msgstr "hiba a külső letöltő meghívásakor"
 msgid "unexpected error"
 msgstr "nemvárt hiba"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: erőltetett frissítés a %s verzióra\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n"
@@ -433,6 +425,10 @@ msgstr "nem sikerült eltávolítani a(z) '%s' bejegyzést a gyorsítótárból\
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: csomagfrissítés kihagyása (a(z) %s-%s le fogja cserélni)\n"
 
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n"
@@ -449,6 +445,10 @@ msgstr "a(z) %s-%s naprakész -- kihagyás\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "a(z) %s-%s naprakész -- újratelepítés\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "visszatérés egy régebbi %s verzióhoz (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "feloldhatatlan csomagütközéseket találtam\n"

lib/libalpm/po/it.po

@@ -1,7 +1,7 @@
 # Italian translation of libalpm.
 # Copyright (C) 2007 THE libalpm'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the libalpm package.
-# Giovanni 'voidnull' Scafora <linuxmania@gmail.com>, 2007, 2008
+# Giovanni 'voidnull' Scafora <giovanni@archlinux.org>, 2007, 2008, 2009
 # Andrea 'bash' Scarpino <bash.lnx@gmail.com>, 2008
 # Alessio 'mOLOk' Bolognino <themolok@gmail.com>, 2007
 # Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>, 2007
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-19 17:26+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-23 19:30+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n"
 
 #, c-format
 msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "salto %s-%s perché la nuova versione %s è nella lista\n"
+msgstr "ignoro %s-%s perché la nuova versione %s è già presente nella lista dei pacchetti\n"
 
 #, c-format
 msgid "conflicting packages were found in the target list\n"
@@ -41,7 +41,7 @@ msgstr "la sostituzione dei pacchetti con -U non è ancora supportata\n"
 #, 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"
+"puoi sostituire manualmente i pacchetti, usando le opzioni -Rd e -U\n"
 
 #, c-format
 msgid ""
@@ -57,7 +57,7 @@ msgstr "estrazione: il link simbolico %s non punta alla directory\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "estrazione: non sovrascrivere la directory con il file %s\n"
+msgstr "estrazione: non posso sovrascrivere la directory con il file %s\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -69,7 +69,7 @@ msgstr "impossibile rinominare %s in %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s salvato come %s\n"
+msgstr "%s è stato salvato come %s\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
@@ -85,7 +85,7 @@ msgstr "estrazione di %s come %s.pacnew\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr "impossibile ottenere la directory corrente\n"
+msgstr "impossibile determinare la directory corrente\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -113,7 +113,7 @@ msgstr "nome non valido per la voce del database '%s'\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "la voce nel database '%s' non è valida\n"
+msgstr "la voce nel database '%s' è corrotta\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -121,11 +121,11 @@ msgstr "impossibile aprire il file %s: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr "il database %s è corrotto: il nome del pacchetto %s è sbagliato\n"
+msgstr "il database %s è inconsistente: il nome del pacchetto %s non corrisponde\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr "il database %s è corrotto: la versione del pacchetto %s è sbagliata\n"
+msgstr "il database %s è inconsistente: la versione del pacchetto %s non corrisponde\n"
 
 #, c-format
 msgid "could not parse package description file in %s\n"
@@ -149,11 +149,11 @@ msgstr "manca il metadata del pacchetto in %s\n"
 
 #, c-format
 msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentativo in corso di registrare di nuovo il database 'locale'\n"
+msgstr "tentativo in corso di registrare di nuovo il DB 'locale'\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr "il percorso del database non è definito\n"
+msgstr "il percorso del database non è stato definito\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
@@ -169,7 +169,7 @@ msgstr "%s sarà installato prima della sua dipendenza %s\n"
 
 #, c-format
 msgid "provider package was selected (%s provides %s)\n"
-msgstr "il pacchetto fornito era selezionato (%s fornisce %s)\n"
+msgstr "il pacchetto è già stato selezionato (%s dipende da %s)\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
@@ -177,11 +177,11 @@ msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "l'url '%s' non è corretto\n"
+msgstr "l'url '%s' non è esatto\n"
 
 #, c-format
 msgid "url scheme not specified, assuming HTTP\n"
-msgstr "il protocollo dell'url non è specificato, sarà usato HTTP\n"
+msgstr "non è stato specificato il protocollo dell'url, sarà usato HTTP\n"
 
 #, c-format
 msgid "disk"
@@ -189,7 +189,7 @@ msgstr "disco"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "impossibile recuperare il file '%s' da %s : %s\n"
+msgstr "impossibile scaricare il pacchetto '%s' da %s : %s\n"
 
 #, c-format
 msgid "cannot resume download, starting over\n"
@@ -245,11 +245,11 @@ msgstr "è stato passato un argomento sbagliato o NULL"
 
 #, c-format
 msgid "library not initialized"
-msgstr "libreria non inizializzata"
+msgstr "la libreria non è stata inizializzata"
 
 #, c-format
 msgid "library already initialized"
-msgstr "libreria già inizializzata"
+msgstr "la libreria è già stata inizializzata"
 
 #, c-format
 msgid "unable to lock database"
@@ -265,11 +265,11 @@ msgstr "impossibile creare il database"
 
 #, c-format
 msgid "database not initialized"
-msgstr "database non inizializzato"
+msgstr "il database non è stato inizializzato"
 
 #, c-format
 msgid "database already registered"
-msgstr "il database è già registrato"
+msgstr "il database è già stato registrato"
 
 #, c-format
 msgid "could not find database"
@@ -289,27 +289,27 @@ msgstr "url non valido per il server"
 
 #, c-format
 msgid "transaction already initialized"
-msgstr "operazione già inizializzata"
+msgstr "l'operazione è già stata inizializzata"
 
 #, c-format
 msgid "transaction not initialized"
-msgstr "operazione non inizializzata"
+msgstr "l'operazione non è stata inizializzata"
 
 #, c-format
 msgid "duplicate target"
-msgstr "pacchetto doppio"
+msgstr "pacchetto duplicato"
 
 #, c-format
 msgid "transaction not prepared"
-msgstr "operazione non preparata"
+msgstr "l'operazione non è stata preparata"
 
 #, c-format
 msgid "transaction aborted"
-msgstr "operazione annullata"
+msgstr "l'operazione è stata annullata"
 
 #, c-format
 msgid "operation not compatible with the transaction type"
-msgstr "operazione incompatibile con il tipo di transazione"
+msgstr "l'operazione è incompatibile con il tipo di transazione"
 
 #, c-format
 msgid "could not commit transaction"
@@ -317,7 +317,7 @@ msgstr "impossibile eseguire l'operazione"
 
 #, c-format
 msgid "could not download all files"
-msgstr "impossibile prelevare tutti i file"
+msgstr "impossibile scaricare tutti i file"
 
 #, c-format
 msgid "could not find or read package"
@@ -325,7 +325,7 @@ msgstr "impossibile trovare o leggere il pacchetto"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr "pacchetto non valido o corrotto"
+msgstr "il pacchetto non è valido oppure è corrotto"
 
 #, c-format
 msgid "cannot open package file"
@@ -337,7 +337,7 @@ msgstr "impossibile caricare i dati del pacchetto"
 
 #, c-format
 msgid "package not installed or lesser version"
-msgstr "pacchetto non installato o una versione precedente"
+msgstr "il pacchetto non è stato installato oppure è una versione meno recente"
 
 #, c-format
 msgid "cannot remove all files for package"
@@ -353,7 +353,7 @@ msgstr "nessun repository corrispondente"
 
 #, c-format
 msgid "invalid or corrupted delta"
-msgstr "pacchetto non valido o corrotto"
+msgstr "il delta non è valido oppure è corrotto"
 
 #, c-format
 msgid "delta patch failed"
@@ -361,7 +361,7 @@ msgstr "si sono verificati degli errori con la patch di delta"
 
 #, c-format
 msgid "group not found"
-msgstr "gruppo non trovato"
+msgstr "impossibile trovare il gruppo"
 
 #, c-format
 msgid "could not satisfy dependencies"
@@ -377,7 +377,7 @@ msgstr "file in conflitto"
 
 #, c-format
 msgid "user aborted the operation"
-msgstr "operazione annullata"
+msgstr "l'utente ha annullato l'operazione"
 
 #, c-format
 msgid "internal error"
@@ -389,7 +389,7 @@ msgstr "non confermato"
 
 #, c-format
 msgid "invalid regular expression"
-msgstr "espressione regolare non valida"
+msgstr "l'espressione regolare non è valida"
 
 #, c-format
 msgid "libarchive error"
@@ -397,25 +397,16 @@ msgstr "errore di libarchive"
 
 #, c-format
 msgid "download library error"
-msgstr "errore nel scaricare la libreria"
+msgstr "si è verificato un errore della libreria di download"
 
 #, c-format
 msgid "error invoking external downloader"
-msgstr "errore nell'inizializzare il download"
+msgstr "si è verificato un errore lanciando il downloader esterno"
 
 #, c-format
 msgid "unexpected error"
 msgstr "errore inaspettato"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: aggiornamento forzato alla versione %s\n"
-
-#, 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"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "impossibile trovare %s nel database, sarà ignorato\n"
@@ -435,12 +426,17 @@ msgstr "impossibile rimuovere la voce '%s' dalla cache\n"
 #, 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-%s: l'aggiornamento del pacchetto è stato ignorato (per essere sostituito con %s-%"
 "s)\n"
 
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
+"%s: la versione installata (%s) è più recente di quella in %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n"
+msgstr "%s: l'aggiornamento del pacchetto è stato ignorato (%s => %s)\n"
 
 #, c-format
 msgid "repository '%s' not found\n"
@@ -454,13 +450,19 @@ msgstr "%s-%s è aggiornato, sarà ignorato\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s è aggiornato, sarà reinstallato\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr ""
+"installazione in corso di una versione meno recente del pacchetto %s (%s => %"
+"s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "sono stati rilevati dei conflitti irrisolvibili\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "rimuovo '%s' dalla lista perché va in conflitto con '%s'\n"
+msgstr "rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n"
 
 #, c-format
 msgid "command: %s\n"
@@ -468,7 +470,7 @@ msgstr "comando: %s\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "impossibile recuperare alcuni file da %s\n"
+msgstr "impossibile scaricare alcuni file da %s\n"
 
 #, c-format
 msgid "could not create removal transaction\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: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -402,14 +402,6 @@ msgstr ""
 msgid "unexpected error"
 msgstr ""
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr ""
@@ -430,6 +422,10 @@ msgstr ""
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr ""
@@ -446,6 +442,10 @@ msgstr ""
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr ""
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr ""
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr ""

lib/libalpm/po/pl.po

@@ -9,8 +9,8 @@ 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-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-19 20:58+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2009-01-03 16:50+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"
@@ -412,14 +412,6 @@ msgstr ""
 msgid "unexpected error"
 msgstr "niespodziewany błąd"
 
-#, 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 "could not find %s in database -- skipping\n"
 msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n"
@@ -441,6 +433,10 @@ 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: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) jest nowsze niż %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n"
@@ -457,6 +453,10 @@ msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "dezaktualizowanie pakietu %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "odkryto nierozwiązywalne konflikty pakietów\n"

lib/libalpm/po/pt_BR.po

@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-20 15:00-0300\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-24 11:24-0300\n"
 "Last-Translator: Hugo Doria <hugo@archlinux.org>\n"
 "Language-Team: Português do Brasil <www.archlinux-br.org>\n"
 "MIME-Version: 1.0\n"
@@ -416,14 +416,6 @@ msgstr "erro invocando programa de download externo"
 msgid "unexpected error"
 msgstr "erro inesperado"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forçando upgrade para a versão %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) é mais novo que %s (%s)\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "não foi possível encontrar %s na base de dados - pulando\n"
@@ -444,6 +436,10 @@ msgstr "não foi possível remover a entrada '%s' da cache\n"
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignorando atualização do pacote (a ser substituido por %s-%s)\n"
 
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) é mais novo que %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorando atualização do pacote (%s => %s)\n"
@@ -460,6 +456,10 @@ msgstr "%s-%s está atualizado -- pulando\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s está atualizado -- reinstalando\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "fazendo downgrade do pacote %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "conflito de pacotes não solucionável detectado\n"
@@ -567,3 +567,4 @@ msgstr "cache %s não existe, criando...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "não foi possível criar cache de pacotes, usando /tmp\n"
+

lib/libalpm/po/ru.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: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-19 19:52+0300\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2009-01-03 15:55+0300\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "заменяю устаревшую версию %s-%s на %s в списке целей\n"
+msgstr "заменяется устаревшая версия %s-%s на %s в списке целей\n"
 
 #, c-format
 msgid "skipping %s-%s because newer version %s is in the target list\n"
@@ -145,7 +145,7 @@ msgstr "ошибка при чтении пакета %s: %s\n"
 
 #, c-format
 msgid "missing package metadata in %s\n"
-msgstr "отсутствуют метаданые пакета в %s\n"
+msgstr "отсутствуют метаданные пакета в %s\n"
 
 #, c-format
 msgid "attempt to re-register the 'local' DB\n"
@@ -337,7 +337,7 @@ msgstr "не удается загрузить данные пакета"
 
 #, c-format
 msgid "package not installed or lesser version"
-msgstr "пекет не установлен или ранней версии"
+msgstr "пакет не установлен или ранней версии"
 
 #, c-format
 msgid "cannot remove all files for package"
@@ -373,7 +373,7 @@ msgstr "конфликтующие зависимости"
 
 #, c-format
 msgid "conflicting files"
-msgstr "конфликрующие файлы"
+msgstr "конфликтующие файлы"
 
 #, c-format
 msgid "user aborted the operation"
@@ -407,14 +407,6 @@ msgstr "ошибка вызова внешнего менеджера загру
 msgid "unexpected error"
 msgstr "непредвиденная ошибка"
 
-#, 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 "could not find %s in database -- skipping\n"
 msgstr "не могу найти %s в базе данных --  пропускаю\n"
@@ -429,12 +421,16 @@ msgstr "не могу удалить из базы данных запись %s-
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "не могу удалить запись '%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: local (%s) is newer than %s (%s)\n"
+msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: игнорирую обновление пакета (%s => %s)\n"
@@ -451,6 +447,10 @@ msgstr "%s-%s не устарел --  пропускаю\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s не устарел --  переустанавливаю\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "откат версии пакета %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "обнаружен неразрешимый конфликт пакетов\n"
@@ -461,7 +461,7 @@ msgstr "удаляю '%s' из списка целей, поскольку он
 
 #, c-format
 msgid "command: %s\n"
-msgstr "комманда: %s\n"
+msgstr "команда: %s\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -558,3 +558,6 @@ msgstr "кэш %s не существует, создаю...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "не могу создать кэш пакетов, будет использован /tmp\n"
+
+#~ msgid "could not create directory %s: %s\n"
+#~ msgstr "не удалось создать директорию %s: (%s)\n"

lib/libalpm/po/tr.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.1.4-1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-17 23:14+0200\n"
-"Last-Translator: Samed BEYRİBEY <ras0ir@eventualis.org>\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2009-01-03 16:20+0200\n"
+"Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n"
 "Language-Team: Turkish Arch Linux Users <tr@archlinuxtr.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -25,11 +25,11 @@ msgstr "%s-%s yeni sürüm %s hedef listesinde olduğundan atlanıyor\n"
 
 #, c-format
 msgid "conflicting packages were found in the target list\n"
-msgstr "hedef listesinde çelişen paketler bulundu\n"
+msgstr "hedef listesinde çakışan paketler bulundu\n"
 
 #, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "çelişen iki paketi aynı anda kuramazsınız\n"
+msgstr "çakışan iki paketi aynı anda kuramazsınız\n"
 
 #, c-format
 msgid "replacing packages with -U is not supported yet\n"
@@ -185,7 +185,7 @@ msgstr "disk"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "'%s' dosyası %s : %s 'ten alınamadı\n"
+msgstr "%3$s hatası nedeniyle '%1$s' dosyası %2$s adresinden alınamadı\n"
 
 #, c-format
 msgid "cannot resume download, starting over\n"
@@ -403,14 +403,6 @@ msgstr "harici indiriciyi çağırırken hata oluştu"
 msgid "unexpected error"
 msgstr "beklenmedik hata"
 
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: %s sürümüne güncelleniyor\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: yereldeki paket (%s) %s (%s) paketinden daha güncel\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "%s veritabanında bulunamadı -- atlanıyor\n"
@@ -429,8 +421,11 @@ msgstr "'%s' kaydı tampondan silinemedi\n"
 
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr ""
-"%s-%s: paket güncellemesi göz ardı ediliyor (%s-%s ile değiştirilecek)\n"
+msgstr "%s-%s: paket güncellemesi göz ardı ediliyor (%s-%s ile değiştirilecek)\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: yereldeki paket (%s) %s (%s) paketinden daha güncel\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
@@ -448,6 +443,10 @@ msgstr "%s-%s güncel -- atlanıyor\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s güncel -- yeniden kuruluyor\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s paketi eski sürümüne çevriliyor (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "çözülemeyen paket çakışmaları bulundu\n"
@@ -555,3 +554,4 @@ msgstr "%s tamponu bulunmuyor, oluşturuluyor...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "paket tamponu oluşturulamadı, /tmp kullanılacak\n"
+

lib/libalpm/po/uk.po

@@ -0,0 +1,560 @@
+# Copyright (C) 2008 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the pacman package.
+# Ivan Kovnatsky <sevenfourk@gmail.com>, 2008.
+# Roman Kyrylych <roman@archlinux.org>, 2008, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libalpm 3.2.2\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Roman Kyrylych <roman@archlinux.org>\n"
+"Language-Team: http://archlinux.org.ua\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Ukrainian\n"
+"X-Poedit-Country: UKRAINE\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "старіша версія %s-%s замінюється на %s в цільовому списку пакунків\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgstr ""
+"%s-%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 -U is not supported yet\n"
+msgstr "заміна пакунків за допомогою -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 ""
+"права каталога відрізняються на\n"
+"файловій системі %s: %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 to %s (%s)\n"
+msgstr "неможливо перейменувати %s на %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 "could not remove database entry %s%s\n"
+msgstr "неможливо видалити запис бази даних %s%s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "невірне ім'я для запису бази даних '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "пошкоджений запис у базі даних '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "неможливо відкрити файл %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "база даних %s неоднорідна: неспівпадіння назви для пакунка %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "база даних %s неоднорідна: неспівпадіння версій для пакунка %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 "attempt to re-register the 'local' DB\n"
+msgstr "спроба перереєструвати базу даних 'local'\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 "provider package was selected (%s provides %s)\n"
+msgstr "був вибраний пакунок %s, що забезпечує %s\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "неможливо розв'язати \"%s\", залежність \"%s\"\n"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "посилання '%s' невірне\n"
+
+#, c-format
+msgid "url scheme not specified, assuming HTTP\n"
+msgstr "протокол посилання не вказано, вважається 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 "failed to download %s\n"
+msgstr "не вдалося завантажити %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 "передано невірний аргумент чи NULL"
+
+#, 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 "невірне посилання чи сервер"
+
+#, 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 not installed or lesser version"
+msgstr "пакунок не встановлено, або існує старіша версія"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "неможливо видалити всі файли для пакунку"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "ім'я файлу пакунку невірне"
+
+#, c-format
+msgid "no such repository"
+msgstr "немає такого репозиторію"
+
+#, c-format
+msgid "invalid or 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 "not confirmed"
+msgstr "не підтверджено"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "невірний регулярний вираз"
+
+#, c-format
+msgid "libarchive error"
+msgstr "помилка libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "помилка бібліотеки завантаження"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "помилка виклику зовнішнього завантажувача"
+
+#, c-format
+msgid "unexpected error"
+msgstr "неочікувана помилка"
+
+#, 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 "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: ігнорування поновлення пакунку (буде замінено на %s-%s)\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %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 "downgrading package %s (%s => %s)\n"
+msgstr "пониження версії пакунку %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "виявлені нерозв'язні конфлікти пакунків\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "видалення '%s' з списку пакунків, бо він конфліктує з '%s'\n"
+
+#, c-format
+msgid "command: %s\n"
+msgstr "команда: %s\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 copy tempfile to %s (%s)\n"
+msgstr "неможливо скопіювати тимчасовий файл до %s (%s)\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 "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"

lib/libalpm/po/zh_CN.po

@@ -7,11 +7,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pacman package manager 3.1.2\n"
+"Project-Id-Version: Pacman package manager 3.2.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-17 23:01+0200\n"
-"Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-10-28 16:20+0900\n"
+"Last-Translator: Lyman Li <lymanrb@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"
@@ -19,11 +19,11 @@ msgstr ""
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "正在替换老版本 %s-%s 通过在目标清单中的%s\n"
+msgstr "正在用目标清单中的 %3$s 替换老版本 %1$s-%2$s\n"
 
 #, c-format
 msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "跳过 %s-%s，因为较新版本的 %s 在目标清单中\n"
+msgstr "跳过 %1$s-%2$s，因为较新版本的 %3$s 在目标清单中\n"
 
 #, c-format
 msgid "conflicting packages were found in the target list\n"
@@ -35,51 +35,51 @@ msgstr "你不能同时安装有冲突的两个软件包\n"
 
 #, c-format
 msgid "replacing packages with -U is not supported yet\n"
-msgstr "正在覆盖软件包， -U 目前尚不支持\n"
+msgstr "目前尚不支持用 -U 参数替换软件包\n"
 
 #, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "你可以使用 -Rd 及 -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"
+"目录权限不一致 %1$s\n"
+"文件系统：%2$o  软件包：%3$o\n"
 
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr "解压缩：链接 %s 没有指向目录\n"
+msgstr "解压缩：符号链接 %s 没有指向目录\n"
 
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "解压缩：没有用 %s 覆盖目录\n"
+msgstr "解压缩：没有用文件 %s 覆盖目录\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "无法解压缩 %s (%s)\n"
+msgstr "无法解压缩 %1$s (%2$s)\n"
 
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
-msgstr "无法重命名 %s 为 %s (%s)\n"
+msgstr "无法将 %1$s 重命名为 %2$s (%3$s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s 已另存为 %s\n"
+msgstr "%1$s 已另存为 %2$s\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
-msgstr "无法安装 %s 作为 %s (%s)\n"
+msgstr "无法将 %1$s 安装为 %2$s (%3$s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
-msgstr "%s 已作为 %s 安装\n"
+msgstr "%1$s 已安装为 %2$s\n"
 
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "正在解压缩 %s 作为 %s.pacnew\n"
+msgstr "正在解压缩 %1$s 为 %2$s.pacnew\n"
 
 #, c-format
 msgid "could not get current working directory\n"
@@ -95,7 +95,7 @@ msgstr "安装 %s 时出现错误\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "无法更新数据库记录 %s-%s\n"
+msgstr "无法更新数据库记录 %1$s-%2$s\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
@@ -103,7 +103,7 @@ msgstr "无法在缓存中添加记录 '%s' \n"
 
 #, c-format
 msgid "could not remove database entry %s%s\n"
-msgstr "无法删除数据库记录 %s%s\n"
+msgstr "无法删除数据库记录 %1$s%2$s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
@@ -115,19 +115,19 @@ msgstr "损坏的数据库记录 '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
-msgstr "无法打开文件 %s: %s\n"
+msgstr "无法打开文件 %1$s: %2$s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr "%s 数据库不一致：名字和软件包中的 %s 不一致\n"
+msgstr "%1$s 数据库不一致：名字和软件包中的 %2$s 不一致\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr "%s 数据库不一致：版本和软件包中的 %s 不一致\n"
+msgstr "%1$s 数据库不一致：版本和软件包中的 %2$s 不一致\n"
 
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "无法分析 %s 中的软件包描述文件\n"
+msgstr "无法解析 %s 中的软件包描述文件\n"
 
 #, c-format
 msgid "missing package name in %s\n"
@@ -139,7 +139,7 @@ msgstr "%s 中缺少软件包版本号\n"
 
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "读取软件包%s: %s发生错误\n"
+msgstr "读取软件包 %1$s 发生错误: %2$s\n"
 
 #, c-format
 msgid "missing package metadata in %s\n"
@@ -151,35 +151,35 @@ msgstr "尝试重新登记“本地”数据库\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr "没有指定数据库路径\n"
+msgstr "数据库路径未定义\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
-msgstr "探测到依赖关系循环：\n"
+msgstr "检测到依赖关系环：\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "%s 将在它 %s 的依赖关系之后被删除\n"
+msgstr "%1$s 将在它 %2$s 的依赖关系之后被删除\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr "%s 将在它 %s 的依赖关系之前被安装\n"
+msgstr "%1$s 将在它 %2$s 的依赖关系之前被安装\n"
 
 #, c-format
 msgid "provider package was selected (%s provides %s)\n"
-msgstr "已选定提供软件包 (%s 提供 %s)\n"
+msgstr "已选定提供软件包 (%1$s 提供 %2$s)\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "无法解决 \"%s\"，\"%s\" 的依赖关系\n"
+msgstr "无法解决 \"%1$s\"，\"%2$s\" 的一个依赖关系\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "url %s' 无效\n"
+msgstr "url '%s' 无效\n"
 
 #, c-format
 msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url 结构没有指定，假定为 HTTP\n"
+msgstr "url scheme 未指定，假定为 HTTP\n"
 
 #, c-format
 msgid "disk"
@@ -187,7 +187,7 @@ msgstr "硬盘"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "无法从 %s : %s 获取文件 '%s' \n"
+msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
 
 #, c-format
 msgid "cannot resume download, starting over\n"
@@ -199,31 +199,31 @@ msgstr "无法写入文件 '%s'\n"
 
 #, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "下载 '%s': %s 时出错\n"
+msgstr "下载 '%1$s' 时出错: %2$s\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr "写入文件 '%s': %s 时出错\n"
+msgstr "写入文件 '%1$s' 时出错: %2$s\n"
 
 #, c-format
 msgid "could not chdir to %s\n"
-msgstr "无法改变目录到 %s\n"
+msgstr "无法切换目录到 %s\n"
 
 #, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr "运行 XferCommand：分支失败！\n"
+msgstr "正在运行 XferCommand：fork 失败！\n"
 
 #, c-format
 msgid "failed to download %s\n"
-msgstr "下载%s失败\n"
+msgstr "下载 %s 失败\n"
 
 #, c-format
 msgid "out of memory!"
-msgstr "没有内存可用！"
+msgstr "内存不足！"
 
 #, c-format
 msgid "unexpected system error"
-msgstr "未预计的系统错误"
+msgstr "未预期的系统错误"
 
 #, c-format
 msgid "insufficient privileges"
@@ -239,11 +239,11 @@ msgstr "无法找到或读取目录"
 
 #, c-format
 msgid "wrong or NULL argument passed"
-msgstr "传递了错误的或空的参数"
+msgstr "传递了错误的或 NULL 参数"
 
 #, c-format
 msgid "library not initialized"
-msgstr "无法初始化函数库"
+msgstr "函数库未初始化"
 
 #, c-format
 msgid "library already initialized"
@@ -263,7 +263,7 @@ msgstr "无法创建数据库"
 
 #, c-format
 msgid "database not initialized"
-msgstr "数据库无法初始化"
+msgstr "数据库未初始化"
 
 #, c-format
 msgid "database already registered"
@@ -283,7 +283,7 @@ msgstr "无法删除数据库记录"
 
 #, c-format
 msgid "invalid url for server"
-msgstr "无效的服务器url"
+msgstr "无效的服务器 url"
 
 #, c-format
 msgid "transaction already initialized"
@@ -291,7 +291,7 @@ msgstr "处理已初始化"
 
 #, c-format
 msgid "transaction not initialized"
-msgstr "处理无法初始化"
+msgstr "处理未初始化"
 
 #, c-format
 msgid "duplicate target"
@@ -339,7 +339,7 @@ msgstr "软件包没有安装或版本较低"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "无法删除软件包全部文件"
+msgstr "无法为软件包删除全部文件"
 
 #, c-format
 msgid "package filename is not valid"
@@ -351,7 +351,7 @@ msgstr "没有该软件库"
 
 #, c-format
 msgid "invalid or corrupted delta"
-msgstr "无效的或已损坏的 delta 包"
+msgstr "无效的或已损坏的 delta"
 
 #, c-format
 msgid "delta patch failed"
@@ -375,7 +375,7 @@ msgstr "有冲突的文件"
 
 #, c-format
 msgid "user aborted the operation"
-msgstr "用户中断操作"
+msgstr "用户中断了操作"
 
 #, c-format
 msgid "internal error"
@@ -383,11 +383,11 @@ msgstr "内部错误"
 
 #, c-format
 msgid "not confirmed"
-msgstr "不能确认"
+msgstr "未确认"
 
 #, c-format
 msgid "invalid regular expression"
-msgstr "无效的常规表达式"
+msgstr "无效的正则表达式"
 
 #, c-format
 msgid "libarchive error"
@@ -399,31 +399,23 @@ msgstr "下载函数库出错"
 
 #, c-format
 msgid "error invoking external downloader"
-msgstr "激活外部下载程序时出现错误"
+msgstr "调用外部下载程序时出错"
 
 #, c-format
 msgid "unexpected error"
 msgstr "未预期的错误"
 
-#, 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 "could not find %s in database -- skipping\n"
 msgstr "无法在数据库中找到 %s -- 跳过\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "无法删除文件 '%s': %s\n"
+msgstr "无法删除文件 '%1$s': %2$s\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "无法删除数据库记录 %s-%s\n"
+msgstr "无法删除数据库记录 %1$s-%2$s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
@@ -431,11 +423,15 @@ msgstr "无法从缓存中删除记录 '%s'\n"
 
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n"
+msgstr "%1$s-%2$s：忽略软件包更新（由 %3$s-%4$s 替代）\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%1$s：本地（%2$s）比 %3$s 的版本更新 (%4$s)\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s：忽略软件包更新（%s => %s）\n"
+msgstr "%1$s：忽略软件包更新（%2$s => %3$s）\n"
 
 #, c-format
 msgid "repository '%s' not found\n"
@@ -443,19 +439,23 @@ msgstr "没有找到软件库 '%s'\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s 已经为最新 -- 跳过\n"
+msgstr "%1$s-%2$s 已经为最新 -- 跳过\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s 已经为最新 -- 重新安装\n"
+msgstr "%1$s-%2$s 已经为最新 -- 重新安装\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "探测到无法解决的软件包冲突\n"
+msgstr "检测到未解决的软件包冲突\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "正在从目标清单中删除 '%s' ，因为它和 '%s' 有冲突\n"
+msgstr "正在从目标清单中删除 '%1$s' ，因为它和 '%2$s' 冲突\n"
 
 #, c-format
 msgid "command: %s\n"
@@ -463,23 +463,23 @@ msgstr "命令：%s\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "某些文件无法从%s取回\n"
+msgstr "无法从 %s 获取某些文件\n"
 
 #, c-format
 msgid "could not create removal transaction\n"
-msgstr "无法生成可删除处理\n"
+msgstr "无法生成可撤销处理\n"
 
 #, c-format
 msgid "could not initialize the removal transaction\n"
-msgstr "无法初始化可删除处理\n"
+msgstr "无法初始化可撤销处理\n"
 
 #, c-format
 msgid "could not prepare removal transaction\n"
-msgstr "无法准备可删除处理\n"
+msgstr "无法准备可撤销处理\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "无法交付可删除处理\n"
+msgstr "无法交付可撤销处理\n"
 
 #, c-format
 msgid "could not create transaction\n"
@@ -503,7 +503,7 @@ msgstr "无法删除锁定文件 %s\n"
 
 #, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "父环境中没有 /bin/sh，正在中断脚本\n"
+msgstr "父环境中没有 /bin/sh，正在中断小脚本\n"
 
 #, c-format
 msgid "could not create temp directory\n"
@@ -511,43 +511,43 @@ msgstr "无法创建临时目录\n"
 
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "无法复制临时文件到 %s (%s)\n"
+msgstr "无法复制临时文件到 %1$s (%2$s)\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "无法更改目录到 %s (%s)\n"
+msgstr "无法更改目录到 %1$s (%2$s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "无法分支新进程(%s)\n"
+msgstr "无法 fork 新进程 (%s)\n"
 
 #, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "无法更改根目录(%s)\n"
+msgstr "无法更改根目录 (%s)\n"
 
 #, c-format
 msgid "could not change directory to / (%s)\n"
-msgstr "无法更改目录到/ (%s)\n"
+msgstr "无法切换目录到 / (%s)\n"
 
 #, c-format
 msgid "call to popen failed (%s)"
-msgstr "调用 popen 失败(%s)"
+msgstr "调用 popen 失败 (%s)"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "调用 waitpid 失败(%s)\n"
+msgstr "调用 waitpid 失败 (%s)\n"
 
 #, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr "脚本没有被正确执行\n"
+msgstr "小脚本未能被正确执行\n"
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "无法删除临时目录%s\n"
+msgstr "无法删除临时目录 %s\n"
 
 #, c-format
 msgid "could not open %s: %s\n"
-msgstr "无法打开 %s: %s\n"
+msgstr "无法打开 %1$s: %2$s\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"

lib/libalpm/remove.c

@@ -285,6 +285,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, pmtrans_t *trans)
 				snprintf(newpath, PATH_MAX, "%s.pacsave", file);
 				rename(file, newpath);
 				_alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), file, newpath);
+				alpm_logaction("warning: %s saved as %s\n", file, newpath);
 				return;
 			} else {
 				_alpm_log(PM_LOG_DEBUG, "transaction is set to NOSAVE, not backing up '%s'\n", file);

lib/libalpm/sync.c

@@ -170,6 +170,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync)
 {
 	alpm_list_t *i;
 	pmpkg_t *spkg = NULL;
+	int cmp;
 
 	for(i = dbs_sync; !spkg && i; i = i->next) {
 		spkg = _alpm_db_get_pkgfromcache(i->data, alpm_pkg_get_name(pkg));
@@ -182,14 +183,20 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync)
 	}
 
 	/* compare versions and see if spkg is an upgrade */
-	if(_alpm_pkg_compare_versions(pkg, spkg)) {
+	cmp = _alpm_pkg_compare_versions(spkg, pkg);
+	if(cmp > 0) {
 		_alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n",
 					alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg),
 					alpm_pkg_get_version(spkg));
 		return(spkg);
-	} else {
-		return(NULL);
 	}
+	if (cmp < 0) {
+			pmdb_t *db = spkg->origin_data.db;
+			_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
+					alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg),
+					alpm_db_get_name(db), alpm_pkg_get_version(spkg));
+	}
+	return(NULL);
 }
 
 /** Get a list of upgradable packages on the current system
@@ -326,18 +333,23 @@ 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) {
-			/* spkg is NOT an upgrade */
+		int cmp = _alpm_pkg_compare_versions(spkg, local);
+		if(cmp == 0) {
 			if(trans->flags & PM_TRANS_FLAG_NEEDED) {
+				/* with the NEEDED flag, packages up to date are not reinstalled */
 				_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 {
-				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));
-				}
+				_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
+						alpm_pkg_get_name(local), alpm_pkg_get_version(local));
+
 			}
+		} else if(cmp < 0) {
+			/* local version is newer */
+			_alpm_log(PM_LOG_WARNING, _("downgrading package %s (%s => %s)\n"),
+					alpm_pkg_get_name(local), alpm_pkg_get_version(local),
+					alpm_pkg_get_version(spkg));
 		}
 	}
 

lib/libalpm/trans.c

@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
-#include <unistd.h>
 #include <errno.h>
 
 /* libalpm */
@@ -205,7 +204,7 @@ int SYMEXPORT alpm_trans_release()
 
 	/* unlock db */
 	if(handle->lckfd != -1) {
-		close(handle->lckfd);
+		while(close(handle->lckfd) == -1 && errno == EINTR);
 		handle->lckfd = -1;
 	}
 	if(_alpm_lckrm()) {
@@ -561,8 +560,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 		if(!pipe) {
 			_alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"),
 					strerror(errno));
-			retval = 1;
-			goto cleanup;
+			exit(1);
 		}
 		while(!feof(pipe)) {
 			char line[PATH_MAX];
@@ -571,12 +569,13 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 			alpm_logaction("%s", line);
 			EVENT(trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL);
 		}
-		exit(0);
+		retval = pclose(pipe);
+		exit(WEXITSTATUS(retval));
 	} else {
 		/* this code runs for the parent only (wait on the child) */
 		pid_t retpid;
 		int status;
-		retpid = waitpid(pid, &status, 0);
+		while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR);
 		if(retpid == -1) {
 			_alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"),
 			          strerror(errno));

lib/libalpm/util.c

@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -240,7 +241,7 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace)
 /* Create a lock file */
 int _alpm_lckmk()
 {
-	int fd, count = 0;
+	int fd;
 	char *dir, *ptr;
 	const char *file = alpm_option_get_lockfile();
 
@@ -251,17 +252,10 @@ int _alpm_lckmk()
 		*ptr = '\0';
 	}
 	_alpm_makepath(dir);
-
-	while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) {
-		if(++count < 1) {
-			sleep(1);
-		}	else {
-			return(-1);
-		}
-	}
-
 	FREE(dir);
 
+	while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1
+			&& errno == EINTR);
 	return(fd > 0 ? fd : -1);
 }
 
@@ -401,12 +395,18 @@ int _alpm_rmrf(const char *path)
 	return(0);
 }
 
-int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *fmt, va_list args)
+int _alpm_logaction(unsigned short usesyslog, FILE *f,
+		const char *fmt, va_list args)
 {
 	int ret = 0;
 
 	if(usesyslog) {
-		vsyslog(LOG_WARNING, fmt, args);
+		/* we can't use a va_list more than once, so we need to copy it
+		 * so we can use the original when calling vfprintf below. */
+		va_list args_syslog;
+		va_copy(args_syslog, args);
+		vsyslog(LOG_WARNING, fmt, args_syslog);
+		va_end(args_syslog);
 	}
 
 	if(f) {

pactest/pmtest.py

@@ -197,9 +197,7 @@ class pmtest:
                 cmd.append("fakeroot")
 
             fakechroot = which("fakechroot")
-            if not fakechroot:
-                print "WARNING: fakechroot not found, scriptlet tests WILL fail!!!"
-            else:
+            if fakechroot:
                 cmd.append("fakechroot")
 
         if pacman["gdb"]:

pactest/tests/scriptlet001.py

@@ -14,3 +14,7 @@ self.args = "--debug -U %s" % p1.filename()
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PACMAN_OUTPUT=" + pre)
 self.addrule("PACMAN_OUTPUT=" + post)
+
+fakechroot = which("fakechroot")
+if not fakechroot:
+	self.expectfailure = True

pactest/tests/scriptlet002.py

@@ -14,3 +14,7 @@ self.args = "--debug -R %s" % p1.name
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PACMAN_OUTPUT=" + pre)
 self.addrule("PACMAN_OUTPUT=" + post)
+
+fakechroot = which("fakechroot")
+if not fakechroot:
+	self.expectfailure = True

po/LINGUAS

@@ -10,4 +10,5 @@ pl
 pt_BR
 ru
 tr
+uk
 zh_CN

po/de.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:29+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 11:41+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -123,6 +123,10 @@ msgstr "Entferne"
 msgid "checking for file conflicts"
 msgstr "Prüfe auf Dateikonflikte"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "lade %s herunter...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc-Fehler: Konnte %zd Bytes nicht zuweisen\n"
@@ -232,8 +236,8 @@ msgid "MD5 Sum        :"
 msgstr "MD5-Summe            :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Beschreibung         : "
+msgid "Description    :"
+msgstr "Beschreibung         :"
 
 #, c-format
 msgid "Repository     :"
@@ -287,13 +291,18 @@ msgstr "Verwendung"
 msgid "operation"
 msgstr "Operation"
 
+#, c-format
+msgid "operations:\n"
+msgstr "Operationen:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"Benutzen Sie '%s --help' mit anderen Optionen für mehr Informationen\n"
+"Benutzen Sie '%s {-h --help}' zusammen mit einer Operation für verfügbare "
+"Optionen\n"
 
 #, c-format
 msgid ""
@@ -468,11 +477,9 @@ msgid ""
 msgstr "  -y, --refresh        Lädt frische Paketdatenbanken vom Server\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
+msgid "      --needed         don't reinstall up to date packages\n"
 msgstr ""
-"      --needed         aktualisiere nur veraltete oder noch nicht "
-"installierte Pakete\n"
+"      --needed         aktuelle Pakete werden nicht nochmals installiert\n"
 
 #, c-format
 msgid ""
@@ -491,11 +498,6 @@ msgstr ""
 "                       Ignoriert Upgrade einer Gruppe (kann mehrfach genutzt "
 "werden)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet         Zeigt weniger Information bei Abfragen und Suche an\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <Pfad>  Setzt eine alternative Konfigurationsdatei\n"
@@ -548,19 +550,6 @@ msgstr ""
 "                       Dieses Programm darf unter Bedingungen der GNU\n"
 "                       General Public License frei weiterverbreitet werden.\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "Segmentierungs-Fehler\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Interner Pacman-Fehler: Segmentierungs-Fehler.\n"
-"Bitte reichen Sie einen vollständigen Bug-Report mit der Ausgabe von --debug "
-"ein, wenn erforderlich.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "Problem beim Setzen des Root-Verzeichnisses '%s' (%s)\n"
@@ -593,6 +582,10 @@ msgstr "Konfigurations-Datei %s konnte nicht gelesen werden.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "Konfigurations-Datei %s, Zeile %d: Schlechter Sektions-Name.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "Kein Zugriff auf die Datenbank '%s' (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
@@ -614,6 +607,10 @@ msgstr ""
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "Ungültiger Wert für 'CleanMethod' : '%s'\n"
 
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "Konnte die Server-URL nicht der Datenbank '%s' hinzufügen: %s (%s)\n"
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "Konnte alpm-Bibliothek nicht initialisieren (%s)\n"
@@ -875,7 +872,7 @@ msgid ""
 ":: Do you want to cancel the current operation\n"
 ":: and upgrade these packages now?"
 msgstr ""
-":: Möchten Sie den laufenden Prozeß abbrechen\n"
+":: Möchten Sie den laufenden Prozess abbrechen\n"
 ":: und diese Pakete nun aktualisieren?"
 
 #, c-format
@@ -907,8 +904,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "Konnte den Vorgang (%s) nicht freigeben\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Nichts\n"
+msgid "None"
+msgstr "Nichts"
 
 #, c-format
 msgid "Targets (%d):"
@@ -930,6 +927,10 @@ msgstr "Entfernen (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Gesamtgröße der zu entfernenden Pakete: %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Optionale Abhängigkeiten für %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[J/n]"
@@ -1031,7 +1032,7 @@ msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s wurde nicht im build Verzeichnis gefunden und ist keine URL."
 
 msgid "Downloading %s..."
-msgstr "Lade %s herunter... "
+msgstr "Lade %s herunter..."
 
 msgid "Failure while downloading %s"
 msgstr "Fehler beim Download von %s"
@@ -1187,6 +1188,15 @@ msgstr "Bestimme letzte hg-Revision..."
 msgid "Version found: %s"
 msgstr "Gefundene Version: %s"
 
+msgid "requires an argument"
+msgstr "erfordert ein Argument"
+
+msgid "unrecognized option"
+msgstr "nicht-erkannte Option"
+
+msgid "invalid option"
+msgstr "ungültige Option"
+
 msgid "Usage: %s [options]"
 msgstr "Verwendung: %s [Optionen]"
 
@@ -1247,6 +1257,13 @@ msgstr "  -R, --repackage  Packe den Inhalt von pkg/ neu, ohne etwas zu bauen"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Installiere fehlende Abhängigkeiten mit Pacman"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource     Erstelle einen Quell-Tarball einschließlich der "
+"heruntergeladenen Quellen"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Lässt makepkg als Root-Nutzer laufen"
 
@@ -1254,11 +1271,14 @@ msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
-"      --holdver    Verhindert, dass die Auto-Version sich mit dev-PKGBUILDS "
-"beisst"
+"      --holdver    Verhindert, dass die Auto-Version mit den dev-PKGBUILDS "
+"kollidiert"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr "      --source     Baue kein Paket, erstelle nur Quell-Tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
+msgstr ""
+"      --source     Erstelle einen Quell-Tarball ohne die heruntergeladenen "
+"Quellen"
 
 msgid "These options can be passed to pacman:"
 msgstr "Diese Optionen können an pacman weitergegeben werden:"
@@ -1298,8 +1318,8 @@ msgstr ""
 msgid "Cleaning up ALL files from %s."
 msgstr "Räume ALLE Dateien aus %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Sind Sie sicher, dass Sie dies tun möchten? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Sind Sie sicher, dass Sie dies tun möchten? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
@@ -1350,7 +1370,7 @@ msgstr "in der BUILDENV Sektion in %s. "
 
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr ""
-"Läßt man makepkg als normaler Nutzer laufen, werden die gepackten Dateien"
+"Lässt man makepkg als normaler Nutzer laufen, werden die gepackten Dateien"
 
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr "nicht Root gehören. Nutzen Sie die fakeroot-Umgebung, indem Sie"
@@ -1396,6 +1416,11 @@ msgstr ""
 msgid "such as arch=('%s')."
 msgstr "so wie arch=('%s')"
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr ""
+"Der Array 'Provides' darf keine Vergleichs-Operatoren wie (< oder >) "
+"enthalten."
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Installations-Skript (%s) existiert nicht."
 
@@ -1498,10 +1523,6 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "Diff-Werkzeug nicht gefunden, bitte diffutils installieren."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft."
-
 msgid "%s does not exist or is not a directory."
 msgstr "%s existiert nicht oder ist kein Verzeichnis"
 
@@ -1509,6 +1530,10 @@ msgid "You must have correct permissions to optimize the database."
 msgstr ""
 "Sie müssen über die nötigen Rechte verfügen, um die Datenbank zu optimieren."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+"Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
 "FEHLER: Konnte kein temporäres Verzeichnis für den Aufbau der Datenbank "
@@ -1523,28 +1548,27 @@ msgstr "Erstelle Tarball aus %s..."
 msgid "Tar'ing up %s failed."
 msgstr "Erstellen des Tarballs %s fehlgeschlagen."
 
-msgid "Making and MD5sum'ing the new db..."
-msgstr "Erstelle neue DB und prüfe MD5-Summen..."
+msgid "Making and MD5sum'ing the new database..."
+msgstr "Erstelle neue Datenbak und prüfe MD5-Summen..."
 
 msgid "Untar'ing %s failed."
 msgstr "Entpacken des Tarballs %s fehlgeschlagen."
 
+msgid "Syncing database to disk..."
+msgstr "Synchronisiere Datenbank mit Festplatte..."
+
 msgid "Checking integrity..."
 msgstr "Prüfe Integrität... "
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr "Integritäts-Prüfung FEHLGESCHLAGEN, kehre zur alten Datenbank zurück."
 
-msgid "Putting the new database in place..."
-msgstr "Verschiebe die neue Datenbank an ihren Ort..."
+msgid "Rotating database into place..."
+msgstr "Verschiebe neue Datenbank an ihren Ort..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Fertig. Ihre Pacman-Datenbank wurde optimiert."
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
-"Für alle Vorteile von pacman-optimize, führen Sie nun ein 'sync' durch."
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "Verwendung: repo-add [-q] <Pfad-zur-Datenbank> <Paketname> ...\\n"
 

po/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
 "PO-Revision-Date: 2008-07-30 08:31+0200\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -118,6 +118,10 @@ msgstr "removing"
 msgid "checking for file conflicts"
 msgstr "checking for file conflicts"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "downloading %s...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc failure: could not allocate %zd bytes\n"
@@ -227,8 +231,8 @@ msgid "MD5 Sum        :"
 msgstr "MD5 Sum        :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Description    : "
+msgid "Description    :"
+msgstr "Description    :"
 
 #, c-format
 msgid "Repository     :"
@@ -282,13 +286,17 @@ msgstr "usage"
 msgid "operation"
 msgstr "operation"
 
+#, c-format
+msgid "operations:\n"
+msgstr "operations:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 
 #, c-format
 msgid ""
@@ -446,10 +454,8 @@ msgstr ""
 "  -y, --refresh        download fresh package databases from the server\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         don't reinstall up to date packages\n"
 
 #, c-format
 msgid ""
@@ -467,10 +473,6 @@ msgstr ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr "  -q  --quiet          show less information for query and search\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <path>  set an alternate configuration file\n"
@@ -519,18 +521,6 @@ msgstr ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "segmentation fault\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "problem setting rootdir '%s' (%s)\n"
@@ -563,6 +553,10 @@ msgstr "config file %s could not be read.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "config file %s, line %d: bad section name.\n"
 
+#, fuzzy, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "could not register 'local' database (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr "config file %s, line %d: syntax error in config file- missing key.\n"
@@ -579,6 +573,10 @@ msgstr "config file %s, line %d: directive '%s' not recognised.\n"
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "invalid value for 'CleanMethod' : '%s'\n"
 
+#, fuzzy, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "could not register 'local' database (%s)\n"
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "failed to initialise alpm library (%s)\n"
@@ -872,8 +870,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "failed to release transaction (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "None\n"
+msgid "None"
+msgstr "None"
 
 #, c-format
 msgid "Targets (%d):"
@@ -895,6 +893,10 @@ msgstr "Remove (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Total Removed Size:   %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Optional dependencies for %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[Y/n]"
@@ -1150,6 +1152,15 @@ msgstr "Determining latest hg revision..."
 msgid "Version found: %s"
 msgstr "Version found: %s"
 
+msgid "requires an argument"
+msgstr ""
+
+msgid "unrecognized option"
+msgstr ""
+
+msgid "invalid option"
+msgstr ""
+
 msgid "Usage: %s [options]"
 msgstr "Usage: %s [options]"
 
@@ -1206,6 +1217,13 @@ msgstr "  -R, --repackage  Repackage contents of pkg/ without building"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Install missing dependencies with pacman"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Allow makepkg to run as root user"
 
@@ -1216,9 +1234,10 @@ msgstr ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     Do not build package; generate a source-only tarball"
+"      --source     Generate a source-only tarball without downloaded sources"
 
 msgid "These options can be passed to pacman:"
 msgstr "These options can be passed to pacman:"
@@ -1256,8 +1275,8 @@ msgstr "\\0--holdver and --forcever cannot both be specified"
 msgid "Cleaning up ALL files from %s."
 msgstr "Cleaning up ALL files from %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Are you sure you wish to do this? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Are you sure you wish to do this? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr "Problem removing files; you may not have correct permissions in %s"
@@ -1337,6 +1356,9 @@ msgstr "Note that many packages may need a line added to their %s"
 msgid "such as arch=('%s')."
 msgstr "such as arch=('%s')."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr ""
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Install scriptlet (%s) does not exist."
 
@@ -1434,15 +1456,15 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "diff tool was not found, please install diffutils."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr "Pacman lock file was found. Cannot run while pacman is running."
-
 msgid "%s does not exist or is not a directory."
 msgstr "%s does not exist or is not a directory."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "You must have correct permissions to optimise the database."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr "Pacman lock file was found. Cannot run while pacman is running."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr "ERROR: Can not create temp directory for database building."
 
@@ -1455,27 +1477,30 @@ msgstr "Tar'ing up %s..."
 msgid "Tar'ing up %s failed."
 msgstr "Tar'ing up %s failed."
 
-msgid "Making and MD5sum'ing the new db..."
+#, fuzzy
+msgid "Making and MD5sum'ing the new database..."
 msgstr "Making and MD5sum'ing the new db..."
 
 msgid "Untar'ing %s failed."
 msgstr "Untar'ing %s failed."
 
+#, fuzzy
+msgid "Syncing database to disk..."
+msgstr ":: Synchronising package databases...\n"
+
 msgid "Checking integrity..."
 msgstr "Checking integrity..."
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr "Integrity check FAILED, reverting to old database."
 
-msgid "Putting the new database in place..."
+#, fuzzy
+msgid "Rotating database into place..."
 msgstr "Putting the new database in place..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Finished. Your pacman database has been optimised."
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr "For full benefits of pacman-optimize, run 'sync' now."
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 
@@ -1599,3 +1624,16 @@ msgstr "All packages have been removed from the database. Deleting '%s'."
 
 msgid "No packages modified, nothing to do."
 msgstr "No packages modified, nothing to do."
+
+#~ msgid "segmentation fault\n"
+#~ msgstr "segmentation fault\n"
+
+#~ msgid ""
+#~ "Internal pacman error: Segmentation fault.\n"
+#~ "Please submit a full bug report with --debug if appropriate.\n"
+#~ msgstr ""
+#~ "Internal pacman error: Segmentation fault.\n"
+#~ "Please submit a full bug report with --debug if appropriate.\n"
+
+#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
+#~ msgstr "For full benefits of pacman-optimize, run 'sync' now."

po/es.po

@@ -1,25 +1,24 @@
-# translation of es.po to
 # Spanish translation for pacman package.
 # Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
 #
-# Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>, 2007.
-# Juan Pablo Gonzalez <jotapesan@gmail.com>, 2008.
 # Imanol Celaya <ilcra1989@gmail.com>, 2008.
+# Juan Pablo González Tognarelli <jotapesan@gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:35+0200\n"
-"Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
-"Language-Team:  <es@li.org>\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 03:15-0300\n"
+"Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n"
+"Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\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-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "checking dependencies...\n"
@@ -125,6 +124,10 @@ msgstr "quitando"
 msgid "checking for file conflicts"
 msgstr "verificando conflictos entre archivos"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "Descargando %s...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "falla en malloc: no se pudo reservar %zd bytes\n"
@@ -234,8 +237,8 @@ msgid "MD5 Sum        :"
 msgstr "Hash MD5     :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Descripción    : "
+msgid "Description    :"
+msgstr "Descripción    :"
 
 #, c-format
 msgid "Repository     :"
@@ -247,7 +250,7 @@ msgstr "Archivos de respaldo:\n"
 
 #, c-format
 msgid "could not calculate checksums for %s\n"
-msgstr "no se pudo verificar %s\n"
+msgstr "no se pudo verificar la integridad para %s\n"
 
 #, c-format
 msgid "MODIFIED\t%s\n"
@@ -289,19 +292,24 @@ msgstr "uso"
 msgid "operation"
 msgstr "operación"
 
+#, c-format
+msgid "operations:\n"
+msgstr "operaciones:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"digite '%s --help' con otra opción para ayuda más específica\n"
+"utilice '%s {-h --help}' con una operación para ver las opciones "
+"disponibles\n"
 
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
 msgstr ""
-"  -c, --cascade        quita paquetes, junto a todos los que dependan de "
+"  -c, --cascade        quita los paquetes, junto a todos los que dependan de "
 "estos\n"
 
 #, c-format
@@ -312,7 +320,7 @@ msgstr "  -d, --nodeps         salta la verificación de dependencias \n"
 msgid ""
 "  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr ""
-"  -k, --dbonly         sólo quita la referencia en la base de datos. No "
+"  -k, --dbonly         sólo quita la referencia en la base de datos, no "
 "elimina archivos\n"
 
 #, c-format
@@ -324,8 +332,8 @@ msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
 "                       (-ss includes explicitly installed dependencies too)\n"
 msgstr ""
-"  -s, --recursive      quita también las dependencias (que no quiebren a "
-"otros paquetes)\n"
+"  -s, --recursive      quita también las dependencias (que no rompan a otros "
+"paquetes)\n"
 "                       (-ss incluye también las dependencias explicitamente "
 "instaladas)\n"
 
@@ -333,12 +341,14 @@ msgstr ""
 msgid ""
 "  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
 msgstr ""
-"  -u, --unneeded      quita los paquetes no necesitados (que no quiebren a "
+"  -u, --unneeded      quita los paquetes no necesitados (que no rompan a "
 "otros paquetes)\n"
 
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr "      --asdeps         instala paquetes como dependencia\n"
+msgstr ""
+"      --asdeps         instala paquetes como dependencia (no-"
+"explicitamente)\n"
 
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
@@ -381,8 +391,8 @@ msgstr ""
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
 msgstr ""
-"  -l, --list           lista los archivos contenidos en los paquetes "
-"consultados\n"
+"  -l, --list           lista los archivos contenidos en el paquete "
+"consultado\n"
 
 #, c-format
 msgid ""
@@ -394,8 +404,8 @@ msgstr ""
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
 msgstr ""
-"  -o, --owns <file>    consulta el paquete que contiene el archivo  "
-"indicado\n"
+"  -o, --owns <arch>    consulta el paquete que contiene el archivo indicado "
+"<arch>\n"
 
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
@@ -408,13 +418,13 @@ msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search <busca> busca paquetes instalados localmente que coincidan "
+"  -s, --search <busqu.> busca paquetes instalados localmente que coincidan "
 "con la cadena\n"
 
 #, c-format
 msgid "  -t, --unrequired     list all packages not required by any package\n"
 msgstr ""
-"  -t, --unrequired     lista todos los pquetes no requeridos por algún "
+"  -t, --unrequired     lista todos los paquetes no requeridos por algún otro "
 "paquete\n"
 
 #, c-format
@@ -439,31 +449,33 @@ msgstr ""
 
 #, c-format
 msgid "  -i, --info           view package information\n"
-msgstr "  -i, --info           ver la información del paquete\n"
+msgstr "  -i, --info           visualiza la información del paquete\n"
 
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr "  -l, --list <repo>    ve una lista de paquetes en un repositorio\n"
+msgstr ""
+"  -l, --list <repo>    visualiza una lista de paquetes en un repositorio\n"
 
 #, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
-"  -p, --print-uris     muestra las URIs (nombres de paquetes) para los "
-"archivos indicados y sus  dependencias\n"
+"  -p, --print-uris     muestra las URIs (nombres de paquete) para los "
+"archivos indicados y sus dependencias\n"
 
 #, c-format
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search <busca> busca en los repositorios remotos por coincidencias "
+"  -s, --search <busq.> busca en los repositorios remotos por coincidencias "
 "de la cadena especificada.\n"
 
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr ""
-"  -u, --sysupgrade     actualiza todos los paquetes que no están al día\n"
+"  -u, --sysupgrade     actualiza todos los paquetes que están "
+"desactualizados\n"
 
 #, c-format
 msgid ""
@@ -481,11 +493,8 @@ msgstr ""
 "servidor\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         solo actualiza paquetes antiguos o los que no\n"
-"                         están instalados\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         no reinstala paquetes no actualizados\n"
 
 #, c-format
 msgid ""
@@ -504,15 +513,10 @@ msgstr ""
 "                       ignora una actualización de grupo (puede ser usado "
 "más de una vez)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          muestra menos información para la consulta y "
-"búsqueda\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr "      --config <ruta>  define un archivo de configuración alterno\n"
+msgstr ""
+"      --config <ruta>  define un archivo de configuración alternativo\n"
 
 #, c-format
 msgid "      --logfile <path> set an alternate log file\n"
@@ -526,7 +530,7 @@ msgstr "      --noconfirm      no solicita confirmación alguna\n"
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
-"      --noprogressbar  no muestra la barra de progreso cuando descarga "
+"      --noprogressbar  no muestra la barra de progreso cuando se descargan "
 "archivos\n"
 
 #, c-format
@@ -564,22 +568,9 @@ msgstr ""
 "                       los términos de la licencia GNU General Public "
 "License\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "Violación de segmento\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"error interno de pacman error: Violación de segmento.\n"
-"Por favor envíe un reporte de errores con la opción   --debug si es "
-"oportuno.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
-msgstr "problemas al establecer el rootdir '%s' (%s)\n"
+msgstr "problemas definiendo el directorio raíz '%s' (%s)\n"
 
 #, c-format
 msgid "problem setting dbpath '%s' (%s)\n"
@@ -607,13 +598,17 @@ msgstr "el archivo de configuración %s no se ha podido leer.\n"
 
 #, c-format
 msgid "config file %s, line %d: bad section name.\n"
-msgstr "archivo de configuración %s, linea %d: nombre de sección erroneo.\n"
+msgstr "archivo de configuración %s, linea %d: nombre de sección erróneo.\n"
+
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "no se pudo registrar la base de datos '%s' (%s)\n"
 
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
-"archivo de configuración %s, linea %d: error en la sintaxis del\n"
-"archivo- clave desaparecida.\n"
+"archivo de configuración %s, linea %d: error de sintaxis - clave "
+"desaparecida.\n"
 
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
@@ -628,11 +623,16 @@ msgstr ""
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
-msgstr "valor invalido para 'CleanMethod' : '%s'\n"
+msgstr "valor no válido para 'CleanMethod' : '%s'\n"
+
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr ""
+"no se pudo agregar la URL del servidor a la base de datos  '%s': %s (%s)\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
-msgstr "falló al iniciar la librería alpm (%s)\n"
+msgstr "falló al iniciar la biblioteca alpm (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
@@ -816,7 +816,7 @@ msgstr "el paquete  '%s' no fue encontrado en el repositorio '%s'\n"
 
 #, c-format
 msgid "package '%s' was not found\n"
-msgstr "El paquete '%s' no fue encontrado\n"
+msgstr "el paquete '%s' no fue encontrado\n"
 
 #, c-format
 msgid "repository \"%s\" was not found.\n"
@@ -828,7 +828,7 @@ msgstr ":: iniciando actualización completa del sistema...\n"
 
 #, c-format
 msgid "%s package not found, searching for group...\n"
-msgstr "paquete %s no encontrado, buscando el grupo...\n"
+msgstr "paquete %s no encontrado, buscando un grupo...\n"
 
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
@@ -844,7 +844,7 @@ msgstr ":: ¿Instalar %s del grupo %s?"
 
 #, c-format
 msgid "'%s': not found in sync db\n"
-msgstr "'%s': no encontrado en la lista de paquetes\n"
+msgstr "'%s': no fue encontrado en la lista de paquetes\n"
 
 #, c-format
 msgid ":: %s: conflicts with %s\n"
@@ -872,7 +872,7 @@ msgstr "%s: %s existe en el sistema de archivos\n"
 
 #, c-format
 msgid "%s is invalid or corrupted\n"
-msgstr "%s es invalido o está corrupto\n"
+msgstr "%s no es válido o está corrupto\n"
 
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
@@ -923,8 +923,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "falló al lanzar la transacción (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Nada\n"
+msgid "None"
+msgstr "Nada"
 
 #, c-format
 msgid "Targets (%d):"
@@ -946,21 +946,25 @@ msgstr "Se quitará (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Tamaño total eliminado:   %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Dependencias Opcionales para %s\n"
+
 #, c-format
 msgid "[Y/n]"
-msgstr "[Y/n]"
+msgstr "[S/n]"
 
 #, c-format
 msgid "[y/N]"
-msgstr "[y/N]"
+msgstr "[s/N]"
 
 #, c-format
 msgid "Y"
-msgstr "Y"
+msgstr "S"
 
 #, c-format
 msgid "YES"
-msgstr "YES"
+msgstr "SI"
 
 #, c-format
 msgid "N"
@@ -1004,7 +1008,7 @@ msgid "Cleaning up..."
 msgstr "Limpiando..."
 
 msgid "There is no agent set up to handle %s URLs. Check %s."
-msgstr "No hay nada configurado para las URLs %s. Comprueba %s."
+msgstr "No se definió un agente para manejar las direcciones %s. Verifique %s."
 
 msgid "Aborting..."
 msgstr "Abortando..."
@@ -1040,31 +1044,33 @@ msgid "Found %s in build dir"
 msgstr "Encontrado %s en el directorio de compilación"
 
 msgid "Using cached copy of %s"
-msgstr "usando copia cacheada de %s"
+msgstr "usando la copia cacheada de %s"
 
 msgid "%s was not found in the build directory and is not a URL."
-msgstr "%s no fue encontrado en el directorio de compilación y no es una URL."
+msgstr ""
+"%s no fue encontrado en el directorio de compilación y no es una dirección."
 
 msgid "Downloading %s..."
-msgstr "Descargando %s... "
+msgstr "Descargando %s..."
 
 msgid "Failure while downloading %s"
 msgstr "Falló mientras se descargaba %s"
 
 msgid "Generating checksums for source files..."
-msgstr "Generando la verificación para los archivos fuentes"
+msgstr "Generando la verificación para los archivos fuentes..."
 
 msgid "Invalid integrity algorithm '%s' specified."
-msgstr "Algoritmo de integridad '%s' invalido"
+msgstr "El algoritmo de integridad especificado '%s' no es válido."
 
 msgid "Cannot find openssl."
-msgstr "No se pudo encontrar openssl."
+msgstr "No se pudo encontrar Openssl."
 
 msgid "Unable to find source file %s to generate checksum."
-msgstr "No se pudo encontrar el archivo fuente '%s' para generar el ckecksum."
+msgstr ""
+"No se pudo encontrar el archivo fuente '%s' para generar la verificación."
 
 msgid "Invalid integrity algorithm '%s' specified"
-msgstr "Algoritmo de integridad inválido '%s' especificado"
+msgstr "El algoritmo de integridad especificado '%s' no es válido"
 
 msgid "Validating source files with %s..."
 msgstr "Validando el archivo fuente con %s..."
@@ -1073,7 +1079,7 @@ msgid "NOT FOUND"
 msgstr "NO ENCONTRADO"
 
 msgid "Passed"
-msgstr "Pasado"
+msgstr "Aprobado"
 
 msgid "FAILED"
 msgstr "FALLÓ"
@@ -1097,7 +1103,7 @@ msgid "Starting build()..."
 msgstr "Comenzando build()..."
 
 msgid "Build Failed."
-msgstr "Falló build()"
+msgstr "Falló la compilación."
 
 msgid "Tidying install..."
 msgstr "Limpiando la instalación..."
@@ -1109,10 +1115,10 @@ msgid "Compressing man pages..."
 msgstr "Comprimiendo las paginas man..."
 
 msgid "Stripping debugging symbols from binaries and libraries..."
-msgstr "Quitando símbolos de depuración de los binarios y librerías..."
+msgstr "Quitando los símbolos de depuración de los binarios y bibliotecas..."
 
 msgid "Removing libtool .la files..."
-msgstr "Eliminando archivos .la de libtool"
+msgstr "Eliminando archivos .la de libtool..."
 
 msgid "Removing empty directories..."
 msgstr "Quitando directorios vacios... "
@@ -1127,7 +1133,7 @@ msgid "Generating .PKGINFO file..."
 msgstr "Generando el archivo .PKGINFO..."
 
 msgid "Please add a license line to your %s!"
-msgstr "Por favor agregar la linea de licencia a %s!"
+msgstr "Por favor agregar la línea de licencia a %s!"
 
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Ejemplo de software con licencia GPL: license=('GPL')."
@@ -1201,6 +1207,15 @@ msgstr "Determinando última revisión de hg..."
 msgid "Version found: %s"
 msgstr "Versión encontrada: %s"
 
+msgid "requires an argument"
+msgstr "necesita un argumento"
+
+msgid "unrecognized option"
+msgstr "opción no reconocida"
+
+msgid "invalid option"
+msgstr "opción no válida"
+
 msgid "Usage: %s [options]"
 msgstr "Uso: %s [opciones]"
 
@@ -1257,7 +1272,14 @@ msgid "  -R, --repackage  Repackage contents of pkg/ without building"
 msgstr "  -R, --repackage  Volver a crear el paquete sin recompilar"
 
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
-msgstr "  -s, --syncdeps   Instala las dependencias faltantes con pacman"
+msgstr "  -s, --syncdeps   Instala las dependencias faltantes con Pacman"
+
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource     Genera un archivo sólo con los fuentes, incluyendo los "
+"descargados"
 
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr ""
@@ -1270,10 +1292,11 @@ msgstr ""
 "      --holdver    Previene el choque automático de versiones para los "
 "PKGBUILD de desarrollo"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     No construir el paquete, crear un tarball con sólo los "
-"fuentes"
+"      --source     Genera un paquete sólo los fuentes, sin incluir los "
+"descargados"
 
 msgid "These options can be passed to pacman:"
 msgstr "Estas opciones pueden ser pasadas a pacman:"
@@ -1312,8 +1335,8 @@ msgstr "\\0--holdver y --forcever no pueden ser usados al mismo tiempo"
 msgid "Cleaning up ALL files from %s."
 msgstr "Limpiando TODOS los archivos de %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    ¿Seguro que quieres hacer esto? [Y/n]"
+msgid "    Are you sure you wish to do this? "
+msgstr "    ¿Seguro que desea hacer esto? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
@@ -1400,6 +1423,10 @@ msgstr "Advierte que muchos paquetes pueden necesitar añadir una línea a su %s
 msgid "such as arch=('%s')."
 msgstr "tales como arch=('%s')."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr ""
+"El arreglo proporcionado no puede contener operadores de comparación (< o >)."
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "El script de instalación (%s) no existe."
 
@@ -1498,17 +1525,17 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "no se encontró diff, por favor, instale diffutils."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Se encontró el archivo bloqueo de pacman. No se puede ejecutar mientras "
-"pacman esté ejecutándose."
-
 msgid "%s does not exist or is not a directory."
 msgstr "'%s' no no existe o no es un directorio."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "Debes tener los permisos correctos para optimizar la base de datos."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+"Se encontró el archivo bloqueo de pacman. No se puede ejecutar mientras "
+"pacman esté ejecutándose."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
 "ERROR: No se pudo crear directorio temporal para crear la base de datos."
@@ -1522,27 +1549,26 @@ msgstr "Empaquetando %s..."
 msgid "Tar'ing up %s failed."
 msgstr "Falló empaquetando %s."
 
-msgid "Making and MD5sum'ing the new db..."
-msgstr "Creando y haciendo md5 de la base de datos nueva."
+msgid "Making and MD5sum'ing the new database..."
+msgstr "Creando y realizando verificación MD5 a la nueva base de datos..."
 
 msgid "Untar'ing %s failed."
 msgstr "Falló desempaquetando %s."
 
+msgid "Syncing database to disk..."
+msgstr "Sincronizando la base de datos con el disco..."
+
 msgid "Checking integrity..."
 msgstr "Verificando la integridad..."
 
 msgid "Integrity check FAILED, reverting to old database."
-msgstr "FALLÓ el test de integridad, volviendo a la base de datos antigua."
+msgstr "FALLÓ la prueba de integridad, volviendo a la base de datos antigua."
 
-msgid "Putting the new database in place..."
-msgstr "Colocando la nueva base de datos en su sitio."
+msgid "Rotating database into place..."
+msgstr "Rotando el sitio de la base de datos..."
 
 msgid "Finished. Your pacman database has been optimized."
-msgstr "Finalizado, Su base de datos de pacman ha sido optimizada."
-
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
-"Para beneficiarse completamente de pacman-optimize ejecute 'sync' ahora."
+msgstr "Finalizado, Su base de datos de Pacman fue optimizada."
 
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "Uso: repo-add [-q] <ruta-a-bd> <paquete> ...\\n"
@@ -1565,20 +1591,20 @@ msgid ""
 msgstr ""
 "repo-remove actualizará una base de datos eliminando de ella el paquete"
 "\\nespecificado en la linea de comandos. Varios paquetes\\n pueden "
-"eliminarse especificandolo en la línea de comandos.\\n\\n"
+"eliminarse especificándolos en la línea de comandos.\\n\\n"
 
 msgid ""
 "The -q/--quiet flag to either program will force silent running except\\nin "
 "the case of warnings or errors.\\n\\n"
 msgstr ""
-"La bandera -q/--quiet forzarán a cualquier programa a trabajar en modo "
-"silencioso excepto \\nen  el caso the advertencias o errores.\\n\\n"
+"La bandera -q/--quiet forzará a cualquier programa a trabajar en modo "
+"silencioso excepto \\nen  el caso de advertencias o errores.\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "Ejemplo: repo-add /ruta/al/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr "Ejemplo: repo-remove /path/al/repo.db.tar.gz kernel26"
+msgstr "Ejemplo: repo-remove /ruta/al/repo.db.tar.gz kernel26"
 
 msgid ""
 "Copyright (C) 2006-2008 Aaron Griffin <aaron@archlinux.org>.\\nCopyright (c) "
@@ -1669,3 +1695,18 @@ msgstr ""
 
 msgid "No packages modified, nothing to do."
 msgstr "No se modificaron paquetes, nada que hacer."
+
+#~ msgid "segmentation fault\n"
+#~ msgstr "Violación de segmento\n"
+
+#~ msgid ""
+#~ "Internal pacman error: Segmentation fault.\n"
+#~ "Please submit a full bug report with --debug if appropriate.\n"
+#~ msgstr ""
+#~ "error interno de pacman error: Violación de segmento.\n"
+#~ "Por favor envíe un reporte de errores con la opción   --debug si es "
+#~ "oportuno.\n"
+
+#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
+#~ msgstr ""
+#~ "Para beneficiarse completamente de pacman-optimize ejecute 'sync' ahora."

po/fr.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:36+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 11:48+0100\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
 "MIME-Version: 1.0\n"
@@ -131,6 +131,10 @@ msgstr "Désinstallation"
 msgid "checking for file conflicts"
 msgstr "Analyse des conflits entre fichiers"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "téléchargement de %s...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "erreur malloc: n'a pas pu allouer %zd bytes\n"
@@ -243,8 +247,8 @@ msgid "MD5 Sum        :"
 msgstr "somme MD5             :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Description           : "
+msgid "Description    :"
+msgstr "Description           :"
 
 #, c-format
 msgid "Repository     :"
@@ -298,13 +302,18 @@ msgstr "utilisation"
 msgid "operation"
 msgstr "opération"
 
+#, c-format
+msgid "operations:\n"
+msgstr "opérations:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"Utilisez '%s --help' avec d'autres options pour une syntaxe plus détaillée.\n"
+"utilisez '%s {-h --help}' avec une opération pour voir les options "
+"disponibles.\n"
 
 #, c-format
 msgid ""
@@ -491,11 +500,8 @@ msgstr ""
 "le serveur\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed             met à jour seulement les paquets obsolètes ou non "
-"installés\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed             ne réinstalle pas les paquets déjà à jour\n"
 
 # moins fidèle, mais plus précis (je changerais l'anglais aussi ici)
 #, c-format
@@ -515,10 +521,6 @@ msgstr ""
 "                           ignore un groupe lors de la màj (peut être "
 "utilisé plus d'une fois)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr "  -q, --quiet              montre moins d'informations\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""
@@ -573,18 +575,6 @@ msgstr ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "erreur de segmentation\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Erreur de segmentation.\n"
-"Soumettez un rapport de bug complet avec debug si approprié.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "problème avec rootdir '%s' (%s)\n"
@@ -617,6 +607,10 @@ msgstr "Le fichier de config %s n'a pas pu être lu.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "fichier de config %s, ligne %d: mauvais nom de section.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "l'enregistrement de la base de données '%s' a échoué (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr "fichier de config %s, ligne %d: erreur de syntaxe- clé manquante.\n"
@@ -636,6 +630,10 @@ msgstr ""
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "valeur invalide pour 'CleanMethod' : '%s'\n"
 
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "l'ajout de l'url '%2$s' à la base de données '%1$s' a échoué (%3$s)\n"
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "l'initialisation de la librairie alpm a échoué (%s)\n"
@@ -935,8 +933,8 @@ msgstr "la libération de la transaction a échoué (%s)\n"
 
 # bon, on peut discuter là dessus; mais pacman -Qi avec tous ses "aucun" est vraiment trop laid... je le préfère comme ça
 #, c-format
-msgid "None\n"
-msgstr "--\n"
+msgid "None"
+msgstr "--"
 
 #, c-format
 msgid "Targets (%d):"
@@ -958,6 +956,10 @@ msgstr "Suppression (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Taille totale des paquets (suppression):   %.2f Mo\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Dépendances optionnelles pour %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[O/n]"
@@ -1061,7 +1063,7 @@ msgstr ""
 "%s n'a pas été trouvé dans le répertoire de travail et n'est pas une URL."
 
 msgid "Downloading %s..."
-msgstr "Téléchargement de %s... "
+msgstr "Téléchargement de %s..."
 
 msgid "Failure while downloading %s"
 msgstr "Erreur lors du téléchargement de %s"
@@ -1221,6 +1223,15 @@ msgstr "Détermination de la dernière révision hg..."
 msgid "Version found: %s"
 msgstr "Version trouvée        : %s"
 
+msgid "requires an argument"
+msgstr "requiert un argument"
+
+msgid "unrecognized option"
+msgstr "option inconnue"
+
+msgid "invalid option"
+msgstr "option invalide"
+
 msgid "Usage: %s [options]"
 msgstr "Utilisation: %s [options]"
 
@@ -1283,6 +1294,13 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Installe les dépendances manquantes avec pacman"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource  Génère une archive uniquement constituée de sources, "
+"sources téléchargées inclues"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Autorise makepkg à s'exécuter en root"
 
@@ -1293,10 +1311,11 @@ msgstr ""
 "      --holdver    Empêche la mise à jour automatique de la version pour les "
 "PKGBUILDs de développement."
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     Ne compile pas le paquet; génère une archive avec juste "
-"les sources"
+"      --source     Génère une archive uniquement constituée de sources, sans "
+"les sources téléchargées"
 
 msgid "These options can be passed to pacman:"
 msgstr "Ces options peuvent être passées à pacman:"
@@ -1333,8 +1352,8 @@ msgstr "\\0--holdver et --forcever sont incompatibles"
 msgid "Cleaning up ALL files from %s."
 msgstr "Nettoyage de TOUS les fichiers dans %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Êtes-vous sur de vouloir faire celà? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Êtes-vous sur de vouloir faire celà? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
@@ -1424,6 +1443,9 @@ msgstr "Notez que beaucoup de paquets peuvent avoir besoin d'une ligne dans %s"
 msgid "such as arch=('%s')."
 msgstr "comme arch=('%s')."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr "Le tableau provides ne peut pas contenir d'opérateurs de comparaison (< ou >)."
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Le scriptlet d'installation (%s) n'a pas été trouvé."
 
@@ -1522,11 +1544,6 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "L'outil diff est introuvable, installez diffutils svp."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Le fichier de verrou de pacman est présent. Ne peut pas être exécuté pendant "
-"que pacman tourne."
-
 msgid "%s does not exist or is not a directory."
 msgstr "'%s' n'existe pas ou n'est pas un répertoire."
 
@@ -1535,6 +1552,11 @@ msgstr ""
 "Vous devez avoir les permissions suffisantes pour optimiser la base de "
 "donnée."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+"Le fichier de verrou de pacman est présent. Ne peut pas être exécuté pendant "
+"que pacman tourne."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
 "ERREUR: la création du répertoire temporaire pour créer la base de données a "
@@ -1549,12 +1571,15 @@ msgstr "Archive %s... "
 msgid "Tar'ing up %s failed."
 msgstr "L'archivage de %s a échoué."
 
-msgid "Making and MD5sum'ing the new db..."
-msgstr "Création et calcul du md5sum de la nouvelle bd..."
+msgid "Making and MD5sum'ing the new database..."
+msgstr "Création de la nouvelle base de données et calcul du md5sum..."
 
 msgid "Untar'ing %s failed."
 msgstr "Le désarchivage de %s a échoué."
 
+msgid "Syncing database to disk..."
+msgstr "Synchronise la base de données sur le disque..."
+
 msgid "Checking integrity..."
 msgstr "Analyse de l'intégrité... "
 
@@ -1562,15 +1587,12 @@ msgid "Integrity check FAILED, reverting to old database."
 msgstr ""
 "La vérification de l'intégrité a échoué, restaure l'ancienne base de données."
 
-msgid "Putting the new database in place..."
-msgstr "Placement de la nouvelle base de données..."
+msgid "Rotating database into place..."
+msgstr "Mise en place de la base de données..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Fini. La base de données de pacman a été optimisé."
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr "Pour que pacman-optimize soit plus efficace, lancez 'sync' maintenant."
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "utilisation: repo-add [-q] <path-to-db> <packagename> ...\\n"
 

po/hu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
 "PO-Revision-Date: 2008-07-30 08:36+0200\n"
 "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -118,6 +118,10 @@ msgstr "eltávolítás:"
 msgid "checking for file conflicts"
 msgstr "fájlütközések vizsgálata"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "%s letöltése...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc hiba: nem sikerült %zd bájtot lefoglalni\n"
@@ -227,8 +231,8 @@ msgid "MD5 Sum        :"
 msgstr "MD5 Sum         :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Leírás          : "
+msgid "Description    :"
+msgstr "Leírás          :"
 
 #, c-format
 msgid "Repository     :"
@@ -282,13 +286,17 @@ msgstr "használat"
 msgid "operation"
 msgstr "művelet"
 
+#, c-format
+msgid "operations:\n"
+msgstr "műveletek:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"használja a '%s --help'-et más opciókkal további szintaxishoz\n"
+"a '%s {-h --help}' után egy műveletet megadva a vonatkozó opciókat kapjuk\n"
 
 #, c-format
 msgid ""
@@ -452,10 +460,8 @@ msgid ""
 msgstr "  -y, --refresh        friss csomagadatbázis letöltése a szerverről\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         csak az elavult vagy hiányzó csomagok \"frissítése\"\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         ne telepítse újra a naprakész csomagokat\n"
 
 #, c-format
 msgid ""
@@ -472,12 +478,6 @@ msgstr ""
 "      --ignoregroup <csoport>\n"
 "                       csoportfrissítés mellőzése (többször is használható)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          kevesebb információ mutatása lekérdezésnél és "
-"keresésnél\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <útv.>  alternatív konfigurációs fájl beállítása\n"
@@ -527,18 +527,6 @@ msgstr ""
 "                       Ez a program szabadon terjeszthető a GNU\n"
 "                       General Public License feltételei szerint.\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "szegmens hiba\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Belső pacman hiba: Szegmens hiba.\n"
-"Kérem küldjön egy teljes hibajelentést (használja a --debug kapcsolót).\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr ""
@@ -572,6 +560,10 @@ msgstr "a %s konfigurációs fájl nem olvasható.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "%s konfigurációs fájl, %d. sor: hibás szekciónév.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "nem sikerült regisztrálni a(z) '%s' adatbázist (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr "%s konfigurációs fájl, %d. sor: szintaktikai hiba- hiányzó kulcs.\n"
@@ -590,6 +582,10 @@ msgstr "%s konfigurációs fájl, %d. sor: a '%s' direktíva nem értelmezhető.
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "hibás 'CleanMethod' érték: '%s'\n"
 
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "nem sikerült a szerver URL beállítása a(z) '%s' adatbázison: %s (%s)\n"
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "nem sikerült inicializálni az alpm könyvtárat (%s)\n"
@@ -883,8 +879,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "nem sikerült lezárni a tranzakciót (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Nincs\n"
+msgid "None"
+msgstr "Nincs"
 
 #, c-format
 msgid "Targets (%d):"
@@ -906,6 +902,10 @@ msgstr "Eltávolítás (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Teljes eltávolított méret:   %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "A(z) %s csomag opcionális függőségei:\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[I/n]"
@@ -955,10 +955,10 @@ msgid "function: "
 msgstr "függvény: "
 
 msgid "WARNING:"
-msgstr "FIGYELMEZTETÉS"
+msgstr ""
 
 msgid "ERROR:"
-msgstr "HIBA:"
+msgstr ""
 
 msgid "Cleaning up..."
 msgstr ""
@@ -1161,6 +1161,15 @@ msgstr ""
 msgid "Version found: %s"
 msgstr ""
 
+msgid "requires an argument"
+msgstr ""
+
+msgid "unrecognized option"
+msgstr ""
+
+msgid "invalid option"
+msgstr ""
+
 msgid "Usage: %s [options]"
 msgstr ""
 
@@ -1216,6 +1225,11 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr ""
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr ""
 
@@ -1224,7 +1238,8 @@ msgid ""
 "PKGBUILDs"
 msgstr ""
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
 
 msgid "These options can be passed to pacman:"
@@ -1257,7 +1272,7 @@ msgstr ""
 msgid "Cleaning up ALL files from %s."
 msgstr ""
 
-msgid "    Are you sure you wish to do this? [Y/n] "
+msgid "    Are you sure you wish to do this? "
 msgstr ""
 
 msgid "Problem removing files; you may not have correct permissions in %s"
@@ -1338,6 +1353,9 @@ msgstr ""
 msgid "such as arch=('%s')."
 msgstr ""
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr ""
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr ""
 
@@ -1427,15 +1445,15 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr ""
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-
 msgid "%s does not exist or is not a directory."
 msgstr ""
 
 msgid "You must have correct permissions to optimize the database."
 msgstr ""
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
 
@@ -1448,27 +1466,27 @@ msgstr ""
 msgid "Tar'ing up %s failed."
 msgstr ""
 
-msgid "Making and MD5sum'ing the new db..."
+msgid "Making and MD5sum'ing the new database..."
 msgstr ""
 
 msgid "Untar'ing %s failed."
 msgstr ""
 
+msgid "Syncing database to disk..."
+msgstr ""
+
 msgid "Checking integrity..."
 msgstr ""
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr ""
 
-msgid "Putting the new database in place..."
+msgid "Rotating database into place..."
 msgstr ""
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr ""
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr ""
 

po/it.po

@@ -1,7 +1,7 @@
 # Italian 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.
-# Giovanni 'voidnull' Scafora <linuxmania@gmail.com>, 2007, 2008
+# Giovanni 'voidnull' Scafora <giovanni@archlinux.org>, 2007, 2008, 2009
 # Andrea 'bash' Scarpino <bash.lnx@gmail.com>, 2008
 # Alessio 'mOLOk' Bolognino <themolok@gmail.com>, 2007
 # Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>, 2007
@@ -10,8 +10,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: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:37+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 13:30+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
 "MIME-Version: 1.0\n"
@@ -73,38 +73,38 @@ msgstr "non riuscito.\n"
 
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Recupero dei pacchetti da %s...\n"
+msgstr ":: Download dei pacchetti da %s...\n"
 
 #, c-format
 msgid ""
 ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
 msgstr ""
 ":: %s richiede l'installazione di %s che è in IgnorePkg/IgnoreGroup. "
-"Installare ugualmente?"
+"Vuoi installarlo?"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ":: %s è in IgnorePkg/IgnoreGroup. Installare ugualmente?"
+msgstr ":: %s è in IgnorePkg/IgnoreGroup. Vuoi installarlo?"
 
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway?"
-msgstr ":: %s è presente in HoldPkg. Rimuovere ugualmente?"
+msgstr ":: %s è presente in HoldPkg. Vuoi rimuoverlo?"
 
 #, c-format
 msgid ":: Replace %s with %s/%s?"
-msgstr ":: Sostituire %s con %s/%s?"
+msgstr ":: Vuoi sostituire %s con %s/%s?"
 
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s?"
-msgstr ":: %s va in conflitto con %s. Rimuovere %s?"
+msgstr ":: %s va in conflitto con %s. Vuoi rimuovere %s?"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
-msgstr ":: %s-%s: la versione installata è più recente. Aggiornare ugualmente?"
+msgstr ":: %s-%s: la versione installata è più recente. Vuoi aggiornarlo?"
 
 #, c-format
 msgid ":: File %s is corrupted. Do you want to delete it?"
-msgstr ":: Il file %s è corrotto. Eliminarlo?"
+msgstr ":: Il file %s è corrotto. Vuoi eliminarlo?"
 
 #, c-format
 msgid "installing"
@@ -122,6 +122,10 @@ msgstr "rimozione in corso di"
 msgid "checking for file conflicts"
 msgstr "controllo dei conflitti in corso"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "download di %s in corso...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc fallita: impossibile allocare %zd byte\n"
@@ -231,8 +235,8 @@ msgid "MD5 Sum        :"
 msgstr "Somma MD5      :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Descrizione    : "
+msgid "Description    :"
+msgstr "Descrizione    :"
 
 #, c-format
 msgid "Repository     :"
@@ -286,13 +290,17 @@ msgstr "uso"
 msgid "operation"
 msgstr "operazione"
 
+#, c-format
+msgid "operations:\n"
+msgstr "operazioni:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"usare '%s --help' con le altre opzioni per ottenere maggiori informazioni\n"
+"usare '%s {-h --help}' con un'operazione per le opzioni disponibili\n"
 
 #, c-format
 msgid ""
@@ -386,7 +394,7 @@ msgstr ""
 
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr "  -o, --owns <file>    mostra il pacchetto che contiene il <file>\n"
+msgstr "  -o, --owns <file>    interroga il pacchetto che contiene il <file>\n"
 
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
@@ -426,7 +434,7 @@ msgstr ""
 
 #, c-format
 msgid "  -i, --info           view package information\n"
-msgstr "  -i, --info           mostra le informazioni sul pacchetto\n"
+msgstr "  -i, --info           mostra le informazioni del pacchetto\n"
 
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
@@ -467,11 +475,8 @@ msgstr ""
 "pacchetti\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         aggiorna solo i pacchetti non aggiornati o da "
-"installare\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         non reinstalla i pacchetti aggiornati\n"
 
 #, c-format
 msgid ""
@@ -487,10 +492,6 @@ msgstr ""
 "      --ignoregroup <grp>\n"
 "                       ignora l'aggiornamento di un gruppo\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr "  -q, --quiet          mostra meno informazioni per query e ricerca\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <path>  imposta un file di configurazione alternativo\n"
@@ -501,7 +502,7 @@ msgstr "      --logfile <path> imposta un file di log alternativo\n"
 
 #, c-format
 msgid "      --noconfirm      do not ask for any confirmation\n"
-msgstr "      --noconfirm      non chiede alcuna conferma\n"
+msgstr "      --noconfirm      non chiede nessuna conferma\n"
 
 #, c-format
 msgid ""
@@ -539,18 +540,6 @@ msgstr ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "segmentation fault\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Errore interno in pacman: Segmentation fault.\n"
-"Invia un report del bug completo usando --debug se necessario.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr ""
@@ -587,6 +576,10 @@ msgstr "il file di configurazione %s potrebbe non essere leggibile.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "file di configurazione %s, linea %d: il nome della sezione è errato.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "impossibile registrare il database '%s' (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
@@ -606,7 +599,11 @@ msgstr ""
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
-msgstr "valore invalido per 'CleanMethod' : '%s'\n"
+msgstr "valore non valido per 'CleanMethod' : '%s'\n"
+
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "impossibile aggiungere l'URL del server al database '%s': %s (%s)\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -614,7 +611,7 @@ msgstr "impossibile inizializzare la libreria alpm (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "operazione possibile solo da root.\n"
+msgstr "questa operazione è possibile solo da root.\n"
 
 #, c-format
 msgid "could not register 'local' database (%s)\n"
@@ -626,7 +623,7 @@ msgstr "nessuna operazione specificata (usare -h per un aiuto)\n"
 
 #, c-format
 msgid "no file was specified for --owns\n"
-msgstr "non è stato specificato alcun file per --owns\n"
+msgstr "non è stato specificato nessun file per --owns\n"
 
 #, c-format
 msgid "failed to read file '%s': %s\n"
@@ -638,7 +635,7 @@ msgstr "impossibile determinare il proprietario di una directory\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
-msgstr "impossibile determinare la vera posizione di '%s': %s\n"
+msgstr "impossibile determinare il percorso reale di '%s': %s\n"
 
 #, c-format
 msgid "%s is owned by %s %s\n"
@@ -666,7 +663,7 @@ msgstr "non è stato configurato nessun repository di pacchetti valido.\n"
 
 #, c-format
 msgid "no targets specified (use -h for help)\n"
-msgstr "nessun pacchetto specificato (usare -h per un aiuto)\n"
+msgstr "non è stato specificato nessun pacchetto (usare -h per un aiuto)\n"
 
 #, c-format
 msgid "package \"%s\" not found\n"
@@ -686,15 +683,15 @@ msgstr ":: gruppo %s:\n"
 
 #, c-format
 msgid "    Remove whole content?"
-msgstr "    Rimuovere l'intero contenuto?"
+msgstr "    Vuoi rimuovere l'intero contenuto?"
 
 #, c-format
 msgid ":: Remove %s from group %s?"
-msgstr ":: Rimuovere %s dal gruppo %s?"
+msgstr ":: Vuoi rimuovere %s dal gruppo %s?"
 
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
-msgstr "impossibile inizializzare l'operazione richiesta (%s)\n"
+msgstr "impossibile eseguire l'operazione richiesta (%s)\n"
 
 #, c-format
 msgid ":: %s: requires %s\n"
@@ -702,7 +699,7 @@ msgstr ":: %s: richiede %s\n"
 
 #, c-format
 msgid "Do you want to remove these packages?"
-msgstr "Rimuovere questi pacchetti?"
+msgstr "Vuoi rimuovere questi pacchetti?"
 
 #, c-format
 msgid "failed to commit transaction (%s)\n"
@@ -714,7 +711,7 @@ msgstr "impossibile accedere alla directory del database\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
-msgstr "Rimuovere %s?"
+msgstr "Vuoi rimuovere %s?"
 
 #, c-format
 msgid "could not remove repository directory\n"
@@ -726,7 +723,7 @@ msgstr "Directory del database: %s\n"
 
 #, c-format
 msgid "Do you want to remove unused repositories?"
-msgstr "Rimuovere i repository inutilizzati?"
+msgstr "Vuoi rimuovere i repository inutilizzati?"
 
 #, c-format
 msgid "Database directory cleaned up\n"
@@ -738,11 +735,11 @@ msgstr "Directory della cache: %s\n"
 
 #, c-format
 msgid "Do you want to remove uninstalled packages from cache?"
-msgstr "Rimuovere i pacchetti disinstallati dalla cache?"
+msgstr "Vuoi rimuovere dalla cache i pacchetti disinstallati?"
 
 #, c-format
 msgid "Do you want to remove outdated packages from cache?"
-msgstr "Rimuovere i pacchetti disinstallati dalla cache?"
+msgstr "Vuoi rimuovere dalla cache i pacchetti non aggiornati?"
 
 #, c-format
 msgid "removing old packages from cache... "
@@ -758,7 +755,7 @@ msgstr "fatto.\n"
 
 #, c-format
 msgid "Do you want to remove ALL packages from cache?"
-msgstr "Rimuovere TUTTI i pacchetti dalla cache?"
+msgstr "Vuoi rimuovere dalla cache TUTTI i pacchetti?"
 
 #, c-format
 msgid "removing all packages from cache... "
@@ -806,7 +803,7 @@ msgstr ":: Aggiornamento del sistema in corso...\n"
 
 #, c-format
 msgid "%s package not found, searching for group...\n"
-msgstr "%s pacchetto non trovato, cerco per un gruppo...\n"
+msgstr "il pacchetto %s non è stato trovato, ricerca nei gruppi in corso...\n"
 
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
@@ -814,11 +811,11 @@ msgstr ":: gruppo %s (include i pacchetti ignorati):\n"
 
 #, c-format
 msgid ":: Install whole content?"
-msgstr ":: Installare l'intero contenuto?"
+msgstr ":: Vuoi installare l'intero contenuto?"
 
 #, c-format
 msgid ":: Install %s from group %s?"
-msgstr ":: Installare %s dal gruppo %s?"
+msgstr ":: Vuoi installare %s dal gruppo %s?"
 
 #, c-format
 msgid "'%s': not found in sync db\n"
@@ -834,11 +831,11 @@ msgstr " Il database locale è aggiornato\n"
 
 #, c-format
 msgid "Proceed with download?"
-msgstr "Procedere con il download?"
+msgstr "Vuoi procedere con il download?"
 
 #, c-format
 msgid "Proceed with installation?"
-msgstr "Procedere con l'installazione?"
+msgstr "Vuoi procedere con l'installazione?"
 
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
@@ -850,7 +847,7 @@ msgstr "%s: %s è già presente nel filesystem\n"
 
 #, c-format
 msgid "%s is invalid or corrupted\n"
-msgstr "%s è invalido o corrotto\n"
+msgstr "%s non è valido oppure è corrotto\n"
 
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
@@ -870,8 +867,8 @@ msgid ""
 ":: Do you want to cancel the current operation\n"
 ":: and upgrade these packages now?"
 msgstr ""
-":: Si desidera annullare l'operazione corrente\n"
-":: e aggiornare ora questi pacchetti?"
+":: Vuoi annullare l'operazione corrente\n"
+":: e aggiornare adesso questi pacchetti?"
 
 #, c-format
 msgid "loading package data...\n"
@@ -894,16 +891,16 @@ msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
 msgstr ""
-"  se sei sicuro che il gestore dei pacchetti non è già\n"
-"  in funzione, è possibile rimuovere %s.\n"
+"  se sei sicuro che il gestore dei pacchetti non sia già\n"
+"  in funzione, puoi rimuovere %s.\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "impossibile annullare l'operazione richiesta (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Nessuno\n"
+msgid "None"
+msgstr "Nessuno"
 
 #, c-format
 msgid "Targets (%d):"
@@ -919,12 +916,16 @@ msgstr "Dimensione totale dei pacchetti da installare:   %.2f MB\n"
 
 #, c-format
 msgid "Remove (%d):"
-msgstr "Rimuovere (%d):"
+msgstr "Da rimuovere (%d):"
 
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Dimensione totale dei pacchetti da rimuovere:   %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Dipendenze opzionali di %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[S/n]"
@@ -1011,7 +1012,7 @@ msgid "Failed to remove installed dependencies."
 msgstr "Impossibile rimuovere le dipendenze installate."
 
 msgid "Retrieving Sources..."
-msgstr "Recupero dei sorgenti in corso..."
+msgstr "Download dei sorgenti in corso..."
 
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Non si dispone dei permessi in scrittura per salvare i download in %s."
@@ -1026,7 +1027,7 @@ msgid "%s was not found in the build directory and is not a URL."
 msgstr "impossibile trovare %s nella directory e non è un URL."
 
 msgid "Downloading %s..."
-msgstr "Scaricamento di %s in corso..."
+msgstr "Download di %s in corso..."
 
 msgid "Failure while downloading %s"
 msgstr "Impossibile scaricare %s"
@@ -1107,7 +1108,7 @@ msgid "Generating .PKGINFO file..."
 msgstr "Generazione del file .PKGINFO in corso..."
 
 msgid "Please add a license line to your %s!"
-msgstr "Si prega di aggiungere il campo license al vostro %s!"
+msgstr "Aggiungi il campo license al tuo %s!"
 
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Esempio di software GPL: license=('GPL')."
@@ -1131,7 +1132,7 @@ msgid "Making delta from version %s..."
 msgstr "Creazione di delta dalla versione %s in corso..."
 
 msgid "Recreating package tarball from delta to match md5 signatures"
-msgstr "Ricreazione del pacchetto dal delta che corrisponda alla firma md5"
+msgstr "Ricreazione del pacchetto dal delta affinché corrisponda alle firme md5"
 
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
 msgstr "NOTA: il delta dovrebbe essere distribuito SOLO con questo archivio"
@@ -1143,7 +1144,7 @@ msgid "Delta was not able to be created."
 msgstr "Impossibile creare il delta."
 
 msgid "No previous version found, skipping xdelta."
-msgstr "Impossibile trovare una versione precedente, delta ignorato."
+msgstr "Impossibile trovare una versione precedente, xdelta ignorato."
 
 msgid "Creating source package..."
 msgstr "Creazione del pacchetto in corso..."
@@ -1181,8 +1182,17 @@ msgstr "Determinazione dell'ultima revisione hg in corso..."
 msgid "Version found: %s"
 msgstr "Versione trovata: %s"
 
+msgid "requires an argument"
+msgstr "richiede un argomento"
+
+msgid "unrecognized option"
+msgstr "opzione non riconosciuta"
+
+msgid "invalid option"
+msgstr "opzione non valida"
+
 msgid "Usage: %s [options]"
-msgstr "uso:  %s [opzioni]"
+msgstr "Uso:  %s [opzioni]"
 
 msgid "Options:"
 msgstr "Opzioni:"
@@ -1197,7 +1207,7 @@ msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Elimina i sorgenti dalla cache"
 
 msgid "  -d, --nodeps     Skip all dependency checks"
-msgstr "  -d, --nodeps     Ignora i controlli tutte sulle dipendenze"
+msgstr "  -d, --nodeps     Ignora tutti i controlli sulle dipendenze"
 
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr "  -e, --noextract  Non estrae i sorgenti (usa l'esistente dir src/)"
@@ -1215,7 +1225,7 @@ msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Installa il pacchetto dopo la compilazione"
 
 msgid "  -L, --log        Log package build process"
-msgstr "  -L, --log        Mostra il log della compilazione"
+msgstr "  -L, --log        Logga il processo di compilazione del pacchetto"
 
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Disabilita l'output dei messaggi colorati"
@@ -1238,6 +1248,12 @@ msgstr "  -R, --repackage  Ricrea il pacchetto in pkg/ senza compilarlo"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Installa le dipendenze mancanti con pacman"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource  Genera solo un archivio includendo i sorgenti scaricati"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Consente a makepkg di avviarsi da root"
 
@@ -1248,8 +1264,10 @@ msgstr ""
 "      --holdver    Previene l'incremento automatico della versione per i "
 "PKGBUILD di sviluppo"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr "      --source     Non compila il pacchetto, genera solo un archivio"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
+msgstr ""
+"      --source     Genera solo un archivio escludendo i sorgenti scaricati"
 
 msgid "These options can be passed to pacman:"
 msgstr "Queste opzioni possono essere passate a pacman:"
@@ -1258,7 +1276,7 @@ msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
 msgstr ""
-"      --noconfirm      Non chiede alcuna conferma durante la risoluzione\n"
+"      --noconfirm      Non chiede nessuna conferma durante la risoluzione\n"
 "                       delle dipendenze"
 
 msgid ""
@@ -1269,7 +1287,7 @@ msgstr ""
 "                       dei file"
 
 msgid "If -p is not specified, makepkg will look for '%s'"
-msgstr "Se -p non è stato specificato, makepkg utilizzerà '%s'"
+msgstr "Se -p non è stato specificato, makepkg cercherà '%s'"
 
 msgid ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free "
@@ -1290,8 +1308,8 @@ msgstr ""
 msgid "Cleaning up ALL files from %s."
 msgstr "Pulizia di TUTTI i file da %s in corso."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Siete proprio sicuri di volerlo fare? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Sei proprio sicuro di volerlo fare? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
@@ -1309,20 +1327,19 @@ msgstr "La destinazione del sorgente deve essere definita in makepkg.conf."
 
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr ""
-"Inoltre, si prega di avviare makepkg -C all'esterno della vostra directory "
-"di cache."
+"Inoltre, avvia makepkg -C all'esterno della tua directory di cache."
 
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
-msgstr "BUILDSCRIPT non è definito! Assicurarsi di aver aggiornato %s."
+msgstr "BUILDSCRIPT non è definito! Assicurati di aver aggiornato %s."
 
 msgid "Running makepkg as root is a BAD idea and can cause"
 msgstr "Avviare makepkg da root è una CATTIVA idea e può causare"
 
 msgid "permanent, catastrophic damage to your system. If you"
-msgstr "danni permanenti e catastrofici al vostro sistema. Se"
+msgstr "danni permanenti e catastrofici al tuo sistema. Se"
 
 msgid "wish to run as root, please use the --asroot option."
-msgstr "volete avviarlo da root, usate l'opzione --asroot."
+msgstr "vuoi avviarlo da root, usa l'opzione --asroot."
 
 msgid "The --asroot option is meant for the root user only."
 msgstr "L'opzione --asroot è riservata solo all'utente root."
@@ -1337,11 +1354,11 @@ msgid "in the BUILDENV array in %s."
 msgstr "è indispensabile installare fakeroot."
 
 msgid "Running makepkg as an unprivileged user will result in non-root"
-msgstr "Avviando makepkg con un utente senza privilegi i file risulteranno"
+msgstr "Avviando makepkg con un utente senza privilegi, i file risulteranno"
 
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
-"di proprietà del pacchettizzatore. Provare usando l'ambiente di fakeroot"
+"di proprietà del pacchettizzatore. Prova ad usare l'ambiente di fakeroot,"
 
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
 msgstr "posizionando 'fakeroot' nell'array BUILDENV in makepkg.conf."
@@ -1354,7 +1371,7 @@ msgstr "Impossibile trovare il binario di sudo! sudo è installato?"
 
 msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr ""
-"Le dipendenze mancanti non possono essere installate o rimosse da utente "
+"Le dipendenze mancanti non possono essere installate o rimosse da un utente "
 "normale"
 
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
@@ -1376,17 +1393,20 @@ msgstr "%s non è disponibile per l'architettura '%s'."
 
 msgid "Note that many packages may need a line added to their %s"
 msgstr ""
-"Notare che molti pacchetti possono aver bisogno di una linea aggiunta al "
+"Nota che molti pacchetti potrebbero aver bisogno di una linea aggiunta al "
 "loro %s"
 
 msgid "such as arch=('%s')."
 msgstr "come ad esempio arch=('%s')."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr "L'array provides non può contenere operatori di confronto (< o >)."
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Lo script install (%s) non esiste."
 
 msgid "options array contains unknown option '%s'"
-msgstr "l'array options contiene un'opzione sconosciuta '%s'"
+msgstr "l'array options contiene l'opzione sconosciuta '%s'"
 
 msgid "A package has already been built, installing existing package..."
 msgstr ""
@@ -1429,7 +1449,7 @@ msgstr ""
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
-"Recupero dei sorgenti ignorato        -- utilizzo la directory esistente src/"
+"Download dei sorgenti ignorato        -- utilizzo la directory esistente src/"
 
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
@@ -1480,7 +1500,7 @@ msgstr ""
 "Poiché pacman utilizza molti file piccoli per tenere traccia dei pacchetti,"
 "\\ncol tempo questi file tendono a frammentarsi.\\nQuesto script prova a "
 "sistemare questi file piccoli all'interno di una\\nlocazione continua sul "
-"vostro disco rigido. Il risultato è che il disco rigido\\ndovrebbe essere in "
+"tuo disco rigido. Il risultato è che il disco rigido\\ndovrebbe essere in "
 "grado di leggerli più velocemente, in quanto la testina non\\ndeve spostarsi "
 "continuamente sul disco.\\n"
 
@@ -1488,17 +1508,17 @@ msgid "diff tool was not found, please install diffutils."
 msgstr ""
 "impossibile trovare lo strumento diff, si prega di installare diffutils."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Il file lock di pacman è stato trovato. Impossibile avviare di nuovo pacman "
-"mentre è ancora in funzione."
-
 msgid "%s does not exist or is not a directory."
 msgstr "%s non esiste o non è una directory."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "Bisogna avere i giusti permessi per ottimizzare il database."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+"Il file lock di pacman è stato trovato. Impossibile avviare di nuovo pacman "
+"mentre è ancora in funzione."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
 "ERRORE: impossibile creare la directory temporanea per creare il database."
@@ -1512,12 +1532,15 @@ msgstr "Compressione di %s in corso..."
 msgid "Tar'ing up %s failed."
 msgstr "Impossibile comprimere %s."
 
-msgid "Making and MD5sum'ing the new db..."
+msgid "Making and MD5sum'ing the new database..."
 msgstr "Creazione del nuovo database e calcolo della somma MD5 in corso..."
 
 msgid "Untar'ing %s failed."
 msgstr "Impossibile decomprimere %s."
 
+msgid "Syncing database to disk..."
+msgstr "Sincronizzazione del database in corso..."
+
 msgid "Checking integrity..."
 msgstr "Controllo dell'integrità in corso..."
 
@@ -1526,15 +1549,11 @@ msgstr ""
 "Impossibile effettuare il controllo dell'integrità, ritorno al vecchio "
 "database."
 
-msgid "Putting the new database in place..."
-msgstr "Inserimento del nuovo database in corso..."
+msgid "Rotating database into place..."
+msgstr "Ottimizzazione del database in corso..."
 
 msgid "Finished. Your pacman database has been optimized."
-msgstr "Terminato. Il database del vostro pacman è stato ottimizzato."
-
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
-"Per migliorare le prestazioni di pacman-optimize, avviare 'sync' adesso."
+msgstr "Terminato. Il database di pacman è stato ottimizzato."
 
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "uso: repo-add [-q] <path-al-db> <nomepacchetto> ...\\n"
@@ -1564,8 +1583,8 @@ msgid ""
 "The -q/--quiet flag to either program will force silent running except\\nin "
 "the case of warnings or errors.\\n\\n"
 msgstr ""
-"L'opzione -q/--quiet esegue il programma in maniera silenziosa eccetto\\nnel "
-"caso in cui ci sono warning o errori.\\n\\n"
+"L'opzione -q/--quiet forzerà l'avvio silenzioso del programma eccetto\\nnel "
+"caso in cui fossero presenti warning o errori.\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "Esempio: repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1609,7 +1628,7 @@ msgid "Removing existing package '%s'..."
 msgstr "Rimozione del pacchetto esistente '%s' in corso..."
 
 msgid "Either realpath or readlink are required by repo-add."
-msgstr "realpath o readlink è richiesto da repo-add."
+msgstr "realpath o readlink sono richiesti da repo-add."
 
 msgid "%s not found. Cannot continue."
 msgstr "%s non è stato trovato. Impossibile continuare."
@@ -1624,7 +1643,7 @@ msgid "the -f and --force options are no longer recognized"
 msgstr "le opzioni -f e --force non sono più riconosciute"
 
 msgid "use options=(force) in the PKGBUILD instead"
-msgstr "piuttosto utilizza options=(force) nel PKGBUILD"
+msgstr "al loro posto utilizza options=(force) nel PKGBUILD"
 
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Il file di repository '%s' non è un valido database di pacman."
@@ -1633,7 +1652,7 @@ msgid "Extracting database to a temporary location..."
 msgstr "Estrazione del database in una locazione temporanea in corso..."
 
 msgid "Repository file '%s' was not found."
-msgstr "Non esiste il database del repository '%s'."
+msgstr "Impossibile trovare il file del repository '%s'."
 
 msgid "'%s' is not a package file, skipping"
 msgstr "'%s' non è un pacchetto, ignorato"

po/pacman.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: 2008-07-30 08:26+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-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"
@@ -117,6 +117,10 @@ msgstr ""
 msgid "checking for file conflicts"
 msgstr ""
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr ""
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr ""
@@ -226,7 +230,7 @@ msgid "MD5 Sum        :"
 msgstr ""
 
 #, c-format
-msgid "Description    : "
+msgid "Description    :"
 msgstr ""
 
 #, c-format
@@ -281,10 +285,14 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
+#, c-format
+msgid "operations:\n"
+msgstr ""
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 
 #, c-format
@@ -425,8 +433,7 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
+msgid "      --needed         don't reinstall up to date packages\n"
 msgstr ""
 
 #, c-format
@@ -441,10 +448,6 @@ msgid ""
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""
@@ -489,16 +492,6 @@ msgid ""
 "                       the terms of the GNU General Public License.\n"
 msgstr ""
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr ""
@@ -531,6 +524,10 @@ msgstr ""
 msgid "config file %s, line %d: bad section name.\n"
 msgstr ""
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr ""
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
@@ -547,6 +544,10 @@ msgstr ""
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr ""
 
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr ""
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr ""
@@ -834,7 +835,7 @@ msgid "failed to release transaction (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "None\n"
+msgid "None"
 msgstr ""
 
 #, c-format
@@ -857,6 +858,10 @@ msgstr ""
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr ""
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr ""
+
 #, c-format
 msgid "[Y/n]"
 msgstr ""
@@ -1112,6 +1117,15 @@ msgstr ""
 msgid "Version found: %s"
 msgstr ""
 
+msgid "requires an argument"
+msgstr ""
+
+msgid "unrecognized option"
+msgstr ""
+
+msgid "invalid option"
+msgstr ""
+
 msgid "Usage: %s [options]"
 msgstr ""
 
@@ -1167,6 +1181,11 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr ""
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr ""
 
@@ -1175,7 +1194,8 @@ msgid ""
 "PKGBUILDs"
 msgstr ""
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
 
 msgid "These options can be passed to pacman:"
@@ -1208,7 +1228,7 @@ msgstr ""
 msgid "Cleaning up ALL files from %s."
 msgstr ""
 
-msgid "    Are you sure you wish to do this? [Y/n] "
+msgid "    Are you sure you wish to do this? "
 msgstr ""
 
 msgid "Problem removing files; you may not have correct permissions in %s"
@@ -1289,6 +1309,9 @@ msgstr ""
 msgid "such as arch=('%s')."
 msgstr ""
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr ""
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr ""
 
@@ -1378,15 +1401,15 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr ""
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-
 msgid "%s does not exist or is not a directory."
 msgstr ""
 
 msgid "You must have correct permissions to optimize the database."
 msgstr ""
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
 
@@ -1399,27 +1422,27 @@ msgstr ""
 msgid "Tar'ing up %s failed."
 msgstr ""
 
-msgid "Making and MD5sum'ing the new db..."
+msgid "Making and MD5sum'ing the new database..."
 msgstr ""
 
 msgid "Untar'ing %s failed."
 msgstr ""
 
+msgid "Syncing database to disk..."
+msgstr ""
+
 msgid "Checking integrity..."
 msgstr ""
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr ""
 
-msgid "Putting the new database in place..."
+msgid "Rotating database into place..."
 msgstr ""
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr ""
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr ""
 

po/pl.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:37+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 17:05+0100\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polski <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -125,6 +125,10 @@ msgstr "usuwanie"
 msgid "checking for file conflicts"
 msgstr "sprawdzanie konfliktów plików"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "pobieram %s...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "błąd malloc: nie można zaalokować %zd bajtów\n"
@@ -234,8 +238,8 @@ msgid "MD5 Sum        :"
 msgstr "Suma MD5       :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Opis           : "
+msgid "Description    :"
+msgstr "Opis           :"
 
 #, c-format
 msgid "Repository     :"
@@ -289,13 +293,17 @@ msgstr "sposób użycia"
 msgid "operation"
 msgstr "operacja"
 
+#, c-format
+msgid "operations:\n"
+msgstr "operacje:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"użyj '%s --help' z innymi opcjami dla dalszych składni\n"
+"użyj '%s {-h --help}' z daną operacją w celu zobaczenia dostępnych opcji\n"
 
 #, c-format
 msgid ""
@@ -466,11 +474,8 @@ msgid ""
 msgstr "  -y, --refresh        pobiera świeże bazy danych pakietów z serwera\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         uaktualnia tylko stare lub nie zainstalowane jeszcze "
-"pakiety\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         nie instaluj ponownie aktualnych pakietów\n"
 
 #, c-format
 msgid ""
@@ -489,11 +494,6 @@ msgstr ""
 "                       ignoruje uaktualnienie grupy (może zostać użyte "
 "więcej niż raz)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          pokazuje mniej informacji dla zapytań i poszukiwań\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <path>  ustawia alternatywny plik konfiguracji\n"
@@ -545,18 +545,6 @@ msgstr ""
 "                       Ten program może być wolno rozpowszechniany na\n"
 "                       zasadach licencji GNU General Public License.\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "naruszenie ochrony pamięci\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Wewnętrzy błąd pacamna: Naruszenie ochrony pamięci.\n"
-"Proszę zgłosić pełny raport błędu, w razie potrzeby z --debug.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "problem ustawiania rootdir '%s' (%s)\n"
@@ -589,6 +577,10 @@ msgstr "plik konfigu %s nie może być odczytany.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "plik konfigu %s, linia %d: zła nazwa sekcji.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "nie udało się zarejestrować bazy danych '%s' (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
@@ -606,6 +598,10 @@ msgstr "plik konfigu %s, linia %d: dyrektywa '%s' nie rozpoznana.\n"
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "zła wartość dla 'CleanMethod' : '%s'\n"
 
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "nie można dodać URL serwera do bazy danych '%s': %s (%s)\n"
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "nie udało się zainicjować biblioteki alpm (%s)\n"
@@ -899,8 +895,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "nie udało się wyswobodzić transakcji (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Żadnych\n"
+msgid "None"
+msgstr "Żadnych"
 
 #, c-format
 msgid "Targets (%d):"
@@ -922,6 +918,10 @@ msgstr "Usunąć (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Całkowity rozmiar do usunięcia: %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Opcjonalne zależności dla %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[T/n]"
@@ -1022,7 +1022,7 @@ msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s nie jest URL i nie znalazłem go w katalgu źródłowym."
 
 msgid "Downloading %s..."
-msgstr "Pobieram %s... "
+msgstr "Pobieram %s..."
 
 msgid "Failure while downloading %s"
 msgstr "Błąd podczas pobierania %s"
@@ -1179,6 +1179,15 @@ msgstr "Sprawdzam ostatnią rewizję repozytorium hg..."
 msgid "Version found: %s"
 msgstr "Wersja        : %s"
 
+msgid "requires an argument"
+msgstr "wymaga argumentu"
+
+msgid "unrecognized option"
+msgstr "nierozpoznana opcja"
+
+msgid "invalid option"
+msgstr "zła opcja"
+
 msgid "Usage: %s [options]"
 msgstr "Użycie: %s [opcje]"
 
@@ -1235,6 +1244,12 @@ msgstr "  -R, --repackage  Przepakuj zawartość pkg/ bez budowania"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Zainstaluj brakujące zależności pacmanem"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource  Generuje archiwum źródłowe zawierające pobrane źródła"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Pozwól makepkg pracować jako root"
 
@@ -1245,9 +1260,9 @@ msgstr ""
 "      --holdver    Zapobiega autopodnoszeniu wersji dla rozwojowych "
 "PKGBUILDów"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr ""
-"      --source     Nie buduj pakietu; tylko wygeneruj archiwum źródłowe"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
+msgstr "      --source     Generuje archiwum źródłowe bez pobranych źródeł"
 
 msgid "These options can be passed to pacman:"
 msgstr "Poniższe opcje mogą być przekazane do pacmana:"
@@ -1283,8 +1298,8 @@ msgstr "\\0--holdver oraz --forcever nie mogą być użyte jednocześnie"
 msgid "Cleaning up ALL files from %s."
 msgstr "Usuwam WSZYSTKIE pliki z %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Czy jesteś pewien, że chcesz to zrobić? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Czy jesteś pewien, że chcesz to zrobić? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr "Problem z usuwaniem plików; możliwy brak uprawnień w %s"
@@ -1368,6 +1383,10 @@ msgstr "Dużo pakietów może potrzebować w %s pola"
 msgid "such as arch=('%s')."
 msgstr "podobnego do arch=('%s')."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr ""
+"Dostarczana tablica nie może zawierać operatorów porównania ( < lub > )"
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Skrypt instalacyjny (%s) nie istnieje."
 
@@ -1465,16 +1484,16 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "Nie znaleziono programu diff, zainstaluj diffutils."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa."
-
 msgid "%s does not exist or is not a directory."
 msgstr "%s nie istnieje lub nie jest katalogiem."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "Musisz mieć odpowiednie uprawnienia aby optymalizować bazę."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+"Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr "BŁĄD: Nie można utworzyć katalogu tymczasowego do zbudowania bazy."
 
@@ -1487,27 +1506,27 @@ msgstr "Tworzę archiwum tar z %s..."
 msgid "Tar'ing up %s failed."
 msgstr "Stworzenie archiwum tar z %s nie udało się."
 
-msgid "Making and MD5sum'ing the new db..."
-msgstr "Tworzę nową bazę i generuję jej sumę kontrolną..."
+msgid "Making and MD5sum'ing the new database..."
+msgstr "Tworzę nową bazę i generuję jej sumę kontrolną MD5..."
 
 msgid "Untar'ing %s failed."
 msgstr "Nie udało się rozpakować archiwum tar z %s."
 
+msgid "Syncing database to disk..."
+msgstr "Synchronizowanie bazy danych z dyskiem..."
+
 msgid "Checking integrity..."
 msgstr "Sprawdzanie spójności pakietów... "
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr "Test spójności NIE POWIÓDŁ się, powracam do starej bazy."
 
-msgid "Putting the new database in place..."
-msgstr "Umieszczam nową bazę w odpowiednim miejscu..."
+msgid "Rotating database into place..."
+msgstr "Przenoszę bazę danych w jej miejsce..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Zakończono. Baza pacmana została zoptymalizowana."
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr "Aby w pełni skorzystać z optymalizacji, uruchom teraz 'sync'."
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "Użycie: repo-add [-q] <ścieżka-do-bazy> <pakiet> ...\\n"
 
@@ -1630,3 +1649,16 @@ msgstr "Wszystkie pakiety zostały usunięte z bazy danych. Usuwanie '%s'."
 
 msgid "No packages modified, nothing to do."
 msgstr "Nie zmodyfikowano żadnego pakietu, nie ma nic do zrobienia."
+
+#~ msgid "segmentation fault\n"
+#~ msgstr "naruszenie ochrony pamięci\n"
+
+#~ msgid ""
+#~ "Internal pacman error: Segmentation fault.\n"
+#~ "Please submit a full bug report with --debug if appropriate.\n"
+#~ msgstr ""
+#~ "Wewnętrzy błąd pacamna: Naruszenie ochrony pamięci.\n"
+#~ "Proszę zgłosić pełny raport błędu, w razie potrzeby z --debug.\n"
+
+#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
+#~ msgstr "Aby w pełni skorzystać z optymalizacji, uruchom teraz 'sync'."

po/pt_BR.po

@@ -9,16 +9,17 @@
 # Joao Felipe Santos <jfsantos@archlinux-br.org>, 2008.
 # Kessia Pinheiro <kessiapinheiro@gmail.com>, 2008.
 # Armando M. Baratti <ambaratti@archlinux-br.org>, 2008.
+# Rodrigo L. M. Flores <flores@archlinux-br.org>, 2009.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:37+0200\n"
-"Last-Translator: Hugo Doria <hugo@archlinux.org>\n"
-"Language-Team: Brazillian Portuguese <www.archlinux-br.org>\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 20:31-0300\n"
+"Last-Translator: Rodrigo L. M. Flores<flores@archlinux-br.org>\n"
+"Language-Team: Brazilian Portuguese <www.archlinux-br.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -127,6 +128,10 @@ msgstr "removendo"
 msgid "checking for file conflicts"
 msgstr "verificando conflitos de arquivo"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "realizando o download de %s...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "falha malloc: não foi possível alocar %zd bytes\n"
@@ -145,47 +150,47 @@ msgstr "Desconhecido"
 
 #, c-format
 msgid "Name           :"
-msgstr "Nome           :"
+msgstr "Nome                 :"
 
 #, c-format
 msgid "Version        :"
-msgstr "Versão        :"
+msgstr "Versão               :"
 
 #, c-format
 msgid "URL            :"
-msgstr "URL            :"
+msgstr "URL                  :"
 
 #, c-format
 msgid "Licenses       :"
-msgstr "Licenças       :"
+msgstr "Licenças             :"
 
 #, c-format
 msgid "Groups         :"
-msgstr "Grupos         :"
+msgstr "Grupos               :"
 
 #, c-format
 msgid "Provides       :"
-msgstr "Provê       :"
+msgstr "Provê                :"
 
 #, c-format
 msgid "Depends On     :"
-msgstr "Depende de     :"
+msgstr "Depende de           :"
 
 #, c-format
 msgid "Optional Deps  :"
-msgstr "Deps Opcionais  :"
+msgstr "Dependências Opcionais       :"
 
 #, c-format
 msgid "Required By    :"
-msgstr "Requerido por   :"
+msgstr "Necessário para        :"
 
 #, c-format
 msgid "Conflicts With :"
-msgstr "Conflita com :"
+msgstr "Conflita com         :"
 
 #, c-format
 msgid "Replaces       :"
-msgstr "Substitui       :"
+msgstr "Substitui            :"
 
 #, c-format
 msgid "Download Size  : %6.2f K\n"
@@ -193,23 +198,23 @@ msgstr "Tamanho do Download  : %6.2f K\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Tamanho Compactado: %6.2f K\n"
+msgstr "Tamanho Compactado   : %6.2f K\n"
 
 #, c-format
 msgid "Installed Size : %6.2f K\n"
-msgstr "Tamanho Instalado : %6.2f K\n"
+msgstr "Tamanho Instalado    : %6.2f K\n"
 
 #, c-format
 msgid "Packager       :"
-msgstr "Empacotador       :"
+msgstr "Empacotador          :"
 
 #, c-format
 msgid "Architecture   :"
-msgstr "Arquitetura   :"
+msgstr "Arquitetura          :"
 
 #, c-format
 msgid "Build Date     :"
-msgstr "Data da Compilação     :"
+msgstr "Data da Compilação   :"
 
 #, c-format
 msgid "Install Date   :"
@@ -221,7 +226,7 @@ msgstr "Motivo da instalação :"
 
 #, c-format
 msgid "Install Script :"
-msgstr "Script de Instalação   :"
+msgstr "Script de Instalação :"
 
 #, c-format
 msgid "Yes"
@@ -233,15 +238,15 @@ msgstr "Não"
 
 #, c-format
 msgid "MD5 Sum        :"
-msgstr "Soma MD5        :"
+msgstr "Soma MD5             :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Descrição    : "
+msgid "Description    :"
+msgstr "Descrição            :"
 
 #, c-format
 msgid "Repository     :"
-msgstr "Repositório     :"
+msgstr "Repositório          :"
 
 #, c-format
 msgid "Backup Files:\n"
@@ -269,7 +274,7 @@ msgstr "(nenhum)\n"
 
 #, c-format
 msgid "no changelog available for '%s'.\n"
-msgstr "changelog não disponível para '%s'.\n"
+msgstr "nenhum changelog disponível para '%s'.\n"
 
 #, c-format
 msgid "options"
@@ -291,13 +296,17 @@ msgstr "uso"
 msgid "operation"
 msgstr "operação"
 
+#, c-format
+msgid "operations:\n"
+msgstr "operações:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"use '%s --help' com outras opções para mais sintaxes\n"
+"use '%s --help' com uma operação para visualizar as opções disponíveis\n"
 
 #, c-format
 msgid ""
@@ -408,7 +417,7 @@ msgstr ""
 #, c-format
 msgid "  -t, --unrequired     list all packages not required by any package\n"
 msgstr ""
-"  -t, --unrequired      lista todos os pacotes não requeridos por nenhum "
+"  -t, --unrequired      lista todos os pacotes não necessários para nenhum "
 "outro pacote\n"
 
 #, c-format
@@ -474,11 +483,8 @@ msgstr ""
 "servidor\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         somente faz o upgrade para pacotes desatualizados ou "
-"não instalados\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         não re-instala pacotes atualizados\n"
 
 #, c-format
 msgid ""
@@ -497,11 +503,6 @@ msgstr ""
 "                       ignora a atualização de um grupo (pode ser usado mais "
 "de uma vez)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          mostra menos informações nas consultas e pesquisas\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""
@@ -558,18 +559,6 @@ msgstr ""
 "                       Este programa pode ser redistribuído livremente sob\n"
 "                       os termos da GNU General Public License\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "falha de segmentação\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Erro interno do pacman: Falha de segmentação \n"
-"Por favor reporte um bug completo com --debug se apropriado. \n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "problema ao configurar rootdir '%s' (%s)\n"
@@ -602,6 +591,10 @@ msgstr "arquivo de configuração %s não pôde ser lido.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "arquivo de configuração %s, linha %d: nome de seção inválido.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "não foi possível registrar a base de dados '%s' (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
@@ -622,6 +615,10 @@ msgstr "arquivo de configuração %s, linha %d: diretiva '%s' não reconhecida.\
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "valor inválido para 'CleanMethod' : '%s'\n"
 
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "não foi possível registrar a base de dados '%s': %s (%s)\n"
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "falha ao iniciar biblioteca alpm (%s)\n"
@@ -712,7 +709,7 @@ msgstr "falha ao preparar a transação (%s)\n"
 
 #, c-format
 msgid ":: %s: requires %s\n"
-msgstr ":: %s: requer %s\n"
+msgstr ":: %s: necessita %s\n"
 
 #, c-format
 msgid "Do you want to remove these packages?"
@@ -915,8 +912,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "falha ao liberar a transação (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Nenhum\n"
+msgid "None"
+msgstr "Nenhum"
 
 #, c-format
 msgid "Targets (%d):"
@@ -938,6 +935,10 @@ msgstr "Remover (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Tamanho total dos pacotes a serem removidos:   %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Deps Opcionais para %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[S/n]"
@@ -1194,6 +1195,15 @@ msgstr "Determinando última revisão hg..."
 msgid "Version found: %s"
 msgstr "Versão encontrada: %s"
 
+msgid "requires an argument"
+msgstr "requer um argumento"
+
+msgid "unrecognized option"
+msgstr "opção não reconhecida"
+
+msgid "invalid option"
+msgstr "opção inválida"
+
 msgid "Usage: %s [options]"
 msgstr "Uso: %s [opções]"
 
@@ -1255,6 +1265,13 @@ msgstr "  -R, --repackage  Re-empacota conteúdo de pkg/ sem compilar"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Instala dependências não-encontradas com pacman"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource     Gera um tarball somente com os fontes, incluindo os "
+"que foram baixados"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Permite ao makepkg rodar como usuário root"
 
@@ -1265,10 +1282,11 @@ msgstr ""
 "      --holdver    Previne atualização automática da versão para PKGBUILDs "
 "de desenvolvimento"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     Não compila o pacote; gera um tarball somente com os "
-"fontes"
+"      --source     Gera um tarball somente com os fontes que não foram "
+"baixados"
 
 msgid "These options can be passed to pacman:"
 msgstr "Estas opções podem ser passadas ao pacman:"
@@ -1307,13 +1325,13 @@ msgstr ""
 msgid "Cleaning up ALL files from %s."
 msgstr "Apagando TODOS os arquivos de %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Você tem certeza que deseja fazer isso? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Você tem certeza que deseja fazer isso? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
 "Problema removendo arquivos; você pode não ter as permissões corretas em %s"
-
+	
 msgid "Source cache cleaned."
 msgstr "Cache de fontes apagada."
 
@@ -1395,6 +1413,9 @@ msgstr ""
 msgid "such as arch=('%s')."
 msgstr "como arch=('%s')."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr "O array provides não pode conter operadores de comparação (< ou >)"
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Rotina de instalação (%s) não existe."
 
@@ -1494,17 +1515,17 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "ferramenta diff não foi encontrada, por favor instale diffutils."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Arquivo lock do pacman foi encontrado. Não é possível rodar enquanto pacman "
-"está em execução."
-
 msgid "%s does not exist or is not a directory."
 msgstr "%s não existe ou não é um diretório."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "Você deve ter as permissões corretas para otimizar a base de dados."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+"Arquivo lock do pacman foi encontrado. Não é possível rodar enquanto pacman "
+"está em execução."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
 "ERRO: Não foi possível criar diretório temporário para construção da base de "
@@ -1519,27 +1540,27 @@ msgstr "Gerando tarball de %s..."
 msgid "Tar'ing up %s failed."
 msgstr "Criação do tarball de %s falhou."
 
-msgid "Making and MD5sum'ing the new db..."
-msgstr "Criando a nova base de dados e calculando a soma md5..."
+msgid "Making and MD5sum'ing the new database..."
+msgstr "Criando e calculando a soma md5 da nova base de dados..."
 
 msgid "Untar'ing %s failed."
 msgstr "Descompactação de %s falhou."
 
+msgid "Syncing database to disk..."
+msgstr "Sincronizando a base de dados com o disco..."
+
 msgid "Checking integrity..."
 msgstr "Verificando integridade..."
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr "Teste de integridade FALHOU, revertendo para a base de dados antiga."
 
-msgid "Putting the new database in place..."
-msgstr "Colocando a nova base de dados em sua localização correta..."
+msgid "Rotating database into place..."
+msgstr "Colocando a nova base de dados no lugar..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Concluído. Sua base de dados do pacman foi otimizada."
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr "Para o benefício total de pacman-optimize, rode 'sync' agora."
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "Uso: repo-add [-q] <caminho-para-bd> <pacote> ...\\n"
 
@@ -1666,3 +1687,16 @@ msgstr "Todos os pacotes foram removidos da base de dados. Removendo '%s'."
 
 msgid "No packages modified, nothing to do."
 msgstr "Nenhum pacote modificado, nada a fazer."
+
+#~ msgid "segmentation fault\n"
+#~ msgstr "falha de segmentação\n"
+
+#~ msgid ""
+#~ "Internal pacman error: Segmentation fault.\n"
+#~ "Please submit a full bug report with --debug if appropriate.\n"
+#~ msgstr ""
+#~ "Erro interno do pacman: Falha de segmentação \n"
+#~ "Por favor reporte um bug completo com --debug se apropriado. \n"
+
+#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
+#~ msgstr "Para o benefício total de pacman-optimize, rode 'sync' agora."

po/ru.po

@@ -5,10 +5,10 @@
 # Sergey Tereschenko <serg.partizan@gmail.com> 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: Pacman package manager 3.0.0\n"
+"Project-Id-Version: Pacman package manager 3.2.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:38+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 17:35+0300\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -119,6 +119,10 @@ msgstr "удаление"
 msgid "checking for file conflicts"
 msgstr "проверка возможных конфликтов файлов"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "загрузка %s...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "ошибка malloc: невозможно выделить %zd байт\n"
@@ -228,8 +232,8 @@ msgid "MD5 Sum        :"
 msgstr "MD5-сумма                :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Описание                 : "
+msgid "Description    :"
+msgstr "Описание                 :"
 
 #, c-format
 msgid "Repository     :"
@@ -283,14 +287,18 @@ msgstr "использование"
 msgid "operation"
 msgstr "действие"
 
+#, c-format
+msgid "operations:\n"
+msgstr "действия:\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"используйте '%s --help' вместе с другими опциями для более подробной "
-"информации\n"
+"используйте '%s { -h --help}' вместе с другими операциями для просмотра "
+"опций\n"
 
 #, c-format
 msgid ""
@@ -317,9 +325,9 @@ msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
 "                       (-ss includes explicitly installed dependencies too)\n"
 msgstr ""
-"  -s, --recursive      удалить вместе с зависимостями (которые не "
-"повредят                        другие пакеты)\n"
-"                       (-ss включая явно установленые зависимости)\n"
+"  -s, --recursive      удалить вместе с зависимостями (которые не повредят "
+"другие пакеты)\n"
+"                       (-ss включая явно установленные зависимости)\n"
 
 #, c-format
 msgid ""
@@ -401,9 +409,7 @@ msgstr ""
 
 #, c-format
 msgid "  -u, --upgrades       list all packages that can be upgraded\n"
-msgstr ""
-"  -u, --upgrades       показать список всех пакетов, которые могут быть "
-"обновлены\n"
+msgstr "  -u, --upgrades       показать список устаревших пакетов\n"
 
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
@@ -456,11 +462,8 @@ msgstr ""
 "  -y, --refresh        загрузить свежие базы данных пакетов с сервера\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         обновлять только устаревшие или еще неустановленные "
-"пакеты\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         обновлять только устаревшие пакеты\n"
 
 #, c-format
 msgid ""
@@ -479,11 +482,6 @@ msgstr ""
 "          игнорировать группу при обновлении (может быть использовано "
 "неоднократно)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          показывать меньше информации при запросах и поиске\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""
@@ -533,18 +531,6 @@ msgstr ""
 "                       Эта программа может свободно распространяться\n"
 "                       на условиях GNU General Public License\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "ошибка сегментации\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Внутрення ошибка pacman: Ошибка сегментации.\n"
-"Просьба предоставить полный отчёт с --debug, при необходимости.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "не могу установить корневой каталог '%s' (%s)\n"
@@ -563,7 +549,7 @@ msgstr "'%s' - неверный уровень отладки\n"
 
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
-msgstr "не удалось добавить кэш-дирректорию '%s' (%s)\n"
+msgstr "не удалось добавить кэш-директорию '%s' (%s)\n"
 
 #, c-format
 msgid "only one operation may be used at a time\n"
@@ -577,6 +563,10 @@ msgstr "не удалось прочитать конфигурационный
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "конфигурационный файл %s, строка %d: неверное название секции.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "не удалось зарегистрировать базу данных '%s' (%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
@@ -594,7 +584,11 @@ msgstr "конфигурационный файл %s, строка %d: дире
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
-msgstr "неизвестное значение для 'CleanMethod' : '%s'\n"
+msgstr "неверное значение для 'CleanMethod' : '%s'\n"
+
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "не удалось добавить адрес сервера в базу данных '%s': %s (%s)\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -890,8 +884,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "не удалось продолжить операцию (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Не указано\n"
+msgid "None"
+msgstr "Не указано"
 
 #, c-format
 msgid "Targets (%d):"
@@ -913,6 +907,10 @@ msgstr "Удалить (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Размер удаляемых файлов:   %.2f МБ\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Дополнительные зависимости для %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[Y/n]"
@@ -1013,7 +1011,7 @@ msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s не найден в директории сборки и это не URL."
 
 msgid "Downloading %s..."
-msgstr "Загрузка %s... "
+msgstr "Загрузка %s..."
 
 msgid "Failure while downloading %s"
 msgstr "Загрузка %s завершилась неудачей"
@@ -1070,10 +1068,10 @@ msgid "Tidying install..."
 msgstr "Очистка..."
 
 msgid "Removing info/doc files..."
-msgstr "Удаление файлы info/doc... "
+msgstr "Удаление файлов документации... "
 
 msgid "Compressing man pages..."
-msgstr "Архивирование man-страниц..."
+msgstr "Сжатие страниц man и info..."
 
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Удаление отладочной информации из бинарных файлов и библиотек..."
@@ -1112,16 +1110,16 @@ msgid "Failed to create package file."
 msgstr "Не удалось создать файл пакета."
 
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
-msgstr "Не могу найти бинарный фалй xdelta! xdelta установлен?"
+msgstr "Не могу найти бинарный файл xdelta! xdelta установлен?"
 
 msgid "Making delta from version %s..."
 msgstr "Ищу отличия от версии %s..."
 
 msgid "Recreating package tarball from delta to match md5 signatures"
-msgstr "Пересоздание тарбола из дельта-патча для соответствия с md5 подписью"
+msgstr "Пересоздание архива из дельта-патча для соответствия с md5 подписью"
 
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
-msgstr "ЗАМЕЧАНИЕ: дельта-патч следует распространять ТОЛЬКО с этим тарболом"
+msgstr "ЗАМЕЧАНИЕ: дельта-патч следует распространять ТОЛЬКО с этим архивом"
 
 msgid "Could not generate the package from the delta."
 msgstr "Не могу создать пакет из дельта-патча."
@@ -1168,6 +1166,15 @@ msgstr "Определяю последнюю версию в hg..."
 msgid "Version found: %s"
 msgstr "Обнаружена версия: %s"
 
+msgid "requires an argument"
+msgstr "требуется аргумент"
+
+msgid "unrecognized option"
+msgstr "нераспознанный параметр"
+
+msgid "invalid option"
+msgstr "недопустимый параметр"
+
 msgid "Usage: %s [options]"
 msgstr "Применение: %s [параметры]"
 
@@ -1230,6 +1237,13 @@ msgstr "  -R, --repackage  Заменить содержимое pkg/ без с
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Установить необходимые зависимости с помощью pacman"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --source     Создать архив с исходными кодами, включая загруженные "
+"файлы"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Позволить makepkg запуск от имени root"
 
@@ -1240,10 +1254,10 @@ msgstr ""
 "      --holdver    Не допускать автоматического изменения версий для "
 "PKGBUILDов находящихся в разработке"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     Не собирать пакет; только сгенерировать тарбол с "
-"исходными кодами"
+"      --source     Создать архив с исходными кодами, без загруженных файлов"
 
 msgid "These options can be passed to pacman:"
 msgstr "Следующие опции могут быть переданы pacman:"
@@ -1281,11 +1295,11 @@ msgstr "\\0--holdver и --forcever не могут использоваться
 msgid "Cleaning up ALL files from %s."
 msgstr "Удаляю ВСЕ файлы из %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Вы уверены, что хотите сделать это? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Вы уверены, что хотите сделать это? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
-msgstr "Не могу удалить файлы; возможно, у вас недостаточно привелегий в %s"
+msgstr "Не могу удалить файлы; возможно, у вас недостаточно привилегий в %s"
 
 msgid "Source cache cleaned."
 msgstr "Кэш с исходными кодами очищен."
@@ -1327,14 +1341,14 @@ msgstr "в массиве BUILDENV в %s."
 
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr ""
-"Запуск makepkg от непревелегированного пользователя приведет к созданию"
+"Запуск makepkg от непривилегированного пользователя приведет к созданию"
 
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 "пакетов с отличным от root владельцем. Попробуйте использовать окружение"
 
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
-msgstr "fakeroot, добавив 'fakeroot' в массив BUILDENV в makepkg.conf."
+msgstr "помещение 'fakeroot' в массив BUILDENV в makepkg.conf."
 
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr ""
@@ -1370,6 +1384,9 @@ msgstr "Имейте ввиду, что многим пакетам в %s мож
 msgid "such as arch=('%s')."
 msgstr "строка вида arch=('%s')."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr "Массив provides не может содержать операторы сравнения(< или >)."
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Установочный скрипт (%s) не существует."
 
@@ -1468,24 +1485,24 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "утилита diff не обнаружена, пожалуйста, установите diffutils."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Обнаружен блокировочный файл pacman'а. Запуск не возможен, когда pacman уже "
-"запущен."
-
 msgid "%s does not exist or is not a directory."
 msgstr "%s не существует или не является директорией."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr ""
-"У вас должны быть соответствующие привелегии, чтобы оптимизировать базу "
+"У вас должны быть соответствующие привилегии, чтобы оптимизировать базу "
 "данных."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr ""
+"Обнаружен блокировочный файл pacman'а. Запуск не возможен, когда pacman уже "
+"запущен."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr "ОШИБКА: Не могу создать временную директорию для создания базы данных."
 
 msgid "MD5sum'ing the old database..."
-msgstr "Подсчёт MD5 сумма старой базы данных..."
+msgstr "Подсчёт MD5 суммы старой базы данных..."
 
 msgid "Tar'ing up %s..."
 msgstr "Архивирование в tar %s..."
@@ -1493,12 +1510,15 @@ msgstr "Архивирование в tar %s..."
 msgid "Tar'ing up %s failed."
 msgstr "Не удалось запаковать в tar %s."
 
-msgid "Making and MD5sum'ing the new db..."
-msgstr "Создание новой базы данных и вычисление MD5-суммы..."
+msgid "Making and MD5sum'ing the new database..."
+msgstr "Создание новой базы данных и вычисление MD5-сумм..."
 
 msgid "Untar'ing %s failed."
 msgstr "Распаковка tar'а %s не удалась."
 
+msgid "Syncing database to disk..."
+msgstr "Синхронизация базы данных..."
+
 msgid "Checking integrity..."
 msgstr "Проверка целостности..."
 
@@ -1506,17 +1526,12 @@ msgid "Integrity check FAILED, reverting to old database."
 msgstr ""
 "Проверка целостности ЗАВЕРШИЛАСЬ НЕУДАЧЕЙ, возвращаюсь к старой базе данных."
 
-msgid "Putting the new database in place..."
-msgstr "Перемещение новой базу данных на место..."
+msgid "Rotating database into place..."
+msgstr "Возвращение базы данных на место..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Завершено. База данных pacman оптимизирована."
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
-"Чтобы полностью использовать приемущества pacman-optimize,сейчас запустите "
-"'sync'."
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "Применение: repo-add [-q] <путь-к-БД> <имя_пакета> ...\\n"
 
@@ -1535,7 +1550,7 @@ msgid ""
 "\\nspecified on the command line from the given repo database. Multiple"
 "\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
-"repo-remove обновит базу даннных пакетов, удалив имя пакета, заданного\\nв "
+"repo-remove обновит базу данных пакетов, удалив имя пакета, заданного\\nв "
 "командной строке из указанной базы данных. Можете указать сразу\\nнесколько "
 "пакетов для удаления в командной строке.\\n\\n"
 
@@ -1597,7 +1612,7 @@ msgid "Cannot create temp directory for database building."
 msgstr "Не могу создать временную директорию для создания базы данных."
 
 msgid "Invalid command name '%s' specified."
-msgstr "Указано неверное имя комманды '%s'."
+msgstr "Указано неверное имя команды '%s'."
 
 msgid "the -f and --force options are no longer recognized"
 msgstr "опции -f и --force больше не используются"
@@ -1640,3 +1655,39 @@ msgstr "Из базы данных были удалены все пакеты.
 
 msgid "No packages modified, nothing to do."
 msgstr "Пакеты не изменялись, делать нечего."
+
+#~ msgid "New optional dependencies for %s\n"
+#~ msgstr "Новые дополнительные зависимости для %s\n"
+
+#, fuzzy
+#~ msgid "Removing pugre targets..."
+#~ msgstr "Удаление ненужных файлов..."
+
+#~ msgid "'%s' is not a valid archive extension."
+#~ msgstr "'%s' это недопустимое расширение архива."
+
+#~ msgid "  --config <config> Use an alternate config file (instead of '%s')"
+#~ msgstr ""
+#~ "  --config <config> Использовать альтернативный файл настроек (вместо '%"
+#~ "s')"
+
+#~ msgid "%s contains CRLF characters and cannot be sourced."
+#~ msgstr "%s содержит CRLF символы и не может быть включен."
+
+#~ msgid "'%s' does not have a valid archive extension."
+#~ msgstr "'%s' это недопустимое расширение для архива."
+
+#~ msgid "segmentation fault\n"
+#~ msgstr "ошибка сегментации\n"
+
+#~ msgid ""
+#~ "Internal pacman error: Segmentation fault.\n"
+#~ "Please submit a full bug report with --debug if appropriate.\n"
+#~ msgstr ""
+#~ "Внутрення ошибка pacman: Ошибка сегментации.\n"
+#~ "Просьба предоставить полный отчёт с --debug, при необходимости.\n"
+
+#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
+#~ msgstr ""
+#~ "Чтобы полностью использовать преимущества pacman-optimize,сейчас "
+#~ "запустите 'sync'."

po/tr.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:38+0200\n"
+"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"PO-Revision-Date: 2009-01-03 16:23+0200\n"
 "Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n"
 "Language-Team: Türkçe <tr@archlinuxtr.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #, c-format
 msgid "checking dependencies...\n"
-msgstr "bağımlılıklar denetleniyor...\n"
+msgstr "paket bağımlılıkları araştırılıyor...\n"
 
 #, c-format
 msgid "checking for file conflicts...\n"
@@ -27,7 +27,7 @@ msgstr "dosya çakışmaları denetleniyor...\n"
 
 #, c-format
 msgid "resolving dependencies...\n"
-msgstr "bağımlılıklar çözümleniyor...\n"
+msgstr "paket bağımlılıkları çözümleniyor...\n"
 
 #, c-format
 msgid "looking for inter-conflicts...\n"
@@ -124,6 +124,10 @@ msgstr "kaldırılıyor"
 msgid "checking for file conflicts"
 msgstr "dosya çakışmaları kontrol ediliyor"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "%s indiriliyor...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "hafıza tahsisi hatası: %zd byte tahsis edilemedi\n"
@@ -233,8 +237,8 @@ msgid "MD5 Sum        :"
 msgstr "MD5 Çıktısı                :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Açıklama                   : "
+msgid "Description    :"
+msgstr "Açıklama                   :"
 
 #, c-format
 msgid "Repository     :"
@@ -288,13 +292,17 @@ msgstr "kullanım"
 msgid "operation"
 msgstr "işlem"
 
+#, c-format
+msgid "operations:\n"
+msgstr "işlem(ler):\n"
+
 #, c-format
 msgid ""
 "\n"
-"use '%s --help' with other options for more syntax\n"
+"use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"daha ayrıntılı bilgi için '%s --help' kullanın\n"
+"daha ayrıntılı bilgi için '%s {-h --help}' kullanın\n"
 
 #, c-format
 msgid ""
@@ -450,13 +458,11 @@ msgstr "  -w, --downloadonly   paketleri sadece indir (kurma ve güncelleme)\n"
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
-msgstr " -y, --refresh        sunucudan güncel paket veritabanını indir\n"
+msgstr "  -y, --refresh        sunucudan güncel paket veritabanını indir\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         sadece eski ve henüz kurulmamış paketleri güncelle\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         güncel paketleri tekrar yükleme\n"
 
 #, c-format
 msgid ""
@@ -475,11 +481,6 @@ msgstr ""
 "                       güncelleme sırasında grubu görmezden gel (birden çok "
 "grup için kullanılabilir)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          arama ve sorgulama çıktılarında daha az bilgi göster\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <yol>  farklı bir ayar dosyası seç\n"
@@ -526,18 +527,6 @@ msgstr ""
 "                       Bu yazılım GNU Genel Kamu Lisansı şartlarına \n"
 "                       uymak şartıyla özgürce dağıtılabilir\n"
 
-#, c-format
-msgid "segmentation fault\n"
-msgstr "parçalama arızası\n"
-
-#, c-format
-msgid ""
-"Internal pacman error: Segmentation fault.\n"
-"Please submit a full bug report with --debug if appropriate.\n"
-msgstr ""
-"Dahili pacman hatası: Parçalama arızası.\n"
-"Lütfen --debug parametresini kullanarak hata kaydı giriniz.\n"
-
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "kök dizini ayarlama sorunu '%s' (%s)\n"
@@ -570,6 +559,10 @@ msgstr "ayar dosyası %s okunamadı.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "ayar dosyası %s, satır %d: hatalı kısım adı.\n"
 
+#, c-format
+msgid "could not register '%s' database (%s)\n"
+msgstr "veritabanı (%s) kaydedilemedi(%s)\n"
+
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
@@ -588,6 +581,10 @@ msgstr "ayar dosyası %s, satır %d: ayar satırı '%s' tanımlanamadı.\n"
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "CleanMethod' için geçersiz değer : '%s'\n"
 
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "sunucu adresi '%s' veritabanına eklenemedi: %s (%s)\n"
+
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "alpm kütüphanesi başlatılamadı (%s)\n"
@@ -626,7 +623,7 @@ msgstr "%s, %s %s tarafından sahiplenilmektedir\n"
 
 #, c-format
 msgid "No package owns %s\n"
-msgstr "%s hiç bir paket tarafından sahiplenilmiyor\n"
+msgstr "%s hiçbir paket tarafından sahiplenilmiyor\n"
 
 #, c-format
 msgid "group \"%s\" was not found\n"
@@ -758,7 +755,7 @@ msgstr "%s (%s) güncellenemedi\n"
 
 #, c-format
 msgid " %s is up to date\n"
-msgstr " %s güncel\n"
+msgstr " %s deposu güncel\n"
 
 #, c-format
 msgid "failed to synchronize any databases\n"
@@ -782,7 +779,7 @@ msgstr "\"%s\" deposu bulunamadı.\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
-msgstr ":: Tam sistem güncellemesi başlatılıyor...\n"
+msgstr ":: Sistem güncellemesi başlatılıyor...\n"
 
 #, c-format
 msgid "%s package not found, searching for group...\n"
@@ -881,8 +878,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "işlem gerçekleştirilemedi (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Hiçbiri\n"
+msgid "None"
+msgstr "Hiçbiri"
 
 #, c-format
 msgid "Targets (%d):"
@@ -904,6 +901,10 @@ msgstr "Sil (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Toplam Silinecek Boyut:   %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "%s için opsiyonel bağımlılık(lar)\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[E/h]"
@@ -977,7 +978,7 @@ msgid "Installing missing dependencies..."
 msgstr "Eksik bağımlılıklar yükleniyor..."
 
 msgid "Pacman failed to install missing dependencies."
-msgstr "Pacman eksik bağımlılıkları yekleyemedi."
+msgstr "Pacman eksik bağımlılıkları yükleyemedi."
 
 msgid "Failed to install all missing dependencies."
 msgstr "Tüm eksik bağımlılıklar yüklenemedi."
@@ -1163,6 +1164,15 @@ msgstr "Güncel hg değişiklik numarası belirleniyor..."
 msgid "Version found: %s"
 msgstr "Değişiklik numarası bulundu: %s"
 
+msgid "requires an argument"
+msgstr "parametre gerektirir"
+
+msgid "unrecognized option"
+msgstr "bilinmeyen seçenek"
+
+msgid "invalid option"
+msgstr "geçersiz seçenek"
+
 msgid "Usage: %s [options]"
 msgstr "Kullanım: %s [seçenekler]"
 
@@ -1222,6 +1232,13 @@ msgstr ""
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Eksik bağımlılıkları pacman ile kur"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --allsource     Paketi derlemek yerine kaynak kodlarını barındıran "
+"sıkıştırılmış tar dosyası oluştur"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr ""
 "      --asroot     makepkg komutunun yönetici haklarıyla çalıştırılmasına "
@@ -1234,9 +1251,10 @@ msgstr ""
 "      --holdver    Geliştirme sırasında kullanılan PKGBUILD dosyasına "
 "otomatik sürüm numarası atanmasını engelle"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     Paketi derlemek yerine kaynak kodlarını barındıran "
+"      --source     Paketi derlemek yerine inşa dosyalarını barındıran "
 "sıkıştırılmış tar dosyası oluştur"
 
 msgid "These options can be passed to pacman:"
@@ -1272,8 +1290,8 @@ msgstr "\\0--holdver ve --forcever birlikte kullanılamazlar"
 msgid "Cleaning up ALL files from %s."
 msgstr "%s içerisindeki tüm dosyalar temizleniyor."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Bunu yapmak istediğinize emin misiniz? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Bunu yapmak istediğinize emin misiniz? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr "Dosyalar silinemedi; %s için gerekli izinlere sahip olmayabilirsiniz"
@@ -1306,7 +1324,7 @@ msgstr ""
 "kullanınız."
 
 msgid "The --asroot option is meant for the root user only."
-msgstr "--asroot seçeneği yalnızca yönetici kullanıcısı için kullanılmalıdır."
+msgstr "Sadece root kullanıcısı --asroot seçeneğini kullanabilir."
 
 msgid "Please rerun makepkg without the --asroot flag."
 msgstr ""
@@ -1366,6 +1384,9 @@ msgstr "Bir çok paketin %s kısmına bir satır eklenmesi gerekebilir"
 msgid "such as arch=('%s')."
 msgstr "arch=('%s') gibi."
 
+msgid "Provides array cannot contain comparison (< or >) operators."
+msgstr "Sağladıkları kısmı karşılaştırma karakterleri (< veya >) barındıramaz."
+
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Kurulum betiği (%s) mevcut değil."
 
@@ -1473,15 +1494,15 @@ msgstr ""
 msgid "diff tool was not found, please install diffutils."
 msgstr "diff komutu bulunamadı, lütfen diffutils paketini kurun."
 
-msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr "Pacman kilit dosyası bulundu. Pacman çalışırken çalıştırılamaz."
-
 msgid "%s does not exist or is not a directory."
 msgstr "%s bulunamadı ya da bir dizin değil."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "Veritabanını optimize etmek için doğru haklara sahip olmalısınız."
 
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr "Pacman kilit dosyası bulundu. Pacman çalışırken çalıştırılamaz."
+
 msgid "ERROR: Can not create temp directory for database building."
 msgstr "HATA: Veritabanı oluşturmak için geçici dizin oluşturulamadı."
 
@@ -1494,29 +1515,27 @@ msgstr "%s sıkıştırılıyor..."
 msgid "Tar'ing up %s failed."
 msgstr "Sıkıştırma başarısız."
 
-msgid "Making and MD5sum'ing the new db..."
-msgstr "Yeni veritabanı oluşturuluyor ve MD5SUM'ı oluşturuluyor..."
+msgid "Making and MD5sum'ing the new database..."
+msgstr "Yeni veritabanı oluşturuluyor ve MD5sum kontrolü yapılıyor..."
 
 msgid "Untar'ing %s failed."
 msgstr "%s sıkıştırılmış dosyadan açılamadı."
 
+msgid "Syncing database to disk..."
+msgstr "Veritabanı disk ile senkronize ediliyor..."
+
 msgid "Checking integrity..."
 msgstr "Bütünlük kontrolü yapılıyor..."
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr "Bütünlük kontrolü BAŞARISIZ, eski veritabanına dönülüyor."
 
-msgid "Putting the new database in place..."
-msgstr "Yeni veritabanı yerleştiriliyor..."
+msgid "Rotating database into place..."
+msgstr "Veritabanı dönüştürülüyor..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Tamamlandı. Pacman veritabanınız optimize edildi."
 
-msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr ""
-"pacman-optimize komutundan tam anlamıyla faydalanmak için şimdi 'sync' "
-"komutunu çalıştırın."
-
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "Kullanım: repo-add [-q] <veritabanı-yolu> <paket-adı> ...\\n"
 
@@ -1543,8 +1562,8 @@ msgid ""
 "The -q/--quiet flag to either program will force silent running except\\nin "
 "the case of warnings or errors.\\n\\n"
 msgstr ""
-"-q/--quiet seçeneği programın çıktı vermemesini sağlar\\nhata durumunda ise "
-"çıktı verilir.\\n\\n"
+"Uygulamanın çıktı vermeden çalışmasını istiyorsanız -q/--quiet seçeneği"
+"\\nile uygulamanın sessiz kipte çalışmasını sağlayabilirsiniz.\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr ""
@@ -1644,3 +1663,18 @@ msgstr "Tüm paketler veritabanından kaldırıldı. '%s' siliniyor."
 
 msgid "No packages modified, nothing to do."
 msgstr "Hiç bir pakette değişiklik yapılmadı, çıkılıyor."
+
+#~ msgid "segmentation fault\n"
+#~ msgstr "parçalama arızası\n"
+
+#~ msgid ""
+#~ "Internal pacman error: Segmentation fault.\n"
+#~ "Please submit a full bug report with --debug if appropriate.\n"
+#~ msgstr ""
+#~ "Dahili pacman hatası: Parçalama arızası.\n"
+#~ "Lütfen --debug parametresini kullanarak hata kaydı giriniz.\n"
+
+#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
+#~ msgstr ""
+#~ "pacman-optimize komutundan tam anlamıyla faydalanmak için şimdi 'sync' "
+#~ "komutunu çalıştırın."

scripts/Makefile.am

@@ -37,6 +37,7 @@ edit = sed \
 	-e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
 	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
 	-e 's|@DBEXT[@]|$(DBEXT)|g' \
+	-e 's|@SIZECMD[@]|$(SIZECMD)|g' \
 	-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
 
 ## All the scripts depend on Makefile so that they are rebuilt when the
@@ -58,6 +59,7 @@ pacman-optimize: $(srcdir)/pacman-optimize.sh.in
 rankmirrors: $(srcdir)/rankmirrors.py.in
 repo-add: $(srcdir)/repo-add.sh.in
 repo-remove: $(srcdir)/repo-add.sh.in
-	ln -sf repo-add repo-remove
+	rm -f repo-remove
+	$(LN_S) repo-add repo-remove
 
 # vim:set ts=2 sw=2 noet:

scripts/makepkg.sh.in

@@ -36,10 +36,6 @@ export TEXTDOMAINDIR='@localedir@'
 # file -i does not work on Mac OSX unless legacy mode is set
 export COMMAND_MODE='legacy'
 
-# when fileglobbing, we want * in an empty directory to expand to the null
-# string rather than itself
-shopt -s nullglob
-
 myver='@PACKAGE_VERSION@'
 confdir='@sysconfdir@'
 startdir="$PWD"
@@ -167,11 +163,23 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT
 trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
 trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR
 
+# a source entry can have two forms :
+# 1) "filename::http://path/to/file"
+# 2) "http://path/to/file"
 
-strip_url() {
-	echo "$1" | sed 's|^.*://.*/||g'
+# extract the filename from a source entry
+get_filename() {
+	# if a filename is specified, use it
+	local filename=$(echo $1 | sed 's|::.*||')
+	# if it is just an url, we only keep the last component
+	echo "$filename" | sed 's|^.*://.*/||g'
 }
 
+# extract the url from a source entry
+get_url() {
+	# strip an eventual filename
+	echo $1 | sed 's|.*::||'
+}
 
 ##
 # Checks to see if options are present in makepkg.conf or PKGBUILD;
@@ -256,7 +264,7 @@ in_array() {
 get_downloadclient() {
 	# $1 = url with valid protocol prefix
 	local url=$1
-	local proto=$(echo $netfile | sed 's|://.*||')
+	local proto=$(echo "$url" | sed 's|://.*||')
 
 	# loop through DOWNLOAD_AGENTS variable looking for protocol
 	local i
@@ -287,18 +295,34 @@ get_downloadclient() {
 	echo "$agent"
 }
 
-get_downloadcmd() {
-	local dlagent=$1
-	local netfile=$2
+download_file() {
+	# download command
+	local dlcmd=$1
+	# url of the file
+	local url=$2
+	# destination file
 	local file=$3
+	# temporary download file, default to last component of the url
+	local dlfile=$(echo "$url" | sed 's|^.*://.*/||g')
 
-	if echo "$dlagent" | grep -q "%u" ; then
-		local dlcmd=$(echo "$dlagent" | sed "s|%o|$file.part|" | sed "s|%u|$netfile|")
+	# replace %o by the temporary dlfile if it exists
+	if echo "$dlcmd" | grep -q "%o" ; then
+		dlcmd=${dlcmd//\%o/$file.part}
+		dlfile="$file.part"
+	fi
+	# add the url, either in place of %u or at the end
+	if echo "$dlcmd" | grep -q "%u" ; then
+		dlcmd=${dlcmd//\%u/$url}
 	else
-		local dlcmd="$dlagent $netfile"
+		dlcmd="$dlcmd $url"
 	fi
 
-	echo "$dlcmd"
+	$dlcmd || return $?
+
+	# rename the temporary download file to the final destination
+	if [ "$dlfile" != "$file" ]; then
+		mv -f "$SRCDEST/$dlfile" "$SRCDEST/$file"
+	fi
 }
 
 check_deps() {
@@ -344,7 +368,10 @@ handledeps() {
 	fi
 
 	# we might need the new system environment
+	# set -e can cause problems during sourcing profile scripts
+	set +e
 	source /etc/profile &>/dev/null
+	set -e
 
 	return $R_DEPS_SATISFIED
 }
@@ -418,7 +445,8 @@ download_sources() {
 
 	local netfile
 	for netfile in "${source[@]}"; do
-		local file=$(strip_url "$netfile")
+		local file=$(get_filename "$netfile")
+		local url=$(get_url "$netfile")
 		if [ -f "$startdir/$file" ]; then
 			msg2 "$(gettext "Found %s in build dir")" "$file"
 			rm -f "$srcdir/$file"
@@ -432,26 +460,23 @@ download_sources() {
 		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"
+		if [ "$file" = "$url" ]; then
+			error "$(gettext "%s was not found in the build directory and is not a URL.")" "$file"
 			exit 1 # $E_MISSING_FILE
 		fi
 
 		# find the client we should use for this URL
-		local dlclient=$(get_downloadclient "$netfile") || exit $?
+		local dlclient=$(get_downloadclient "$url") || exit $?
 
 		msg2 "$(gettext "Downloading %s...")" "$file"
 		# fix flyspray bug #3289
 		local ret=0
-		$(get_downloadcmd "$dlclient" "$netfile" "$file") || ret=$?
+		download_file "$dlclient" "$url" "$file" || ret=$?
 		if [ $ret -gt 0 ]; then
 			error "$(gettext "Failure while downloading %s")" "$file"
 			plain "$(gettext "Aborting...")"
 			exit 1
 		fi
-		if echo "$dlclient" | grep -q "%o" ; then
-			mv -f "$SRCDEST/$file.part" "$SRCDEST/$file"
-		fi
 		rm -f "$srcdir/$file"
 		ln -s "$SRCDEST/$file" "$srcdir/"
 	done
@@ -491,7 +516,7 @@ generate_checksums() {
 
 		local netfile
 		for netfile in "${source[@]}"; do
-			local file="$(strip_url "$netfile")"
+			local file="$(get_filename "$netfile")"
 
 			if [ ! -f "$file" ] ; then
 				if [ ! -f "$SRCDEST/$file" ] ; then
@@ -537,7 +562,7 @@ check_checksums() {
 			local idx=0
 			local file
 			for file in "${source[@]}"; do
-				file="$(strip_url "$file")"
+				file="$(get_filename "$file")"
 				echo -n "    $file ... " >&2
 
 				if [ ! -f "$file" ] ; then
@@ -550,7 +575,9 @@ check_checksums() {
 					fi
 				fi
 
-				if [ "${integrity_sums[$idx]}" = "$(openssl dgst -${integ} "$file" | awk '{print $NF}')" ]; then
+				local expectedsum="$(echo ${integrity_sums[$idx]} | tr '[A-F]' '[a-f]')"
+				local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')"
+				if [ "$expectedsum" = "$realsum" ]; then
 					echo "$(gettext "Passed")" >&2
 				else
 					echo "$(gettext "FAILED")" >&2
@@ -574,7 +601,7 @@ extract_sources() {
 	msg "$(gettext "Extracting Sources...")"
 	local netfile
 	for netfile in "${source[@]}"; do
-		file=$(strip_url "$netfile")
+		file=$(get_filename "$netfile")
 		if in_array "$file" ${noextract[@]}; then
 			#skip source files in the noextract=() array
 			#  these are marked explicitly to NOT be extracted
@@ -648,6 +675,8 @@ run_build() {
 
 	# ensure all necessary build variables are exported
 	export CFLAGS CXXFLAGS MAKEFLAGS CHOST
+	# save our shell options so build() can't override what we need
+	local shellopts=$(shopt -p)
 
 	local ret=0
 	if [ "$LOGGING" = "1" ]; then
@@ -668,6 +697,8 @@ run_build() {
 	else
 		build 2>&1 || ret=$?
 	fi
+	# reset our shell options
+	eval "$shellopts"
 
 	if [ $ret -gt 0 ]; then
 		error "$(gettext "Build Failed.")"
@@ -848,10 +879,15 @@ create_package() {
 
 	local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
 
+	# when fileglobbing, we want * in an empty directory to expand to
+	# the null string rather than itself
+	shopt -s nullglob
+
 	if ! bsdtar -czf "$pkg_file" $comp_files *; then
 		error "$(gettext "Failed to create package file.")"
 		exit 1 # TODO: error code
 	fi
+	shopt -u nullglob
 }
 
 create_xdelta() {
@@ -952,10 +988,10 @@ create_srcpackage() {
 
 	local netfile
 	for netfile in "${source[@]}"; do
-		local file=$(strip_url "$netfile")
+		local file=$(get_filename "$netfile")
 		if [ -f "$netfile" ]; then
 			msg2 "$(gettext "Adding %s...")" "$netfile"
-			ln -s $netfile "${srclinks}/${pkgname}"
+			ln -s "${startdir}/$netfile" "${srclinks}/${pkgname}"
 		elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then
 			msg2 "$(gettext "Adding %s...")" "$file"
 			ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/"
@@ -998,27 +1034,27 @@ devel_check() {
 		# 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
+		if [ -n "${_darcstrunk}" -a -n "${_darcsmod}" ] ; then
 			[ $(type -p darcs) ] || return 0
 			msg "$(gettext "Determining latest darcs revision...")"
 			newpkgver=$(date +%Y%m%d)
-		elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then
+		elif [ -n "${_cvsroot}" -a -n "${_cvsmod}" ] ; then
 			[ $(type -p cvs) ] || return 0
 			msg "$(gettext "Determining latest cvs revision...")"
 			newpkgver=$(date +%Y%m%d)
-		elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then
+		elif [ -n "${_gitroot}" -a -n "${_gitname}" ] ; then
 			[ $(type -p git) ] || return 0
 			msg "$(gettext "Determining latest git revision...")"
 			newpkgver=$(date +%Y%m%d)
-		elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then
+		elif [ -n "${_svntrunk}" -a -n "${_svnmod}" ] ; then
 			[ $(type -p svn) ] || return 0
 			msg "$(gettext "Determining latest svn revision...")"
 			newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: \([0-9]*\)$/\1/p')
-		elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then
+		elif [ -n "${_bzrtrunk}" -a -n "${_bzrmod}" ] ; then
 			[ $(type -p bzr) ] || return 0
 			msg "$(gettext "Determining latest bzr revision...")"
 			newpkgver=$(bzr revno ${_bzrtrunk})
-		elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then
+		elif [ -n "${_hgroot}" -a -n "${_hgrepo}" ] ; then
 			[ $(type -p hg) ] || return 0
 			msg "$(gettext "Determining latest hg revision...")"
 			if [ -d ./src/$_hgrepo ] ; then
@@ -1030,13 +1066,14 @@ devel_check() {
 				hg clone $_hgroot/$_hgrepo ./src/$_hgrepo
 				cd ./src/$_hgrepo
 			fi
-			newpkgver=$(hg tip | sed -n '1s/[^0-9]*\([^:]*\):.*$/\1/p')
+			newpkgver=$(hg tip --template "{rev}")
 			cd ../../
 		fi
 
 		if [ "$newpkgver" != "" ]; then
 			msg2 "$(gettext "Version found: %s")" "$newpkgver"
 			pkgver=$newpkgver
+			pkgrel=1
 		fi
 
 	else
@@ -1056,13 +1093,101 @@ devel_update() {
 	#  _foo=pkgver
 	#
 	if [ "$newpkgver" != "" ]; then
-		if [ "newpkgver" != "$pkgver" ]; then
-			sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT
-			source $BUILDSCRIPT
+		if [ "$newpkgver" != "$pkgver" ]; then
+			sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT"
+			sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT"
+			source "$BUILDSCRIPT"
 		fi
 	fi
 }
 
+# getopt like parser
+parse_options() {
+	local short_options=$1; shift;
+	local long_options=$1; shift;
+	local ret=0;
+	local unused_options=""
+
+	while [ -n "$1" ]; do
+		if [ ${1:0:2} = '--' ]; then
+			if [ -n "${1:2}" ]; then
+				local match=""
+				for i in ${long_options//,/ }; do
+					if [ ${1:2} = ${i//:} ]; then
+						match=$i
+						break
+					fi
+				done
+				if [ -n "$match" ]; then
+					if [ ${1:2} = $match ]; then
+						printf ' %s' "$1"
+					else
+						if [ -n "$2" ]; then
+							printf ' %s' "$1"
+							shift
+							printf " '%s'" "$1"
+						else
+							echo "makepkg: option '$1' $(gettext "requires an argument")" >&2
+							ret=1
+						fi
+					fi
+				else
+					echo "makepkg: $(gettext "unrecognized option") '$1'" >&2
+					ret=1
+				fi
+			else
+				shift
+				break
+			fi
+		elif [ ${1:0:1} = '-' ]; then
+			for ((i=1; i<${#1}; i++)); do
+				if [[ "$short_options" =~ "${1:i:1}" ]]; then
+					if [[ "$short_options" =~ "${1:i:1}:" ]]; then
+						if [ -n "${1:$i+1}" ]; then
+							printf ' -%s' "${1:i:1}"
+							printf " '%s'" "${1:$i+1}"
+						else
+							if [ -n "$2" ]; then
+								printf ' -%s' "${1:i:1}"
+								shift
+								printf " '%s'" "${1}"
+							else
+								echo "makepkg: option $(gettext "requires an argument") -- '${1:i:1}'" >&2
+								ret=1
+							fi
+						fi
+						break
+					else
+						printf ' -%s' "${1:i:1}"
+					fi
+				else
+					echo "makepkg: $(gettext "invalid option") -- '${1:i:1}'" >&2
+					ret=1
+				fi
+			done
+		else
+			unused_options="${unused_options} '$1'"
+		fi
+		shift
+	done
+
+	printf " --"
+	if [ -n "$unused_options" ]; then
+		for i in ${unused_options[@]}; do
+			printf ' %s' "$i"
+		done
+	fi
+	if [ -n "$1" ]; then
+		while [ -n "$1" ]; do
+			printf " '%s'" "${1}"
+			shift
+		done
+	fi
+	printf "\n"
+
+	return $ret
+}
+
 usage() {
 	printf "makepkg (pacman) %s\n" "$myver"
 	echo
@@ -1086,9 +1211,10 @@ usage() {
 	# fix flyspray feature request #2978
 	echo "$(gettext "  -R, --repackage  Repackage contents of pkg/ without building")"
 	echo "$(gettext "  -s, --syncdeps   Install missing dependencies with pacman")"
+	echo "$(gettext "      --allsource  Generate a source-only tarball including downloaded sources")"
 	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 "$(gettext "      --source     Generate a source-only tarball without downloaded sources")"
 	echo
 	echo "$(gettext "These options can be passed to pacman:")"
 	echo
@@ -1150,8 +1276,8 @@ OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source"
 OPT_LONG="$OPT_LONG,syncdeps,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!')"
-if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then
+OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')"
+if echo "$OPT_TEMP" | grep -q 'PARSE_OPTIONS FAILED'; then
 	# This is a small hack to stop the script bailing with 'set -e'
 	echo; usage; exit 1 # E_INVALID_OPTION;
 fi
@@ -1207,10 +1333,11 @@ if [ "$CLEANCACHE" = "1" ]; then
 	#fix flyspray feature request #5223
 	if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then
 		msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST"
-		echo -n "$(gettext "    Are you sure you wish to do this? [Y/n] ")"
+		echo -n "$(gettext "    Are you sure you wish to do this? ")"
+		echo -n "$(gettext "[Y/n]")"
 		read answer
-		answer=$(echo $answer | tr '[:upper:]' '[:lower:]')
-		if [ "$answer" = "yes" -o "$answer" = "y" ]; then
+		answer=$(echo $answer | tr '[:lower:]' '[:upper:]')
+		if [ "$answer" = "$(gettext "YES")" -o "$answer" = "$(gettext "Y")" ]; then
 			rm "$SRCDEST"/*
 			if [ $? -ne 0 ]; then
 				error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST"
@@ -1233,7 +1360,7 @@ if [ "$CLEANCACHE" = "1" ]; then
 	fi
 fi
 
-if [ -z $BUILDSCRIPT ]; then
+if [ -z "$BUILDSCRIPT" ]; then
 	error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$confdir/makepkg.conf"
 	exit 1
 fi
@@ -1312,11 +1439,11 @@ if [ -z "$pkgrel" ]; then
 	error "$(gettext "%s is not allowed to be empty.")" "pkgrel"
 	exit 1
 fi
-if [ $(echo "$pkgver" | grep '-') ]; then
+if [ "$pkgver" != "${pkgver//-/}" ]; then
 	error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver"
 	exit 1
 fi
-if [ $(echo "$pkgrel" | grep '-') ]; then
+if [ "$pkgrel" != "${pkgrel//-/}" ]; then
 	error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel"
 	exit 1
 fi
@@ -1338,6 +1465,14 @@ if ! in_array $CARCH ${arch[@]}; then
 	fi
 fi
 
+for provide in ${provides[@]}; do
+	if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then
+		error "$(gettext "Provides array cannot contain comparison (< or >) operators.")"
+		exit 1
+	fi
+done
+unset provide
+
 if [ "$install" -a ! -f "$install" ]; then
 	error "$(gettext "Install scriptlet (%s) does not exist.")" "$install"
 	exit 1

scripts/pacman-optimize.sh.in

@@ -25,7 +25,6 @@ export TEXTDOMAINDIR='@localedir@'
 
 myver='@PACKAGE_VERSION@'
 dbroot='@localstatedir@/lib/pacman/'
-lockfile="${dbroot}db.lck"
 
 msg() {
 	local mesg=$1; shift
@@ -98,11 +97,6 @@ if ! type diff >/dev/null 2>&1; then
 	die "$(gettext "diff tool was not found, please install diffutils.")"
 fi
 
-# make sure pacman isn't running
-if [ -f "$lockfile" ]; then
-	die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")"
-fi
-
 if [ ! -d "$dbroot" ]; then
 	die "$(gettext "%s does not exist or is not a directory.")" "$dbroot"
 fi
@@ -111,12 +105,21 @@ if [ ! -w "$dbroot" ]; then
 	die "$(gettext "You must have correct permissions to optimize the database.")"
 fi
 
-workdir=$(mktemp -d /tmp/pacman-optimize.XXXXXXXXXX) ||
-	die_r "$(gettext "ERROR: Can not create temp directory for database building.")\n" >&2
+# strip any trailing slash from our dbroot
+dbroot="${dbroot%/}"
+# form the path to our lockfile location
+lockfile="${dbroot}/db.lck"
 
+# make sure pacman isn't running
+if [ -f "$lockfile" ]; then
+	die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")"
+fi
 # do not let pacman run while we do this
 touch "$lockfile"
 
+workdir=$(mktemp -d /tmp/pacman-optimize.XXXXXXXXXX) ||
+	die_r "$(gettext "ERROR: Can not create temp directory for database building.")\n" >&2
+
 # step 1: sum the old db
 msg "$(gettext "MD5sum'ing the old database...")"
 find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old"
@@ -124,46 +127,56 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old"
 # step 2: tar it up
 msg "$(gettext "Tar'ing up %s...")" "$dbroot"
 cd "$dbroot"
-bsdtar -czf "$workdir/pacmanDB.tgz" ./
+bsdtar -czf "$workdir/pacman-db.tar.gz" ./
 if [ $? -ne 0 ]; then
 	rm -rf "$workdir"
 	die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot"
 fi
 
-# step 3: make and sum the new db
-msg "$(gettext "Making and MD5sum'ing the new db...")"
+# step 3: make and sum the new db side-by-side with the old
+msg "$(gettext "Making and MD5sum'ing the new database...")"
 mkdir "$dbroot.new"
-bsdtar -zxpf "$workdir/pacmanDB.tgz" -C "$dbroot.new/"
+bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new"
 if [ $? -ne 0 ]; then
        rm -rf "$workdir"
        die_r "$(gettext "Untar'ing %s failed.")" "$dbroot"
 fi
+# immediate sync following extraction should get it written continuously on HDD
+msg "$(gettext "Syncing database to disk...")"
+sync
 find "$dbroot.new" -type f | sort | \
-		xargs md5sum | sed 's#.new/##' > "$workdir/pacsums.new"
+		xargs md5sum | sed 's#.new##' > "$workdir/pacsums.new"
 
 # step 4: compare the sums
 msg "$(gettext "Checking integrity...")"
 diff "$workdir/pacsums.old" "$workdir/pacsums.new" >/dev/null 2>&1
 if [ $? -ne 0 ]; then
 	# failed
-	# leave /tmp/pacsums.old and .new for checking to see what doesn't match up
+	# leave our pacman-optimize tmpdir for checking to see what doesn't match up
 	rm -rf "$dbroot.new"
 	die_r "$(gettext "Integrity check FAILED, reverting to old database.")"
 fi
 
-# step 5: remove the new temporary database and the old one
-#         and use the .tgz to replace the old one
-msg "$(gettext "Putting the new database in place...")"
-rm -rf "$dbroot.new" "$dbroot"/*
-bsdtar -zxpf "$workdir/pacmanDB.tgz" -C "$dbroot/"
+# step 5: shuffle the newly extracted DB into the proper location
+msg "$(gettext "Rotating database into place...")"
 
-# remove the lock file, sum files, and .tgz of database
+fail=0
+mv "$dbroot" "$dbroot.old" || fail=1
+mv "$dbroot.new" "$dbroot" || fail=1
+chmod --reference="$dbroot.old" "$dbroot" || fail=1
+chown --reference="$dbroot.old" "$dbroot" || fail=1
+if [ $fail -ne 0 ]; then
+	# failure with our directory shuffle
+	die_r "$(gettext "New database substitution failed. Check for $dbroot,\n$dbroot.old, and $dbroot.new directories.")"
+fi
+rm -rf "$dbroot.old"
+
+# remove the lock file and our working directory with sums and tarfile
 rm -f "$lockfile"
 rm -rf "$workdir"
 
 echo
 msg "$(gettext "Finished. Your pacman database has been optimized.")"
-msg "$(gettext "For full benefits of pacman-optimize, run 'sync' now.")"
 echo
 
 exit 0

scripts/repo-add.sh.in

@@ -99,8 +99,7 @@ test_repo_db_file () {
 write_list_entry() {
 	if [ -n "$2" ]; then
 		echo "%$1%" >>$3
-		echo $2 | tr -s ' ' '\n' >>$3
-		echo "" >>$3
+		echo -e $2 >>$3
 	fi
 }
 
@@ -122,8 +121,8 @@ db_write_delta()
 	arch=${deltavars[3]}
 
 	# get md5sum and size of delta
-	md5sum="$(md5sum "$deltafile" | cut -d ' ' -f 1)"
-	csize=$(du -kL "$deltafile" | awk '{print $1 * 1024}')
+	md5sum="$(openssl dgst -md5 "$deltafile" | awk '{print $NF}')"
+	csize=$(@SIZECMD@ "$deltafile")
 
 	# ensure variables were found
 	if [ -z "$pkgname" -o -z "$fromver" -o -z "$tover" -o -z "$arch" ]; then
@@ -144,7 +143,7 @@ db_write_entry()
 	local pkgname pkgver pkgdesc url builddate packager csize size \
 		group depend backup license replaces provides conflict force \
 		_groups _depends _backups _licenses _replaces _provides _conflicts \
-		startdir
+		startdir optdepend _optdepends
 
 	local OLDIFS="$IFS"
 	# IFS (field separator) is only the newline character
@@ -157,20 +156,21 @@ db_write_entry()
 		grep -v "^#" | sed 's|\(\w*\)\s*=\s*\(.*\)|\1="\2"|'); do
 		eval "$line"
 		case "$line" in
-			group=*)    _groups="$_groups $group" ;;
-			depend=*)   _depends="$_depends $depend" ;;
-			backup=*)   _backups="$_backups $backup" ;;
-			license=*)  _licenses="$_licenses $license" ;;
-			replaces=*) _replaces="$_replaces $replaces" ;;
-			provides=*) _provides="$_provides $provides" ;;
-			conflict=*) _conflicts="$_conflicts $conflict" ;;
+			group=*)    _groups="$_groups$group\n" ;;
+			depend=*)   _depends="$_depends$depend\n" ;;
+			backup=*)   _backups="$_backups$backup\n" ;;
+			license=*)  _licenses="$_licenses$license\n" ;;
+			replaces=*) _replaces="$_replaces$replaces\n" ;;
+			provides=*) _provides="$_provides$provides\n" ;;
+			conflict=*) _conflicts="$_conflicts$conflict\n" ;;
+			optdepend=*) _optdepends="$_optdepends$optdepend\n" ;;
 		esac
 	done
 
 	IFS=$OLDIFS
 
 	# get compressed size of package
-	csize=$(du -kL "$pkgfile" | awk '{print $1 * 1024}')
+	csize=$(@SIZECMD@ "$pkgfile")
 
 	startdir=$(pwd)
 	pushd "$gstmpdir" 2>&1 >/dev/null
@@ -201,7 +201,7 @@ db_write_entry()
 
 	# compute checksums
 	msg2 "$(gettext "Computing md5 checksums...")"
-	echo -e "%MD5SUM%\n$(md5sum "$pkgfile" | cut -d ' ' -f 1)\n" >>desc
+	echo -e "%MD5SUM%\n$(openssl dgst -md5 "$pkgfile" | awk '{print $NF}')\n" >>desc
 
 	[ -n "$url" ] && echo -e "%URL%\n$url\n" >>desc
 	write_list_entry "LICENSE" "$_licenses" "desc"
@@ -216,6 +216,7 @@ db_write_entry()
 	write_list_entry "DEPENDS" "$_depends" "depends"
 	write_list_entry "CONFLICTS" "$_conflicts" "depends"
 	write_list_entry "PROVIDES" "$_provides" "depends"
+	write_list_entry "OPTDEPENDS" "$_optdepends" "depends"
 
 	# create deltas entry if there are delta files
 	for delta in $startdir/$pkgname-*-*_to_*-*-$arch.delta; do

src/pacman/callback.c

@@ -137,11 +137,9 @@ static void fill_progress(const int bar_percent, const int disp_percent,
 		}
 		printf("]");
 	}
-	/* print percent after progress bar */
+	/* print display percent after progress bar */
 	if(proglen > 5) {
-		/* use disp_percent if it is not 0, else show bar_percent */
-		int p = disp_percent ? disp_percent : bar_percent;
-		printf(" %3d%%", p);
+		printf(" %3d%%", disp_percent);
 	}
 
 	if(bar_percent == 100) {
@@ -181,6 +179,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 			alpm_logaction("installed %s (%s)\n",
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data1));
+			display_optdepends(data1);
 			break;
 		case PM_TRANS_EVT_REMOVE_START:
 			if(config->noprogressbar) {
@@ -202,6 +201,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 			         (char *)alpm_pkg_get_name(data1),
 			         (char *)alpm_pkg_get_version(data2),
 			         (char *)alpm_pkg_get_version(data1));
+			display_optdepends(data1);
 			break;
 		case PM_TRANS_EVT_INTEGRITY_START:
 			printf(_("checking package integrity...\n"));
@@ -436,18 +436,29 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	int len, wclen, wcwid, padwid;
 	wchar_t *wcfname;
 
+	int totaldownload;
 	off_t xfered, total;
 	float rate = 0.0, timediff = 0.0, f_xfered = 0.0;
 	unsigned int eta_h = 0, eta_m = 0, eta_s = 0;
 	int file_percent = 0, total_percent = 0;
 	char rate_size = 'K', xfered_size = 'K';
 
-	if(config->noprogressbar) {
+	if(config->noprogressbar || file_total == -1) {
+		if(file_xfered == 0) {
+			printf(_("downloading %s...\n"), filename);
+			fflush(stdout);
+		}
 		return;
 	}
 
 	/* only use TotalDownload if enabled and we have a callback value */
 	if(config->totaldownload && list_total) {
+		totaldownload = 1;
+	} else {
+		totaldownload = 0;
+	}
+
+	if(totaldownload) {
 		xfered = list_xfered + file_xfered;
 		total = list_total;
 	} else {
@@ -460,8 +471,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	if(file_xfered == 0) {
 		/* set default starting values, ensure we only call this once
 		 * if TotalDownload is enabled */
-		if(!(config->totaldownload)
-				|| (config->totaldownload && list_xfered == 0)) {
+		if(!totaldownload || (totaldownload && list_xfered == 0)) {
 			gettimeofday(&initial_time, NULL);
 			xfered_last = (off_t)0;
 			rate_last = 0.0;
@@ -498,7 +508,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 
 	file_percent = (int)((float)file_xfered) / ((float)file_total) * 100;
 
-	if(config->totaldownload && list_total) {
+	if(totaldownload) {
 		total_percent = (int)((float)list_xfered + file_xfered) /
 			((float)list_total) * 100;
 
@@ -579,7 +589,11 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	free(fname);
 	free(wcfname);
 
-	fill_progress(file_percent, total_percent, getcols() - infolen);
+	if(totaldownload) {
+		fill_progress(file_percent, total_percent, getcols() - infolen);
+	} else {
+		fill_progress(file_percent, file_percent, getcols() - infolen);
+	}
 	return;
 }
 

src/pacman/package.c

@@ -44,13 +44,11 @@
  */
 void dump_pkg_full(pmpkg_t *pkg, int level)
 {
-	const char *reason, *descheader;
+	const char *reason;
 	time_t bdate, idate;
 	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;
@@ -97,7 +95,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	list_display(_("Groups         :"), alpm_pkg_get_groups(pkg));
 	list_display(_("Provides       :"), alpm_pkg_get_provides(pkg));
 	list_display(_("Depends On     :"), depstrings);
-	list_display(_("Optional Deps  :"), alpm_pkg_get_optdepends(pkg));
+	list_display_linebreak(_("Optional Deps  :"), alpm_pkg_get_optdepends(pkg));
 	/* Only applicable if installed */
 	if(level > 0) {
 		list_display(_("Required By    :"), requiredby);
@@ -132,26 +130,16 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	if(level < 0) {
 		string_display(_("MD5 Sum        :"), alpm_pkg_get_md5sum(pkg));
 	}
-
-	/* 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), len);
-	printf("\n\n");
+	string_display(_("Description    :"), alpm_pkg_get_desc(pkg));
 
 	/* Print additional package info if info flag passed more than once */
 	if(level > 1) {
 		dump_pkg_backups(pkg);
-		printf("\n");
 	}
 
+	/* final newline to separate packages */
+	printf("\n");
+
 	FREELIST(depstrings);
 }
 

src/pacman/pacman.c

@@ -36,6 +36,7 @@
 #include <sys/utsname.h> /* uname */
 #include <locale.h> /* setlocale */
 #include <time.h> /* time_t */
+#include <errno.h>
 #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H)
 #include <mcheck.h> /* debug tracing (mtrace) */
 #endif
@@ -71,14 +72,15 @@ static void usage(int op, const char * const myname)
 
 	if(op == PM_OP_MAIN) {
 		printf("%s:  %s <%s> [...]\n", str_usg, myname, str_opr);
-		printf("%s:\n", str_opt);
+		printf(_("operations:\n"));
 		printf("    %s {-h --help}\n", myname);
 		printf("    %s {-V --version}\n", myname);
 		printf("    %s {-Q --query}   [%s] [%s]\n", myname, str_opt, str_pkg);
 		printf("    %s {-R --remove}  [%s] <%s>\n", myname, str_opt, str_pkg);
 		printf("    %s {-S --sync}    [%s] [%s]\n", myname, str_opt, str_pkg);
 		printf("    %s {-U --upgrade} [%s] <%s>\n", myname, str_opt, str_file);
-		printf(_("\nuse '%s --help' with other options for more syntax\n"), myname);
+		printf(_("\nuse '%s {-h --help}' with an operation for available options\n"),
+				myname);
 	} else {
 		if(op == PM_OP_REMOVE) {
 			printf("%s:  %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg);
@@ -129,11 +131,11 @@ static void usage(int op, const char * const myname)
 			printf(_("  -u, --sysupgrade     upgrade all packages that are out of date\n"));
 			printf(_("  -w, --downloadonly   download packages but do not install/upgrade anything\n"));
 			printf(_("  -y, --refresh        download fresh package databases from the server\n"));
-			printf(_("      --needed         only upgrade outdated or not yet installed packages\n"));
+			printf(_("      --needed         don't reinstall up to date packages\n"));
 			printf(_("      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"));
 			printf(_("      --ignoregroup <grp>\n"
 			         "                       ignore a group upgrade (can be used more than once)\n"));
-			printf(_("  -q  --quiet          show less information for query and search\n"));
+			printf(_("  -q, --quiet          show less information for query and search\n"));
 		}
 		printf(_("      --config <path>  set an alternate configuration file\n"));
 		printf(_("      --logfile <path> set an alternate log file\n"));
@@ -210,21 +212,34 @@ static void cleanup(int ret) {
 	exit(ret);
 }
 
+/** Write function that correctly handles EINTR.
+ */
+static ssize_t xwrite(int fd, const void *buf, size_t count)
+{
+	ssize_t ret;
+	while((ret = write(fd, buf, count)) == -1 && errno == EINTR);
+	return(ret);
+}
+
 /** Catches thrown signals. Performs necessary cleanup to ensure database is
  * in a consistant state.
  * @param signum the thrown signal
  */
 static RETSIGTYPE handler(int signum)
 {
-	if(signum==SIGSEGV)
-	{
-		/* write a log message and write to stderr */
-		pm_printf(PM_LOG_ERROR, _("segmentation fault\n"));
-		pm_fprintf(stderr, PM_LOG_ERROR,
-				_("Internal pacman error: Segmentation fault.\n"
-					"Please submit a full bug report with --debug if appropriate.\n"));
+	int out = fileno(stdout);
+	int err = fileno(stderr);
+	if(signum == SIGSEGV) {
+		const char *msg1 = "error: segmentation fault\n";
+		const char *msg2 = "Internal pacman error: Segmentation fault.\n"
+			"Please submit a full bug report with --debug if appropriate.\n";
+		/* write a error message to out, the rest to err */
+		xwrite(out, msg1, strlen(msg1));
+		xwrite(err, msg2, strlen(msg2));
 		exit(signum);
 	} else if((signum == SIGINT)) {
+		const char *msg = "\nInterrupt signal received\n";
+		xwrite(err, msg, strlen(msg));
 		if(alpm_trans_interrupt() == 0) {
 			/* a transaction is being interrupted, don't exit pacman yet. */
 			return;
@@ -232,7 +247,7 @@ static RETSIGTYPE handler(int signum)
 		/* 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");
+		xwrite(out, "\n", 1);
 	}
 	cleanup(signum);
 }
@@ -261,11 +276,13 @@ static void setlibpaths(void)
 				cleanup(ret);
 			}
 			if(!config->dbpath) {
-				snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), DBPATH);
+				/* omit leading slash from our static DBPATH, root handles it */
+				snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), DBPATH + 1);
 				config->dbpath = strdup(path);
 			}
 			if(!config->logfile) {
-				snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE);
+				/* omit leading slash from our static LOGFILE path, root handles it */
+				snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE + 1);
 				config->logfile = strdup(path);
 			}
 		}
@@ -560,6 +577,7 @@ static int _parseconfig(const char *file, const char *givensection,
 	int linenum = 0;
 	char *ptr, *section = NULL;
 	pmdb_t *db = NULL;
+	int ret = 0;
 
 	pm_printf(PM_LOG_DEBUG, "config: attempting to read file %s\n", file);
 	fp = fopen(file, "r");
@@ -602,7 +620,8 @@ static int _parseconfig(const char *file, const char *givensection,
 			if(!strlen(section)) {
 				pm_printf(PM_LOG_ERROR, _("config file %s, line %d: bad section name.\n"),
 						file, linenum);
-				return(1);
+				ret = 1;
+				goto cleanup;
 			}
 			/* if we are not looking at the options section, register a db and also
 			 * ensure we have set all of our library paths as the library is too stupid
@@ -610,6 +629,12 @@ static int _parseconfig(const char *file, const char *givensection,
 			if(strcmp(section, "options") != 0) {
 				setlibpaths();
 				db = alpm_db_register_sync(section);
+				if(db == NULL) {
+					pm_printf(PM_LOG_ERROR, _("could not register '%s' database (%s)\n"),
+							section, alpm_strerrorlast());
+					ret = 1;
+					goto cleanup;
+				}
 			}
 		} else {
 			/* directive */
@@ -624,17 +649,19 @@ static int _parseconfig(const char *file, const char *givensection,
 			if(key == NULL) {
 				pm_printf(PM_LOG_ERROR, _("config file %s, line %d: syntax error in config file- missing key.\n"),
 						file, linenum);
-				return(1);
+				ret = 1;
+				goto cleanup;
 			}
 			/* For each directive, compare to the camelcase string. */
 			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);
+				ret = 1;
+				goto cleanup;
 			}
 			if(ptr == NULL && strcmp(section, "options") == 0) {
 				/* directives without settings, all in [options] */
-				if(strcmp(key, "NoPassiveFTP") == 0) {
+				if(strcmp(key, "NoPassiveFtp") == 0) {
 					alpm_option_set_nopassiveftp(1);
 					pm_printf(PM_LOG_DEBUG, "config: nopassiveftp\n");
 				} else if(strcmp(key, "UseSyslog") == 0) {
@@ -655,7 +682,8 @@ static int _parseconfig(const char *file, const char *givensection,
 				} else {
 					pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"),
 							file, linenum, key);
-					return(1);
+					ret = 1;
+					goto cleanup;
 				}
 			} else {
 				/* directives with settings */
@@ -686,7 +714,8 @@ static int _parseconfig(const char *file, const char *givensection,
 						if(alpm_option_add_cachedir(ptr) != 0) {
 							pm_printf(PM_LOG_ERROR, _("problem adding cachedir '%s' (%s)\n"),
 									ptr, alpm_strerrorlast());
-							return(1);
+							ret = 1;
+							goto cleanup;
 						}
 						pm_printf(PM_LOG_DEBUG, "config: cachedir: %s\n", ptr);
 					} else if(strcmp(key, "RootDir") == 0) {
@@ -710,13 +739,15 @@ static int _parseconfig(const char *file, const char *givensection,
 							config->cleanmethod = PM_CLEAN_KEEPCUR;
 						} else {
 							pm_printf(PM_LOG_ERROR, _("invalid value for 'CleanMethod' : '%s'\n"), ptr);
-							return(1);
+							ret = 1;
+							goto cleanup;
 						}
 						pm_printf(PM_LOG_DEBUG, "config: cleanmethod: %s\n", ptr);
 					} else {
 						pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"),
 								file, linenum, key);
-						return(1);
+						ret = 1;
+						goto cleanup;
 					}
 				} else if(strcmp(key, "Server") == 0) {
 					/* let's attempt a replacement for the current repo */
@@ -724,27 +755,35 @@ static int _parseconfig(const char *file, const char *givensection,
 
 					if(alpm_db_setserver(db, server) != 0) {
 						/* pm_errno is set by alpm_db_setserver */
-						return(1);
+						pm_printf(PM_LOG_ERROR, _("could not add server URL to database '%s': %s (%s)\n"),
+								alpm_db_get_name(db), server, alpm_strerrorlast());
+						free(server);
+						ret = 1;
+						goto cleanup;
 					}
 
 					free(server);
 				} else {
 					pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"),
 							file, linenum, key);
-					return(1);
+					ret = 1;
+					goto cleanup;
 				}
 			}
 		}
 	}
-	fclose(fp);
+
+cleanup:
+	if(fp) {
+		fclose(fp);
+	}
 	if(section){
 		free(section);
 	}
-
 	/* call setlibpaths here to ensure we have called it at least once */
 	setlibpaths();
 	pm_printf(PM_LOG_DEBUG, "config: finished parsing %s\n", file);
-	return(0);
+	return(ret);
 }
 
 /** Parse a configuration file.

src/pacman/sync.c

@@ -551,6 +551,7 @@ static int sync_trans(alpm_list_t *targets)
 	int retval = 0;
 	alpm_list_t *data = NULL;
 	alpm_list_t *sync_dbs = alpm_option_get_syncdbs();
+	alpm_list_t *packages = NULL;
 
 	/* Step 1: create a new transaction... */
 	if(trans_init(PM_TRANS_TYPE_SYNC, config->flags) == -1) {
@@ -659,7 +660,7 @@ static int sync_trans(alpm_list_t *targets)
 		goto cleanup;
 	}
 
-	alpm_list_t *packages = alpm_trans_get_pkgs();
+	packages = alpm_trans_get_pkgs();
 	if(packages == NULL) {
 		/* nothing to do: just exit without complaining */
 		printf(_(" local database is up to date\n"));

src/pacman/util.c

@@ -59,7 +59,7 @@ int trans_init(pmtranstype_t type, pmtransflag_t flags)
 	return(0);
 }
 
-int trans_release()
+int trans_release(void)
 {
 	if(alpm_trans_release() == -1) {
 		pm_fprintf(stderr, PM_LOG_ERROR, _("failed to release transaction (%s)\n"),
@@ -69,7 +69,7 @@ int trans_release()
 	return(0);
 }
 
-int needs_transaction()
+int needs_transaction(void)
 {
 	if(config->op != PM_OP_MAIN && config->op != PM_OP_QUERY && config->op != PM_OP_DEPTEST) {
 		if((config->op == PM_OP_SYNC && !config->op_s_sync &&
@@ -85,7 +85,7 @@ int needs_transaction()
 }
 
 /* gets the current screen column width */
-int getcols()
+int getcols(void)
 {
 	if(!isatty(1)) {
 		/* We will default to 80 columns if we're not a tty
@@ -252,7 +252,7 @@ void indentprint(const char *str, int indent)
 {
 	wchar_t *wcstr;
 	const wchar_t *p;
-	int len, cidx;
+	int len, cidx, cols;
 
 	if(!str) {
 		return;
@@ -267,6 +267,7 @@ void indentprint(const char *str, int indent)
 	if(!p) {
 		return;
 	}
+	cols = getcols();
 
 	while(*p) {
 		if(*p == L' ') {
@@ -283,7 +284,7 @@ void indentprint(const char *str, int indent)
 			while(q < next) {
 				len += wcwidth(*q++);
 			}
-			if(len > (getcols() - cidx - 1)) {
+			if(len > (cols - cidx - 1)) {
 				/* wrap to a newline and reindent */
 				fprintf(stdout, "\n%-*s", indent, "");
 				cidx = indent;
@@ -423,51 +424,65 @@ alpm_list_t *strsplit(const char *str, const char splitchar)
 	return(list);
 }
 
+static int string_length(const char *s)
+{
+	int len;
+	wchar_t *wcstr;
+
+	if(!s) {
+		return(0);
+	}
+	/* len goes from # bytes -> # chars -> # cols */
+	len = strlen(s) + 1;
+	wcstr = calloc(len, sizeof(wchar_t));
+	len = mbstowcs(wcstr, s, len);
+	len = wcswidth(wcstr, len);
+	free(wcstr);
+
+	return(len);
+}
+
 void string_display(const char *title, const char *string)
 {
-	printf("%s ", title);
-	if(string == NULL || string[0] == '\0') {
-		printf(_("None\n"));
-	} else {
-		printf("%s\n", string);
+	int len = 0;
+
+	if(title) {
+		/* compute the length of title + a space */
+		len = string_length(title) + 1;
+		printf("%s ", title);
 	}
+	if(string == NULL || string[0] == '\0') {
+		printf(_("None"));
+	} else {
+		indentprint(string, len);
+	}
+	printf("\n");
 }
 
 void list_display(const char *title, const alpm_list_t *list)
 {
 	const alpm_list_t *i;
-	int cols, len;
-	wchar_t *wcstr;
+	int cols, len = 0;
 
 	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);
+		len = string_length(title) + 1;
 		printf("%s ", title);
-	} else {
-		len = 0;
 	}
 
-	if(list) {
+	if(!list) {
+		printf("%s\n", _("None"));
+	} else {
 		for(i = list, cols = len; i; i = alpm_list_next(i)) {
 			char *str = alpm_list_getdata(i);
-			/* 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);
+			int s = string_length(str);
 			/* two additional spaces are added to the length */
 			s += 2;
 			int maxcols = getcols();
-			if(s + cols >= maxcols) {
-				int i;
+			if(s + cols > maxcols) {
+				int j;
 				cols = len;
 				printf("\n");
-				for (i = 0; i <= len; ++i) {
+				for (j = 1; j <= len; j++) {
 					printf(" ");
 				}
 			}
@@ -475,11 +490,36 @@ void list_display(const char *title, const alpm_list_t *list)
 			cols += s;
 		}
 		printf("\n");
-	} else {
-		printf(_("None\n"));
 	}
 }
 
+void list_display_linebreak(const char *title, const alpm_list_t *list)
+{
+	const alpm_list_t *i;
+	int len = 0;
+
+	if(title) {
+		len = string_length(title) + 1;
+		printf("%s ", title);
+	}
+
+	if(!list) {
+		printf("%s\n", _("None"));
+	} else {
+		/* Print the first element */
+		indentprint((const char *) alpm_list_getdata(list), len);
+		printf("\n");
+		/* Print the rest */
+		for(i = alpm_list_next(list); i; i = alpm_list_next(i)) {
+			int j;
+			for(j = 1; j <= len; j++) {
+				printf(" ");
+			}
+			indentprint((const char *) alpm_list_getdata(i), len);
+			printf("\n");
+		}
+	}
+}
 /* prepare a list of pkgs to display */
 void display_targets(const alpm_list_t *pkgs, int install)
 {
@@ -570,6 +610,15 @@ void display_synctargets(const alpm_list_t *syncpkgs)
 	alpm_list_free(rpkglist);
 }
 
+void display_optdepends(pmpkg_t *pkg)
+{
+	alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg);
+	if(optdeps) {
+		printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg));
+		list_display_linebreak("   ", optdeps);
+	}
+}
+
 /* presents a prompt and gets a Y/N answer */
 int yesno(short preset, char *fmt, ...)
 {

src/pacman/util.h

@@ -37,9 +37,9 @@
 #define UPDATE_SPEED_SEC 0.2f
 
 int trans_init(pmtranstype_t type, pmtransflag_t flags);
-int trans_release();
-int needs_transaction();
-int getcols();
+int trans_release(void);
+int needs_transaction(void);
+int getcols(void);
 int makepath(const char *path);
 int rmrf(const char *path);
 char *mbasename(const char *path);
@@ -51,8 +51,10 @@ char *strreplace(const char *str, const char *needle, const char *replace);
 alpm_list_t *strsplit(const char *str, const char splitchar);
 void string_display(const char *title, const char *string);
 void list_display(const char *title, const alpm_list_t *list);
+void list_display_linebreak(const char *title, const alpm_list_t *list);
 void display_targets(const alpm_list_t *pkgs, int install);
 void display_synctargets(const alpm_list_t *syncpkgs);
+void display_optdepends(pmpkg_t *pkg);
 int yesno(short preset, char *fmt, ...);
 int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3)));
 int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4)));