[meld] Updated French translation

[Bruno Brouard <bbrouard src gnome org>]

commit acc8709a35075b7cbb3232effc1dcea44739b33a
Author: Bruno Brouard <annoa b gmail com>
Date:   Sat Dec 18 12:21:33 2010 +0100

    Updated French translation

 po/fr.po |  339 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 205 insertions(+), 134 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 65fef34..f33a270 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,14 +13,14 @@ msgstr ""
 "Project-Id-Version: Meld HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&component=general\n"
-"POT-Creation-Date: 2010-10-22 20:43+0000\n"
-"PO-Revision-Date: 2010-10-13 20:52+0200\n"
+"POT-Creation-Date: 2010-12-11 19:24+0000\n"
+"PO-Revision-Date: 2010-12-18 10:58+0100\n"
 "Last-Translator: Claude Paroz <claude 2xlibre net>\n"
 "Language-Team: Français <gnomefr traduc org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../bin/meld:96
 msgid "Cannot import: "
@@ -111,46 +111,49 @@ msgstr "Sélectionnez les fichiers"
 msgid ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
 "Copyright &#xA9; 2009-2010 Kai Willadsen"
-msgstr "Copyright © 2002-2009 Stephen Kennedy"
-"Copyright © 2009-2010 Kai Willadsen"
+msgstr ""
+"Copyright © 2002-2009 Stephen KennedyCopyright © 2009-2010 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
 msgid "Directory"
 msgstr "Répertoire"
 
-#: ../data/ui/meldapp.ui.h:6
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:7
 msgid "Mine"
 msgstr "Le mien"
 
-#: ../data/ui/meldapp.ui.h:7
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:9
 msgid "Original"
 msgstr "Original"
 
-#: ../data/ui/meldapp.ui.h:8
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:11
 msgid "Other"
 msgstr "Autre"
 
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:12
 msgid "Select VC Directory"
 msgstr "Sélectionner le répertoire du gestionnaire de versions"
 
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:13
 msgid "_Directory Comparison"
 msgstr "Comparaison de _répertoires"
 
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
 msgstr "Comparaison de _fichiers"
 
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:15
 msgid "_Three Way Compare"
 msgstr "Comparaison _triple"
 
-#: ../data/ui/meldapp.ui.h:13
+#: ../data/ui/meldapp.ui.h:16
 msgid "_Version Control Browser"
 msgstr "Navigateur du gestionnaire de _versions"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../data/ui/meldapp.ui.h:17
 msgid "translator-credits"
 msgstr ""
 "Stephen Kennedy <steve9000 users sourceforge net>, 2003\n"
@@ -159,6 +162,34 @@ msgstr ""
 "Robert-André Mauchin <zebob m pengzone org>, 2007\n"
 "Bruno Brouard <annoa b gmail com>, 2009-2010"
 
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "Copier vers le presse-papiers"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "Créer un correctif"
+
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Create a patch"
+msgstr "Créer un correctif"
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr "Panneaux de gauche et du milieu"
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr "Panneaux du milieu et de droite"
+
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Use differences between:"
+msgstr "Utiliser les différences entre :"
+
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "Inve_rser la direction du correctif"
+
 #: ../data/ui/preferences.ui.h:1
 msgid "Display"
 msgstr "Affichage"
@@ -218,23 +249,27 @@ msgid "Show _line numbers"
 msgstr "Afficher les numéros de _ligne"
 
 #: ../data/ui/preferences.ui.h:15
+msgid "Show w_hitespace"
+msgstr "Affic_her les espaces"
+
+#: ../data/ui/preferences.ui.h:16
 msgid "Text Filters"
 msgstr "Filtres de texte"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:17
 msgid "Use _default system editor"
 msgstr "Utiliser l'éditeur par _défaut du système"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:18
 msgid "Use s_yntax highlighting"
 msgstr "Utiliser la _coloration syntaxique"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:19
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr ""
 "Lors du chargement, essayer ces codages dans l'ordre (ex : utf-8, iso8859)"
 
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:20
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -244,7 +279,7 @@ msgstr ""
 "des dossiers en fonction de leur nom. Chaque motif est une liste de jokers "
 "de type shell séparés par des espaces."
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:21
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -258,19 +293,19 @@ msgstr ""
 "comparaison. Si l'expression contient des groupes, seuls les groupes sont "
 "remplacés. Consultez le manuel d'utilisation pour plus de détails."
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:22
 msgid "_Editor font:"
 msgstr "_Police de l'éditeur :"
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:23
 msgid "_Insert spaces instead of tabs"
 msgstr "Insérer des _espaces au lieu des tabulations"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:24
 msgid "_Tab width:"
 msgstr "Largeur des _tabulations :"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:25
 msgid "_Use the system fixed width font"
 msgstr "_Utiliser la police à chasse fixe du système"
 
@@ -302,7 +337,7 @@ msgstr "Message du journal"
 msgid "Previous Logs"
 msgstr "Journaux précédents"
 
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:189
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
 msgid "Tag"
 msgstr "Ã?tiquette"
 
@@ -310,11 +345,11 @@ msgstr "Ã?tiquette"
 msgid "VC Log"
 msgstr "Journal du gestionnaire de versions"
 
-#: ../meld/dirdiff.py:142 ../meld/vcview.py:128
+#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
 msgid "_Compare"
 msgstr "_Comparer"
 
-#: ../meld/dirdiff.py:142 ../meld/vcview.py:128
+#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
 msgid "Compare selected"
 msgstr "Comparer la sélection"
 
@@ -338,7 +373,7 @@ msgstr "Copier vers la droite"
 msgid "Delete selected"
 msgstr "Effacer la sélection"
 
-#: ../meld/dirdiff.py:146 ../meld/filediff.py:914
+#: ../meld/dirdiff.py:146 ../meld/filediff.py:962
 msgid "Hide"
 msgstr "Masquer"
 
@@ -346,7 +381,7 @@ msgstr "Masquer"
 msgid "Hide selected"
 msgstr "Masquer la sélection"
 
-#: ../meld/dirdiff.py:148 ../meld/filediff.py:226 ../meld/vcview.py:129
+#: ../meld/dirdiff.py:148 ../meld/filediff.py:246 ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "Ouvrir la sélection"
 
@@ -378,7 +413,7 @@ msgstr "Afficher les nouveaux fichiers"
 msgid "Modified"
 msgstr "Modifiés"
 
-#: ../meld/dirdiff.py:155 ../meld/vcview.py:142
+#: ../meld/dirdiff.py:155 ../meld/vcview.py:132
 msgid "Show modified"
 msgstr "Afficher les objets modifiés"
 
@@ -400,8 +435,8 @@ msgstr "Erreur durant la conversion de « %s » en expression régulière."
 msgid "Hide %s"
 msgstr "Masquer %s"
 
-#: ../meld/dirdiff.py:355 ../meld/dirdiff.py:365 ../meld/vcview.py:309
-#: ../meld/vcview.py:337
+#: ../meld/dirdiff.py:355 ../meld/dirdiff.py:365 ../meld/vcview.py:299
+#: ../meld/vcview.py:327
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] En cours d'analyse de %s"
@@ -447,7 +482,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:548 ../meld/vcview.py:496
+#: ../meld/dirdiff.py:548 ../meld/vcview.py:486
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -456,7 +491,7 @@ msgstr ""
 "« %s » est un répertoire.\n"
 "Supprimer récursivement ?"
 
-#: ../meld/dirdiff.py:555 ../meld/vcview.py:501
+#: ../meld/dirdiff.py:555 ../meld/vcview.py:491
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -516,114 +551,146 @@ msgid_plural "%i years"
 msgstr[0] "%i année"
 msgstr[1] "%i années"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:247
 msgid "Format as patch..."
 msgstr "Mettre sous forme de correctif..."
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:247
 msgid "Create a patch using differences between files"
 msgstr ""
 "Crée un correctif (patch) en utilisant les différences entre les fichiers"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:248
 msgid "Previous conflict"
 msgstr "Conflit précédent"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:248
 msgid "Go to the previous conflict"
 msgstr "Revient au conflit précédent"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:249
 msgid "Next conflict"
 msgstr "Conflit suivant"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:249
 msgid "Go to the next conflict"
 msgstr "Va au prochain conflit"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:250
 msgid "Push to left"
 msgstr "Envoyer à gauche"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:250
 msgid "Push current change to the left"
 msgstr "Envoie la modification actuelle vers la gauche"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:251
 msgid "Push to right"
 msgstr "Envoyer à droite"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:251
 msgid "Push current change to the right"
 msgstr "Envoie la modification actuelle vers la droite"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:253
 msgid "Pull from left"
 msgstr "Récupérer de la gauche"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:253
 msgid "Pull change from the left"
 msgstr "Récupère la modification de gauche"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:254
 msgid "Pull from right"
 msgstr "Récupérer de la droite"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:254
 msgid "Pull change from the right"
 msgstr "Récupère la modification de droite"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:255
+msgid "Copy above left"
+msgstr "Copier au-dessus de la gauche"
+
+#: ../meld/filediff.py:255
+msgid "Copy change above the left chunk"
+msgstr "Copie la modification au-dessus du segment de gauche"
+
+#: ../meld/filediff.py:256
+msgid "Copy below left"
+msgstr "Copier en dessous de la gauche"
+
+#: ../meld/filediff.py:256
+msgid "Copy change below the left chunk"
+msgstr "Copie la modification en dessous du segment de gauche"
+
+#: ../meld/filediff.py:257
+msgid "Copy above right"
+msgstr "Copier au-dessus de la droite"
+
+#: ../meld/filediff.py:257
+msgid "Copy change above the right chunk"
+msgstr "Copie la modification au-dessus du segment de droite"
+
+#: ../meld/filediff.py:258
+msgid "Copy below right"
+msgstr "Copier en dessous de la droite"
+
+#: ../meld/filediff.py:258
+msgid "Copy change below the right chunk"
+msgstr "Copie la modification en dessous du segement de droite"
+
+#: ../meld/filediff.py:259
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:259
 msgid "Delete change"
 msgstr "Supprimer les modifications"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:260
 msgid "Merge all changes from left"
 msgstr "Fusionne toutes les modifications de gauche"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:260
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Fusionne toutes les modifications non-conflictuelles de gauche"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:261
 msgid "Merge all changes from right"
 msgstr "Fusionne toutes les modifications de droite"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:261
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Fusionne toutes les modifications non-conflictuelles de droite"
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:262
 msgid "Merge all non-conflicting"
 msgstr "Fusionne toutes les modifications non-conflictuelles"
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:262
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr ""
 "Fusionne toutes les modifications non-conflictuelles des panneaux de gauche "
 "et de droite"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:333
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:333
 msgid "OVR"
 msgstr "Ã?CR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:335
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, Col %i"
 
-#: ../meld/filediff.py:493
+#: ../meld/filediff.py:537
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -634,54 +701,54 @@ msgstr ""
 "plus de détails."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:595
+#: ../meld/filediff.py:645
 msgid "<unnamed>"
 msgstr "<Document non enregistré>"
 
-#: ../meld/filediff.py:772
+#: ../meld/filediff.py:828
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Régler le nombre de volets"
 
-#: ../meld/filediff.py:778
+#: ../meld/filediff.py:834
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ouverture des fichiers"
 
-#: ../meld/filediff.py:784 ../meld/filediff.py:918
+#: ../meld/filediff.py:840 ../meld/filediff.py:966
 msgid "Hi_de"
 msgstr "Mas_quer"
 
-#: ../meld/filediff.py:806 ../meld/filediff.py:817 ../meld/filediff.py:830
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:861 ../meld/filediff.py:870 ../meld/filediff.py:882
+#: ../meld/filediff.py:888
 msgid "Could not read file"
 msgstr "Impossible de lire le fichier"
 
-#: ../meld/filediff.py:809
+#: ../meld/filediff.py:862
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lecture des fichiers"
 
-#: ../meld/filediff.py:818
+#: ../meld/filediff.py:871
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semble être un fichier binaire."
 
-#: ../meld/filediff.py:831
+#: ../meld/filediff.py:883
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s n'est pas dans un des codages : %s"
 
-#: ../meld/filediff.py:863 ../meld/filemerge.py:70
+#: ../meld/filediff.py:913 ../meld/filemerge.py:69
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcul des différences"
 
-#: ../meld/filediff.py:912
+#: ../meld/filediff.py:960
 msgid "Files are identical"
 msgstr "Les fichiers sont identiques"
 
-#: ../meld/filediff.py:1047
+#: ../meld/filediff.py:1095
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -690,7 +757,7 @@ msgstr ""
 "« %s » existe déjà  !\n"
 "�craser ?"
 
-#: ../meld/filediff.py:1060
+#: ../meld/filediff.py:1108
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -701,12 +768,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1069
+#: ../meld/filediff.py:1117
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Choisissez un nom pour le tampon %i."
 
-#: ../meld/filediff.py:1083
+#: ../meld/filediff.py:1132
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -717,7 +784,7 @@ msgstr ""
 "\n"
 "Quel format voulez-vous utiliser ?"
 
-#: ../meld/filediff.py:1099
+#: ../meld/filediff.py:1148
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -726,7 +793,7 @@ msgstr ""
 "« %s » contient des caractères qui ne peuvent être codés avec « %s »\n"
 "Voulez-vous enregistrer en UTF-8Â ?"
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1207
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -739,7 +806,7 @@ msgstr ""
 "\n"
 "Vous ne pouvez pas annuler cette opération."
 
-#: ../meld/filemerge.py:78
+#: ../meld/filemerge.py:82
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fusion des fichiers"
@@ -966,10 +1033,14 @@ msgid "Automatically compare all differing files on startup"
 msgstr "Compare automatiquement tous les fichiers différents au démarrage"
 
 #: ../meld/meldapp.py:619
+msgid "Set the target file for saving a merge result"
+msgstr "Définit le fichier cible pour l'enregistrement d'un résultat de fusion"
+
+#: ../meld/meldapp.py:622
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr "Crée un onglet diff pour un maximum de 3 fichiers ou répertoires."
 
-#: ../meld/meldapp.py:622
+#: ../meld/meldapp.py:625
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "trop de paramètres (0-4 désirés, %d reçus)"
@@ -983,7 +1054,7 @@ msgstr "sans titre"
 msgid "[None]"
 msgstr "[Aucun]"
 
-#: ../meld/patchdialog.py:118
+#: ../meld/patchdialog.py:119
 msgid "Save Patch As..."
 msgstr "Enregistrer le correctif sous..."
 
@@ -995,247 +1066,247 @@ msgstr "étiquette"
 msgid "pattern"
 msgstr "motif"
 
-#: ../meld/preferences.py:141
+#: ../meld/preferences.py:142
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Disponible uniquement si gnome-python-desktop est installé"
 
 #. file filters
 #. text filters
-#: ../meld/preferences.py:165 ../meld/preferences.py:170 ../meld/vcview.py:166
+#: ../meld/preferences.py:167 ../meld/preferences.py:172 ../meld/vcview.py:156
 msgid "Name"
 msgstr "Nom"
 
-#: ../meld/preferences.py:165 ../meld/preferences.py:170
+#: ../meld/preferences.py:167 ../meld/preferences.py:172
 msgid "Active"
 msgstr "Actif"
 
-#: ../meld/preferences.py:165
+#: ../meld/preferences.py:167
 msgid "Pattern"
 msgstr "Motif"
 
-#: ../meld/preferences.py:170
+#: ../meld/preferences.py:172
 msgid "Regex"
 msgstr "Expression régulière"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:264
+#: ../meld/preferences.py:269
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Sauvegardes\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:266
+#: ../meld/preferences.py:271
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Gestionnaire de versions\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:268
+#: ../meld/preferences.py:273
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgstr "Binaires\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:270
+#: ../meld/preferences.py:275
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "Média\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:272
+#: ../meld/preferences.py:277
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "Mots-clés CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:274
+#: ../meld/preferences.py:279
 msgid "C++ comment\t0\t//.*\n"
 msgstr "Commentaire C++\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:276
+#: ../meld/preferences.py:281
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "Commentaire C\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:278
+#: ../meld/preferences.py:283
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Tout caractère d'espacement\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:280
+#: ../meld/preferences.py:285
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "Caractère d'espacement en début de ligne\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:282
+#: ../meld/preferences.py:287
 msgid "Script comment\t0\t#.*"
 msgstr "Commentaire de script\t0\t#.*"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:120
 msgid "_Commit"
 msgstr "_Valider"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:120
 msgid "Commit"
 msgstr "Valider"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:121
 msgid "_Update"
 msgstr "Mettre à _jour"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:121
 msgid "Update"
 msgstr "Mettre à jour"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:122
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:122
 msgid "Add to VC"
 msgstr "Ajouter au gestionnaire de versions"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:123
 msgid "Add _Binary"
 msgstr "Ajouter _binaire"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:123
 msgid "Add binary to VC"
 msgstr "Ajouter le binaire au gestionnaire de versions"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:124
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:124
 msgid "Remove from VC"
 msgstr "Supprimer du gestionnaire de versions"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:125
 msgid "_Resolved"
 msgstr "_Résolu"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:125
 msgid "Mark as resolved for VC"
 msgstr "Marque comme résolu pour le gestionnaire de versions"
 
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:126
 msgid "Revert to original"
 msgstr "Revenir à l'original"
 
-#: ../meld/vcview.py:137
+#: ../meld/vcview.py:127
 msgid "Delete locally"
 msgstr "Effacer localement"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:131
 msgid "_Flatten"
 msgstr "A_platir"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:131
 msgid "Flatten directories"
 msgstr "Aplatir les répertoires"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:132
 msgid "_Modified"
 msgstr "_Modifiés"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:133
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:133
 msgid "Show normal"
 msgstr "Affichage normal"
 
-#: ../meld/vcview.py:144
+#: ../meld/vcview.py:134
 msgid "Non _VC"
 msgstr "Non _versionné"
 
-#: ../meld/vcview.py:144
+#: ../meld/vcview.py:134
 msgid "Show unversioned files"
 msgstr "Afficher les fichiers qui ne sont pas versionnés"
 
-#: ../meld/vcview.py:145
+#: ../meld/vcview.py:135
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: ../meld/vcview.py:145
+#: ../meld/vcview.py:135
 msgid "Show ignored files"
 msgstr "Afficher les fichiers ignorés"
 
-#: ../meld/vcview.py:186 ../meld/vcview.py:305
+#: ../meld/vcview.py:176 ../meld/vcview.py:295
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../meld/vcview.py:187
+#: ../meld/vcview.py:177
 msgid "Status"
 msgstr "Ã?tat"
 
-#: ../meld/vcview.py:188
+#: ../meld/vcview.py:178
 msgid "Rev"
 msgstr "Révision"
 
-#: ../meld/vcview.py:190
+#: ../meld/vcview.py:180
 msgid "Options"
 msgstr "Options"
 
-#: ../meld/vcview.py:237
+#: ../meld/vcview.py:227
 msgid "Choose one Version Control"
 msgstr "Choisir un système de gestion de versions"
 
-#: ../meld/vcview.py:238
+#: ../meld/vcview.py:228
 msgid "Only one Version Control in this directory"
 msgstr "Un seul système de gestion de versions dans ce répertoire"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:251
+#: ../meld/vcview.py:241
 #, python-format
 msgid "%s Not Installed"
 msgstr "%s n'est pas installé"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:245
 msgid "Invalid Repository"
 msgstr "Dépôt non valide"
 
-#: ../meld/vcview.py:264
+#: ../meld/vcview.py:254
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:305
+#: ../meld/vcview.py:295
 #, python-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: ../meld/vcview.py:353
+#: ../meld/vcview.py:343
 msgid "(Empty)"
 msgstr "(vide)"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:376
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Récupération des différences"
 
-#: ../meld/vcview.py:393
+#: ../meld/vcview.py:383
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Application du correctif"
 
-#: ../meld/vcview.py:397
+#: ../meld/vcview.py:387
 msgid "No differences found."
 msgstr "Aucune différence trouvée."
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:461
 msgid "Select some files first."
 msgstr "Sélectionnez d'abord des fichiers."
 
-#: ../meld/vcview.py:537
+#: ../meld/vcview.py:527
 #, python-format
 msgid ""
 "\n"
@@ -1284,7 +1355,7 @@ msgstr ""
 "                    gestionnaire de versions que vous utilisez.\n"
 "                    "
 
-#: ../meld/ui/findbar.py:119
+#: ../meld/ui/findbar.py:120
 #, python-format
 msgid ""
 "Regular expression error\n"