Merge branch 'maint'

Message updates made this one a bit messy, but nothing too bad.

Conflicts:
	lib/libalpm/add.c
	lib/libalpm/remove.c

19 files changed, 284 insertions, 147 deletions

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 268ecd7d..70f8317b 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -92,7 +92,7 @@ int SYMEXPORT alpm_add_target(char *target)
 				i->data = pkg;
 			} else {
 				_alpm_log(PM_LOG_WARNING,
-						_("skipping %s-%s because newer version %s is in the target list\n"),
+						_("skipping %s-%s because newer version %s is in target list\n"),
 						pkgname, pkgver, transpkg->version);
 				_alpm_pkg_free(pkg);
 			}
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index 03a14637..d698e018 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -125,7 +125,7 @@ static int checkdbdir(pmdb_t *db)
 			RET_ERR(PM_ERR_SYSTEM, -1);
 		}
 	} else if(!S_ISDIR(buf.st_mode)) {
-		_alpm_log(PM_LOG_WARNING, "removing bogus database: %s\n", path);
+		_alpm_log(PM_LOG_WARNING, _("removing invalid database: %s\n"), path);
 		if(unlink(path) != 0 || _alpm_makepath(path) != 0) {
 			RET_ERR(PM_ERR_SYSTEM, -1);
 		}
diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po
index 7a081707..2141372f 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: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
 "PO-Revision-Date: 2009-07-29 14:14+0200\n"
 "Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "v seznamu cílů nahrazena starší verze %s-%s za %s\n"
 
-#, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+#, fuzzy, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "vynechává se %s-%s, protože v seznamu cílů je novější veze %s\n"
 
-#, c-format
-msgid "conflicting packages were found in the target list\n"
+#, fuzzy, c-format
+msgid "conflicting packages were found in target list\n"
 msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
 
 #, c-format
@@ -101,6 +101,10 @@ msgstr "nelze aktualizovat záznam databáze %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "nelze přidat položku '%s' do cache\n"
 
+#, fuzzy, c-format
+msgid "removing invalid database: %s\n"
+msgstr "nelze odstranit záznam v databázi %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "nelze odstranit záznam v databázi %s\n"
@@ -393,6 +397,10 @@ msgstr "neočekávaná chyba"
 msgid "could not find %s in database -- skipping\n"
 msgstr "nelze nalézt %s v databázi -- vynechat\n"
 
+#, fuzzy, c-format
+msgid "removing %s from target list\n"
+msgstr "'%s' odstraněn ze seznamu cílů, protože je konfliktní s '%s'\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nelze odstranit soubor '%s': %s\n"
@@ -521,8 +529,8 @@ msgstr "nelze změnit kořenový adresář (%s)\n"
 msgid "could not change directory to / (%s)\n"
 msgstr "nelze změnit adresář na / (%s)\n"
 
-#, c-format
-msgid "call to popen failed (%s)"
+#, fuzzy, c-format
+msgid "call to popen failed (%s)\n"
 msgstr "volání popen selhalo (%s)"
 
 #, c-format
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 0a339164..4a08eaac 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-29 16:09+0100\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-17 16:47+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +26,13 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "Überspringe %s-%s, da die Ziel-Liste die neuere Version %s enthält\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"Überspringe %s-%s, da sich die neuere Version %s in der Ziel-Liste befindet\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n"
+msgid "conflicting packages were found in target list\n"
+msgstr "In Konflikt stehende Pakete wurden in der Ziel-Liste gefunden\n"
 
 #, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
@@ -108,6 +109,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "Entferne die ungültige Datenbank: %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr "Konnte Datenbank %s nicht entfernen\n"
 
@@ -405,6 +410,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "Entferne '%s' aus der Ziel-Liste\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "Kann Datei '%s' nicht entfernen: %s\n"
 
@@ -533,8 +542,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "Aufruf von 'popen' fehlgeschlagen (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "Aufruf von 'popen' fehlgeschlagen (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index 8e1c56fd..2237eb37 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-30 18:37+1000\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-16 19:39-0600\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +21,12 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "replacing older version %s-%s by %s in target list\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "skipping %s-%s because newer version %s is in target list\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
+msgstr "conflicting packages were found in target list\n"
 
 #, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
@@ -101,6 +101,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "could not add entry '%s' in cache\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "removing invalid database: %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr "could not remove database %s\n"
 
@@ -393,6 +397,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "removing %s from target list\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "cannot remove file '%s': %s\n"
 
@@ -521,8 +529,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "could not change directory to / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "call to popen failed (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "call to popen failed (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index 54eb6040..84e6c2ee 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -4,10 +4,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-29 11:51+0200\n"
-"Last-Translator: Juan Pablo González Tognarelli <juan.gonzalez."
-"tognarelli@gmail.com>\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-17 11:13-0400\n"
+"Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n"
 "Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,7 +14,7 @@ msgstr ""
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: CHILE\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -23,13 +22,17 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 "reemplazando la versión antigua  %s-%s por %s en la lista de objetivos\n"
 
+# , c-format
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "saltando %s-%s debido a que una nueva versión de %s esta en la lista\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"saltando %s-%s debido a la nueva versión de %s esta en la lista de "
+"objetivos\n"
 
+# , c-format
 #, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "paquetes con conflictos fueron encontrados en la lista\n"
+msgid "conflicting packages were found in target list\n"
+msgstr "se encontraron paquetes con conflictos en la lista de objetivos\n"
 
 #, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
@@ -105,6 +108,11 @@ msgstr "no se pudo actualizar en la base de datos la entrada %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "no se pudo agregar '%s' en la cache\n"
 
+# , c-format
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "quitando la base de datos inválida: %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "no se pudo quitar la base de datos %s\n"
@@ -247,7 +255,7 @@ msgstr "no se pudo leer el directorio"
 
 #, c-format
 msgid "wrong or NULL argument passed"
-msgstr "argumento erroneo o NULO"
+msgstr "se pasó un argumento erróneo o NULO"
 
 #, c-format
 msgid "library not initialized"
@@ -360,7 +368,7 @@ msgstr "invalido o diferencial corrupto"
 
 #, c-format
 msgid "delta patch failed"
-msgstr "parche delta fallado"
+msgstr "parche diferencial fallado"
 
 #, c-format
 msgid "could not satisfy dependencies"
@@ -402,6 +410,11 @@ msgstr "error inesperado"
 msgid "could not find %s in database -- skipping\n"
 msgstr "no se pudo encontrar %s en la base de datos -- saltando\n"
 
+# , c-format
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "quitando %s de la lista de objetivos\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "no se pudo quitar el archivo '%s': %s\n"
@@ -532,9 +545,10 @@ msgstr "no se pudo cambiar el directorio raíz (%s)\n"
 msgid "could not change directory to / (%s)\n"
 msgstr "no se pudo cambiar el directorio a / (%s)\n"
 
+# , c-format
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "llamada a popen fallida (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "falló la llamada a popen (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index 810e1aaf..abb24840 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: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-28 14:01+0200\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-17 02:17+0200\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,13 @@ msgstr ""
 "remplacement de l'ancienne version %s-%s par %s dans la liste des cibles\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "ignore le paquet %s-%s car une version plus récente %s est dans la liste des "
 "cibles\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr "des paquets en conflit ont été trouvés dans la liste des cibles\n"
 
 #, c-format
@@ -105,6 +105,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "l'ajout au cache de l'entrée '%s' a échoué\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "suppression d'une base de données invalide: %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr "la suppression de la base de données %s a échoué\n"
 
@@ -399,6 +403,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "trouver %s dans la base de données a échoué -- ignoré\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "supprime %s de la liste de cible\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "suppression du fichier '%s' impossible: %s\n"
 
@@ -527,8 +535,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "changer de répertoire vers / a échoué (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "l'appel de popen a échoué (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "l'appel de popen a échoué (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index be6e52be..4accf287 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: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\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"
@@ -22,11 +22,11 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a célok listájában\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "%s-%s kihagyása, mert újabb verzió (%s) van a célok között\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr "ütköző csomagokat találtam a célok között\n"
 
 #, c-format
@@ -102,8 +102,12 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "hibás adatbázis eltávolítása: %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
-msgstr "sikertelen a %s adatbázis-bejegyzés eltávolítása\n"
+msgstr "sikertelen a(z) %s adatbázis eltávolítása\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
@@ -394,6 +398,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "%s eltávolítása a cél listából\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nem sikerült eltávolítani a '%s' fájlt : %s\n"
 
@@ -522,8 +530,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "nem sikerült a könyvtárat a /-re váltani (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "popen hívás sikertelen (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "popen hívás sikertelen (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 6816a280..391bca61 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
 "PO-Revision-Date: 2009-07-28 15:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -23,26 +23,29 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
-"ignoro %s-%s perché la nuova versione %s è già presente nella lista dei "
+"ignoro %s-%s perché la nuova versione %s è presente nella lista dei "
 "pacchetti\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "sono stati individuati dei pacchetti che vanno in conflitto\n"
+msgid "conflicting packages were found in target list\n"
+msgstr ""
+"ci sono dei pacchetti in conflitto all'interno della lista dei pacchetti\n"
 
 #, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "impossibile installare due pacchetti che vanno in conflitto\n"
+msgstr ""
+"non puoi installare contemporaneamente due pacchetti che vanno in conflitto\n"
 
 #, c-format
 msgid "replacing packages with -U is not supported yet\n"
-msgstr "la sostituzione dei pacchetti con -U non è ancora supportata\n"
+msgstr ""
+"la sostituzione dei pacchetti con l'opzione -U non è ancora supportata\n"
 
 #, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "puoi sostituire manualmente i pacchetti, usando le opzioni -Rd e -U\n"
+msgstr "puoi sostituire i pacchetti manualmente, usando le opzioni -Rd e -U\n"
 
 #, c-format
 msgid ""
@@ -105,6 +108,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "impossible includere la voce '%s' nella cache\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "rimozione del database: %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr "impossibile rimuovere il database %s\n"
 
@@ -193,7 +200,7 @@ msgstr "l'url '%s' non è esatto\n"
 
 #, c-format
 msgid "url scheme not specified, assuming HTTP\n"
-msgstr "non è stato specificato il protocollo dell'url, sarà usato HTTP\n"
+msgstr "il protocollo dell'url non è stato specificato, sarà usato HTTP\n"
 
 #, c-format
 msgid "disk"
@@ -400,6 +407,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "impossibile trovare %s nel database, sarà ignorato\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "rimozione di %s dalla lista dei pacchetti\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "impossibile rimuovere il file '%s': %s\n"
 
@@ -469,11 +480,11 @@ msgstr "impossibile scaricare alcuni file da %s\n"
 
 #, c-format
 msgid "could not create removal transaction\n"
-msgstr "impossibile avviare l'operazione di rimozione\n"
+msgstr "impossibile eseguire l'operazione di rimozione\n"
 
 #, c-format
 msgid "could not create transaction\n"
-msgstr "impossibile avviare l'operazione\n"
+msgstr "impossibile eseguire l'operazione\n"
 
 #, c-format
 msgid "could not initialize the removal transaction\n"
@@ -532,8 +543,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "impossibile spostarsi nella directory / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "chiamata a popen non riuscita (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "chiamata a popen non riuscita (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po
index 1114510e..335d297a 100644
--- a/lib/libalpm/po/kk.po
+++ b/lib/libalpm/po/kk.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: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-28 19:05+0600\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-17 13:00+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh\n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,12 @@ msgstr ""
 "мақсаттар тізімінде ескірген %s-%s нұсқасы жаңа %s нұсқасымен алмастырылады\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
-"%s-%s өткізіледі, өйткені оның жаңа %s нұсқасы мақсаттар тізімінде бар болып "
-"тұр\n"
+"%s-%s өткізіледі, өйткені жаңа %s нұсқасы мақсаттар тізімінде бар болып тұр\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n"
 
 #, c-format
@@ -104,6 +103,10 @@ 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 "could not remove database %s\n"
 msgstr "%s дерекқорын өшіру мүмкін емес\n"
 
@@ -396,6 +399,10 @@ 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"
 
@@ -525,8 +532,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "/ бумасына ауысу мүмкін емес (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "popen шақыру қатемен аяқталды (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "popen шақыру сәтсіз аяқталды (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 34106630..fed05bb6 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: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\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"
@@ -21,11 +21,11 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr ""
 
 #, c-format
@@ -99,6 +99,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr ""
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr ""
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr ""
 
@@ -391,6 +395,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr ""
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr ""
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr ""
 
@@ -519,7 +527,7 @@ msgid "could not change directory to / (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "call to popen failed (%s)"
+msgid "call to popen failed (%s)\n"
 msgstr ""
 
 #, c-format
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index bf212f63..7163afc6 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: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
 "PO-Revision-Date: 2009-07-29 10:39+0100\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -23,12 +23,12 @@ msgstr ""
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów\n"
 
-#, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+#, fuzzy, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "pomijam %s-%s ponieważ na liście celów znajduje się nowsza wersja %s\n"
 
-#, c-format
-msgid "conflicting packages were found in the target list\n"
+#, fuzzy, c-format
+msgid "conflicting packages were found in target list\n"
 msgstr ""
 "konfliktujące pakiety znalazły się na liście pakietów do zainstalowania\n"
 
@@ -107,6 +107,10 @@ msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym\n"
 
+#, fuzzy, c-format
+msgid "removing invalid database: %s\n"
+msgstr "nie można usunąć bazy danych %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "nie można usunąć bazy danych %s\n"
@@ -400,6 +404,10 @@ msgstr "niespodziewany błąd"
 msgid "could not find %s in database -- skipping\n"
 msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n"
 
+#, fuzzy, c-format
+msgid "removing %s from target list\n"
+msgstr "usuwanie '%s' z listy celów ponieważ konfliktuje z '%s'\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nie udało się usunąć pliku '%s': %s\n"
@@ -528,8 +536,8 @@ msgstr "nie udało się zmienić katalogu głównego (%s)\n"
 msgid "could not change directory to / (%s)\n"
 msgstr "nie udało się zmienić katalogu na / (%s)\n"
 
-#, c-format
-msgid "call to popen failed (%s)"
+#, fuzzy, c-format
+msgid "call to popen failed (%s)\n"
 msgstr "zawołanie do popen nieudane (%s)"
 
 #, c-format
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index bc29efb8..5dc6576d 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: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
 "PO-Revision-Date: 2009-07-28 23:17-0300\n"
 "Last-Translator: Armando M. Baratti <ambaratti.listas@gmail.com.br>\n"
 "Language-Team: Português do Brasil <www.archlinux-br.org>\n"
@@ -27,14 +27,14 @@ msgstr ""
 "substituindo a versão antiga %s-%s por %s na lista de pacotes a serem "
 "atualizados\n"
 
-#, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+#, fuzzy, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "ignorando %s-%s porque uma nova versão %s está na lista de pacotes a serem "
 "atualizados\n"
 
-#, c-format
-msgid "conflicting packages were found in the target list\n"
+#, fuzzy, c-format
+msgid "conflicting packages were found in target list\n"
 msgstr ""
 "pacotes conflitantes foram encontrados na lista de pacotes a serem "
 "atualizados\n"
@@ -111,6 +111,10 @@ msgstr "não foi possível atualizar a entrada na base de dados %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "não foi possível adicionar a entrada '%s' ao cache\n"
 
+#, fuzzy, c-format
+msgid "removing invalid database: %s\n"
+msgstr "não foi possível remover a base de dados %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "não foi possível remover a base de dados %s\n"
@@ -404,6 +408,10 @@ msgstr "erro inesperado"
 msgid "could not find %s in database -- skipping\n"
 msgstr "não foi possível encontrar %s na base de dados - pulando\n"
 
+#, fuzzy, c-format
+msgid "removing %s from target list\n"
+msgstr "removendo '%s' da lista de pacotes porque ele conflita com '%s'\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "não foi possível remover o arquivo '%s': %s\n"
@@ -532,8 +540,8 @@ msgstr "não foi possível mudar o diretório raiz (%s)\n"
 msgid "could not change directory to / (%s)\n"
 msgstr "não foi possível mudar o diretório para / (%s)\n"
 
-#, c-format
-msgid "call to popen failed (%s)"
+#, fuzzy, c-format
+msgid "call to popen failed (%s)\n"
 msgstr "chamada para popen falhou (%s)"
 
 #, c-format
diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po
index 367ff47b..3ffcd22a 100644
--- a/lib/libalpm/po/ro.po
+++ b/lib/libalpm/po/ro.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: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
 "PO-Revision-Date: 2009-06-28 14:30+0700\n"
 "Last-Translator: volodia macovei <blog@volodia.ro>\n"
 "Language-Team: Romanian SbLUG for Arch <blog@volodia.ro>\n"
@@ -21,12 +21,12 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "se înlocuieşte versiunea veche %s-%s cu %s în lista ţintă\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "se trece peste %s-%s deoarece o versiune mai nouă %s există în lista ţintă\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr "s-au găsit pachete în conflict în lista ţintă\n"
 
 #, c-format
@@ -102,6 +102,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "nu se poate adăuga intrarea '%s' în cache\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "se elimină baza de date nevalidă %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr "nu poate fi eliminată baza de date %s\n"
 
@@ -397,6 +401,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "nu poate fi găsit %s în baza de date -- se trece peste\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "se elimină '%s' din lista ţintă\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nu poate fi eliminat fişierul '%s': %s\n"
 
@@ -525,8 +533,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "nu poate fi schimbat directorul la / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "cererea către popen a eşuat (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "cererea către popen a eşuat (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index 5d1b1e5e..8fb51cf3 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.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: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-29 20:29+0300\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-17 10:57+0300\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "заменяется устаревшая версия %s-%s на %s в списке целей\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "пропускается %s-%s, поскольку новая версия %s в списке целей\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr "в списке целей найдены конфликтующие пакеты\n"
 
 #, c-format
@@ -104,6 +104,10 @@ 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 "could not remove database %s\n"
 msgstr "не удалось удалить базу данных %s\n"
 
@@ -398,6 +402,10 @@ 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"
 
@@ -526,8 +534,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "не удалось изменить каталог на / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "вызов popen не удался (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "вызов popen не удался (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
@@ -588,4 +596,4 @@ msgstr "не удалось создать кэш пакетов, будет и�
 #~ msgstr "не удалось подготовить запрос\n"
 
 #~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-#~ msgstr "Нету /bin/sh в родительском окружении, отмена скрипта\n"
+#~ msgstr "Нет /bin/sh в родительском окружении, отмена скрипта\n"
diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po
index 78fb6102..02ee1c86 100644
--- a/lib/libalpm/po/tr.po
+++ b/lib/libalpm/po/tr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.1.4-1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-29 03:26+0200\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-17 11:16+0200\n"
 "Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n"
 "Language-Team: Turkish Arch Linux Users <tr@archlinuxtr.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "eski sürüm %s-%s hedef listesindeki %s ile değiştiriliyor\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "%s-%s yeni sürüm %s hedef listesinde olduğundan atlanıyor\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "%s-%s yeni sürümü %s hedef listesinde olduğundan atlanıyor\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr "hedef listesinde çakışan paketler bulundu\n"
 
 #, c-format
@@ -100,6 +100,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "'%s' kaydı tampona eklenemedi\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "geçersiz veritabanı siliniyor: %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr "veritabanı kaldırılamıyor %s\n"
 
@@ -392,6 +396,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "%s veritabanında bulunamadı -- atlanıyor\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "%s hedef listesinden kaldırılıyor\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "'%s' dosyası silinemiyor: %s\n"
 
@@ -521,8 +529,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "/ dizinine geçilemedi (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "popen çağrısı başarısız (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "popen çağrısı başarısız (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po
index c3f4e4d5..8d8fc20e 100644
--- a/lib/libalpm/po/uk.po
+++ b/lib/libalpm/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm 3.2.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Roman Kyrylych <roman@archlinux.org>\n"
 "Language-Team: http://archlinux.org.ua\n"
@@ -22,12 +22,12 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "старіша версія %s-%s замінюється на %s в цільовому списку пакунків\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "%s-%s пропускається, бо в списку цільових пакунків є новіша версія %s\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr "в списку цільових пакунків були знайдені конфліктуючі пакунки\n"
 
 #, c-format
@@ -88,7 +88,7 @@ msgstr "неможливо отримати поточний робочий ка
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "з'явилась проблема при поновленні %s\n"
+msgstr "з'явилась проблема при оновленні %s\n"
 
 #, c-format
 msgid "problem occurred while installing %s\n"
@@ -96,15 +96,19 @@ msgstr "з'явилась проблема при встановленні %s\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "неможливо поновити запис бази даних %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 "could not remove database %s\n"
-msgstr "неможливо видалити базу даних %s\n"
+msgstr "неможливо вилучити базу даних %s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
@@ -164,7 +168,7 @@ msgstr "виявлено цикл залежностей:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "%s буде видалено після його залежності %s\n"
+msgstr "%s буде вилучено після його залежності %s\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
@@ -276,11 +280,11 @@ msgstr "неможливо знайти базу даних"
 
 #, c-format
 msgid "could not update database"
-msgstr "неможливо поновити базу даних"
+msgstr "неможливо оновити базу даних"
 
 #, c-format
 msgid "could not remove database entry"
-msgstr "неможливо видалити запис з бази даних"
+msgstr "неможливо вилучити запис з бази даних"
 
 #, c-format
 msgid "invalid url for server"
@@ -336,7 +340,7 @@ msgstr "неможливо відкрити файл пакунку"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "неможливо видалити всі файли для пакунку"
+msgstr "неможливо вилучити всі файли для пакунку"
 
 #, c-format
 msgid "package filename is not valid"
@@ -395,20 +399,24 @@ 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"
+msgstr "неможливо вилучити файл '%s': %s\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "неможливо видалити запис бази даних %s-%s\n"
+msgstr "неможливо вилучити запис бази даних %s-%s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "неможливо видалити запис '%s' з кешу\n"
+msgstr "неможливо вилучити запис '%s' з кешу\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: ігнорування поновлення пакунку (%s => %s)\n"
+msgstr "%s: ігнорування оновлення пакунку (%s => %s)\n"
 
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
@@ -436,11 +444,11 @@ msgstr "репозиторій '%s' не знайдено\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s не потребує поновлення -- пропускається\n"
+msgstr "%s-%s не потребує оновлення -- пропущено\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s не потребує поновлення -- перевстановлюється\n"
+msgstr "%s-%s не потребує оновлення -- перевстановлюється\n"
 
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
@@ -452,7 +460,7 @@ msgstr "виявлені нерозв'язні конфлікти пакункі
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "видалення '%s' з списку пакунків, бо він конфліктує з '%s'\n"
+msgstr "вилучення '%s' з списку пакунків, бо він конфліктує з '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -460,7 +468,7 @@ msgstr "не вдалося отримати деякі файли з %s\n"
 
 #, c-format
 msgid "could not create removal transaction\n"
-msgstr "неможливо створити транзакцію видалення\n"
+msgstr "неможливо створити транзакцію вилучення\n"
 
 #, c-format
 msgid "could not create transaction\n"
@@ -468,7 +476,7 @@ msgstr "неможливо створити транзакцію\n"
 
 #, c-format
 msgid "could not initialize the removal transaction\n"
-msgstr "неможливо почати транзакцію видалення\n"
+msgstr "неможливо почати транзакцію вилучення\n"
 
 #, c-format
 msgid "could not initialize transaction\n"
@@ -476,11 +484,11 @@ msgstr "неможливо почати транзакцію\n"
 
 #, c-format
 msgid "could not prepare removal transaction\n"
-msgstr "неможливо підготувати транзакцію видалення\n"
+msgstr "неможливо підготувати транзакцію вилучення\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "неможливо здійснити транзакцію видалення\n"
+msgstr "неможливо здійснити транзакцію вилучення\n"
 
 #, c-format
 msgid "could not commit transaction\n"
@@ -488,7 +496,7 @@ msgstr "неможливо здійснити транзакцію\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr "неможливо видалити файл блокування %s\n"
+msgstr "неможливо вилучити файл блокування %s\n"
 
 #, c-format
 msgid "could not create temp directory\n"
@@ -500,7 +508,7 @@ msgstr "неможливо скопіювати тимчасовий файл д
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "неможливо видалити тимчасовий каталог %s\n"
+msgstr "неможливо вилучити тимчасовий каталог %s\n"
 
 #, c-format
 msgid "could not open %s: %s\n"
@@ -523,8 +531,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "неможливо змінити каталог на / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "виклик popen невдалий (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "виклик popen невдалий (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index c12dd961..f22fdb74 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.2.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
 "PO-Revision-Date: 2009-07-30 20:39+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "正在用目标清单中的 %3$s 替换老版本 %1$s-%2$s\n"
 
-#, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+#, fuzzy, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "跳过 %1$s-%2$s，因为较新版本的 %3$s 在目标清单中\n"
 
-#, c-format
-msgid "conflicting packages were found in the target list\n"
+#, fuzzy, c-format
+msgid "conflicting packages were found in target list\n"
 msgstr "目标清单中发现有冲突的软件包\n"
 
 #, c-format
@@ -101,6 +101,10 @@ msgstr "无法更新数据库记录 %1$s-%2$s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "无法在缓存中添加记录 '%s' \n"
 
+#, fuzzy, c-format
+msgid "removing invalid database: %s\n"
+msgstr "无法删除数据库 %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "无法删除数据库 %s\n"
@@ -393,6 +397,10 @@ msgstr "未预期的错误"
 msgid "could not find %s in database -- skipping\n"
 msgstr "无法在数据库中找到 %s -- 跳过\n"
 
+#, fuzzy, c-format
+msgid "removing %s from target list\n"
+msgstr "正在从目标清单中删除 '%1$s' ，因为它和 '%2$s' 冲突\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "无法删除文件 '%1$s': %2$s\n"
@@ -521,8 +529,8 @@ msgstr "无法更改根目录 (%s)\n"
 msgid "could not change directory to / (%s)\n"
 msgstr "无法切换目录到 / (%s)\n"
 
-#, c-format
-msgid "call to popen failed (%s)"
+#, fuzzy, c-format
+msgid "call to popen failed (%s)\n"
 msgstr "调用 popen 失败 (%s)"
 
 #, c-format
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index af2ce943..7bafaf1c 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -71,7 +71,7 @@ int SYMEXPORT alpm_remove_target(char *target)
 	}
 
 	if((info = _alpm_db_get_pkgfromcache(db_local, target)) != NULL) {
-		_alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name);
+		_alpm_log(PM_LOG_DEBUG, "adding %s in the target list\n", info->name);
 		trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info));
 		return(0);
 	}
@@ -83,7 +83,7 @@ int SYMEXPORT alpm_remove_target(char *target)
 	}
 	for(p = alpm_grp_get_pkgs(grp); p; p = alpm_list_next(p)) {
 		pmpkg_t *pkg = alpm_list_getdata(p);
-		_alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", pkg->name);
+		_alpm_log(PM_LOG_DEBUG, "adding %s in the target list\n", pkg->name);
 		trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(pkg));
 	}
 
@@ -102,7 +102,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
 			pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target);
 			if(info) {
 				if(!_alpm_pkg_find(trans->remove, alpm_pkg_get_name(info))) {
-					_alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n",
+					_alpm_log(PM_LOG_DEBUG, "pulling %s in target list\n",
 							alpm_pkg_get_name(info));
 					trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info));
 				}
@@ -122,7 +122,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
 {
 	ALPM_LOG_FUNC;
 
-	/* Remove needed packages (which break dependencies) from the target list */
+	/* Remove needed packages (which break dependencies) from target list */
 	while(lp != NULL) {
 		alpm_list_t *i;
 		for(i = lp; i; i = i->next) {
@@ -136,7 +136,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
 					&vpkg);
 			pkg = vpkg;
 			if(pkg) {
-				_alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n",
+				_alpm_log(PM_LOG_WARNING, _("removing %s from target list\n"),
 						alpm_pkg_get_name(pkg));
 				_alpm_pkg_free(pkg);
 			}
@@ -172,7 +172,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 				remove_prepare_cascade(trans, db, lp);
 			} else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) {
 				/* Remove needed packages (which would break dependencies)
-				 * from the target list */
+				 * from target list */
 				remove_prepare_keep_needed(trans, db, lp);
 			} else {
 				if(data) {