8 files changed, 1355 insertions, 1125 deletions
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index a847af05..43d7a711 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -236,7 +236,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	snprintf(path, PATH_MAX, "%s/%s-%s", db->path, info->name, info->version);
 	if(stat(path, &buf)) {
 		/* directory doesn't exist or can't be opened */
-		_alpm_log(PM_LOG_ERROR, _("cannot find '%s-%s' in db '%s'"), info->name, info->version, db->treename);
+		_alpm_log(PM_LOG_DEBUG, _("cannot find '%s-%s' in db '%s'"), info->name, info->version, db->treename);
 		return(-1);
 	}
 
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 6e8e45e3..5ca8258e 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -119,8 +119,8 @@ int _alpm_handle_free(pmhandle_t *handle)
 	return(0);
 }
 
-alpm_cb_log alpm_option_get_logcb() { return handle->logcb; }
-alpm_cb_download alpm_option_get_dlcb() { return handle->dlcb; }
+alpm_cb_log alpm_option_get_logcb() { return (handle ? handle->logcb : NULL); }
+alpm_cb_download alpm_option_get_dlcb() { return (handle ? handle->dlcb : NULL); }
 unsigned short alpm_option_get_logmask() { return handle->logmask; }
 const char SYMEXPORT *alpm_option_get_root() { return handle->root; }
 const char SYMEXPORT *alpm_option_get_dbpath() { return handle->dbpath; }
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index de6ca556..7c03fbdb 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-03 09:17+0100\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
 "PO-Revision-Date: 2007-03-03 09:35+0100\n"
 "Last-Translator: Pierre Schmitz <pierre@archlinux.de>\n"
 "Language-Team: Deutsch <archlinux.de>\n"
@@ -85,8 +85,8 @@ msgid "removing old package first (%s-%s)"
 msgstr "Entferne zuerst altes Paket (%s-%s)"
 
 #: lib/libalpm/add.c:405
-#, c-format
-msgid "adding %s to the NoUpgrade array temporarilly"
+#, fuzzy, c-format
+msgid "adding %s to the NoUpgrade array temporarily"
 msgstr "Füge %s temporär zum NoUpgrade-Array hinzu"
 
 #: lib/libalpm/add.c:423
@@ -178,7 +178,8 @@ msgstr "Aktion: Lasse existierende Datei an ihrem Platz"
 
 #: lib/libalpm/add.c:657
 msgid "action: keeping current file and installing new one with .pacnew ending"
-msgstr "Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew"
+msgstr ""
+"Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew"
 
 #: lib/libalpm/add.c:660
 #, c-format
@@ -249,18 +250,16 @@ msgid "provision '%s' has been removed from package %s (%s => %s)"
 msgstr "'%s' wird nicht mehr von %s bereitgestellt (%s => %s)"
 
 #: lib/libalpm/add.c:775
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "updating '%s' due to provision change (%s)"
 msgstr "aktualisiere '%s' aufgrund einer Bereitstellungsänderung (%s)"
 
 #: lib/libalpm/add.c:779 lib/libalpm/add.c:780
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "could not update provision '%s' from '%s'"
 msgstr "konnte Bereitstellung '%s' von '%s' nicht aktualisieren"
 
-#: lib/libalpm/add.c:793 lib/libalpm/remove.c:330
+#: lib/libalpm/add.c:793 lib/libalpm/remove.c:337
 msgid "updating database"
 msgstr "Aktualisiere Datenbank"
 
@@ -279,7 +278,7 @@ msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren"
 msgid "could not add entry '%s' in cache"
 msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen"
 
-#: lib/libalpm/add.c:838 lib/libalpm/remove.c:351 lib/libalpm/sync.c:1038
+#: lib/libalpm/add.c:838 lib/libalpm/remove.c:364 lib/libalpm/sync.c:1038
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "Führe \"ldconfig -r %s\" aus"
@@ -301,7 +300,8 @@ msgstr "Schließe Datenbank '%s'"
 
 #: lib/libalpm/alpm.c:229
 #, c-format
-msgid "adding new server to database '%s': protocol '%s', server '%s', path '%s'"
+msgid ""
+"adding new server to database '%s': protocol '%s', server '%s', path '%s'"
 msgstr ""
 "Füge neuen Server zur Datenbank '%s' hinzu: Protokoll '%s', Server '%s', "
 "Pfad '%s'"
@@ -507,8 +507,10 @@ msgstr "Überspringe ungültigen an _alpm_db_read übergebenen Paket-Eintrag"
 
 #: lib/libalpm/be_files.c:223
 #, c-format
-msgid "request to read database info for a file-based package '%s', skipping..."
-msgstr "Überspringe das Lesen der Datenbank für ein Datei-basiertes Paket '%s'..."
+msgid ""
+"request to read database info for a file-based package '%s', skipping..."
+msgstr ""
+"Überspringe das Lesen der Datenbank für ein Datei-basiertes Paket '%s'..."
 
 #: lib/libalpm/be_files.c:231
 #, c-format
@@ -599,8 +601,7 @@ msgid "   found conflict '%s' : package '%s' provides '%s'"
 msgstr "   Konflikt gefunden '%s' : Paket '%s' stellt '%s' bereit"
 
 #: lib/libalpm/conflict.c:100 lib/libalpm/conflict.c:142
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "package '%s' conflicts with itself - packaging error"
 msgstr "Paket '%s' steht im Konflikt mit sich selbst - Verpackungsfehler"
 
@@ -624,16 +625,16 @@ msgstr "checkconflicts: Datenbank gegen Ziel '%s'"
 msgid "target '%s' is also in target list, using NEW conflicts"
 msgstr "Ziel '%s' ist auch in der Ziel-Liste, benutze neue Konflikte"
 
-#: lib/libalpm/conflict.c:254
+#: lib/libalpm/conflict.c:256
 #, c-format
 msgid "\tCONFLICTS:: %s conflicts with %s"
 msgstr "\tCONFLICTS:: %s steht im Konflikt mit %s"
 
-#: lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57 lib/libalpm/deps.c:619
-#: lib/libalpm/deps.c:659 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
-#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:598
-#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:711 lib/libalpm/trans.c:52
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:616
+#: lib/libalpm/conflict.c:348 lib/libalpm/deps.c:57 lib/libalpm/deps.c:435
+#: lib/libalpm/deps.c:631 lib/libalpm/deps.c:671 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:80 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:598 lib/libalpm/sync.c:614 lib/libalpm/sync.c:711
+#: lib/libalpm/trans.c:52 lib/libalpm/util.c:609 lib/libalpm/util.c:616
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr "malloc Fehler: Konnte %d Bytes nicht allozieren"
@@ -662,7 +663,8 @@ msgstr "Registriere Datenbank '%s'"
 #: lib/libalpm/db.c:184
 #, c-format
 msgid "database directory '%s' does not exist -- try creating it"
-msgstr "Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen"
+msgstr ""
+"Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen"
 
 #: lib/libalpm/db.c:195
 #, c-format
@@ -677,11 +679,11 @@ msgstr "Sortieren von Abhängigkeiten gestartet"
 msgid "possible dependency cycle detected"
 msgstr "möglicher Abhängigkeitszyklus gefunden"
 
-#: lib/libalpm/deps.c:179
+#: lib/libalpm/deps.c:180
 msgid "sorting dependencies finished"
 msgstr "Sortieren von Abhängigkeiten beendet"
 
-#: lib/libalpm/deps.c:222 lib/libalpm/deps.c:303
+#: lib/libalpm/deps.c:222 lib/libalpm/deps.c:307
 msgid "null package found in package list"
 msgstr "ein leeres Paket wurde in der Paketliste gefunden"
 
@@ -690,83 +692,88 @@ msgstr "ein leeres Paket wurde in der Paketliste gefunden"
 msgid "cannot find package installed '%s'"
 msgstr "Konnte installiertes Paket '%s' nicht finden"
 
-#: lib/libalpm/deps.c:255
+#: lib/libalpm/deps.c:258
 #, c-format
 msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'"
 msgstr "checkdeps: Abhängigkeit'%s' wurde von '%s' nach '%s' verschoben"
 
-#: lib/libalpm/deps.c:274
+#: lib/libalpm/deps.c:277
 #, c-format
 msgid "checkdeps: dependency '%s' satisfied by installed package '%s'"
-msgstr "checkdeps: Abhängigkeit '%s' von installiertem Paket '%s' bereitgestellt"
+msgstr ""
+"checkdeps: Abhängigkeit '%s' von installiertem Paket '%s' bereitgestellt"
 
-#: lib/libalpm/deps.c:283
+#: lib/libalpm/deps.c:286
 #, c-format
 msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'"
-msgstr "checkdeps: aktualisiertes '%s' wird die Abhängigkeit von '%s' nicht zufriedenstellen"
+msgstr ""
+"checkdeps: aktualisiertes '%s' wird die Abhängigkeit von '%s' nicht "
+"zufriedenstellen"
 
-#: lib/libalpm/deps.c:348
+#: lib/libalpm/deps.c:356
 #, c-format
 msgid "missing dependency '%s' for package '%s'"
 msgstr "Abhängigkeit '%s' für Paket '%s' fehlt"
 
-#: lib/libalpm/deps.c:397
+#: lib/libalpm/deps.c:406
 #, c-format
 msgid "checkdeps: found %s as required by %s"
 msgstr "checkdeps: %s wird von %s benötigt"
 
-#: lib/libalpm/deps.c:471
+#: lib/libalpm/deps.c:482
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr "Schließe %s aus -- Ausdrücklich installiert"
 
-#: lib/libalpm/deps.c:518
+#: lib/libalpm/deps.c:529
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
-msgstr "Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!"
+msgstr ""
+"Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!"
 
-#: lib/libalpm/deps.c:526 lib/libalpm/deps.c:537
+#: lib/libalpm/deps.c:537 lib/libalpm/deps.c:548
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr "Füge '%s' zu der Ziel-Liste hinzu"
 
-#: lib/libalpm/deps.c:568
+#: lib/libalpm/deps.c:580
 msgid "started resolving dependencies"
 msgstr "Starte das Auflösen der Abhängigkeiten"
 
-#: lib/libalpm/deps.c:586
+#: lib/libalpm/deps.c:598
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr "%s stellt Abhängigkeit %s zur Verfügung -- Überspringe"
 
-#: lib/libalpm/deps.c:615
+#: lib/libalpm/deps.c:627
 #, c-format
-msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid ""
+"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
 msgstr ""
 "Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in "
 "Paketliste enthalten)"
 
-#: lib/libalpm/deps.c:632
+#: lib/libalpm/deps.c:644
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr "Abhängigkeit %s ist bereits in Ziel-Liste -- Überspringe"
 
-#: lib/libalpm/deps.c:652
+#: lib/libalpm/deps.c:664
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr "Ziehe Abhängigkeit %s (benötigt von %s)"
 
-#: lib/libalpm/deps.c:656
+#: lib/libalpm/deps.c:668
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr "Kann Abhängigkeiten für \"%s\" nicht auflösen"
 
-#: lib/libalpm/deps.c:672
+#: lib/libalpm/deps.c:684
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr "Abhängigkeitszyklus entdeckt: %s"
 
-#: lib/libalpm/deps.c:676
+#: lib/libalpm/deps.c:688
 msgid "finished resolving dependencies"
 msgstr "Auflösen von Abhängigkeiten beendet"
 
@@ -1052,12 +1059,12 @@ msgstr "Fehlende Paketdaten"
 msgid "missing package filelist in %s, generating one"
 msgstr "Fehlende Paketdateiliste in %s, erstelle eine"
 
-#: lib/libalpm/package.c:559
+#: lib/libalpm/package.c:560
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr "Füge '%s' zum requiredby Feld für '%s' hinzu"
 
-#: lib/libalpm/package.c:570
+#: lib/libalpm/package.c:571
 #, c-format
 msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
 msgstr "Füge '%s' zum requiredby Feld für '%s' hinzu (stellt bereit: %s)"
@@ -1136,32 +1143,32 @@ msgstr "Lösche %s"
 msgid "cannot remove file %s: %s"
 msgstr "Kann Datei %s nicht entfernen: %s"
 
-#: lib/libalpm/remove.c:287
+#: lib/libalpm/remove.c:291
 #, c-format
 msgid "removing package %s-%s"
 msgstr "Entferne Paket %s-%s"
 
-#: lib/libalpm/remove.c:304
+#: lib/libalpm/remove.c:308
 #, c-format
 msgid "not removing package '%s', can't remove all files"
 msgstr "Paket '%s' wird nicht entfernt, konnte nicht alle Dateien löschen"
 
-#: lib/libalpm/remove.c:311
+#: lib/libalpm/remove.c:315
 #, c-format
 msgid "removing %d files"
 msgstr "Entferne %d Dateien"
 
-#: lib/libalpm/remove.c:331
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "Entferne Datenbankeintrag '%s'"
 
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "Konnte Datenbankeintrag %s-%s nicht entfernen"
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:345
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "Konnte Eintrag '%s' nicht aus dem Cache entfernen"
@@ -1365,15 +1372,13 @@ msgid "could not update new database entry %s-%s"
 msgstr "Konnte neuen Datenbankeintrag %s-%s nicht aktualisieren"
 
 #: lib/libalpm/sync.c:1062
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "found package '%s-%s' in sync"
 msgstr "Paket '%s-%s' gefunden"
 
 #: lib/libalpm/sync.c:1068
-#, c-format
-#, fuzzy
-msgid "package '%s not found in sync"
+#, fuzzy, c-format
+msgid "package '%s' not found in sync"
 msgstr "Paket '%s' nicht gefunden"
 
 #: lib/libalpm/trans.c:264
@@ -1383,7 +1388,9 @@ msgstr "Aktualisiere 'requiredby' Felder abhängiger Pakete für %s-%s"
 
 #: lib/libalpm/trans.c:267
 msgid "package has no dependencies, no other packages to update"
-msgstr "Paket besitzt keine Abhängigkeiten, kein anderes Paket muß aktualisiert werden"
+msgstr ""
+"Paket besitzt keine Abhängigkeiten, kein anderes Paket muß aktualisiert "
+"werden"
 
 #: lib/libalpm/trans.c:304 lib/libalpm/trans.c:330
 #, c-format
@@ -1483,4 +1490,3 @@ msgstr "depcmp: %s-%s %s %s-%s => %s"
 #, c-format
 msgid "depcmp: %s-%s %s %s => %s"
 msgstr "depcmp: %s-%s %s %s => %s"
-
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index cef5511a..03934261 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.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: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
 "PO-Revision-Date: 2006-06-05 22:47+0100\n"
 "Last-Translator: Enda <enda@netou.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,261 +16,266 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: lib/libalpm/add.c:95
-#, c-format
-msgid "could not parse token %s"
-msgstr "ne peut analyser l'�l�ment %s"
-
-#: lib/libalpm/add.c:129
+#: lib/libalpm/add.c:75
 #, c-format
 msgid "loading target '%s'"
 msgstr "charge la cible  '%s'"
 
-#: lib/libalpm/add.c:174
+#: lib/libalpm/add.c:120
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr "remplace l'ancienne version %s-%s par %s dans la liste de destination"
 
-#: lib/libalpm/add.c:183
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr "une version plus r�cente %s-%s est d�j� pr�sente -- ignorer"
 
-#: lib/libalpm/add.c:190
+#: lib/libalpm/add.c:136
 #, c-format
 msgid "reading '%s' metadata"
 msgstr "lecture des m�tas-donn�es '%s'"
 
-#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:189 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr "recherche des d�pendances non satisfaites"
 
-#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:201 lib/libalpm/sync.c:467
 msgid "looking for conflicts"
 msgstr "recherche des conflits"
 
-#: lib/libalpm/add.c:260
+#: lib/libalpm/add.c:206
 msgid "replacing packages with -A and -U is not supported yet"
 msgstr ""
 
-#: lib/libalpm/add.c:261
+#: lib/libalpm/add.c:207
 #, c-format
 msgid "please remove '%s' first, using -Rd"
 msgstr ""
 
-#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:248 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr "tri par d�pendances"
 
-#: lib/libalpm/add.c:314
+#: lib/libalpm/add.c:260
 msgid "cleaning up"
 msgstr "nettoyage"
 
-#: lib/libalpm/add.c:329
+#: lib/libalpm/add.c:275
 msgid "looking for file conflicts"
 msgstr "recherche de conflits entre fichiers"
 
-#: lib/libalpm/add.c:394
+#: lib/libalpm/add.c:340
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr "mise a jour du paquet %s-%s"
 
-#: lib/libalpm/add.c:417
+#: lib/libalpm/add.c:364
 #, c-format
 msgid "adding package %s-%s"
 msgstr "ajout du paquet %s-%s"
 
-#: lib/libalpm/add.c:430
+#: lib/libalpm/add.c:377
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr "retirer l'ancien paquet pr�alablement (%s-%s)"
 
-#: lib/libalpm/add.c:457
+#: lib/libalpm/add.c:405
 #, c-format
-msgid "adding %s to the NoUpgrade array temporarilly"
+msgid "adding %s to the NoUpgrade array temporarily"
 msgstr ""
 
-#: lib/libalpm/add.c:475
+#: lib/libalpm/add.c:423
 msgid "extracting files"
 msgstr "extraction des fichiers"
 
-#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:438 lib/libalpm/util.c:463
 msgid "could not get current working directory"
 msgstr "impossible de d�terminer le r�pertoire courant"
 
-#: lib/libalpm/add.c:546
+#: lib/libalpm/add.c:494 lib/libalpm/add.c:495
 #, fuzzy, c-format
 msgid "%s is in NoExtract, skipping extraction"
 msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
 
-#: lib/libalpm/add.c:547
-#, c-format
-msgid "notice: %s is in NoExtract -- skipping extraction"
-msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
-
-#: lib/libalpm/add.c:554
+#: lib/libalpm/add.c:502
 #, fuzzy, c-format
 msgid "%s is in trans->skip_add, skipping extraction"
 msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
 
-#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
+#: lib/libalpm/add.c:548 lib/libalpm/add.c:549 lib/libalpm/add.c:698
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr "n'a pas pu extraire %s (%s)"
 
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:592
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr "v�rification de la 'signature' md5 pour %s"
 
-#: lib/libalpm/add.c:646
+#: lib/libalpm/add.c:594
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr "v�rification de la 'signature' sha1 pour %s"
 
-#: lib/libalpm/add.c:648
+#: lib/libalpm/add.c:596
 #, c-format
 msgid "current:  %s"
 msgstr "courant:   %s"
 
-#: lib/libalpm/add.c:649
+#: lib/libalpm/add.c:597
 #, c-format
 msgid "new:      %s"
 msgstr "nouveau: %s"
 
-#: lib/libalpm/add.c:650
+#: lib/libalpm/add.c:598
 #, c-format
 msgid "original: %s"
 msgstr "original:   %s"
 
-#: lib/libalpm/add.c:662
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr "n'a pas pu renommer  %s (%s)"
 
-#: lib/libalpm/add.c:663
+#: lib/libalpm/add.c:611
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr "erreur: n'a pas pu renommer  %s (%s)"
 
-#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
+#: lib/libalpm/add.c:617 lib/libalpm/add.c:636
 #, fuzzy, c-format
 msgid "could not copy tempfile to %s (%s)"
 msgstr "n'a pas pu copier %s vers %s (%s)"
 
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:618
 #, fuzzy, c-format
 msgid "error: could not copy tempfile to %s (%s)"
 msgstr "erreur: n'a pas pu copier %s vers %s (%s)"
 
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:622
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr "%s sauve en tant que %s.pacorig"
 
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:623
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "avertissement: %s sauve en tant que %s"
 
-#: lib/libalpm/add.c:685
+#: lib/libalpm/add.c:633
 #, fuzzy, c-format
 msgid "action: installing new file: %s"
 msgstr "action: installation de nouveau fichier"
 
-#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
+#: lib/libalpm/add.c:643 lib/libalpm/add.c:649 lib/libalpm/add.c:654
 msgid "action: leaving existing file in place"
 msgstr "action: quitte en pr�servant les fichiers existant"
 
-#: lib/libalpm/add.c:709
+#: lib/libalpm/add.c:657
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 "action: conserver le fichier actuel et installer le nouveau avec "
 "l'extension .pacnew"
 
-#: lib/libalpm/add.c:712
+#: lib/libalpm/add.c:660
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr "n'a pas pu installer %s en tant que %s: %s"
 
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:661
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr "erreur: n'a pas pu installer %s en tant que %s: %s"
 
-#: lib/libalpm/add.c:715
+#: lib/libalpm/add.c:663
 #, c-format
 msgid "%s installed as %s"
 msgstr "%s install� en tant que %s"
 
-#: lib/libalpm/add.c:716
+#: lib/libalpm/add.c:664
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr "avertissement: %s install� en tant que %s"
 
-#: lib/libalpm/add.c:730
+#: lib/libalpm/add.c:678
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr "%s est marqu� NoUpgrade -- ignore"
 
-#: lib/libalpm/add.c:731
+#: lib/libalpm/add.c:679
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr "extrait %s en tant que %s.pacnew"
 
-#: lib/libalpm/add.c:732
+#: lib/libalpm/add.c:680
 #, fuzzy, c-format
 msgid "warning: extracting %s as %s.pacnew"
 msgstr "avertissement: extrait %s%s en tant que %s"
 
-#: lib/libalpm/add.c:735
+#: lib/libalpm/add.c:683
 #, c-format
 msgid "extracting %s"
 msgstr "extrait %s"
 
-#: lib/libalpm/add.c:751
+#: lib/libalpm/add.c:699
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr "erreur: n'a pas pu extraire %s (%s)"
 
-#: lib/libalpm/add.c:763
+#: lib/libalpm/add.c:711
 #, fuzzy, c-format
 msgid "appending backup entry for %s"
 msgstr "ajoute une entre pour la sauvegarde"
 
-#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
+#: lib/libalpm/add.c:743 lib/libalpm/add.c:745
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "des erreurs sont survenue pendant %s %s"
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "upgrading"
 msgstr "mise � jour"
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "installing"
 msgstr "installation"
 
-#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
+#: lib/libalpm/add.c:763
+#, c-format
+msgid "provision '%s' has been removed from package %s (%s => %s)"
+msgstr ""
+
+#: lib/libalpm/add.c:775
+#, fuzzy, c-format
+msgid "updating '%s' due to provision change (%s)"
+msgstr "trouv� '%s' comme disposition pour '%s'"
+
+#: lib/libalpm/add.c:779 lib/libalpm/add.c:780
+#, fuzzy, c-format
+msgid "could not update provision '%s' from '%s'"
+msgstr "trouv� '%s' comme disposition pour '%s'"
+
+#: lib/libalpm/add.c:793 lib/libalpm/remove.c:337
 msgid "updating database"
 msgstr "met � jour la base de donn�es"
 
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:794
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "ajoute l'entr�e de base de donn�es '%s'"
 
-#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
+#: lib/libalpm/add.c:797 lib/libalpm/add.c:799
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "n'a pas pu mettre a jour l'entr�e de base de donn�es %s-%s"
 
-#: lib/libalpm/add.c:824
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "n'a pas pu ajouter l'entr�e '%s' dans le cache"
 
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:838 lib/libalpm/remove.c:364 lib/libalpm/sync.c:1038
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "execute \"ldconfig -r %s\""
@@ -317,158 +322,158 @@ msgid "sync: new mtime for %s: %s"
 msgstr ""
 
 #: lib/libalpm/alpm.c:305
-#, c-format
-msgid "flushing database %s/%s"
+#, fuzzy, c-format
+msgid "flushing database %s%s"
 msgstr "recharge la base de donn�es %s/%s"
 
 #: lib/libalpm/alpm.c:309
-#, c-format
-msgid "could not remove database entry %s/%s"
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s"
 msgstr "n'a pas pu retirer l'entr�e de base de donn�es %s/%s"
 
-#: lib/libalpm/alpm.c:479
+#: lib/libalpm/alpm.c:478
 #, fuzzy, c-format
 msgid "could not get sha1sum for package %s-%s"
 msgstr "n'a pas pu obtenir la 'signature' sha1 pour le paquet %s-%s\n"
 
-#: lib/libalpm/alpm.c:485
+#: lib/libalpm/alpm.c:484
 #, fuzzy, c-format
 msgid "sha1sums for package %s-%s match"
 msgstr "les 'signatures' correspondent pour le paquet %s-%s"
 
-#: lib/libalpm/alpm.c:488
+#: lib/libalpm/alpm.c:487
 #, fuzzy, c-format
 msgid "sha1sums do not match for package %s-%s"
 msgstr "les 'signatures' sha1 ne correspondent pas pour le paquet %s-%s\n"
 
-#: lib/libalpm/alpm.c:523
+#: lib/libalpm/alpm.c:522
 #, fuzzy, c-format
 msgid "could not get md5sum for package %s-%s"
 msgstr "n'a pas pu obtenir la 'signature' md5 pour le paquet %s-%s\n"
 
-#: lib/libalpm/alpm.c:529
+#: lib/libalpm/alpm.c:528
 #, fuzzy, c-format
 msgid "md5sums for package %s-%s match"
 msgstr "les 'signatures' correspondent pour le paquet %s-%s"
 
-#: lib/libalpm/alpm.c:532
+#: lib/libalpm/alpm.c:531
 #, fuzzy, c-format
 msgid "md5sums do not match for package %s-%s"
 msgstr "les 'signatures' md5 ne correspondent pas pour le paquet %s-%s\n"
 
-#: lib/libalpm/alpm.c:781
+#: lib/libalpm/alpm.c:780
 #, c-format
 msgid "could not remove lock file %s"
 msgstr "n'a pas pu effacer le fichier de verrou %s"
 
-#: lib/libalpm/alpm.c:782
+#: lib/libalpm/alpm.c:781
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr "avertissement: n'a pas pu effacer le fichier de verrou %s"
 
-#: lib/libalpm/alpm.c:917
+#: lib/libalpm/alpm.c:916
 #, fuzzy, c-format
 msgid "config: new section '%s'"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: lib/libalpm/alpm.c:946
+#: lib/libalpm/alpm.c:945
 msgid "config: nopassiveftp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:949
+#: lib/libalpm/alpm.c:948
 msgid "config: usesyslog"
 msgstr ""
 
-#: lib/libalpm/alpm.c:952
+#: lib/libalpm/alpm.c:951
 msgid "config: chomp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:955
+#: lib/libalpm/alpm.c:954
 msgid "config: usecolor"
 msgstr ""
 
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:963
 #, fuzzy, c-format
 msgid "config: including %s"
 msgstr "ne peut ouvrir le fichier de log %s"
 
-#: lib/libalpm/alpm.c:974 lib/libalpm/alpm.c:979
+#: lib/libalpm/alpm.c:973 lib/libalpm/alpm.c:978
 #, fuzzy, c-format
 msgid "config: noupgrade: %s"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: lib/libalpm/alpm.c:987 lib/libalpm/alpm.c:992
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
 #, fuzzy, c-format
 msgid "config: noextract: %s"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: lib/libalpm/alpm.c:1000 lib/libalpm/alpm.c:1005
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
 #, fuzzy, c-format
 msgid "config: ignorepkg: %s"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: lib/libalpm/alpm.c:1013 lib/libalpm/alpm.c:1018
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
 #, fuzzy, c-format
 msgid "config: holdpkg: %s"
 msgstr "ne peut ouvrir le fichier de log %s"
 
-#: lib/libalpm/alpm.c:1025
+#: lib/libalpm/alpm.c:1024
 #, fuzzy, c-format
 msgid "config: dbpath: %s"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: lib/libalpm/alpm.c:1032
+#: lib/libalpm/alpm.c:1031
 #, fuzzy, c-format
 msgid "config: cachedir: %s"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: lib/libalpm/alpm.c:1035
+#: lib/libalpm/alpm.c:1034
 #, fuzzy, c-format
 msgid "config: logfile: %s"
 msgstr "ne peut ouvrir le fichier de log %s"
 
-#: lib/libalpm/alpm.c:1038
+#: lib/libalpm/alpm.c:1037
 #, fuzzy, c-format
 msgid "config: xfercommand: %s"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: lib/libalpm/alpm.c:1043
+#: lib/libalpm/alpm.c:1042
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
+#: lib/libalpm/alpm.c:1080 lib/libalpm/sync.c:105
 msgid "checking for package replacements"
 msgstr "v�rification des remplacements pour le paquet"
 
-#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:121
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr "analyse du remplacement '%s' pour le paquet '%s'"
 
-#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr "%s-%s: ignore la mise a jour du paquet (� remplacer par %s-%s)"
 
-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1124 lib/libalpm/sync.c:158
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr "%s-%s s�lectionn� pour mise � jour (� remplacer par %s-%s)"
 
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
+#: lib/libalpm/alpm.c:1146 lib/libalpm/sync.c:192
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr "'%s' non trouv� dans la liste de synchronisation -- ignor�"
 
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1160 lib/libalpm/sync.c:206 lib/libalpm/sync.c:493
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr "'%s' est d�j� s�lectionn� pour retrait -- ignor�"
 
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
-#, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
+#: lib/libalpm/alpm.c:1166
+#, fuzzy, c-format
+msgid "%s elected for upgrade (%s => %s)"
 msgstr "%s-%s s�lectionn� pour mise � jour (%s => %s)"
 
 #: lib/libalpm/be_files.c:58
@@ -491,129 +496,139 @@ msgstr "ne peut trouver ou lire le paquet"
 msgid "invalid name for dabatase entry '%s'"
 msgstr "nom invalide pour l'entr�e de base de donn�es '%s'"
 
-#: lib/libalpm/be_files.c:213
+#: lib/libalpm/be_files.c:218
 msgid "invalid package entry provided to _alpm_db_read, skipping"
 msgstr ""
 
-#: lib/libalpm/be_files.c:218
+#: lib/libalpm/be_files.c:223
 #, c-format
 msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""
 
-#: lib/libalpm/be_files.c:226
+#: lib/libalpm/be_files.c:231
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""
 
-#: lib/libalpm/be_files.c:234
+#: lib/libalpm/be_files.c:239
 #, fuzzy, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr "ne peut trouver %s dans la base de donn�es"
 
-#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
-#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
-#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
-#: lib/libalpm/package.c:197
+#: lib/libalpm/be_files.c:247 lib/libalpm/be_files.c:393
+#: lib/libalpm/be_files.c:416 lib/libalpm/be_files.c:507
+#: lib/libalpm/be_files.c:596 lib/libalpm/be_files.c:623
+#: lib/libalpm/package.c:204
 #, fuzzy, c-format
 msgid "could not open file %s: %s"
 msgstr "ne peut ouvrir le fichier %s"
 
-#: lib/libalpm/be_files.c:500
+#: lib/libalpm/be_files.c:504
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:589
+#: lib/libalpm/be_files.c:593
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:616
+#: lib/libalpm/be_files.c:620
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
 
-#: lib/libalpm/cache.c:59
-#, c-format
-msgid "loading package cache (infolevel=%#x) for repository '%s'"
-msgstr "chargement du cache de paquet (infolevel=%#x) pour le d�pot '%s'"
+#: lib/libalpm/cache.c:57
+#, fuzzy, c-format
+msgid "loading package cache for repository '%s'"
+msgstr "nettoyage du cache de paquet pour le d�pot '%s'"
 
-#: lib/libalpm/cache.c:64
+#: lib/libalpm/cache.c:62
 #, fuzzy, c-format
 msgid "adding '%s' to package cache for db '%s'"
 msgstr "nettoyage du cache de paquet pour le d�pot '%s'"
 
-#: lib/libalpm/cache.c:84
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr "nettoyage du cache de paquet pour le d�pot '%s'"
 
-#: lib/libalpm/cache.c:109
+#: lib/libalpm/cache.c:107
 #, c-format
 msgid "error: pkgcache is NULL for db '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:136
-#, fuzzy, c-format
-msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
-msgstr "chargement du cache de paquet (infolevel=%#x) pour le d�pot '%s'"
-
-#: lib/libalpm/cache.c:156
+#: lib/libalpm/cache.c:127
 #, c-format
 msgid "adding entry '%s' in '%s' cache"
 msgstr "ajout de l'entr�e '%s' dans '%s' cache"
 
-#: lib/libalpm/cache.c:182
+#: lib/libalpm/cache.c:147
 #, c-format
 msgid "removing entry '%s' from '%s' cache"
 msgstr "retrait de l'entr�e '%s' depuis '%s' cache"
 
-#: lib/libalpm/cache.c:200
+#: lib/libalpm/cache.c:154
+#, fuzzy, c-format
+msgid "cannot remove entry '%s' from '%s' cache: not found"
+msgstr "retrait de l'entr�e '%s' depuis '%s' cache"
+
+#: lib/libalpm/cache.c:176
 #, fuzzy, c-format
 msgid "error: failed to get '%s' from NULL pkgcache"
 msgstr "ne peut retirer l'entr�e '%s' du cache"
 
-#: lib/libalpm/cache.c:223
+#: lib/libalpm/cache.c:199
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr "chargement du group depuis le cache pour le d�pot '%s'"
 
-#: lib/libalpm/conflict.c:78
-#, c-format
-msgid "checkconflicts: targ '%s' vs db"
-msgstr "analyse des conflits: cible '%s' compar�e � la base"
+#: lib/libalpm/conflict.c:68
+#, fuzzy, c-format
+msgid "   found conflict '%s' : package '%s'"
+msgstr "analyse du remplacement '%s' pour le paquet '%s'"
 
-#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
+#: lib/libalpm/conflict.c:77
 #, c-format
-msgid "targs vs db: found %s as a conflict for %s"
-msgstr "comparaison cibles / base de donn�es : trouve %s comme conflit pour %s"
+msgid "   found conflict '%s' : package '%s' provides '%s'"
+msgstr ""
 
-#: lib/libalpm/conflict.c:114
-#, c-format
-msgid "checkconflicts: targ '%s' vs targs"
-msgstr "analyse des conflits: cible '%s' compar�e aux cibles"
+#: lib/libalpm/conflict.c:100 lib/libalpm/conflict.c:142
+#, fuzzy, c-format
+msgid "package '%s' conflicts with itself - packaging error"
+msgstr "le paquet '%s' est en conflit avec '%s'"
 
-#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
-#, c-format
-msgid "targs vs targs: found %s as a conflict for %s"
-msgstr "comparaison cible / liste de cibles : trouve %s comme conflit pour %s"
+#: lib/libalpm/conflict.c:106
+#, fuzzy, c-format
+msgid "checkconflicts: target '%s' vs db"
+msgstr "analyse des conflits: cible '%s' compar�e � la base"
 
-#: lib/libalpm/conflict.c:150
-#, c-format
-msgid "checkconflicts: db vs targ '%s'"
+#: lib/libalpm/conflict.c:148
+#, fuzzy, c-format
+msgid "checkconflicts: target '%s' vs all targets"
+msgstr "analyse des conflits: cible '%s' compar�e aux cibles"
+
+#: lib/libalpm/conflict.c:180
+#, fuzzy, c-format
+msgid "checkconflicts: db vs target '%s'"
 msgstr "analyse des conflits: base de donnes compar�e a la cible '%s'"
 
-#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
+#: lib/libalpm/conflict.c:200
+#, fuzzy, c-format
+msgid "target '%s' is also in target list, using NEW conflicts"
+msgstr "'%s' est dans la la liste de cibles -- conservation"
+
+#: lib/libalpm/conflict.c:256
 #, c-format
-msgid "db vs targs: found %s as a conflict for %s"
-msgstr "comparaison base de donn�e / cibles: trouve %s en conflit avec %s"
+msgid "\tCONFLICTS:: %s conflicts with %s"
+msgstr ""
 
-#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
-#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
-#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
-#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
-#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:348 lib/libalpm/deps.c:57 lib/libalpm/deps.c:435
+#: lib/libalpm/deps.c:631 lib/libalpm/deps.c:671 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:80 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:598 lib/libalpm/sync.c:614 lib/libalpm/sync.c:711
+#: lib/libalpm/trans.c:52 lib/libalpm/util.c:609 lib/libalpm/util.c:616
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr "probl�me malloc: n'a pas pu allouer %d bytes"
@@ -623,27 +638,27 @@ msgstr "probl�me malloc: n'a pas pu allouer %d bytes"
 msgid "malloc failed: could not allocate %d bytes"
 msgstr "malloc � echou�: n'a pas pu allouer %d bytes"
 
-#: lib/libalpm/db.c:163
+#: lib/libalpm/db.c:165
 msgid "attempt to re-register the 'local' DB"
 msgstr ""
 
-#: lib/libalpm/db.c:171
+#: lib/libalpm/db.c:173
 #, c-format
 msgid "attempt to re-register the '%s' database, using existing"
 msgstr ""
 
-#: lib/libalpm/db.c:177
+#: lib/libalpm/db.c:179
 #, c-format
 msgid "registering database '%s'"
 msgstr "enregistre la base de donn�es '%s'"
 
-#: lib/libalpm/db.c:182
+#: lib/libalpm/db.c:184
 #, c-format
 msgid "database directory '%s' does not exist -- try creating it"
 msgstr ""
 "le r�pertoire de base de donn�es '%s' n'existe pas -- tentative de cr�ation"
 
-#: lib/libalpm/db.c:193
+#: lib/libalpm/db.c:195
 #, c-format
 msgid "opening database '%s'"
 msgstr "ouvre la base de donn�es '%s'"
@@ -656,60 +671,70 @@ msgstr "d�but du tri des d�pendances"
 msgid "possible dependency cycle detected"
 msgstr "possible cycle de d�pendances d�tecte"
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:180
 msgid "sorting dependencies finished"
 msgstr "fin du tri des d�pendances"
 
-#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
+#: lib/libalpm/deps.c:222 lib/libalpm/deps.c:307
 msgid "null package found in package list"
 msgstr ""
 
-#: lib/libalpm/deps.c:223
+#: lib/libalpm/deps.c:227
 #, fuzzy, c-format
 msgid "cannot find package installed '%s'"
 msgstr "ne peut ouvrir le fichier de paquet"
 
-#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
+#: lib/libalpm/deps.c:258
 #, c-format
-msgid "checkdeps: found %s as required by %s"
-msgstr "analyse des d�pendances: trouve %s comme besoin pour %s"
+msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'"
+msgstr ""
 
-#: lib/libalpm/deps.c:283
+#: lib/libalpm/deps.c:277
 #, fuzzy, c-format
-msgid "no dependencies for target '%s'"
-msgstr "ne peut r�soudre les d�pendances pour \"%s\""
+msgid "checkdeps: dependency '%s' satisfied by installed package '%s'"
+msgstr "analyse du remplacement '%s' pour le paquet '%s'"
 
-#: lib/libalpm/deps.c:329
+#: lib/libalpm/deps.c:286
+#, fuzzy, c-format
+msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'"
+msgstr "analyse des d�pendances: trouve %s comme d�pendance pour %s"
+
+#: lib/libalpm/deps.c:356
 #, fuzzy, c-format
 msgid "missing dependency '%s' for package '%s'"
 msgstr "analyse du remplacement '%s' pour le paquet '%s'"
 
-#: lib/libalpm/deps.c:452
+#: lib/libalpm/deps.c:406
+#, c-format
+msgid "checkdeps: found %s as required by %s"
+msgstr "analyse des d�pendances: trouve %s comme besoin pour %s"
+
+#: lib/libalpm/deps.c:482
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr "exclue %s -- explicitement installe"
 
-#: lib/libalpm/deps.c:499
+#: lib/libalpm/deps.c:529
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr "ne peut trouver le paquet \"%s\" ou quoique ce soit qui le fournisse!"
 
-#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
+#: lib/libalpm/deps.c:537 lib/libalpm/deps.c:548
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr "ajoute '%s' aux cibles"
 
-#: lib/libalpm/deps.c:551
+#: lib/libalpm/deps.c:580
 #, fuzzy
 msgid "started resolving dependencies"
 msgstr "d�but du tri des d�pendances"
 
-#: lib/libalpm/deps.c:569
+#: lib/libalpm/deps.c:598
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr "%s fourni la d�pendance %s -- ignore"
 
-#: lib/libalpm/deps.c:594
+#: lib/libalpm/deps.c:627
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
@@ -717,27 +742,27 @@ msgstr ""
 "ne peut r�soudre les d�pendances pour \"%s\" (\"%s\" n'est pas dans le jeu "
 "de paquet)"
 
-#: lib/libalpm/deps.c:611
+#: lib/libalpm/deps.c:644
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr "la d�pendance %s est d�j� dans la liste de cible -- ignor�e"
 
-#: lib/libalpm/deps.c:631
+#: lib/libalpm/deps.c:664
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr "r�cup�re la d�pendance %s (requise par %s)"
 
-#: lib/libalpm/deps.c:635
+#: lib/libalpm/deps.c:668
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr "ne peut r�soudre les d�pendances pour \"%s\""
 
-#: lib/libalpm/deps.c:651
+#: lib/libalpm/deps.c:684
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr "cycle de d�pendances d�tecte: %s"
 
-#: lib/libalpm/deps.c:655
+#: lib/libalpm/deps.c:688
 #, fuzzy
 msgid "finished resolving dependencies"
 msgstr "d�but du tri des d�pendances"
@@ -835,7 +860,7 @@ msgstr "transaction annul�e"
 msgid "operation not compatible with the transaction type"
 msgstr "op�ration incompatible avec le type de transaction"
 
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:977
 msgid "could not commit transaction"
 msgstr "n'a pas pu appliquer la transaction"
 
@@ -977,70 +1002,70 @@ msgstr "%s ne peut etre ouvert\n"
 msgid "%s: forcing upgrade to version %s"
 msgstr "version de paquet manquant dans %s"
 
-#: lib/libalpm/package.c:152
+#: lib/libalpm/package.c:153
 #, fuzzy, c-format
 msgid "%s: local (%s) is newer than %s (%s)"
 msgstr "%s-%s: la version locale est plus r�cente"
 
-#: lib/libalpm/package.c:159
+#: lib/libalpm/package.c:161
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr "%s-%s: ignore la mise � jour du paquet (%s)"
 
-#: lib/libalpm/package.c:163
+#: lib/libalpm/package.c:167
 #, fuzzy, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr "%s-%s: repousse la mise � jour du paquet (%s)\n"
 
-#: lib/libalpm/package.c:168
-#, c-format
-msgid "compare versions for %s: %s vs %s, result=%d"
-msgstr ""
-
-#: lib/libalpm/package.c:211 lib/libalpm/package.c:270
+#: lib/libalpm/package.c:218 lib/libalpm/package.c:277
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr "%s: erreur de syntaxe dans le fichier de description � la ligne %d"
 
-#: lib/libalpm/package.c:344
+#: lib/libalpm/package.c:351
 msgid "could not parse the package description file"
 msgstr "n'a pas pu analyser le fichier de description"
 
-#: lib/libalpm/package.c:348
+#: lib/libalpm/package.c:355
 #, c-format
 msgid "missing package name in %s"
 msgstr "nom de paquet manquant dans %s"
 
-#: lib/libalpm/package.c:352
+#: lib/libalpm/package.c:359
 #, c-format
 msgid "missing package version in %s"
 msgstr "version de paquet manquant dans %s"
 
-#: lib/libalpm/package.c:387
+#: lib/libalpm/package.c:394
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr "ne peut effacer le fichier temporaire %s"
 
-#: lib/libalpm/package.c:400 lib/libalpm/package.c:407
+#: lib/libalpm/package.c:407 lib/libalpm/package.c:414
 #, fuzzy, c-format
 msgid "error while reading package: %s"
 msgstr "mise a jour du paquet %s-%s"
 
-#: lib/libalpm/package.c:413
+#: lib/libalpm/package.c:420
 #, fuzzy
 msgid "missing package metadata"
 msgstr "nom de paquet manquant dans %s"
 
-#: lib/libalpm/package.c:420
+#: lib/libalpm/package.c:427
 #, fuzzy, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr "fichier d'information manquant dans le paquet %s"
 
-#: lib/libalpm/package.c:547
+#: lib/libalpm/package.c:560
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr "ajoute '%s' dans le champ 'requit par' pour '%s'"
 
+#: lib/libalpm/package.c:571
+#, fuzzy, c-format
+msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
+msgstr "ajoute '%s' dans le champ 'requit par' pour '%s'"
+
 #: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
@@ -1115,254 +1140,270 @@ msgstr "suppression %s"
 msgid "cannot remove file %s: %s"
 msgstr "ne peut effacer le fichier %s"
 
-#: lib/libalpm/remove.c:286
+#: lib/libalpm/remove.c:291
 #, c-format
 msgid "removing package %s-%s"
 msgstr "retrait du paquet %s-%s"
 
-#: lib/libalpm/remove.c:298
+#: lib/libalpm/remove.c:308
 #, fuzzy, c-format
 msgid "not removing package '%s', can't remove all files"
 msgstr "r�solution du conflit de paquet '%s'"
 
-#: lib/libalpm/remove.c:304
-msgid "removing files"
+#: lib/libalpm/remove.c:315
+#, fuzzy, c-format
+msgid "removing %d files"
 msgstr "efface les fichiers"
 
-#: lib/libalpm/remove.c:322
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "ne peut effacer l'entr�e de base de de donn�es %s"
 
-#: lib/libalpm/remove.c:324
+#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "ne peut retirer l'entr�e de base de donn�e %s-%s"
 
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:345
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "ne peut retirer l'entr�e '%s' du cache"
 
-#: lib/libalpm/sync.c:199
+#: lib/libalpm/sync.c:181
 msgid "checking for package upgrades"
 msgstr "v�rification des mises � jour de paquets"
 
-#: lib/libalpm/sync.c:232
-#, fuzzy, c-format
-msgid "%s-%s: ignoring package upgrade (%s => %s)"
-msgstr "%s-%s: ignore la mise � jour du paquet (%s)"
+#: lib/libalpm/sync.c:213
+#, c-format
+msgid "%s-%s elected for upgrade (%s => %s)"
+msgstr "%s-%s s�lectionn� pour mise � jour (%s => %s)"
 
-#: lib/libalpm/sync.c:281
+#: lib/libalpm/sync.c:260
 #, fuzzy, c-format
 msgid "searching for target in repo '%s'"
 msgstr "charge la cible  '%s'"
 
-#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
+#: lib/libalpm/sync.c:268 lib/libalpm/sync.c:291
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr "cible '%s' non trouv�e -- recherche des dispositions"
 
-#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
+#: lib/libalpm/sync.c:273 lib/libalpm/sync.c:296
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr "trouv� '%s' comme disposition pour '%s'"
 
-#: lib/libalpm/sync.c:302
+#: lib/libalpm/sync.c:280
 #, fuzzy, c-format
 msgid "repository '%s' not found"
 msgstr "groupe non trouv�"
 
-#: lib/libalpm/sync.c:336
+#: lib/libalpm/sync.c:321
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr "%s-%s est � jour -- ignor�"
 
-#: lib/libalpm/sync.c:356
+#: lib/libalpm/sync.c:344
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr "ajout de la cible '%s' au jeu de transaction"
 
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:392
 #, fuzzy
 msgid "resolving target's dependencies"
 msgstr "r�solution des d�pendances pour les cibles"
 
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:412
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr "ajout du paquet %s-%s � la liste de transactions"
 
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:447
 msgid "looking for unresolvable dependencies"
 msgstr "recherche de d�pendancea non soluble"
 
-#: lib/libalpm/sync.c:487
-#, c-format
-msgid "package '%s' is conflicting with '%s'"
+#: lib/libalpm/sync.c:478
+#, fuzzy, c-format
+msgid "package '%s' conflicts with '%s'"
 msgstr "le paquet '%s' est en conflit avec '%s'"
 
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:500
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr "'%s' non trouve dans le jeu de transaction -- ignor�"
 
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:511
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr "le paquet '%s' g�n�re son propre conflit"
 
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:534 lib/libalpm/sync.c:539
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr "'%s' est dans la la liste de cibles -- conservation"
 
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:551 lib/libalpm/sync.c:588
 #, c-format
 msgid "removing '%s' from target list"
 msgstr "retire '%s' de la liste de cibles"
 
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:560
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr "r�solution du conflit de paquet '%s'"
 
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:583
 #, c-format
 msgid "electing '%s' for removal"
 msgstr "s�lection de  '%s' pour retrait"
 
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:594 lib/libalpm/sync.c:610
 msgid "unresolvable package conflicts detected"
 msgstr "conflit de paquets non soluble d�tect�"
 
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:662
 msgid "checking dependencies of packages designated for removal"
 msgstr "analyse des d�pendances pour les paquets marques � retirer"
 
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:676
 msgid "something has gone horribly wrong"
 msgstr "quelque chose s'est horriblement mal pass�"
 
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:696
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr "trouv� '%s' comme disposition pour '%s' -- conflit annul�"
 
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:792
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:803
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:804
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:809
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:810
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:817
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:846 lib/libalpm/sync.c:858
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr "ne peut obtenir la 'signature' md5 ou sha1 pour le paquet %s\n"
 
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:877
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "l'archive %s �tait corrompue (mauvaise somme MD5 ou SHA1)\n"
 
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:879
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "l'archive %s est corrompue (mauvaise somme MD5 ou SHA1)\n"
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:900
 msgid "could not create removal transaction"
 msgstr "n'a pas pu cr�er la transaction de retrait"
 
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:906
 msgid "could not initialize the removal transaction"
 msgstr "n'a pas pu initialiser la transaction de retrait"
 
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:926
 msgid "removing conflicting and to-be-replaced packages"
 msgstr "efface les paquets en conflit et ceux � remplacer"
 
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:928
 msgid "could not prepare removal transaction"
 msgstr "n'a pas pu pr�parer la transaction de retrait"
 
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:934
 msgid "could not commit removal transaction"
 msgstr "n'a pas pu appliquer la transaction de retrait"
 
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:941
 msgid "installing packages"
 msgstr "installe les paquets"
 
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:944
 msgid "could not create transaction"
 msgstr "n'a pas pu cr�er la transaction"
 
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:949
 msgid "could not initialize transaction"
 msgstr "n'a pas pu initialiser la transaction"
 
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:972
 msgid "could not prepare transaction"
 msgstr "n'a pas pu pr�parer la transaction"
 
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:984
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 "mise a jour de la base de donn�es concernant les d�pendances de paquets "
 "remplaces"
 
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1013
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 "n'a pas pu mettre a jour les pr�-requis pour l'entr�e de base de donn�es %s-%"
 "s"
 
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1022
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr "n'a pu mettre a jour la nouvelle entr�e de base de donn�es %s-%s"
 
-#: lib/libalpm/trans.c:262
-msgid "updating dependency packages 'requiredby' fields"
+#: lib/libalpm/sync.c:1062
+#, fuzzy, c-format
+msgid "found package '%s-%s' in sync"
+msgstr "retrait du paquet %s-%s"
+
+#: lib/libalpm/sync.c:1068
+#, fuzzy, c-format
+msgid "package '%s' not found in sync"
+msgstr "'%s' non trouv� dans la liste de synchronisation -- ignor�"
+
+#: lib/libalpm/trans.c:264
+#, fuzzy, c-format
+msgid "updating dependency packages 'requiredby' fields for %s-%s"
 msgstr "mise a jour des champs 'requit par' des d�pendances"
 
-#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#: lib/libalpm/trans.c:267
+msgid "package has no dependencies, no other packages to update"
+msgstr ""
+
+#: lib/libalpm/trans.c:304 lib/libalpm/trans.c:330
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr "mise � jour du champ 'requit par' pour le paquet '%s'"
 
-#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#: lib/libalpm/trans.c:315 lib/libalpm/trans.c:341
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""
 "n'a pas pu mettre � jour le champ 'requit par' de l'entr�e de base de "
 "donn�es %s-%s"
 
-#: lib/libalpm/trans.c:315
+#: lib/libalpm/trans.c:322
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "n'a pas pu trouver la d�pendance '%s'"
@@ -1382,61 +1423,61 @@ msgstr "n'a pas pu extraire %s: %s\n"
 msgid "logaction called: %s"
 msgstr "original:   %s"
 
-#: lib/libalpm/util.c:441
+#: lib/libalpm/util.c:443
 msgid "could not create temp directory"
 msgstr "n'a pas pu cr�er le r�pertoire temporaire"
 
-#: lib/libalpm/util.c:468
+#: lib/libalpm/util.c:470
 #, c-format
 msgid "could not change directory to %s (%s)"
 msgstr "n'a pas pu changer de r�pertoire pour %s (%s)"
 
-#: lib/libalpm/util.c:471
+#: lib/libalpm/util.c:473
 #, c-format
 msgid "executing %s script..."
 msgstr "ex�cute le script %s ..."
 
-#: lib/libalpm/util.c:484
+#: lib/libalpm/util.c:486
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr "n'a pas pu g�n�rer un nouveau processus (%s)"
 
-#: lib/libalpm/util.c:491
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "chrooting in %s"
 msgstr "chroot dans %s"
 
-#: lib/libalpm/util.c:493
+#: lib/libalpm/util.c:495
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr "n'a pas pu changer le r�pertoire racine (%s)"
 
-#: lib/libalpm/util.c:497
+#: lib/libalpm/util.c:499
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr "n'a pas pu changer de r�pertoire vers / (%s)"
 
-#: lib/libalpm/util.c:501
+#: lib/libalpm/util.c:503
 #, c-format
 msgid "executing \"%s\""
 msgstr "ex�cute \"%s\""
 
-#: lib/libalpm/util.c:504
+#: lib/libalpm/util.c:506
 #, fuzzy, c-format
 msgid "call to popen failed (%s)"
 msgstr "la demande de mise en attente du pid a �chou�e (%s)"
 
-#: lib/libalpm/util.c:536
+#: lib/libalpm/util.c:538
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr "la demande de mise en attente du pid a �chou�e (%s)"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr "n'a pas pu effacer tmpdir %s"
 
-#: lib/libalpm/util.c:602
+#: lib/libalpm/util.c:604
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
@@ -1446,20 +1487,49 @@ msgstr ""
 msgid "depcmp: %s-%s %s %s-%s => %s"
 msgstr ""
 
-#: lib/libalpm/versioncmp.c:281
+#: lib/libalpm/versioncmp.c:282
 #, c-format
 msgid "depcmp: %s-%s %s %s => %s"
 msgstr ""
 
+#~ msgid "could not parse token %s"
+#~ msgstr "ne peut analyser l'�l�ment %s"
+
+#~ msgid "notice: %s is in NoExtract -- skipping extraction"
+#~ msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
+
+#~ msgid "loading package cache (infolevel=%#x) for repository '%s'"
+#~ msgstr "chargement du cache de paquet (infolevel=%#x) pour le d�pot '%s'"
+
+#, fuzzy
+#~ msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+#~ msgstr "chargement du cache de paquet (infolevel=%#x) pour le d�pot '%s'"
+
+#~ msgid "targs vs db: found %s as a conflict for %s"
+#~ msgstr ""
+#~ "comparaison cibles / base de donn�es : trouve %s comme conflit pour %s"
+
+#~ msgid "targs vs targs: found %s as a conflict for %s"
+#~ msgstr ""
+#~ "comparaison cible / liste de cibles : trouve %s comme conflit pour %s"
+
+#~ msgid "db vs targs: found %s as a conflict for %s"
+#~ msgstr "comparaison base de donn�e / cibles: trouve %s en conflit avec %s"
+
+#, fuzzy
+#~ msgid "no dependencies for target '%s'"
+#~ msgstr "ne peut r�soudre les d�pendances pour \"%s\""
+
+#, fuzzy
+#~ msgid "%s-%s: ignoring package upgrade (%s => %s)"
+#~ msgstr "%s-%s: ignore la mise � jour du paquet (%s)"
+
 #~ msgid "adding new package %s-%s"
 #~ msgstr "ajout du nouveau paquet %s-%s"
 
 #~ msgid "error updating database for %s-%s!"
 #~ msgstr "erreur lors de la mise a jour de la base de donn�es pour %s-%s!"
 
-#~ msgid "checkdeps: found %s as a dependency for %s"
-#~ msgstr "analyse des d�pendances: trouve %s comme d�pendance pour %s"
-
 #~ msgid "dep is NULL!"
 #~ msgstr "dep est NULL!"
 
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index 4926b7dc..e01452aa 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -8,7 +8,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: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
 "PO-Revision-Date: 2006-09-03 13:49+0200\n"
 "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,261 +16,266 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: lib/libalpm/add.c:95
-#, c-format
-msgid "could not parse token %s"
-msgstr "�rtelmezhetetlen token %s"
-
-#: lib/libalpm/add.c:129
+#: lib/libalpm/add.c:75
 #, c-format
 msgid "loading target '%s'"
 msgstr "c�l bet�lt�se '%s'"
 
-#: lib/libalpm/add.c:174
+#: lib/libalpm/add.c:120
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr "a %s-%s-t lecser�li a %s a c�l list�ban"
 
-#: lib/libalpm/add.c:183
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr "az �jabb verzi� (%s-%s) m�r el�rhet� a c�l list�ban -- kihagy�s"
 
-#: lib/libalpm/add.c:190
+#: lib/libalpm/add.c:136
 #, c-format
 msgid "reading '%s' metadata"
 msgstr "'%s' metaadat olvas�sa"
 
-#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:189 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr "el�gtelen f�gg�s�gek keres�se"
 
-#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:201 lib/libalpm/sync.c:467
 msgid "looking for conflicts"
 msgstr "konfliktusok keres�se"
 
-#: lib/libalpm/add.c:260
+#: lib/libalpm/add.c:206
 msgid "replacing packages with -A and -U is not supported yet"
 msgstr ""
 
-#: lib/libalpm/add.c:261
+#: lib/libalpm/add.c:207
 #, c-format
 msgid "please remove '%s' first, using -Rd"
 msgstr ""
 
-#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:248 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr "rendez�s f�gg�s�gek szerint"
 
-#: lib/libalpm/add.c:314
+#: lib/libalpm/add.c:260
 msgid "cleaning up"
 msgstr "tiszt�t�s"
 
-#: lib/libalpm/add.c:329
+#: lib/libalpm/add.c:275
 msgid "looking for file conflicts"
 msgstr "f�jl konfliktusok keres�se"
 
-#: lib/libalpm/add.c:394
+#: lib/libalpm/add.c:340
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr "csomag friss�t�se: %s-%s"
 
-#: lib/libalpm/add.c:417
+#: lib/libalpm/add.c:364
 #, c-format
 msgid "adding package %s-%s"
 msgstr "csomag hozz�ad�sa %s-%s"
 
-#: lib/libalpm/add.c:430
+#: lib/libalpm/add.c:377
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr "els�k�nt a r�gi csomag elt�vol�t�sa (%s-%s)"
 
-#: lib/libalpm/add.c:457
+#: lib/libalpm/add.c:405
 #, c-format
-msgid "adding %s to the NoUpgrade array temporarilly"
+msgid "adding %s to the NoUpgrade array temporarily"
 msgstr ""
 
-#: lib/libalpm/add.c:475
+#: lib/libalpm/add.c:423
 msgid "extracting files"
 msgstr "f�jlok kifejt�se"
 
-#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:438 lib/libalpm/util.c:463
 msgid "could not get current working directory"
 msgstr "a jelenlegi munkak�nyvt�r nem kaphat� meg"
 
-#: lib/libalpm/add.c:546
+#: lib/libalpm/add.c:494 lib/libalpm/add.c:495
 #, fuzzy, c-format
 msgid "%s is in NoExtract, skipping extraction"
 msgstr "figyelmeztet�s: %s a NoExtractben van -- kifejt�s kihagy�sa"
 
-#: lib/libalpm/add.c:547
-#, c-format
-msgid "notice: %s is in NoExtract -- skipping extraction"
-msgstr "figyelmeztet�s: %s a NoExtractben van -- kifejt�s kihagy�sa"
-
-#: lib/libalpm/add.c:554
+#: lib/libalpm/add.c:502
 #, fuzzy, c-format
 msgid "%s is in trans->skip_add, skipping extraction"
 msgstr "figyelmeztet�s: %s a NoExtractben van -- kifejt�s kihagy�sa"
 
-#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
+#: lib/libalpm/add.c:548 lib/libalpm/add.c:549 lib/libalpm/add.c:698
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr "nem siker�lt kifejteni: %s (%s)"
 
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:592
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr "md5 �sszegek vizsg�lata a %s sz�m�ra"
 
-#: lib/libalpm/add.c:646
+#: lib/libalpm/add.c:594
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr "sha1 �sszegek vizsg�lata a %s sz�m�ra"
 
-#: lib/libalpm/add.c:648
+#: lib/libalpm/add.c:596
 #, c-format
 msgid "current:  %s"
 msgstr "jelenlegi: %s"
 
-#: lib/libalpm/add.c:649
+#: lib/libalpm/add.c:597
 #, c-format
 msgid "new:      %s"
 msgstr "�j:       %s"
 
-#: lib/libalpm/add.c:650
+#: lib/libalpm/add.c:598
 #, c-format
 msgid "original: %s"
 msgstr "eredeti:  %s"
 
-#: lib/libalpm/add.c:662
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr "nem siker�lt �tnevezni: %s (%s)"
 
-#: lib/libalpm/add.c:663
+#: lib/libalpm/add.c:611
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr "hiba: nem siker�lt �tnevezni: %s (%s)"
 
-#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
+#: lib/libalpm/add.c:617 lib/libalpm/add.c:636
 #, fuzzy, c-format
 msgid "could not copy tempfile to %s (%s)"
 msgstr "nem siker�lt m�solni: %s-t ide: %s (%s)"
 
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:618
 #, fuzzy, c-format
 msgid "error: could not copy tempfile to %s (%s)"
 msgstr "hiba: nem siker�lt m�solni: %s-t ide: %s (%s)"
 
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:622
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr "a %s elmentve %s.pacorig n�ven"
 
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:623
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "figyelmeztet�s: a %s elmentve %s n�ven"
 
-#: lib/libalpm/add.c:685
+#: lib/libalpm/add.c:633
 #, fuzzy, c-format
 msgid "action: installing new file: %s"
 msgstr "folyamat: az �j f�jl telep�t�se"
 
-#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
+#: lib/libalpm/add.c:643 lib/libalpm/add.c:649 lib/libalpm/add.c:654
 msgid "action: leaving existing file in place"
 msgstr "folyamat: a jelenlegi f�jl megtart�sa"
 
-#: lib/libalpm/add.c:709
+#: lib/libalpm/add.c:657
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 "folyamat: a jelenlegi f�jl megtart�sa �s az �j .pacnew v�gz�d�ssel val� "
 "telep�t�se"
 
-#: lib/libalpm/add.c:712
+#: lib/libalpm/add.c:660
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr "nem siker�lt telep�teni a %s-t %s-k�nt: %s"
 
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:661
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr "hiba: nem siker�lt telep�teni a %s-t %s-k�nt: %s"
 
-#: lib/libalpm/add.c:715
+#: lib/libalpm/add.c:663
 #, c-format
 msgid "%s installed as %s"
 msgstr "a %s %s n�ven lett telep�tve"
 
-#: lib/libalpm/add.c:716
+#: lib/libalpm/add.c:664
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr "figyelmeztet�s: a %s n�ven %s lett telep�tve"
 
-#: lib/libalpm/add.c:730
+#: lib/libalpm/add.c:678
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr "%s a NoUpgrade-ben van -- kihagy�s"
 
-#: lib/libalpm/add.c:731
+#: lib/libalpm/add.c:679
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr "%s kifejt�se %s.pacnew n�ven"
 
-#: lib/libalpm/add.c:732
+#: lib/libalpm/add.c:680
 #, fuzzy, c-format
 msgid "warning: extracting %s as %s.pacnew"
 msgstr "figyelmeztet�s: %s%s kifejt�se %s.pacnew n�ven"
 
-#: lib/libalpm/add.c:735
+#: lib/libalpm/add.c:683
 #, c-format
 msgid "extracting %s"
 msgstr "a %s kifejt�se"
 
-#: lib/libalpm/add.c:751
+#: lib/libalpm/add.c:699
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr "hiba: nem siker�lt kifejteni: %s (%s)"
 
-#: lib/libalpm/add.c:763
+#: lib/libalpm/add.c:711
 #, fuzzy, c-format
 msgid "appending backup entry for %s"
 msgstr "hozz�f�z�s a biztons�gi bejegyz�shez"
 
-#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
+#: lib/libalpm/add.c:743 lib/libalpm/add.c:745
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "hiba %s k�zben: %s"
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "upgrading"
 msgstr "friss�t�s"
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "installing"
 msgstr "telep�t�s"
 
-#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
+#: lib/libalpm/add.c:763
+#, c-format
+msgid "provision '%s' has been removed from package %s (%s => %s)"
+msgstr ""
+
+#: lib/libalpm/add.c:775
+#, fuzzy, c-format
+msgid "updating '%s' due to provision change (%s)"
+msgstr "a '%s' szolg�ltatja a k�vetkez�t: '%s'"
+
+#: lib/libalpm/add.c:779 lib/libalpm/add.c:780
+#, fuzzy, c-format
+msgid "could not update provision '%s' from '%s'"
+msgstr "a '%s' szolg�ltatja a k�vetkez�t: '%s'"
+
+#: lib/libalpm/add.c:793 lib/libalpm/remove.c:337
 msgid "updating database"
 msgstr "az adatb�zis friss�t�se"
 
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:794
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "adatb�zis mez� hozz�ad�sa '%s'"
 
-#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
+#: lib/libalpm/add.c:797 lib/libalpm/add.c:799
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
 
-#: lib/libalpm/add.c:824
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "sikertelen a '%s' bejegyz�s hozz�ad�sa a gyors�t�t�rhoz"
 
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:838 lib/libalpm/remove.c:364 lib/libalpm/sync.c:1038
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "az \"ldconfig -r %s\" futtat�sa"
@@ -321,162 +326,162 @@ msgid "sync: new mtime for %s: %s"
 msgstr "szinkroniz�l�s: �j m�dos�t�si d�tum a %s sz�m�ra: %s\n"
 
 #: lib/libalpm/alpm.c:305
-#, c-format
-msgid "flushing database %s/%s"
+#, fuzzy, c-format
+msgid "flushing database %s%s"
 msgstr "adatb�zis friss�t�se: %s/%s"
 
 #: lib/libalpm/alpm.c:309
-#, c-format
-msgid "could not remove database entry %s/%s"
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s"
 msgstr "sikertelen a %s/%s adatb�zis-bejegyz�s elt�vol�t�sa"
 
-#: lib/libalpm/alpm.c:479
+#: lib/libalpm/alpm.c:478
 #, fuzzy, c-format
 msgid "could not get sha1sum for package %s-%s"
 msgstr "sikertelen az sha1 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra\n"
 
-#: lib/libalpm/alpm.c:485
+#: lib/libalpm/alpm.c:484
 #, fuzzy, c-format
 msgid "sha1sums for package %s-%s match"
 msgstr "a %s-%s csomag ellen�rz� �sszegei megegyeznek"
 
-#: lib/libalpm/alpm.c:488
+#: lib/libalpm/alpm.c:487
 #, fuzzy, c-format
 msgid "sha1sums do not match for package %s-%s"
 msgstr "%s-%s csomag sha1 ellen�rz� �sszegei nem egyeznek meg\n"
 
-#: lib/libalpm/alpm.c:523
+#: lib/libalpm/alpm.c:522
 #, fuzzy, c-format
 msgid "could not get md5sum for package %s-%s"
 msgstr "sikertelen az md5 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra\n"
 
-#: lib/libalpm/alpm.c:529
+#: lib/libalpm/alpm.c:528
 #, fuzzy, c-format
 msgid "md5sums for package %s-%s match"
 msgstr "a %s-%s csomag ellen�rz� �sszegei megegyeznek"
 
-#: lib/libalpm/alpm.c:532
+#: lib/libalpm/alpm.c:531
 #, fuzzy, c-format
 msgid "md5sums do not match for package %s-%s"
 msgstr "%s-%s csomag md5 ellen�rz� �sszegei nem egyeznek meg\n"
 
-#: lib/libalpm/alpm.c:781
+#: lib/libalpm/alpm.c:780
 #, c-format
 msgid "could not remove lock file %s"
 msgstr "nem siker�lt a z�rol� f�jl (%s) elt�vol�t�sa"
 
-#: lib/libalpm/alpm.c:782
+#: lib/libalpm/alpm.c:781
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr "figyelmeztet�s: nem siker�lt a z�rol� f�jl (%s) elt�vol�t�sa"
 
-#: lib/libalpm/alpm.c:917
+#: lib/libalpm/alpm.c:916
 #, fuzzy, c-format
 msgid "config: new section '%s'"
 msgstr "be�ll�t�sok: �j szekci� '%s'\n"
 
-#: lib/libalpm/alpm.c:946
+#: lib/libalpm/alpm.c:945
 #, fuzzy
 msgid "config: nopassiveftp"
 msgstr "be�ll�t�sok: nem fog friss�lni: %s\n"
 
-#: lib/libalpm/alpm.c:949
+#: lib/libalpm/alpm.c:948
 #, fuzzy
 msgid "config: usesyslog"
 msgstr "be�ll�t�sok: syslog haszn�lata\n"
 
-#: lib/libalpm/alpm.c:952
+#: lib/libalpm/alpm.c:951
 #, fuzzy
 msgid "config: chomp"
 msgstr "be�ll�t�sok: ez a csomag mindenk�pp meg lesz tartva: %s\n"
 
-#: lib/libalpm/alpm.c:955
+#: lib/libalpm/alpm.c:954
 #, fuzzy
 msgid "config: usecolor"
 msgstr "be�ll�t�sok: syslog haszn�lata\n"
 
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:963
 #, fuzzy, c-format
 msgid "config: including %s"
 msgstr "be�ll�t�sok: a %s beolvas�sa\n"
 
-#: lib/libalpm/alpm.c:974 lib/libalpm/alpm.c:979
+#: lib/libalpm/alpm.c:973 lib/libalpm/alpm.c:978
 #, fuzzy, c-format
 msgid "config: noupgrade: %s"
 msgstr "be�ll�t�sok: nem fog friss�lni: %s\n"
 
-#: lib/libalpm/alpm.c:987 lib/libalpm/alpm.c:992
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
 #, fuzzy, c-format
 msgid "config: noextract: %s"
 msgstr "nem siker�lt kifejteni: %s\n"
 
-#: lib/libalpm/alpm.c:1000 lib/libalpm/alpm.c:1005
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
 #, fuzzy, c-format
 msgid "config: ignorepkg: %s"
 msgstr "be�ll�t�sok: a %s csomag figyelmen k�v�l hagy�sa\n"
 
-#: lib/libalpm/alpm.c:1013 lib/libalpm/alpm.c:1018
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
 #, fuzzy, c-format
 msgid "config: holdpkg: %s"
 msgstr "be�ll�t�sok: ez a csomag mindenk�pp meg lesz tartva: %s\n"
 
-#: lib/libalpm/alpm.c:1025
+#: lib/libalpm/alpm.c:1024
 #, fuzzy, c-format
 msgid "config: dbpath: %s"
 msgstr "be�ll�t�sok: adatb�zis �tvonala: %s\n"
 
-#: lib/libalpm/alpm.c:1032
+#: lib/libalpm/alpm.c:1031
 #, fuzzy, c-format
 msgid "config: cachedir: %s"
 msgstr "be�ll�t�sok: gyors�t�t�r k�nyvt�ra: %s\n"
 
-#: lib/libalpm/alpm.c:1035
+#: lib/libalpm/alpm.c:1034
 #, fuzzy, c-format
 msgid "config: logfile: %s"
 msgstr "be�ll�t�sok: napl�f�jl: %s\n"
 
-#: lib/libalpm/alpm.c:1038
+#: lib/libalpm/alpm.c:1037
 #, fuzzy, c-format
 msgid "config: xfercommand: %s"
 msgstr "be�ll�t�sok: gyors�t�t�r k�nyvt�ra: %s\n"
 
-#: lib/libalpm/alpm.c:1043
+#: lib/libalpm/alpm.c:1042
 #, fuzzy, c-format
 msgid "config: upgradedelay: %d"
 msgstr "be�ll�t�sok: friss�t�s k�sleltet�se: %i\n"
 
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
+#: lib/libalpm/alpm.c:1080 lib/libalpm/sync.c:105
 msgid "checking for package replacements"
 msgstr "csomagcser�k ellen�rz�se"
 
-#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:121
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr "csere vizsg�lata: '%s' -> '%s'"
 
-#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr "%s-%s: friss�t�s figyelmen k�v�l hagy�sa (a %s-%s fogja lecser�lni)"
 
-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1124 lib/libalpm/sync.c:158
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr "a %s-%s kiv�lasztva friss�t�sre (a %s-%s fogja lecser�lni)"
 
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
+#: lib/libalpm/alpm.c:1146 lib/libalpm/sync.c:192
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr "a '%s' nem tal�lhat� a t�voli adatb�zisban -- kihagy�s"
 
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1160 lib/libalpm/sync.c:206 lib/libalpm/sync.c:493
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr "a '%s' m�r kijel�lve elt�vol�t�sra -- kihagy�s"
 
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
-#, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
+#: lib/libalpm/alpm.c:1166
+#, fuzzy, c-format
+msgid "%s elected for upgrade (%s => %s)"
 msgstr "%s-%s kiv�lasztva friss�t�sre (%s => %s)"
 
 #: lib/libalpm/be_files.c:58
@@ -499,129 +504,139 @@ msgstr "nem tal�lhat� vagy nem olvashat� a csomag"
 msgid "invalid name for dabatase entry '%s'"
 msgstr "�rv�nytelen n�v a '%s' adatb�zis-bejegyz�s sz�m�ra"
 
-#: lib/libalpm/be_files.c:213
+#: lib/libalpm/be_files.c:218
 msgid "invalid package entry provided to _alpm_db_read, skipping"
 msgstr ""
 
-#: lib/libalpm/be_files.c:218
+#: lib/libalpm/be_files.c:223
 #, c-format
 msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""
 
-#: lib/libalpm/be_files.c:226
+#: lib/libalpm/be_files.c:231
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""
 
-#: lib/libalpm/be_files.c:234
+#: lib/libalpm/be_files.c:239
 #, fuzzy, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr "nem tal�lhat� a %s az adatb�zisban"
 
-#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
-#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
-#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
-#: lib/libalpm/package.c:197
+#: lib/libalpm/be_files.c:247 lib/libalpm/be_files.c:393
+#: lib/libalpm/be_files.c:416 lib/libalpm/be_files.c:507
+#: lib/libalpm/be_files.c:596 lib/libalpm/be_files.c:623
+#: lib/libalpm/package.c:204
 #, fuzzy, c-format
 msgid "could not open file %s: %s"
 msgstr "nem siker�lt megnyitni a %s f�jlt"
 
-#: lib/libalpm/be_files.c:500
+#: lib/libalpm/be_files.c:504
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:589
+#: lib/libalpm/be_files.c:593
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:616
+#: lib/libalpm/be_files.c:620
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
 
-#: lib/libalpm/cache.c:59
-#, c-format
-msgid "loading package cache (infolevel=%#x) for repository '%s'"
-msgstr "csomagok gyors�t�t�r�nak bet�lt�se (inf�szint=%#x) a '%s' rep� sz�m�ra"
+#: lib/libalpm/cache.c:57
+#, fuzzy, c-format
+msgid "loading package cache for repository '%s'"
+msgstr "csomagok gyors�t�t�r�nak felszabad�t�sa a '%s' rep� sz�m�ra"
 
-#: lib/libalpm/cache.c:64
+#: lib/libalpm/cache.c:62
 #, fuzzy, c-format
 msgid "adding '%s' to package cache for db '%s'"
 msgstr "csomagok gyors�t�t�r�nak felszabad�t�sa a '%s' rep� sz�m�ra"
 
-#: lib/libalpm/cache.c:84
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr "csomagok gyors�t�t�r�nak felszabad�t�sa a '%s' rep� sz�m�ra"
 
-#: lib/libalpm/cache.c:109
+#: lib/libalpm/cache.c:107
 #, c-format
 msgid "error: pkgcache is NULL for db '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:136
-#, fuzzy, c-format
-msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
-msgstr "csomagok gyors�t�t�r�nak bet�lt�se (inf�szint=%#x) a '%s' rep� sz�m�ra"
-
-#: lib/libalpm/cache.c:156
+#: lib/libalpm/cache.c:127
 #, c-format
 msgid "adding entry '%s' in '%s' cache"
 msgstr "a '%s' bejegyz�s hozz�ad�sa a '%s' gyors�t�t�rhoz"
 
-#: lib/libalpm/cache.c:182
+#: lib/libalpm/cache.c:147
 #, c-format
 msgid "removing entry '%s' from '%s' cache"
 msgstr "a '%s' bejegyz�s elt�vol�t�sa a '%s' gyors�t�t�rb�l"
 
-#: lib/libalpm/cache.c:200
+#: lib/libalpm/cache.c:154
+#, fuzzy, c-format
+msgid "cannot remove entry '%s' from '%s' cache: not found"
+msgstr "a '%s' bejegyz�s elt�vol�t�sa a '%s' gyors�t�t�rb�l"
+
+#: lib/libalpm/cache.c:176
 #, fuzzy, c-format
 msgid "error: failed to get '%s' from NULL pkgcache"
 msgstr "nem siker�lt elt�vol�tani a '%s' bejegyz�st a gyors�t�t�rb�l"
 
-#: lib/libalpm/cache.c:223
+#: lib/libalpm/cache.c:199
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr "csoportgyors�t�t�r bet�lt�se a '%s' rep� sz�m�ra"
 
-#: lib/libalpm/conflict.c:78
-#, c-format
-msgid "checkconflicts: targ '%s' vs db"
-msgstr "checkconflicts: c�l '%s' vs db"
+#: lib/libalpm/conflict.c:68
+#, fuzzy, c-format
+msgid "   found conflict '%s' : package '%s'"
+msgstr "csere vizsg�lata: '%s' -> '%s'"
 
-#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
+#: lib/libalpm/conflict.c:77
 #, c-format
-msgid "targs vs db: found %s as a conflict for %s"
-msgstr "targs vs db: a %s �tk�zik a k�vetkez�vel: %s"
+msgid "   found conflict '%s' : package '%s' provides '%s'"
+msgstr ""
 
-#: lib/libalpm/conflict.c:114
+#: lib/libalpm/conflict.c:100 lib/libalpm/conflict.c:142
 #, c-format
-msgid "checkconflicts: targ '%s' vs targs"
-msgstr "checkconflicts: c�l '%s' vs c�lok"
+msgid "package '%s' conflicts with itself - packaging error"
+msgstr ""
 
-#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
-#, c-format
-msgid "targs vs targs: found %s as a conflict for %s"
-msgstr "targs vs targs: a %s �tk�zik a k�vetkez�vel: %s"
+#: lib/libalpm/conflict.c:106
+#, fuzzy, c-format
+msgid "checkconflicts: target '%s' vs db"
+msgstr "checkconflicts: c�l '%s' vs db"
 
-#: lib/libalpm/conflict.c:150
-#, c-format
-msgid "checkconflicts: db vs targ '%s'"
+#: lib/libalpm/conflict.c:148
+#, fuzzy, c-format
+msgid "checkconflicts: target '%s' vs all targets"
+msgstr "checkconflicts: c�l '%s' vs c�lok"
+
+#: lib/libalpm/conflict.c:180
+#, fuzzy, c-format
+msgid "checkconflicts: db vs target '%s'"
 msgstr "checkconflicts: db vs c�l '%s'"
 
-#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
+#: lib/libalpm/conflict.c:200
+#, fuzzy, c-format
+msgid "target '%s' is also in target list, using NEW conflicts"
+msgstr "az �jabb verzi� (%s-%s) m�r el�rhet� a c�l list�ban -- kihagy�s"
+
+#: lib/libalpm/conflict.c:256
 #, c-format
-msgid "db vs targs: found %s as a conflict for %s"
-msgstr "db vs targs: a %s �tk�zik a k�vetkez�vel: %s"
+msgid "\tCONFLICTS:: %s conflicts with %s"
+msgstr ""
 
-#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
-#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
-#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
-#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
-#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:348 lib/libalpm/deps.c:57 lib/libalpm/deps.c:435
+#: lib/libalpm/deps.c:631 lib/libalpm/deps.c:671 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:80 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:598 lib/libalpm/sync.c:614 lib/libalpm/sync.c:711
+#: lib/libalpm/trans.c:52 lib/libalpm/util.c:609 lib/libalpm/util.c:616
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr "malloc probl�ma: nem siker�lt allok�lni %d byte-ot"
@@ -631,26 +646,26 @@ msgstr "malloc probl�ma: nem siker�lt allok�lni %d byte-ot"
 msgid "malloc failed: could not allocate %d bytes"
 msgstr "malloc probl�ma: nem siker�lt allok�lni %d byte-ot"
 
-#: lib/libalpm/db.c:163
+#: lib/libalpm/db.c:165
 msgid "attempt to re-register the 'local' DB"
 msgstr ""
 
-#: lib/libalpm/db.c:171
+#: lib/libalpm/db.c:173
 #, c-format
 msgid "attempt to re-register the '%s' database, using existing"
 msgstr ""
 
-#: lib/libalpm/db.c:177
+#: lib/libalpm/db.c:179
 #, c-format
 msgid "registering database '%s'"
 msgstr "adatb�zis regisztr�l�sa: '%s'"
 
-#: lib/libalpm/db.c:182
+#: lib/libalpm/db.c:184
 #, c-format
 msgid "database directory '%s' does not exist -- try creating it"
 msgstr "'%s' adatb�zis-k�nyvt�r nem l�tezik -- k�s�rlet a l�trehoz�sra"
 
-#: lib/libalpm/db.c:193
+#: lib/libalpm/db.c:195
 #, c-format
 msgid "opening database '%s'"
 msgstr "adatb�zis megnyit�sa: '%s'"
@@ -663,60 +678,70 @@ msgstr "a f�gg�s�gek rendez�se elkezd�d�tt"
 msgid "possible dependency cycle detected"
 msgstr "lehets�ges k�rk�r�s f�gg�s�gi probl�ma �szlelve"
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:180
 msgid "sorting dependencies finished"
 msgstr "a f�gg�s�gek rendez�se befejez�d�tt"
 
-#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
+#: lib/libalpm/deps.c:222 lib/libalpm/deps.c:307
 msgid "null package found in package list"
 msgstr ""
 
-#: lib/libalpm/deps.c:223
+#: lib/libalpm/deps.c:227
 #, fuzzy, c-format
 msgid "cannot find package installed '%s'"
 msgstr "nem siker�lt megnyitni a csomagf�jlt"
 
-#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
+#: lib/libalpm/deps.c:258
 #, c-format
-msgid "checkdeps: found %s as required by %s"
-msgstr "checkdeps: a %s ig�nyelt a %s �ltal"
+msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'"
+msgstr ""
 
-#: lib/libalpm/deps.c:283
+#: lib/libalpm/deps.c:277
 #, fuzzy, c-format
-msgid "no dependencies for target '%s'"
-msgstr "nem siker�lt feloldani a f�gg�s�geket a \"%s\" sz�m�ra"
+msgid "checkdeps: dependency '%s' satisfied by installed package '%s'"
+msgstr "csere vizsg�lata: '%s' -> '%s'"
+
+#: lib/libalpm/deps.c:286
+#, fuzzy, c-format
+msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'"
+msgstr "checkdeps: a %s egy f�gg�s�g a %s sz�m�ra"
 
-#: lib/libalpm/deps.c:329
+#: lib/libalpm/deps.c:356
 #, fuzzy, c-format
 msgid "missing dependency '%s' for package '%s'"
 msgstr "csere vizsg�lata: '%s' -> '%s'"
 
-#: lib/libalpm/deps.c:452
+#: lib/libalpm/deps.c:406
+#, c-format
+msgid "checkdeps: found %s as required by %s"
+msgstr "checkdeps: a %s ig�nyelt a %s �ltal"
+
+#: lib/libalpm/deps.c:482
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr "a %s kihagy�sa -- explicit m�don lett telep�tve"
 
-#: lib/libalpm/deps.c:499
+#: lib/libalpm/deps.c:529
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr "nem tal�lhat� a \"%s\" csomag �s nem is szolg�ltatja semmi!"
 
-#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
+#: lib/libalpm/deps.c:537 lib/libalpm/deps.c:548
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr "a '%s' hozz�ad�sa a c�lcsomagokhoz"
 
-#: lib/libalpm/deps.c:551
+#: lib/libalpm/deps.c:580
 #, fuzzy
 msgid "started resolving dependencies"
 msgstr "a f�gg�s�gek rendez�se elkezd�d�tt"
 
-#: lib/libalpm/deps.c:569
+#: lib/libalpm/deps.c:598
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr "a %s szolg�ltatja a %s f�gg�s�get -- kihagy�s"
 
-#: lib/libalpm/deps.c:594
+#: lib/libalpm/deps.c:627
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
@@ -724,27 +749,27 @@ msgstr ""
 "nem siker�lt a f�gg�s�gek felold�sa a \"%s\" sz�m�ra (nem tal�lhat� a \"%s\" "
 "a csomagok k�z�tt)"
 
-#: lib/libalpm/deps.c:611
+#: lib/libalpm/deps.c:644
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr "a %s f�gg�s�g m�r a c�lcsomagok k�z�tt szerepel -- kihagy�s"
 
-#: lib/libalpm/deps.c:631
+#: lib/libalpm/deps.c:664
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr "a %s f�gg�s�g behoz�sa (a %s ig�nyli)"
 
-#: lib/libalpm/deps.c:635
+#: lib/libalpm/deps.c:668
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr "nem siker�lt feloldani a f�gg�s�geket a \"%s\" sz�m�ra"
 
-#: lib/libalpm/deps.c:651
+#: lib/libalpm/deps.c:684
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr "k�rk�r�s f�gg�s�g �szlelve: %s"
 
-#: lib/libalpm/deps.c:655
+#: lib/libalpm/deps.c:688
 #, fuzzy
 msgid "finished resolving dependencies"
 msgstr "a f�gg�s�gek rendez�se elkezd�d�tt"
@@ -842,7 +867,7 @@ msgstr "a tranzakci� f�lbeszak�tva"
 msgid "operation not compatible with the transaction type"
 msgstr "a m�velet nem egyeztethet� �ssze a jelenlegi tranzakci�t�pussal"
 
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:977
 #, fuzzy
 msgid "could not commit transaction"
 msgstr "nem siker�lt l�trehozni az adatb�zist"
@@ -988,70 +1013,70 @@ msgstr "nem siker�lt megnyitni a k�vetkez�t: %s\n"
 msgid "%s: forcing upgrade to version %s"
 msgstr "hi�nyz� csomagverzi� itt: %s"
 
-#: lib/libalpm/package.c:152
+#: lib/libalpm/package.c:153
 #, fuzzy, c-format
 msgid "%s: local (%s) is newer than %s (%s)"
 msgstr "%s-%s: a helyi verzi� �jabb"
 
-#: lib/libalpm/package.c:159
+#: lib/libalpm/package.c:161
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr "%s-%s: a csomagfriss�t�s figyelmen k�v�l hagy�sa (%s)"
 
-#: lib/libalpm/package.c:163
+#: lib/libalpm/package.c:167
 #, fuzzy, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr "%s-%s: a csomag friss�t�s�nek k�sleltet�se (%s)\n"
 
-#: lib/libalpm/package.c:168
-#, c-format
-msgid "compare versions for %s: %s vs %s, result=%d"
-msgstr ""
-
-#: lib/libalpm/package.c:211 lib/libalpm/package.c:270
+#: lib/libalpm/package.c:218 lib/libalpm/package.c:277
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr "%s: szintaktikai hiba a le�r�f�jl %d. sor�ban"
 
-#: lib/libalpm/package.c:344
+#: lib/libalpm/package.c:351
 msgid "could not parse the package description file"
 msgstr "nem siker�lt �rtelmezni a csomagle�r� f�jlt"
 
-#: lib/libalpm/package.c:348
+#: lib/libalpm/package.c:355
 #, c-format
 msgid "missing package name in %s"
 msgstr "hi�nyz� csomagn�v itt: %s"
 
-#: lib/libalpm/package.c:352
+#: lib/libalpm/package.c:359
 #, c-format
 msgid "missing package version in %s"
 msgstr "hi�nyz� csomagverzi� itt: %s"
 
-#: lib/libalpm/package.c:387
+#: lib/libalpm/package.c:394
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr "nem siker�lt elt�vol�tani a %s ideiglenes f�jlt"
 
-#: lib/libalpm/package.c:400 lib/libalpm/package.c:407
+#: lib/libalpm/package.c:407 lib/libalpm/package.c:414
 #, fuzzy, c-format
 msgid "error while reading package: %s"
 msgstr "csomag friss�t�se: %s-%s"
 
-#: lib/libalpm/package.c:413
+#: lib/libalpm/package.c:420
 #, fuzzy
 msgid "missing package metadata"
 msgstr "hi�nyz� csomagn�v itt: %s"
 
-#: lib/libalpm/package.c:420
+#: lib/libalpm/package.c:427
 #, fuzzy, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr "hi�nyz� csomaginform�ci�-f�jl ebben: %s"
 
-#: lib/libalpm/package.c:547
+#: lib/libalpm/package.c:560
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr "a '%s' hozz�ad�sa \"f�gg t�le\" mez�k�nt a '%s' sz�m�ra"
 
+#: lib/libalpm/package.c:571
+#, fuzzy, c-format
+msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
+msgstr "a '%s' hozz�ad�sa \"f�gg t�le\" mez�k�nt a '%s' sz�m�ra"
+
 #: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
@@ -1126,253 +1151,269 @@ msgstr "a %s t�rl�se"
 msgid "cannot remove file %s: %s"
 msgstr "nem siker�lt elt�vol�tani a %s f�jlt"
 
-#: lib/libalpm/remove.c:286
+#: lib/libalpm/remove.c:291
 #, c-format
 msgid "removing package %s-%s"
 msgstr "a %s-%s csomag elt�vol�t�sa"
 
-#: lib/libalpm/remove.c:298
+#: lib/libalpm/remove.c:308
 #, fuzzy, c-format
 msgid "not removing package '%s', can't remove all files"
 msgstr "a %s-%s csomag elt�vol�t�sa"
 
-#: lib/libalpm/remove.c:304
-msgid "removing files"
+#: lib/libalpm/remove.c:315
+#, fuzzy, c-format
+msgid "removing %d files"
 msgstr "f�jlok t�rl�se"
 
-#: lib/libalpm/remove.c:322
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "a '%s' adatb�zis-bejegyz�s elt�vol�t�sa"
 
-#: lib/libalpm/remove.c:324
+#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "nem siker�lt elt�vol�tani a %s-%s adatb�zis-bejegyz�st"
 
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:345
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "nem siker�lt elt�vol�tani a '%s' bejegyz�st a gyors�t�t�rb�l"
 
-#: lib/libalpm/sync.c:199
+#: lib/libalpm/sync.c:181
 msgid "checking for package upgrades"
 msgstr "csomagfriss�t�sek vizsg�lata"
 
-#: lib/libalpm/sync.c:232
-#, fuzzy, c-format
-msgid "%s-%s: ignoring package upgrade (%s => %s)"
-msgstr "%s-%s: a csomagfriss�t�s figyelmen k�v�l hagy�sa (%s)"
+#: lib/libalpm/sync.c:213
+#, c-format
+msgid "%s-%s elected for upgrade (%s => %s)"
+msgstr "%s-%s kiv�lasztva friss�t�sre (%s => %s)"
 
-#: lib/libalpm/sync.c:281
+#: lib/libalpm/sync.c:260
 #, fuzzy, c-format
 msgid "searching for target in repo '%s'"
 msgstr "c�l bet�lt�se '%s'"
 
-#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
+#: lib/libalpm/sync.c:268 lib/libalpm/sync.c:291
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr "a '%s' c�l nem tal�lhat� -- csomagok keres�se amik szolg�ltatj�k"
 
-#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
+#: lib/libalpm/sync.c:273 lib/libalpm/sync.c:296
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr "a '%s' szolg�ltatja a k�vetkez�t: '%s'"
 
-#: lib/libalpm/sync.c:302
+#: lib/libalpm/sync.c:280
 #, fuzzy, c-format
 msgid "repository '%s' not found"
 msgstr "a csoport nem tal�lhat�"
 
-#: lib/libalpm/sync.c:336
+#: lib/libalpm/sync.c:321
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr "%s-%s naprak�sz -- kihagy�s"
 
-#: lib/libalpm/sync.c:356
+#: lib/libalpm/sync.c:344
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr "a '%s' c�l hozz�ad�sa a tranzakci�hoz"
 
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:392
 #, fuzzy
 msgid "resolving target's dependencies"
 msgstr "a c�lok f�gg�s�geinek felold�sa"
 
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:412
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr "a %s-%s csomag hozz�ad�sa a tranzakci� c�ljaihoz"
 
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:447
 msgid "looking for unresolvable dependencies"
 msgstr "feloldhatatlan f�gg�s�gek keres�se"
 
-#: lib/libalpm/sync.c:487
-#, c-format
-msgid "package '%s' is conflicting with '%s'"
-msgstr ""
+#: lib/libalpm/sync.c:478
+#, fuzzy, c-format
+msgid "package '%s' conflicts with '%s'"
+msgstr "a %s-%s csomag elt�vol�t�sa"
 
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:500
 #, fuzzy, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr "a '%s' nem tal�lhat� a t�voli adatb�zisban -- kihagy�s"
 
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:511
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:534 lib/libalpm/sync.c:539
 #, fuzzy, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr "az �jabb verzi� (%s-%s) m�r el�rhet� a c�l list�ban -- kihagy�s"
 
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:551 lib/libalpm/sync.c:588
 #, fuzzy, c-format
 msgid "removing '%s' from target list"
 msgstr "a '%s' bejegyz�s elt�vol�t�sa a '%s' gyors�t�t�rb�l"
 
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:560
 #, fuzzy, c-format
 msgid "resolving package '%s' conflict"
 msgstr "a %s-%s csomag elt�vol�t�sa"
 
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:583
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:594 lib/libalpm/sync.c:610
 msgid "unresolvable package conflicts detected"
 msgstr ""
 
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:662
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:676
 msgid "something has gone horribly wrong"
 msgstr ""
 
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:696
 #, fuzzy, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr "a '%s' szolg�ltatja a k�vetkez�t: '%s'"
 
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:792
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:803
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:804
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:809
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:810
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:817
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:846 lib/libalpm/sync.c:858
 #, fuzzy, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr "sikertelen az sha1 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra\n"
 
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:877
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:879
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:900
 #, fuzzy
 msgid "could not create removal transaction"
 msgstr "nem siker�lt l�trehozni az adatb�zist"
 
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:906
 msgid "could not initialize the removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:926
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:928
 #, fuzzy
 msgid "could not prepare removal transaction"
 msgstr "nem siker�lt l�trehozni az adatb�zist"
 
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:934
 msgid "could not commit removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:941
 #, fuzzy
 msgid "installing packages"
 msgstr "telep�t�s"
 
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:944
 #, fuzzy
 msgid "could not create transaction"
 msgstr "nem siker�lt l�trehozni az adatb�zist"
 
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:949
 msgid "could not initialize transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:972
 #, fuzzy
 msgid "could not prepare transaction"
 msgstr "�rtelmezhetetlen token %s"
 
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:984
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1013
 #, fuzzy, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr "sikertelen a %s-%s 'f�gg t�le' adatb�zis-bejegyz�s�nek friss�t�se"
 
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1022
 #, fuzzy, c-format
 msgid "could not update new database entry %s-%s"
 msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
 
-#: lib/libalpm/trans.c:262
-msgid "updating dependency packages 'requiredby' fields"
+#: lib/libalpm/sync.c:1062
+#, fuzzy, c-format
+msgid "found package '%s-%s' in sync"
+msgstr "a %s-%s csomag elt�vol�t�sa"
+
+#: lib/libalpm/sync.c:1068
+#, fuzzy, c-format
+msgid "package '%s' not found in sync"
+msgstr "a '%s' nem tal�lhat� a t�voli adatb�zisban -- kihagy�s"
+
+#: lib/libalpm/trans.c:264
+#, fuzzy, c-format
+msgid "updating dependency packages 'requiredby' fields for %s-%s"
 msgstr "a f�gg� csomagok 'f�gg t�le' mez�j�nek friss�t�se"
 
-#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#: lib/libalpm/trans.c:267
+msgid "package has no dependencies, no other packages to update"
+msgstr ""
+
+#: lib/libalpm/trans.c:304 lib/libalpm/trans.c:330
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr "a '%s' csomag 'f�gg t�le' mez�j�nek friss�t�se"
 
-#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#: lib/libalpm/trans.c:315 lib/libalpm/trans.c:341
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr "sikertelen a %s-%s 'f�gg t�le' adatb�zis-bejegyz�s�nek friss�t�se"
 
-#: lib/libalpm/trans.c:315
+#: lib/libalpm/trans.c:322
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "nem tal�lhat� a '%s' f�gg�s�g"
@@ -1392,62 +1433,62 @@ msgstr "nem siker�lt kifejteni: %s (%s)"
 msgid "logaction called: %s"
 msgstr "eredeti:  %s"
 
-#: lib/libalpm/util.c:441
+#: lib/libalpm/util.c:443
 #, fuzzy
 msgid "could not create temp directory"
 msgstr "a jelenlegi munkak�nyvt�r nem kaphat� meg"
 
-#: lib/libalpm/util.c:468
+#: lib/libalpm/util.c:470
 #, fuzzy, c-format
 msgid "could not change directory to %s (%s)"
 msgstr "nem siker�lt m�solni: %s-t ide: %s (%s)"
 
-#: lib/libalpm/util.c:471
+#: lib/libalpm/util.c:473
 #, c-format
 msgid "executing %s script..."
 msgstr ""
 
-#: lib/libalpm/util.c:484
+#: lib/libalpm/util.c:486
 #, fuzzy, c-format
 msgid "could not fork a new process (%s)"
 msgstr "nem siker�lt �tnevezni: %s (%s)"
 
-#: lib/libalpm/util.c:491
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "chrooting in %s"
 msgstr ""
 
-#: lib/libalpm/util.c:493
+#: lib/libalpm/util.c:495
 #, fuzzy, c-format
 msgid "could not change the root directory (%s)"
 msgstr "a jelenlegi munkak�nyvt�r nem kaphat� meg"
 
-#: lib/libalpm/util.c:497
+#: lib/libalpm/util.c:499
 #, fuzzy, c-format
 msgid "could not change directory to / (%s)"
 msgstr "nem siker�lt m�solni: %s-t ide: %s (%s)"
 
-#: lib/libalpm/util.c:501
+#: lib/libalpm/util.c:503
 #, fuzzy, c-format
 msgid "executing \"%s\""
 msgstr "a %s kifejt�se"
 
-#: lib/libalpm/util.c:504
+#: lib/libalpm/util.c:506
 #, fuzzy, c-format
 msgid "call to popen failed (%s)"
 msgstr "nem siker�lt megnyitni a %s f�jlt"
 
-#: lib/libalpm/util.c:536
+#: lib/libalpm/util.c:538
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, fuzzy, c-format
 msgid "could not remove tmpdir %s"
 msgstr "nem siker�lt elt�vol�tani a %s ideiglenes f�jlt"
 
-#: lib/libalpm/util.c:602
+#: lib/libalpm/util.c:604
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
@@ -1457,20 +1498,49 @@ msgstr ""
 msgid "depcmp: %s-%s %s %s-%s => %s"
 msgstr ""
 
-#: lib/libalpm/versioncmp.c:281
+#: lib/libalpm/versioncmp.c:282
 #, c-format
 msgid "depcmp: %s-%s %s %s => %s"
 msgstr ""
 
+#~ msgid "could not parse token %s"
+#~ msgstr "�rtelmezhetetlen token %s"
+
+#~ msgid "notice: %s is in NoExtract -- skipping extraction"
+#~ msgstr "figyelmeztet�s: %s a NoExtractben van -- kifejt�s kihagy�sa"
+
+#~ msgid "loading package cache (infolevel=%#x) for repository '%s'"
+#~ msgstr ""
+#~ "csomagok gyors�t�t�r�nak bet�lt�se (inf�szint=%#x) a '%s' rep� sz�m�ra"
+
+#, fuzzy
+#~ msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+#~ msgstr ""
+#~ "csomagok gyors�t�t�r�nak bet�lt�se (inf�szint=%#x) a '%s' rep� sz�m�ra"
+
+#~ msgid "targs vs db: found %s as a conflict for %s"
+#~ msgstr "targs vs db: a %s �tk�zik a k�vetkez�vel: %s"
+
+#~ msgid "targs vs targs: found %s as a conflict for %s"
+#~ msgstr "targs vs targs: a %s �tk�zik a k�vetkez�vel: %s"
+
+#~ msgid "db vs targs: found %s as a conflict for %s"
+#~ msgstr "db vs targs: a %s �tk�zik a k�vetkez�vel: %s"
+
+#, fuzzy
+#~ msgid "no dependencies for target '%s'"
+#~ msgstr "nem siker�lt feloldani a f�gg�s�geket a \"%s\" sz�m�ra"
+
+#, fuzzy
+#~ msgid "%s-%s: ignoring package upgrade (%s => %s)"
+#~ msgstr "%s-%s: a csomagfriss�t�s figyelmen k�v�l hagy�sa (%s)"
+
 #~ msgid "adding new package %s-%s"
 #~ msgstr "�j csomag hozz�ad�sa %s-%s"
 
 #~ msgid "error updating database for %s-%s!"
 #~ msgstr "hiba a %s-%s adatb�zis-friss�t�se sor�n"
 
-#~ msgid "checkdeps: found %s as a dependency for %s"
-#~ msgstr "checkdeps: a %s egy f�gg�s�g a %s sz�m�ra"
-
 #~ msgid "dep is NULL!"
 #~ msgstr "a dep NULL!"
 
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index f2c55872..dc832d28 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-03 16:40+0100\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
 "PO-Revision-Date: 2007-03-03 17:30+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
@@ -82,8 +82,8 @@ msgid "removing old package first (%s-%s)"
 msgstr "rimozione del vecchio pacchetto (%s-%s) in corso"
 
 #: lib/libalpm/add.c:405
-#, c-format
-msgid "adding %s to the NoUpgrade array temporarilly"
+#, fuzzy, c-format
+msgid "adding %s to the NoUpgrade array temporarily"
 msgstr "aggiunta in corso di %s nell'array temporaneo NoUpgrade"
 
 #: lib/libalpm/add.c:423
@@ -257,7 +257,7 @@ msgstr "aggiornamento in corso di '%s' dovuto ad un cambiamento (%s)"
 msgid "could not update provision '%s' from '%s'"
 msgstr "impossibile aggiornare '%s' da '%s'"
 
-#: lib/libalpm/add.c:793 lib/libalpm/remove.c:330
+#: lib/libalpm/add.c:793 lib/libalpm/remove.c:337
 msgid "updating database"
 msgstr "aggiornamento del database in corso"
 
@@ -276,7 +276,7 @@ msgstr "impossibile aggiornare la voce %s-%s nel database"
 msgid "could not add entry '%s' in cache"
 msgstr "impossible includere la voce '%s' nella cache"
 
-#: lib/libalpm/add.c:838 lib/libalpm/remove.c:351 lib/libalpm/sync.c:1038
+#: lib/libalpm/add.c:838 lib/libalpm/remove.c:364 lib/libalpm/sync.c:1038
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "esecuzione in corso di \"ldconfig -r %s\""
@@ -605,7 +605,8 @@ msgstr "   trovato il conflitto '%s' : il pacchetto '%s' fornisce '%s'"
 #: lib/libalpm/conflict.c:100 lib/libalpm/conflict.c:142
 #, c-format
 msgid "package '%s' conflicts with itself - packaging error"
-msgstr "il pacchetto '%s' va in conflitto con se stesso - errore di pacchettizzazione"
+msgstr ""
+"il pacchetto '%s' va in conflitto con se stesso - errore di pacchettizzazione"
 
 #: lib/libalpm/conflict.c:106
 #, c-format
@@ -627,12 +628,12 @@ msgstr "checkconflicts: db vs target '%s'"
 msgid "target '%s' is also in target list, using NEW conflicts"
 msgstr "il pacchetto '%s' è già presente nella lista, usando nuovi conflitti"
 
-#: lib/libalpm/conflict.c:254
+#: lib/libalpm/conflict.c:256
 #, c-format
 msgid "\tCONFLICTS:: %s conflicts with %s"
 msgstr "\tCONFLITTI:: %s va in conflitto con %s"
 
-#: lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57 lib/libalpm/deps.c:435
+#: lib/libalpm/conflict.c:348 lib/libalpm/deps.c:57 lib/libalpm/deps.c:435
 #: lib/libalpm/deps.c:631 lib/libalpm/deps.c:671 lib/libalpm/group.c:43
 #: lib/libalpm/handle.c:49 lib/libalpm/package.c:80 lib/libalpm/sync.c:65
 #: lib/libalpm/sync.c:598 lib/libalpm/sync.c:614 lib/libalpm/sync.c:711
@@ -757,7 +758,8 @@ msgstr ""
 #: lib/libalpm/deps.c:644
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
-msgstr "la dipendenza %s è già presente nella lista dei pacchetti -- verrà ignorata"
+msgstr ""
+"la dipendenza %s è già presente nella lista dei pacchetti -- verrà ignorata"
 
 #: lib/libalpm/deps.c:664
 #, c-format
@@ -1144,32 +1146,32 @@ msgstr "scollegamento in corso da %s"
 msgid "cannot remove file %s: %s"
 msgstr "impossibile rimuovere il file %s: %s"
 
-#: lib/libalpm/remove.c:287
+#: lib/libalpm/remove.c:291
 #, c-format
 msgid "removing package %s-%s"
 msgstr "rimozione in corso del pacchetto %s-%s"
 
-#: lib/libalpm/remove.c:304
+#: lib/libalpm/remove.c:308
 #, c-format
 msgid "not removing package '%s', can't remove all files"
 msgstr "impossibile rimuovere il pacchetto '%s' e tutti i file"
 
-#: lib/libalpm/remove.c:311
+#: lib/libalpm/remove.c:315
 #, c-format
 msgid "removing %d files"
 msgstr "rimozione in corso di %d file"
 
-#: lib/libalpm/remove.c:331
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "rimozione in corso della voce '%s' dal database"
 
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "impossibile rimuovere la voce %s-%s dal database"
 
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:345
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "impossibile rimuovere '%s' dalla cache"
@@ -1384,8 +1386,8 @@ msgid "found package '%s-%s' in sync"
 msgstr "trovato il pacchetto '%s-%s' nel database"
 
 #: lib/libalpm/sync.c:1068
-#, c-format
-msgid "package '%s not found in sync"
+#, fuzzy, c-format
+msgid "package '%s' not found in sync"
 msgstr "impossibile trovare il pacchetto '%s'"
 
 #: lib/libalpm/trans.c:264
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 94703fd2..81b5ee5e 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: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\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"
@@ -16,259 +16,264 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/libalpm/add.c:95
-#, c-format
-msgid "could not parse token %s"
-msgstr ""
-
-#: lib/libalpm/add.c:129
+#: lib/libalpm/add.c:75
 #, c-format
 msgid "loading target '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:174
+#: lib/libalpm/add.c:120
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr ""
 
-#: lib/libalpm/add.c:183
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr ""
 
-#: lib/libalpm/add.c:190
+#: lib/libalpm/add.c:136
 #, c-format
 msgid "reading '%s' metadata"
 msgstr ""
 
-#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:189 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr ""
 
-#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:201 lib/libalpm/sync.c:467
 msgid "looking for conflicts"
 msgstr ""
 
-#: lib/libalpm/add.c:260
+#: lib/libalpm/add.c:206
 msgid "replacing packages with -A and -U is not supported yet"
 msgstr ""
 
-#: lib/libalpm/add.c:261
+#: lib/libalpm/add.c:207
 #, c-format
 msgid "please remove '%s' first, using -Rd"
 msgstr ""
 
-#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:248 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr ""
 
-#: lib/libalpm/add.c:314
+#: lib/libalpm/add.c:260
 msgid "cleaning up"
 msgstr ""
 
-#: lib/libalpm/add.c:329
+#: lib/libalpm/add.c:275
 msgid "looking for file conflicts"
 msgstr ""
 
-#: lib/libalpm/add.c:394
+#: lib/libalpm/add.c:340
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:417
+#: lib/libalpm/add.c:364
 #, c-format
 msgid "adding package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:430
+#: lib/libalpm/add.c:377
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:457
+#: lib/libalpm/add.c:405
 #, c-format
-msgid "adding %s to the NoUpgrade array temporarilly"
+msgid "adding %s to the NoUpgrade array temporarily"
 msgstr ""
 
-#: lib/libalpm/add.c:475
+#: lib/libalpm/add.c:423
 msgid "extracting files"
 msgstr ""
 
-#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:438 lib/libalpm/util.c:463
 msgid "could not get current working directory"
 msgstr ""
 
-#: lib/libalpm/add.c:546
+#: lib/libalpm/add.c:494 lib/libalpm/add.c:495
 #, c-format
 msgid "%s is in NoExtract, skipping extraction"
 msgstr ""
 
-#: lib/libalpm/add.c:547
-#, c-format
-msgid "notice: %s is in NoExtract -- skipping extraction"
-msgstr ""
-
-#: lib/libalpm/add.c:554
+#: lib/libalpm/add.c:502
 #, c-format
 msgid "%s is in trans->skip_add, skipping extraction"
 msgstr ""
 
-#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
+#: lib/libalpm/add.c:548 lib/libalpm/add.c:549 lib/libalpm/add.c:698
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:592
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:646
+#: lib/libalpm/add.c:594
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:648
+#: lib/libalpm/add.c:596
 #, c-format
 msgid "current:  %s"
 msgstr ""
 
-#: lib/libalpm/add.c:649
+#: lib/libalpm/add.c:597
 #, c-format
 msgid "new:      %s"
 msgstr ""
 
-#: lib/libalpm/add.c:650
+#: lib/libalpm/add.c:598
 #, c-format
 msgid "original: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:662
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:663
+#: lib/libalpm/add.c:611
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
+#: lib/libalpm/add.c:617 lib/libalpm/add.c:636
 #, c-format
 msgid "could not copy tempfile to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:618
 #, c-format
 msgid "error: could not copy tempfile to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:622
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr ""
 
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:623
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:685
+#: lib/libalpm/add.c:633
 #, c-format
 msgid "action: installing new file: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
+#: lib/libalpm/add.c:643 lib/libalpm/add.c:649 lib/libalpm/add.c:654
 msgid "action: leaving existing file in place"
 msgstr ""
 
-#: lib/libalpm/add.c:709
+#: lib/libalpm/add.c:657
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 
-#: lib/libalpm/add.c:712
+#: lib/libalpm/add.c:660
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:661
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:715
+#: lib/libalpm/add.c:663
 #, c-format
 msgid "%s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:716
+#: lib/libalpm/add.c:664
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:730
+#: lib/libalpm/add.c:678
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr ""
 
-#: lib/libalpm/add.c:731
+#: lib/libalpm/add.c:679
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr ""
 
-#: lib/libalpm/add.c:732
+#: lib/libalpm/add.c:680
 #, c-format
 msgid "warning: extracting %s as %s.pacnew"
 msgstr ""
 
-#: lib/libalpm/add.c:735
+#: lib/libalpm/add.c:683
 #, c-format
 msgid "extracting %s"
 msgstr ""
 
-#: lib/libalpm/add.c:751
+#: lib/libalpm/add.c:699
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:763
+#: lib/libalpm/add.c:711
 #, c-format
 msgid "appending backup entry for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
+#: lib/libalpm/add.c:743 lib/libalpm/add.c:745
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr ""
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "upgrading"
 msgstr ""
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "installing"
 msgstr ""
 
-#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
+#: lib/libalpm/add.c:763
+#, c-format
+msgid "provision '%s' has been removed from package %s (%s => %s)"
+msgstr ""
+
+#: lib/libalpm/add.c:775
+#, c-format
+msgid "updating '%s' due to provision change (%s)"
+msgstr ""
+
+#: lib/libalpm/add.c:779 lib/libalpm/add.c:780
+#, c-format
+msgid "could not update provision '%s' from '%s'"
+msgstr ""
+
+#: lib/libalpm/add.c:793 lib/libalpm/remove.c:337
 msgid "updating database"
 msgstr ""
 
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:794
 #, c-format
 msgid "adding database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
+#: lib/libalpm/add.c:797 lib/libalpm/add.c:799
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:824
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr ""
 
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:838 lib/libalpm/remove.c:364 lib/libalpm/sync.c:1038
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr ""
@@ -316,157 +321,157 @@ msgstr ""
 
 #: lib/libalpm/alpm.c:305
 #, c-format
-msgid "flushing database %s/%s"
+msgid "flushing database %s%s"
 msgstr ""
 
 #: lib/libalpm/alpm.c:309
 #, c-format
-msgid "could not remove database entry %s/%s"
+msgid "could not remove database entry %s%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:479
+#: lib/libalpm/alpm.c:478
 #, c-format
 msgid "could not get sha1sum for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:485
+#: lib/libalpm/alpm.c:484
 #, c-format
 msgid "sha1sums for package %s-%s match"
 msgstr ""
 
-#: lib/libalpm/alpm.c:488
+#: lib/libalpm/alpm.c:487
 #, c-format
 msgid "sha1sums do not match for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:523
+#: lib/libalpm/alpm.c:522
 #, c-format
 msgid "could not get md5sum for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:529
+#: lib/libalpm/alpm.c:528
 #, c-format
 msgid "md5sums for package %s-%s match"
 msgstr ""
 
-#: lib/libalpm/alpm.c:532
+#: lib/libalpm/alpm.c:531
 #, c-format
 msgid "md5sums do not match for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:781
+#: lib/libalpm/alpm.c:780
 #, c-format
 msgid "could not remove lock file %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:782
+#: lib/libalpm/alpm.c:781
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:917
+#: lib/libalpm/alpm.c:916
 #, c-format
 msgid "config: new section '%s'"
 msgstr ""
 
-#: lib/libalpm/alpm.c:946
+#: lib/libalpm/alpm.c:945
 msgid "config: nopassiveftp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:949
+#: lib/libalpm/alpm.c:948
 msgid "config: usesyslog"
 msgstr ""
 
-#: lib/libalpm/alpm.c:952
+#: lib/libalpm/alpm.c:951
 msgid "config: chomp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:955
+#: lib/libalpm/alpm.c:954
 msgid "config: usecolor"
 msgstr ""
 
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:963
 #, c-format
 msgid "config: including %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:974 lib/libalpm/alpm.c:979
+#: lib/libalpm/alpm.c:973 lib/libalpm/alpm.c:978
 #, c-format
 msgid "config: noupgrade: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:987 lib/libalpm/alpm.c:992
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
 #, c-format
 msgid "config: noextract: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1000 lib/libalpm/alpm.c:1005
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
 #, c-format
 msgid "config: ignorepkg: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1013 lib/libalpm/alpm.c:1018
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
 #, c-format
 msgid "config: holdpkg: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1025
+#: lib/libalpm/alpm.c:1024
 #, c-format
 msgid "config: dbpath: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1032
+#: lib/libalpm/alpm.c:1031
 #, c-format
 msgid "config: cachedir: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1035
+#: lib/libalpm/alpm.c:1034
 #, c-format
 msgid "config: logfile: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1038
+#: lib/libalpm/alpm.c:1037
 #, c-format
 msgid "config: xfercommand: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1043
+#: lib/libalpm/alpm.c:1042
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
+#: lib/libalpm/alpm.c:1080 lib/libalpm/sync.c:105
 msgid "checking for package replacements"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:121
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1124 lib/libalpm/sync.c:158
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
+#: lib/libalpm/alpm.c:1146 lib/libalpm/sync.c:192
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1160 lib/libalpm/sync.c:206 lib/libalpm/sync.c:493
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
+#: lib/libalpm/alpm.c:1166
 #, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
+msgid "%s elected for upgrade (%s => %s)"
 msgstr ""
 
 #: lib/libalpm/be_files.c:58
@@ -489,129 +494,139 @@ msgstr ""
 msgid "invalid name for dabatase entry '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:213
+#: lib/libalpm/be_files.c:218
 msgid "invalid package entry provided to _alpm_db_read, skipping"
 msgstr ""
 
-#: lib/libalpm/be_files.c:218
+#: lib/libalpm/be_files.c:223
 #, c-format
 msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""
 
-#: lib/libalpm/be_files.c:226
+#: lib/libalpm/be_files.c:231
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""
 
-#: lib/libalpm/be_files.c:234
+#: lib/libalpm/be_files.c:239
 #, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
-#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
-#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
-#: lib/libalpm/package.c:197
+#: lib/libalpm/be_files.c:247 lib/libalpm/be_files.c:393
+#: lib/libalpm/be_files.c:416 lib/libalpm/be_files.c:507
+#: lib/libalpm/be_files.c:596 lib/libalpm/be_files.c:623
+#: lib/libalpm/package.c:204
 #, c-format
 msgid "could not open file %s: %s"
 msgstr ""
 
-#: lib/libalpm/be_files.c:500
+#: lib/libalpm/be_files.c:504
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:589
+#: lib/libalpm/be_files.c:593
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:616
+#: lib/libalpm/be_files.c:620
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
 
-#: lib/libalpm/cache.c:59
+#: lib/libalpm/cache.c:57
 #, c-format
-msgid "loading package cache (infolevel=%#x) for repository '%s'"
+msgid "loading package cache for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:64
+#: lib/libalpm/cache.c:62
 #, c-format
 msgid "adding '%s' to package cache for db '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:84
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:109
+#: lib/libalpm/cache.c:107
 #, c-format
 msgid "error: pkgcache is NULL for db '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:136
+#: lib/libalpm/cache.c:127
 #, c-format
-msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+msgid "adding entry '%s' in '%s' cache"
 msgstr ""
 
-#: lib/libalpm/cache.c:156
+#: lib/libalpm/cache.c:147
 #, c-format
-msgid "adding entry '%s' in '%s' cache"
+msgid "removing entry '%s' from '%s' cache"
 msgstr ""
 
-#: lib/libalpm/cache.c:182
+#: lib/libalpm/cache.c:154
 #, c-format
-msgid "removing entry '%s' from '%s' cache"
+msgid "cannot remove entry '%s' from '%s' cache: not found"
 msgstr ""
 
-#: lib/libalpm/cache.c:200
+#: lib/libalpm/cache.c:176
 #, c-format
 msgid "error: failed to get '%s' from NULL pkgcache"
 msgstr ""
 
-#: lib/libalpm/cache.c:223
+#: lib/libalpm/cache.c:199
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:78
+#: lib/libalpm/conflict.c:68
 #, c-format
-msgid "checkconflicts: targ '%s' vs db"
+msgid "   found conflict '%s' : package '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
+#: lib/libalpm/conflict.c:77
 #, c-format
-msgid "targs vs db: found %s as a conflict for %s"
+msgid "   found conflict '%s' : package '%s' provides '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:114
+#: lib/libalpm/conflict.c:100 lib/libalpm/conflict.c:142
 #, c-format
-msgid "checkconflicts: targ '%s' vs targs"
+msgid "package '%s' conflicts with itself - packaging error"
 msgstr ""
 
-#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
+#: lib/libalpm/conflict.c:106
 #, c-format
-msgid "targs vs targs: found %s as a conflict for %s"
+msgid "checkconflicts: target '%s' vs db"
 msgstr ""
 
-#: lib/libalpm/conflict.c:150
+#: lib/libalpm/conflict.c:148
 #, c-format
-msgid "checkconflicts: db vs targ '%s'"
+msgid "checkconflicts: target '%s' vs all targets"
 msgstr ""
 
-#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
+#: lib/libalpm/conflict.c:180
 #, c-format
-msgid "db vs targs: found %s as a conflict for %s"
+msgid "checkconflicts: db vs target '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
-#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
-#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
-#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
-#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:200
+#, c-format
+msgid "target '%s' is also in target list, using NEW conflicts"
+msgstr ""
+
+#: lib/libalpm/conflict.c:256
+#, c-format
+msgid "\tCONFLICTS:: %s conflicts with %s"
+msgstr ""
+
+#: lib/libalpm/conflict.c:348 lib/libalpm/deps.c:57 lib/libalpm/deps.c:435
+#: lib/libalpm/deps.c:631 lib/libalpm/deps.c:671 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:80 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:598 lib/libalpm/sync.c:614 lib/libalpm/sync.c:711
+#: lib/libalpm/trans.c:52 lib/libalpm/util.c:609 lib/libalpm/util.c:616
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr ""
@@ -621,26 +636,26 @@ msgstr ""
 msgid "malloc failed: could not allocate %d bytes"
 msgstr ""
 
-#: lib/libalpm/db.c:163
+#: lib/libalpm/db.c:165
 msgid "attempt to re-register the 'local' DB"
 msgstr ""
 
-#: lib/libalpm/db.c:171
+#: lib/libalpm/db.c:173
 #, c-format
 msgid "attempt to re-register the '%s' database, using existing"
 msgstr ""
 
-#: lib/libalpm/db.c:177
+#: lib/libalpm/db.c:179
 #, c-format
 msgid "registering database '%s'"
 msgstr ""
 
-#: lib/libalpm/db.c:182
+#: lib/libalpm/db.c:184
 #, c-format
 msgid "database directory '%s' does not exist -- try creating it"
 msgstr ""
 
-#: lib/libalpm/db.c:193
+#: lib/libalpm/db.c:195
 #, c-format
 msgid "opening database '%s'"
 msgstr ""
@@ -653,85 +668,95 @@ msgstr ""
 msgid "possible dependency cycle detected"
 msgstr ""
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:180
 msgid "sorting dependencies finished"
 msgstr ""
 
-#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
+#: lib/libalpm/deps.c:222 lib/libalpm/deps.c:307
 msgid "null package found in package list"
 msgstr ""
 
-#: lib/libalpm/deps.c:223
+#: lib/libalpm/deps.c:227
 #, c-format
 msgid "cannot find package installed '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
+#: lib/libalpm/deps.c:258
 #, c-format
-msgid "checkdeps: found %s as required by %s"
+msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'"
+msgstr ""
+
+#: lib/libalpm/deps.c:277
+#, c-format
+msgid "checkdeps: dependency '%s' satisfied by installed package '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:283
+#: lib/libalpm/deps.c:286
 #, c-format
-msgid "no dependencies for target '%s'"
+msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:329
+#: lib/libalpm/deps.c:356
 #, c-format
 msgid "missing dependency '%s' for package '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:452
+#: lib/libalpm/deps.c:406
+#, c-format
+msgid "checkdeps: found %s as required by %s"
+msgstr ""
+
+#: lib/libalpm/deps.c:482
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr ""
 
-#: lib/libalpm/deps.c:499
+#: lib/libalpm/deps.c:529
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr ""
 
-#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
+#: lib/libalpm/deps.c:537 lib/libalpm/deps.c:548
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr ""
 
-#: lib/libalpm/deps.c:551
+#: lib/libalpm/deps.c:580
 msgid "started resolving dependencies"
 msgstr ""
 
-#: lib/libalpm/deps.c:569
+#: lib/libalpm/deps.c:598
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr ""
 
-#: lib/libalpm/deps.c:594
+#: lib/libalpm/deps.c:627
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
 msgstr ""
 
-#: lib/libalpm/deps.c:611
+#: lib/libalpm/deps.c:644
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr ""
 
-#: lib/libalpm/deps.c:631
+#: lib/libalpm/deps.c:664
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr ""
 
-#: lib/libalpm/deps.c:635
+#: lib/libalpm/deps.c:668
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr ""
 
-#: lib/libalpm/deps.c:651
+#: lib/libalpm/deps.c:684
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr ""
 
-#: lib/libalpm/deps.c:655
+#: lib/libalpm/deps.c:688
 msgid "finished resolving dependencies"
 msgstr ""
 
@@ -827,7 +852,7 @@ msgstr ""
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:977
 msgid "could not commit transaction"
 msgstr ""
 
@@ -964,69 +989,69 @@ msgstr ""
 msgid "%s: forcing upgrade to version %s"
 msgstr ""
 
-#: lib/libalpm/package.c:152
+#: lib/libalpm/package.c:153
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:159
+#: lib/libalpm/package.c:161
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:163
+#: lib/libalpm/package.c:167
 #, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:168
-#, c-format
-msgid "compare versions for %s: %s vs %s, result=%d"
-msgstr ""
-
-#: lib/libalpm/package.c:211 lib/libalpm/package.c:270
+#: lib/libalpm/package.c:218 lib/libalpm/package.c:277
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr ""
 
-#: lib/libalpm/package.c:344
+#: lib/libalpm/package.c:351
 msgid "could not parse the package description file"
 msgstr ""
 
-#: lib/libalpm/package.c:348
+#: lib/libalpm/package.c:355
 #, c-format
 msgid "missing package name in %s"
 msgstr ""
 
-#: lib/libalpm/package.c:352
+#: lib/libalpm/package.c:359
 #, c-format
 msgid "missing package version in %s"
 msgstr ""
 
-#: lib/libalpm/package.c:387
+#: lib/libalpm/package.c:394
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr ""
 
-#: lib/libalpm/package.c:400 lib/libalpm/package.c:407
+#: lib/libalpm/package.c:407 lib/libalpm/package.c:414
 #, c-format
 msgid "error while reading package: %s"
 msgstr ""
 
-#: lib/libalpm/package.c:413
+#: lib/libalpm/package.c:420
 msgid "missing package metadata"
 msgstr ""
 
-#: lib/libalpm/package.c:420
+#: lib/libalpm/package.c:427
 #, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr ""
 
-#: lib/libalpm/package.c:547
+#: lib/libalpm/package.c:560
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr ""
 
+#: lib/libalpm/package.c:571
+#, c-format
+msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
+msgstr ""
+
 #: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
@@ -1101,247 +1126,263 @@ msgstr ""
 msgid "cannot remove file %s: %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:286
+#: lib/libalpm/remove.c:291
 #, c-format
 msgid "removing package %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:298
+#: lib/libalpm/remove.c:308
 #, c-format
 msgid "not removing package '%s', can't remove all files"
 msgstr ""
 
-#: lib/libalpm/remove.c:304
-msgid "removing files"
+#: lib/libalpm/remove.c:315
+#, c-format
+msgid "removing %d files"
 msgstr ""
 
-#: lib/libalpm/remove.c:322
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "removing database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/remove.c:324
+#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:345
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr ""
 
-#: lib/libalpm/sync.c:199
+#: lib/libalpm/sync.c:181
 msgid "checking for package upgrades"
 msgstr ""
 
-#: lib/libalpm/sync.c:232
+#: lib/libalpm/sync.c:213
 #, c-format
-msgid "%s-%s: ignoring package upgrade (%s => %s)"
+msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr ""
 
-#: lib/libalpm/sync.c:281
+#: lib/libalpm/sync.c:260
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
+#: lib/libalpm/sync.c:268 lib/libalpm/sync.c:291
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""
 
-#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
+#: lib/libalpm/sync.c:273 lib/libalpm/sync.c:296
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:302
+#: lib/libalpm/sync.c:280
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: lib/libalpm/sync.c:336
+#: lib/libalpm/sync.c:321
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:356
+#: lib/libalpm/sync.c:344
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""
 
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:392
 msgid "resolving target's dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:412
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""
 
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:447
 msgid "looking for unresolvable dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:478
 #, c-format
-msgid "package '%s' is conflicting with '%s'"
+msgid "package '%s' conflicts with '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:500
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:511
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:534 lib/libalpm/sync.c:539
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""
 
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:551 lib/libalpm/sync.c:588
 #, c-format
 msgid "removing '%s' from target list"
 msgstr ""
 
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:560
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:583
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:594 lib/libalpm/sync.c:610
 msgid "unresolvable package conflicts detected"
 msgstr ""
 
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:662
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:676
 msgid "something has gone horribly wrong"
 msgstr ""
 
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:696
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""
 
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:792
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:803
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:804
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:809
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:810
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:817
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:846 lib/libalpm/sync.c:858
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:877
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:879
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:900
 msgid "could not create removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:906
 msgid "could not initialize the removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:926
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:928
 msgid "could not prepare removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:934
 msgid "could not commit removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:941
 msgid "installing packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:944
 msgid "could not create transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:949
 msgid "could not initialize transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:972
 msgid "could not prepare transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:984
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1013
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1022
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/trans.c:262
-msgid "updating dependency packages 'requiredby' fields"
+#: lib/libalpm/sync.c:1062
+#, c-format
+msgid "found package '%s-%s' in sync"
+msgstr ""
+
+#: lib/libalpm/sync.c:1068
+#, c-format
+msgid "package '%s' not found in sync"
 msgstr ""
 
-#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#: lib/libalpm/trans.c:264
+#, c-format
+msgid "updating dependency packages 'requiredby' fields for %s-%s"
+msgstr ""
+
+#: lib/libalpm/trans.c:267
+msgid "package has no dependencies, no other packages to update"
+msgstr ""
+
+#: lib/libalpm/trans.c:304 lib/libalpm/trans.c:330
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr ""
 
-#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#: lib/libalpm/trans.c:315 lib/libalpm/trans.c:341
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/trans.c:315
+#: lib/libalpm/trans.c:322
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr ""
@@ -1361,61 +1402,61 @@ msgstr ""
 msgid "logaction called: %s"
 msgstr ""
 
-#: lib/libalpm/util.c:441
+#: lib/libalpm/util.c:443
 msgid "could not create temp directory"
 msgstr ""
 
-#: lib/libalpm/util.c:468
+#: lib/libalpm/util.c:470
 #, c-format
 msgid "could not change directory to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:471
+#: lib/libalpm/util.c:473
 #, c-format
 msgid "executing %s script..."
 msgstr ""
 
-#: lib/libalpm/util.c:484
+#: lib/libalpm/util.c:486
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:491
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "chrooting in %s"
 msgstr ""
 
-#: lib/libalpm/util.c:493
+#: lib/libalpm/util.c:495
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:497
+#: lib/libalpm/util.c:499
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:501
+#: lib/libalpm/util.c:503
 #, c-format
 msgid "executing \"%s\""
 msgstr ""
 
-#: lib/libalpm/util.c:504
+#: lib/libalpm/util.c:506
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:536
+#: lib/libalpm/util.c:538
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr ""
 
-#: lib/libalpm/util.c:602
+#: lib/libalpm/util.c:604
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
@@ -1425,7 +1466,7 @@ msgstr ""
 msgid "depcmp: %s-%s %s %s-%s => %s"
 msgstr ""
 
-#: lib/libalpm/versioncmp.c:281
+#: lib/libalpm/versioncmp.c:282
 #, c-format
 msgid "depcmp: %s-%s %s %s => %s"
 msgstr ""
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 17499c85..975eec41 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.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: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
 "PO-Revision-Date: 2007-02-06 20:16-0500\n"
 "Last-Translator: Dan McGee <pacman-dev@archlinux.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,259 +15,264 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: lib/libalpm/add.c:95
-#, c-format
-msgid "could not parse token %s"
-msgstr ""
-
-#: lib/libalpm/add.c:129
+#: lib/libalpm/add.c:75
 #, c-format
 msgid "loading target '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:174
+#: lib/libalpm/add.c:120
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr ""
 
-#: lib/libalpm/add.c:183
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr ""
 
-#: lib/libalpm/add.c:190
+#: lib/libalpm/add.c:136
 #, c-format
 msgid "reading '%s' metadata"
 msgstr ""
 
-#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:189 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr ""
 
-#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:201 lib/libalpm/sync.c:467
 msgid "looking for conflicts"
 msgstr ""
 
-#: lib/libalpm/add.c:260
+#: lib/libalpm/add.c:206
 msgid "replacing packages with -A and -U is not supported yet"
 msgstr ""
 
-#: lib/libalpm/add.c:261
+#: lib/libalpm/add.c:207
 #, c-format
 msgid "please remove '%s' first, using -Rd"
 msgstr ""
 
-#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:248 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr ""
 
-#: lib/libalpm/add.c:314
+#: lib/libalpm/add.c:260
 msgid "cleaning up"
 msgstr ""
 
-#: lib/libalpm/add.c:329
+#: lib/libalpm/add.c:275
 msgid "looking for file conflicts"
 msgstr ""
 
-#: lib/libalpm/add.c:394
+#: lib/libalpm/add.c:340
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:417
+#: lib/libalpm/add.c:364
 #, c-format
 msgid "adding package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:430
+#: lib/libalpm/add.c:377
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:457
+#: lib/libalpm/add.c:405
 #, c-format
-msgid "adding %s to the NoUpgrade array temporarilly"
+msgid "adding %s to the NoUpgrade array temporarily"
 msgstr ""
 
-#: lib/libalpm/add.c:475
+#: lib/libalpm/add.c:423
 msgid "extracting files"
 msgstr ""
 
-#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:438 lib/libalpm/util.c:463
 msgid "could not get current working directory"
 msgstr ""
 
-#: lib/libalpm/add.c:546
+#: lib/libalpm/add.c:494 lib/libalpm/add.c:495
 #, c-format
 msgid "%s is in NoExtract, skipping extraction"
 msgstr ""
 
-#: lib/libalpm/add.c:547
-#, c-format
-msgid "notice: %s is in NoExtract -- skipping extraction"
-msgstr ""
-
-#: lib/libalpm/add.c:554
+#: lib/libalpm/add.c:502
 #, c-format
 msgid "%s is in trans->skip_add, skipping extraction"
 msgstr ""
 
-#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
+#: lib/libalpm/add.c:548 lib/libalpm/add.c:549 lib/libalpm/add.c:698
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:592
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:646
+#: lib/libalpm/add.c:594
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:648
+#: lib/libalpm/add.c:596
 #, c-format
 msgid "current:  %s"
 msgstr ""
 
-#: lib/libalpm/add.c:649
+#: lib/libalpm/add.c:597
 #, c-format
 msgid "new:      %s"
 msgstr ""
 
-#: lib/libalpm/add.c:650
+#: lib/libalpm/add.c:598
 #, c-format
 msgid "original: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:662
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:663
+#: lib/libalpm/add.c:611
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
+#: lib/libalpm/add.c:617 lib/libalpm/add.c:636
 #, c-format
 msgid "could not copy tempfile to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:618
 #, c-format
 msgid "error: could not copy tempfile to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:622
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr ""
 
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:623
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:685
+#: lib/libalpm/add.c:633
 #, c-format
 msgid "action: installing new file: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
+#: lib/libalpm/add.c:643 lib/libalpm/add.c:649 lib/libalpm/add.c:654
 msgid "action: leaving existing file in place"
 msgstr ""
 
-#: lib/libalpm/add.c:709
+#: lib/libalpm/add.c:657
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 
-#: lib/libalpm/add.c:712
+#: lib/libalpm/add.c:660
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:661
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:715
+#: lib/libalpm/add.c:663
 #, c-format
 msgid "%s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:716
+#: lib/libalpm/add.c:664
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:730
+#: lib/libalpm/add.c:678
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr ""
 
-#: lib/libalpm/add.c:731
+#: lib/libalpm/add.c:679
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr ""
 
-#: lib/libalpm/add.c:732
+#: lib/libalpm/add.c:680
 #, c-format
 msgid "warning: extracting %s as %s.pacnew"
 msgstr ""
 
-#: lib/libalpm/add.c:735
+#: lib/libalpm/add.c:683
 #, c-format
 msgid "extracting %s"
 msgstr ""
 
-#: lib/libalpm/add.c:751
+#: lib/libalpm/add.c:699
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:763
+#: lib/libalpm/add.c:711
 #, c-format
 msgid "appending backup entry for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
+#: lib/libalpm/add.c:743 lib/libalpm/add.c:745
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr ""
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "upgrading"
 msgstr ""
 
-#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
+#: lib/libalpm/add.c:744 lib/libalpm/add.c:746
 msgid "installing"
 msgstr ""
 
-#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
+#: lib/libalpm/add.c:763
+#, c-format
+msgid "provision '%s' has been removed from package %s (%s => %s)"
+msgstr ""
+
+#: lib/libalpm/add.c:775
+#, c-format
+msgid "updating '%s' due to provision change (%s)"
+msgstr ""
+
+#: lib/libalpm/add.c:779 lib/libalpm/add.c:780
+#, c-format
+msgid "could not update provision '%s' from '%s'"
+msgstr ""
+
+#: lib/libalpm/add.c:793 lib/libalpm/remove.c:337
 msgid "updating database"
 msgstr ""
 
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:794
 #, c-format
 msgid "adding database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
+#: lib/libalpm/add.c:797 lib/libalpm/add.c:799
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:824
+#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr ""
 
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:838 lib/libalpm/remove.c:364 lib/libalpm/sync.c:1038
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr ""
@@ -315,157 +320,157 @@ msgstr ""
 
 #: lib/libalpm/alpm.c:305
 #, c-format
-msgid "flushing database %s/%s"
+msgid "flushing database %s%s"
 msgstr ""
 
 #: lib/libalpm/alpm.c:309
 #, c-format
-msgid "could not remove database entry %s/%s"
+msgid "could not remove database entry %s%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:479
+#: lib/libalpm/alpm.c:478
 #, c-format
 msgid "could not get sha1sum for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:485
+#: lib/libalpm/alpm.c:484
 #, c-format
 msgid "sha1sums for package %s-%s match"
 msgstr ""
 
-#: lib/libalpm/alpm.c:488
+#: lib/libalpm/alpm.c:487
 #, c-format
 msgid "sha1sums do not match for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:523
+#: lib/libalpm/alpm.c:522
 #, c-format
 msgid "could not get md5sum for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:529
+#: lib/libalpm/alpm.c:528
 #, c-format
 msgid "md5sums for package %s-%s match"
 msgstr ""
 
-#: lib/libalpm/alpm.c:532
+#: lib/libalpm/alpm.c:531
 #, c-format
 msgid "md5sums do not match for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:781
+#: lib/libalpm/alpm.c:780
 #, c-format
 msgid "could not remove lock file %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:782
+#: lib/libalpm/alpm.c:781
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:917
+#: lib/libalpm/alpm.c:916
 #, c-format
 msgid "config: new section '%s'"
 msgstr ""
 
-#: lib/libalpm/alpm.c:946
+#: lib/libalpm/alpm.c:945
 msgid "config: nopassiveftp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:949
+#: lib/libalpm/alpm.c:948
 msgid "config: usesyslog"
 msgstr ""
 
-#: lib/libalpm/alpm.c:952
+#: lib/libalpm/alpm.c:951
 msgid "config: chomp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:955
+#: lib/libalpm/alpm.c:954
 msgid "config: usecolor"
 msgstr ""
 
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:963
 #, c-format
 msgid "config: including %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:974 lib/libalpm/alpm.c:979
+#: lib/libalpm/alpm.c:973 lib/libalpm/alpm.c:978
 #, c-format
 msgid "config: noupgrade: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:987 lib/libalpm/alpm.c:992
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
 #, c-format
 msgid "config: noextract: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1000 lib/libalpm/alpm.c:1005
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
 #, c-format
 msgid "config: ignorepkg: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1013 lib/libalpm/alpm.c:1018
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
 #, c-format
 msgid "config: holdpkg: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1025
+#: lib/libalpm/alpm.c:1024
 #, c-format
 msgid "config: dbpath: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1032
+#: lib/libalpm/alpm.c:1031
 #, c-format
 msgid "config: cachedir: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1035
+#: lib/libalpm/alpm.c:1034
 #, c-format
 msgid "config: logfile: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1038
+#: lib/libalpm/alpm.c:1037
 #, c-format
 msgid "config: xfercommand: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1043
+#: lib/libalpm/alpm.c:1042
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
+#: lib/libalpm/alpm.c:1080 lib/libalpm/sync.c:105
 msgid "checking for package replacements"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:121
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1124 lib/libalpm/sync.c:158
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
+#: lib/libalpm/alpm.c:1146 lib/libalpm/sync.c:192
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1160 lib/libalpm/sync.c:206 lib/libalpm/sync.c:493
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
+#: lib/libalpm/alpm.c:1166
 #, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
+msgid "%s elected for upgrade (%s => %s)"
 msgstr ""
 
 #: lib/libalpm/be_files.c:58
@@ -488,129 +493,139 @@ msgstr ""
 msgid "invalid name for dabatase entry '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:213
+#: lib/libalpm/be_files.c:218
 msgid "invalid package entry provided to _alpm_db_read, skipping"
 msgstr ""
 
-#: lib/libalpm/be_files.c:218
+#: lib/libalpm/be_files.c:223
 #, c-format
 msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""
 
-#: lib/libalpm/be_files.c:226
+#: lib/libalpm/be_files.c:231
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""
 
-#: lib/libalpm/be_files.c:234
+#: lib/libalpm/be_files.c:239
 #, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
-#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
-#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
-#: lib/libalpm/package.c:197
+#: lib/libalpm/be_files.c:247 lib/libalpm/be_files.c:393
+#: lib/libalpm/be_files.c:416 lib/libalpm/be_files.c:507
+#: lib/libalpm/be_files.c:596 lib/libalpm/be_files.c:623
+#: lib/libalpm/package.c:204
 #, c-format
 msgid "could not open file %s: %s"
 msgstr ""
 
-#: lib/libalpm/be_files.c:500
+#: lib/libalpm/be_files.c:504
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:589
+#: lib/libalpm/be_files.c:593
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:616
+#: lib/libalpm/be_files.c:620
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
 
-#: lib/libalpm/cache.c:59
+#: lib/libalpm/cache.c:57
 #, c-format
-msgid "loading package cache (infolevel=%#x) for repository '%s'"
+msgid "loading package cache for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:64
+#: lib/libalpm/cache.c:62
 #, c-format
 msgid "adding '%s' to package cache for db '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:84
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:109
+#: lib/libalpm/cache.c:107
 #, c-format
 msgid "error: pkgcache is NULL for db '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:136
+#: lib/libalpm/cache.c:127
 #, c-format
-msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+msgid "adding entry '%s' in '%s' cache"
 msgstr ""
 
-#: lib/libalpm/cache.c:156
+#: lib/libalpm/cache.c:147
 #, c-format
-msgid "adding entry '%s' in '%s' cache"
+msgid "removing entry '%s' from '%s' cache"
 msgstr ""
 
-#: lib/libalpm/cache.c:182
+#: lib/libalpm/cache.c:154
 #, c-format
-msgid "removing entry '%s' from '%s' cache"
+msgid "cannot remove entry '%s' from '%s' cache: not found"
 msgstr ""
 
-#: lib/libalpm/cache.c:200
+#: lib/libalpm/cache.c:176
 #, c-format
 msgid "error: failed to get '%s' from NULL pkgcache"
 msgstr ""
 
-#: lib/libalpm/cache.c:223
+#: lib/libalpm/cache.c:199
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:78
+#: lib/libalpm/conflict.c:68
 #, c-format
-msgid "checkconflicts: targ '%s' vs db"
+msgid "   found conflict '%s' : package '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
+#: lib/libalpm/conflict.c:77
 #, c-format
-msgid "targs vs db: found %s as a conflict for %s"
+msgid "   found conflict '%s' : package '%s' provides '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:114
+#: lib/libalpm/conflict.c:100 lib/libalpm/conflict.c:142
 #, c-format
-msgid "checkconflicts: targ '%s' vs targs"
+msgid "package '%s' conflicts with itself - packaging error"
 msgstr ""
 
-#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
+#: lib/libalpm/conflict.c:106
 #, c-format
-msgid "targs vs targs: found %s as a conflict for %s"
+msgid "checkconflicts: target '%s' vs db"
 msgstr ""
 
-#: lib/libalpm/conflict.c:150
+#: lib/libalpm/conflict.c:148
 #, c-format
-msgid "checkconflicts: db vs targ '%s'"
+msgid "checkconflicts: target '%s' vs all targets"
 msgstr ""
 
-#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
+#: lib/libalpm/conflict.c:180
 #, c-format
-msgid "db vs targs: found %s as a conflict for %s"
+msgid "checkconflicts: db vs target '%s'"
 msgstr ""
 
-#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
-#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
-#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
-#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
-#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:200
+#, c-format
+msgid "target '%s' is also in target list, using NEW conflicts"
+msgstr ""
+
+#: lib/libalpm/conflict.c:256
+#, c-format
+msgid "\tCONFLICTS:: %s conflicts with %s"
+msgstr ""
+
+#: lib/libalpm/conflict.c:348 lib/libalpm/deps.c:57 lib/libalpm/deps.c:435
+#: lib/libalpm/deps.c:631 lib/libalpm/deps.c:671 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:80 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:598 lib/libalpm/sync.c:614 lib/libalpm/sync.c:711
+#: lib/libalpm/trans.c:52 lib/libalpm/util.c:609 lib/libalpm/util.c:616
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr ""
@@ -620,26 +635,26 @@ msgstr ""
 msgid "malloc failed: could not allocate %d bytes"
 msgstr ""
 
-#: lib/libalpm/db.c:163
+#: lib/libalpm/db.c:165
 msgid "attempt to re-register the 'local' DB"
 msgstr ""
 
-#: lib/libalpm/db.c:171
+#: lib/libalpm/db.c:173
 #, c-format
 msgid "attempt to re-register the '%s' database, using existing"
 msgstr ""
 
-#: lib/libalpm/db.c:177
+#: lib/libalpm/db.c:179
 #, c-format
 msgid "registering database '%s'"
 msgstr ""
 
-#: lib/libalpm/db.c:182
+#: lib/libalpm/db.c:184
 #, c-format
 msgid "database directory '%s' does not exist -- try creating it"
 msgstr ""
 
-#: lib/libalpm/db.c:193
+#: lib/libalpm/db.c:195
 #, c-format
 msgid "opening database '%s'"
 msgstr ""
@@ -652,85 +667,95 @@ msgstr ""
 msgid "possible dependency cycle detected"
 msgstr ""
 
-#: lib/libalpm/deps.c:177
+#: lib/libalpm/deps.c:180
 msgid "sorting dependencies finished"
 msgstr ""
 
-#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
+#: lib/libalpm/deps.c:222 lib/libalpm/deps.c:307
 msgid "null package found in package list"
 msgstr ""
 
-#: lib/libalpm/deps.c:223
+#: lib/libalpm/deps.c:227
 #, c-format
 msgid "cannot find package installed '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
+#: lib/libalpm/deps.c:258
 #, c-format
-msgid "checkdeps: found %s as required by %s"
+msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'"
+msgstr ""
+
+#: lib/libalpm/deps.c:277
+#, c-format
+msgid "checkdeps: dependency '%s' satisfied by installed package '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:283
+#: lib/libalpm/deps.c:286
 #, c-format
-msgid "no dependencies for target '%s'"
+msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:329
+#: lib/libalpm/deps.c:356
 #, c-format
 msgid "missing dependency '%s' for package '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:452
+#: lib/libalpm/deps.c:406
+#, c-format
+msgid "checkdeps: found %s as required by %s"
+msgstr ""
+
+#: lib/libalpm/deps.c:482
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr ""
 
-#: lib/libalpm/deps.c:499
+#: lib/libalpm/deps.c:529
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr ""
 
-#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
+#: lib/libalpm/deps.c:537 lib/libalpm/deps.c:548
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr ""
 
-#: lib/libalpm/deps.c:551
+#: lib/libalpm/deps.c:580
 msgid "started resolving dependencies"
 msgstr ""
 
-#: lib/libalpm/deps.c:569
+#: lib/libalpm/deps.c:598
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr ""
 
-#: lib/libalpm/deps.c:594
+#: lib/libalpm/deps.c:627
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
 msgstr ""
 
-#: lib/libalpm/deps.c:611
+#: lib/libalpm/deps.c:644
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr ""
 
-#: lib/libalpm/deps.c:631
+#: lib/libalpm/deps.c:664
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr ""
 
-#: lib/libalpm/deps.c:635
+#: lib/libalpm/deps.c:668
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr ""
 
-#: lib/libalpm/deps.c:651
+#: lib/libalpm/deps.c:684
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr ""
 
-#: lib/libalpm/deps.c:655
+#: lib/libalpm/deps.c:688
 msgid "finished resolving dependencies"
 msgstr ""
 
@@ -826,7 +851,7 @@ msgstr ""
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:977
 msgid "could not commit transaction"
 msgstr ""
 
@@ -963,69 +988,69 @@ msgstr ""
 msgid "%s: forcing upgrade to version %s"
 msgstr ""
 
-#: lib/libalpm/package.c:152
+#: lib/libalpm/package.c:153
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:159
+#: lib/libalpm/package.c:161
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:163
+#: lib/libalpm/package.c:167
 #, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:168
-#, c-format
-msgid "compare versions for %s: %s vs %s, result=%d"
-msgstr ""
-
-#: lib/libalpm/package.c:211 lib/libalpm/package.c:270
+#: lib/libalpm/package.c:218 lib/libalpm/package.c:277
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr ""
 
-#: lib/libalpm/package.c:344
+#: lib/libalpm/package.c:351
 msgid "could not parse the package description file"
 msgstr ""
 
-#: lib/libalpm/package.c:348
+#: lib/libalpm/package.c:355
 #, c-format
 msgid "missing package name in %s"
 msgstr ""
 
-#: lib/libalpm/package.c:352
+#: lib/libalpm/package.c:359
 #, c-format
 msgid "missing package version in %s"
 msgstr ""
 
-#: lib/libalpm/package.c:387
+#: lib/libalpm/package.c:394
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr ""
 
-#: lib/libalpm/package.c:400 lib/libalpm/package.c:407
+#: lib/libalpm/package.c:407 lib/libalpm/package.c:414
 #, c-format
 msgid "error while reading package: %s"
 msgstr ""
 
-#: lib/libalpm/package.c:413
+#: lib/libalpm/package.c:420
 msgid "missing package metadata"
 msgstr ""
 
-#: lib/libalpm/package.c:420
+#: lib/libalpm/package.c:427
 #, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr ""
 
-#: lib/libalpm/package.c:547
+#: lib/libalpm/package.c:560
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr ""
 
+#: lib/libalpm/package.c:571
+#, c-format
+msgid "adding '%s' in requiredby field for '%s' (provides: %s)"
+msgstr ""
+
 #: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
@@ -1100,247 +1125,263 @@ msgstr ""
 msgid "cannot remove file %s: %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:286
+#: lib/libalpm/remove.c:291
 #, c-format
 msgid "removing package %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:298
+#: lib/libalpm/remove.c:308
 #, c-format
 msgid "not removing package '%s', can't remove all files"
 msgstr ""
 
-#: lib/libalpm/remove.c:304
-msgid "removing files"
+#: lib/libalpm/remove.c:315
+#, c-format
+msgid "removing %d files"
 msgstr ""
 
-#: lib/libalpm/remove.c:322
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "removing database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/remove.c:324
+#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:345
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr ""
 
-#: lib/libalpm/sync.c:199
+#: lib/libalpm/sync.c:181
 msgid "checking for package upgrades"
 msgstr ""
 
-#: lib/libalpm/sync.c:232
+#: lib/libalpm/sync.c:213
 #, c-format
-msgid "%s-%s: ignoring package upgrade (%s => %s)"
+msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr ""
 
-#: lib/libalpm/sync.c:281
+#: lib/libalpm/sync.c:260
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
+#: lib/libalpm/sync.c:268 lib/libalpm/sync.c:291
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""
 
-#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
+#: lib/libalpm/sync.c:273 lib/libalpm/sync.c:296
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:302
+#: lib/libalpm/sync.c:280
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: lib/libalpm/sync.c:336
+#: lib/libalpm/sync.c:321
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:356
+#: lib/libalpm/sync.c:344
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""
 
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:392
 msgid "resolving target's dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:412
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""
 
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:447
 msgid "looking for unresolvable dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:478
 #, c-format
-msgid "package '%s' is conflicting with '%s'"
+msgid "package '%s' conflicts with '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:500
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:511
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:534 lib/libalpm/sync.c:539
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""
 
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:551 lib/libalpm/sync.c:588
 #, c-format
 msgid "removing '%s' from target list"
 msgstr ""
 
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:560
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:583
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:594 lib/libalpm/sync.c:610
 msgid "unresolvable package conflicts detected"
 msgstr ""
 
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:662
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:676
 msgid "something has gone horribly wrong"
 msgstr ""
 
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:696
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""
 
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:792
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:803
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:804
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:809
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:810
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:817
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:846 lib/libalpm/sync.c:858
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:877
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:879
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:900
 msgid "could not create removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:906
 msgid "could not initialize the removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:926
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:928
 msgid "could not prepare removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:934
 msgid "could not commit removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:941
 msgid "installing packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:944
 msgid "could not create transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:949
 msgid "could not initialize transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:972
 msgid "could not prepare transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:984
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1013
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1022
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/trans.c:262
-msgid "updating dependency packages 'requiredby' fields"
+#: lib/libalpm/sync.c:1062
+#, c-format
+msgid "found package '%s-%s' in sync"
+msgstr ""
+
+#: lib/libalpm/sync.c:1068
+#, c-format
+msgid "package '%s' not found in sync"
 msgstr ""
 
-#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#: lib/libalpm/trans.c:264
+#, c-format
+msgid "updating dependency packages 'requiredby' fields for %s-%s"
+msgstr ""
+
+#: lib/libalpm/trans.c:267
+msgid "package has no dependencies, no other packages to update"
+msgstr ""
+
+#: lib/libalpm/trans.c:304 lib/libalpm/trans.c:330
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr ""
 
-#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#: lib/libalpm/trans.c:315 lib/libalpm/trans.c:341
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/trans.c:315
+#: lib/libalpm/trans.c:322
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr ""
@@ -1360,61 +1401,61 @@ msgstr ""
 msgid "logaction called: %s"
 msgstr ""
 
-#: lib/libalpm/util.c:441
+#: lib/libalpm/util.c:443
 msgid "could not create temp directory"
 msgstr ""
 
-#: lib/libalpm/util.c:468
+#: lib/libalpm/util.c:470
 #, c-format
 msgid "could not change directory to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:471
+#: lib/libalpm/util.c:473
 #, c-format
 msgid "executing %s script..."
 msgstr ""
 
-#: lib/libalpm/util.c:484
+#: lib/libalpm/util.c:486
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:491
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "chrooting in %s"
 msgstr ""
 
-#: lib/libalpm/util.c:493
+#: lib/libalpm/util.c:495
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:497
+#: lib/libalpm/util.c:499
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:501
+#: lib/libalpm/util.c:503
 #, c-format
 msgid "executing \"%s\""
 msgstr ""
 
-#: lib/libalpm/util.c:504
+#: lib/libalpm/util.c:506
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:536
+#: lib/libalpm/util.c:538
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr ""
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr ""
 
-#: lib/libalpm/util.c:602
+#: lib/libalpm/util.c:604
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
@@ -1424,7 +1465,7 @@ msgstr ""
 msgid "depcmp: %s-%s %s %s-%s => %s"
 msgstr ""
 
-#: lib/libalpm/versioncmp.c:281
+#: lib/libalpm/versioncmp.c:282
 #, c-format
 msgid "depcmp: %s-%s %s %s => %s"
 msgstr ""