[meld] Updated French translation

From: Bruno Brouard <bbrouard src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated French translation
Date: Thu, 26 Aug 2010 09:12:08 +0000 (UTC)
commit 678423887bb8ab71c9eb5c0a929612c75e166e51
Author: Bruno Brouard <annoa b gmail com>
Date:   Thu Aug 26 11:11:07 2010 +0200

    Updated French translation

 po/fr.po |  146 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 82 insertions(+), 64 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index bfd1382..d9990f9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,25 +2,26 @@
 # Copyright (C) 2003-2010 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-2010.
 # Robert-AndrÃ© Mauchin <zebob m pengzone org>, 2007.
-# Bruno Brouard <annoa b gmail com>, 2009-2010
-#
+# Bruno Brouard <annoa b gmail com>, 2009-2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Meld HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=meld&component=general\n"
-"POT-Creation-Date: 2010-06-19 02:36+0000\n"
-"PO-Revision-Date: 2010-05-25 14:01+0200\n"
-"Last-Translator: Claude Paroz <claude 2xlibre net>\n"
-"Language-Team: GNOME French Team <gnomefr traduc org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
+"cgi?product=meld&component=general\n"
+"POT-Creation-Date: 2010-08-24 09:51+0000\n"
+"PO-Revision-Date: 2010-08-26 10:57+0200\n"
+"Last-Translator: Bruno Brouard <annoa b gmail com>\n"
+"Language-Team: FranÃ§ais <gnomefr traduc org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: ../bin/meld:77
 msgid "Cannot import: "
@@ -271,23 +272,18 @@ msgstr ""
 "remplacÃ©s. Consultez le manuel d'utilisation pour plus de dÃ©tails."
 
 #: ../data/ui/preferences.glade.h:21
-msgid "_Automatically supply missing newline at end of file"
-msgstr ""
-"Ajouter _automatiquement le retour Ã  la ligne manquant en fin de fichier"
-
-#: ../data/ui/preferences.glade.h:22
 msgid "_Editor font:"
 msgstr "_Police de l'Ã©diteurÂ :"
 
-#: ../data/ui/preferences.glade.h:23
+#: ../data/ui/preferences.glade.h:22
 msgid "_Insert spaces instead of tabs"
 msgstr "InsÃ©rer des _espaces au lieu des tabulations"
 
-#: ../data/ui/preferences.glade.h:24
+#: ../data/ui/preferences.glade.h:23
 msgid "_Tab width:"
 msgstr "Largeur des _tabulationsÂ :"
 
-#: ../data/ui/preferences.glade.h:25
+#: ../data/ui/preferences.glade.h:24
 msgid "_Use the system fixed width font"
 msgstr "_Utiliser la police Ã  chasse fixe du systÃ¨me"
 
@@ -355,7 +351,7 @@ msgstr "Copier vers la droite"
 msgid "Delete selected"
 msgstr "Effacer la sÃ©lection"
 
-#: ../meld/dirdiff.py:188 ../meld/filediff.py:842
+#: ../meld/dirdiff.py:188 ../meld/filediff.py:850
 msgid "Hide"
 msgstr "Masquer"
 
@@ -417,8 +413,8 @@ msgstr "Erreur durant la conversion de Â«Â %sÂ Â» en expression rÃ©guliÃ¨re."
 msgid "Hide %s"
 msgstr "Masquer %s"
 
-#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:276
-#: ../meld/vcview.py:304
+#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:302
+#: ../meld/vcview.py:330
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] En cours d'analyse de %s"
@@ -464,7 +460,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:587 ../meld/vcview.py:463
+#: ../meld/dirdiff.py:587 ../meld/vcview.py:489
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -473,7 +469,7 @@ msgstr ""
 "Â«Â %sÂ Â» est un rÃ©pertoire.\n"
 "Supprimer rÃ©cursivementÂ ?"
 
-#: ../meld/dirdiff.py:594 ../meld/vcview.py:468
+#: ../meld/dirdiff.py:594 ../meld/vcview.py:494
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -601,25 +597,25 @@ msgstr "Fusionne toutes les modifications non-conflictuelles"
 #: ../meld/filediff.py:189
 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"
+"Fusionne toutes les modifications non-conflictuelles des panneaux de gauche "
+"et de droite"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:258
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:258
 msgid "OVR"
 msgstr "Ã?CR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:260
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, Col %i"
 
-#: ../meld/filediff.py:432
+#: ../meld/filediff.py:435
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -630,21 +626,21 @@ msgstr ""
 "plus de dÃ©tails."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:529
+#: ../meld/filediff.py:532
 msgid "<unnamed>"
 msgstr "<Document non enregistrÃ©>"
 
-#: ../meld/filediff.py:709
+#: ../meld/filediff.py:708
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] RÃ©gler le nombre de volets"
 
-#: ../meld/filediff.py:715
+#: ../meld/filediff.py:714
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ouverture des fichiers"
 
-#: ../meld/filediff.py:721 ../meld/filediff.py:846
+#: ../meld/filediff.py:720 ../meld/filediff.py:854
 msgid "Hi_de"
 msgstr "Mas_quer"
 
@@ -668,16 +664,16 @@ msgstr "%s semble Ãªtre un fichier binaire."
 msgid "%s is not in encodings: %s"
 msgstr "%s n'est pas dans un des codagesÂ : %s"
 
-#: ../meld/filediff.py:792 ../meld/filemerge.py:70
+#: ../meld/filediff.py:799 ../meld/filemerge.py:70
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcul des diffÃ©rences"
 
-#: ../meld/filediff.py:840
+#: ../meld/filediff.py:848
 msgid "Files are identical"
 msgstr "Les fichiers sont identiques"
 
-#: ../meld/filediff.py:974
+#: ../meld/filediff.py:985
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -686,7 +682,7 @@ msgstr ""
 "Â«Â %sÂ Â» existe dÃ©jÃ Â !\n"
 "Ã?craserÂ ?"
 
-#: ../meld/filediff.py:987
+#: ../meld/filediff.py:998
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -697,12 +693,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:1007
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Choisissez un nom pour le tampon %i."
 
-#: ../meld/filediff.py:1010
+#: ../meld/filediff.py:1021
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -713,7 +709,7 @@ msgstr ""
 "\n"
 "Quel format voulez-vous utiliserÂ ?"
 
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1037
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -723,11 +719,11 @@ msgstr ""
 "Voulez-vous enregistrer en UTF-8Â ?"
 
 #. save as
-#: ../meld/filediff.py:1064
+#: ../meld/filediff.py:1074
 msgid "Save patch as..."
 msgstr "Enregistrer le patch sous..."
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1121
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -980,7 +976,7 @@ msgstr "CrÃ©e un onglet diff pour un maximum de 3 fichiers ou rÃ©pertoires."
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "trop de paramÃ¨tres (0-4 dÃ©sirÃ©s, %d reÃ§us)"
 
-#: ../meld/melddoc.py:48
+#: ../meld/melddoc.py:47
 msgid "untitled"
 msgstr "sans titre"
 
@@ -1003,70 +999,70 @@ msgstr "Disponible uniquement si gnome-python-desktop est installÃ©"
 
 #. file filters
 #. text filters
-#: ../meld/preferences.py:166 ../meld/preferences.py:171 ../meld/vcview.py:163
+#: ../meld/preferences.py:165 ../meld/preferences.py:170 ../meld/vcview.py:163
 msgid "Name"
 msgstr "Nom"
 
-#: ../meld/preferences.py:166 ../meld/preferences.py:171
+#: ../meld/preferences.py:165 ../meld/preferences.py:170
 msgid "Active"
 msgstr "Actif"
 
-#: ../meld/preferences.py:166
+#: ../meld/preferences.py:165
 msgid "Pattern"
 msgstr "Motif"
 
-#: ../meld/preferences.py:171
+#: ../meld/preferences.py:170
 msgid "Regex"
 msgstr "Expression rÃ©guliÃ¨re"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:268
+#: ../meld/preferences.py:264
 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:270
+#: ../meld/preferences.py:266
 #, 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:272
+#: ../meld/preferences.py:268
 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:274
+#: ../meld/preferences.py:270
 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:276
+#: ../meld/preferences.py:272
 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:278
+#: ../meld/preferences.py:274
 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:280
+#: ../meld/preferences.py:276
 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:282
+#: ../meld/preferences.py:278
 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:284
+#: ../meld/preferences.py:280
 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:286
+#: ../meld/preferences.py:282
 msgid "Script comment\t0\t#.*"
 msgstr "Commentaire de script\t0\t#.*"
 
@@ -1183,37 +1179,55 @@ msgstr "RÃ©vision"
 msgid "Options"
 msgstr "Options"
 
-#: ../meld/vcview.py:230
+#: ../meld/vcview.py:231
 msgid "Choose one Version Control"
 msgstr "Choisir un systÃ¨me de gestion de versions"
 
-#: ../meld/vcview.py:231
+#: ../meld/vcview.py:232
 msgid "Only one Version Control in this directory"
 msgstr "Un seul systÃ¨me de gestion de versions dans ce rÃ©pertoire"
 
-#: ../meld/vcview.py:320
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:245
+#, 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:249
+msgid "Invalid Repository"
+msgstr "DÃ©pÃ´t non valide"
+
+#: ../meld/vcview.py:258
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../meld/vcview.py:346
 msgid "(Empty)"
 msgstr "(vide)"
 
-#: ../meld/vcview.py:353
+#: ../meld/vcview.py:379
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] RÃ©cupÃ©ration des diffÃ©rences"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:386
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Application du correctif"
 
-#: ../meld/vcview.py:364
+#: ../meld/vcview.py:390
 msgid "No differences found."
 msgstr "Aucune diffÃ©rence trouvÃ©e."
 
-#: ../meld/vcview.py:438
+#: ../meld/vcview.py:464
 msgid "Select some files first."
 msgstr "SÃ©lectionnez d'abord des fichiers."
 
-#: ../meld/vcview.py:504
+#: ../meld/vcview.py:530
 #, python-format
 msgid ""
 "\n"
@@ -1308,7 +1322,7 @@ msgstr ""
 "IgnorÃ©:Non-versionnÃ©:::Erreur::Nouvellement ajoutÃ©:ModifiÃ©:<b>Conflit</b>:"
 "SupprimÃ©:Manquant"
 
-#: ../meld/vc/cvs.py:151
+#: ../meld/vc/cvs.py:156
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1319,6 +1333,10 @@ msgstr ""
 "Le motif Ã©tait Â«Â %sÂ Â»\n"
 "L'erreur Ã©tait Â«Â %sÂ Â»"
 
+#~ msgid "_Automatically supply missing newline at end of file"
+#~ msgstr ""
+#~ "Ajouter _automatiquement le retour Ã  la ligne manquant en fin de fichier"
+
 #~ msgid "<b>Edit Menu</b>"
 #~ msgstr "<b>Menu d'Ã©dition</b>"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]