GNOME.org
 

[meld] Updated French translation

commit e74b2b014eca330b5db123d91dda4153d7885f69
Author: Bruno Brouard <annoa b gmail com>
Date:   Sun Apr 15 16:50:00 2012 +0200

    Updated French translation

 po/fr.po |  765 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 384 insertions(+), 381 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 9ff78c1..5442307 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,20 +1,20 @@
 # French translation of Meld.
-# Copyright (C) 2003-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
 #
 # Stephen Kennedy <steve9000 users sourceforge net>, 2003.
 # Jonathan Ernst <jonathan ernstfamily ch>, 2006.
 # Claude Paroz <claude 2xlibre net>, 2006-2011.
 # Robert-Andrà Mauchin <zebob m pengzone org>, 2007.
-# Bruno Brouard <annoa b gmail com>, 2009-2011.
+# Bruno Brouard <annoa b gmail com>, 2009-2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Meld HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-05-29 02:18+0000\n"
-"PO-Revision-Date: 2011-08-02 17:27+0200\n"
+"POT-Creation-Date: 2012-04-03 07:51+0000\n"
+"PO-Revision-Date: 2012-04-15 16:49+0200\n"
 "Last-Translator: Bruno Brouard <annoa b gmail com>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
 "MIME-Version: 1.0\n"
@@ -22,78 +22,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/meld:96
+#: ../bin/meld:97
 msgid "Cannot import: "
 msgstr "Impossible d'importerÂ: "
 
-#: ../bin/meld:99
+#: ../bin/meld:100
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld nÃcessite %s ou supÃrieur."
 
-#: ../data/meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "Comparer et fusionner des fichiers"
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
 
 #: ../data/meld.desktop.in.h:2
 msgid "Diff Viewer"
 msgstr "Visionneur de diffÃrences"
 
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
-msgid "Meld"
-msgstr "Meld"
-
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:3
 msgid "Meld Diff Viewer"
 msgstr "Meld visionneur de diffÃrences"
 
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "Comparer et fusionner des fichiers"
+
 #: ../data/ui/EditableList.ui.h:1
-msgid "Active"
-msgstr "Actif"
+msgid "Editable List"
+msgstr "Liste modifiable"
 
 #: ../data/ui/EditableList.ui.h:2
-msgid "Add new filter"
-msgstr "Ajouter un nouveau filtre"
+msgid "Active"
+msgstr "Actif"
 
-#: ../data/ui/EditableList.ui.h:3
-msgid "Editable List"
-msgstr "Liste modifiable"
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
+msgid "Name"
+msgstr "Nom"
 
 #: ../data/ui/EditableList.ui.h:4
-msgid "Move _Down"
-msgstr "_Descendre"
+msgid "Pattern"
+msgstr "Motif"
 
 #: ../data/ui/EditableList.ui.h:5
-msgid "Move _Up"
-msgstr "_Monter"
+msgid "Add new filter"
+msgstr "Ajouter un nouveau filtre"
 
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item down"
-msgstr "Fait descendre l'ÃlÃment"
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+msgid "_Add"
+msgstr "_Ajouter"
 
 #: ../data/ui/EditableList.ui.h:7
-msgid "Move item up"
-msgstr "Fait monter l'ÃlÃment"
+msgid "Remove selected filter"
+msgstr "EnlÃve le filtre sÃlectionnÃ"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
-msgid "Name"
-msgstr "Nom"
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+msgid "_Remove"
+msgstr "_Supprimer"
 
 #: ../data/ui/EditableList.ui.h:9
-msgid "Pattern"
-msgstr "Motif"
+msgid "Move item up"
+msgstr "Fait monter l'ÃlÃment"
 
 #: ../data/ui/EditableList.ui.h:10
-msgid "Remove selected filter"
-msgstr "EnlÃve le filtre sÃlectionnÃ"
+msgid "Move _Up"
+msgstr "_Monter"
 
-#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
-msgid "_Add"
-msgstr "_Ajouter"
+#: ../data/ui/EditableList.ui.h:11
+msgid "Move item down"
+msgstr "Fait descendre l'ÃlÃment"
 
-#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
-msgid "_Remove"
-msgstr "_Supprimer"
+#: ../data/ui/EditableList.ui.h:12
+msgid "Move _Down"
+msgstr "_Descendre"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
@@ -115,113 +115,114 @@ msgstr "_Fermer sans enregistrer"
 msgid "_Save Selected"
 msgstr "_Enregistrer la sÃlection"
 
-#: ../data/ui/findbar.ui.h:1
-msgid "Regular E_xpression"
-msgstr "E_xpression rÃguliÃre"
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "_Remplacer"
 
 #: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "_Tout remplacer"
 
 #: ../data/ui/findbar.ui.h:3
-msgid "Replace _With"
-msgstr "Remplacer _par"
+msgid "_Previous"
+msgstr "_PrÃcÃdent"
 
 #: ../data/ui/findbar.ui.h:4
-msgid "Who_le word"
-msgstr "_Mots entiers"
+msgid "_Next"
+msgstr "_Suivant"
 
 #: ../data/ui/findbar.ui.h:5
-msgid "_Match Case"
-msgstr "Res_pecter la casse"
+msgid "_Search for"
+msgstr "_Rechercher"
 
 #: ../data/ui/findbar.ui.h:6
-msgid "_Next"
-msgstr "_Suivant"
+msgid "Replace _With"
+msgstr "Remplacer _par"
 
 #: ../data/ui/findbar.ui.h:7
-msgid "_Previous"
-msgstr "_PrÃcÃdent"
+msgid "_Match Case"
+msgstr "Res_pecter la casse"
 
-#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "_Remplacer"
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "_Mots entiers"
 
 #: ../data/ui/findbar.ui.h:9
-msgid "_Search for"
-msgstr "_Rechercher"
-
-#: ../data/ui/meldapp.ui.h:1
-msgid "Choose Files"
-msgstr "SÃlectionnez les fichiers"
+msgid "Regular E_xpression"
+msgstr "E_xpression rÃguliÃre"
 
 #: ../data/ui/meldapp.ui.h:2
 msgid ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2010 Kai Willadsen"
+"Copyright &#xA9; 2009-2012 Kai Willadsen"
 msgstr ""
-"Copyright  2002-2009 Stephen KennedyCopyright  2009-2010 Kai Willadsen"
+"Copyright  2002-2009 Stephen Kennedy\n"
+"Copyright  2009-2012 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
-msgid "Directory"
-msgstr "RÃpertoire"
+msgid "translator-credits"
+msgstr ""
+"Stephen Kennedy <steve9000 users sourceforge net>, 2003\n"
+"Jonathan Ernst <jonathan ernstfamily ch>, 2006\n"
+"Claude Paroz <claude 2xlibre net>, 2006-2010\n"
+"Robert-Andrà Mauchin <zebob m pengzone org>, 2007\n"
+"Bruno Brouard <annoa b gmail com>, 2009-2010"
+
+#: ../data/ui/meldapp.ui.h:5
+msgid "Choose Files"
+msgstr "SÃlectionnez les fichiers"
+
+#: ../data/ui/meldapp.ui.h:6
+msgid "_Three Way Compare"
+msgstr "Comparaison _triple"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:7
+#: ../data/ui/meldapp.ui.h:8
 msgid "Mine"
 msgstr "Le mien"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:10
 msgid "Original"
 msgstr "Original"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:12
 msgid "Other"
 msgstr "Autre"
 
-#: ../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:13
-msgid "_Directory Comparison"
-msgstr "Comparaison de _rÃpertoires"
-
-#: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
 msgstr "Comparaison de _fichiers"
 
+#: ../data/ui/meldapp.ui.h:14
+msgid "_Directory Comparison"
+msgstr "Comparaison de _rÃpertoires"
+
 #: ../data/ui/meldapp.ui.h:15
-msgid "_Three Way Compare"
-msgstr "Comparaison _triple"
+msgid "Select VC Directory"
+msgstr "SÃlectionner le rÃpertoire du gestionnaire de versions"
 
 #: ../data/ui/meldapp.ui.h:16
-msgid "_Version Control Browser"
-msgstr "Navigateur du gestionnaire de _versions"
+msgid "Directory"
+msgstr "RÃpertoire"
 
 #: ../data/ui/meldapp.ui.h:17
-msgid "translator-credits"
-msgstr ""
-"Stephen Kennedy <steve9000 users sourceforge net>, 2003\n"
-"Jonathan Ernst <jonathan ernstfamily ch>, 2006\n"
-"Claude Paroz <claude 2xlibre net>, 2006-2010\n"
-"Robert-Andrà Mauchin <zebob m pengzone org>, 2007\n"
-"Bruno Brouard <annoa b gmail com>, 2009-2010"
+msgid "_Version Control Browser"
+msgstr "Navigateur du gestionnaire de _versions"
 
 #: ../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
+#: ../data/ui/patch-dialog.ui.h:2
 msgid "Create a patch"
 msgstr "CrÃer un correctif"
 
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Use differences between:"
+msgstr "Utiliser les diffÃrences entreÂ:"
+
 #: ../data/ui/patch-dialog.ui.h:4
 msgid "Left and middle panes"
 msgstr "Panneaux de gauche et du milieu"
@@ -231,93 +232,78 @@ 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/patch-dialog.ui.h:7
+msgid "Copy to Clipboard"
+msgstr "Copier vers le presse-papiers"
+
 #: ../data/ui/preferences.ui.h:1
-msgid "Display"
-msgstr "Affichage"
+msgid "Meld Preferences"
+msgstr "PrÃfÃrences de Meld"
 
 #: ../data/ui/preferences.ui.h:2
-msgid "Do not _split words over two lines"
-msgstr "Ne pas _couper les mots par les sauts de ligne"
+msgid "Font"
+msgstr "Police"
 
 #: ../data/ui/preferences.ui.h:3
-msgid "Edito_r command:"
-msgstr "Commande de l'Ãditeu_rÂ:"
+msgid "_Use the system fixed width font"
+msgstr "_Utiliser la police à chasse fixe du systÃme"
 
 #: ../data/ui/preferences.ui.h:4
-msgid "Editor"
-msgstr "Ãditeur"
+msgid "_Editor font:"
+msgstr "_Police de l'ÃditeurÂ:"
 
 #: ../data/ui/preferences.ui.h:5
-msgid "Enable text _wrapping"
-msgstr "Acti_ver les sauts de ligne automatiques"
+msgid "Display"
+msgstr "Affichage"
 
 #: ../data/ui/preferences.ui.h:6
-msgid "Encoding"
-msgstr "Codage des caractÃres"
+msgid "_Tab width:"
+msgstr "Largeur des _tabulationsÂ:"
 
 #: ../data/ui/preferences.ui.h:7
-msgid "External editor"
-msgstr "Ãditeur externe"
+msgid "_Insert spaces instead of tabs"
+msgstr "InsÃrer des _espaces au lieu des tabulations"
 
 #: ../data/ui/preferences.ui.h:8
-msgid "File Filters"
-msgstr "Filtres de fichiers"
+msgid "Enable text _wrapping"
+msgstr "Acti_ver les sauts de ligne automatiques"
 
 #: ../data/ui/preferences.ui.h:9
-msgid "Font"
-msgstr "Police"
+msgid "Do not _split words over two lines"
+msgstr "Ne pas _couper les mots par les sauts de ligne"
 
 #: ../data/ui/preferences.ui.h:10
-msgid "Ignore changes which insert or delete blank lines"
-msgstr ""
-"Ignorer les modifications qui concernent l'insertion ou l'effacement de "
-"lignes vides."
+msgid "Show _line numbers"
+msgstr "Afficher les numÃros de _ligne"
 
 #: ../data/ui/preferences.ui.h:11
-msgid "Ignore symbolic links"
-msgstr "Ignorer les liens symboliques"
+msgid "Show w_hitespace"
+msgstr "Affic_her les espaces"
 
 #: ../data/ui/preferences.ui.h:12
-msgid "Loading"
-msgstr "Chargement"
+msgid "Use s_yntax highlighting"
+msgstr "Utiliser la _coloration syntaxique"
 
 #: ../data/ui/preferences.ui.h:13
-msgid "Meld Preferences"
-msgstr "PrÃfÃrences de Meld"
+msgid "External editor"
+msgstr "Ãditeur externe"
 
 #: ../data/ui/preferences.ui.h:14
-msgid "Show _line numbers"
-msgstr "Afficher les numÃros de _ligne"
+msgid "Use _default system editor"
+msgstr "Utiliser l'Ãditeur par _dÃfaut du systÃme"
 
 #: ../data/ui/preferences.ui.h:15
-msgid "Show w_hitespace"
-msgstr "Affic_her les espaces"
+msgid "Edito_r command:"
+msgstr "Commande de l'Ãditeu_rÂ:"
 
 #: ../data/ui/preferences.ui.h:16
-msgid "Text Filters"
-msgstr "Filtres de texte"
+msgid "Editor"
+msgstr "Ãditeur"
 
 #: ../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:18
-msgid "Use s_yntax highlighting"
-msgstr "Utiliser la _coloration syntaxique"
-
-#: ../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:20
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -327,7 +313,15 @@ 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:21
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "Ignorer les liens symboliques"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "File Filters"
+msgstr "Filtres de fichiers"
+
+#: ../data/ui/preferences.ui.h:20
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -341,175 +335,158 @@ 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
+msgid "Ignore changes which insert or delete blank lines"
+msgstr ""
+"Ignorer les modifications qui concernent l'insertion ou l'effacement de "
+"lignes vides."
+
 #: ../data/ui/preferences.ui.h:22
-msgid "_Editor font:"
-msgstr "_Police de l'ÃditeurÂ:"
+msgid "Text Filters"
+msgstr "Filtres de texte"
 
 #: ../data/ui/preferences.ui.h:23
-msgid "_Insert spaces instead of tabs"
-msgstr "InsÃrer des _espaces au lieu des tabulations"
+msgid "Loading"
+msgstr "Chargement"
 
 #: ../data/ui/preferences.ui.h:24
-msgid "_Tab width:"
-msgstr "Largeur des _tabulationsÂ:"
+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:25
-msgid "_Use the system fixed width font"
-msgstr "_Utiliser la police à chasse fixe du systÃme"
+msgid "Encoding"
+msgstr "Codage des caractÃres"
 
 #: ../data/ui/vcview.ui.h:1
-msgid "Commit Files"
-msgstr "Valider les fichiers"
+msgid "VC Log"
+msgstr "Journal du gestionnaire de versions"
 
 #: ../data/ui/vcview.ui.h:2
-msgid "Compare Options"
-msgstr "Comparer les options"
+msgid "Commit Files"
+msgstr "Valider les fichiers"
 
 #: ../data/ui/vcview.ui.h:3
-msgid "Date"
-msgstr "Date"
+msgid "Previous Logs"
+msgstr "Journaux prÃcÃdents"
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Local copy against other remote revision"
-msgstr "Copie locale par rapport à une autre rÃvision distante"
-
-#: ../data/ui/vcview.ui.h:5
-msgid "Local copy against same remote revision"
-msgstr "Copie locale par rapport à la mÃme rÃvision distante"
-
-#: ../data/ui/vcview.ui.h:6
 msgid "Log Message"
 msgstr "Message du journal"
 
-#: ../data/ui/vcview.ui.h:7
-msgid "Previous Logs"
-msgstr "Journaux prÃcÃdents"
-
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
-msgid "Tag"
-msgstr "Ãtiquette"
-
-#: ../data/ui/vcview.ui.h:9
-msgid "VC Log"
-msgstr "Journal du gestionnaire de versions"
-
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
 msgid "_Compare"
 msgstr "_Comparer"
 
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
 msgid "Compare selected"
 msgstr "Comparer la sÃlection"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:233
 msgid "Copy _Left"
 msgstr "Copier à _gauche"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:233
 msgid "Copy to left"
 msgstr "Copie vers la gauche"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:234
 msgid "Copy _Right"
 msgstr "Copier à _droite"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:234
 msgid "Copy to right"
 msgstr "Copie vers la droite"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:235
 msgid "Delete selected"
 msgstr "Effacer la sÃlection"
 
-#: ../meld/dirdiff.py:231 ../meld/filediff.py:1117
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1165
 msgid "Hide"
 msgstr "Masquer"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:236
 msgid "Hide selected"
 msgstr "Masquer la sÃlection"
 
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:267 ../meld/vcview.py:119
-msgid "Open selected"
-msgstr "Ouvrir la sÃlection"
-
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:240
 msgid "Case"
 msgstr "Casse"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:240
 msgid "Ignore case of entries"
 msgstr "Ignorer la casse des entrÃes"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:241
 msgid "Same"
 msgstr "Identique"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:241
 msgid "Show identical"
 msgstr "Afficher les fichiers identiques"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:242
 msgid "New"
 msgstr "Nouveaux"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:242
 msgid "Show new"
 msgstr "Afficher les nouveaux fichiers"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:243
 msgid "Modified"
 msgstr "ModifiÃs"
 
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
 msgid "Show modified"
 msgstr "Afficher les objets modifiÃs"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:245
 msgid "Filters"
 msgstr "Filtres"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:245
 msgid "Set active filters"
 msgstr "DÃfinir les filtres actifs"
 
-#: ../meld/dirdiff.py:359
+#: ../meld/dirdiff.py:362
 #, python-format
 msgid "Hide %s"
 msgstr "Masquer %s"
 
-#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
-#: ../meld/vcview.py:333
+#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
+#: ../meld/vcview.py:347
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] En cours d'analyse de %s"
 
-#: ../meld/dirdiff.py:574
+#: ../meld/dirdiff.py:578
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] TerminÃ"
 
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:582
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Plusieurs erreurs se sont produites lors de l'analyse de ce dossier"
 
-#: ../meld/dirdiff.py:579
+#: ../meld/dirdiff.py:583
 msgid "Files with invalid encodings found"
 msgstr "Le codage de caractÃres de certains fichiers n'est pas valide"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:581
+#: ../meld/dirdiff.py:585
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Le codage de caractÃres de certains fichiers n'est pas correct. Les noms "
 "ressemblent ÃÂ:"
 
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:587
 msgid "Files hidden by case insensitive comparison"
 msgstr "Fichiers cachÃs en raison de la comparaison insensible à la casse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:585
+#: ../meld/dirdiff.py:589
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -518,16 +495,16 @@ msgstr ""
 "fichiers sensible à la casse. Les fichiers suivants de ce dossier sont "
 "masquÃsÂ:"
 
-#: ../meld/dirdiff.py:596
+#: ../meld/dirdiff.py:600
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "ÂÂ%s est masquà par ÂÂ%sÂÂ"
 
-#: ../meld/dirdiff.py:621 ../meld/filediff.py:981 ../meld/filediff.py:1121
+#: ../meld/dirdiff.py:625 ../meld/filediff.py:1008 ../meld/filediff.py:1169
 msgid "Hi_de"
 msgstr "Mas_quer"
 
-#: ../meld/dirdiff.py:671
+#: ../meld/dirdiff.py:675
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -536,7 +513,7 @@ msgstr ""
 "ÂÂ%sÂÂ existe dÃjÃ.\n"
 "ÃcraserÂ?"
 
-#: ../meld/dirdiff.py:678
+#: ../meld/dirdiff.py:682
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -547,7 +524,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
+#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -556,7 +533,7 @@ msgstr ""
 "ÂÂ%sÂÂ est un rÃpertoire.\n"
 "Supprimer rÃcursivementÂ?"
 
-#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
+#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -567,211 +544,212 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:715
+#: ../meld/dirdiff.py:741
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i seconde"
 msgstr[1] "%i secondes"
 
-#: ../meld/dirdiff.py:716
+#: ../meld/dirdiff.py:742
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minute"
 msgstr[1] "%i minutes"
 
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:743
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i heure"
 msgstr[1] "%i heures"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:744
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i jour"
 msgstr[1] "%i jours"
 
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:745
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semaine"
 msgstr[1] "%i semaines"
 
-#: ../meld/dirdiff.py:720
+#: ../meld/dirdiff.py:746
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mois"
 msgstr[1] "%i mois"
 
-#: ../meld/dirdiff.py:721
+#: ../meld/dirdiff.py:747
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i annÃe"
 msgstr[1] "%i annÃes"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:294
 msgid "Format as patch..."
 msgstr "Mettre sous forme de correctif..."
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:294
 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:269
+#: ../meld/filediff.py:295
 msgid "Previous conflict"
 msgstr "Conflit prÃcÃdent"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:295
 msgid "Go to the previous conflict"
 msgstr "Revient au conflit prÃcÃdent"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:296
 msgid "Next conflict"
 msgstr "Conflit suivant"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:296
 msgid "Go to the next conflict"
 msgstr "Va au prochain conflit"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:297
 msgid "Push to left"
 msgstr "Envoyer à gauche"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:297
 msgid "Push current change to the left"
 msgstr "Envoie la modification actuelle vers la gauche"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:298
 msgid "Push to right"
 msgstr "Envoyer à droite"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:298
 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:274
+#: ../meld/filediff.py:300
 msgid "Pull from left"
 msgstr "RÃcupÃrer de la gauche"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:300
 msgid "Pull change from the left"
 msgstr "RÃcupÃre la modification de gauche"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:301
 msgid "Pull from right"
 msgstr "RÃcupÃrer de la droite"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:301
 msgid "Pull change from the right"
 msgstr "RÃcupÃre la modification de droite"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:302
 msgid "Copy above left"
 msgstr "Copier au-dessus de la gauche"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:302
 msgid "Copy change above the left chunk"
 msgstr "Copie la modification au-dessus du segment de gauche"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:303
 msgid "Copy below left"
 msgstr "Copier en dessous de la gauche"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:303
 msgid "Copy change below the left chunk"
 msgstr "Copie la modification en dessous du segment de gauche"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:304
 msgid "Copy above right"
 msgstr "Copier au-dessus de la droite"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:304
 msgid "Copy change above the right chunk"
 msgstr "Copie la modification au-dessus du segment de droite"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:305
 msgid "Copy below right"
 msgstr "Copier en dessous de la droite"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:305
 msgid "Copy change below the right chunk"
 msgstr "Copie la modification en dessous du segement de droite"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:306
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:306
 msgid "Delete change"
 msgstr "Supprimer les modifications"
 
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:307
 msgid "Merge all changes from left"
 msgstr "Fusionne toutes les modifications de gauche"
 
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:307
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Fusionne toutes les modifications non-conflictuelles de gauche"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:308
 msgid "Merge all changes from right"
 msgstr "Fusionne toutes les modifications de droite"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:308
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Fusionne toutes les modifications non-conflictuelles de droite"
 
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:309
 msgid "Merge all non-conflicting"
 msgstr "Fusionne toutes les modifications non-conflictuelles"
 
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:309
 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"
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:310
 msgid "Cycle through documents"
 msgstr "Parcourir cycliquement les documents"
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:310
 msgid "Move keyboard focus to the next document in this comparison"
-msgstr "DÃplacer le focus clavier vers le document suivant dans cette comparaison"
+msgstr ""
+"DÃplacer le focus clavier vers le document suivant dans cette comparaison"
 
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:314
 msgid "Lock scrolling"
 msgstr "Verrouiller le dÃfilement"
 
-#: ../meld/filediff.py:289
+#: ../meld/filediff.py:315
 msgid "Lock scrolling of all panes"
 msgstr "Verrouille le dÃfilement de tous les panneaux"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:381
+#: ../meld/filediff.py:396
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:381
+#: ../meld/filediff.py:396
 msgid "OVR"
 msgstr "ÃCR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:383
+#: ../meld/filediff.py:398
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, Col %i"
 
-#: ../meld/filediff.py:693
+#: ../meld/filediff.py:722
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -781,62 +759,63 @@ msgstr ""
 "sera plus correcte. Consultez le manuel d'utilisation pour plus de dÃtails."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:780
+#: ../meld/filediff.py:809
 msgid "<unnamed>"
 msgstr "<Document non enregistrÃ>"
 
-#: ../meld/filediff.py:969
+#: ../meld/filediff.py:996
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] RÃgler le nombre de volets"
 
-#: ../meld/filediff.py:975
+#: ../meld/filediff.py:1002
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ouverture des fichiers"
 
-#: ../meld/filediff.py:999 ../meld/filediff.py:1008 ../meld/filediff.py:1020
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
+#: ../meld/filediff.py:1053
 msgid "Could not read file"
 msgstr "Impossible de lire le fichier"
 
-#: ../meld/filediff.py:1000
+#: ../meld/filediff.py:1027
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lecture des fichiers"
 
-#: ../meld/filediff.py:1009
+#: ../meld/filediff.py:1036
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semble Ãtre un fichier binaire."
 
-#: ../meld/filediff.py:1021
+#: ../meld/filediff.py:1048
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s n'est pas dans un des codagesÂ: %s"
 
-#: ../meld/filediff.py:1051 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcul des diffÃrences"
 
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1156
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr ""
-"Les filtres de texte sont actuellement utilisÃs et il se peut qu'ils masquent "
-"des diffÃrences entre les fichiers. Voulez-vous comparer les fichiers non filtrÃsÂ?"
+"Les filtres de texte sont actuellement utilisÃs et il se peut qu'ils "
+"masquent des diffÃrences entre les fichiers. Voulez-vous comparer les "
+"fichiers non filtrÃsÂ?"
 
-#: ../meld/filediff.py:1114
+#: ../meld/filediff.py:1162
 msgid "Files are identical"
 msgstr "Les fichiers sont identiques"
 
-#: ../meld/filediff.py:1124
+#: ../meld/filediff.py:1172
 msgid "Show without filters"
 msgstr "Afficher sans les filtres"
 
-#: ../meld/filediff.py:1278
+#: ../meld/filediff.py:1361
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -845,7 +824,7 @@ msgstr ""
 "ÂÂ%sÂÂ existe dÃjÃÂ!\n"
 "ÃcraserÂ?"
 
-#: ../meld/filediff.py:1291
+#: ../meld/filediff.py:1374
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -856,12 +835,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1300
+#: ../meld/filediff.py:1383
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Choisissez un nom pour le tampon %i."
 
-#: ../meld/filediff.py:1315
+#: ../meld/filediff.py:1398
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -872,7 +851,7 @@ msgstr ""
 "\n"
 "Quel format voulez-vous utiliserÂ?"
 
-#: ../meld/filediff.py:1331
+#: ../meld/filediff.py:1414
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -881,7 +860,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:1390
+#: ../meld/filediff.py:1473
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -899,72 +878,72 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Fusion des fichiers"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:152
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Nombre de paramÃtres incorrect pour --diff"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:156
 msgid "Start with an empty window"
 msgstr "DÃmarrer avec une fenÃtre vide"
 
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
 msgid "file"
 msgstr "fichier"
 
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
 msgid "dir"
 msgstr "rÃpertoire"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:157
 msgid "Start a version control comparison"
 msgstr "DÃmarrer une comparaison de gestion de versions"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:158
 msgid "Start a 2- or 3-way file comparison"
 msgstr "DÃmarrer une comparaison de 2 ou 3 fichiers"
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:159
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "DÃmarrer une comparaison de 2 ou 3 rÃpertoires"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:160
 msgid "Start a comparison between file and dir/file"
 msgstr "DÃmarrer une comparaison de fichier et de rÃpertoire/fichier"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:166
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld est un outil de comparaison de fichiers et de rÃpertoires."
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:169
 msgid "Set label to use instead of file name"
 msgstr "DÃfinit l'Ãtiquette à utiliser au lieu du nom de fichier"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:171
 msgid "Automatically compare all differing files on startup"
 msgstr "Compare automatiquement tous les fichiers diffÃrents au dÃmarrage"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:173
 msgid "Ignored for compatibility"
 msgstr "IgnorÃe pour compatibilitÃ"
 
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:176
 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:176
+#: ../meld/meldapp.py:179
 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:179
+#: ../meld/meldapp.py:182
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "trop de paramÃtres (0-4 dÃsirÃs, %d reÃus)"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
 msgid "can't compare more than three directories"
 msgstr "impossible de comparer plus de trois rÃpertoires"
 
-#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
 msgid "untitled"
 msgstr "sans titre"
 
@@ -1068,128 +1047,138 @@ msgstr "DiffÃrence prÃcÃdente"
 msgid "Go to the previous change"
 msgstr "Revient à la diffÃrence prÃcÃdente"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:147
+msgid "Open externally"
+msgstr "Ouvrir avec"
+
+#: ../meld/meldwindow.py:147
+msgid "Open selected file or directory in the default external application"
+msgstr ""
+"Ouvre le dossier ou le fichier sÃlectionnà dans l'application externe par "
+"dÃfaut"
+
+#: ../meld/meldwindow.py:149
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:150
 msgid "File status"
 msgstr "Ãtat du fichier"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
 msgid "Version status"
 msgstr "Ãtat de la version"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
 msgid "File filters"
 msgstr "Filtres de fichier"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Stop the current action"
 msgstr "ArrÃte l'action en cours"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 msgid "Refresh the view"
 msgstr "Actualise l'affichage"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:155
 msgid "Reload"
 msgstr "Recharger"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:155
 msgid "Reload the comparison"
 msgstr "Recharge la comparaison"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
 msgid "_Tabs"
 msgstr "_Onglets"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
 msgid "_Previous Tab"
 msgstr "Onglet _prÃcÃdent"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
 msgid "Activate previous tab"
 msgstr "Active l'onglet prÃcÃdent"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
 msgid "_Next Tab"
 msgstr "Onglet _suivant"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
 msgid "Activate next tab"
 msgstr "Active l'onglet suivant"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
 msgid "Move Tab _Left"
 msgstr "DÃplacer l'onglet vers la _gauche"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
 msgid "Move current tab to left"
 msgstr "DÃplace l'onglet actuel vers la gauche"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
 msgid "Move Tab _Right"
 msgstr "DÃplacer l'onglet vers la _droite"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
 msgid "Move current tab to right"
 msgstr "DÃplace l'onglet actuel vers la droite"
 
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:163
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
 msgid "Open the Meld manual"
 msgstr "Ouvre le manuel de Meld"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "Report _Bug"
 msgstr "Signaler une _anomalie"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "Report a bug in Meld"
 msgstr "Rapporte une anomalie de Meld"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "About this program"
 msgstr "Ã propos de ce programme"
 
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
 msgid "Full Screen"
 msgstr "Plein Ãcran"
 
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
 msgid "View the comparison in full screen"
 msgstr "Afficher la comparaison en plein Ãcran"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
 msgid "_Toolbar"
 msgstr "_Barre d'outils"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
 msgid "Show or hide the toolbar"
 msgstr "Affiche ou masque la barre d'outils"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "_Statusbar"
 msgstr "B_arre d'Ãtat"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "Show or hide the statusbar"
 msgstr "Affiche ou masque la barre d'Ãtat"
 
-#: ../meld/meldwindow.py:534
+#: ../meld/meldwindow.py:538
 msgid "Switch to this tab"
 msgstr "Basculer vers cet onglet"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:625
+#: ../meld/meldwindow.py:629
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Impossible de comparer des fichiers avec des rÃpertoires.\n"
 
@@ -1210,212 +1199,225 @@ msgstr "Ãtiquette"
 msgid "pattern"
 msgstr "motif"
 
-#: ../meld/preferences.py:105
+#: ../meld/preferences.py:111
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Disponible uniquement si gnome-python-desktop est installÃ"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:233
+#: ../meld/preferences.py:234
 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:235
+#: ../meld/preferences.py:236
+msgid ""
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+msgstr ""
+"MÃtadonnÃes spÃcifiques au systÃme d'exploitation\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:238
 #, 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:237
+#: ../meld/preferences.py:240
 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:239
+#: ../meld/preferences.py:242
 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:241
+#: ../meld/preferences.py:244
 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:243
+#: ../meld/preferences.py:246
 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:245
+#: ../meld/preferences.py:248
 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:247
+#: ../meld/preferences.py:250
 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:249
+#: ../meld/preferences.py:252
 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:251
+#: ../meld/preferences.py:254
 msgid "Script comment\t0\t#.*"
 msgstr "Commentaire de script\t0\t#.*"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:128
 msgid "Co_mmit"
 msgstr "_Valider"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:128
 msgid "Commit"
 msgstr "Fait un ÂÂCommitÂÂ"
 
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:129
 msgid "_Update"
 msgstr "Mettre à _jour"
 
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:129
 msgid "Update"
 msgstr "Fait un ÂÂUpdateÂÂ"
 
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:130
 msgid "Add to VC"
 msgstr "Ajoute au gestionnaire de versions"
 
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:131
 msgid "Add _Binary"
 msgstr "Ajouter _binaire"
 
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:131
 msgid "Add binary to VC"
 msgstr "Ajoute le binaire au gestionnaire de versions"
 
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:132
 msgid "Remove from VC"
 msgstr "Supprime du gestionnaire de versions"
 
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:133
 msgid "_Resolved"
 msgstr "_RÃsolu"
 
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:133
 msgid "Mark as resolved for VC"
 msgstr "Marque comme rÃsolu pour le gestionnaire de versions"
 
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:134
 msgid "Revert to original"
 msgstr "Revenir à l'original"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:135
 msgid "Delete locally"
 msgstr "Effacer localement"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:139
 msgid "_Flatten"
 msgstr "A_platir"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:139
 msgid "Flatten directories"
 msgstr "Aplatir les rÃpertoires"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:140
 msgid "_Modified"
 msgstr "_ModifiÃs"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:141
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:141
 msgid "Show normal"
 msgstr "Affichage normal"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:142
 msgid "Non _VC"
 msgstr "Non _versionnÃ"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:142
 msgid "Show unversioned files"
 msgstr "Affiche les fichiers qui ne sont pas versionnÃs"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:143
 msgid "Ignored"
 msgstr "IgnorÃ"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:143
 msgid "Show ignored files"
 msgstr "Affiche les fichiers ignorÃs"
 
-#: ../meld/vcview.py:177 ../meld/vcview.py:301
+#: ../meld/vcview.py:186 ../meld/vcview.py:319
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:187
 msgid "Status"
 msgstr "Ãtat"
 
-#: ../meld/vcview.py:179
+#: ../meld/vcview.py:188
 msgid "Rev"
 msgstr "RÃvision"
 
-#: ../meld/vcview.py:181
+#: ../meld/vcview.py:189
+msgid "Tag"
+msgstr "Ãtiquette"
+
+#: ../meld/vcview.py:190
 msgid "Options"
 msgstr "Options"
 
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:249
 msgid "Choose one Version Control"
 msgstr "Choisir un systÃme de gestion de versions"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:250
 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:247
+#: ../meld/vcview.py:263
 #, 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:251
+#: ../meld/vcview.py:267
 msgid "Invalid Repository"
 msgstr "DÃpÃt non valide"
 
-#: ../meld/vcview.py:260
+#: ../meld/vcview.py:276
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:301
+#: ../meld/vcview.py:319
 #, python-format
 msgid "%s: %s"
 msgstr "%sÂ: %s"
 
-#: ../meld/vcview.py:349
+#: ../meld/vcview.py:363
 msgid "(Empty)"
 msgstr "(vide)"
 
-#: ../meld/vcview.py:387
+#: ../meld/vcview.py:401
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] RÃcupÃration des diffÃrences"
 
-#: ../meld/vcview.py:395
+#: ../meld/vcview.py:409
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Application du correctif"
 
-#: ../meld/vcview.py:480
+#: ../meld/vcview.py:511
 msgid "Select some files first."
 msgstr "SÃlectionnez d'abord des fichiers."
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:584
 #, python-format
 msgid ""
 "\n"
@@ -1519,3 +1521,4 @@ msgstr ""
 "Erreur durant la conversion en expression rÃguliÃre\n"
 "Le motif Ãtait ÂÂ%sÂÂ\n"
 "L'erreur Ãtait ÂÂ%sÂÂ"
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]