Check in changes for 3.0.5 release (mostly backports)

* Update the mirrorlist * Fix FS7338- the previous repo-add fix didn't quite do the job, but it should be fixed now. * Small updates to translations files * Add -mtune=generic to default CFLAGS (req'd by GCC 4.2)
Fix libarchive permission extraction
2007-06-18 00:15:36 +00:00 · 2007-05-18 03:26:24 +00:00 · 2007-05-16 17:14:19 +00:00 · 2007-05-13 04:40:13 +00:00 · 2007-05-13 04:29:05 +00:00 · 2007-05-08 08:13:13 +00:00
68 changed files with 11150 additions and 3960 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,8 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib
 EXTRA_DIST = HACKING

 check-local:  src/pacman
-	python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman
+	python $(top_srcdir)/pactest/pactest.py --debug=1 \
+		--test $(top_srcdir)/pactest/tests/*.py \
+		-p $(top_builddir)/src/pacman/pacman
 	rm -rf $(top_builddir)/root

--- a/62
+++ b/62
@@ -1,39 +1,71 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.0.5         - Add -mtune=generic to default CFLAGS in makepkg.conf
+              - Small updates to translations
+              - repo-add: fix conflicts issue for real this time
+              - Fix issue with libarchive incorrectly setting permissions
+3.0.4         - Updated translations
+              - repo-add: fix issue where conflicts were not put in database
+3.0.3         - Updated translations
+              - repo-add: fixed a desc file clobbering issue
+3.0.2         - fix a bug where pre/post_remove scriptlets were not ran
+              - ensure ldconfig is ran in all operations
+              - added a few new translations, updated existing ones
+              - updated mirror lists
+              - makepkg: ensure CFLAGS are exported to build function
+3.0.1         - fix a locale issue with tr_TR upper/lower-case conversion
+              - allow removal when listing the same package multiple times
+              - fix a repo-add bug that left a .PKGINFO file in the current
+                directory
+              - proper error messages when we cannot read mtab for freespace
 3.0.0         - first release based on libalpm backend
-              - added internationalization (gettext) support
-              - prompt to delete corrupted packages
+              - added internationalization (gettext) support:
+                - de, fr, hu, it, pt_BR, en_GB, ru_RU translations
+              - switch to usage of libdownload and libarchive
+              - improved proxy support using libdownload
              - documentation - man pages updated, new conf manpages added
+              - repository mirror list updates
              - added support for package changelogs
              - logging of all install scriptlet messages to pacman.log
-              - repository mirror list updates
              - orphans search (-Qe) now shows true orphans
-              - new -Qu option- show all packages that can be upgraded
+              - new -Qu option - show all packages that can be upgraded
+              - new -Se option - install only dependencies
              - dependency sorting on install and removal
-              - new uncompressed size field, shown on sync upgrade
              - check for free space before installing packages
+              - prompt to delete corrupted packages
+              - improved backup handling - backup array proactive on upgrade
+              - removed NoUpgrade lines from default pacman.conf
+              - new uncompressed size field, shown on sync upgrade
              - improved progress and progressbar output
              - reduced unnecessary calling of ldconfig
              - selective loading of database to speed up certain operations
-              - switch to usage of libdownload and libarchive
-              - improved proxy support as a result of switch to libdownload
              - debugging output improved with --debug flag
-              - added 'rankmirrors' - script to show best available mirrors
-              - added 'repo-add' - the backbone script for building repos
-              - added pactest testing suite
-              - abs - supports cvsup/csup, expanded configuration
-              - abs - supports fetching of testing repository
-              - makepkg fixes:
+              - pacman-optimize - now supports DBs on separate filesystem
+              - makepkg and abs now support conf files in home directory
+              - makepkg changes:
+                - arch field is required
+                - added -arch suffix to generated package filenames
                - new configuration file options format
+                - changed default configuration
                - support alternate integrity checks
                - extract files using filetype, not extension
                - added noextract array
+                - new options array format
                - new option to log build process
-                - new repackage option - repackage pkg/ w/o building
+                - new --repackage option - repackage pkg/ without building
                - user-selectable paths for doc stripping
                - configurable source cache location
                - dependencies now removed on a build success or failure
-              - pacman-optimize - support DB's on separate filesystem
+              - abs changes:
+                - supports both cvsup and csup
+                - expanded configuration
+                - added support for testing repository
+              - new helper scripts:
+                - rankmirrors - shows best available mirrors
+                - repo-add - adds a package to a repo database file
+                - repo-remove - removes a package from a repo database file
+              - added pactest testing suite
+              - MANY fixes and small improvements everywhere
 2.9.8         - Changed behaviour with original=X,current=Y,new=Z scenario
                - keep old in place, install new as .pacnew
              - Search package provides when finding matching targets with -S
--- a/TODO.dan
+++ b/TODO.dan
@@ -11,14 +11,6 @@ Port the libdownload (libfetch) manpage from BSD style to Linux style, or at
 very least change references to BSD.


-Pacman 3.0:
-----------
-
-ideas mentioned here- http://bbs.archlinux.org/viewtopic.php?id=29450- add a
-.install message about mirrors, maybe comment whole file, encourage rankmirrors
-usage
-
-
 Pacman 3.1:
 -----------

@@ -32,6 +24,9 @@ keep, etc. Good python script in the forums that we should try to emulate.
 Downgrade feature - allow users to see cached packages and downgrade to
 (previous or any?) available options.

+Installed size and download size in -Si/Qi output should scale with package
+size- KB to MB to GB. We should also get consistancy of K/KB, M/MB, etc.
+
 Extreme similarity between some of the sync and add code...we have to be able
 to abstract more away from sync actions and add actions to just 'actions'
 (example: sync,c, add.c, and deptest.c all contain a switch on PM_DEP_MOD_*).
@@ -81,7 +76,8 @@ Localize the date display done in --info output. Also, fix other localized
 issues- use non-printf when necessary, make sure all two line printed messages
 (especially usage instructions) are printed using one print statement. We
 may need to use some wchar_t output on the progress bar as char/byte counts
-differ here.
+differ here. Sizes of packages (e.g. 10,400.23 MB) should all be localized with
+correct seperators.

 Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should
 allow us to do this. Make universal message functions for systemwide use,
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ CFLAGS=""

 AC_PREREQ(2.59)
 dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots
-AC_INIT([Pacman package manager], 3.0.0, [pacman-dev@archlinux.org], [pacman])
+AC_INIT([Pacman package manager], 3.0.5, [pacman-dev@archlinux.org], [pacman])
 AC_LANG([C])
 AC_CONFIG_HEADERS(config.h)
 AC_CANONICAL_HOST
--- a/doc/pacman.8
+++ b/doc/pacman.8
@@ -68,6 +68,11 @@ general syntax is shown.

 .SH OPTIONS
 .TP
+.B \--ask \fInumber\fP
+Pre-specify answers to questions. It is doubtful whether this option even
+works, so I would not recommend using it. TODO: document this more, as I have
+no idea how it works or when you would use it, or if we should just dump it.
+.TP
 .B \-b, --dbpath \fIpath\fP
 Specify an alternative database location (default is "/var/lib/pacman/"). This
 should not be used unless you know what you are doing.
@@ -109,9 +114,17 @@ unless you want to run pacman from a script.
 .B \--noprogressbar
 Do not show a progress bar when downloading files. This can be useful for
 scripts that call pacman and capture the output.
+.TP
+.B \--noscriptlet
+If an install scriptlet exists, do not execute it. Do not use this unless you
+know what you are doing.

 .SH QUERY OPTIONS
 .TP
+.B \-c, --changelog
+View the ChangeLog of a package. Not every package will provide one but it
+will be shown if available.
+.TP
 .B \-e, --orphans
 List all packages that were pulled in by a previously installed package but no
 longer required by any installed package.
@@ -175,6 +188,10 @@ downloads packages, it saves them in \fI/var/cache/pacman/pkg\fP. Use one
 \fB--clean\fP switch to remove \fIold\fP packages; use two to remove \fIall\fP
 packages from the cache.
 .TP
+.B \-e, --dependsonly
+Install all dependencies of a package, but not the specified package itself.
+This is pretty useless and we're not sure why it even exists.
+.TP
 .B \-g, --groups
 Display all the members for each package group specified. If no group names
 are provided, all groups will be listed; pass the flag twice to view all
--- a/doc/pacman.conf.5
+++ b/doc/pacman.conf.5
@@ -54,9 +54,6 @@ Instructs \fBpacman\fP to ignore any upgrades for this package when performing a
 Include another config file. This file can include repositories or general
 configuration options.
 .TP
-.B ProxyServer = <\fIhost\fP|\fIip\fP>[:\fIport\fP]
-If set, \fBpacman\fP will use this proxy server for all ftp/http transfers.
-.TP
 .B XferCommand = \fI/path/to/command %u\fP
 If set, an external program will be used to download all remote files.  All
 instances of \fB%u\fP will be replaced with the download URL. If present,
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -21,8 +21,8 @@ CHOST="@CHOST@"
 #-- Exclusive: will only run on @CARCHFLAGS@
 # -mtune builds exclusively for an architecture
 # -mcpu optimizes for an architecture, but builds for the whole processor family
-CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe"
-CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe"
+CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
+CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"

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

 #########################################################################
 # PACKAGE OUTPUT
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -20,7 +20,7 @@ HoldPkg     = pacman glibc
 #     have identical names, regardless of version number
 #
 #[testing]
-#Server = ftp://ftp.archlinux.org/testing/os/@CARCH@
+#Include = /etc/pacman.d/testing

 [current]
 # Add your preferred servers here, they will be used first
--- a/etc/pacman.d/.cvsignore
+++ b/etc/pacman.d/.cvsignore
@@ -6,3 +6,4 @@ extra
 mirrorlist
 release
 unstable
+testing
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,5 +1,5 @@
 pkgsysconfdir = ${sysconfdir}/pacman.d
-dist_pkgsysconf_DATA = community current extra release unstable
+dist_pkgsysconf_DATA = community current extra release testing unstable

 $(dist_pkgsysconf_DATA): mirrorlist
 	sed "s|@@REPO@@|$@|g" <$< >$@
--- a/etc/pacman.d/mirrorlist.in
+++ b/etc/pacman.d/mirrorlist.in
@@ -5,10 +5,16 @@
 # United States
 Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://locke.suu.edu/linux/dist/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@
+Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@

+# South America
+# - Brazil
+Server = http://archlinux.c3sl.ufpr.br/@@REPO@@/os/@CARCH@
+
 # Europe
 # - Austria
 Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@@REPO@@/os/@CARCH@
@@ -28,6 +34,7 @@ Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@C
 # - Germany
 Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.archlinuxppc.org/i686/@@REPO@@/os/@CARCH@
 # - Great Britain
 Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
 # - Greece
@@ -52,19 +59,22 @@ Server = ftp://cesium.di.uminho.pt/pub/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@
 # - Romania
 Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@
+# - Russia
+Server = http://archlinux.freeside.ru/@@REPO@@/os/@CARCH@
 # - Sweden
 Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@
 # - Switzerland
 Server = ftp://archlinux.puzzle.ch/@@REPO@@/os/@CARCH@
+# - Turkey
+Server = ftp://ftp.linux.org.tr/pub/archlinux/@@REPO@@/os/@CARCH@
 # - Ukraine
 Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@@REPO@@/os/@CARCH@

+# Asia
+# - Israel
+Server = http://mirror.isoc.org.il/pub/archlinux/@@REPO@@/os/@CARCH@
+
 # Australia
 Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@

-# Asia
-# - China
-Server = http://mirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@
-Server = http://dxmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@
-Server = http://cncmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -129,7 +129,7 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
 				i->data = newpkg;
 			} else {
 				_alpm_log(PM_LOG_WARNING, _("newer version %s-%s is in the target list -- skipping"),
-				          pkg->name, pkg->version, pkgver);
+				          pkg->name, pkg->version);
 			}
 			return(0);
 		}
@@ -318,6 +318,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 	pkg_count = alpm_list_count(trans->targets);
 	
 	for(targ = trans->packages; targ; targ = targ->next) {
+		char scriptlet[PATH_MAX+1];
 		int targ_count = 0, is_upgrade = 0, use_md5 = 0;
 		double percent = 0.0;
 		pmpkg_t *newpkg = (pmpkg_t *)targ->data;
@@ -328,6 +329,9 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 			break;
 		}

+		snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
+						 alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+
 		/* check if we have a valid sha1sum, if not, use MD5 */
 		if(strlen(newpkg->sha1sum) == 0) {
 			use_md5 = 1;
@@ -700,6 +704,8 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 						_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno));
 						alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno));
 						errors++;
+					} else {
+						chmod(filename, archive_entry_mode(entry));
 					}

 					/* calculate an hash if this is in newpkg's backup */
@@ -817,15 +823,12 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)

 		/* run the post-install script if it exists  */
 		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
-			char pm_install[PATH_MAX];
-			snprintf(pm_install, PATH_MAX, "%s%s%s-%s/install", handle->root, db->path,
-							 alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
 			if(is_upgrade) {
-				_alpm_runscriptlet(handle->root, pm_install, "post_upgrade",
+				_alpm_runscriptlet(handle->root, scriptlet, "post_upgrade",
 													alpm_pkg_get_version(newpkg), oldpkg ? alpm_pkg_get_version(oldpkg) : NULL,
 													trans);
 			} else {
-				_alpm_runscriptlet(handle->root, pm_install, "post_install",
+				_alpm_runscriptlet(handle->root, scriptlet, "post_install",
 													 alpm_pkg_get_version(newpkg), NULL, trans);
 			}
 		}
@@ -836,7 +839,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 	}

 	/* run ldconfig if it exists */
-	if((trans->type != PM_TRANS_TYPE_UPGRADE) && (handle->trans->state != STATE_INTERRUPTED)) {
+	if(handle->trans->state != STATE_INTERRUPTED) {
 		_alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root);
 		_alpm_ldconfig(handle->root);
 	}
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -884,6 +884,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 	char *ptr = NULL;
 	char *key = NULL;
 	int linenum = 0;
+	char origkey[256];
 	char section[256] = "";
 	pmdb_t *db = NULL;

@@ -938,21 +939,22 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 				RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1);
 			}
 			_alpm_strtrim(key);
+			strncpy(origkey, key, min(255, strlen(key)));
 			key = _alpm_strtoupper(key);
 			if(!strlen(section) && strcmp(key, "INCLUDE")) {
 				RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1);
 			}
 			if(ptr == NULL) {
-				if(!strcmp(key, "NOPASSIVEFTP")) {
+				if(strcmp(origkey, "NoPassiveFTP") == 0 || strcmp(key, "NOPASSIVEFTP") == 0) {
 					alpm_option_set_nopassiveftp(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: nopassiveftp"));
-				} else if(!strcmp(key, "USESYSLOG")) {
+				} else if(strcmp(origkey, "UseSyslog") == 0 || strcmp(key, "USESYSLOG") == 0) {
 					alpm_option_set_usesyslog(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: usesyslog"));
-				} else if(!strcmp(key, "ILOVECANDY")) {
+				} else if(strcmp(origkey, "ILoveCandy") == 0 || strcmp(key, "ILOVECANDY") == 0) {
 					alpm_option_set_chomp(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: chomp"));
-				} else if(!strcmp(key, "USECOLOR")) {
+				} else if(strcmp(origkey, "UseColor") == 0 || strcmp(key, "USECOLOR") == 0) {
 					alpm_option_set_usecolor(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: usecolor"));
 				} else {
@@ -960,13 +962,13 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 				}
 			} else {
 				_alpm_strtrim(ptr);
-				if(!strcmp(key, "INCLUDE")) {
+				if(strcmp(origkey, "Include") == 0 || strcmp(key, "INCLUDE") == 0) {
 					char conf[PATH_MAX];
 					strncpy(conf, ptr, PATH_MAX);
 					_alpm_log(PM_LOG_DEBUG, _("config: including %s"), conf);
 					alpm_parse_config(conf, callback, section);
-				} else if(!strcmp(section, "options")) {
-					if(!strcmp(key, "NOUPGRADE")) {
+				} else if(strcmp(section, "options") == 0) {
+					if(strcmp(origkey, "NoUpgrade") == 0 || strcmp(key, "NOUPGRADE") == 0) {
 						char *p = ptr;
 						char *q;

@@ -979,7 +981,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_noupgrade(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: noupgrade: %s"), p);
-					} else if(!strcmp(key, "NOEXTRACT")) {
+					} else if(strcmp(origkey, "NoExtract") == 0 || strcmp(key, "NOEXTRACT") == 0) {
 						char *p = ptr;
 						char *q;

@@ -992,7 +994,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_noextract(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: noextract: %s"), p);
-					} else if(!strcmp(key, "IGNOREPKG")) {
+					} else if(strcmp(origkey, "IgnorePkg") == 0 || strcmp(key, "IGNOREPKG") == 0) {
 						char *p = ptr;
 						char *q;

@@ -1005,7 +1007,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_ignorepkg(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: ignorepkg: %s"), p);
-					} else if(!strcmp(key, "HOLDPKG")) {
+					} else if(strcmp(origkey, "HoldPkg") == 0 || strcmp(key, "HOLDPKG") == 0) {
 						char *p = ptr;
 						char *q;

@@ -1018,27 +1020,34 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_holdpkg(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: holdpkg: %s"), p);
-					} else if(!strcmp(key, "DBPATH")) {
+					} else if(strcmp(origkey, "DBPath") == 0 || strcmp(key, "DBPATH") == 0) {
 						/* shave off the leading slash, if there is one */
 						if(*ptr == '/') {
 							ptr++;
 						}
 						alpm_option_set_dbpath(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: dbpath: %s"), ptr);
-					} else if(!strcmp(key, "CACHEDIR")) {
+					} else if(strcmp(origkey, "CacheDir") == 0 || strcmp(key, "CACHEDIR") == 0) {
 						/* shave off the leading slash, if there is one */
 						if(*ptr == '/') {
 							ptr++;
 						}
 						alpm_option_set_cachedir(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: cachedir: %s"), ptr);
-					} else if (!strcmp(key, "LOGFILE")) {
+					} else if(strcmp(origkey, "RootDir") == 0 || strcmp(key, "ROOTDIR") == 0) {
+						/* shave off the leading slash, if there is one */
+						if(*ptr == '/') {
+							ptr++;
+						}
+						alpm_option_set_root(ptr);
+						_alpm_log(PM_LOG_DEBUG, _("config: rootdir: %s"), ptr);
+					} else if (strcmp(origkey, "LogFile") == 0 || strcmp(key, "LOGFILE") == 0) {
 						alpm_option_set_logfile(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: logfile: %s"), ptr);
-					} else if (!strcmp(key, "XFERCOMMAND")) {
+					} else if (strcmp(origkey, "XferCommand") == 0 || strcmp(key, "XFERCOMMAND") == 0) {
 						alpm_option_set_xfercommand(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: xfercommand: %s"), ptr);
-					} else if (!strcmp(key, "UPGRADEDELAY")) {
+					} else if (strcmp(origkey, "UpgradeDelay") == 0 || strcmp(key, "UPGRADEDELAY") == 0) {
 						/* The config value is in days, we use seconds */
 						time_t ud = atol(ptr) * 60 * 60 *24;
 						alpm_option_set_upgradedelay(ud);
@@ -1047,7 +1056,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1);
 					}
 				} else {
-					if(!strcmp(key, "SERVER")) {
+					if(strcmp(origkey, "Server") == 0 || strcmp(key, "SERVER") == 0) {
 						/* add to the list */
 						if(alpm_db_setserver(db, ptr) != 0) {
 							/* pm_errno is set by alpm_db_setserver */
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -371,7 +371,6 @@ typedef enum _pmdepmod_t {

 typedef enum _pmdeptype_t {
 	PM_DEP_TYPE_DEPEND = 1,
-	PM_DEP_TYPE_REQUIRED,
 	PM_DEP_TYPE_CONFLICT
 } pmdeptype_t;

--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -183,9 +183,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target)
 			return(NULL);
 		}
 		if(_alpm_pkg_splitname(ent->d_name, pkg->name, pkg->version, 0) == -1) {
-			/* TODO wow, string freeze so correct the below later: dabatase -> database */
-			/*_alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'"), ent->d_name);*/
-			_alpm_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), ent->d_name);
+			_alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'"), ent->d_name);
 			return(NULL);
 		}

--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -366,14 +366,14 @@ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
 	return(conflicts);
 }

+/* Find file conflicts that may occur during the transaction with two checks:
+ * 1: check every target against every target
+ * 2: check every target against the filesystem */
 alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
 {
-	alpm_list_t *i, *j, *k;
-	alpm_list_t *conflicts = NULL;
-	alpm_list_t *tmpfiles = NULL;
+	alpm_list_t *i, *conflicts = NULL;
 	alpm_list_t *targets = trans->packages;
 	int numtargs = alpm_list_count(targets);
-	double percent;

 	ALPM_LOG_FUNC;

@@ -382,17 +382,16 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
 	}

 	for(i = targets; i; i = i->next) {
+		alpm_list_t *j, *k, *tmpfiles = NULL;
 		pmpkg_t *p1, *p2, *dbpkg;
-		char *filestr = NULL;
 		char path[PATH_MAX+1];
-		struct stat buf;

 		p1 = i->data;
 		if(!p1) {
 			continue;
 		}

-		percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1)
+		double percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1)
 			                 / alpm_list_count(targets);
 		PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100),
 		         numtargs, (numtargs - alpm_list_count(i) +1));
@@ -407,7 +406,6 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
 			tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2));

 			if(tmpfiles) {
-				char path[PATH_MAX];
 				for(k = tmpfiles; k; k = k->next) {
 					snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data);
 					conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_TARGET, path,
@@ -418,6 +416,10 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
 			}
 		}

+		/* declarations for second check */
+		struct stat buf;
+		char *filestr = NULL;
+
 		/* CHECK 2: check every target against the filesystem */
 		_alpm_log(PM_LOG_DEBUG, "searching for filesystem conflicts: %s", p1->name);
 		dbpkg = _alpm_db_get_pkgfromcache(db, p1->name);
@@ -443,6 +445,26 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
 			if(lstat(path, &buf) == 0 && !S_ISDIR(buf.st_mode)) {
 				_alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s", path);

+				/* Make sure the possible conflict is not a symlink that points to a
+				 * path in the old package. This is kind of dirty with inode usage */
+				if(dbpkg) {
+					struct stat buf2;
+					char str[PATH_MAX+1];
+					unsigned ok = 0;
+					for(k = dbpkg->files; k; k = k->next) {
+						snprintf(str, PATH_MAX, "%s%s", root, (char*)k->data);
+						lstat(str, &buf2);
+						if(buf.st_ino == buf2.st_ino) {
+							ok = 1;
+							_alpm_log(PM_LOG_DEBUG, "conflict was a symlink: %s", path);
+							break;
+						}
+					}
+					if(ok == 1) {
+						continue;
+					}
+				}
+
 				/* Look at all the targets to see if file has changed hands */
 				int resolved_conflict = 0; /* have we acted on this conflict? */
 				for(k = targets; k; k = k->next) {
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -163,7 +163,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
 					for(l = alpm_pkg_get_provides(q); l; l = l->next) {
 						const char *provname = l->data;
 						if(!strcmp(depend->name, provname)) {
-							if(!_alpm_pkg_find(provname, tmptargs)) {
+							if(!_alpm_pkg_find(qname, tmptargs)) {
 								change = 1;
 								tmptargs = alpm_list_add(tmptargs, q);
 							}
@@ -288,7 +288,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
 						if(!satisfied) {
 							_alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"),
 												alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p));
-							miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend->mod,
+							miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend->mod,
 																			 depend->name, depend->version);
 							if(!_alpm_depmiss_isin(miss, baddeps)) {
 								baddeps = alpm_list_add(baddeps, miss);
@@ -408,7 +408,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
 					if(!found) {
 						_alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"),
 								reqname, alpm_pkg_get_name(tp));
-						miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_REQUIRED,
+						miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND,
 																		 PM_DEP_MOD_ANY, j->data, NULL);
 						if(!_alpm_depmiss_isin(miss, baddeps)) {
 							baddeps = alpm_list_add(baddeps, miss);
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -142,6 +142,14 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
 		_alpm_db_read(pkg->data, pkg, INFRQ_DESC);
 	}

+	if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) {
+		/* package should be ignored (IgnorePkg) */
+		_alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
+							alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
+							alpm_pkg_get_version(pkg));
+		return(0);
+	}
+
 	/* compare versions and see if we need to upgrade */
 	cmp = _alpm_versioncmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg));

@@ -158,13 +166,7 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
 		cmp = 0;
 	} else if(cmp > 0) {
 		/* we have an upgrade, make sure we should actually do it */
-		if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) {
-			/* package should be ignored (IgnorePkg) */
-			_alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
-								alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
-								alpm_pkg_get_version(pkg));
-			cmp = 0;
-		} else if(_alpm_pkg_istoonew(pkg)) {
+		if(_alpm_pkg_istoonew(pkg)) {
 			/* package too new (UpgradeDelay) */
 			_alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)"),
 								alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
--- a/lib/libalpm/po/LINGUAS
+++ b/lib/libalpm/po/LINGUAS
@@ -1,7 +1,10 @@
 # Set of available languages.
 de
+en_GB
+es
 fr
 hu
 it
+pl_PL
 pt_BR
-en_GB
+ru_RU
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/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: 2007-03-07 11:45-0500\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-03-07 21:05+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -40,7 +40,7 @@ msgstr "reading '%s' metadata"
 msgid "looking for unsatisfied dependencies"
 msgstr "looking for unsatisfied dependencies"

-#: lib/libalpm/add.c:203 lib/libalpm/sync.c:469
+#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483
 msgid "looking for conflicts"
 msgstr "looking for conflicts"

@@ -65,216 +65,216 @@ msgstr "cleaning up"
 msgid "looking for file conflicts"
 msgstr "looking for file conflicts"

-#: lib/libalpm/add.c:342
+#: lib/libalpm/add.c:346
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr "upgrading package %s-%s"

-#: lib/libalpm/add.c:366
+#: lib/libalpm/add.c:370
 #, c-format
 msgid "adding package %s-%s"
 msgstr "adding package %s-%s"

-#: lib/libalpm/add.c:379
+#: lib/libalpm/add.c:383
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr "removing old package first (%s-%s)"

-#: lib/libalpm/add.c:407
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "adding %s to the NoUpgrade array temporarily"
 msgstr "adding %s to the NoUpgrade array temporarily"

-#: lib/libalpm/add.c:425
+#: lib/libalpm/add.c:429
 msgid "extracting files"
 msgstr "extracting files"

-#: lib/libalpm/add.c:440 lib/libalpm/util.c:465
+#: lib/libalpm/add.c:444 lib/libalpm/util.c:465
 msgid "could not get current working directory"
 msgstr "could not get current working directory"

-#: lib/libalpm/add.c:496 lib/libalpm/add.c:497
+#: lib/libalpm/add.c:500 lib/libalpm/add.c:501
 #, c-format
 msgid "%s is in NoExtract, skipping extraction"
 msgstr "%s is in NoExtract, skipping extraction"

-#: lib/libalpm/add.c:504
+#: lib/libalpm/add.c:508
 #, c-format
 msgid "%s is in trans->skip_add, skipping extraction"
 msgstr "%s is in trans->skip_add, skipping extraction"

-#: lib/libalpm/add.c:550 lib/libalpm/add.c:551 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr "could not extract %s (%s)"

-#: lib/libalpm/add.c:594
+#: lib/libalpm/add.c:598
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr "checking md5 hashes for %s"

-#: lib/libalpm/add.c:596
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr "checking sha1 hashes for %s"

-#: lib/libalpm/add.c:598
+#: lib/libalpm/add.c:602
 #, c-format
 msgid "current:  %s"
 msgstr "current:  %s"

-#: lib/libalpm/add.c:599
+#: lib/libalpm/add.c:603
 #, c-format
 msgid "new:      %s"
 msgstr "new:      %s"

-#: lib/libalpm/add.c:600
+#: lib/libalpm/add.c:604
 #, c-format
 msgid "original: %s"
 msgstr "original: %s"

-#: lib/libalpm/add.c:612
+#: lib/libalpm/add.c:616
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr "could not rename %s (%s)"

-#: lib/libalpm/add.c:613
+#: lib/libalpm/add.c:617
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr "error: could not rename %s (%s)"

-#: lib/libalpm/add.c:619 lib/libalpm/add.c:638
+#: lib/libalpm/add.c:623 lib/libalpm/add.c:642
 #, c-format
 msgid "could not copy tempfile to %s (%s)"
 msgstr "could not copy tempfile to %s (%s)"

-#: lib/libalpm/add.c:620
+#: lib/libalpm/add.c:624
 #, c-format
 msgid "error: could not copy tempfile to %s (%s)"
 msgstr "error: could not copy tempfile to %s (%s)"

-#: lib/libalpm/add.c:624 lib/libalpm/remove.c:247
+#: lib/libalpm/add.c:628 lib/libalpm/remove.c:247
 #, c-format
 msgid "%s saved as %s"
 msgstr "%s saved as %s"

-#: lib/libalpm/add.c:625
+#: lib/libalpm/add.c:629
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "warning: %s saved as %s"

-#: lib/libalpm/add.c:635
+#: lib/libalpm/add.c:639
 #, c-format
 msgid "action: installing new file: %s"
 msgstr "action: installing new file: %s"

-#: lib/libalpm/add.c:645 lib/libalpm/add.c:651 lib/libalpm/add.c:656
+#: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660
 msgid "action: leaving existing file in place"
 msgstr "action: leaving existing file in place"

-#: lib/libalpm/add.c:659
+#: lib/libalpm/add.c:663
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 "action: keeping current file and installing new one with .pacnew ending"

-#: lib/libalpm/add.c:662
+#: lib/libalpm/add.c:666
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr "could not install %s as %s: %s"

-#: lib/libalpm/add.c:663
+#: lib/libalpm/add.c:667
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr "error: could not install %s as %s: %s"

-#: lib/libalpm/add.c:665
+#: lib/libalpm/add.c:669
 #, c-format
 msgid "%s installed as %s"
 msgstr "%s installed as %s"

-#: lib/libalpm/add.c:666
+#: lib/libalpm/add.c:670
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr "warning: %s installed as %s"

-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:684
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr "%s is in NoUpgrade -- skipping"

-#: lib/libalpm/add.c:681
+#: lib/libalpm/add.c:685
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr "extracting %s as %s.pacnew"

-#: lib/libalpm/add.c:682
+#: lib/libalpm/add.c:686
 #, c-format
 msgid "warning: extracting %s as %s.pacnew"
 msgstr "warning: extracting %s as %s.pacnew"

-#: lib/libalpm/add.c:685
+#: lib/libalpm/add.c:689
 #, c-format
 msgid "extracting %s"
 msgstr "extracting %s"

-#: lib/libalpm/add.c:701
+#: lib/libalpm/add.c:705
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr "error: could not extract %s (%s)"

-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "appending backup entry for %s"

-#: lib/libalpm/add.c:745 lib/libalpm/add.c:747
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "errors occurred while %s %s"

-#: lib/libalpm/add.c:746 lib/libalpm/add.c:748
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "upgrading"

-#: lib/libalpm/add.c:746 lib/libalpm/add.c:748
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "installing"

-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "provision '%s' has been removed from package %s (%s => %s)"

-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "updating '%s' due to provision change (%s)"

-#: lib/libalpm/add.c:781 lib/libalpm/add.c:782
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "could not update provision '%s' from '%s'"

-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:338
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "updating database"

-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "adding database entry '%s'"

-#: lib/libalpm/add.c:799 lib/libalpm/add.c:801
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "could not update database entry %s-%s"

-#: lib/libalpm/add.c:807
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "could not add entry '%s' in cache"

-#: lib/libalpm/add.c:840 lib/libalpm/remove.c:365 lib/libalpm/sync.c:1041
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "running \"ldconfig -r %s\""
@@ -371,107 +371,112 @@ msgstr "could not remove lock file %s"
 msgid "warning: could not remove lock file %s"
 msgstr "warning: could not remove lock file %s"

-#: lib/libalpm/alpm.c:919
+#: lib/libalpm/alpm.c:920
 #, c-format
 msgid "config: new section '%s'"
 msgstr "config: new section '%s'"

-#: lib/libalpm/alpm.c:948
+#: lib/libalpm/alpm.c:950
 msgid "config: nopassiveftp"
 msgstr "config: nopassiveftp"

-#: lib/libalpm/alpm.c:951
+#: lib/libalpm/alpm.c:953
 msgid "config: usesyslog"
 msgstr "config: usesyslog"

-#: lib/libalpm/alpm.c:954
+#: lib/libalpm/alpm.c:956
 msgid "config: chomp"
 msgstr "config: chomp"

-#: lib/libalpm/alpm.c:957
+#: lib/libalpm/alpm.c:959
 msgid "config: usecolor"
 msgstr "config: usecolor"

-#: lib/libalpm/alpm.c:966
+#: lib/libalpm/alpm.c:968
 #, c-format
 msgid "config: including %s"
 msgstr "config: including %s"

-#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981
+#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983
 #, c-format
 msgid "config: noupgrade: %s"
 msgstr "config: noupgrade: %s"

-#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994
+#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996
 #, c-format
 msgid "config: noextract: %s"
 msgstr "config: noextract: %s"

-#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007
+#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009
 #, c-format
 msgid "config: ignorepkg: %s"
 msgstr "config: ignorepkg: %s"

-#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020
+#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022
 #, c-format
 msgid "config: holdpkg: %s"
 msgstr "config: holdpkg: %s"

-#: lib/libalpm/alpm.c:1027
+#: lib/libalpm/alpm.c:1029
 #, c-format
 msgid "config: dbpath: %s"
 msgstr "config: dbpath: %s"

-#: lib/libalpm/alpm.c:1034
+#: lib/libalpm/alpm.c:1036
 #, c-format
 msgid "config: cachedir: %s"
 msgstr "config: cachedir: %s"

-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1043
+#, fuzzy, c-format
+msgid "config: rootdir: %s"
+msgstr "config: cachedir: %s"
+
+#: lib/libalpm/alpm.c:1046
 #, c-format
 msgid "config: logfile: %s"
 msgstr "config: logfile: %s"

-#: lib/libalpm/alpm.c:1040
+#: lib/libalpm/alpm.c:1049
 #, c-format
 msgid "config: xfercommand: %s"
 msgstr "config: xfercommand: %s"

-#: lib/libalpm/alpm.c:1045
+#: lib/libalpm/alpm.c:1054
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr "config: upgradedelay: %d"

-#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107
+#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107
 msgid "checking for package replacements"
 msgstr "checking for package replacements"

-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr "checking replacement '%s' for package '%s'"

-#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125
+#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"

-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr "%s-%s elected for upgrade (to be replaced by %s-%s)"

-#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194
+#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr "'%s' not found in sync db -- skipping"

-#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:495
+#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr "'%s' is already elected for removal -- skipping"

-#: lib/libalpm/alpm.c:1169
+#: lib/libalpm/alpm.c:1178
 #, c-format
 msgid "%s elected for upgrade (%s => %s)"
 msgstr "%s elected for upgrade (%s => %s)"
@@ -493,8 +498,8 @@ msgstr "db scan could not find package: %s"

 #: lib/libalpm/be_files.c:186
 #, c-format
-msgid "invalid name for dabatase entry '%s'"
-msgstr "invalid name for dabatase entry '%s'"
+msgid "invalid name for database entry '%s'"
+msgstr "invalid name for database entry '%s'"

 #: lib/libalpm/be_files.c:221
 msgid "invalid package entry provided to _alpm_db_read, skipping"
@@ -507,35 +512,35 @@ msgid ""
 msgstr ""
 "request to read database info for a file-based package '%s', skipping..."

-#: lib/libalpm/be_files.c:234
+#: lib/libalpm/be_files.c:239
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr "loading package data for %s : level=%d"

-#: lib/libalpm/be_files.c:242
+#: lib/libalpm/be_files.c:247
 #, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr "cannot find '%s-%s' in db '%s'"

-#: lib/libalpm/be_files.c:250 lib/libalpm/be_files.c:396
-#: lib/libalpm/be_files.c:419 lib/libalpm/be_files.c:510
-#: lib/libalpm/be_files.c:599 lib/libalpm/be_files.c:626
-#: lib/libalpm/package.c:206
+#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401
+#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515
+#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632
+#: lib/libalpm/package.c:208
 #, c-format
 msgid "could not open file %s: %s"
 msgstr "could not open file %s: %s"

-#: lib/libalpm/be_files.c:507
+#: lib/libalpm/be_files.c:512
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr "writing %s-%s DESC information back to db"

-#: lib/libalpm/be_files.c:596
+#: lib/libalpm/be_files.c:602
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr "writing %s-%s FILES information back to db"

-#: lib/libalpm/be_files.c:623
+#: lib/libalpm/be_files.c:629
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr "writing %s-%s DEPENDS information back to db"
@@ -628,8 +633,8 @@ msgstr "\tCONFLICTS:: %s conflicts with %s"
 #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438
 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45
 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67
-#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616 lib/libalpm/sync.c:713
-#: lib/libalpm/trans.c:55 lib/libalpm/util.c:611 lib/libalpm/util.c:618
+#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727
+#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr "malloc failure: could not allocate %d bytes"
@@ -655,8 +660,8 @@ msgstr "registering database '%s'"

 #: lib/libalpm/db.c:186
 #, c-format
-msgid "database directory '%s' does not exist, try creating it"
-msgstr "database directory '%s' does not exist, try creating it"
+msgid "database directory '%s' does not exist, creating it"
+msgstr "database directory '%s' does not exist, creating it"

 #: lib/libalpm/db.c:197
 #, c-format
@@ -856,7 +861,7 @@ msgstr "transaction aborted"
 msgid "operation not compatible with the transaction type"
 msgstr "operation not compatible with the transaction type"

-#: lib/libalpm/error.c:97 lib/libalpm/sync.c:980
+#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994
 msgid "could not commit transaction"
 msgstr "could not commit transaction"

@@ -998,70 +1003,70 @@ msgstr "%s can't be opened\n"
 msgid "md5(%s) = %s"
 msgstr "md5(%s) = %s"

-#: lib/libalpm/package.c:150
-#, c-format
-msgid "%s: forcing upgrade to version %s"
-msgstr "%s: forcing upgrade to version %s"
-
-#: lib/libalpm/package.c:155
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr "%s: local (%s) is newer than %s (%s)"
-
-#: lib/libalpm/package.c:163
+#: lib/libalpm/package.c:147
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr "%s-%s: ignoring package upgrade (%s)"

-#: lib/libalpm/package.c:169
+#: lib/libalpm/package.c:158
+#, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr "%s: forcing upgrade to version %s"
+
+#: lib/libalpm/package.c:163
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr "%s: local (%s) is newer than %s (%s)"
+
+#: lib/libalpm/package.c:171
 #, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr "%s-%s: delaying upgrade of package (%s)"

-#: lib/libalpm/package.c:220 lib/libalpm/package.c:279
+#: lib/libalpm/package.c:222 lib/libalpm/package.c:281
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr "%s: syntax error in description file line %d"

-#: lib/libalpm/package.c:353
+#: lib/libalpm/package.c:355
 msgid "could not parse the package description file"
 msgstr "could not parse the package description file"

-#: lib/libalpm/package.c:357
+#: lib/libalpm/package.c:359
 #, c-format
 msgid "missing package name in %s"
 msgstr "missing package name in %s"

-#: lib/libalpm/package.c:361
+#: lib/libalpm/package.c:363
 #, c-format
 msgid "missing package version in %s"
 msgstr "missing package version in %s"

-#: lib/libalpm/package.c:396
+#: lib/libalpm/package.c:398
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr "could not remove tempfile %s"

-#: lib/libalpm/package.c:409 lib/libalpm/package.c:416
+#: lib/libalpm/package.c:411 lib/libalpm/package.c:418
 #, c-format
 msgid "error while reading package: %s"
 msgstr "error while reading package: %s"

-#: lib/libalpm/package.c:422
+#: lib/libalpm/package.c:424
 msgid "missing package metadata"
 msgstr "missing package metadata"

-#: lib/libalpm/package.c:429
+#: lib/libalpm/package.c:431
 #, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr "missing package filelist in %s, generating one"

-#: lib/libalpm/package.c:562
+#: lib/libalpm/package.c:570
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr "adding '%s' in requiredby field for '%s'"

-#: lib/libalpm/package.c:573
+#: lib/libalpm/package.c:584
 #, c-format
 msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
 msgstr "adding '%s' in requiredby field for '%s' (provides: %s)"
@@ -1135,7 +1140,7 @@ msgstr "unlinking %s"
 msgid "cannot remove file %s: %s"
 msgstr "cannot remove file %s: %s"

-#: lib/libalpm/remove.c:292
+#: lib/libalpm/remove.c:294
 #, c-format
 msgid "removing package %s-%s"
 msgstr "removing package %s-%s"
@@ -1150,17 +1155,17 @@ msgstr "not removing package '%s', can't remove all files"
 msgid "removing %d files"
 msgstr "removing %d files"

-#: lib/libalpm/remove.c:339
+#: lib/libalpm/remove.c:337
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "removing database entry '%s'"

-#: lib/libalpm/remove.c:341
+#: lib/libalpm/remove.c:339
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "could not remove database entry %s-%s"

-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:344
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "could not remove entry '%s' from cache"
@@ -1184,224 +1189,224 @@ msgstr "checking for package upgrades"
 msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr "%s-%s elected for upgrade (%s => %s)"

-#: lib/libalpm/sync.c:262
+#: lib/libalpm/sync.c:270
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr "searching for target in repo '%s'"

-#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293
+#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr "target '%s' not found -- looking for provisions"

-#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr "found '%s' as a provision for '%s'"

-#: lib/libalpm/sync.c:282
+#: lib/libalpm/sync.c:290
 #, c-format
 msgid "repository '%s' not found"
 msgstr "repository '%s' not found"

-#: lib/libalpm/sync.c:323
+#: lib/libalpm/sync.c:331
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr "%s-%s is up to date -- skipping"

-#: lib/libalpm/sync.c:346
+#: lib/libalpm/sync.c:354
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr "adding target '%s' to the transaction set"

-#: lib/libalpm/sync.c:394
+#: lib/libalpm/sync.c:402
 msgid "resolving target's dependencies"
 msgstr "resolving target's dependencies"

-#: lib/libalpm/sync.c:414
+#: lib/libalpm/sync.c:422
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr "adding package %s-%s to the transaction targets"

-#: lib/libalpm/sync.c:449
+#: lib/libalpm/sync.c:463
 msgid "looking for unresolvable dependencies"
 msgstr "looking for unresolvable dependencies"

-#: lib/libalpm/sync.c:480
+#: lib/libalpm/sync.c:494
 #, c-format
 msgid "package '%s' conflicts with '%s'"
 msgstr "package '%s' conflicts with '%s'"

-#: lib/libalpm/sync.c:502
+#: lib/libalpm/sync.c:516
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr "'%s' not found in transaction set -- skipping"

-#: lib/libalpm/sync.c:513
+#: lib/libalpm/sync.c:527
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr "package '%s' provides its own conflict"

-#: lib/libalpm/sync.c:536 lib/libalpm/sync.c:541
+#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr "'%s' is in the target list -- keeping it"

-#: lib/libalpm/sync.c:553 lib/libalpm/sync.c:590
+#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604
 #, c-format
 msgid "removing '%s' from target list"
 msgstr "removing '%s' from target list"

-#: lib/libalpm/sync.c:562
+#: lib/libalpm/sync.c:576
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr "resolving package '%s' conflict"

-#: lib/libalpm/sync.c:585
+#: lib/libalpm/sync.c:599
 #, c-format
 msgid "electing '%s' for removal"
 msgstr "electing '%s' for removal"

-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:612
+#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626
 msgid "unresolvable package conflicts detected"
 msgstr "unresolvable package conflicts detected"

-#: lib/libalpm/sync.c:664
+#: lib/libalpm/sync.c:678
 msgid "checking dependencies of packages designated for removal"
 msgstr "checking dependencies of packages designated for removal"

-#: lib/libalpm/sync.c:678
+#: lib/libalpm/sync.c:692
 msgid "something has gone horribly wrong"
 msgstr "something has gone horribly wrong"

-#: lib/libalpm/sync.c:698
+#: lib/libalpm/sync.c:712
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr "found '%s' as a provision for '%s' -- conflict aborted"

-#: lib/libalpm/sync.c:794
+#: lib/libalpm/sync.c:808
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr "%s is already in the cache\n"

-#: lib/libalpm/sync.c:805
+#: lib/libalpm/sync.c:819
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "no %s cache exists, creating...\n"

-#: lib/libalpm/sync.c:806
+#: lib/libalpm/sync.c:820
 #, c-format
 msgid "warning: no %s cache exists, creating..."
 msgstr "warning: no %s cache exists, creating..."

-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:825
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "couldn't create package cache, using /tmp instead\n"

-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:826
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr "warning: couldn't create package cache, using /tmp instead"

-#: lib/libalpm/sync.c:819
+#: lib/libalpm/sync.c:833
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "failed to retrieve some files from %s\n"

-#: lib/libalpm/sync.c:849 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr "can't get md5 or sha1 checksum for package %s\n"

-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:894
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"

-#: lib/libalpm/sync.c:882
+#: lib/libalpm/sync.c:896
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"

-#: lib/libalpm/sync.c:903
+#: lib/libalpm/sync.c:917
 msgid "could not create removal transaction"
 msgstr "could not create removal transaction"

-#: lib/libalpm/sync.c:909
+#: lib/libalpm/sync.c:923
 msgid "could not initialize the removal transaction"
 msgstr "could not initialise the removal transaction"

-#: lib/libalpm/sync.c:929
+#: lib/libalpm/sync.c:943
 msgid "removing conflicting and to-be-replaced packages"
 msgstr "removing conflicting and to-be-replaced packages"

-#: lib/libalpm/sync.c:931
+#: lib/libalpm/sync.c:945
 msgid "could not prepare removal transaction"
 msgstr "could not prepare removal transaction"

-#: lib/libalpm/sync.c:937
+#: lib/libalpm/sync.c:951
 msgid "could not commit removal transaction"
 msgstr "could not commit removal transaction"

-#: lib/libalpm/sync.c:944
+#: lib/libalpm/sync.c:958
 msgid "installing packages"
 msgstr "installing packages"

-#: lib/libalpm/sync.c:947
+#: lib/libalpm/sync.c:961
 msgid "could not create transaction"
 msgstr "could not create transaction"

-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:966
 msgid "could not initialize transaction"
 msgstr "could not initialise transaction"

-#: lib/libalpm/sync.c:975
+#: lib/libalpm/sync.c:989
 msgid "could not prepare transaction"
 msgstr "could not prepare transaction"

-#: lib/libalpm/sync.c:987
+#: lib/libalpm/sync.c:1001
 msgid "updating database for replaced packages' dependencies"
 msgstr "updating database for replaced packages' dependencies"

-#: lib/libalpm/sync.c:1016
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr "could not update requiredby for database entry %s-%s"

-#: lib/libalpm/sync.c:1025
+#: lib/libalpm/sync.c:1039
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr "could not update new database entry %s-%s"

-#: lib/libalpm/sync.c:1065
+#: lib/libalpm/sync.c:1079
 #, c-format
 msgid "found package '%s-%s' in sync"
 msgstr "found package '%s-%s' in sync"

-#: lib/libalpm/sync.c:1071
+#: lib/libalpm/sync.c:1085
 #, c-format
 msgid "package '%s' not found in sync"
 msgstr "package '%s' not found in sync"

-#: lib/libalpm/trans.c:267
+#: lib/libalpm/trans.c:271
 #, c-format
 msgid "updating dependency packages 'requiredby' fields for %s-%s"
 msgstr "updating dependency packages 'requiredby' fields for %s-%s"

-#: lib/libalpm/trans.c:270
+#: lib/libalpm/trans.c:274
 msgid "package has no dependencies, no other packages to update"
 msgstr "package has no dependencies, no other packages to update"

-#: lib/libalpm/trans.c:307 lib/libalpm/trans.c:333
+#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr "updating 'requiredby' field for package '%s'"

-#: lib/libalpm/trans.c:318 lib/libalpm/trans.c:344
+#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr "could not update 'requiredby' database entry %s-%s"

-#: lib/libalpm/trans.c:325
+#: lib/libalpm/trans.c:333
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "could not find dependency '%s'"
@@ -1421,7 +1426,7 @@ msgstr "could not open %s: %s\n"
 msgid "could not extract %s: %s\n"
 msgstr "could not extract %s: %s\n"

-#: lib/libalpm/util.c:351
+#: lib/libalpm/util.c:350
 #, c-format
 msgid "logaction called: %s"
 msgstr "logaction called: %s"
@@ -1435,52 +1440,57 @@ msgstr "could not create temp directory"
 msgid "could not change directory to %s (%s)"
 msgstr "could not change directory to %s (%s)"

-#: lib/libalpm/util.c:475
+#: lib/libalpm/util.c:476
 #, c-format
 msgid "executing %s script..."
 msgstr "executing %s script..."

-#: lib/libalpm/util.c:488
+#: lib/libalpm/util.c:489
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr "could not fork a new process (%s)"

-#: lib/libalpm/util.c:495
+#: lib/libalpm/util.c:496
 #, c-format
 msgid "chrooting in %s"
 msgstr "chrooting in %s"

-#: lib/libalpm/util.c:497
+#: lib/libalpm/util.c:498
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr "could not change the root directory (%s)"

-#: lib/libalpm/util.c:501
+#: lib/libalpm/util.c:502
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr "could not change directory to / (%s)"

-#: lib/libalpm/util.c:505
+#: lib/libalpm/util.c:506
 #, c-format
 msgid "executing \"%s\""
 msgstr "executing \"%s\""

-#: lib/libalpm/util.c:508
+#: lib/libalpm/util.c:509
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "call to popen failed (%s)"

-#: lib/libalpm/util.c:540
+#: lib/libalpm/util.c:541
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr "call to waitpid failed (%s)"

-#: lib/libalpm/util.c:549
+#: lib/libalpm/util.c:550
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr "could not remove tmpdir %s"

-#: lib/libalpm/util.c:606
+#: lib/libalpm/util.c:568
+#, c-format
+msgid "cannot read disk space information from %s: %s"
+msgstr ""
+
+#: lib/libalpm/util.c:609
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr "check_freespace: total pkg size: %lld, disk space: %lld"
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-07 11:45-0500\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\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"
@@ -40,7 +40,7 @@ msgstr ""
 msgid "looking for unsatisfied dependencies"
 msgstr ""

-#: lib/libalpm/add.c:203 lib/libalpm/sync.c:469
+#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483
 msgid "looking for conflicts"
 msgstr ""

@@ -65,215 +65,215 @@ msgstr ""
 msgid "looking for file conflicts"
 msgstr ""

-#: lib/libalpm/add.c:342
+#: lib/libalpm/add.c:346
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr ""

-#: lib/libalpm/add.c:366
+#: lib/libalpm/add.c:370
 #, c-format
 msgid "adding package %s-%s"
 msgstr ""

-#: lib/libalpm/add.c:379
+#: lib/libalpm/add.c:383
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr ""

-#: lib/libalpm/add.c:407
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "adding %s to the NoUpgrade array temporarily"
 msgstr ""

-#: lib/libalpm/add.c:425
+#: lib/libalpm/add.c:429
 msgid "extracting files"
 msgstr ""

-#: lib/libalpm/add.c:440 lib/libalpm/util.c:465
+#: lib/libalpm/add.c:444 lib/libalpm/util.c:465
 msgid "could not get current working directory"
 msgstr ""

-#: lib/libalpm/add.c:496 lib/libalpm/add.c:497
+#: lib/libalpm/add.c:500 lib/libalpm/add.c:501
 #, c-format
 msgid "%s is in NoExtract, skipping extraction"
 msgstr ""

-#: lib/libalpm/add.c:504
+#: lib/libalpm/add.c:508
 #, c-format
 msgid "%s is in trans->skip_add, skipping extraction"
 msgstr ""

-#: lib/libalpm/add.c:550 lib/libalpm/add.c:551 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr ""

-#: lib/libalpm/add.c:594
+#: lib/libalpm/add.c:598
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr ""

-#: lib/libalpm/add.c:596
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr ""

-#: lib/libalpm/add.c:598
+#: lib/libalpm/add.c:602
 #, c-format
 msgid "current:  %s"
 msgstr ""

-#: lib/libalpm/add.c:599
+#: lib/libalpm/add.c:603
 #, c-format
 msgid "new:      %s"
 msgstr ""

-#: lib/libalpm/add.c:600
+#: lib/libalpm/add.c:604
 #, c-format
 msgid "original: %s"
 msgstr ""

-#: lib/libalpm/add.c:612
+#: lib/libalpm/add.c:616
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr ""

-#: lib/libalpm/add.c:613
+#: lib/libalpm/add.c:617
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr ""

-#: lib/libalpm/add.c:619 lib/libalpm/add.c:638
+#: lib/libalpm/add.c:623 lib/libalpm/add.c:642
 #, c-format
 msgid "could not copy tempfile to %s (%s)"
 msgstr ""

-#: lib/libalpm/add.c:620
+#: lib/libalpm/add.c:624
 #, c-format
 msgid "error: could not copy tempfile to %s (%s)"
 msgstr ""

-#: lib/libalpm/add.c:624 lib/libalpm/remove.c:247
+#: lib/libalpm/add.c:628 lib/libalpm/remove.c:247
 #, c-format
 msgid "%s saved as %s"
 msgstr ""

-#: lib/libalpm/add.c:625
+#: lib/libalpm/add.c:629
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""

-#: lib/libalpm/add.c:635
+#: lib/libalpm/add.c:639
 #, c-format
 msgid "action: installing new file: %s"
 msgstr ""

-#: lib/libalpm/add.c:645 lib/libalpm/add.c:651 lib/libalpm/add.c:656
+#: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660
 msgid "action: leaving existing file in place"
 msgstr ""

-#: lib/libalpm/add.c:659
-msgid "action: keeping current file and installing new one with .pacnew ending"
-msgstr ""
-
-#: lib/libalpm/add.c:662
-#, c-format
-msgid "could not install %s as %s: %s"
-msgstr ""
-
 #: lib/libalpm/add.c:663
-#, c-format
-msgid "error: could not install %s as %s: %s"
-msgstr ""
-
-#: lib/libalpm/add.c:665
-#, c-format
-msgid "%s installed as %s"
+msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""

 #: lib/libalpm/add.c:666
 #, c-format
+msgid "could not install %s as %s: %s"
+msgstr ""
+
+#: lib/libalpm/add.c:667
+#, c-format
+msgid "error: could not install %s as %s: %s"
+msgstr ""
+
+#: lib/libalpm/add.c:669
+#, c-format
+msgid "%s installed as %s"
+msgstr ""
+
+#: lib/libalpm/add.c:670
+#, c-format
 msgid "warning: %s installed as %s"
 msgstr ""

-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:684
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr ""

-#: lib/libalpm/add.c:681
+#: lib/libalpm/add.c:685
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr ""

-#: lib/libalpm/add.c:682
+#: lib/libalpm/add.c:686
 #, c-format
 msgid "warning: extracting %s as %s.pacnew"
 msgstr ""

-#: lib/libalpm/add.c:685
+#: lib/libalpm/add.c:689
 #, c-format
 msgid "extracting %s"
 msgstr ""

-#: lib/libalpm/add.c:701
+#: lib/libalpm/add.c:705
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr ""

-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr ""

-#: lib/libalpm/add.c:745 lib/libalpm/add.c:747
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr ""

-#: lib/libalpm/add.c:746 lib/libalpm/add.c:748
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr ""

-#: lib/libalpm/add.c:746 lib/libalpm/add.c:748
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr ""

-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr ""

-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr ""

-#: lib/libalpm/add.c:781 lib/libalpm/add.c:782
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr ""

-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:338
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr ""

-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr ""

-#: lib/libalpm/add.c:799 lib/libalpm/add.c:801
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr ""

-#: lib/libalpm/add.c:807
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr ""

-#: lib/libalpm/add.c:840 lib/libalpm/remove.c:365 lib/libalpm/sync.c:1041
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr ""
@@ -369,107 +369,112 @@ msgstr ""
 msgid "warning: could not remove lock file %s"
 msgstr ""

-#: lib/libalpm/alpm.c:919
+#: lib/libalpm/alpm.c:920
 #, c-format
 msgid "config: new section '%s'"
 msgstr ""

-#: lib/libalpm/alpm.c:948
+#: lib/libalpm/alpm.c:950
 msgid "config: nopassiveftp"
 msgstr ""

-#: lib/libalpm/alpm.c:951
+#: lib/libalpm/alpm.c:953
 msgid "config: usesyslog"
 msgstr ""

-#: lib/libalpm/alpm.c:954
+#: lib/libalpm/alpm.c:956
 msgid "config: chomp"
 msgstr ""

-#: lib/libalpm/alpm.c:957
+#: lib/libalpm/alpm.c:959
 msgid "config: usecolor"
 msgstr ""

-#: lib/libalpm/alpm.c:966
+#: lib/libalpm/alpm.c:968
 #, c-format
 msgid "config: including %s"
 msgstr ""

-#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981
+#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983
 #, c-format
 msgid "config: noupgrade: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994
+#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996
 #, c-format
 msgid "config: noextract: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007
+#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009
 #, c-format
 msgid "config: ignorepkg: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020
+#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022
 #, c-format
 msgid "config: holdpkg: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:1027
+#: lib/libalpm/alpm.c:1029
 #, c-format
 msgid "config: dbpath: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:1034
+#: lib/libalpm/alpm.c:1036
 #, c-format
 msgid "config: cachedir: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1043
+#, c-format
+msgid "config: rootdir: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1046
 #, c-format
 msgid "config: logfile: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:1040
+#: lib/libalpm/alpm.c:1049
 #, c-format
 msgid "config: xfercommand: %s"
 msgstr ""

-#: lib/libalpm/alpm.c:1045
+#: lib/libalpm/alpm.c:1054
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr ""

-#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107
+#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107
 msgid "checking for package replacements"
 msgstr ""

-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr ""

-#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125
+#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""

-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""

-#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194
+#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr ""

-#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:495
+#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr ""

-#: lib/libalpm/alpm.c:1169
+#: lib/libalpm/alpm.c:1178
 #, c-format
 msgid "%s elected for upgrade (%s => %s)"
 msgstr ""
@@ -491,7 +496,7 @@ msgstr ""

 #: lib/libalpm/be_files.c:186
 #, c-format
-msgid "invalid name for dabatase entry '%s'"
+msgid "invalid name for database entry '%s'"
 msgstr ""

 #: lib/libalpm/be_files.c:221
@@ -504,35 +509,35 @@ msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""

-#: lib/libalpm/be_files.c:234
+#: lib/libalpm/be_files.c:239
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""

-#: lib/libalpm/be_files.c:242
+#: lib/libalpm/be_files.c:247
 #, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr ""

-#: lib/libalpm/be_files.c:250 lib/libalpm/be_files.c:396
-#: lib/libalpm/be_files.c:419 lib/libalpm/be_files.c:510
-#: lib/libalpm/be_files.c:599 lib/libalpm/be_files.c:626
-#: lib/libalpm/package.c:206
+#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401
+#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515
+#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632
+#: lib/libalpm/package.c:208
 #, c-format
 msgid "could not open file %s: %s"
 msgstr ""

-#: lib/libalpm/be_files.c:507
+#: lib/libalpm/be_files.c:512
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""

-#: lib/libalpm/be_files.c:596
+#: lib/libalpm/be_files.c:602
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""

-#: lib/libalpm/be_files.c:623
+#: lib/libalpm/be_files.c:629
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
@@ -625,8 +630,8 @@ msgstr ""
 #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438
 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45
 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67
-#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616 lib/libalpm/sync.c:713
-#: lib/libalpm/trans.c:55 lib/libalpm/util.c:611 lib/libalpm/util.c:618
+#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727
+#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr ""
@@ -652,7 +657,7 @@ msgstr ""

 #: lib/libalpm/db.c:186
 #, c-format
-msgid "database directory '%s' does not exist, try creating it"
+msgid "database directory '%s' does not exist, creating it"
 msgstr ""

 #: lib/libalpm/db.c:197
@@ -852,7 +857,7 @@ msgstr ""
 msgid "operation not compatible with the transaction type"
 msgstr ""

-#: lib/libalpm/error.c:97 lib/libalpm/sync.c:980
+#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994
 msgid "could not commit transaction"
 msgstr ""

@@ -994,70 +999,70 @@ msgstr ""
 msgid "md5(%s) = %s"
 msgstr ""

-#: lib/libalpm/package.c:150
-#, c-format
-msgid "%s: forcing upgrade to version %s"
-msgstr ""
-
-#: lib/libalpm/package.c:155
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr ""
-
-#: lib/libalpm/package.c:163
+#: lib/libalpm/package.c:147
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr ""

-#: lib/libalpm/package.c:169
+#: lib/libalpm/package.c:158
+#, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr ""
+
+#: lib/libalpm/package.c:163
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:171
 #, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr ""

-#: lib/libalpm/package.c:220 lib/libalpm/package.c:279
+#: lib/libalpm/package.c:222 lib/libalpm/package.c:281
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr ""

-#: lib/libalpm/package.c:353
+#: lib/libalpm/package.c:355
 msgid "could not parse the package description file"
 msgstr ""

-#: lib/libalpm/package.c:357
+#: lib/libalpm/package.c:359
 #, c-format
 msgid "missing package name in %s"
 msgstr ""

-#: lib/libalpm/package.c:361
+#: lib/libalpm/package.c:363
 #, c-format
 msgid "missing package version in %s"
 msgstr ""

-#: lib/libalpm/package.c:396
+#: lib/libalpm/package.c:398
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr ""

-#: lib/libalpm/package.c:409 lib/libalpm/package.c:416
+#: lib/libalpm/package.c:411 lib/libalpm/package.c:418
 #, c-format
 msgid "error while reading package: %s"
 msgstr ""

-#: lib/libalpm/package.c:422
+#: lib/libalpm/package.c:424
 msgid "missing package metadata"
 msgstr ""

-#: lib/libalpm/package.c:429
+#: lib/libalpm/package.c:431
 #, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr ""

-#: lib/libalpm/package.c:562
+#: lib/libalpm/package.c:570
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr ""

-#: lib/libalpm/package.c:573
+#: lib/libalpm/package.c:584
 #, c-format
 msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
 msgstr ""
@@ -1131,7 +1136,7 @@ msgstr ""
 msgid "cannot remove file %s: %s"
 msgstr ""

-#: lib/libalpm/remove.c:292
+#: lib/libalpm/remove.c:294
 #, c-format
 msgid "removing package %s-%s"
 msgstr ""
@@ -1146,17 +1151,17 @@ msgstr ""
 msgid "removing %d files"
 msgstr ""

-#: lib/libalpm/remove.c:339
+#: lib/libalpm/remove.c:337
 #, c-format
 msgid "removing database entry '%s'"
 msgstr ""

-#: lib/libalpm/remove.c:341
+#: lib/libalpm/remove.c:339
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr ""

-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:344
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr ""
@@ -1180,224 +1185,224 @@ msgstr ""
 msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr ""

-#: lib/libalpm/sync.c:262
+#: lib/libalpm/sync.c:270
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr ""

-#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293
+#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""

-#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""

-#: lib/libalpm/sync.c:282
+#: lib/libalpm/sync.c:290
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""

-#: lib/libalpm/sync.c:323
+#: lib/libalpm/sync.c:331
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr ""

-#: lib/libalpm/sync.c:346
+#: lib/libalpm/sync.c:354
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""

-#: lib/libalpm/sync.c:394
+#: lib/libalpm/sync.c:402
 msgid "resolving target's dependencies"
 msgstr ""

-#: lib/libalpm/sync.c:414
+#: lib/libalpm/sync.c:422
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""

-#: lib/libalpm/sync.c:449
+#: lib/libalpm/sync.c:463
 msgid "looking for unresolvable dependencies"
 msgstr ""

-#: lib/libalpm/sync.c:480
+#: lib/libalpm/sync.c:494
 #, c-format
 msgid "package '%s' conflicts with '%s'"
 msgstr ""

-#: lib/libalpm/sync.c:502
+#: lib/libalpm/sync.c:516
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""

-#: lib/libalpm/sync.c:513
+#: lib/libalpm/sync.c:527
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""

-#: lib/libalpm/sync.c:536 lib/libalpm/sync.c:541
+#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""

-#: lib/libalpm/sync.c:553 lib/libalpm/sync.c:590
+#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604
 #, c-format
 msgid "removing '%s' from target list"
 msgstr ""

-#: lib/libalpm/sync.c:562
+#: lib/libalpm/sync.c:576
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""

-#: lib/libalpm/sync.c:585
+#: lib/libalpm/sync.c:599
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""

-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:612
+#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626
 msgid "unresolvable package conflicts detected"
 msgstr ""

-#: lib/libalpm/sync.c:664
+#: lib/libalpm/sync.c:678
 msgid "checking dependencies of packages designated for removal"
 msgstr ""

-#: lib/libalpm/sync.c:678
+#: lib/libalpm/sync.c:692
 msgid "something has gone horribly wrong"
 msgstr ""

-#: lib/libalpm/sync.c:698
+#: lib/libalpm/sync.c:712
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""

-#: lib/libalpm/sync.c:794
+#: lib/libalpm/sync.c:808
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""

-#: lib/libalpm/sync.c:805
+#: lib/libalpm/sync.c:819
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr ""

-#: lib/libalpm/sync.c:806
+#: lib/libalpm/sync.c:820
 #, c-format
 msgid "warning: no %s cache exists, creating..."
 msgstr ""

-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:825
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""

-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:826
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""

-#: lib/libalpm/sync.c:819
+#: lib/libalpm/sync.c:833
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""

-#: lib/libalpm/sync.c:849 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr ""

-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:894
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""

-#: lib/libalpm/sync.c:882
+#: lib/libalpm/sync.c:896
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""

-#: lib/libalpm/sync.c:903
+#: lib/libalpm/sync.c:917
 msgid "could not create removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:909
+#: lib/libalpm/sync.c:923
 msgid "could not initialize the removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:929
+#: lib/libalpm/sync.c:943
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""

-#: lib/libalpm/sync.c:931
+#: lib/libalpm/sync.c:945
 msgid "could not prepare removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:937
+#: lib/libalpm/sync.c:951
 msgid "could not commit removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:944
+#: lib/libalpm/sync.c:958
 msgid "installing packages"
 msgstr ""

-#: lib/libalpm/sync.c:947
+#: lib/libalpm/sync.c:961
 msgid "could not create transaction"
 msgstr ""

-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:966
 msgid "could not initialize transaction"
 msgstr ""

-#: lib/libalpm/sync.c:975
+#: lib/libalpm/sync.c:989
 msgid "could not prepare transaction"
 msgstr ""

-#: lib/libalpm/sync.c:987
+#: lib/libalpm/sync.c:1001
 msgid "updating database for replaced packages' dependencies"
 msgstr ""

-#: lib/libalpm/sync.c:1016
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""

-#: lib/libalpm/sync.c:1025
+#: lib/libalpm/sync.c:1039
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr ""

-#: lib/libalpm/sync.c:1065
+#: lib/libalpm/sync.c:1079
 #, c-format
 msgid "found package '%s-%s' in sync"
 msgstr ""

-#: lib/libalpm/sync.c:1071
+#: lib/libalpm/sync.c:1085
 #, c-format
 msgid "package '%s' not found in sync"
 msgstr ""

-#: lib/libalpm/trans.c:267
+#: lib/libalpm/trans.c:271
 #, c-format
 msgid "updating dependency packages 'requiredby' fields for %s-%s"
 msgstr ""

-#: lib/libalpm/trans.c:270
+#: lib/libalpm/trans.c:274
 msgid "package has no dependencies, no other packages to update"
 msgstr ""

-#: lib/libalpm/trans.c:307 lib/libalpm/trans.c:333
+#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr ""

-#: lib/libalpm/trans.c:318 lib/libalpm/trans.c:344
+#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""

-#: lib/libalpm/trans.c:325
+#: lib/libalpm/trans.c:333
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr ""
@@ -1417,7 +1422,7 @@ msgstr ""
 msgid "could not extract %s: %s\n"
 msgstr ""

-#: lib/libalpm/util.c:351
+#: lib/libalpm/util.c:350
 #, c-format
 msgid "logaction called: %s"
 msgstr ""
@@ -1431,52 +1436,57 @@ msgstr ""
 msgid "could not change directory to %s (%s)"
 msgstr ""

-#: lib/libalpm/util.c:475
+#: lib/libalpm/util.c:476
 #, c-format
 msgid "executing %s script..."
 msgstr ""

-#: lib/libalpm/util.c:488
+#: lib/libalpm/util.c:489
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr ""

-#: lib/libalpm/util.c:495
+#: lib/libalpm/util.c:496
 #, c-format
 msgid "chrooting in %s"
 msgstr ""

-#: lib/libalpm/util.c:497
+#: lib/libalpm/util.c:498
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr ""

-#: lib/libalpm/util.c:501
+#: lib/libalpm/util.c:502
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr ""

-#: lib/libalpm/util.c:505
+#: lib/libalpm/util.c:506
 #, c-format
 msgid "executing \"%s\""
 msgstr ""

-#: lib/libalpm/util.c:508
+#: lib/libalpm/util.c:509
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""

-#: lib/libalpm/util.c:540
+#: lib/libalpm/util.c:541
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr ""

-#: lib/libalpm/util.c:549
+#: lib/libalpm/util.c:550
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr ""

-#: lib/libalpm/util.c:606
+#: lib/libalpm/util.c:568
+#, c-format
+msgid "cannot read disk space information from %s: %s"
+msgstr ""
+
+#: lib/libalpm/util.c:609
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
--- a/lib/libalpm/po/pl_PL.po
+++ b/lib/libalpm/po/pl_PL.po
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-07 11:45-0500\n"
+"POT-Creation-Date: 2007-06-17 20:11-0400\n"
 "PO-Revision-Date: 2007-03-07 01:18-0300\n"
 "Last-Translator: Douglas Soares de Andrade <dsandrade@gmail.com>\n"
 "Language-Team: Português do Brasil <pt@li.org>\n"
@@ -46,7 +46,7 @@ msgstr "lendo os metadados de '%s'"
 msgid "looking for unsatisfied dependencies"
 msgstr "procurando por dependências não satisfeitas"

-#: lib/libalpm/add.c:203 lib/libalpm/sync.c:469
+#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483
 msgid "looking for conflicts"
 msgstr "procurando por conflitos"

@@ -71,217 +71,217 @@ msgstr "finalizando"
 msgid "looking for file conflicts"
 msgstr "procurando por conflitos de arquivos"

-#: lib/libalpm/add.c:342
+#: lib/libalpm/add.c:346
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr "atualizando pacote %s-%s"

-#: lib/libalpm/add.c:366
+#: lib/libalpm/add.c:370
 #, c-format
 msgid "adding package %s-%s"
 msgstr "adicionando pacote %s-%s"

-#: lib/libalpm/add.c:379
+#: lib/libalpm/add.c:383
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr "removendo pacotes antigos primeiro (%s-%s)"

-#: lib/libalpm/add.c:407
+#: lib/libalpm/add.c:411
 #, c-format
 msgid "adding %s to the NoUpgrade array temporarily"
 msgstr "adicionando %s para NoUpgrade temporariamente"

-#: lib/libalpm/add.c:425
+#: lib/libalpm/add.c:429
 msgid "extracting files"
 msgstr "extraindo arquivos"

-#: lib/libalpm/add.c:440 lib/libalpm/util.c:465
+#: lib/libalpm/add.c:444 lib/libalpm/util.c:465
 msgid "could not get current working directory"
 msgstr "não foi possível obter o diretório de trabalho atual"

-#: lib/libalpm/add.c:496 lib/libalpm/add.c:497
+#: lib/libalpm/add.c:500 lib/libalpm/add.c:501
 #, c-format
 msgid "%s is in NoExtract, skipping extraction"
 msgstr "%s está incluso em NoExtract -- não descompactando"

-#: lib/libalpm/add.c:504
+#: lib/libalpm/add.c:508
 #, c-format
 msgid "%s is in trans->skip_add, skipping extraction"
 msgstr "o pacote %s está incluso em trans->skip_add, não descompactando"

-#: lib/libalpm/add.c:550 lib/libalpm/add.c:551 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr "não foi possível extrair %s (%s)"

-#: lib/libalpm/add.c:594
+#: lib/libalpm/add.c:598
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr "verificando hashes md5 para %s"

-#: lib/libalpm/add.c:596
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr "verificando hashes sha1 para %s"

-#: lib/libalpm/add.c:598
+#: lib/libalpm/add.c:602
 #, c-format
 msgid "current:  %s"
 msgstr "atual:  %s"

-#: lib/libalpm/add.c:599
+#: lib/libalpm/add.c:603
 #, c-format
 msgid "new:      %s"
 msgstr "novo:      %s"

-#: lib/libalpm/add.c:600
+#: lib/libalpm/add.c:604
 #, c-format
 msgid "original: %s"
 msgstr "original: %s"

-#: lib/libalpm/add.c:612
+#: lib/libalpm/add.c:616
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr "não foi possível renomear %s (%s)"

-#: lib/libalpm/add.c:613
+#: lib/libalpm/add.c:617
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr "erro: não foi possível renomear %s (%s)"

-#: lib/libalpm/add.c:619 lib/libalpm/add.c:638
+#: lib/libalpm/add.c:623 lib/libalpm/add.c:642
 #, c-format
 msgid "could not copy tempfile to %s (%s)"
 msgstr "não foi possível copiar arquivo temporário para %s (%s)"

-#: lib/libalpm/add.c:620
+#: lib/libalpm/add.c:624
 #, c-format
 msgid "error: could not copy tempfile to %s (%s)"
 msgstr "erro: não foi possível copiar arquivo temporário para %s (%s)"

-#: lib/libalpm/add.c:624 lib/libalpm/remove.c:247
+#: lib/libalpm/add.c:628 lib/libalpm/remove.c:247
 #, c-format
 msgid "%s saved as %s"
 msgstr "%s salvo como %s"

-#: lib/libalpm/add.c:625
+#: lib/libalpm/add.c:629
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "aviso: %s salvo como %s"

-#: lib/libalpm/add.c:635
+#: lib/libalpm/add.c:639
 #, c-format
 msgid "action: installing new file: %s"
 msgstr "ação: instalando novo arquivo: %s"

-#: lib/libalpm/add.c:645 lib/libalpm/add.c:651 lib/libalpm/add.c:656
+#: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660
 msgid "action: leaving existing file in place"
 msgstr "ação: preservando o arquivo existente"

-#: lib/libalpm/add.c:659
+#: lib/libalpm/add.c:663
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 "ação: preservando o arquivo existente e instalando o novo com um final ."
 "pacnew"

-#: lib/libalpm/add.c:662
+#: lib/libalpm/add.c:666
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr "não foi possível instalar %s como %s: %s"

-#: lib/libalpm/add.c:663
+#: lib/libalpm/add.c:667
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr "erro: não foi possível instalar %s como %s: %s"

-#: lib/libalpm/add.c:665
+#: lib/libalpm/add.c:669
 #, c-format
 msgid "%s installed as %s"
 msgstr "%s instalado como %s"

-#: lib/libalpm/add.c:666
+#: lib/libalpm/add.c:670
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr "atenção: %s instalado como %s"

-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:684
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr "%s está como NoUpgrade -- pulando"

-#: lib/libalpm/add.c:681
+#: lib/libalpm/add.c:685
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr "extraindo %s como %s.pacnew"

-#: lib/libalpm/add.c:682
+#: lib/libalpm/add.c:686
 #, c-format
 msgid "warning: extracting %s as %s.pacnew"
 msgstr "aviso: extraindo %s como %s.pacnew"

-#: lib/libalpm/add.c:685
+#: lib/libalpm/add.c:689
 #, c-format
 msgid "extracting %s"
 msgstr "extraindo %s"

-#: lib/libalpm/add.c:701
+#: lib/libalpm/add.c:705
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr "erro: não foi possível descompactar %s (%s)"

-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "appending backup entry for %s"
 msgstr "adicionando entrada de backup para %s"

-#: lib/libalpm/add.c:745 lib/libalpm/add.c:747
+#: lib/libalpm/add.c:751 lib/libalpm/add.c:753
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "erros ocorreram durante %s %s"

-#: lib/libalpm/add.c:746 lib/libalpm/add.c:748
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "upgrading"
 msgstr "atualizando"

-#: lib/libalpm/add.c:746 lib/libalpm/add.c:748
+#: lib/libalpm/add.c:752 lib/libalpm/add.c:754
 msgid "installing"
 msgstr "instalando"

-#: lib/libalpm/add.c:765
+#: lib/libalpm/add.c:771
 #, c-format
 msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "a provisão '%s' foi removida do pacote %s (%s => %s)"

-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:783
 #, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "atualizando '%s' devido a uma mudança de provisão (%s)"

-#: lib/libalpm/add.c:781 lib/libalpm/add.c:782
+#: lib/libalpm/add.c:787 lib/libalpm/add.c:788
 #, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "não foi possível atualizar a provisão '%s' para '%s'"

-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:338
+#: lib/libalpm/add.c:801 lib/libalpm/remove.c:336
 msgid "updating database"
 msgstr "atualizando base de dados"

-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:802
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "adicionando a entrada de base de dados '%s'"

-#: lib/libalpm/add.c:799 lib/libalpm/add.c:801
+#: lib/libalpm/add.c:805 lib/libalpm/add.c:807
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "não foi possível atualizar a entrada na base de dados %s-%s"

-#: lib/libalpm/add.c:807
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "não foi possível adicionar a entrada '%s' ao cache"

-#: lib/libalpm/add.c:840 lib/libalpm/remove.c:365 lib/libalpm/sync.c:1041
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "executando \"ldconfig -r %s\""
@@ -380,107 +380,112 @@ msgstr "não foi possível remover o arquivo de lock %s"
 msgid "warning: could not remove lock file %s"
 msgstr "aviso: não foi possível remover o arquivo de lock %s"

-#: lib/libalpm/alpm.c:919
+#: lib/libalpm/alpm.c:920
 #, c-format
 msgid "config: new section '%s'"
 msgstr "configuração: nova seção '%s'"

-#: lib/libalpm/alpm.c:948
+#: lib/libalpm/alpm.c:950
 msgid "config: nopassiveftp"
 msgstr "configuração: nopassiveftp"

-#: lib/libalpm/alpm.c:951
+#: lib/libalpm/alpm.c:953
 msgid "config: usesyslog"
 msgstr "configuração: usesyslog"

-#: lib/libalpm/alpm.c:954
+#: lib/libalpm/alpm.c:956
 msgid "config: chomp"
 msgstr "configuração: chomp"

-#: lib/libalpm/alpm.c:957
+#: lib/libalpm/alpm.c:959
 msgid "config: usecolor"
 msgstr "configuração: usecolor"

-#: lib/libalpm/alpm.c:966
+#: lib/libalpm/alpm.c:968
 #, c-format
 msgid "config: including %s"
 msgstr "configuração: including %s"

-#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981
+#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983
 #, c-format
 msgid "config: noupgrade: %s"
 msgstr "configuração: noupgrade: %s"

-#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994
+#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996
 #, c-format
 msgid "config: noextract: %s"
 msgstr "configuração: noextract: %s"

-#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007
+#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009
 #, c-format
 msgid "config: ignorepkg: %s"
 msgstr "configuração: ignorepkg: %s"

-#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020
+#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022
 #, c-format
 msgid "config: holdpkg: %s"
 msgstr "configuração: holdpkg: %s"

-#: lib/libalpm/alpm.c:1027
+#: lib/libalpm/alpm.c:1029
 #, c-format
 msgid "config: dbpath: %s"
 msgstr "configuração: dbpath: %s"

-#: lib/libalpm/alpm.c:1034
+#: lib/libalpm/alpm.c:1036
 #, c-format
 msgid "config: cachedir: %s"
 msgstr "configuração: cachedir: %s"

-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1043
+#, fuzzy, c-format
+msgid "config: rootdir: %s"
+msgstr "configuração: cachedir: %s"
+
+#: lib/libalpm/alpm.c:1046
 #, c-format
 msgid "config: logfile: %s"
 msgstr "configuração: logfile: %s"

-#: lib/libalpm/alpm.c:1040
+#: lib/libalpm/alpm.c:1049
 #, c-format
 msgid "config: xfercommand: %s"
 msgstr "configuração: xfercommand: %s"

-#: lib/libalpm/alpm.c:1045
+#: lib/libalpm/alpm.c:1054
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr "configuração: upgradedelay: %d"

-#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107
+#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107
 msgid "checking for package replacements"
 msgstr "verificando por substitutos do pacote"

-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr "verificando substituto '%s' para o pacote '%s'"

-#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125
+#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""

-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""

-#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194
+#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr ""

-#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:495
+#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr ""

-#: lib/libalpm/alpm.c:1169
+#: lib/libalpm/alpm.c:1178
 #, c-format
 msgid "%s elected for upgrade (%s => %s)"
 msgstr ""
@@ -491,7 +496,7 @@ msgid "unpacking database '%s'"
 msgstr "descompactando base de dados '%s'"

 #: lib/libalpm/be_files.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "opening database from path '%s'"
 msgstr "abrindo base de dados '%s'"

@@ -502,7 +507,7 @@ msgstr "não foi possível encontrar a base de dados"

 #: lib/libalpm/be_files.c:186
 #, c-format
-msgid "invalid name for dabatase entry '%s'"
+msgid "invalid name for database entry '%s'"
 msgstr "nome inválido para a entrada na base de dados '%s'"

 #: lib/libalpm/be_files.c:221
@@ -515,35 +520,35 @@ msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""

-#: lib/libalpm/be_files.c:234
+#: lib/libalpm/be_files.c:239
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""

-#: lib/libalpm/be_files.c:242
+#: lib/libalpm/be_files.c:247
 #, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr ""

-#: lib/libalpm/be_files.c:250 lib/libalpm/be_files.c:396
-#: lib/libalpm/be_files.c:419 lib/libalpm/be_files.c:510
-#: lib/libalpm/be_files.c:599 lib/libalpm/be_files.c:626
-#: lib/libalpm/package.c:206
+#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401
+#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515
+#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632
+#: lib/libalpm/package.c:208
 #, c-format
 msgid "could not open file %s: %s"
 msgstr "não foi possível abrir o arquivo %s: %s"

-#: lib/libalpm/be_files.c:507
+#: lib/libalpm/be_files.c:512
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""

-#: lib/libalpm/be_files.c:596
+#: lib/libalpm/be_files.c:602
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""

-#: lib/libalpm/be_files.c:623
+#: lib/libalpm/be_files.c:629
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
@@ -636,8 +641,8 @@ msgstr ""
 #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438
 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45
 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67
-#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616 lib/libalpm/sync.c:713
-#: lib/libalpm/trans.c:55 lib/libalpm/util.c:611 lib/libalpm/util.c:618
+#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727
+#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr ""
@@ -663,7 +668,7 @@ msgstr ""

 #: lib/libalpm/db.c:186
 #, c-format
-msgid "database directory '%s' does not exist, try creating it"
+msgid "database directory '%s' does not exist, creating it"
 msgstr ""

 #: lib/libalpm/db.c:197
@@ -863,7 +868,7 @@ msgstr ""
 msgid "operation not compatible with the transaction type"
 msgstr ""

-#: lib/libalpm/error.c:97 lib/libalpm/sync.c:980
+#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994
 msgid "could not commit transaction"
 msgstr ""

@@ -1005,70 +1010,70 @@ msgstr ""
 msgid "md5(%s) = %s"
 msgstr ""

-#: lib/libalpm/package.c:150
-#, c-format
-msgid "%s: forcing upgrade to version %s"
-msgstr ""
-
-#: lib/libalpm/package.c:155
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr ""
-
-#: lib/libalpm/package.c:163
+#: lib/libalpm/package.c:147
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr ""

-#: lib/libalpm/package.c:169
+#: lib/libalpm/package.c:158
+#, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr ""
+
+#: lib/libalpm/package.c:163
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:171
 #, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr ""

-#: lib/libalpm/package.c:220 lib/libalpm/package.c:279
+#: lib/libalpm/package.c:222 lib/libalpm/package.c:281
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr ""

-#: lib/libalpm/package.c:353
+#: lib/libalpm/package.c:355
 msgid "could not parse the package description file"
 msgstr ""

-#: lib/libalpm/package.c:357
+#: lib/libalpm/package.c:359
 #, c-format
 msgid "missing package name in %s"
 msgstr ""

-#: lib/libalpm/package.c:361
+#: lib/libalpm/package.c:363
 #, c-format
 msgid "missing package version in %s"
 msgstr ""

-#: lib/libalpm/package.c:396
+#: lib/libalpm/package.c:398
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr ""

-#: lib/libalpm/package.c:409 lib/libalpm/package.c:416
+#: lib/libalpm/package.c:411 lib/libalpm/package.c:418
 #, c-format
 msgid "error while reading package: %s"
 msgstr ""

-#: lib/libalpm/package.c:422
+#: lib/libalpm/package.c:424
 msgid "missing package metadata"
 msgstr ""

-#: lib/libalpm/package.c:429
+#: lib/libalpm/package.c:431
 #, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr ""

-#: lib/libalpm/package.c:562
+#: lib/libalpm/package.c:570
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr ""

-#: lib/libalpm/package.c:573
+#: lib/libalpm/package.c:584
 #, c-format
 msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
 msgstr ""
@@ -1142,7 +1147,7 @@ msgstr ""
 msgid "cannot remove file %s: %s"
 msgstr ""

-#: lib/libalpm/remove.c:292
+#: lib/libalpm/remove.c:294
 #, c-format
 msgid "removing package %s-%s"
 msgstr ""
@@ -1157,17 +1162,17 @@ msgstr ""
 msgid "removing %d files"
 msgstr "removendo diretório %s"

-#: lib/libalpm/remove.c:339
+#: lib/libalpm/remove.c:337
 #, c-format
 msgid "removing database entry '%s'"
 msgstr ""

-#: lib/libalpm/remove.c:341
+#: lib/libalpm/remove.c:339
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr ""

-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:344
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr ""
@@ -1191,224 +1196,224 @@ msgstr ""
 msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr ""

-#: lib/libalpm/sync.c:262
+#: lib/libalpm/sync.c:270
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr ""

-#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293
+#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""

-#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""

-#: lib/libalpm/sync.c:282
+#: lib/libalpm/sync.c:290
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""

-#: lib/libalpm/sync.c:323
+#: lib/libalpm/sync.c:331
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr ""

-#: lib/libalpm/sync.c:346
+#: lib/libalpm/sync.c:354
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""

-#: lib/libalpm/sync.c:394
+#: lib/libalpm/sync.c:402
 msgid "resolving target's dependencies"
 msgstr ""

-#: lib/libalpm/sync.c:414
+#: lib/libalpm/sync.c:422
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""

-#: lib/libalpm/sync.c:449
+#: lib/libalpm/sync.c:463
 msgid "looking for unresolvable dependencies"
 msgstr ""

-#: lib/libalpm/sync.c:480
-#, fuzzy, c-format
+#: lib/libalpm/sync.c:494
+#, c-format
 msgid "package '%s' conflicts with '%s'"
 msgstr "pacote '%s' conflita com '%s'"

-#: lib/libalpm/sync.c:502
+#: lib/libalpm/sync.c:516
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""

-#: lib/libalpm/sync.c:513
+#: lib/libalpm/sync.c:527
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""

-#: lib/libalpm/sync.c:536 lib/libalpm/sync.c:541
+#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""

-#: lib/libalpm/sync.c:553 lib/libalpm/sync.c:590
+#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604
 #, c-format
 msgid "removing '%s' from target list"
 msgstr "removendo '%s' da lista de alvos"

-#: lib/libalpm/sync.c:562
+#: lib/libalpm/sync.c:576
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""

-#: lib/libalpm/sync.c:585
+#: lib/libalpm/sync.c:599
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""

-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:612
+#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626
 msgid "unresolvable package conflicts detected"
 msgstr ""

-#: lib/libalpm/sync.c:664
+#: lib/libalpm/sync.c:678
 msgid "checking dependencies of packages designated for removal"
 msgstr ""

-#: lib/libalpm/sync.c:678
+#: lib/libalpm/sync.c:692
 msgid "something has gone horribly wrong"
 msgstr ""

-#: lib/libalpm/sync.c:698
+#: lib/libalpm/sync.c:712
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""

-#: lib/libalpm/sync.c:794
+#: lib/libalpm/sync.c:808
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""

-#: lib/libalpm/sync.c:805
+#: lib/libalpm/sync.c:819
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr ""

-#: lib/libalpm/sync.c:806
+#: lib/libalpm/sync.c:820
 #, c-format
 msgid "warning: no %s cache exists, creating..."
 msgstr ""

-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:825
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""

-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:826
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""

-#: lib/libalpm/sync.c:819
+#: lib/libalpm/sync.c:833
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""

-#: lib/libalpm/sync.c:849 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr ""

-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:894
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""

-#: lib/libalpm/sync.c:882
+#: lib/libalpm/sync.c:896
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""

-#: lib/libalpm/sync.c:903
+#: lib/libalpm/sync.c:917
 msgid "could not create removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:909
+#: lib/libalpm/sync.c:923
 msgid "could not initialize the removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:929
+#: lib/libalpm/sync.c:943
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""

-#: lib/libalpm/sync.c:931
+#: lib/libalpm/sync.c:945
 msgid "could not prepare removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:937
+#: lib/libalpm/sync.c:951
 msgid "could not commit removal transaction"
 msgstr ""

-#: lib/libalpm/sync.c:944
+#: lib/libalpm/sync.c:958
 msgid "installing packages"
 msgstr ""

-#: lib/libalpm/sync.c:947
+#: lib/libalpm/sync.c:961
 msgid "could not create transaction"
 msgstr ""

-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:966
 msgid "could not initialize transaction"
 msgstr ""

-#: lib/libalpm/sync.c:975
+#: lib/libalpm/sync.c:989
 msgid "could not prepare transaction"
 msgstr ""

-#: lib/libalpm/sync.c:987
+#: lib/libalpm/sync.c:1001
 msgid "updating database for replaced packages' dependencies"
 msgstr ""

-#: lib/libalpm/sync.c:1016
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""

-#: lib/libalpm/sync.c:1025
+#: lib/libalpm/sync.c:1039
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr ""

-#: lib/libalpm/sync.c:1065
+#: lib/libalpm/sync.c:1079
 #, fuzzy, c-format
 msgid "found package '%s-%s' in sync"
 msgstr "atualizando pacote %s-%s"

-#: lib/libalpm/sync.c:1071
+#: lib/libalpm/sync.c:1085
 #, c-format
 msgid "package '%s' not found in sync"
 msgstr ""

-#: lib/libalpm/trans.c:267
+#: lib/libalpm/trans.c:271
 #, c-format
 msgid "updating dependency packages 'requiredby' fields for %s-%s"
 msgstr ""

-#: lib/libalpm/trans.c:270
+#: lib/libalpm/trans.c:274
 msgid "package has no dependencies, no other packages to update"
 msgstr ""

-#: lib/libalpm/trans.c:307 lib/libalpm/trans.c:333
+#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr ""

-#: lib/libalpm/trans.c:318 lib/libalpm/trans.c:344
+#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""

-#: lib/libalpm/trans.c:325
+#: lib/libalpm/trans.c:333
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "não foi possível encontrar a dependência '%s'"
@@ -1428,7 +1433,7 @@ msgstr ""
 msgid "could not extract %s: %s\n"
 msgstr ""

-#: lib/libalpm/util.c:351
+#: lib/libalpm/util.c:350
 #, c-format
 msgid "logaction called: %s"
 msgstr ""
@@ -1442,52 +1447,57 @@ msgstr ""
 msgid "could not change directory to %s (%s)"
 msgstr ""

-#: lib/libalpm/util.c:475
+#: lib/libalpm/util.c:476
 #, c-format
 msgid "executing %s script..."
 msgstr ""

-#: lib/libalpm/util.c:488
+#: lib/libalpm/util.c:489
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr ""

-#: lib/libalpm/util.c:495
+#: lib/libalpm/util.c:496
 #, c-format
 msgid "chrooting in %s"
 msgstr ""

-#: lib/libalpm/util.c:497
+#: lib/libalpm/util.c:498
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr ""

-#: lib/libalpm/util.c:501
+#: lib/libalpm/util.c:502
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr ""

-#: lib/libalpm/util.c:505
+#: lib/libalpm/util.c:506
 #, c-format
 msgid "executing \"%s\""
 msgstr "executando \"%s\""

-#: lib/libalpm/util.c:508
+#: lib/libalpm/util.c:509
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""

-#: lib/libalpm/util.c:540
+#: lib/libalpm/util.c:541
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr ""

-#: lib/libalpm/util.c:549
+#: lib/libalpm/util.c:550
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr ""

-#: lib/libalpm/util.c:606
+#: lib/libalpm/util.c:568
+#, c-format
+msgid "cannot read disk space information from %s: %s"
+msgstr ""
+
+#: lib/libalpm/util.c:609
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
--- a/lib/libalpm/po/ru_RU.po
+++ b/lib/libalpm/po/ru_RU.po
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -275,7 +275,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)

 	for(targ = trans->packages; targ; targ = targ->next) {
 		int position = 0;
-		char pm_install[PATH_MAX];
+		char scriptlet[PATH_MAX];
 		alpm_list_t *files;
 		info = (pmpkg_t*)targ->data;
 		const char *pkgname = NULL;
@@ -286,6 +286,8 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)

 		/* get the name now so we can use it after package is removed */
 		pkgname = alpm_pkg_get_name(info);
+		snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
+						 pkgname, alpm_pkg_get_version(info));

 		if(trans->type != PM_TRANS_TYPE_UPGRADE) {
 			EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL);
@@ -294,9 +296,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)

 			/* run the pre-remove scriptlet if it exists  */
 			if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
-				snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path,
-				         pkgname, alpm_pkg_get_version(info));
-				_alpm_runscriptlet(handle->root, pm_install, "pre_remove",
+				_alpm_runscriptlet(handle->root, scriptlet, "pre_remove",
 				                   alpm_pkg_get_version(info), NULL, trans);
 			}
 		}
@@ -324,9 +324,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
 		if(trans->type != PM_TRANS_TYPE_UPGRADE) {
 			/* run the post-remove script if it exists  */
 			if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
-				snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path,
-				         pkgname, alpm_pkg_get_version(info));
-				_alpm_runscriptlet(handle->root, pm_install, "post_remove",
+				_alpm_runscriptlet(handle->root, scriptlet, "post_remove",
 													 alpm_pkg_get_version(info), NULL, trans);
 			}
 		}
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -29,6 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
+#include <errno.h>
 #include <download.h>

 /* libalpm */
@@ -71,6 +72,10 @@ pmserver_t *_alpm_server_new(const char *url)
 		strcpy(u->pwd, "libalpm@guest");
 	}

+	/* remove trailing slashes, just to clean up the rest of the code */
+	for(int i = strlen(u->doc) - 1; u->doc[i] == '/'; --i)
+		u->doc[i] = '\0';
+
  server->s_url = u;

 	return server;
@@ -125,6 +130,7 @@ static struct url *url_for_file(pmserver_t *server, const char *filename)
 	}

 	snprintf(doc, doclen, "%s/%s", server->s_url->doc, filename);
+	_alpm_log(PM_LOG_DEBUG, "file path: '%s'", doc);
 	ret = downloadMakeURL(server->s_url->scheme,
 												server->s_url->host,
 												server->s_url->port,
@@ -210,7 +216,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
 				continue;
 			}

-			if(!handle->xfercommand) {
+			if(!handle->xfercommand || !strcmp(fileurl->scheme, "file")) {
 				FILE *dlf, *localf = NULL;
 				struct url_stat ust;
 				struct stat st;
@@ -290,6 +296,9 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
 					localf = fopen(output, "w");
 					if(localf == NULL) { /* still null? */
 						_alpm_log(PM_LOG_ERROR, _("cannot write to file '%s'"), output);
+						if(dlf != NULL) {
+							fclose(dlf);
+						}
 						return -1;
 					}
 				}
@@ -300,8 +309,29 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
 				int nread = 0;
 				char buffer[PM_DLBUF_LEN];
 				while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) {
+					if(ferror(dlf)) {
+						_alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s"),
+											fn, downloadLastErrString);
+						fclose(localf);
+						fclose(dlf);
+						return(-1);
+					}
+					
 					int nwritten = 0;
-					while((nwritten += fwrite(buffer, 1, (nread - nwritten), localf)) < nread) ;
+					while(nwritten < nread) {
+						nwritten += fwrite(buffer, 1, (nread - nwritten), localf);
+						if(ferror(localf)) {
+							_alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s"),
+												realfile, strerror(errno));
+							fclose(localf);
+							fclose(dlf);
+							return(-1);
+						}
+					}
+
+					if(nwritten != nread) {
+						
+					}
 					dltotal_bytes += nread;

 					if(handle->dlcb) handle->dlcb(pkgname, dltotal_bytes, ust.size);
@@ -407,7 +437,7 @@ char *_alpm_fetch_pkgurl(char *target)
 		alpm_list_t *servers = alpm_list_add(NULL, server);
 		alpm_list_t *files = alpm_list_add(NULL, filename);

-		if(_alpm_downloadfiles(servers, ".", files)) {
+		if(_alpm_downloadfiles(servers, "./", files)) {
 			_alpm_log(PM_LOG_WARNING, _("failed to download %s"), target);
 			return(NULL);
 		}
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -216,14 +216,22 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 									alpm_pkg_get_name(local), alpm_pkg_get_version(local),
 									alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 				if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) {
-					pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local),
-																				 alpm_pkg_get_version(local));
-					if(dummy == NULL) {
+					/* If package is in the ignorepkg list, ask before we add it to
+					 * the transaction */
+					if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) {
+						int resp = 0;
+						QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp);
+						if(!resp) {
+							continue;
+						}
+					}
+					pmpkg_t *tmp = _alpm_pkg_dup(local);
+					if(tmp == NULL) {
 						goto error;
 					}
-					sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy);
+					sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp);
 					if(sync == NULL) {
-						FREEPKG(dummy);
+						FREEPKG(tmp);
 						goto error;
 					}
 					trans->packages = alpm_list_add(trans->packages, sync);
@@ -317,7 +325,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 				if(!resp) {
 					return(0);
 				}
-			} else {
+			} else if(!(trans->flags & PM_TRANS_FLAG_PRINTURIS)) {
 				QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp);
 				if(!resp) {
 					_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"),
@@ -416,11 +424,17 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			} else {
 				/* remove the original targets from the list if requested */
 				if((trans->flags & PM_TRANS_FLAG_DEPENDSONLY)) {
-					void *vp;
-					pmpkg_t *p;
-					trans->packages = alpm_list_remove(trans->packages, spkg, _alpm_pkg_cmp, &vp);
-					p = vp;
-					FREEPKG(p);
+					void *vpkg;
+					pmsyncpkg_t *sync;
+					const char *pkgname;
+
+					pkgname = alpm_pkg_get_name(spkg);
+					_alpm_log(PM_LOG_DEBUG, "removing package %s-%s from the transaction targets",
+										pkgname, alpm_pkg_get_version(spkg));
+
+					sync = _alpm_sync_find(trans->packages, pkgname);
+					trans->packages = alpm_list_remove(trans->packages, sync, syncpkg_cmp, &vpkg);
+					FREESYNC(vpkg);
 				}
 			}
 		}
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -135,7 +135,8 @@ int _alpm_trans_addtarget(pmtrans_t *trans, char *target)
 	ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));

 	if(alpm_list_find_str(trans->targets, target)) {
-		RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
+		return(0);
+		//RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
 	}

 	switch(trans->type) {
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -310,21 +310,20 @@ int _alpm_rmrf(const char *path)
 	struct dirent *dp;
 	DIR *dirp;
 	char name[PATH_MAX];
-  struct stat st;
+	struct stat st;

-	if(stat(path, &st) == 0) {
-		if(S_ISREG(st.st_mode)) {
+	if(lstat(path, &st) == 0) {
+		if(!S_ISDIR(st.st_mode)) {
 			if(!unlink(path)) {
 				return(0);
 			} else {
 				if(errno == ENOENT) {
 					return(0);
 				} else {
-					/* not a directory */
 					return(1);
 				}
 			}
-		} else if(S_ISDIR(st.st_mode)) {
+		} else {
 			if((dirp = opendir(path)) == (DIR *)-1) {
 				return(1);
 			}
@@ -432,6 +431,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,

 	if(stat(installfn, &buf)) {
 		/* not found */
+		_alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found", installfn);
 		return(0);
 	}

@@ -470,6 +470,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 	/* just in case our cwd was removed in the upgrade operation */
 	if(chdir(root) != 0) {
 		_alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)"), root, strerror(errno));
+		goto cleanup;
 	}

 	_alpm_log(PM_LOG_DEBUG, _("executing %s script..."), script);
@@ -559,11 +560,13 @@ cleanup:
 static long long get_freespace()
 {
 	struct mntent *mnt;
-	char *table = MOUNTED;
+	const char *table = MOUNTED;
 	FILE *fp;
 	long long ret=0;

 	if((fp = setmntent(table, "r")) == NULL) {
+		_alpm_log(PM_LOG_ERROR, _("cannot read disk space information from %s: %s"),
+							table, strerror(errno));
 		return(-1);
 	}

--- a/pactest/tests/ldconfig001.py
+++ b/pactest/tests/ldconfig001.py
@@ -0,0 +1,12 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on an add operation"
+
+p = pmpkg("dummy")
+self.addpkg(p)
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -A %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=ldconfig")
--- a/pactest/tests/ldconfig002.py
+++ b/pactest/tests/ldconfig002.py
@@ -0,0 +1,16 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on an upgrade operation"
+
+lp = pmpkg("dummy")
+self.addpkg2db("local", lp)
+
+p = pmpkg("dummy", "1.0-2")
+self.addpkg(p)
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-2")
+self.addrule("PACMAN_OUTPUT=ldconfig")
--- a/pactest/tests/ldconfig003.py
+++ b/pactest/tests/ldconfig003.py
@@ -0,0 +1,14 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on a sync operation"
+
+sp = pmpkg("dummy")
+self.addpkg2db("sync", sp)
+
+self.args = "-S %s" % sp.name
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -S %s" % sp.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=ldconfig")
--- a/pactest/tests/remove001.py
+++ b/pactest/tests/remove001.py
@@ -0,0 +1,10 @@
+# If someone else can come up with a better name, please do so
+self.description = "Remove a package listed 5 times"
+
+p = pmpkg("foo")
+self.addpkg2db("local", p)
+
+self.args = "-R " + "foo "*5
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXISTS=foo")
--- a/pactest/tests/scriptlet001.py
+++ b/pactest/tests/scriptlet001.py
@@ -0,0 +1,16 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Scriptlet test (pre/post install)"
+
+p1 = pmpkg("dummy")
+p1.files = ['etc/dummy.conf']
+p1.install['pre_install'] = "ls /etc";
+p1.install['post_install'] = "ls /etc";
+self.addpkg(p1)
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -U %s" % p1.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=pre_install")
+self.addrule("PACMAN_OUTPUT=post_install")
--- a/pactest/tests/sync1000.py
+++ b/pactest/tests/sync1000.py
@@ -0,0 +1,19 @@
+# If someone else can come up with a better name, please do so
+self.description = "stonecrest's problem"
+
+sp = pmpkg("dummy", "1.1-1")
+sp.requiredby = [ "pkg" ]
+self.addpkg2db("sync", sp)
+
+lp1 = pmpkg("dummy", "1.0-1")
+lp1.requiredby = [ "pkg" ]
+self.addpkg2db("local", lp1)
+
+lp2 = pmpkg("pkg")
+lp2.depends = [ "dummy=1.0" ]
+self.addpkg2db("local", lp2)
+
+self.args = "-Su"
+
+self.addrule("!PACMAN_RETCODE=0")
+self.addrule("!PKG_VERSION=dummy|1.1-1")
--- a/pactest/tests/sync1001.py
+++ b/pactest/tests/sync1001.py
@@ -0,0 +1,18 @@
+self.description = "Test -Se (ensure specified package is not installed)"
+
+sp1 = pmpkg("dummy")
+sp1.depends = [ "dep1", "dep2" ]
+self.addpkg2db("sync", sp1)
+
+sp2 = pmpkg("dep1")
+self.addpkg2db("sync", sp2)
+
+sp3 = pmpkg("dep2")
+self.addpkg2db("sync", sp3)
+
+self.args = "-Se dummy"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_EXIST=dep1")
+self.addrule("PKG_EXIST=dep2")
+self.addrule("!PKG_EXIST=dummy")
--- a/pactest/tests/sync136.py
+++ b/pactest/tests/sync136.py
@@ -0,0 +1,15 @@
+self.description = "Sysupgrade with a sync package forcing a downgrade"
+
+sp = pmpkg("dummy", "1.0-1")
+sp.force = 1
+
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("dummy", "1.0-2")
+
+self.addpkg2db("local", lp)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-1")
--- a/pactest/tests/sync137.py
+++ b/pactest/tests/sync137.py
@@ -0,0 +1,14 @@
+self.description = "Sysupgrade with a force and ignore on same package"
+
+lp = pmpkg("dummy", "1.0-1")
+
+self.addpkg2db("local", lp)
+
+sp = pmpkg("dummy", "1.0-2")
+sp.force = 1
+self.addpkg2db("sync", sp)
+
+self.args = "-Su --ignore %s" % lp.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-1")
--- a/pactest/tests/upgrade058.py
+++ b/pactest/tests/upgrade058.py
@@ -0,0 +1,17 @@
+self.description = "Upgrade a package that's older version is required by another package."
+
+lp1 = pmpkg("pkg1")
+lp1.depends = [ "pkg2=1.0" ]
+self.addpkg2db("local", lp1)
+
+lp2 = pmpkg("pkg2", "1.0-1")
+lp2.requiredby = [ "pkg1" ]
+self.addpkg2db("local", lp2)
+
+p = pmpkg("pkg2", "1.1-1")
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_VERSION=pkg2|1.1")
--- a/pactest/util.py
+++ b/pactest/util.py
@@ -236,16 +236,12 @@ def diffmtime(mt1, mt2):
 #

 def grep(filename, pattern):
-    found = 0
-    fd = file(filename, "r")
-    while 1 and not found:
-        line = fd.readline()
-        if not line:
-            break
+    lines = file(filename, 'r').readlines()
+    for line in lines:
+        if not line: break
        if line.find(pattern) != -1:
-            found = 1
-    fd.close()
-    return found
+            return True
+    return False

 def mkdir(dir):
    if os.path.isdir(dir):
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -25,7 +25,7 @@
 #   USA.
 #

-myver='3.0.0'
+myver='3.0.3'
 startdir=$(pwd)

 BUILDSCRIPT="PKGBUILD"
@@ -177,16 +177,12 @@ in_array() {
 }

 checkdeps() {
-	local missdep=""
-	local deplist=""
-
 	[ $# -gt 0 ] || return

 	pmout=$(pacman $PACMAN_OPTS -T $*)
 	ret=$?
 	if [ $ret -eq 1 ]; then #unresolved deps
-		#strip out the pacman prefix from "requires: xyz"
-		echo $pmout | sed 's|requires:||g'
+		echo $pmout
 	elif [ $ret -ne 0 ]; then
 		error "pacman returned a fatal error ($ret): $pmout"
 		exit 1
@@ -196,11 +192,18 @@ checkdeps() {
 handledeps() {
 	local missingdeps=0
 	local deplist="$*"
+	local depstrip=""
+	local striplist=""
 	local haveperm=0
 	if [ \( "$EUID" = "0" -a "$INFAKEROOT" != "1" \) -o "$SUDO" = 1 ]; then
 		haveperm=1
 	fi

+	for dep in $deplist; do
+		depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||')
+		striplist="$striplist $depstrip"
+	done
+
 	if [ "$deplist" != "" -a $haveperm -eq 1 ]; then
 		if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then
 			# install missing deps from binary packages (using pacman -S and sudo)
@@ -211,9 +214,9 @@ handledeps() {
 				FAKEROOTKEY2=$FAKEROOTKEY
 				unset FAKEROOTKEY
 			fi
-			sudo pacman $PACMAN_OPTS -S $deplist
+			sudo pacman $PACMAN_OPTS -S $striplist
 			if [ $? -eq 1 ]; then
-				error "Failed to install missing dependencies."
+				error "Pacman failed to install missing dependencies."
 				exit 1
 			fi
 			if [ "$INFAKEROOT" = "1" ]; then
@@ -223,9 +226,9 @@ handledeps() {
 		elif [ "$DEP_BIN" = "1" ]; then
 			# install missing deps from binary packages (using pacman -S)
 			msg "Installing missing dependencies..."
-			pacman $PACMAN_OPTS -S $deplist
+			pacman $PACMAN_OPTS -S $striplist
 			if [ $? -eq 1 ]; then
-				error "Failed to install missing dependencies."
+				error "Pacman failed to install missing dependencies."
 				exit 1
 			fi
 		elif [ "$DEP_SRC" = "1" ]; then
@@ -237,7 +240,7 @@ handledeps() {
 			fi
 			# TODO: handle version comparators (eg, glibc>=2.2.5)
 			msg "Building missing dependencies..."
-			for dep in $deplist; do
+			for dep in $striplist; do
 				candidates=$(find $SRCROOT -type d -name "$dep")
 				if [ "$candidates" = "" ]; then
 					error "Could not find \"$dep\" under $SRCROOT"
@@ -245,12 +248,12 @@ handledeps() {
 				fi
 				success=0
 				for pkgdir in $candidates; do
-					if [ -f $pkgdir/$BUILDSCRIPT ]; then
-						cd $pkgdir
+					if [ -f "$pkgdir/$BUILDSCRIPT" ]; then
+						cd "$pkgdir"
 						if [ "$RMDEPS" = "1" ]; then
-							makepkg -i -c -b -r -w $PKGDEST
+							PKGDEST="$PKGDEST" makepkg -i -c -b -r
 						else
-							makepkg -i -c -b -w $PKGDEST
+							PKGDEST="$PKGDEST" makepkg -i -c -b
 						fi
 						if [ $? -eq 0 ]; then
 							success=1
@@ -286,21 +289,27 @@ handledeps() {
 }

 resolvedeps() {
+	deplist=""
+	newdeplist=""
+
 	deplist=$(checkdeps $*)
 	if [ -n "${deplist}" ]; then
 		handledeps $deplist
 		if [ $? -eq 0 ]; then
 			# check deps again to make sure they were resolved
-			deplist=$(checkdeps ${depends[@]})
-			if [ -n "${deplist}" ]; then
-				error "Failed to install missing dependencies."
+			newdeplist=$(checkdeps $*)
+			if [ -n "${newdeplist}" ]; then
+				error "Failed to install all missing dependencies."
 			fi
+		else
+			newdeplist="$deplist"
 		fi
 	fi

-	if [ -n "${deplist}" ]; then
+	# if new dep list is not empty, print the list
+	if [ -n "${newdeplist}" ]; then
 		msg "Missing Dependencies:"
-		for dep in ${deplist}; do
+		for dep in ${newdeplist}; do
 			msg2 "${dep}"
 		done
 		return 1
@@ -311,20 +320,30 @@ resolvedeps() {

 # fix flyspray bug #5923
 removedeps() {
-	if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
+	# runtimedeps and buildtimedeps are set when resolving deps
+	local deplist="$runtimedeps $buildtimedeps"
+	local depstrip=""
+	local striplist=""
+
+	for dep in $deplist; do
+		depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||')
+		striplist="$striplist $depstrip"
+	done
+
+	if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then
 		msg "Removing installed dependencies..."
 		if [ "$INFAKEROOT" = "1" ]; then
 			export FAKEROOTKEY2=$FAKEROOTKEY
 			unset FAKEROOTKEY
 		fi
-		sudo pacman $PACMAN_OPTS -Rs $makedeplist $deplist
+		sudo pacman $PACMAN_OPTS -Rs $striplist
 		if [ "$INFAKEROOT" = "1" ]; then
 			export FAKEROOTKEY=$FAKEROOTKEY2
 			unset FAKEROOTKEY2
 		fi
-	elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
+	elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then
 		msg "Removing installed dependencies..."
-		pacman $PACMAN_OPTS -Rs $makedeplist $deplist
+		pacman $PACMAN_OPTS -Rs $striplist
 	fi
 }

@@ -503,7 +522,7 @@ if [ "$CLEANCACHE" = "1" ]; then
 			fi
 		else
 			# answer = no
-			"No files have been removed."
+			msg "No files have been removed."
 			exit 0
 		fi
 	else
@@ -541,11 +560,11 @@ if [ -z "$pkgrel" ]; then
 	error "pkgrel is not allowed to be empty."
 	exit 1
 fi
-if [ $(echo $pkgver | grep '-') ]; then
+if [ $(echo "$pkgver" | grep '-') ]; then
 	error "pkgver is not allowed to contain hyphens."
 	exit 1
 fi
-if [ $(echo $pkgrel | grep '-') ]; then
+if [ $(echo "$pkgrel" | grep '-') ]; then
 	error "pkgrel is not allowed to contain hyphens."
 	exit 1
 fi
@@ -561,7 +580,7 @@ if [ "$install" -a ! -f "$install" ]; then
 	exit 1
 fi

-if [ -f $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} \
+if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}" \
     -a "$FORCE" = "0" -a "$GENINTEG" = "0" ]; then
 	if [ "$INSTALL" = "1" ]; then
 		warning "a package has already been built, installing existing package."
@@ -600,7 +619,6 @@ fi

 msg "Making package: $pkgname $pkgver-$pkgrel ($(date))"

-unset deplist makedeplist
 # fix flyspray bug #5973
 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then
 	if [ "$NODEPS" = "1" ]; then
@@ -609,16 +627,24 @@ if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1"
 	# skip printing a warning message for the others: geninteg, nobuild, repkg
 elif [ $(type -p pacman) ]; then
 	deperr=0
+	# these two variables are needed later by removedeps
+	unset runtimedeps buildtimedeps

 	msg "Checking Runtime Dependencies..."
 	resolvedeps ${depends[@]}
-	if [ $? -ne 0 ]; then
+	ret=$?
+	# deplist is a global variable set by resolvedeps
+	runtimedeps="$deplist"
+	if [ "$ret" != "0" ]; then
 		deperr=1
 	fi

 	msg "Checking Buildtime Dependencies..."
 	resolvedeps ${makedepends[@]}
-	if [ $? -ne 0 ]; then
+	ret=$?
+	# deplist is a global variable set by resolvedeps
+	buildtimedeps="$deplist"
+	if [ "$ret" != "0" ]; then
 		deperr=1
 	fi

@@ -630,12 +656,12 @@ else
 	warning "pacman was not found in PATH. skipping dependency checks."
 fi

-cd $startdir
+cd "$startdir"

 # retrieve sources
 msg "Retrieving Sources..."
 mkdir -p src
-cd $startdir/src
+cd "$startdir/src"
 for netfile in ${source[@]}; do
 	file=$(strip_url "$netfile")
 	if [ -f "../$file" ]; then
@@ -719,7 +745,11 @@ else
 				if [ $ct -eq 0 ]; then
 					echo -n "${integrity_name}s=("
 				else
-					echo -ne "\t  "
+					indent=0
+					while [ $indent -lt $((${#integrity_name}+3)) ]; do
+						echo -n " "
+						indent=$(($indent+1))
+					done
 				fi
 				echo -n "'$sum'"
 				ct=$(($ct+1))
@@ -782,6 +812,8 @@ else
 		file_type=$(file -biz "$file")
 		unset cmd
 		case "$file_type" in
+			*application/x-tar*application/x-compress*)
+				cmd="tar -xzf $file" ;;
 			*application/x-tar*)
 				cmd="tar -xf $file" ;;
 			*application/x-zip*)
@@ -790,7 +822,7 @@ else
 			*application/x-cpio*)
 				cmd="bsdtar -x -f $file" ;;
 			*application/x-gzip*)
-				cmd="gunzip -f $file" ;;
+				cmd="gunzip -d -f $file" ;;
 			*application/x-bzip*)
 				cmd="bunzip2 -f $file" ;;
 		esac
@@ -810,7 +842,7 @@ else
 	
 	if [ "$EUID" = "0" ]; then
 		# chown all source files to root.root
-		chown -R root.root $startdir/src
+		chown -R root.root "$startdir/src"
 	fi
 fi

@@ -821,18 +853,19 @@ elif [ "$REPKG" = "1" ]; then
 	warning "Skipping build"
 else
 	# check for existing pkg directory
-	if [ -d $startdir/pkg ]; then
+	if [ -d "$startdir/pkg" ]; then
 		msg "Removing existing pkg/ directory..."
-		rm -rf $startdir/pkg
+		rm -rf "$startdir/pkg"
 	fi
-	mkdir -p $startdir/pkg
+	mkdir -p "$startdir/pkg"

 	# use distcc if it is requested (check buildenv and PKGBUILD opts)
 	if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then
 		[ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH
+		export DISTCC_HOSTS
 	elif [ "$(check_option distcc)" = "n" ]; then
 		# if it is not wanted, clear the makeflags too
-		export MAKEFLAGS=""
+		MAKEFLAGS=""
 	fi

 	# use ccache if it is requested (check buildenv and PKGBUILD opts)
@@ -842,20 +875,24 @@ else

 	# clear user-specified makeflags if requested
 	if [ "$(check_option makeflags)" = "n" ]; then
-		export MAKEFLAGS=""
+		MAKEFLAGS=""
 	fi

 	# build
 	msg "Starting build()..."

 	# some applications (eg, blackbox) will not build with some languages
-	unset LC_ALL LANG
+	unset LC_ALL LC_MESSAGES LANG
 	umask 0022

+	# ensure all necessary build variables are exported
+	export CFLAGS CXXFLAGS MAKEFLAGS
+
 	#check for "exit on syntax error" shell option
 	echo $SHELLOPTS | grep errexit 2>&1 >/dev/null
 	set_e=$?

+	ret=0
 	if [ "$LOGGING" = "1" ]; then
 		BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log"
 		if [ -f "$BUILDLOG" ]; then
@@ -872,38 +909,32 @@ else

 		#use 'errexit' to bail on syntax error
 		[ $set_e -eq 1 ] && set -e
-		build 2>&1 | tee "$BUILDLOG"
+		build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]}
 		[ $set_e -eq 1 ] && set +e
-
-		if [ ${PIPESTATUS[0]} -gt 0 ]; then
-			error "Build Failed.  Aborting..."
-			removedeps
-			exit 2
-		fi
 	else
 		#use 'errexit' to bail on syntax error
 		[ $set_e -eq 1 ] && set -e
-		build 2>&1
+		build 2>&1 || ret=$?
 		[ $set_e -eq 1 ] && set +e
-		if [ $? -gt 0 ]; then
-			error "Build Failed.  Aborting..."
-			removedeps
-			exit 2
-		fi
+	fi
+	if [ $ret -gt 0 ]; then
+		error "Build Failed.  Aborting..."
+		removedeps
+		exit 2
 	fi
 fi

 if [ "$(check_option docs)" = "n" ]; then
 	# remove info/doc files
 	msg "Removing info/doc files..."
-	cd $startdir/pkg
+	cd "$startdir/pkg"
 	#fix flyspray bug #5021
 	rm -rf ${DOC_DIRS[@]}
 fi

 # move /usr/share/man files to /usr/man
 if [ -d $startdir/pkg/usr/share/man ]; then
-	cd $startdir
+	cd "$startdir"
 	mkdir -p pkg/usr/man 
 	cp -a pkg/usr/share/man/* pkg/usr/man/
 	rm -rf pkg/usr/share/man
@@ -911,12 +942,12 @@ fi

 # compress man pages
 msg "Compressing man pages..."
-find $startdir/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do
+find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do
 	ext="${i##*.}"
 	fn="${i##*/}"
 	if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then
 		# update symlinks to this manpage
-		find $startdir/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do
+		find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do
 			rm -f "$ln"
 			ln -sf "${fn}.gz" "${ln}.gz"
 		done
@@ -925,7 +956,7 @@ find $startdir/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ;
 	fi
 done

-cd $startdir
+cd "$startdir"

 # strip binaries
 if [ "$(check_option strip)" = "y" ]; then
@@ -959,7 +990,7 @@ if [ "$PACKAGER" != "" ]; then
 else
 	packager="Arch Linux (http://www.archlinux.org)"
 fi
-size=$(du -cb $startdir/pkg | tail -n 1 | awk '{print $1}')
+size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}')

 # build a filelist - do this first to keep meta files out of the list
 msg "Generating .FILELIST file..."
@@ -968,7 +999,7 @@ tar cvf /dev/null * | sort >.FILELIST

 # write the .PKGINFO file
 msg "Generating .PKGINFO file..."
-cd $startdir/pkg
+cd "$startdir/pkg"
 echo "# Generated by makepkg $myver" >.PKGINFO
 echo -n "# " >>.PKGINFO
 date >>.PKGINFO
--- a/scripts/makeworld
+++ b/scripts/makeworld
@@ -131,20 +131,20 @@ if [ "$dest" = "" ]; then
 fi

 # convert a (possibly) relative path to absolute
-cd $dest
-dest=$(pwd)
+cd "$dest"
+dest="$(pwd)"
 cd - &>/dev/null

 sd=$(date +"[%b %d %H:%M]")

 for category in $*; do
-	for port in $(find $toplevel/$category -maxdepth 1 -mindepth 1 -type d | sort); do
+	for port in $(find "$toplevel/$category" -maxdepth 1 -mindepth 1 -type d | sort); do
 		cd $port
 		if [ -f PKGBUILD ]; then
 			. PKGBUILD
 			buildstatus=0
-			if [ ! -f $dest/$pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then
-				makepkg $MAKEPKG_OPTS -m -w $dest 2>>$toplevel/makepkg.log
+			if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" ]; then
+				PKGDEST="$dest" makepkg $MAKEPKG_OPTS -m 2>>$toplevel/makepkg.log
 				if [ $? -gt 0 ]; then
 					buildstatus=2
 				else
--- a/scripts/rankmirrors
+++ b/scripts/rankmirrors
@@ -55,7 +55,8 @@ def timeCmd(cmd):

 def talkToServer(serverUrl):
    opener = urllib2.build_opener()
-    tmp = opener.open(serverUrl).read()
+    # retrieve first 50,000 bytes only
+    tmp = opener.open(serverUrl).read(50000)

 def getFuncToTime(serverUrl):
    return lambda : talkToServer(serverUrl)
@@ -139,8 +140,23 @@ if __name__ == "__main__":
        elif options.times:
            print ' * ',
        sys.stdout.flush()
+
+        # add *.db.tar.gz to server name. the repo name is parsed
+        # from the mirror url; it is the third (or fourth) dir
+        # from the end, where the url is http://foo/bar/REPO/os/arch
        try:
-            serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl))
+            splitted2 = serverUrl.split('/')
+            if serverUrl[-1] != '/':
+                repoName = splitted2[-3]
+                dbFileName = '/' + repoName + '.db.tar.gz'
+            else:
+                repoName = splitted2[-4]
+                dbFileName = repoName + '.db.tar.gz'
+        except:
+            dbFileName = ''
+
+        try:
+            serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl + dbFileName))
            if options.verbose:
                try:
                    print "%.2f" % serverToTime[serverUrl]
--- a/scripts/repo-add
+++ b/scripts/repo-add
@@ -19,7 +19,7 @@
 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
 #   USA.

-myver='3.0.0'
+myver='3.0.3'

 FORCE=0
 REPO_DB_FILE=""
@@ -117,7 +117,7 @@ db_write_entry()
 			license=*) _licenses="$_licenses $license" ;;
 			replaces=*) _replaces="$_replaces $replaces" ;;
 			provides=*) _provides="$_provides $provides" ;;
-			conflicts=*) _conflicts="$_conflicts $conflicts" ;;
+			conflict=*) _conflicts="$_conflicts $conflict" ;;
 		esac
 	done

@@ -148,7 +148,7 @@ db_write_entry()

 	# create desc entry
 	echo ":: creating 'desc' db entry"
-	echo -e "%FILENAME%\n$1\n" >> desc
+	echo -e "%FILENAME%\n$(basename $1)\n" >>desc
 	echo -e "%NAME%\n$pkgname\n" >>desc
 	echo -e "%VERSION%\n$pkgver\n" >>desc
 	if [ -n "$pkgdesc" ]; then
@@ -157,7 +157,7 @@ db_write_entry()
 	if [ -n "$_groups" ]; then
 		echo "%GROUPS%" >>desc
 		echo $_groups | tr -s ' ' '\n' >>desc
-		echo "" >desc
+		echo "" >>desc
 	fi
 	[ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc
 	[ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc
@@ -246,7 +246,7 @@ if [ $# -gt 1 ]; then
 			fi
 		else
 			if [ -f "$arg" ]; then
-				if ! tar xf "$arg" .PKGINFO 2>&1 >/dev/null; then
+				if ! tar tf "$arg" .PKGINFO 2>&1 >/dev/null; then
 					echo "error: '$arg' is not a package file, skipping"
 				else
 					echo ":: adding package '$arg'"
--- a/src/pacman/deptest.c
+++ b/src/pacman/deptest.c
@@ -81,7 +81,7 @@ int pacman_deptest(alpm_list_t *targets)
 		}

 		if(!found) {
-			MSG(NL, _("requires: %s"), saved_target);
+			MSG(NL, "%s", saved_target);
 			retval = 1;
 		}
 		free(saved_target);
--- a/src/pacman/log.c
+++ b/src/pacman/log.c
@@ -134,7 +134,7 @@ void pm_fprintf(FILE *file, unsigned short line, char *fmt, ...)
 	fprintf(file, str);

 	if(needpad == 1) {
-		unsigned int i, cols = getcols();
+		int i, cols = getcols();
 		for(i=len; i < cols; ++i) {
 			fprintf(file, " ");
 		}
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -128,10 +128,10 @@ static void usage(int op, char *myname)
 			printf(_("  -g, --groups         view all members of a package group\n"));
 			printf(_("  -i, --info           view package information\n"));
 			printf(_("  -l, --list           list the contents of the queried package\n"));
-			printf(_("  -m, --foreign        list all packages that were not found in the sync db(s)\n"));
+			printf(_("  -m, --foreign        list installed packages not found in sync db(s)\n"));
 			printf(_("  -o, --owns <file>    query the package that owns <file>\n"));
-			printf(_("  -p, --file           query the package file [package] instead of the database\n"));
-			printf(_("  -s, --search         search locally-installed packages for matching strings\n"));
+			printf(_("  -p, --file <package> query a package file instead of the database\n"));
+			printf(_("  -s, --search <regex> search locally-installed packages for matching strings\n"));
 			printf(_("  -u, --upgrades       list all packages that can be upgraded\n"));
 		} else if(op == PM_OP_SYNC) {
 			printf(_("usage:  %s {-S --sync} [options] [package]\n"), myname);
@@ -142,15 +142,16 @@ static void usage(int op, char *myname)
 			printf(_("  -f, --force          force install, overwrite conflicting files\n"));
 			printf(_("  -g, --groups         view all members of a package group\n"));
 			printf(_("  -i, --info           view package information\n"));
+			printf(_("  -l, --list <repo>    view a list of packages in a repo\n"));
 			printf(_("  -p, --print-uris     print out URIs for given packages and their dependencies\n"));
-			printf(_("  -s, --search         search remote repositories for matching strings\n"));
+			printf(_("  -s, --search <regex> search remote repositories for matching strings\n"));
 			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(_("      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"));
 		}
 		printf(_("      --config <path>  set an alternate configuration file\n"));
-		printf(_("      --noconfirm      do not ask for anything confirmation\n"));
+		printf(_("      --noconfirm      do not ask for any confirmation\n"));
 		printf(_("      --ask <number>   pre-specify answers for questions (see manpage)\n"));
 		printf(_("      --noprogressbar  do not show a progress bar when downloading files\n"));
 		printf(_("      --noscriptlet    do not execute the install scriptlet if there is any\n"));
@@ -452,7 +453,7 @@ int main(int argc, char *argv[])

 	/* initialize pm library */
 	if(alpm_initialize() == -1) {
-		ERR(NL, _("failed to initilize alpm library (%s)\n"), alpm_strerror(pm_errno));
+		ERR(NL, _("failed to initialize alpm library (%s)\n"), alpm_strerror(pm_errno));
 		cleanup(1);
 	}

@@ -509,9 +510,10 @@ int main(int argc, char *argv[])
 	alpm_option_set_dlcb(log_progress);

 	if(config->verbose > 0) {
-		printf("Root  : %s\n", alpm_option_get_root());
-		printf("DBPath: %s\n", alpm_option_get_dbpath());
-		list_display(_("Targets:"), pm_targets);
+		printf("Root     : %s\n", alpm_option_get_root());
+		printf("DBPath   : %s\n", alpm_option_get_dbpath());
+		printf("CacheDir : %s\n", alpm_option_get_cachedir());
+		list_display(_("Targets  :"), pm_targets);
 	}

 	/* Opening local database */
--- a/src/pacman/po/LINGUAS
+++ b/src/pacman/po/LINGUAS
@@ -1,8 +1,10 @@
 # Set of available languages.
 de
+en_GB
+es
 fr
 hu
 it
+pl_PL
 pt_BR
-en_GB
 ru_RU
--- a/src/pacman/po/de.po
+++ b/src/pacman/po/de.po
@@ -1,4 +1,4 @@
-# translation of de.po to Deutsch
+# translation of de.po to German
 # German translations 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.
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-07 09:07+0100\n"
-"PO-Revision-Date: 2007-03-07 09:13+0100\n"
+"POT-Creation-Date: 2007-04-28 04:02-0400\n"
+"PO-Revision-Date: 2007-05-09 17:38+0200\n"
 "Last-Translator: Pierre Schmitz <pierre@archlinux.de>\n"
-"Language-Team: Deutsch <archlinux.de>\n"
+"Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,38 +39,37 @@ msgid "failed to add target '%s' (%s)"
 msgstr "Konnte Paket '%s' nicht hinzufügen (%s)"

 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94
-#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134
-#: src/pacman/trans.c:145
+#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
+#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
-msgstr "fertig.\n"
+msgstr "Fertig.\n"

 #: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
-msgstr "Konnte Aktion nicht vorbereiten (%s)\n"
+msgstr "Konnte Vorgang nicht vorbereiten (%s)\n"

 #: src/pacman/add.c:104
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ":: %s: Benötigt %s"

-#: src/pacman/add.c:125 src/pacman/sync.c:645
+#: src/pacman/add.c:125 src/pacman/sync.c:643
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: Steht im Konflikt mit %s"

-#: src/pacman/add.c:134 src/pacman/sync.c:709
+#: src/pacman/add.c:134 src/pacman/sync.c:707
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s existiert in '%s' und '%s'\n"

-#: src/pacman/add.c:140 src/pacman/sync.c:715
+#: src/pacman/add.c:140 src/pacman/sync.c:713
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s existiert im Dateisystem\n"

-#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -78,27 +77,22 @@ msgstr ""
 "\n"
 "Fehler aufgetreten, keine Pakete wurden aktualisiert.\n"

-#: src/pacman/add.c:156 src/pacman/sync.c:652
+#: src/pacman/add.c:156 src/pacman/sync.c:650
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ":: %.1f MB werden benötigt, %.1f MB stehen zur Verfügung"

-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702
+#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "Konnte den Vorgang (%s) nicht durchführen\n"

 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:743
+#: src/pacman/sync.c:741
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "Konnte den Vorgang (%s) nicht freigeben\n"

-#: src/pacman/deptest.c:86
-#, c-format
-msgid "requires: %s"
-msgstr "Erfordert: %s"
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -194,10 +188,10 @@ msgstr "Benötigt von         :"
 msgid "Conflicts With :"
 msgstr "Konflikt mit         :"

-#: src/pacman/package.c:86
+#: src/pacman/package.c:86 src/pacman/package.c:136
 #, c-format
-msgid "Installed Size : %ld K\n"
-msgstr "Installationsgröße   : %ld K\n"
+msgid "Installed Size : %6.2f K\n"
+msgstr "Installationsgröße   : %6.2f K\n"

 #: src/pacman/package.c:87
 #, c-format
@@ -256,11 +250,6 @@ msgstr "Ersetzt              :"
 msgid "Download Size  : %6.2f K\n"
 msgstr "Download-Größe       : %6.2f K\n"

-#: src/pacman/package.c:136
-#, c-format
-msgid "Installed Size : %6.2f K\n"
-msgstr "Installationsgröße   : %6.2f K\n"
-
 #: src/pacman/package.c:144
 #, c-format
 msgid "MD5 Sum        : %s"
@@ -299,7 +288,7 @@ msgstr "FEHLEND\t\t%s\n"
 #: src/pacman/package.c:206
 #, c-format
 msgid "(none)\n"
-msgstr "(nichts)\n"
+msgstr "(Nichts)\n"

 #: src/pacman/package.c:246
 #, c-format
@@ -358,7 +347,7 @@ msgstr ""
 #: src/pacman/pacman.c:101
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
-msgstr "Benutzung:  %s {-A -add} [Optionen] <Datei>\n"
+msgstr "Verwendung:  %s {-A -add} [Optionen] <Datei>\n"

 #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119
 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138
@@ -375,22 +364,28 @@ msgstr "  -d, --nodeps         Überspringt die Abhängigkeitsprüfung\n"
 #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
-msgstr "  -f, --force          Installation erzwingen, Dateikonflikte überschreiben\n"
+msgstr ""
+"  -f, --force          Installation erzwingen, Dateikonflikte überschreiben\n"

 #: src/pacman/pacman.c:106
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
-msgstr "Benutzung:  %s {-R --remove} [Optionen] <Paket>\n"
+msgstr "Verwendung:  %s {-R --remove} [Optionen] <Paket>\n"

 #: src/pacman/pacman.c:108
 #, c-format
-msgid "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        Entfernt Pakete und alle, die von ihnen abhängen\n"
+msgid ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
+msgstr ""
+"  -c, --cascade        Entfernt Pakete und alle, die von ihnen abhängen\n"

 #: src/pacman/pacman.c:110
 #, c-format
-msgid "  -k, --dbonly         only remove database entry, do not remove files\n"
-msgstr "  -k, --dbonly         Nur Datenbankeintrag entfernen, keine Dateien\n"
+msgid ""
+"  -k, --dbonly         only remove database entry, do not remove files\n"
+msgstr ""
+"  -k, --dbonly         Nur Datenbankeintrag entfernen, keine Dateien "
+"entfernen\n"

 #: src/pacman/pacman.c:111
 #, c-format
@@ -399,7 +394,8 @@ msgstr "  -n, --nosave         Auch Konfigurationsdateien entfernen\n"

 #: src/pacman/pacman.c:112
 #, c-format
-msgid "  -s, --recursive      remove dependencies also (that won't break packages)\n"
+msgid ""
+"  -s, --recursive      remove dependencies also (that won't break packages)\n"
 msgstr ""
 "  -s, --recursive      Auch Abhängigkeiten entfernen (beschädigt keine "
 "Pakete)\n"
@@ -407,17 +403,17 @@ msgstr ""
 #: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
-msgstr "Benutzung:  %s {-F --freshen} [Optionen] <Datei>\n"
+msgstr "Verwendung:  %s {-F --freshen} [Optionen] <Datei>\n"

 #: src/pacman/pacman.c:117
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
-msgstr "Benutzung:  %s {-U --upgrade} [Optionen] <Datei>\n"
+msgstr "Verwendung:  %s {-U --upgrade} [Optionen] <Datei>\n"

 #: src/pacman/pacman.c:123
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
-msgstr "Benutzung:  %s {-Q --query} [Optionen] [Pakete]\n"
+msgstr "Verwendung:  %s {-Q --query} [Optionen] [Pakete]\n"

 #: src/pacman/pacman.c:125
 #, c-format
@@ -441,12 +437,12 @@ msgstr "                       wurden, aber nicht mehr benötigt werden\n"
 #: src/pacman/pacman.c:128 src/pacman/pacman.c:143
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr "  -g, --groups         Zeige alle Mitglieder einer Paket-Gruppe an\n"
+msgstr "  -g, --groups         Zeigt alle Mitglieder einer Paket-Gruppe an\n"

 #: src/pacman/pacman.c:129 src/pacman/pacman.c:144
 #, c-format
 msgid "  -i, --info           view package information\n"
-msgstr "  -i, --info           Zeige Paketinformationen an\n"
+msgstr "  -i, --info           Zeigt Paketinformationen an\n"

 #: src/pacman/pacman.c:130
 #, c-format
@@ -456,10 +452,9 @@ msgstr "  -l, --list           Zeigt den Inhalt des abgefragten Paketes an\n"
 #: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -m, --foreign        list all packages that were not found in the sync db"
-"(s)\n"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
-"  -m, --foreign        Zeigt alle Pakete an, die nicht in den Sync db(s)\n"
+"  -m, --foreign        Zeigt alle Pakete an, die nicht in den Sync-db(s)\n"
 "                       gefunden wurden\n"

 #: src/pacman/pacman.c:132
@@ -469,24 +464,23 @@ msgstr "  -o, --owns <Datei>   Fragt das Paket ab, dass <Datei> enthält\n"

 #: src/pacman/pacman.c:133
 #, c-format
-msgid ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
+msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
-"  -p, --file           Fragt die Paketdatei [Paket] anstatt der Datenbank "
+"  -p, --file <Paket>   Fragt die Paketdatei <Paket> anstatt der Datenbank "
 "ab\n"

 #: src/pacman/pacman.c:134
 #, c-format
 msgid ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr "  -s, --search         Durchsuche lokal installierte Pakete nach einem Wort\n"
+msgstr ""
+"  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"

 #: src/pacman/pacman.c:135
 #, c-format
 msgid "  -u, --upgrades       list all packages that can be upgraded\n"
-msgstr "  -u, --upgrades       Zeige alle aktualisierbaren Pakete an\n"
+msgstr "  -u, --upgrades       Zeigt alle aktualisierbaren Pakete an\n"

 #: src/pacman/pacman.c:137
 #, c-format
@@ -509,6 +503,12 @@ msgstr "  -e, --dependsonly    Nur Abhängigkeiten installieren\n"

 #: src/pacman/pacman.c:145
 #, c-format
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
+msgstr ""
+"  -l, --list <repo>    Zeigt eine Liste aller Pakete eines Repositoriums an\n"
+
+#: src/pacman/pacman.c:146
+#, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
@@ -516,201 +516,223 @@ msgstr ""
 "  -p, --print-uris     URIs der angegebenen Pakete und deren Abhängigkeiten\n"
 "                       ausgeben\n"

-#: src/pacman/pacman.c:146
-#, c-format
-msgid "  -s, --search         search remote repositories for matching strings\n"
-msgstr "  -s, --search         Durchsuche entfernte Repositorien nach einem Wort\n"
-
 #: src/pacman/pacman.c:147
 #, c-format
-msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
-msgstr "  -u, --sysupgrade     Alle veralteten Pakete aktualisieren\n"
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr ""
+"  -s, --search <regex> Durchsucht entfernte Repositorien nach einem Wort\n"

 #: src/pacman/pacman.c:148
 #, c-format
+msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
+msgstr "  -u, --sysupgrade     Aktualisiert alle veralteten Pakete\n"
+
+#: src/pacman/pacman.c:149
+#, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
 msgstr ""
-"  -w, --downloadonly   Lade Pakete herunter, aber nichts installieren oder\n"
+"  -w, --downloadonly   Lädt Pakete herunter, ohne etwas zu installieren "
+"oder\n"
 "                       aktualisieren\n"

-#: src/pacman/pacman.c:149
-#, c-format
-msgid "  -y, --refresh        download fresh package databases from the server\n"
-msgstr "  -y, --refresh        Lade frische Paketdatenbank vom Server\n"
-
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
+"  -y, --refresh        download fresh package databases from the server\n"
+msgstr "  -y, --refresh        Lädt frische Paketdatenbank vom Server\n"
+
+#: src/pacman/pacman.c:151
+#, c-format
+msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
-"      --ignore <pkg>   Ignoriere ein neues Paket (kann mehrfach genutzt\n"
+"      --ignore <pkg>   Ignoriert ein neues Paket (kann mehrfach genutzt\n"
 "                       werden)\n"

-#: src/pacman/pacman.c:152
+#: src/pacman/pacman.c:153
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <Pfad>  Setzt eine alternative Konfigurationsdatei\n"

-#: src/pacman/pacman.c:153
-#, c-format
-msgid "      --noconfirm      do not ask for anything confirmation\n"
-msgstr "      --noconfirm      Niemals nach einer Bestätigung fragen\n"
-
 #: src/pacman/pacman.c:154
 #, c-format
-msgid "      --ask <number>   pre-specify answers for questions (see manpage)\n"
-msgstr "      --ask <Nummer>   Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
+msgid "      --noconfirm      do not ask for any confirmation\n"
+msgstr "      --noconfirm      Niemals nach einer Bestätigung fragen\n"

 #: src/pacman/pacman.c:155
 #, c-format
-msgid "      --noprogressbar  do not show a progress bar when downloading files\n"
+msgid ""
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
+msgstr ""
+"      --ask <Nummer>   Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
+
+#: src/pacman/pacman.c:156
+#, c-format
+msgid ""
+"      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
 "      --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien\n"
 "                       heruntergeladen werden\n"

-#: src/pacman/pacman.c:156
-#, c-format
-msgid "      --noscriptlet    do not execute the install scriptlet if there is any\n"
-msgstr "      --noscriptlet    Installationskript nicht ausführen, falls vorhanden\n"
-
 #: src/pacman/pacman.c:157
 #, c-format
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if there is any\n"
+msgstr ""
+"      --noscriptlet    Installationskript nicht ausführen, falls vorhanden\n"
+
+#: src/pacman/pacman.c:158
+#, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose        Sei gesprächig\n"

-#: src/pacman/pacman.c:158
+#: src/pacman/pacman.c:159
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
-"  -r, --root <Pfad>    Benutze ein alternatives Wurzelverzeichnis zur\n"
+"  -r, --root <Pfad>    Setzt ein alternatives Wurzelverzeichnis zur\n"
 "                       Installation\n"

-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:160
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr "  -b, --dbpath <Pfad>  Setzt einen anderen Ort für die Datenbank\n"

-#: src/pacman/pacman.c:160
+#: src/pacman/pacman.c:161
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr "  -b, --dbpath <Pfad>  Setzt einen anderen Ort für den Paketpuffer\n"

-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:174
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr "                       Dieses Programm ist frei verfügbar unter\n"

-#: src/pacman/pacman.c:174
+#: src/pacman/pacman.c:175
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
-msgstr "                       der GNU General Public License\n"
+msgstr "                      den Bedingungen der GNU General Public License\n"

-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
 msgstr "'%s' ist kein gültiger Debug-Level"

-#: src/pacman/pacman.c:314
+#: src/pacman/pacman.c:315
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr "'%s' ist kein gültiges Paketpuffer-Verzeichnis\n"

-#: src/pacman/pacman.c:332
+#: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
-msgstr "'%s' ist kein gültiger Db-Pfad\n"
+msgstr "'%s' ist kein gültiger db-Pfad\n"

-#: src/pacman/pacman.c:362
+#: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
 msgstr "'%s' ist kein gültiger root-Pfad\n"

-#: src/pacman/pacman.c:389
+#: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
 msgstr "Es ist nur eine Operation zur selben Zeit erlaubt\n"

-#: src/pacman/pacman.c:435
-#, fuzzy
+#: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
 msgstr ""
 "Warnung: Die Standard-Ortseinstellung ist ungültig; verwende Standard-\"C\"-"
 "Ortseinstellung"

-#: src/pacman/pacman.c:455
+#: src/pacman/pacman.c:456
 #, c-format
-msgid "failed to initilize alpm library (%s)\n"
+msgid "failed to initialize alpm library (%s)\n"
 msgstr "Konnte alpm-Bibliothek nicht initialisieren (%s)\n"

-#: src/pacman/pacman.c:488
+#: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "Sie benötigen root-Rechte, um diese Operation ausführen zu können\n"

-#: src/pacman/pacman.c:504
+#: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
-msgstr "Konnte Konfiguration nicht lesen (%s)\n"
+msgstr "Konnte Konfiguration (%s) nicht lesen\n"

-#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
-msgstr "Pakete:"
+#: src/pacman/pacman.c:516
+msgid "Targets  :"
+msgstr "Pakete   :"

-#: src/pacman/pacman.c:520
+#: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
-msgstr "Kein auf die lokale Datenbank (%s)\n"
+msgstr "Kein Zugriff auf die lokale Datenbank (%s)\n"

-#: src/pacman/pacman.c:527
+#: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
 msgstr "Keine Pakete angegeben (benutzen Sie -h für Hilfe)\n"

-#: src/pacman/pacman.c:540
+#: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
 msgstr "Keine Operation angegeben (benutzen Sie -h für Hilfe)\n"

-#: src/pacman/query.c:56
+#: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
 msgstr "Es wurde keine Datei für --owns angegeben\n"

-#: src/pacman/query.c:74
+#: src/pacman/query.c:95
+#, c-format
+msgid "failed to read file '%s': %s"
+msgstr "Fehler beim Lesen der Datei '%s': %s"
+
+#: src/pacman/query.c:100
+msgid "cannot determine ownership of a directory"
+msgstr "Konnte den Besitzer eines Verzeichnisses nicht ermitteln"
+
+#: src/pacman/query.c:105
+#, c-format
+msgid "cannot determine real path for '%s': %s"
+msgstr "Konnte den wahren Pfad für '%s' nicht ermitteln: %s"
+
+#: src/pacman/query.c:119
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s ist in %s %s enthalten\n"

-#: src/pacman/query.c:81
+#: src/pacman/query.c:127
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Kein Paket enthält %s\n"

-#: src/pacman/query.c:122 src/pacman/sync.c:453
+#: src/pacman/query.c:170 src/pacman/sync.c:453
 msgid "no usable package repositories configured.\n"
 msgstr "Keine brauchbaren Paket-Repositorien konfiguriert.\n"

-#: src/pacman/query.c:128
+#: src/pacman/query.c:176
 msgid "Checking for package upgrades..."
 msgstr "Suche nach aktualisierbaren Paketen..."

-#: src/pacman/query.c:135
+#: src/pacman/query.c:183
 msgid "no upgrades found"
 msgstr "Keine Aktualisierungen gefunden"

-#: src/pacman/query.c:173
+#: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "Gruppe \"%s\" wurde nicht gefunden\n"

-#: src/pacman/query.c:184
+#: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
 msgstr "Es wurde kein Paket für --file angegeben\n"

-#: src/pacman/query.c:188
+#: src/pacman/query.c:236
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "Konnte Paket '%s' nicht laden (%s)\n"

-#: src/pacman/query.c:226 src/pacman/query.c:258
+#: src/pacman/query.c:273 src/pacman/query.c:305
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "Paket \"%s\" nicht gefunden\n"
@@ -722,7 +744,7 @@ msgstr ":: Gruppe %s:\n"

 #: src/pacman/remove.c:63
 msgid "    Remove whole content? [Y/n] "
-msgstr "    Den gesamten Inhalt entfernen? [J/n] "
+msgstr "    Gesamten Inhalt entfernen? [J/n] "

 #: src/pacman/remove.c:67
 #, c-format
@@ -744,6 +766,10 @@ msgstr "Konnte Paket '%s' nicht hinzufügen (%s)\n"
 msgid ":: %s is required by %s\n"
 msgstr ":: %s wird benötigt von %s\n"

+#: src/pacman/remove.c:128 src/pacman/util.c:324
+msgid "Targets:"
+msgstr "Pakete:"
+
 #: src/pacman/remove.c:131
 msgid ""
 "\n"
@@ -754,31 +780,31 @@ msgstr ""

 #: src/pacman/sync.c:115
 msgid "Do you want to remove old packages from cache? [Y/n] "
-msgstr "Möchten Sie alte Pakete aus dem Cache entfernen? [J/n] "
+msgstr "Möchten Sie alte Pakete aus dem Puffer entfernen? [J/n] "

 #: src/pacman/sync.c:117
 msgid "removing old packages from cache... "
-msgstr "Entferne alte Pakete aus dem Cache... "
+msgstr "Entferne alte Pakete aus dem Puffer... "

 #: src/pacman/sync.c:120
 msgid "could not access cache directory\n"
-msgstr "Konnte nicht auf Cache-Verzeichnis zugreifen\n"
+msgstr "Konnte nicht auf Puffer-Verzeichnis zugreifen\n"

 #: src/pacman/sync.c:181
 msgid "Do you want to remove all packages from cache? [Y/n] "
-msgstr "Wollen Sie alle Pakete aus dem Cache entfernen? [J/n] "
+msgstr "Wollen Sie alle Pakete aus dem Puffer entfernen? [J/n] "

 #: src/pacman/sync.c:183
 msgid "removing all packages from cache... "
-msgstr "Entferne alle Pakete aus dem Cache... "
+msgstr "Entferne alle Pakete aus dem Puffer... "

 #: src/pacman/sync.c:186
 msgid "could not remove cache directory\n"
-msgstr "Konnte Cache-Verzeichnis nicht entfernen\n"
+msgstr "Konnte Puffer-Verzeichnis nicht entfernen\n"

 #: src/pacman/sync.c:191
 msgid "could not create new cache directory\n"
-msgstr "Konnte neues Cache-Verzeichnis nicht erstellen\n"
+msgstr "Konnte neues Puffer-Verzeichnis nicht erstellen\n"

 #: src/pacman/sync.c:218
 #, c-format
@@ -860,11 +886,6 @@ msgstr ":: Zuerst pacman aktualisieren? [J/n] "
 msgid "pacman: %s\n"
 msgstr "pacman: %s\n"

-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr "'%s':%s\n"
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Gesamten Inhalt installieren? [J/n] "
@@ -879,19 +900,15 @@ msgstr ":: %s aus Gruppe %s installieren? [J/n] "
 msgid "'%s': not found in sync db\n"
 msgstr "'%s': nicht in Synchronisations-Datenbank gefunden\n"

-#: src/pacman/sync.c:623
+#: src/pacman/sync.c:621
 msgid "requires"
-msgstr "benötigt"
+msgstr "Benötigt"

-#: src/pacman/sync.c:623
-msgid "is required by"
-msgstr "wird benötigt von"
-
-#: src/pacman/sync.c:665
+#: src/pacman/sync.c:663
 msgid " local database is up to date\n"
-msgstr " lokale Datenbank ist aktuell\n"
+msgstr " Lokale Datenbank ist aktuell\n"

-#: src/pacman/sync.c:674
+#: src/pacman/sync.c:672
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -899,11 +916,11 @@ msgstr ""
 "\n"
 "Beginne Download ...\n"

-#: src/pacman/sync.c:678
+#: src/pacman/sync.c:676
 msgid "Proceed with download? [Y/n] "
 msgstr "Download fortsetzen? [J/n] "

-#: src/pacman/sync.c:686
+#: src/pacman/sync.c:684
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -911,7 +928,7 @@ msgstr ""
 "\n"
 "Beginne Aktualisierungsprozess...\n"

-#: src/pacman/sync.c:690
+#: src/pacman/sync.c:688
 msgid "Proceed with installation? [Y/n] "
 msgstr "Installation fortsetzen? [J/n] "

@@ -935,102 +952,102 @@ msgstr "Löse Abhängigkeiten auf... "
 msgid "looking for inter-conflicts... "
 msgstr "Suche nach Zwischen-Konflikten... "

-#: src/pacman/trans.c:89
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr "Installiere %s... "

-#: src/pacman/trans.c:96
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
 msgstr "%s (%s) installiert"

-#: src/pacman/trans.c:103
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
 msgstr "Entferne %s... "

-#: src/pacman/trans.c:110
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
 msgstr "%s (%s) entfernt"

-#: src/pacman/trans.c:117
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
 msgstr "Aktualisiere %s... "

-#: src/pacman/trans.c:124
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "%s (%s -> %s) aktualisiert"

-#: src/pacman/trans.c:131
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
 msgstr "Prüfe Paketintegrität... "

-#: src/pacman/trans.c:147
+#: src/pacman/trans.c:144
 msgid "failed.\n"
 msgstr "fehlgeschlagen.\n"

-#: src/pacman/trans.c:154
+#: src/pacman/trans.c:151
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
 msgstr ":: Empfange Pakete von %s...\n"

-#: src/pacman/trans.c:175
+#: src/pacman/trans.c:172
 #, c-format
 msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
 msgstr ":: %1$s benötigt %2$s aus IgnorePkg. %2$s installieren? [J/n] "

-#: src/pacman/trans.c:180
+#: src/pacman/trans.c:177
 #, c-format
 msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ":: %s ist in IgnorePkg. Trotzdem installieren? [J/n] "

-#: src/pacman/trans.c:193
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ":: %s ist als ein HoldPkg gekennzeichnet. Trotzdem entfernen? [J/n] "

-#: src/pacman/trans.c:206
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: %s mit %s/%s ersetzen? [J/n] "
+msgstr ":: %s durch %s/%s ersetzen? [J/n] "

-#: src/pacman/trans.c:221
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s steht im Konflikt mit %s. %s entfernen? [J/n] "

-#: src/pacman/trans.c:237
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: Lokale Version ist neuer. Trotzdem aktualisieren? [J/n] "

-#: src/pacman/trans.c:255
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: Lokale Version ist aktuell. Trotzdem aktualisieren? [J/n] "

-#: src/pacman/trans.c:273
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: Archiv %s ist beschädigt. Möchten Sie es löschen? [J/n] "

-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr "Installiere"

-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr "Aktualisiere"

-#: src/pacman/trans.c:335
+#: src/pacman/trans.c:332
 msgid "removing"
-msgstr "entferne"
+msgstr "Entferne"

-#: src/pacman/trans.c:338
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
 msgstr "Pruefe auf Dateikonflikte"

@@ -1059,10 +1076,9 @@ msgid ""
 "Total Package Size:   %.2f MB\n"
 msgstr ""
 "\n"
-"Gesamte Paketgröße                     : %.2f MB\n"
+"Gesamte Paketgröße:   %.2f MB\n"

 #: src/pacman/util.c:337
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Gesamtgröße der installierten Pakete   : %.2f MB\n"
-
--- a/src/pacman/po/en_GB.po
+++ b/src/pacman/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: 2007-03-07 11:45-0500\n"
+"POT-Creation-Date: 2007-04-28 04:02-0400\n"
 "PO-Revision-Date: 2007-03-07 21:16+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -36,9 +36,8 @@ msgid "failed to add target '%s' (%s)"
 msgstr "failed to add target '%s' (%s)"

 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94
-#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134
-#: src/pacman/trans.c:145
+#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
+#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
 msgstr "done.\n"

@@ -52,22 +51,22 @@ msgstr "failed to prepare transaction (%s)\n"
 msgid ":: %s: requires %s"
 msgstr ":: %s: requires %s"

-#: src/pacman/add.c:125 src/pacman/sync.c:645
+#: src/pacman/add.c:125 src/pacman/sync.c:643
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: conflicts with %s"

-#: src/pacman/add.c:134 src/pacman/sync.c:709
+#: src/pacman/add.c:134 src/pacman/sync.c:707
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s exists in both '%s' and '%s'\n"

-#: src/pacman/add.c:140 src/pacman/sync.c:715
+#: src/pacman/add.c:140 src/pacman/sync.c:713
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s exists in filesystem\n"

-#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -75,27 +74,22 @@ msgstr ""
 "\n"
 "errors occurred, no packages were upgraded.\n"

-#: src/pacman/add.c:156 src/pacman/sync.c:652
+#: src/pacman/add.c:156 src/pacman/sync.c:650
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ":: %.1f MB required, have %.1f MB"

-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702
+#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "failed to commit transaction (%s)\n"

 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:743
+#: src/pacman/sync.c:741
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "failed to release transaction (%s)\n"

-#: src/pacman/deptest.c:86
-#, c-format
-msgid "requires: %s"
-msgstr "requires: %s"
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -191,10 +185,10 @@ msgstr "Required By    :"
 msgid "Conflicts With :"
 msgstr "Conflicts With :"

-#: src/pacman/package.c:86
+#: src/pacman/package.c:86 src/pacman/package.c:136
 #, c-format
-msgid "Installed Size : %ld K\n"
-msgstr "Installed Size : %ld K\n"
+msgid "Installed Size : %6.2f K\n"
+msgstr "Installed Size : %6.2f K\n"

 #: src/pacman/package.c:87
 #, c-format
@@ -253,11 +247,6 @@ msgstr "Replaces       :"
 msgid "Download Size  : %6.2f K\n"
 msgstr "Download Size  : %6.2f K\n"

-#: src/pacman/package.c:136
-#, c-format
-msgid "Installed Size : %6.2f K\n"
-msgstr "Installed Size : %6.2f K\n"
-
 #: src/pacman/package.c:144
 #, c-format
 msgid "MD5 Sum        : %s"
@@ -457,10 +446,9 @@ msgstr "  -l, --list           list the contents of the queried package\n"
 #: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -m, --foreign        list all packages that were not found in the sync db"
-"(s)\n"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
-"  -m, --foreign        list all packages that were not found in the sync db"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 "(s)\n"

 #: src/pacman/pacman.c:132
@@ -470,20 +458,16 @@ msgstr "  -o, --owns <file>    query the package that owns <file>\n"

 #: src/pacman/pacman.c:133
 #, c-format
-msgid ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
-msgstr ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
+msgid "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -p, --file <package> query a package file instead of the database\n"

 #: src/pacman/pacman.c:134
 #, c-format
 msgid ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"

 #: src/pacman/pacman.c:135
@@ -512,212 +496,231 @@ msgstr "  -e, --dependsonly    install dependencies only\n"

 #: src/pacman/pacman.c:145
 #, c-format
-msgid ""
-"  -p, --print-uris     print out URIs for given packages and their "
-"dependencies\n"
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
 msgstr ""
-"  -p, --print-uris     print out URIs for given packages and their "
-"dependencies\n"

 #: src/pacman/pacman.c:146
 #, c-format
 msgid ""
-"  -s, --search         search remote repositories for matching strings\n"
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"
 msgstr ""
-"  -s, --search         search remote repositories for matching strings\n"
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"

 #: src/pacman/pacman.c:147
 #, c-format
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
+
+#: src/pacman/pacman.c:148
+#, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade     upgrade all packages that are out of date\n"

-#: src/pacman/pacman.c:148
-#, c-format
-msgid ""
-"  -w, --downloadonly   download packages but do not install/upgrade "
-"anything\n"
-msgstr ""
-"  -w, --downloadonly   download packages but do not install/upgrade "
-"anything\n"
-
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
-"  -y, --refresh        download fresh package databases from the server\n"
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"
 msgstr ""
-"  -y, --refresh        download fresh package databases from the server\n"
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"

 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
+"  -y, --refresh        download fresh package databases from the server\n"
+msgstr ""
+"  -y, --refresh        download fresh package databases from the server\n"
+
+#: src/pacman/pacman.c:151
+#, c-format
+msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"

-#: src/pacman/pacman.c:152
+#: src/pacman/pacman.c:153
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <path>  set an alternate configuration file\n"

-#: src/pacman/pacman.c:153
-#, c-format
-msgid "      --noconfirm      do not ask for anything confirmation\n"
-msgstr "      --noconfirm      do not ask for anything confirmation\n"
-
 #: src/pacman/pacman.c:154
 #, c-format
-msgid ""
-"      --ask <number>   pre-specify answers for questions (see manpage)\n"
-msgstr ""
-"      --ask <number>   pre-specify answers for questions (see manpage)\n"
+msgid "      --noconfirm      do not ask for any confirmation\n"
+msgstr "      --noconfirm      do not ask for any confirmation\n"

 #: src/pacman/pacman.c:155
 #, c-format
 msgid ""
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
+msgstr ""
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
+
+#: src/pacman/pacman.c:156
+#, c-format
+msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"

-#: src/pacman/pacman.c:156
+#: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if there is any\n"
 msgstr ""
 "      --noscriptlet    do not execute the install scriptlet if there is any\n"

-#: src/pacman/pacman.c:157
+#: src/pacman/pacman.c:158
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose        be verbose\n"

-#: src/pacman/pacman.c:158
+#: src/pacman/pacman.c:159
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr "  -r, --root <path>    set an alternate installation root\n"

-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:160
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr "  -b, --dbpath <path>  set an alternate database location\n"

-#: src/pacman/pacman.c:160
+#: src/pacman/pacman.c:161
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr "      --cachedir <dir> set an alternate package cache location\n"

-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:174
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 "                       This program may be freely redistributed under\n"

-#: src/pacman/pacman.c:174
+#: src/pacman/pacman.c:175
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr "                       the terms of the GNU General Public License\n"

-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
 msgstr "'%s' is not a valid debug level"

-#: src/pacman/pacman.c:314
+#: src/pacman/pacman.c:315
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr "'%s' is not a valid cache directory\n"

-#: src/pacman/pacman.c:332
+#: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
 msgstr "'%s' is not a valid db path\n"

-#: src/pacman/pacman.c:362
+#: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
 msgstr "'%s' is not a valid root path\n"

-#: src/pacman/pacman.c:389
+#: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
 msgstr "only one operation may be used at a time\n"

-#: src/pacman/pacman.c:435
+#: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
 msgstr "warning: current locale is invalid; using default \"C\" locale"

-#: src/pacman/pacman.c:455
+#: src/pacman/pacman.c:456
 #, c-format
-msgid "failed to initilize alpm library (%s)\n"
-msgstr "failed to initilise alpm library (%s)\n"
+msgid "failed to initialize alpm library (%s)\n"
+msgstr "failed to initialise alpm library (%s)\n"

-#: src/pacman/pacman.c:488
+#: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "you cannot perform this operation unless you are root.\n"

-#: src/pacman/pacman.c:504
+#: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "failed to parse config (%s)\n"

-#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
-msgstr "Targets:"
+#: src/pacman/pacman.c:516
+msgid "Targets  :"
+msgstr "Targets  :"

-#: src/pacman/pacman.c:520
+#: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr "could not register 'local' database (%s)\n"

-#: src/pacman/pacman.c:527
+#: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
 msgstr "no targets specified (use -h for help)\n"

-#: src/pacman/pacman.c:540
+#: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
 msgstr "no operation specified (use -h for help)\n"

-#: src/pacman/query.c:56
+#: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
 msgstr "no file was specified for --owns\n"

-#: src/pacman/query.c:74
+#: src/pacman/query.c:95
+#, c-format
+msgid "failed to read file '%s': %s"
+msgstr "failed to read file '%s': %s"
+
+#: src/pacman/query.c:100
+msgid "cannot determine ownership of a directory"
+msgstr ""
+
+#: src/pacman/query.c:105
+#, c-format
+msgid "cannot determine real path for '%s': %s"
+msgstr ""
+
+#: src/pacman/query.c:119
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s is owned by %s %s\n"

-#: src/pacman/query.c:81
+#: src/pacman/query.c:127
 #, c-format
 msgid "No package owns %s\n"
 msgstr "No package owns %s\n"

-#: src/pacman/query.c:122 src/pacman/sync.c:453
+#: src/pacman/query.c:170 src/pacman/sync.c:453
 msgid "no usable package repositories configured.\n"
 msgstr "no usable package repositories configured.\n"

-#: src/pacman/query.c:128
+#: src/pacman/query.c:176
 msgid "Checking for package upgrades..."
 msgstr "Checking for package upgrades..."

-#: src/pacman/query.c:135
+#: src/pacman/query.c:183
 msgid "no upgrades found"
 msgstr "no upgrades found"

-#: src/pacman/query.c:173
+#: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "group \"%s\" was not found\n"

-#: src/pacman/query.c:184
+#: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
 msgstr "no package file was specified for --file\n"

-#: src/pacman/query.c:188
+#: src/pacman/query.c:236
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "failed to load package '%s' (%s)\n"

-#: src/pacman/query.c:226 src/pacman/query.c:258
+#: src/pacman/query.c:273 src/pacman/query.c:305
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "package \"%s\" not found\n"
@@ -751,6 +754,10 @@ msgstr "failed to add target '%s' (%s)\n"
 msgid ":: %s is required by %s\n"
 msgstr ":: %s is required by %s\n"

+#: src/pacman/remove.c:128 src/pacman/util.c:324
+msgid "Targets:"
+msgstr "Targets:"
+
 #: src/pacman/remove.c:131
 msgid ""
 "\n"
@@ -867,11 +874,6 @@ msgstr ":: Upgrade pacman first? [Y/n] "
 msgid "pacman: %s\n"
 msgstr "pacman: %s\n"

-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr "'%s': %s\n"
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Install whole content? [Y/n] "
@@ -886,19 +888,15 @@ msgstr ":: Install %s from group %s? [Y/n] "
 msgid "'%s': not found in sync db\n"
 msgstr "'%s': not found in sync db\n"

-#: src/pacman/sync.c:623
+#: src/pacman/sync.c:621
 msgid "requires"
 msgstr "requires"

-#: src/pacman/sync.c:623
-msgid "is required by"
-msgstr "is required by"
-
-#: src/pacman/sync.c:665
+#: src/pacman/sync.c:663
 msgid " local database is up to date\n"
 msgstr " local database is up to date\n"

-#: src/pacman/sync.c:674
+#: src/pacman/sync.c:672
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -906,11 +904,11 @@ msgstr ""
 "\n"
 "Beginning download...\n"

-#: src/pacman/sync.c:678
+#: src/pacman/sync.c:676
 msgid "Proceed with download? [Y/n] "
 msgstr "Proceed with download? [Y/n] "

-#: src/pacman/sync.c:686
+#: src/pacman/sync.c:684
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -918,7 +916,7 @@ msgstr ""
 "\n"
 "Beginning upgrade process...\n"

-#: src/pacman/sync.c:690
+#: src/pacman/sync.c:688
 msgid "Proceed with installation? [Y/n] "
 msgstr "Proceed with installation? [Y/n] "

@@ -942,102 +940,102 @@ msgstr "resolving dependencies... "
 msgid "looking for inter-conflicts... "
 msgstr "looking for inter-conflicts... "

-#: src/pacman/trans.c:89
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr "installing %s... "

-#: src/pacman/trans.c:96
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
 msgstr "installed %s (%s)"

-#: src/pacman/trans.c:103
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
 msgstr "removing %s... "

-#: src/pacman/trans.c:110
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
 msgstr "removed %s (%s)"

-#: src/pacman/trans.c:117
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
 msgstr "upgrading %s... "

-#: src/pacman/trans.c:124
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "upgraded %s (%s -> %s)"

-#: src/pacman/trans.c:131
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
 msgstr "checking package integrity... "

-#: src/pacman/trans.c:147
+#: src/pacman/trans.c:144
 msgid "failed.\n"
 msgstr "failed.\n"

-#: src/pacman/trans.c:154
+#: src/pacman/trans.c:151
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
 msgstr ":: Retrieving packages from %s...\n"

-#: src/pacman/trans.c:175
+#: src/pacman/trans.c:172
 #, c-format
 msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
 msgstr ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "

-#: src/pacman/trans.c:180
+#: src/pacman/trans.c:177
 #, c-format
 msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ":: %s is in IgnorePkg. Install anyway? [Y/n] "

-#: src/pacman/trans.c:193
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "

-#: src/pacman/trans.c:206
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Replace %s with %s/%s? [Y/n] "

-#: src/pacman/trans.c:221
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s conflicts with %s. Remove %s? [Y/n] "

-#: src/pacman/trans.c:237
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "

-#: src/pacman/trans.c:255
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "

-#: src/pacman/trans.c:273
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "

-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr "installing"

-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr "upgrading"

-#: src/pacman/trans.c:335
+#: src/pacman/trans.c:332
 msgid "removing"
 msgstr "removing"

-#: src/pacman/trans.c:338
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
 msgstr "checking for file conflicts"

@@ -1072,3 +1070,15 @@ msgstr ""
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Total Installed Size:   %.2f MB\n"
+
+#~ msgid "requires: %s"
+#~ msgstr "requires: %s"
+
+#~ msgid "'%s': %s\n"
+#~ msgstr "'%s': %s\n"
+
+#~ msgid "Installed Size : %ld K\n"
+#~ msgstr "Installed Size : %ld K\n"
+
+#~ msgid "is required by"
+#~ msgstr "is required by"
--- a/src/pacman/po/es.po
+++ b/src/pacman/po/es.po
--- a/src/pacman/po/fr.po
+++ b/src/pacman/po/fr.po
--- a/src/pacman/po/hu.po
+++ b/src/pacman/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-11 22:57+0100\n"
+"POT-Creation-Date: 2007-04-28 04:02-0400\n"
 "PO-Revision-Date: 2006-09-03 13:52+0200\n"
 "Last-Translator: Nagy Gabor <ngaba@petra.hos.u-szeged.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -33,12 +33,11 @@ msgstr "csomag adatainak bet
 #: src/pacman/add.c:83
 #, c-format
 msgid "failed to add target '%s' (%s)"
-msgstr "nem siker<65>lt a '%s' c<>lt hozz<7A>adni a tranzakci<63>hoz (%s)"
+msgstr "nem siker<65>lt a(z) '%s' c<>lt hozz<7A>adni a tranzakci<63>hoz (%s)"

 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94
-#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134
-#: src/pacman/trans.c:145
+#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
+#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
 msgstr "k<>sz.\n"

@@ -52,22 +51,22 @@ msgstr "nem siker
 msgid ":: %s: requires %s"
 msgstr ":: %s: ig<69>nyli a k<>vetkez<65>t: %s"

-#: src/pacman/add.c:125 src/pacman/sync.c:645
+#: src/pacman/add.c:125 src/pacman/sync.c:643
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: <20>tk<74>zik a k<>vetkez<65>vel: %s"

-#: src/pacman/add.c:134 src/pacman/sync.c:709
+#: src/pacman/add.c:134 src/pacman/sync.c:707
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s l<>tezik ebben: '%s' <20>s ebben: '%s'\n"

-#: src/pacman/add.c:140 src/pacman/sync.c:715
+#: src/pacman/add.c:140 src/pacman/sync.c:713
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s l<>tezik a f<>jlrendszerben\n"

-#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -75,27 +74,22 @@ msgstr ""
 "\n"
 "hib<69>k l<>ptek fel, nem friss<73>lt csomag.\n"

-#: src/pacman/add.c:156 src/pacman/sync.c:652
+#: src/pacman/add.c:156 src/pacman/sync.c:650
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ":: %.1f MB sz<73>ks<6B>ges, %.1f MB <20>ll rendelkez<65>sre"

-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702
+#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "nem siker<65>lt v<>grehajtani a tranzakci<63>t (%s)\n"

 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:743
+#: src/pacman/sync.c:741
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "nem siker<65>lt lez<65>rni a tranzakci<63>t (%s)\n"

-#: src/pacman/deptest.c:84
-#, c-format
-msgid "requires: %s"
-msgstr "ig<69>nyli a k<>vetkez<65>t: %s"
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -130,7 +124,7 @@ msgstr "hiba: "

 #: src/pacman/log.h:34
 msgid "warning: "
-msgstr "figyelmeztet<65>s"
+msgstr "figyelmeztet<65>s: "

 #: src/pacman/package.c:60
 msgid "Explicitly installed"
@@ -271,7 +265,7 @@ msgstr "Backup f
 #: src/pacman/package.c:180
 #, c-format
 msgid "error calculating checksums for %s\n"
-msgstr "hiba a %s ellen<65>rz<72> <20>sszeg<65>nek sz<73>m<EFBFBD>t<EFBFBD>sa k<>zben\n"
+msgstr "hiba a(z) %s ellen<65>rz<72> <20>sszeg<65>nek sz<73>m<EFBFBD>t<EFBFBD>sa k<>zben\n"

 #: src/pacman/package.c:193
 #, c-format
@@ -296,7 +290,7 @@ msgstr "(nincs)\n"
 #: src/pacman/package.c:246
 #, c-format
 msgid "No changelog available for '%s'.\n"
-msgstr "Nem <20>ll rendelkez<65>sre v<>ltoz<6F>si napl<70> a '%s' csomaghoz.\n"
+msgstr "Nem <20>ll rendelkez<65>sre v<>ltoz<6F>si napl<70> a(z) '%s' csomaghoz.\n"

 #: src/pacman/pacman.c:90
 #, c-format
@@ -373,7 +367,7 @@ msgstr ""
 #: src/pacman/pacman.c:106
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
-msgstr "usage:  %s {-R --remove} [opci<63>k] <csomag>\n"
+msgstr "haszn<EFBFBD>lat:  %s {-R --remove} [opci<63>k] <csomag>\n"

 #: src/pacman/pacman.c:108
 #, c-format
@@ -455,8 +449,7 @@ msgstr "  -l, --list           a lek
 #: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -m, --foreign        list all packages that were not found in the sync db"
-"(s)\n"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
 "  -m, --foreign        a t<>voli rep<65>kban nem tal<61>lt telep<65>tett csomagok "
 "list<73>ja\n"
@@ -468,9 +461,7 @@ msgstr "  -o, --owns <f

 #: src/pacman/pacman.c:133
 #, c-format
-msgid ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
+msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
 "  -p, --file <csomag>  a <csomag> csomagf<67>jl lek<65>rdez<65>se az adatb<74>zis "
 "helyett\n"
@@ -478,9 +469,9 @@ msgstr ""
 #: src/pacman/pacman.c:134
 #, c-format
 msgid ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr "  -s, --search [regex] keres<65>s a telep<65>tett csomagok k<>z<EFBFBD>tt\n"
+msgstr "  -s, --search <regex> keres<65>s a telep<65>tett csomagok k<>z<EFBFBD>tt\n"

 #: src/pacman/pacman.c:135
 #, c-format
@@ -508,37 +499,42 @@ msgstr "  -e, --dependsonly    csak a f

 #: src/pacman/pacman.c:145
 #, c-format
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
+msgstr "  -l, --list <rep<65>>    egy rep<65> csomagjainak list<73>z<EFBFBD>sa\n"
+
+#: src/pacman/pacman.c:146
+#, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
 "  -p, --print-uris     list<73>zza az adott csomagok <20>s f<>gg<67>s<EFBFBD>geik URI-jait\n"

-#: src/pacman/pacman.c:146
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
-"  -s, --search         search remote repositories for matching strings\n"
-msgstr "  -s, --search [regex] keres<65>s a t<>voli csomagadatb<74>zisokban\n"
+"  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> keres<65>s a t<>voli csomagadatb<74>zisokban\n"

-#: src/pacman/pacman.c:147
+#: src/pacman/pacman.c:148
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade     az <20>sszes elavult csomag friss<73>t<EFBFBD>se\n"

-#: src/pacman/pacman.c:148
+#: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
 msgstr "  -w, --downloadonly   csak let<65>lt<6C>s, de semmit nem telep<65>t/friss<73>t\n"

-#: src/pacman/pacman.c:149
+#: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 msgstr "  -y, --refresh        friss csomagadatb<74>zis let<65>lt<6C>se a szerverr<72>l\n"

-#: src/pacman/pacman.c:150
+#: src/pacman/pacman.c:151
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
@@ -546,17 +542,17 @@ msgid ""
 msgstr ""
 "      --ignore <csom.> csomagfriss<73>t<EFBFBD>s mell<6C>z<EFBFBD>se (t<>bbsz<73>r is haszn<7A>lhat<61>)\n"

-#: src/pacman/pacman.c:152
+#: src/pacman/pacman.c:153
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <<3C>tv.>  alternat<61>v konfigur<75>ci<63>s f<>jl haszn<7A>lata\n"

-#: src/pacman/pacman.c:153
+#: src/pacman/pacman.c:154
 #, c-format
-msgid "      --noconfirm      do not ask for anything confirmation\n"
+msgid "      --noconfirm      do not ask for any confirmation\n"
 msgstr "      --noconfirm      ne k<>rjen soha meger<65>s<EFBFBD>t<EFBFBD>st\n"

-#: src/pacman/pacman.c:154
+#: src/pacman/pacman.c:155
 #, c-format
 msgid ""
 "      --ask <number>   pre-specify answers for questions (see manpage)\n"
@@ -564,156 +560,170 @@ msgstr ""
 "      --ask <sz<73>m>     el<65>re megadja a v<>laszokat k<>rd<72>sekre (ld. man "
 "oldal)\n"

-#: src/pacman/pacman.c:155
+#: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
 "      --noprogressbar  ne mutasson folyamats<74>vot a f<>jlok let<65>lt<6C>se k<>zben\n"

-#: src/pacman/pacman.c:156
+#: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if there is any\n"
 msgstr ""
 "      --noscriptlet    ne futtassa le a telep<65>t<EFBFBD>si szkriptet, ha van olyan\n"

-#: src/pacman/pacman.c:157
+#: src/pacman/pacman.c:158
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose        legyen b<>besz<73>d<EFBFBD>\n"

-#: src/pacman/pacman.c:158
+#: src/pacman/pacman.c:159
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
 "  -r, --root <<3C>tvonal> alternat<61>v telep<65>t<EFBFBD>si gy<67>k<EFBFBD>rk<72>nyvt<76>r be<62>ll<6C>t<EFBFBD>sa\n"

-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:160
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr "  -b, --dbpath <<3C>tv.>  alternat<61>v adatb<74>zisk<73>nyvt<76>r be<62>ll<6C>t<EFBFBD>sa\n"

-#: src/pacman/pacman.c:160
+#: src/pacman/pacman.c:161
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr ""
 "      --cachedir <kvt> alternat<61>v csomaggyors<72>t<EFBFBD>t<EFBFBD>r-k<>nyvt<76>r be<62>ll<6C>t<EFBFBD>sa\n"

-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:174
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 "                       Ezt a programot b<>rki a General Public License-ben\n"

-#: src/pacman/pacman.c:174
+#: src/pacman/pacman.c:175
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr "                       foglaltak alapj<70>n szabadon terjesztheti\n"

-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
-msgstr "a '%s' nem <20>rv<72>nyes hibakeres<65>si szint"
+msgstr "a(z) '%s' nem <20>rv<72>nyes hibakeres<65>si szint"

-#: src/pacman/pacman.c:314
+#: src/pacman/pacman.c:315
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr "a '%s' nem <20>rv<72>nyes gyors<72>t<EFBFBD>t<EFBFBD>rk<72>nyvt<76>r\n"

-#: src/pacman/pacman.c:332
+#: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
 msgstr "a '%s' nem <20>rv<72>nyes adatb<74>zis <20>tvonal\n"

-#: src/pacman/pacman.c:362
+#: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
 msgstr "a '%s' nem <20>rv<72>nyes gy<67>k<EFBFBD>rk<72>nyvt<76>r <20>tvonal\n"

-#: src/pacman/pacman.c:389
+#: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
 msgstr "csak egy m<>velet hajthat<61> v<>gre egyszerre\n"

-#: src/pacman/pacman.c:435
+#: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
 msgstr ""

-#: src/pacman/pacman.c:455
+#: src/pacman/pacman.c:456
 #, c-format
-msgid "failed to initilize alpm library (%s)\n"
+msgid "failed to initialize alpm library (%s)\n"
 msgstr "nem siker<65>lt inicializ<69>lni az alpm k<>nyvt<76>rat (%s)\n"

-#: src/pacman/pacman.c:488
+#: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "nem hajthat<61> v<>gre ez a m<>velet hacsak nem rendszergazda.\n"
+msgstr "ez a m<>velet csak rendszergazdak<EFBFBD>nt hajthat<61> v<>gre.\n"

-#: src/pacman/pacman.c:504
+#: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "nem siker<65>lt <20>rtelmezni a be<62>ll<6C>t<EFBFBD>si f<>jlt (%s)\n"

-#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
-msgstr "C<>lok:"
+#: src/pacman/pacman.c:516
+msgid "Targets  :"
+msgstr "C<>lok    :"

-#: src/pacman/pacman.c:520
+#: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr "nem siker<65>lt regisztr<74>lni a 'local' adatb<74>zist (%s)\n"

-#: src/pacman/pacman.c:527
+#: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
 msgstr "nincs megadva egyetlen c<>l se (haszn<7A>lja a '-h'-t seg<65>ts<74>g<EFBFBD>rt)\n"

-#: src/pacman/pacman.c:540
+#: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
 msgstr "nincs megadva egyetlen m<>velet se (haszn<7A>lja a '-h'-t seg<65>ts<74>g<EFBFBD>rt)\n"

-#: src/pacman/query.c:56
+#: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
 msgstr "nincs megadva f<>jl a --owns sz<73>m<EFBFBD>ra\n"

-#: src/pacman/query.c:74
+#: src/pacman/query.c:95
+#, c-format
+msgid "failed to read file '%s': %s"
+msgstr "nem siker<65>lt olvasni a '%s' f<>jlt: %s"
+
+#: src/pacman/query.c:100
+msgid "cannot determine ownership of a directory"
+msgstr "nem siker<65>lt egy k<>nyvt<76>r tulajdonos<6F>t meg<65>llap<61>tani"
+
+#: src/pacman/query.c:105
+#, c-format
+msgid "cannot determine real path for '%s': %s"
+msgstr "nem <20>llap<61>that<61> meg a val<61>di <20>tvonal a(z) '%s' sz<73>m<EFBFBD>ra: %s"
+
+#: src/pacman/query.c:119
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "a %s f<>jlt a %s %s tartalmazza\n"

-#: src/pacman/query.c:81
+#: src/pacman/query.c:127
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Egyik csomag sem tartalmazza a k<>vetkez<65>t: %s\n"

-#: src/pacman/query.c:122 src/pacman/sync.c:453
+#: src/pacman/query.c:170 src/pacman/sync.c:453
 msgid "no usable package repositories configured.\n"
-msgstr "egyetlen haszn<7A>lhat<61> csomag rep<EFBFBD> sincs be<62>ll<6C>tva.\n"
+msgstr "egyetlen haszn<7A>lhat<61> csomagrep<65> sincs be<62>ll<6C>tva.\n"

-#: src/pacman/query.c:128
+#: src/pacman/query.c:176
 msgid "Checking for package upgrades..."
 msgstr "Friss<73>t<EFBFBD>sek keres<65>se... "

-#: src/pacman/query.c:135
+#: src/pacman/query.c:183
 msgid "no upgrades found"
 msgstr "nem tal<61>ltam friss<73>t<EFBFBD>st"

-#: src/pacman/query.c:173
+#: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
-msgstr "a \"%s\" csoport nem tal<61>lhat<61>\n"
+msgstr "a(z) \"%s\" csoport nem tal<61>lhat<61>\n"

-#: src/pacman/query.c:184
+#: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
-msgstr "nincs megadva f<>jl a --file sz<73>m<EFBFBD>ra\n"
+msgstr "nincs megadva csomagf<EFBFBD>jl a --file sz<73>m<EFBFBD>ra\n"

-#: src/pacman/query.c:188
+#: src/pacman/query.c:236
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
-msgstr "nem siker<65>lt bet<65>lteni a '%s' csomagot (%s)\n"
+msgstr "nem siker<65>lt bet<65>lteni a(z) '%s' csomagot (%s)\n"

-#: src/pacman/query.c:226 src/pacman/query.c:258
+#: src/pacman/query.c:273 src/pacman/query.c:305
 #, c-format
 msgid "package \"%s\" not found\n"
-msgstr "a \"%s\" csomag nem tal<61>lhat<61>\n"
+msgstr "a(z) \"%s\" csomag nem tal<61>lhat<61>\n"

 #: src/pacman/remove.c:61 src/pacman/sync.c:568
 #, c-format
@@ -727,7 +737,7 @@ msgstr "    Elt
 #: src/pacman/remove.c:67
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
-msgstr ":: Elt<6C>vol<6F>tja a %s-t a %s csoportb<74>l? [I/n] "
+msgstr ":: Elt<6C>vol<6F>tja %s-t a(z) %s csoportb<74>l? [I/n] "

 #: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529
 #, c-format
@@ -737,12 +747,16 @@ msgstr "nem siker
 #: src/pacman/remove.c:92
 #, c-format
 msgid "failed to add target '%s' (%s)\n"
-msgstr "nem siker<65>lt a '%s' c<>lt hozz<7A>adni a tranzakci<63>hoz (%s)\n"
+msgstr "nem siker<65>lt a(z) '%s' c<>lt hozz<7A>adni a tranzakci<63>hoz (%s)\n"

 #: src/pacman/remove.c:106
 #, c-format
 msgid ":: %s is required by %s\n"
-msgstr ":: %s-t ig<69>nyli a %s\n"
+msgstr ":: %s-t ig<69>nyli: %s\n"
+
+#: src/pacman/remove.c:128 src/pacman/util.c:324
+msgid "Targets:"
+msgstr "C<>lok:"

 #: src/pacman/remove.c:131
 msgid ""
@@ -793,27 +807,27 @@ msgstr "nem siker
 #: src/pacman/sync.c:223
 #, c-format
 msgid " %s is up to date\n"
-msgstr " a %s naprak<61>sz\n"
+msgstr " a(z) %s naprak<61>sz\n"

 #: src/pacman/sync.c:345
 #, c-format
 msgid "repository '%s' does not exist\n"
-msgstr "a '%s' rep<65> nem l<>tezik\n"
+msgstr "a(z) '%s' rep<65> nem l<>tezik\n"

 #: src/pacman/sync.c:361
 #, c-format
 msgid "package '%s' was not found in repository '%s'\n"
-msgstr "a '%s' csomag nem tal<61>lhat<61> a '%s' rep<65>ban\n"
+msgstr "a(z) '%s' csomag nem tal<61>lhat<61> a(z) '%s' rep<65>ban\n"

 #: src/pacman/sync.c:381
 #, c-format
 msgid "package '%s' was not found\n"
-msgstr "a \"%s\" csomag nem tal<61>lhat<61>.\n"
+msgstr "a(z) '%s' csomag nem tal<61>lhat<61>\n"

 #: src/pacman/sync.c:418
 #, c-format
 msgid "repository \"%s\" was not found.\n"
-msgstr "a \"%s\" rep<65> nem tal<61>lhat<61>.\n"
+msgstr "a(z) \"%s\" rep<65> nem tal<61>lhat<61>.\n"

 #: src/pacman/sync.c:490
 msgid ":: Synchronizing package databases...\n"
@@ -860,11 +874,6 @@ msgstr ":: El
 msgid "pacman: %s\n"
 msgstr "pacman: %s\n"

-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr "'%s': %s\n"
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: A teljes tartalom telep<65>t<EFBFBD>se? [I/n] "
@@ -872,26 +881,22 @@ msgstr ":: A teljes tartalom telep
 #: src/pacman/sync.c:579
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
-msgstr ":: Telep<65>ti a %s-t a %s csoportb<74>l? [I/n] "
+msgstr ":: Telep<65>ti %s-t a(z) %s csoportb<74>l? [I/n] "

 #: src/pacman/sync.c:603
 #, c-format
 msgid "'%s': not found in sync db\n"
 msgstr "'%s': nem tal<61>lhat<61> a t<>voli adatb<74>zisban\n"

-#: src/pacman/sync.c:623
+#: src/pacman/sync.c:621
 msgid "requires"
 msgstr "ig<69>nyli a k<>vetkez<65>t:"

-#: src/pacman/sync.c:623
-msgid "is required by"
-msgstr "ig<69>nyli a"
-
-#: src/pacman/sync.c:665
+#: src/pacman/sync.c:663
 msgid " local database is up to date\n"
 msgstr " a helyi adatb<74>zis naprak<61>sz\n"

-#: src/pacman/sync.c:674
+#: src/pacman/sync.c:672
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -899,11 +904,11 @@ msgstr ""
 "\n"
 "A let<65>lt<6C>s megkezd<7A>se...\n"

-#: src/pacman/sync.c:678
+#: src/pacman/sync.c:676
 msgid "Proceed with download? [Y/n] "
 msgstr "Kezd<7A>dhet a let<65>lt<6C>s? [I/n] "

-#: src/pacman/sync.c:686
+#: src/pacman/sync.c:684
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -911,7 +916,7 @@ msgstr ""
 "\n"
 "A friss<73>t<EFBFBD>si folyamat megkezd<7A>se...\n"

-#: src/pacman/sync.c:690
+#: src/pacman/sync.c:688
 msgid "Proceed with installation? [Y/n] "
 msgstr "Kezd<7A>dhet a telep<65>t<EFBFBD>s? [I/n] "

@@ -925,7 +930,7 @@ msgstr "f

 #: src/pacman/trans.c:63
 msgid "cleaning up... "
-msgstr "tisztogat<EFBFBD>s... "
+msgstr "takar<EFBFBD>t<EFBFBD>s... "

 #: src/pacman/trans.c:66
 msgid "resolving dependencies... "
@@ -935,102 +940,102 @@ msgstr "f
 msgid "looking for inter-conflicts... "
 msgstr "bels<6C> <20>tk<74>z<EFBFBD>sek keres<65>se... "

-#: src/pacman/trans.c:89
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr "%s telep<65>t<EFBFBD>se... "

-#: src/pacman/trans.c:96
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
 msgstr "%s telep<65>tve (%s)"

-#: src/pacman/trans.c:103
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
 msgstr "%s elt<6C>vol<6F>t<EFBFBD>sa... "

-#: src/pacman/trans.c:110
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
 msgstr "%s elt<6C>vol<6F>tva (%s)"

-#: src/pacman/trans.c:117
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
 msgstr "%s friss<73>t<EFBFBD>se... "

-#: src/pacman/trans.c:124
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "%s friss<73>tve (%s -> %s)"

-#: src/pacman/trans.c:131
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
-msgstr "a csomagok integrit<69>s<EFBFBD>nak ellen<65>rz<72>se... "
+msgstr "csomagok integrit<69>s<EFBFBD>nak ellen<65>rz<72>se... "

-#: src/pacman/trans.c:147
+#: src/pacman/trans.c:144
 msgid "failed.\n"
-msgstr " sikertelen.\n"
+msgstr "sikertelen.\n"

-#: src/pacman/trans.c:154
+#: src/pacman/trans.c:151
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Csomagok let<65>lt<6C>se a %s-b<EFBFBD>l...\n"
+msgstr ":: Csomagok let<65>lt<6C>se a(z) %s rep<65>b<EFBFBD>l...\n"

-#: src/pacman/trans.c:175
+#: src/pacman/trans.c:172
 #, c-format
 msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
 msgstr ":: %1$s ig<69>nyli %2$s-t az IgnorePkg-b<>l. Telep<65>ti %2$s-t? [I/n] "

-#: src/pacman/trans.c:180
+#: src/pacman/trans.c:177
 #, c-format
 msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
-msgstr ":: a %s az IgnorePkg r<>sze. M<>gis telep<65>ti? [I/n] "
+msgstr ":: %s az IgnorePkg r<>sze. M<>gis telep<65>ti? [I/n] "

-#: src/pacman/trans.c:193
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: a %s HoldPkgnak lett jel<65>lve. Biztosan elt<6C>vol<6F>tja? [I/n] "
+msgstr ":: %s HoldPkgnak lett jel<65>lve. Biztosan elt<6C>vol<6F>tja? [I/n] "

-#: src/pacman/trans.c:206
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: Lecser<65>li a %s-t erre: %s/%s? [I/n] "
+msgstr ":: Lecser<65>li %s-t erre: %s/%s? [I/n] "

-#: src/pacman/trans.c:221
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
-msgstr ":: a %s <20>tk<74>zik a k<>vetkez<65>vel: %s. Elt<6C>vol<6F>tja a %s-t? [I/n] "
+msgstr ":: %s <20>tk<74>zik a k<>vetkez<65>vel: %s. Elt<6C>vol<6F>tja a %s-t? [I/n] "

-#: src/pacman/trans.c:237
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: a helyi verzi<7A> <20>jabb. M<>gis friss<73>ti? [I/n] "

-#: src/pacman/trans.c:255
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: a helyi verzi<7A> naprak<61>sz. M<>gis friss<73>ti? [I/n] "

-#: src/pacman/trans.c:273
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
-msgstr ":: A %s s<>r<EFBFBD>lt. K<>v<EFBFBD>nja t<>r<EFBFBD>lni? [I/n] "
+msgstr ":: %s s<>r<EFBFBD>lt. K<>v<EFBFBD>nja t<>r<EFBFBD>lni? [I/n] "

-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr "telep<65>t<EFBFBD>s:"

-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr "friss<73>t<EFBFBD>s:"

-#: src/pacman/trans.c:335
+#: src/pacman/trans.c:332
 msgid "removing"
-msgstr "elt<6C>vol<6F><6C>s:"
+msgstr "elt<6C>vol<6F>t<EFBFBD>s:"

-#: src/pacman/trans.c:338
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
 msgstr "f<>jl<6A>tk<74>z<EFBFBD>sek vizsg<73>lata"

@@ -1041,7 +1046,7 @@ msgstr "Nincs\n"

 #: src/pacman/util.c:311
 msgid "Remove:"
-msgstr "Elt<6C>vol<6F>t<EFBFBD>s:  "
+msgstr "Elt<6C>vol<6F>t<EFBFBD>s:"

 #: src/pacman/util.c:319
 #, c-format
@@ -1065,3 +1070,9 @@ msgstr ""
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Teljes telep<65>tett m<>ret:   %.2f MB\n"
+
+#~ msgid "requires: %s"
+#~ msgstr "ig<69>nyli a k<>vetkez<65>t: %s"
+
+#~ msgid "'%s': %s\n"
+#~ msgstr "'%s': %s\n"
--- a/src/pacman/po/it.po
+++ b/src/pacman/po/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-07 11:45-0500\n"
-"PO-Revision-Date: 2007-03-08 02:30+0100\n"
+"POT-Creation-Date: 2007-04-28 04:02-0400\n"
+"PO-Revision-Date: 2007-03-31 04:00+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -38,9 +38,8 @@ msgid "failed to add target '%s' (%s)"
 msgstr "impossibile aggiungere il pacchetto '%s' (%s)"

 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94
-#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134
-#: src/pacman/trans.c:145
+#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
+#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
 msgstr "fatto.\n"

@@ -54,22 +53,22 @@ msgstr "preparazione non riuscita (%s)\n"
 msgid ":: %s: requires %s"
 msgstr ":: %s: richiede %s"

-#: src/pacman/add.c:125 src/pacman/sync.c:645
+#: src/pacman/add.c:125 src/pacman/sync.c:643
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: va in conflitto con %s"

-#: src/pacman/add.c:134 src/pacman/sync.c:709
+#: src/pacman/add.c:134 src/pacman/sync.c:707
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s è già presente in '%s' e in '%s'\n"

-#: src/pacman/add.c:140 src/pacman/sync.c:715
+#: src/pacman/add.c:140 src/pacman/sync.c:713
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s è già presente nel filesystem\n"

-#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -77,27 +76,22 @@ msgstr ""
 "\n"
 "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n"

-#: src/pacman/add.c:156 src/pacman/sync.c:652
+#: src/pacman/add.c:156 src/pacman/sync.c:650
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB"

-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702
+#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "impossibile eseguire l'operazione richiesta (%s)\n"

 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:743
+#: src/pacman/sync.c:741
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "impossibile annullare l'operazione richiesta (%s)\n"

-#: src/pacman/deptest.c:86
-#, c-format
-msgid "requires: %s"
-msgstr "richiede: %s"
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -193,10 +187,10 @@ msgstr "Richiesto da   :"
 msgid "Conflicts With :"
 msgstr "Conflitto con  :"

-#: src/pacman/package.c:86
+#: src/pacman/package.c:86 src/pacman/package.c:136
 #, c-format
-msgid "Installed Size : %ld K\n"
-msgstr "Dimensione     : %ld K\n"
+msgid "Installed Size : %6.2f K\n"
+msgstr "Kb richiesti   : %6.2f K\n"

 #: src/pacman/package.c:87
 #, c-format
@@ -211,7 +205,7 @@ msgstr "Architettura   : %s\n"
 #: src/pacman/package.c:89
 #, c-format
 msgid "Build Date     : %s %s\n"
-msgstr "Creato in data : %s %s\n"
+msgstr "Creato il      : %s %s\n"

 #: src/pacman/package.c:90
 #, c-format
@@ -255,11 +249,6 @@ msgstr "Sostituisce    :"
 msgid "Download Size  : %6.2f K\n"
 msgstr "Dimensione pkg : %6.2f K\n"

-#: src/pacman/package.c:136
-#, c-format
-msgid "Installed Size : %6.2f K\n"
-msgstr "Kb richiesti   : %6.2f K\n"
-
 #: src/pacman/package.c:144
 #, c-format
 msgid "MD5 Sum        : %s"
@@ -278,7 +267,7 @@ msgstr "File di backup:\n"
 #: src/pacman/package.c:180
 #, c-format
 msgid "error calculating checksums for %s\n"
-msgstr "si è verificato un errore durante il calcolo del checksum di %s\n"
+msgstr "si è verificato un errore durante il calcolo dei checksum di %s\n"

 #: src/pacman/package.c:193
 #, c-format
@@ -369,7 +358,7 @@ msgstr "opzioni:\n"
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         ignora le dipendenze richieste\n"
+msgstr "  -d, --nodeps         ignora i controlli sulle dipendenze\n"

 #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142
 #, c-format
@@ -387,8 +376,7 @@ msgstr "uso:  %s {-R --remove} [opzioni] <pacchetto>\n"
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        rimuove i pacchetti e quelli che dipendono da questi\n"
+msgstr "  -c, --cascade        rimuove i pacchetti con tutte le dipendenze\n"

 #: src/pacman/pacman.c:110
 #, c-format
@@ -407,7 +395,8 @@ msgstr "  -n, --nosave         rimuove anche i file di configurazione\n"
 #, c-format
 msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
-msgstr "  -s, --recursive      rimuove anche le dipendenze (non richieste)\n"
+msgstr ""
+"  -s, --recursive      rimuove anche le dipendenze (non richieste altrove)\n"

 #: src/pacman/pacman.c:115
 #, c-format
@@ -427,7 +416,7 @@ msgstr "uso:  %s {-Q --query} [opzioni] [pacchetto]\n"
 #: src/pacman/pacman.c:125
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
-msgstr "  -c, --changelog      visualizza il changelog di un pacchetto\n"
+msgstr "  -c, --changelog      mostra il changelog di un pacchetto\n"

 #: src/pacman/pacman.c:126
 #, c-format
@@ -435,13 +424,12 @@ msgid ""
 "  -e, --orphans        list all packages installed as dependencies but no "
 "longer\n"
 msgstr ""
-"  -e, --orphans        elenca tutti i pacchetti installati come dipendenze e "
-"non\n"
+"  -e, --orphans        elenca i pacchetti installati che erano dipendenze\n"

 #: src/pacman/pacman.c:127
 #, c-format
 msgid "                       required by any package\n"
-msgstr "                       più richiesti da nessun pacchetto\n"
+msgstr "                       ma non più richiesti da alcun pacchetto\n"

 #: src/pacman/pacman.c:128 src/pacman/pacman.c:143
 #, c-format
@@ -462,8 +450,7 @@ msgstr "  -l, --list           elenca i file contenuti nel pacchetto\n"
 #: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -m, --foreign        list all packages that were not found in the sync db"
-"(s)\n"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
 "  -m, --foreign        elenca tutti i pacchetti non trovati nei database\n"

@@ -475,20 +462,18 @@ msgstr ""

 #: src/pacman/pacman.c:133
 #, c-format
-msgid ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
+msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
-"  -p, --file           interroga il file del pacchetto invece del database\n"
+"  -p, --file           interroga il file di pacchetto invece del database\n"

 #: src/pacman/pacman.c:134
 #, c-format
 msgid ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search         cerca nei pacchetti installati le corrispondenti "
-"stringhe\n"
+"  -s, --search <regex> cerca nei pacchetti installati le stringhe "
+"corrispondenti\n"

 #: src/pacman/pacman.c:135
 #, c-format
@@ -519,27 +504,33 @@ msgstr "  -e, --dependsonly    installa solo le dipendenze\n"

 #: src/pacman/pacman.c:145
 #, c-format
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
+msgstr ""
+"  -l, --list <repo>    visualizza la lista dei pacchetti di un repository\n"
+
+#: src/pacman/pacman.c:146
+#, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
 "  -p, --print-uris     stampa gli URI dei pacchetti e le loro dipendenze\n"

-#: src/pacman/pacman.c:146
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
-"  -s, --search         search remote repositories for matching strings\n"
+"  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search         cerca le stringhe corrispondenti nei repository "
+"  -s, --search <regex> cerca le stringhe corrispondenti nei repository "
 "remoti\n"

-#: src/pacman/pacman.c:147
+#: src/pacman/pacman.c:148
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr ""
 "  -u, --sysupgrade     aggiorna tutti i pacchetti installati nel sistema\n"

-#: src/pacman/pacman.c:148
+#: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
@@ -547,7 +538,7 @@ msgid ""
 msgstr ""
 "  -w, --downloadonly   scarica i pacchetti senza installarli/aggiornarli\n"

-#: src/pacman/pacman.c:149
+#: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
@@ -555,175 +546,189 @@ msgstr ""
 "  -y, --refresh        scarica dal server i database aggiornati dei "
 "pacchetti\n"

-#: src/pacman/pacman.c:150
+#: src/pacman/pacman.c:151
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr "      --ignore <pkg>   ignora l'aggiornamento di un pacchetto\n"

-#: src/pacman/pacman.c:152
+#: src/pacman/pacman.c:153
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <path>  imposta un file di configurazione alternativo\n"

-#: src/pacman/pacman.c:153
+#: src/pacman/pacman.c:154
 #, c-format
-msgid "      --noconfirm      do not ask for anything confirmation\n"
+msgid "      --noconfirm      do not ask for any confirmation\n"
 msgstr "      --noconfirm      non chiede alcuna conferma\n"

-#: src/pacman/pacman.c:154
+#: src/pacman/pacman.c:155
 #, c-format
 msgid ""
 "      --ask <number>   pre-specify answers for questions (see manpage)\n"
-msgstr "      --ask <numero>   pre-specifica delle risposte alle domande\n"
+msgstr ""
+"      --ask <numero>   specifica in anticipo le risposte alle domande\n"

-#: src/pacman/pacman.c:155
+#: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr "      --noprogressbar  non visualizza la barra di avanzamento\n"

-#: src/pacman/pacman.c:156
+#: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if there is any\n"
-msgstr "      --noscriptlet    non esegue lo script install\n"
+msgstr "      --noscriptlet    non esegue un eventuale script di install\n"

-#: src/pacman/pacman.c:157
+#: src/pacman/pacman.c:158
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose        mostra maggiori informazioni\n"

-#: src/pacman/pacman.c:158
+#: src/pacman/pacman.c:159
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
 "  -r, --root <path>    imposta una root alternativa per l'installazione\n"

-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:160
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr ""
 "  -b, --dbpath <path>  imposta un percorso alternativo per il database\n"

-#: src/pacman/pacman.c:160
+#: src/pacman/pacman.c:161
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <dir> imposta un percorso alternativo per la cache\n"
+msgstr "      --cachedir <dir> imposta un percorso alternativo per la cache\n"

-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:174
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 "                       This program may be freely redistributed under\n"

-#: src/pacman/pacman.c:174
+#: src/pacman/pacman.c:175
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr "                       the terms of the GNU General Public License\n"

-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
-msgstr "'%s' livello di debug non valido"
+msgstr "'%s' non è un livello di debug valido"

-#: src/pacman/pacman.c:314
+#: src/pacman/pacman.c:315
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr "'%s' non è una directory di cache valida\n"

-#: src/pacman/pacman.c:332
+#: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
 msgstr "'%s' non è un path del database valido\n"

-#: src/pacman/pacman.c:362
+#: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
-msgstr "'%s' path di root non valido\n"
+msgstr "'%s' non è un path di root valido\n"

-#: src/pacman/pacman.c:389
+#: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
 msgstr "è consentito eseguire solo un'operazione per volta\n"

-#: src/pacman/pacman.c:435
+#: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
-msgstr "attenzione: locale non valido, verrà utilizzato il locale \"C\""
+msgstr "attenzione: locale non valido, sarà utilizzato il locale \"C\""

-#: src/pacman/pacman.c:455
+#: src/pacman/pacman.c:456
 #, c-format
-msgid "failed to initilize alpm library (%s)\n"
+msgid "failed to initialize alpm library (%s)\n"
 msgstr "impossibile inizializzare la libreria alpm (%s)\n"

-#: src/pacman/pacman.c:488
+#: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "operazione possibile solo da root.\n"
+msgstr "operazione possibile solo come root.\n"

-#: src/pacman/pacman.c:504
+#: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "impossibile analizzare la configurazione (%s)\n"

-#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
-msgstr "Pacchetti:"
+#: src/pacman/pacman.c:516
+msgid "Targets  :"
+msgstr "Pacchetti  :"

-#: src/pacman/pacman.c:520
+#: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
-msgstr "impossibile registrare il database 'locale' (%s)\n"
+msgstr "impossibile registrare il database 'local' (%s)\n"

-#: src/pacman/pacman.c:527
+#: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
 msgstr "nessun pacchetto specificato (usare -h per un aiuto)\n"

-#: src/pacman/pacman.c:540
+#: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
 msgstr "nessuna operazione specificata (usare -h per un aiuto)\n"

-#: src/pacman/query.c:56
+#: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
 msgstr "nessun file specificato per --owns\n"

-#: src/pacman/query.c:74
+#: src/pacman/query.c:95
+#, c-format
+msgid "failed to read file '%s': %s"
+msgstr "impossibile leggere il file '%s': %s"
+
+#: src/pacman/query.c:100
+msgid "cannot determine ownership of a directory"
+msgstr "impossibile determinare il proprietario di una directory"
+
+#: src/pacman/query.c:105
+#, c-format
+msgid "cannot determine real path for '%s': %s"
+msgstr "impossibile determinare la posizione reale di '%s': %s"
+
+#: src/pacman/query.c:119
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s è contenuto in %s %s\n"

-#: src/pacman/query.c:81
+#: src/pacman/query.c:127
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Nessun pacchetto contiene %s\n"

-#: src/pacman/query.c:122 src/pacman/sync.c:453
+#: src/pacman/query.c:170 src/pacman/sync.c:453
 msgid "no usable package repositories configured.\n"
-msgstr "nessun repository configurato.\n"
+msgstr "non è stato configurato nessun repository di pacchetti valido.\n"

-#: src/pacman/query.c:128
+#: src/pacman/query.c:176
 msgid "Checking for package upgrades..."
-msgstr "Controllo dei pacchetti da aggiornare in corso..."
+msgstr "Controllo degli aggiornamenti dei pacchetti in corso..."

-#: src/pacman/query.c:135
+#: src/pacman/query.c:183
 msgid "no upgrades found"
 msgstr "nessun aggiornamento trovato"

-#: src/pacman/query.c:173
+#: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "gruppo \"%s\" non trovato\n"

-#: src/pacman/query.c:184
+#: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
-msgstr "nessun file del pacchetto specificato per --file\n"
+msgstr "nessun file di pacchetto specificato per --file\n"

-#: src/pacman/query.c:188
+#: src/pacman/query.c:236
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "impossibile caricare il pacchetto '%s' (%s)\n"

-#: src/pacman/query.c:226 src/pacman/query.c:258
+#: src/pacman/query.c:273 src/pacman/query.c:305
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "pacchetto \"%s\" non trovato\n"
@@ -735,7 +740,7 @@ msgstr ":: gruppo %s:\n"

 #: src/pacman/remove.c:63
 msgid "    Remove whole content? [Y/n] "
-msgstr "    Rimuovere tutto il contenuto? [Y/n] "
+msgstr "    Rimuovere l'intero contenuto? [Y/n] "

 #: src/pacman/remove.c:67
 #, c-format
@@ -757,6 +762,10 @@ msgstr "impossibile aggiungere il pacchetto '%s' (%s)\n"
 msgid ":: %s is required by %s\n"
 msgstr ":: %s è richiesto da %s\n"

+#: src/pacman/remove.c:128 src/pacman/util.c:324
+msgid "Targets:"
+msgstr "Pacchetti:"
+
 #: src/pacman/remove.c:131
 msgid ""
 "\n"
@@ -862,25 +871,20 @@ msgstr ":: Si consiglia di consentire a pacman di aggiornarsi\n"

 #: src/pacman/sync.c:520
 msgid ":: first, then you can re-run the operation with the newer version.\n"
-msgstr ":: adesso e riavviare l'operazione con la versione più recente.\n"
+msgstr ":: prima e poi riavviare l'operazione con la versione più recente.\n"

 #: src/pacman/sync.c:522
 msgid ":: Upgrade pacman first? [Y/n] "
-msgstr ":: Aggiornare adesso pacman? [Y/n] "
+msgstr ":: Aggiornare pacman adesso? [Y/n] "

 #: src/pacman/sync.c:537
 #, c-format
 msgid "pacman: %s\n"
 msgstr "pacman: %s\n"

-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr "'%s': %s\n"
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
-msgstr ":: Installare tutto il contenuto? [Y/n] "
+msgstr ":: Installare l'intero contenuto? [Y/n] "

 #: src/pacman/sync.c:579
 #, c-format
@@ -892,19 +896,15 @@ msgstr ":: Installare %s dal gruppo %s? [Y/n] "
 msgid "'%s': not found in sync db\n"
 msgstr "'%s': non trovato nel database\n"

-#: src/pacman/sync.c:623
+#: src/pacman/sync.c:621
 msgid "requires"
 msgstr "richiede"

-#: src/pacman/sync.c:623
-msgid "is required by"
-msgstr "è richiesto da"
-
-#: src/pacman/sync.c:665
+#: src/pacman/sync.c:663
 msgid " local database is up to date\n"
 msgstr " Il database locale è aggiornato\n"

-#: src/pacman/sync.c:674
+#: src/pacman/sync.c:672
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -912,11 +912,11 @@ msgstr ""
 "\n"
 "Download in corso...\n"

-#: src/pacman/sync.c:678
+#: src/pacman/sync.c:676
 msgid "Proceed with download? [Y/n] "
 msgstr "Procedere con il download? [Y/n] "

-#: src/pacman/sync.c:686
+#: src/pacman/sync.c:684
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -924,7 +924,7 @@ msgstr ""
 "\n"
 "Aggiornamento in corso...\n"

-#: src/pacman/sync.c:690
+#: src/pacman/sync.c:688
 msgid "Proceed with installation? [Y/n] "
 msgstr "Procedere con l'installazione? [Y/n] "

@@ -946,106 +946,106 @@ msgstr "risoluzione delle dipendenze in corso... "

 #: src/pacman/trans.c:69
 msgid "looking for inter-conflicts... "
-msgstr "ricerca dei conflitti in corso... "
+msgstr "ricerca dei conflitti incrociati in corso... "

-#: src/pacman/trans.c:89
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr "installazione di %s in corso... "

-#: src/pacman/trans.c:96
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
-msgstr "installato %s (%s)"
+msgstr "%s installato (%s)"

-#: src/pacman/trans.c:103
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
-msgstr "rimozione in corso di %s... "
+msgstr "rimozione di %s in corso... "

-#: src/pacman/trans.c:110
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
-msgstr "rimosso %s (%s)"
+msgstr "%s rimosso (%s)"

-#: src/pacman/trans.c:117
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
-msgstr "aggiornamento in corso di %s... "
+msgstr "aggiornamento di %s in corso... "

-#: src/pacman/trans.c:124
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
-msgstr "aggiornato %s (%s -> %s)"
+msgstr "%s aggiornato (%s -> %s)"

-#: src/pacman/trans.c:131
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
 msgstr "controllo dell'integrità dei pacchetti in corso... "

-#: src/pacman/trans.c:147
+#: src/pacman/trans.c:144
 msgid "failed.\n"
 msgstr "non riuscito.\n"

-#: src/pacman/trans.c:154
+#: src/pacman/trans.c:151
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
 msgstr ":: Recupero dei pacchetti da %s...\n"

-#: src/pacman/trans.c:175
+#: src/pacman/trans.c:172
 #, c-format
 msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
 msgstr ":: %1$s richiede %2$s da IgnorePkg. Installare %2$s? [Y/n] "

-#: src/pacman/trans.c:180
+#: src/pacman/trans.c:177
 #, c-format
 msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ":: %s è in IgnorePkg. Installare ugualmente? [Y/n] "

-#: src/pacman/trans.c:193
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: %s è in HoldPkg. Rimuovere ugualmente? [Y/n] "
+msgstr ":: %s è presente in HoldPkg. Rimuovere ugualmente? [Y/n] "

-#: src/pacman/trans.c:206
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Sostituire %s con %s/%s? [Y/n] "

-#: src/pacman/trans.c:221
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s va in conflitto con %s. Rimuovere %s? [Y/n] "

-#: src/pacman/trans.c:237
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: la versione installata è più recente. Aggiornare ugualmente? [Y/n] "

-#: src/pacman/trans.c:255
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: la versione installata è aggiornata. Aggiornare ugualmente? [Y/n] "

-#: src/pacman/trans.c:273
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: L'archivio %s è corrotto. Eliminarlo? [Y/n] "

-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr "installazione in corso di "

-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr "aggiornamento in corso di"

-#: src/pacman/trans.c:335
+#: src/pacman/trans.c:332
 msgid "removing"
 msgstr "rimozione in corso di"

-#: src/pacman/trans.c:338
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
 msgstr "controllo dei conflitti in corso"

@@ -1081,6 +1081,18 @@ msgstr ""
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Dimensione totale dei pacchetti installati:   %.2f MB\n"

+#~ msgid "requires: %s"
+#~ msgstr "richiede: %s"
+
+#~ msgid "'%s': %s\n"
+#~ msgstr "'%s': %s\n"
+
+#~ msgid "is required by"
+#~ msgstr "è richiesto da"
+
+#~ msgid "Installed Size : %ld K\n"
+#~ msgstr "Dimensione     : %ld K\n"
+
 #~ msgid "memory allocation failure\n"
 #~ msgstr "allocazione della memoria non riuscita\n"

--- a/src/pacman/po/pacman.pot
+++ b/src/pacman/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: 2007-03-07 11:45-0500\n"
+"POT-Creation-Date: 2007-04-28 04:02-0400\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"
@@ -34,9 +34,8 @@ msgid "failed to add target '%s' (%s)"
 msgstr ""

 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94
-#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134
-#: src/pacman/trans.c:145
+#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
+#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
 msgstr ""

@@ -50,48 +49,43 @@ msgstr ""
 msgid ":: %s: requires %s"
 msgstr ""

-#: src/pacman/add.c:125 src/pacman/sync.c:645
+#: src/pacman/add.c:125 src/pacman/sync.c:643
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ""

-#: src/pacman/add.c:134 src/pacman/sync.c:709
+#: src/pacman/add.c:134 src/pacman/sync.c:707
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr ""

-#: src/pacman/add.c:140 src/pacman/sync.c:715
+#: src/pacman/add.c:140 src/pacman/sync.c:713
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr ""

-#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 msgstr ""

-#: src/pacman/add.c:156 src/pacman/sync.c:652
+#: src/pacman/add.c:156 src/pacman/sync.c:650
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ""

-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702
+#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr ""

 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:743
+#: src/pacman/sync.c:741
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr ""

-#: src/pacman/deptest.c:86
-#, c-format
-msgid "requires: %s"
-msgstr ""
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -187,9 +181,9 @@ msgstr ""
 msgid "Conflicts With :"
 msgstr ""

-#: src/pacman/package.c:86
+#: src/pacman/package.c:86 src/pacman/package.c:136
 #, c-format
-msgid "Installed Size : %ld K\n"
+msgid "Installed Size : %6.2f K\n"
 msgstr ""

 #: src/pacman/package.c:87
@@ -249,11 +243,6 @@ msgstr ""
 msgid "Download Size  : %6.2f K\n"
 msgstr ""

-#: src/pacman/package.c:136
-#, c-format
-msgid "Installed Size : %6.2f K\n"
-msgstr ""
-
 #: src/pacman/package.c:144
 #, c-format
 msgid "MD5 Sum        : %s"
@@ -446,8 +435,7 @@ msgstr ""
 #: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -m, --foreign        list all packages that were not found in the sync db"
-"(s)\n"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""

 #: src/pacman/pacman.c:132
@@ -457,15 +445,13 @@ msgstr ""

 #: src/pacman/pacman.c:133
 #, c-format
-msgid ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
+msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""

 #: src/pacman/pacman.c:134
 #, c-format
 msgid ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""

@@ -493,200 +479,219 @@ msgstr ""

 #: src/pacman/pacman.c:145
 #, c-format
-msgid ""
-"  -p, --print-uris     print out URIs for given packages and their "
-"dependencies\n"
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
 msgstr ""

 #: src/pacman/pacman.c:146
 #, c-format
 msgid ""
-"  -s, --search         search remote repositories for matching strings\n"
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"
 msgstr ""

 #: src/pacman/pacman.c:147
 #, c-format
-msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""

 #: src/pacman/pacman.c:148
 #, c-format
+msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
+msgstr ""
+
+#: src/pacman/pacman.c:149
+#, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
 msgstr ""

-#: src/pacman/pacman.c:149
+#: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 msgstr ""

-#: src/pacman/pacman.c:150
+#: src/pacman/pacman.c:151
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""

-#: src/pacman/pacman.c:152
+#: src/pacman/pacman.c:153
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""

-#: src/pacman/pacman.c:153
-#, c-format
-msgid "      --noconfirm      do not ask for anything confirmation\n"
-msgstr ""
-
 #: src/pacman/pacman.c:154
 #, c-format
-msgid ""
-"      --ask <number>   pre-specify answers for questions (see manpage)\n"
+msgid "      --noconfirm      do not ask for any confirmation\n"
 msgstr ""

 #: src/pacman/pacman.c:155
 #, c-format
 msgid ""
-"      --noprogressbar  do not show a progress bar when downloading files\n"
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
 msgstr ""

 #: src/pacman/pacman.c:156
 #, c-format
 msgid ""
-"      --noscriptlet    do not execute the install scriptlet if there is any\n"
+"      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""

 #: src/pacman/pacman.c:157
 #, c-format
-msgid "  -v, --verbose        be verbose\n"
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if there is any\n"
 msgstr ""

 #: src/pacman/pacman.c:158
 #, c-format
-msgid "  -r, --root <path>    set an alternate installation root\n"
+msgid "  -v, --verbose        be verbose\n"
 msgstr ""

 #: src/pacman/pacman.c:159
 #, c-format
-msgid "  -b, --dbpath <path>  set an alternate database location\n"
+msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""

 #: src/pacman/pacman.c:160
 #, c-format
-msgid "      --cachedir <dir> set an alternate package cache location\n"
+msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr ""

-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:161
 #, c-format
-msgid "                       This program may be freely redistributed under\n"
+msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr ""

 #: src/pacman/pacman.c:174
 #, c-format
+msgid "                       This program may be freely redistributed under\n"
+msgstr ""
+
+#: src/pacman/pacman.c:175
+#, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr ""

-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
 msgstr ""

-#: src/pacman/pacman.c:314
+#: src/pacman/pacman.c:315
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr ""

-#: src/pacman/pacman.c:332
+#: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
 msgstr ""

-#: src/pacman/pacman.c:362
+#: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
 msgstr ""

-#: src/pacman/pacman.c:389
+#: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
 msgstr ""

-#: src/pacman/pacman.c:435
+#: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
 msgstr ""

-#: src/pacman/pacman.c:455
+#: src/pacman/pacman.c:456
 #, c-format
-msgid "failed to initilize alpm library (%s)\n"
+msgid "failed to initialize alpm library (%s)\n"
 msgstr ""

-#: src/pacman/pacman.c:488
+#: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr ""

-#: src/pacman/pacman.c:504
+#: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr ""

-#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
+#: src/pacman/pacman.c:516
+msgid "Targets  :"
 msgstr ""

-#: src/pacman/pacman.c:520
+#: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr ""

-#: src/pacman/pacman.c:527
+#: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
 msgstr ""

-#: src/pacman/pacman.c:540
+#: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
 msgstr ""

-#: src/pacman/query.c:56
+#: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
 msgstr ""

-#: src/pacman/query.c:74
+#: src/pacman/query.c:95
+#, c-format
+msgid "failed to read file '%s': %s"
+msgstr ""
+
+#: src/pacman/query.c:100
+msgid "cannot determine ownership of a directory"
+msgstr ""
+
+#: src/pacman/query.c:105
+#, c-format
+msgid "cannot determine real path for '%s': %s"
+msgstr ""
+
+#: src/pacman/query.c:119
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr ""

-#: src/pacman/query.c:81
+#: src/pacman/query.c:127
 #, c-format
 msgid "No package owns %s\n"
 msgstr ""

-#: src/pacman/query.c:122 src/pacman/sync.c:453
+#: src/pacman/query.c:170 src/pacman/sync.c:453
 msgid "no usable package repositories configured.\n"
 msgstr ""

-#: src/pacman/query.c:128
+#: src/pacman/query.c:176
 msgid "Checking for package upgrades..."
 msgstr ""

-#: src/pacman/query.c:135
+#: src/pacman/query.c:183
 msgid "no upgrades found"
 msgstr ""

-#: src/pacman/query.c:173
+#: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr ""

-#: src/pacman/query.c:184
+#: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
 msgstr ""

-#: src/pacman/query.c:188
+#: src/pacman/query.c:236
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr ""

-#: src/pacman/query.c:226 src/pacman/query.c:258
+#: src/pacman/query.c:273 src/pacman/query.c:305
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr ""
@@ -720,6 +725,10 @@ msgstr ""
 msgid ":: %s is required by %s\n"
 msgstr ""

+#: src/pacman/remove.c:128 src/pacman/util.c:324
+msgid "Targets:"
+msgstr ""
+
 #: src/pacman/remove.c:131
 msgid ""
 "\n"
@@ -832,11 +841,6 @@ msgstr ""
 msgid "pacman: %s\n"
 msgstr ""

-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr ""
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
 msgstr ""
@@ -851,35 +855,31 @@ msgstr ""
 msgid "'%s': not found in sync db\n"
 msgstr ""

-#: src/pacman/sync.c:623
+#: src/pacman/sync.c:621
 msgid "requires"
 msgstr ""

-#: src/pacman/sync.c:623
-msgid "is required by"
-msgstr ""
-
-#: src/pacman/sync.c:665
+#: src/pacman/sync.c:663
 msgid " local database is up to date\n"
 msgstr ""

-#: src/pacman/sync.c:674
+#: src/pacman/sync.c:672
 msgid ""
 "\n"
 "Beginning download...\n"
 msgstr ""

-#: src/pacman/sync.c:678
+#: src/pacman/sync.c:676
 msgid "Proceed with download? [Y/n] "
 msgstr ""

-#: src/pacman/sync.c:686
+#: src/pacman/sync.c:684
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
 msgstr ""

-#: src/pacman/sync.c:690
+#: src/pacman/sync.c:688
 msgid "Proceed with installation? [Y/n] "
 msgstr ""

@@ -903,102 +903,102 @@ msgstr ""
 msgid "looking for inter-conflicts... "
 msgstr ""

-#: src/pacman/trans.c:89
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr ""

-#: src/pacman/trans.c:96
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
 msgstr ""

-#: src/pacman/trans.c:103
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
 msgstr ""

-#: src/pacman/trans.c:110
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
 msgstr ""

-#: src/pacman/trans.c:117
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
 msgstr ""

-#: src/pacman/trans.c:124
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr ""

-#: src/pacman/trans.c:131
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
 msgstr ""

-#: src/pacman/trans.c:147
+#: src/pacman/trans.c:144
 msgid "failed.\n"
 msgstr ""

-#: src/pacman/trans.c:154
+#: src/pacman/trans.c:151
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
 msgstr ""

-#: src/pacman/trans.c:175
+#: src/pacman/trans.c:172
 #, c-format
 msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:180
+#: src/pacman/trans.c:177
 #, c-format
 msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:193
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:206
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:221
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:237
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:255
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:273
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ""

-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr ""

-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr ""

-#: src/pacman/trans.c:335
+#: src/pacman/trans.c:332
 msgid "removing"
 msgstr ""

-#: src/pacman/trans.c:338
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
 msgstr ""

--- a/src/pacman/po/pl_PL.po
+++ b/src/pacman/po/pl_PL.po
--- a/src/pacman/po/pt_BR.po
+++ b/src/pacman/po/pt_BR.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-07 11:45-0500\n"
-"PO-Revision-Date: 2007-03-07 00:17-0300\n"
-"Last-Translator: Douglas Soares de Andrade <dsandrade@gmail.com>\n"
+"POT-Creation-Date: 2007-04-28 04:02-0400\n"
+"PO-Revision-Date: 2007-03-22 13:52-0300\n"
+"Last-Translator: Douglas Soares de Andrade <douglas@archlinux-br.org>\n"
 "Language-Team: Archlinux-br <contato@archlinux-br.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,9 +41,8 @@ msgid "failed to add target '%s' (%s)"
 msgstr "falha com o parametro'%s' (%s)"

 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94
-#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134
-#: src/pacman/trans.c:145
+#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
+#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
 msgstr "concluído.\n"

@@ -57,22 +56,22 @@ msgstr "falha ao preparar transação (%s)\n"
 msgid ":: %s: requires %s"
 msgstr ":: %s: requer %s"

-#: src/pacman/add.c:125 src/pacman/sync.c:645
+#: src/pacman/add.c:125 src/pacman/sync.c:643
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: conflita com %s"

-#: src/pacman/add.c:134 src/pacman/sync.c:709
+#: src/pacman/add.c:134 src/pacman/sync.c:707
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s existe em '%s' e em '%s'\n"

-#: src/pacman/add.c:140 src/pacman/sync.c:715
+#: src/pacman/add.c:140 src/pacman/sync.c:713
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s existe no sistema de arquivos\n"

-#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -80,27 +79,22 @@ msgstr ""
 "\n"
 "ocorreram alguns erros, portanto, nenhum pacote foi atualizado.\n"

-#: src/pacman/add.c:156 src/pacman/sync.c:652
+#: src/pacman/add.c:156 src/pacman/sync.c:650
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ":: %.1f MB requerido, possui %.1f MB"

-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702
+#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "falha ao terminar a transação (%s)\n"

 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:743
+#: src/pacman/sync.c:741
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "falha ao liberar a transação (%s)\n"

-#: src/pacman/deptest.c:86
-#, c-format
-msgid "requires: %s"
-msgstr "requer: %s"
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -196,10 +190,10 @@ msgstr "Requerido Por         :"
 msgid "Conflicts With :"
 msgstr "Conflita Com          :"

-#: src/pacman/package.c:86
+#: src/pacman/package.c:86 src/pacman/package.c:136
 #, c-format
-msgid "Installed Size : %ld K\n"
-msgstr "Espaço Utilizado      : %ld K\n"
+msgid "Installed Size : %6.2f K\n"
+msgstr "Tamanho Instalado     : %6.2f K\n"

 #: src/pacman/package.c:87
 #, c-format
@@ -258,11 +252,6 @@ msgstr "Substitui             :"
 msgid "Download Size  : %6.2f K\n"
 msgstr "Tamanho do Download   : %6.2f K\n"

-#: src/pacman/package.c:136
-#, c-format
-msgid "Installed Size : %6.2f K\n"
-msgstr "Tamanho Instalado     : %6.2f K\n"
-
 #: src/pacman/package.c:144
 #, c-format
 msgid "MD5 Sum        : %s"
@@ -466,8 +455,7 @@ msgstr "  -l, --list             lista o conteúdo do pacote pesquisado\n"
 #: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -m, --foreign        list all packages that were not found in the sync db"
-"(s)\n"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
 "  -m, --foreign          lista todos os pacotes que não foram encontrados na"
 "(s) base(s) de dados de pacotes\n"
@@ -479,20 +467,18 @@ msgstr "  -o, --owns <arquivo>   pesquisa o pacote que contém <arquivo>\n"

 #: src/pacman/pacman.c:133
 #, c-format
-msgid ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
+msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
-"  -p, --file             pesquisa o arquivo de pacote [pacote] ao invés da "
+"  -p, --file <pacote>    pesquisa o arquivo de pacote <pacote> ao invés da "
 "base de dados\n"

 #: src/pacman/pacman.c:134
 #, c-format
 msgid ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search           busca em arquivos localmente instalados por textos "
+"  -s, --search <regex>   busca em arquivos localmente instalados por textos "
 "coincidentes\n"

 #: src/pacman/pacman.c:135
@@ -522,28 +508,34 @@ msgstr "  -e, --dependsonly      instala apenas as dependências \n"

 #: src/pacman/pacman.c:145
 #, c-format
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
+msgstr ""
+"  -l, --list <repo>    visualizar uma lista dos pacotes em um repositório\n"
+
+#: src/pacman/pacman.c:146
+#, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
 "  -p, --print-uris       imprime as URIs dos pacotes e suas dependências\n"

-#: src/pacman/pacman.c:146
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
-"  -s, --search         search remote repositories for matching strings\n"
+"  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search           procura em repositórios remotos por textos "
+"  -s, --search <regex>   procura em repositórios remotos por textos "
 "coincidentes\n"

-#: src/pacman/pacman.c:147
+#: src/pacman/pacman.c:148
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr ""
 "  -u, --sysupgrade       atualiza todos os pacotes que estão desatualizados "
 "no sistema\n"

-#: src/pacman/pacman.c:148
+#: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
@@ -552,13 +544,13 @@ msgstr ""
 "  -w, --downloadonly     baixa os pacotes mas não instala/atualiza nenhum "
 "pacote\n"

-#: src/pacman/pacman.c:149
+#: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 msgstr "  -y, --refresh          atualizar a base de dados de pacotes\n"

-#: src/pacman/pacman.c:150
+#: src/pacman/pacman.c:151
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
@@ -567,18 +559,18 @@ msgstr ""
 "      --ignore <pkg>     ignora a atualização de um pacote (pode ser usado "
 "mais de uma vez)\n"

-#: src/pacman/pacman.c:152
+#: src/pacman/pacman.c:153
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""
 "      --config <caminho> define um arquivo de configuração alternativo\n"

-#: src/pacman/pacman.c:153
+#: src/pacman/pacman.c:154
 #, c-format
-msgid "      --noconfirm      do not ask for anything confirmation\n"
+msgid "      --noconfirm      do not ask for any confirmation\n"
 msgstr "      --noconfirm        não pede nenhuma confirmação\n"

-#: src/pacman/pacman.c:154
+#: src/pacman/pacman.c:155
 #, c-format
 msgid ""
 "      --ask <number>   pre-specify answers for questions (see manpage)\n"
@@ -586,7 +578,7 @@ msgstr ""
 "      --ask  <número>    pré-especificar respostas para as perguntas (veja a "
 "manpage)\n"

-#: src/pacman/pacman.c:155
+#: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
@@ -594,7 +586,7 @@ msgstr ""
 "      --noprogressbar    não mostra a barra de progresso enquanto baixa os "
 "arquivos\n"

-#: src/pacman/pacman.c:156
+#: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if there is any\n"
@@ -602,141 +594,155 @@ msgstr ""
 "      --noscriptlet      não executar o scriptlet de instalação se o mesmo "
 "existir\n"

-#: src/pacman/pacman.c:157
+#: src/pacman/pacman.c:158
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose          informações adicionais\n"

-#: src/pacman/pacman.c:158
+#: src/pacman/pacman.c:159
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
 "  -r, --root <caminho>   define um diretório de instalação alternativo\n"

-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:160
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr ""
 "  -b, --dbpath <caminho> define uma localização diferente para a base de "
 "dados\n"

-#: src/pacman/pacman.c:160
+#: src/pacman/pacman.c:161
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr "      --cachedir <dir>   define um diretório de cache alternativo\n"

-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:174
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 "                       Este programa pode ser distribuído livremente sob\n"

-#: src/pacman/pacman.c:174
+#: src/pacman/pacman.c:175
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr ""
 "                       os termos da Licença GPL - General Public License\n"

-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
 msgstr "'%s' não é um nível de depuração válido"

-#: src/pacman/pacman.c:314
+#: src/pacman/pacman.c:315
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr "'%s' não é um diretório de cache válido\n"

-#: src/pacman/pacman.c:332
+#: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
 msgstr "'%s' não é um caminho de base de dados válido\n"

-#: src/pacman/pacman.c:362
+#: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
 msgstr "'%s' não é uma caminho válido\n"

-#: src/pacman/pacman.c:389
+#: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
 msgstr "só uma operação pode ser usada de cada vez\n"

-#: src/pacman/pacman.c:435
+#: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
 msgstr "aviso: o locale atual é inválido; usando o locale padrão \"C\""

-#: src/pacman/pacman.c:455
+#: src/pacman/pacman.c:456
 #, c-format
-msgid "failed to initilize alpm library (%s)\n"
+msgid "failed to initialize alpm library (%s)\n"
 msgstr "falha ao iniciar biblioteca alpm (%s)\n"

-#: src/pacman/pacman.c:488
+#: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "você não pode realizar esta operação a menos que você seja root\n"

-#: src/pacman/pacman.c:504
+#: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "falha ao interpretar configuração (%s)\n"

-#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
-msgstr "Pacotes:"
+#: src/pacman/pacman.c:516
+msgid "Targets  :"
+msgstr "Pacotes  :"

-#: src/pacman/pacman.c:520
+#: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr "não foi possível registar a base de dados local (%s)\n"

-#: src/pacman/pacman.c:527
+#: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
 msgstr "nenhum arquivo definido (use -h para obter ajuda)\n"

-#: src/pacman/pacman.c:540
+#: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
 msgstr "nenhuma operação definida (use -h para obter ajuda)\n"

-#: src/pacman/query.c:56
+#: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
 msgstr "nenhum arquivo especificado para --owns\n"

-#: src/pacman/query.c:74
+#: src/pacman/query.c:95
+#, c-format
+msgid "failed to read file '%s': %s"
+msgstr "falha ao ler o arquivo '%s' %s"
+
+#: src/pacman/query.c:100
+msgid "cannot determine ownership of a directory"
+msgstr "não é possível determinar o dono de um diretório"
+
+#: src/pacman/query.c:105
+#, c-format
+msgid "cannot determine real path for '%s': %s"
+msgstr "não é possível determinar o caminho de '%s': %s"
+
+#: src/pacman/query.c:119
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s pertence a %s %s\n"

-#: src/pacman/query.c:81
+#: src/pacman/query.c:127
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Nenhum pacote possui %s\n"

-#: src/pacman/query.c:122 src/pacman/sync.c:453
+#: src/pacman/query.c:170 src/pacman/sync.c:453
 msgid "no usable package repositories configured.\n"
 msgstr "nenhum repositório de pacotes configurado.\n"

-#: src/pacman/query.c:128
+#: src/pacman/query.c:176
 msgid "Checking for package upgrades..."
 msgstr "Buscando atualizações de pacotes..."

-#: src/pacman/query.c:135
+#: src/pacman/query.c:183
 msgid "no upgrades found"
 msgstr "nenhuma atualização encontrada"

-#: src/pacman/query.c:173
+#: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "grupo \"%s\" não encontrado\n"

-#: src/pacman/query.c:184
+#: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
 msgstr "nenhum pacote foi especificado para a opção --file\n"

-#: src/pacman/query.c:188
+#: src/pacman/query.c:236
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "falha ao carregar o pacote '%s' (%s)\n"

-#: src/pacman/query.c:226 src/pacman/query.c:258
+#: src/pacman/query.c:273 src/pacman/query.c:305
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "pacote \"%s\" não encontrado\n"
@@ -770,6 +776,10 @@ msgstr "falha com o parametro '%s' (%s)\n"
 msgid ":: %s is required by %s\n"
 msgstr ":: %s é necessário para %s\n"

+#: src/pacman/remove.c:128 src/pacman/util.c:324
+msgid "Targets:"
+msgstr "Pacotes:"
+
 #: src/pacman/remove.c:131
 msgid ""
 "\n"
@@ -888,11 +898,6 @@ msgstr ":: Atualizar o pacman primeiro? [S/n] "
 msgid "pacman: %s\n"
 msgstr "pacman: %s\n"

-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr "'%s': %s\n"
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Instalar todo o conteúdo? [S/n] "
@@ -907,19 +912,15 @@ msgstr ":: Instalar %s do grupo %s? [S/n] "
 msgid "'%s': not found in sync db\n"
 msgstr "'%s': não foi encontrado na base de dados de pacotes\n"

-#: src/pacman/sync.c:623
+#: src/pacman/sync.c:621
 msgid "requires"
 msgstr "requer"

-#: src/pacman/sync.c:623
-msgid "is required by"
-msgstr "é requerido por"
-
-#: src/pacman/sync.c:665
+#: src/pacman/sync.c:663
 msgid " local database is up to date\n"
 msgstr "Base de dados de pacotes está atualizada.\n"

-#: src/pacman/sync.c:674
+#: src/pacman/sync.c:672
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -927,11 +928,11 @@ msgstr ""
 "\n"
 "Iniciando download...\n"

-#: src/pacman/sync.c:678
+#: src/pacman/sync.c:676
 msgid "Proceed with download? [Y/n] "
 msgstr "Continuar o download? [S/n] "

-#: src/pacman/sync.c:686
+#: src/pacman/sync.c:684
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -939,7 +940,7 @@ msgstr ""
 "\n"
 "Iniciando processo de atualização...\n"

-#: src/pacman/sync.c:690
+#: src/pacman/sync.c:688
 msgid "Proceed with installation? [Y/n] "
 msgstr "Continuar a instalação? [S/n] "

@@ -953,7 +954,7 @@ msgstr "verificando conflitos de arquivos... "

 #: src/pacman/trans.c:63
 msgid "cleaning up... "
-msgstr "limpando..."
+msgstr "finalizando..."

 #: src/pacman/trans.c:66
 msgid "resolving dependencies... "
@@ -963,108 +964,109 @@ msgstr "resolvendo dependências... "
 msgid "looking for inter-conflicts... "
 msgstr "procurando por conflitos internos... "

-#: src/pacman/trans.c:89
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr "instalando %s... "

-#: src/pacman/trans.c:96
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
 msgstr "%s instalado (%s)"

-#: src/pacman/trans.c:103
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
 msgstr "removendo %s... "

-#: src/pacman/trans.c:110
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
 msgstr "%s removido (%s)"

-#: src/pacman/trans.c:117
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
 msgstr "atualizando %s... "

-#: src/pacman/trans.c:124
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "%s atualizado (%s -> %s)"

-#: src/pacman/trans.c:131
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
 msgstr "verificando a integridade do pacote... "

-#: src/pacman/trans.c:147
+#: src/pacman/trans.c:144
 msgid "failed.\n"
 msgstr "falhou.\n"

-#: src/pacman/trans.c:154
+#: src/pacman/trans.c:151
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Obtendo pacotes do %s...\n"
+msgstr ":: Obtendo pacotes do repositório %s...\n"

-#: src/pacman/trans.c:175
-#, fuzzy, c-format
+#: src/pacman/trans.c:172
+#, c-format
 msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
 msgstr ""
-":: %s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] "
+":: %1$s requer %2$s, mas ele está em IgnorePkg. Instalar %2$s assim mesmo? "
+"[S/n] "

-#: src/pacman/trans.c:180
+#: src/pacman/trans.c:177
 #, c-format
 msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""
 "::O pacote %s está na lista de pacotes ignorados (IgnorePkg). Instalar assim "
 "mesmo? [S/n] "

-#: src/pacman/trans.c:193
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ":: %s é designado como um HoldPkg Remover assim mesmo? [S/n] "

-#: src/pacman/trans.c:206
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Substituir %s com %s/%s? [S/n] "

-#: src/pacman/trans.c:221
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s conflita com %s. Remover %s? [S/n] "

-#: src/pacman/trans.c:237
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: a versão local é mais recente. Deseja atualizar mesmo assim? [S/n] "

-#: src/pacman/trans.c:255
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: a versão local está atualizada. Deseja atualizar mesmo assim? [S/"
 "n] "

-#: src/pacman/trans.c:273
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: Arquivo %s está corrompido. Você gostaria de apagá-lo? [S/n] "

-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr "instalando"

-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr "atualizando"

-#: src/pacman/trans.c:335
+#: src/pacman/trans.c:332
 msgid "removing"
 msgstr "removendo"

-#: src/pacman/trans.c:338
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
 msgstr "verificando conflitos de arquivo"

@@ -1099,3 +1101,9 @@ msgstr ""
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Tamanho total da instalação:   %.2f MB\n"
+
+#~ msgid "requires: %s"
+#~ msgstr "requer: %s"
+
+#~ msgid "'%s': %s\n"
+#~ msgstr "'%s': %s\n"
--- a/src/pacman/po/ru_RU.po
+++ b/src/pacman/po/ru_RU.po
@@ -1,5 +1,5 @@
 # Pacman Russian Translation
-# Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
+# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package.
 # Vladimir Bayrakovskiy <4rayven@gmail.com>, 2007
 #
@@ -7,12 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-07 11:45-0500\n"
+"POT-Creation-Date: 2007-04-28 04:02-0400\n"
 "PO-Revision-Date: 2007-03-07 11:45-0500\n"
 "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n"
+"Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482
 #: src/pacman/sync.c:531
@@ -31,69 +34,63 @@ msgstr "чтение информации о пакете... "
 #: src/pacman/add.c:83
 #, c-format
 msgid "failed to add target '%s' (%s)"
-msgstr ""
+msgstr "не удалось добавить цель '%s' (%s)"

 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
-#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94
-#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134
-#: src/pacman/trans.c:145
+#: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
+#: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
 msgstr "готово.\n"

 #: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
-msgstr ""
+msgstr "не удалось подготовить операцию (%s)\n"

 #: src/pacman/add.c:104
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ":: %s: требует %s"

-#: src/pacman/add.c:125 src/pacman/sync.c:645
+#: src/pacman/add.c:125 src/pacman/sync.c:643
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: конфликтует с %s"

-#: src/pacman/add.c:134 src/pacman/sync.c:709
+#: src/pacman/add.c:134 src/pacman/sync.c:707
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
 msgstr "%s содержится в '%s' и в '%s'\n"

-#: src/pacman/add.c:140 src/pacman/sync.c:715
+#: src/pacman/add.c:140 src/pacman/sync.c:713
 #, c-format
 msgid "%s: %s exists in filesystem\n"
 msgstr "%s: %s уже есть на диске\n"

-#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 msgstr ""
 "\n"
-"произошли ошибки, пакеты небыли обновлены.\n"
+"произошли ошибки, пакеты не были обновлены.\n"

-#: src/pacman/add.c:156 src/pacman/sync.c:652
+#: src/pacman/add.c:156 src/pacman/sync.c:650
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ":: требуется %.1f MB, доступно %.1f MB"

-#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702
+#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "не удалось завершить операцию (%s)\n"

 #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524
-#: src/pacman/sync.c:743
+#: src/pacman/sync.c:741
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "не удалось продолжить операцию (%s)\n"

-#: src/pacman/deptest.c:86
-#, c-format
-msgid "requires: %s"
-msgstr "требуется: %s"
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -116,11 +113,11 @@ msgstr "функция"

 #: src/pacman/log.c:194
 msgid "Y"
-msgstr ""
+msgstr "Y"

 #: src/pacman/log.c:194
 msgid "YES"
-msgstr ""
+msgstr "YES"

 #: src/pacman/log.h:30
 msgid "error: "
@@ -132,7 +129,7 @@ msgstr "предупреждение: "

 #: src/pacman/package.c:60
 msgid "Explicitly installed"
-msgstr ""
+msgstr "Явно установлен"

 #: src/pacman/package.c:63
 msgid "Installed as a dependency for another package"
@@ -171,7 +168,7 @@ msgstr "Группы                  :"

 #: src/pacman/package.c:78 src/pacman/package.c:130
 msgid "Provides       :"
-msgstr "Обеспечивает            :"
+msgstr "Предоставляет           :"

 #: src/pacman/package.c:79 src/pacman/package.c:131
 msgid "Depends On     :"
@@ -189,10 +186,10 @@ msgstr "Требуется пакетами      :"
 msgid "Conflicts With :"
 msgstr "Конфликтует с           :"

-#: src/pacman/package.c:86
+#: src/pacman/package.c:86 src/pacman/package.c:136
 #, c-format
-msgid "Installed Size : %ld K\n"
-msgstr "Размер установленного   : %ld K\n"
+msgid "Installed Size : %6.2f K\n"
+msgstr "Размер установленного   : %6.2f K\n"

 #: src/pacman/package.c:87
 #, c-format
@@ -231,11 +228,11 @@ msgstr "Скрипт при установке    : %s\n"

 #: src/pacman/package.c:96
 msgid "Yes"
-msgstr ""
+msgstr "Yes"

 #: src/pacman/package.c:96
 msgid "No"
-msgstr ""
+msgstr "No"

 #: src/pacman/package.c:126
 #, c-format
@@ -251,11 +248,6 @@ msgstr "Заменяет                :"
 msgid "Download Size  : %6.2f K\n"
 msgstr "Размер при закачке      : %6.2f K\n"

-#: src/pacman/package.c:136
-#, c-format
-msgid "Installed Size : %6.2f K\n"
-msgstr "Размер установленного   : %6.2f K\n"
-
 #: src/pacman/package.c:144
 #, c-format
 msgid "MD5 Sum        : %s"
@@ -269,7 +261,7 @@ msgstr "Сумма SHA1              : %s"
 #: src/pacman/package.c:158
 #, c-format
 msgid "Backup Files:\n"
-msgstr "Создает резервные копии файлов:\n"
+msgstr "Создаёт резервные копии файлов:\n"

 #: src/pacman/package.c:180
 #, c-format
@@ -279,12 +271,12 @@ msgstr "ошибка при вычислении контрольной сумм
 #: src/pacman/package.c:193
 #, c-format
 msgid "MODIFIED\t%s\n"
-msgstr "ИЗМЕНЕН\t%s\n"
+msgstr "ИЗМЕНЁН\t%s\n"

 #: src/pacman/package.c:195
 #, c-format
 msgid "Not Modified\t%s\n"
-msgstr "Не Изменен\t%s\n"
+msgstr "Не Изменён\t%s\n"

 #: src/pacman/package.c:200
 #, c-format
@@ -299,7 +291,7 @@ msgstr "(пусто)\n"
 #: src/pacman/package.c:246
 #, c-format
 msgid "No changelog available for '%s'.\n"
-msgstr "Список измененний не доступен для пакета '%s'.\n"
+msgstr "Список изменений недоступен для пакета '%s'.\n"

 #: src/pacman/pacman.c:90
 #, c-format
@@ -309,37 +301,37 @@ msgstr "использование:  %s {-h --help}\n"
 #: src/pacman/pacman.c:91
 #, c-format
 msgid "        %s {-V --version}\n"
-msgstr ""
+msgstr "        %s {-V --version}\n"

 #: src/pacman/pacman.c:92
 #, c-format
 msgid "        %s {-A --add}     [options] <file>\n"
-msgstr "        %s {-A --add}     [опции] <файл>\n"
+msgstr "        %s {-A --add}     [параметры] <файл>\n"

 #: src/pacman/pacman.c:93
 #, c-format
 msgid "        %s {-F --freshen} [options] <file>\n"
-msgstr "        %s {-F --freshen} [опции] <файл>\n"
+msgstr "        %s {-F --freshen} [параметры] <файл>\n"

 #: src/pacman/pacman.c:94
 #, c-format
 msgid "        %s {-Q --query}   [options] [package]\n"
-msgstr "        %s {-Q --query}   [опции] [пакет]\n"
+msgstr "        %s {-Q --query}   [параметры] [пакет]\n"

 #: src/pacman/pacman.c:95
 #, c-format
 msgid "        %s {-R --remove}  [options] <package>\n"
-msgstr "        %s {-R --remove}  [опции] <пакет>\n"
+msgstr "        %s {-R --remove}  [параметры] <пакет>\n"

 #: src/pacman/pacman.c:96
 #, c-format
 msgid "        %s {-S --sync}    [options] [package]\n"
-msgstr "        %s {-S --sync}    [опции] [пакет]\n"
+msgstr "        %s {-S --sync}    [параметры] [пакет]\n"

 #: src/pacman/pacman.c:97
 #, c-format
 msgid "        %s {-U --upgrade} [options] <file>\n"
-msgstr "        %s {-U --upgrade} [опции] <файл>\n"
+msgstr "        %s {-U --upgrade} [параметры] <файл>\n"

 #: src/pacman/pacman.c:98
 #, c-format
@@ -354,13 +346,13 @@ msgstr ""
 #: src/pacman/pacman.c:101
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
-msgstr "использование:  %s {-A --add} [опции] <файл>\n"
+msgstr "использование:  %s {-A --add} [параметры] <файл>\n"

 #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119
 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138
 #, c-format
 msgid "options:\n"
-msgstr "опции:\n"
+msgstr "параметры:\n"

 #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120
 #: src/pacman/pacman.c:140
@@ -378,7 +370,7 @@ msgstr ""
 #: src/pacman/pacman.c:106
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
-msgstr "использование:  %s {-R --remove} [опции] <пакет>\n"
+msgstr "использование:  %s {-R --remove} [параметры] <пакет>\n"

 #: src/pacman/pacman.c:108
 #, c-format
@@ -410,17 +402,17 @@ msgstr ""
 #: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
-msgstr "использование:  %s {-F --freshen} [опции] <файл>\n"
+msgstr "использование:  %s {-F --freshen} [параметры] <файл>\n"

 #: src/pacman/pacman.c:117
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
-msgstr "использование:  %s {-U --upgrade} [опции] <файл>\n"
+msgstr "использование:  %s {-U --upgrade} [параметры] <файл>\n"

 #: src/pacman/pacman.c:123
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
-msgstr "использование:  %s {-Q --query} [опции] [пакет]\n"
+msgstr "использование:  %s {-Q --query} [параметры] [пакет]\n"

 #: src/pacman/pacman.c:125
 #, c-format
@@ -438,7 +430,7 @@ msgstr ""
 #: src/pacman/pacman.c:127
 #, c-format
 msgid "                       required by any package\n"
-msgstr "                       но более не трубующиеся другим пакетам\n"
+msgstr "                       но более не требующиеся другим пакетам\n"

 #: src/pacman/pacman.c:128 src/pacman/pacman.c:143
 #, c-format
@@ -458,32 +450,29 @@ msgstr "  -l, --list           показать содержимое запра
 #: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -m, --foreign        list all packages that were not found in the sync db"
-"(s)\n"
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
-"  -m, --foreign        показать все пакеты не найденные в базе данных(s)\n"
+"  -m, --foreign        показать все пакеты не найденные в базе(ах) данных\n"

 #: src/pacman/pacman.c:132
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr "  -o, --owns <файл>    найти пакет сдержащий <файл>\n"
+msgstr "  -o, --owns <файл>    найти пакет содержащий <файл>\n"

 #: src/pacman/pacman.c:133
 #, c-format
-msgid ""
-"  -p, --file           query the package file [package] instead of the "
-"database\n"
+msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
-"  -p, --file           извлеч информацию из файла пакета [пакет], а не из "
+"  -p, --file <пакет>   извлечь информацию из файла пакета <пакет>, а не из "
 "базы данных\n"

 #: src/pacman/pacman.c:134
 #, c-format
 msgid ""
-"  -s, --search         search locally-installed packages for matching "
+"  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search         искать указанную строку в локально установленных "
+"  -s, --search <regex> искать указанную строку в локально установленных "
 "пакетах\n"

 #: src/pacman/pacman.c:135
@@ -496,7 +485,7 @@ msgstr ""
 #: src/pacman/pacman.c:137
 #, c-format
 msgid "usage:  %s {-S --sync} [options] [package]\n"
-msgstr "использование:  %s {-S --sync} [опции] [пакет]\n"
+msgstr "использование:  %s {-S --sync} [параметры] [пакет]\n"

 #: src/pacman/pacman.c:139
 #, c-format
@@ -504,7 +493,7 @@ msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
 msgstr ""
-"  -c, --clean          удалить старые пакеты из кэша (-cc чтобы удалеть все "
+"  -c, --clean          удалить старые пакеты из кэша (-cc чтобы удалить все "
 "пакеты из кэша)\n"

 #: src/pacman/pacman.c:141
@@ -514,6 +503,11 @@ msgstr "  -e, --dependsonly    установить только зависим

 #: src/pacman/pacman.c:145
 #, c-format
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
+msgstr "  -l, --list <repo>    показать все пакеты данного репозитория\n"
+
+#: src/pacman/pacman.c:146
+#, c-format
 msgid ""
 "  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
@@ -521,207 +515,224 @@ msgstr ""
 "  -p, --print-uris     напечатать ссылки для загрузки указанных пакетов и их "
 "зависимостей\n"

-#: src/pacman/pacman.c:146
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
-"  -s, --search         search remote repositories for matching strings\n"
+"  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search         искать указанную строку в репозиториях на удаленных "
+"  -s, --search <regex> искать указанную строку в репозиториях на удаленных "
 "серверах\n"

-#: src/pacman/pacman.c:147
+#: src/pacman/pacman.c:148
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade     обновить все устаревшие пакеты\n"

-#: src/pacman/pacman.c:148
+#: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
 msgstr ""
-"  -w, --downloadonly   загрузить пакеты с сервера, но ни чего не "
-"устанавливать и не обновлять\n"
+"  -w, --downloadonly   загрузить пакеты с сервера, но не устанавливать\n"

-#: src/pacman/pacman.c:149
+#: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 msgstr ""
 "  -y, --refresh        загрузить свежие базы данных пакетов с сервера\n"

-#: src/pacman/pacman.c:150
+#: src/pacman/pacman.c:151
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
-"      --ignore <pkg>   игнорировать пакет при обновлинии (может быть "
+"      --ignore <пакет> игнорировать пакет при обновлении (может быть "
 "использовано неоднократно)\n"

-#: src/pacman/pacman.c:152
-#, c-format
-msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <path>  использовать алтернативный конфигурационный файл\n"
-
 #: src/pacman/pacman.c:153
 #, c-format
-msgid "      --noconfirm      do not ask for anything confirmation\n"
-msgstr "      --noconfirm      не спрашивать подтверждения\n"
+msgid "      --config <path>  set an alternate configuration file\n"
+msgstr ""
+"      --config <путь>  использовать альтернативный конфигурационный файл\n"

 #: src/pacman/pacman.c:154
 #, c-format
-msgid ""
-"      --ask <number>   pre-specify answers for questions (see manpage)\n"
-msgstr ""
-"      --ask <number>   заранее подготовленные ответы на вопросы (смотрите "
-"man-страницу)\n"
+msgid "      --noconfirm      do not ask for any confirmation\n"
+msgstr "      --noconfirm      не спрашивать подтверждения\n"

 #: src/pacman/pacman.c:155
 #, c-format
 msgid ""
-"      --noprogressbar  do not show a progress bar when downloading files\n"
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
 msgstr ""
+"      --ask <число>    заранее подготовленные ответы на вопросы (смотрите "
+"man-страницу)\n"

 #: src/pacman/pacman.c:156
 #, c-format
 msgid ""
+"      --noprogressbar  do not show a progress bar when downloading files\n"
+msgstr "      --noprogressbar  не отображать прогресс при скачивании файлов\n"
+
+#: src/pacman/pacman.c:157
+#, c-format
+msgid ""
 "      --noscriptlet    do not execute the install scriptlet if there is any\n"
 msgstr ""
 "      --noscriptlet    не запускать установочные скрипты, если они есть\n"

-#: src/pacman/pacman.c:157
+#: src/pacman/pacman.c:158
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose        выводить больше информации\n"

-#: src/pacman/pacman.c:158
+#: src/pacman/pacman.c:159
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
-
-#: src/pacman/pacman.c:159
-#, c-format
-msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
+"  -r, --root <путь>    указать альтернативную корневую директорию для "
+"установки\n"

 #: src/pacman/pacman.c:160
 #, c-format
-msgid "      --cachedir <dir> set an alternate package cache location\n"
+msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr ""
-"      --cachedir <директория> указать альтернативное расположение кэша\n"
+"  -b, --dbpath <путь>  указать альтернативное расположение базы данных\n"

-#: src/pacman/pacman.c:173
+#: src/pacman/pacman.c:161
 #, c-format
-msgid "                       This program may be freely redistributed under\n"
-msgstr ""
+msgid "      --cachedir <dir> set an alternate package cache location\n"
+msgstr "      --cachedir <dir> указать альтернативное расположение кэша\n"

 #: src/pacman/pacman.c:174
 #, c-format
-msgid "                       the terms of the GNU General Public License\n"
+msgid "                       This program may be freely redistributed under\n"
 msgstr ""
+"                       This program may be freely redistributed under\n"

-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:175
+#, c-format
+msgid "                       the terms of the GNU General Public License\n"
+msgstr "                       the terms of the GNU General Public License\n"
+
+#: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
 msgstr "'%s' - неверный уровень отладки"

-#: src/pacman/pacman.c:314
+#: src/pacman/pacman.c:315
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr "'%s' неправильно указан путь к кэш-директории\n"

-#: src/pacman/pacman.c:332
+#: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
 msgstr "'%s' неправильно указан путь к базе данных\n"

-#: src/pacman/pacman.c:362
+#: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
-msgstr ""
+msgstr "некорректный корневой каталог: '%s'\n"

-#: src/pacman/pacman.c:389
+#: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
 msgstr "одновременно может выполняться только одна операция\n"

-#: src/pacman/pacman.c:435
+#: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
-msgstr ""
+msgstr "warning: current locale is invalid; using default \"C\" locale"

-#: src/pacman/pacman.c:455
+#: src/pacman/pacman.c:456
 #, c-format
-msgid "failed to initilize alpm library (%s)\n"
+msgid "failed to initialize alpm library (%s)\n"
 msgstr "не удалось инициализировать библиотеку alpm (%s)\n"

-#: src/pacman/pacman.c:488
+#: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "Вы не можете выполнить эту операцию если вы не root.\n"
+msgstr ""
+"Вы не можете выполнить эту операцию не являясь суперпользователем (root).\n"

-#: src/pacman/pacman.c:504
+#: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
-msgstr "не удалось разобрать конфигурационный файл (%s)\n"
+msgstr "не удалось обработать конфигурационный файл (%s)\n"

-#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324
-msgid "Targets:"
-msgstr "Цели:"
+#: src/pacman/pacman.c:516
+msgid "Targets  :"
+msgstr "Цели     :"

-#: src/pacman/pacman.c:520
+#: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
-msgstr "не могу зарегистрировать 'локальную' бызу данных (%s)\n"
+msgstr "не могу зарегистрировать локальную базу данных (%s)\n"

-#: src/pacman/pacman.c:527
+#: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
-msgstr "не задано целей (для помощи используйте -h)\n"
+msgstr "не задано целей (для справки используйте -h)\n"

-#: src/pacman/pacman.c:540
+#: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
-msgstr "не указаны конкретные операции (для помощи используйте -h)\n"
+msgstr "не задана операция (для справки используйте -h)\n"

-#: src/pacman/query.c:56
+#: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
 msgstr "не был указан файл для --owns\n"

-#: src/pacman/query.c:74
+#: src/pacman/query.c:95
+#, c-format
+msgid "failed to read file '%s': %s"
+msgstr "не удалось прочитать файл '%s': %s"
+
+#: src/pacman/query.c:100
+msgid "cannot determine ownership of a directory"
+msgstr "не удалось определить владельца каталога"
+
+#: src/pacman/query.c:105
+#, c-format
+msgid "cannot determine real path for '%s': %s"
+msgstr "не удалось определить настоящий путь для '%s': %s"
+
+#: src/pacman/query.c:119
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s принадлежит %s %s\n"

-#: src/pacman/query.c:81
+#: src/pacman/query.c:127
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Ни один пакет не содержит %s\n"

-#: src/pacman/query.c:122 src/pacman/sync.c:453
+#: src/pacman/query.c:170 src/pacman/sync.c:453
 msgid "no usable package repositories configured.\n"
 msgstr "ни один репозиторий не сконфигурирован должным образом.\n"

-#: src/pacman/query.c:128
+#: src/pacman/query.c:176
 msgid "Checking for package upgrades..."
 msgstr "Проверка обновлений..."

-#: src/pacman/query.c:135
+#: src/pacman/query.c:183
 msgid "no upgrades found"
 msgstr "обновлений не найдено"

-#: src/pacman/query.c:173
+#: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "группа \"%s\" не найдена\n"

-#: src/pacman/query.c:184
+#: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
-msgstr "не указан файл пакета для опции --file\n"
+msgstr "не указан файл пакета для параметра --file\n"

-#: src/pacman/query.c:188
+#: src/pacman/query.c:236
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "не удалось загрузить пакет '%s' (%s)\n"

-#: src/pacman/query.c:226 src/pacman/query.c:258
+#: src/pacman/query.c:273 src/pacman/query.c:305
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "пакет \"%s\" не найден\n"
@@ -748,13 +759,17 @@ msgstr "не удалось начать операцию (%s)\n"
 #: src/pacman/remove.c:92
 #, c-format
 msgid "failed to add target '%s' (%s)\n"
-msgstr ""
+msgstr "ну удалось добавить цель '%s' (%s)\n"

 #: src/pacman/remove.c:106
 #, c-format
 msgid ":: %s is required by %s\n"
 msgstr ":: %s необходим для %s\n"

+#: src/pacman/remove.c:128 src/pacman/util.c:324
+msgid "Targets:"
+msgstr "Цели:"
+
 #: src/pacman/remove.c:131
 msgid ""
 "\n"
@@ -832,7 +847,7 @@ msgstr ":: Синхронизирую базу данных пакетов...\n"

 #: src/pacman/sync.c:491
 msgid "synchronizing package lists"
-msgstr "синхронизирую список пакетов"
+msgstr "синхронизирую списки пакетов"

 #: src/pacman/sync.c:493
 msgid "failed to synchronize any databases"
@@ -864,17 +879,12 @@ msgstr ":: после чего перезапустить операцию с и

 #: src/pacman/sync.c:522
 msgid ":: Upgrade pacman first? [Y/n] "
-msgstr ":: Сначала обновить pacman? [Y/n] "
+msgstr ":: Обновить pacman в первую очередь? [Y/n] "

 #: src/pacman/sync.c:537
 #, c-format
 msgid "pacman: %s\n"
-msgstr ""
-
-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr ""
+msgstr "pacman: %s\n"

 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
@@ -888,21 +898,17 @@ msgstr ":: Установить %s из группы %s? [Y/n] "
 #: src/pacman/sync.c:603
 #, c-format
 msgid "'%s': not found in sync db\n"
-msgstr "'%s': не найдено в базе данных\n"
+msgstr "'%s': не найдено в базе пакетов\n"

-#: src/pacman/sync.c:623
+#: src/pacman/sync.c:621
 msgid "requires"
 msgstr "требует"

-#: src/pacman/sync.c:623
-msgid "is required by"
-msgstr "требуется для"
-
-#: src/pacman/sync.c:665
+#: src/pacman/sync.c:663
 msgid " local database is up to date\n"
 msgstr " локальная база данных не устарела\n"

-#: src/pacman/sync.c:674
+#: src/pacman/sync.c:672
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -910,11 +916,11 @@ msgstr ""
 "\n"
 "Начинаю загрузку...\n"

-#: src/pacman/sync.c:678
+#: src/pacman/sync.c:676
 msgid "Proceed with download? [Y/n] "
 msgstr "Приступить к загрузке? [Y/n] "

-#: src/pacman/sync.c:686
+#: src/pacman/sync.c:684
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -922,7 +928,7 @@ msgstr ""
 "\n"
 "Начинаю процесс обновления...\n"

-#: src/pacman/sync.c:690
+#: src/pacman/sync.c:688
 msgid "Proceed with installation? [Y/n] "
 msgstr "Приступить к установке? [Y/n] "

@@ -944,106 +950,106 @@ msgstr "разрешаю зависимости... "

 #: src/pacman/trans.c:69
 msgid "looking for inter-conflicts... "
-msgstr "проверка на взаимную несовместимость... "
+msgstr "проверяю на взаимную несовместимость... "

-#: src/pacman/trans.c:89
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr "устанавливаю %s... "

-#: src/pacman/trans.c:96
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
 msgstr "установлено %s (%s)"

-#: src/pacman/trans.c:103
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
 msgstr "удаляю %s... "

-#: src/pacman/trans.c:110
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
 msgstr "удалено %s (%s)"

-#: src/pacman/trans.c:117
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
 msgstr "обновляю %s... "

-#: src/pacman/trans.c:124
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "обновлено %s (%s -> %s)"

-#: src/pacman/trans.c:131
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
 msgstr "проверяю целостность пакета... "

-#: src/pacman/trans.c:147
+#: src/pacman/trans.c:144
 msgid "failed.\n"
 msgstr "провал.\n"

-#: src/pacman/trans.c:154
+#: src/pacman/trans.c:151
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
 msgstr ":: Получение пакетов с %s...\n"

-#: src/pacman/trans.c:175
+#: src/pacman/trans.c:172
 #, c-format
 msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "
 msgstr ":: %1$s требует %2$s из IgnorePkg. Установить %2$s? [Y/n] "

-#: src/pacman/trans.c:180
+#: src/pacman/trans.c:177
 #, c-format
 msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
-msgstr ":: %s указан в IgnorePkg. Все равно установить? [Y/n] "
+msgstr ":: %s указан в IgnorePkg. Всё равно установить? [Y/n] "

-#: src/pacman/trans.c:193
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: %s указан в HoldPkg. Все равно удалить? [Y/n] "
+msgstr ":: %s указан в HoldPkg. Всё равно удалить? [Y/n] "

-#: src/pacman/trans.c:206
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Заменить %s на %s/%s? [Y/n] "

-#: src/pacman/trans.c:221
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s конфликтует с %s. Удалить %s? [Y/n] "

-#: src/pacman/trans.c:237
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s: установленная версия новее. Все равно обновить? [Y/n] "
+msgstr ":: %s-%s: установленная версия новее. Всё равно обновить? [Y/n] "

-#: src/pacman/trans.c:255
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s: установленная версия не устарела. Все равно обновить? [Y/n] "
+msgstr ":: %s-%s: установленная версия не устарела. Всё равно обновить? [Y/n] "

-#: src/pacman/trans.c:273
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: Архив %s поврежден. Хотите его удалить? [Y/n] "

-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr "установка"

-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr "обновление"

-#: src/pacman/trans.c:335
+#: src/pacman/trans.c:332
 msgid "removing"
 msgstr "удаление"

-#: src/pacman/trans.c:338
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
-msgstr "порверяю возможные конфликты файлов"
+msgstr "проверяю возможные конфликты файлов"

 #: src/pacman/util.c:259
 #, c-format
@@ -1075,4 +1081,10 @@ msgstr ""
 #: src/pacman/util.c:337
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
-msgstr "Итого установленно:   %.2f МБ\n"
+msgstr "Итого установлено:   %.2f МБ\n"
+
+#~ msgid "requires: %s"
+#~ msgstr "требуется: %s"
+
+#~ msgid "'%s': %s\n"
+#~ msgstr "'%s': %s\n"
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -27,6 +27,8 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <libintl.h>
+#include <errno.h>
+#include <unistd.h>

 #include <alpm.h>
 #include <alpm_list.h>
@@ -42,11 +44,43 @@
 extern config_t *config;
 extern pmdb_t *db_local;

+static char *resolve_path(const char* file)
+{
+	char *copy, *p, *str = NULL;
+
+	if(!(copy = strdup(file))) {
+		return(NULL);
+	}
+
+	if((p = strrchr(copy, '/')) == NULL) {
+		return(copy);
+	} else {
+		*p = '\0'; ++p;
+
+		str = calloc(PATH_MAX+1, sizeof(char));
+		if(!str) {
+			/* null hmmm.... */
+			return(NULL);
+		}
+
+		if(!realpath(copy, str)) {
+			return(NULL);
+		}
+
+		str[strlen(str)] = '/';
+		strcat(str, p);
+	}
+
+	free(copy);
+	return(str);
+}
+
+
 static void query_fileowner(pmdb_t *db, char *filename)
 {
 	struct stat buf;
 	int gotcha = 0;
-	char rpath[PATH_MAX];
+	char *rpath;
 	alpm_list_t *i, *j;

 	if(db == NULL) {
@@ -57,8 +91,18 @@ static void query_fileowner(pmdb_t *db, char *filename)
 		return;
 	}

-	if(stat(filename, &buf) == -1 || S_ISDIR(buf.st_mode) || realpath(filename, rpath) == NULL) {
-		/* fail silently if we're a directory */
+	if(stat(filename, &buf) == -1) {
+		ERR(NL, _("failed to read file '%s': %s"), filename, strerror(errno));
+		return;
+	}
+	
+	if(S_ISDIR(buf.st_mode)) {
+		ERR(NL, _("cannot determine ownership of a directory"));
+		return;
+	}
+
+	if(!(rpath = resolve_path(filename))) {
+		ERR(NL, _("cannot determine real path for '%s': %s"), filename, strerror(errno));
 		return;
 	}

@@ -66,20 +110,24 @@ static void query_fileowner(pmdb_t *db, char *filename)
 		pmpkg_t *info = alpm_list_getdata(i);

 		for(j = alpm_pkg_get_files(info); j && !gotcha; j = alpm_list_next(j)) {
-			char path[PATH_MAX];
-			char *filename = alpm_list_getdata(j);
-			snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), filename);
+			char path[PATH_MAX], *ppath;
+			snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), (const char *)alpm_list_getdata(j));

-			if(strcmp(path, rpath) == 0) {
-				printf(_("%s is owned by %s %s\n"), path, alpm_pkg_get_name(info), alpm_pkg_get_version(info));
+			ppath = resolve_path(path);
+
+			if(ppath && strcmp(ppath, rpath) == 0) {
+				printf(_("%s is owned by %s %s\n"), filename, alpm_pkg_get_name(info), alpm_pkg_get_version(info));
 				gotcha = 1;
-				break;
 			}
+
+			free(ppath);
 		}
 	}
 	if(!gotcha) {
 		ERR(NL, _("No package owns %s\n"), filename);
 	}
+
+	free(rpath);
 }

 int pacman_query(alpm_list_t *targets)
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -554,7 +554,7 @@ int pacman_sync(alpm_list_t *targets)
 					continue;
 				}
 				if(pm_errno != PM_ERR_PKG_NOT_FOUND) {
-					ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno));
+					ERR(NL, "'%s': %s\n", (char *)i->data, alpm_strerror(pm_errno));
 					retval = 1;
 					goto cleanup;
 				}
@@ -618,10 +618,8 @@ int pacman_sync(alpm_list_t *targets)
 			case PM_ERR_UNSATISFIED_DEPS:
 				for(i = data; i; i = alpm_list_next(i)) {
 					pmdepmissing_t *miss = alpm_list_getdata(i);
-					MSG(NL, ":: %s %s %s", alpm_dep_get_target(miss),
-					    alpm_dep_get_type(miss) == PM_DEP_TYPE_DEPEND ?
-									_("requires") : _("is required by"),
-									alpm_dep_get_name(miss));
+					MSG(NL, ":: %s %s %s", alpm_dep_get_target(miss), _("requires"),
+							    alpm_dep_get_name(miss));
 					switch(alpm_dep_get_mod(miss)) {
 						case PM_DEP_MOD_ANY:
 							break;
--- a/src/pacman/trans.c
+++ b/src/pacman/trans.c
@@ -80,9 +80,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 			MSG(CL, _("done.\n"));
 			break;
 		case PM_TRANS_EVT_EXTRACT_DONE:
-			if(config->noprogressbar) {
-				MSG(CL, _("done.\n"));
-			}
 			break;
 		case PM_TRANS_EVT_ADD_START:
 			if(config->noprogressbar) {
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -53,7 +53,7 @@
 extern config_t *config;

 /* gets the current screen column width */
-unsigned int getcols()
+int getcols()
 {
 	if(!isatty(1)) {
 		/* We will default to 80 columns if we're not a tty
@@ -161,10 +161,10 @@ int rmrf(char *path)

 /* output a string, but wrap words properly with a specified indentation
 */
-void indentprint(const char *str, unsigned int indent)
+void indentprint(const char *str, int indent)
 {
 	const char *p = str;
-	unsigned int cidx = indent;
+	int cidx = indent;

 	while(*p) {
 		if(*p == ' ') {
@@ -177,9 +177,9 @@ void indentprint(const char *str, unsigned int indent)
 				next = p + strlen(p);
 			}
 			len = next - p;
-			if(len > (getcols()-cidx-1)) {
+			if(len > (getcols() - cidx - 1)) {
 				/* newline */
-				unsigned int i;
+				int i;
 				fprintf(stdout, "\n");
 				for(i = 0; i < indent; i++) {
 					fprintf(stdout, " ");
@@ -242,7 +242,7 @@ void list_display(const char *title, alpm_list_t *list)
 		for(i = list, cols = len; i; i = alpm_list_next(i)) {
 			char *str = alpm_list_getdata(i);
 			int s = strlen(str) + 2;
-			unsigned int maxcols = getcols();
+			int maxcols = getcols();
 			if(s + cols >= maxcols) {
 				int i;
 				cols = len;
@@ -385,46 +385,55 @@ void fill_progress(const int percent, const int proglen)
 	static unsigned int lasthash = 0, mouth = 0;
 	unsigned int i;

+	/* printf("\ndebug: proglen: %i\n", proglen); DEBUG*/
+
 	if(percent == 0) {
 		lasthash = 0;
 		mouth = 0;
 	}

-	printf(" [");
-	for(i = hashlen; i > 1; --i) {
-		/* if special progress bar enabled */
-		if(chomp) {
-			if(i > hashlen - hash) {
-				printf("-");
-			} else if(i == hashlen - hash) {
-				if(lasthash == hash) {
-					if(mouth) {
-						printf("\033[1;33mC\033[m");
+	/* magic numbers, how I loathe thee */
+	if(proglen > 8) {
+		printf(" [");
+		for(i = hashlen; i > 1; --i) {
+			/* if special progress bar enabled */
+			if(chomp) {
+				if(i > hashlen - hash) {
+					printf("-");
+				} else if(i == hashlen - hash) {
+					if(lasthash == hash) {
+						if(mouth) {
+							printf("\033[1;33mC\033[m");
+						} else {
+							printf("\033[1;33mc\033[m");
+						}
 					} else {
-						printf("\033[1;33mc\033[m");
+						lasthash = hash;
+						mouth = mouth == 1 ? 0 : 1;
+						if(mouth) {
+							printf("\033[1;33mC\033[m");
+						} else {
+							printf("\033[1;33mc\033[m");
+						}
 					}
+				} else if(i%3 == 0) {
+					printf("\033[0;37mo\033[m");
 				} else {
-					lasthash = hash;
-					mouth = mouth == 1 ? 0 : 1;
-					if(mouth) {
-						printf("\033[1;33mC\033[m");
-					} else {
-						printf("\033[1;33mc\033[m");
-					}
+					printf("\033[0;37m \033[m");
 				}
-			} else if(i%3 == 0) {
-				printf("\033[0;37mo\033[m");
+			} /* else regular progress bar */
+			else if(i > hashlen - hash) {
+				printf("#");
 			} else {
-				printf("\033[0;37m \033[m");
+				printf("-");
 			}
-		} /* else regular progress bar */
-		else if(i > hashlen - hash) {
-			printf("#");
-		} else {
-			printf("-");
 		}
+		printf("]");
+	}
+	/* print percent after progress bar */
+	if(proglen > 5) {
+		printf(" %3d%%", percent);
 	}
-	printf("] %3d%%", percent);

 	if(percent == 100) {
 		printf("\n");
@@ -434,5 +443,4 @@ void fill_progress(const int percent, const int proglen)
 	fflush(stdout);
 }

-
 /* vim: set ts=2 sw=2 noet: */
--- a/src/pacman/util.h
+++ b/src/pacman/util.h
@@ -50,10 +50,10 @@
 #define UPDATE_SPEED_SEC 0.2f

 #define _(str) gettext(str)
-unsigned int getcols();
+int getcols();
 int makepath(char *path);
 int rmrf(char *path);
-void indentprint(const char *str, unsigned int indent);
+void indentprint(const char *str, int indent);
 char *strtoupper(char *str);
 char *strtrim(char *str);
 int reg_match(char *string, char *pattern);
Author	SHA1	Message	Date
Dan McGee	0cfb412220	Check in changes for 3.0.5 release (mostly backports) * Update the mirrorlist * Fix FS7338- the previous repo-add fix didn't quite do the job, but it should be fixed now. * Small updates to translations files * Add -mtune=generic to default CFLAGS (req'd by GCC 4.2)	2007-06-18 00:15:36 +00:00
Aaron Griffin	5786c6e4a3	Fix libarchive permission extraction Hackish fix to ensure libarchive extracts files and dirs with the right permissions. For some reason extracting /tmp on install wasn't handled properly by librachive, so an explicit chmod will fix this. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>	2007-05-18 03:26:24 +00:00
Dan McGee	6a0059ddd5	Ensure MAKEFLAGS and DISTCC_HOSTS are exported if required	2007-05-16 17:14:19 +00:00
Dan McGee	2c74e0ad8a	* Updated German translation Pierre Schmitz <pierre@archlinux.de>	2007-05-13 04:40:13 +00:00
Dan McGee	a01b2ad8e6	Corrections to Spanish translation	2007-05-13 04:29:05 +00:00
Aaron Griffin	8be3f1f62f	Version bumped to 3.0.4	2007-05-08 08:13:13 +00:00
Aaron Griffin	48c840fb76	minor: Remove trailing slashes from Server urls to prevent double slashes in paths	2007-05-08 08:11:59 +00:00
Dan McGee	337046ab75	A ton of updates of all of the translation files. Thanks to the authors of those.	2007-05-08 03:41:30 +00:00
Dan McGee	53bc96106d	repo-add: fix typo, conflicts instead of conflict	2007-05-06 22:56:08 +00:00
Dan McGee	afec5e46a4	Bumps for pacman 3.0.3	2007-04-28 08:26:37 +00:00
Dan McGee	4a6d963ae1	repo-add: Fixed bug of missing desc entries if package is in a group Fixes bug #7005 as reported and patched by Marcus Habernehl <bmh1980de@yahoo.de>	2007-04-25 15:00:49 +00:00
Dan McGee	a7e80fba9e	Updated French translation from Nam <37i11@altern.org>.	2007-04-25 04:38:54 +00:00
Dan McGee	c60c1b5ccc	* Updated German translation Pierre Schmitz <pierre@archlinux.de>	2007-04-23 08:14:33 +00:00
Dan McGee	75b20014c1	Updates in prep for 3.0.2 release	2007-04-23 07:03:13 +00:00
Dan McGee	3e42d00c99	Add two pactests	2007-04-23 06:41:00 +00:00
Dan McGee	318d2b511b	* Updated Italian translation Giovanni Scafora <linuxmania@gmail.com>	2007-04-23 06:15:06 +00:00
Dan McGee	4f2ecfdee3	rankmirrors: download first 50KB of DB to get more reliable numbers Scott Horowitz <stonecrest@gmail.com>	2007-04-23 04:09:00 +00:00
Aaron Griffin	5299115020	* Nagy Gabor <ngaba@petra.hos.u-szeged.hu> Using the wrong variable in sortbydeps	2007-04-23 04:01:37 +00:00
Aaron Griffin	c6a335501c	New archlinuxppc.org mirror added to mirrorlist	2007-04-23 03:53:19 +00:00
Aaron Griffin	38e3b7c4fa	* Chantry Xavier <xav@chantry.homelinux.org> Let IgnorePkg take precedence over the FORCE package flag	2007-04-23 03:46:54 +00:00
Dan McGee	8af5c8d421	Added Spanish Translation. Juan Pablo González T. <lord_jotape@yahoo.com.ar>	2007-04-23 02:56:11 +00:00
Aaron Griffin	1a42b23187	* Alexander Baldeck <alexander@archlinux.org> Bugfix for FS#6944	2007-04-18 05:50:00 +00:00
Dan McGee	eb448f222a	makepkg: unset one more language variable	2007-04-17 03:56:52 +00:00
Dan McGee	756ec7e69f	Updated German translation Matthias Gorissen <siquame@web.de>	2007-04-17 03:32:20 +00:00
Dan McGee	38ff2153c6	Adding Polish language translation, thanks! From: Mateusz Jędrasik <m.jedrasik@gmail.com>	2007-04-17 02:35:59 +00:00
Aaron Griffin	e0f5d4efbe	* Nagy Gabor <ngaba@petra.hos.u-szeged.hu> Make sure ldconfig runs on upgrade * Added 3 pactests to verify (by output only) that ldconfig is run	2007-04-17 02:31:04 +00:00
Dan McGee	ec83c93ea4	Bugfixes in prep for a 3.0.2 release Fix #6905- makepkg dependency checking error Fix #6915- add SUU mirror to mirrorlist.in	2007-04-17 01:49:06 +00:00
Dan McGee	562887ba5c	Fix FS #6872- CFLAGS were not being exported	2007-04-11 16:41:29 +00:00
Dan McGee	14d74623b0	Added easynews mirror	2007-04-09 20:13:31 +00:00
Dan McGee	d4f78116e0	Fix running of pre_remove and Post_remove pkgname was undefined previously when this was called, fixed. Patch from Roman Kyrylych <roman.kyrylych@gmail.com>.	2007-04-05 16:37:23 +00:00
Aaron Griffin	ef578e77c8	* Updated	2007-04-04 05:07:43 +00:00
Aaron Griffin	cfbec7464f	* Version number bump	2007-04-04 05:03:52 +00:00
Aaron Griffin	10ba636987	* Fix FS#6798 - there is no reason to fail on a duplicate removal target Added a pactest case for this ("-R foo foo foo foo foo" should do what is expected)	2007-04-04 04:43:24 +00:00
Aaron Griffin	1cd7567ff8	This change does two things: * Prefer case-insensitive config settings. In the future case-insensitivity may be enforced. * Provides a fix for the tr_TR locale by checking the case-insensitive version first. This is more elegant than setting the 'C' locale for tr_TR. Also added a 'RootDir' config option to match CacheDir and DBPath	2007-04-04 03:59:36 +00:00
Aaron Griffin	8153e3851e	Forgot the @@REPO@@ part of the russian mirror.	2007-04-04 03:00:24 +00:00
Aaron Griffin	c87745646c	Added new Russian mirror	2007-04-04 02:19:37 +00:00
Aaron Griffin	ec689b5978	* Tom Killian <tom@archlinux.org> Properly align checksums on makepkg -g	2007-04-04 02:03:44 +00:00
Dan McGee	d2c6bcdbbd	* Updated Italian translation Giovanni Scafora <linuxmania@gmail.com>	2007-04-01 17:05:16 +00:00
Dan McGee	60a588261c	* Updated Hungarian translation Nagy Gabor <ngaba@petra.hos.u-szeged.hu>	2007-03-30 19:55:05 +00:00
Dan McGee	3382a1416f	* Updated Russian translation Владимир Байраковский <4rayven@gmail.com>	2007-03-30 18:06:04 +00:00
Aaron Griffin	19cec12f73	commit `1d35c4dcc6` Author: Aaron Griffin <aaronmgriffin@gmail.com> Date: Thu Mar 29 22:44:10 2007 -0500 Report an error on setmntent failure Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>	2007-03-30 04:46:17 +00:00
Aaron Griffin	a0f8f03056	commit `970d2e942e` Author: Aaron Griffin <aaronmgriffin@gmail.com> Date: Thu Mar 29 21:30:40 2007 -0500 repo-add leaves .PKGINFO in the current directory * Misuse of 'tar xf', which should be 'tar tf' Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>	2007-03-30 03:33:19 +00:00
Aaron Griffin	1e859c647f	From: Andrew Fyfe <andrew@neptune-one.net> Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe <andrew@neptune-one.net> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>	2007-03-30 03:24:09 +00:00
Dan McGee	ab8c825364	Fix --ignore behavior on sysupgrade * --ignore was being ignored (haha) on sysupgrade when a package was listed as being a force upgrade. This adds a prompt to the user in this case asking what to do. Signed-off-by: Dan McGee <dan@archlinux.org>	2007-03-28 04:32:00 +00:00
Dan McGee	a2a781f416	* Remove outdated ProxyServer option from pacman.conf.5.	2007-03-27 15:51:18 +00:00
Dan McGee	d47b8cdf48	* Fix NEWS typo. Oops. * Updated Russian translation. Владимир Байраковский <4rayven@gmail.com> and Shild <sxp@bk.ru> * Removed a string from gettext that didn't need it.	2007-03-26 22:47:56 +00:00
Dan McGee	58fe79eef6	* Fix bug where 'makepkg -L' doesn't stop on build failure. Andrew Fyfe <andrew@neptune-one.net> * Add testing to etc/pacman.d/.cvsignore * Fix scriptlet001.py test to work during 'make check'.	2007-03-25 17:37:42 +00:00
Dan McGee	a07b490344	Andrew Fyfe <andrew@neptune-one.net> * Fix FS #6688- builddeps not working in makepkg.	2007-03-24 17:11:18 +00:00
Aaron Griffin	f8d0601b8d	* Added a mirror list for [testing] (it appears most mirrors mirror testing) * Commented ftp.archlinux.org in the official mirror list * ran a make dist, which updated some translation files	2007-03-24 04:18:17 +00:00
Dan McGee	d38b273f91	* Removed three dead mirrors (Dale Blount <dale@archlinux.org>).	2007-03-23 17:48:05 +00:00
Dan McGee	5702b943e8	* Updated German translation Pierre Schmitz <pierre@archlinux.de>	2007-03-23 17:42:14 +00:00
Dan McGee	9cf9606459	Fixed alpm_log call- too many parameters passed. (bardo on #archlinux-pacman)	2007-03-22 18:33:27 +00:00
Dan McGee	19faa24cf3	Clarify some English messages as suggested by Nagy Gabor. I even did the hard work of fixing these in the translation files, and I removed a few fuzzys while doing so. If any more patches for translations come, try to do it against these files.	2007-03-22 18:19:49 +00:00
Dan McGee	4a75cb7e52	* Updated Brazilian Portuguese translation Douglas Soares de Andrade <dsandrade@gmail.com>	2007-03-22 17:20:39 +00:00
Dan McGee	df59a18460	Roman Kyrylych <roman.kyrylych@gmail.com> * Updates to news file.	2007-03-22 15:18:26 +00:00
Dan McGee	b882353d48	Lots of translation updates before we release. * Ran msgmerge on all po files from new pot files, but did not check in the updated pot files as that just causes problems. * Updated Italian translation Giovanni Scafora <linuxmania@gmail.com> * Updated Russian translation, added libalpm partial translation Владимир Байраковский <4rayven@gmail.com> * Updated Hungarian translation Nagy Gabor <ngaba@petra.hos.u-szeged.hu> * Updated French translation solsTiCe d'Hiver <solstice.dhiver@laposte.net> Thanks again guys!	2007-03-22 14:51:00 +00:00
Aaron Griffin	bdfe232b8a	Quick pactest changes: * Minor change to utils.py(grep) to make it cleaner * Added scriptlet check to verify scriptlet events happen	2007-03-22 08:30:18 +00:00
Aaron Griffin	118671eff4	I was mistaken, newpkg->data IS useful here, as the scriptlet isn't in the FS at this point	2007-03-22 08:28:09 +00:00
Aaron Griffin	d8ec08f578	* Correct install scriptlet usage (reuse of handle->root when not needed) * Skip running scriptlet when chroot fails - to prevent issues in the host filesystem	2007-03-22 08:22:48 +00:00
Aaron Griffin	3aa0c85716	* -Qo now properly resolves paths when finding an owner NOTE that we do NOT want symlinked files resolved, only paths (i.e. /usr/lib/perl5/site_perl/*)	2007-03-22 07:32:54 +00:00
Dan McGee	d763017233	* Fix conflict checking to ignore symlinks that were in previous version of package. Regression from 2.9.8.	2007-03-22 06:25:26 +00:00
Aaron Griffin	5a37682525	* Quick fixup for the translations due to a typo fix committed earlier.	2007-03-22 01:00:29 +00:00
Aaron Griffin	06d7e3d7c3	Giovanni Scafora <linuxmania@gmail.com> * Fix typo in pacman.c	2007-03-22 00:20:05 +00:00
Dan McGee	3a4030837e	* Updated Italian translation Giovanni Scafora <linuxmania@gmail.com> * Added pactest test for -Se operation James Rosten <seinfeld90@gmail.com>	2007-03-21 22:15:50 +00:00
Jürgen Hötzel	75d6149711	* dont use XferCommand if retrieving local files, fixes wget error: file:////....: Unsupported scheme.	2007-03-21 21:08:08 +00:00
Dan McGee	79ecbd82bd	* Typo fix.	2007-03-21 03:38:43 +00:00
Dan McGee	40855b48fe	* pacman.c: Add CacheDir to -v --verbose output.	2007-03-21 03:29:11 +00:00
Aaron Griffin	941c23025c	* Fix asking the user to upgrade when using -Sp * More significant error messages when -Qo fails * Potential fix for reported error that pacman indicates corrupt packages when space is full on the cache dir	2007-03-21 03:08:19 +00:00
Dan McGee	8ded2051d2	* TODO.dan updates. Alessio 'mOLOk' Bolognino <themolok.ml@gmail.com> * Make makeworld compatable with makepkg lacking -w option.	2007-03-20 19:16:17 +00:00
Dan McGee	b6018c436d	* NEWS: add quick line about backup files. * pacman.8: add documentation for -Se option.	2007-03-20 05:47:11 +00:00
Aaron Griffin	9b08a5aa97	* Fix pacman -Se which installs depends only, as it was broken (Is this useful to anyone?)	2007-03-20 02:36:21 +00:00
Dan McGee	0fa7d47a4d	* makepkg: a few more changes to get dependencies working correctly. If a user does not install all required dependencies, makepkg will now bail.	2007-03-20 02:13:44 +00:00
Dan McGee	b882f463df	* makepkg: Fix behavior of -Ssr: deps were not being correctly removed before.	2007-03-20 01:34:16 +00:00
Dan McGee	62d0a00511	* makepkg: fix installation of dependencies with version comparitors.	2007-03-19 22:48:54 +00:00
Dan McGee	eef6154620	* TODO list updates.	2007-03-19 04:54:58 +00:00
Aaron Griffin	22206d5bea	Nagy Gabor <ngaba@petra.hos.u-szeged.hu> * correct _alpm_rmrf usage with regard to symlinks and directories	2007-03-19 04:49:28 +00:00
Aaron Griffin	bd55cf548c	James Rosten <seinfeld90@gmail.com> * Two new pactest test cases * Fix some "required by" / "requires" output by unifying all "dependency types" to a single value (PM_DEP_TYPE_DEPEND)	2007-03-19 04:23:45 +00:00
Dan McGee	cf6f184243	* Updated Italian translation Giovanni Scafora <linuxmania@gmail.com> * Many minor issues mentioned by Scott Horowitz <stonecrest@gmail.com>. - extra 'done' text in --noprogressbar output - missing flags in the pacman.8 manpage - unclear text in --noconfirm help description	2007-03-19 02:45:00 +00:00
Dan McGee	bf1885b1e0	* Adding new Turkish mirror as posted on the forums. * Updated Italian translation Giovanni Scafora <linuxmania@gmail.com>	2007-03-19 01:28:31 +00:00
Dan McGee	a755dacea2	James Rosten <seinfeld90@gmail.com> * Add missing help line for --sync --list.	2007-03-18 23:21:57 +00:00
Dan McGee	bd7b7e5f0c	* Added quoting on several makepkg paths that were lacking it.	2007-03-18 23:09:50 +00:00
Aaron Griffin	ff76c8c552	* makepkg.conf.in: Added /usr/share/gtk-doc back into default DOC_DIRS	2007-03-15 00:07:27 +00:00
Dan McGee	4bfd0cb6cc	* Missing a 'msg' in makepkg- pointed out by wain on Flyspray. Thanks!	2007-03-14 23:25:03 +00:00
Dan McGee	1205e544d3	* Updated Hungarian translation Nagy Gabor <ngaba@petra.hos.u-szeged.hu>	2007-03-14 23:17:11 +00:00
Dan McGee	fa4a6eec4d	* Updated Russian translation Владимир Байраковский <4rayven@gmail.com>	2007-03-14 15:02:53 +00:00
Dan McGee	0d38e4f977	* Fixed up broken translation	2007-03-14 14:14:37 +00:00
Dan McGee	fb938770c3	* Small updates to my TODO file. * Updated fr.po courtesy of solsTiCe d'Hiver <solstice.dhiver@laposte.net>.	2007-03-13 21:05:01 +00:00
Dan McGee	6e05ad1d24	* Resizing terminal while progress bars were displayed caused some weird issues, this should fix it. Progress bars now go from displaying, to showing percent only, to not displaying at all. Changed unsigned -> signed to prevent wraparound errors in integer comparison.	2007-03-13 16:15:38 +00:00
Aaron Griffin	2020e0ec73	* Sebastian Sareyko Fix repo-add filename addition (use basename)	2007-03-13 15:01:15 +00:00
Aaron Griffin	74e8b28fc3	* Missed a path when requiring that all paths end with / - this caused -U not to work (it was downloading files as .package-name) at all.	2007-03-12 23:26:47 +00:00