3.5.4 release preparation

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

.mailmap

@@ -6,10 +6,11 @@ Andres P <aepd87@gmail.com> <stderr@mail.com>
 Bryan Ischo <bryan@ischo.com> <bji-keyword-pacman.3644cb@www.ischo.com>
 Christos Nouskas <nous@archlinux.us> <nouskas@gmail.com>
 Daenyth Blank <daenyth+arch@gmail.com> <Daenyth+Arch@gmail.com>
-Daenyth Blank <Daenyth+Arch@gmail.com> <Daenyth+git@gmail.com>
+Daenyth Blank <Daenyth+arch@gmail.com> <Daenyth+git@gmail.com>
 甘露(Gan Lu) <rhythm.gan@gmail.com>
 Giovanni Scafora <giovanni@archlinux.org> <linuxmania@gmail.com>
 Jaroslaw Swierczynski <swiergot@gmail.com> <swiergot@juvepoland.com>
+Jonathan Conder <j@skurvy.no-ip.org> <jonno.conder@gmail.com>
 Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
 Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar> <jotapesan@gmail.com>
 Manuel Tortosa <manutortosa@chakra-project.org> <manutortosa@gmail.com>

NEWS

@@ -1,5 +1,35 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.5.4         - fix display of lists on non-TTYs and other output fixes
+              - fix group selection entry for large inputs (FS#24253)
+              - fix divide by zero when downloading zero length files
+              - flush terminal input before reading response (FS#20538)
+              - allow files to be replaced by directories (FS#24904)
+              - makepkg: fix filenames with spaces and noextract (FS#25100)
+              - scripts: remove ln -f option for POSIX compliance (FS24893)
+              - various small documentation updates
+              - minor translation updates: de, fi
+3.5.3         - segfault when creating lock in non-existent dir (FS#24292)
+              - segfault when uninstalling broken backed-up symlink (FS#24230)
+              - --print should not enable --noconfirm (FS#24287)
+              - fix default path substitution in documentation
+              - makepkg: quote variables that may contain spaces (FS#24002)
+              - makepkg: fix creation of source package with -p (FS#24567)
+              - repo-add: include dotfiles in filelists (FS#24534)
+              - minor translation updates: de, fi, fr, sk, zh_CN
+3.5.2         - ensure we show correct missing dependency info (FS#23424)
+              - pacman usage/--help updates (FS#23433, FS#23369)
+              - ensure stdout/stderr are flushed before prompts (FS#23492)
+              - compile/portability fixes for FreeBSD platform
+              - extensive documentation updates for alpm.h interfaces
+              - fix several missing pm_errno error code returns
+              - makepkg:
+                - simplify log redirection and remove sync (FS#23378)
+                - improve parsing for sanity checks (FS#23524)
+                - avoid use of `tr` to avoid locale and other issues
+                - fix GNU-ism in `su` invocation
+              - bacman: update for new local database format (FS#23641)
+              - extensive translation updates and fixes
 3.5.1         - don't error on unknown pacman.conf directives (FS#23055)
               - only read arguments from stdin if '-' is provided as target
               - fix case with ignore handling in argument list (FS#23342)

acinclude.m4

@@ -123,6 +123,13 @@ extern int getmntinfo (struct statfs **, int);
   )
   AC_DEFINE_UNQUOTED(FSSTATSTYPE, [$fs_stats_cv_type],
     [Defined as the filesystem stats type ('statvfs' or 'statfs')])
+  if test $ac_cv_func_getmntinfo = yes; then
+    if test "$fs_stats_cv_type" = "struct statvfs"; then
+      AC_DEFINE([HAVE_GETMNTINFO_STATVFS], 1, [Define if getmntinfo() uses statvfs.])
+    else
+      AC_DEFINE([HAVE_GETMNTINFO_STATFS], 1, [Define if getmntinfo() uses statfs.])
+    fi
+  fi
 ])
 
 dnl Checks for PATH_MAX and defines it if not present

configure.ac

@@ -42,12 +42,12 @@ AC_PREREQ(2.62)
 #     pacman_version_micro += 1
 
 m4_define([lib_current], [6])
-m4_define([lib_revision], [1])
+m4_define([lib_revision], [4])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [5])
-m4_define([pacman_version_micro], [1])
+m4_define([pacman_version_micro], [4])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
@@ -171,7 +171,8 @@ AM_CONDITIONAL([HAVE_LIBFETCH], [test "x$ac_cv_lib_fetch_fetchParseURL" = "xyes"
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h glob.h libintl.h locale.h mntent.h string.h \
                   sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h \
-                  sys/time.h sys/types.h sys/ucred.h syslog.h wchar.h])
+                  sys/time.h sys/types.h sys/ucred.h syslog.h termios.h \
+                  wchar.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -190,7 +191,7 @@ AC_FUNC_GETMNTENT
 AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
 AC_FUNC_MKTIME
 AC_CHECK_FUNCS([geteuid getmntinfo realpath regcomp strcasecmp \
-                strndup strrchr strsep swprintf \
+                strndup strrchr strsep swprintf tcflush \
                 wcwidth uname])
 # For the diskspace code
 FS_STATS_TYPE

contrib/bacman.in

@@ -174,7 +174,7 @@ fi
 echo "# $(LC_ALL=C date)"            >> .PKGINFO
 echo "#"                    >> .PKGINFO
 
-cat "$pkg_dir"/{desc,files,depends} |
+cat "$pkg_dir"/{desc,files} |
 while read i; do
     if [[ -z "$i" ]]; then
         continue;
@@ -220,14 +220,6 @@ while read i; do
         %REPLACES%)
             echo "replaces = $i"    >> .PKGINFO
         ;;
-
-        # files
-        %BACKUP%)
-            # strip the md5sum after the tab
-            echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
-        ;;
-
-        # depends
         %DEPENDS%)
             echo "depend = $i"   >> .PKGINFO
         ;;
@@ -240,6 +232,12 @@ while read i; do
         %PROVIDES%)
             echo "provides = $i"  >> .PKGINFO
         ;;
+
+        # files
+        %BACKUP%)
+            # strip the md5sum after the tab
+            echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
+        ;;
     esac
 done
 

doc/Makefile.am

@@ -86,16 +86,16 @@ html: $(HTML_DOCS)
 website: html
 	bsdtar czf website.tar.gz $(HTML_DOCS) \
 		-C /etc/asciidoc/stylesheets/ \
-		xhtml11.css xhtml11-manpage.css xhtml11-quirks.css \
+		asciidoc.css asciidoc-manpage.css \
 		-C /etc/asciidoc/javascripts/ \
-		asciidoc-xhtml11.js \
+		asciidoc.js \
 		-C /etc/asciidoc/ \
 		images
 
 pkgdatadir = ${datadir}/${PACKAGE}
 
 ASCIIDOC_OPTS = \
-	-f asciidoc.conf \
+	-f $(srcdir)/asciidoc.conf \
 	-a pacman_version="$(REAL_PACKAGE_VERSION)" \
 	-a pacman_date="`date +%Y-%m-%d`" \
 	-a pkgdatadir=$(pkgdatadir) \
@@ -106,11 +106,12 @@ A2X_OPTS = \
 	--no-xmllint \
 	-d manpage \
 	-f manpage \
-	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
+	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' \
+	--destination-dir='./'
 
 # These rules are due to the includes and files of the asciidoc text
 $(ASCIIDOC_MANS): asciidoc.conf footer.txt
-	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
+	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt
 
 %.html: %.txt
 	asciidoc $(ASCIIDOC_OPTS) $*.txt

doc/PKGBUILD-example.txt

@@ -13,8 +13,12 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('ee5ae84d115f051d87fcaaef3b4ae782')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
-  make prefix=$pkgdir/usr install
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make prefix="$pkgdir"/usr install
 }

doc/PKGBUILD.5.txt

@@ -384,8 +384,7 @@ from.
 		The SVN module to fetch.
 
 *Git*::
-	The generated pkgver will be one formatted by the 'git-describe'
-	command, with '-' characters converted to '_' characters.
+	The generated pkgver will be the date the package is built.
 
 	*_gitroot*;;
 		The URL (all protocols supported) to the GIT repository.

doc/asciidoc.conf

@@ -17,7 +17,11 @@ plus=+
 caret=^
 startsb=[
 endsb=]
+backslash=\
 tilde=~
+apostrophe='
+backtick=`
+litdd=--
 
 ifdef::backend-docbook[]
 [linkman-inlinemacro]

doc/index.txt

@@ -63,6 +63,9 @@ Releases
 `------------`-------
 Date         Version
 ---------------------
+2011-08-10   v3.5.4
+2011-06-07   v3.5.3
+2011-04-18   v3.5.2
 2011-03-23   v3.5.1
 2011-03-16   v3.5.0
 2011-01-22   v3.4.3

doc/makepkg.8.txt

@@ -53,7 +53,7 @@ Options
 	in linkman:makepkg.conf[5].
 
 *\--config* <file>::
-	Use an alternate config file instead of the `{sysconfdir}/makepkg.conf`
+	Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+
 	default.
 
 *-d, \--nodeps*::

doc/makepkg.conf.5.txt

@@ -70,7 +70,7 @@ Options
 	This is often used to set the number of jobs used, for example, `-j2`.
 	Other flags that make accepts can also be passed.
 
-**BUILDENV=(**fakeroot !distcc color !ccache**)**::
+**BUILDENV=(**fakeroot !distcc color !ccache check**)**::
 	This array contains options that affect the build environment, the defaults
 	are shown here. All options should always be left in the array; to enable
 	or disable an option simply remove or place an ``!'' at the front of the

doc/pacman.8.txt

@@ -13,7 +13,6 @@ Synopsis
 --------
 'pacman' <operation> [options] [targets]
 
-
 Description
 -----------
 Pacman is a package management utility that tracks installed packages on a Linux
@@ -35,7 +34,7 @@ read from stdin.
 Operations
 ----------
 *-D, \--database*::
-	Modify the package database. This options allows you to modify certain
+	Modify the package database. This operation allows you to modify certain
 	attributes of the installed packages in pacman's database. At the
 	moment, you can only change the install reason using '\--asdeps' and
 	'\--asexplicit' options.
@@ -69,13 +68,18 @@ Operations
 	interprets ">" as redirection to file.)
 +
 In addition to packages, groups can be specified as well. For example, if
-gnome is a defined package group, then `pacman -S gnome` will install every
-package in the gnome group, as well as the dependencies of those packages.
+gnome is a defined package group, then `pacman -S gnome` will provide a
+prompt allowing you to select which packages to install from a numbered list.
+The package selection is specified using a space separated list of package
+numbers. Sequential packages may be selected by specifying the first and last
+package numbers separated by a hyphen (`-`). Excluding packages is achieved by
+prefixing a number or range of numbers with a caret (`^`).
 +
-Packages which provide other packages are also handled. For example, `pacman -S
-foo` will first look for a foo package. If foo is not found, packages which
+Packages that provide other packages are also handled. For example, `pacman -S
+foo` will first look for a foo package. If foo is not found, packages that
 provide the same functionality as foo will be searched for. If any package is
-found, it will be installed.
+found, it will be installed. A selection prompt is provided if multiple packages
+providing foo are found.
 +
 You can also use `pacman -Su` to upgrade all packages that are out of date. See
 <<SO,Sync Options>> below. When upgrading, pacman performs version comparison
@@ -94,7 +98,7 @@ greater than `1:3.6-1`.
 *-T, \--deptest*::
 	Check dependencies; this is useful in scripts such as makepkg to check
 	installed packages. This operation will check each dependency specified and
-	return a list of those which are not currently satisfied on the system.
+	return a list of dependencies that are not currently satisfied on the system.
 	This operation accepts no other options. Example usage: `pacman -T qt
 	"bash>=3.2"`.
 
@@ -117,7 +121,7 @@ Options
 -------
 *-b, \--dbpath* <path>::
 	Specify an alternative database location (a typical default is
-	`{localstatedir}/lib/pacman`). This should not be used unless you know what you are
+	+{localstatedir}/lib/pacman+). This should not be used unless you know what you are
 	doing. *NOTE*: if specified, this is an absolute path and the root path is
 	not automatically prepended.
 
@@ -125,7 +129,7 @@ Options
 	Specify an alternative installation root (default is `/`). This should
 	not be used as a way to install software into `/usr/local` instead of
 	`/usr`. This option is used if you want to install a package on a
-	temporary mounted partition which is "owned" by another system.
+	temporary mounted partition that is "owned" by another system.
 	*NOTE*: if database path or logfile are not specified on either the
 	command line or in linkman:pacman.conf[5], their default location will
 	be inside this root path.
@@ -138,7 +142,7 @@ Options
 
 *\--cachedir* <dir>::
 	Specify an alternative package cache location (a typical default is
-	`{localstatedir}/cache/pacman/pkg`). Multiple cache directories can be specified,
+	+{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be specified,
 	and they are tried in the order they are passed to pacman. *NOTE*: this
 	is an absolute path, the root path is not automatically prepended.
 
@@ -230,7 +234,7 @@ Query Options[[QO]]
 
 *-e, \--explicit*::
 	Restrict or filter output to explicitly installed packages. This option
-	can be combined with '-t' to list explicitly installed packages which
+	can be combined with '-t' to list explicitly installed packages that
 	are not required by any other package.
 
 *-g, \--groups*::
@@ -366,12 +370,14 @@ linkman:pacman.conf[5].
 	report of all packages to upgrade will be presented and  the operation
 	will not proceed without user confirmation. Dependencies are
 	automatically resolved at this level and will be installed/upgraded if
-	necessary. Pass this option twice to enable package downgrade; in this
-	case pacman will select sync packages whose version does not match with
-	the local version. This can be useful when the user switches from a testing
-	repo to a stable one. Additional targets can also be specified manually, so
-	that '-Su foo' will do a system upgrade and install/upgrade the foo package in
-	the same operation.
+	necessary.
++
+Pass this option twice to enable package downgrade; in this case pacman will
+select sync packages whose version does not match with the local version.  This
+can be useful when the user switches from a testing repo to a stable one.
++
+Additional targets can also be specified manually, so that '-Su foo' will do a
+system upgrade and install/upgrade the foo package in the same operation.
 
 *-w, \--downloadonly*::
 	Retrieve all packages from the server, but do not install/upgrade anything.

doc/pacman.conf.5.txt

@@ -35,7 +35,7 @@ NoUpgrade = etc/passwd etc/group etc/shadow
 NoUpgrade = etc/fstab
 
 [core]
-Include = {sysconfdir}/pacman.d/core
+Include = /etc/pacman.d/core
 
 [custom]
 Server = file:///home/pkgs
@@ -57,13 +57,13 @@ Options
 
 *DBPath =* path/to/db/dir::
 	Overrides the default location of the toplevel database directory.  A
-	typical default is `{localstatedir}/lib/pacman/`. Most users will not need to set
+	typical default is +{localstatedir}/lib/pacman/+. Most users will not need to set
 	this option. *NOTE*: if specified, this is an absolute path and the root
 	path is not automatically prepended.
 
 *CacheDir =* path/to/cache/dir::
 	Overrides the default location of the package cache directory. A typical
-	default is `{localstatedir}/cache/pacman/pkg/`. Multiple cache directories can be
+	default is +{localstatedir}/cache/pacman/pkg/+. Multiple cache directories can be
 	specified, and they are tried in the order they are listed in the config
 	file. If a file is not found in any cache directory, it will be downloaded
 	to the first cache directory with write access. *NOTE*: this is an absolute
@@ -72,7 +72,7 @@ Options
 
 *LogFile =* '/path/to/file'::
 	Overrides the default location of the pacman log file. A typical default
-	is `{localstatedir}/log/pacman.log`. This is an absolute path and the root directory
+	is +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory
 	is not prepended.
 
 *HoldPkg =* package ...::
@@ -149,7 +149,7 @@ Options
 
 *UseSyslog*::
 	Log action messages through syslog(). This will insert log entries into
-	`{localstatedir}/log/messages` or equivalent.
+	+{localstatedir}/log/messages+ or equivalent.
 
 *ShowSize*::
 	Display the size of individual packages for '\--sync' and '\--query' modes.
@@ -215,7 +215,7 @@ directory with these packages so pacman can find it when run with '\--refresh'.
 
 The above command will generate a compressed database named
 '/home/pkgs/custom.db.tar.gz'. Note that the database must be of the form
-'{treename}.db.tar.gz', where '{treename}' is the name of the section defined in
+'\{treename\}.db.tar.gz', where '\{treename\}' is the name of the section defined in
 the configuration file. That's it! Now configure your custom section in the
 configuration file as shown in the config example above. Pacman will now use your
 package repository. If you add new packages to the repository, remember to

lib/libalpm/add.c

@@ -92,7 +92,7 @@ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg)
 				_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"),
 						localpkgname, localpkgver);
 				return(0);
-			} else {
+			} else if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) {
 				_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
 						localpkgname, localpkgver);
 			}

lib/libalpm/alpm.c

@@ -77,10 +77,19 @@ int SYMEXPORT alpm_initialize(void)
  */
 int SYMEXPORT alpm_release(void)
 {
+	pmdb_t *db;
+
 	ALPM_LOG_FUNC;
 
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 
+	/* close local database */
+	db = handle->db_local;
+	if(db) {
+		db->ops->unregister(db);
+		handle->db_local = NULL;
+	}
+
 	if(alpm_db_unregister_all() == -1) {
 		return(-1);
 	}

lib/libalpm/alpm.h

@@ -39,6 +39,11 @@ extern "C" {
  * Arch Linux Package Management library
  */
 
+/** @addtogroup alpm_api Public API
+ * The libalpm Public API
+ * @{
+ */
+
 /*
  * Structures
  */
@@ -93,39 +98,67 @@ typedef void (*alpm_cb_totaldl)(off_t total);
 typedef int (*alpm_cb_fetch)(const char *url, const char *localpath,
 		int force);
 
-/*
- * Options
+/** Fetch a remote pkg.
+ * @param url URL of the package to download
+ * @return the downloaded filepath on success, NULL on error
+ */
+char *alpm_fetch_pkgurl(const char *url);
+
+/** @addtogroup alpm_api_options Options
+ * Libalpm option getters and setters
+ * @{
  */
 
+/** @name The logging callback. */
+/* @{ */
 alpm_cb_log alpm_option_get_logcb(void);
 void alpm_option_set_logcb(alpm_cb_log cb);
+/* @} */
 
+/** Get/set the download progress callback. */
 alpm_cb_download alpm_option_get_dlcb(void);
 void alpm_option_set_dlcb(alpm_cb_download cb);
 
+/** Get/set the downloader callback. */
 alpm_cb_fetch alpm_option_get_fetchcb(void);
 void alpm_option_set_fetchcb(alpm_cb_fetch cb);
 
+/** Get/set the callback used when download size is known. */
 alpm_cb_totaldl alpm_option_get_totaldlcb(void);
 void alpm_option_set_totaldlcb(alpm_cb_totaldl cb);
 
+/** Get/set the root of the destination filesystem. */
 const char *alpm_option_get_root(void);
 int alpm_option_set_root(const char *root);
 
+/** Get/set the path to the database directory. */
 const char *alpm_option_get_dbpath(void);
 int alpm_option_set_dbpath(const char *dbpath);
 
+/** Get/set the list of package cache directories. */
 alpm_list_t *alpm_option_get_cachedirs(void);
-int alpm_option_add_cachedir(const char *cachedir);
 void alpm_option_set_cachedirs(alpm_list_t *cachedirs);
+
+/** Add a single directory to the package cache paths. */
+int alpm_option_add_cachedir(const char *cachedir);
+
+/** Remove a single directory from the package cache paths. */
 int alpm_option_remove_cachedir(const char *cachedir);
 
+/** Get/set the logfile name. */
 const char *alpm_option_get_logfile(void);
 int alpm_option_set_logfile(const char *logfile);
 
+/** Get the name of the database lock file.
+ *
+ * This properly is read-only, and determined from
+ * the database path.
+ *
+ * @sa alpm_option_set_dbpath(const char*)
+ */
 const char *alpm_option_get_lockfile(void);
-/* no set_lockfile, path is determined from dbpath */
 
+/** Get/set whether to use syslog (0 is FALSE, TRUE otherwise). */
 int alpm_option_get_usesyslog(void);
 void alpm_option_set_usesyslog(int usesyslog);
 
@@ -149,6 +182,7 @@ void alpm_option_add_ignoregrp(const char *grp);
 void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps);
 int alpm_option_remove_ignoregrp(const char *grp);
 
+/** Get/set the targeted architecture. */
 const char *alpm_option_get_arch(void);
 void alpm_option_set_arch(const char *arch);
 
@@ -158,88 +192,363 @@ void alpm_option_set_usedelta(int usedelta);
 int alpm_option_get_checkspace(void);
 void alpm_option_set_checkspace(int checkspace);
 
-pmdb_t *alpm_option_get_localdb(void);
-alpm_list_t *alpm_option_get_syncdbs(void);
+/** @} */
 
-/*
- * Install reasons -- ie, why the package was installed
+/** Install reasons
+ * Why the package was installed.
  */
-
 typedef enum _pmpkgreason_t {
-	PM_PKG_REASON_EXPLICIT = 0,  /* explicitly requested by the user */
-	PM_PKG_REASON_DEPEND = 1  /* installed as a dependency for another package */
+	/** Explicitly requested by the user. */
+	PM_PKG_REASON_EXPLICIT = 0,
+	/** Installed as a dependency for another package. */
+	PM_PKG_REASON_DEPEND = 1
 } pmpkgreason_t;
 
-/*
- * Databases
+/** @addtogroup alpm_api_databases Database Functions
+ * Functions to query and manipulate the database of libalpm.
+ * @{
  */
 
+/** Get the database of locally installed packages.
+ * The returned pointer points to an internal structure
+ * of libalpm which should only be manipulated through
+ * libalpm functions.
+ * @return a reference to the local database
+ */
+pmdb_t *alpm_option_get_localdb(void);
+
+/** Get the list of sync databases.
+ * Returns a list of pmdb_t structures, one for each registered
+ * sync database.
+ * @return a reference to an internal list of pmdb_t structures
+ */
+alpm_list_t *alpm_option_get_syncdbs(void);
+
+/** Register a sync database of packages.
+ * @param treename the name of the sync repository
+ * @return a pmdb_t* on success (the value), NULL on error
+ */
 pmdb_t *alpm_db_register_sync(const char *treename);
+
+/** Unregister a package database.
+ * @param db pointer to the package database to unregister
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_db_unregister(pmdb_t *db);
+
+/** Unregister all package databases.
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_db_unregister_all(void);
 
+/** Get the name of a package database.
+ * @param db pointer to the package database
+ * @return the name of the package database, NULL on error
+ */
 const char *alpm_db_get_name(const pmdb_t *db);
+
+/** Get a download URL for the package database.
+ * @param db pointer to the package database
+ * @return a fully-specified download URL, NULL on error
+ */
 const char *alpm_db_get_url(const pmdb_t *db);
 
+/** Set the serverlist of a database.
+ * @param db database pointer
+ * @param url url of the server
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_db_setserver(pmdb_t *db, const char *url);
 
 int alpm_db_update(int level, pmdb_t *db);
 
+/** Get a package entry from a package database.
+ * @param db pointer to the package database to get the package from
+ * @param name of the package
+ * @return the package entry on success, NULL on error
+ */
 pmpkg_t *alpm_db_get_pkg(pmdb_t *db, const char *name);
+
+/** Get the package cache of a package database.
+ * @param db pointer to the package database to get the package from
+ * @return the list of packages on success, NULL on error
+ */
 alpm_list_t *alpm_db_get_pkgcache(pmdb_t *db);
 
+/** Get a group entry from a package database.
+ * @param db pointer to the package database to get the group from
+ * @param name of the group
+ * @return the groups entry on success, NULL on error
+ */
 pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name);
+
+/** Get the group cache of a package database.
+ * @param db pointer to the package database to get the group from
+ * @return the list of groups on success, NULL on error
+ */
 alpm_list_t *alpm_db_get_grpcache(pmdb_t *db);
+
+/** Searches a database.
+ * @param db pointer to the package database to search in
+ * @param needles the list of strings to search for
+ * @return the list of packages on success, NULL on error
+ */
 alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
+
+/** Set install reason for a package in db.
+ * @param db pointer to the package database
+ * @param name the name of the package
+ * @param reason the new install reason
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason);
 
-/*
- * Packages
+/** @} */
+
+/** @addtogroup alpm_api_packages Package Functions
+ * Functions to manipulate libalpm packages
+ * @{
  */
 
-/* Info parameters */
-
+/** Create a package from a file.
+ * If full is false, the archive is read only until all necessary
+ * metadata is found. If it is true, the entire archive is read, which
+ * serves as a verfication of integrity and the filelist can be created.
+ * @param filename location of the package tarball
+ * @param full whether to stop the load after metadata is read or continue
+ *             through the full archive
+ * @param pkg address of the package pointer
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_pkg_load(const char *filename, int full, pmpkg_t **pkg);
+
+/** Free a package.
+ * @param pkg package pointer to free
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_pkg_free(pmpkg_t *pkg);
+
+/** Check the integrity (with md5) of a package from the sync cache.
+ * @param pkg package pointer
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_pkg_checkmd5sum(pmpkg_t *pkg);
-char *alpm_fetch_pkgurl(const char *url);
+
+/** Compare two version strings and determine which one is 'newer'. */
 int alpm_pkg_vercmp(const char *a, const char *b);
+
+/** Computes the list of packages requiring a given package.
+ * The return value of this function is a newly allocated
+ * list of package names (char*), it should be freed by the caller.
+ * @param pkg a package
+ * @return the list of packages requiring pkg
+ */
 alpm_list_t *alpm_pkg_compute_requiredby(pmpkg_t *pkg);
 
+/** @name Package Property Accessors
+ * Any pointer returned by these functions points to internal structures
+ * allocated by libalpm. They should not be freed nor modified in any
+ * way.
+ * @{
+ */
+
+/** Gets the name of the file from which the package was loaded.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_filename(pmpkg_t *pkg);
+
+/** Returns the package name.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_name(pmpkg_t *pkg);
+
+/** Returns the package version as a string.
+ * This includes all available epoch, version, and pkgrel components. Use
+ * alpm_pkg_vercmp() to compare version strings if necessary.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_version(pmpkg_t *pkg);
+
+/** Returns the package description.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_desc(pmpkg_t *pkg);
+
+/** Returns the package URL.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_url(pmpkg_t *pkg);
+
+/** Returns the build timestamp of the package.
+ * @param pkg a pointer to package
+ * @return the timestamp of the build time
+ */
 time_t alpm_pkg_get_builddate(pmpkg_t *pkg);
+
+/** Returns the install timestamp of the package.
+ * @param pkg a pointer to package
+ * @return the timestamp of the install time
+ */
 time_t alpm_pkg_get_installdate(pmpkg_t *pkg);
+
+/** Returns the packager's name.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_packager(pmpkg_t *pkg);
+
+/** Returns the package's MD5 checksum as a string.
+ * The returned string is a sequence of lowercase hexadecimal digits.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_md5sum(pmpkg_t *pkg);
+
+/** Returns the architecture for which the package was built.
+ * @param pkg a pointer to package
+ * @return a reference to an internal string
+ */
 const char *alpm_pkg_get_arch(pmpkg_t *pkg);
+
+/** Returns the size of the package.
+ * @param pkg a pointer to package
+ * @return the size of the package in bytes.
+ */
 off_t alpm_pkg_get_size(pmpkg_t *pkg);
+
+/** Returns the installed size of the package.
+ * @param pkg a pointer to package
+ * @return the total size of files installed by the package.
+ */
 off_t alpm_pkg_get_isize(pmpkg_t *pkg);
+
+/** Returns the package installation reason.
+ * @param pkg a pointer to package
+ * @return an enum member giving the install reason.
+ */
 pmpkgreason_t alpm_pkg_get_reason(pmpkg_t *pkg);
+
+/** Returns the list of package licenses.
+ * @param pkg a pointer to package
+ * @return a pointer to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_licenses(pmpkg_t *pkg);
+
+/** Returns the list of package groups.
+ * @param pkg a pointer to package
+ * @return a pointer to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_groups(pmpkg_t *pkg);
+
+/** Returns the list of package dependencies as pmdepend_t.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of pmdepend_t structures.
+ */
 alpm_list_t *alpm_pkg_get_depends(pmpkg_t *pkg);
+
+/** Returns the list of package optional dependencies.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_optdepends(pmpkg_t *pkg);
+
+/** Returns the list of package names conflicting with pkg.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_conflicts(pmpkg_t *pkg);
+
+/** Returns the list of package names provided by pkg.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_provides(pmpkg_t *pkg);
+
+/** Returns the list of available deltas for pkg.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg);
+
+/** Returns the list of packages to be replaced by pkg.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg);
+
+/** Returns the list of files installed by pkg.
+ * The filenames are relative to the install root,
+ * and do not include leading slashes.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg);
+
+/** Returns the list of files backed up when installing pkg.
+ * The elements of the returned list have the form
+ * "<filename>\t<md5sum>", where the given md5sum is that of
+ * the file as provided by the package.
+ * @param pkg a pointer to package
+ * @return a reference to an internal list of strings.
+ */
 alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg);
+
+/** Returns the database containing pkg
+ * Returns a pointer to the pmdb_t structure the package is
+ * originating from, or NULL is the package was loaded from a file.
+ * @param pkg a pointer to package
+ * @return a pointer to the DB containing pkg, or NULL.
+ */
 pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg);
+
+/* End of pmpkg_t accessors */
+/* @} */
+
+/** Open a package changelog for reading.
+ * Similar to fopen in functionality, except that the returned 'file
+ * stream' could really be from an archive as well as from the database.
+ * @param pkg the package to read the changelog of (either file or db)
+ * @return a 'file stream' to the package changelog
+ */
 void *alpm_pkg_changelog_open(pmpkg_t *pkg);
+
+/** Read data from an open changelog 'file stream'.
+ * Similar to fread in functionality, this function takes a buffer and
+ * amount of data to read. If an error occurs pm_errno will be set.
+ * @param ptr a buffer to fill with raw changelog data
+ * @param size the size of the buffer
+ * @param pkg the package that the changelog is being read from
+ * @param fp a 'file stream' to the package changelog
+ * @return the number of characters read, or 0 if there is no more data or an
+ * error occurred.
+ */
 size_t alpm_pkg_changelog_read(void *ptr, size_t size,
 		const pmpkg_t *pkg, const void *fp);
+
 /*int alpm_pkg_changelog_feof(const pmpkg_t *pkg, void *fp);*/
+
 int alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp);
+
 int alpm_pkg_has_scriptlet(pmpkg_t *pkg);
 
+/** Returns the size of download.
+ * Returns the size of the files that will be downloaded to install a
+ * package.
+ * @param newpkg the new package to upgrade to
+ * @return the size of the download
+ */
 off_t alpm_pkg_download_size(pmpkg_t *newpkg);
+
 alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg);
 
+/* End of alpm_pkg */
+/** @} */
+
 /*
  * Deltas
  */
@@ -263,39 +572,50 @@ alpm_list_t *alpm_find_grp_pkgs(alpm_list_t *dbs, const char *name);
 
 pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync);
 
-/*
- * Transactions
+/** @addtogroup alpm_api_trans Transaction Functions
+ * Functions to manipulate libalpm transactions
+ * @{
  */
 
-
-/* Flags */
+/** Transaction flags */
 typedef enum _pmtransflag_t {
+	/** Ignore dependency checks. */
 	PM_TRANS_FLAG_NODEPS = 1,
+	/** Ignore file conflicts and overwrite files. */
 	PM_TRANS_FLAG_FORCE = (1 << 1),
+	/** Delete files even if they are tagged as backup. */
 	PM_TRANS_FLAG_NOSAVE = (1 << 2),
+	/** Ignore version numbers when checking dependencies. */
 	PM_TRANS_FLAG_NODEPVERSION = (1 << 3),
+	/** Remove also any packages depending on a package being removed. */
 	PM_TRANS_FLAG_CASCADE = (1 << 4),
+	/** Remove packages and their unneeded deps (not explicitly installed). */
 	PM_TRANS_FLAG_RECURSE = (1 << 5),
+	/** Modify database but do not commit changes to the filesystem. */
 	PM_TRANS_FLAG_DBONLY = (1 << 6),
 	/* (1 << 7) flag can go here */
+	/** Use PM_PKG_REASON_DEPEND when installing packages. */
 	PM_TRANS_FLAG_ALLDEPS = (1 << 8),
+	/** Only download packages and do not actually install. */
 	PM_TRANS_FLAG_DOWNLOADONLY = (1 << 9),
+	/** Do not execute install scriptlets after installing. */
 	PM_TRANS_FLAG_NOSCRIPTLET = (1 << 10),
+	/** Ignore dependency conflicts. */
 	PM_TRANS_FLAG_NOCONFLICTS = (1 << 11),
 	/* (1 << 12) flag can go here */
+	/** Do not install a package if it is already installed and up to date. */
 	PM_TRANS_FLAG_NEEDED = (1 << 13),
+	/** Use PM_PKG_REASON_EXPLICIT when installing packages. */
 	PM_TRANS_FLAG_ALLEXPLICIT = (1 << 14),
+	/** Do not remove a package if it is needed by another one. */
 	PM_TRANS_FLAG_UNNEEDED = (1 << 15),
+	/** Remove also explicitly installed unneeded deps (use with PM_TRANS_FLAG_RECURSE). */
 	PM_TRANS_FLAG_RECURSEALL = (1 << 16),
+	/** Do not lock the database during the operation. */
 	PM_TRANS_FLAG_NOLOCK = (1 << 17)
 } pmtransflag_t;
 
-/**
- * @addtogroup alpm_trans
- * @{
- */
-/**
- * @brief Transaction events.
+/** Transaction events.
  * NULL parameters are passed to in all events unless specified otherwise.
  */
 typedef enum _pmtransevt_t {
@@ -374,9 +694,8 @@ typedef enum _pmtransevt_t {
 	/** Disk space usage was computed for a package */
 	PM_TRANS_EVT_DISKSPACE_DONE,
 } pmtransevt_t;
-/*@}*/
 
-/* Transaction Conversations (ie, questions) */
+/** Transaction Conversations (ie, questions) */
 typedef enum _pmtransconv_t {
 	PM_TRANS_CONV_INSTALL_IGNOREPKG = 1,
 	PM_TRANS_CONV_REPLACE_PKG = (1 << 1),
@@ -387,7 +706,7 @@ typedef enum _pmtransconv_t {
 	PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6),
 } pmtransconv_t;
 
-/* Transaction Progress */
+/** Transaction Progress */
 typedef enum _pmtransprog_t {
 	PM_TRANS_PROGRESS_ADD_START,
 	PM_TRANS_PROGRESS_UPGRADE_START,
@@ -397,41 +716,90 @@ typedef enum _pmtransprog_t {
 	PM_TRANS_PROGRESS_INTEGRITY_START,
 } pmtransprog_t;
 
-/* Transaction Event callback */
+/** Transaction Event callback */
 typedef void (*alpm_trans_cb_event)(pmtransevt_t, void *, void *);
 
-/* Transaction Conversation callback */
+/** Transaction Conversation callback */
 typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *,
                                    void *, int *);
 
-/* Transaction Progress callback */
+/** Transaction Progress callback */
 typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t);
 
 int alpm_trans_get_flags(void);
+
+/** Returns a list of packages added by the transaction.
+ * @return a list of pmpkg_t structures
+ */
 alpm_list_t * alpm_trans_get_add(void);
+
+/** Returns the list of packages removed by the transaction.
+ * @return a list of pmpkg_t structures
+ */
 alpm_list_t * alpm_trans_get_remove(void);
+
+/** Initialize the transaction.
+ * @param flags flags of the transaction (like nodeps, etc)
+ * @param event event callback function pointer
+ * @param conv question callback function pointer
+ * @param progress progress callback function pointer
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
 int alpm_trans_init(pmtransflag_t flags,
                     alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv,
                     alpm_trans_cb_progress cb_progress);
-int alpm_trans_prepare(alpm_list_t **data);
-int alpm_trans_commit(alpm_list_t **data);
-int alpm_trans_interrupt(void);
-int alpm_trans_release(void);
 
+/** Prepare a transaction.
+ * @param data the address of an alpm_list where a list
+ * of pmdepmissing_t objects is dumped (conflicting packages)
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int alpm_trans_prepare(alpm_list_t **data);
+
+/** Commit a transaction.
+ * @param data the address of an alpm_list where detailed description
+ * of an error can be dumped (ie. list of conflicting files)
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int alpm_trans_commit(alpm_list_t **data);
+
+/** Interrupt a transaction.
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int alpm_trans_interrupt(void);
+
+/** Release a transaction.
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int alpm_trans_release(void);
+/** @} */
+
+/** @name Common Transactions */
+/** @{ */
 int alpm_sync_sysupgrade(int enable_downgrade);
 int alpm_add_pkg(pmpkg_t *pkg);
 int alpm_remove_pkg(pmpkg_t *pkg);
+/** @} */
 
-/*
- * Dependencies and conflicts
+/** @addtogroup alpm_api_depends Dependency Functions
+ * Functions dealing with libalpm representation of dependency
+ * information.
+ * @{
  */
 
+/** Types of version constraints in dependency specs. */
 typedef enum _pmdepmod_t {
+  /** No version constraint */
 	PM_DEP_MOD_ANY = 1,
+  /** Test version equality (package=x.y.z) */
 	PM_DEP_MOD_EQ,
+  /** Test for at least a version (package>=x.y.z) */
 	PM_DEP_MOD_GE,
+  /** Test for at most a version (package<=x.y.z) */
 	PM_DEP_MOD_LE,
+  /** Test for greater than some version (package>x.y.z) */
 	PM_DEP_MOD_GT,
+  /** Test for less than some version (package<x.y.z) */
 	PM_DEP_MOD_LT
 } pmdepmod_t;
 
@@ -450,13 +818,38 @@ const char *alpm_conflict_get_package1(pmconflict_t *conflict);
 const char *alpm_conflict_get_package2(pmconflict_t *conflict);
 const char *alpm_conflict_get_reason(pmconflict_t *conflict);
 
+/** Returns the type of version constraint.
+ * @param dep a dependency info structure
+ * @return the type of version constraint (PM_DEP_MOD_ANY if no version
+ * is specified).
+ */
 pmdepmod_t alpm_dep_get_mod(const pmdepend_t *dep);
+
+/** Returns the package name of a dependency constraint.
+ * @param dep a dependency info structure
+ * @return a pointer to an internal string.
+ */
 const char *alpm_dep_get_name(const pmdepend_t *dep);
+
+/** Returns the version specified by a dependency constraint.
+ * The version information is returned as a string in the same format
+ * as given by alpm_pkg_get_version().
+ * @param dep a dependency info structure
+ * @return a pointer to an internal string.
+ */
 const char *alpm_dep_get_version(const pmdepend_t *dep);
+
+/** Returns a newly allocated string representing the dependency information.
+ * @param dep a dependency info structure
+ * @return a formatted string, e.g. "glibc>=2.12"
+ */
 char *alpm_dep_compute_string(const pmdepend_t *dep);
 
-/*
- * File conflicts
+/** @} */
+
+/** @addtogroup alpm_api_fileconflicts File Conflicts Functions
+ * Functions to manipulate file conflict information.
+ * @{
  */
 
 typedef enum _pmfileconflicttype_t {
@@ -469,6 +862,8 @@ pmfileconflicttype_t alpm_fileconflict_get_type(pmfileconflict_t *conflict);
 const char *alpm_fileconflict_get_file(pmfileconflict_t *conflict);
 const char *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict);
 
+/** @} */
+
 /*
  * Helpers
  */
@@ -476,8 +871,8 @@ const char *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict);
 /* checksums */
 char *alpm_compute_md5sum(const char *name);
 
-/*
- * Errors
+/** @addtogroup alpm_api_errors Error Codes
+ * @{
  */
 enum _pmerrno_t {
 	PM_ERR_MEMORY = 1,
@@ -538,11 +933,21 @@ enum _pmerrno_t {
 	PM_ERR_EXTERNAL_DOWNLOAD
 };
 
+/** The number of the last error that occurred. */
 extern enum _pmerrno_t pm_errno;
 
+/** Returns the string corresponding to an error number. */
 const char *alpm_strerror(int err);
+
+/** Returns the string corresponding to pm_errno. */
 const char *alpm_strerrorlast(void);
 
+/* End of alpm_api_errors */
+/** @} */
+
+/* End of alpm_api */
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

lib/libalpm/alpm_list.c

@@ -287,7 +287,7 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn
 
 /**
  * @brief Remove an item from the list.
- * item is not freed; this is the responsiblity of the caller.
+ * item is not freed; this is the responsibility of the caller.
  *
  * @param haystack the list to remove the item from
  * @param item the item to remove from the list

lib/libalpm/be_local.c

@@ -384,7 +384,8 @@ static int local_db_populate(pmdb_t *db)
 
 	dbpath = _alpm_db_path(db);
 	if(dbpath == NULL) {
-		RET_ERR(PM_ERR_DB_OPEN, -1);
+		/* pm_errno set in _alpm_db_path() */
+		return -1;
 	}
 	dbdir = opendir(dbpath);
 	if(dbdir == NULL) {
@@ -405,7 +406,7 @@ static int local_db_populate(pmdb_t *db)
 		 * http://kerneltrap.org/mailarchive/linux-btrfs/2010/1/23/6723483/thread
 		 */
 		est_count = 0;
-		while((ent = readdir(dbdir)) != NULL) {
+		while(readdir(dbdir) != NULL) {
 			est_count++;
 		}
 		rewinddir(dbdir);

lib/libalpm/be_package.c

@@ -367,16 +367,6 @@ error:
 	return(NULL);
 }
 
-/** Create a package from a file.
- * If full is false, the archive is read only until all necessary
- * metadata is found. If it is true, the entire archive is read, which
- * serves as a verfication of integrity and the filelist can be created.
- * @param filename location of the package tarball
- * @param full whether to stop the load after metadata is read or continue
- *             through the full archive
- * @param pkg address of the package pointer
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
 int SYMEXPORT alpm_pkg_load(const char *filename, int full, pmpkg_t **pkg)
 {
 	ALPM_LOG_FUNC;

lib/libalpm/be_sync.c

@@ -197,9 +197,11 @@ static size_t estimate_package_count(struct stat *st, struct archive *archive)
 		case ARCHIVE_COMPRESSION_XZ:
 			per_package = 143;
 			break;
+#ifdef ARCHIVE_COMPRESSION_UU
 		case ARCHIVE_COMPRESSION_UU:
 			per_package = 3543;
 			break;
+#endif
 		default:
 			/* assume it is at least somewhat compressed */
 			per_package = 200;
@@ -209,6 +211,7 @@ static size_t estimate_package_count(struct stat *st, struct archive *archive)
 
 static int sync_db_populate(pmdb_t *db)
 {
+	const char *dbpath;
 	size_t est_count;
 	int count = 0;
 	struct stat buf;
@@ -220,21 +223,30 @@ static int sync_db_populate(pmdb_t *db)
 
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
-	if((archive = archive_read_new()) == NULL)
-		RET_ERR(PM_ERR_LIBARCHIVE, 1);
+	if((archive = archive_read_new()) == NULL) {
+		RET_ERR(PM_ERR_LIBARCHIVE, -1);
+	}
 
 	archive_read_support_compression_all(archive);
 	archive_read_support_format_all(archive);
 
-	if(archive_read_open_filename(archive, _alpm_db_path(db),
+	dbpath = _alpm_db_path(db);
+	if(!dbpath) {
+		/* pm_errno set in _alpm_db_path() */
+		return -1;
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "opening database archive %s\n", dbpath);
+
+	if(archive_read_open_filename(archive, dbpath,
 				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-		_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), _alpm_db_path(db),
+		_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), dbpath,
 				archive_error_string(archive));
 		archive_read_finish(archive);
-		RET_ERR(PM_ERR_DB_OPEN, 1);
+		RET_ERR(PM_ERR_DB_OPEN, -1);
 	}
-	if(stat(_alpm_db_path(db), &buf) != 0) {
-		RET_ERR(PM_ERR_DB_OPEN, 1);
+	if(stat(dbpath, &buf) != 0) {
+		RET_ERR(PM_ERR_DB_OPEN, -1);
 	}
 	est_count = estimate_package_count(&buf, archive);
 
@@ -418,6 +430,12 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 				pkg->isize = atol(line);
 			} else if(strcmp(line, "%MD5SUM%") == 0) {
 				READ_AND_STORE(pkg->md5sum);
+			} else if(strcmp(line, "%SHA256SUM%") == 0) {
+				/* we don't do anything with this value right now */
+				READ_NEXT(line);
+			} else if(strcmp(line, "%PGPSIG%") == 0) {
+				/* we don't do anything with this value right now */
+				READ_NEXT(line);
 			} else if(strcmp(line, "%REPLACES%") == 0) {
 				READ_AND_STORE_ALL(pkg->replaces);
 			} else if(strcmp(line, "%DEPENDS%") == 0) {

lib/libalpm/conflict.c

@@ -296,14 +296,14 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
 	return(ret);
 }
 
-/* Adds pmfileconflict_t to a conflicts list. Pass the conflicts list, type (either
- * PM_FILECONFLICT_TARGET or PM_FILECONFLICT_FILESYSTEM), a file string, and either
- * two package names or one package name and NULL. This is a wrapper for former
- * functionality that was done inline.
+/* Adds pmfileconflict_t to a conflicts list. Pass the conflicts list, type
+ * (either PM_FILECONFLICT_TARGET or PM_FILECONFLICT_FILESYSTEM), a file
+ * string, and either two package names or one package name and NULL. This is
+ * a wrapper for former functionality that was done inline.
  */
 static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
                     pmfileconflicttype_t type, const char *filestr,
-                    const char* name1, const char* name2)
+                    const char *name1, const char *name2)
 {
 	pmfileconflict_t *conflict;
 	MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
@@ -334,7 +334,7 @@ void _alpm_fileconflict_free(pmfileconflict_t *conflict)
 	FREE(conflict);
 }
 
-static int dir_belongsto_pkg(char *dirpath, pmpkg_t *pkg)
+static int dir_belongsto_pkg(const char *dirpath, pmpkg_t *pkg)
 {
 	struct dirent *ent = NULL;
 	struct stat sbuf;
@@ -433,7 +433,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 
 		/* declarations for second check */
 		struct stat lsbuf, sbuf;
-		char *filestr = NULL;
 
 		/* CHECK 2: check every target against the filesystem */
 		_alpm_log(PM_LOG_DEBUG, "searching for filesystem conflicts: %s\n", p1->name);
@@ -452,7 +451,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 		}
 
 		for(j = tmpfiles; j; j = j->next) {
-			filestr = j->data;
+			const char *filestr = j->data, *relative_path;
+			/* have we acted on this conflict? */
+			int resolved_conflict = 0;
 
 			snprintf(path, PATH_MAX, "%s%s", handle->root, filestr);
 
@@ -462,7 +463,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 			}
 			stat(path, &sbuf);
 
-			if(path[strlen(path)-1] == '/') {
+			if(path[strlen(path) - 1] == '/') {
 				if(S_ISDIR(lsbuf.st_mode)) {
 					_alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path);
 					continue;
@@ -471,16 +472,22 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 							"%s is a symlink to a dir, hopefully not a conflict\n", path);
 					continue;
 				}
+				/* if we made it to here, we want all subsequent path comparisons to
+				 * not include the trailing slash. This allows things like file ->
+				 * directory replacements. */
+				path[strlen(path) - 1] = '\0';
 			}
-			_alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s\n", path);
 
-			int resolved_conflict = 0; /* have we acted on this conflict? */
+			_alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s\n", path);
+			relative_path = path + strlen(handle->root);
 
 			/* Check remove list (will we remove the conflicting local file?) */
 			for(k = remove; k && !resolved_conflict; k = k->next) {
 				pmpkg_t *rempkg = k->data;
-				if(rempkg && alpm_list_find_str(alpm_pkg_get_files(rempkg), filestr)) {
-					_alpm_log(PM_LOG_DEBUG, "local file will be removed, not a conflict: %s\n", filestr);
+				if(alpm_list_find_str(alpm_pkg_get_files(rempkg), relative_path)) {
+					_alpm_log(PM_LOG_DEBUG,
+							"local file will be removed, not a conflict: %s\n",
+							relative_path);
 					resolved_conflict = 1;
 				}
 			}
@@ -498,8 +505,11 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 					/* skip removal of file, but not add. this will prevent a second
 					 * package from removing the file when it was already installed
 					 * by its new owner (whether the file is in backup array or not */
-					trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(filestr));
-					_alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr);
+					trans->skip_remove = alpm_list_add(trans->skip_remove,
+							strdup(filestr));
+					_alpm_log(PM_LOG_DEBUG,
+							"file changed packages, adding to remove skiplist: %s\n",
+							filestr);
 					resolved_conflict = 1;
 				}
 			}
@@ -518,19 +528,19 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 
 			if(!resolved_conflict && dbpkg) {
 				char *rpath = calloc(PATH_MAX+1, sizeof(char));
+				const char *relative_rpath;
 				if(!realpath(path, rpath)) {
-					FREE(rpath);
+					free(rpath);
 					continue;
 				}
-				char *filestr = rpath + strlen(handle->root);
-				if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),filestr)) {
+				relative_rpath = rpath + strlen(handle->root);
+				if(alpm_list_find_str(alpm_pkg_get_files(dbpkg), relative_rpath)) {
 					resolved_conflict = 1;
 				}
 				free(rpath);
 			}
 
 			if(!resolved_conflict) {
-				_alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path);
 				conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM,
 						path, p1->name, NULL);
 			}

lib/libalpm/db.c

@@ -47,10 +47,7 @@
  * @{
  */
 
-/** Register a sync database of packages.
- * @param treename the name of the sync repository
- * @return a pmdb_t* on success (the value), NULL on error
- */
+/** Register a sync database of packages. */
 pmdb_t SYMEXPORT *alpm_db_register_sync(const char *treename)
 {
 	ALPM_LOG_FUNC;
@@ -75,9 +72,7 @@ void _alpm_db_unregister(pmdb_t *db)
 	_alpm_db_free(db);
 }
 
-/** Unregister all package databases
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Unregister all package databases. */
 int SYMEXPORT alpm_db_unregister_all(void)
 {
 	alpm_list_t *i;
@@ -90,14 +85,7 @@ int SYMEXPORT alpm_db_unregister_all(void)
 	/* Do not unregister a database if a transaction is on-going */
 	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
 
-	/* close local database */
-	db = handle->db_local;
-	if(db) {
-		db->ops->unregister(db);
-		handle->db_local = NULL;
-	}
-
-	/* and also sync ones */
+	/* unregister all sync dbs */
 	for(i = handle->dbs_sync; i; i = i->next) {
 		db = i->data;
 		db->ops->unregister(db);
@@ -107,10 +95,7 @@ int SYMEXPORT alpm_db_unregister_all(void)
 	return(0);
 }
 
-/** Unregister a package database
- * @param db pointer to the package database to unregister
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Unregister a package database. */
 int SYMEXPORT alpm_db_unregister(pmdb_t *db)
 {
 	int found = 0;
@@ -147,11 +132,7 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
 	return(0);
 }
 
-/** Set the serverlist of a database.
- * @param db database pointer
- * @param url url of the server
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Set the serverlist of a database. */
 int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
 {
 	alpm_list_t *i;
@@ -194,10 +175,7 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
 	return(0);
 }
 
-/** Get the name of a package database
- * @param db pointer to the package database
- * @return the name of the package database, NULL on error
- */
+/** Get the name of a package database. */
 const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
@@ -209,10 +187,7 @@ const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db)
 	return db->treename;
 }
 
-/** Get a download URL for the package database
- * @param db pointer to the package database
- * @return a fully-specified download URL, NULL on error
- */
+/** Get a download URL for the package database. */
 const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db)
 {
 	char *url;
@@ -230,11 +205,7 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db)
 }
 
 
-/** Get a package entry from a package database
- * @param db pointer to the package database to get the package from
- * @param name of the package
- * @return the package entry on success, NULL on error
- */
+/** Get a package entry from a package database. */
 pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
 {
 	ALPM_LOG_FUNC;
@@ -247,10 +218,7 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
 	return(_alpm_db_get_pkgfromcache(db, name));
 }
 
-/** Get the package cache of a package database
- * @param db pointer to the package database to get the package from
- * @return the list of packages on success, NULL on error
- */
+/** Get the package cache of a package database. */
 alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
@@ -262,11 +230,7 @@ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
 	return(_alpm_db_get_pkgcache(db));
 }
 
-/** Get a group entry from a package database
- * @param db pointer to the package database to get the group from
- * @param name of the group
- * @return the groups entry on success, NULL on error
- */
+/** Get a group entry from a package database. */
 pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
 {
 	ALPM_LOG_FUNC;
@@ -279,10 +243,7 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
 	return(_alpm_db_get_grpfromcache(db, name));
 }
 
-/** Get the group cache of a package database
- * @param db pointer to the package database to get the group from
- * @return the list of groups on success, NULL on error
- */
+/** Get the group cache of a package database. */
 alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
@@ -294,11 +255,7 @@ alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
 	return(_alpm_db_get_grpcache(db));
 }
 
-/** Searches a database
- * @param db pointer to the package database to search in
- * @param needles the list of strings to search for
- * @return the list of packages on success, NULL on error
- */
+/** Searches a database. */
 alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
 {
 	ALPM_LOG_FUNC;
@@ -310,12 +267,7 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
 	return(_alpm_db_search(db, needles));
 }
 
-/** Set install reason for a package in db
- * @param db pointer to the package database
- * @param name the name of the package
- * @param reason the new install reason
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Set install reason for a package in db. */
 int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason)
 {
 	ALPM_LOG_FUNC;
@@ -338,7 +290,7 @@ int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t
 	pkg->reason = reason;
 	/* write DESC */
 	if(_alpm_local_db_write(db, pkg, INFRQ_DESC)) {
-		return(-1);
+		RET_ERR(PM_ERR_DB_WRITE, -1);
 	}
 
 	return(0);

lib/libalpm/deps.c

@@ -43,7 +43,7 @@ void _alpm_dep_free(pmdepend_t *dep)
 	FREE(dep);
 }
 
-pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepend_t *dep,
+static pmdepmissing_t *depmiss_new(const char *target, pmdepend_t *dep,
 		const char *causingpkg)
 {
 	pmdepmissing_t *miss;
@@ -67,6 +67,18 @@ void _alpm_depmiss_free(pmdepmissing_t *miss)
 	FREE(miss);
 }
 
+/* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */
+static int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2)
+{
+	alpm_list_t *i;
+	for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) {
+		if(_alpm_depcmp(pkg2, i->data)) {
+			return(1);
+		}
+	}
+	return(0);
+}
+
 /* Convert a list of pmpkg_t * to a graph structure,
  * with a edge for each dependency.
  * Returns a list of vertices (one vertex = one package)
@@ -192,13 +204,37 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse)
 	return(newtargs);
 }
 
-pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep)
+static int no_dep_version(void)
+{
+	int flags = alpm_trans_get_flags();
+	return flags != -1 && (flags & PM_TRANS_FLAG_NODEPVERSION);
+}
+
+static pmdepend_t *filtered_depend(pmdepend_t *dep, int nodepversion)
+{
+	if(nodepversion) {
+		pmdepend_t *newdep = _alpm_dep_dup(dep);
+		ASSERT(newdep, return(dep));
+		newdep->mod = PM_DEP_MOD_ANY;
+		dep = newdep;
+	}
+	return dep;
+}
+
+static void release_filtered_depend(pmdepend_t *dep, int nodepversion)
+{
+	if(nodepversion) {
+		free(dep);
+	}
+}
+
+static pmpkg_t *find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep)
 {
 	alpm_list_t *i;
 
 	for(i = pkgs; i; i = alpm_list_next(i)) {
 		pmpkg_t *pkg = i->data;
-		if(_alpm_depcmp_tolerant(pkg, dep)) {
+		if(_alpm_depcmp(pkg, dep)) {
 			return(pkg);
 		}
 	}
@@ -214,7 +250,7 @@ pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep)
 pmpkg_t SYMEXPORT *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstring)
 {
 	pmdepend_t *dep = _alpm_splitdep(depstring);
-	pmpkg_t *pkg = _alpm_find_dep_satisfier(pkgs, dep);
+	pmpkg_t *pkg = find_dep_satisfier(pkgs, dep);
 	_alpm_dep_free(dep);
 	return(pkg);
 }
@@ -225,7 +261,7 @@ pmpkg_t SYMEXPORT *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstring)
  * @param reversedeps handles the backward dependencies
  * @param remove an alpm_list_t* of packages to be removed
  * @param upgrade an alpm_list_t* of packages to be upgraded (remove-then-upgrade)
- * @return an alpm_list_t* of pmpkg_t* of pmdepmissing_t pointers.
+ * @return an alpm_list_t* of pmdepmissing_t pointers.
  */
 alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 		alpm_list_t *remove, alpm_list_t *upgrade)
@@ -233,6 +269,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 	alpm_list_t *i, *j;
 	alpm_list_t *targets, *dblist = NULL, *modified = NULL;
 	alpm_list_t *baddeps = NULL;
+	int nodepversion;
 
 	ALPM_LOG_FUNC;
 
@@ -247,6 +284,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 	}
 	alpm_list_free(targets);
 
+	nodepversion = no_dep_version();
+
 	/* look for unsatisfied dependencies of the upgrade list */
 	for(i = upgrade; i; i = i->next) {
 		pmpkg_t *tp = i->data;
@@ -255,19 +294,21 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 
 		for(j = alpm_pkg_get_depends(tp); j; j = j->next) {
 			pmdepend_t *depend = j->data;
+			depend = filtered_depend(depend, nodepversion);
 			/* 1. we check the upgrade list */
 			/* 2. we check database for untouched satisfying packages */
-			if(!_alpm_find_dep_satisfier(upgrade, depend) &&
-			   !_alpm_find_dep_satisfier(dblist, depend)) {
+			if(!find_dep_satisfier(upgrade, depend) &&
+			   !find_dep_satisfier(dblist, depend)) {
 				/* Unsatisfied dependency in the upgrade list */
 				pmdepmissing_t *miss;
 				char *missdepstring = alpm_dep_compute_string(depend);
 				_alpm_log(PM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n",
 						missdepstring, alpm_pkg_get_name(tp));
 				free(missdepstring);
-				miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), depend, NULL);
+				miss = depmiss_new(alpm_pkg_get_name(tp), depend, NULL);
 				baddeps = alpm_list_add(baddeps, miss);
 			}
+			release_filtered_depend(depend, nodepversion);
 		}
 	}
 
@@ -278,21 +319,23 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 			pmpkg_t *lp = i->data;
 			for(j = alpm_pkg_get_depends(lp); j; j = j->next) {
 				pmdepend_t *depend = j->data;
-				pmpkg_t *causingpkg = _alpm_find_dep_satisfier(modified, depend);
+				depend = filtered_depend(depend, nodepversion);
+				pmpkg_t *causingpkg = find_dep_satisfier(modified, depend);
 				/* we won't break this depend, if it is already broken, we ignore it */
 				/* 1. check upgrade list for satisfiers */
 				/* 2. check dblist for satisfiers */
 				if(causingpkg &&
-				   !_alpm_find_dep_satisfier(upgrade, depend) &&
-				   !_alpm_find_dep_satisfier(dblist, depend)) {
+				   !find_dep_satisfier(upgrade, depend) &&
+				   !find_dep_satisfier(dblist, depend)) {
 					pmdepmissing_t *miss;
 					char *missdepstring = alpm_dep_compute_string(depend);
 					_alpm_log(PM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n",
 							missdepstring, alpm_pkg_get_name(lp));
 					free(missdepstring);
-					miss = _alpm_depmiss_new(lp->name, depend, alpm_pkg_get_name(causingpkg));
+					miss = depmiss_new(lp->name, depend, alpm_pkg_get_name(causingpkg));
 					baddeps = alpm_list_add(baddeps, miss);
 				}
+				release_filtered_depend(depend, nodepversion);
 			}
 		}
 	}
@@ -324,18 +367,10 @@ static int dep_vercmp(const char *version1, pmdepmod_t mod,
 	return(equal);
 }
 
-/* nodepversion: skip version checking */
-static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion)
+int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
 {
 	alpm_list_t *i;
 	int satisfy = 0;
-	int depmod;
-
-	if(nodepversion) {
-		depmod = PM_DEP_MOD_ANY;
-	} else {
-		depmod = dep->mod;
-	}
 
 	/* check (pkg->name, pkg->version) */
 	if(pkg->name_hash && dep->name_hash
@@ -343,7 +378,7 @@ static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion)
 		/* skip more expensive checks */
 	} else {
 		satisfy = (strcmp(pkg->name, dep->name) == 0
-				&& dep_vercmp(pkg->version, depmod, dep->version));
+				&& dep_vercmp(pkg->version, dep->mod, dep->version));
 		if(satisfy) {
 			return(satisfy);
 		}
@@ -355,7 +390,7 @@ static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion)
 		const char *provver = strchr(provision, '=');
 
 		if(provver == NULL) { /* no provision version */
-			satisfy = (depmod == PM_DEP_MOD_ANY
+			satisfy = (dep->mod == PM_DEP_MOD_ANY
 					&& strcmp(provision, dep->name) == 0);
 		} else {
 			/* This is a bit tricker than the old code for performance reasons. To
@@ -367,32 +402,13 @@ static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion)
 			provver += 1;
 			satisfy = (strlen(dep->name) == namelen
 					&& strncmp(provision, dep->name, namelen) == 0
-					&& dep_vercmp(provver, depmod, dep->version));
+					&& dep_vercmp(provver, dep->mod, dep->version));
 		}
 	}
 
 	return(satisfy);
 }
 
-/* tolerant : respects NODEPVERSION flag */
-int _alpm_depcmp_tolerant(pmpkg_t *pkg, pmdepend_t *dep)
-{
-	int nodepversion = 0;
-	int flags = alpm_trans_get_flags();
-
-	if (flags != -1) {
-		nodepversion = flags & PM_TRANS_FLAG_NODEPVERSION;
-	}
-
-	return(_depcmp(pkg, dep, nodepversion));
-}
-
-/* strict : ignores NODEPVERSION flag */
-int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
-{
-	return(_depcmp(pkg, dep, 0));
-}
-
 pmdepend_t *_alpm_splitdep(const char *depstring)
 {
 	pmdepend_t *depend;
@@ -526,28 +542,6 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit)
 	}
 }
 
-/** Find a package satisfying a specified dependency.
- * First look for a literal, going through each db one by one. Then look for
- * providers. The first satisfier found is returned.
- * The dependency can include versions with depmod operators.
- * @param dbs an alpm_list_t* of pmdb_t where the satisfier will be searched
- * @param depstring package or provision name, versioned or not
- * @return a pmpkg_t* satisfying depstring
- */
-pmpkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_list_t *dbs, const char *depstring)
-{
-	pmdepend_t *dep;
-	pmpkg_t *pkg;
-
-	ASSERT(dbs, return(NULL));
-
-	dep = _alpm_splitdep(depstring);
-	ASSERT(dep, return(NULL));
-	pkg = _alpm_resolvedep(dep, dbs, NULL, 1);
-	_alpm_dep_free(dep);
-	return(pkg);
-}
-
 /**
  * helper function for resolvedeps: search for dep satisfier in dbs
  *
@@ -560,7 +554,7 @@ pmpkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_list_t *dbs, const char *depstri
  *        an error code without prompting
  * @return the resolved package
  **/
-pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
+static pmpkg_t *resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
 		alpm_list_t *excluding, int prompt)
 {
 	alpm_list_t *i, *j;
@@ -572,7 +566,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
 	/* 1. literals */
 	for(i = dbs; i; i = i->next) {
 		pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name);
-		if(pkg && _alpm_depcmp_tolerant(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) {
+		if(pkg && _alpm_depcmp(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) {
 			if(_alpm_pkg_should_ignore(pkg)) {
 				int install = 0;
 				if (prompt) {
@@ -593,7 +587,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
 	for(i = dbs; i; i = i->next) {
 		for(j = _alpm_db_get_pkgcache(i->data); j; j = j->next) {
 			pmpkg_t *pkg = j->data;
-			if(_alpm_depcmp_tolerant(pkg, dep) && strcmp(pkg->name, dep->name) != 0 &&
+			if(_alpm_depcmp(pkg, dep) && strcmp(pkg->name, dep->name) != 0 &&
 			             !_alpm_pkg_find(excluding, pkg->name)) {
 				if(_alpm_pkg_should_ignore(pkg)) {
 					int install = 0;
@@ -650,7 +644,30 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
 	return(NULL);
 }
 
-/* Computes resolvable dependencies for a given package and adds that package
+/** Find a package satisfying a specified dependency.
+ * First look for a literal, going through each db one by one. Then look for
+ * providers. The first satisfier found is returned.
+ * The dependency can include versions with depmod operators.
+ * @param dbs an alpm_list_t* of pmdb_t where the satisfier will be searched
+ * @param depstring package or provision name, versioned or not
+ * @return a pmpkg_t* satisfying depstring
+ */
+pmpkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_list_t *dbs, const char *depstring)
+{
+	pmdepend_t *dep;
+	pmpkg_t *pkg;
+
+	ASSERT(dbs, return(NULL));
+
+	dep = _alpm_splitdep(depstring);
+	ASSERT(dep, return(NULL));
+	pkg = resolvedep(dep, dbs, NULL, 1);
+	_alpm_dep_free(dep);
+	return(pkg);
+}
+
+/**
+ * Computes resolvable dependencies for a given package and adds that package
  * and those resolvable dependencies to a list.
  *
  * @param localpkgs is the list of local packages
@@ -704,16 +721,16 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk
 			pmdepend_t *missdep = alpm_miss_get_dep(miss);
 			/* check if one of the packages in the [*packages] list already satisfies
 			 * this dependency */
-			if(_alpm_find_dep_satisfier(*packages, missdep)) {
+			if(find_dep_satisfier(*packages, missdep)) {
 				_alpm_depmiss_free(miss);
 				continue;
 			}
 			/* check if one of the packages in the [preferred] list already satisfies
 			 * this dependency */
-			pmpkg_t *spkg = _alpm_find_dep_satisfier(preferred, missdep);
+			pmpkg_t *spkg = find_dep_satisfier(preferred, missdep);
 			if(!spkg) {
 				/* find a satisfier package in the given repositories */
-				spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0);
+				spkg = resolvedep(missdep, dbs_sync, *packages, 0);
 			}
 			if(!spkg) {
 				pm_errno = PM_ERR_UNSATISFIED_DEPS;
@@ -746,18 +763,6 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk
 	return(ret);
 }
 
-/* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */
-int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2)
-{
-	alpm_list_t *i;
-	for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) {
-		if(_alpm_depcmp_tolerant(pkg2, i->data)) {
-			return(1);
-		}
-	}
-	return(0);
-}
-
 const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss)
 {
 	ALPM_LOG_FUNC;
@@ -825,7 +830,8 @@ const char SYMEXPORT *alpm_dep_get_version(const pmdepend_t *dep)
  */
 char SYMEXPORT *alpm_dep_compute_string(const pmdepend_t *dep)
 {
-	char *name, *opr, *ver, *str = NULL;
+	const char *name, *opr, *ver;
+	char *str;
 	size_t len;
 
 	ALPM_LOG_FUNC;
@@ -863,7 +869,7 @@ char SYMEXPORT *alpm_dep_compute_string(const pmdepend_t *dep)
 			break;
 	}
 
-	if(dep->version) {
+	if(dep->mod != PM_DEP_MOD_ANY && dep->version) {
 		ver = dep->version;
 	} else {
 		ver = "";

lib/libalpm/deps.h

@@ -44,20 +44,14 @@ struct __pmdepmissing_t {
 
 void _alpm_dep_free(pmdepend_t *dep);
 pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep);
-pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepend_t *dep,
-		const char *causinpkg);
 void _alpm_depmiss_free(pmdepmissing_t *miss);
 alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse);
 void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit);
-pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt);
 int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg,
 		alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove,
 		alpm_list_t **data);
-int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2);
 pmdepend_t *_alpm_splitdep(const char *depstring);
-pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep);
 int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep);
-int _alpm_depcmp_tolerant(pmpkg_t *pkg, pmdepend_t *dep);
 
 #endif /* _ALPM_DEPS_H */
 

lib/libalpm/diskspace.c

@@ -112,9 +112,9 @@ static alpm_list_t *mount_point_list(void)
 		mp->mount_dir = strdup(fsp->f_mntonname);
 		mp->mount_dir_len = strlen(mp->mount_dir);
 		memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE));
-#if defined HAVE_STRUCT_STATVFS_F_FLAG
+#if defined(HAVE_GETMNTINFO_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_FLAG)
 		mp->read_only = fsp->f_flag & ST_RDONLY;
-#elif defined HAVE_STRUCT_STATFS_F_FLAGS
+#elif defined(HAVE_GETMNTINFO_STATFS) && defined(HAVE_STRUCT_STATFS_F_FLAGS)
 		mp->read_only = fsp->f_flags & MNT_RDONLY;
 #endif
 

lib/libalpm/dload.c

@@ -308,6 +308,7 @@ static int download_internal(const char *url, const char *localpath,
 		_alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
 				tempfile, destfile, strerror(errno));
 		ret = -1;
+		goto cleanup;
 	}
 	ret = 0;
 
@@ -415,11 +416,7 @@ int _alpm_download_files(alpm_list_t *files,
 	return(ret);
 }
 
-/** Fetch a remote pkg.
- * @param url URL of the package to download
- * @return the downloaded filepath on success, NULL on error
- * @addtogroup alpm_misc
- */
+/** Fetch a remote pkg. */
 char SYMEXPORT *alpm_fetch_pkgurl(const char *url)
 {
 	char *filename, *filepath;

lib/libalpm/handle.c

@@ -46,8 +46,6 @@ pmhandle_t *_alpm_handle_new()
 {
 	pmhandle_t *handle;
 
-	ALPM_LOG_FUNC;
-
 	CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
 	return(handle);
@@ -302,6 +300,8 @@ int SYMEXPORT alpm_option_set_root(const char *root)
 
 	ALPM_LOG_FUNC;
 
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+
 	if(!root) {
 		pm_errno = PM_ERR_WRONG_ARGS;
 		return(-1);
@@ -342,6 +342,7 @@ int SYMEXPORT alpm_option_set_dbpath(const char *dbpath)
 
 	ALPM_LOG_FUNC;
 
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	if(!dbpath) {
 		pm_errno = PM_ERR_WRONG_ARGS;
 		return(-1);
@@ -380,6 +381,7 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir)
 
 	ALPM_LOG_FUNC;
 
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	if(!cachedir) {
 		pm_errno = PM_ERR_WRONG_ARGS;
 		return(-1);
@@ -402,6 +404,7 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir)
 
 void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	if(handle->cachedirs) FREELIST(handle->cachedirs);
 	if(cachedirs) handle->cachedirs = cachedirs;
 }
@@ -411,6 +414,7 @@ int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir)
 	char *vdata = NULL;
 	char *newcachedir;
 	size_t cachedirlen;
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	/* verify cachedir ends in a '/' */
 	cachedirlen = strlen(cachedir);
 	if(cachedir[cachedirlen-1] != '/') {
@@ -434,6 +438,7 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
 
 	ALPM_LOG_FUNC;
 
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	if(!logfile) {
 		pm_errno = PM_ERR_WRONG_ARGS;
 		return(-1);
@@ -456,16 +461,19 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
 
 void SYMEXPORT alpm_option_set_usesyslog(int usesyslog)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	handle->usesyslog = usesyslog;
 }
 
 void SYMEXPORT alpm_option_add_noupgrade(const char *pkg)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg));
 }
 
 void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	if(handle->noupgrade) FREELIST(handle->noupgrade);
 	if(noupgrade) handle->noupgrade = noupgrade;
 }
@@ -473,6 +481,7 @@ void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade)
 int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg)
 {
 	char *vdata = NULL;
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
@@ -483,11 +492,13 @@ int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg)
 
 void SYMEXPORT alpm_option_add_noextract(const char *pkg)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	handle->noextract = alpm_list_add(handle->noextract, strdup(pkg));
 }
 
 void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	if(handle->noextract) FREELIST(handle->noextract);
 	if(noextract) handle->noextract = noextract;
 }
@@ -495,6 +506,7 @@ void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract)
 int SYMEXPORT alpm_option_remove_noextract(const char *pkg)
 {
 	char *vdata = NULL;
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
@@ -505,11 +517,13 @@ int SYMEXPORT alpm_option_remove_noextract(const char *pkg)
 
 void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg));
 }
 
 void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	if(handle->ignorepkg) FREELIST(handle->ignorepkg);
 	if(ignorepkgs) handle->ignorepkg = ignorepkgs;
 }
@@ -517,6 +531,7 @@ void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
 int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg)
 {
 	char *vdata = NULL;
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
@@ -527,11 +542,13 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg)
 
 void SYMEXPORT alpm_option_add_ignoregrp(const char *grp)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp));
 }
 
 void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	if(handle->ignoregrp) FREELIST(handle->ignoregrp);
 	if(ignoregrps) handle->ignoregrp = ignoregrps;
 }
@@ -539,6 +556,7 @@ void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
 int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp)
 {
 	char *vdata = NULL;
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	handle->ignoregrp = alpm_list_remove_str(handle->ignoregrp, grp, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
@@ -549,17 +567,20 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp)
 
 void SYMEXPORT alpm_option_set_arch(const char *arch)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	if(handle->arch) FREE(handle->arch);
 	if(arch) handle->arch = strdup(arch);
 }
 
 void SYMEXPORT alpm_option_set_usedelta(int usedelta)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	handle->usedelta = usedelta;
 }
 
 void SYMEXPORT alpm_option_set_checkspace(int checkspace)
 {
+	ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL));
 	handle->checkspace = checkspace;
 }
 

lib/libalpm/package.c

@@ -46,10 +46,7 @@
  * @{
  */
 
-/** Free a package.
- * @param pkg package pointer to free
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Free a package. */
 int SYMEXPORT alpm_pkg_free(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
@@ -64,10 +61,7 @@ int SYMEXPORT alpm_pkg_free(pmpkg_t *pkg)
 	return(0);
 }
 
-/** Check the integrity (with md5) of a package from the sync cache.
- * @param pkg package pointer
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Check the integrity (with md5) of a package from the sync cache. */
 int SYMEXPORT alpm_pkg_checkmd5sum(pmpkg_t *pkg)
 {
 	char *fpath;
@@ -123,6 +117,10 @@ static alpm_list_t *_pkg_get_deltas(pmpkg_t *pkg)     { return pkg->deltas; }
 static alpm_list_t *_pkg_get_files(pmpkg_t *pkg)      { return pkg->files; }
 static alpm_list_t *_pkg_get_backup(pmpkg_t *pkg)     { return pkg->backup; }
 
+static void *_pkg_changelog_open(pmpkg_t *pkg)        { return NULL; }
+static size_t _pkg_changelog_read(void *ptr, size_t size, const pmpkg_t *pkg, const void *fp) { return 0; }
+static int _pkg_changelog_close(const pmpkg_t *pkg, void *fp) { return EOF; }
+
 /** The standard package operations struct. Get fields directly from the
  * struct itself with no abstraction layer or any type of lazy loading.
  */
@@ -141,6 +139,7 @@ struct pkg_operations default_pkg_ops = {
 	.get_isize       = _pkg_get_isize,
 	.get_reason      = _pkg_get_reason,
 	.has_scriptlet   = _pkg_has_scriptlet,
+
 	.get_licenses    = _pkg_get_licenses,
 	.get_groups      = _pkg_get_groups,
 	.get_depends     = _pkg_get_depends,
@@ -151,6 +150,10 @@ struct pkg_operations default_pkg_ops = {
 	.get_deltas      = _pkg_get_deltas,
 	.get_files       = _pkg_get_files,
 	.get_backup      = _pkg_get_backup,
+
+	.changelog_open  = _pkg_changelog_open,
+	.changelog_read  = _pkg_changelog_read,
+	.changelog_close = _pkg_changelog_close,
 };
 
 /* Public functions for getting package information. These functions
@@ -280,30 +283,13 @@ pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg)
 	return(pkg->origin_data.db);
 }
 
-/**
- * Open a package changelog for reading. Similar to fopen in functionality,
- * except that the returned 'file stream' could really be from an archive
- * as well as from the database.
- * @param pkg the package to read the changelog of (either file or db)
- * @return a 'file stream' to the package changelog
- */
+/** Open a package changelog for reading. */
 void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg)
 {
 	return pkg->ops->changelog_open(pkg);
 }
 
-/**
- * Read data from an open changelog 'file stream'. Similar to fread in
- * functionality, this function takes a buffer and amount of data to read. If an
- * error occurs pm_errno will be set.
- *
- * @param ptr a buffer to fill with raw changelog data
- * @param size the size of the buffer
- * @param pkg the package that the changelog is being read from
- * @param fp a 'file stream' to the package changelog
- * @return the number of characters read, or 0 if there is no more data or an
- * error occurred.
- */
+/** Read data from an open changelog 'file stream'. */
 size_t SYMEXPORT alpm_pkg_changelog_read(void *ptr, size_t size,
 		const pmpkg_t *pkg, const void *fp)
 {
@@ -317,14 +303,7 @@ int SYMEXPORT alpm_pkg_changelog_feof(const pmpkg_t *pkg, void *fp)
 }
 */
 
-/**
- * Close a package changelog for reading. Similar to fclose in functionality,
- * except that the 'file stream' could really be from an archive as well as
- * from the database.
- * @param pkg the package that the changelog was read from
- * @param fp a 'file stream' to the package changelog
- * @return whether closing the package changelog stream was successful
- */
+/** Close a package changelog for reading. */
 int SYMEXPORT alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp)
 {
 	return pkg->ops->changelog_close(pkg, fp);
@@ -339,24 +318,20 @@ static void find_requiredby(pmpkg_t *pkg, pmdb_t *db, alpm_list_t **reqs)
 {
 	const alpm_list_t *i;
 	for(i = _alpm_db_get_pkgcache(db); i; i = i->next) {
-		if(!i->data) {
-			continue;
-		}
 		pmpkg_t *cachepkg = i->data;
-		if(_alpm_dep_edge(cachepkg, pkg)) {
-			const char *cachepkgname = cachepkg->name;
-			if(alpm_list_find_str(*reqs, cachepkgname) == NULL) {
-				*reqs = alpm_list_add(*reqs, strdup(cachepkgname));
+		alpm_list_t *i;
+		for(i = alpm_pkg_get_depends(cachepkg); i; i = i->next) {
+			if(_alpm_depcmp(pkg, i->data)) {
+				const char *cachepkgname = cachepkg->name;
+				if(alpm_list_find_str(*reqs, cachepkgname) == NULL) {
+					*reqs = alpm_list_add(*reqs, strdup(cachepkgname));
+				}
 			}
 		}
 	}
 }
 
-/**
- * @brief Compute the packages requiring a given package.
- * @param pkg a package
- * @return the list of packages requiring pkg
- */
+/** Compute the packages requiring a given package. */
 alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg)
 {
 	const alpm_list_t *i;
@@ -377,8 +352,8 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg)
 			for(i = handle->dbs_sync; i; i = i->next) {
 				db = i->data;
 				find_requiredby(pkg, db, &reqs);
-				reqs = alpm_list_msort(reqs, alpm_list_count(reqs), _alpm_str_cmp);
 			}
+			reqs = alpm_list_msort(reqs, alpm_list_count(reqs), _alpm_str_cmp);
 		}
 	}
 	return(reqs);

lib/libalpm/pkghash.c

@@ -84,12 +84,11 @@ pmpkghash_t *_alpm_pkghash_create(size_t size)
 static size_t get_hash_position(unsigned long name_hash, pmpkghash_t *hash)
 {
 	size_t position;
-	alpm_list_t *ptr;
 
 	position = name_hash % hash->buckets;
 
 	/* collision resolution using open addressing with linear probing */
-	while((ptr = hash->hash_table[position]) != NULL) {
+	while(hash->hash_table[position] != NULL) {
 		position = (position + 1) % hash->buckets;
 	}
 

lib/libalpm/po/LINGUAS

@@ -11,7 +11,6 @@ fr
 hu
 it
 kk
-ko
 nb
 pl
 pt

lib/libalpm/po/ca.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 11:15+0000\n"
+"Last-Translator: hseara <hseara@gmail.com>\n"
+"Language-Team: Catalan <None>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "desactualitzant paquet %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "advertència al extreure %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -151,7 +151,7 @@ msgstr "falten les metadades del paquet en %s\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "Esborrant fitxer invàlid: %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -179,31 +179,33 @@ msgstr "no es pot resoldre \"%s\", una dependència de \"%s\"\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "no s'ha pogut obtenir informació del sistema d'arxiu\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "no s'ha pogut obtenir informació  per %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "no s'ha pogut determinar el punt de muntatge per al fitxer %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "no s'ha pogut determinar els punts de muntatge del sistema d'arxius\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "no s'ha pogut determinar punt de muntatge de root %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "La partició %s està muntat només en mode lectura\n"
 
 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
 msgstr ""
+"La partició %s està molt plena: nombre de blocs requerits %ld, nombre de "
+"blocs lliures %ld\n"
 
 #, c-format
 msgid "disk"
@@ -263,7 +265,7 @@ msgstr "s'ha passat un argument erroni o NULL"
 
 #, c-format
 msgid "not enough free disk space"
-msgstr ""
+msgstr "no hi ha prou espai lliure en disc"
 
 #, c-format
 msgid "library not initialized"
@@ -299,7 +301,7 @@ msgstr "no s'ha pogut trobar la base de dades"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr ""
+msgstr "la versió de la base de dades és incorrecta"
 
 #, c-format
 msgid "could not update database"
@@ -404,7 +406,7 @@ msgstr "ha fallat en recuperar alguns fitxers"
 
 #, c-format
 msgid "failed to copy some file"
-msgstr ""
+msgstr "no s'ha aconseguit copiar algun arxiu"
 
 #, c-format
 msgid "invalid regular expression"
@@ -428,7 +430,7 @@ msgstr "error inesperat"
 
 #, c-format
 msgid "database larger than maximum size\n"
-msgstr ""
+msgstr "base de dades sobrepassa la grandaria màxima\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -498,7 +500,7 @@ msgstr "no s'ha pogut publicar la transacció\n"
 
 #, c-format
 msgid "%s database version is too old\n"
-msgstr ""
+msgstr "%s versió de la base de dades és massa vella\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
@@ -518,7 +520,7 @@ msgstr "no s'ha pogut eliminar el directori temporal %s\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "no s'ha pogut crear la canonada (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -530,7 +532,7 @@ msgstr "no s'ha pogut canviar el directori arrel (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "la crida a execve ha fallat (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -538,7 +540,7 @@ msgstr "ha fallat la crida a waitpid (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "no s'ha pogut obrir la canonada (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"

lib/libalpm/po/cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: vogo <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Czech <None>\n"

lib/libalpm/po/da.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Danish <None>\n"

lib/libalpm/po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: tlaloc <matthias@archlinux.de>\n"
 "Language-Team: German <None>\n"

lib/libalpm/po/el.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-08 16:42+0000\n"
+"Last-Translator: nous <nous@archlinux.us>\n"
 "Language-Team: Greek <None>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@@ -191,11 +191,11 @@ msgstr "αδυναμία καθορισμού σημείου προσάρτησ
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "αδυναμία καθορισμού σημείων προσάρτησης στο σύστημα αρχείων\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "αδυναμία καθορισμού ριζικού σημείου προσάρτησης %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"

lib/libalpm/po/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

lib/libalpm/po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: angvp <angvp@archlinux.org>\n"
 "Language-Team: Spanish (Castilian) <>\n"

lib/libalpm/po/fi.po

@@ -1,16 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#   <larso@gmx.com>, 2011.
+# Larso <larso@gmx.com>, 2011.
+# Jesse Jaara <jesse.jaara@gmail.com>, 2011.
+# apuasi <kaannokset.hellberg@gmail.com>, 2011.
+# Dan McGee <dpmcgee@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: Finnish <None>\n"
+"POT-Creation-Date: 2011-08-08 16:37-0500\n"
+"PO-Revision-Date: 2011-07-28 22:14+0000\n"
+"Last-Translator: Larso <larso@gmx.com>\n"
+"Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
+"team/fi/)\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,19 +24,19 @@ msgstr ""
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr ""
+msgstr "%s-%s on ajan tasalla -- ohitetaan\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr ""
+msgstr "%s-%s on ajan tasalla -- asennetaan uudelleen\n"
 
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
-msgstr ""
+msgstr "varhennetaan paketti %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "annettiin varoitus purettaessa %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -42,7 +47,7 @@ msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"kansion oikeuksissa eriavaisuuksia kohdassa %s\n"
+"kansion oikeuksissa eroavaisuuksia kohdassa %s\n"
 "tiedostojärjestelmä: %o   paketti: %o\n"
 
 #, c-format
@@ -51,11 +56,11 @@ msgstr "purku: kansiota ei ylikirjoiteta tiedostolla %s\n"
 
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr "purku: symboolinenlinkki %s ei osoita kansioon\n"
+msgstr "purku: symbolinen linkki %s ei osoita kansioon\n"
 
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
-msgstr "kohdetta %s ei voitu uudelleen kohteeksi %s (%s)\n"
+msgstr "kohdetta %s ei voitu nimetä uudelleen kohteeksi %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
@@ -63,7 +68,7 @@ msgstr "kohde %s tallennettu kohteena %s\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
-msgstr "kohdetta %s ei voitu tallentaa kohteena %s (%s)\n"
+msgstr "kohdetta %s ei voitu asentaa kohteena %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -79,7 +84,7 @@ msgstr "nykyisen kansion sijaintia ei voitu määrittää\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
+msgstr "ei voitu vaihtaa kansioon %s (%s)\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -91,31 +96,31 @@ msgstr "pakettia %s asennettaessa tapahtui virhe\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "ei voitu päivittää titokantamerkintää: %s-%s\n"
+msgstr "ei voitu päivittää tietokantamerkintää: %s-%s\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr ""
+msgstr "merkintää '%s' ei voitu lisätä välimuistiin\n"
 
 #, c-format
 msgid "removing invalid database: %s\n"
-msgstr ""
+msgstr "poistetaan virheellinen tietokanta: %s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr ""
+msgstr "virheellinen nimi tietokantamerkinnälle '%s'\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr ""
+msgstr "tietokantamerkintä '%s' on useampaan kertaan\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr ""
+msgstr "vahingoittunut tietokantamerkintä '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
-msgstr ""
+msgstr "tiedostoa %s ei voitu avata: %s\n"
 
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
@@ -127,424 +132,426 @@ msgstr ""
 
 #, c-format
 msgid "could not create directory %s: %s\n"
-msgstr ""
+msgstr "kansiota %s ei voitu luoda: %s\n"
 
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr ""
+msgstr "paketin kuvausta tiedostossa %s ei voitu jäsentää\n"
 
 #, c-format
 msgid "missing package name in %s\n"
-msgstr ""
+msgstr "paketin nimi puuttuu tiedostosta %s\n"
 
 #, c-format
 msgid "missing package version in %s\n"
-msgstr ""
+msgstr "paketin versio puuttuu tiedostosta %s\n"
 
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr ""
+msgstr "virhe luettaessa pakettia %s: %s\n"
 
 #, c-format
 msgid "missing package metadata in %s\n"
-msgstr ""
+msgstr "paketin metadata puuttuu tiedostosta %s\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "poistetaan virheellinen tiedosto: %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr ""
+msgstr "tietokannan polkua ei ole määritelty\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
-msgstr ""
+msgstr "kehäriippuvuus havaittu:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr ""
+msgstr "%s poistetaan riippuvuutensa %s jälkeen\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr ""
+msgstr "%s asennetaan ennen riippuvuuttansa %s\n"
 
 #, c-format
 msgid "ignoring package %s-%s\n"
-msgstr ""
+msgstr "ohitetaan paketti %s-%s\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr ""
+msgstr "ei voida selvittää paketin \"%s\", riippuvuutta \"%s\"\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "ei saatu tietoja tiedostojärjestelmästä\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "ei saatu tietoja tiedostojärjestelmästä %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "tiedoston %s tiedostojärjestelmän liitospistettä ei voitu selvittää\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "tiedostojärjestelmien liitospisteitä ei voitu selvittää\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "juuren %s liitospistettä ei voitu selvittää\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "Osio %s on liitetty vain lukutilassa\n"
 
 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
-msgstr ""
+msgstr "osio %s on liian täynnä: %ld lohkoa tarvitaan, %ld lohkoa vapaana\n"
 
 #, c-format
 msgid "disk"
-msgstr ""
+msgstr "levy"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr ""
+msgstr "osoite '%s' on virheellinen\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr ""
+msgstr "tiedoston '%s' nouto palvelimelta %s epäonnistui : %s\n"
 
 #, c-format
 msgid "resuming download of %s not possible; starting over\n"
-msgstr ""
+msgstr "tiedoston %s latauksen jatkaminen ei mahdollista; aloitetaan alusta\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr ""
+msgstr "virhe kirjoitettaessa tiedostoon '%s': %s\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s\n"
-msgstr ""
+msgstr "tiedoston '%s' nouto palvelimelta %s epäonnistui\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr ""
+msgstr "%s näyttää katkenneen: %jd/%jd tavua\n"
 
 #, c-format
 msgid "failed to download %s\n"
-msgstr ""
+msgstr "%s: lataus epäonnistui\n"
 
 #, c-format
 msgid "out of memory!"
-msgstr ""
+msgstr "muisti loppu!"
 
 #, c-format
 msgid "unexpected system error"
-msgstr ""
+msgstr "odottamaton järjestelmävirhe"
 
 #, c-format
 msgid "insufficient privileges"
-msgstr ""
+msgstr "riittämättömät oikeudet"
 
 #, c-format
 msgid "could not find or read file"
-msgstr ""
+msgstr "tiedostoa ei löytynyt tai voitu lukea"
 
 #, c-format
 msgid "could not find or read directory"
-msgstr ""
+msgstr "kansiota ei löytynyt tai voitu lukea"
 
 #, c-format
 msgid "wrong or NULL argument passed"
-msgstr ""
+msgstr "väärä tai NULL-parametri annettiin"
 
 #, c-format
 msgid "not enough free disk space"
-msgstr ""
+msgstr "ei tarpeeksi vapaata levytilaa"
 
 #, c-format
 msgid "library not initialized"
-msgstr ""
+msgstr "kirjastoa ei ole alustettu"
 
 #, c-format
 msgid "library already initialized"
-msgstr ""
+msgstr "kirjasto on jo alustettu"
 
 #, c-format
 msgid "unable to lock database"
-msgstr ""
+msgstr "tietokannan lukitseminen epäonnistui"
 
 #, c-format
 msgid "could not open database"
-msgstr ""
+msgstr "tietokannan avaus epäonnistui"
 
 #, c-format
 msgid "could not create database"
-msgstr ""
+msgstr "tietokannan luonti epäonnistui"
 
 #, c-format
 msgid "database not initialized"
-msgstr ""
+msgstr "tietokantaa ei ole alustettu"
 
 #, c-format
 msgid "database already registered"
-msgstr ""
+msgstr "tietokanta on jo rekisteröity"
 
 #, c-format
 msgid "could not find database"
-msgstr ""
+msgstr "tietokantaa ei löytynyt"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr ""
+msgstr "tietokannan versio on väärä"
 
 #, c-format
 msgid "could not update database"
-msgstr ""
+msgstr "tietokantaa ei voitu päivittää"
 
 #, c-format
 msgid "could not remove database entry"
-msgstr ""
+msgstr "tietokantamerkintää ei voitu poistaa"
 
 #, c-format
 msgid "invalid url for server"
-msgstr ""
+msgstr "virheellinen palvelimen osoite"
 
 #, c-format
 msgid "no servers configured for repository"
-msgstr ""
+msgstr "varastolle ei ole asetettu palvelimia"
 
 #, c-format
 msgid "transaction already initialized"
-msgstr ""
+msgstr "toimenpide on jo alustettu"
 
 #, c-format
 msgid "transaction not initialized"
-msgstr ""
+msgstr "toimenpidettä ei ole alustettu"
 
 #, c-format
 msgid "duplicate target"
-msgstr ""
+msgstr "kohde on useampaan kertaan"
 
 #, c-format
 msgid "transaction not prepared"
-msgstr ""
+msgstr "toimenpidettä ei ole valmisteltu"
 
 #, c-format
 msgid "transaction aborted"
-msgstr ""
+msgstr "toimenpide keskeytettiin"
 
 #, c-format
 msgid "operation not compatible with the transaction type"
-msgstr ""
+msgstr "operaatio ei ole yhteensopiva toimenpidetyypin kanssa"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
+msgstr "toimenpiteen suoritusyritys kun tietokanta ei ollut lukittuna"
 
 #, c-format
 msgid "could not find or read package"
-msgstr ""
+msgstr "pakettia ei löytynyt tai voitu lukea"
 
 #, c-format
 msgid "operation cancelled due to ignorepkg"
-msgstr ""
+msgstr "operaatio peruutettiin ignorepkg:n takia"
 
 #, c-format
 msgid "invalid or corrupted package"
-msgstr ""
+msgstr "paketti ei kelvollinen tai se on vahingoittunut"
 
 #, c-format
 msgid "cannot open package file"
-msgstr ""
+msgstr "pakettitiedostoa ei voitu avata"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr ""
+msgstr "paketin kaikkia tiedostoja ei voitu poistaa"
 
 #, c-format
 msgid "package filename is not valid"
-msgstr ""
+msgstr "paketin tiedostonimi ei ole kelvollinen"
 
 #, c-format
 msgid "package architecture is not valid"
-msgstr ""
+msgstr "paketin arkkitehtuuri ei ole kelvollinen"
 
 #, c-format
 msgid "could not find repository for target"
-msgstr ""
+msgstr "kohteen varastoa ei löytynyt"
 
 #, c-format
 msgid "invalid or corrupted delta"
-msgstr ""
+msgstr "delta ei kelvollinen tai vahingoittunut"
 
 #, c-format
 msgid "delta patch failed"
-msgstr ""
+msgstr "deltapaikkaus epäonnistui"
 
 #, c-format
 msgid "could not satisfy dependencies"
-msgstr ""
+msgstr "riippuvuuksia ei voitu ratkoa"
 
 #, c-format
 msgid "conflicting dependencies"
-msgstr ""
+msgstr "ristiriidassa olevia riippuvuuksia"
 
 #, c-format
 msgid "conflicting files"
-msgstr ""
+msgstr "ristiriidassa olevia tiedostoja"
 
 #, c-format
 msgid "failed to retrieve some files"
-msgstr ""
+msgstr "joidenkin tiedostojen nouto epäonnistui"
 
 #, c-format
 msgid "failed to copy some file"
-msgstr ""
+msgstr "jonkin tiedoston kopiointi epäonnistui"
 
 #, c-format
 msgid "invalid regular expression"
-msgstr ""
+msgstr "virheellinen säännöllinen lauseke"
 
 #, c-format
 msgid "libarchive error"
-msgstr ""
+msgstr "libarchive-virhe"
 
 #, c-format
 msgid "download library error"
-msgstr ""
+msgstr "latauskirjaston virhe"
 
 #, c-format
 msgid "error invoking external downloader"
-msgstr ""
+msgstr "virhe kutsuttaessa ulkoista latausohjelmaa"
 
 #, c-format
 msgid "unexpected error"
-msgstr ""
+msgstr "odottamaton virhe"
 
 #, c-format
 msgid "database larger than maximum size\n"
-msgstr ""
+msgstr "tietokanta enimmäiskokoa suurempi\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr ""
+msgstr "%s ei löytynyt tietokannasta -- ohitetaan\n"
 
 #, c-format
 msgid "removing %s from target list\n"
-msgstr ""
+msgstr "poistetaan %s kohteiden listasta\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr ""
+msgstr "tiedostoa '%s' ei voitu poistaa: %s\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr ""
+msgstr "ei voitu poistaa tietokantamerkintää %s-%s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr ""
+msgstr "merkintää '%s' ei voitu poistaa välimuistista\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr ""
+msgstr "%s: ohitetaan paketin päivitys (%s => %s)\n"
 
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr ""
+msgstr "%s: ohitetaan paketin varhennus (%s => %s)\n"
 
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
-msgstr ""
+msgstr "%s: varhennetaan versiosta %s versioon %s\n"
 
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
+msgstr "%s: paikallinen (%s) on uudempi kuin %s (%s)\n"
 
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
-msgstr ""
+msgstr "ohitetaan paketin korvaus (%s-%s => %s-%s)\n"
 
 #, c-format
 msgid "cannot replace %s by %s\n"
-msgstr ""
+msgstr "pakettia %s ei voi korvata paketilla %s\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr ""
+msgstr "ratkaisemattomia pakettiristiriitoja havaittu\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr ""
+"poistetaan '%s' kohteiden listasta, koska se on ristiriidassa paketin '%s' "
+"kanssa\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr ""
+msgstr "joidenkin tiedostojen nouto varastosta %s epäonnistui\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr ""
+msgstr "poistotoimenpidettä ei voitu suorittaa\n"
 
 #, c-format
 msgid "could not commit transaction\n"
-msgstr ""
+msgstr "toimenpidettä ei voitu suorittaa\n"
 
 #, c-format
 msgid "%s database version is too old\n"
-msgstr ""
+msgstr "tietokannan %s versio on liian vanha\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr ""
+msgstr "lukkotiedostoa %s ei voitu poistaa\n"
 
 #, c-format
 msgid "could not create temp directory\n"
-msgstr ""
+msgstr "väliaikaiskansiota ei voitu luoda\n"
 
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr ""
+msgstr "väliaikaistiedostoa ei voitu kopioida kansioon %s (%s)\n"
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr ""
+msgstr "väliaikaiskansiota %s ei voitu poistaa\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "ei voitu luoda putkea (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr ""
+msgstr "uuden prosessin käynnistys epäonnistui (%s)\n"
 
 #, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr ""
+msgstr "juurikansiota ei voitu vaihtaa (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "execv-kutsu epäonnistui (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr ""
+msgstr "waitpid-kutsu epäonnistui (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "ei voitu avata putkea (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"
-msgstr ""
+msgstr "komento päättyi virheeseen\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr ""
+msgstr "välimuistia %s ei ole olemassa, luodaan...\n"
 
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr ""
+msgstr "pakettivälimuistia ei voitu luoda, käytetään /tmp:tä sen sijasta\n"

lib/libalpm/po/fr.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 22:46+0000\n"
-"Last-Translator: shining <chantry.xavier@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-03-23 07:04+0000\n"
+"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: French <>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"

lib/libalpm/po/hu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: ngaba <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team: Hungarian <None>\n"

lib/libalpm/po/it.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: giovanni <giovanni@archlinux.org>\n"
 "Language-Team: Italian <None>\n"

lib/libalpm/po/kk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Kazakh <None>\n"

lib/libalpm/po/ko.po

@@ -1,548 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: Korean <None>\n"
-"Language: ko\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#, c-format
-msgid "%s-%s is up to date -- skipping\n"
-msgstr ""
-
-#, c-format
-msgid "%s-%s is up to date -- reinstalling\n"
-msgstr ""
-
-#, c-format
-msgid "downgrading package %s (%s => %s)\n"
-msgstr ""
-
-#, c-format
-msgid "warning given when extracting %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "could not extract %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"directory permissions differ on %s\n"
-"filesystem: %o  package: %o\n"
-msgstr ""
-
-#, c-format
-msgid "extract: not overwriting dir with file %s\n"
-msgstr ""
-
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr ""
-
-#, c-format
-msgid "could not rename %s to %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "%s saved as %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not install %s as %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "%s installed as %s\n"
-msgstr ""
-
-#, c-format
-msgid "extracting %s as %s.pacnew\n"
-msgstr ""
-
-#, c-format
-msgid "could not get current working directory\n"
-msgstr ""
-
-#, c-format
-msgid "could not change directory to %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "problem occurred while upgrading %s\n"
-msgstr ""
-
-#, c-format
-msgid "problem occurred while installing %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not update database entry %s-%s\n"
-msgstr ""
-
-#, c-format
-msgid "could not add entry '%s' in cache\n"
-msgstr ""
-
-#, c-format
-msgid "removing invalid database: %s\n"
-msgstr ""
-
-#, c-format
-msgid "invalid name for database entry '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "duplicated database entry '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "corrupted database entry '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "could not open file %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not create directory %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr ""
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr ""
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr ""
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr ""
-
-#, c-format
-msgid "removing invalid file: %s\n"
-msgstr ""
-
-#, c-format
-msgid "database path is undefined\n"
-msgstr ""
-
-#, c-format
-msgid "dependency cycle detected:\n"
-msgstr ""
-
-#, c-format
-msgid "%s will be removed after its %s dependency\n"
-msgstr ""
-
-#, c-format
-msgid "%s will be installed before its %s dependency\n"
-msgstr ""
-
-#, c-format
-msgid "ignoring package %s-%s\n"
-msgstr ""
-
-#, c-format
-msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr ""
-
-#, c-format
-msgid "could not get filesystem information\n"
-msgstr ""
-
-#, c-format
-msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not determine mount point for file %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not determine filesystem mount points\n"
-msgstr ""
-
-#, c-format
-msgid "could not determine root mount point %s\n"
-msgstr ""
-
-#, c-format
-msgid "Partition %s is mounted read only\n"
-msgstr ""
-
-#, c-format
-msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
-msgstr ""
-
-#, c-format
-msgid "disk"
-msgstr ""
-
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr ""
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr ""
-
-#, c-format
-msgid "resuming download of %s not possible; starting over\n"
-msgstr ""
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr ""
-
-#, c-format
-msgid "failed retrieving file '%s' from %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr ""
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr ""
-
-#, c-format
-msgid "out of memory!"
-msgstr ""
-
-#, c-format
-msgid "unexpected system error"
-msgstr ""
-
-#, c-format
-msgid "insufficient privileges"
-msgstr ""
-
-#, c-format
-msgid "could not find or read file"
-msgstr ""
-
-#, c-format
-msgid "could not find or read directory"
-msgstr ""
-
-#, c-format
-msgid "wrong or NULL argument passed"
-msgstr ""
-
-#, c-format
-msgid "not enough free disk space"
-msgstr ""
-
-#, c-format
-msgid "library not initialized"
-msgstr ""
-
-#, c-format
-msgid "library already initialized"
-msgstr ""
-
-#, c-format
-msgid "unable to lock database"
-msgstr ""
-
-#, c-format
-msgid "could not open database"
-msgstr ""
-
-#, c-format
-msgid "could not create database"
-msgstr ""
-
-#, c-format
-msgid "database not initialized"
-msgstr ""
-
-#, c-format
-msgid "database already registered"
-msgstr ""
-
-#, c-format
-msgid "could not find database"
-msgstr ""
-
-#, c-format
-msgid "database is incorrect version"
-msgstr ""
-
-#, c-format
-msgid "could not update database"
-msgstr ""
-
-#, c-format
-msgid "could not remove database entry"
-msgstr ""
-
-#, c-format
-msgid "invalid url for server"
-msgstr ""
-
-#, c-format
-msgid "no servers configured for repository"
-msgstr ""
-
-#, c-format
-msgid "transaction already initialized"
-msgstr ""
-
-#, c-format
-msgid "transaction not initialized"
-msgstr ""
-
-#, c-format
-msgid "duplicate target"
-msgstr ""
-
-#, c-format
-msgid "transaction not prepared"
-msgstr ""
-
-#, c-format
-msgid "transaction aborted"
-msgstr ""
-
-#, c-format
-msgid "operation not compatible with the transaction type"
-msgstr ""
-
-#, c-format
-msgid "transaction commit attempt when database is not locked"
-msgstr ""
-
-#, c-format
-msgid "could not find or read package"
-msgstr ""
-
-#, c-format
-msgid "operation cancelled due to ignorepkg"
-msgstr ""
-
-#, c-format
-msgid "invalid or corrupted package"
-msgstr ""
-
-#, c-format
-msgid "cannot open package file"
-msgstr ""
-
-#, c-format
-msgid "cannot remove all files for package"
-msgstr ""
-
-#, c-format
-msgid "package filename is not valid"
-msgstr ""
-
-#, c-format
-msgid "package architecture is not valid"
-msgstr ""
-
-#, c-format
-msgid "could not find repository for target"
-msgstr ""
-
-#, c-format
-msgid "invalid or corrupted delta"
-msgstr ""
-
-#, c-format
-msgid "delta patch failed"
-msgstr ""
-
-#, c-format
-msgid "could not satisfy dependencies"
-msgstr ""
-
-#, c-format
-msgid "conflicting dependencies"
-msgstr ""
-
-#, c-format
-msgid "conflicting files"
-msgstr ""
-
-#, c-format
-msgid "failed to retrieve some files"
-msgstr ""
-
-#, c-format
-msgid "failed to copy some file"
-msgstr ""
-
-#, c-format
-msgid "invalid regular expression"
-msgstr ""
-
-#, c-format
-msgid "libarchive error"
-msgstr ""
-
-#, c-format
-msgid "download library error"
-msgstr ""
-
-#, c-format
-msgid "error invoking external downloader"
-msgstr ""
-
-#, c-format
-msgid "unexpected error"
-msgstr ""
-
-#, c-format
-msgid "database larger than maximum size\n"
-msgstr ""
-
-#, c-format
-msgid "could not find %s in database -- skipping\n"
-msgstr ""
-
-#, c-format
-msgid "removing %s from target list\n"
-msgstr ""
-
-#, c-format
-msgid "cannot remove file '%s': %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not remove database entry %s-%s\n"
-msgstr ""
-
-#, c-format
-msgid "could not remove entry '%s' from cache\n"
-msgstr ""
-
-#, c-format
-msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr ""
-
-#, c-format
-msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr ""
-
-#, c-format
-msgid "%s: downgrading from version %s to version %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "ignoring package replacement (%s-%s => %s-%s)\n"
-msgstr ""
-
-#, c-format
-msgid "cannot replace %s by %s\n"
-msgstr ""
-
-#, c-format
-msgid "unresolvable package conflicts detected\n"
-msgstr ""
-
-#, c-format
-msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not commit removal transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not commit transaction\n"
-msgstr ""
-
-#, c-format
-msgid "%s database version is too old\n"
-msgstr ""
-
-#, c-format
-msgid "could not remove lock file %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not create temp directory\n"
-msgstr ""
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not create pipe (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "could not fork a new process (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "could not change the root directory (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "call to execv failed (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "call to waitpid failed (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "could not open pipe (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "command failed to execute correctly\n"
-msgstr ""
-
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr ""
-
-#, c-format
-msgid "couldn't create package cache, using /tmp instead\n"
-msgstr ""

lib/libalpm/po/libalpm.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 3.5.1\n"
+"Project-Id-Version: pacman 3.5.3\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-08-08 16:37-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

lib/libalpm/po/nb.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-16 00:45+0000\n"
+"Last-Translator: Jonhoo <jon@thesquareplanet.com>\n"
+"Language-Team: Norwegian Bokmål <None>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "nedgraderer pakke %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "feilmelding gitt under utpakkingen av %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -107,7 +107,7 @@ msgstr "ugyldig navn for databaseelement '%s'\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr ""
+msgstr "gjentatt databaseelement '%s'\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
@@ -151,7 +151,7 @@ msgstr "mangler metadata i %s\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "fjerner ugyldig fil: %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -179,31 +179,32 @@ msgstr "kan ikke avgjøre \"%s\", en avhengighet av \"%s\"\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "kunne ikke hente filsysteminformasjon\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "kunne ikke hente filsysteminformasjon for %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "kunne ikke avgjøre monteringspunkt for fil %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "kunne ikke avgjøre monteringspunkt for filsystem\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "kunne ikke avgjøre rotmonteringspunkt %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "Partisjonen %s er kun tilgjengelig for skriving\n"
 
 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
 msgstr ""
+"Partisjonen %s er for full: %ld blokker trengs, %ld blokker tilgjengelig\n"
 
 #, c-format
 msgid "disk"
@@ -219,7 +220,7 @@ msgstr "mottakelse av fil '%s' fra %s : %s feilet\n"
 
 #, c-format
 msgid "resuming download of %s not possible; starting over\n"
-msgstr ""
+msgstr "kan ikke fortsette nedlastingen av %s; starter på nytt\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -263,7 +264,7 @@ msgstr "feil eller NULL-argument gitt"
 
 #, c-format
 msgid "not enough free disk space"
-msgstr ""
+msgstr "ikke nok ledig diskplass"
 
 #, c-format
 msgid "library not initialized"
@@ -299,7 +300,7 @@ msgstr "kunne ikke finne database"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr ""
+msgstr "databasen har feil versjonsnummer"
 
 #, c-format
 msgid "could not update database"
@@ -371,11 +372,11 @@ msgstr "pakkens filnavn er ikke gyldig"
 
 #, c-format
 msgid "package architecture is not valid"
-msgstr ""
+msgstr "pakkearkitekturen er ikke gyldig"
 
 #, c-format
 msgid "could not find repository for target"
-msgstr ""
+msgstr "fant ikke pakkebrønn for mål"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -403,7 +404,7 @@ msgstr "mottagelsen av noen filer feilet"
 
 #, c-format
 msgid "failed to copy some file"
-msgstr ""
+msgstr "kunne ikke kopiere en fil"
 
 #, c-format
 msgid "invalid regular expression"
@@ -427,7 +428,7 @@ msgstr "uforventet feil"
 
 #, c-format
 msgid "database larger than maximum size\n"
-msgstr ""
+msgstr "databasen er større enn maksstørrelsen\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -495,7 +496,7 @@ msgstr "kunne ikke begå transaksjon\n"
 
 #, c-format
 msgid "%s database version is too old\n"
-msgstr ""
+msgstr "%s databaseversjon for gammel\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
@@ -515,7 +516,7 @@ msgstr "kunne ikke fjerne midlertidig mappe %s\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "kunne ikke opprette filter (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -527,7 +528,7 @@ msgstr "kunne ikke endre root-mappe (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "kall til execv feilet (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -535,7 +536,7 @@ msgstr "kall på waitpid feilet (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "kunne ikke opprette filter (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"

lib/libalpm/po/pl.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 20:00+0000\n"
+"Last-Translator: Barthalion <barthalion@gmail.com>\n"
+"Language-Team: Polish <None>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr "dezaktualizowanie pakietu %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "wystąpił błąd podczas rozpakowywania %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -152,7 +152,7 @@ msgstr "brak metadanych pakietu w %s\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "usuwanie nieprawidłowego pliku: %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -180,31 +180,32 @@ msgstr "nie można rozwiązać \"%s\", zależności od \"%s\"\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "nie można odczytać informacji o systemie plików\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "nie można odczytać informacji o systemie plików %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "nie można określić punktu montowania pliku %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "nie można określić punktów montowania systemu plików\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "nie można określić punktu montowania partycji systemowej %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "Partycja %s jest zamontowana tylko do odczytu\n"
 
 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
 msgstr ""
+"Partycja %s jest zapełniona: %ld potrzebnych bloków, %ld wolnych bloków\n"
 
 #, c-format
 msgid "disk"
@@ -264,7 +265,7 @@ msgstr "Dany został błędny bądź ZEROWY argument"
 
 #, c-format
 msgid "not enough free disk space"
-msgstr ""
+msgstr "niewystarczające miejsce na dysku"
 
 #, c-format
 msgid "library not initialized"
@@ -300,7 +301,7 @@ msgstr "nie udało się odnaleźć bazy danych"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr ""
+msgstr "niepoprawna wersja bazy danych"
 
 #, c-format
 msgid "could not update database"
@@ -404,7 +405,7 @@ msgstr "nie udało się odzyskać niektórych plików"
 
 #, c-format
 msgid "failed to copy some file"
-msgstr ""
+msgstr "bład kopiowania niektórych plików"
 
 #, c-format
 msgid "invalid regular expression"
@@ -429,7 +430,7 @@ msgstr "niespodziewany błąd"
 
 #, c-format
 msgid "database larger than maximum size\n"
-msgstr ""
+msgstr "baza danych jest większa, niż maksymalny rozmiar\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -497,7 +498,7 @@ msgstr "nie udało się wykonać tranzakcji\n"
 
 #, c-format
 msgid "%s database version is too old\n"
-msgstr ""
+msgstr "wersja bazy danych %s jest za stara\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
@@ -517,7 +518,7 @@ msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "nie można stworzyć potoku (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -529,7 +530,7 @@ msgstr "nie udało się zmienić katalogu głównego (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "odwołanie do execv zakończone błędem (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -537,7 +538,7 @@ msgstr "zawołanie do waitpid nieudane (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "nie można otworzyć potoku (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"

lib/libalpm/po/pt.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-16 01:24+0000\n"
+"Last-Translator: ArchGalileu <omeuviolino@gmail.com>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "a fazer downgrade do pacote %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "aviso apresentado ao extrair %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -152,7 +152,7 @@ msgstr "em falta metadados do pacote em %s\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "a remover ficheiro inválido: %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -180,31 +180,35 @@ msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "não foi possível obter informações do sistema de ficheiros\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
 msgstr ""
+"não foi possível obter informações do sistema de ficheiros para %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "Não foi possível determinar o ponto de montagem para o ficheiro %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
 msgstr ""
+"não foi possível determinar os pontos de montagem do sistema de ficheiros\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "não é possível determinar o ponto de montagem do \"root\" %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "A partição %s está montada somente para leitura\n"
 
 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
 msgstr ""
+"A partição %s está cheia: são necessários %ld blocos, estão livres %ld "
+"blocos\n"
 
 #, c-format
 msgid "disk"
@@ -264,7 +268,7 @@ msgstr "argumento comunicado está errado ou NULO"
 
 #, c-format
 msgid "not enough free disk space"
-msgstr ""
+msgstr "não há espaço livre suficiente no disco"
 
 #, c-format
 msgid "library not initialized"
@@ -300,7 +304,7 @@ msgstr "não foi possível encontrar a base de dados"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr ""
+msgstr "a versão da base de dados é incorrecta"
 
 #, c-format
 msgid "could not update database"
@@ -404,7 +408,7 @@ msgstr "falha ao descarregar alguns ficheiros"
 
 #, c-format
 msgid "failed to copy some file"
-msgstr ""
+msgstr "falhou ao copiar algum ficheiro"
 
 #, c-format
 msgid "invalid regular expression"
@@ -428,7 +432,7 @@ msgstr "erro inesperado"
 
 #, c-format
 msgid "database larger than maximum size\n"
-msgstr ""
+msgstr "a base de dados é maior que o tamanho máximo\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -496,7 +500,7 @@ msgstr "não foi possível efectuar a operação\n"
 
 #, c-format
 msgid "%s database version is too old\n"
-msgstr ""
+msgstr "%s a versão da base de dados é demasiado antiga\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
@@ -516,7 +520,7 @@ msgstr "não foi possível remover o diretório temporário %s\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "Não foi possível criar pipe (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -528,7 +532,7 @@ msgstr "não foi possível mudar o diretório raiz (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "falhou chamada para execv (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -536,7 +540,7 @@ msgstr "chamada para waitpid falhou (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "não foi possível abrir pipe (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"

lib/libalpm/po/pt_BR.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 02:29+0000\n"
+"Last-Translator: ambaratti <ambaratti.listas@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) <None>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -195,10 +195,11 @@ msgstr "não foi possível determinar o ponto de montagem para o arquivo %s\n"
 #, c-format
 msgid "could not determine filesystem mount points\n"
 msgstr ""
+"não foi possível determinar os pontos de montagem do sistema de arquivos\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "não foi possível determinar o ponto de montagem da raiz %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"

lib/libalpm/po/ro.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: wonder <ibiru@archlinux.org>\n"
 "Language-Team: Romanian <>\n"

lib/libalpm/po/ru.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-13 14:50+0000\n"
+"Last-Translator: vdk <vdk@gmx.us>\n"
 "Language-Team: Russian <None>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -194,11 +194,11 @@ msgstr "не удалось определить точку подключени
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "не удалось определить точку монтирования для файловой системы\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "не удалось определить точку монтированиия корня %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"

lib/libalpm/po/sk.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
-"PO-Revision-Date: 2011-03-22 15:34+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-17 10:09+0000\n"
+"Last-Translator: jose1711 <jose1711@gmail.com>\n"
+"Language-Team: Slovak <None>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "downgradujem balíček %s (%s => %s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "varovanie pri rozbaľovaní %s (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -151,7 +151,7 @@ msgstr "chýbaju metadáta balíčka v %s\n"
 
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "odstraňujem neplatný súbor: %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -179,31 +179,32 @@ msgstr "nie je možné vyriešiť \"%s\", závislosť \"%s\"\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "nepodarilo sa zistiť informácie o súborovom systéme\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "nepodarilo sa zistiť informácie o súborovom systém pre %s: %s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "nepodarilo sa určiť bod pripojenia pre súbor %s\n"
 
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "nepodarilo sa uričť body pripojenia pre súborový systém\n"
 
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "nepodarilo sa určiť bod pripojenia pre koreň %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "Partícia %s je pripojená iba v režime na čítanie\n"
 
 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
 msgstr ""
+"Partícia %s je príliš plná: %ld blokov potrebných, %ld blokov voľných\n"
 
 #, c-format
 msgid "disk"
@@ -263,7 +264,7 @@ msgstr "odovzdaný chybný alebo NULL argument"
 
 #, c-format
 msgid "not enough free disk space"
-msgstr ""
+msgstr "nedostatok voľného miesta na disku"
 
 #, c-format
 msgid "library not initialized"
@@ -299,7 +300,7 @@ msgstr "nemožno nájsť databázu"
 
 #, c-format
 msgid "database is incorrect version"
-msgstr ""
+msgstr "databáza má nesprávnu verziu"
 
 #, c-format
 msgid "could not update database"
@@ -403,7 +404,7 @@ msgstr "chyba pri získavaní niektorých súborov"
 
 #, c-format
 msgid "failed to copy some file"
-msgstr ""
+msgstr "nepodarilo sa skopírovať súbor"
 
 #, c-format
 msgid "invalid regular expression"
@@ -427,7 +428,7 @@ msgstr "neočakávaná chyba"
 
 #, c-format
 msgid "database larger than maximum size\n"
-msgstr ""
+msgstr "databáza väčšia ako maximálna veľkosť\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
@@ -495,7 +496,7 @@ msgstr "nie je možné uskutočniť transakciu\n"
 
 #, c-format
 msgid "%s database version is too old\n"
-msgstr ""
+msgstr "verzia databáze %s je príliš stará\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
@@ -515,7 +516,7 @@ msgstr "nie je možné odstrániť dočasný adresár %s\n"
 
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "nepodarilo sa vytvoriť rúru (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -527,7 +528,7 @@ msgstr "nie je možné zmeniť koreňový adresár (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "volanie execv zlyhalo (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -535,7 +536,7 @@ msgstr "volanie waitpid zlyhalo (%s)\n"
 
 #, c-format
 msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "nepodarilo sa otvoriť rúru (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"

lib/libalpm/po/sr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian <None>\n"

lib/libalpm/po/sr@latin.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (Latin) <None>\n"

lib/libalpm/po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

lib/libalpm/po/tr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: ras0ir <ras0ir@eventualis.org>\n"
 "Language-Team: Turkish <None>\n"

lib/libalpm/po/uk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

lib/libalpm/po/zh_CN.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: ganlu <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese (China) <None>\n"

lib/libalpm/remove.c

@@ -129,6 +129,14 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
 	}
 }
 
+/** Transaction preparation for remove actions.
+ * This functions takes a pointer to a alpm_list_t which will be
+ * filled with a list of pmdepmissing_t* objects representing
+ * the packages blocking the transaction.
+ * @param trans the transaction object
+ * @param db the database of local packages
+ * @param data a pointer to an alpm_list_t* to fill
+ */
 int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 {
 	alpm_list_t *lp;
@@ -258,7 +266,7 @@ static void unlink_file(pmpkg_t *info, char *filename, alpm_list_t *skip_remove,
 				FREE(pkghash);
 			} else {
 				char *filehash = alpm_compute_md5sum(file);
-				int cmp = strcmp(filehash,pkghash);
+				int cmp = filehash ? strcmp(filehash, pkghash) : 0;
 				FREE(filehash);
 				FREE(pkghash);
 				if(cmp != 0) {

lib/libalpm/trans.c

@@ -58,6 +58,8 @@ static int make_lock(pmhandle_t *handle)
 	int fd;
 	char *dir, *ptr;
 
+	ASSERT(handle->lockfile != NULL, return -1);
+
 	/* create the dir of the lockfile first */
 	dir = strdup(handle->lockfile);
 	ptr = strrchr(dir, '/');
@@ -97,13 +99,7 @@ static int remove_lock(pmhandle_t *handle)
 	return(0);
 }
 
-/** Initialize the transaction.
- * @param flags flags of the transaction (like nodeps, etc)
- * @param event event callback function pointer
- * @param conv question callback function pointer
- * @param progress progress callback function pointer
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Initialize the transaction. */
 int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
 		alpm_trans_cb_event event, alpm_trans_cb_conv conv,
 		alpm_trans_cb_progress progress)
@@ -116,7 +112,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
 
 	/* Sanity checks */
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-
 	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
 
 	/* lock db */
@@ -126,15 +121,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
 		}
 	}
 
-	/* check database version */
-	db_version = _alpm_db_version(handle->db_local);
-	if(db_version < required_db_version) {
-		_alpm_log(PM_LOG_ERROR,
-				_("%s database version is too old\n"), handle->db_local->treename);
-		remove_lock(handle);
-		RET_ERR(PM_ERR_DB_VERSION, -1);
-	}
-
 	trans = _alpm_trans_new();
 	if(trans == NULL) {
 		RET_ERR(PM_ERR_MEMORY, -1);
@@ -148,6 +134,16 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
 
 	handle->trans = trans;
 
+	/* check database version */
+	db_version = _alpm_db_version(handle->db_local);
+	if(db_version < required_db_version) {
+		_alpm_log(PM_LOG_ERROR,
+				_("%s database version is too old\n"), handle->db_local->treename);
+		remove_lock(handle);
+		_alpm_trans_free(trans);
+		RET_ERR(PM_ERR_DB_VERSION, -1);
+	}
+
 	return(0);
 }
 
@@ -176,11 +172,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs)
 	return(invalid);
 }
 
-/** Prepare a transaction.
- * @param data the address of an alpm_list where detailed description
- * of an error can be dumped (ie. list of conflicting files)
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Prepare a transaction. */
 int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
 {
 	pmtrans_t *trans;
@@ -226,11 +218,7 @@ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
 	return(0);
 }
 
-/** Commit a transaction.
- * @param data the address of an alpm_list where detailed description
- * of an error can be dumped (ie. list of conflicting files)
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Commit a transaction. */
 int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
 {
 	pmtrans_t *trans;
@@ -271,9 +259,7 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
 	return(0);
 }
 
-/** Interrupt a transaction.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Interrupt a transaction. */
 int SYMEXPORT alpm_trans_interrupt(void)
 {
 	pmtrans_t *trans;
@@ -293,9 +279,7 @@ int SYMEXPORT alpm_trans_interrupt(void)
 	return(0);
 }
 
-/** Release a transaction.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
+/** Release a transaction. */
 int SYMEXPORT alpm_trans_release(void)
 {
 	pmtrans_t *trans;
@@ -465,8 +449,8 @@ cleanup:
 int SYMEXPORT alpm_trans_get_flags()
 {
 	/* Sanity checks */
-	ASSERT(handle != NULL, return(-1));
-	ASSERT(handle->trans != NULL, return(-1));
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
 
 	return handle->trans->flags;
 }

lib/libalpm/util.c

@@ -34,6 +34,7 @@
 #include <time.h>
 #include <syslog.h>
 #include <errno.h>
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>

lib/libalpm/util.h

@@ -57,6 +57,10 @@
 
 #define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
 
+#define RET_ERR_VOID(err) do { pm_errno = (err); \
+	_alpm_log(PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerrorlast()); \
+	return; } while(0)
+
 #define RET_ERR(err, ret) do { pm_errno = (err); \
 	_alpm_log(PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerrorlast()); \
 	return(ret); } while(0)

po/LINGUAS

@@ -11,7 +11,6 @@ fr
 hu
 it
 kk
-ko
 nb
 pl
 pt

po/ca.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 10:54+0000\n"
+"Last-Translator: hseara <hseara@gmail.com>\n"
+"Language-Team: Catalan <None>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr ":: Recuperant paquets des de %s...\n"
 
 #, c-format
 msgid "checking available disk space...\n"
-msgstr ""
+msgstr "comprovant l'espai disponible al disc ...\n"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
@@ -101,17 +101,21 @@ msgid_plural ""
 ":: The following packages cannot be upgraded due to unresolvable "
 "dependencies:\n"
 msgstr[0] ""
+":: El següent paquet no es pot actualitzar a causa de dependències sense "
+"resolució:\n"
 msgstr[1] ""
+":: Els següents paquets no es pot actualitzar a causa de dependències sense "
+"resolució:\n"
 
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vols saltar aquest paquet en aquesta actualització?"
+msgstr[1] "Vols saltar aquests paquets en aquesta actualització?"
 
 #, c-format
 msgid ":: There are %d providers available for %s:\n"
-msgstr ""
+msgstr ":: Hi ha %d proveïdors disponibles per %s:\n"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
@@ -139,11 +143,11 @@ msgstr "s'estan comprovant els conflictes amb fitxers"
 
 #, c-format
 msgid "checking available disk space"
-msgstr ""
+msgstr "comprovant l'espai disponible al disc"
 
 #, c-format
 msgid "checking package integrity"
-msgstr ""
+msgstr "comprovant la integritat del paquet"
 
 #, c-format
 msgid "downloading %s...\n"
@@ -159,19 +163,21 @@ msgstr "no s'ha especificat cap objectiu (useu -h per ajuda)\n"
 
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
+msgstr "cap motiu d'instal·lació especificat (empra -h per ajuda)\n"
 
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
+msgstr "no s'ha pogut establir el motiu d'instal·lació del paquet %s (%s)\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
 msgstr ""
+"%s: el motiu d'instal·lació s'ha fixat a \"instal.lat com a dependència\"\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
 msgstr ""
+"%s: el motiu d'instal·lació s'ha fixat a ' instal·lat explicitament \"\n"
 
 #, c-format
 msgid "Explicitly installed"
@@ -340,25 +346,20 @@ msgstr ""
 "  -c, --cascade        elimina paquets i tots els paques que depenen d'ells\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         elimina també els fitxers de configuració\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         esborra arxius de configuració\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      elimina també les dependències (que no trenquen "
-"paquets)\n"
-"                       (-ss inclou també les dependències instal·lades "
-"explícitament)\n"
+"  -s, --recursive      esborra dependències innecessàries\n"
+"                       (-ss inclou dependències installades explícitament)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       elimina els paquets innecessaris (que no trenquen "
-"paquets)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       esborra paquets innecessaris\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -533,13 +534,20 @@ msgstr ""
 "d'un alhora)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         salta la comprovació de dependències\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         ometre comprovacions de versions de les dependències "
+"(-dd per ometre totes les comprovacions)\n"
 
 #, c-format
 msgid ""
 "  -k, --dbonly         only modify database entries, not package files\n"
 msgstr ""
+"  -k, --dbonly         modifica entrades del paquet a la base de dades, però "
+"no fitxers\n"
+"\n"
 
 #, c-format
 msgid ""
@@ -555,10 +563,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          només imprimeix els objectius enlloc de realitzar "
+"      --print          imprimir el objectius in comptes d'executar "
 "l'operació\n"
 
 #, c-format
@@ -645,7 +653,7 @@ msgstr "només es pot usar una operació alhora\n"
 
 #, c-format
 msgid "invalid option\n"
-msgstr ""
+msgstr "opció no vàlida\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -653,7 +661,7 @@ msgstr "valor invàlid per «CleanMethod» : «%s»\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr ""
+msgstr "no s'ha pogut obtenir l'actual directori de treball\n"
 
 #, c-format
 msgid "could not chdir to download directory %s\n"
@@ -665,12 +673,14 @@ msgstr "execució XferCommand: ha fallat la bifurcació!\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
+msgstr "no s'ha pogut canviar el directori a %s (%s)\n"
 
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""
+"fitxer de configuració %s, línia %d: directiva '%s' en la secció '%s' no "
+"reconeguda.\n"
 
 #, c-format
 msgid ""
@@ -712,6 +722,7 @@ msgstr ""
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
+"fitxer de configuració %s, línia %d: directiva '%s' necessita un valor\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -720,10 +731,11 @@ msgstr "ha fallat en iniciar la llibreria alpm (%s)\n"
 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
 msgstr ""
+"desbordament de memòria detectat en l'anàlisi i interpolació dels arguments\n"
 
 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
-msgstr ""
+msgstr "Errada al reobrir stdin per a la lectura: (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
@@ -733,6 +745,10 @@ msgstr "no podeu realitzar aquesta operació si no sou root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "no s'ha especificat cap operació (useu -h per ajuda)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s pertany a %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "no s'ha especificat cap fitxer per --owns\n"
@@ -747,7 +763,7 @@ msgstr "ha fallat en llegir el fitxer «%s»: %s\n"
 
 #, c-format
 msgid "cannot determine ownership of directory '%s'\n"
-msgstr ""
+msgstr "no s'ha pogut determinar la propietat del directori '%s'\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
@@ -755,11 +771,7 @@ msgstr "no es pot determinar la ruta real per «%s»: %s\n"
 
 #, c-format
 msgid "path too long: %s%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s pertany a %s %s\n"
+msgstr "ruta d'accés massa llarga:%s%s\n"
 
 #, c-format
 msgid "No package owns %s\n"
@@ -772,14 +784,14 @@ msgstr "no s'ha trobat el grup \"%s\"\n"
 #, c-format
 msgid "%s: %d total file, "
 msgid_plural "%s: %d total files, "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s: %d fitxer en total, "
+msgstr[1] "%s: %d fitxers en total, "
 
 #, c-format
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Falta %d fitxer\n"
+msgstr[1] "Falten %d fitxers\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -827,7 +839,7 @@ msgstr "no es pot accedit al directori de la base de dades\n"
 
 #, c-format
 msgid "could not remove %s\n"
-msgstr ""
+msgstr "no s'ha pogut esborrar %s\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
@@ -851,19 +863,19 @@ msgstr "Directori de memòria cau: %s\n"
 
 #, c-format
 msgid "Packages to keep:\n"
-msgstr ""
+msgstr "Paquets a conservar:\n"
 
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
+msgstr "  Tots els paquets instal·lats localment\n"
 
 #, c-format
 msgid "  All current sync database packages\n"
-msgstr ""
+msgstr "  Tots els paquets de base de dades a sincronitzar\n"
 
 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr ""
+msgstr "Vols eliminar tots els altres paquets de la memòria cau?"
 
 #, c-format
 msgid "removing old packages from cache...\n"
@@ -923,15 +935,15 @@ msgstr "s'ometrà l'objectiu: %s\n"
 
 #, c-format
 msgid "target not found: %s\n"
-msgstr ""
+msgstr "objectiu que no es troba: %s\n"
 
 #, c-format
 msgid ":: There are %d members in group %s:\n"
-msgstr ""
+msgstr ":: Hi ha %d membres en el grup %s:\n"
 
 #, c-format
 msgid "database not found: %s\n"
-msgstr ""
+msgstr "base de dades no trobada: %s\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
@@ -999,7 +1011,7 @@ msgstr ""
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "  proveu d'executar pacman-db-upgrade\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -1039,23 +1051,23 @@ msgstr "Dependències opcionals per %s\n"
 
 #, c-format
 msgid "Repository %s\n"
-msgstr ""
+msgstr "Programari %s\n"
 
 #, c-format
 msgid "Invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "valor no vàlid: %d no està entre %d i %d\n"
 
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "nombre no vàlid: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
-msgstr ""
+msgstr "Introduïu una selecció (per defecte=all)"
 
 #, c-format
 msgid "Enter a number (default=%d)"
-msgstr ""
+msgstr "Introduïu un número (per defecte =%d)"
 
 #, c-format
 msgid "[Y/n]"
@@ -1083,7 +1095,7 @@ msgstr "NO"
 
 #, c-format
 msgid "failed to allocate string\n"
-msgstr ""
+msgstr "No s'ha pogut assignar memòria a la cadena de caràcters\n"
 
 #, c-format
 msgid "error: %s"
@@ -1194,7 +1206,7 @@ msgid "Failed to extract %s"
 msgstr "Ha fallat en extreure %s"
 
 msgid "A failure occurred in %s()."
-msgstr ""
+msgstr "S'ha produït un error en %s()."
 
 msgid "Starting %s()..."
 msgstr "Iniciant %s()..."
@@ -1232,7 +1244,7 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Exemple per programari amb llicència GPL: license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
-msgstr ""
+msgstr "Entrada arxiu de còpia de seguretat no present al paquet: %s"
 
 msgid "Package contains reference to %s"
 msgstr "El paquet conté referències a %s"
@@ -1244,7 +1256,7 @@ msgid "Creating package..."
 msgstr "S'està creant el paquet..."
 
 msgid "Adding %s file..."
-msgstr ""
+msgstr "Afegint fitxer %s..."
 
 msgid "Compressing package..."
 msgstr "S'està comprimint el paquet..."
@@ -1277,7 +1289,7 @@ msgid "Failed to create source package file."
 msgstr "Ha fallat en crear el fitxer de paquet de codi font."
 
 msgid "Failed to create symlink to source package file."
-msgstr ""
+msgstr "No s'ha pogut crear l'enllaç simbòlic a l'arxiu font del paquet."
 
 msgid "Installing package %s with %s -U..."
 msgstr "S'està instal·lant el paquet %s amb %s -U... "
@@ -1295,13 +1307,13 @@ msgid "%s is not allowed to start with a hyphen."
 msgstr "%s no pot començar amb un guionet."
 
 msgid "%s is not allowed to contain colons or hyphens."
-msgstr ""
+msgstr "%s no pot contenir dos punts o guions."
 
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s no pot contenir guionets."
 
 msgid "%s must be an integer."
-msgstr ""
+msgstr "%s ha de ser un nombre enter."
 
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s no és disponible per l'arquitectura «%s»."
@@ -1318,6 +1330,7 @@ msgstr ""
 
 msgid "Backup entry should not contain leading slash : %s"
 msgstr ""
+"Entrada arxiu de còpia de seguretat no pot contenir barra inclinada: %s"
 
 msgid "Invalid syntax for optdepend : '%s'"
 msgstr "Sintaxi invàlida per optdepend : «%s»"
@@ -1335,7 +1348,7 @@ msgid "requested package %s is not provided in %s"
 msgstr "el paquet sol·licitat %s no és proporcionat a %s"
 
 msgid "Determining latest %s revision..."
-msgstr ""
+msgstr "Determinant la darrera revisió %s..."
 
 msgid "Version found: %s"
 msgstr "S'ha trobat la versió: %s"
@@ -1425,7 +1438,7 @@ msgid "  --asroot         Allow makepkg to run as root user"
 msgstr "  --asroot     Permet a makepkg executar-se com a usuari root"
 
 msgid "  --check          Run the check() function in the %s"
-msgstr ""
+msgstr "  --check          Executa la funció check() en %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
@@ -1434,9 +1447,11 @@ msgstr ""
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
+"  --holdver        Prevé increment automàtic de la versió en el "
+"desenvolupament %ss"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr ""
+msgstr "  --nocheck        No execució de la funció check() en %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr ""
@@ -1471,6 +1486,10 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nAquest es "
+"un programa lliure; consulteu el codi font per a les condicions de còpia."
+"\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
 
 msgid "%s not found."
 msgstr "no s'ha trobat %s"
@@ -1591,10 +1610,10 @@ msgid "Skipping dependency checks."
 msgstr "S'està ometent la comprovació de les dependències."
 
 msgid "Checking runtime dependencies..."
-msgstr ""
+msgstr "Comprovant les dependències en temps d'execució ..."
 
 msgid "Checking buildtime dependencies..."
-msgstr ""
+msgstr "Comprovant de dependències per l'assemblatge ..."
 
 msgid "Could not resolve all dependencies."
 msgstr "No es poden resoldre totes les dependències."
@@ -1641,12 +1660,18 @@ msgid ""
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nAquest es un programa lliure; consulteu el codi font per a les condicions "
+"de còpia.\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s no existeix o no és un directori."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s no és un directori de la base de dades de pacman."
+
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
+msgstr "Has de corregir els permisos per actualitzar la base de dades."
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr ""
@@ -1654,10 +1679,10 @@ msgstr ""
 "pacman és en execució."
 
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
+msgstr "Format base de dades Pre-3.5 detectat - actualitzant..."
 
 msgid "Done."
-msgstr ""
+msgstr "Fet."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -1725,51 +1750,57 @@ msgid "Finished. Your pacman database has been optimized."
 msgstr "Ha finalitzat. S'ha optimitzat la base de dades del pacman."
 
 msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr ""
+msgstr "Ús: pkgdelta [q] <package1><package2>\\n"
 
 msgid ""
 "\tpkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n\\n"
 msgstr ""
+"»pkgdelta crearà un fitxer delta file entre dos paquets.\\n Aquest fitxer "
+"delta pot ser afegit a la base de dades mitjançant repo-add.\\n\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
-msgstr ""
+msgstr "Exemple:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nAquest es un "
+"programa lliure; consulteu el codi font per a les condicions de còpia.\\nNO "
+"hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Fitxer de paquet invàlid «%s»..."
 
 msgid "The package names don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Els noms dels paquets no coincideixen: '%s' i '%s'"
 
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Les arquitectures del paquet no coincideixen: '%s' i '%s'"
 
 msgid "Both packages have the same version : '%s'"
-msgstr ""
+msgstr "Tots dos paquets tenen la mateixa versió: '%s'"
 
 msgid "Generating delta from version %s to version %s"
-msgstr ""
+msgstr "Generant delta de la versió %s a la versió %s"
 
 msgid "Delta could not be created."
-msgstr ""
+msgstr "No s'ha pogut generar delta."
 
 msgid "Generated delta : '%s'"
-msgstr ""
+msgstr "Delta generada: '%s'"
 
 msgid "File '%s' does not exist"
-msgstr ""
+msgstr "L'arxiu '%s' no existeix"
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "No es pot trobar el binari xdelta3! Està instal·lat xdelta3?"
 
 msgid "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
 msgstr ""
+"Ús: reposició afegeix [-d] [-f] [-q] <path-to-db><package|delta> ...\\n"
 
 msgid "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
 msgstr "Sintaxi: repo-remove [-q] <ruta-a-la-bd> <nomdepaquet|delta> ...\\n\\n"
@@ -1796,16 +1827,23 @@ msgid ""
 "Use the -q/--quiet flag to minimize output to basic messages, warnings,"
 "\\nand errors.\\n\\n"
 msgstr ""
+"Utilitzeu l'indicador -q/--quiet per reduir al mínim la producció de "
+"missatges,\\n advertències, i errors. \\n\\n"
 
 msgid ""
 "Use the -d/--delta flag to automatically generate and add a delta file"
 "\\nbetween the old entry and the new one, if the old package file is found"
 "\\nnext to the new one.\\n\\n"
 msgstr ""
+"Utilitzeu l'indicador -d/--delta per generar i afegir de forma automàtica\\n "
+"un arxiu delta entre la nova entrada i l'antiga, si l'antic fitxer del "
+"paquet es troba\\n al costat del nou. \\n\\n"
 
 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
 msgstr ""
+"Utilitzeu l'indicador -f/--files per actualitzar una base de dades "
+"conjuntament amb les entrades d'arxiu. \\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "Exemple:  repo-add /ruta/a/repo.bd.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1825,10 +1863,10 @@ msgstr ""
 "GARANTIA ampliada a la permesa per la llei.\\n"
 
 msgid "No database entry for package '%s'."
-msgstr ""
+msgstr "No existeix cap base de dades amb entrades referents al paquet '%s'."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr ""
+msgstr "Afegint entrada 'deltas':%s -> %s"
 
 msgid "Removing existing entry '%s'..."
 msgstr "S'està eliminant l'entrada existent «%s»..."
@@ -1837,13 +1875,13 @@ msgid "An entry for '%s' already existed"
 msgstr "Ja existeix una entrada per «%s»"
 
 msgid "Creating '%s' db entry..."
-msgstr ""
+msgstr "Creant entrada base de dades '%s'..."
 
 msgid "Computing md5 checksums..."
 msgstr "S'estan computant les sumes de comprovació md5"
 
 msgid "Old package file not found: %s"
-msgstr ""
+msgstr "Antic arxiu del paquet no trobat: %s"
 
 msgid "Failed to acquire lockfile: %s."
 msgstr "Ha fallat en adquirir el fitxer de bloqueig: %s."

po/cs.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-16 05:54+0000\n"
 "Last-Translator: vogo <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Czech <None>\n"
 "Language: cs\n"
@@ -348,24 +348,20 @@ msgstr ""
 "  -c, --cascade        odstranit balíčky včetně všech, které na nich závisí\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         odstranit i konfigurační soubory\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         odstraní konfigurační soubory\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      odstranit závislosti (které nepoškodí jiné balíčky)\n"
-"                       (--ss odstraní také výslovně nainstalované "
-"závislosti)\n"
+"  -s, --recursive      odstraní nepotřebné závislosti\n"
+"                       (-ss včetně výslovně nainstalovaných závislostí)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       odstranit nepotřebné balíčky\n"
-"                       (které nepoškodí jiné balíčky)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       odstraní nepotřebné závislosti\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -529,8 +525,12 @@ msgstr ""
 "                       ignorovat aktualizaci skupiny (lze použít vícekrát)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         přeskočit kontrolu závislostí\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         přeskočí kontrolu verze závislostí\n"
+"                       (-dd přeskočí všechny kontroly)\n"
 
 #, c-format
 msgid ""
@@ -551,9 +551,9 @@ msgstr "      --noscriptlet    nespouštět instalační skripty\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr "      --print          vypsat cíle místo spuštění operace\n"
+msgstr "      --print          vypíše cíle místo spuštění operace\n"
 
 #, c-format
 msgid ""
@@ -723,6 +723,10 @@ msgstr "operaci nelze provést, pokud nejste root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nebyla specifikována operace (použijte -h pro nápovědu)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s vlastní %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nebyl určen soubor pro --owns\n"
@@ -747,10 +751,6 @@ msgstr "nelze určit skutečnou cestu pro '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr "cesta je příliš dlouhá: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s vlastní %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Žádný balíček nevlastní %s\n"
@@ -1620,6 +1620,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s neexistuje, nebo není adresář."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s není adresář databáze pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Musíte mít správná oprávnění k aktualizaci databáze."
 

po/da.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-03-28 02:39+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Danish <None>\n"
 "Language: da\n"
@@ -341,24 +341,18 @@ msgstr ""
 "  -c, --cascade        fjern pakker og alle pakker som afhænger af dem\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         fjern også konfigurationsfiler\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr ""
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      fjern også afhængigheder (som ikke ødelægger pakker)\n"
-"                       (-ss inkluderer også eksplicit installerede "
-"afhængigheder)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
-"  -u, --unneeded       fjern pakker der ikke er behov for (som ikke "
-"ødelægger pakker)\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -524,8 +518,10 @@ msgstr ""
 "gang)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         spring afhængighedstjek over\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -545,10 +541,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          vis kun mål frem for at udføre selve handlingen\n"
 
 #, c-format
 msgid ""
@@ -715,6 +710,10 @@ msgstr ""
 msgid "no operation specified (use -h for help)\n"
 msgstr "ingen handling angivet (brug -h for hjælp)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s er ejet af %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "ingen fil var angivet for -owns\n"
@@ -739,10 +738,6 @@ msgstr "kan ikke bestemme reel sti for »%s«: %s\n"
 msgid "path too long: %s%s\n"
 msgstr ""
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s er ejet af %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Ingen pakke ejer %s\n"
@@ -1615,6 +1610,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s findes ikke elelr er ikke en mappe."
 
+msgid "%s is not a pacman database directory."
+msgstr ""
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 

po/de.po

@@ -1,16 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# Mineo <themineo+transifex@googlemail.com>, 2011.
+# Simon Schneider <SPAM.schneida@gmail.com>, 2011.
+# Matthias Gorissen <matthias@archlinux.de>, 2011.
+# Dan McGee <dpmcgee@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: tlaloc <matthias@archlinux.de>\n"
-"Language-Team: German <None>\n"
+"POT-Creation-Date: 2011-08-08 16:32-0500\n"
+"PO-Revision-Date: 2011-06-30 08:35+0000\n"
+"Last-Translator: jakob <jakob.matthes@gmail.com>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
+"team/de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +35,7 @@ msgstr "Löse Abhängigkeiten auf...\n"
 
 #, c-format
 msgid "looking for inter-conflicts...\n"
-msgstr "Suche nach Zwischen-Konflikten...\n"
+msgstr "Suche nach Zwischenkonflikten...\n"
 
 #, c-format
 msgid "installing %s...\n"
@@ -179,7 +183,7 @@ msgstr ""
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
 msgstr ""
-"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt?\n"
+"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt\n"
 
 #, c-format
 msgid "Explicitly installed"
@@ -349,25 +353,22 @@ msgstr ""
 "  -c, --cascade        Entfernt Pakete und alle, die von ihnen abhängen\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         Auch Konfigurationsdateien entfernen\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         auch Konfigurationsdateien entfernen\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      Auch Abhängigkeiten entfernen (beschädigt keine "
-"Pakete)\n"
-"                       (-ss schließt auch ausdrücklich installierte "
-"Abhängigkeiten mit ein)\n"
+"  -s, --recursive      entfernt unnötige Abhängigkeiten\n"
+"                       (-ss auch explizit installierte Abhängigkeiten "
+"entfernen)\n"
+"\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded      Entferne nicht benötigte Pakete (beschädigt keine "
-"Pakete)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       entfernt unnötige Pakete\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -541,8 +542,12 @@ msgstr ""
 "werden)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         Überspringt die Abhängigkeitsprüfung\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         überspringt die Versionsüberprüfungen für "
+"Abhängigkeiten (-dd um alle Überprüfungen zu überspringen)\n"
 
 #, c-format
 msgid ""
@@ -566,7 +571,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
 "      --print          gibt nur die Zeile aus, statt die Operation "
@@ -743,6 +748,10 @@ msgstr "Sie benötigen Root-Rechte, um diese Operation auszuführen.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "Keine Operation angegeben (benutzen Sie -h für Hilfe)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s ist in %s %s enthalten\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "Es wurde keine Datei für --owns angegeben\n"
@@ -767,10 +776,6 @@ msgstr "Kann den wahren Pfad für '%s' nicht ermitteln: %s\n"
 msgid "path too long: %s%s\n"
 msgstr "Pfad zu lang: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s ist in %s %s enthalten\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Kein Paket besitzt %s\n"
@@ -789,7 +794,7 @@ msgstr[1] "%s: %d gesamte Dateien,"
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
 msgstr[0] "%d fehlende Datei\n"
-msgstr[1] "%d fehlende Datein\n"
+msgstr[1] "%d fehlende Dateien\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -831,7 +836,7 @@ msgstr "Möchten Sie diese Pakete entfernen?"
 
 #, c-format
 msgid "failed to commit transaction (%s)\n"
-msgstr "Konnte den Vorgang (%s) nicht durchführen\n"
+msgstr "Konnte den Vorgang nicht durchführen (%s)\n"
 
 #, c-format
 msgid "could not access database directory\n"
@@ -999,7 +1004,7 @@ msgstr ""
 
 #, c-format
 msgid "failed to init transaction (%s)\n"
-msgstr "Konnte den Vorgang (%s) nicht starten\n"
+msgstr "Konnte den Vorgang nicht starten (%s)\n"
 
 #, c-format
 msgid ""
@@ -1015,7 +1020,7 @@ msgstr "  Vesuche, pacman-db-upgrade zu starten\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
-msgstr "Konnte den Vorgang (%s) nicht freigeben\n"
+msgstr "Konnte den Vorgang nicht freigeben (%s)\n"
 
 #, c-format
 msgid "None"
@@ -1207,7 +1212,7 @@ msgid "Failed to extract %s"
 msgstr "Konnte %s nicht entpacken"
 
 msgid "A failure occurred in %s()."
-msgstr "Ein Unfall geschah in %s()."
+msgstr "Ein Fehler geschah in %s()."
 
 msgid "Starting %s()..."
 msgstr "Beginne %s()..."
@@ -1327,7 +1332,7 @@ msgstr "so wie arch=('%s')"
 
 msgid "Provides array cannot contain comparison (< or >) operators."
 msgstr ""
-"Der Array 'Provides' darf keine Vergleichs-Operatoren wie (< oder >) "
+"Der Array 'provides' darf keine Vergleichs-Operatoren wie (< oder >) "
 "enthalten."
 
 msgid "Backup entry should not contain leading slash : %s"
@@ -1359,7 +1364,7 @@ msgid "requires an argument"
 msgstr "erfordert ein Argument"
 
 msgid "unrecognized option"
-msgstr "nicht-erkannte Option"
+msgstr "nicht erkannte Option"
 
 msgid "invalid option"
 msgstr "ungültige Option"
@@ -1447,7 +1452,7 @@ msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
 "  --holdver        Verhindert die automatische Erhöhung der Versionsnummer "
-"für die Entwickler-Vesrion %ss"
+"für die Entwickler-Version %ss"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
 msgstr "  --nocheck       Unterdrückt die check()-Funktion in %s"
@@ -1586,7 +1591,7 @@ msgid "A package has already been built, installing existing package..."
 msgstr "Es wurde bereits ein Paket gebaut, installiere existierendes Paket..."
 
 msgid "A package has already been built. (use -f to overwrite)"
-msgstr "Es wurde bereits ein Paket gebaut. (Benutzen Sie -f zum überschreiben)"
+msgstr "Es wurde bereits ein Paket gebaut. (Benutzen Sie -f zum Überschreiben)"
 
 msgid ""
 "The package group has already been built, installing existing packages..."
@@ -1618,7 +1623,7 @@ msgstr "Erstelle Paket: %s"
 
 msgid "A source package has already been built. (use -f to overwrite)"
 msgstr ""
-"Es wurde bereits ein Quell-Paket gebaut. (Benutzen Sie -f zum überschreiben)"
+"Es wurde bereits ein Quell-Paket gebaut. (Benutzen Sie -f zum Überschreiben)"
 
 msgid "Source package created: %s"
 msgstr "Quell-Paket erstellt: %s"
@@ -1683,14 +1688,16 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s existiert nicht oder ist kein Verzeichnis"
 
+msgid "%s is not a pacman database directory."
+msgstr "%s ist kein Pacman Datenbank Verzeichnis."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 "Sie müssen über die korrekten Berechtigungen verfügen, um die Datenbank zu "
 "aktualisieren."
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft."
+msgstr "Pacman Lock-Datei gefunden. Kann nicht arbeiten, während Pacman läuft."
 
 msgid "Pre-3.5 database format detected - upgrading..."
 msgstr "Prä-3.5 Datenbankformat entdeckt - aktualisiere..."
@@ -1743,7 +1750,7 @@ msgid "Tar'ing up %s failed."
 msgstr "Erstellen des Tarballs %s fehlgeschlagen."
 
 msgid "Making and MD5sum'ing the new database..."
-msgstr "Erstelle neue Datenbak und prüfe MD5-Summen..."
+msgstr "Erstelle neue Datenbank und prüfe MD5-Summen..."
 
 msgid "Untar'ing %s failed."
 msgstr "Entpacken des Tarballs %s fehlgeschlagen."
@@ -1892,13 +1899,13 @@ msgid "Creating '%s' db entry..."
 msgstr "Erstelle '%s' Datenbank-Eintrag"
 
 msgid "Computing md5 checksums..."
-msgstr "Errechne md5-Prüfsummen..."
+msgstr "Errechne MD5-Prüfsummen..."
 
 msgid "Old package file not found: %s"
 msgstr "Alte Paket-Datei nicht gefunden: %s"
 
 msgid "Failed to acquire lockfile: %s."
-msgstr "Konnte die Lock-Datei nicht erreichen: %s."
+msgstr "Konnte die Lock-Datei nicht beanspruchen: %s."
 
 msgid "Held by process %s"
 msgstr "Gehalten vom Prozess %s"
@@ -1907,7 +1914,7 @@ msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Repositorien-Datei '%s' ist keine korrekte pacman-Datenbank."
 
 msgid "Extracting database to a temporary location..."
-msgstr "Entpacke Datenbasis an einen temporären Ort..."
+msgstr "Entpacke Datenbank an einen temporären Ort..."
 
 msgid "Repository file '%s' was not found."
 msgstr "Repositorium \"%s\" wurde nicht gefunden."

po/el.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-08 19:22+0000\n"
+"Last-Translator: nous <nous@archlinux.us>\n"
 "Language-Team: Greek <None>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@@ -145,7 +145,7 @@ msgstr "έλεγχος διαθέσιμου χώρου δίσκου"
 
 #, c-format
 msgid "checking package integrity"
-msgstr "έλεγχος ακεραιότητας πακέτου"
+msgstr "έλεγχος ακεραιότητας πακέτων"
 
 #, c-format
 msgid "downloading %s...\n"
@@ -333,7 +333,7 @@ msgid ""
 "use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"δώσε '%s {-h --help}' μαζί με μια λειτουργία για τις διαθέσιμες επιλογές\n"
+"χρήση: '%s {-h --help}' με μια λειτουργία για διαθέσιμες επιλογές\n"
 
 #, c-format
 msgid ""
@@ -343,25 +343,20 @@ msgstr ""
 "αυτά\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave               διαγραφή και των αρχείων ρυθμίσεων\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave               κατάργηση αρχείων ρυθμίσεων\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive            διαγραφή και εξαρτήσεων (που δεν επηρεάζουν "
-"άλλα πακέτα)\n"
-"                             (-ss περιλαμβάνει και τις ρητώς εγκατεστημένες "
-"εξαρτήσεις)\n"
+"  -s, --recursive            κατάργηση αχρείαστων εξαρτήσεων\n"
+"                             (-ss και ρητώς εγκατεστημένες εξαρτήσεις)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded             κατάργηση αχρείαστων πακέτων (που δεν "
-"απαιτούνται από άλλα)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --uneeded              κατάργηση αχρείαστων πακέτων\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -520,7 +515,7 @@ msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
-"      --ignore <πακέτο>      παράβλεψη αναβάθμισης πακέτου (επιτρέπεται και "
+"      --ignore <πακέτο>      παράβλεψη αναβάθμισης πακέτου (επιτρέπεται "
 "πολλαπλή χρήση)\n"
 
 #, c-format
@@ -528,12 +523,16 @@ msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
-"      --ignoregroup <ομάδα>  παράβλεψη αναβάθμισης ομάδας (επιτρέπεται και "
+"      --ignoregroup <ομάδα>  παράβλεψη αναβάθμισης ομάδας (επιτρέπεται "
 "πολλαπλή χρήση)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps               παράλειψη ελέγχου εξαρτήσεων\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps               παράλειψη ελέγχου έκδοσης εξαρτήσεων (-dd "
+"παράλειψη όλων των ελέγχων)\n"
 
 #, c-format
 msgid ""
@@ -554,10 +553,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print                παράθεση στόχων χωρίς εκτέλεση λειτουργίας\n"
+"      --print                εμφάνιση στόχων χωρίς εκτέλεση λειτουργίας\n"
 
 #, c-format
 msgid ""
@@ -633,7 +632,7 @@ msgstr "το '%s' δεν είναι έγκυρο επίπεδο αποσφαλμ
 
 #, c-format
 msgid "only one operation may be used at a time\n"
-msgstr "μόνο μια λειτουργία μπορεί να εκτελεστεί\n"
+msgstr "μόνο μια λειτουργία την φορά μπορεί να εκτελεστεί\n"
 
 #, c-format
 msgid "invalid option\n"
@@ -662,7 +661,7 @@ msgstr "αδυναμία μετάβασης στον κατάλογο %s (%s)\n"
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
+msgstr "αρχείο επιλογών %s, γραμμή %d: άγνωστη εντολή '%s' στο τμήμα '%s'\n"
 
 #, c-format
 msgid ""
@@ -700,7 +699,7 @@ msgstr ""
 
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
+msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: η εντολή '%s' απαιτεί τιμή\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -722,6 +721,10 @@ msgstr "αυτή η λειτουργία απαιτεί προνόμια root.\n
 msgid "no operation specified (use -h for help)\n"
 msgstr "ακαθόριστη λειτουργία ('-h' για βοήθεια)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "Το %s ανήκει στο %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "δεν ορίσθηκε αρχείο στην --owns\n"
@@ -746,10 +749,6 @@ msgstr "αδύνατος ο προσδιορισμός της πραγματικ
 msgid "path too long: %s%s\n"
 msgstr "υπερβολικό μήκος διαδρομής: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "Το %s ανήκει στο %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Το %s δεν ανήκει σε κανένα πακέτο\n"
@@ -1625,6 +1624,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "Το %s δεν υπάρχει ή δεν είναι κατάλογος."
 
+msgid "%s is not a pacman database directory."
+msgstr "το %s δεν είναι κατάλογος βάσης του pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Απαιτούνται σωστές άδειες για την αναβάθμιση της βάσης."
 

po/en_GB.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-03-28 02:45+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -344,22 +344,20 @@ msgstr ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         remove configuration files as well\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         remove configuration files\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       remove unneeded packages\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -518,8 +516,12 @@ msgstr ""
 "                       ignore a group upgrade (can be used more than once)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         skip dependency checks\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
 
 #, c-format
 msgid ""
@@ -541,10 +543,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 
 #, c-format
@@ -709,6 +711,10 @@ msgstr "you cannot perform this operation unless you are root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "no operation specified (use -h for help)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s is owned by %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "no file was specified for --owns\n"
@@ -733,10 +739,6 @@ msgstr "cannot determine real path for '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr "path too long: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s is owned by %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "No package owns %s\n"
@@ -1605,6 +1607,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s does not exist or is not a directory."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s is not a pacman database directory."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "You must have correct permissions to upgrade the database."
 
@@ -1658,7 +1663,7 @@ msgid "Tar'ing up %s failed."
 msgstr "Tar'ing up %s failed."
 
 msgid "Making and MD5sum'ing the new database..."
-msgstr "Making and MD5summing the new database..."
+msgstr "Making and MD5sum'ing the new database..."
 
 msgid "Untar'ing %s failed."
 msgstr "Untar'ing %s failed."

po/es.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: angvp <angvp@archlinux.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-01 02:37+0000\n"
+"Last-Translator: Traumness <traumness@gmail.com>\n"
 "Language-Team: Spanish (Castilian) <>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr ":: Descargando paquetes desde %s...\n"
 
 #, c-format
 msgid "checking available disk space...\n"
-msgstr "verificando espacio disponible en disco...\n"
+msgstr "verificando el espacio disponible en disco...\n"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
@@ -124,7 +124,7 @@ msgstr ""
 
 #, c-format
 msgid ":: File %s is corrupted. Do you want to delete it?"
-msgstr ":: El archivo %s está dañado. ¿Desea borrarlo?"
+msgstr ":: El archivo %s está dañado. ¿Desea eliminarlo?"
 
 #, c-format
 msgid "installing"
@@ -144,11 +144,11 @@ msgstr "verificando conflictos entre archivos"
 
 #, c-format
 msgid "checking available disk space"
-msgstr "verificando espacio disponible en disco"
+msgstr "verificando el espacio disponible en disco"
 
 #, c-format
 msgid "checking package integrity"
-msgstr "verificando integridad de los paquetes"
+msgstr "verificando la integridad de los paquetes"
 
 #, c-format
 msgid "downloading %s...\n"
@@ -183,7 +183,7 @@ msgstr ""
 
 #, c-format
 msgid "Explicitly installed"
-msgstr "Explícitamente instalado"
+msgstr "Instalado explícitamente"
 
 #, c-format
 msgid "Installed as a dependency for another package"
@@ -231,11 +231,11 @@ msgstr "Requerido por     :"
 
 #, c-format
 msgid "Conflicts With :"
-msgstr "Conflictos con    :"
+msgstr "En conflicto con    :"
 
 #, c-format
 msgid "Replaces       :"
-msgstr "Reemplaza         :"
+msgstr "Reemplaza a         :"
 
 #, c-format
 msgid "Download Size  : %6.2f K\n"
@@ -259,19 +259,19 @@ msgstr "Arquitectura      :"
 
 #, c-format
 msgid "Build Date     :"
-msgstr "Fecha compilación :"
+msgstr "Fecha de compilación :"
 
 #, c-format
 msgid "Install Date   :"
-msgstr "Fecha instalación :"
+msgstr "Fecha de instalación :"
 
 #, c-format
 msgid "Install Reason :"
-msgstr "Motivo instalación:"
+msgstr "Motivo de la instalación:"
 
 #, c-format
 msgid "Install Script :"
-msgstr "Script instalación:"
+msgstr "Script de instalación:"
 
 #, c-format
 msgid "Yes"
@@ -350,25 +350,21 @@ msgstr ""
 "éstos\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         quita también los archivos de configuración\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         elimina los archivos de configuración\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      quita también las dependencias (que no rompan a otros "
-"paquetes)\n"
-"                       (-ss incluye también las dependencias explícitamente "
-"instaladas)\n"
+"  -s, --recursive     elimina las dependencias que no son necesarias\n"
+"                       (-ss hace que se incluyan las dependencias instaladas "
+"de forma explícita)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       elimina los paquetes innecesarios (sin romper otros "
-"paquetes)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       elimina los paquetes que no son necesarios\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -418,8 +414,8 @@ msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
 msgstr ""
-"  -m, --foreign        lista paquetes instalados no encontrados en las "
-"listas de paquetes [filtro]\n"
+"  -m, --foreign        lista paquetes instalados que no se encuentran en la"
+"(s) base(s) de datos de sincronización [filtro]\n"
 
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
@@ -451,7 +447,7 @@ msgstr ""
 msgid ""
 "  -t, --unrequired     list packages not required by any package [filter]\n"
 msgstr ""
-"  -t, --unrequired     lista todos los paquetes no requeridos por algún otro "
+"  -t, --unrequired     lista todos los paquetes que no requiere algún otro "
 "paquete [filtro]\n"
 
 #, c-format
@@ -481,8 +477,8 @@ msgstr ""
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search <busq.> busca en los repositorios remotos por coincidencias "
-"de la cadena especificada.\n"
+"  -s, --search <busq.> busca coincidencias de la cadena especificada en los "
+"repositorios remotos.\n"
 
 #, c-format
 msgid ""
@@ -503,23 +499,23 @@ msgstr ""
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 msgstr ""
-"  -y, --refresh        descarga bases de datos actualizadas desde el "
-"servidor\n"
+"  -y, --refresh        descarga las bases de datos de paquetes actualizadas "
+"desde el servidor\n"
 
 #, c-format
 msgid "      --needed         don't reinstall up to date packages\n"
-msgstr "      --needed         no reinstala paquetes no actualizados\n"
+msgstr "      --needed         no reinstala paquetes que están actualizados\n"
 
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
 msgstr ""
-"      --asdeps         marca los paquetes como instalados en forma no-"
+"      --asdeps         marca los paquetes como instalados de forma no "
 "explícita\n"
 
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
 msgstr ""
-"      --asexplicit     marca los paquetes como instalados en forma "
+"      --asexplicit     marca los paquetes como instalados de forma "
 "explícita\n"
 
 #, c-format
@@ -537,15 +533,15 @@ msgstr ""
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
 msgstr ""
-"      --asexplicit     instala paquetes como explícitamente instalados\n"
+"      --asexplicit     instala paquetes como instalados explícitamente \n"
 
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
-"      --ignore <paq>   ignora una actualización de paquete (puede ser usado "
-"más de una vez)\n"
+"      --ignore <paq>   ignora una actualización de un paquete (puede ser "
+"usado más de una vez)\n"
 
 #, c-format
 msgid ""
@@ -553,12 +549,16 @@ msgid ""
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
 "      --ignoregroup <grp>\n"
-"                       ignora una actualización de grupo (puede ser usado "
-"más de una vez)\n"
+"                       ignora una actualización de un grupo de paquetes "
+"(puede ser usado más de una vez)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         salta la verificación de dependencias \n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         se salta la(s) comprobación(es) de versión de las "
+"dependencias (-dd para saltarlas todas)\n"
 
 #, c-format
 msgid ""
@@ -583,10 +583,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          sólo muestra los objetivos en lugar de realizar la "
+"      --print          simula el proceso en lugar de llevar a cabo la "
 "operación\n"
 
 #, c-format
@@ -600,12 +600,13 @@ msgstr ""
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr ""
-"  -b, --dbpath <ruta>  define una localización alternativa de la base de "
-"datos\n"
+"  -b, --dbpath <ruta>  define una ruta para una base de datos alternativa\n"
 
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr "  -r, --root <ruta>    define una raíz alterna para la instalación\n"
+msgstr ""
+"  -r, --root <ruta>    define una ruta para una raíz de instalación "
+"alternativa\n"
 
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
@@ -618,8 +619,8 @@ msgstr "      --arch <arq.>    define una arquitectura alternativa\n"
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr ""
-"      --cachedir <dir> define una ruta alternativa para la cache de los "
-"archivos\n"
+"      --cachedir <dir> define una ruta para un directorio caché de paquetes "
+"alternativo\n"
 
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
@@ -643,25 +644,25 @@ msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
 msgstr ""
-"                       Este programa puede ser libremente distribuido bajo\n"
+"                       Este programa puede distribuirse libremente bajo\n"
 "                       los términos de la licencia GNU General Public "
 "License\n"
 
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
-msgstr "problemas definiendo el directorio raíz '%s' (%s)\n"
+msgstr "error al definir el directorio raíz '%s' (%s)\n"
 
 #, c-format
 msgid "problem setting dbpath '%s' (%s)\n"
-msgstr "problemas al establecer el dbpath '%s' (%s)\n"
+msgstr "error al establecer el dbpath '%s' (%s)\n"
 
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
-msgstr "problemas al establecer logfile '%s' (%s)\n"
+msgstr "error al establecer logfile '%s' (%s)\n"
 
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
-msgstr "problema añadiendo el directorio de caché '%s' (%s)\n"
+msgstr "error al añadir el directorio de caché '%s' (%s)\n"
 
 #, c-format
 msgid "'%s' is not a valid debug level\n"
@@ -673,7 +674,7 @@ msgstr "sólo una operación puede utilizarse a la vez\n"
 
 #, c-format
 msgid "invalid option\n"
-msgstr "opción inválida\n"
+msgstr "opción no válida\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -745,7 +746,7 @@ msgstr ""
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
-msgstr "falló al iniciar la biblioteca alpm (%s)\n"
+msgstr "fallo al iniciar la biblioteca alpm (%s)\n"
 
 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
@@ -763,6 +764,10 @@ msgstr "no puede realizar esta operación, a menos que sea root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "no se especificó una operación (utilice -h para ayuda)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s es propiedad de %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "no se indicó un archivo para --owns\n"
@@ -787,10 +792,6 @@ msgstr "no se pudo determinar la ruta real de '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr "ruta muy larga: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s es propiedad de %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Ningún paquete posee %s\n"
@@ -813,11 +814,11 @@ msgstr[1] "%d archivos no encontrados\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
-msgstr "no se encontraron repositorios configurados que se puedan usar.\n"
+msgstr "no hay ningún repositorio de paquetes configurado.\n"
 
 #, c-format
 msgid "package \"%s\" not found\n"
-msgstr "no fue encontrado el paquete \"%s\" \n"
+msgstr "el paquete \"%s\" no fue encontrado \n"
 
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
@@ -825,7 +826,7 @@ msgstr "error al preparar la transacción (%s)\n"
 
 #, c-format
 msgid ":: package %s does not have a valid architecture\n"
-msgstr ":: '%s' no tiene una arquitectura válida\n"
+msgstr "::el paquete '%s' no posee una arquitectura válida\n"
 
 #, c-format
 msgid ":: %s: requires %s\n"
@@ -1005,7 +1006,7 @@ msgstr ":: Sincronizando las bases de datos de paquetes...\n"
 
 #, c-format
 msgid ":: The following packages should be upgraded first :\n"
-msgstr ":: Los siguientes paquetes deberían ser actualizados primero:\n"
+msgstr ":: Los siguientes paquetes deben actualizarse primero:\n"
 
 #, c-format
 msgid ""
@@ -1029,7 +1030,7 @@ msgstr ""
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr "   intentando ejecutar pacman-db-upgrade\n"
+msgstr "   intente ejecutar pacman-db-upgrade\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -1159,7 +1160,7 @@ msgid "Installing missing dependencies..."
 msgstr "Instalando las dependencias que faltan... "
 
 msgid "'%s' failed to install missing dependencies."
-msgstr "'%s' falló al instalar las dependencias faltantes."
+msgstr "'%s' fallo al instalar las dependencias faltantes."
 
 msgid "Missing Dependencies:"
 msgstr "Dependencias que faltan:"
@@ -1260,7 +1261,7 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Ejemplo para software con licencia GPL: license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
-msgstr "Entrada de archivo de respaldo no está en el paquete: %s"
+msgstr "La entrada del archivo de respaldo no está en el paquete: %s"
 
 msgid "Package contains reference to %s"
 msgstr "El paquete contiene referencias a %s"
@@ -1314,7 +1315,7 @@ msgid "Installing %s package group with %s -U..."
 msgstr "Instalando el grupo de paquetes %s con %s -U..."
 
 msgid "Failed to install built package(s)."
-msgstr "Error al instalar el/los paquete(s) construido(s)."
+msgstr "Error al instalar el/los paquete(s) compilado(s)."
 
 msgid "%s is not allowed to be empty."
 msgstr "No está permitido que %s esté vacío."
@@ -1362,7 +1363,7 @@ msgid "missing package function for split package '%s'"
 msgstr "falta una función para el paquete dividido '%s'"
 
 msgid "requested package %s is not provided in %s"
-msgstr "el paquete solicitado %s no es provisto en %s"
+msgstr "el paquete solicitado %s no se provee con %s"
 
 msgid "Determining latest %s revision..."
 msgstr "Determinando ultima revisión de %s..."
@@ -1398,7 +1399,8 @@ msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Saltar la verificación de dependencias"
 
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
-msgstr "  -e, --noextract No extraer los fuentes (usar el directorio src/)"
+msgstr ""
+"  -e, --noextract No extraer los archivos fuente (usar el directorio src/)"
 
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force          Sobreescribe el paquete existente"
@@ -1414,7 +1416,7 @@ msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Instalar el paquete tras una compilación exitosa"
 
 msgid "  -L, --log        Log package build process"
-msgstr "  -L, --log        Registra el proceso de construcción"
+msgstr "  -L, --log        Registra el proceso de compilación"
 
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Deshabilitar los colores en la salida"
@@ -1423,12 +1425,12 @@ msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Sólo descargar y extraer"
 
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr "  -p <archivo>     Usar un script alternativo (en vez de '%s')"
+msgstr "  -p <archivo>     Usar un script alternativo (en lugar de '%s')"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
-"  -r, --rmdeps     Elimina las dependencias instaladas tras una creación "
+"  -r, --rmdeps     Elimina las dependencias instaladas tras una compilación "
 "exitosa."
 
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
@@ -1441,11 +1443,11 @@ msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
-"  --allsource     Genera un archivo sólo con los fuentes, incluyendo los "
-"fuentes descargados"
+"  --allsource     Genera un archivo sólo con las fuentes, incluyendo las "
+"fuentes descargadas"
 
 msgid "  --asroot         Allow makepkg to run as root user"
-msgstr "  --asroot     Permitir a makepkg ser ejecutado como el usuario root"
+msgstr "  --asroot     Permitir que makepkg se ejecute como usuario root"
 
 msgid "  --check          Run the check() function in the %s"
 msgstr "  --check          Ejecuta la función check() en %s"
@@ -1466,7 +1468,7 @@ msgstr "  --nocheck        No ejecutar la función check() en %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr ""
-"  --pkg <lista>    Sólo construye los paquetes listados desde un paquete "
+"  --pkg <lista>    Sólo compila los paquetes listados desde un paquete "
 "dividido"
 
 msgid "  --skipinteg      Do not fail when integrity checks are missing"
@@ -1480,7 +1482,7 @@ msgstr ""
 "descargadas"
 
 msgid "These options can be passed to pacman:"
-msgstr "Estas opciones pueden ser pasadas a pacman:"
+msgstr "Estas opciones pueden ser usadas en pacman:"
 
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
@@ -1501,7 +1503,7 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Copyright (c) 2006-2011 Equipo de Desarrollo Pacman <pacman-dev@archlinux."
+"Copyright (c) 2006-2011 Equipo de Desarrollo de Pacman <pacman-dev@archlinux."
 "org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nEste "
 "software es libre; mira las fuentes para condiciones de copias.\\nNo tiene "
 "GARANTÍA, en la medida permitida por la ley.\\n"
@@ -1516,7 +1518,7 @@ msgid "You do not have write permission to store downloads in %s."
 msgstr "No tiene permiso de escritura para guardar las descargas en %s."
 
 msgid "\\0--holdver and --forcever cannot both be specified"
-msgstr "\\0--holdver y --forcever no pueden ser usados al mismo tiempo"
+msgstr "\\0--holdver y --forcever no se pueden usar al mismo tiempo"
 
 msgid "Cleaning up ALL files from %s."
 msgstr "Limpiando TODOS los archivos de %s."
@@ -1526,7 +1528,7 @@ msgstr "    ¿Está seguro que desea hacer esto? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
-"Problemas eliminando archivos; puede que no tenga los permisos correctos en "
+"Problemas eliminando archivos; puede que no tenga los permisos adecuados en "
 "%s"
 
 msgid "Source cache cleaned."
@@ -1536,33 +1538,31 @@ msgid "No files have been removed."
 msgstr "No se eliminaron archivos."
 
 msgid "Source destination must be defined in %s."
-msgstr "La destinación de las fuentes debe ser definido en %s."
+msgstr "El destino de las fuentes debe ser definido en %s."
 
 msgid "In addition, please run makepkg -C outside of your cache directory."
-msgstr ""
-"Adicionalmente, por favor, ejecute makepkg -C fuera de su directorio de "
-"caché."
+msgstr "Por favor, ejecute también makepkg -C fuera de su directorio de caché."
 
 msgid "Running makepkg as root is a BAD idea and can cause"
-msgstr "Ejecutar makepkg como root es una MALA idea y puede causar"
+msgstr "Ejecutar makepkg como root es una MALA idea y puede ocasionar"
 
 msgid "permanent, catastrophic damage to your system. If you"
-msgstr "un daño catastrófico y permanente a tu sistema. Si"
+msgstr "un daño catastrófico y permanente en su sistema. Si"
 
 msgid "wish to run as root, please use the --asroot option."
-msgstr "quiere ejecutarlo como root, por favor, use la opción --asroot."
+msgstr "desea ejecutarlo como root, por favor, use la opción --asroot."
 
 msgid "The --asroot option is meant for the root user only."
 msgstr "La opción --asroot está pensada sólo para el usuario root."
 
 msgid "Please rerun makepkg without the --asroot flag."
-msgstr "Por favor, ejecuta makepkg sin la opción --asroot."
+msgstr "Por favor, vuelva a ejecutar makepkg sin la opción --asroot."
 
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Fakeroot debe ser instalado si se usa la opción 'fakeroot'"
 
 msgid "in the BUILDENV array in %s."
-msgstr "en el arreglo BUILDENV en %s."
+msgstr "en la línea BUILDENV en %s."
 
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr ""
@@ -1610,10 +1610,10 @@ msgid "Repackaging without the use of a package() function is deprecated."
 msgstr "Reempaquetar sin el uso de la función package() está obsoleto."
 
 msgid "File permissions may not be preserved."
-msgstr "Puede que no sean preservados los permisos del archivo."
+msgstr "Puede que no se preserven los permisos del archivo."
 
 msgid "Leaving fakeroot environment."
-msgstr "Saliendo de fakeroot."
+msgstr "Saliendo del entorno fakeroot."
 
 msgid "Making package: %s"
 msgstr "Creando el paquete: %s"
@@ -1682,8 +1682,11 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "'%s' no existe o no es un directorio."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s no es un directorio de una base de datos de pacman."
+
 msgid "You must have correct permissions to upgrade the database."
-msgstr "Debes tener los permisos correcto para actualizar la base de dato."
+msgstr "Debes tener los permisos adecuados para actualizar la base de datos."
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr ""
@@ -1711,18 +1714,18 @@ msgid ""
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
 msgstr ""
-"Ya que pacman usa un montón de archivos pequeños para mantener el rastro de "
-"los paquetes,\\nhay una tendencia a que estos archivos se fragmenten durante "
-"el tiempo.\\nEste script ubicará y situará estos pequeños archivos en un "
-"espacio\\ncontinuo en tu disco duro. El resultado es que el disco duro "
-"debería ser capaz de leerlos más rápido, ya que los cabezales\\nno tienen "
-"que moverse tanto.\\n"
+"Debido a que pacman usa un montón de archivos pequeños para mantener el "
+"rastro de los paquetes,\\nhay una tendencia a que estos archivos se "
+"fragmenten com el paso del tiempo.\\nEste script ubicará y situará estos "
+"pequeños archivos en un espacio\\ncontinuo en tu disco duro. El resultado es "
+"que el disco duro debería ser capaz de leerlos más rápido, ya que los "
+"cabezales\\nno tienen que moverse tanto.\\n"
 
 msgid "diff tool was not found, please install diffutils."
 msgstr "no se encontró diff, por favor, instale diffutils."
 
 msgid "You must have correct permissions to optimize the database."
-msgstr "Debes tener los permisos correctos para optimizar la base de datos."
+msgstr "Debes tener los permisos adecuados para optimizar la base de datos."
 
 msgid "ERROR: Can not create temp directory for database building."
 msgstr ""
@@ -1844,8 +1847,8 @@ msgid ""
 "\\nnext to the new one.\\n\\n"
 msgstr ""
 "Usa la opción -d/--delta para automáticamente generar y agregar un archivo "
-"diferencial\\nentre la entrada vieja y la nueva, si el paquete viejo es "
-"encontrado\\njunto al nuevo.\\n\\n"
+"diferencial\\nentre la entrada vieja y la nueva, si el paquete viejo se "
+"encuentra\\njunto al nuevo.\\n\\n"
 
 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
@@ -1877,7 +1880,7 @@ msgid "Adding 'deltas' entry : %s -> %s"
 msgstr "Agregando entradas 'diferenciales': %s -> %s"
 
 msgid "Removing existing entry '%s'..."
-msgstr "Quitando el paquete existente '%s'..."
+msgstr "Quitando la entrada existente '%s'..."
 
 msgid "An entry for '%s' already existed"
 msgstr "Una entrada para '%s' ya existía"
@@ -1922,7 +1925,7 @@ msgid "Adding package '%s'"
 msgstr "Agregando el paquete %s"
 
 msgid "Searching for delta '%s'..."
-msgstr "Buscando por el diferencial '%s'..."
+msgstr "Buscando el diferencial '%s'..."
 
 msgid "Delta matching '%s' not found."
 msgstr "No fueron encontrados diferenciales que coincidan con '%s'."
@@ -1937,10 +1940,10 @@ msgid "Invalid command name '%s' specified."
 msgstr "Nombre de comando especificado '%s' inválido"
 
 msgid "Cannot create temp directory for database building."
-msgstr "No se puede crear directorio temporal para la base de datos."
+msgstr "No se puede crear directorio temporal para compilar la base de datos."
 
 msgid "Creating updated database file '%s'"
-msgstr "Creado una base de datos actualizada '%s'"
+msgstr "Creado un archivo de base de datos actualizada '%s'"
 
 msgid "'%s' does not have a valid archive extension."
 msgstr "'%s' no tiene una extensión de archivo válida."

po/fi.po

@@ -1,16 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# Larso <larso@gmx.com>, 2011.
+# Jesse Jaara <jesse.jaara@gmail.com>, 2011.
+# apuasi <kaannokset.hellberg@gmail.com>, 2011.
+# Dan McGee <dpmcgee@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: Finnish <None>\n"
+"POT-Creation-Date: 2011-08-08 16:32-0500\n"
+"PO-Revision-Date: 2011-06-14 11:10+0000\n"
+"Last-Translator: Huulivoide <jesse.jaara@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
+"team/fi/)\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +47,7 @@ msgstr "poistetaan pakettia %s...\n"
 
 #, c-format
 msgid "upgrading %s...\n"
-msgstr "päivitettään pakettia %s...\n"
+msgstr "päivitetään pakettia %s...\n"
 
 #, c-format
 msgid "checking package integrity...\n"
@@ -71,7 +75,7 @@ msgstr "epäonnistui.\n"
 
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Noudetaan paketteja %s varastosta...\n"
+msgstr ":: Noudetaan paketteja varastosta %s...\n"
 
 #, c-format
 msgid "checking available disk space...\n"
@@ -80,7 +84,7 @@ msgstr "tarkastetaan saatavilla olevaa levytilaa...\n"
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
 msgstr ""
-":: Paketti %s on IgnorePkg/IgnoreGroup listalla. Asenna siitä huolimatta?"
+":: Paketti %s on IgnorePkg/IgnoreGroup -listalla. Asenna siitä huolimatta?"
 
 #, c-format
 msgid ":: Replace %s with %s/%s?"
@@ -105,10 +109,10 @@ msgid_plural ""
 ":: The following packages cannot be upgraded due to unresolvable "
 "dependencies:\n"
 msgstr[0] ""
-":: Seuraavaa pakettia ei voida päivitää selvittämättömien rippuvuuksien "
+":: Seuraavaa pakettia ei voida päivittää selvittämättömien riippuvuuksien "
 "vuoksi:\n"
 msgstr[1] ""
-":: Seuraavia paketteja ei voida päivitää selvittämättömien rippuvuuksien "
+":: Seuraavia paketteja ei voida päivittää selvittämättömien riippuvuuksien "
 "vuoksi:\n"
 
 #, c-format
@@ -151,19 +155,19 @@ msgstr "tarkastetaan saatavilla olevaa levytilaa"
 
 #, c-format
 msgid "checking package integrity"
-msgstr "tarkastetaan pakettie virheettömyyttä"
+msgstr "tarkastetaan pakettien virheettömyyttä"
 
 #, c-format
 msgid "downloading %s...\n"
-msgstr "ladataa pakettia %s...\n"
+msgstr "ladataan pakettia %s...\n"
 
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc virhe: %zd tavua ei voitu varata\n"
+msgstr "malloc-virhe: %zd tavua ei voitu varata\n"
 
 #, c-format
 msgid "no targets specified (use -h for help)\n"
-msgstr "yhtään kohdetta ei ole määritelty (-h valitsin tulost6aa ohjeen)\n"
+msgstr "yhtään kohdetta ei ole määritelty (-h tulostaa ohjeen)\n"
 
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
@@ -207,7 +211,7 @@ msgstr "Osoite                  :"
 
 #, c-format
 msgid "Licenses       :"
-msgstr "Lisesnssi               :"
+msgstr "Lisenssi               :"
 
 #, c-format
 msgid "Groups         :"
@@ -283,7 +287,7 @@ msgstr "Ei"
 
 #, c-format
 msgid "MD5 Sum        :"
-msgstr "MD5 Summa              :"
+msgstr "MD5-summa              :"
 
 #, c-format
 msgid "Description    :"
@@ -339,7 +343,7 @@ msgid ""
 "use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"suorita '%s {-h --help}' operaation kanssa käytettävissäolevien valitsimien "
+"suorita '%s {-h --help}' operaation kanssa käytettävissä olevien valitsimien "
 "listaamiseksi.\n"
 
 #, c-format
@@ -348,25 +352,18 @@ msgid ""
 msgstr "  -c, --cascade        poista paketit ja kaikki niiden riippuvuudet\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
+msgid "  -n, --nosave         remove configuration files\n"
 msgstr "  -n, --nosave         poista myös asetustiedostot\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      poista myös riippuvuudet (jotka eivät riko "
-"paketteja)\n"
-"                       (-ss sisällyttää myös itsenäisesti asennetut "
-"riippuvuudet)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       poista tarpeettomat paketit (jotka eivät riko "
-"paketteja)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       poista tarpeettomat paketit\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -399,7 +396,7 @@ msgid ""
 "  -k, --check          check that the files owned by the package(s) are "
 "present\n"
 msgstr ""
-"  -k, --check             varmistaa että kaikki paketin tieodostot ovat "
+"  -k, --check             varmistaa, että kaikki paketin tiedostot ovat "
 "levyllä\n"
 
 #, c-format
@@ -431,7 +428,7 @@ msgstr "  -q, --quiet             näytä vähemmän tietoja\n"
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr "  -s, --search <regex> etsi merkkijona asennetuista paketeista\n"
+msgstr "  -s, --search <regex> etsi merkkijonoa asennetuista paketeista\n"
 
 #, c-format
 msgid ""
@@ -529,8 +526,10 @@ msgstr ""
 "kerran)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         ohita riippuvuuksien tarkastaminen\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -548,12 +547,12 @@ msgstr ""
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
 msgstr ""
-"      --noscriplet        älä suorita asennus scriptiä, jos sellainen on "
+"      --noscriplet        älä suorita asennusskriptiä, jos sellainen on "
 "olemassa\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr "      --print          listaa paketit, mutta älä suorita operaatiota\n"
 
@@ -609,7 +608,7 @@ msgid ""
 "                       the terms of the GNU General Public License.\n"
 msgstr ""
 "                     Tätä ohjelmaa saa jakaa vapaasti GNU\n"
-"                     General Public lisensin ehtojen mukaisesti.\n"
+"                     General Public Licensen ehtojen mukaisesti.\n"
 
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
@@ -625,11 +624,11 @@ msgstr "ongelma asetettaessa lokitiedostoa '%s' (%s)\n"
 
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
-msgstr "ongelma lisättäessä välimuisti kansiota '%s' (%s)\n"
+msgstr "ongelma lisättäessä välimuistikansiota '%s' (%s)\n"
 
 #, c-format
 msgid "'%s' is not a valid debug level\n"
-msgstr "'%s' ei ole kelvollinen debugaus taso\n"
+msgstr "'%s' ei ole kelvollinen debuggaustaso\n"
 
 #, c-format
 msgid "only one operation may be used at a time\n"
@@ -663,12 +662,13 @@ msgstr "ei voitu siirtyä kansioon %s (%s)\n"
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""
+"asetustiedosto %s rivillä %d: direktiiviä '%s' osiossa '%s' ei tunnistettu.\n"
 
 #, c-format
 msgid ""
 "The mirror '%s' contains the $arch variable, but no Architecture is "
 "defined.\n"
-msgstr "Peilipalvelin '%s' sisältää $arch muuttujan, jota ei ole määritetty.\n"
+msgstr "Peilipalvelin '%s' sisältää $arch-muuttujan, jota ei ole määritetty.\n"
 
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
@@ -688,7 +688,7 @@ msgstr "tietokannan '%s' rekisteroiminen epäonnistui (%s)\n"
 
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
-msgstr "asetustiedosto %s, rivi %d: syntaksi virhe, avain puuttuu.\n"
+msgstr "asetustiedosto %s, rivi %d: syntaksivirhe, avain puuttuu.\n"
 
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
@@ -698,15 +698,15 @@ msgstr ""
 
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
+msgstr "asetustiedosto %s rivillä %d: direktiivi '%s' tarvitsee arvon\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
-msgstr "alpm kirjanston alustaminen epäonnistui (%s)\n"
+msgstr "alpm-kirjaston alustaminen epäonnistui (%s)\n"
 
 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
-msgstr "muistinylitys virhe valitsimia jäsennettäessä\n"
+msgstr "puskurin ylivuotovirhe valitsimia jäsennettäessä\n"
 
 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
@@ -720,6 +720,10 @@ msgstr "tämän operaation suorittamiseen vaaditaan ylläpitäjän oikeudet.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "mitään operaatiota ei määritelty (-h valitsin tulostaa ohjeen)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "tiedosto '%s' on paketin %s %s omistuksessa\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "valitsimelle --owns ei annettu tiedostoa\n"
@@ -738,15 +742,11 @@ msgstr "kansion '%s' omistussuhteita ei voida määrittää\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
-msgstr "kohteen '%s' todellesin sijainnin selvittäminen epäonnsui: %s\n"
+msgstr "kohteen '%s' todellisen sijainnin selvittäminen epäonnistui: %s\n"
 
 #, c-format
 msgid "path too long: %s%s\n"
-msgstr "polku on liianpitkä: %s%s\n"
-
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "tiedosto '%s' on paketin %s %s omistuksessa\n"
+msgstr "polku on liian pitkä: %s%s\n"
 
 #, c-format
 msgid "No package owns %s\n"
@@ -790,7 +790,7 @@ msgstr ":: %s: riippuu paketeista %s\n"
 
 #, c-format
 msgid "%s is designated as a HoldPkg.\n"
-msgstr "paketti %s in HoldPkg listalla.\n"
+msgstr "paketti %s on HoldPkg-listalla.\n"
 
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
@@ -842,7 +842,7 @@ msgstr "Säilytettävät paketit:\n"
 
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr "  Kaikki paikalliset paketit\n"
+msgstr "  Kaikki asennetut paketit\n"
 
 #, c-format
 msgid "  All current sync database packages\n"
@@ -878,7 +878,7 @@ msgstr "Paketin %s päivittäminen epäonnistui (%s)\n"
 
 #, c-format
 msgid " %s is up to date\n"
-msgstr " paketti %s on päivitetty\n"
+msgstr " %s on ajan tasalla\n"
 
 #, c-format
 msgid "failed to synchronize any databases\n"
@@ -942,7 +942,7 @@ msgstr "Jatketaanko asentamista?"
 
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
-msgstr "tiedosto %s löytyy paketista '%s' sekä '%s'\n"
+msgstr "tiedosto %s löytyy sekä paketista '%s' että '%s'\n"
 
 #, c-format
 msgid "%s: %s exists in filesystem\n"
@@ -954,7 +954,7 @@ msgstr "paketti %s ei ole kelvollinen tai se on vahingoittunut\n"
 
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
-msgstr "Yhtään pakettia ei ole päivitetty tapahtuneiden virheiden vuoksi.\n"
+msgstr "Yhtään pakettia ei päivitetty tapahtuneiden virheiden vuoksi.\n"
 
 #, c-format
 msgid ":: Synchronizing package databases...\n"
@@ -969,7 +969,7 @@ msgid ""
 ":: Do you want to cancel the current operation\n"
 ":: and upgrade these packages now?"
 msgstr ""
-":: Tahdotko peruuttaa nykyise operaation\n"
+":: Tahdotko peruuttaa nykyisen operaation\n"
 ":: ja päivittää nämä paketit nyt?"
 
 #, c-format
@@ -986,7 +986,7 @@ msgstr ""
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr "  yritä pacman-db-update scriptin suorittamista\n"
+msgstr "  yritä pacman-db-upgrade scriptin suorittamista\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -1131,13 +1131,13 @@ msgid "Found %s"
 msgstr "Kohde %s löytyi"
 
 msgid "%s was not found in the build directory and is not a URL."
-msgstr "Kohdetta %s ei löydy kääntäkansiosta eikä se ole osoite."
+msgstr "Kohdetta %s ei löydy kääntökansiosta eikä se ole osoite."
 
 msgid "Downloading %s..."
 msgstr "Ladataan kohdetta %s..."
 
 msgid "Failure while downloading %s"
-msgstr "Kodetta %s ladatessa tapahtui virhe"
+msgstr "Kohdetta %s ladatessa tapahtui virhe"
 
 msgid "Generating checksums for source files..."
 msgstr "Luodaan tarkistussummia lähdetiedostoille..."
@@ -1161,14 +1161,14 @@ msgid "FAILED"
 msgstr "Virheellinen"
 
 msgid "One or more files did not pass the validity check!"
-msgstr "Yksi tai useampi tiedosto ei läpäissyt virheetömys testiä!"
+msgstr "Yksi tai useampi tiedosto ei läpäissyt virheettömyystestiä!"
 
 msgid "Integrity checks (%s) differ in size from the source array."
 msgstr ""
-"Tarkistus summien (%s) lukumäärä ei täsmää lähdetiedostojen määrän kassa."
+"Tarkistussummien (%s) lukumäärä ei täsmää lähdetiedostojen määrän kassa."
 
 msgid "Integrity checks are missing."
-msgstr "Takistusummat puuttuvat."
+msgstr "Tarkistussummat puuttuvat."
 
 msgid "Extracting Sources..."
 msgstr "Puretaan lähdetiedostoja..."
@@ -1180,7 +1180,7 @@ msgid "Failed to extract %s"
 msgstr "tiedoston %s purkaminen epäonnistui"
 
 msgid "A failure occurred in %s()."
-msgstr "Virhe tapahtui kohdassa %s()."
+msgstr "Virhe tapahtui funktiossa %s()."
 
 msgid "Starting %s()..."
 msgstr "Aloitetaan osion %s() käsittelemistä..."
@@ -1189,40 +1189,40 @@ msgid "Tidying install..."
 msgstr "Siistitään pakettia..."
 
 msgid "Removing doc files..."
-msgstr "Poistetaan doc tiedostoja..."
+msgstr "Poistetaan doc-tiedostoja..."
 
 msgid "Purging other files..."
 msgstr "Puhdistetaan muita tiedostoja..."
 
 msgid "Compressing man and info pages..."
-msgstr "Pakataan man ja info sivuja..."
+msgstr "Pakataan man- ja info-sivuja..."
 
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr "Poistetaan tarpeettomia symbooleja ohjelmista ja kirjastoista..."
+msgstr "Poistetaan tarpeettomat symbolit ohjelmista ja kirjastoista..."
 
 msgid "Removing libtool .la files..."
-msgstr "Poistetaan libtool .la tiedostoja..."
+msgstr "Poistetaan libtool .la-tiedostoja..."
 
 msgid "Removing empty directories..."
 msgstr "Poistetaan tyhjiä kansioita..."
 
 msgid "Generating .PKGINFO file..."
-msgstr "Luodaan .PKGINFO tiedostoa..."
+msgstr "Luodaan .PKGINFO-tiedostoa..."
 
 msgid "Please add a license line to your %s!"
-msgstr "Lisää lisenssi rivi %s tiedostoosi!"
+msgstr "Lisää lisenssirivi tiedostoosi %s!"
 
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Esimerkki GPL-lisenssöidystä ohjelmistosta: license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
-msgstr "Varmuuskopio tiedosto merkintää ei ole paketissa :%s"
+msgstr "Varmuuskopiotiedostomerkintää ei ole paketissa : %s"
 
 msgid "Package contains reference to %s"
 msgstr "Paketti sisältää viitteitä kohteeseen %s"
 
 msgid "Missing pkg/ directory."
-msgstr "Kansio pkg/ puutuu."
+msgstr "Kansio pkg/ puuttuu."
 
 msgid "Creating package..."
 msgstr "Luodaan pakettia..."
@@ -1240,13 +1240,13 @@ msgid "Failed to create package file."
 msgstr "Pakettitiedoston luominen epäonnistui."
 
 msgid "Failed to create symlink to package file."
-msgstr "Symboolisenlinkin luominen pakettiin epäonnistui."
+msgstr "Symbolisen linkin luominen pakettiin epäonnistui."
 
 msgid "Skipping integrity checks."
 msgstr "Ohitetaan pakettien virheellisyyden tarkistaminen."
 
 msgid "Creating source package..."
-msgstr "Luodaan lähde pakettia..."
+msgstr "Luodaan lähdepakettia..."
 
 msgid "Adding %s..."
 msgstr "Lisätään kohdetta %s..."
@@ -1255,19 +1255,19 @@ msgid "Adding %s file (%s)..."
 msgstr "Lisätään %s tiedostoa (%s)..."
 
 msgid "Compressing source package..."
-msgstr "Pakataan lähdepakettia..."
+msgstr "Pakataan lähdekoodipakettia..."
 
 msgid "Failed to create source package file."
 msgstr "Lähdepaketin luominen epäonnistui."
 
 msgid "Failed to create symlink to source package file."
-msgstr "Symboolisenlinkin luominen lähdetiedostoon epäonnistui."
+msgstr "Symbolisen linkin luominen lähdetiedostoon epäonnistui."
 
 msgid "Installing package %s with %s -U..."
 msgstr "Asennetaan pakettia %s %s -U:n avulla..."
 
 msgid "Installing %s package group with %s -U..."
-msgstr "Asennetaan pakettiaryhmää %s %s -U:n avulla..."
+msgstr "Asennetaan pakettiryhmää %s %s -U:n avulla..."
 
 msgid "Failed to install built package(s)."
 msgstr "Käännettyjen pakettien asentaminen epäonnistui."
@@ -1294,37 +1294,37 @@ msgid "Note that many packages may need a line added to their %s"
 msgstr "Huomioi että monet paketit saattavat tarvita rivin %s:iinsa"
 
 msgid "such as arch=('%s')."
-msgstr "esim arch=('%s')."
+msgstr "esim. arch=('%s')."
 
 msgid "Provides array cannot contain comparison (< or >) operators."
-msgstr "Provides lista ei saa sisältää vertailu merkkäjä > ja/tai <."
+msgstr "Provides-lista ei saa sisältää vertailumerkkejä > ja/tai <."
 
 msgid "Backup entry should not contain leading slash : %s"
-msgstr "Varmuuskopio merkintä ei saisi sisältää ensimmäistä /-merkkiä: %s"
+msgstr "Varmuuskopiomerkintä ei saisi alkaa /-merkillä: %s"
 
 msgid "Invalid syntax for optdepend : '%s'"
-msgstr "Vainnaisella riippuvuudella on väärän lainen syntaksi: '%s'"
+msgstr "Valinnaisella riippuvuudella on vääränlainen syntaksi: '%s'"
 
 msgid "%s file (%s) does not exist."
 msgstr "%s tiedostoa (%s) ei ole olemassa."
 
 msgid "options array contains unknown option '%s'"
-msgstr "options listassa on tuntematon valitsin '%s'"
+msgstr "options-listassa on tuntematon valitsin '%s'"
 
 msgid "missing package function for split package '%s'"
-msgstr "Jaetunpaketin '%s' pakkausfunktio puuttu"
+msgstr "Jaetun paketin '%s' pakkausfunktio puuttuu"
 
 msgid "requested package %s is not provided in %s"
 msgstr "pyydettiin pakettia %s, mutta paketti %s ei sisällä sitä"
 
 msgid "Determining latest %s revision..."
-msgstr "Etsitään uusinta versiota kohteelle %s..."
+msgstr "Etsitään uusinta %s-versiota..."
 
 msgid "Version found: %s"
 msgstr "Löydetty versio: %s"
 
 msgid "requires an argument"
-msgstr "vaatii valitsimen"
+msgstr "vaatii parametrin"
 
 msgid "unrecognized option"
 msgstr "tunnistamaton valitsin"
@@ -1340,7 +1340,7 @@ msgstr "Valitsimet:"
 
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr ""
-"  -A, --ignorearch älä ota huomioon puutteelista arkkitehtuuri listaa "
+"  -A, --ignorearch älä ota huomioon puutteellista arkkitehtuurikenttää "
 "kohteessa %s"
 
 msgid "  -c, --clean      Clean up work files after build"
@@ -1354,7 +1354,7 @@ msgstr "  -d, --nodeps     Ohita riippuvuustarkastukset"
 
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
-"  -e,  --noextract  Älä pura lähdetiedostoja (käytä olemassa olevaa src/ "
+"  -e,  --noextract  Älä pura lähdetiedostoja (käytä olemassa olevaa src/-"
 "kansiota)"
 
 msgid "  -f, --force      Overwrite existing package"
@@ -1381,14 +1381,14 @@ msgstr ""
 
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr ""
-"  -p <tiedosto>    Käytä vaihtoehtoista käännös scriptiä ('%s':in sjaan)"
+"  -p <tiedosto>    Käytä vaihtoehtoista käännösskriptiä ('%s':in sjaan)"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     Poista asennetut riippuvuudet kääntämisen jälkeen"
 
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr "  -R, --repackage  Uudelleen pakkaa paketin sisältö ilman kääntämistä"
+msgstr "  -R, --repackage  Uudelleenpakkaa paketin sisältö ilman kääntämistä"
 
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Asenna puuttuvat riippuvuudet pacmanin avulla"
@@ -1405,11 +1405,11 @@ msgstr ""
 "  --asroot          Salli makepkg:n suorittaminen ylläpitäjän oikeuksilla"
 
 msgid "  --check          Run the check() function in the %s"
-msgstr "  --check          Suorita tarkastus funktio check() kohteessa %s"
+msgstr "  --check          Suorita funktio check() kohteessa %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
-"--config<tiedosto> Käytä vaihtoehtoista asetus tiedostoa ('%s':in sijaan)"
+"  --config<tiedosto> Käytä vaihtoehtoista asetustiedostoa ('%s':in sijaan)"
 
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
@@ -1417,8 +1417,7 @@ msgstr ""
 "  --holdver        Estää automaattisen version muutoksen kehittämiseen %ss"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr ""
-"  --nocheck        Älä suorita tarkastus funktiota check() kohteessa %s"
+msgstr "  --nocheck        Älä suorita funktiota check() kohteessa %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <lista>    Käännä vain listatut paketit jaetustapaketista"
@@ -1431,14 +1430,14 @@ msgid ""
 msgstr "  --source         Luo lähdepaketti ilman ladattuja lähdetiedostoja"
 
 msgid "These options can be passed to pacman:"
-msgstr "Seuraavat valitsimet voidaan nataa pacmanille:"
+msgstr "Seuraavat valitsimet voidaan anaa pacmanille:"
 
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "  --noconfirm      Älä kysy vahvistusta riippuvuuksia setvittäessä"
 
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr "  --noprogressbar   Älä näytä edistymisplkkia tiedostoja ladattaessa"
+msgstr "  --noprogressbar   Älä näytä edistymispalkkia tiedostoja ladattaessa"
 
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "jos -p:tä ei ole määritelty, niin makepkg etsii '%s' tiedostoa"
@@ -1449,10 +1448,10 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Tekijänoikeudet (c) 2006-2011 Pacmanin kehitys tiimi <pacman-dev@archlinux."
+"Tekijänoikeudet (c) 2006-2011 Pacmanin kehitystiimi <pacman-dev@archlinux."
 "org>.\\nTekijänoikeudet (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\nTämä on ilmainen ohjelmisto; katso kopioimis ehdot lähdekoodista."
-"\\nMitään takuita ei anneta, lain rajoissa.\\n"
+"\\nTämä on ilmainen ohjelmisto; katso kopioimisehdot lähdekoodista.\\nMitään "
+"takuita ei anneta, lain rajoissa.\\n"
 
 msgid "%s not found."
 msgstr "%s löytyi."
@@ -1464,7 +1463,8 @@ msgid "You do not have write permission to store downloads in %s."
 msgstr "Sinulla ei ole oikeuksia säilöä latauksia sijainnissa %s."
 
 msgid "\\0--holdver and --forcever cannot both be specified"
-msgstr "\\0valitsimi --holdver ja --forcever ei voida määrittää samaan aikaan."
+msgstr ""
+"\\0valitsimia --holdver ja --forcever ei voida määrittää samaan aikaan."
 
 msgid "Cleaning up ALL files from %s."
 msgstr "Siivoa KAIKKI tiedostot kansiosta '%s'"
@@ -1474,17 +1474,17 @@ msgstr "    Oletko varma tästä? "
 
 msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr ""
-"Virhe tiedostoja poistettaessa; sinulla ei saata ollatarvittavia oikeuksia "
+"Virhe tiedostoja poistettaessa; sinulla ei saata olla tarvittavia oikeuksia "
 "%s kansioon"
 
 msgid "Source cache cleaned."
-msgstr "Lähde välimuisti tyhjennetty."
+msgstr "Lähdevälimuisti tyhjennetty."
 
 msgid "No files have been removed."
-msgstr "Yhtään tiedostoa ei ole poistettu."
+msgstr "Yhtään tiedostoa ei poistettu."
 
 msgid "Source destination must be defined in %s."
-msgstr "Lähdetiedostojen tallennus kansio pitää määritää %s:issa."
+msgstr "Lähdetiedostojen tallennuskansio pitää määritää %s:issa."
 
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr "Äläkä suorita makepkg -C komentoa välimuistikansiossasi."
@@ -1496,19 +1496,19 @@ msgid "permanent, catastrophic damage to your system. If you"
 msgstr "Se voi aiheuttaa katastrofaalista tuhoa järjestelmääsi."
 
 msgid "wish to run as root, please use the --asroot option."
-msgstr "Jos tahdot suorittaa makepkg:n ylääpitäjänä käytä --asroot valitsinta."
+msgstr "Jos tahdot suorittaa makepkg:n ylläpitäjänä käytä --asroot-valitsinta."
 
 msgid "The --asroot option is meant for the root user only."
-msgstr "--asroot valitsin on tarkoitettu vain ylläpitäjälle."
+msgstr "--asroot-valitsin on tarkoitettu vain ylläpitäjälle."
 
 msgid "Please rerun makepkg without the --asroot flag."
-msgstr "Suorita makepkg uudelleen ilman --asroot valitsinta."
+msgstr "Suorita makepkg uudelleen ilman --asroot-valitsinta."
 
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
 msgstr "Jos tahdot käyttää 'fakeroot' valitsinta BUILDENV listassa"
 
 msgid "in the BUILDENV array in %s."
-msgstr "asetus tiedossa %s. Niin tulee sinun asentaa fakeroot järjestelmääsi."
+msgstr "asetus tiedossa %s. Niin sinun tulee asentaa fakeroot järjestelmääsi."
 
 msgid "Running makepkg as an unprivileged user will result in non-root"
 msgstr "Makepkg:n suorittaminen peruskäyttäjänä johtaa siihen että"
@@ -1518,21 +1518,21 @@ msgstr "root-käyttäjä ei ole paketoitujen tedostojen omistaja. Yritä"
 
 msgid "placing 'fakeroot' in the BUILDENV array in %s."
 msgstr ""
-"käyttää fakeroot ympäristöä lisäämällä 'faceroot' %s tiedoston\n"
-"BUILDENV listaan."
+"käyttää fakeroot-ympäristöä lisäämällä 'fakeroot' %s tiedoston\n"
+"BUILDENV-listaan."
 
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "Älä käytä '-F' valitsinta. Vain makepkg käyttää sitä.."
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
 msgstr ""
-"Sudoa ei löydy. Käytetään su komentoa ylläpitäjän oikeuksien saamiseksi."
+"Sudoa ei löydy. Käytetään su-komentoa ylläpitäjän oikeuksien saamiseksi."
 
 msgid "%s does not exist."
 msgstr "%s ei ole olemassa."
 
 msgid "%s contains CRLF characters and cannot be sourced."
-msgstr "%s sisältää CRLF merkkejä eikä sitä voida siksi lukea."
+msgstr "%s sisältää CRLF-merkkejä eikä sitä voida siksi lukea."
 
 msgid "A package has already been built, installing existing package..."
 msgstr "Paketti on jo käännetty. Asennetaan valmista pakettia..."
@@ -1560,10 +1560,10 @@ msgid "Repackaging without the use of a package() function is deprecated."
 msgstr "Uudelleenpakkaaminen ilman pakkausfunktio package():ta on vanhentunut."
 
 msgid "File permissions may not be preserved."
-msgstr "Tiedostojen omistusuhteet saattavat kärsiä."
+msgstr "Tiedostojen omistussuhteet saattavat kärsiä."
 
 msgid "Leaving fakeroot environment."
-msgstr "Poistutaan fakeroot ympäristöstä."
+msgstr "Poistutaan fakeroot-ympäristöstä."
 
 msgid "Making package: %s"
 msgstr "Käännetään pakettia: %s"
@@ -1577,7 +1577,7 @@ msgid "Source package created: %s"
 msgstr "Luotiin lähdepaketti: %s"
 
 msgid "Skipping dependency checks."
-msgstr "Ohitetaan riippuvuus tarkastukset."
+msgstr "Ohitetaan riippuvuustarkastukset."
 
 msgid "Checking runtime dependencies..."
 msgstr "Tarkastetaan yleisriippuvuuksia..."
@@ -1590,23 +1590,23 @@ msgstr "Kaikkia riippuvuuksia ei pystytty selvittämään."
 
 msgid "%s was not found in PATH; skipping dependency checks."
 msgstr ""
-"ohjelmaa %s ei löydy PATH muuttujan määrittämistä kansioista; ohitetana "
-"riippuvuus tarkastukset."
+"ohjelmaa %s ei löydy PATH-muuttujan määrittämistä kansioista; ohitetaan "
+"riippuvuustarkastukset."
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
 "Ohitetaan lähdepakettien lataaminen                   -- käytetään olemassa "
-"oelvaa src/ kansiota"
+"olevaa src/-kansiota"
 
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
 "Ohitetaan lähdepakettien virheellisyyden tarkastaminen -- käytetään olemassa "
-"olevaa src/ kansiota"
+"olevaa src/-kansiota"
 
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr ""
 "Ohitettaan lähdepakettien purkaminen                   -- käytetään olemassa "
-"olevaa src/ kansiota"
+"olevaa src/-kansiota"
 
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "Lähdekansio on tyhjä, ei ole mitään käännettävää."
@@ -1618,29 +1618,32 @@ msgid "Sources are ready."
 msgstr "Lähdetiedostot ovat valmiita."
 
 msgid "Removing existing pkg/ directory..."
-msgstr "Poistetaan jo olemessaolevaa pkg/ kansiota..."
+msgstr "Poistetaan jo olemassaolevaa pkg/-kansiota..."
 
 msgid "Entering fakeroot environment..."
-msgstr "Siirrytään fakeroot ympäristöön..."
+msgstr "Siirrytään fakeroot-ympäristöön..."
 
 msgid "Finished making: %s"
 msgstr "Saatiin valmiiksi paketti: %s"
 
 msgid "Usage: %s [pacman_db_root]"
-msgstr "Käyttö: %s [pacman_tietokanan_juuri]"
+msgstr "Käyttö: %s [pacman_tietokannan_juuri]"
 
 msgid ""
 "Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Tekijänoikeudet (c) 2010-2011 Pacmanin kehitys tiimi <pacman-dev@archlinux."
-"org>.\\nTämä on ilmainen ohjelmisto; katso kopioimis ehdot lähdekoodista."
+"Tekijänoikeudet (c) 2010-2011 Pacmanin kehitystiimi <pacman-dev@archlinux."
+"org>.\\nTämä on ilmainen ohjelmisto; katso kopioimisehdot lähdekoodista."
 "\\nMitään takuita ei anneta, lain rajoissa.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s ei ole olemassa, tai se ei ole kansio."
 
+msgid "%s is not a pacman database directory."
+msgstr ""
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Sinulla tulee olla oikeat oikeudet tietokannan päivittämiseen."
 
@@ -1660,7 +1663,7 @@ msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
 msgstr ""
-"pacman-optimize on pikkuinen scripti, jonka tarkoituksena\\non kohentaa "
+"pacman-optimize on pikkuinen skripti, jonka tarkoituksena\\non kohentaa "
 "pacmanin suorituskykyä,\\nluettaessa ja kirjoitettaessa sen tietokantaa.\\n"
 "\\n"
 
@@ -1674,12 +1677,12 @@ msgid ""
 msgstr ""
 "Koska pacman pitää kirjaa paketeista monien pienten tiedostojen\\navulla, "
 "niin saattavat nämä tiedostot kertyä ympäri kiintolevyä\\najan kuluessa. "
-"Tämän scriptin tarkoituksena on tuoda nämä tiedostot\\nyhteen ja samaan "
+"Tämän skriptin tarkoituksena on tuoda nämä tiedostot\\nyhteen ja samaan "
 "paikkaan kiintolevyllä.\\nNäin ollen pacmanilta menee vähemmän aikaa löytää "
 "ne.\\n\\n"
 
 msgid "diff tool was not found, please install diffutils."
-msgstr "diff työkalua ei löydy. Asenna diffyutils paketti."
+msgstr "diff työkalua ei löydy. Asenna diffutils-paketti."
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "Sinulla tulee olla kunnolliset oikeudet tietokannan optimoimiseen."
@@ -1690,7 +1693,7 @@ msgstr ""
 "luoda."
 
 msgid "MD5sum'ing the old database..."
-msgstr "Luodaan md5 summaa vanhasta tietokannasta..."
+msgstr "Luodaan md5-summaa vanhasta tietokannasta..."
 
 msgid "Tar'ing up %s..."
 msgstr "Tar-arkistoidaan %s"
@@ -1699,7 +1702,7 @@ msgid "Tar'ing up %s failed."
 msgstr "%s:n tar-arkistointi epäonnistui."
 
 msgid "Making and MD5sum'ing the new database..."
-msgstr "Luodaan uutta tietokantaa ja sen md5 summia..."
+msgstr "Luodaan uutta tietokantaa ja sen md5-summia..."
 
 msgid "Untar'ing %s failed."
 msgstr "%s:n purkaminen tar-arkistosta epäonnistui."
@@ -1714,7 +1717,7 @@ msgid "Integrity check FAILED, reverting to old database."
 msgstr "Uusi tietokanta on VIRHEELLINEN, palautetaan vanhaa tietokantaa..."
 
 msgid "Rotating database into place..."
-msgstr "Pyöritellään tietokantaa pakalleen..."
+msgstr "Pyöritellään tietokantaa paikalleen..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Valmis. Pakettitietokantasi on nyt optimoitu."
@@ -1727,7 +1730,7 @@ msgid ""
 "can then be added to a database using repo-add.\\n\\n"
 msgstr ""
 "\tpkgdelta luo kahden tiedoston välisen deltatiedoston.\\nTämä deltatiedosto "
-"voidaan sitten lisätä pakettitietokantaan\\nkäyttäen repo-add ohjelmaa.\\n\\n"
+"voidaan sitten lisätä pakettitietokantaan\\nkäyttäen repo-add-ohjelmaa.\\n\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Esimerkki:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1738,8 +1741,8 @@ msgid ""
 "the extent permitted by law.\\n"
 msgstr ""
 "Tekijänoikeudet (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nTämä on "
-"ilmainen ohjelmito, katso kopionti ehdot lähdekoodista.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"ilmainen ohjelmito, katso kopiontiehdot lähdekoodista.\\nMitään takuita ei "
+"anneta, lain rajoissa.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Pakettitiedosto '%s' ei ole kelvollinen."
@@ -1766,7 +1769,7 @@ msgid "File '%s' does not exist"
 msgstr "Tiedostoa '%s' ei ole olemassa"
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
-msgstr "Xdelta3 ohjelmaa ei löydy! Onko xdelta3 asennettuna?"
+msgstr "Xdelta3-ohjelmaa ei löydy! Onko xdelta3 asennettuna?"
 
 msgid "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
 msgstr ""
@@ -1780,7 +1783,7 @@ msgid ""
 "repo-add will update a package database by reading a package file."
 "\\nMultiple packages to add can be specified on the command line.\\n\\n"
 msgstr ""
-"repo-add päivitää pakettitietokannan lukemalla pakettitiedoston."
+"repo-add päivittää pakettitietokannan lukemalla pakettitiedoston."
 "\\nKomentorivillä voidaan määrittää useampia paketteja kerrallaan.\\n\\n"
 
 msgid ""
@@ -1802,15 +1805,15 @@ msgid ""
 "\\nbetween the old entry and the new one, if the old package file is found"
 "\\nnext to the new one.\\n\\n"
 msgstr ""
-"Käytä -d/--delta valitsinta luodaksesi automaatisesti deltan\\nvanhan ja "
-"uuden titokantamerkinnän välille, jos sekä vanha\\nettä uusi paketti on "
+"Käytä -d/--delta valitsinta luodaksesi automaattisesti deltan\\nvanhan ja "
+"uuden tietokantamerkinnän välille, jos sekä vanha\\nettä uusi paketti on "
 "saatavilla.\\n\\n"
 
 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
 msgstr ""
-"Käytä -f/--files valitsinta päivittääksesi tietokannan sekä tiedosto "
-"merkinnät.\\n\\n"
+"Käytä -f/--files valitsinta päivittääksesi tietokannan sekä "
+"tiedostomerkinnät.\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr ""
@@ -1835,7 +1838,7 @@ msgid "No database entry for package '%s'."
 msgstr "Paketilla '%s' ei ole merkintää tietokannassa."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr "Lisätään 'deltan' merkintää: %s -> %s"
+msgstr "Lisätään 'deltas'-merkintää: %s -> %s"
 
 msgid "Removing existing entry '%s'..."
 msgstr "Poistetaan pakettia '%s' tietokannasta..."
@@ -1844,10 +1847,10 @@ msgid "An entry for '%s' already existed"
 msgstr "Paketti '%s' on jo tietokannassa"
 
 msgid "Creating '%s' db entry..."
-msgstr "Luodaan kohteen '%s' tietokanta merkintää.."
+msgstr "Luodaan tietokantamerkintää '%s'.."
 
 msgid "Computing md5 checksums..."
-msgstr "Lasketaan md5 summia..."
+msgstr "Lasketaan md5-summia..."
 
 msgid "Old package file not found: %s"
 msgstr "Vanhaa pakettia ei löydy: %s"
@@ -1860,7 +1863,7 @@ msgstr "Prosessin %s hallinnassa"
 
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr ""
-"Pakettivarastotiedosto '%s' ei ole kelvollinen pacmnin pakettitietokanta."
+"Pakettivarastotiedosto '%s' ei ole kelvollinen pacmanin pakettitietokanta."
 
 msgid "Extracting database to a temporary location..."
 msgstr "Puretaan tietokantaa väliaikaiseen sijaintiin..."
@@ -1902,7 +1905,7 @@ msgid "Cannot create temp directory for database building."
 msgstr "Tietokannan luontiin tarvittavaa väliaikaiskansiota ei voida luoda."
 
 msgid "Creating updated database file '%s'"
-msgstr "Luodaan päivitettyä tietokanta tiedostoa '%s'"
+msgstr "Luodaan päivitettyä tietokantatiedostoa '%s'"
 
 msgid "'%s' does not have a valid archive extension."
 msgstr "kohteella '%s' ei ole kelvollista arkistopäätettä."

po/fr.po

@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# shining <chantry.xavier@gmail.com>, 2011
+# Dan McGee <dpmcgee@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 22:43+0000\n"
-"Last-Translator: shining <chantry.xavier@gmail.com>\n"
-"Language-Team: French <>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-06-03 20:24+0000\n"
+"Last-Translator: remyoudompheng <remy@archlinux.org>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/"
+"team/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,47 +21,47 @@ msgstr ""
 
 #, c-format
 msgid "checking dependencies...\n"
-msgstr "Vérification des dépendances...\n"
+msgstr "vérification des dépendances...\n"
 
 #, c-format
 msgid "checking for file conflicts...\n"
-msgstr "Recherche des conflits entre fichiers...\n"
+msgstr "recherche des conflits entre fichiers...\n"
 
 #, c-format
 msgid "resolving dependencies...\n"
-msgstr "Résolution des dépendances...\n"
+msgstr "résolution des dépendances...\n"
 
 #, c-format
 msgid "looking for inter-conflicts...\n"
-msgstr "Recherche des conflits possibles entre paquets...\n"
+msgstr "recherche des conflits entre paquets...\n"
 
 #, c-format
 msgid "installing %s...\n"
-msgstr "Installation de %s...\n"
+msgstr "installation de %s...\n"
 
 #, c-format
 msgid "removing %s...\n"
-msgstr "Désinstallation de %s...\n"
+msgstr "désinstallation de %s...\n"
 
 #, c-format
 msgid "upgrading %s...\n"
-msgstr "Mise à jour de %s...\n"
+msgstr "mise à jour de %s...\n"
 
 #, c-format
 msgid "checking package integrity...\n"
-msgstr "Analyse de l'intégrité des paquets...\n"
+msgstr "analyse de l'intégrité des paquets...\n"
 
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr "Analyse de l'intégrité des deltas...\n"
+msgstr "analyse de l'intégrité des deltas...\n"
 
 #, c-format
 msgid "applying deltas...\n"
-msgstr "Application des deltas...\n"
+msgstr "application des deltas...\n"
 
 #, c-format
 msgid "generating %s with %s... "
-msgstr "Génération de %s avec %s... "
+msgstr "génération de %s avec %s... "
 
 #, c-format
 msgid "success!\n"
@@ -67,7 +69,7 @@ msgstr "succès !\n"
 
 #, c-format
 msgid "failed.\n"
-msgstr "Échec.\n"
+msgstr "échec.\n"
 
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
@@ -130,19 +132,19 @@ msgstr ":: L'archive %s est corrompue. Voulez-vous l'effacer ?"
 
 #, c-format
 msgid "installing"
-msgstr "Installation de"
+msgstr "installation de"
 
 #, c-format
 msgid "upgrading"
-msgstr "Mise à jour de"
+msgstr "mise à jour de"
 
 #, c-format
 msgid "removing"
-msgstr "Désinstallation de"
+msgstr "désinstallation de"
 
 #, c-format
 msgid "checking for file conflicts"
-msgstr "Analyse des conflits entre fichiers"
+msgstr "analyse des conflits entre fichiers"
 
 #, c-format
 msgid "checking available disk space"
@@ -166,16 +168,15 @@ msgstr "aucune cible spécifiée (utiliser -h pour l'aide)\n"
 
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr "pas d'origine d'installation spécifiée (-h pour l'aide)\n"
+msgstr "aucun motif d'installation spécifié (-h pour l'aide)\n"
 
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
-"impossible de changer l'origine d'installation pour le paquet %s (%s)\n"
+msgstr "impossible de changer le motif d'installation pour le paquet %s (%s)\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr "%s: paquet marqué comme étant une dépendance\n"
+msgstr "%s : paquet marqué comme installé en tant que dépendance\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
@@ -239,7 +240,7 @@ msgstr "Remplace              :"
 
 #, c-format
 msgid "Download Size  : %6.2f K\n"
-msgstr "A télécharger         : %6.2f K\n"
+msgstr "Taille (à télécharger): %6.2f K\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
@@ -303,7 +304,7 @@ msgstr "Fichiers de sauvegarde:\n"
 
 #, c-format
 msgid "(none)\n"
-msgstr "(Aucun)\n"
+msgstr "(aucun)\n"
 
 #, c-format
 msgid "no changelog available for '%s'.\n"
@@ -350,23 +351,20 @@ msgstr ""
 "dépendent\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr ""
-"  -n, --nosave             supprime aussi les fichiers de configuration\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave             supprime les fichiers de configuration\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive          supprime également les dépendances (inutilisées "
-"par d'autres paquets)\n"
-"                           (-ss inclut aussi les dépendances explicitement "
-"installées)\n"
+"  -s, --recursive          supprime les dépendances inutiles\n"
+"                           (-ss inclut les dépendances installées "
+"explicitement)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr "  -u, --unneeded           supprime les paquets inutiles\n"
 
 #, c-format
@@ -547,13 +545,17 @@ msgstr ""
 "utilisé plusieurs fois)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps             ne vérifie pas les dépendances\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps             ignore les versions des dépendances\n"
+"                           (-dd pour ignorer complètement toute dépendance)\n"
 
 #, c-format
 msgid ""
 "  -k, --dbonly         only modify database entries, not package files\n"
-msgstr "  -k, --dbonly             modifie uniquement la base de donnée\n"
+msgstr "  -k, --dbonly             modifie uniquement la base de données\n"
 
 #, c-format
 msgid ""
@@ -571,7 +573,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
 "      --print              affiche les cibles sans exécuter l'opération\n"
@@ -640,7 +642,7 @@ msgstr "problème en définissant le dossier de la base de données '%s' (%s)\n"
 
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
-msgstr "problème avec logfile '%s' (%s)\n"
+msgstr "problème en définissant le chemin du fichier de log '%s' (%s)\n"
 
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
@@ -668,7 +670,7 @@ msgstr "impossible de déterminer le répertoire courant\n"
 
 #, c-format
 msgid "could not chdir to download directory %s\n"
-msgstr "le déplacement vers le répertoire de téléchargement %s a échoué\n"
+msgstr "impossible de se placer dans le répertoire de téléchargement %s\n"
 
 #, c-format
 msgid "running XferCommand: fork failed!\n"
@@ -701,7 +703,7 @@ msgstr ""
 
 #, c-format
 msgid "config file %s could not be read.\n"
-msgstr "Le fichier de configuration %s n'a pas pu être lu.\n"
+msgstr "le fichier de configuration %s n'a pas pu être lu.\n"
 
 #, c-format
 msgid "config file %s, line %d: bad section name.\n"
@@ -738,7 +740,7 @@ msgstr "débordement de tampon détecté en parsant les arguments\n"
 
 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
-msgstr "impossible de lire l'entrée standard: (%s)\n"
+msgstr "impossible de lire l'entrée standard  : (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
@@ -748,6 +750,10 @@ msgstr "vous ne pouvez pas effectuer cette opération à moins d'être root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "aucune opération spécifiée (utiliser -h pour l'aide)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s appartient à %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "aucun fichier spécifié pour --owns\n"
@@ -772,10 +778,6 @@ msgstr "ne peut déterminer le vrai chemin pour '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr "chemin trop long: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s appartient à %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "aucun paquet ne contient %s\n"
@@ -1224,12 +1226,10 @@ msgid "Purging other files..."
 msgstr "Suppression d'autres fichiers..."
 
 msgid "Compressing man and info pages..."
-msgstr "Compression des man/info pages..."
+msgstr "Compression des pages de man/info..."
 
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Strip des symboles de débogage inutiles dans les binaires et les "
-"bibliothèques..."
+msgstr "Strip des symboles inutiles dans les binaires et les bibliothèques..."
 
 msgid "Removing libtool .la files..."
 msgstr "Suppression des fichiers libtool .la..."
@@ -1244,7 +1244,7 @@ msgid "Please add a license line to your %s!"
 msgstr "Veuillez ajouter une ligne license à votre %s !"
 
 msgid "Example for GPL'ed software: license=('GPL')."
-msgstr "Exemple pour les logiciels GPL: license=('GPL')."
+msgstr "Exemple pour les logiciels GPL : license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
 msgstr "Cette entrée backup est introuvable dans le paquet : %s"
@@ -1268,13 +1268,13 @@ msgid "'%s' is not a valid archive extension."
 msgstr "'%s' n'est pas pas une extension valide pour une archive."
 
 msgid "Failed to create package file."
-msgstr "Echec à la création du paquet."
+msgstr "Échec à la création du paquet."
 
 msgid "Failed to create symlink to package file."
 msgstr "Impossible de créer un lien vers le paquet."
 
 msgid "Skipping integrity checks."
-msgstr "Ignore les sommes d'intégrité."
+msgstr "Vérifications d'intégrité ignorées."
 
 msgid "Creating source package..."
 msgstr "Création du paquet source..."
@@ -1301,7 +1301,7 @@ msgid "Installing %s package group with %s -U..."
 msgstr "Installation du groupe %s avec %s -U..."
 
 msgid "Failed to install built package(s)."
-msgstr "Echec à l'installation des paquets."
+msgstr "Échec à l'installation des paquets."
 
 msgid "%s is not allowed to be empty."
 msgstr "%s ne peut pas être vide."
@@ -1335,16 +1335,16 @@ msgid "Backup entry should not contain leading slash : %s"
 msgstr "L'entrée backup ne doit pas commencer par une barre oblique : %s"
 
 msgid "Invalid syntax for optdepend : '%s'"
-msgstr "syntaxe invalide pour 'optdepend' : '%s'"
+msgstr "Syntaxe invalide pour 'optdepend' : '%s'"
 
 msgid "%s file (%s) does not exist."
-msgstr "Le fichier %s (%s) n'a pas été trouvé."
+msgstr "Le fichier %s (%s) n'existe pas."
 
 msgid "options array contains unknown option '%s'"
 msgstr "Le champ options contient une option inconnue : '%s'"
 
 msgid "missing package function for split package '%s'"
-msgstr "il manque la fonction package pour le paquet splitté '%s'"
+msgstr "fonction package manquante dans le sous-paquet '%s'"
 
 msgid "requested package %s is not provided in %s"
 msgstr "le paquet demandé %s n'existe pas dans %s"
@@ -1371,16 +1371,16 @@ msgid "Options:"
 msgstr "Options:"
 
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
-msgstr "  -A, --ignorearch Ignore une entrée arch incomplète dans %s"
+msgstr "  -A, --ignorearch Ignorer une entrée arch incomplète dans %s"
 
 msgid "  -c, --clean      Clean up work files after build"
-msgstr "  -c, --clean      Nettoyage des fichiers après compilation"
+msgstr "  -c, --clean      Nettoyer les fichiers après compilation"
 
 msgid "  -C, --cleancache Clean up source files from the cache"
-msgstr "  -C, --cleancache Nettoie les fichiers source dans le cache"
+msgstr "  -C, --cleancache Nettoyer les fichiers source dans le cache"
 
 msgid "  -d, --nodeps     Skip all dependency checks"
-msgstr "  -d, --nodeps     Ne vérifie pas les dépendances"
+msgstr "  -d, --nodeps     Ne pas vérifier les dépendances"
 
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
@@ -1388,16 +1388,16 @@ msgstr ""
 "existant)"
 
 msgid "  -f, --force      Overwrite existing package"
-msgstr "  -f, --force      Ecrase le paquet existant"
+msgstr "  -f, --force      Écraser le paquet existant"
 
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Générer les sommes d'intégrité des sources"
 
 msgid "  -h, --help       This help"
-msgstr "  -h, --help       Cette aide"
+msgstr "  -h, --help       Afficher cette aide"
 
 msgid "  -i, --install    Install package after successful build"
-msgstr "  -i, --install    Installe le paquet après une compilation réussie"
+msgstr "  -i, --install    Installer le paquet après une compilation réussie"
 
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        Log la compilation du paquet"
@@ -1406,35 +1406,36 @@ msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Ne pas colorer les messages de sortie"
 
 msgid "  -o, --nobuild    Download and extract files only"
-msgstr "  -o, --nobuild    Seulement téléchargement et extraction des fichiers"
+msgstr ""
+"  -o, --nobuild    Effectuer seulement le téléchargement\n"
+"                   et l'extraction des fichiers"
 
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr "  -p <file>        Utilise un script alternatif (à la place de '%s')"
+msgstr "  -p <file>        Utiliser un script alternatif (au lieu de '%s')"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr ""
-"  -r, --rmdeps     Supprime les dépendances installées après une compilation "
-"réussie"
+"  -r, --rmdeps     Supprimer les dépendances installées après une\n"
+"                   compilation réussie"
 
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr "  -R, --repackage  Recréation du paquet sans recompiler"
+msgstr "  -R, --repackage  Recréer le paquet sans recompiler"
 
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
-msgstr "  -s, --syncdeps   Installe les dépendances manquantes avec pacman"
+msgstr "  -s, --syncdeps   Installer les dépendances manquantes avec pacman"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
-"  --allsource      Génère une archive source incluant les sources "
-"téléchargées"
+"  --allsource      Créer une archive source incluant les sources téléchargées"
 
 msgid "  --asroot         Allow makepkg to run as root user"
-msgstr "  --asroot         Autorise makepkg à s'exécuter en root"
+msgstr "  --asroot         Autoriser makepkg à s'exécuter en root"
 
 msgid "  --check          Run the check() function in the %s"
-msgstr "  --check          Lance la fonction check() dans le %s"
+msgstr "  --check          Lancer la fonction check() dans le %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
@@ -1444,11 +1445,11 @@ msgstr ""
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
-"  --holdver        Ne change pas automatiquement la version pour les %ss de "
-"développement"
+"  --holdver        Ne pas changer automatiquement la version pour\n"
+"                   les %ss de développement"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr "  --nocheck        Ne lance pas la fonction check() dans le %s"
+msgstr "  --nocheck        Ne pas lancer la fonction check() dans le %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr ""
@@ -1463,22 +1464,22 @@ msgstr ""
 msgid ""
 "  --source         Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source         Génère une archive source sans les sources téléchargées"
+"  --source         Générer une archive source sans les sources téléchargées"
 
 msgid "These options can be passed to pacman:"
 msgstr "Ces options peuvent être passées à pacman:"
 
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr "  --noconfirm      Ne demande aucune confirmation"
+msgstr "  --noconfirm      Ne demander aucune confirmation"
 
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
-"  --noprogressbar  N'affiche pas la barre de progression pendant le "
-"téléchargement"
+"  --noprogressbar  Ne pas afficher la barre de progression pendant le\n"
+"                   téléchargement"
 
 msgid "If -p is not specified, makepkg will look for '%s'"
-msgstr "Si -p n'est pas spécifié, makepkg regardera seulement '%s'"
+msgstr "Si -p n'est pas spécifié, makepkg cherchera seulement '%s'"
 
 msgid ""
 "Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
@@ -1673,6 +1674,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "'%s' n'existe pas ou n'est pas un dossier."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s n'est pas un répertoire de dépôt pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 "Vous devez avoir les permissions suffisantes pour mettre à jour la base de "

po/hu.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-16 17:39+0000\n"
 "Last-Translator: ngaba <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team: Hungarian <None>\n"
 "Language: hu\n"
@@ -344,22 +344,20 @@ msgstr ""
 "  -c, --cascade        a csomagok és az őket igénylő csomagok eltávolítása\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         a konfigurációs fájlokat is törölje\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         törölje a konfigurációs fájlokat\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      a függőségeket is távolítsa el (melyeknél ez "
-"biztonságos)\n"
+"  -s, --recursive      a feleslegessé váló függőségeket is távolítsa el\n"
 "                       (-ss a kézzel telepített függőségeket is "
 "eltávolítja)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
 "  -u, --unneeded       a megmaradó csomagok által igényelt csomagok "
 "kihagyása\n"
@@ -525,8 +523,12 @@ msgstr ""
 "                       csoportfrissítés mellőzése (többször is használható)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         függőségi ellenőrzések kihagyása\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         függőségverzió-ellenőrzések kihagyása\n"
+"                       (-dd: minden függőség-ellenőrzés kihagyása)\n"
 
 #, c-format
 msgid ""
@@ -548,11 +550,10 @@ msgstr "      --noscriptlet    ne futtassa az install szkripteket\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          csak listázza a csomagokat a művelet végrehajtása "
-"helyett\n"
+"      --print          a célok listázása a művelet végrehajtása helyett\n"
 
 #, c-format
 msgid ""
@@ -722,6 +723,10 @@ msgstr "ez a művelet csak rendszergazdaként hajtható végre.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nincs megadva egyetlen művelet sem (használja a '-h'-t segítségért)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "a %s fájlt a %s %s tartalmazza\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nincs megadva fájl a --owns számára\n"
@@ -746,10 +751,6 @@ msgstr "nem állapítható meg a valódi útvonal a(z) '%s' számára: %s\n"
 msgid "path too long: %s%s\n"
 msgstr "az útvonal túl hosszú: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "a %s fájlt a %s %s tartalmazza\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Egyik csomag sem tartalmazza a következőt: %s\n"
@@ -1646,6 +1647,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "A %s nem létezik vagy nem egy könyvtár."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s nem pacman adatbáziskönyvtár."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Megfelelő jogosultságok kellenek az adatbázis frissítéséhez."
 

po/it.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-10 16:14+0000\n"
 "Last-Translator: giovanni <giovanni@archlinux.org>\n"
 "Language-Team: Italian <None>\n"
 "Language: it\n"
@@ -352,24 +352,20 @@ msgstr ""
 "essi\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         rimuove anche i file di configurazione\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         rimuove i file di configurazione\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      rimuove anche le dipendenze (non richieste altrove)\n"
-"                       (-ss include le dipendenze installate "
-"esplicitamente)\n"
+"  -s, --recursive      rimuove le dipendenze non necessarie\n"
+"                       (-ss include quelle installate esplicitamente)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       rimuove i pacchetti non necessari (non richiesti "
-"altrove)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       rimuove i pacchetti non necessari\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -542,8 +538,12 @@ msgstr ""
 "                       ignora l'aggiornamento di un gruppo\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         ignora i controlli sulle dipendenze\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         salta il controllo sulle versioni delle dipendenze (-"
+"dd salta tutti i controlli)\n"
 
 #, c-format
 msgid ""
@@ -564,11 +564,10 @@ msgstr "      --noscriptlet    non esegue un eventuale script di install\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          elenca solo i pacchetti invece di eseguire "
-"l'operazione\n"
+"      --print          visualizza i pacchetti senza effettuare operazioni\n"
 
 #, c-format
 msgid ""
@@ -747,6 +746,10 @@ msgstr "questa operazione è possibile solo da root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nessuna operazione specificata (usa -h per un aiuto)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s è contenuto in %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "non è stato specificato nessun file per --owns\n"
@@ -771,10 +774,6 @@ msgstr "impossibile determinare il percorso reale di '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr "il path è troppo lungo: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s è contenuto in %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Nessun pacchetto contiene %s\n"
@@ -792,7 +791,7 @@ msgstr[1] "%s: %d file totali, "
 #, c-format
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
-msgstr[0] "%d file mancente\n"
+msgstr[0] "%d file mancante\n"
 msgstr[1] "%d file mancanti\n"
 
 #, c-format
@@ -1675,6 +1674,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s non esiste o non è una directory."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s non è una directory di un database di pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Per aggiornare il database devi avere i corretti permessi."
 

po/kk.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-03-28 02:39+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Kazakh <None>\n"
 "Language: kk\n"
@@ -344,24 +344,18 @@ msgstr ""
 "өшіру\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         дестемен қоса баптаулар файлдарын өшіру\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr ""
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      тәуелділіктермен бірге өшіру (басқа дестелерге зиян "
-"келтірмесе)\n"
-"                       (-ss нақты орнатылған тәуелділіктерін қоса)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
-"  -u, --unneeded       керек емес дестелерді өшіру (бұл басқа дестелерге "
-"зиян келтірмейді)\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -527,8 +521,10 @@ msgstr ""
 "          жаңарту кезінде топты елемеу (бірнеше рет қолданылуы мүмкін)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         тәуелділіктерді тексермеу\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -549,11 +545,9 @@ msgstr "      --noscriptlet    орнату скриптері бар болса
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          әрекетті шынымен орындамай тек мақсаттар тізімін "
-"шығару\n"
 
 #, c-format
 msgid ""
@@ -718,6 +712,10 @@ msgstr "Бұл әрекетті жасай алмайсыз, өйткені сі
 msgid "no operation specified (use -h for help)\n"
 msgstr "әрекет көрсетілмеді (көмек үшін -h қолданыңыз)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s қазір %s %s иелігінде\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "--owns үшін файл көрсетілмеді\n"
@@ -742,10 +740,6 @@ msgstr "'%s' үшін шын жолды анықтау мүмкін емес: %s
 msgid "path too long: %s%s\n"
 msgstr "жол тым ұзын: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s қазір %s %s иелігінде\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Бірде-бір десте құрамында %s жоқ\n"
@@ -1628,6 +1622,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s жоқ болып тұр немесе ол бума емес."
 
+msgid "%s is not a pacman database directory."
+msgstr ""
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Дерекқорды жаңарту үшін сізде керек рұқсаттар болу тиіс."
 

po/nb.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 09:21+0000\n"
+"Last-Translator: Jonhoo <jon@thesquareplanet.com>\n"
+"Language-Team: Norwegian Bokmål <None>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,11 +71,11 @@ msgstr "feilet.\n"
 
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Mottar pakker fra %s ...\n"
+msgstr ":: Henter pakker fra %s ...\n"
 
 #, c-format
 msgid "checking available disk space...\n"
-msgstr ""
+msgstr "sjekker ledig diskplass...\n"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
@@ -87,11 +87,11 @@ msgstr ":: Bytt ut %s med %s/%s?"
 
 #, c-format
 msgid ":: %s and %s are in conflict. Remove %s?"
-msgstr ""
+msgstr ":: konflikt mellom %s og %s. Fjerne %s?"
 
 #, c-format
 msgid ":: %s and %s are in conflict (%s). Remove %s?"
-msgstr ""
+msgstr ":: konflikt mellom %s og %s (%s). Fjerne %s?"
 
 #, c-format
 msgid ""
@@ -101,17 +101,23 @@ msgid_plural ""
 ":: The following packages cannot be upgraded due to unresolvable "
 "dependencies:\n"
 msgstr[0] ""
+":: Den følgende pakken kunne ikke oppgraderes grunnet uoppfylte "
+"avhengigheter:\n"
 msgstr[1] ""
+":: De følgende pakkene kunne ikke oppgraderes grunnet uoppfylte "
+"avhengigheter:\n"
 
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
 msgstr[0] ""
+"Ønsker du å hoppe over den overnevnte pakken i denne oppgraderingen?"
 msgstr[1] ""
+"Ønsker du å hoppe over de overnevnte pakkene i denne oppgraderingen?"
 
 #, c-format
 msgid ":: There are %d providers available for %s:\n"
-msgstr ""
+msgstr ":: %d tilbydere av %s er tilgjengelig:\n"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
@@ -139,11 +145,11 @@ msgstr "leter etter filkonflikter"
 
 #, c-format
 msgid "checking available disk space"
-msgstr ""
+msgstr "sjekker ledig diskplass"
 
 #, c-format
 msgid "checking package integrity"
-msgstr ""
+msgstr "sjekker pakkeintegritet"
 
 #, c-format
 msgid "downloading %s...\n"
@@ -159,19 +165,19 @@ msgstr "ingen mål spesifisert (bruk -h for hjelp)\n"
 
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
+msgstr "ingen installasjonstype ble oppgitt (bruk  -h for hjelp)\n"
 
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
+msgstr "kunne ikke sette installasjonstype for pakke %s (%s)\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
+msgstr "%s: installasjonstype ble satt til 'installert som avhengighet'\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
+msgstr "%s: installasjonstype ble satt til 'manuelt installert'\n"
 
 #, c-format
 msgid "Explicitly installed"
@@ -227,7 +233,7 @@ msgstr "Strider med    :"
 
 #, c-format
 msgid "Replaces       :"
-msgstr "Tar over for   :"
+msgstr "Erstatter   :"
 
 #, c-format
 msgid "Download Size  : %6.2f K\n"
@@ -340,24 +346,20 @@ msgid ""
 msgstr "  -c, --cascade      fjern pakker og alle pakker som avhenger av dem\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         fjerner konfigurasjonsfiler i tillegg\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         fjern konfigurasjonsfiler\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive    fjern avhengigheter i tillegg (som ikke ødelegger "
-"pakker)\n"
-"        (-ss inkluderer manuelt installerte avhengigheter i tillegg)\n"
+"  -s, --recursive      fjern unødvendige avhengigheter \n"
+"                       (-ss inkluderer manuelt installerte avhengigheter)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded    fjerner unødvendige pakker (som ikke ødelegger for andre "
-"pakker)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       fjern unødvendige pakker\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -481,11 +483,11 @@ msgstr "      --needed         ikke reinstaller pakker som er oppdaterte\n"
 
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
+msgstr "      --asdeps         marker pakker som ikke eksplisitt installert\n"
 
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
+msgstr "      --asexplicit     marker pakker som eksplisitt installert\n"
 
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
@@ -519,13 +521,17 @@ msgstr ""
 "én gang)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         hopper over sjekking av avhengigheter\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         hopp over versjonssjekk for avhengigheter (-dd for å "
+"hoppe over all sjekker)\n"
 
 #, c-format
 msgid ""
 "  -k, --dbonly         only modify database entries, not package files\n"
-msgstr ""
+msgstr "  -k, --dbonly         bare endre databasedata, ikke pakkefilene\n"
 
 #, c-format
 msgid ""
@@ -539,15 +545,18 @@ msgstr "    --noscriptlet     ikke kjør install-scriptet hvis det eksisterer\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
+"      --print          skriv ut målene istedenfor å utføre handlingen\n"
 
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
 msgstr ""
+"      --print-format <string>\n"
+"                       oppgir hvordan målene skal bli vist\n"
 
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
@@ -563,7 +572,7 @@ msgstr "  -v, --verbose        vær utdypende\n"
 
 #, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr ""
+msgstr "      --arch <arch>    set en alternativ arkitektur\n"
 
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
@@ -623,7 +632,7 @@ msgstr "kun én operasjon kan bli brukt av gangen\n"
 
 #, c-format
 msgid "invalid option\n"
-msgstr ""
+msgstr "ugyldig valg\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -631,7 +640,7 @@ msgstr "invalid verdi for 'CleanMethod' : '%s'\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr ""
+msgstr "kunne ikke avgjøre arbeidsmappe\n"
 
 #, c-format
 msgid "could not chdir to download directory %s\n"
@@ -643,18 +652,22 @@ msgstr "kjører XferCommand: splitting feilet\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
+msgstr "kunne ikke endre mappe til %s (%s)\n"
 
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""
+"konfigurasjonsfil %s, linje %d: direktiv '%s' i seksjon '%s' ikke "
+"gjenkjent.\n"
 
 #, c-format
 msgid ""
 "The mirror '%s' contains the $arch variable, but no Architecture is "
 "defined.\n"
 msgstr ""
+"The mirror '%s' contains the $arch variable, but no Architecture is "
+"defined.\n"
 
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
@@ -685,7 +698,7 @@ msgstr ""
 
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
+msgstr "konfigurasjonsfil %s, linje %d: direktiv '%s' trenger en verdi\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -693,11 +706,11 @@ msgstr "feilet under initialisering av alpm-biblioteket (%s)\n"
 
 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
-msgstr ""
+msgstr "bufferoverflyt oppdaget i gitte argumenter\n"
 
 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
-msgstr ""
+msgstr "klarte ikke å åpne stdin for lesing: (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
@@ -707,13 +720,17 @@ msgstr "du kan ikke utføre denne operasjonen hvis du ikke er rot-bruker.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "ingen operasjon spesifisert (bruk -h for hjelp)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s er eid av %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "ingen fil ble spesifisert for --owns\n"
 
 #, c-format
 msgid "failed to find '%s' in PATH: %s\n"
-msgstr ""
+msgstr "fant ikke '%s' i PATH: %s\n"
 
 #, c-format
 msgid "failed to read file '%s': %s\n"
@@ -721,7 +738,7 @@ msgstr "feilet under innlesing av '%s' : %s\n"
 
 #, c-format
 msgid "cannot determine ownership of directory '%s'\n"
-msgstr ""
+msgstr "kunne ikke avgjøre eierskapet til mappen '%s'\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
@@ -729,11 +746,7 @@ msgstr "kunne ikke bestemme reell mappe for '%s' : %s\n"
 
 #, c-format
 msgid "path too long: %s%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s er eid av %s %s\n"
+msgstr "stien er for lang: %s%s\n"
 
 #, c-format
 msgid "No package owns %s\n"
@@ -746,14 +759,14 @@ msgstr "gruppe \"%s\" ble ikke funnet\n"
 #, c-format
 msgid "%s: %d total file, "
 msgid_plural "%s: %d total files, "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s: %d fil "
+msgstr[1] "%s: %d filer, "
 
 #, c-format
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d manglende fil\n"
+msgstr[1] "%d manglende filer\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -769,7 +782,7 @@ msgstr "feilet å forberede transaksjon (%s)\n"
 
 #, c-format
 msgid ":: package %s does not have a valid architecture\n"
-msgstr ""
+msgstr ":: pakken %s har ikke en gyldig arkitektur\n"
 
 #, c-format
 msgid ":: %s: requires %s\n"
@@ -785,7 +798,7 @@ msgstr "HoldPkg ble funnet i målliste. Vil du fortsette?"
 
 #, c-format
 msgid " there is nothing to do\n"
-msgstr ""
+msgstr " ingen handling nødvendig\n"
 
 #, c-format
 msgid "Do you want to remove these packages?"
@@ -801,7 +814,7 @@ msgstr "fikk ikke tilgang til database-mappe\n"
 
 #, c-format
 msgid "could not remove %s\n"
-msgstr ""
+msgstr "kunne ikke fjerne %s\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
@@ -825,19 +838,19 @@ msgstr "Cache-mappe: %s\n"
 
 #, c-format
 msgid "Packages to keep:\n"
-msgstr ""
+msgstr "Pakker som skal beholdes:\n"
 
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
+msgstr "  Alle lokalt installerte pakker\n"
 
 #, c-format
 msgid "  All current sync database packages\n"
-msgstr ""
+msgstr "  Alle pakker i sync-databasen\n"
 
 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr ""
+msgstr "Vil du fjerne alle pakkene i cachen?"
 
 #, c-format
 msgid "removing old packages from cache...\n"
@@ -853,7 +866,7 @@ msgstr "fjerner alle filer fra cache ...\n"
 
 #, c-format
 msgid "could not access cache directory %s\n"
-msgstr ""
+msgstr "kunne ikke lese cache mappen %s\n"
 
 #, c-format
 msgid "File %s does not seem to be a valid package, remove it?"
@@ -873,7 +886,7 @@ msgstr "klarte ikke å synkronisere noen databaser\n"
 
 #, c-format
 msgid "installed"
-msgstr ""
+msgstr "installert"
 
 #, c-format
 msgid "repository '%s' does not exist\n"
@@ -897,15 +910,15 @@ msgstr "hopper over mål: %s\n"
 
 #, c-format
 msgid "target not found: %s\n"
-msgstr ""
+msgstr "målet ble ikke funnet: %s\n"
 
 #, c-format
 msgid ":: There are %d members in group %s:\n"
-msgstr ""
+msgstr ":: Det er %d elementer i gruppen %s:\n"
 
 #, c-format
 msgid "database not found: %s\n"
-msgstr ""
+msgstr "databasen ble ikke funnet: %s\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
@@ -913,11 +926,11 @@ msgstr ":: Starter full systemoppgradering ...\n"
 
 #, c-format
 msgid ":: %s and %s are in conflict\n"
-msgstr ""
+msgstr ":: konflikt mellom %s og %s\n"
 
 #, c-format
 msgid ":: %s and %s are in conflict (%s)\n"
-msgstr ""
+msgstr ":: konflikt mellom %s og %s (%s)\n"
 
 #, c-format
 msgid "Proceed with download?"
@@ -973,7 +986,7 @@ msgstr ""
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "  prøv å kjøre pacman-db-upgrade\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -1013,23 +1026,23 @@ msgstr "Alternative avhengigheter for %s\n"
 
 #, c-format
 msgid "Repository %s\n"
-msgstr ""
+msgstr "Pakkebrønn %s\n"
 
 #, c-format
 msgid "Invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "Ugyldig verdi: %d er ikke mellom %d og %d\n"
 
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "Ugyldig tallverdi: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
-msgstr ""
+msgstr "Oppgi et valg (standardvalg=all)"
 
 #, c-format
 msgid "Enter a number (default=%d)"
-msgstr ""
+msgstr "Oppgi et tall (standardverdi=%d)"
 
 #, c-format
 msgid "[Y/n]"
@@ -1057,7 +1070,7 @@ msgstr "NEI"
 
 #, c-format
 msgid "failed to allocate string\n"
-msgstr ""
+msgstr "klarte ikke å tilegne tekstlinje\n"
 
 #, c-format
 msgid "error: %s"
@@ -1085,7 +1098,7 @@ msgid "Cleaning up..."
 msgstr "Rydder opp ..."
 
 msgid "Unable to find source file %s."
-msgstr ""
+msgstr "Fant ikke kildefilen %s."
 
 msgid "Aborting..."
 msgstr "Avslutter ..."
@@ -1097,13 +1110,13 @@ msgid "The download program %s is not installed."
 msgstr "Nedlastingsprogrammet %s er ikke installert."
 
 msgid "'%s' returned a fatal error (%i): %s"
-msgstr ""
+msgstr "'%s' avsluttet med en fatal feil (%i): %s"
 
 msgid "Installing missing dependencies..."
 msgstr "Installerer manglende avhengigheter ..."
 
 msgid "'%s' failed to install missing dependencies."
-msgstr ""
+msgstr "'%s' klarte ikke installere manglende avhengigheter"
 
 msgid "Missing Dependencies:"
 msgstr "Manglende Avhengigheter:"
@@ -1115,7 +1128,7 @@ msgid "Retrieving Sources..."
 msgstr "Henter Kilder ..."
 
 msgid "Found %s"
-msgstr ""
+msgstr "Fant %s"
 
 msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s ble ikke funnet i build-mappen, og er ikke en URL."
@@ -1166,7 +1179,7 @@ msgid "Failed to extract %s"
 msgstr "Klarte ikke å pakke ut %s"
 
 msgid "A failure occurred in %s()."
-msgstr ""
+msgstr "En feil oppsto i %s()."
 
 msgid "Starting %s()..."
 msgstr "Starter %s() ..."
@@ -1184,7 +1197,7 @@ msgid "Compressing man and info pages..."
 msgstr "Komprimener manual- og informasjonssider ..."
 
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
+msgstr "Fjerner unødvendige symboler fra binær- og katalogfiler..."
 
 msgid "Removing libtool .la files..."
 msgstr "Fjerner libtool .la-filer"
@@ -1202,10 +1215,10 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Eksempel for GPL-lisensiert programvare: license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
-msgstr ""
+msgstr "Sikkerhetskopidirektiv ikke funnet i pakke : %s"
 
 msgid "Package contains reference to %s"
-msgstr ""
+msgstr "Pakken inneholder referanser til %s"
 
 msgid "Missing pkg/ directory."
 msgstr "Mangler pkg/-mappe"
@@ -1214,7 +1227,7 @@ msgid "Creating package..."
 msgstr "Lager pakke ..."
 
 msgid "Adding %s file..."
-msgstr ""
+msgstr "Legger til fil %s..."
 
 msgid "Compressing package..."
 msgstr "Komprimerer pakke ..."
@@ -1226,10 +1239,10 @@ msgid "Failed to create package file."
 msgstr "Feilet å lage pakkefil."
 
 msgid "Failed to create symlink to package file."
-msgstr ""
+msgstr "Klarte ikke lage symbolsk lenke til pakkefilen."
 
 msgid "Skipping integrity checks."
-msgstr ""
+msgstr "Hopper over integritetssjekk."
 
 msgid "Creating source package..."
 msgstr "Lager kildepakke ..."
@@ -1238,7 +1251,7 @@ msgid "Adding %s..."
 msgstr "Legger til %s ..."
 
 msgid "Adding %s file (%s)..."
-msgstr ""
+msgstr "Legger til %s fil (%s)..."
 
 msgid "Compressing source package..."
 msgstr "Komprimerer kildepakker ..."
@@ -1247,13 +1260,13 @@ msgid "Failed to create source package file."
 msgstr "Feilet å lage pakkefil for kilde."
 
 msgid "Failed to create symlink to source package file."
-msgstr ""
+msgstr "Kunne ikke opprette symbolsk lenke til pakkefil."
 
 msgid "Installing package %s with %s -U..."
-msgstr ""
+msgstr "Installerer pakke %s med %s -U..."
 
 msgid "Installing %s package group with %s -U..."
-msgstr ""
+msgstr "Installerer %s pakkegruppe med %s -U..."
 
 msgid "Failed to install built package(s)."
 msgstr "Feilet å installere pakke(r) som er bygd."
@@ -1265,13 +1278,13 @@ msgid "%s is not allowed to start with a hyphen."
 msgstr "%s kan ikke starte med en bindestrek."
 
 msgid "%s is not allowed to contain colons or hyphens."
-msgstr ""
+msgstr "%s kan ikke inneholde kolon eller bindestreker."
 
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s kan ikke inneholde bindestreker."
 
 msgid "%s must be an integer."
-msgstr ""
+msgstr "%s må være et helt tall."
 
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s er ikke tilgjengelig for '%s'-arkitekturen."
@@ -1286,13 +1299,13 @@ msgid "Provides array cannot contain comparison (< or >) operators."
 msgstr "Provides-listen kan ikke inneholde operatortegn som (< eller >)."
 
 msgid "Backup entry should not contain leading slash : %s"
-msgstr ""
+msgstr "Sikkerhetskopidirektiv kan ikke begynne med / : %s"
 
 msgid "Invalid syntax for optdepend : '%s'"
-msgstr ""
+msgstr "Ugyldig syntaks for optdepend : '%s'"
 
 msgid "%s file (%s) does not exist."
-msgstr ""
+msgstr "%s fil (%s) finnes ikke."
 
 msgid "options array contains unknown option '%s'"
 msgstr "options-listen inneholder ukjent alternativ '%s'"
@@ -1301,10 +1314,10 @@ msgid "missing package function for split package '%s'"
 msgstr "manglende pakkefunksjon for splittet pakke '%s'"
 
 msgid "requested package %s is not provided in %s"
-msgstr ""
+msgstr "ønsket pakke %s tilbys ikke av %s"
 
 msgid "Determining latest %s revision..."
-msgstr ""
+msgstr "Avgjøre siste %s versjon..."
 
 msgid "Version found: %s"
 msgstr "Versjon funnet: %s"
@@ -1362,7 +1375,7 @@ msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Laster kun ned og pakker ut filer"
 
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
+msgstr "  -p <fil>        Bruk alternativt oppsettsscript (istedenfor '%s')"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
@@ -1381,32 +1394,36 @@ msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
+"  --allsource      Opprett en .tar fil med kun kildekode og nedlastede kilder"
 
 msgid "  --asroot         Allow makepkg to run as root user"
-msgstr ""
+msgstr "      --asroot     Tillater makepkg å kjøre som rot-bruker"
 
 msgid "  --check          Run the check() function in the %s"
-msgstr ""
+msgstr "  --check          Kjør check() funksjonen i %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
+"  --config <fil>  Bruk en alternativ konfigurasjonsfil (istedenfor '%s')"
 
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
+"  --holdver        Forhindre automatisk versjonsoppdatering for utvikling "
+"%ser"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr ""
+msgstr "  --nocheck        Ikke kjør check() funksjonen i %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
-msgstr ""
+msgstr "  --pkg <liste>     Bygg kun oppgitte pakker fra en delt pakke"
 
 msgid "  --skipinteg      Do not fail when integrity checks are missing"
-msgstr ""
+msgstr "  --skipinteg      Ikke avbryt selv om integritetstester mangler"
 
 msgid ""
 "  --source         Generate a source-only tarball without downloaded sources"
-msgstr ""
+msgstr "  --source         Generér en .tar fil med kildekode, men uten kilder"
 
 msgid "These options can be passed to pacman:"
 msgstr "Disse alternativene kan gis til pacman:"
@@ -1414,9 +1431,11 @@ msgstr "Disse alternativene kan gis til pacman:"
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr ""
+"     --noconfirm      Ikke spør etter bekreftelse under oppløsning av "
+"avhengigheter"
 
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
+msgstr "      --noprogressbar  Ikke vis framdrift under nedlasting av filer "
 
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Hvis -p ikke er spesifisert vil makepkg se etter '%s'"
@@ -1427,12 +1446,16 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Kopirett (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nKopirett (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDette er "
+"gratis programvar; se kildekoden for kopibetingelser.\\nDet gis INGEN "
+"GARANTI innenfor det som er tillatt av loven.\\n"
 
 msgid "%s not found."
 msgstr "%s ikke funnet."
 
 msgid "You do not have write permission to store packages in %s."
-msgstr ""
+msgstr "Du har ikke skriverettigheter til å lagre pakker i %s."
 
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Du har ikke skriverettigheter til å lagre nedlastinger i %s."
@@ -1502,7 +1525,7 @@ msgstr ""
 "Ikke bruk '-F'-alternativet. Dette alternativet er kun beregnet på makepkg."
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
-msgstr ""
+msgstr "Fant ikke sudo. Bruker su for å få rot-rettigheter."
 
 msgid "%s does not exist."
 msgstr "%s finnes ikke."
@@ -1529,10 +1552,10 @@ msgstr ""
 "Deler av pakkegruppen har allerede blitt bygd. (bruk -f for å overskrive)"
 
 msgid "Repackaging without the use of a package() function is deprecated."
-msgstr ""
+msgstr "Ompakking uten bruk av package() funksjonen er ikke lengre støttet."
 
 msgid "File permissions may not be preserved."
-msgstr ""
+msgstr "Filerettigheter blir muligens ikke beholdt."
 
 msgid "Leaving fakeroot environment."
 msgstr "Går ut av fakeroot-miljøet."
@@ -1541,7 +1564,7 @@ msgid "Making package: %s"
 msgstr "Lager pakke: %s"
 
 msgid "A source package has already been built. (use -f to overwrite)"
-msgstr ""
+msgstr "En kildepakke har allerede blitt bygget (brukt -f for å overskrive)"
 
 msgid "Source package created: %s"
 msgstr "Kildepakke laget: %s"
@@ -1550,16 +1573,16 @@ msgid "Skipping dependency checks."
 msgstr "Hopper over avhengighetstester."
 
 msgid "Checking runtime dependencies..."
-msgstr ""
+msgstr "Sjekker avhengigheter som trengs under kjøring..."
 
 msgid "Checking buildtime dependencies..."
-msgstr ""
+msgstr "Sjekker avhengigheter som trengs under bygging..."
 
 msgid "Could not resolve all dependencies."
 msgstr "Kunne ikke avgjøre alle avhengigheter."
 
 msgid "%s was not found in PATH; skipping dependency checks."
-msgstr ""
+msgstr "%s ble ikke funnet i PATH; hopper over avhengighetstester."
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr "Hopper over innhenting av kilder -- bruker eksisterende src/-mappe"
@@ -1596,21 +1619,27 @@ msgid ""
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nThis is free software; see the source for copying conditions.\\nThere is "
+"NO WARRANTY, to the extent permitted by law.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s finnes ikke eller er ikke en mappe."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s er ikke en pacman databasemappe."
+
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
+msgstr "Du må ha riktige rettigheter for å oppgradere databasen."
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr "Pacman lock-fil ble funnet. Kan ikke kjøre når pacman samtidig kjører."
 
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
+msgstr "Database fra før versjon 3.5 funnet - oppgraderer..."
 
 msgid "Done."
-msgstr ""
+msgstr "Ferdig."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -1673,51 +1702,56 @@ msgid "Finished. Your pacman database has been optimized."
 msgstr "Ferdig. Din pacman-database har blitt optimisert."
 
 msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr ""
+msgstr "Bruk: pkgdelta [-q] <pakke1> <pakke2>\\n"
 
 msgid ""
 "\tpkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n\\n"
 msgstr ""
+"»pkgdelta oppretter en fil med forskjellene mellom to pakker.\\nDenne "
+"forskjellsfilen kan så bli lagt til en database med repo-add.\\n\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
-msgstr ""
+msgstr "Eksempel:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Kopirett (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDette er gratis "
+"programvare;; se kildekoden for kopibetingelser.\\nDet gis INGEN GARANTI, "
+"innenfor det loven tillater.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Ugyldig pakkefil '%s'."
 
 msgid "The package names don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Pakkenavnene stemmer ikke overens : '%s' og '%s'"
 
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Pakkearkitekturene stemmer ikke overens : '%s' og '%s'"
 
 msgid "Both packages have the same version : '%s'"
-msgstr ""
+msgstr "Begge pakkene har samme versjon : '%s'"
 
 msgid "Generating delta from version %s to version %s"
-msgstr ""
+msgstr "Finner forskjellene mellom versjon %s og %s"
 
 msgid "Delta could not be created."
-msgstr ""
+msgstr "Forskjellene kunne ikke bli avgjort."
 
 msgid "Generated delta : '%s'"
-msgstr ""
+msgstr "Forskjeller : '%s'"
 
 msgid "File '%s' does not exist"
-msgstr ""
+msgstr "Filen '%s' finnes ikke"
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "Kan ikke finne xdelta3-programmet! Er xdelta3 installert?"
 
 msgid "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
-msgstr ""
+msgstr "Bruk: repo-add [-d] [-f] [-q] <sti-til-db> <pakke|forskjell> ...\\n"
 
 msgid "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
 msgstr "Bruk: repo-remove [-q] <vei-til-database> <pakkenavn|delta> ... \\n\\n"
@@ -1742,16 +1776,23 @@ msgid ""
 "Use the -q/--quiet flag to minimize output to basic messages, warnings,"
 "\\nand errors.\\n\\n"
 msgstr ""
+"Bruk -q/--quiet flagget for å begrense mengden utskrift til kun grunnleggende"
+"\\nbeskjeder, advarsler og feilmeldinger.\\n\\n"
 
 msgid ""
 "Use the -d/--delta flag to automatically generate and add a delta file"
 "\\nbetween the old entry and the new one, if the old package file is found"
 "\\nnext to the new one.\\n\\n"
 msgstr ""
+"Bruk -d/--delta flagget for å automatisk finne og legge til en fil med"
+"\\nforskjellene mellom den gamle og den nye oppføringen dersom den gamle "
+"pakkefilen\\nblir funnet ved siden av den nye.\\n\\n"
 
 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
 msgstr ""
+"Bruk -f/--files flagget for å oppdatere databasen inkludert filoppføringer."
+"\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "Eksempel: repo-add /vei/til/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1772,10 +1813,10 @@ msgstr ""
 "kopibetingelser. Det er INGEN GARANTI, så langt som det loven tillater.\\n"
 
 msgid "No database entry for package '%s'."
-msgstr ""
+msgstr "Ingen databaseoppføring for pakke '%s'."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr ""
+msgstr "Legger til forskjellsoppføring : %s -> %s"
 
 msgid "Removing existing entry '%s'..."
 msgstr "Fjerner eksisterende element '%s' ..."
@@ -1784,13 +1825,13 @@ msgid "An entry for '%s' already existed"
 msgstr "Et element for '%s' finnes allerede"
 
 msgid "Creating '%s' db entry..."
-msgstr ""
+msgstr "Oppretter '%s' databaseoppføring..."
 
 msgid "Computing md5 checksums..."
 msgstr "Kalkulerer md5-sjekksummer ..."
 
 msgid "Old package file not found: %s"
-msgstr ""
+msgstr "Gammel pakkefil ikke funnet: %s"
 
 msgid "Failed to acquire lockfile: %s."
 msgstr "Kunne ikke innhente låsefil: %s."

po/pacman.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 3.5.1\n"
+"Project-Id-Version: pacman 3.5.3\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"POT-Creation-Date: 2011-08-08 16:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -338,18 +338,17 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
+msgid "  -n, --nosave         remove configuration files\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
 
 #, c-format
@@ -489,7 +488,9 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
 msgstr ""
 
 #, c-format
@@ -509,7 +510,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
 
@@ -585,10 +586,6 @@ msgstr ""
 msgid "only one operation may be used at a time\n"
 msgstr ""
 
-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr ""
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@@ -668,6 +665,14 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr ""
 
+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr ""
+
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr ""
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr ""
@@ -692,10 +697,6 @@ msgstr ""
 msgid "path too long: %s%s\n"
 msgstr ""
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr ""
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr ""
@@ -1544,6 +1545,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr ""
 
+msgid "%s is not a pacman database directory."
+msgstr ""
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 

po/pl.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-05 05:39+0000\n"
+"Last-Translator: Barthalion <barthalion@gmail.com>\n"
+"Language-Team: Polish <None>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ":: Pobieranie pakietów z %s...\n"
 
 #, c-format
 msgid "checking available disk space...\n"
-msgstr ""
+msgstr "sprawdzanie dostępnego miejsca na dysku...\n"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
@@ -102,19 +102,25 @@ msgid_plural ""
 ":: The following packages cannot be upgraded due to unresolvable "
 "dependencies:\n"
 msgstr[0] ""
+":: Następujący pakiet nie mógł zostać zaktualizowany w wyniku niespełnionych "
+"zależności:\n"
 msgstr[1] ""
+":: Następujące pakiety nie mogły zostać zaktualizowane w wyniku "
+"niespełnionych zależności:\n"
 msgstr[2] ""
+":: Następujące pakiety nie mogły zostać zaktualizowane w wyniku "
+"niespełnionych zależności:\n"
 
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Czy chcesz pominąć powyższy pakiet przy aktualizacji?"
+msgstr[1] "Czy chcesz pominąć powyższe pakiety przy aktualizacji?"
+msgstr[2] "Czy chcesz pominąć powyższe pakiety przy aktualizacji?"
 
 #, c-format
 msgid ":: There are %d providers available for %s:\n"
-msgstr ""
+msgstr ":: Jest dostępnych %d dostawców dla %s:\n"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
@@ -142,11 +148,11 @@ msgstr "sprawdzanie konfliktów plików"
 
 #, c-format
 msgid "checking available disk space"
-msgstr ""
+msgstr "sprawdzanie dostępnego miejsca na dysku"
 
 #, c-format
 msgid "checking package integrity"
-msgstr ""
+msgstr "sprawdzanie spójności pakietów"
 
 #, c-format
 msgid "downloading %s...\n"
@@ -162,19 +168,19 @@ msgstr "nie podano żadnych celów (użyj -h aby otrzymać pomoc)\n"
 
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
+msgstr "nie podano powodu instalacji (użyj -h aby otrzymać pomoc)\n"
 
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
+msgstr "nie można ustawić powodu instalacji pakietu %s (%s)\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
+msgstr "%s: powód instalacji został ustawiony jako zależność.\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
+msgstr "%s: powód instalacji został ustawiony jako ręczny.\n"
 
 #, c-format
 msgid "Explicitly installed"
@@ -302,7 +308,7 @@ msgstr "(żadnych)\n"
 
 #, c-format
 msgid "no changelog available for '%s'.\n"
-msgstr "brak changelog'a dla '%s'.\n"
+msgstr "brak listy zmian dla '%s'.\n"
 
 #, c-format
 msgid "options"
@@ -343,28 +349,27 @@ msgstr ""
 "  -c, --cascade        usuwa pakiet i wszystkie pakiety od niego zależne\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
+msgid "  -n, --nosave         remove configuration files\n"
 msgstr "  -n, --nosave         usuwa także pliki konfiguracyjne\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      usuwa także zależności (to nie zakłóci działania "
-"innych pakietów)                       (-ss zawiera również wyraźnie "
-"zainstalowane zależności)\n"
+"  -s, --recursive      usuwa także niepotrzebne zależności\n"
+"                       (-ss zawiera również zależności zainstalowane "
+"ręcznie)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
 "  -u, --unneeded       usuwania niepotrzebne pakiety (to nie zakłóci "
 "działania innych pakietów)\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
-msgstr "  -c, --changelog      wyświetla changelog dla pakietu\n"
+msgstr "  -c, --changelog      wyświetla listę zmian dla pakietu\n"
 
 #, c-format
 msgid ""
@@ -385,7 +390,7 @@ msgstr "  -g, --groups         wyświetla zawartość grupy pakietów\n"
 msgid ""
 "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
-"  -i, --info           wyświetla informację o pakiecie (-ii dla kopii "
+"  -i, --info           wyświetla informacje o pakiecie (-ii dla kopii "
 "bezp.)\n"
 
 #, c-format
@@ -461,7 +466,7 @@ msgstr "  -l, --list <repo>    przegląda listę pakietów w repozytorium \n"
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search <regex> przeszukuje zdalne repozytoria wedle pasujących "
+"  -s, --search <regex> przeszukuje zdalne repozytoria według pasujących "
 "ciągów\n"
 
 #, c-format
@@ -490,12 +495,11 @@ msgstr "      --needed         nie instaluj ponownie aktualnych pakietów\n"
 
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         oznacza pakiety jako zainstalowane na życzenie\n"
+msgstr "      --asdeps         oznacza pakiety jako zależności\n"
 
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr "      --asexplicit     oznacza pakiet jako zainstalowany na życzenie\n"
+msgstr "      --asexplicit     oznacza pakiety jako zainstalowane ręcznie\n"
 
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
@@ -504,12 +508,11 @@ msgstr ""
 
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps       instaluje pakiety jako zależności (nie na życzenie)\n"
+msgstr "      --asdeps       instaluje pakiety jako zależności\n"
 
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr "      --asexplicit     zainstaluj pakiet jako wyraźnie zainstalowany\n"
+msgstr "      --asexplicit     zainstaluj pakiet jako zainstalowany ręcznie\n"
 
 #, c-format
 msgid ""
@@ -529,13 +532,19 @@ msgstr ""
 "więcej niż raz)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         pomija sprawdzanie zależności\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         pomija sprawdzanie wersji zależności (-dd pomija "
+"wszystkie sprawdzenia)\n"
 
 #, c-format
 msgid ""
 "  -k, --dbonly         only modify database entries, not package files\n"
 msgstr ""
+"  -k, --dbonly         modyfikuje tylko wpis w bazie danych, nie pliki "
+"pakietu\n"
 
 #, c-format
 msgid ""
@@ -551,7 +560,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
 "      --print          wypisz tylko cele, bez przeprowadzania operacji\n"
@@ -606,20 +615,20 @@ msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
 msgstr ""
-"                       Ten program może być wolno rozpowszechniany na\n"
+"                       Ten program może być swobodnie rozpowszechniany na\n"
 "                       zasadach licencji GNU General Public License.\n"
 
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
-msgstr "problem ustawiania rootdir '%s' (%s)\n"
+msgstr "problem przy ustawianiu rootdir '%s' (%s)\n"
 
 #, c-format
 msgid "problem setting dbpath '%s' (%s)\n"
-msgstr "problem ustawiania dbpath '%s' (%s)\n"
+msgstr "problem przy ustawianiu dbpath '%s' (%s)\n"
 
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
-msgstr "problem ustawiania logfile '%s' (%s)\n"
+msgstr "problem przy ustawianiu logfile '%s' (%s)\n"
 
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
@@ -635,7 +644,7 @@ msgstr "tylko jedna operacja może być użyta na raz\n"
 
 #, c-format
 msgid "invalid option\n"
-msgstr ""
+msgstr "nieprawidłowa opcja\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -643,7 +652,7 @@ msgstr "zła wartość dla 'CleanMethod' : '%s'\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr ""
+msgstr "nie można odnaleźć bieżącego katalogu roboczego\n"
 
 #, c-format
 msgid "could not chdir to download directory %s\n"
@@ -655,12 +664,14 @@ msgstr "uruchamianie XferCommand: fork nieudany!\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
+msgstr "nie można zmienić katalogu na %s (%s)\n"
 
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""
+"plik konfiguracyjny %s, linia %d: dyrektywa '%s' w sekcji '%s' nie "
+"rozpoznana.\n"
 
 #, c-format
 msgid ""
@@ -676,11 +687,11 @@ msgstr "nie można dodać URL serwera do bazy danych '%s': %s (%s)\n"
 
 #, c-format
 msgid "config file %s could not be read.\n"
-msgstr "plik konfigu %s nie może być odczytany.\n"
+msgstr "plik konfiguracyjny %s nie może być odczytany.\n"
 
 #, c-format
 msgid "config file %s, line %d: bad section name.\n"
-msgstr "plik konfigu %s, linia %d: zła nazwa sekcji.\n"
+msgstr "plik konfiguracyjny %s, linia %d: zła nazwa sekcji.\n"
 
 #, c-format
 msgid "could not register '%s' database (%s)\n"
@@ -689,7 +700,7 @@ msgstr "nie udało się zarejestrować bazy danych '%s' (%s)\n"
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
 msgstr ""
-"plik konfigu %s, linia %d: błąd składni w pliku konfigu- brak klucza.\n"
+"plik konfiguracyjny %s, linia %d: błąd składni w pliku - brak klucza.\n"
 
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
@@ -697,7 +708,7 @@ msgstr "plik %s, linia %d: Wszystkie dyrektywy muszą należeć do sekcji.\n"
 
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
+msgstr "plik konfiguracyjny %s, linia %d: wymagana wartość w dyrektywie '%s'\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -705,11 +716,11 @@ msgstr "nie udało się zainicjować biblioteki alpm (%s)\n"
 
 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
-msgstr ""
+msgstr "przepełnienie bufora wykryte przy parsowaniu argumentów\n"
 
 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
-msgstr ""
+msgstr "nie mozna ponownie otworzyć stdin: (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
@@ -719,6 +730,10 @@ msgstr "tą operację wykonać można jedynie jako root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nie podano żadnej operacji (użyj -h aby otrzymać pomoc)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s jest własnością %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nie podano pliku dla --owns\n"
@@ -733,7 +748,7 @@ msgstr "nie udało się odczytać pliku '%s': %s\n"
 
 #, c-format
 msgid "cannot determine ownership of directory '%s'\n"
-msgstr ""
+msgstr "nie można określić właściciela katalogu '%s'\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
@@ -741,11 +756,7 @@ msgstr "nie można ustalić pełnej ścieżki dla '%s': %s\n"
 
 #, c-format
 msgid "path too long: %s%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s jest własnością %s %s\n"
+msgstr "za długa ścieżka: %s%s\n"
 
 #, c-format
 msgid "No package owns %s\n"
@@ -758,16 +769,16 @@ msgstr "grupa \"%s\" nie została znaleziona\n"
 #, c-format
 msgid "%s: %d total file, "
 msgid_plural "%s: %d total files, "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s: %d plik, "
+msgstr[1] "%s: %d pliki, "
+msgstr[2] "%s: %d plików, "
 
 #, c-format
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d brakujący plik\n"
+msgstr[1] "%d brakujące pliki\n"
+msgstr[2] "%d brakujących plików\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -815,7 +826,7 @@ msgstr "brak dostępu do katalogu bazy danych\n"
 
 #, c-format
 msgid "could not remove %s\n"
-msgstr ""
+msgstr "nie można usunąć %s\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
@@ -839,19 +850,19 @@ msgstr "Katalog pamięci podręcznej : %s\n"
 
 #, c-format
 msgid "Packages to keep:\n"
-msgstr ""
+msgstr "Pakiety do zachowania:\n"
 
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
+msgstr "  Wszystkie pakiety zainstalowane lokalnie\n"
 
 #, c-format
 msgid "  All current sync database packages\n"
-msgstr ""
+msgstr "  Wszystkie pakiety z bazy danych\n"
 
 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr ""
+msgstr "Czy chcesz usunąć wszystkie inne pakiety z pamięci podręcznej?"
 
 #, c-format
 msgid "removing old packages from cache...\n"
@@ -911,15 +922,15 @@ msgstr "Pomijam cel: %s\n"
 
 #, c-format
 msgid "target not found: %s\n"
-msgstr ""
+msgstr "nie znaleziono celu: %s\n"
 
 #, c-format
 msgid ":: There are %d members in group %s:\n"
-msgstr ""
+msgstr ":: Jest %d pakietów w grupie %s:\n"
 
 #, c-format
 msgid "database not found: %s\n"
-msgstr ""
+msgstr "nie znaleziono bazy danych: %s\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
@@ -987,7 +998,7 @@ msgstr ""
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "  spróbuj uruchomić pacman-db-upgrade\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -1027,23 +1038,23 @@ msgstr "Opcjonalne zależności dla %s\n"
 
 #, c-format
 msgid "Repository %s\n"
-msgstr ""
+msgstr "Repozytorium %s\n"
 
 #, c-format
 msgid "Invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "Nieprawidłowa wartość: %d nie jest pomiędzy %d i %d\n"
 
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "Nieprawidłowy numer: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
-msgstr ""
+msgstr "Wybierz pakiety (domyślnie=wszystkie)"
 
 #, c-format
 msgid "Enter a number (default=%d)"
-msgstr ""
+msgstr "Podaj numer (domyślnie=%d)"
 
 #, c-format
 msgid "[Y/n]"
@@ -1071,7 +1082,7 @@ msgstr "NIE"
 
 #, c-format
 msgid "failed to allocate string\n"
-msgstr ""
+msgstr "nie można wyznaczyć łańcucha\n"
 
 #, c-format
 msgid "error: %s"
@@ -1180,7 +1191,7 @@ msgid "Failed to extract %s"
 msgstr "Nie udało się rozpakować %s"
 
 msgid "A failure occurred in %s()."
-msgstr ""
+msgstr "Wystąpił błąd w %s()."
 
 msgid "Starting %s()..."
 msgstr "Zaczynam %s()"
@@ -1216,7 +1227,7 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Przykład dla programu na GPL: license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
-msgstr ""
+msgstr "Plik z wpisu backup nie znajduje się w pakiecie: %s"
 
 msgid "Package contains reference to %s"
 msgstr "Pakiet zawiera odwołanie do %s"
@@ -1228,7 +1239,7 @@ msgid "Creating package..."
 msgstr "Tworzę pakiet..."
 
 msgid "Adding %s file..."
-msgstr ""
+msgstr "Dodawanie pliku %s..."
 
 msgid "Compressing package..."
 msgstr "Kompresuję pakiet..."
@@ -1261,7 +1272,7 @@ msgid "Failed to create source package file."
 msgstr "Nie udało się stworzyć pakietu źródłowego."
 
 msgid "Failed to create symlink to source package file."
-msgstr ""
+msgstr "Nie można utworzyć dowiązania do źródłowych plików pakietu."
 
 msgid "Installing package %s with %s -U..."
 msgstr "Instaluję pakiet %s z %s -U"
@@ -1279,13 +1290,13 @@ msgid "%s is not allowed to start with a hyphen."
 msgstr "%s nie może zaczynać się od myślnika"
 
 msgid "%s is not allowed to contain colons or hyphens."
-msgstr ""
+msgstr "%s nie może zawierać dwukropków ani myślników."
 
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s nie może zawierać myślnika."
 
 msgid "%s must be an integer."
-msgstr ""
+msgstr "%s musi być liczbą całkowitą."
 
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s nie jest dostępny dla architektury '%s'."
@@ -1301,7 +1312,7 @@ msgstr ""
 "Dostarczana tablica nie może zawierać operatorów porównania ( < lub > )"
 
 msgid "Backup entry should not contain leading slash : %s"
-msgstr ""
+msgstr "Wpisu backup nie powinien poprzedzać ukośnik: %s"
 
 msgid "Invalid syntax for optdepend : '%s'"
 msgstr "Zła składa dla optdepend : '%s'"
@@ -1319,7 +1330,7 @@ msgid "requested package %s is not provided in %s"
 msgstr "Żądany pakiet %s nie jest dostarczony przez %s"
 
 msgid "Determining latest %s revision..."
-msgstr ""
+msgstr "Sprawdzanie najnowszej rewizji %s..."
 
 msgid "Version found: %s"
 msgstr "Wersja        : %s"
@@ -1399,7 +1410,7 @@ msgid "  --asroot         Allow makepkg to run as root user"
 msgstr "  --asroot         Pozwól makepkg pracować jako root"
 
 msgid "  --check          Run the check() function in the %s"
-msgstr ""
+msgstr "  --check          Uruchom funkcję check() w %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
@@ -1408,9 +1419,11 @@ msgstr ""
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
+"  --holdver        Nie aktualizuj automatycznie wersji pakietu rozwojowego "
+"%ss"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr ""
+msgstr "  --nocheck        Nie uruchamiaj funkcji check() w %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <lista>     Buduj tylko podane pakiety z rozdzielonego pakietu"
@@ -1442,9 +1455,14 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nNiniejszy "
+"program jest wolnym oprogramowaniem; sprawdź w źródłach warunki "
+"rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST "
+"OBJĘTY GWARANCJĄ.\\n"
 
 msgid "%s not found."
-msgstr "%s nie znaleziony."
+msgstr "%s nieznaleziony."
 
 msgid "You do not have write permission to store packages in %s."
 msgstr "Nie masz prawa zapisu do przechowywania pakietów w %s."
@@ -1559,10 +1577,10 @@ msgid "Skipping dependency checks."
 msgstr "Pomijam sprawdzanie zależności."
 
 msgid "Checking runtime dependencies..."
-msgstr ""
+msgstr "Sprawdzanie zależności potrzebnych do uruchomienia..."
 
 msgid "Checking buildtime dependencies..."
-msgstr ""
+msgstr "Sprawdzanie zależności potrzebnych do budowy..."
 
 msgid "Could not resolve all dependencies."
 msgstr "Nie udało się rozwiązać wszystkich zależności."
@@ -1605,22 +1623,29 @@ msgid ""
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nNiniejszy program jest wolnym oprogramowaniem; sprawdź w źródłach warunki "
+"rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST "
+"OBJĘTY GWARANCJĄ.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s nie istnieje lub nie jest katalogiem."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s nie jest bazą danych pacmana."
+
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
+msgstr "Musisz posiadać odpowiednie uprawnienia, by zaktualizować bazę danych."
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr ""
 "Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa."
 
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
+msgstr "Wykryto bazę danych sprzed wersji 3.5 - aktualizowanie..."
 
 msgid "Done."
-msgstr ""
+msgstr "Gotowe."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -1684,51 +1709,58 @@ msgid "Finished. Your pacman database has been optimized."
 msgstr "Zakończono. Baza pacmana została zoptymalizowana."
 
 msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr ""
+msgstr "sposób użycia: pkgdelta [-q] <pakiet1> <pakiet2>\\n"
 
 msgid ""
 "\tpkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n\\n"
 msgstr ""
+"\tpkgdelta tworzy plik przyrostowy między dwoma pakietami.\\nPlik "
+"przyrostowy można dodać do bazy danych używając repo-add.\\n\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
-msgstr ""
+msgstr "Przykład: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nNiniejszy "
+"program jest wolnym oprogramowaniem; sprawdź w źródłach warunki "
+"rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST "
+"OBJĘTY GWARANCJĄ.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Błędny plik pakietu '%s'."
 
 msgid "The package names don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Nazwy pakietów się nie zgadzają: '%s' i '%s'"
 
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Architektury pakietów się nie zgadzają: '%s' and '%s'"
 
 msgid "Both packages have the same version : '%s'"
-msgstr ""
+msgstr "Oba pakiety mają tą samą wersję: '%s'"
 
 msgid "Generating delta from version %s to version %s"
-msgstr ""
+msgstr "Tworzenie danych przyrostowych między wersją %s, a %s"
 
 msgid "Delta could not be created."
-msgstr ""
+msgstr "Plik przyrostowy nie mogł zostać utworzony."
 
 msgid "Generated delta : '%s'"
-msgstr ""
+msgstr "Stworzono pakiet przyrostowy: '%s'"
 
 msgid "File '%s' does not exist"
-msgstr ""
+msgstr "Plik '%s' nie istnieje."
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "Nie znaleziono programu xdelta3! Czy jest on zainstalowany?"
 
 msgid "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
 msgstr ""
+"Użycie: repo-add [-d] [-f] [-q] <ścieżka-do-bazy> <pakiet|przyrostowy> ...\\n"
 
 msgid "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
 msgstr ""
@@ -1753,16 +1785,22 @@ msgid ""
 "Use the -q/--quiet flag to minimize output to basic messages, warnings,"
 "\\nand errors.\\n\\n"
 msgstr ""
+"Użyj -q/--quiet, aby zminimalizować wyświetlane informacje do podstawowych "
+"wiadomości, ostrzeżeń,\\ni błędów.\\n\\n"
 
 msgid ""
 "Use the -d/--delta flag to automatically generate and add a delta file"
 "\\nbetween the old entry and the new one, if the old package file is found"
 "\\nnext to the new one.\\n\\n"
 msgstr ""
+"Użyj -d/--delta, aby automatycznie stworzyć i dodać plik przyrostowy"
+"\\nmiędzy starym wpisem, a nowym, jeśli znaleziono stary pakiet\\nwraz z "
+"nowym.\\n\\n"
 
 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
 msgstr ""
+"Użyj -f/--files, aby zaktualizować bazę danych włącznie z wpisami plików.\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "Przykład: repo-add /ścieżka/do/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1782,10 +1820,10 @@ msgstr ""
 "prawo.\\n"
 
 msgid "No database entry for package '%s'."
-msgstr ""
+msgstr "Brak wpisu '%s' w bazie danych."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr ""
+msgstr "Dodawanie wpisu przyrostowego: %s -> %s"
 
 msgid "Removing existing entry '%s'..."
 msgstr "Usuwam istniejący wpis '%s'..."
@@ -1794,13 +1832,13 @@ msgid "An entry for '%s' already existed"
 msgstr "Wpis dla '%s' już istniał"
 
 msgid "Creating '%s' db entry..."
-msgstr ""
+msgstr "Tworzenie wpisu '%s' w bazie danych..."
 
 msgid "Computing md5 checksums..."
 msgstr "Obliczam sumy kontrolne..."
 
 msgid "Old package file not found: %s"
-msgstr ""
+msgstr "Nie znaleziono starego pakietu: %s"
 
 msgid "Failed to acquire lockfile: %s."
 msgstr "Nie udało się użyć pliku blokady: %s."
@@ -1845,7 +1883,7 @@ msgid "Package matching '%s' not found."
 msgstr "Nie odnaleziono pakietu pasującego do '%s'."
 
 msgid "Invalid command name '%s' specified."
-msgstr "Zła nazwa komenty '%s' została podana"
+msgstr "Zła nazwa komendy '%s' została podana"
 
 msgid "Cannot create temp directory for database building."
 msgstr "Nie udało się utworzyć katalogu tymczasowego do zbudowania bazy."

po/pt.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-16 12:23+0000\n"
+"Last-Translator: ArchGalileu <omeuviolino@gmail.com>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr ":: A obter pacotes de %s...\n"
 
 #, c-format
 msgid "checking available disk space...\n"
-msgstr ""
+msgstr "a verificar espaço disponível no disco...\n"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
@@ -102,17 +102,21 @@ msgid_plural ""
 ":: The following packages cannot be upgraded due to unresolvable "
 "dependencies:\n"
 msgstr[0] ""
+":: O seguinte pacote não pode ser actualizado devido a dependências não "
+"resolvidas:\n"
 msgstr[1] ""
+":: Os seguintes pacotes não pode ser actualizados devido a dependências não "
+"resolvidas:\n"
 
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Deseja ignorar o pacote acima para esta atualização?"
+msgstr[1] "Deseja ignorar os pacotes acima para esta atualização?"
 
 #, c-format
 msgid ":: There are %d providers available for %s:\n"
-msgstr ""
+msgstr ":: Existem %d provedores disponíveis para %s:\n"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
@@ -141,11 +145,11 @@ msgstr "a verificar conflitos em ficheiros"
 
 #, c-format
 msgid "checking available disk space"
-msgstr ""
+msgstr "a verificar espaço disponível no disco"
 
 #, c-format
 msgid "checking package integrity"
-msgstr ""
+msgstr "a verificar integridade dos pacotes"
 
 #, c-format
 msgid "downloading %s...\n"
@@ -162,18 +166,19 @@ msgstr "nenhum alvo definido (use -h para obter ajuda)\n"
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
 msgstr ""
+"não foi especificada nenhuma razão para a instalação (use -h para ajuda)\n"
 
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
+msgstr "não foi possível definir a razão de instalação para o pacote %s (%s)\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
+msgstr "%s: razão de instalação definida para \"instalado como dependência\"\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
+msgstr "%s: razão de instalação definida para \"instalado explicitamente\"\n"
 
 #, c-format
 msgid "Explicitly installed"
@@ -343,26 +348,20 @@ msgstr ""
 "deles\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr ""
-"  -n, --nosave              remover também os ficheiros de configuração\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         remove os ficheiros de configuração\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive           também remover as dependências (que não causem "
-"ruptura em pacotes)\n"
-"                             (-ss também incluir dependências explicitamente "
-"instaladas)\n"
+"  -s, --recursive      remove as dependências desnecessárias\n"
+"                       (-ss inclui dependências instaladas explicitamente)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded         remover pacotes desnecessários (que não provocam "
-"rupturade outros pacotes)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --desnecessário        remover aplicações desnecessáras\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -553,13 +552,18 @@ msgstr ""
 "(pode ser usado mais de uma vez)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps             ignorar a verificação de dependências\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --dependnao         ignorar verificação de dependências (-dd para "
+"ignorar todas as verificações)\n"
 
 #, c-format
 msgid ""
 "  -k, --dbonly         only modify database entries, not package files\n"
 msgstr ""
+"  -k, --dbonly         only modify database entries, not package files\n"
 
 #, c-format
 msgid ""
@@ -577,11 +581,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print                     mostrar apenas os pacotes alvo em vez de "
-"executar a operação\n"
+"      --mostrar          mostrar as aplicações alvo em vez de executar a "
+"operação\n"
 
 #, c-format
 msgid ""
@@ -669,7 +673,7 @@ msgstr "somente uma operação pode ser usada de cada vez\n"
 
 #, c-format
 msgid "invalid option\n"
-msgstr ""
+msgstr "Opção inválida\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -677,7 +681,7 @@ msgstr "valor inválido para 'CleanMethod' : '%s'\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr ""
+msgstr "não foi possível saber a directoria actual\n"
 
 #, c-format
 msgid "could not chdir to download directory %s\n"
@@ -689,12 +693,14 @@ msgstr "a executar XferCommand: erro no fork!\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
+msgstr "não foi possível mudar para a directoria %s (%s)\n"
 
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""
+"ficheiro de configuração %s, linha %d: directiva '%s' na secção '%s' não "
+"reconhecida.\n"
 
 #, c-format
 msgid ""
@@ -732,7 +738,7 @@ msgstr ""
 
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
+msgstr "no ficheiro de configuração %s, linha %d: '%s' necessita um valor\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -740,11 +746,11 @@ msgstr "falha ao iniciar a biblioteca alpm (%s)\n"
 
 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
-msgstr ""
+msgstr "buffer overflow detectado no processamento de argumentos\n"
 
 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
-msgstr ""
+msgstr "falha ao reabrir o stdin para leitura: (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
@@ -754,6 +760,10 @@ msgstr "não pode realizar esta operação a menos que seja o root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nenhuma operação definida (use -h para obter ajuda)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s pertence a %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nenhum ficheiro foi especificado para --owns\n"
@@ -768,7 +778,7 @@ msgstr "falhou ao ler o ficheiro '%s': %s\n"
 
 #, c-format
 msgid "cannot determine ownership of directory '%s'\n"
-msgstr ""
+msgstr "não foi possível determinar o proprietário da directoria '%s'\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
@@ -776,11 +786,7 @@ msgstr "não é possível determinar a localização real para '%s': %s\n"
 
 #, c-format
 msgid "path too long: %s%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s pertence a %s %s\n"
+msgstr "caminho demasiado longo: %s%s\n"
 
 #, c-format
 msgid "No package owns %s\n"
@@ -793,14 +799,14 @@ msgstr "o grupo \"%s\" não foi encontrado\n"
 #, c-format
 msgid "%s: %d total file, "
 msgid_plural "%s: %d total files, "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s: %d ficheiro completo, "
+msgstr[1] "%s: %d ficheiros completos, "
 
 #, c-format
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "em falta %d ficheiro\n"
+msgstr[1] "em falta %d ficheiros\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -849,7 +855,7 @@ msgstr "sem acesso ao diretório da base de dados\n"
 
 #, c-format
 msgid "could not remove %s\n"
-msgstr ""
+msgstr "não foi possível remover %s\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
@@ -873,19 +879,19 @@ msgstr "Diretório de cache: %s\n"
 
 #, c-format
 msgid "Packages to keep:\n"
-msgstr ""
+msgstr "Pacotes para serem mantidos:\n"
 
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
+msgstr "  Todos os pacotes instalados localmente\n"
 
 #, c-format
 msgid "  All current sync database packages\n"
-msgstr ""
+msgstr "  Estão sincronizados todos os pacotes da base de dados\n"
 
 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr ""
+msgstr "Deseja remover todos os outros pacotes da cache?"
 
 #, c-format
 msgid "removing old packages from cache...\n"
@@ -945,15 +951,15 @@ msgstr "ignorar alvo: %s\n"
 
 #, c-format
 msgid "target not found: %s\n"
-msgstr ""
+msgstr "alvo não encontrado: %s\n"
 
 #, c-format
 msgid ":: There are %d members in group %s:\n"
-msgstr ""
+msgstr ":: Há %d membros no grupo %s:\n"
 
 #, c-format
 msgid "database not found: %s\n"
-msgstr ""
+msgstr "base de dados não encontrada: %s\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
@@ -1021,7 +1027,7 @@ msgstr ""
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "  tente executar pacman-db-upgrade\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -1061,23 +1067,23 @@ msgstr "Deps Opcionais para %s\n"
 
 #, c-format
 msgid "Repository %s\n"
-msgstr ""
+msgstr "Repositório %s\n"
 
 #, c-format
 msgid "Invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "Valor inválido: %d não está entre %d e %d\n"
 
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "Número inválido: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
-msgstr ""
+msgstr "Escolha uma selecção (padrão=todos)"
 
 #, c-format
 msgid "Enter a number (default=%d)"
-msgstr ""
+msgstr "Escolha um número (padrão=%d)"
 
 #, c-format
 msgid "[Y/n]"
@@ -1105,7 +1111,7 @@ msgstr "NÃO"
 
 #, c-format
 msgid "failed to allocate string\n"
-msgstr ""
+msgstr "falha ao alocar string\n"
 
 #, c-format
 msgid "error: %s"
@@ -1214,7 +1220,7 @@ msgid "Failed to extract %s"
 msgstr "Falhou ao extrair %s"
 
 msgid "A failure occurred in %s()."
-msgstr ""
+msgstr "Uma falha ocorreu em %s()."
 
 msgid "Starting %s()..."
 msgstr "A iniciar %s()..."
@@ -1251,7 +1257,7 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Exemplo para software sob a GPL: license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
-msgstr ""
+msgstr "Não se encontra no pacote o ficheiro de cópia de segurança: %s"
 
 msgid "Package contains reference to %s"
 msgstr "Pacote contém referência a %s"
@@ -1263,7 +1269,7 @@ msgid "Creating package..."
 msgstr "A criar pacote..."
 
 msgid "Adding %s file..."
-msgstr ""
+msgstr "A adicionar %s ficheiros..."
 
 msgid "Compressing package..."
 msgstr "A compactar o pacote..."
@@ -1296,7 +1302,7 @@ msgid "Failed to create source package file."
 msgstr "Falhou ao criar o ficheiro do pacote fonte."
 
 msgid "Failed to create symlink to source package file."
-msgstr ""
+msgstr "Falha ao criar o link simbólico para do pacote fonte."
 
 msgid "Installing package %s with %s -U..."
 msgstr "A instalar pacote %s com %s -U..."
@@ -1314,13 +1320,13 @@ msgid "%s is not allowed to start with a hyphen."
 msgstr "%s não pode iniciar com um hífen."
 
 msgid "%s is not allowed to contain colons or hyphens."
-msgstr ""
+msgstr "%s não pode conter dois pontos ou hífens."
 
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s não pode conter hifens."
 
 msgid "%s must be an integer."
-msgstr ""
+msgstr "%s tem que ser um inteiro."
 
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s não está disponível para a arquitectura '%s'."
@@ -1337,7 +1343,7 @@ msgstr ""
 "A ordem providenciada não pode conter operadores de comparação (< or >)"
 
 msgid "Backup entry should not contain leading slash : %s"
-msgstr ""
+msgstr "O registo de backup não deve ter uma barra no início: %s"
 
 msgid "Invalid syntax for optdepend : '%s'"
 msgstr "Sintaxe inválida para optdepend : '%s'"
@@ -1355,7 +1361,7 @@ msgid "requested package %s is not provided in %s"
 msgstr "%s o pacote requisitado não está disponível em %s"
 
 msgid "Determining latest %s revision..."
-msgstr ""
+msgstr "A determinar a última revisão de %s..."
 
 msgid "Version found: %s"
 msgstr "Versão encontrada: %s"
@@ -1450,7 +1456,7 @@ msgstr ""
 "root"
 
 msgid "  --check          Run the check() function in the %s"
-msgstr ""
+msgstr "  --check        Executar a função check() em %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
@@ -1460,9 +1466,11 @@ msgstr ""
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
+"  --holdver        Evitar actualização automática da versão para "
+"desenvolvimento %ss"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr ""
+msgstr "  --nocheck        Não executar a função check() em %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr ""
@@ -1502,6 +1510,10 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nEste é um "
+"software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ "
+"GARANTIA, na extensão permitida pela lei.\\n"
 
 msgid "%s not found."
 msgstr "%s em falta."
@@ -1626,10 +1638,10 @@ msgid "Skipping dependency checks."
 msgstr "A ignorar testes de dependência."
 
 msgid "Checking runtime dependencies..."
-msgstr ""
+msgstr "A verfificar as dependências para executar a aplicação..."
 
 msgid "Checking buildtime dependencies..."
-msgstr ""
+msgstr "A verificar as dependências para construir a aplicação..."
 
 msgid "Could not resolve all dependencies."
 msgstr "Não foi possível resolver todas as dependências."
@@ -1673,12 +1685,19 @@ msgid ""
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"\\nEste é um software livre; veja o código fonte para condições de cópia."
+"\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s não existe ou não é um diretório."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s não é um caminho para a base de dados do pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
+"Precisa de ter as permissões correctas para actualizar a base de dados."
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr ""
@@ -1686,10 +1705,10 @@ msgstr ""
 "pacman está em execução."
 
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
+msgstr "Formato da base de dados pré 3.5 detectado - a actualizar..."
 
 msgid "Done."
-msgstr ""
+msgstr "Feito."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -1756,52 +1775,57 @@ msgid "Finished. Your pacman database has been optimized."
 msgstr "Concluído. A base de dados do pacman foi optimizada."
 
 msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr ""
+msgstr "Uso: pkgdelta [-q] <pacote1> <pacote2>\\n"
 
 msgid ""
 "\tpkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n\\n"
 msgstr ""
+"\\tpkgdelta vai criar um ficheiro delta entre dois pacotes.\\nEste ficheiro "
+"poderá então ser adicionado à base de dados usando repo-add.\\n\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
-msgstr ""
+msgstr "Exemplo:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEste é um "
+"software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ "
+"GARANTIA, na extensão permitida pela lei.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Arquivo de pacote inválido '%s'."
 
 msgid "The package names don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Os nomes dos pacotes não coincidem: '%s' e '%s'"
 
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr ""
+msgstr "As arquiteturas dos pacotes não coincidem: '%s' e '%s'"
 
 msgid "Both packages have the same version : '%s'"
-msgstr ""
+msgstr "Ambos os pacotes têm a mesma versão: '%s'"
 
 msgid "Generating delta from version %s to version %s"
-msgstr ""
+msgstr "A gerando o delta da versão %s para a versão %s"
 
 msgid "Delta could not be created."
-msgstr ""
+msgstr "O delta não pode ser criado."
 
 msgid "Generated delta : '%s'"
-msgstr ""
+msgstr "Delta gerado: '%s'"
 
 msgid "File '%s' does not exist"
-msgstr ""
+msgstr "O ficheiro '%s' não existe"
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr ""
 "Não foi possível encontrar o binário xdelta3! O xdelta3 está instalado?"
 
 msgid "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
-msgstr ""
+msgstr "Uso: repo-add [-d] [-f] [-q] <caminho-para-a-bd> <pacote|delta> ...\\n"
 
 msgid "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
 msgstr ""
@@ -1829,16 +1853,23 @@ msgid ""
 "Use the -q/--quiet flag to minimize output to basic messages, warnings,"
 "\\nand errors.\\n\\n"
 msgstr ""
+"Use a flag -q/--quiet para minimizar o output para mensagens básicas, avisos,"
+"\\ne erros.\\n\\n"
 
 msgid ""
 "Use the -d/--delta flag to automatically generate and add a delta file"
 "\\nbetween the old entry and the new one, if the old package file is found"
 "\\nnext to the new one.\\n\\n"
 msgstr ""
+"Use a flag -d/--delta para gerar e adicionar automaticamente um ficheiro "
+"delta\\nentre o antigo e o novo registo, se o ficheiro do pacote antigo for "
+"encontrado\\npróximo do novo.\\n\\n"
 
 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
 msgstr ""
+"Use a flag -f/--files para actualizar uma base de dados incluindo os "
+"registos de ficheiros.\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr ""
@@ -1859,10 +1890,10 @@ msgstr ""
 "permitida pela lei.\\n"
 
 msgid "No database entry for package '%s'."
-msgstr ""
+msgstr "Nenhum registo de base de dados para o pacote '%s'."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr ""
+msgstr "A adicionar registo de 'deltas': %s -> %s"
 
 msgid "Removing existing entry '%s'..."
 msgstr "A remover entrada existente '%s'..."
@@ -1871,13 +1902,13 @@ msgid "An entry for '%s' already existed"
 msgstr "Uma entrada para '%s' já existe"
 
 msgid "Creating '%s' db entry..."
-msgstr ""
+msgstr "A criar registo '%s' na base de dados..."
 
 msgid "Computing md5 checksums..."
 msgstr "A informatizar md5sums..."
 
 msgid "Old package file not found: %s"
-msgstr ""
+msgstr "Ficheiro de pacotes antigo não encontrado: %s"
 
 msgid "Failed to acquire lockfile: %s."
 msgstr "Falhou ao adquirir o arquivo de bloqueio: %s."

po/pt_BR.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 02:31+0000\n"
+"Last-Translator: ambaratti <ambaratti.listas@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) <None>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -346,25 +346,20 @@ msgid ""
 msgstr "  -c, --cascade        remove pacotes e todos os que dependem deles\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         remove também os arquivos de configuração\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         remove os arquivos de configuração\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      também remove as dependências (que não causem quebra "
-"dos pacotes)\n"
-"                       (-ss também inclui dependências instaladas "
-"explicitamente)\n"
+"  -s, --recursive      remove as dependências desnecessárias\n"
+"                       (-ss inclui dependências instaladas explicitamente)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       remove pacotes desnecessários (que não quebrarão "
-"outros pacotes)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       remove pacotes desnecessários\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -541,8 +536,12 @@ msgstr ""
 "de uma vez)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         ignora a verificação de dependências\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         ignora verificações de versão da dependência (-dd "
+"para ignorar todas as verificações)\n"
 
 #, c-format
 msgid ""
@@ -566,11 +565,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"      --print          mostra apenas os pacotes em vez de efetuar a "
-"operação\n"
+msgstr "      --print          mostrar os alvos em vez de efetuar a operação\n"
 
 #, c-format
 msgid ""
@@ -682,6 +679,8 @@ msgstr "não foi possível mudar para o diretório %s (%s)\n"
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""
+"arquivo de configuração %s, linha %d: diretiva '%s' na seção '%s' não foi "
+"reconhecida.\n"
 
 #, c-format
 msgid ""
@@ -723,6 +722,7 @@ msgstr ""
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
+"arquivo de configuração %s, linha %d: diretiva '%s' precisa de um valor\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -744,6 +744,10 @@ msgstr "você não pode realizar esta operação a menos que seja root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nenhuma operação especificada (use -h para obter ajuda)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s pertence a %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nenhum arquivo foi especificado para --owns\n"
@@ -768,10 +772,6 @@ msgstr "não é possível determinar o caminho real para '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr "caminho muito longo: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s pertence a %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Nenhum pacote possui %s\n"
@@ -1662,6 +1662,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s não existe ou não é um diretório."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s não é um diretório de base de dados do pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 "Você precisa ter as permissões adequadas para atualizar a base de dados."

po/ro.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: z0id <mihai@m1x.ro>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 13:54+0000\n"
+"Last-Translator: wonder <ibiru@archlinux.org>\n"
 "Language-Team: Romanian <>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
@@ -228,7 +228,7 @@ msgstr "Depinde de         :"
 
 #, c-format
 msgid "Optional Deps  :"
-msgstr "Dep. opționale      :"
+msgstr "Dep. opționale     :"
 
 #, c-format
 msgid "Required By    :"
@@ -268,7 +268,7 @@ msgstr "Data construirii   :"
 
 #, c-format
 msgid "Install Date   :"
-msgstr "Data instalării   :"
+msgstr "Data instalării    :"
 
 #, c-format
 msgid "Install Reason :"
@@ -355,24 +355,20 @@ msgstr ""
 "\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         elimină și fișierele de configurare\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         elimină fișierele de configurare\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      elimină și dependențele (nu va strica pachete)\n"
-"                       (-ss include și dependențele instalate în mod "
-"explicit)\n"
+"  -s, --recursive      elimina dependențele inutile\n"
+"                       (-ss include dependețele instalate explicit\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       elimina pachetele de care nu este nevoie (nu va "
-"strica pachete)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       eliminină pachetele care nu sunt necesare\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -546,8 +542,12 @@ msgstr ""
 "mult de o dată)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         treci peste verificarea dependențelor\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         se omite verificare versiunii dependențelor (-dd "
+"pentru a omite toate verificările\n"
 
 #, c-format
 msgid ""
@@ -571,12 +571,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          doar afișează țintele în loc de a efectua "
-"operațiunea\n"
-"\n"
+"      --print          afișeaza țintele în loc de a efectua operațiunea\n"
 
 #, c-format
 msgid ""
@@ -750,6 +748,10 @@ msgstr "nu puteți efectua această operațiune decât dacă sunteți root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nu este specificată nicio operațiune (folosiți -h pentru ajutor)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s este deținut de către %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nu este specificat niciun fișier pentru --owns\n"
@@ -774,10 +776,6 @@ msgstr "nu poate fi determinată calea reală pentru '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr "cale prea lungă: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s este deținut de către %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr ""
@@ -1677,6 +1675,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s nu există sau nu este un director."
 
+msgid "%s is not a pacman database directory."
+msgstr "Directorul %s nu conține o bază de date pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 "Trebuie să aveți permisiunile corespunzătoare pentru a actualiza baza de "

po/ru.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-13 16:07+0000\n"
+"Last-Translator: vdk <vdk@gmx.us>\n"
 "Language-Team: Russian <None>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -346,24 +346,18 @@ msgid ""
 msgstr "  -c, --cascade        удалить пакет и все зависящие от него пакеты\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         удалить в том числе и конфигурационные файлы\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         удалить конфигурационный файл\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      удалить вместе с зависимостями (которые не повредят "
-"другие пакеты)\n"
-"                       (-ss включая явно установленные зависимости)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       удалить ненужные пакеты (это не повредит другие "
-"пакеты)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       удалить ненужные пакеты\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -529,8 +523,12 @@ msgstr ""
 "использовано неоднократно)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         не проверять зависимости\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         пропостить проверку версий (-dd пропускает все "
+"проверки)\n"
 
 #, c-format
 msgid ""
@@ -553,10 +551,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"      --print          только показать цели, вместо выполнения действия\n"
+msgstr "      --print          вывести цели вместо реального исполнения\n"
 
 #, c-format
 msgid ""
@@ -724,6 +721,10 @@ msgstr ""
 msgid "no operation specified (use -h for help)\n"
 msgstr "не задана операция (для справки используйте -h)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s принадлежит %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "не был указан файл для --owns\n"
@@ -748,10 +749,6 @@ msgstr "не удалось определить настоящий путь д
 msgid "path too long: %s%s\n"
 msgstr "путь слишком длинный: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s принадлежит %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Ни один пакет не содержит %s\n"
@@ -1640,6 +1637,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s не существует или не является каталогом."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s не является директорией базы дынных pacman."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Вы должны иметь правильные права доступа для обновления базы данных."
 

po/sk.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-22 15:26+0000\n"
+"Last-Translator: jose1711 <jose1711@gmail.com>\n"
+"Language-Team: Slovak <None>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr ":: Získavam balíčky z %s...\n"
 
 #, c-format
 msgid "checking available disk space...\n"
-msgstr ""
+msgstr "zisťujem voľné miesto na disku...\n"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
@@ -101,19 +101,25 @@ msgid_plural ""
 ":: The following packages cannot be upgraded due to unresolvable "
 "dependencies:\n"
 msgstr[0] ""
+":: Nasledovný balíček nemohol byť aktualizovaný kvôli nevyriešiteľným "
+"závislostiam:\n"
 msgstr[1] ""
+":: Nasledovné balíčky nemohli byť aktualizované kvôli nevyriešiteľným "
+"závislostiam:\n"
 msgstr[2] ""
+":: Nasledovné balíčky nemohli byť aktualizované kvôli nevyriešiteľným "
+"závislostiam:\n"
 
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Chcete preskočiť aktualizáciu balíčka vyššie?"
+msgstr[1] "Chete preskočiť aktualizáciu balíčkov vyššie?"
+msgstr[2] "Chete preskočiť aktualizáciu balíčkov vyššie?"
 
 #, c-format
 msgid ":: There are %d providers available for %s:\n"
-msgstr ""
+msgstr ":: Existujú %d poskytovatelia balíčka %s:\n"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
@@ -141,11 +147,11 @@ msgstr "kontrolujem konflikty súborov"
 
 #, c-format
 msgid "checking available disk space"
-msgstr ""
+msgstr "zisťujem voľné miesto na disku"
 
 #, c-format
 msgid "checking package integrity"
-msgstr ""
+msgstr "kontrolujem integritu balíčkov"
 
 #, c-format
 msgid "downloading %s...\n"
@@ -161,19 +167,20 @@ msgstr "nie sú špecifikované ciele (použite -h pre nápovedu)\n"
 
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
+msgstr "nie je špecifikovaný dôvod inštalácie (použite -h pre nápovedu)\n"
 
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
+msgstr "nepodarilo sa nastaviť dôvod pre inštaláciu balíčku %s (%s)\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
 msgstr ""
+"%s: dôvod pre inštaláciu bol nastavený na 'inštalovaný ako závislosť'\n"
 
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
+msgstr "%s: dôvod pre inštaláciu bol nastavený na 'explicitne nainštalovaný'\n"
 
 #, c-format
 msgid "Explicitly installed"
@@ -343,24 +350,18 @@ msgstr ""
 "závisia\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         odstrániť aj konfiguračné súbory\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr ""
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      odstrániť závislosti (ktoré nepoškodia iné balíčky)\n"
-"                       (--ss odstráni tiež explicitne nainštalované "
-"závislosti)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
-"  -u, --unneeded       odstrániť nepotrebné balíčky\n"
-"                       (ktoré nepoškodia iné balíčky)\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -528,13 +529,17 @@ msgstr ""
 "viackrát)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         preskočiť kontrolu závislostí\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
 
 #, c-format
 msgid ""
 "  -k, --dbonly         only modify database entries, not package files\n"
 msgstr ""
+"  -k, --dbonly         iba modifikovať záznamy v databáze, nie súbory "
+"balíčkov\n"
 
 #, c-format
 msgid ""
@@ -548,9 +553,9 @@ msgstr "      --noscriptlet    nespúšťať inštalačné skripty\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr "      --print          vypísať ciele miesto spustenia operácie\n"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -630,7 +635,7 @@ msgstr "súčasne je možné spustiť len jednu operáciu\n"
 
 #, c-format
 msgid "invalid option\n"
-msgstr ""
+msgstr "neplatná voľba\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -638,7 +643,7 @@ msgstr "chybná hodnota pre 'CleanMethod': '%s'\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr ""
+msgstr "nepodarilo sa zistiť aktuálny pracovný adresár\n"
 
 #, c-format
 msgid "could not chdir to download directory %s\n"
@@ -650,12 +655,14 @@ msgstr "spustenie XferCommand: bolo neúspešné!\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
+msgstr "nepodarilo sa zmeniť adresár na %s (%s)\n"
 
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""
+"konfiguračný súbor %s, riadok %d: direktíva '%s' v sekcii '%s' nebola "
+"rozpoznaná.\n"
 
 #, c-format
 msgid ""
@@ -694,7 +701,7 @@ msgstr ""
 
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
+msgstr "konfiguračný súbor %s, riadok %d: direktíva '%s' vyžaduje hodnotu\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -702,11 +709,11 @@ msgstr "zlyhala inicializácia knižnice alpm (%s)\n"
 
 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
-msgstr ""
+msgstr "detegované pretečenie zásobníka pri spracúvaní argumentov\n"
 
 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
-msgstr ""
+msgstr "nepodarilo sa znovuotvoriť štandardný vstup na čítanie: (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
@@ -716,6 +723,10 @@ msgstr "operáciu nie je možné uskutočniť, ak nie ste root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nebola špecifikovaná operácia (použite -h pre nápovedu)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s vlastní %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nebol určený súbor pre --owns\n"
@@ -730,7 +741,7 @@ msgstr "zlyhalo čítanie súboru '%s': %s\n"
 
 #, c-format
 msgid "cannot determine ownership of directory '%s'\n"
-msgstr ""
+msgstr "nepodarilo sa určiť vlastníctvo adresára '%s'\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
@@ -738,11 +749,7 @@ msgstr "nie je možné určiť skutočnú cestu pre '%s': %s\n"
 
 #, c-format
 msgid "path too long: %s%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s vlastní %s %s\n"
+msgstr "cesta príliš dlhá: %s%s\n"
 
 #, c-format
 msgid "No package owns %s\n"
@@ -755,16 +762,16 @@ msgstr "skupina \"%s\" nebola nájdená\n"
 #, c-format
 msgid "%s: %d total file, "
 msgid_plural "%s: %d total files, "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s: %d súbor celkom, "
+msgstr[1] "%s: %d súbory celkom, "
+msgstr[2] "%s: %d súborov celkom, "
 
 #, c-format
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d chýbajúci súbor\n"
+msgstr[1] "%d chýbajúce súbory\n"
+msgstr[2] "%d chýbajúcich súborov\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -813,7 +820,7 @@ msgstr "nie je možné pristupovať k adresáru s databázou\n"
 
 #, c-format
 msgid "could not remove %s\n"
-msgstr ""
+msgstr "nemôžem odstrániť %s\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
@@ -837,19 +844,19 @@ msgstr "Adresár cache: %s\n"
 
 #, c-format
 msgid "Packages to keep:\n"
-msgstr ""
+msgstr "Balíčky, ktoré nebudú odstránené:\n"
 
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
+msgstr "  Všetky lokálne nainštalované balíčky\n"
 
 #, c-format
 msgid "  All current sync database packages\n"
-msgstr ""
+msgstr "  Všetky balíčky v databáze\n"
 
 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr ""
+msgstr "Chcete odstrániť všetky ostatné balíčky z cache?"
 
 #, c-format
 msgid "removing old packages from cache...\n"
@@ -909,15 +916,15 @@ msgstr "preskakujem cieľ: %s\n"
 
 #, c-format
 msgid "target not found: %s\n"
-msgstr ""
+msgstr "cieľ nebol nájdený: %s\n"
 
 #, c-format
 msgid ":: There are %d members in group %s:\n"
-msgstr ""
+msgstr ":: V skupine %2$s je %1$d členov:\n"
 
 #, c-format
 msgid "database not found: %s\n"
-msgstr ""
+msgstr "databáza nebola nájdená: %s\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
@@ -983,7 +990,7 @@ msgstr ""
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "  skúste spustiť pacman-db-upgrade\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -1023,23 +1030,23 @@ msgstr "Voliteľné závislosti pre %s\n"
 
 #, c-format
 msgid "Repository %s\n"
-msgstr ""
+msgstr "Repozitár %s\n"
 
 #, c-format
 msgid "Invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "Neplatná hodnota: %d nie je medzi %d a %d\n"
 
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "Neplatné čislo: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
-msgstr ""
+msgstr "Zadajte výber (východzie=všetky)"
 
 #, c-format
 msgid "Enter a number (default=%d)"
-msgstr ""
+msgstr "Zadajte číslo (východzie=%d)"
 
 #, c-format
 msgid "[Y/n]"
@@ -1067,7 +1074,7 @@ msgstr "NIE"
 
 #, c-format
 msgid "failed to allocate string\n"
-msgstr ""
+msgstr "nepodarilo sa alokovať reťazec\n"
 
 #, c-format
 msgid "error: %s"
@@ -1177,7 +1184,7 @@ msgid "Failed to extract %s"
 msgstr "Chyba pri rozbaľovaní %s"
 
 msgid "A failure occurred in %s()."
-msgstr ""
+msgstr "Chyba nastala v %s()."
 
 msgid "Starting %s()..."
 msgstr "Spúšťam %s()..."
@@ -1214,7 +1221,7 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Príklad pre GPL software: license=('GPL')."
 
 msgid "Backup entry file not in package : %s"
-msgstr ""
+msgstr "Zálohovaný súbor nie je v balíčku: %s"
 
 msgid "Package contains reference to %s"
 msgstr "Balíček obsahuje odkaz na %s"
@@ -1226,7 +1233,7 @@ msgid "Creating package..."
 msgstr "Vytváram balíček..."
 
 msgid "Adding %s file..."
-msgstr ""
+msgstr "Prídávam súbor %s..."
 
 msgid "Compressing package..."
 msgstr "Komprimujem balíček..."
@@ -1259,7 +1266,7 @@ msgid "Failed to create source package file."
 msgstr "Chyba pri vytváraní zdrojového balíčku."
 
 msgid "Failed to create symlink to source package file."
-msgstr ""
+msgstr "Nepodarilo sa vytvoriť symbolický odkaz na súbor zdrojového balíčku."
 
 msgid "Installing package %s with %s -U..."
 msgstr "Inštalujem balíček %s pomocou %s -U..."
@@ -1277,13 +1284,13 @@ msgid "%s is not allowed to start with a hyphen."
 msgstr "%s nemôže začínať pomlčkou."
 
 msgid "%s is not allowed to contain colons or hyphens."
-msgstr ""
+msgstr "%s nemôže obsahovať dvojbodky alebo pomlčky."
 
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s nemôže obsahovat pomlčky."
 
 msgid "%s must be an integer."
-msgstr ""
+msgstr "%s musí byť celé číslo."
 
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s nie je dostupný pre architektúru '%s'."
@@ -1298,7 +1305,7 @@ msgid "Provides array cannot contain comparison (< or >) operators."
 msgstr "Pole Provides nemôže obsahovať porovnávacie operátory (< alebo >)."
 
 msgid "Backup entry should not contain leading slash : %s"
-msgstr ""
+msgstr "Zálohovaný súbor by nemal začínať lomkou: %s"
 
 msgid "Invalid syntax for optdepend : '%s'"
 msgstr "Chybná syntax pre voliteľné závislosti: '%s'"
@@ -1316,7 +1323,7 @@ msgid "requested package %s is not provided in %s"
 msgstr "požadovaný balíček %s nie je poskytovaný balíčkom %s"
 
 msgid "Determining latest %s revision..."
-msgstr ""
+msgstr "Zisťujem poslednú revíziu %s..."
 
 msgid "Version found: %s"
 msgstr "Nájdená verzia: %s"
@@ -1398,7 +1405,7 @@ msgid "  --asroot         Allow makepkg to run as root user"
 msgstr "  --asroot         Povoliť spustenie makepkg pod užívateľom root"
 
 msgid "  --check          Run the check() function in the %s"
-msgstr ""
+msgstr "  --check          Spustiť funkciu check() v %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
@@ -1407,9 +1414,10 @@ msgstr ""
 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
+"  --holdver        Zabrániť automatickému zisteniu verzie pre vývojové %sy"
 
 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr ""
+msgstr "  --nocheck        Nespúšťať funkciu check() v %s"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr ""
@@ -1441,6 +1449,10 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2006-2011 Pacman Tím vývojárov <pacman-dev@archlinux.org>."
+"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nToto je "
+"slobodný software; podmienky kopírovania nájdete v zdrojových súboroch\\nNa "
+"software sa nevzťahuje ŽIADNA ZÁRUKA. v rozsahu povoleného zákonom.\\n"
 
 msgid "%s not found."
 msgstr "%s nebol nájdený."
@@ -1557,10 +1569,10 @@ msgid "Skipping dependency checks."
 msgstr "Preskakujem kontrolu závislostí."
 
 msgid "Checking runtime dependencies..."
-msgstr ""
+msgstr "Zisťujem runtime závislosti..."
 
 msgid "Checking buildtime dependencies..."
-msgstr ""
+msgstr "Zisťujem buildtime závislosti..."
 
 msgid "Could not resolve all dependencies."
 msgstr "Nie je možné vyriešiť všetky závislosti."
@@ -1603,21 +1615,28 @@ msgid ""
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2006-2011 Pacman Tím vývojárov <pacman-dev@archlinux.org>."
+"\\nToto je slobodný software; podmienky kopírovania nájdete v zdrojových "
+"súboroch\\nNa software sa nevzťahuje ŽIADNA ZÁRUKA. v rozsahu povoleného "
+"zákonom.\\n"
 
 msgid "%s does not exist or is not a directory."
-msgstr "%s neexistuje, alebo nie je adresár."
+msgstr "%s neexistuje, alebo nie je adresárom."
+
+msgid "%s is not a pacman database directory."
+msgstr ""
 
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
+msgstr "Na upgrade databáze musíte mať správne oprávnenia."
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr "Bol nájdený zámok pacmana. Nedá sa pokračovať, kým pacman beží."
 
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
+msgstr "Zistený formát databáze pred verziu 3.5 - aktualizujem..."
 
 msgid "Done."
-msgstr ""
+msgstr "Hotovo."
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -1680,51 +1699,57 @@ msgid "Finished. Your pacman database has been optimized."
 msgstr "Hotovo. Databáza pacmana bola optimalizovaná."
 
 msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr ""
+msgstr "Použitie: pkgdelta [-q] <balíček1> <balíček2>\\n"
 
 msgid ""
 "\tpkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n\\n"
 msgstr ""
+"\tpkgdelta vytvorí delta rozdiel medzi dvoma balíčkami.\\nTento delta "
+"rozdiel potom môže byť pridaný do databáze pomocou repo-add.\\n\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
-msgstr ""
+msgstr "Príklad:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
 msgstr ""
+"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nToto je "
+"slobodný software; podmienky kopírovania nájdete v zdrojových súboroch\\nNa "
+"software sa nevzťahuje ŽIADNA ZÁRUKA. v rozsahu povoleného zákonom.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Neplatný súbor balíčka '%s'."
 
 msgid "The package names don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Mena balíčkov nesúhlasia: '%s' a '%s'"
 
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr ""
+msgstr "Architektúry balíčkov nesúhlasia: '%s' a '%s'"
 
 msgid "Both packages have the same version : '%s'"
-msgstr ""
+msgstr "Oba balíčky sú v rovnakej verzii: '%s'"
 
 msgid "Generating delta from version %s to version %s"
-msgstr ""
+msgstr "Generujem delta rozdiel z verzie %s na verziu %s"
 
 msgid "Delta could not be created."
-msgstr ""
+msgstr "Delta rozdiel sa nepodarilo vytvoriť."
 
 msgid "Generated delta : '%s'"
-msgstr ""
+msgstr "Vygenerovaný delta rozdiel: '%s'"
 
 msgid "File '%s' does not exist"
-msgstr ""
+msgstr "Súbor '%s' neexistuje"
 
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "Nepodarilo sa nájsť príkaz xdelta3! Je xdelta3 nainštalovaný?"
 
 msgid "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
 msgstr ""
+"Použitie: repo-add [-d] [-f] [-q] <cesta-k-db> <balíček|delta rozdiel> ...\\n"
 
 msgid "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
 msgstr "Použitie: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
@@ -1749,16 +1774,23 @@ msgid ""
 "Use the -q/--quiet flag to minimize output to basic messages, warnings,"
 "\\nand errors.\\n\\n"
 msgstr ""
+"Použite prepínač -q/--quiet pre obmedzenie výstupu na základné hlášky, "
+"varovania,\\na chyby.\\n\\n"
 
 msgid ""
 "Use the -d/--delta flag to automatically generate and add a delta file"
 "\\nbetween the old entry and the new one, if the old package file is found"
 "\\nnext to the new one.\\n\\n"
 msgstr ""
+"Použite prepínač -d/--delta pre automatické vygenerovanie a pridanie delta "
+"rozdielu\\nmedzi starým a novým balíčkom, ak je nájdená staršia verzia"
+"\\npridávaného balíčku.\\n\\n"
 
 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
 msgstr ""
+"Použite prepínač -f/--files pre aktualizciu databáze vrátane záznamov o "
+"súboroch.\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "Príklad:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1778,10 +1810,10 @@ msgstr ""
 "kóde. Zo zákona nie sú poskytované ŽIADNE ZÁRUKY.\\n"
 
 msgid "No database entry for package '%s'."
-msgstr ""
+msgstr "V databáze neexistuje záznam o balíčku '%s'."
 
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr ""
+msgstr "Pridávam 'delta' záznam: %s -> %s"
 
 msgid "Removing existing entry '%s'..."
 msgstr "Odstraňujem existujúci záznam '%s'..."
@@ -1790,13 +1822,13 @@ msgid "An entry for '%s' already existed"
 msgstr "Záznam pre '%s' už existuje"
 
 msgid "Creating '%s' db entry..."
-msgstr ""
+msgstr "Vytváram db záznam '%s'..."
 
 msgid "Computing md5 checksums..."
 msgstr "Počítam kontrolný MD5 súčet..."
 
 msgid "Old package file not found: %s"
-msgstr ""
+msgstr "Staršia verzia balíčku nebol nájdená: %s"
 
 msgid "Failed to acquire lockfile: %s."
 msgstr "Zlyhalo získanie zamykacieho súboru: %s."

po/sr.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 10:01+0000\n"
 "Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian <None>\n"
 "Language: sr\n"
@@ -242,7 +242,7 @@ msgstr "Вел. преузимања  : %6.2f K\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Вел. архиве      : %6.2f K\n"
+msgstr "Вел. архиве    : %6.2f K\n"
 
 #, c-format
 msgid "Installed Size : %6.2f K\n"
@@ -346,23 +346,20 @@ msgid ""
 msgstr " -c, --cascade        уклања пакета и све пакете који зависе од њих\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr " -n, --nosave         уклања и све фајлове поставки\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave        уклања фајлове поставки\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --resursive      уклања и све зависности (које неће поломити пакете)\n"
-"                      (-ss укључује и експлицитно инсталиране зависности)\n"
+"  -s, --recursive      уклања непотребне зависности\n"
+"                       (-ss укључује и експлицитно инсталиране зависности)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-" -u, --unneeded       укања непотребне пакете (који неће поломити друге "
-"пакете)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       уклања непотребне пакете\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -528,8 +525,12 @@ msgstr ""
 "пута)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         прескаче проверу зависности\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         прескаче проверу верзија зависности (-dd прескаче све "
+"провере)\n"
 
 #, c-format
 msgid ""
@@ -550,10 +551,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"      --print          само штампа циљеве иместо извршавања операције\n"
+msgstr "      --print         штампа циљеве уместо извршавања операције\n"
 
 #, c-format
 msgid ""
@@ -717,6 +717,10 @@ msgstr "не можете извршити ову операцију ако ни
 msgid "no operation specified (use -h for help)\n"
 msgstr "није назначена операција (употребите -h за помоћ)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s је у саставу %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "није одређен фајл за --owns\n"
@@ -741,10 +745,6 @@ msgstr "не могу да утврдим стварну путању за „%s
 msgid "path too long: %s%s\n"
 msgstr "предуга путања: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s је у саставу %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Ниједан пакет не садржи %s\n"
@@ -968,8 +968,8 @@ msgid ""
 ":: Do you want to cancel the current operation\n"
 ":: and upgrade these packages now?"
 msgstr ""
-":: Желите ли да откажете тренутну радњу\n"
-":: и надорадите ове пакете одмах?"
+":: Желите ли да откажете тренутну операцију\n"
+":: и надоградите ове пакете одмах?"
 
 #, c-format
 msgid "failed to init transaction (%s)\n"
@@ -1617,6 +1617,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s не постоји или није у фасцикли."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s није фасцикла пакменове базе."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Морате имати одговарајуће дозволе за надоградњу базе."
 

po/sr@latin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 10:02+0000\n"
 "Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (Latin) <None>\n"
 "Language: sr@latin\n"
@@ -242,7 +242,7 @@ msgstr "Vel. preuzimanja  : %6.2f K\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Vel. arhive      : %6.2f K\n"
+msgstr "Vel. arhive    : %6.2f K\n"
 
 #, c-format
 msgid "Installed Size : %6.2f K\n"
@@ -347,23 +347,20 @@ msgstr ""
 " -c, --cascade        uklanja paketa i sve pakete koji zavise od njih\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr " -n, --nosave         uklanja i sve fajlove postavki\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         uklanja fajlove postavki\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --resursive      uklanja i sve zavisnosti (koje neće polomiti pakete)\n"
-"                      (-ss uključuje i eksplicitno instalirane zavisnosti)\n"
+"  -s, --recursive      uklanja nepotrebne zavisnosti\n"
+"                       (-ss uključuje i eksplicitno instalirane zavisnosti)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-" -u, --unneeded       ukanja nepotrebne pakete (koji neće polomiti druge "
-"pakete)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       uklanja nepotrebne pakete\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -529,8 +526,12 @@ msgstr ""
 "puta)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         preskače proveru zavisnosti\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         preskače provere verzija zavisnosti (-dd preskače sve "
+"provere)\n"
 
 #, c-format
 msgid ""
@@ -551,10 +552,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"      --print          samo štampa ciljeve imesto izvršavanja operacije\n"
+msgstr "      --print          štampa ciljeve umesto izvršavanja operacije\n"
 
 #, c-format
 msgid ""
@@ -719,6 +719,10 @@ msgstr "ne možete izvršiti ovu operaciju ako niste koreni korisnik.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "nije naznačena operacija (upotrebite -h za pomoć)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s je u sastavu %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nije određen fajl za --owns\n"
@@ -743,10 +747,6 @@ msgstr "ne mogu da utvrdim stvarnu putanju za „%s“: %s\n"
 msgid "path too long: %s%s\n"
 msgstr "preduga putanja: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s je u sastavu %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Nijedan paket ne sadrži %s\n"
@@ -970,8 +970,8 @@ msgid ""
 ":: Do you want to cancel the current operation\n"
 ":: and upgrade these packages now?"
 msgstr ""
-":: Želite li da otkažete trenutnu radnju\n"
-":: i nadoradite ove pakete odmah?"
+":: Želite li da otkažete trenutnu operaciju\n"
+":: i nadogradite ove pakete odmah?"
 
 #, c-format
 msgid "failed to init transaction (%s)\n"
@@ -1621,6 +1621,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s ne postoji ili nije u fascikli."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s nije fascikla pacmanove baze."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Morate imati odgovarajuće dozvole za nadogradnju baze."
 

po/sv.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-03-28 02:39+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sv\n"
@@ -341,24 +341,18 @@ msgstr ""
 "dom\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         ta även bort konfigurationsfiler\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr ""
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      ta även bort beroenden (som inte stör andra paket)\n"
-"                       (-ss inkluderar även uttryckligt installerade "
-"beroenden\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
-"  -u, --unneeded       tar bort ej behövda paket (som inte stör andra "
-"paket)\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -522,8 +516,10 @@ msgstr ""
 "gång)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         hoppa över kontroll av beroenden\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -546,9 +542,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr "--print         skriv endast ut, utan att utföra operationen\n"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -713,6 +709,10 @@ msgstr "du kan inte genomföra denna operation om du inte är root.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "ingen operation specifierad (använd -h för hjälp)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s ägs av %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "ingen fil specifierades för --owns\n"
@@ -737,10 +737,6 @@ msgstr "kan inte bestämma riktig sökväg för '%s': %s\n"
 msgid "path too long: %s%s\n"
 msgstr ""
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s ägs av %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Inget paket äger %s\n"
@@ -1617,6 +1613,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s existerar inte eller är inte en katalog."
 
+msgid "%s is not a pacman database directory."
+msgstr ""
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 

po/tr.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: ras0ir <ras0ir@eventualis.org>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-06 08:03+0000\n"
+"Last-Translator: tarakbumba <tarakbumba@gmail.com>\n"
 "Language-Team: Turkish <None>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -344,24 +344,21 @@ msgstr ""
 "  -c, --cascade       paket(ler)i ve on(lar)a ait tüm bağımlılıkları kaldır\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         yapılandırma dosyalarını da sil\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         yapılandırma dosyalarını kaldır\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      paketin çalışmasını engellemeyecek bağımlılıkları da "
+"  -s, --recursive      gereksiz bağımlılıkları\n"
 "kaldır\n"
-"                       (-ss doğrudan kurulmuş bağımlılıkları da içerir)\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       paketin çalışmasını engellemeyecek gereksiz "
-"bağımlılıkları da kaldır\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       gereksiz paketleri kaldır\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -525,8 +522,12 @@ msgstr ""
 "grup için kullanılabilir)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         bağımlılık kontrolünü atla\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         bağımlılk sürüm denetimlerini atla (-dd tüm "
+"denetimleri atlar)\n"
 
 #, c-format
 msgid ""
@@ -545,10 +546,11 @@ msgstr "      --noscriptlet    kurulum betiği varsa çalıştırma\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print           işlemi gerçekleştirmek yerine hedefleri göster\n"
+"      --print          işlemi gerçekleştirmek yerine hedefleri ekrana "
+"yazdır\n"
 
 #, c-format
 msgid ""
@@ -713,6 +715,10 @@ msgstr "yönetici yetkileri olmadan bu işlemi gerçekleştiremezsiniz.\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "herhangi bir işlem belirlenmedi (yardım için -h kullanın)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s, %s %s tarafından sahiplenilmektedir\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "--owns parametresi için herhangi bir dosya belirtilmedi\n"
@@ -737,10 +743,6 @@ msgstr "'%s' için gerçek yol belirlenemedi: %s\n"
 msgid "path too long: %s%s\n"
 msgstr "dosya yolu çok uzun: %s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s, %s %s tarafından sahiplenilmektedir\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "%s hiçbir paket tarafından sahiplenilmiyor\n"
@@ -1633,6 +1635,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s bulunamadı ya da bir dizin değil."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s bir pacman veritabanı dizini değil."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Veritabanını yükseltmek için geçerli izniniz bulunmalıdır."
 

po/uk.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-03-28 02:39+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: uk\n"
@@ -343,23 +343,18 @@ msgstr ""
 "  -c, --cascade        вилучити пакунки і всі пакунки, які залежать від них\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         також вилучити файли налаштувань\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr ""
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      вилучити залежності також (які не зламають пакунки)\n"
-"                       (-ss включає явно встановлені залежності також)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
 msgstr ""
-"  -u, --unneeded       вилучити непотрібні пакунки (які не зламають "
-"пакунки)\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -528,8 +523,10 @@ msgstr ""
 "неодноразово)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         пропустити перевірку залежностей\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -550,10 +547,9 @@ msgstr "      --noscriptlet    не виконувати скрипт встан
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
 msgstr ""
-"      --print          тільки вивести цілі замість виконання операції\n"
 
 #, c-format
 msgid ""
@@ -722,6 +718,10 @@ msgstr "ви можете виконати цю операцію тільки я
 msgid "no operation specified (use -h for help)\n"
 msgstr "не вказано операцію (використайте -h для довідки)\n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s є власністю %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "не було вказано файл для --owns\n"
@@ -746,10 +746,6 @@ msgstr "неможливо визначити справжній шлях до '
 msgid "path too long: %s%s\n"
 msgstr ""
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s є власністю %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Жоден пакунок не є власником %s\n"
@@ -1625,6 +1621,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s не існує, або не є каталогом."
 
+msgid "%s is not a pacman database directory."
+msgstr ""
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr ""
 

po/zh_CN.po

@@ -1,16 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#   <rainofchaos@gmail.com>, 2011
+# leonfeng <rainofchaos@gmail.com>, 2011
+# 甘 露 <rhythm.gan@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
-"Last-Translator: ganlu <rhythm.gan@gmail.com>\n"
-"Language-Team: Chinese (China) <None>\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-06-04 02:50+0000\n"
+"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/"
+"archlinux-pacman/team/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -150,7 +153,7 @@ msgstr "正在下载 %s...\n"
 
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "内存分配失败：无法分配 %zd bytes\n"
+msgstr "内存分配失败：无法分配 %zd \n"
 
 #, c-format
 msgid "no targets specified (use -h for help)\n"
@@ -338,22 +341,20 @@ msgid ""
 msgstr "  -c, --cascade        删除软件包及所有依赖于此的软件包\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr "  -n, --nosave         同时删除配置文件\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         删除配置文件\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --recursive      同时删除 (不会破坏其他软件包的) 依赖关系\n"
-"                       (-ss·也包括单独指定安装的依赖关系)\n"
+"  -s, --recursive      删除不需要的依赖关系\n"
+"                       (-ss 包括单独指定安装的依赖关系)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       同时删除不需要的 (且不会破坏其他软件包的) 依赖关系\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       删除不需要的软件包\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -495,8 +496,10 @@ msgstr ""
 "                         升级时忽略某个软件包组 (可多次使用) \n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         略过依赖关系检查\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr "-d, --nodeps         跳过依赖关系的版本检查 (-dd 跳过所有检查)\n"
 
 #, c-format
 msgid ""
@@ -515,9 +518,9 @@ msgstr "      --noscriptlet    不执行安装小脚本\n"
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr "      --print          仅打印目标而不执行操作\n"
+msgstr "      --print          打印本目标而不是执行本操作\n"
 
 #, c-format
 msgid ""
@@ -678,6 +681,10 @@ msgstr "非 root (根用户) 无法执行指定操作。\n"
 msgid "no operation specified (use -h for help)\n"
 msgstr "没有指定的操作 (使用 -h 获取帮助) \n"
 
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s 属于 %s %s\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "错误：没有为 --owns 指定文件\n"
@@ -702,10 +709,6 @@ msgstr "无法确定 '%s' 的真实路径：%s\n"
 msgid "path too long: %s%s\n"
 msgstr "路径过长：%s%s\n"
 
-#, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s 属于 %s %s\n"
-
 #, c-format
 msgid "No package owns %s\n"
 msgstr "没有软件包拥有 %s\n"
@@ -1561,6 +1564,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s 不存在或不是一个目录。"
 
+msgid "%s is not a pacman database directory."
+msgstr "%s 不是一个 pacman 的数据库目录。"
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "您必须有正确的许可才可升级数据库。"
 

scripts/makepkg.sh.in

@@ -286,11 +286,10 @@ check_buildenv() {
 #          ? - not found
 ##
 in_opt_array() {
-	local needle=$(tr '[:upper:]' '[:lower:]' <<< $1); shift
+	local needle=$1; shift
 
 	local opt
 	for opt in "$@"; do
-		opt=$(tr '[:upper:]' '[:lower:]' <<< $opt)
 		if [[ $opt = $needle ]]; then
 			echo 'y' # Enabled
 			return
@@ -395,7 +394,7 @@ run_pacman() {
 		if [ "$(type -p sudo)" ]; then
 			cmd="sudo $cmd"
 		else
-			cmd="su -c '$cmd'"
+			cmd="su root -c '$cmd'"
 		fi
 	fi
 	eval "$cmd"
@@ -510,7 +509,8 @@ download_sources() {
 		local file=$(get_filepath "$netfile" || true)
 		if [[ -n "$file" ]]; then
 			msg2 "$(gettext "Found %s")" "${file##*/}"
-			ln -sf "$file" "$srcdir/"
+			rm -f "$srcdir/$file"
+			ln -s "$file" "$srcdir/"
 			continue
 		fi
 
@@ -578,7 +578,6 @@ generate_checksums() {
 
 	local integ
 	for integ in ${integlist[@]}; do
-		integ=$(tr '[:upper:]' '[:lower:]' <<< "$integ")
 		case "$integ" in
 			md5|sha1|sha256|sha384|sha512) : ;;
 			*)
@@ -676,7 +675,7 @@ extract_sources() {
 	local netfile
 	for netfile in "${source[@]}"; do
 		local file=$(get_filename "$netfile")
-		if in_array "$file" ${noextract[@]}; then
+		if in_array "$file" "${noextract[@]}"; then
 			#skip source files in the noextract=() array
 			#  these are marked explicitly to NOT be extracted
 			continue
@@ -794,15 +793,15 @@ run_function() {
 		# ensure overridden package variables survive tee with split packages
 		logpipe=$(mktemp -u "$startdir/logpipe.XXXXXXXX")
 		mkfifo "$logpipe"
-		exec 3>&1
 		tee "$BUILDLOG" < "$logpipe" &
-		exec 1>"$logpipe" 2>"$logpipe"
+		local teepid=$!
+
 		restoretrap=$(trap -p ERR)
 		trap 'error_function $pkgfunc' ERR
-		$pkgfunc 2>&1
+		$pkgfunc &>"$logpipe"
 		eval $restoretrap
-		sync
-		exec 1>&3 2>&3 3>&-
+
+		wait $teepid
 		rm "$logpipe"
 	else
 		restoretrap=$(trap -p ERR)
@@ -879,8 +878,8 @@ tidy_install() {
 				# update symlinks to this manpage
 				find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null |
 				while read link ; do
-					rm -f "$link"
-					ln -sf "${file}.gz" "${link}.gz"
+					rm -f "$link" "${link}.gz"
+					ln -s "${file}.gz" "${link}.gz"
 				done
 
 				# check file still exists (potentially already compressed due to hardlink)
@@ -1039,13 +1038,12 @@ create_package() {
 	local comp_files=".PKGINFO"
 
 	# check for changelog/install files
-	for i in 'changelog' 'install'; do
-		orig=${!i}
-		dest=$(tr '[:lower:]' '[:upper:]' <<<".$i")
+	for i in 'changelog/.CHANGELOG' 'install/.INSTALL'; do
+		IFS='/' read -r orig dest <<< "$i"
 
-		if [[ -n $orig ]]; then
-			msg2 "$(gettext "Adding %s file...")" "$i"
-			cp "$startdir/$orig" "$dest"
+		if [[ -n ${!orig} ]]; then
+			msg2 "$(gettext "Adding %s file...")" "$orig"
+			cp "$startdir/${!orig}" "$dest"
 			chmod 644 "$dest"
 			comp_files+=" $dest"
 		fi
@@ -1079,7 +1077,7 @@ create_package() {
 	    *tar.bz2) bzip2 -c -f ;;
 	    *tar.xz)  xz -c -z - ;;
 	    *tar)     cat ;;
-	esac > ${pkg_file} || ret=$?
+	esac > "${pkg_file}" || ret=$?
 
 	shopt -u nullglob
 	shopt -u -o pipefail
@@ -1090,7 +1088,8 @@ create_package() {
 	fi
 
 	if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then
-		ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}"
+		rm -f "${pkg_file/$PKGDEST/$startdir}"
+		ln -s "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}"
 		ret=$?
 	fi
 
@@ -1138,7 +1137,7 @@ create_srcpackage() {
 
 	local i
 	for i in 'changelog' 'install'; do
-		local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT")
+		local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE")
 		local file
 		for file in $filelist; do
 			# evaluate any bash variables used
@@ -1172,7 +1171,8 @@ create_srcpackage() {
 	fi
 
 	if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then
-		ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"
+		rm -f "${pkg_file/$SRCPKGDEST/$startdir}"
+		ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"
 		ret=$?
 	fi
 
@@ -1259,7 +1259,7 @@ check_sanity() {
 
 	local provides_list=()
 	eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \
-		sed -e "s/provides=/provides_list+=/" -e "s/#.*//")
+		sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//')
 	for i in ${provides_list[@]}; do
 		if [[ $i != ${i//</} || $i != ${i//>/} ]]; then
 			error "$(gettext "Provides array cannot contain comparison (< or >) operators.")"
@@ -1269,7 +1269,7 @@ check_sanity() {
 
 	local backup_list=()
 	eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | \
-		sed -e "s/backup=/backup_list+=/" -e "s/#.*//")
+		sed -e "s/backup=/backup_list+=/" -e "s/#.*//" -e 's/\\$//')
 	for i in "${backup_list[@]}"; do
 		if [[ ${i:0:1} = "/" ]]; then
 			error "$(gettext "Backup entry should not contain leading slash : %s")" "$i"
@@ -1278,8 +1278,8 @@ check_sanity() {
 	done
 
 	local optdepends_list=()
-	eval $(awk '/^[[:space:]]*optdepends=\(/,/\)[[:space:]]*(|#.*)$/' "$BUILDFILE" | \
-		sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//")
+	eval $(awk '/^[[:space:]]*optdepends=\(/,/\)[[:space:]]*(#.*)?$/' "$BUILDFILE" | \
+		sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//')
 	for i in "${optdepends_list[@]}"; do
 		local pkg=${i%%:*}
 		if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then
@@ -1304,7 +1304,7 @@ check_sanity() {
 	local valid_options=1
 	local known kopt options_list
 	eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | \
-		sed -e "s/options=/options_list+=/" -e "s/#.*//")
+		sed -e "s/options=/options_list+=/" -e "s/#.*//" -e 's/\\$//')
 	for i in ${options_list[@]}; do
 		known=0
 		# check if option matches a known option or its inverse

scripts/pacman-db-upgrade.sh.in

@@ -83,10 +83,14 @@ if [[ -n $1 ]]; then
 	dbroot="$1"
 fi
 
-if [[ ! -d $dbroot || ! -d $dbroot/local ]]; then
+if [[ ! -d $dbroot ]]; then
 	die "$(gettext "%s does not exist or is not a directory.")" "$dbroot"
 fi
 
+if [[ ! -d $dbroot/local ]]; then
+	die "$(gettext "%s is not a pacman database directory.")" "$dbroot"
+fi
+
 if [[ ! -w $dbroot ]]; then
 	die "$(gettext "You must have correct permissions to upgrade the database.")"
 fi

scripts/repo-add.sh.in

@@ -292,7 +292,7 @@ db_write_entry()
 		msg2 "$(gettext "Creating '%s' db entry...")" 'files'
 		local files_path="$tmpdir/$pkgname-$pkgver/files"
 		echo "%FILES%" >$files_path
-		bsdtar --exclude='.*' -tf "$pkgfile" >>$files_path
+		bsdtar --exclude='^.*' -tf "$pkgfile" >>$files_path
 	fi
 
 	# create a delta file
@@ -525,8 +525,9 @@ if (( success )); then
 	[[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE"
 	dblink="${REPO_DB_FILE%.tar.*}"
 	target=${REPO_DB_FILE##*/}
-	ln -sf "$target" "$dblink" 2>/dev/null || \
-		ln -f "$target" "$dblink" 2>/dev/null || \
+	rm -f "$dblink"
+	ln -s "$target" "$dblink" 2>/dev/null || \
+		ln "$target" "$dblink" 2>/dev/null || \
 		cp "$REPO_DB_FILE" "$dblink"
 else
 	msg "$(gettext "No packages modified, nothing to do.")"

src/pacman/callback.c

@@ -27,6 +27,7 @@
 #include <sys/types.h> /* off_t */
 #include <unistd.h>
 #include <wchar.h>
+#include <limits.h> /* UINT_MAX */
 
 #include <alpm.h>
 
@@ -351,7 +352,9 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 	int len, wclen, wcwid, padwid;
 	wchar_t *wcstr;
 
-	if(config->noprogressbar) {
+	const int cols = getcols(0);
+
+	if(config->noprogressbar || cols == 0) {
 		return;
 	}
 
@@ -397,7 +400,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 			return;
 	}
 
-	infolen = getcols() * 6 / 10;
+	infolen = cols * 6 / 10;
 	if (infolen < 50) {
 		infolen = 50;
 	}
@@ -454,7 +457,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 	free(wcstr);
 
 	/* call refactored fill progress function */
-	fill_progress(percent, percent, getcols() - infolen);
+	fill_progress(percent, percent, cols - infolen);
 
 	if(percent == 100) {
 		alpm_list_t *i = NULL;
@@ -497,7 +500,9 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	int file_percent = 0, total_percent = 0;
 	char rate_size = 'K', xfered_size = 'K';
 
-	if(config->noprogressbar || file_total == -1) {
+	const int cols = getcols(0);
+
+	if(config->noprogressbar || cols == 0 || file_total == -1) {
 		if(file_xfered == 0) {
 			printf(_("downloading %s...\n"), filename);
 			fflush(stdout);
@@ -505,7 +510,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 		return;
 	}
 
-	infolen = getcols() * 6 / 10;
+	infolen = cols * 6 / 10;
 	if (infolen < 50) {
 		infolen = 50;
 	}
@@ -557,10 +562,13 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 		diff_sec = current_time.tv_sec - initial_time.tv_sec;
 		diff_usec = current_time.tv_usec - initial_time.tv_usec;
 		timediff = diff_sec + (diff_usec / 1000000.0);
-		rate = xfered / (timediff * 1024.0);
-
-		/* round elapsed time to the nearest second */
-		eta_s = (int)(timediff + 0.5);
+		if(timediff > 0.0) {
+			rate = xfered / (timediff * 1024.0);
+			/* round elapsed time to the nearest second */
+			eta_s = (unsigned int)(timediff + 0.5);
+		} else {
+			eta_s = 0;
+		}
 	} else {
 		/* compute current average values */
 		timediff = get_update_timediff(0);
@@ -572,12 +580,20 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 		rate = (xfered - xfered_last) / (timediff * 1024.0);
 		/* average rate to reduce jumpiness */
 		rate = (rate + 2 * rate_last) / 3;
-		eta_s = (total - xfered) / (rate * 1024.0);
+		if(rate > 0.0) {
+			eta_s = (total - xfered) / (rate * 1024.0);
+		} else {
+			eta_s = UINT_MAX;
+		}
 		rate_last = rate;
 		xfered_last = xfered;
 	}
 
-	file_percent = (file_xfered * 100) / file_total;
+	if(file_total) {
+		file_percent = (file_xfered * 100) / file_total;
+	} else {
+		file_percent = 100;
+	}
 
 	if(totaldownload) {
 		total_percent = ((list_xfered + file_xfered) * 100) /
@@ -654,6 +670,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	}
 
 	/* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */
+	/* TODO: if eta_h > 99, formatting gets all messed up */
 	printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname,
 			padwid, "", f_xfered, xfered_size,
 			rate, rate_size, eta_h, eta_m, eta_s);
@@ -662,9 +679,9 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	free(wcfname);
 
 	if(totaldownload) {
-		fill_progress(file_percent, total_percent, getcols() - infolen);
+		fill_progress(file_percent, total_percent, cols - infolen);
 	} else {
-		fill_progress(file_percent, file_percent, getcols() - infolen);
+		fill_progress(file_percent, file_percent, cols - infolen);
 	}
 	return;
 }

src/pacman/pacman.c

@@ -114,6 +114,7 @@ static void usage(int op, const char * const myname)
 	char const * const str_usg = _("usage");
 	char const * const str_opr = _("operation");
 
+	/* please limit your strings to 80 characters in width */
 	if(op == PM_OP_MAIN) {
 		printf("%s:  %s <%s> [...]\n", str_usg, myname, str_opr);
 		printf(_("operations:\n"));
@@ -123,6 +124,7 @@ static void usage(int op, const char * const myname)
 		printf("    %s {-Q --query}    [%s] [%s]\n", myname, str_opt, str_pkg);
 		printf("    %s {-R --remove}   [%s] <%s>\n", myname, str_opt, str_pkg);
 		printf("    %s {-S --sync}     [%s] [%s]\n", myname, str_opt, str_pkg);
+		printf("    %s {-T --deptest}  [%s] [%s]\n", myname, str_opt, str_pkg);
 		printf("    %s {-U --upgrade}  [%s] <%s>\n", myname, str_opt, str_file);
 		printf(_("\nuse '%s {-h --help}' with an operation for available options\n"),
 				myname);
@@ -131,10 +133,10 @@ static void usage(int op, const char * const myname)
 			printf("%s:  %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg);
 			printf("%s:\n", str_opt);
 			addlist(_("  -c, --cascade        remove packages and all packages that depend on them\n"));
-			addlist(_("  -n, --nosave         remove configuration files as well\n"));
-			addlist(_("  -s, --recursive      remove dependencies also (that won't break packages)\n"
-				 "                       (-ss includes explicitly installed dependencies too)\n"));
-			addlist(_("  -u, --unneeded       remove unneeded packages (that won't break packages)\n"));
+			addlist(_("  -n, --nosave         remove configuration files\n"));
+			addlist(_("  -s, --recursive      remove unnecessary dependencies\n"
+			          "                       (-ss includes explicitly installed dependencies)\n"));
+			addlist(_("  -u, --unneeded       remove unneeded packages\n"));
 		} else if(op == PM_OP_UPGRADE) {
 			printf("%s:  %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file);
 			printf("%s:\n", str_opt);
@@ -173,6 +175,9 @@ static void usage(int op, const char * const myname)
 			printf("%s:\n", str_opt);
 			addlist(_("      --asdeps         mark packages as non-explicitly installed\n"));
 			addlist(_("      --asexplicit     mark packages as explicitly installed\n"));
+		} else if(op == PM_OP_DEPTEST) {
+			printf("%s:  %s {-T --deptest} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg);
+			printf("%s:\n", str_opt);
 		}
 		switch(op) {
 			case PM_OP_SYNC:
@@ -182,16 +187,16 @@ static void usage(int op, const char * const myname)
 				addlist(_("      --asexplicit     install packages as explicitly installed\n"));
 				addlist(_("      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"));
 				addlist(_("      --ignoregroup <grp>\n"
-				         "                       ignore a group upgrade (can be used more than once)\n"));
+				          "                       ignore a group upgrade (can be used more than once)\n"));
 				/* pass through */
 			case PM_OP_REMOVE:
-				addlist(_("  -d, --nodeps         skip dependency checks\n"));
+				addlist(_("  -d, --nodeps         skip dependency version checks (-dd to skip all checks)\n"));
 				addlist(_("  -k, --dbonly         only modify database entries, not package files\n"));
 				addlist(_("      --noprogressbar  do not show a progress bar when downloading files\n"));
 				addlist(_("      --noscriptlet    do not execute the install scriptlet if one exists\n"));
-				addlist(_("      --print          only print the targets instead of performing the operation\n"));
+				addlist(_("      --print          print the targets instead of performing the operation\n"));
 				addlist(_("      --print-format <string>\n"
-				         "                       specify how the targets should be printed\n"));
+				          "                       specify how the targets should be printed\n"));
 				break;
 		}
 
@@ -1260,8 +1265,9 @@ static void cl_to_log(int argc, char* argv[])
 		size += strlen(argv[i]) + 1;
 	}
 	char *cl_text = malloc(size);
-	if(!cl_text)
+	if(!cl_text) {
 		return;
+	}
 	char *p = cl_text;
 	for(i = 0; i<argc-1; i++) {
 		strcpy(p, argv[i]);
@@ -1411,7 +1417,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* set up the print operations */
-	if(config->print) {
+	if(config->print && !config->op_s_clean) {
 		config->noconfirm = 1;
 		config->flags |= PM_TRANS_FLAG_NOCONFLICTS;
 		config->flags |= PM_TRANS_FLAG_NOLOCK;

src/pacman/query.c

@@ -60,16 +60,16 @@ static int search_path(char **filename, struct stat *bufptr)
 	char *envpath, *envpathsplit, *path, *fullname;
 	size_t flen;
 
-	if ((envpath = getenv("PATH")) == NULL) {
+	if((envpath = getenv("PATH")) == NULL) {
 		return(-1);
 	}
-	if ((envpath = envpathsplit = strdup(envpath)) == NULL) {
+	if((envpath = envpathsplit = strdup(envpath)) == NULL) {
 		return(-1);
 	}
 
 	flen = strlen(*filename);
 
-	while ((path = strsep(&envpathsplit, ":")) != NULL) {
+	while((path = strsep(&envpathsplit, ":")) != NULL) {
 		size_t plen = strlen(path);
 
 		/* strip the trailing slash if one exists */
@@ -78,6 +78,10 @@ static int search_path(char **filename, struct stat *bufptr)
 		}
 
 		fullname = malloc(plen + flen + 2);
+		if(!fullname) {
+			free(envpath);
+			return(-1);
+		}
 		sprintf(fullname, "%s/%s", path, *filename);
 
 		if(lstat(fullname, bufptr) == 0) {
@@ -92,6 +96,16 @@ static int search_path(char **filename, struct stat *bufptr)
 	return(-1);
 }
 
+static void print_query_fileowner(const char *filename, pmpkg_t *info)
+{
+	if(!config->quiet) {
+		printf(_("%s is owned by %s %s\n"), filename,
+				alpm_pkg_get_name(info), alpm_pkg_get_version(info));
+	} else {
+		printf("%s\n", alpm_pkg_get_name(info));
+	}
+}
+
 static int query_fileowner(alpm_list_t *targets)
 {
 	int ret = 0;
@@ -156,17 +170,21 @@ static int query_fileowner(alpm_list_t *targets)
 
 		bname = mbasename(filename);
 		dname = mdirname(filename);
-		rpath = resolve_path(dname);
+		/* for files in '/', there is no directory name to match */
+		if (strcmp(dname, "") == 0) {
+			rpath = NULL;
+		} else {
+			rpath = resolve_path(dname);
 
-		/* this odd conditional is to ensure files in '/' can be checked */
-		if(!rpath && strcmp(dname, "") != 0) {
-			pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"),
-					filename, strerror(errno));
-			free(filename);
-			free(dname);
-			free(rpath);
-			ret++;
-			continue;
+			if(!rpath) {
+				pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"),
+						filename, strerror(errno));
+				free(filename);
+				free(dname);
+				free(rpath);
+				ret++;
+				continue;
+			}
 		}
 		free(dname);
 
@@ -183,6 +201,13 @@ static int query_fileowner(alpm_list_t *targets)
 					continue;
 				}
 
+				/* for files in '/', there is no directory name to match */
+				if(!rpath) {
+					print_query_fileowner(filename, info);
+					found = 1;
+					continue;
+				}
+
 				if(strlen(pkgfile) > max_length) {
 					pm_fprintf(stderr, PM_LOG_ERROR, _("path too long: %s%s\n"), root, pkgfile);
 				}
@@ -194,12 +219,7 @@ static int query_fileowner(alpm_list_t *targets)
 				free(pdname);
 
 				if(ppath && strcmp(ppath, rpath) == 0) {
-					if (!config->quiet) {
-						printf(_("%s is owned by %s %s\n"), filename,
-								alpm_pkg_get_name(info), alpm_pkg_get_version(info));
-					} else {
-						printf("%s\n", alpm_pkg_get_name(info));
-					}
+					print_query_fileowner(filename, info);
 					found = 1;
 				}
 				free(ppath);

src/pacman/sync.c

@@ -578,10 +578,11 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets)
 
 static alpm_list_t *syncfirst(void) {
 	alpm_list_t *i, *res = NULL;
+	pmdb_t *db_local = alpm_option_get_localdb();
 
 	for(i = config->syncfirst; i; i = alpm_list_next(i)) {
 		char *pkgname = alpm_list_getdata(i);
-		pmpkg_t *pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname);
+		pmpkg_t *pkg = alpm_db_get_pkg(db_local, pkgname);
 		if(pkg == NULL) {
 			continue;
 		}
@@ -643,7 +644,15 @@ static int process_group(alpm_list_t *dbs, char *group)
 				group);
 		select_display(pkgs);
 		char *array = malloc(count);
-		multiselect_question(array, count);
+		if(!array) {
+			ret = 1;
+			goto cleanup;
+		}
+		if(multiselect_question(array, count)) {
+			ret = 1;
+			free(array);
+			goto cleanup;
+		}
 		int n = 0;
 		for(i = pkgs; i; i = alpm_list_next(i)) {
 			if(array[n++] == 0)
@@ -656,6 +665,7 @@ static int process_group(alpm_list_t *dbs, char *group)
 				goto cleanup;
 			}
 		}
+		free(array);
 	} else {
 		for(i = pkgs; i; i = alpm_list_next(i)) {
 			pmpkg_t *pkg = alpm_list_getdata(i);

src/pacman/util.c

@@ -37,6 +37,9 @@
 #include <unistd.h>
 #include <limits.h>
 #include <wchar.h>
+#ifdef HAVE_TERMIOS_H
+#include <termios.h> /* tcflush */
+#endif
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -100,8 +103,20 @@ int needs_root(void)
 	}
 }
 
+/* discard unhandled input on the terminal's input buffer */
+static int flush_term_input(void) {
+#ifdef HAVE_TCFLUSH
+	if(isatty(fileno(stdin))) {
+		return(tcflush(fileno(stdin), TCIFLUSH));
+	}
+#endif
+
+	/* fail silently */
+	return 0;
+}
+
 /* gets the current screen column width */
-int getcols(void)
+int getcols(int def)
 {
 #ifdef TIOCGSIZE
 	struct ttysize win;
@@ -114,7 +129,7 @@ int getcols(void)
 		return win.ws_col;
 	}
 #endif
-	return 0;
+	return def;
 }
 
 /* does the same thing as 'rm -rf' */
@@ -209,16 +224,16 @@ void indentprint(const char *str, int indent)
 {
 	wchar_t *wcstr;
 	const wchar_t *p;
-	int len, cidx, cols;
+	int len, cidx;
+	const int cols = getcols(0);
 
 	if(!str) {
 		return;
 	}
 
-	cols = getcols();
-
-	/* if we're not a tty, print without indenting */
-	if(cols == 0) {
+	/* if we're not a tty, or our tty is not wide enough that wrapping even makes
+	 * sense, print without indenting */
+	if(cols == 0 || indent > cols) {
 		printf("%s", str);
 		return;
 	}
@@ -425,8 +440,6 @@ static int string_length(const char *s)
 
 void string_display(const char *title, const char *string)
 {
-	int len = 0;
-
 	if(title) {
 		printf("%s ", title);
 	}
@@ -434,7 +447,7 @@ void string_display(const char *title, const char *string)
 		printf(_("None"));
 	} else {
 		/* compute the length of title + a space */
-		len = string_length(title) + 1;
+		int len = string_length(title) + 1;
 		indentprint(string, len);
 	}
 	printf("\n");
@@ -443,7 +456,7 @@ void string_display(const char *title, const char *string)
 void list_display(const char *title, const alpm_list_t *list)
 {
 	const alpm_list_t *i;
-	int cols, len = 0;
+	int len = 0;
 
 	if(title) {
 		len = string_length(title) + 1;
@@ -453,11 +466,16 @@ void list_display(const char *title, const alpm_list_t *list)
 	if(!list) {
 		printf("%s\n", _("None"));
 	} else {
-		for(i = list, cols = len; i; i = alpm_list_next(i)) {
-			char *str = alpm_list_getdata(i);
+		const int maxcols = getcols(0);
+		int cols = len;
+		const char *str = alpm_list_getdata(list);
+		printf("%s", str);
+		cols += string_length(str);
+		for(i = alpm_list_next(list); i; i = alpm_list_next(i)) {
+			const char *str = alpm_list_getdata(i);
 			int s = string_length(str);
-			int maxcols = getcols();
-			if(maxcols > 0 && (cols + s + 2) >= maxcols) {
+			/* wrap only if we have enough usable column space */
+			if(maxcols > len && cols + s + 2 >= maxcols) {
 				int j;
 				cols = len;
 				printf("\n");
@@ -746,8 +764,9 @@ static int multiselect_parse(char *array, int count, char *response)
 		char *ends = NULL;
 		char *starts = strtok_r(str, " ", &saveptr);
 
-		if (starts == NULL)
+		if (starts == NULL) {
 			break;
+		}
 		strtrim(starts);
 		int len = strlen(starts);
 		if(len == 0)
@@ -765,9 +784,9 @@ static int multiselect_parse(char *array, int count, char *response)
 		if(len > 1) {
 			/* check for range */
 			char *p;
-			if((p = strchr(starts+1, '-'))) {
+			if((p = strchr(starts + 1, '-'))) {
 				*p = 0;
-				ends = p+1;
+				ends = p + 1;
 			}
 		}
 
@@ -777,9 +796,11 @@ static int multiselect_parse(char *array, int count, char *response)
 		if(!ends) {
 			array[start-1] = include;
 		} else {
-			if(parseindex(ends, &end, start, count) != 0)
+			int d;
+			if(parseindex(ends, &end, start, count) != 0) {
 				return(-1);
-			for(int d = start; d <= end; d++) {
+			}
+			for(d = start; d <= end; d++) {
 				array[d-1] = include;
 			}
 		}
@@ -790,8 +811,9 @@ static int multiselect_parse(char *array, int count, char *response)
 
 int multiselect_question(char *array, int count)
 {
-	char response[64];
+	char *response, *lastchar;
 	FILE *stream;
+	size_t response_len = 64;
 
 	if(config->noconfirm) {
 		stream = stdout;
@@ -800,19 +822,47 @@ int multiselect_question(char *array, int count)
 		stream = stderr;
 	}
 
+	response = malloc(response_len);
+	if(!response) {
+		return -1;
+	}
+	lastchar = response + response_len - 1;
+	/* sentinel byte to later see if we filled up the entire string */
+	*lastchar = 1;
+
 	while(1) {
 		memset(array, 1, count);
 
 		fprintf(stream, "\n");
 		fprintf(stream, _("Enter a selection (default=all)"));
 		fprintf(stream,	": ");
+		fflush(stream);
 
 		if(config->noconfirm) {
 			fprintf(stream, "\n");
 			break;
 		}
 
-		if(fgets(response, sizeof(response), stdin)) {
+		flush_term_input();
+
+		if(fgets(response, response_len, stdin)) {
+			const size_t response_incr = 64;
+			/* handle buffer not being large enough to read full line case */
+			while(*lastchar == '\0' && lastchar[-1] != '\n') {
+				response_len += response_incr;
+				response = realloc(response, response_len);
+				if(!response) {
+					return -1;
+				}
+				lastchar = response + response_len - 1;
+				/* sentinel byte */
+				*lastchar = 1;
+				if(fgets(response + response_len - response_incr - 1,
+							response_incr + 1, stdin) == 0) {
+					free(response);
+					return -1;
+				}
+			}
 			strtrim(response);
 			if(strlen(response) > 0) {
 				if(multiselect_parse(array, count, response) == -1) {
@@ -820,9 +870,14 @@ int multiselect_question(char *array, int count)
 					continue;
 				}
 			}
+			break;
+		} else {
+			free(response);
+			return -1;
 		}
-		break;
 	}
+
+	free(response);
 	return(0);
 }
 
@@ -849,6 +904,8 @@ int select_question(int count)
 			break;
 		}
 
+		flush_term_input();
+
 		if(fgets(response, sizeof(response), stdin)) {
 			strtrim(response);
 			if(strlen(response) > 0) {
@@ -878,6 +935,10 @@ static int question(short preset, char *fmt, va_list args)
 		stream = stderr;
 	}
 
+	/* ensure all text makes it to the screen before we prompt the user */
+	fflush(stdout);
+	fflush(stderr);
+
 	vfprintf(stream, fmt, args);
 
 	if(preset) {
@@ -891,6 +952,9 @@ static int question(short preset, char *fmt, va_list args)
 		return(preset);
 	}
 
+	fflush(stream);
+	flush_term_input();
+
 	if(fgets(response, sizeof(response), stdin)) {
 		strtrim(response);
 		if(strlen(response) == 0) {

src/pacman/util.h

@@ -42,7 +42,7 @@
 int trans_init(pmtransflag_t flags);
 int trans_release(void);
 int needs_root(void);
-int getcols(void);
+int getcols(int def);
 int rmrf(const char *path);
 const char *mbasename(const char *path);
 char *mdirname(const char *path);

test/pacman/pmpkg.py

@@ -102,7 +102,7 @@ class pmpkg(object):
         # Generate package file system
         for f in self.files:
             util.mkfile(f, f)
-            self.size += os.stat(util.getfilename(f))[stat.ST_SIZE]
+            self.size += os.lstat(util.getfilename(f))[stat.ST_SIZE]
 
         # .PKGINFO
         data = ["pkgname = %s" % self.name]