Merge branch 'maint'

13 files changed, 171 insertions, 140 deletions

diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po
index 4420ac29..afd411f5 100644
--- a/lib/libalpm/po/cs.po
+++ b/lib/libalpm/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-19 08:45+0200\n"
 "Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Čeština\n"
@@ -405,14 +405,6 @@ msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: vynucená aktualizace na verzi %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: lokální (%s) je novější než %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nelze nalézt %s v databázi -- přeskakuji\n"
 
@@ -433,6 +425,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignoruji aktualizaci balíčku (bude nahrazen %s-%s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: lokální (%s) je novější než %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
 
@@ -448,6 +444,10 @@ msgstr "%s-%s je aktuální -- přeskakuji\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s je aktuální -- přeinstalovávám\n"
 
+#, fuzzy, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
@@ -555,3 +555,6 @@ msgstr "neexistuje cache %s, vytvářím...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "nelze vytvořit cache balíčků, používám /tmp\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: vynucená aktualizace na verzi %s\n"
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 9b433a8c..c086f3ac 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-16 13:30+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
@@ -416,14 +416,6 @@ msgid "unexpected error"
 msgstr "Unerwarteter Fehler"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: Erzwungene Aktualisierung auf Version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n"
 
@@ -444,6 +436,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: Ignoriere zu aktualisierendes Paket (zu ersetzen durch %s-%s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n"
 
@@ -459,6 +455,10 @@ msgstr "%s-%s ist aktuell -- Überspringe\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s ist aktuell -- Reinstalliere\n"
 
+#, fuzzy, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "Nicht lösbare Paketkonflikte gefunden\n"
@@ -566,3 +566,6 @@ msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: Erzwungene Aktualisierung auf Version %s\n"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index 62222bc1..71990fed 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-19 17:31+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-23 23:38+0200\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -405,14 +405,6 @@ msgid "unexpected error"
 msgstr "unexpected error"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forcing upgrade to version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) is newer than %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
 
@@ -433,6 +425,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) is newer than %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoring package upgrade (%s => %s)\n"
 
@@ -449,6 +445,10 @@ msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s is up to date -- reinstalling\n"
 
 #, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "downgrading package %s (%s => %s)\n"
+
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "unresolvable package conflicts detected\n"
 
@@ -555,3 +555,6 @@ msgstr "no %s cache exists, creating...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "couldn't create package cache, using /tmp instead\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: forcing upgrade to version %s\n"
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index 54e17c88..2838b55d 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -1,21 +1,20 @@
-# translation of libalpm.po to
-# Juan Pablo Gonzalez <jotapesan@gmail.com>, 2008.
-# translation of es.po to
+# Juan Pablo González Tognarelli <jotapesan@gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: libalpm\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-16 09:26-0400\n"
-"Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
-"Language-Team:  <es@li.org>\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-23 23:35+0200\n"
+"Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n"
+"Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: CHILE\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
@@ -38,7 +37,7 @@ msgstr ""
 
 #, c-format
 msgid "replacing packages with -U is not supported yet\n"
-msgstr "reemplazar paquetes  con -U aún no esta soportado\n"
+msgstr "reemplazar paquetes con -U aún no esta soportado\n"
 
 #, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
@@ -142,7 +141,7 @@ msgstr "nombre de paquete ausente en %s\n"
 
 #, c-format
 msgid "missing package version in %s\n"
-msgstr "forzando la versión del paquete en %s\n"
+msgstr "versión del paquete ausente en %s\n"
 
 #, c-format
 msgid "error while reading package %s: %s\n"
@@ -202,11 +201,11 @@ msgstr "no se puede resumir la descarga, empezando de nuevo\n"
 
 #, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "no se pudo escribir al archivo '%s'\n"
+msgstr "no se puede escribir en el archivo '%s'\n"
 
 #, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "error descargando %s: %s\n"
+msgstr "error descargando '%s': %s\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -226,7 +225,7 @@ msgstr "no se pudo descargar %s\n"
 
 #, c-format
 msgid "out of memory!"
-msgstr "no hay memoria!"
+msgstr "memoria insuficiente!"
 
 #, c-format
 msgid "unexpected system error"
@@ -250,11 +249,11 @@ msgstr "argumento erroneo o NULO"
 
 #, c-format
 msgid "library not initialized"
-msgstr "librería no inicializada"
+msgstr "biblioteca no inicializada"
 
 #, c-format
 msgid "library already initialized"
-msgstr "la librería ya fue inicializada"
+msgstr "la biblioteca ya fue inicializada"
 
 #, c-format
 msgid "unable to lock database"
@@ -350,7 +349,7 @@ msgstr "no se pudo quitar todos los archivos del paquete"
 
 #, c-format
 msgid "package filename is not valid"
-msgstr "nombre de archivo del paquete no es válido"
+msgstr "el nombre de archivo del paquete no es válido"
 
 #, c-format
 msgid "no such repository"
@@ -402,7 +401,7 @@ msgstr "error de libarchive"
 
 #, c-format
 msgid "download library error"
-msgstr "error de descarga de librería"
+msgstr "error de descarga de biblioteca"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -413,14 +412,6 @@ msgid "unexpected error"
 msgstr "error inesperado"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forzando la actualización a la versión %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "no se pudo encontrar %s en la base de datos -- saltando\n"
 
@@ -443,6 +434,10 @@ msgstr ""
 "s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorando la actualización del paquete (%s => %s)\n"
 
@@ -459,6 +454,10 @@ msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s esta al día -- re-instalando\n"
 
 #, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "decrementando la versión del paquete %s (%s => %s)\n"
+
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "se han detectado paquetes con conflictos no resueltos\n"
 
@@ -567,3 +566,6 @@ msgstr "no existe la cache %s, creando...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: forzando la actualización a la versión %s\n"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index 38129188..933682dd 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-16 22:50+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-23 22:51+0200\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
 "MIME-Version: 1.0\n"
@@ -409,14 +409,6 @@ msgid "unexpected error"
 msgstr "erreur non prévue"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: force la mise à jour à la version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "trouver %s dans la base de données a échoué -- ignoré\n"
 
@@ -437,6 +429,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n"
 
@@ -453,6 +449,10 @@ msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s est à jour -- réinstalle\n"
 
 #, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "retourne à la version antérieure du paquet %s (%s => %s)\n"
+
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 
@@ -560,3 +560,6 @@ msgstr "le cache %s n'existe pas, création...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: force la mise à jour à la version %s\n"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index bff4c63b..69029d6f 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2007-03-14 13:45+0100\n"
 "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team:  <hu@li.org>\n"
@@ -406,14 +406,6 @@ msgid "unexpected error"
 msgstr "nemvárt hiba"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: erőltetett frissítés a %s verzióra\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n"
 
@@ -434,6 +426,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: csomagfrissítés kihagyása (a(z) %s-%s le fogja cserélni)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n"
 
@@ -450,6 +446,10 @@ msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "a(z) %s-%s naprakész -- újratelepítés\n"
 
 #, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "visszatérés egy régebbi %s verzióhoz (%s => %s)\n"
+
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "feloldhatatlan csomagütközéseket találtam\n"
 
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 99158e99..ed4dd3b9 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
-"PO-Revision-Date: 2008-07-19 17:26+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
+"PO-Revision-Date: 2008-08-23 19:30+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
 "MIME-Version: 1.0\n"
@@ -353,7 +353,7 @@ msgstr "nessun repository corrispondente"
 
 #, c-format
 msgid "invalid or corrupted delta"
-msgstr "pacchetto non valido o corrotto"
+msgstr "delta non valido o corrotto"
 
 #, c-format
 msgid "delta patch failed"
@@ -397,7 +397,7 @@ msgstr "errore di libarchive"
 
 #, c-format
 msgid "download library error"
-msgstr "errore nel scaricare la libreria"
+msgstr "si è verificato un errore della libreria durante il download"
 
 #, c-format
 msgid "error invoking external downloader"
@@ -408,15 +408,6 @@ msgid "unexpected error"
 msgstr "errore inaspettato"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: aggiornamento forzato alla versione %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "impossibile trovare %s nel database, sarà ignorato\n"
 
@@ -439,6 +430,11 @@ msgstr ""
 "s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
+"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n"
 
@@ -455,12 +451,18 @@ msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s è aggiornato, sarà reinstallato\n"
 
 #, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr ""
+"installazione in corso di una versione meno recente del pacchetto %s (%s => %"
+"s)\n"
+
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "sono stati rilevati dei conflitti irrisolvibili\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "rimuovo '%s' dalla lista perché va in conflitto con '%s'\n"
+msgstr "rimozione di '%s' dalla lista perché va in conflitto con '%s'\n"
 
 #, c-format
 msgid "command: %s\n"
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 8a9882ea..f2360710 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -403,14 +403,6 @@ msgid "unexpected error"
 msgstr ""
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr ""
 
@@ -431,6 +423,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr ""
 
@@ -447,6 +443,10 @@ msgid "%s-%s is up to date -- reinstalling\n"
 msgstr ""
 
 #, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr ""
+
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr ""
 
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index e810b208..6cd0460c 100644
--- a/lib/libalpm/po/pl.po
+++ b/lib/libalpm/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-19 20:58+0200\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -413,14 +413,6 @@ msgid "unexpected error"
 msgstr "niespodziewany błąd"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: wymuszanie aktualizacji do wersji %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) jest nowsze niż %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n"
 
@@ -442,6 +434,10 @@ msgstr ""
 "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) jest nowsze niż %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n"
 
@@ -458,6 +454,10 @@ msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n"
 
 #, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "dezaktualizowanie pakietu %s (%s => %s)\n"
+
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "odkryto nierozwiązywalne konflikty pakietów\n"
 
@@ -565,3 +565,6 @@ msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: wymuszanie aktualizacji do wersji %s\n"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 9f81dc98..26b7a8c6 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-20 15:00-0300\n"
 "Last-Translator: Hugo Doria <hugo@archlinux.org>\n"
 "Language-Team: Português do Brasil <www.archlinux-br.org>\n"
@@ -417,14 +417,6 @@ msgid "unexpected error"
 msgstr "erro inesperado"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forçando upgrade para a versão %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) é mais novo que %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "não foi possível encontrar %s na base de dados - pulando\n"
 
@@ -445,6 +437,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignorando atualização do pacote (a ser substituido por %s-%s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) é mais novo que %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorando atualização do pacote (%s => %s)\n"
 
@@ -460,6 +456,10 @@ msgstr "%s-%s está atualizado -- pulando\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s está atualizado -- reinstalando\n"
 
+#, fuzzy, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s: ignorando atualização do pacote (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "conflito de pacotes não solucionável detectado\n"
@@ -567,3 +567,6 @@ msgstr "cache %s não existe, criando...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "não foi possível criar cache de pacotes, usando /tmp\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: forçando upgrade para a versão %s\n"
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index 0dd6fc36..ec65a889 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-19 19:52+0300\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -408,14 +408,6 @@ msgid "unexpected error"
 msgstr "непредвиденная ошибка"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: принудительно обновляю до версии %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "не могу найти %s в базе данных --  пропускаю\n"
 
@@ -436,6 +428,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: игнорирую обновление пакета (он будет заменен на %s-%s)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: игнорирую обновление пакета (%s => %s)\n"
 
@@ -451,6 +447,10 @@ msgstr "%s-%s не устарел --  пропускаю\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s не устарел --  переустанавливаю\n"
 
+#, fuzzy, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s: игнорирую обновление пакета (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "обнаружен неразрешимый конфликт пакетов\n"
@@ -558,3 +558,6 @@ msgstr "кэш %s не существует, создаю...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "не могу создать кэш пакетов, будет использован /tmp\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: принудительно обновляю до версии %s\n"
diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po
index 302c41c5..90324bed 100644
--- a/lib/libalpm/po/tr.po
+++ b/lib/libalpm/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.1.4-1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-17 23:14+0200\n"
 "Last-Translator: Samed BEYRİBEY <ras0ir@eventualis.org>\n"
 "Language-Team: Turkish Arch Linux Users <tr@archlinuxtr.org>\n"
@@ -404,14 +404,6 @@ msgid "unexpected error"
 msgstr "beklenmedik hata"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: %s sürümüne güncelleniyor\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: yereldeki paket (%s) %s (%s) paketinden daha güncel\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "%s veritabanında bulunamadı -- atlanıyor\n"
 
@@ -433,6 +425,10 @@ msgstr ""
 "%s-%s: paket güncellemesi göz ardı ediliyor (%s-%s ile değiştirilecek)\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: yereldeki paket (%s) %s (%s) paketinden daha güncel\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: paket güncellemesi göz ardı ediliyor (%s => %s)\n"
 
@@ -448,6 +444,10 @@ msgstr "%s-%s güncel -- atlanıyor\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s güncel -- yeniden kuruluyor\n"
 
+#, fuzzy, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s: paket güncellemesi göz ardı ediliyor (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "çözülemeyen paket çakışmaları bulundu\n"
@@ -555,3 +555,6 @@ msgstr "%s tamponu bulunmuyor, oluşturuluyor...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "paket tamponu oluşturulamadı, /tmp kullanılacak\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s: %s sürümüne güncelleniyor\n"
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index 3b3af526..43642811 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-17 23:01+0200\n"
 "Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -406,14 +406,6 @@ msgid "unexpected error"
 msgstr "未预期的错误"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s：强制更新至版本 %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "无法在数据库中找到 %s -- 跳过\n"
 
@@ -434,6 +426,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s：忽略软件包更新（%s => %s）\n"
 
@@ -449,6 +445,10 @@ msgstr "%s-%s 已经为最新 -- 跳过\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s 已经为最新 -- 重新安装\n"
 
+#, fuzzy, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s：忽略软件包更新（%s => %s）\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "探测到无法解决的软件包冲突\n"
@@ -556,3 +556,6 @@ msgstr "没有 %s 缓存存在，正在创建...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s：强制更新至版本 %s\n"