GNOME.org
 

[meld] Updated French translation

commit 11d170577d901be916e95b7514254b3aa1cf1255
Author: Claude Paroz <claude 2xlibre net>
Date:   Sat May 23 15:13:32 2009 +0200

    Updated French translation
---
 po/fr.po |  349 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 204 insertions(+), 145 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 29dbce2..3b93bfd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,116 +13,116 @@ 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: 2009-03-30 11:38+0000\n"
-"PO-Revision-Date: 2009-03-30 14:42+0200\n"
-"Last-Translator: Bruno Brouard <annoa b gmail com>\n"
+"POT-Creation-Date: 2009-05-13 01:38+0000\n"
+"PO-Revision-Date: 2009-05-23 15:13+0200\n"
+"Last-Translator: Claude Paroz <claude 2xlibre net>\n"
 "Language-Team: GNOME French Team <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"
 
-#: ../dirdiff.py:175 ../vcview.py:115
+#: ../dirdiff.py:173 ../vcview.py:125
 msgid "_Compare"
 msgstr "_Comparer"
 
-#: ../dirdiff.py:175 ../vcview.py:115
+#: ../dirdiff.py:173 ../vcview.py:125
 msgid "Compare selected"
 msgstr "Comparer la sélection"
 
-#: ../dirdiff.py:176
+#: ../dirdiff.py:174
 msgid "Left"
 msgstr "Gauche"
 
-#: ../dirdiff.py:176 ../filediff.py:147
+#: ../dirdiff.py:174 ../filediff.py:125
 msgid "Copy To Left"
 msgstr "Copier vers la gauche"
 
-#: ../dirdiff.py:177
+#: ../dirdiff.py:175
 msgid "Right"
 msgstr "Droite"
 
-#: ../dirdiff.py:177 ../filediff.py:148
+#: ../dirdiff.py:175 ../filediff.py:126
 msgid "Copy To Right"
 msgstr "Copier vers la droite"
 
-#: ../dirdiff.py:178
+#: ../dirdiff.py:176
 msgid "Delete selected"
 msgstr "Effacer la sélection"
 
-#: ../dirdiff.py:179
+#: ../dirdiff.py:177
 msgid "Hide"
 msgstr "Masquer"
 
-#: ../dirdiff.py:179
+#: ../dirdiff.py:177
 msgid "Hide selected"
 msgstr "Masquer la sélection"
 
-#: ../dirdiff.py:181 ../filediff.py:145 ../vcview.py:116
+#: ../dirdiff.py:179 ../filediff.py:123 ../vcview.py:126
 msgid "Open selected"
 msgstr "Ouvrir la sélection"
 
-#: ../dirdiff.py:185
+#: ../dirdiff.py:183
 msgid "Case"
 msgstr "Casse"
 
-#: ../dirdiff.py:185
+#: ../dirdiff.py:183
 msgid "Ignore case of entries"
 msgstr "Ignorer la casse des entrées"
 
-#: ../dirdiff.py:186
+#: ../dirdiff.py:184
 msgid "Same"
 msgstr "Identique"
 
-#: ../dirdiff.py:186
+#: ../dirdiff.py:184
 msgid "Show identical"
 msgstr "Afficher les fichiers identiques"
 
-#: ../dirdiff.py:187
+#: ../dirdiff.py:185
 msgid "New"
 msgstr "Nouveaux"
 
-#: ../dirdiff.py:187
+#: ../dirdiff.py:185
 msgid "Show new"
 msgstr "Afficher les nouveaux fichiers"
 
-#: ../dirdiff.py:188
+#: ../dirdiff.py:186
 msgid "Modified"
 msgstr "Modifiés"
 
-#: ../dirdiff.py:188 ../vcview.py:128
+#: ../dirdiff.py:186 ../vcview.py:139
 msgid "Show modified"
 msgstr "Afficher les objets modifiés"
 
-#: ../dirdiff.py:190
+#: ../dirdiff.py:188
 msgid "Filters"
 msgstr "Filtres"
 
-#: ../dirdiff.py:190
+#: ../dirdiff.py:188
 msgid "Set active filters"
 msgstr "Définir les filtres actifs"
 
-#: ../dirdiff.py:243 ../dirdiff.py:289
+#: ../dirdiff.py:241 ../dirdiff.py:287
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
 msgstr "Erreur durant la conversion de « %s » en expression régulière."
 
-#: ../dirdiff.py:300
+#: ../dirdiff.py:298
 #, python-format
 msgid "Hide %s"
 msgstr "Masquer %s"
 
-#: ../dirdiff.py:385 ../dirdiff.py:395 ../vcview.py:244 ../vcview.py:272
+#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:272 ../vcview.py:300
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] En cours d'analyse de %s"
 
-#: ../dirdiff.py:424
+#: ../dirdiff.py:422
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "« %s » est masqué par « %s »"
 
-#: ../dirdiff.py:430
+#: ../dirdiff.py:428
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -133,12 +133,12 @@ msgstr ""
 "fichiers sensible à la casse. Des fichiers ne sont pas visibles :\n"
 "%s"
 
-#: ../dirdiff.py:503
+#: ../dirdiff.py:501
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Terminé"
 
-#: ../dirdiff.py:549
+#: ../dirdiff.py:547
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -147,7 +147,7 @@ msgstr ""
 "« %s » existe déjà.\n"
 "�craser ?"
 
-#: ../dirdiff.py:556
+#: ../dirdiff.py:554
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:574 ../vcview.py:433
+#: ../dirdiff.py:572 ../vcview.py:464
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -167,7 +167,7 @@ msgstr ""
 "« %s » est un répertoire.\n"
 "Supprimer récursivement ?"
 
-#: ../dirdiff.py:581 ../vcview.py:438
+#: ../dirdiff.py:579 ../vcview.py:469
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -178,85 +178,85 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:592
+#: ../dirdiff.py:590
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i seconde"
 msgstr[1] "%i secondes"
 
-#: ../dirdiff.py:593
+#: ../dirdiff.py:591
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minute"
 msgstr[1] "%i minutes"
 
-#: ../dirdiff.py:594
+#: ../dirdiff.py:592
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i heure"
 msgstr[1] "%i heures"
 
-#: ../dirdiff.py:595
+#: ../dirdiff.py:593
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i jour"
 msgstr[1] "%i jours"
 
-#: ../dirdiff.py:596
+#: ../dirdiff.py:594
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semaine"
 msgstr[1] "%i semaines"
 
-#: ../dirdiff.py:597
+#: ../dirdiff.py:595
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mois"
 msgstr[1] "%i mois"
 
-#: ../dirdiff.py:598
+#: ../dirdiff.py:596
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i année"
 msgstr[1] "%i années"
 
-#: ../filediff.py:146 ../glade2/filediff.glade.h:4
+#: ../filediff.py:124 ../glade2/filediff.glade.h:4
 msgid "Create Patch"
 msgstr "Créer un patch"
 
-#: ../filediff.py:146
+#: ../filediff.py:124
 msgid "Create a patch"
 msgstr "Créer un patch"
 
-#: ../filediff.py:147
+#: ../filediff.py:125
 msgid "Copy all changes from right pane to left pane"
 msgstr ""
 "Copier toutes les modifications du panneau de droite vers celui de gauche"
 
-#: ../filediff.py:148
+#: ../filediff.py:126
 msgid "Copy all changes from left pane to right pane"
 msgstr ""
 "Copier toutes les modifications du panneau de gauche vers celui de droite"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:197
+#: ../filediff.py:179
 msgid "INS,OVR"
 msgstr "INS,Ã?CR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:199
+#: ../filediff.py:181
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, Col %i"
 
-#: ../filediff.py:254
+#: ../filediff.py:238
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -266,31 +266,31 @@ msgstr ""
 "comparaison ne sera plus correcte. Consultez le manuel d'utilisation pour "
 "plus de détails."
 
-#: ../filediff.py:523
+#: ../filediff.py:507
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Régler le nombre de volets"
 
-#: ../filediff.py:529
+#: ../filediff.py:513
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ouverture des fichiers"
 
-#: ../filediff.py:547 ../filediff.py:561 ../filediff.py:577 ../filediff.py:584
+#: ../filediff.py:531 ../filediff.py:545 ../filediff.py:561 ../filediff.py:568
 #, python-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire « %s »"
 
-#: ../filediff.py:548 ../filediff.py:585
+#: ../filediff.py:532 ../filediff.py:569
 msgid "The error was:"
 msgstr "L'erreur était :"
 
-#: ../filediff.py:553
+#: ../filediff.py:537
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lecture des fichiers"
 
-#: ../filediff.py:562
+#: ../filediff.py:546
 msgid ""
 "It contains ascii nulls.\n"
 "Perhaps it is a binary file."
@@ -298,17 +298,17 @@ msgstr ""
 "Il contient des caractères ASCII NULL.\n"
 "Il s'agit peut-être d'un fichier binaire."
 
-#: ../filediff.py:578
+#: ../filediff.py:562
 #, python-format
 msgid "I tried encodings %s."
 msgstr "Les codages %s ont été essayés."
 
-#: ../filediff.py:607
+#: ../filediff.py:589
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcul des différences"
 
-#: ../filediff.py:734
+#: ../filediff.py:716
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -317,7 +317,7 @@ msgstr ""
 "« %s » existe déjà !\n"
 "�craser ?"
 
-#: ../filediff.py:747
+#: ../filediff.py:729
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -328,12 +328,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../filediff.py:756
+#: ../filediff.py:738
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Choisissez un nom pour le tampon %i."
 
-#: ../filediff.py:770
+#: ../filediff.py:752
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -344,7 +344,7 @@ msgstr ""
 "\n"
 "Quel format voulez-vous utiliser ?"
 
-#: ../filediff.py:786
+#: ../filediff.py:768
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -354,11 +354,11 @@ msgstr ""
 "Voulez-vous enregistrer en UTF-8 ?"
 
 #. save as
-#: ../filediff.py:834
+#: ../filediff.py:808
 msgid "Save patch as..."
 msgstr "Enregistrer le patch sous..."
 
-#: ../filediff.py:901
+#: ../filediff.py:875
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -371,7 +371,7 @@ msgstr ""
 "\n"
 "Vous ne pouvez pas annuler cette opération."
 
-#: ../findbar.py:99
+#: ../findbar.py:120
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -380,16 +380,6 @@ msgstr ""
 "Erreur d'expression régulière\n"
 "« %s »"
 
-#: ../findbar.py:111
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "L'expression régulière « %s » n'a pas été trouvée."
-
-#: ../findbar.py:113
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "Impossible de trouver « %s »."
-
 #: ../glade2/filediff.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
@@ -678,7 +668,7 @@ msgstr "Message du journal"
 msgid "Previous Logs"
 msgstr "Journaux précédents"
 
-#: ../glade2/vcview.glade.h:8 ../vcview.py:172
+#: ../glade2/vcview.glade.h:8 ../vcview.py:183
 msgid "Tag"
 msgstr "Ã?tiquette"
 
@@ -686,19 +676,19 @@ msgstr "Ã?tiquette"
 msgid "VC Log"
 msgstr "Journal du gestionnaire de versions"
 
-#: ../historyentry.py:247
+#: ../historyentry.py:248
 msgid "_Browse..."
 msgstr "_Parcourir..."
 
-#: ../historyentry.py:255
+#: ../historyentry.py:256
 msgid "Path"
 msgstr "Chemin"
 
-#: ../historyentry.py:256
+#: ../historyentry.py:257
 msgid "Path to file"
 msgstr "Chemin vers le fichier"
 
-#: ../historyentry.py:257
+#: ../historyentry.py:258
 msgid "Pop up a file selector to choose a file"
 msgstr "Affiche un sélecteur de fichiers pour choisir un fichier"
 
@@ -715,6 +705,10 @@ msgstr "Sélectionner le fichier"
 msgid "Meld requires %s or higher."
 msgstr "Meld nécessite %s ou supérieur."
 
+#: ../meld:64 ../meld:71
+msgid "Cannot import: "
+msgstr "Impossible d'importer : "
+
 #: ../meld.desktop.in.h:1
 msgid "Compare and merge your files"
 msgstr "Comparer et fusionner des fichiers"
@@ -723,90 +717,89 @@ msgstr "Comparer et fusionner des fichiers"
 msgid "Meld Diff Viewer"
 msgstr "Meld visionneur de différences"
 
-#: ../meldapp.py:155
+#: ../meldapp.py:153
 msgid "label"
 msgstr "étiquette"
 
-#: ../meldapp.py:155
+#: ../meldapp.py:153
 msgid "pattern"
 msgstr "motif"
 
-#: ../meldapp.py:223
+#: ../meldapp.py:221
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Disponible uniquement si gnome-python-desktop est installé"
 
 #. file filters
 #. text filters
-#: ../meldapp.py:233 ../meldapp.py:238 ../vcview.py:152
+#: ../meldapp.py:231 ../meldapp.py:236 ../vcview.py:163
 msgid "Name"
 msgstr "Nom"
 
-#: ../meldapp.py:233 ../meldapp.py:238
+#: ../meldapp.py:231 ../meldapp.py:236
 msgid "Active"
 msgstr "Actif"
 
-#: ../meldapp.py:233
+#: ../meldapp.py:231
 msgid "Pattern"
 msgstr "Motif"
 
-#: ../meldapp.py:238
+#: ../meldapp.py:236
 msgid "Regex"
 msgstr "Expression régulière"
 
-#: ../meldapp.py:342
+#: ../meldapp.py:340
 msgid "Close tab"
 msgstr "Fermer l'onglet"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:414
+#: ../meldapp.py:412
 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
-#: ../meldapp.py:416
-msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
-msgstr ""
-"Gestion des révisions\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory "
-"RCS\n"
+#: ../meldapp.py:414
+#, python-format
+#| msgid "_Version Control Browser"
+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
-#: ../meldapp.py:418
+#: ../meldapp.py:416
 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
-#: ../meldapp.py:420
+#: ../meldapp.py:418
 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
-#: ../meldapp.py:422
+#: ../meldapp.py:420
 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
-#: ../meldapp.py:424
+#: ../meldapp.py:422
 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
-#: ../meldapp.py:426
+#: ../meldapp.py:424
 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
-#: ../meldapp.py:428
+#: ../meldapp.py:426
 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
-#: ../meldapp.py:430
+#: ../meldapp.py:428
 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
-#: ../meldapp.py:432
+#: ../meldapp.py:430
 msgid "Script comment\t0\t#.*"
 msgstr "Commentaire de script\t0\t#.*"
 
@@ -918,31 +911,89 @@ msgstr "Rapporte une anomalie de Meld"
 msgid "About this program"
 msgstr "Ã? propos de ce programme"
 
-#: ../meldapp.py:857
+#: ../meldapp.py:545
+msgid "Full Screen"
+msgstr "Plein écran"
+
+#: ../meldapp.py:545
+msgid "View the comparison in full screen"
+msgstr "Afficher la comparaison en plein écran"
+
+#: ../meldapp.py:546
+msgid "_Toolbar"
+msgstr "_Barre d'outils"
+
+#: ../meldapp.py:546
+msgid "Show or hide the toolbar"
+msgstr "Affiche ou masque la barre d'outils"
+
+#: ../meldapp.py:547
+msgid "_Statusbar"
+msgstr "B_arre d'état"
+
+#: ../meldapp.py:547
+msgid "Show or hide the statusbar"
+msgstr "Affiche ou masque la barre d'état"
+
+#: ../meldapp.py:895
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Impossible de comparer des fichiers avec des répertoires.\n"
 
-#: ../meldapp.py:910
+#: ../meldapp.py:938 ../meldapp.py:946
+msgid "file"
+msgstr "fichier"
+
+#: ../meldapp.py:939 ../meldapp.py:945
+msgid "dir"
+msgstr "répertoire"
+
+#: ../meldapp.py:944
+msgid "Start with no window open"
+msgstr "Démarre sans ouvrir de fenêtre"
+
+#: ../meldapp.py:945
+#, python-format
+msgid "Start with Version Control browser in '%s'"
+msgstr "Démarre avec le navigateur du gestionnaire de versions dans « %s »"
+
+#: ../meldapp.py:946
+#, python-format
+msgid "Start with Version Control diff of '%s'"
+msgstr "Démarre avec le « diff » du gestionnaire de versions pour « %s »"
+
+#: ../meldapp.py:947
+msgid "Start with 2 or 3 way file comparison"
+msgstr "Démarre avec la comparaison de 2 ou 3 fichiers"
+
+#: ../meldapp.py:948
+msgid "Start with 2 or 3 way directory comparison"
+msgstr "Démarre avec la comparaison de 2 ou 3 répertoires"
+
+#: ../meldapp.py:955
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld est un outil de comparaison de fichiers et de répertoires."
+
+#: ../meldapp.py:958
 msgid "Set label to use instead of file name"
 msgstr "Définit l'étiquette à utiliser au lieu du nom de fichier"
 
-#: ../meldapp.py:911
+#: ../meldapp.py:960
 msgid "Automatically compare all differing files on startup"
 msgstr "Compare automatiquement tous les fichiers différents au démarrage"
 
-#: ../meldapp.py:912 ../meldapp.py:913 ../meldapp.py:914 ../meldapp.py:915
+#: ../meldapp.py:961 ../meldapp.py:962 ../meldapp.py:963 ../meldapp.py:964
 msgid "Ignored for compatibility"
 msgstr "Ignorée pour compatibilité"
 
-#: ../meldapp.py:918
-msgid "Creates a diff tab for up to 3 supplied files."
-msgstr "Crée un onglet diff pour un maximum de 3 fichiers."
+#: ../meldapp.py:967
+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."
 
-#: ../meldapp.py:922
+#: ../meldapp.py:971
 msgid "Invalid number of arguments supplied for --diff."
 msgstr "Nombre de paramètres non valide pour --diff."
 
-#: ../meldapp.py:953
+#: ../meldapp.py:974
 #, python-format
 msgid "Wrong number of arguments (Got %i)"
 msgstr "Nombre de paramètres invalide (%i reçus)"
@@ -952,146 +1003,154 @@ msgid "untitled"
 msgstr "sans-titre"
 
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:173
+#: ../misc.py:191
 msgid "[None]"
 msgstr "[Aucun]"
 
-#: ../vcview.py:117
+#: ../vcview.py:127
 msgid "_Commit"
 msgstr "_Valider"
 
-#: ../vcview.py:117
+#: ../vcview.py:127
 msgid "Commit"
 msgstr "Valider"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:118
+#: ../vcview.py:128
 msgid "_Update"
 msgstr "Mettre à _jour"
 
-#: ../vcview.py:118
+#: ../vcview.py:128
 msgid "Update"
 msgstr "Mettre à jour"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:119
+#: ../vcview.py:129
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../vcview.py:119
+#: ../vcview.py:129
 msgid "Add to VC"
 msgstr "Ajouter au gestionnaire de versions"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:120
+#: ../vcview.py:130
 msgid "Add _Binary"
 msgstr "Ajouter _binaire"
 
-#: ../vcview.py:120
+#: ../vcview.py:130
 msgid "Add binary to VC"
 msgstr "Ajouter le binaire au gestionnaire de versions"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:121
+#: ../vcview.py:131
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../vcview.py:121
+#: ../vcview.py:131
 msgid "Remove from VC"
 msgstr "Supprimer du gestionnaire de versions"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:122
+#: ../vcview.py:132
+msgid "_Resolved"
+msgstr "_Résolu"
+
+#: ../vcview.py:132
+msgid "Mark as resolved for VC"
+msgstr "Marque comme résolu pour le gestionnaire de versions"
+
+#: ../vcview.py:133
 msgid "Revert to original"
 msgstr "Revenir à l'original"
 
-#: ../vcview.py:123
+#: ../vcview.py:134
 msgid "Delete locally"
 msgstr "Effacer localement"
 
-#: ../vcview.py:127
+#: ../vcview.py:138
 msgid "_Flatten"
 msgstr "A_platir"
 
-#: ../vcview.py:127
+#: ../vcview.py:138
 msgid "Flatten directories"
 msgstr "Aplatir les répertoires"
 
-#: ../vcview.py:128
+#: ../vcview.py:139
 msgid "_Modified"
 msgstr "_Modifiés"
 
-#: ../vcview.py:129
+#: ../vcview.py:140
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../vcview.py:129
+#: ../vcview.py:140
 msgid "Show normal"
 msgstr "Affichage normal"
 
-#: ../vcview.py:130
+#: ../vcview.py:141
 msgid "Non _VC"
 msgstr "Non _versionné"
 
-#: ../vcview.py:130
+#: ../vcview.py:141
 msgid "Show unversioned files"
 msgstr "Afficher les fichiers qui ne sont pas versionnés"
 
-#: ../vcview.py:131
+#: ../vcview.py:142
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: ../vcview.py:131
+#: ../vcview.py:142
 msgid "Show ignored files"
 msgstr "Afficher les fichiers ignorés"
 
-#: ../vcview.py:169
+#: ../vcview.py:180
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../vcview.py:170
+#: ../vcview.py:181
 msgid "Status"
 msgstr "Ã?tat"
 
-#: ../vcview.py:171
+#: ../vcview.py:182
 msgid "Rev"
 msgstr "Révision"
 
-#: ../vcview.py:173
+#: ../vcview.py:184
 msgid "Options"
 msgstr "Options"
 
-#: ../vcview.py:208
+#: ../vcview.py:230
 msgid "Choose one Version Control"
 msgstr "Choisir un système de gestion de versions"
 
-#: ../vcview.py:209
+#: ../vcview.py:231
 msgid "Only one Version Control in this directory"
 msgstr "Un seul système de gestion de versions dans ce répertoire"
 
-#: ../vcview.py:288
+#: ../vcview.py:316
 msgid "(Empty)"
 msgstr "(vide)"
 
-#: ../vcview.py:321
+#: ../vcview.py:349
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Récupération des différences"
 
-#: ../vcview.py:328
+#: ../vcview.py:356
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Application du correctif"
 
-#: ../vcview.py:332
+#: ../vcview.py:360
 msgid "No differences found."
 msgstr "Aucune différence trouvée."
 
-#: ../vcview.py:410
+#: ../vcview.py:439
 msgid "Select some files first."
 msgstr "Sélectionnez d'abord des fichiers."
 
-#: ../vcview.py:474
+#: ../vcview.py:505
 #, python-format
 msgid ""
 "\n"
@@ -1139,7 +1198,7 @@ msgstr ""
 "Ignoré:Non-versionné:::Erreur::Nouvellement ajouté:Modifié:<b>Conflit</b>:"
 "Supprimé:Manquant"
 
-#: ../vc/cvs.py:156
+#: ../vc/cvs.py:151
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]