* Refactored conflict checking within packages. Profiling from Dan showed an

  unbelievable amount of strcmp() calls (25 million) due to the list searching.
  This has been reimplemented with a set-intersection scheme, due to the fact
  that file lists are always ordered. - NEEDS TESTING
* Minor clean up, "globalized" the str_cmp helper to match the alpm comparison
  signature, so we can use it elsewhere.

1 files changed, 217 insertions, 199 deletions

diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po
index a325a8d9..aebd7e61 100644
--- a/src/pacman/po/fr.po
+++ b/src/pacman/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:17-0500\n"
 "PO-Revision-Date: 2006-06-05 22:46+0100\n"
 "Last-Translator: Enda <enda@netou.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
-#: src/pacman/sync.c:442 src/pacman/sync.c:491
+#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
+#: src/pacman/sync.c:438 src/pacman/sync.c:487
 #, fuzzy, c-format
 msgid ""
 "       if you're sure a package manager is not already running,\n"
@@ -36,13 +36,14 @@ msgstr "chargement des données du paquet.."
 msgid "failed to add target '%s' (%s)"
 msgstr "échec d'ajout de la cible '%s' (%s)\n"
 
-#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
-#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
-#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:70
+#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
+#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
+#: src/pacman/trans.c:142
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "échec de préparation de la transaction (%s)\n"
@@ -52,22 +53,22 @@ msgstr "échec de préparation de la transaction (%s)\n"
 msgid ":: %s: requires %s"
 msgstr ":: %s: requiert %s"
 
-#: src/pacman/add.c:118 src/pacman/sync.c:605
+#: src/pacman/add.c:118 src/pacman/sync.c:601
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: conflit avec %s"
 
-#: src/pacman/add.c:127 src/pacman/sync.c:669
+#: src/pacman/add.c:127 src/pacman/sync.c:665
 #, fuzzy, c-format
 msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
 msgstr "%s%s existe dans \"%s\" (cible) and \"%s\" (cible)"
 
-#: src/pacman/add.c:134 src/pacman/sync.c:676
+#: src/pacman/add.c:134 src/pacman/sync.c:672
 #, fuzzy, c-format
 msgid "%s: %s%s exists in filesystem\n"
 msgstr "%s: %s%s existe dans le système de fichiers"
 
-#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
+#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -75,47 +76,47 @@ msgstr ""
 "\n"
 "des erreurs se sont produites, aucun paquet n'a été mis à jour.\n"
 
-#: src/pacman/add.c:151 src/pacman/sync.c:612
+#: src/pacman/add.c:151 src/pacman/sync.c:608
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ""
 
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "échec de validation de la transaction (%s)\n"
 
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
-#: src/pacman/sync.c:705
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
+#: src/pacman/sync.c:701
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "échec de libération de la transaction (%s)\n"
 
-#: src/pacman/deptest.c:82
+#: src/pacman/deptest.c:70
 msgid "memory allocation failure\n"
 msgstr "erreur d'allocation mémoire\n"
 
-#: src/pacman/deptest.c:93
+#: src/pacman/deptest.c:81
 #, c-format
 msgid "add target %s\n"
 msgstr "ajout de la cible %s\n"
 
-#: src/pacman/deptest.c:96
+#: src/pacman/deptest.c:84
 #, c-format
 msgid "could not add target (%s)\n"
 msgstr "n'a pas pu ajouter la cible (%s)\n"
 
-#: src/pacman/deptest.c:115
+#: src/pacman/deptest.c:103
 #, c-format
 msgid "requires: %s"
 msgstr "requiert: %s"
 
-#: src/pacman/deptest.c:139
+#: src/pacman/deptest.c:127
 #, c-format
 msgid "conflict: %s"
 msgstr "conflit: %s"
 
-#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
+#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
 #, c-format
 msgid "could not release transaction (%s)"
 msgstr "n'a pas pu libérer la transaction (%s)"
@@ -140,11 +141,11 @@ msgstr "avertissement"
 msgid "function"
 msgstr "fonction"
 
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
 msgid "Y"
 msgstr "O"
 
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
 msgid "YES"
 msgstr "OUI"
 
@@ -173,12 +174,12 @@ msgstr "Installé comme dépendance un autre paquet\n"
 msgid "Unknown"
 msgstr "Inconnu\n"
 
-#: src/pacman/package.c:68 src/pacman/package.c:118
+#: src/pacman/package.c:68 src/pacman/package.c:119
 #, c-format
 msgid "Name           : %s\n"
 msgstr "Nom            : %s\n"
 
-#: src/pacman/package.c:69 src/pacman/package.c:119
+#: src/pacman/package.c:69 src/pacman/package.c:120
 #, c-format
 msgid "Version        : %s\n"
 msgstr ""
@@ -192,19 +193,19 @@ msgstr "Nom            : %s\n"
 msgid "License        :"
 msgstr ""
 
-#: src/pacman/package.c:72 src/pacman/package.c:120
+#: src/pacman/package.c:72 src/pacman/package.c:121
 msgid "Groups         :"
 msgstr "Groupes        :"
 
-#: src/pacman/package.c:73 src/pacman/package.c:121
+#: src/pacman/package.c:73 src/pacman/package.c:122
 msgid "Provides       :"
 msgstr "Fournit        :"
 
-#: src/pacman/package.c:74 src/pacman/package.c:122
+#: src/pacman/package.c:74 src/pacman/package.c:123
 msgid "Depends On     :"
 msgstr "Depend De      :"
 
-#: src/pacman/package.c:75 src/pacman/package.c:123
+#: src/pacman/package.c:75 src/pacman/package.c:124
 msgid "Removes        :"
 msgstr "Supprimer       :"
 
@@ -212,7 +213,7 @@ msgstr "Supprimer       :"
 msgid "Required By    :"
 msgstr "Requit par       :"
 
-#: src/pacman/package.c:80 src/pacman/package.c:124
+#: src/pacman/package.c:80 src/pacman/package.c:125
 msgid "Conflicts With :"
 msgstr "Conflit avec    :"
 
@@ -264,66 +265,71 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/pacman/package.c:93 src/pacman/package.c:129
+#: src/pacman/package.c:93 src/pacman/package.c:130
 #, c-format
 msgid "Description    : "
 msgstr ""
 
-#: src/pacman/package.c:117
+#: src/pacman/package.c:118
 #, fuzzy, c-format
 msgid "Repository     : %s\n"
 msgstr "Dépot                : %s\n"
 
-#: src/pacman/package.c:125
+#: src/pacman/package.c:126
 #, fuzzy
 msgid "Replaces       :"
 msgstr "Remplace          :"
 
-#: src/pacman/package.c:126
+#: src/pacman/package.c:127
 #, c-format
 msgid "Download Size  : %6.2f K\n"
 msgstr ""
 
-#: src/pacman/package.c:127
+#: src/pacman/package.c:128
 #, fuzzy, c-format
 msgid "Installed Size : %6.2f K\n"
 msgstr "Script d'installation    : %s\n"
 
-#: src/pacman/package.c:134
+#: src/pacman/package.c:135
 #, fuzzy, c-format
 msgid "MD5 Sum        : %s"
 msgstr ""
 "\n"
 "somme MD5           : %s"
 
-#: src/pacman/package.c:137
+#: src/pacman/package.c:138
 #, fuzzy, c-format
 msgid "SHA1 Sum       : %s"
 msgstr ""
 "\n"
 "Somme SHA1         : %s"
 
-#: src/pacman/package.c:168
+#: src/pacman/package.c:149
+#, c-format
+msgid "Backup Files :\n"
+msgstr ""
+
+#: src/pacman/package.c:169
 #, fuzzy, c-format
 msgid "error calculating checksums for %s\n"
 msgstr "erreur lors du calcul des sommes md5 ou sha1 pour %s\n"
 
-#: src/pacman/package.c:181
+#: src/pacman/package.c:182
 #, fuzzy, c-format
 msgid "MODIFIED\t%s\n"
 msgstr "%sMODIFIE\t%s\n"
 
-#: src/pacman/package.c:183
+#: src/pacman/package.c:184
 #, c-format
 msgid "Not Modified\t%s\n"
 msgstr ""
 
-#: src/pacman/package.c:188
+#: src/pacman/package.c:189
 #, c-format
 msgid "MISSING\t\t%s\n"
 msgstr "MANQUANT\t\t%s\n"
 
-#: src/pacman/package.c:221
+#: src/pacman/package.c:222
 #, c-format
 msgid "No changelog available for '%s'.\n"
 msgstr "Aucun changelog disponible pour '%s'.\n"
@@ -345,27 +351,27 @@ msgstr ""
 
 #: src/pacman/pacman.c:91
 #, c-format
-msgid "        %s {-R --remove}  [options] <package>\n"
+msgid "        %s {-F --freshen} [options] <file>\n"
 msgstr ""
 
 #: src/pacman/pacman.c:92
 #, c-format
-msgid "        %s {-U --upgrade} [options] <file>\n"
+msgid "        %s {-Q --query}   [options] [package]\n"
 msgstr ""
 
 #: src/pacman/pacman.c:93
 #, c-format
-msgid "        %s {-F --freshen} [options] <file>\n"
+msgid "        %s {-R --remove}  [options] <package>\n"
 msgstr ""
 
 #: src/pacman/pacman.c:94
 #, c-format
-msgid "        %s {-Q --query}   [options] [package]\n"
+msgid "        %s {-S --sync}    [options] [package]\n"
 msgstr ""
 
 #: src/pacman/pacman.c:95
 #, c-format
-msgid "        %s {-S --sync}    [options] [package]\n"
+msgid "        %s {-U --upgrade} [options] <file>\n"
 msgstr ""
 
 #: src/pacman/pacman.c:96
@@ -390,13 +396,13 @@ msgstr ""
 
 #: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
 #: src/pacman/pacman.c:138
-#, c-format
-msgid "  -d, --nodeps        skip dependency checks\n"
+#, fuzzy, c-format
+msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps        ignore le contrôle des dépendances\n"
 
 #: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140
-#, c-format
-msgid "  -f, --force         force install, overwrite conflicting files\n"
+#, fuzzy, c-format
+msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr ""
 "  -f, --force         force l'installation, malgré les éventuels fichiers en "
 "conflit\n"
@@ -407,28 +413,29 @@ msgid "usage:  %s {-R --remove} [options] <package>\n"
 msgstr ""
 
 #: src/pacman/pacman.c:106
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -c, --cascade       remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on them\n"
 msgstr ""
 "  -c, --cascade       supprime les paquets et tout ceux qui en dépendent\n"
 
 #: src/pacman/pacman.c:108
-#, c-format
-msgid "  -k, --dbonly        only remove database entry, do not remove files\n"
+#, fuzzy, c-format
+msgid ""
+"  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr ""
 "  -k, --dbonly        supprime uniquement les entrées dans la base de "
 "données, pas les fichiers\n"
 
 #: src/pacman/pacman.c:109
-#, c-format
-msgid "  -n, --nosave        remove configuration files as well\n"
+#, fuzzy, c-format
+msgid "  -n, --nosave         remove configuration files as well\n"
 msgstr "  -n, --nosave        efface également les fichiers de config\n"
 
 #: src/pacman/pacman.c:110
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -s, --recursive     remove dependencies also (that won't break packages)\n"
+"  -s, --recursive      remove dependencies also (that won't break packages)\n"
 msgstr ""
 "  -s, --recursive     supprime les dépendances également (cela ne cassera "
 "pas les dépendances d'autres paquets)\n"
@@ -449,14 +456,14 @@ msgid "usage:  %s {-Q --query} [options] [package]\n"
 msgstr ""
 
 #: src/pacman/pacman.c:123
-#, c-format
-msgid "  -c, --changelog     view the changelog of a package\n"
+#, fuzzy, c-format
+msgid "  -c, --changelog      view the changelog of a package\n"
 msgstr "  -c, --changelog     afficher le changelog du paquet\n"
 
 #: src/pacman/pacman.c:124
 #, fuzzy, c-format
 msgid ""
-"  -e, --orphans       list all packages installed as dependencies but no "
+"  -e, --orphans        list all packages installed as dependencies but no "
 "longer\n"
 msgstr ""
 "  -e, --orphans       lister tous les paquets qui ont été installés comme "
@@ -464,37 +471,37 @@ msgstr ""
 
 #: src/pacman/pacman.c:125
 #, fuzzy, c-format
-msgid "                      required by any package\n"
+msgid "                       required by any package\n"
 msgstr "                      et ne sont plus requis par aucun autre paquet\n"
 
 #: src/pacman/pacman.c:126 src/pacman/pacman.c:141
-#, c-format
-msgid "  -g, --groups        view all members of a package group\n"
+#, fuzzy, c-format
+msgid "  -g, --groups         view all members of a package group\n"
 msgstr ""
 "  -g, --groups        afficher tous les éléments d'un group de paquet\n"
 
 #: src/pacman/pacman.c:127 src/pacman/pacman.c:142
-#, c-format
-msgid "  -i, --info          view package information\n"
+#, fuzzy, c-format
+msgid "  -i, --info           view package information\n"
 msgstr "  -i, --info          afficher les informations du paquet\n"
 
 #: src/pacman/pacman.c:128
-#, c-format
-msgid "  -l, --list          list the contents of the queried package\n"
+#, fuzzy, c-format
+msgid "  -l, --list           list the contents of the queried package\n"
 msgstr "  -l, --list          lister le contenu du paquet interrogé\n"
 
 #: src/pacman/pacman.c:129
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -m, --foreign       list all packages that were not found in the sync db"
+"  -m, --foreign        list all packages that were not found in the sync db"
 "(s)\n"
 msgstr ""
 "  -m, --foreign       liste les paquets non trouvés dans la/les base(s) de "
 "données de synchronisation\n"
 
 #: src/pacman/pacman.c:130
-#, c-format
-msgid "  -o, --owns <file>   query the package that owns <file>\n"
+#, fuzzy, c-format
+msgid "  -o, --owns <file>    query the package that owns <file>\n"
 msgstr ""
 "  -o, --owns <fichier>   recherche les paquets contenant le fichier "
 "<fiichier>\n"
@@ -502,15 +509,15 @@ msgstr ""
 #: src/pacman/pacman.c:131
 #, fuzzy, c-format
 msgid ""
-"  -p, --file          query the package file [package] instead of the "
+"  -p, --file           query the package file [package] instead of the "
 "database\n"
 msgstr ""
 "  -p, --file          pacman va interroger le fichier [paquet] au lieu de\n"
 
 #: src/pacman/pacman.c:132
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -s, --search        search locally-installed packages for matching "
+"  -s, --search         search locally-installed packages for matching "
 "strings\n"
 msgstr ""
 "  -s, --search        recherche dans les paquets installés localement ceux "
@@ -518,7 +525,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:133
 #, fuzzy, c-format
-msgid "  -u, --upgrades      list all packages that can be upgraded\n"
+msgid "  -u, --upgrades       list all packages that can be upgraded\n"
 msgstr "  -u, --sysupgrade    met à jour tous les paquets obsolètes\n"
 
 #: src/pacman/pacman.c:135
@@ -527,167 +534,183 @@ msgid "usage:  %s {-S --sync} [options] [package]\n"
 msgstr ""
 
 #: src/pacman/pacman.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -c, --clean         remove old packages from cache directory (use -cc for "
+"  -c, --clean          remove old packages from cache directory (use -cc for "
 "all)\n"
 msgstr ""
 "  -c, --clean         remove old packages from cache directory (use -cc for "
 "all)\n"
 
 #: src/pacman/pacman.c:139
-#, c-format
-msgid "  -e, --dependsonly   install dependencies only\n"
+#, fuzzy, c-format
+msgid "  -e, --dependsonly    install dependencies only\n"
 msgstr "  -e, --dependsonly   installe les dépendances uniquement\n"
 
 #: src/pacman/pacman.c:143
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -p, --print-uris    print out URIs for given packages and their "
+"  -p, --print-uris     print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
 "  -p, --print-uris    affiche les URIs pour des paquets donnés et leurs "
 "dépendances\n"
 
 #: src/pacman/pacman.c:144
-#, c-format
-msgid "  -s, --search        search remote repositories for matching strings\n"
+#, fuzzy, c-format
+msgid ""
+"  -s, --search         search remote repositories for matching strings\n"
 msgstr "  -s, --search        recherche la chaîne dans les dépots distants\n"
 
 #: src/pacman/pacman.c:145
-#, c-format
-msgid "  -u, --sysupgrade    upgrade all packages that are out of date\n"
+#, fuzzy, c-format
+msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade    met à jour tous les paquets obsolètes\n"
 
 #: src/pacman/pacman.c:146
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -w, --downloadonly  download packages but do not install/upgrade anything\n"
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"
 msgstr ""
 "  -w, --downloadonly  télécharge les paquets mais n'installe rien et ne met "
 "rien à jour\n"
 
 #: src/pacman/pacman.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -y, --refresh       download fresh package databases from the server\n"
+"  -y, --refresh        download fresh package databases from the server\n"
 msgstr ""
 "  -y, --refresh       télécharge les dernières bases de données depuis les "
 "serveurs\n"
 
 #: src/pacman/pacman.c:148
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"      --ignore <pkg>  ignore a package upgrade (can be used more than once)\n"
+"      --ignore <pkg>   ignore a package upgrade (can be used more than "
+"once)\n"
 msgstr ""
 "      --ignore <pkg>  ignore la mise à jour d'un paquet (peut être utilisé "
 "plus d'une fois)\n"
 
 #: src/pacman/pacman.c:150
-#, c-format
-msgid "      --config <path> set an alternate configuration file\n"
+#, fuzzy, c-format
+msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <path> défini un fichier de configuration alternatif\n"
 
 #: src/pacman/pacman.c:151
-#, c-format
-msgid "      --noconfirm     do not ask for anything confirmation\n"
+#, fuzzy, c-format
+msgid "      --noconfirm      do not ask for anything confirmation\n"
 msgstr "      --noconfirm     ne demande aucune confirmation\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
-msgid "      --ask  <number> pre-specify answers for questions (see manpage)\n"
+msgid ""
+"      --ask <number>   pre-specify answers for questions (see manpage)\n"
 msgstr ""
 
 #: src/pacman/pacman.c:153
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"      --noprogressbar do not show a progress bar when downloading files\n"
+"      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr ""
 "      --noprogressbar n'affiche pas la barre de progression pendant le "
 "téléchargement\n"
 
 #: src/pacman/pacman.c:154
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"      --noscriptlet   do not execute the install scriptlet if there is any\n"
+"      --noscriptlet    do not execute the install scriptlet if there is any\n"
 msgstr ""
 "      --noscriptlet   n'exécute pas les scripts d'installation s'il y'en a\n"
 
 #: src/pacman/pacman.c:155
-#, c-format
-msgid "  -v, --verbose       be verbose\n"
+#, fuzzy, c-format
+msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose       mode verbeux (affichage prolixe)\n"
 
 #: src/pacman/pacman.c:156
-#, c-format
-msgid "  -r, --root <path>   set an alternate installation root\n"
+#, fuzzy, c-format
+msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr "  -r, --root <path>   défini un répertoire d'installation alternatif\n"
 
 #: src/pacman/pacman.c:157
-#, c-format
-msgid "  -b, --dbpath <path> set an alternate database location\n"
+#, fuzzy, c-format
+msgid "  -b, --dbpath <path>  set an alternate database location\n"
+msgstr ""
+"  -b, --dbpath <path> défini un emplacement alternatif pour les bases de "
+"données\n"
+
+#: src/pacman/pacman.c:158
+#, fuzzy, c-format
+msgid "      --cachedir <dir> set an alternate database location\n"
 msgstr ""
 "  -b, --dbpath <path> défini un emplacement alternatif pour les bases de "
 "données\n"
 
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:171
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 "                       Ce programme peut être librement redistribué sous\n"
 
-#: src/pacman/pacman.c:171
+#: src/pacman/pacman.c:172
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr "                       les termes de la GNU General Public License\n"
 
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:299
 #, fuzzy, c-format
-msgid "error: '%s' is not a valid debug level"
+msgid "'%s' is not a valid debug level"
 msgstr "%s nest pas une expression régulière valide.\n"
 
-#: src/pacman/pacman.c:334
-#, c-format
-msgid "error: '%s' is not a valid db path\n"
-msgstr ""
+#: src/pacman/pacman.c:315
+#, fuzzy, c-format
+msgid "'%s' is not a valid cache directory\n"
+msgstr "n'a pas pu acceder au répertoire de cache\n"
 
-#: src/pacman/pacman.c:364
-#, c-format
-msgid "error: '%s' is not a valid root path\n"
-msgstr ""
+#: src/pacman/pacman.c:341
+#, fuzzy, c-format
+msgid "'%s' is not a valid db path\n"
+msgstr "%s nest pas une expression régulière valide.\n"
+
+#: src/pacman/pacman.c:371
+#, fuzzy, c-format
+msgid "'%s' is not a valid root path\n"
+msgstr "%s nest pas une expression régulière valide.\n"
 
-#: src/pacman/pacman.c:391
+#: src/pacman/pacman.c:398
 msgid "only one operation may be used at a time\n"
 msgstr "une seule opération peut être effectuée à la fois\n"
 
-#: src/pacman/pacman.c:454
+#: src/pacman/pacman.c:461
 #, c-format
 msgid "failed to initilize alpm library (%s)\n"
 msgstr "échec d'initialisation de la librairie alpm (%s)\n"
 
-#: src/pacman/pacman.c:487
+#: src/pacman/pacman.c:494
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr "vous ne pouvez effectuer cette opération à moins d'être root.\n"
 
-#: src/pacman/pacman.c:503
+#: src/pacman/pacman.c:510
 #, fuzzy, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "échec de préparation de la transaction (%s)\n"
 
-#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
 msgid "Targets:"
 msgstr "Cibles:"
 
-#: src/pacman/pacman.c:519
+#: src/pacman/pacman.c:526
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr "n'a pas pu enregistrer la base de données 'locale' (%s)\n"
 
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:533
 msgid "no targets specified (use -h for help)\n"
 msgstr "aucune cible spécifiée (utiliser -h pour de l'aide)\n"
 
-#: src/pacman/pacman.c:539
+#: src/pacman/pacman.c:546
 msgid "no operation specified (use -h for help)\n"
 msgstr "aucune opération spécifiée (utiliser -h pour de l'aide)\n"
 
@@ -705,39 +728,39 @@ msgstr "%s appartient à %s %s\n"
 msgid "No package owns %s\n"
 msgstr "Aucun paquet ne contient %s\n"
 
-#: src/pacman/query.c:122 src/pacman/sync.c:413
+#: src/pacman/query.c:119 src/pacman/sync.c:409
 msgid "no usable package repositories configured.\n"
 msgstr "aucun dépot de paquet utilisable n'est définit.\n"
 
-#: src/pacman/query.c:128
+#: src/pacman/query.c:125
 #, fuzzy
 msgid "Checking for package upgrades..."
 msgstr "verification de l'intégrité des paquets"
 
-#: src/pacman/query.c:135
+#: src/pacman/query.c:132
 msgid "no upgrades found"
 msgstr ""
 
-#: src/pacman/query.c:173
+#: src/pacman/query.c:170
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "le groupe \"%s\" n'a pas été trouvé\n"
 
-#: src/pacman/query.c:184
+#: src/pacman/query.c:181
 msgid "no package file was specified for --file\n"
 msgstr "aucun fichier du paquet spécifié pour --file\n"
 
-#: src/pacman/query.c:188
+#: src/pacman/query.c:185
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "échec de chargement du paquet '%s' (%s)\n"
 
-#: src/pacman/query.c:226 src/pacman/query.c:263
+#: src/pacman/query.c:223 src/pacman/query.c:255
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "paquet \"%s\" non trouvé\n"
 
-#: src/pacman/remove.c:58 src/pacman/sync.c:528
+#: src/pacman/remove.c:58 src/pacman/sync.c:524
 #, c-format
 msgid ":: group %s:\n"
 msgstr ":: groupe %s:\n"
@@ -751,7 +774,7 @@ msgstr "    Effacer tout le contenu? [O/n] "
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Retirer %s du groupe %s? [O/n] "
 
-#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
+#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
 #, c-format
 msgid "failed to init transaction (%s)\n"
 msgstr "échec d'initialisation de la transaction (%s)\n"
@@ -817,39 +840,39 @@ msgstr "echec de mise à jour %s (%s)\n"
 msgid " %s is up to date\n"
 msgstr " %s est à jour\n"
 
-#: src/pacman/sync.c:341
+#: src/pacman/sync.c:337
 #, c-format
 msgid "package \"%s\" was not found.\n"
 msgstr "paquet \"%s\" non trouvé.\n"
 
-#: src/pacman/sync.c:378
+#: src/pacman/sync.c:374
 #, c-format
 msgid "repository \"%s\" was not found.\n"
 msgstr "le dépot \"%s\" n'a pas été trouvé.\n"
 
-#: src/pacman/sync.c:450
+#: src/pacman/sync.c:446
 msgid ":: Synchronizing package databases...\n"
 msgstr ":: Synchronisation des bases de données de paquets...\n"
 
-#: src/pacman/sync.c:451
+#: src/pacman/sync.c:447
 msgid "synchronizing package lists"
 msgstr "synchronisation de la liste des paquets"
 
-#: src/pacman/sync.c:453
+#: src/pacman/sync.c:449
 #, fuzzy
 msgid "failed to synchronize any databases"
 msgstr "echec lors de la synchronisation %s\n"
 
-#: src/pacman/sync.c:459
+#: src/pacman/sync.c:455
 #, fuzzy
 msgid ":: Starting full system upgrade...\n"
 msgstr "demarrage de la mise à jour pour le système complet"
 
-#: src/pacman/sync.c:460
+#: src/pacman/sync.c:456
 msgid "starting full system upgrade"
 msgstr "demarrage de la mise à jour pour le système complet"
 
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:474
 msgid ""
 "\n"
 ":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -857,59 +880,59 @@ msgstr ""
 "\n"
 ":: pacman a détecté une version plus récente du paquet \"pacman\".\n"
 
-#: src/pacman/sync.c:479
+#: src/pacman/sync.c:475
 msgid ":: It is recommended that you allow pacman to upgrade itself\n"
 msgstr ":: Il est recommandé de laisser pacman se mettre à jour\n"
 
-#: src/pacman/sync.c:480
+#: src/pacman/sync.c:476
 msgid ":: first, then you can re-run the operation with the newer version.\n"
 msgstr ""
 ":: d'abord, vous devriez re-lancer l'opération avec la nouvelle version.\n"
 
-#: src/pacman/sync.c:482
+#: src/pacman/sync.c:478
 msgid ":: Upgrade pacman first? [Y/n] "
 msgstr ":: Mettre à jour pacman préalablement? [O/n] "
 
-#: src/pacman/sync.c:497
+#: src/pacman/sync.c:493
 #, fuzzy, c-format
 msgid "pacman: %s\n"
 msgstr "Aucun paquet ne contient %s\n"
 
-#: src/pacman/sync.c:517
+#: src/pacman/sync.c:513
 #, c-format
 msgid "'%s': %s\n"
 msgstr ""
 
-#: src/pacman/sync.c:532
+#: src/pacman/sync.c:528
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Installer tout le contenu? [O/n] "
 
-#: src/pacman/sync.c:539
+#: src/pacman/sync.c:535
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Installer %s du groupe %s? [O/n] "
 
-#: src/pacman/sync.c:563
+#: src/pacman/sync.c:559
 #, fuzzy, c-format
 msgid "'%s': not found in sync db\n"
 msgstr ""
 "n'a pas pu ajouter la cible '%s': non trouvé dans la base de données de "
 "synchronisation\n"
 
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
 msgid "requires"
 msgstr "requiert"
 
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
 msgid "is required by"
 msgstr "est requit par"
 
-#: src/pacman/sync.c:625
+#: src/pacman/sync.c:621
 #, fuzzy
 msgid "local database is up to date\n"
 msgstr " %s est à jour\n"
 
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:630
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -917,11 +940,11 @@ msgstr ""
 "\n"
 "Début du téléchargement...\n"
 
-#: src/pacman/sync.c:638
+#: src/pacman/sync.c:634
 msgid "Proceed with download? [Y/n] "
 msgstr "Procéder au téléchargement? [O/n] "
 
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:642
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -929,140 +952,131 @@ msgstr ""
 "\n"
 "Début du processus de mise à jour...\n"
 
-#: src/pacman/sync.c:650
+#: src/pacman/sync.c:646
 #, fuzzy
 msgid "Proceed with installation? [Y/n] "
 msgstr "Procéder au téléchargement? [O/n] "
 
-#: src/pacman/trans.c:57
-msgid "] 100%    LOCAL "
-msgstr ""
-
-#: src/pacman/trans.c:68
+#: src/pacman/trans.c:52
 msgid "checking dependencies... "
 msgstr "vérification des dépendances..."
 
-#: src/pacman/trans.c:72
+#: src/pacman/trans.c:56
 msgid "checking for file conflicts... "
 msgstr "vérification des conflits de fichiers..."
 
-#: src/pacman/trans.c:76
+#: src/pacman/trans.c:60
 #, fuzzy
 msgid "cleaning up... "
 msgstr "désinstallation de %s... "
 
-#: src/pacman/trans.c:79
+#: src/pacman/trans.c:63
 msgid "resolving dependencies... "
 msgstr "résolution des dépendances..."
 
-#: src/pacman/trans.c:82
+#: src/pacman/trans.c:66
 msgid "looking for inter-conflicts... "
 msgstr "recherche inter-conflits... "
 
-#: src/pacman/trans.c:102
+#: src/pacman/trans.c:86
 #, c-format
 msgid "installing %s... "
 msgstr "installation de %s ..."
 
-#: src/pacman/trans.c:109
+#: src/pacman/trans.c:93
 #, c-format
 msgid "installed %s (%s)"
 msgstr "%s installé (%s)"
 
-#: src/pacman/trans.c:116
+#: src/pacman/trans.c:100
 #, c-format
 msgid "removing %s... "
 msgstr "désinstallation de %s... "
 
-#: src/pacman/trans.c:123
+#: src/pacman/trans.c:107
 #, c-format
 msgid "removed %s (%s)"
 msgstr "%s désinstallé (%s)"
 
-#: src/pacman/trans.c:130
+#: src/pacman/trans.c:114
 #, c-format
 msgid "upgrading %s... "
 msgstr "mise à jour de %s... "
 
-#: src/pacman/trans.c:137
+#: src/pacman/trans.c:121
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "%s mit à jour (%s -> %s)"
 
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:128
 msgid "checking package integrity... "
 msgstr "verification de l'intégrité des paquets"
 
-#: src/pacman/trans.c:158
-#, fuzzy
-msgid " done.\n"
-msgstr "fait.\n"
-
-#: src/pacman/trans.c:160
-msgid " failed.\n"
+#: src/pacman/trans.c:144
+msgid "failed.\n"
 msgstr ""
 
-#: src/pacman/trans.c:167
+#: src/pacman/trans.c:151
 #, fuzzy, c-format
 msgid ":: Retrieving packages from %s...\n"
 msgstr ""
 "\n"
 ":: Récupération des paquets depuis %s...\n"
 
-#: src/pacman/trans.c:190
+#: src/pacman/trans.c:171
 #, c-format
 msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""
 ":: %s requiert %s, mais il est défini en IgnorePkg. Installer tout de même? "
 "[Y/n] "
 
-#: src/pacman/trans.c:204
+#: src/pacman/trans.c:185
 #, fuzzy, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ":: %s est indiqué comme \"HoldPkg\".  Supprimer tout de même? [Y/n] "
 
-#: src/pacman/trans.c:217
+#: src/pacman/trans.c:198
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Remplacer %s avec %s/%s? [O/n] "
 
-#: src/pacman/trans.c:232
+#: src/pacman/trans.c:213
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s est en conflit avec with %s. Retirer %s? [O/n] "
 
-#: src/pacman/trans.c:248
+#: src/pacman/trans.c:229
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: la version locale est plus récente. Mettre à jour tout de même? [Y/"
 "n] "
 
-#: src/pacman/trans.c:266
+#: src/pacman/trans.c:247
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: la version locale est à jour. Mettre à jour tout de même? [Y/n] "
 
-#: src/pacman/trans.c:284
+#: src/pacman/trans.c:265
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: L'archive %s est corrompue. Voulez vous l'effacer? [Y/n] "
 
-#: src/pacman/trans.c:333
+#: src/pacman/trans.c:314
 msgid "installing"
 msgstr "Installation"
 
-#: src/pacman/trans.c:336
+#: src/pacman/trans.c:317
 msgid "upgrading"
 msgstr "Mise à jour"
 
-#: src/pacman/trans.c:339
+#: src/pacman/trans.c:320
 #, fuzzy
 msgid "removing"
 msgstr "désinstallation de %s... "
 
-#: src/pacman/trans.c:342
+#: src/pacman/trans.c:323
 #, fuzzy
 msgid "checking for file conflicts"
 msgstr "vérification des conflits de fichiers..."
@@ -1072,14 +1086,14 @@ msgstr "vérification des conflits de fichiers..."
 msgid "None\n"
 msgstr "Aucun\n"
 
-#: src/pacman/util.c:303
+#: src/pacman/util.c:310
 #, fuzzy
 msgid "Remove:"
 msgstr ""
 "\n"
 "Retire:  "
 
-#: src/pacman/util.c:311
+#: src/pacman/util.c:318
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1088,7 +1102,7 @@ msgstr ""
 "\n"
 "Taille Totale du Paquet:   %.1f MB\n"
 
-#: src/pacman/util.c:322
+#: src/pacman/util.c:329
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1097,13 +1111,17 @@ msgstr ""
 "\n"
 "Taille Totale du Paquet:   %.1f MB\n"
 
-#: src/pacman/util.c:329
+#: src/pacman/util.c:336
 #, fuzzy, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr ""
 "\n"
 "Taille Totale du Paquet:   %.1f MB\n"
 
+#, fuzzy
+#~ msgid " done.\n"
+#~ msgstr "fait.\n"
+
 #~ msgid "done."
 #~ msgstr "fait."