better phrasing

1 files changed, 80 insertions, 77 deletions

diff --git a/po/fr.po b/po/fr.po
index ba25a408..8309c698 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-02 22:39+0200\n"
+"POT-Creation-Date: 2007-08-03 16:14+0200\n"
 "PO-Revision-Date: 2007-08-02 22:44+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
@@ -254,7 +254,7 @@ msgstr "Type de média :"
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
 #: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:612
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
 #: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
 #, c-format
 msgid "Cancel"
@@ -266,7 +266,7 @@ msgstr "Annuler"
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
 #: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:815
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
 #: ../rpmdrake.pm:304 ../rpmdrake.pm:616
 #, c-format
@@ -617,7 +617,7 @@ msgstr "Parallèle..."
 msgid "Global options..."
 msgstr "Options générales..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:145
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -883,7 +883,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Certains paquetages doivent être enlevés"
@@ -1563,12 +1563,12 @@ msgstr "Serveur en réseau"
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:39
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Usage : %s [OPTION]..."
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:40
 #, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
@@ -1577,12 +1577,12 @@ msgstr ""
 "  -changelog-first       montrer le changelog avant la liste de fichiers\n"
 "                         dans le panneau de description"
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:41
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=media1,..     n'utiliser que les médias listés"
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
@@ -1590,30 +1590,30 @@ msgstr ""
 "  --merge-all-rpmnew     proposer de fusionner tous les fichiers\n"
 "                         .rpmnew/.rpmsave trouvés"
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:43
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            choix du mode (install (défaut), remove, update)"
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      ne pas confirmer au lancement du mode mise à jour"
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:45
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ne pas mettre à jour les médias au démarrage "
 
-#: ../Rpmdrake/init.pm:53
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm - ne pas vérifier les signatures des paquetages"
 
-#: ../Rpmdrake/init.pm:54
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1622,37 +1622,37 @@ msgstr ""
 "  --parallel=alias,host  mode parallèle, avec le groupe \"alias\" et sur\n"
 "                         l'hôte \"host\""
 
-#: ../Rpmdrake/init.pm:55
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    ne montrer que ces paquetages"
 
-#: ../Rpmdrake/init.pm:56
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      présélectionner ces paquetages"
 
-#: ../Rpmdrake/init.pm:57
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 forcer l'exécution en tant que root"
 
-#: ../Rpmdrake/init.pm:58
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           lancer une recherche sur \"pkg\""
 
-#: ../Rpmdrake/init.pm:59
+#: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - afficher la version de cet utilitaire\n"
 
-#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid "Running in user mode"
 msgstr "Fonctionnement en utilisateur normal"
 
-#: ../Rpmdrake/init.pm:137
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1663,12 +1663,12 @@ msgstr ""
 "Vous ne pourrez pas effectuer de modifications sur le système,\n"
 "par contre vous pourrez parcourir la base de données existante."
 
-#: ../Rpmdrake/init.pm:144 ../Rpmdrake/init.pm:169
+#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
 #, c-format
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: ../Rpmdrake/init.pm:149
+#: ../Rpmdrake/init.pm:142
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1681,7 +1681,7 @@ msgstr ""
 "Cet outil va vous aider à choisir quel(s) logiciel(s) vous\n"
 "souhaitez supprimer de votre ordinateur."
 
-#: ../Rpmdrake/init.pm:154
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1694,12 +1694,12 @@ msgstr ""
 "Cet outil va vous aider à choisir les mises à jour que vous\n"
 "souhaiter installer sur votre ordinateur."
 
-#: ../Rpmdrake/init.pm:159
+#: ../Rpmdrake/init.pm:152
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Bienvenue dans l'outil d'installation de logiciels !"
 
-#: ../Rpmdrake/init.pm:160
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1715,17 +1715,17 @@ msgstr ""
 "à choisir quels logiciels vous désirez installer sur votre\n"
 "ordinateur."
 
-#: ../Rpmdrake/init.pm:171
+#: ../Rpmdrake/init.pm:164
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr "L'outil d'installation de logiciels peut configurer des média sources."
 
-#: ../Rpmdrake/init.pm:172
+#: ../Rpmdrake/init.pm:165
 #, c-format
 msgid "Do you want to add media sources now?"
 msgstr "Voulez-vous ajouter des média sources maintenant ?"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Confirmation"
 msgstr "Confirmation"
@@ -1786,18 +1786,18 @@ msgstr ""
 "\n"
 "Puis, redémarrez %s."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #: ../rpmdrake.pm:329
 #, c-format
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
 #, c-format
 msgid "Package installation..."
 msgstr "Installation des paquetages..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #, c-format
 msgid "Initializing..."
 msgstr "Initialisation..."
@@ -1827,17 +1827,17 @@ msgstr "Veuillez patienter, recherche des paquetages installés..."
 msgid "Could not create temporary directory '%s'"
 msgstr "Impossible de créer le répertoire temporaire « %s »"
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:792
+#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Tous les paquetages demandés ont été installés correctement."
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:772
+#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Problem during installation"
 msgstr "Des problèmes sont survenus durant l'installation"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:480 ../Rpmdrake/pkg.pm:774
+#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1848,22 +1848,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:761
+#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
 #, c-format
 msgid "Installation failed"
 msgstr "Echec de l'installation"
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:507
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Impossible d'obtenir les paquetages sources."
 
-#: ../Rpmdrake/pkg.pm:509
+#: ../Rpmdrake/pkg.pm:508
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Impossible d'obtenir les paquetages sources, désolé. %s"
 
-#: ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
 #, c-format
 msgid ""
 "\n"
@@ -1876,95 +1876,95 @@ msgstr ""
 "Erreurs rencontrées :\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:523
 #, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "Le paquetage suivant va être installé :"
 msgstr[1] "Les %d paquetages suivants vont être installés :"
 
-#: ../Rpmdrake/pkg.pm:529
+#: ../Rpmdrake/pkg.pm:528
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Supprimer un paquetage ?"
 msgstr[1] "Supprimer %d paquetages ?"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:530
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr ""
 "Le paquetage suivant doit être supprimé afin que les autres puissent être "
 "mis à jour :"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr ""
 "Les paquetages suivants doivent être supprimés afin que les autres puissent "
 "être mis à jour :"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Êtes-vous d'accord pour continuer ?"
 
-#: ../Rpmdrake/pkg.pm:562
+#: ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Change medium"
 msgstr "Changement de média"
 
-#: ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/pkg.pm:562
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
 
-#: ../Rpmdrake/pkg.pm:586
+#: ../Rpmdrake/pkg.pm:585
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Préparation de l'installation des paquetages..."
 
-#: ../Rpmdrake/pkg.pm:586
-#, c-format
-msgid "Preparing..."
-msgstr "Préparation..."
+#: ../Rpmdrake/pkg.pm:585
+#, fuzzy, c-format
+msgid "Preparing package installation transaction..."
+msgstr "Préparation de l'installation des paquetages..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:588
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installation du paquetage « %s » (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:590
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Total: %s/%s"
 msgstr "Total : %s/%s"
 
-#: ../Rpmdrake/pkg.pm:611 ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Téléchargement du paquetage %s ..."
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:617
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% de %s terminé, ETA = %s, débit = %s"
 
-#: ../Rpmdrake/pkg.pm:619
+#: ../Rpmdrake/pkg.pm:618
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% terminé, débit = %s"
 
-#: ../Rpmdrake/pkg.pm:640
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Vérification de la signature des paquetages..."
 
-#: ../Rpmdrake/pkg.pm:653 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
 #, c-format
 msgid "Warning"
 msgstr "Attention"
 
-#: ../Rpmdrake/pkg.pm:654
+#: ../Rpmdrake/pkg.pm:653
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1979,43 +1979,43 @@ msgstr ""
 "\n"
 "Voulez-vous continuer l'installation ?"
 
-#: ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:666
 #, c-format
 msgid "installing %s from %s"
 msgstr "installation de %s depuis %s"
 
-#: ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/pkg.pm:668
 #, c-format
 msgid "installing %s"
 msgstr "installation de %s"
 
-#: ../Rpmdrake/pkg.pm:673
+#: ../Rpmdrake/pkg.pm:672
 #, c-format
 msgid "removing %s"
 msgstr "désinstallation de %s"
 
-#: ../Rpmdrake/pkg.pm:708 ../Rpmdrake/pkg.pm:726 ../Rpmdrake/pkg.pm:819
+#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
 #: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
 #, c-format
 msgid "Error"
 msgstr "Erreur"
 
-#: ../Rpmdrake/pkg.pm:709 ../Rpmdrake/pkg.pm:727 ../Rpmdrake/pkg.pm:740
+#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
 #, c-format
 msgid "Installation failed:"
 msgstr "L'installation a échoué :"
 
-#: ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
 
-#: ../Rpmdrake/pkg.pm:728
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
 
-#: ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:752
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2028,12 +2028,12 @@ msgstr ""
 "\n"
 "Vous devriez probablement mettre à jour vos médias."
 
-#: ../Rpmdrake/pkg.pm:773
+#: ../Rpmdrake/pkg.pm:763
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transactions ont échoué"
 
-#: ../Rpmdrake/pkg.pm:787
+#: ../Rpmdrake/pkg.pm:777
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2047,43 +2047,43 @@ msgstr ""
 "« .rpmnew » ou « .rpmsave », vous pouvez maintenant les examiner\n"
 "afin de décider ce que vous souhaitez en faire :"
 
-#: ../Rpmdrake/pkg.pm:795
+#: ../Rpmdrake/pkg.pm:787
 #, c-format
 msgid "Upgrade information"
 msgstr "Informations de mise à jour"
 
-#: ../Rpmdrake/pkg.pm:797
+#: ../Rpmdrake/pkg.pm:789
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ces paquets sont fournis avec des informations de mise à jour"
 
-#: ../Rpmdrake/pkg.pm:805
+#: ../Rpmdrake/pkg.pm:797
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Informations de mise à jour de ce paquetage"
 
-#: ../Rpmdrake/pkg.pm:808
+#: ../Rpmdrake/pkg.pm:800
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Informations de mise à jour du paquetage %s"
 
-#: ../Rpmdrake/pkg.pm:820
+#: ../Rpmdrake/pkg.pm:812
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Erreur irrécupérable : aucun paquetage trouvé pour l'installation, désolé."
 
-#: ../Rpmdrake/pkg.pm:836 ../Rpmdrake/pkg.pm:853
+#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Veuillez patienter, suppression des paquetages..."
 
-#: ../Rpmdrake/pkg.pm:864
+#: ../Rpmdrake/pkg.pm:856
 #, c-format
 msgid "Problem during removal"
 msgstr "Un problème est survenu pendant la désinstallation"
 
-#: ../Rpmdrake/pkg.pm:865
+#: ../Rpmdrake/pkg.pm:857
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -3194,3 +3194,6 @@ msgstr "Supprimer des Logiciels"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Gestionnaire de Médias Logiciels"
+
+#~ msgid "Preparing..."
+#~ msgstr "Préparation..."