Merge branch 'maint'

2011-03-23 02:16:13 -05:00 · 2011-03-23 02:16:13 -05:00 · 3df49acb30
commit 3df49acb30
parent 0ff52b6845 115bf1bf9f
63 changed files with 6185 additions and 1634 deletions
--- a/15
+++ b/15
@ -1,5 +1,20 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+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)
+              - don't show group selection prompt with -Sp (FS#23340)
+              - restore old --debug/--verbose behavior (FS#23370)
+              - ensure repo DBs are saved with sane umask (FS#23343)
+              - fix segfault when a repo includes deltas entries (FS#23314)
+              - fix potential data corruption issue on sync DB read
+              - get zsh completion in a working state (FS#23322)
+              - makepkg: improve optdepends extraction (FS#23307)
+              - translations:
+                - de: fix makepkg fatal error (FS#23315)
+                - sr, sr@latin: new Serbian translation
+                - various other translation updates
+              - build system: ensure libtool respects LDFLAGS (FS#23325)
 3.5.0         - sync DBs read directly from the database tarball
                (FS#8586, FS#20233)
              - local DB "depends" file has been merged into the "desc" file
--- a/configure.ac
+++ b/configure.ac
@ -42,12 +42,12 @@ AC_PREREQ(2.62)
 #     pacman_version_micro += 1

 m4_define([lib_current], [6])
-m4_define([lib_revision], [0])
+m4_define([lib_revision], [1])
 m4_define([lib_age], [0])

 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [5])
-m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_micro], [1])
 m4_define([pacman_version],
          [pacman_version_major.pacman_version_minor.pacman_version_micro])

--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@ -52,8 +52,9 @@ Options
 	Removes all cached source files from the directory specified in `SRCDEST`
 	in linkman:makepkg.conf[5].

-*--config* <`/path/to/config`>::
-	Use an alternate config file instead of the `{sysconfdir}/makepkg.conf` default;
+*\--config* <file>::
+	Use an alternate config file instead of the `{sysconfdir}/makepkg.conf`
+	default.

 *-d, \--nodeps*::
 	Do not perform any dependency checks. This will let you override and
@ -117,7 +118,7 @@ Options
 	`\--noextract` option if you wish to tweak the files in src/ before
 	building.

-*-p* <`buildscript`>::
+*-p* <buildscript>::
 	Read the package script `buildscript` instead of the `PKGBUILD` default;
 	see linkman:PKGBUILD[5].

@ -149,7 +150,7 @@ Options
 	remote builder, or a tarball upload. Because integrity checks are verified,
 	all source files of the package need to be present or downloadable.

-*\--pkg <`list`>*::
+*\--pkg <list>*::
 	Only build listed packages from a split package. The use of quotes is
 	necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"`

--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@ -55,7 +55,7 @@ Operations
 	removed, in which case every package in that group will be removed.
 	Files belonging to the specified package will be deleted, and the
 	database will be updated. Most configuration files will be saved
-	with a `.pacsave` extension unless the '\--nosave' option is used.
+	with a '.pacsave' extension unless the '\--nosave' option is used.
 	See <<RO,Remove Options>> below.

 *-S, \--sync*::
@ -115,16 +115,16 @@ greater than `1:3.6-1`.

 Options
 -------
-*-b, \--dbpath* <'path'>::
+*-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.

-*-r, \--root* <'path'>::
-	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
+*-r, \--root* <path>::
+	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.
 	*NOTE*: if database path or logfile are not specified on either the
 	command line or in linkman:pacman.conf[5], their default location will
@ -133,23 +133,23 @@ Options
 *-v, \--verbose*::
 	Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.

-*\--arch* <'arch'>::
+*\--arch* <arch>::
 	Specify an alternate architecture.

-*\--cachedir* <'dir'>::
+*\--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.

-*\--config* <'file'>::
+*\--config* <file>::
 	Specify an alternate configuration file.

 *\--debug*::
 	Display debug messages. When reporting bugs, this option is recommended
 	to be used.

-*\--logfile* <'file'>::
+*\--logfile* <file>::
 	Specify an alternate log file. This is an absolute path, regardless of
 	the installation root setting.

@ -182,7 +182,7 @@ Transaction Options (apply to '-S', '-R' and '-U')
 	displayed. The default format string is "%l", which displays URLs with
 	'-S', filenames with '-U' and pkgname-pkgver with '-R'.

-*\--print-format* <'format'>::
+*\--print-format* <format>::
 	Specify a printf-like format to control the output of the '\--print'
 	operation. The possible attributes are: %n for pkgname, %v for pkgver,
 	%l for location, %r for repo and %s for size.
@ -207,12 +207,12 @@ Upgrade Options (apply to '-S' and '-U')[[UO]]
 	as explicitly installed so it will not be removed by the '\--recursive'
 	remove operation.

-*\--ignore* <'package'>::
+*\--ignore* <package>::
 	Directs pacman to ignore upgrades of package even if there is one
 	available. Multiple packages can be specified by separating them
 	with a comma.

-*\--ignoregroup* <'group'>::
+*\--ignoregroup* <group>::
 	Directs pacman to ignore upgrades of all packages in 'group' even if
 	there is one available. Multiple groups can be specified by
 	separating them with a comma.
@ -257,7 +257,7 @@ Query Options[[QO]]
 	database(s).  Typically these are packages that were downloaded manually
 	and installed with '\--upgrade'.

-*-o, \--owns* <'file'>::
+*-o, \--owns* <file>::
 	Search for packages that own the specified file(s). The path can be
 	relative or absolute and one or more files can be specified.

@ -276,7 +276,7 @@ Query Options[[QO]]
 	and missing files; a bare query will only show package names
 	rather than names and versions.

-*-s, \--search* <'regexp'>::
+*-s, \--search* <regexp>::
 	Search each locally-installed package for names or descriptions that
 	match `regexp`. When including multiple search terms, only packages
 	with descriptions matching ALL of those terms are returned.
@ -302,7 +302,7 @@ Remove Options[[RO]]
 *-n, \--nosave*::
 	Instructs pacman to ignore file backup designations. Normally, when a
 	file is removed from the system the database is checked to see if the
-	file should be renamed with a ``.pacsave'' extension.
+	file should be renamed with a '.pacsave' extension.

 *-s, \--recursive*::
 	Remove each target specified including all of their dependencies, provided
@ -354,7 +354,7 @@ linkman:pacman.conf[5].
 	will only show package names and omit databases and versions; group will
 	only show package names and omit group names.

-*-s, \--search* <'regexp'>::
+*-s, \--search* <regexp>::
 	This will search each package in the sync databases for names or
 	descriptions that match `regexp`. When you include multiple search
 	terms, only packages with descriptions matching ALL of those terms will
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@ -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.
--- a/lib/libalpm/po/LINGUAS
+++ b/lib/libalpm/po/LINGUAS
@ -19,6 +19,8 @@ pt_BR
 ro
 ru
 sk
+sr
+sr@latin
 sv
 tr
 uk
--- a/lib/libalpm/po/ca.po
+++ b/lib/libalpm/po/ca.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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"
 "Language: ca\n"
@ -190,7 +190,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/cs.po
+++ b/lib/libalpm/po/cs.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-14 18:54+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2011-03-20 23:42-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"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@ -190,8 +190,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "nepodařilo se určit připojovací bod pro soubor %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "nepodařilo se určit připojovací body pro souborové systémy"
+msgid "could not determine filesystem mount points\n"
+msgstr "nepodařilo se určit přípojné body souborového systému\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "nepodařilo se určit kořen přípojného bodu %s\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/da.po
+++ b/lib/libalpm/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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: Danish <None>\n"
 "Language: da\n"
@ -190,7 +190,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-08 14:50+0000\n"
+"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: tlaloc <matthias@archlinux.de>\n"
 "Language-Team: German <None>\n"
 "Language: de\n"
@ -194,8 +194,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "Konnte keinen Einhänge-Punkt für die Datei %s ermitteln\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "Konnte die Einhängepunkte des Dateisystems nicht bestimmen"
+msgid "could not determine filesystem mount points\n"
+msgstr "Konnte die Einhängepunkte des Dateisystems nicht ermitteln\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "Konnte den Root-Einhängepunkt %s nicht ermitteln\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/el.po
+++ b/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-05 00:39+0000\n"
-"Last-Translator: nous <nous@archlinux.us>\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: Greek <None>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@ -190,8 +190,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "αδυναμία καθορισμού σημείου προσάρτησης αρχείου %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "αδυναμία καθορισμού σημείων προσάρτησης συστήματος αρχείων"
+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"
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-11 04:03+0000\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"
 "Language: en_GB\n"
@ -190,8 +190,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "could not determine mount point for file %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr "could not determine filesystem mount points\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "could not determine root mount point %s\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-15 18:34+0000\n"
-"Last-Translator: Traumness <traumness@gmail.com>\n"
+"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"PO-Revision-Date: 2011-03-22 15:34+0000\n"
+"Last-Translator: angvp <angvp@archlinux.org>\n"
 "Language-Team: Spanish (Castilian) <>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@ -19,15 +19,15 @@ msgstr ""

 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s esta al día -- saltando\n"
+msgstr "%s-%s está actualizado -- omitiendo\n"

 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s esta al día -- re-instalando\n"
+msgstr "%s-%s está actualizado -- re-instalando\n"

 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
-msgstr "decrementando la versión del paquete %s (%s => %s)\n"
+msgstr "desactualizando la versión del paquete %s (%s => %s)\n"

 #, c-format
 msgid "warning given when extracting %s (%s)\n"
@ -43,15 +43,15 @@ msgid ""
 "filesystem: %o  package: %o\n"
 msgstr ""
 "los permisos de directorio difieren en %s\n"
-"sistema de archivos: %o paquete: %o\n"
+"sistema de archivos: %o  paquete: %o\n"

 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "extract: no se puede sobreescribir el dir con el archivo %s\n"
+msgstr "extract: no se puede sobreescribir el directorio con el archivo %s\n"

 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr "extract: el link simbólico %s no apunta al directorio\n"
+msgstr "extract: el enlace simbólico %s no apunta al directorio\n"

 #, c-format
 msgid "could not rename %s to %s (%s)\n"
@ -71,7 +71,7 @@ msgstr "%s instalado como %s\n"

 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "descomprimiendo %s como %s.pacnew\n"
+msgstr "extrayendo %s como %s.pacnew\n"

 #, c-format
 msgid "could not get current working directory\n"
@ -99,19 +99,19 @@ msgstr "no se pudo agregar la entrada '%s' a la caché\n"

 #, c-format
 msgid "removing invalid database: %s\n"
-msgstr "quitando la base de datos inválida: %s\n"
+msgstr "quitando la base de datos no válida: %s\n"

 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "nombre inválido para la entrada '%s' de la base de datos \n"
+msgstr "nombre no válido para la entrada '%s' de la base de datos\n"

 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "entrada '%s' duplicada en la base de datos \n"
+msgstr "entrada '%s' duplicada en la base de datos\n"

 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "entrada corrupta en la base de datos '%s'\n"
+msgstr "entrada dañada en la base de datos '%s'\n"

 #, c-format
 msgid "could not open file %s: %s\n"
@ -179,7 +179,7 @@ msgstr "ignorando el paquete %s-%s\n"

 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "no se pudo resolver \"%s\", una dependencia para \"%s\"\n"
+msgstr "no se pudo resolver \"%s\", una dependencia de \"%s\"\n"

 #, c-format
 msgid "could not get filesystem information\n"
@ -196,8 +196,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "no se pudo determinar el punto de montaje para el archivo %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "no se pudo determinar los puntos de montajes del sistema de archivos"
+msgid "could not determine filesystem mount points\n"
+msgstr "no se puede determinar el punto de montaje del sistema de archivos\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "no se pudo determinar el punto de montaje de la raiz %s\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
@ -215,7 +219,7 @@ msgstr "disco"

 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "la url %s no es válida\n"
+msgstr "la dirección %s no es válida\n"

 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
@ -231,7 +235,7 @@ msgstr "no se pudo escribir al archivo '%s': %s\n"

 #, c-format
 msgid "failed retrieving file '%s' from %s\n"
-msgstr "falló al obtener archivo '%s' desde %s\n"
+msgstr "error al obtener el archivo '%s' desde %s\n"

 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
@ -263,7 +267,7 @@ msgstr "no se pudo encontrar o leer el directorio"

 #, c-format
 msgid "wrong or NULL argument passed"
-msgstr "se pasó un argumento erróneo o NULO"
+msgstr "se pasó un argumento erróneo o nulo"

 #, c-format
 msgid "not enough free disk space"
@ -303,7 +307,7 @@ msgstr "no se pudo encontrar la base de datos"

 #, c-format
 msgid "database is incorrect version"
-msgstr "la base de datos es una versión incorrecta"
+msgstr "la base de datos es de una versión incorrecta"

 #, c-format
 msgid "could not update database"
@ -327,7 +331,7 @@ msgstr "la operación ya se inicializó"

 #, c-format
 msgid "transaction not initialized"
-msgstr "operación no inicializada"
+msgstr "la operación no está inicializada"

 #, c-format
 msgid "duplicate target"
@ -335,7 +339,7 @@ msgstr "objetivo duplicado"

 #, c-format
 msgid "transaction not prepared"
-msgstr "operación no lista"
+msgstr "la operación no está lista"

 #, c-format
 msgid "transaction aborted"
@ -360,7 +364,7 @@ msgstr "operación cancelada debido a ignorepkg"

 #, c-format
 msgid "invalid or corrupted package"
-msgstr "paquete invalido o corrupto"
+msgstr "paquete inválido o corrupto"

 #, c-format
 msgid "cannot open package file"
@ -384,11 +388,11 @@ msgstr "no pudo encontrarse un repositorio para el objetivo"

 #, c-format
 msgid "invalid or corrupted delta"
-msgstr "invalido o diferencial corrupto"
+msgstr "no válido o diferencial dañado"

 #, c-format
 msgid "delta patch failed"
-msgstr "parche diferencial fallado"
+msgstr "parche diferencial falló"

 #, c-format
 msgid "could not satisfy dependencies"
@ -404,15 +408,15 @@ msgstr "archivos en conflicto"

 #, c-format
 msgid "failed to retrieve some files"
-msgstr "falló al descargar algunos archivos"
+msgstr "error al descargar algunos archivos"

 #, c-format
 msgid "failed to copy some file"
-msgstr "falló al copiar algún archivo"
+msgstr "error al copiar algún archivo"

 #, c-format
 msgid "invalid regular expression"
-msgstr "expresión regular inválida"
+msgstr "expresión regular no válida"

 #, c-format
 msgid "libarchive error"
@ -432,7 +436,7 @@ msgstr "error inesperado"

 #, c-format
 msgid "database larger than maximum size\n"
-msgstr "la base de datos es más grande del tamaño máximo\n"
+msgstr "la base de datos supera el tamaño máximo\n"

 #, c-format
 msgid "could not find %s in database -- skipping\n"
@ -448,11 +452,11 @@ msgstr "no se pudo quitar el archivo '%s': %s\n"

 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "no se pudo quitar de la base de datos %s-%s\n"
+msgstr "no se pudo quitar la entrada %s-%s de la base de datos\n"

 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "no se pudo quitar la entrada '%s' de la cache\n"
+msgstr "no se pudo quitar la entrada '%s' de la caché\n"

 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
@ -460,11 +464,11 @@ msgstr "%s: ignorando la actualización del paquete (%s => %s)\n"

 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr "%s: ignorando la degradación del paquete (%s => %s)\n"
+msgstr "%s: ignorando la desactualización del paquete (%s => %s)\n"

 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
-msgstr "%s: degradando desde la versión %s a la versión %s\n"
+msgstr "%s: desactualizando de la versión %s a la versión %s\n"

 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
@ -480,17 +484,17 @@ msgstr "no se pudo reemplazar el archivo %s por %s\n"

 #, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "se han detectado paquetes con conflictos no resueltos\n"
+msgstr "se han detectado paquetes con conflictos no resolvibles\n"

 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr ""
-"quitando '%s' de la lista de objetivos debido a que posee conflictos con "
+"quitando '%s' de la lista de objetivos debido a que tiene conflictos con "
 "'%s'\n"

 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "falló al descargar algunos archivos desde %s\n"
+msgstr "error al descargar algunos archivos desde %s\n"

 #, c-format
 msgid "could not commit removal transaction\n"
@ -502,7 +506,7 @@ msgstr "no se pudo asignar la transacción\n"

 #, c-format
 msgid "%s database version is too old\n"
-msgstr "%s versión de la base de datos es muy vieja\n"
+msgstr "la versión de la base de datos %s es muy antigua\n"

 #, c-format
 msgid "could not remove lock file %s\n"
@ -550,7 +554,7 @@ msgstr "el comando falló al ejecutarse\n"

 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "no existe la cache %s, creando...\n"
+msgstr "no existe la caché %s, creando...\n"

 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
--- a/lib/libalpm/po/fi.po
+++ b/lib/libalpm/po/fi.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-12 18:34+0000\n"
-"Last-Translator: Huulivoide <jesse.jaara@gmail.com>\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"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@ -190,7 +190,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 20:43+0000\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"
 "Language-Team: French <>\n"
 "Language: fr\n"
@ -191,8 +191,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "impossible de déterminer le point de montage pour le fichier %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "impossible de déterminer les point de montage"
+msgid "could not determine filesystem mount points\n"
+msgstr "impossible de déterminer les points de montage\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "impossible de déterminer le point de montage de la racine %s\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-07 12:32+0000\n"
+"POT-Creation-Date: 2011-03-20 23:42-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"
 "Language: hu\n"
@ -187,11 +187,15 @@ msgstr "nem sikerült meghatározni a fájlrendszer-információt %s-hez: %s\n"

 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr "nem sikerült meghározni a csatolási pontot a %s fájlhoz\n"
+msgstr "nem sikerült meghatározni a csatolási pontot a %s fájlhoz\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "nem sikerült meghatározni a fájlrendszer csatolási pontokat"
+msgid "could not determine filesystem mount points\n"
+msgstr "nem sikerült meghatározni a csatolási pontokat\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "nem sikerült meghatározni a %s gyökérkönyvtár csatolási pontját\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-05 17:03+0000\n"
+"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: giovanni <giovanni@archlinux.org>\n"
 "Language-Team: Italian <None>\n"
 "Language: it\n"
@ -196,8 +196,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "impossibile determinare il punto di montaggio del file %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "impossibile determinare i punti di montaggio del filesystem"
+msgid "could not determine filesystem mount points\n"
+msgstr "impossibile determinare i mount point del filesystem\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "impossibile determinare il mount point di root %s\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/kk.po
+++ b/lib/libalpm/po/kk.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-05 03:56+0000\n"
-"Last-Translator: sotrud_nik <baurthefirst@gmail.com>\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: Kazakh <None>\n"
 "Language: kk\n"
 "MIME-Version: 1.0\n"
@ -190,8 +190,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "%s файлы үшін тіркеу нүктесін анықтау мүмкін емес\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "файлдық жүйенің тіркеу нүктелерін анықтау мүмкін емес"
+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"
--- a/lib/libalpm/po/ko.po
+++ b/lib/libalpm/po/ko.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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"
@ -188,7 +188,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 3.5.0\n"
+"Project-Id-Version: pacman 3.5.1\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 12:35-0500\n"
+"POT-Creation-Date: 2011-03-20 23:42-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"
--- a/lib/libalpm/po/nb.po
+++ b/lib/libalpm/po/nb.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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"
 "Language: nb\n"
@ -190,7 +190,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/pl.po
+++ b/lib/libalpm/po/pl.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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"
 "Language: pl\n"
@ -191,7 +191,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/pt.po
+++ b/lib/libalpm/po/pt.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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: Portuguese <>\n"
 "Language: pt\n"
@ -191,7 +191,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/pt_BR.po
+++ b/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-10 01:56+0000\n"
-"Last-Translator: ambaratti <ambaratti.listas@gmail.com>\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: Portuguese (Brazilian) <None>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@ -193,9 +193,12 @@ msgid "could not determine mount point for file %s\n"
 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"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""
-"não foi possível determinar os pontos de montagem do sistema de arquivos"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/ro.po
+++ b/lib/libalpm/po/ro.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-16 16:09+0000\n"
+"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: wonder <ibiru@archlinux.org>\n"
 "Language-Team: Romanian <>\n"
 "Language: ro\n"
@ -197,8 +197,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "nu s-a putut determina locul de montare al fișierului %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "nu s-au putut determina locurile de montare ale sistemului de fișiere"
+msgid "could not determine filesystem mount points\n"
+msgstr "nu s-a putut determina locul de montare al sistemului de fișiere\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "nu s-a putut determina locul de montare al partiției root %s\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@ -7,15 +7,15 @@ 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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 21:23+0000\n"
-"Last-Translator: partizan <serg.partizan@gmail.com>\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: Russian <None>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"

 #, c-format
@ -193,8 +193,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "не удалось определить точку подключения для файла %s\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "не удалось определить точки подключения для файловой системы"
+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"
--- a/lib/libalpm/po/sk.po
+++ b/lib/libalpm/po/sk.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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"
 "Language: sk\n"
@ -190,7 +190,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/sr.po
+++ b/lib/libalpm/po/sr.po
@ -0,0 +1,552 @@
+# 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: Xabre <githzerai06@gmail.com>\n"
+"Language-Team: Serbian <None>\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s је већ ажуран — прескачем\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s је већ ажуран — инсталирам поново\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "разграђујем пакет %s (%s -> %s)\n"
+
+#, c-format
+msgid "warning given when extracting %s (%s)\n"
+msgstr "дато је упозорење при распакивању %s (%s)\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "не могу да распакујем %s (%s)\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"дозволе фасцикле се разликују за %s\n"
+"систем фајлова: %o пакет: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "распакивање: не преписујем фасциклу фајлом %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "распакивање: симболичка веза %s не упућује на фасциклу\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "не могу да преименујем %s у %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "сачувах %s као %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "не могу да инсталирам %s као %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "инсталирах %s као %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "распакујем %s као %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "не могу да одредим радну фасциклу\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "не могу да променим фасциклу у %s (%s)\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "дошло је до грешке при надоградњи %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "дошло је до грешке при инсталирању %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "не могу да ажурирам унос у бази %s - %s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "не могу да додам унос „%s“ у кеш\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "уклањам неисправну базу: %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "неисправно име уноса базе „%s“\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "дупликат уноса базе „%s“\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "оштећен унос базе „%s“\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "не могу да отворим фајл %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "недоследност базе „%s“: разлика у имену пакета %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "недоследност базе „%s“: разлика у верзији пакета %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "не могу да направим фасциклу %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "не могу да обрадим фајл описа пакета у %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "недостаје име пакета у %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "недостаје верзија пакета у %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "грешка при читању пакета %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "недостају метаподаци пакета %s\n"
+
+#, c-format
+msgid "removing invalid file: %s\n"
+msgstr "уклањам неисправан фајл: %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "путања базе није одређена\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "откривена петља зависности:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s ће бити укоњен након своје зависности %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s ће бити инсталиран пре своје зависности %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "игноришем пакет %s - %s\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "не могу да разрешим „%s“, зависност за „%s“\n"
+
+#, c-format
+msgid "could not get filesystem information\n"
+msgstr "не могу да добавим податке о систему фајлова\n"
+
+#, c-format
+msgid "could not get filesystem information for %s: %s\n"
+msgstr "не могу да добавим податке о систему фајлова за %s: %s\n"
+
+#, c-format
+msgid "could not determine mount point for file %s\n"
+msgstr "не могу да одредим тачку монтирања за фајл %s\n"
+
+#, c-format
+msgid "could not determine filesystem mount points\n"
+msgstr "не могу да утврдим тачке монтирања система фајлова\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "не могу да утврдим корену тачку монтирања %s\n"
+
+#, c-format
+msgid "Partition %s is mounted read only\n"
+msgstr "Партиција %s је монтирана само за читање\n"
+
+#, c-format
+msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
+msgstr ""
+"Партиција %s је препуна: потребно је %ld блокова, али је %ld слободно\n"
+
+#, c-format
+msgid "disk"
+msgstr "диск"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "„%s“ је нисправан урл\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "неуспешно преузимање фајла „%s“ са „%s“: %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "настављање преузимања %s није могуће: започињем изнова\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "грешка при упису у фајл „%s“: %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "неуспешно преузимање фајла „%s“ са %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "изгледа да је %s окрњен: %jd/%jd бајтова\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "неуспешно преузимање %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "недостатак меморије!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "неочекивана системска грешка"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "неодговарајуће дозволе"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "не могу да нађем или прочитам фајл"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "не могу да нађем или прочитам фасциклу"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "прослеђен је погрешан или празан аргумент"
+
+#, 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 "база је већа од максималне величине\n"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "не могу да нађем %s у бази — прескачем\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "уклањам %s са списка циљева\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "не могу да уклоним фајл „%s“: %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "не могу да уклоним унос базе %s — %s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "не могу да уклоним унос „%s“ из кеша\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: игноришем надоградњу пакета (%s -> %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: игноришем разградњу пакета (%s -> %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: разграђујем са верзије %s на верзију %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: локални (%s) је новији од %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "игноришем замену пакета (%s-%s -> %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "не могу да заменим %s са %s\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "откривени су неразрешиви сукоби пакета\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "уклањам „%s“ са списка циљева због сукоба са „%s“\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "неуспешно преузимање неких фајлова са %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "не могу да обавим уклањање\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "не могу да обавим пренос\n"
+
+#, c-format
+msgid "%s database version is too old\n"
+msgstr "верзија базе %s је застарела\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "не могу да уклоним фајл браве %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "не могу да направим привремену фасциклу\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "не могу да копирам привремени фајл у %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "не могу да уклоним привремену фасциклу %s\n"
+
+#, c-format
+msgid "could not create pipe (%s)\n"
+msgstr "не могу да направим цев (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "не могу да рачвам нови процес (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "ме могу да променим корену фасциклу (%s)\n"
+
+#, c-format
+msgid "call to execv failed (%s)\n"
+msgstr "неуспео позив извршног аргумента (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "неуспешо позивање процеса чекања (%s)\n"
+
+#, c-format
+msgid "could not open pipe (%s)\n"
+msgstr "не могу да отворим цев (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "неуспешно правилно извршавање наредбе\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "не постоји кеш за %s; правим....\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "не могу да направим кеш пакета; користим /tmp као замену\n"
--- a/lib/libalpm/po/sr@latin.po
+++ b/lib/libalpm/po/sr@latin.po
@ -0,0 +1,552 @@
+# 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: Xabre <githzerai06@gmail.com>\n"
+"Language-Team: Serbian (Latin) <None>\n"
+"Language: sr@latin\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s je već ažuran — preskačem\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s je već ažuran — instaliram ponovo\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "razgrađujem paket %s (%s -> %s)\n"
+
+#, c-format
+msgid "warning given when extracting %s (%s)\n"
+msgstr "dato je upozorenje pri raspakivanju %s (%s)\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "ne mogu da raspakujem %s (%s)\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"dozvole fascikle se razlikuju za %s\n"
+"sistem fajlova: %o paket: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "raspakivanje: ne prepisujem fasciklu fajlom %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "raspakivanje: simbolička veza %s ne upućuje na fasciklu\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "ne mogu da preimenujem %s u %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "sačuvah %s kao %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "ne mogu da instaliram %s kao %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "instalirah %s kao %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "raspakujem %s kao %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "ne mogu da odredim radnu fasciklu\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "ne mogu da promenim fasciklu u %s (%s)\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "došlo je do greške pri nadogradnji %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "došlo je do greške pri instaliranju %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "ne mogu da ažuriram unos u bazi %s - %s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "ne mogu da dodam unos „%s“ u keš\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "uklanjam neispravnu bazu: %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "neispravno ime unosa baze „%s“\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplikat unosa baze „%s“\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "oštećen unos baze „%s“\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "ne mogu da otvorim fajl %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "nedoslednost baze „%s“: razlika u imenu paketa %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "nedoslednost baze „%s“: razlika u verziji paketa %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "ne mogu da napravim fasciklu %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "ne mogu da obradim fajl opisa paketa u %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "nedostaje ime paketa u %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "nedostaje verzija paketa u %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "greška pri čitanju paketa %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "nedostaju metapodaci paketa %s\n"
+
+#, c-format
+msgid "removing invalid file: %s\n"
+msgstr "uklanjam neispravan fajl: %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "putanja baze nije određena\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "otkrivena petlja zavisnosti:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s će biti ukonjen nakon svoje zavisnosti %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s će biti instaliran pre svoje zavisnosti %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignorišem paket %s - %s\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "ne mogu da razrešim „%s“, zavisnost za „%s“\n"
+
+#, c-format
+msgid "could not get filesystem information\n"
+msgstr "ne mogu da dobavim podatke o sistemu fajlova\n"
+
+#, c-format
+msgid "could not get filesystem information for %s: %s\n"
+msgstr "ne mogu da dobavim podatke o sistemu fajlova za %s: %s\n"
+
+#, c-format
+msgid "could not determine mount point for file %s\n"
+msgstr "ne mogu da odredim tačku montiranja za fajl %s\n"
+
+#, c-format
+msgid "could not determine filesystem mount points\n"
+msgstr "ne mogu da utvrdim tačke montiranja sistema fajlova\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "ne mogu da utvrdim korenu tačku montiranja %s\n"
+
+#, c-format
+msgid "Partition %s is mounted read only\n"
+msgstr "Particija %s je montirana samo za čitanje\n"
+
+#, c-format
+msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
+msgstr ""
+"Particija %s je prepuna: potrebno je %ld blokova, ali je %ld slobodno\n"
+
+#, c-format
+msgid "disk"
+msgstr "disk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "„%s“ je nispravan url\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "neuspešno preuzimanje fajla „%s“ sa „%s“: %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nastavljanje preuzimanja %s nije moguće: započinjem iznova\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "greška pri upisu u fajl „%s“: %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "neuspešno preuzimanje fajla „%s“ sa %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "izgleda da je %s okrnjen: %jd/%jd bajtova\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "neuspešno preuzimanje %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "nedostatak memorije!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "neočekivana sistemska greška"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "neodgovarajuće dozvole"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "ne mogu da nađem ili pročitam fajl"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "ne mogu da nađem ili pročitam fasciklu"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "prosleđen je pogrešan ili prazan argument"
+
+#, c-format
+msgid "not enough free disk space"
+msgstr "nema dovoljno slobodnog prostora na disku"
+
+#, c-format
+msgid "library not initialized"
+msgstr "biblioteka nije učitana"
+
+#, c-format
+msgid "library already initialized"
+msgstr "biblioteka je već učitana"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "ne mogu da zaključam bazu"
+
+#, c-format
+msgid "could not open database"
+msgstr "ne mogu da otvorim bazu"
+
+#, c-format
+msgid "could not create database"
+msgstr "ne mogu da napravim bazu"
+
+#, c-format
+msgid "database not initialized"
+msgstr "baza nije učitana"
+
+#, c-format
+msgid "database already registered"
+msgstr "baza je već registrovana"
+
+#, c-format
+msgid "could not find database"
+msgstr "ne mogu da nađem bazu"
+
+#, c-format
+msgid "database is incorrect version"
+msgstr "pogrešna verzija baze"
+
+#, c-format
+msgid "could not update database"
+msgstr "ne mogu da ažuriram bazu"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "ne mogu da uklonim unos baze"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "neispravan url servera"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "nisu podešeni severi riznice"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "prenos je već pokrenut"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "prenos nije pokrenut"
+
+#, c-format
+msgid "duplicate target"
+msgstr "dupliran cilj"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "prenos nije pripremljen"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "prenos je otkazan"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "radnja nije saglasna sa vrstom prenosa"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "pokušaj prenosa dok baza nije zaključana"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "ne mogu da nađem ili pročitam paket"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "radnja je otkazana zbog ignorisanog paketa"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "neispravan ili pokvaren paket"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "ne mogu da otvorim fajl paketa"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "ne mogu da uklonim sve fajlove paketa"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "neispravno ime fajla paketa"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "neispravna arhitektura paketa"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "ne mogu da nađem riznicu cilja"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "neispravna ili pokvarena delta"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "neuspela zakrpa deltom"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "ne mogu da zadovoljim zavisnosti"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "sukob zavisnosti"
+
+#, c-format
+msgid "conflicting files"
+msgstr "sukob fajlova"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "neuspešno preuzimanje nekih fajlova"
+
+#, c-format
+msgid "failed to copy some file"
+msgstr "greška pri kopiranju fajla"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "neispravan regularni izraz"
+
+#, c-format
+msgid "libarchive error"
+msgstr "greška libarchivea"
+
+#, c-format
+msgid "download library error"
+msgstr "greška u biblioteci preuzimanja"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "greška pri pokretanju spoljnog programa za preuzimanje"
+
+#, c-format
+msgid "unexpected error"
+msgstr "neočekivana greška"
+
+#, c-format
+msgid "database larger than maximum size\n"
+msgstr "baza je veća od maksimalne veličine\n"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "ne mogu da nađem %s u bazi — preskačem\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "uklanjam %s sa spiska ciljeva\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "ne mogu da uklonim fajl „%s“: %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "ne mogu da uklonim unos baze %s — %s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "ne mogu da uklonim unos „%s“ iz keša\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: ignorišem nadogradnju paketa (%s -> %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignorišem razgradnju paketa (%s -> %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: razgrađujem sa verzije %s na verziju %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: lokalni (%s) je noviji od %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignorišem zamenu paketa (%s-%s -> %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "ne mogu da zamenim %s sa %s\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "otkriveni su nerazrešivi sukobi paketa\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "uklanjam „%s“ sa spiska ciljeva zbog sukoba sa „%s“\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "neuspešno preuzimanje nekih fajlova sa %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "ne mogu da obavim uklanjanje\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "ne mogu da obavim prenos\n"
+
+#, c-format
+msgid "%s database version is too old\n"
+msgstr "verzija baze %s je zastarela\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "ne mogu da uklonim fajl brave %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "ne mogu da napravim privremenu fasciklu\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "ne mogu da kopiram privremeni fajl u %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "ne mogu da uklonim privremenu fasciklu %s\n"
+
+#, c-format
+msgid "could not create pipe (%s)\n"
+msgstr "ne mogu da napravim cev (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "ne mogu da račvam novi proces (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "me mogu da promenim korenu fasciklu (%s)\n"
+
+#, c-format
+msgid "call to execv failed (%s)\n"
+msgstr "neuspeo poziv izvršnog argumenta (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "neuspešo pozivanje procesa čekanja (%s)\n"
+
+#, c-format
+msgid "could not open pipe (%s)\n"
+msgstr "ne mogu da otvorim cev (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "neuspešno pravilno izvršavanje naredbe\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "ne postoji keš za %s; pravim....\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "ne mogu da napravim keš paketa; koristim /tmp kao zamenu\n"
--- a/lib/libalpm/po/sv.po
+++ b/lib/libalpm/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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"
 "Language: sv\n"
@ -190,7 +190,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/tr.po
+++ b/lib/libalpm/po/tr.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-05 01:11+0000\n"
+"POT-Creation-Date: 2011-03-20 23:42-0500\n"
+"PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: ras0ir <ras0ir@eventualis.org>\n"
 "Language-Team: Turkish <None>\n"
 "Language: tr\n"
@ -190,8 +190,12 @@ msgid "could not determine mount point for file %s\n"
 msgstr "%s dosyası için bağlama noktası belirlenemedi\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "dosya sistemi bağlama noktaları belirlenemedi"
+msgid "could not determine filesystem mount points\n"
+msgstr "dosya sistemi bağlama noktaları belirlenemedi\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "%s kök bağlama noktası belirlenemedi\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
--- a/lib/libalpm/po/uk.po
+++ b/lib/libalpm/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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-04 18:24+0000\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"
 "Language: uk\n"
@ -191,7 +191,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""

 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""

 #, c-format
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.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-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-15 05:36+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2011-03-20 23:42-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"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@ -31,7 +31,7 @@ msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"

 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "解压 %s 时出现警告 (%s)\n"

 #, c-format
 msgid "could not extract %s (%s)\n"
@ -183,15 +183,19 @@ msgstr "无法获取文件系统的信息\n"

 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "无法为 %s 获得文件系统信息：%s\n"

 #, c-format
 msgid "could not determine mount point for file %s\n"
 msgstr "无法确定文件 %s 的挂载点\n"

 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "无法确定文件系统的挂载点"
+msgid "could not determine filesystem mount points\n"
+msgstr "无法测定文件系统挂载点\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "无法测定根分区挂载点 %s\n"

 #, c-format
 msgid "Partition %s is mounted read only\n"
@ -201,7 +205,7 @@ msgstr ""

 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
-msgstr ""
+msgstr "分区 %s 无可用空间：需要 %ld 盘区，可用 %ld 盘区\n"

 #, c-format
 msgid "disk"
@ -525,7 +529,7 @@ msgstr "无法更改根目录 (%s)\n"

 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "调用 execv 失败 (%s)\n"

 #, c-format
 msgid "call to waitpid failed (%s)\n"
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@ -166,7 +166,8 @@ int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade)
 							continue;
 						}

-						/* If spkg is already in the target list, we append lpkg to spkg's removes list */
+						/* If spkg is already in the target list, we append lpkg to spkg's
+						 * removes list */
 						pmpkg_t *tpkg = _alpm_pkg_find(trans->add, spkg->name);
 						if(tpkg) {
 							/* sanity check, multiple repos can contain spkg->name */
@ -330,8 +331,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			}
 		}

-		/* Compute the fake local database for resolvedeps (partial fix for the phonon/qt issue) */
-		alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(db_local), trans->add, _alpm_pkg_cmp);
+		/* Compute the fake local database for resolvedeps (partial fix for the
+		 * phonon/qt issue) */
+		alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(db_local),
+				trans->add, _alpm_pkg_cmp);

 		/* Resolve packages in the transaction one at a time, in addition
 		   building up a list of packages which could not be resolved. */
@ -512,7 +515,11 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 	for(i = trans->add; i; i = i->next) {
 		pmpkg_t *spkg = i->data;
 		for(j = spkg->removes; j; j = j->next) {
-			trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(j->data));
+			pmpkg_t *rpkg = j->data;
+			if(!_alpm_pkg_find(trans->remove, rpkg->name)) {
+				_alpm_log(PM_LOG_DEBUG, "adding '%s' to remove list\n", rpkg->name);
+				trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(rpkg));
+			}
 		}
 	}

--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@ -740,6 +740,9 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b)
 	int64_t offset;
 	int done = 0;

+	/* ensure we start populating our line buffer at the beginning */
+	b->line_offset = b->line;
+
 	while(1) {
 		/* have we processed this entire block? */
 		if(b->block + b->block_size == b->block_offset) {
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -19,6 +19,8 @@ pt_BR
 ro
 ru
 sk
+sr
+sr@latin
 sv
 tr
 uk
--- a/po/ca.po
+++ b/po/ca.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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"
 "Language: ca\n"
@ -643,10 +643,6 @@ msgstr "«%s» no és un nivell de depuració vàlid\n"
 msgid "only one operation may be used at a time\n"
 msgstr "només es pot usar una operació alhora\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "no s'ha especificat cap operació (useu -h per ajuda)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -672,12 +668,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "directiva «%s» sense valor no reconeguda\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr " directiva «%s» amb un valor no reconegut\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -717,21 +710,8 @@ msgstr ""
 "una secció.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"fitxer de configuració %s, línia %d: la directiva «%s» necessita un valor\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "fitxer de configuració %s, línia %d: problema a la secció opcions\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"fitxer de configuració %s, línia %d: directiva «%s» a la secció repositori "
-"«%s» no reconeguda.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -749,6 +729,10 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "no podeu realitzar aquesta operació si no sou root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "no s'ha especificat cap operació (useu -h per ajuda)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "no s'ha especificat cap fitxer per --owns\n"
--- a/po/cs.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-15 15:01+0000\n"
+"POT-Creation-Date: 2011-03-23 02:03-0500\n"
+"PO-Revision-Date: 2011-03-22 15:36+0000\n"
 "Last-Translator: vogo <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Czech <None>\n"
 "Language: cs\n"
@ -593,7 +593,7 @@ msgstr "      --debug          zobrazit ladící zprávy\n"

 #, c-format
 msgid "      --logfile <path> set an alternate log file\n"
-msgstr "      --logfile <path  nastavit cestu k log souboru\n"
+msgstr "      --logfile <path> nastavit cestu k log souboru\n"

 #, c-format
 msgid "      --noconfirm      do not ask for any confirmation\n"
@ -632,10 +632,6 @@ msgstr "'%s' není validní ladící úroveň\n"
 msgid "only one operation may be used at a time\n"
 msgstr "současně lze spustit jen jednu operaci\n"

-#, c-format
-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 "invalid option\n"
 msgstr "neplatný přepínač\n"
@ -661,12 +657,11 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "nepodařilo se změnit adresář na %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "položka konfigurace '%s' bez hodnoty není správně\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "položka konfigurace '%s' s hodnotou není správně\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""
+"konfigurační soubor %s, řádek %d: direktiva '%s' v sekci '%s' nebyla "
+"rozpoznána.\n"

 #, c-format
 msgid ""
@ -704,21 +699,9 @@ msgstr ""
 "sekci.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"konfigurační soubor %s, řádek %d: položka konfigurace '%s'.vyžaduje hodnotu\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "konfigurační soubor %s, řádek %d: chyba nastavení.\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"konfigurační soubor %s, řádek %d: položka konfigurace '%s' v sekci '%s' není "
-"správně.\n"
+"konfigurační soubor %s, řádek %d: direktiva '%s' vyžaduje zadanou hodnotu\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -736,6 +719,10 @@ msgstr "nepodařilo se znovu otevřít standardní vstup pro čtení: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "operaci nelze provést, pokud nejste root.\n"

+#, c-format
+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 "no file was specified for --owns\n"
 msgstr "nebyl určen soubor pro --owns\n"
--- a/po/da.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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: Danish <None>\n"
 "Language: da\n"
@ -627,10 +627,6 @@ msgstr "»%s« er ikke et gyldigt fejlsøgningsniveau\n"
 msgid "only one operation may be used at a time\n"
 msgstr "kun en handling kan udføres ad gangen\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "ingen handling angivet (brug -h for hjælp)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -656,12 +652,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "direktiv »%s« uden værdi er ikke genkendt\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "direktiv »%s« med en værdi er ikke genkendt\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -698,20 +691,8 @@ msgstr ""
 "konfigurationsfil %s, linje %d: Alle direktiver skal tilhøre et afsnit.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "konfigurationsfil %s, linje %d: Direktiv %s kræver en værdi\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "konfigurationsfil %s, linje %d: Problem i indstillingsafsnit\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"konfigurationsfil %s, linje %d: Direktiv »%s« i arkivafsnit »%s« blev ikke "
-"genkendt.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -730,6 +711,10 @@ msgid "you cannot perform this operation unless you are root.\n"
 msgstr ""
 "du kan ikke udføre denne handling med mindre du er administrator (root).\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "ingen handling angivet (brug -h for hjælp)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "ingen fil var angivet for -owns\n"
--- a/po/de.po
+++ b/po/de.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-08 14:52+0000\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"
 "Language: de\n"
@ -651,10 +651,6 @@ msgstr "'%s' ist kein gültiger Debug-Level\n"
 msgid "only one operation may be used at a time\n"
 msgstr "Es ist nur eine Operation zur selben Zeit erlaubt\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "Keine Operation angegeben (benutzen Sie -h für Hilfe)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "Ungültige Option\n"
@ -680,12 +676,11 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "Konnte nicht in Verzeichnis %s wechseln(%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "Direktive '%s' wird ohne Wert nicht erkannt\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "Direktive '%s' mit einem Wert wird nicht erkannt\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""
+"Konfigurations-Datei %s, Zeile %d: Direktive '%s in Sektion '%s' wird nicht "
+"erkannt.\n"

 #, c-format
 msgid ""
@ -724,21 +719,9 @@ msgstr ""
 "gehören.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"Konfigurations-Datei %s, Zeile %d: Direktive '%s' benötigt einen Wert\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "Konfigurations-Datei %s, Zeile %d: Problem in der Sektion Option\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"Konfigurations-Datei %s, Zeile %d: Direktive '%s' in der Repositorien-"
-"Sektion '%s' wurde nicht erkannt.\n"
+"Konfigurations-Datei %s, Zeile %d: Direktive '%s' verlangt einen Wert.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -756,6 +739,10 @@ msgstr "Konnte stdin nicht zum Auslesen neu öffnen: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "Sie benötigen Root-Rechte, um diese Operation auszuführen.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "Keine Operation angegeben (benutzen Sie -h für Hilfe)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "Es wurde keine Datei für --owns angegeben\n"
@ -814,7 +801,7 @@ msgstr "Paket \"%s\" wurde nicht gefunden\n"

 #, c-format
 msgid "failed to prepare transaction (%s)\n"
-msgstr "Konnte den Vorgang (%s) nicht vorbereiten\n"
+msgstr "Konnte den Vorgang nicht vorbereiten (%s)\n"

 #, c-format
 msgid ":: package %s does not have a valid architecture\n"
@ -1268,7 +1255,7 @@ msgid "Creating package..."
 msgstr "Erstelle Paket ... "

 msgid "Adding %s file..."
-msgstr "Füge % Datei hinzu..."
+msgstr "Füge %s Datei hinzu..."

 msgid "Compressing package..."
 msgstr "Komprimiere Paket ... "
--- a/po/el.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-05 00:22+0000\n"
-"Last-Translator: nous <nous@archlinux.us>\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: Greek <None>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@ -635,10 +635,6 @@ msgstr "το '%s' δεν είναι έγκυρο επίπεδο αποσφαλμ
 msgid "only one operation may be used at a time\n"
 msgstr "μόνο μια λειτουργία μπορεί να εκτελεστεί\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "ακαθόριστη λειτουργία ('-h' για βοήθεια)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "άκυρη επιλογή\n"
@ -664,12 +660,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "αδυναμία μετάβασης στον κατάλογο %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "άγνωστη οδηγία '%s'\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "άγνωστη οδηγία '%s'\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -706,20 +699,8 @@ msgstr ""
 "ενότητα.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: απαιτείται τιμή στην οδηγία '%s'\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: πρόβλημα στην ενότητα επιλογών\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"αρχείο ρυθμίσεων %s, γραμμή %d: άγνωστη οδηγία '%s' στην ενότητα αποθηκών "
-"%s.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -737,6 +718,10 @@ msgstr "αποτυχία ανάγνωσης από stdin: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "αυτή η λειτουργία απαιτεί προνόμια root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "ακαθόριστη λειτουργία ('-h' για βοήθεια)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "δεν ορίσθηκε αρχείο στην --owns\n"
--- a/po/en_GB.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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"
 "Language: en_GB\n"
@ -623,10 +623,6 @@ msgstr "'%s' is not a valid debug level\n"
 msgid "only one operation may be used at a time\n"
 msgstr "only one operation may be used at a time\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "no operation specified (use -h for help)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "invalid option\n"
@ -652,12 +648,10 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "could not change directory to %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "directive '%s' without value not recognised\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "directive '%s' with a value not recognised\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"

 #, c-format
 msgid ""
@ -692,20 +686,8 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr "config file %s, line %d: All directives must belong to a section.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "config file %s, line %d: directive %s needs a value\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "config file %s, line %d: problem in options section\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognised.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
+msgstr "config file %s, line %d: directive '%s' needs a value\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -723,6 +705,10 @@ msgstr "failed to reopen stdin for reading: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "you cannot perform this operation unless you are root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "no operation specified (use -h for help)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "no file was specified for --owns\n"
--- a/po/es.po
+++ b/po/es.po
--- a/po/fi.po
+++ b/po/fi.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-13 17:51+0000\n"
-"Last-Translator: apuasi <kaannokset.hellberg@gmail.com>\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"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@ -635,10 +635,6 @@ msgstr "'%s' ei ole kelvollinen debugaus taso\n"
 msgid "only one operation may be used at a time\n"
 msgstr "vain yksi operaatio voidaan suorittaa kerralla\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "mitään operaatiota ei määritelty (-h valitsin tulostaa ohjeen)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "epäkelvollinen valitsin\n"
@ -664,12 +660,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "ei voitu siirtyä kansioon %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "asetusvalintaa '%s' ilman arvoa ei tunnisteta.\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "asetusvalintaa '%s' valitsimen kanssa ei tunnisteta\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -704,20 +697,8 @@ msgstr ""
 "osioon.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "asetustiedosto %s, rivi %d: asetusvalinta %s vaatii arvon\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "asetustiedosto %s, rivi %d: ongelma 'options' osiossa\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"asetustiedosto %s, rivi %d: asetusvalintaa '%s', 'repository'  '%s' osiossa "
-"ei tunnisteta.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -735,6 +716,10 @@ msgstr "stdin:in uudelleen avaaminen epäonnistui: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "tämän operaation suorittamiseen vaaditaan ylläpitäjän oikeudet.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "mitään operaatiota ei määritelty (-h valitsin tulostaa ohjeen)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "valitsimelle --owns ei annettu tiedostoa\n"
--- a/po/fr.po
+++ b/po/fr.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 20:43+0000\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"
 "Language: fr\n"
@ -654,10 +654,6 @@ msgstr "'%s' n'est pas un niveau de débogage valide\n"
 msgid "only one operation may be used at a time\n"
 msgstr "une seule opération peut être effectuée à la fois\n"

-#, c-format
-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 "invalid option\n"
 msgstr "option invalide\n"
@ -683,12 +679,11 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "impossible d'aller dans le répertoire %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "l'instruction '%s' sans valeur n'est pas reconnue\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "l'instruction '%s' avec une valeur n'est pas reconnue\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""
+"fichier de configuration %s, ligne %d: l'instruction '%s' dans la section "
+"'%s' n'est pas valide.\n"

 #, c-format
 msgid ""
@ -728,24 +723,11 @@ msgstr ""
 "appartenir à une section.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"fichier de configuration %s, ligne %d: l'instruction '%s' doit avoir une "
+"fichier de configuration %s, ligne %d: l'instruction '%s' a besoin d'une "
 "valeur\n"

-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr ""
-"fichier de configuration %s, ligne %d: problème dans la section options.\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"fichier de configuration %s, ligne %d: l'instruction '%s' dans la section du "
-"dépôt '%s' n'est pas reconnue\n"
-
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "l'initialisation de la librairie alpm a échoué (%s)\n"
@ -762,6 +744,10 @@ msgstr "impossible de lire l'entrée standard: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "vous ne pouvez pas effectuer cette opération à moins d'être root.\n"

+#, c-format
+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 "no file was specified for --owns\n"
 msgstr "aucun fichier spécifié pour --owns\n"
--- a/po/hu.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-07 12:35+0000\n"
+"POT-Creation-Date: 2011-03-23 02:03-0500\n"
+"PO-Revision-Date: 2011-03-22 15:36+0000\n"
 "Last-Translator: ngaba <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team: Hungarian <None>\n"
 "Language: hu\n"
@ -633,10 +633,6 @@ msgstr "a(z) '%s' nem érvényes hibakeresési szint\n"
 msgid "only one operation may be used at a time\n"
 msgstr "csak egy művelet hajtható végre egyszerre\n"

-#, c-format
-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 "invalid option\n"
 msgstr "érvénytelen opció\n"
@ -662,12 +658,11 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "nem sikerült könyvtárat váltani %s-re (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "ismeretlen direktíva (megadott érték nélkül): %s\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "ismeretlen direktíva (megadott értékkel): %s\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""
+"%s konfigurációs fájl, %d. sor: ismeretlen '%s' direktíva a(z) '%s' "
+"szekcióban.\n"

 #, c-format
 msgid ""
@ -703,20 +698,9 @@ msgstr ""
 "tartoznia.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "%s konfigurációs fájl, %d. sor: hiányzik a %s direktíva értéke\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "%s konfigurációs fájl, %d. sor: hiba az options szekcióban\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"%s konfigurációs fájl, %d. sor: ismeretlen '%s' direktíva a '%s' repó "
-"szekcióban.\n"
+"%s konfigurációs fájl, %d. sor: a(z) '%s' direktívának értéket kell adni\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -734,6 +718,10 @@ msgstr "nem sikerült újra megnyitni az stdin-t olvasásra: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "ez a művelet csak rendszergazdaként hajtható végre.\n"

+#, c-format
+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 "no file was specified for --owns\n"
 msgstr "nincs megadva fájl a --owns számára\n"
--- a/po/it.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-05 16:47+0000\n"
+"POT-Creation-Date: 2011-03-23 02:03-0500\n"
+"PO-Revision-Date: 2011-03-22 15:36+0000\n"
 "Last-Translator: giovanni <giovanni@archlinux.org>\n"
 "Language-Team: Italian <None>\n"
 "Language: it\n"
@ -595,7 +595,7 @@ msgstr "  -v, --verbose        mostra maggiori informazioni\n"

 #, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr "      --arch <arch>  imposta una architettura alternativa\n"
+msgstr "      --arch <arch>    imposta una architettura alternativa\n"

 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
@ -654,10 +654,6 @@ msgstr "'%s' non è un livello di debug valido\n"
 msgid "only one operation may be used at a time\n"
 msgstr "è consentito eseguire solo un'operazione per volta\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "nessuna operazione specificata (usa -h per un aiuto)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "opzione non valida\n"
@ -683,12 +679,11 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "impossibile entrare nella directory %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "la direttiva '%s' senza valore non è stata riconosciuta\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "la direttiva '%s' con un valore non riconosciuto\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""
+"file di configurazione %s, riga %d: la direttiva '%s' presente nella sezione "
+"'%s' non è stata riconosciuta.\n"

 #, c-format
 msgid ""
@ -726,23 +721,10 @@ msgstr ""
 "ad una sezione.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"file di configurazione %s, linea %d: la direttiva %s necessita di un valore\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr ""
-"file di configurazione %s, linea %d: c'è un problema nella sezione delle "
-"opzioni\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"file di configurazione %s, linea %d: la direttiva '%s' nella sezione '%s' "
-"del repository non è stata riconosciuta.\n"
+"file di configurazione %s, riga %d: la direttiva '%s' necessita di un "
+"valore\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -761,6 +743,10 @@ msgstr "impossibile riaprire stdin in lettura: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "questa operazione è possibile solo da root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "nessuna operazione specificata (usa -h per un aiuto)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "non è stato specificato nessun file per --owns\n"
@ -839,7 +825,7 @@ msgstr "È stato trovato HoldPkg nella lista dei pacchetti. Vuoi continuare?"

 #, c-format
 msgid " there is nothing to do\n"
-msgstr "Non c'è nulla da fare\n"
+msgstr " non ci sono aggiornamenti disponibili\n"

 #, c-format
 msgid "Do you want to remove these packages?"
--- a/po/kk.po
+++ b/po/kk.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-05 04:19+0000\n"
-"Last-Translator: sotrud_nik <baurthefirst@gmail.com>\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: Kazakh <None>\n"
 "Language: kk\n"
 "MIME-Version: 1.0\n"
@ -631,10 +631,6 @@ msgstr "'%s' - жөндеудің қате деңгейі\n"
 msgid "only one operation may be used at a time\n"
 msgstr "бір уақытта тек бір әрекет орындалуы мүмкін\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "әрекет көрсетілмеді (көмек үшін -h қолданыңыз)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "опция қате\n"
@ -660,12 +656,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "%s бумасына өту мүмкін емес (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "мәні жоқ '%s' директивасы танылмады\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "мәні бәр '%s' директивасы танылмады\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -702,20 +695,8 @@ msgstr ""
 "керек.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "баптаулар файлы %s, жол %d: %s директивасы мәнді талап етеді\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "баптаулар файлы %s, жол %d: опциялар секциясында мәселелер\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"баптаулар файлы %s, жол %d: '%s' директивасы '%s' репозиторий секциясында "
-"танылмады\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -733,6 +714,10 @@ msgstr "оқу үшін stdin қайта ашу сәтсіз: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "Бұл әрекетті жасай алмайсыз, өйткені сіз әкімші емессіз (root).\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "әрекет көрсетілмеді (көмек үшін -h қолданыңыз)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "--owns үшін файл көрсетілмеді\n"
--- a/po/ko.po
+++ b/po/ko.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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: Korean <None>\n"
 "Language: ko\n"
@ -582,10 +582,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 ""
@ -611,11 +607,8 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr ""
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""

 #, c-format
@ -649,17 +642,7 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr ""

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr ""
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""

 #, c-format
@ -678,6 +661,10 @@ 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 "no file was specified for --owns\n"
 msgstr ""
--- a/po/nb.po
+++ b/po/nb.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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"
 "Language: nb\n"
@ -621,10 +621,6 @@ msgstr "'%s' er ikke et gyldig feilsøkingsnivå\n"
 msgid "only one operation may be used at a time\n"
 msgstr "kun én operasjon kan bli brukt av gangen\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "ingen operasjon spesifisert (bruk -h for hjelp)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -650,11 +646,8 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr ""
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 msgstr ""

 #, c-format
@ -691,17 +684,7 @@ msgstr ""
 "konfigurasjonsfil %s, linje %d: Alle direktiver må høre til en seksjon.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr ""
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""

 #, c-format
@ -720,6 +703,10 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "du kan ikke utføre denne operasjonen hvis du ikke er rot-bruker.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "ingen operasjon spesifisert (bruk -h for hjelp)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "ingen fil ble spesifisert for --owns\n"
--- a/po/pacman.pot
+++ b/po/pacman.pot
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 3.5.0\n"
+"Project-Id-Version: pacman 3.5.1\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-20 23:07-0500\n"
+"POT-Creation-Date: 2011-03-20 23:42-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"
--- a/po/pl.po
+++ b/po/pl.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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"
 "Language: pl\n"
@ -633,10 +633,6 @@ msgstr "'%s' nie jest ważnym poziomem odpluskwiania\n"
 msgid "only one operation may be used at a time\n"
 msgstr "tylko jedna operacja może być użyta na raz\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "nie podano żadnej operacji (użyj -h aby otrzymać pomoc)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -662,12 +658,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "dyrektywa '%s' bez wartości nie rozpoznane\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "dyrektywa '%s' z wartością nie rozpoznane\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -703,20 +696,8 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
 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 "plik konfiguracyjny %s, linia %d: dyrektywa %s potrzebuje wartości\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "plik konfiguracyjny %s, linia %d: problem w sekcji opcji\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"plik konfiguracyjny %s, linia %d: dyrektywa '%s' w sekcji repozytorium '%s' "
-"nie rozpoznana.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -734,6 +715,10 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "tą operację wykonać można jedynie jako root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "nie podano żadnej operacji (użyj -h aby otrzymać pomoc)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nie podano pliku dla --owns\n"
--- a/po/pt.po
+++ b/po/pt.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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: Portuguese <>\n"
 "Language: pt\n"
@ -667,10 +667,6 @@ msgstr "'%s' não é um nível de depuração válido\n"
 msgid "only one operation may be used at a time\n"
 msgstr "somente uma operação pode ser usada de cada vez\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "nenhuma operação definida (use -h para obter ajuda)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -696,12 +692,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "instrução '%s' sem valor reconhecido\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "instrução '%s' com valor deconhecido\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -738,21 +731,8 @@ msgstr ""
 "uma secção.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"ficheiro de configuração %s, linha %d: instrução '%s' precisa um valor\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "ficheiro de configuração %s, linha %d: problema na secção de opções\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"ficheiro de configuração %s, linha %d: instrução '%s' na secção do "
-"repositório '%s' não reconhecida.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -770,6 +750,10 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "não pode realizar esta operação a menos que seja o root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "nenhuma operação definida (use -h para obter ajuda)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nenhum ficheiro foi especificado para --owns\n"
--- a/po/pt_BR.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-09 22:13+0000\n"
-"Last-Translator: ambaratti <ambaratti.listas@gmail.com>\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: Portuguese (Brazilian) <None>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@ -47,11 +47,11 @@ msgstr "atualizando %s...\n"

 #, c-format
 msgid "checking package integrity...\n"
-msgstr "verificando a integridade do pacote...\n"
+msgstr "verificando a integridade do(s) pacote(s)...\n"

 #, c-format
 msgid "checking delta integrity...\n"
-msgstr "verificando a integridade do delta...\n"
+msgstr "verificando a integridade do(s) delta(s)...\n"

 #, c-format
 msgid "applying deltas...\n"
@ -654,10 +654,6 @@ msgstr "'%s' não é um nível de debug válido\n"
 msgid "only one operation may be used at a time\n"
 msgstr "somente uma operação pode ser usada por vez\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "nenhuma operação especificada (use -h para obter ajuda)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "opção inválida\n"
@ -683,12 +679,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "não foi possível mudar para o diretório %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "diretiva '%s' sem valor não reconhecida\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "diretiva '%s' com valor não reconhecida\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -728,21 +721,8 @@ msgstr ""
 "uma seção.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+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 "config file %s, line %d: problem in options section\n"
-msgstr "arquivo de configuração %s, linha %d: problema na seção de opções\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"arquivo de configuração %s, linha %d: diretiva '%s' na seção de repositório "
-"'%s' não reconhecida.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -760,6 +740,10 @@ msgstr "falha ao reabrir stdin para leitura: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "você não pode realizar esta operação a menos que seja root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "nenhuma operação especificada (use -h para obter ajuda)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nenhum arquivo foi especificado para --owns\n"
@ -1765,8 +1749,9 @@ 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 criará um arquivo delta entre dois pacotes.\\nEste arquivo delta "
-"pode então ser adicionado à base de dados usando repo-add.\\n\\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>pkgdelta criará um "
+"arquivo delta entre dois pacotes.\\nEste arquivo delta pode 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 "Examplo:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
@ -7,15 +7,15 @@ 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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-05 17:02+0000\n"
-"Last-Translator: partizan <serg.partizan@gmail.com>\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: Russian <None>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"

 #, c-format
@ -107,8 +107,6 @@ msgstr[1] ""
 ":: Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
 msgstr[2] ""
 ":: Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
-msgstr[3] ""
-":: Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"

 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
@ -116,7 +114,6 @@ msgid_plural "Do you want to skip the above packages for this upgrade?"
 msgstr[0] "Вы уверены что хотите пропустить этот пакет при обновлении?"
 msgstr[1] "Вы уверены что хотите пропустить эти пакеты при обновлении?"
 msgstr[2] "Вы уверены что хотите пропустить эти пакеты при обновлении?"
-msgstr[3] "Вы уверены что хотите пропустить эти пакеты при обновлении?"

 #, c-format
 msgid ":: There are %d providers available for %s:\n"
@ -639,10 +636,6 @@ msgstr "'%s' - неверный уровень отладки\n"
 msgid "only one operation may be used at a time\n"
 msgstr "одновременно может выполняться только одна операция\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "не задана операция (для справки используйте -h)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "несуществующий параметр\n"
@ -668,12 +661,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "не удалось изменить рабочий каталог на %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "директива '%s' без значения не распознана\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "директива '%s' со значением не распознана\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -710,20 +700,8 @@ msgstr ""
 "секциях.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "конфигурационный файл %s, строка %d: директива '%s' требует значения\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "конфигурационный файл %s, строка %d: проблема в секции options\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"конфигурационный файл %s, строка %d: директива '%s' в секции репозитория "
-"'%s' не распознана.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -742,6 +720,10 @@ msgid "you cannot perform this operation unless you are root.\n"
 msgstr ""
 "Вы не можете выполнить эту операцию, не являясь суперпользователем (root).\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "не задана операция (для справки используйте -h)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "не был указан файл для --owns\n"
@ -783,8 +765,7 @@ msgid "%s: %d total file, "
 msgid_plural "%s: %d total files, "
 msgstr[0] "%s: всего %d файл, "
 msgstr[1] "%s: всего %d файлов, "
-msgstr[2] "%s: всего %d файла, "
-msgstr[3] "%s: всего %d файлов, "
+msgstr[2] "%s: всего %d файлов, "

 #, c-format
 msgid "%d missing file\n"
@ -792,7 +773,6 @@ msgid_plural "%d missing files\n"
 msgstr[0] "%d отсутствующий файл\n"
 msgstr[1] "%d отсутствующие файлы\n"
 msgstr[2] "%d отсутствующие файлы\n"
-msgstr[3] "%d отсутствующие файлы\n"

 #, c-format
 msgid "no usable package repositories configured.\n"
--- a/po/sk.po
+++ b/po/sk.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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"
 "Language: sk\n"
@ -628,10 +628,6 @@ msgstr "'%s' nie je platná ladiaca úroveň\n"
 msgid "only one operation may be used at a time\n"
 msgstr "súčasne je možné spustiť len jednu operáciu\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "nebola špecifikovaná operácia (použite -h pre nápovedu)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -657,12 +653,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "položka konfigurácie '%s' bez hodnoty nie je povolená\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "položka konfigurácie '%s' s hodnotou nebola rozpoznaná\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -700,21 +693,8 @@ msgstr ""
 "do nejakej sekcie.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"konfiguračný súbor %s, riadok %d: položka konfigurace '%s'.vyžaduje hodnotu\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "konfiguračný súbor %s, riadok %d: chyba nastavenia.\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"konfiguračný súbor %s, riadok %d: položka konfigurácie '%s' v sekcii '%s' "
-"nebola rozpoznaná.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -732,6 +712,10 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "operáciu nie je možné uskutočniť, ak nie ste root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "nebola špecifikovaná operácia (použite -h pre nápovedu)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nebol určený súbor pre --owns\n"
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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"
 "Language: sv\n"
@ -626,10 +626,6 @@ msgstr "'%s' är inte en giltig felsökningsnivå\n"
 msgid "only one operation may be used at a time\n"
 msgstr "enbart en operation kan användas på samma gång\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "ingen operation specifierad (använd -h för hjälp)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -655,12 +651,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "direktiv '%s' utan värde känns inte igen\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "direktiv '%s' med ett värde känns inte igen\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -697,19 +690,8 @@ msgstr ""
 "konfigurationsfil %s, rad %d: Alla direktiv måste tillhöra en sektion.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "konfigurationsfil %s, rad %d: direktiv '%s' kräver ett värde\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "konfigurationsfil %s, rad %d: problem i alternativsektionen.\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"konfigurationsfil %s, rad %d: direktiv '%s' i sektion '%s' känns inte igen.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -727,6 +709,10 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "du kan inte genomföra denna operation om du inte är root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "ingen operation specifierad (använd -h för hjälp)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "ingen fil specifierades för --owns\n"
--- a/po/tr.po
+++ b/po/tr.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-05 01:19+0000\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"
 "Language-Team: Turkish <None>\n"
 "Language: tr\n"
@ -626,10 +626,6 @@ msgstr "'%s' geçerli bir hata ayıklama seviyesi değil\n"
 msgid "only one operation may be used at a time\n"
 msgstr "her seferinde yalnızca bir işlem yapılabilir\n"

-#, c-format
-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 "invalid option\n"
 msgstr "hatalı seçenek\n"
@ -655,12 +651,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "%s dizinine geçilemedi (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "'%s' komutuna parametre eklenmediği için tanımlanamadı\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "'%s' komutundaki parametre tanımlanamadı\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr "ayar dosyası %s, satır %d: '%s' direktifi '%s' bölümü için geçersiz.\n"

 #, c-format
 msgid ""
@ -696,19 +689,9 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr "ayar dosyası %s, satır %d: Tüm direktifler bir bölüme ait olmalı.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "ayar dosyası %s, satır %d: direktif %s bir değere ihtiyaç duyuyor.\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "ayar dosyası %s, satır %d: seçenekler bölümü hatalı.\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"ayar dosyası %s, satır %d: direktif '%s' içeren '%s' bölümü tanımlanamadı.\n"
+"yapılandırma dosyası %s, satır %d: '%s' direktifine bir değer atanmalı\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -726,6 +709,10 @@ msgstr "stdin okunmak için açılamadı: (%s)\n"
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "yönetici yetkileri olmadan bu işlemi gerçekleştiremezsiniz.\n"

+#, c-format
+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 "no file was specified for --owns\n"
 msgstr "--owns parametresi için herhangi bir dosya belirtilmedi\n"
--- a/po/uk.po
+++ b/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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\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"
 "Language: uk\n"
@ -636,10 +636,6 @@ msgstr "рівень відлагодження '%s' невірний\n"
 msgid "only one operation may be used at a time\n"
 msgstr "тільки одна операція може використовуватися одночасно\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "не вказано операцію (використайте -h для довідки)\n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr ""
@ -665,12 +661,9 @@ msgid "could not change directory to %s (%s)\n"
 msgstr ""

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "директива '%s' без значення не розпізнана.\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "директива '%s' зі значенням не розпізнана.\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""

 #, c-format
 msgid ""
@ -706,20 +699,8 @@ msgstr ""
 "файл налаштувань %s, рядок %d: Всі директиви повинні належати секції.\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "файл налаштувань %s, рядок %d: директива '%s' потребує значення\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "файл налаштувань %s, рядок %d: проблема в секції опцій.\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
 msgstr ""
-"файл налаштувань %s, рядок %d: директива '%s' в секцій репозиторія '%s' не "
-"розпізнана.\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -737,6 +718,10 @@ msgstr ""
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "ви можете виконати цю операцію тільки як root.\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "не вказано операцію (використайте -h для довідки)\n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "не було вказано файл для --owns\n"
--- a/po/zh_CN.po
+++ b/po/zh_CN.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-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-15 03:52+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\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"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@ -101,16 +101,16 @@ msgid ""
 msgid_plural ""
 ":: The following packages cannot be upgraded due to unresolvable "
 "dependencies:\n"
-msgstr[0] ""
+msgstr[0] "因为无法解决以来关系，以下软件包无法进行更新：\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[0] "您想在本次更新中跳过上述软件包吗？"

 #, c-format
 msgid ":: There are %d providers available for %s:\n"
-msgstr ""
+msgstr ":: 有 %d 个软件包均可提供 %s ：\n"

 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
@ -138,7 +138,7 @@ msgstr "正在检查文件冲突"

 #, c-format
 msgid "checking available disk space"
-msgstr ""
+msgstr "正在检查可用硬盘空间"

 #, c-format
 msgid "checking package integrity"
@ -158,19 +158,19 @@ msgstr "没有指定目标 (使用 -h 获取帮助) \n"

 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
+msgstr "没有指定安装原因 ( 使用 -h 获取帮助)\n"

 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
+msgstr "无法为软件包 %s 指定安装原因 (%s)\n"

 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
+msgstr "%s：安装原因设定为“作为依赖关系安装”\n"

 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
+msgstr "%s：安装原因设定为“单独指定安装”\n"

 #, c-format
 msgid "Explicitly installed"
@ -501,7 +501,7 @@ msgstr "  -d, --nodeps         略过依赖关系检查\n"
 #, c-format
 msgid ""
 "  -k, --dbonly         only modify database entries, not package files\n"
-msgstr ""
+msgstr " -k, --dbonly         仅修改数据库条目，而非软件包文件\n"

 #, c-format
 msgid ""
@ -595,10 +595,6 @@ msgstr "'%s' 不是有效的调试级别\n"
 msgid "only one operation may be used at a time\n"
 msgstr "一次只能运行一个操作\n"

-#, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "没有指定的操作 (使用 -h 获取帮助) \n"
-
 #, c-format
 msgid "invalid option\n"
 msgstr "无效选项\n"
@ -609,7 +605,7 @@ msgstr "'CleanMethod' 设置的为无效值： '%s'\n"

 #, c-format
 msgid "could not get current working directory\n"
-msgstr ""
+msgstr "无法获取当前的工作目录\n"

 #, c-format
 msgid "could not chdir to download directory %s\n"
@ -621,15 +617,12 @@ msgstr "正在运行 XferCommand：分支失败！\n"

 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr ""
+msgstr "无法改变目录到 %s (%s)\n"

 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "无法识别无参数值的指令 '%s'\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "无法识别带参数值的指令 '%s'\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr "配置文件 %s，第 %d 行：指令 '%s'(位于章节 '%s' 中) 无法识别。\n"

 #, c-format
 msgid ""
@ -662,18 +655,8 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr "配置文件 %s，第 %d 行：所有的命令必须属于同一章节。\n"

 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "配置文件 %s，第 %d 行：指令 '%s' 需要一个值\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "配置文件 %s，第 %d 行：选项段中有问题\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr "配置文件 %s，第 %d 行：无法识别指令 '%s' (位在软件库段 '%s' 中)。\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
+msgstr "配置文件 %s，第 %d 行：指令 '%s' 需要赋值\n"

 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@ -681,16 +664,20 @@ msgstr "初始化 alpm 库失败 (%s)\n"

 #, c-format
 msgid "buffer overflow detected in arg parsing\n"
-msgstr ""
+msgstr "参数解析时探测到缓存溢出\n"

 #, c-format
 msgid "failed to reopen stdin for reading: (%s)\n"
-msgstr ""
+msgstr "无法打开 stdin 以读取：(%s)\n"

 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "非 root (根用户) 无法执行指定操作。\n"

+#, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "没有指定的操作 (使用 -h 获取帮助) \n"
+
 #, c-format
 msgid "no file was specified for --owns\n"
 msgstr "错误：没有为 --owns 指定文件\n"
@ -705,7 +692,7 @@ msgstr "无法读取文件 '%s'：%s\n"

 #, c-format
 msgid "cannot determine ownership of directory '%s'\n"
-msgstr ""
+msgstr "无法测定目录 '%s' 的所属权\n"

 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
@ -713,7 +700,7 @@ msgstr "无法确定 '%s' 的真实路径：%s\n"

 #, c-format
 msgid "path too long: %s%s\n"
-msgstr ""
+msgstr "路径过长：%s%s\n"

 #, c-format
 msgid "%s is owned by %s %s\n"
@ -730,12 +717,12 @@ msgstr "未找到 \"%s\" 组\n"
 #, c-format
 msgid "%s: %d total file, "
 msgid_plural "%s: %d total files, "
-msgstr[0] ""
+msgstr[0] "%s: 共 %d 个文件。"

 #, c-format
 msgid "%d missing file\n"
 msgid_plural "%d missing files\n"
-msgstr[0] ""
+msgstr[0] "共 %d 个缺失文件\n"

 #, c-format
 msgid "no usable package repositories configured.\n"
@ -807,19 +794,19 @@ msgstr "缓存目录：%s\n"

 #, c-format
 msgid "Packages to keep:\n"
-msgstr ""
+msgstr "要保留的软件包：\n"

 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
+msgstr "  所有本地安装的软件包\n"

 #, c-format
 msgid "  All current sync database packages\n"
-msgstr ""
+msgstr "  所有目前同步数据库的软件包\n"

 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr ""
+msgstr "您想从缓存中删除全部其他软件包吗？"

 #, c-format
 msgid "removing old packages from cache...\n"
@ -879,15 +866,15 @@ msgstr "正在跳过软件包：%s\n"

 #, c-format
 msgid "target not found: %s\n"
-msgstr ""
+msgstr "未找到目标：%s\n"

 #, c-format
 msgid ":: There are %d members in group %s:\n"
-msgstr ""
+msgstr ":: 共有 %d 组员在组 %s 中：\n"

 #, c-format
 msgid "database not found: %s\n"
-msgstr ""
+msgstr "未找到数据库：%s\n"

 #, c-format
 msgid ":: Starting full system upgrade...\n"
@ -955,7 +942,7 @@ msgstr ""

 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "  请尝试运行 pacman-db-upgrade\n"

 #, c-format
 msgid "failed to release transaction (%s)\n"
@ -995,23 +982,23 @@ msgstr "%s 的可选依赖\n"

 #, c-format
 msgid "Repository %s\n"
-msgstr ""
+msgstr "软件库 %s\n"

 #, c-format
 msgid "Invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "无效值：%d 不在 %d 和 %d 之间\n"

 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "无效数字：%s\n"

 #, c-format
 msgid "Enter a selection (default=all)"
-msgstr ""
+msgstr "输入某个选择 ( 默认=全部选定 )"

 #, c-format
 msgid "Enter a number (default=%d)"
-msgstr ""
+msgstr "输入某个数字 ( 默认=%d )"

 #, c-format
 msgid "[Y/n]"
@ -1039,7 +1026,7 @@ msgstr "否"

 #, c-format
 msgid "failed to allocate string\n"
-msgstr ""
+msgstr "无法分配字符串\n"

 #, c-format
 msgid "error: %s"
@ -1148,7 +1135,7 @@ msgid "Failed to extract %s"
 msgstr "无法解压缩 %s"

 msgid "A failure occurred in %s()."
-msgstr ""
+msgstr "在 %s() 中发生一个错误。"

 msgid "Starting %s()..."
 msgstr "正在开始 %s()..."
@ -1184,7 +1171,7 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "GPL 软件的列子：license=('GPL')"

 msgid "Backup entry file not in package : %s"
-msgstr ""
+msgstr "备份条目文件不在软件包中：%s"

 msgid "Package contains reference to %s"
 msgstr "软件包提及含有 %s"
@ -1196,7 +1183,7 @@ msgid "Creating package..."
 msgstr "正在创建软件包..."

 msgid "Adding %s file..."
-msgstr ""
+msgstr "正在添加 %s 文件..."

 msgid "Compressing package..."
 msgstr "正在压缩软件包..."
@ -1229,7 +1216,7 @@ msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"

 msgid "Failed to create symlink to source package file."
-msgstr ""
+msgstr "无法创建源软件包文件的系统链接。"

 msgid "Installing package %s with %s -U..."
 msgstr "正在安装软件包 %s (使用 %s  -U )..."
@ -1247,13 +1234,13 @@ msgid "%s is not allowed to start with a hyphen."
 msgstr "%s 不允许以连字号开始。"

 msgid "%s is not allowed to contain colons or hyphens."
-msgstr ""
+msgstr "%s 不允许含有冒号( : )或连字号( - )。"

 msgid "%s is not allowed to contain hyphens."
 msgstr "%s 不允许含有连字号 (减号) "

 msgid "%s must be an integer."
-msgstr ""
+msgstr "%s 必须是个整数。"

 msgid "%s is not available for the '%s' architecture."
 msgstr "%s 不具备 '%s' 架构。"
@ -1268,7 +1255,7 @@ msgid "Provides array cannot contain comparison (< or >) operators."
 msgstr "提供不能含有 (< 或 >)比较操作符的阵列"

 msgid "Backup entry should not contain leading slash : %s"
-msgstr ""
+msgstr "备份条目不能包含前置斜杠号：%s"

 msgid "Invalid syntax for optdepend : '%s'"
 msgstr "无效的 optdepend 语法： '%s'"
@ -1286,7 +1273,7 @@ msgid "requested package %s is not provided in %s"
 msgstr "提供所需求的软件包 %s，在 %s 里没有"

 msgid "Determining latest %s revision..."
-msgstr ""
+msgstr "正在测定最新 %s 的修订..."

 msgid "Version found: %s"
 msgstr "找到版本：%s"
@ -1364,17 +1351,17 @@ msgid "  --asroot         Allow makepkg to run as root user"
 msgstr "      --asroot     允许 makepkg 作为根用户运行"

 msgid "  --check          Run the check() function in the %s"
-msgstr ""
+msgstr "  --check          在 %s 中运行 check() 功能"

 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr "  --config <文件> 使用替代的配置文件 (而不是 '%s')"

 msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
-msgstr ""
+msgstr "  --holdver        防止开发 %ss 的自动版本碰撞"

 msgid "  --nocheck        Do not run the check() function in the %s"
-msgstr ""
+msgstr "  --nocheck          不在 %s 中运行 check() 功能"

 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <清单>     仅从分割软件包中创建清单中所列的软件包"
@ -1405,6 +1392,9 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"版权所有 (c) 2006-2011 Pacman 开发团队 <pacman-dev@archlinux.org>.\\n版权所"
+"有 (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自由软件；请"
+"参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"

 msgid "%s not found."
 msgstr "%s 未找到。"
@ -1565,18 +1555,20 @@ msgid ""
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
+"版权所有 (c) 2010-2011 Pacman 开发团队 <pacman-dev@archlinux.org>.\\n本程序是"
+"自由软件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"

 msgid "%s does not exist or is not a directory."
 msgstr "%s 不存在或不是一个目录。"

 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
+msgstr "您必须有正确的许可才可升级数据库。"

 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr "发现 Pacman 锁文件。不能在 pacman 运行时再次运行。"

 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
+msgstr "探测到 3.5 版本以前的数据库格式 - 正在升级中..."

 msgid "Done."
 msgstr "完成。"
@ -1640,51 +1632,55 @@ msgid "Finished. Your pacman database has been optimized."
 msgstr "完毕。你的 pacman 数据库已经优化。"

 msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr ""
+msgstr "用法：pkgdelta [-q] <软件包1> <软件包2>\\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 将在两个软件包中创建增量文件。\\n该增量文件可通过使用 repo-add 添"
+"加到数据库中。\\n\\n"

 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
-msgstr ""
+msgstr "例子：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 ""
+"版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软"
+"件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"

 msgid "Invalid package file '%s'."
 msgstr "无效的软件包文件 '%s'。"

 msgid "The package names don't match : '%s' and '%s'"
-msgstr ""
+msgstr "软件包名称不一致：'%s' 和 '%s'"

 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr ""
+msgstr "软件包架构不一致：'%s' 和 '%s'"

 msgid "Both packages have the same version : '%s'"
-msgstr ""
+msgstr "两个软件包为同一版本：'%s'"

 msgid "Generating delta from version %s to version %s"
-msgstr ""
+msgstr "正在创建从版本 %s 到版本 %s 的增量包"

 msgid "Delta could not be created."
-msgstr ""
+msgstr "无法创建增量软件包。"

 msgid "Generated delta : '%s'"
-msgstr ""
+msgstr "已创建好增量软件包：'%s'"

 msgid "File '%s' does not exist"
-msgstr ""
+msgstr "文件 '%s' 不存在"

 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "无法找到 xdelta 执行文件！是否已安装 xdelta3？"

 msgid "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
-msgstr ""
+msgstr "用法：repo-add [-d] [-f] [-q] <数据库路径> <软件包|增量包> ...\\n"

 msgid "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
 msgstr "用法：repo-remove·[-q]·<path-to-db>·<软件包名|delta增量包>·...\\n\\n"
@ -1708,16 +1704,19 @@ msgid ""
 "Use the -q/--quiet flag to minimize output to basic messages, warnings,"
 "\\nand errors.\\n\\n"
 msgstr ""
+"使用 -q/--quiet 参数可将输出最小化为基本信息，警告，\\n以及错误。\\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 ""
+"使用 -d/--delta 参数以自动创建并在旧条目\\n和新条目之间添加增量文件，如果能在"
+"新软件包文件\\n旁边找到旧的软件包文件的话。\\n\\n"

 msgid ""
 "Use the -f/--files flag to update a database including file entries.\\n\\n"
-msgstr ""
+msgstr "使用 -f/--files 参数以更新包括文件条目的某个数据库。\\n\\n"

 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "例子：  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@ -1736,10 +1735,10 @@ msgstr ""
 "码。\\n在法律许可下，不承担任何担保责任。\\n"

 msgid "No database entry for package '%s'."
-msgstr ""
+msgstr "没有软件包 '%s' 的数据库条目。"

 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr ""
+msgstr "正在添加 'deltas' 增量包条目：%s -> %s"

 msgid "Removing existing entry '%s'..."
 msgstr "正在删除现有的条目 '%s'..."
@ -1748,13 +1747,13 @@ msgid "An entry for '%s' already existed"
 msgstr "已存在条目 '%s'"

 msgid "Creating '%s' db entry..."
-msgstr ""
+msgstr "正在创建 '%s' 数据库条目..."

 msgid "Computing md5 checksums..."
 msgstr "正在计算 md5 校验值..."

 msgid "Old package file not found: %s"
-msgstr ""
+msgstr "没有找到旧的软件包：%s"

 msgid "Failed to acquire lockfile: %s."
 msgstr "无法要求锁定文件：%s。"