summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-23 02:16:13 -0500
committerDan McGee <dan@archlinux.org>2011-03-23 02:16:13 -0500
commit3df49acb30cb5a06e15faffcc18cc52b74905e7f (patch)
tree00dfc92971d16683bb3c08c7003ea4842120db94 /lib
parent0ff52b68452046d61c24649ec94886bd74faab45 (diff)
parent115bf1bf9f4be00e93bfd40a2506eda12607ccb8 (diff)
downloadpacman-3df49acb30cb5a06e15faffcc18cc52b74905e7f.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/po/LINGUAS2
-rw-r--r--lib/libalpm/po/ca.po10
-rw-r--r--lib/libalpm/po/cs.po14
-rw-r--r--lib/libalpm/po/da.po10
-rw-r--r--lib/libalpm/po/de.po12
-rw-r--r--lib/libalpm/po/el.po14
-rw-r--r--lib/libalpm/po/en_GB.po12
-rw-r--r--lib/libalpm/po/es.po82
-rw-r--r--lib/libalpm/po/fi.po12
-rw-r--r--lib/libalpm/po/fr.po12
-rw-r--r--lib/libalpm/po/hu.po14
-rw-r--r--lib/libalpm/po/it.po12
-rw-r--r--lib/libalpm/po/kk.po14
-rw-r--r--lib/libalpm/po/ko.po10
-rw-r--r--lib/libalpm/po/libalpm.pot4
-rw-r--r--lib/libalpm/po/nb.po10
-rw-r--r--lib/libalpm/po/pl.po10
-rw-r--r--lib/libalpm/po/pt.po10
-rw-r--r--lib/libalpm/po/pt_BR.po13
-rw-r--r--lib/libalpm/po/ro.po12
-rw-r--r--lib/libalpm/po/ru.po16
-rw-r--r--lib/libalpm/po/sk.po10
-rw-r--r--lib/libalpm/po/sr.po552
-rw-r--r--lib/libalpm/po/sr@latin.po552
-rw-r--r--lib/libalpm/po/sv.po10
-rw-r--r--lib/libalpm/po/tr.po12
-rw-r--r--lib/libalpm/po/uk.po10
-rw-r--r--lib/libalpm/po/zh_CN.po22
-rw-r--r--lib/libalpm/sync.c15
-rw-r--r--lib/libalpm/util.c3
30 files changed, 1351 insertions, 140 deletions
diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS
index 272f6e60..3ce69e3c 100644
--- 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
diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po
index 3648215c..6ffd8da3 100644
--- 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
diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po
index cbd55939..13e2d39f 100644
--- 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"
diff --git a/lib/libalpm/po/da.po b/lib/libalpm/po/da.po
index b3d461e4..dd050fdd 100644
--- 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
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 1a64d812..13dec4d2 100644
--- 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"
diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po
index 861c1d90..122e3f2b 100644
--- 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"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index e39b744c..920044b5 100644
--- 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"
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index 3611ba79..85fde4eb 100644
--- 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"
diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po
index c6eaf3ac..e0455c7f 100644
--- 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
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index e77c00f0..f4d215a6 100644
--- 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"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index 37f2a0fd..94b0b1ac 100644
--- 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"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index d6593ba9..ca75cc28 100644
--- 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"
diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po
index 76c6a90c..fba06aaf 100644
--- 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"
diff --git a/lib/libalpm/po/ko.po b/lib/libalpm/po/ko.po
index 849ff8f9..d4c70983 100644
--- 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
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index b4a5da66..2691bdeb 100644
--- 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"
diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po
index 18e3c643..ae347db8 100644
--- 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
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index ee796663..b46a632f 100644
--- 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
diff --git a/lib/libalpm/po/pt.po b/lib/libalpm/po/pt.po
index b63492fc..9fbef2fe 100644
--- 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
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 5ee66123..3acd7df0 100644
--- 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"
diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po
index 7d094f68..789aed7a 100644
--- 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"
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index cb814233..8f6790ea 100644
--- 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"
diff --git a/lib/libalpm/po/sk.po b/lib/libalpm/po/sk.po
index c3aca832..dd1d0364 100644
--- 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
diff --git a/lib/libalpm/po/sr.po b/lib/libalpm/po/sr.po
new file mode 100644
index 00000000..da124030
--- /dev/null
+++ 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"
diff --git a/lib/libalpm/po/sr@latin.po b/lib/libalpm/po/sr@latin.po
new file mode 100644
index 00000000..650ed209
--- /dev/null
+++ 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"
diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po
index 76d6223b..4ebfdea0 100644
--- 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
diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po
index d373fa10..1ebbab02 100644
--- 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"
diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po
index 41d7d7ec..d7cb85b8 100644
--- 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
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index ca170930..c24459a3 100644
--- 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"
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index ebf8474d..e0a86706 100644
--- 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));
+ }
}
}
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 5332f001..660d4eb4 100644
--- 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) {