GNOME.org
 

[meld] Update French translation

commit 6bb1893e472d7b00295ab08aee85ebcdc14a7a04
Author: Alexandre Franke <alexandre franke gmail com>
Date:   Wed May 2 19:06:50 2012 +0200

    Update French translation

 po/fr.po |  132 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 67 insertions(+), 65 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 5442307..64108f3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ 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: 2012-04-03 07:51+0000\n"
+"POT-Creation-Date: 2012-04-30 14:40+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"
@@ -22,11 +22,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/meld:97
+#: ../bin/meld:103
 msgid "Cannot import: "
 msgstr "Impossible d'importerÂ: "
 
-#: ../bin/meld:100
+#: ../bin/meld:106
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld nÃcessite %s ou supÃrieur."
@@ -132,12 +132,12 @@ msgid "_Next"
 msgstr "_Suivant"
 
 #: ../data/ui/findbar.ui.h:5
-msgid "_Search for"
-msgstr "_Rechercher"
+msgid "Find:"
+msgstr "Rechercher :"
 
 #: ../data/ui/findbar.ui.h:6
-msgid "Replace _With"
-msgstr "Remplacer _par"
+msgid "Replace _with:"
+msgstr "Remplacer _par :"
 
 #: ../data/ui/findbar.ui.h:7
 msgid "_Match Case"
@@ -402,7 +402,7 @@ msgstr "Copie vers la droite"
 msgid "Delete selected"
 msgstr "Effacer la sÃlection"
 
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1165
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
 msgid "Hide"
 msgstr "Masquer"
 
@@ -500,7 +500,7 @@ msgstr ""
 msgid "'%s' hidden by '%s'"
 msgstr "ÂÂ%s est masquà par ÂÂ%sÂÂ"
 
-#: ../meld/dirdiff.py:625 ../meld/filediff.py:1008 ../meld/filediff.py:1169
+#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
 msgid "Hi_de"
 msgstr "Mas_quer"
 
@@ -593,144 +593,144 @@ msgid_plural "%i years"
 msgstr[0] "%i annÃe"
 msgstr[1] "%i annÃes"
 
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:295
 msgid "Format as patch..."
 msgstr "Mettre sous forme de correctif..."
 
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:295
 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:295
+#: ../meld/filediff.py:296
 msgid "Previous conflict"
 msgstr "Conflit prÃcÃdent"
 
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:296
 msgid "Go to the previous conflict"
 msgstr "Revient au conflit prÃcÃdent"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:297
 msgid "Next conflict"
 msgstr "Conflit suivant"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:297
 msgid "Go to the next conflict"
 msgstr "Va au prochain conflit"
 
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:298
 msgid "Push to left"
 msgstr "Envoyer à gauche"
 
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:298
 msgid "Push current change to the left"
 msgstr "Envoie la modification actuelle vers la gauche"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:299
 msgid "Push to right"
 msgstr "Envoyer à droite"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:299
 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:300
+#: ../meld/filediff.py:301
 msgid "Pull from left"
 msgstr "RÃcupÃrer de la gauche"
 
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:301
 msgid "Pull change from the left"
 msgstr "RÃcupÃre la modification de gauche"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:302
 msgid "Pull from right"
 msgstr "RÃcupÃrer de la droite"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:302
 msgid "Pull change from the right"
 msgstr "RÃcupÃre la modification de droite"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:303
 msgid "Copy above left"
 msgstr "Copier au-dessus de la gauche"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:303
 msgid "Copy change above the left chunk"
 msgstr "Copie la modification au-dessus du segment de gauche"
 
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:304
 msgid "Copy below left"
 msgstr "Copier en dessous de la gauche"
 
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:304
 msgid "Copy change below the left chunk"
 msgstr "Copie la modification en dessous du segment de gauche"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:305
 msgid "Copy above right"
 msgstr "Copier au-dessus de la droite"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:305
 msgid "Copy change above the right chunk"
 msgstr "Copie la modification au-dessus du segment de droite"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:306
 msgid "Copy below right"
 msgstr "Copier en dessous de la droite"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:306
 msgid "Copy change below the right chunk"
 msgstr "Copie la modification en dessous du segement de droite"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:307
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:307
 msgid "Delete change"
 msgstr "Supprimer les modifications"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:308
 msgid "Merge all changes from left"
 msgstr "Fusionne toutes les modifications de gauche"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:308
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Fusionne toutes les modifications non-conflictuelles de gauche"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:309
 msgid "Merge all changes from right"
 msgstr "Fusionne toutes les modifications de droite"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:309
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Fusionne toutes les modifications non-conflictuelles de droite"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:310
 msgid "Merge all non-conflicting"
 msgstr "Fusionne toutes les modifications non-conflictuelles"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:310
 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:310
+#: ../meld/filediff.py:311
 msgid "Cycle through documents"
 msgstr "Parcourir cycliquement les documents"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:311
 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:314
+#: ../meld/filediff.py:315
 msgid "Lock scrolling"
 msgstr "Verrouiller le dÃfilement"
 
-#: ../meld/filediff.py:315
+#: ../meld/filediff.py:316
 msgid "Lock scrolling of all panes"
 msgstr "Verrouille le dÃfilement de tous les panneaux"
 
@@ -763,42 +763,42 @@ msgstr ""
 msgid "<unnamed>"
 msgstr "<Document non enregistrÃ>"
 
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:998
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] RÃgler le nombre de volets"
 
-#: ../meld/filediff.py:1002
+#: ../meld/filediff.py:1004
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ouverture des fichiers"
 
-#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
-#: ../meld/filediff.py:1053
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
+#: ../meld/filediff.py:1055
 msgid "Could not read file"
 msgstr "Impossible de lire le fichier"
 
-#: ../meld/filediff.py:1027
+#: ../meld/filediff.py:1029
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lecture des fichiers"
 
-#: ../meld/filediff.py:1036
+#: ../meld/filediff.py:1038
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semble Ãtre un fichier binaire."
 
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1050
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s n'est pas dans un des codagesÂ: %s"
 
-#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcul des diffÃrences"
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1158
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -807,15 +807,15 @@ msgstr ""
 "masquent des diffÃrences entre les fichiers. Voulez-vous comparer les "
 "fichiers non filtrÃsÂ?"
 
-#: ../meld/filediff.py:1162
+#: ../meld/filediff.py:1164
 msgid "Files are identical"
 msgstr "Les fichiers sont identiques"
 
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1174
 msgid "Show without filters"
 msgstr "Afficher sans les filtres"
 
-#: ../meld/filediff.py:1361
+#: ../meld/filediff.py:1363
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -824,7 +824,7 @@ msgstr ""
 "ÂÂ%sÂÂ existe dÃjÃÂ!\n"
 "ÃcraserÂ?"
 
-#: ../meld/filediff.py:1374
+#: ../meld/filediff.py:1376
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -835,12 +835,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1383
+#: ../meld/filediff.py:1385
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Choisissez un nom pour le tampon %i."
 
-#: ../meld/filediff.py:1398
+#: ../meld/filediff.py:1400
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -851,7 +851,7 @@ msgstr ""
 "\n"
 "Quel format voulez-vous utiliserÂ?"
 
-#: ../meld/filediff.py:1414
+#: ../meld/filediff.py:1416
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -860,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:1473
+#: ../meld/filediff.py:1475
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -1173,12 +1173,12 @@ msgstr "B_arre d'Ãtat"
 msgid "Show or hide the statusbar"
 msgstr "Affiche ou masque la barre d'Ãtat"
 
-#: ../meld/meldwindow.py:538
+#: ../meld/meldwindow.py:541
 msgid "Switch to this tab"
 msgstr "Basculer vers cet onglet"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:629
+#: ../meld/meldwindow.py:639
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Impossible de comparer des fichiers avec des rÃpertoires.\n"
 
@@ -1214,8 +1214,8 @@ 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"
+"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
@@ -1466,7 +1466,7 @@ msgstr ""
 "                    gestionnaire de versions que vous utilisez.\n"
 "                    "
 
-#: ../meld/ui/findbar.py:127
+#: ../meld/ui/findbar.py:140
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -1522,3 +1522,5 @@ msgstr ""
 "Le motif Ãtait ÂÂ%sÂÂ\n"
 "L'erreur Ãtait ÂÂ%sÂÂ"
 
+#~ msgid "_Search for"
+#~ msgstr "_Rechercher"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]