New Ukrainian 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:

NEWS

@@ -1,7 +1,23 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
-3.2.0
-              - removed -A/--add option from pacman frontend
+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

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_current], [4])
 m4_define([lib_revision], [0])
-m4_define([lib_age], [0])
+m4_define([lib_age], [1])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [2])
-m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_micro], [1])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
@@ -182,18 +182,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)
@@ -365,6 +371,7 @@ ${PACKAGE_NAME}:
     Architecture           : ${CARCH}
     Architecture flags     : ${CARCHFLAGS}
     Host Type              : ${CHOST}
+    Filesize command       : ${SIZECMD}
 
     libalpm version        : ${LIB_VERSION}
     libalpm version info   : ${LIB_VERSION_INFO}

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

doc/makepkg.8.txt

@@ -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
 -------

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

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

@@ -170,6 +170,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 +188,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 +358,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);

lib/libalpm/dload.c

@@ -340,21 +340,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 +365,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

@@ -295,6 +295,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 +841,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

@@ -7,14 +7,15 @@ 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: 2008-08-24 08:16+0200\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"
@@ -404,14 +405,6 @@ 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"
@@ -432,6 +425,10 @@ msgstr "nelze odstranit položku '%s' z cache\n"
 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"
 
+#, 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 "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
@@ -448,6 +445,10 @@ msgstr "%s-%s je aktuální -- přeskakuji\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s je aktuální -- přeinstalovávám\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"
 msgstr "zjištěn konflikt nerozlišitelných balíčků\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: 2008-08-24 12:41+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"
@@ -566,3 +566,4 @@ msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\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.
 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: 2008-08-23 23:35+0200\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"
@@ -142,7 +141,7 @@ msgstr "nombre de paquete ausente en %s\n"
 
 #, c-format
 msgid "missing package version in %s\n"
-msgstr "forzando la versión del paquete en %s\n"
+msgstr "versión del paquete ausente en %s\n"
 
 #, c-format
 msgid "error while reading package %s: %s\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

@@ -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"
@@ -353,7 +353,7 @@ msgstr "nessun repository corrispondente"
 
 #, c-format
 msgid "invalid or corrupted delta"
-msgstr "pacchetto non valido o corrotto"
+msgstr "delta non valido o corrotto"
 
 #, c-format
 msgid "delta patch failed"
@@ -397,7 +397,7 @@ msgstr "errore di libarchive"
 
 #, c-format
 msgid "download library error"
-msgstr "errore nel scaricare la libreria"
+msgstr "si è verificato un errore della libreria durante il download"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -407,15 +407,6 @@ msgstr "errore nell'inizializzare il download"
 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"
@@ -438,6 +429,11 @@ msgstr ""
 "%s-%s: aggiornamento del pacchetto 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 presente in %s (%s)\n"
+
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\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 perché va in conflitto con '%s'\n"
 
 #, c-format
 msgid "command: %s\n"

lib/libalpm/po/libalpm.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 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,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-19 20:58+0200\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\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"
@@ -565,3 +565,4 @@ msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+

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: 2008-08-24 02:00+0200\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -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"
@@ -435,6 +427,10 @@ msgstr "не могу удалить запись '%s' из кеша\n"
 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"
@@ -558,3 +558,4 @@ msgstr "кэш %s не существует, создаю...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "не могу создать кэш пакетов, будет использован /tmp\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: 2008-08-25 12:57+0200\n"
+"Last-Translator: Samed Beyribey <beyribey@gmail.com>\n"
 "Language-Team: Turkish Arch Linux Users <tr@archlinuxtr.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\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"
@@ -432,6 +424,10 @@ 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"
 
+#, 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"
 msgstr "%s: paket güncellemesi göz ardı ediliyor (%s => %s)\n"
@@ -448,6 +444,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 +555,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,554 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: libalpm 3.2.1\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,10 +7,10 @@
 #
 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"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-25 08:33+0200\n"
 "Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -405,14 +405,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"
@@ -433,6 +425,10 @@ msgstr "无法从缓存中删除记录 '%s'\n"
 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"
@@ -449,6 +445,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"
@@ -556,3 +556,4 @@ msgstr "没有 %s 缓存存在，正在创建...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
+

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/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,9 @@ 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);
 
+	fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000);
 	return(fd > 0 ? fd : -1);
 }
 
@@ -401,12 +394,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) {

po/LINGUAS

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

po/cs.po

@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\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:28+0200\n"
+"POT-Creation-Date: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-24 08:33+0200\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 "checking dependencies...\n"
@@ -118,6 +119,10 @@ msgstr "odstraňuji"
 msgid "checking for file conflicts"
 msgstr "kontroluji konflikty mezi soubory"
 
+#, c-format
+msgid "downloading %s...\n"
+msgstr "stahuji %s...\n"
+
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc selhal: nelze alokovat %zd bytů\n"
@@ -227,8 +232,8 @@ msgid "MD5 Sum        :"
 msgstr "MD5 součet     :"
 
 #, c-format
-msgid "Description    : "
-msgstr "Popis          : "
+msgid "Description    :"
+msgstr "Popis          :"
 
 #, c-format
 msgid "Repository     :"
@@ -282,13 +287,17 @@ msgstr "použití"
 msgid "operation"
 msgstr "operace"
 
+#, c-format
+msgid "operations:\n"
+msgstr "operace:\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"
-"použijte '%s --help' s dalšími volbami pro další nápovědu\n"
+"použijte '%s {-h --help}' s přepínačem operace pro další nápovědu\n"
 
 #, c-format
 msgid ""
@@ -449,11 +458,8 @@ msgid ""
 msgstr "  -y, --refresh        stáhne aktuální databázi balíčků ze serveru\n"
 
 #, c-format
-msgid ""
-"      --needed         only upgrade outdated or not yet installed packages\n"
-msgstr ""
-"      --needed         aktualizuje jen zastaralé nebo nenainstalované "
-"balíčky\n"
+msgid "      --needed         don't reinstall up to date packages\n"
+msgstr "      --needed         zabrání přeinstalování aktuálních balíčků\n"
 
 #, c-format
 msgid ""
@@ -471,10 +477,6 @@ msgstr ""
 "      --ignoregroup <skupina>\n"
 "                       ignorovat aktualizaci skupiny (lze použít vícekrát)\n"
 
-#, c-format
-msgid "  -q  --quiet          show less information for query and search\n"
-msgstr "  -q  --quiet          zobrazit méně informací při dotazu a hledání\n"
-
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <cesta> nastaví cestu ke konfiguračnímu souboru\n"
@@ -880,8 +882,8 @@ msgid "failed to release transaction (%s)\n"
 msgstr "selhalo dokončení transakce (%s)\n"
 
 #, c-format
-msgid "None\n"
-msgstr "Nic\n"
+msgid "None"
+msgstr "Nic"
 
 #, c-format
 msgid "Targets (%d):"
@@ -903,6 +905,10 @@ msgstr "Odstranit (%d):"
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Celková uvolněná velikost:    %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "Volitelné závislosti pro %s\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[A/n]"
@@ -1215,6 +1221,12 @@ msgstr "  -R, --repackage  Znovu zabalí obsah pkg/ bez sestavování"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Nainstaluje chybějící závislosti pomocí pacmana"
 
+msgid ""
+"      --allsource  Generate a source-only tarball including downloaded "
+"sources"
+msgstr ""
+"      --source     Vygeneruje zdrojový archiv, včetně stahovaných souborů"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     Umožňuje spustit makepkg s právy uživatele root"
 
@@ -1224,9 +1236,9 @@ msgid ""
 msgstr ""
 "      --holdver    Zabrání automatickému zvýšení verze u vývojových PKGBUILDů"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr ""
-"      --source     Nesestavovat balíček, vygenerovat jen zdrojový archiv"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
+msgstr "      --source     Vygeneruje zdrojový archiv, bez stahovaných souborů"
 
 msgid "These options can be passed to pacman:"
 msgstr "Tyto volby se předají pacmanovi:"
@@ -1261,8 +1273,8 @@ msgstr "\\0--holdver a --forcever nemohou být zadány současně"
 msgid "Cleaning up ALL files from %s."
 msgstr "Odstraňuji VŠECHNY soubory z %s."
 
-msgid "    Are you sure you wish to do this? [Y/n] "
-msgstr "    Jste si jistý, že víte co děláte? [Y/n] "
+msgid "    Are you sure you wish to do this? "
+msgstr "    Jste si jistý, že víte co děláte? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr "Problém s odstraněním souborů, možná nemáte správná oprávnění v %s"

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: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-24 12:36+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"
@@ -907,8 +909,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 +932,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 +1037,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"
@@ -1247,6 +1253,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"
 
@@ -1257,8 +1270,11 @@ msgstr ""
 "      --holdver    Verhindert, dass die Auto-Version sich mit dev-PKGBUILDS "
 "beisst"
 
-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 +1314,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 ""

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: 2008-08-25 20:14+0200\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"
@@ -872,8 +874,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 +897,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]"
@@ -1206,6 +1212,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 +1229,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 +1270,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"

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.
 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: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-23 23:21+0200\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     :"
@@ -289,13 +292,17 @@ 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"
+"digite '{%s --help}' con una operación para ayuda más específica\n"
 
 #, c-format
 msgid ""
@@ -481,11 +488,10 @@ msgstr ""
 "servidor\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         solo actualiza paquetes antiguos o los que no\n"
-"                         están instalados\n"
+"      --needed         solo actualiza paquetes antiguos o los que no están "
+"instalados\n"
 
 #, c-format
 msgid ""
@@ -504,12 +510,6 @@ 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"
@@ -632,7 +632,7 @@ msgstr "valor invalido para 'CleanMethod' : '%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"
@@ -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"
@@ -1046,7 +1050,7 @@ 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."
 
 msgid "Downloading %s..."
-msgstr "Descargando %s... "
+msgstr "Descargando %s..."
 
 msgid "Failure while downloading %s"
 msgstr "Falló mientras se descargaba %s"
@@ -1109,7 +1113,7 @@ 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 símbolos de depuración de los binarios y bibliotecas..."
 
 msgid "Removing libtool .la files..."
 msgstr "Eliminando archivos .la de libtool"
@@ -1259,6 +1263,13 @@ 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"
 
+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 ""
 "      --asroot     Permitir a makepkg ser ejecutado como el usuario root"
@@ -1270,10 +1281,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 paquetesólo 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 +1324,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 quieres hacer esto? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""

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: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-23 23:27+0200\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 ""
@@ -935,8 +937,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 +960,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 +1067,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"
@@ -1283,6 +1289,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 +1306,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 +1347,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 ""

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: 2008-08-25 20:14+0200\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"
@@ -883,8 +883,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 +906,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]"
@@ -1216,6 +1220,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 +1233,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 +1267,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"

po/it.po

@@ -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: 2008-08-25 20:14+0200\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"
@@ -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 "scaricamento 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 ""
@@ -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"
@@ -902,8 +903,8 @@ 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):"
@@ -925,6 +926,10 @@ msgstr "Rimuovere (%d):"
 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]"
@@ -1238,6 +1243,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 +1259,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:"
@@ -1290,8 +1303,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 "    Siete proprio sicuri di volerlo fare? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
@@ -1386,7 +1399,7 @@ 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 ""

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: 2008-08-25 20:14+0200\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 ""
@@ -834,7 +837,7 @@ msgid "failed to release transaction (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "None\n"
+msgid "None"
 msgstr ""
 
 #, c-format
@@ -857,6 +860,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 ""
@@ -1167,6 +1174,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 +1187,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 +1221,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"

po/pl.po

@@ -11,7 +11,7 @@ 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"
+"POT-Creation-Date: 2008-08-25 20:14+0200\n"
 "PO-Revision-Date: 2008-07-30 08:37+0200\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polski <pl@li.org>\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"
@@ -899,8 +899,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 +922,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 +1026,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"
@@ -1235,6 +1239,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 +1255,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 +1293,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"

po/pt_BR.po

@@ -15,8 +15,8 @@ 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"
+"POT-Creation-Date: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-25 19:48+0200\n"
 "Last-Translator: Hugo Doria <hugo@archlinux.org>\n"
 "Language-Team: Brazillian Portuguese <www.archlinux-br.org>\n"
 "MIME-Version: 1.0\n"
@@ -127,6 +127,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 +149,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 "Deps Opcionais       :"
 
 #, c-format
 msgid "Required By    :"
-msgstr "Requerido por   :"
+msgstr "Requerido por        :"
 
 #, 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 +197,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 +225,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 +237,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"
@@ -291,13 +295,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 ""
@@ -474,11 +482,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 +502,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 ""
@@ -915,8 +915,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 +938,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]"
@@ -1255,6 +1259,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 +1276,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,8 +1319,8 @@ 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 ""

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-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:38+0200\n"
+"POT-Creation-Date: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-24 02:24+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 ""
@@ -456,11 +464,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 +484,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 ""
@@ -890,8 +890,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 +913,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 +1017,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 завершилась неудачей"
@@ -1230,6 +1234,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 +1251,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,8 +1292,8 @@ 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"

po/tr.po

@@ -8,9 +8,9 @@ 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"
-"Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n"
+"POT-Creation-Date: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-25 07:47+0200\n"
+"Last-Translator: Samed Beyribey <beyribey@gmail.com>\n"
 "Language-Team: Türkçe <tr@archlinuxtr.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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 ""
@@ -453,10 +461,8 @@ msgid ""
 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"
@@ -881,8 +882,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 +905,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]"
@@ -1222,6 +1227,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 +1246,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 +1285,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"

po/zh_CN.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-30 08:26+0200\n"
-"PO-Revision-Date: 2008-07-30 08:39+0200\n"
+"POT-Creation-Date: 2008-08-25 20:14+0200\n"
+"PO-Revision-Date: 2008-08-24 10:17+0700\n"
 "Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -121,6 +121,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 "内存分配失败：无法分配 %zd bytes\n"
@@ -230,7 +234,7 @@ msgid "MD5 Sum        :"
 msgstr "MD5校验值："
 
 #, c-format
-msgid "Description    : "
+msgid "Description    :"
 msgstr "描述　　　："
 
 #, c-format
@@ -285,13 +289,17 @@ 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 ""
@@ -434,9 +442,8 @@ msgid ""
 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 ""
@@ -452,10 +459,6 @@ msgstr ""
 "      --ignoregroup <软件包组>\n"
 "                         升级时忽略某个软件包组（可多次使用）\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 "      --config <路径>  指定另外的配置文件\n"
@@ -855,8 +858,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):"
@@ -878,6 +881,10 @@ msgstr "删除 (%d)："
 msgid "Total Removed Size:   %.2f MB\n"
 msgstr "全部删除大小:   %.2f MB\n"
 
+#, c-format
+msgid "Optional dependencies for %s\n"
+msgstr "%s 的可选依赖\n"
+
 #, c-format
 msgid "[Y/n]"
 msgstr "[Y/n]"
@@ -1188,6 +1195,11 @@ 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 "    --allsource     只生成源码包（包括有已下载的源码）"
+
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     允许makepkg作为 root（根用户）运行"
 
@@ -1196,8 +1208,9 @@ msgid ""
 "PKGBUILDs"
 msgstr "      --holdver    防止开发中的 PKGBUILD 自动更新版本"
 
-msgid "      --source     Do not build package; generate a source-only tarball"
-msgstr "    --source     不编译软件包，仅仅生成源码包"
+msgid ""
+"      --source     Generate a source-only tarball without downloaded sources"
+msgstr "    --source     只生成源码包（不包括已下载的源码）"
 
 msgid "These options can be passed to pacman:"
 msgstr "这些选项可以传递给 pacman："
@@ -1231,8 +1244,8 @@ 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 你可能没有正确的权限。"

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

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
@@ -848,10 +875,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 +984,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}/"
@@ -1086,9 +1118,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
@@ -1207,10 +1240,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"

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
 }
 
@@ -123,7 +122,7 @@ db_write_delta()
 
 	# get md5sum and size of delta
 	md5sum="$(md5sum "$deltafile" | cut -d ' ' -f 1)"
-	csize=$(du -kL "$deltafile" | awk '{print $1 * 1024}')
+	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
@@ -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

@@ -139,8 +139,8 @@ static void fill_progress(const int bar_percent, const int disp_percent,
 	}
 	/* print 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;
+		/* show total download percent if option is enabled */
+		int p = config->totaldownload ? disp_percent : bar_percent;
 		printf(" %3d%%", p);
 	}
 
@@ -181,6 +181,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 +203,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"));
@@ -442,7 +444,10 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	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);
+		}
 		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,19 +130,7 @@ 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) {

src/pacman/pacman.c

@@ -71,14 +71,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 +130,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"));
@@ -634,7 +635,7 @@ static int _parseconfig(const char *file, const char *givensection,
 			}
 			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) {

src/pacman/util.c

@@ -423,51 +423,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 +489,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 +609,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

@@ -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)));