[meld] Updated French translation
- From: Bruno Brouard <bbrouard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated French translation
- Date: Tue, 2 Aug 2011 15:29:12 +0000 (UTC)
commit ebc44d4f068f1729371ee03bb22f22475f016c8e
Author: Bruno Brouard <annoa b gmail com>
Date: Tue Aug 2 17:28:11 2011 +0200
Updated French translation
po/fr.po | 369 ++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 202 insertions(+), 167 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 98145c6..9ff78c1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,8 +13,8 @@ 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-03-14 21:22+0000\n"
-"PO-Revision-Date: 2011-03-20 19:06+0100\n"
+"POT-Creation-Date: 2011-05-29 02:18+0000\n"
+"PO-Revision-Date: 2011-08-02 17:27+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"
@@ -75,7 +75,7 @@ msgstr "Fait descendre l'ÃlÃment"
msgid "Move item up"
msgstr "Fait monter l'ÃlÃment"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:156
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
msgid "Name"
msgstr "Nom"
@@ -143,7 +143,7 @@ msgstr "_Suivant"
msgid "_Previous"
msgstr "_PrÃcÃdent"
-#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:140
+#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
msgid "_Replace"
msgstr "_Remplacer"
@@ -385,7 +385,7 @@ msgstr "Message du journal"
msgid "Previous Logs"
msgstr "Journaux prÃcÃdents"
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
msgid "Tag"
msgstr "Ãtiquette"
@@ -393,123 +393,123 @@ msgstr "Ãtiquette"
msgid "VC Log"
msgstr "Journal du gestionnaire de versions"
-#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
msgid "_Compare"
msgstr "_Comparer"
-#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
msgid "Compare selected"
msgstr "Comparer la sÃlection"
-#: ../meld/dirdiff.py:216
+#: ../meld/dirdiff.py:228
msgid "Copy _Left"
msgstr "Copier à _gauche"
-#: ../meld/dirdiff.py:216
+#: ../meld/dirdiff.py:228
msgid "Copy to left"
msgstr "Copie vers la gauche"
-#: ../meld/dirdiff.py:217
+#: ../meld/dirdiff.py:229
msgid "Copy _Right"
msgstr "Copier à _droite"
-#: ../meld/dirdiff.py:217
+#: ../meld/dirdiff.py:229
msgid "Copy to right"
msgstr "Copie vers la droite"
-#: ../meld/dirdiff.py:218
+#: ../meld/dirdiff.py:230
msgid "Delete selected"
msgstr "Effacer la sÃlection"
-#: ../meld/dirdiff.py:219 ../meld/filediff.py:999
+#: ../meld/dirdiff.py:231 ../meld/filediff.py:1117
msgid "Hide"
msgstr "Masquer"
-#: ../meld/dirdiff.py:219
+#: ../meld/dirdiff.py:231
msgid "Hide selected"
msgstr "Masquer la sÃlection"
-#: ../meld/dirdiff.py:221 ../meld/filediff.py:264 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:267 ../meld/vcview.py:119
msgid "Open selected"
msgstr "Ouvrir la sÃlection"
-#: ../meld/dirdiff.py:225
+#: ../meld/dirdiff.py:237
msgid "Case"
msgstr "Casse"
-#: ../meld/dirdiff.py:225
+#: ../meld/dirdiff.py:237
msgid "Ignore case of entries"
msgstr "Ignorer la casse des entrÃes"
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:238
msgid "Same"
msgstr "Identique"
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:238
msgid "Show identical"
msgstr "Afficher les fichiers identiques"
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:239
msgid "New"
msgstr "Nouveaux"
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:239
msgid "Show new"
msgstr "Afficher les nouveaux fichiers"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:240
msgid "Modified"
msgstr "ModifiÃs"
-#: ../meld/dirdiff.py:228 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
msgid "Show modified"
msgstr "Afficher les objets modifiÃs"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:242
msgid "Filters"
msgstr "Filtres"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:242
msgid "Set active filters"
msgstr "DÃfinir les filtres actifs"
-#: ../meld/dirdiff.py:347
+#: ../meld/dirdiff.py:359
#, python-format
msgid "Hide %s"
msgstr "Masquer %s"
-#: ../meld/dirdiff.py:449 ../meld/dirdiff.py:462 ../meld/vcview.py:304
-#: ../meld/vcview.py:332
+#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
+#: ../meld/vcview.py:333
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] En cours d'analyse de %s"
-#: ../meld/dirdiff.py:561
+#: ../meld/dirdiff.py:574
#, python-format
msgid "[%s] Done"
msgstr "[%s] TerminÃ"
-#: ../meld/dirdiff.py:565
+#: ../meld/dirdiff.py:578
msgid "Multiple errors occurred while scanning this folder"
msgstr "Plusieurs erreurs se sont produites lors de l'analyse de ce dossier"
-#: ../meld/dirdiff.py:566
+#: ../meld/dirdiff.py:579
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:568
+#: ../meld/dirdiff.py:581
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:570
+#: ../meld/dirdiff.py:583
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:572
+#: ../meld/dirdiff.py:585
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -518,16 +518,16 @@ msgstr ""
"fichiers sensible à la casse. Les fichiers suivants de ce dossier sont "
"masquÃsÂ:"
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:596
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "ÂÂ%s est masquà par ÂÂ%sÂÂ"
-#: ../meld/dirdiff.py:608 ../meld/filediff.py:876 ../meld/filediff.py:1003
+#: ../meld/dirdiff.py:621 ../meld/filediff.py:981 ../meld/filediff.py:1121
msgid "Hi_de"
msgstr "Mas_quer"
-#: ../meld/dirdiff.py:658
+#: ../meld/dirdiff.py:671
#, python-format
msgid ""
"'%s' exists.\n"
@@ -536,7 +536,7 @@ msgstr ""
"ÂÂ%sÂÂ existe dÃjÃ.\n"
"ÃcraserÂ?"
-#: ../meld/dirdiff.py:665
+#: ../meld/dirdiff.py:678
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -547,7 +547,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:683 ../meld/vcview.py:504
+#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -556,7 +556,7 @@ msgstr ""
"ÂÂ%sÂÂ est un rÃpertoire.\n"
"Supprimer rÃcursivementÂ?"
-#: ../meld/dirdiff.py:690 ../meld/vcview.py:509
+#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
#, python-format
msgid ""
"Error removing %s\n"
@@ -567,203 +567,211 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:702
+#: ../meld/dirdiff.py:715
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i seconde"
msgstr[1] "%i secondes"
-#: ../meld/dirdiff.py:703
+#: ../meld/dirdiff.py:716
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
msgstr[0] "%i minute"
msgstr[1] "%i minutes"
-#: ../meld/dirdiff.py:704
+#: ../meld/dirdiff.py:717
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
msgstr[0] "%i heure"
msgstr[1] "%i heures"
-#: ../meld/dirdiff.py:705
+#: ../meld/dirdiff.py:718
#, python-format
msgid "%i day"
msgid_plural "%i days"
msgstr[0] "%i jour"
msgstr[1] "%i jours"
-#: ../meld/dirdiff.py:706
+#: ../meld/dirdiff.py:719
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
msgstr[0] "%i semaine"
msgstr[1] "%i semaines"
-#: ../meld/dirdiff.py:707
+#: ../meld/dirdiff.py:720
#, python-format
msgid "%i month"
msgid_plural "%i months"
msgstr[0] "%i mois"
msgstr[1] "%i mois"
-#: ../meld/dirdiff.py:708
+#: ../meld/dirdiff.py:721
#, python-format
msgid "%i year"
msgid_plural "%i years"
msgstr[0] "%i annÃe"
msgstr[1] "%i annÃes"
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:268
msgid "Format as patch..."
msgstr "Mettre sous forme de correctif..."
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:268
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:266
+#: ../meld/filediff.py:269
msgid "Previous conflict"
msgstr "Conflit prÃcÃdent"
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:269
msgid "Go to the previous conflict"
msgstr "Revient au conflit prÃcÃdent"
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:270
msgid "Next conflict"
msgstr "Conflit suivant"
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:270
msgid "Go to the next conflict"
msgstr "Va au prochain conflit"
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:271
msgid "Push to left"
msgstr "Envoyer à gauche"
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:271
msgid "Push current change to the left"
msgstr "Envoie la modification actuelle vers la gauche"
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:272
msgid "Push to right"
msgstr "Envoyer à droite"
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:272
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:271
+#: ../meld/filediff.py:274
msgid "Pull from left"
msgstr "RÃcupÃrer de la gauche"
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:274
msgid "Pull change from the left"
msgstr "RÃcupÃre la modification de gauche"
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:275
msgid "Pull from right"
msgstr "RÃcupÃrer de la droite"
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:275
msgid "Pull change from the right"
msgstr "RÃcupÃre la modification de droite"
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:276
msgid "Copy above left"
msgstr "Copier au-dessus de la gauche"
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:276
msgid "Copy change above the left chunk"
msgstr "Copie la modification au-dessus du segment de gauche"
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:277
msgid "Copy below left"
msgstr "Copier en dessous de la gauche"
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:277
msgid "Copy change below the left chunk"
msgstr "Copie la modification en dessous du segment de gauche"
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:278
msgid "Copy above right"
msgstr "Copier au-dessus de la droite"
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:278
msgid "Copy change above the right chunk"
msgstr "Copie la modification au-dessus du segment de droite"
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:279
msgid "Copy below right"
msgstr "Copier en dessous de la droite"
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:279
msgid "Copy change below the right chunk"
msgstr "Copie la modification en dessous du segement de droite"
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:280
msgid "Delete"
msgstr "Supprimer"
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:280
msgid "Delete change"
msgstr "Supprimer les modifications"
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:281
msgid "Merge all changes from left"
msgstr "Fusionne toutes les modifications de gauche"
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:281
msgid "Merge all non-conflicting changes from the left"
msgstr "Fusionne toutes les modifications non-conflictuelles de gauche"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:282
msgid "Merge all changes from right"
msgstr "Fusionne toutes les modifications de droite"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:282
msgid "Merge all non-conflicting changes from the right"
msgstr "Fusionne toutes les modifications non-conflictuelles de droite"
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:283
msgid "Merge all non-conflicting"
msgstr "Fusionne toutes les modifications non-conflictuelles"
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:283
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
+msgid "Cycle through documents"
+msgstr "Parcourir cycliquement les documents"
+
+#: ../meld/filediff.py:284
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "DÃplacer le focus clavier vers le document suivant dans cette comparaison"
+
+#: ../meld/filediff.py:288
msgid "Lock scrolling"
msgstr "Verrouiller le dÃfilement"
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:289
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:366
+#: ../meld/filediff.py:381
msgid "INS"
msgstr "INS"
-#: ../meld/filediff.py:366
+#: ../meld/filediff.py:381
msgid "OVR"
msgstr "ÃCR"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:368
+#: ../meld/filediff.py:383
#, python-format
msgid "Ln %i, Col %i"
msgstr "Ln %i, Col %i"
-#: ../meld/filediff.py:571
+#: ../meld/filediff.py:693
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -773,50 +781,62 @@ 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:674
+#: ../meld/filediff.py:780
msgid "<unnamed>"
msgstr "<Document non enregistrÃ>"
-#: ../meld/filediff.py:864
+#: ../meld/filediff.py:969
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] RÃgler le nombre de volets"
-#: ../meld/filediff.py:870
+#: ../meld/filediff.py:975
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Ouverture des fichiers"
-#: ../meld/filediff.py:894 ../meld/filediff.py:903 ../meld/filediff.py:915
-#: ../meld/filediff.py:921
+#: ../meld/filediff.py:999 ../meld/filediff.py:1008 ../meld/filediff.py:1020
+#: ../meld/filediff.py:1026
msgid "Could not read file"
msgstr "Impossible de lire le fichier"
-#: ../meld/filediff.py:895
+#: ../meld/filediff.py:1000
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Lecture des fichiers"
-#: ../meld/filediff.py:904
+#: ../meld/filediff.py:1009
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s semble Ãtre un fichier binaire."
-#: ../meld/filediff.py:916
+#: ../meld/filediff.py:1021
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s n'est pas dans un des codagesÂ: %s"
-#: ../meld/filediff.py:946 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1051 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Calcul des diffÃrences"
-#: ../meld/filediff.py:997
+#: ../meld/filediff.py:1108
+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Â?"
+
+#: ../meld/filediff.py:1114
msgid "Files are identical"
msgstr "Les fichiers sont identiques"
-#: ../meld/filediff.py:1151
+#: ../meld/filediff.py:1124
+msgid "Show without filters"
+msgstr "Afficher sans les filtres"
+
+#: ../meld/filediff.py:1278
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -825,7 +845,7 @@ msgstr ""
"ÂÂ%sÂÂ existe dÃjÃÂ!\n"
"ÃcraserÂ?"
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1291
#, python-format
msgid ""
"Error writing to %s\n"
@@ -836,12 +856,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1173
+#: ../meld/filediff.py:1300
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Choisissez un nom pour le tampon %i."
-#: ../meld/filediff.py:1188
+#: ../meld/filediff.py:1315
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -852,7 +872,7 @@ msgstr ""
"\n"
"Quel format voulez-vous utiliserÂ?"
-#: ../meld/filediff.py:1204
+#: ../meld/filediff.py:1331
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -861,7 +881,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:1263
+#: ../meld/filediff.py:1390
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -923,19 +943,27 @@ msgstr "DÃfinit l'Ãtiquette à utiliser au lieu du nom de fichier"
msgid "Automatically compare all differing files on startup"
msgstr "Compare automatiquement tous les fichiers diffÃrents au dÃmarrage"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:170
+msgid "Ignored for compatibility"
+msgstr "IgnorÃe pour compatibilitÃ"
+
+#: ../meld/meldapp.py:173
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:174
+#: ../meld/meldapp.py:176
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:177
+#: ../meld/meldapp.py:179
#, 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
+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
msgid "untitled"
msgstr "sans titre"
@@ -998,162 +1026,170 @@ msgstr "Rechercher le _suivant"
#: ../meld/meldwindow.py:139
msgid "Search forwards for the same text"
-msgstr "Recherche le mÃme texte plus loin"
+msgstr "Recherche le mÃme texte en avant"
+
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr "Rechercher le _prÃcÃdent"
#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr "Recherche le mÃme texte en arriÃre"
+
+#: ../meld/meldwindow.py:141
msgid "Find and replace text"
msgstr "Recherche un texte et le remplace"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:142
msgid "Prefere_nces"
msgstr "_PrÃfÃrences"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:142
msgid "Configure the application"
msgstr "Configurer l'application"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:144
msgid "_Changes"
msgstr "D_iffÃrences"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:145
msgid "Next change"
msgstr "Prochaine diffÃrence"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:145
msgid "Go to the next change"
msgstr "Va jusqu'Ã la prochaine diffÃrence"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
msgid "Previous change"
msgstr "DiffÃrence prÃcÃdente"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
msgid "Go to the previous change"
msgstr "Revient à la diffÃrence prÃcÃdente"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:148
msgid "_View"
msgstr "_Affichage"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
msgid "File status"
msgstr "Ãtat du fichier"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:150
msgid "Version status"
msgstr "Ãtat de la version"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
msgid "File filters"
msgstr "Filtres de fichier"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
msgid "Stop the current action"
msgstr "ArrÃte l'action en cours"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
msgid "Refresh the view"
msgstr "Actualise l'affichage"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
msgid "Reload"
msgstr "Recharger"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
msgid "Reload the comparison"
msgstr "Recharge la comparaison"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:156
msgid "_Tabs"
msgstr "_Onglets"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
msgid "_Previous Tab"
msgstr "Onglet _prÃcÃdent"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
msgid "Activate previous tab"
msgstr "Active l'onglet prÃcÃdent"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
msgid "_Next Tab"
msgstr "Onglet _suivant"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
msgid "Activate next tab"
msgstr "Active l'onglet suivant"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
msgid "Move Tab _Left"
msgstr "DÃplacer l'onglet vers la _gauche"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
msgid "Move current tab to left"
msgstr "DÃplace l'onglet actuel vers la gauche"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
msgid "Move Tab _Right"
msgstr "DÃplacer l'onglet vers la _droite"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
msgid "Move current tab to right"
msgstr "DÃplace l'onglet actuel vers la droite"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:162
msgid "_Help"
msgstr "Aid_e"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:163
msgid "_Contents"
msgstr "_Sommaire"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:163
msgid "Open the Meld manual"
msgstr "Ouvre le manuel de Meld"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
msgid "Report _Bug"
msgstr "Signaler une _anomalie"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
msgid "Report a bug in Meld"
msgstr "Rapporte une anomalie de Meld"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
msgid "About this program"
msgstr "Ã propos de ce programme"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
msgid "Full Screen"
msgstr "Plein Ãcran"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
msgid "View the comparison in full screen"
msgstr "Afficher la comparaison en plein Ãcran"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
msgid "_Toolbar"
msgstr "_Barre d'outils"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
msgid "Show or hide the toolbar"
msgstr "Affiche ou masque la barre d'outils"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
msgid "_Statusbar"
msgstr "B_arre d'Ãtat"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
msgid "Show or hide the statusbar"
msgstr "Affiche ou masque la barre d'Ãtat"
-#: ../meld/meldwindow.py:530
+#: ../meld/meldwindow.py:534
msgid "Switch to this tab"
msgstr "Basculer vers cet onglet"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:621
+#: ../meld/meldwindow.py:625
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Impossible de comparer des fichiers avec des rÃpertoires.\n"
@@ -1179,53 +1215,53 @@ 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:232
+#: ../meld/preferences.py:233
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:234
+#: ../meld/preferences.py:235
#, 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:236
+#: ../meld/preferences.py:237
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:238
+#: ../meld/preferences.py:239
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:240
+#: ../meld/preferences.py:241
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:242
+#: ../meld/preferences.py:243
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:244
+#: ../meld/preferences.py:245
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:246
+#: ../meld/preferences.py:247
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:248
+#: ../meld/preferences.py:249
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:250
+#: ../meld/preferences.py:251
msgid "Script comment\t0\t#.*"
msgstr "Commentaire de script\t0\t#.*"
@@ -1313,73 +1349,73 @@ msgstr "IgnorÃ"
msgid "Show ignored files"
msgstr "Affiche les fichiers ignorÃs"
-#: ../meld/vcview.py:176 ../meld/vcview.py:300
+#: ../meld/vcview.py:177 ../meld/vcview.py:301
msgid "Location"
msgstr "Emplacement"
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:178
msgid "Status"
msgstr "Ãtat"
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:179
msgid "Rev"
msgstr "RÃvision"
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:181
msgid "Options"
msgstr "Options"
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:233
msgid "Choose one Version Control"
msgstr "Choisir un systÃme de gestion de versions"
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:234
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:246
+#: ../meld/vcview.py:247
#, 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:250
+#: ../meld/vcview.py:251
msgid "Invalid Repository"
msgstr "DÃpÃt non valide"
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:260
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:301
#, python-format
msgid "%s: %s"
msgstr "%sÂ: %s"
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:349
msgid "(Empty)"
msgstr "(vide)"
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:387
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] RÃcupÃration des diffÃrences"
-#: ../meld/vcview.py:394
+#: ../meld/vcview.py:395
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Application du correctif"
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:480
msgid "Select some files first."
msgstr "SÃlectionnez d'abord des fichiers."
-#: ../meld/vcview.py:552
+#: ../meld/vcview.py:553
#, python-format
msgid ""
"\n"
@@ -1428,7 +1464,7 @@ msgstr ""
" gestionnaire de versions que vous utilisez.\n"
" "
-#: ../meld/ui/findbar.py:120
+#: ../meld/ui/findbar.py:127
#, python-format
msgid ""
"Regular expression error\n"
@@ -1483,4 +1519,3 @@ 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]