Bizarre french translation

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* Bizarre french translation - fixes
@ 2008-08-11 14:39 Alexandre Bourget
  2008-08-11 14:39 ` [PATCH] Update french translation Alexandre Bourget
  0 siblings, 1 reply; 9+ messages in thread
From: Alexandre Bourget @ 2008-08-11 14:39 UTC (permalink / raw)
  To: git


Hey list,

when the french translation of git-gui appeared, I was enthusiast, but when I
saw how bad it was, I wasn't anymore.

Here are some fixes to the french translation that make it more precise, less
confusing, and that say the right things :)

thanks

Alexandre Bourget



----
Alexandre Bourget
Free software consultant
Savoir-faire Linux inc., MontrÃ©al
alexandre.bourget@savoirfairelinux.com
1 (514) 276-5468 ext. 124

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH] Update french translation
  2008-08-11 14:39 Bizarre french translation - fixes Alexandre Bourget
@ 2008-08-11 14:39 ` Alexandre Bourget
  2008-08-11 15:20   ` Shawn O. Pearce
  2008-08-11 19:19   ` Matthieu Moy
  0 siblings, 2 replies; 9+ messages in thread
From: Alexandre Bourget @ 2008-08-11 14:39 UTC (permalink / raw)
  To: git; +Cc: Alexandre Bourget

---
 git-gui/po/fr.po |  251 +++++++++++++++++++++++++++---------------------------
 1 files changed, 126 insertions(+), 125 deletions(-)

diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po
index 89b6d51..31e55fd 100644
--- a/git-gui/po/fr.po
+++ b/git-gui/po/fr.po
@@ -1,17 +1,18 @@
-# translation of fr.po to French
+# translation of fr.po to FranÃ§ais
 # Translation of git-gui to French.
 # Copyright (C) 2008 Shawn Pearce, et al.
 # This file is distributed under the same license as the git package.
 #
 # Christian Couder <chriscool@tuxfamily.org>, 2008.
+# Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-03-14 07:18+0100\n"
-"PO-Revision-Date: 2008-04-04 22:05+0200\n"
-"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
-"Language-Team: French\n"
+"PO-Revision-Date: 2008-08-06 14:25-0400\n"
+"Last-Translator: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>\n"
+"Language-Team: FranÃ§ais <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +27,15 @@ msgstr "git-gui: erreur fatale"
 #: git-gui.sh:593
 #, tcl-format
 msgid "Invalid font specified in %s:"
-msgstr "Invalide fonte spÃ©cifiÃ©e dans %s :"
+msgstr "Police invalide spÃ©cifiÃ©e dans %s :"
 
 #: git-gui.sh:620
 msgid "Main Font"
-msgstr "Fonte principale"
+msgstr "Police principale"
 
 #: git-gui.sh:621
 msgid "Diff/Console Font"
-msgstr "Fonte diff/console"
+msgstr "Police diff/console"
 
 #: git-gui.sh:635
 msgid "Cannot find git in PATH."
@@ -65,7 +66,7 @@ msgstr ""
 
 #: git-gui.sh:918
 msgid "Git directory not found:"
-msgstr "Impossible de trouver le rÃ©pertoire de Git :"
+msgstr "Impossible de trouver le rÃ©pertoire git :"
 
 #: git-gui.sh:925
 msgid "Cannot move to top of working directory:"
@@ -73,11 +74,11 @@ msgstr "Impossible d'aller Ã  la racine du rÃ©pertoire de travail :"
 
 #: git-gui.sh:932
 msgid "Cannot use funny .git directory:"
-msgstr "Impossible d'utiliser un drÃ´le de rÃ©pertoire git :"
+msgstr "Impossible d'utiliser le rÃ©pertoire .git:"
 
 #: git-gui.sh:937
 msgid "No working directory"
-msgstr "Pas de rÃ©pertoire de travail"
+msgstr "Aucun rÃ©pertoire de travail"
 
 #: git-gui.sh:1084 lib/checkout_op.tcl:283
 msgid "Refreshing file status..."
@@ -97,23 +98,23 @@ msgstr "Non modifiÃ©"
 
 #: git-gui.sh:1592
 msgid "Modified, not staged"
-msgstr "ModifiÃ©, non prÃ©-commitÃ©"
+msgstr "ModifiÃ©, pas indexÃ©"
 
 #: git-gui.sh:1593 git-gui.sh:1598
 msgid "Staged for commit"
-msgstr "PrÃ©-commitÃ©"
+msgstr "IndexÃ©"
 
 #: git-gui.sh:1594 git-gui.sh:1599
 msgid "Portions staged for commit"
-msgstr "En partie prÃ©-commitÃ©"
+msgstr "Portions indexÃ©es"
 
 #: git-gui.sh:1595 git-gui.sh:1600
 msgid "Staged for commit, missing"
-msgstr "PrÃ©-commitÃ©, manquant"
+msgstr "IndexÃ©s, manquant"
 
 #: git-gui.sh:1597
 msgid "Untracked, not staged"
-msgstr "Non suivi, non prÃ©-commitÃ©"
+msgstr "Non versionnÃ©, non indexÃ©"
 
 #: git-gui.sh:1602
 msgid "Missing"
@@ -121,11 +122,11 @@ msgstr "Manquant"
 
 #: git-gui.sh:1603
 msgid "Staged for removal"
-msgstr "PrÃ©-commitÃ© pour suppression"
+msgstr "IndexÃ© pour suppression"
 
 #: git-gui.sh:1604
 msgid "Staged for removal, still present"
-msgstr "PrÃ©-commitÃ© pour suppression, toujours prÃ©sent"
+msgstr "IndexÃ© pour suppression, toujours prÃ©sent"
 
 #: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
 msgid "Requires merge resolution"
@@ -133,7 +134,7 @@ msgstr "NÃ©cessite la rÃ©solution d'une fusion"
 
 #: git-gui.sh:1644
 msgid "Starting gitk... please wait..."
-msgstr "Lancement de gitk... merci de patienter..."
+msgstr "Lancement de gitk... un instant..."
 
 #: git-gui.sh:1653
 #, tcl-format
@@ -148,11 +149,11 @@ msgstr ""
 
 #: git-gui.sh:1860 lib/choose_repository.tcl:36
 msgid "Repository"
-msgstr "RÃ©fÃ©rentiel"
+msgstr "DÃ©pÃ´t"
 
 #: git-gui.sh:1861
 msgid "Edit"
-msgstr "Editer"
+msgstr "Edition"
 
 #: git-gui.sh:1863 lib/choose_rev.tcl:561
 msgid "Branch"
@@ -168,15 +169,15 @@ msgstr "Fusionner"
 
 #: git-gui.sh:1870 lib/choose_rev.tcl:557
 msgid "Remote"
-msgstr "RÃ©fÃ©rentiel distant"
+msgstr "DÃ©pÃ´t distant"
 
 #: git-gui.sh:1879
 msgid "Browse Current Branch's Files"
-msgstr "Visionner fichiers dans branche courante"
+msgstr "Naviguer dans la branche courante"
 
 #: git-gui.sh:1883
 msgid "Browse Branch Files..."
-msgstr "Visionner fichiers de branche"
+msgstr "Naviguer dans la branche..."
 
 #: git-gui.sh:1888
 msgid "Visualize Current Branch's History"
@@ -184,29 +185,29 @@ msgstr "Visualiser historique branche courante"
 
 #: git-gui.sh:1892
 msgid "Visualize All Branch History"
-msgstr "Visualiser historique toutes branches"
+msgstr "Voir l'historique de toutes les branches"
 
 #: git-gui.sh:1899
 #, tcl-format
 msgid "Browse %s's Files"
-msgstr "Visionner fichiers de %s"
+msgstr "Naviguer l'arborescence de %s"
 
 #: git-gui.sh:1901
 #, tcl-format
 msgid "Visualize %s's History"
-msgstr "Visualiser historique de %s"
+msgstr "Voir l'historique de la branche: %s"
 
 #: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
-msgstr "Statistiques base de donnÃ©e"
+msgstr "Statistiques du dÃ©pÃ´t"
 
 #: git-gui.sh:1909 lib/database.tcl:34
 msgid "Compress Database"
-msgstr "Comprimer base de donnÃ©e"
+msgstr "Comprimer le dÃ©pÃ´t"
 
 #: git-gui.sh:1912
 msgid "Verify Database"
-msgstr "VÃ©rifier base de donnÃ©e"
+msgstr "VÃ©rifier le dÃ©pÃ´t"
 
 #: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
@@ -253,7 +254,7 @@ msgstr "CrÃ©er..."
 
 #: git-gui.sh:1974
 msgid "Checkout..."
-msgstr "Emprunter... "
+msgstr "Charger (checkout)..."
 
 #: git-gui.sh:1980
 msgid "Rename..."
@@ -277,27 +278,27 @@ msgstr "Corriger dernier commit"
 
 #: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
-msgstr "Resynchroniser"
+msgstr "Recharger modifs."
 
 #: git-gui.sh:2025
 msgid "Stage To Commit"
-msgstr "Commiter un prÃ©-commit"
+msgstr "Indexer"
 
 #: git-gui.sh:2031
 msgid "Stage Changed Files To Commit"
-msgstr "Commiter fichiers modifiÃ©s dans prÃ©-commit"
+msgstr "Indexer toutes modifications"
 
 #: git-gui.sh:2037
 msgid "Unstage From Commit"
-msgstr "Commit vers prÃ©-commit"
+msgstr "DÃ©sindexer"
 
 #: git-gui.sh:2042 lib/index.tcl:395
 msgid "Revert Changes"
-msgstr "Inverser modification"
+msgstr "Annuler les modifications (revert)"
 
 #: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
 msgid "Sign Off"
-msgstr "Se dÃ©sinscrire"
+msgstr "Signer"
 
 #: git-gui.sh:2053 git-gui.sh:2372
 msgid "Commit@@verb"
@@ -323,7 +324,7 @@ msgstr "Pomme"
 #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
-msgstr "A propos de %s"
+msgstr "Ã€ propos de %s"
 
 #: git-gui.sh:2099
 msgid "Preferences..."
@@ -352,15 +353,15 @@ msgstr "Branche courante :"
 
 #: git-gui.sh:2292
 msgid "Staged Changes (Will Commit)"
-msgstr "Modifications prÃ©-commitÃ©es"
+msgstr "Modifs. indexÃ©es (pour commit)"
 
 #: git-gui.sh:2312
 msgid "Unstaged Changes"
-msgstr "Modifications non prÃ©-commitÃ©es"
+msgstr "Modifs. non indexÃ©es"
 
 #: git-gui.sh:2362
 msgid "Stage Changed"
-msgstr "PrÃ©-commit modifiÃ©"
+msgstr "Indexer modifs."
 
 #: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
 msgid "Push"
@@ -416,19 +417,19 @@ msgstr "Rafraichir"
 
 #: git-gui.sh:2631
 msgid "Decrease Font Size"
-msgstr "RÃ©duire fonte"
+msgstr "Diminuer la police"
 
 #: git-gui.sh:2635
 msgid "Increase Font Size"
-msgstr "Agrandir fonte"
+msgstr "Agrandir la police"
 
 #: git-gui.sh:2646
 msgid "Unstage Hunk From Commit"
-msgstr "Enlever section prÃ©-commitÃ©e"
+msgstr "DÃ©sindexer la section"
 
 #: git-gui.sh:2648
 msgid "Stage Hunk For Commit"
-msgstr "PrÃ©-commiter section"
+msgstr "Indexer la section"
 
 #: git-gui.sh:2667
 msgid "Initializing..."
@@ -545,11 +546,11 @@ msgstr "CopiÃ© ou dÃ©placÃ© ici par :"
 
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
-msgstr "Emprunter branche"
+msgstr "Charger la branche (checkout)"
 
 #: lib/branch_checkout.tcl:23
 msgid "Checkout"
-msgstr "Emprunter"
+msgstr "Charger (checkout)"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
@@ -568,11 +569,11 @@ msgstr "Options"
 
 #: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
 msgid "Fetch Tracking Branch"
-msgstr "Branche suivant rÃ©cupÃ©ration"
+msgstr "RÃ©cupÃ©rer la branche de suivi"
 
 #: lib/branch_checkout.tcl:44
 msgid "Detach From Local Branch"
-msgstr "DÃ©tacher de branche locale"
+msgstr "DÃ©tacher de la branche locale"
 
 #: lib/branch_create.tcl:22
 msgid "Create Branch"
@@ -600,7 +601,7 @@ msgstr "Trouver nom de branche de suivi"
 
 #: lib/branch_create.tcl:66
 msgid "Starting Revision"
-msgstr "DÃ©but de rÃ©vision"
+msgstr "RÃ©vision initiale"
 
 #: lib/branch_create.tcl:72
 msgid "Update Existing Branch:"
@@ -612,7 +613,7 @@ msgstr "Non"
 
 #: lib/branch_create.tcl:80
 msgid "Fast Forward Only"
-msgstr "Avance rapide seulement"
+msgstr "Mise-Ã -jour rectiligne seulement (fast-forward)"
 
 #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 msgid "Reset"
@@ -620,20 +621,20 @@ msgstr "RÃ©initialiser"
 
 #: lib/branch_create.tcl:97
 msgid "Checkout After Creation"
-msgstr "Emprunt aprÃ¨s crÃ©ation"
+msgstr "Charger (checkout) aprÃ¨s crÃ©ation"
 
 #: lib/branch_create.tcl:131
 msgid "Please select a tracking branch."
-msgstr "Merci de choisir une branche de suivi"
+msgstr "Choisissez une branche de suivi"
 
 #: lib/branch_create.tcl:140
 #, tcl-format
 msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr "La branche de suivi %s n'est pas une branche dans le rÃ©fÃ©rentiel distant."
+msgstr "La branche de suivi %s n'est pas une branche dans le dÃ©pÃ´t distant."
 
 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 msgid "Please supply a branch name."
-msgstr "Merci de fournir un nom de branche."
+msgstr "Fournissez un nom de branche."
 
 #: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
 #, tcl-format
@@ -712,7 +713,7 @@ msgstr "La branche '%s' existe dÃ©jÃ ."
 #: lib/branch_rename.tcl:117
 #, tcl-format
 msgid "Failed to rename '%s'."
-msgstr "Le renommage de '%s' a Ã©chouÃ©."
+msgstr "Ã‰chec pour renommer '%s'."
 
 #: lib/browser.tcl:17
 msgid "Starting..."
@@ -733,13 +734,13 @@ msgstr "[Jusqu'au parent]"
 
 #: lib/browser.tcl:267 lib/browser.tcl:273
 msgid "Browse Branch Files"
-msgstr "Visionner fichiers de branches"
+msgstr "Naviguer fichiers de branches"
 
 #: lib/browser.tcl:278 lib/choose_repository.tcl:387
 #: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
 #: lib/choose_repository.tcl:987
 msgid "Browse"
-msgstr "Visionner"
+msgstr "Naviguer"
 
 #: lib/checkout_op.tcl:79
 #, tcl-format
@@ -770,7 +771,7 @@ msgid ""
 msgstr ""
 "La branche '%s' existe dÃ©jÃ .\n"
 "\n"
-"Impossible d'avancer rapidement Ã  %s.\n"
+"Impossible de mettre Ã  jour de maniÃ¨re rectiligne (fast forward) Ã  %s.\n"
 "Une fusion est nÃ©cessaire."
 
 #: lib/checkout_op.tcl:220
@@ -785,7 +786,7 @@ msgstr "La mise Ã  jour de '%s' a Ã©chouÃ©e."
 
 #: lib/checkout_op.tcl:251
 msgid "Staging area (index) is already locked."
-msgstr "L'espace de prÃ©-commit ('index' ou 'staging') est dÃ©jÃ  vÃ©rouillÃ©."
+msgstr "L'index (staging area) est dÃ©jÃ  vÃ©rouillÃ©"
 
 #: lib/checkout_op.tcl:266
 msgid ""
@@ -796,9 +797,9 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du rÃ©fÃ©rentiel.\n"
+"L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du dÃ©pÃ´t\n"
 "\n"
-"Un autre programme Git a modifiÃ© ce rÃ©fÃ©rentiel depuis la derniÃ¨re synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir modifier la branche courante.\n"
+"Un autre programme Git a modifiÃ© ce dÃ©pÃ´tdepuis la derniÃ¨re synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir modifier la branche courante.\n"
 "\n"
 "Cela va Ãªtre fait tout de suite automatiquement.\n"
 
@@ -809,12 +810,12 @@ msgstr "Mise Ã  jour du rÃ©pertoire courant avec '%s'..."
 
 #: lib/checkout_op.tcl:323
 msgid "files checked out"
-msgstr "fichiers empruntÃ©s"
+msgstr "fichiers chargÃ©s"
 
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
-msgstr "Emprunt de '%s' abandonnÃ©. (Il est nÃ©cessaire de fusionner des fichiers.)"
+msgstr "Chargement de '%s' abandonnÃ©. (Il est nÃ©cessaire de fusionner des fichiers.)"
 
 #: lib/checkout_op.tcl:354
 msgid "File level merge required."
@@ -840,7 +841,7 @@ msgstr ""
 #: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
 #, tcl-format
 msgid "Checked out '%s'."
-msgstr "'%s' empruntÃ©."
+msgstr "'%s' chargÃ©."
 
 #: lib/checkout_op.tcl:478
 #, tcl-format
@@ -884,15 +885,15 @@ msgstr "SÃ©lectionner"
 
 #: lib/choose_font.tcl:53
 msgid "Font Family"
-msgstr "Famille de fonte"
+msgstr "Familles de polices"
 
 #: lib/choose_font.tcl:74
 msgid "Font Size"
-msgstr "Taille de fonte"
+msgstr "Taille de police"
 
 #: lib/choose_font.tcl:91
 msgid "Font Example"
-msgstr "Exemple de fonte"
+msgstr "Exemple de police"
 
 #: lib/choose_font.tcl:103
 msgid ""
@@ -900,7 +901,7 @@ msgid ""
 "If you like this text, it can be your font."
 msgstr ""
 "C'est un texte d'exemple.\n"
-"Si vous aimez ce texte, vous pouvez choisir cette fonte."
+"Si vous aimez ce texte, vous pouvez choisir cette police"
 
 #: lib/choose_repository.tcl:28
 msgid "Git Gui"
@@ -908,7 +909,7 @@ msgstr "Git Gui"
 
 #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
 msgid "Create New Repository"
-msgstr "CrÃ©er nouveau rÃ©fÃ©rentiel"
+msgstr "CrÃ©er nouveau dÃ©pÃ´t"
 
 #: lib/choose_repository.tcl:87
 msgid "New..."
@@ -916,7 +917,7 @@ msgstr "Nouveau..."
 
 #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
 msgid "Clone Existing Repository"
-msgstr "Cloner rÃ©fÃ©rentiel existant"
+msgstr "Cloner dÃ©pÃ´t existant"
 
 #: lib/choose_repository.tcl:100
 msgid "Clone..."
@@ -924,7 +925,7 @@ msgstr "Cloner..."
 
 #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
 msgid "Open Existing Repository"
-msgstr "Ouvrir rÃ©fÃ©rentiel existant"
+msgstr "Ouvrir dÃ©pÃ´t existant"
 
 #: lib/choose_repository.tcl:113
 msgid "Open..."
@@ -932,17 +933,17 @@ msgstr "Ouvrir..."
 
 #: lib/choose_repository.tcl:126
 msgid "Recent Repositories"
-msgstr "RÃ©fÃ©rentiels rÃ©cents"
+msgstr "DÃ©pÃ´t rÃ©cemment utilisÃ©s"
 
 #: lib/choose_repository.tcl:132
 msgid "Open Recent Repository:"
-msgstr "Ouvrir rÃ©fÃ©rentiel rÃ©cent :"
+msgstr "Ouvrir dÃ©pÃ´t rÃ©cent :"
 
 #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
 #: lib/choose_repository.tcl:310
 #, tcl-format
 msgid "Failed to create repository %s:"
-msgstr "La crÃ©ation du rÃ©fÃ©rentiel %s a Ã©chouÃ©e :"
+msgstr "La crÃ©ation du dÃ©pÃ´t %s a Ã©chouÃ©e :"
 
 #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
 msgid "Directory:"
@@ -951,7 +952,7 @@ msgstr "RÃ©pertoire :"
 #: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
 #: lib/choose_repository.tcl:1011
 msgid "Git Repository"
-msgstr "RÃ©fÃ©rentiel Git"
+msgstr "DÃ©pÃ´t Git"
 
 #: lib/choose_repository.tcl:437
 #, tcl-format
@@ -992,15 +993,15 @@ msgstr "PartagÃ© (le plus rapide, non recommandÃ©, pas de sauvegarde)"
 #: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
 #, tcl-format
 msgid "Not a Git repository: %s"
-msgstr "'%s' n'est pas un rÃ©fÃ©rentiel Git."
+msgstr "'%s' n'est pas un dÃ©pÃ´t Git."
 
 #: lib/choose_repository.tcl:579
 msgid "Standard only available for local repository."
-msgstr "Standard n'est disponible que pour un rÃ©fÃ©rentiel local."
+msgstr "Standard n'est disponible que pour un dÃ©pÃ´t local."
 
 #: lib/choose_repository.tcl:583
 msgid "Shared only available for local repository."
-msgstr "PartagÃ© n'est disponible que pour un rÃ©fÃ©rentiel local."
+msgstr "PartagÃ© n'est disponible que pour un dÃ©pÃ´t local."
 
 #: lib/choose_repository.tcl:604
 #, tcl-format
@@ -1013,7 +1014,7 @@ msgstr "La configuration de l'origine a Ã©chouÃ©e."
 
 #: lib/choose_repository.tcl:627
 msgid "Counting objects"
-msgstr "Comptage des objets"
+msgstr "DÃ©compte des objets"
 
 #: lib/choose_repository.tcl:628
 msgid "buckets"
@@ -1032,11 +1033,11 @@ msgstr "Il n'y a rien Ã  cloner depuis %s."
 #: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
 #: lib/choose_repository.tcl:916
 msgid "The 'master' branch has not been initialized."
-msgstr "Cette branche 'master' n'a pas Ã©tÃ© initialisÃ©e."
+msgstr "La branche 'master' n'a pas Ã©tÃ© initialisÃ©e."
 
 #: lib/choose_repository.tcl:703
 msgid "Hardlinks are unavailable.  Falling back to copying."
-msgstr "Les liens durs ne sont pas disponibles. On se rÃ©soud Ã  copier."
+msgstr "Les liens durs ne sont pas supportÃ©s. Une copie sera effectuÃ©e Ã  la place."
 
 #: lib/choose_repository.tcl:715
 #, tcl-format
@@ -1078,7 +1079,7 @@ msgstr ""
 #: lib/choose_repository.tcl:856
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
-"Impossible de rÃ©cupÃ©rer les marques. Voir la sortie console pour plus de "
+"Impossible de rÃ©cupÃ©rer les marques (tags). Voir la sortie console pour plus de "
 "dÃ©tails."
 
 #: lib/choose_repository.tcl:880
@@ -1114,7 +1115,7 @@ msgstr "fichiers"
 
 #: lib/choose_repository.tcl:955
 msgid "Initial file checkout failed."
-msgstr "L'emprunt initial de fichier a Ã©chouÃ©."
+msgstr "Checkement initial du fichier Ã©chouÃ©."
 
 #: lib/choose_repository.tcl:971
 msgid "Open"
@@ -1122,12 +1123,12 @@ msgstr "Ouvrir"
 
 #: lib/choose_repository.tcl:981
 msgid "Repository:"
-msgstr "RÃ©fÃ©rentiel :"
+msgstr "DÃ©pÃ´t :"
 
 #: lib/choose_repository.tcl:1031
 #, tcl-format
 msgid "Failed to open repository %s:"
-msgstr "Impossible d'ouvrir le rÃ©fÃ©rentiel %s :"
+msgstr "Impossible d'ouvrir le dÃ©pÃ´t %s :"
 
 #: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
@@ -1143,11 +1144,11 @@ msgstr "Branche locale"
 
 #: lib/choose_rev.tcl:79
 msgid "Tracking Branch"
-msgstr "Suivi de branche"
+msgstr "Branche de suivi"
 
 #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
 msgid "Tag"
-msgstr "Marque"
+msgstr "Marque (tag)"
 
 #: lib/choose_rev.tcl:317
 #, tcl-format
@@ -1164,7 +1165,7 @@ msgstr "L'expression de rÃ©vision est vide."
 
 #: lib/choose_rev.tcl:531
 msgid "Updated"
-msgstr "Misa Ã  jour"
+msgstr "Ã€ jour (updated)"
 
 #: lib/choose_rev.tcl:559
 msgid "URL"
@@ -1218,9 +1219,9 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 "L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du "
-"rÃ©fÃ©rentiel.\n"
+"dÃ©pÃ´t.\n"
 "\n"
-"Un autre programme Git a modifiÃ© ce rÃ©fÃ©rentiel depuis la derniÃ¨re "
+"Un autre programme Git a modifiÃ© ce dÃ©pÃ´t depuis la derniÃ¨re "
 "synchronisation. Une resynshronisation doit Ãªtre effectuÃ©e avant de pouvoir "
 "crÃ©er un nouveau commit.\n"
 "\n"
@@ -1258,7 +1259,7 @@ msgid ""
 msgstr ""
 "Pas de modification Ã  commiter.\n"
 "\n"
-"Vous devez prÃ©-commiter au moins 1 fichier avant de pouvoir commiter.\n"
+"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n"
 
 #: lib/commit.tcl:183
 msgid ""
@@ -1285,19 +1286,19 @@ msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
 
 #: lib/commit.tcl:221
 msgid "Calling pre-commit hook..."
-msgstr "Appel du programme externe d'avant commit..."
+msgstr "Appel du programme externe d'avant commit (pre-commit)..."
 
 #: lib/commit.tcl:236
 msgid "Commit declined by pre-commit hook."
-msgstr "Commit refusÃ© par le programme externe d'avant commit."
+msgstr "Commit refusÃ© par le programme externe d'avant commit (pre-commit)."
 
 #: lib/commit.tcl:259
 msgid "Calling commit-msg hook..."
-msgstr "Appel du programme externe de message de commit..."
+msgstr "Appel du programme externe de message de commit (commit-msg)..."
 
 #: lib/commit.tcl:274
 msgid "Commit declined by commit-msg hook."
-msgstr "Commit refusÃ© par le programme externe de message de commit."
+msgstr "Commit refusÃ© par le programme externe de message de commit (commit-msg)."
 
 #: lib/commit.tcl:287
 msgid "Committing changes..."
@@ -1406,7 +1407,7 @@ msgid ""
 "\n"
 "Compress the database now?"
 msgstr ""
-"Ce rÃ©fÃ©rentiel comprend actuellement environ %i objets ayant leur fichier "
+"Ce dÃ©pÃ´t comprend actuellement environ %i objets ayant leur fichier "
 "particulier.\n"
 "\n"
 "Pour conserver une performance optimale, il est fortement recommandÃ© de "
@@ -1459,7 +1460,7 @@ msgstr "Erreur lors du chargement du fichier :"
 
 #: lib/diff.tcl:122
 msgid "Git Repository (subproject)"
-msgstr "RÃ©fÃ©rentiel Git (sous projet)"
+msgstr "DÃ©pÃ´t Git (sous projet)"
 
 #: lib/diff.tcl:134
 msgid "* Binary file (not showing content)."
@@ -1471,11 +1472,11 @@ msgstr "Erreur lors du chargement des diffÃ©rences :"
 
 #: lib/diff.tcl:303
 msgid "Failed to unstage selected hunk."
-msgstr "La suppression dans le prÃ©-commit de la section sÃ©lectionnÃ©e a Ã©chouÃ©e."
+msgstr "Ã‰chec lors de la dÃ©sindexation de la section."
 
 #: lib/diff.tcl:310
 msgid "Failed to stage selected hunk."
-msgstr "Le prÃ©-commit de la section sÃ©lectionnÃ©e a Ã©chouÃ©."
+msgstr "Ã‰chec lors de l'indexation de la section."
 
 #: lib/error.tcl:20 lib/error.tcl:114
 msgid "error"
@@ -1491,17 +1492,17 @@ msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
 
 #: lib/index.tcl:6
 msgid "Unable to unlock the index."
-msgstr "Impossible de dÃ©vÃ©rouiller le prÃ©-commit."
+msgstr "Impossible de dÃ©vÃ©rouiller l'index."
 
 #: lib/index.tcl:15
 msgid "Index Error"
-msgstr "Erreur de prÃ©-commit"
+msgstr "Erreur de l'index"
 
 #: lib/index.tcl:21
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
-msgstr "Le prÃ©-commit a Ã©chouÃ©. Une resynchronisation va Ãªtre lancÃ©e automatiquement."
+msgstr "Ã‰chec de la mise Ã  jour de l'index. Une resynchronisation va Ãªtre lancÃ©e automatiquement."
 
 #: lib/index.tcl:27
 msgid "Continue"
@@ -1509,12 +1510,12 @@ msgstr "Continuer"
 
 #: lib/index.tcl:31
 msgid "Unlock Index"
-msgstr "DÃ©vÃ©rouiller le prÃ©-commit"
+msgstr "DÃ©verouiller l'index"
 
 #: lib/index.tcl:282
 #, tcl-format
 msgid "Unstaging %s from commit"
-msgstr "Supprimer %s du commit"
+msgstr "DÃ©sindexation de: %s"
 
 #: lib/index.tcl:313
 msgid "Ready to commit."
@@ -1523,23 +1524,23 @@ msgstr "PrÃªt Ã  Ãªtre commitÃ©."
 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"
-msgstr "Ajouter %s"
+msgstr "Ajout de %s"
 
 #: lib/index.tcl:381
 #, tcl-format
 msgid "Revert changes in file %s?"
-msgstr "Inverser les modifications dans le fichier %s ? "
+msgstr "Annuler les modifications dans le fichier %s ? "
 
 #: lib/index.tcl:383
 #, tcl-format
 msgid "Revert changes in these %i files?"
-msgstr "Inverser les modifications dans ces %i fichiers ?"
+msgstr "Annuler les modifications dans ces %i fichiers ?"
 
 #: lib/index.tcl:391
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
-"Toutes les modifications non prÃ©-commitÃ©es seront dÃ©finitivement perdues "
-"lors de l'inversion."
+"Toutes les modifications non-indexÃ©es seront dÃ©finitivement perdues "
+"par l'annulation."
 
 #: lib/index.tcl:394
 msgid "Do Nothing"
@@ -1551,7 +1552,7 @@ msgid ""
 "\n"
 "You must finish amending this commit before starting any type of merge.\n"
 msgstr ""
-"Impossible de fucionner pendant une correction.\n"
+"Impossible de fusionner pendant une correction.\n"
 "\n"
 "Vous devez finir de corriger ce commit avant de lancer une quelconque "
 "fusion.\n"
@@ -1566,9 +1567,9 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 "L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du "
-"rÃ©fÃ©rentiel.\n"
+"dÃ©pÃ´t.\n"
 "\n"
-"Un autre programme Git a modifiÃ© ce rÃ©fÃ©rentiel depuis la derniÃ¨re "
+"Un autre programme Git a modifiÃ© ce dÃ©pÃ´t depuis la derniÃ¨re "
 "synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir "
 "fusionner de nouveau.\n"
 "\n"
@@ -1588,8 +1589,8 @@ msgstr ""
 "\n"
 "Le fichier %s a des conflicts de fusion.\n"
 "\n"
-"Vous devez les rÃ©soudre, puis prÃ©-commiter le fichier, et enfin commiter "
-"pour terminer la fusion courante. SeulementÃ  ce moment lÃ , il sera possible "
+"Vous devez les rÃ©soudre, puis indexer le fichier, et enfin commiter "
+"pour terminer la fusion courante. Seulement Ã  ce moment lÃ  sera-t-il possible "
 "d'effectuer une nouvelle fusion.\n"
 
 #: lib/merge.tcl:54
@@ -1704,11 +1705,11 @@ msgstr "Sauvegarder"
 #: lib/option.tcl:109
 #, tcl-format
 msgid "%s Repository"
-msgstr "RÃ©fÃ©rentiel de %s"
+msgstr "DÃ©pÃ´t: %s"
 
 #: lib/option.tcl:110
 msgid "Global (All Repositories)"
-msgstr "Globales (tous les rÃ©fÃ©rentiels)"
+msgstr "Globales (tous les dÃ©pÃ´ts)"
 
 #: lib/option.tcl:116
 msgid "User Name"
@@ -1736,7 +1737,7 @@ msgstr "Faire confiance aux dates de modification de fichiers "
 
 #: lib/option.tcl:124
 msgid "Prune Tracking Branches During Fetch"
-msgstr "Nettoyer les branches de suivi pendant la rÃ©cupÃ©ration"
+msgstr "Purger les branches de suivi pendant la rÃ©cupÃ©ration"
 
 #: lib/option.tcl:125
 msgid "Match Tracking Branches"
@@ -1760,7 +1761,7 @@ msgstr "Dictionnaire d'orthographe :"
 
 #: lib/option.tcl:216
 msgid "Change Font"
-msgstr "Modifier les fontes"
+msgstr "Modifier les polices"
 
 #: lib/option.tcl:220
 #, tcl-format
@@ -1785,7 +1786,7 @@ msgstr "Supprimer branche distante"
 
 #: lib/remote_branch_delete.tcl:47
 msgid "From Repository"
-msgstr "RÃ©fÃ©rentiel"
+msgstr "DÃ©pÃ´t source"
 
 #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
@@ -1856,7 +1857,7 @@ msgstr "Supprimer les branches de %s"
 
 #: lib/remote_branch_delete.tcl:286
 msgid "No repository selected."
-msgstr "Aucun rÃ©fÃ©rentiel n'est sÃ©lectionnÃ©."
+msgstr "Aucun dÃ©pÃ´t n'est sÃ©lectionnÃ©."
 
 #: lib/remote_branch_delete.tcl:291
 #, tcl-format
@@ -1865,7 +1866,7 @@ msgstr "Synchronisation de %s..."
 
 #: lib/remote.tcl:165
 msgid "Prune from"
-msgstr "Nettoyer de"
+msgstr "Purger de"
 
 #: lib/remote.tcl:170
 msgid "Fetch from"
@@ -1914,7 +1915,7 @@ msgstr "Aucune suggestion"
 
 #: lib/spellcheck.tcl:381
 msgid "Unexpected EOF from spell checker"
-msgstr "Fin de fichier innatendue envoyÃ©e par le vÃ©rificateur d'orthographe"
+msgstr "EOF inattendue envoyÃ©e par le vÃ©rificateur d'orthographe"
 
 #: lib/spellcheck.tcl:385
 msgid "Spell Checker Failed"
@@ -1938,7 +1939,7 @@ msgstr "RÃ©cupÃ©ration des derniÃ¨res modifications de %s"
 #: lib/transport.tcl:18
 #, tcl-format
 msgid "remote prune %s"
-msgstr "nettoyer Ã  distance %s"
+msgstr "purger Ã  distance %s"
 
 #: lib/transport.tcl:19
 #, tcl-format
@@ -1970,7 +1971,7 @@ msgstr "Branches source"
 
 #: lib/transport.tcl:120
 msgid "Destination Repository"
-msgstr "RÃ©fÃ©rentiel de destination"
+msgstr "DÃ©pÃ´t de destination"
 
 #: lib/transport.tcl:158
 msgid "Transfer Options"
@@ -1988,5 +1989,5 @@ msgstr "Utiliser des petits paquets (pour les connexions lentes)"
 
 #: lib/transport.tcl:168
 msgid "Include tags"
-msgstr "Inclure les marques"
+msgstr "Inclure les marques (tags)"
 
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] Update french translation
  2008-08-11 14:39 ` [PATCH] Update french translation Alexandre Bourget
@ 2008-08-11 15:20   ` Shawn O. Pearce
  2008-08-11 19:19   ` Matthieu Moy
  1 sibling, 0 replies; 9+ messages in thread
From: Shawn O. Pearce @ 2008-08-11 15:20 UTC (permalink / raw)
  To: Alexandre Bourget; +Cc: git

Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> wrote:
> ---
>  git-gui/po/fr.po |  251 +++++++++++++++++++++++++++---------------------------
>  1 files changed, 126 insertions(+), 125 deletions(-)

Thanks.  I guess this means we'll have a 0.11.1 as part of 1.6.0.  ;-)

I'll apply and push later tonight, unless someone who can actually
read French suggests a better patch.
 
-- 
Shawn.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] Update french translation
  2008-08-11 14:39 ` [PATCH] Update french translation Alexandre Bourget
  2008-08-11 15:20   ` Shawn O. Pearce
@ 2008-08-11 19:19   ` Matthieu Moy
  2008-08-11 21:17     ` Alexandre Bourget
  2008-08-11 21:19     ` [PATCH] git-gui: " Alexandre Bourget
  1 sibling, 2 replies; 9+ messages in thread
From: Matthieu Moy @ 2008-08-11 19:19 UTC (permalink / raw)
  To: Alexandre Bourget; +Cc: git

General remark: you should split your patch into

* Some word substitution on the one side (s/référentiel/dépos/g,
  s/fonte/police/g, ...)

* Some manual rephrasing.

(so that the first patch doesn't need much review, while the second
should be read more carefully)

Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> writes:

> -msgstr "Invalide fonte spécifiée dans %s :"
> +msgstr "Police invalide spécifiée dans %s :"

This is indeed technically incorrect. fonte is not just an anglicism,
it is also an actual french word:

  http://police.planete-typographie.com/definitions.html

(for non-french speaking, it says that "Times" is a "police" and
"times normal, times italic, times bold, ..." are the different
"fonte" declinaisons of it)

That said, "police" is the most commonly used french word, so it can
be worth

>  msgid "Browse Branch Files"
> -msgstr "Visionner fichiers de branches"
> +msgstr "Naviguer fichiers de branches"

           Naviguer dans les fichiers de la branche

?

> -"Impossible d'avancer rapidement à %s.\n"
> +"Impossible de mettre à jour de manière rectiligne (fast forward) à %s.\n"
>  "Une fusion est nécessaire."
I think you can re-use the tape-recorder analogy here:

    Impossible de faire une avance-rapide vers %s.\n

> +"Un autre programme Git a modifié ce dépôtdepuis la dernière synchronisation. Une resynchronisation doit être effectuée avant de pouvoir modifier la branche courante.\n"

missing space between dépôt and depuis.

> -msgstr "Emprunt de '%s' abandonné. (Il est nécessaire de fusionner des fichiers.)"
> +msgstr "Chargement de '%s' abandonné. (Il est nécessaire de fusionner des fichiers.)"

Misplaced periods:

  +msgstr "Chargement de '%s' abandonné (Il est nécessaire de fusionner des fichiers)."

>  msgid "Hardlinks are unavailable.  Falling back to copying."
> -msgstr "Les liens durs ne sont pas disponibles. On se résoud à copier."
> +msgstr "Les liens durs ne sont pas supportés. Une copie sera effectuée à la place."

This is an anglicism (also very commonly used in practice).
"Supporter" is a false friend. "Supporter quelque chose" means "to
endure something" in correct french.

> -"Impossible de récupérer les marques. Voir la sortie console pour plus de "
> +"Impossible de récupérer les marques (tags). Voir la sortie console pour plus de "
>  "détails."

Right, I wouldn't have guessed that "marque" would refer to tags ;-)
but I can't give a really better translation.

> -msgstr "L'emprunt initial de fichier a échoué."
> +msgstr "Checkement initial du fichier échoué."

Chargement ?

>  #: lib/choose_rev.tcl:531
>  msgid "Updated"
> -msgstr "Misa à jour"
> +msgstr "À jour (updated)"

If you go for "indexé" elsewhere, you should s/updated/indexé/ here
also.

>  #: lib/commit.tcl:221
>  msgid "Calling pre-commit hook..."
> -msgstr "Appel du programme externe d'avant commit..."
> +msgstr "Appel du programme externe d'avant commit (pre-commit)..."

Quite un-natural to mee (but although I'm french, I'm more used to
technical english than technical french ;-) ) : "program externe" just
means "external program", but "hook" says something more. Perhaps
"action avant commit" would be more explicit.

>  
>  #: lib/diff.tcl:303
>  msgid "Failed to unstage selected hunk."
> -msgstr "La suppression dans le pré-commit de la section sélectionnée a échouée."
> +msgstr "Échec lors de la désindexation de la section."
                                          de la section sélectionnée."

?

-- 
Matthieu

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] Update french translation
  2008-08-11 19:19   ` Matthieu Moy
@ 2008-08-11 21:17     ` Alexandre Bourget
  2008-08-11 22:04       ` Matthieu Moy
  2008-08-11 21:19     ` [PATCH] git-gui: " Alexandre Bourget
  1 sibling, 1 reply; 9+ messages in thread
From: Alexandre Bourget @ 2008-08-11 21:17 UTC (permalink / raw)
  To: Matthieu Moy; +Cc: git

Hi Matthieu and list,

I've retouched the French translation update for git-gui.. I'll send it
right after this mail.

I've fixed some more "out-of-context" translations, and considered some
of the comments from Matthieu Moy.

A second patch will follow which will updated all lacking translations
as of today. This makes the French translation 100% covered and
reviewed.

Le lundi 11 août 2008 à 21:19 +0200, Matthieu Moy a écrit :
> General remark: you should split your patch into
> 
> * Some word substitution on the one side (s/référentiel/dépos/g,
>   s/fonte/police/g, ...)
> 
> * Some manual rephrasing.

This is funny requirement, especially when I see what you've let in as a
"french" translation :) I doubt 

> >  msgid "Hardlinks are unavailable.  Falling back to copying."
> > -msgstr "Les liens durs ne sont pas disponibles. On se résoud à copier."
> > +msgstr "Les liens durs ne sont pas supportés. Une copie sera effectuée à la place."
>
> This is an anglicism (also very commonly used in practice).
> "Supporter" is a false friend. "Supporter quelque chose" means "to
> endure something" in correct french.

In fact, there are many meanings to that word. "Centre de support"
doesn't mean a place to endure stuff :)

http://www.granddictionnaire.com reveals us that "supporter" is a
computer-related term that means just what we need here, and it's been
reviewed by the "Office de la langue française" in 2002.

> >  #: lib/choose_rev.tcl:531
> >  msgid "Updated"
> > -msgstr "Misa à jour"
> > +msgstr "À jour (updated)"
> 
> If you go for "indexé" elsewhere, you should s/updated/indexé/ here
> also.

Have you looked at the context ?

To tell you the truth, I hadn't either, but I just did and fixed it in
the second patch I send. It was used in a tooltip to show the last date
a branch was updated, so it's now "Mise-à-jour:".

There you go, I've fixed most of the things you've outlines.

Hope this helps

Alexandre Bourget

-- 
Alexandre Bourget
Consultant en Logiciel Libre
Savoir-faire Linux Inc.
alexandre.bourget@savoirfairelinux.com
514-276-5468 poste 124

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH] git-gui: Update french translation
  2008-08-11 19:19   ` Matthieu Moy
  2008-08-11 21:17     ` Alexandre Bourget
@ 2008-08-11 21:19     ` Alexandre Bourget
  2008-08-11 21:19       ` [PATCH] git-gui: update all remaining translations to French Alexandre Bourget
  1 sibling, 1 reply; 9+ messages in thread
From: Alexandre Bourget @ 2008-08-11 21:19 UTC (permalink / raw)
  To: git; +Cc: Alexandre Bourget

Signed-off-by: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
---
 git-gui/po/fr.po |  253 +++++++++++++++++++++++++++---------------------------
 1 files changed, 127 insertions(+), 126 deletions(-)

diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po
index 89b6d51..128cd69 100644
--- a/git-gui/po/fr.po
+++ b/git-gui/po/fr.po
@@ -1,17 +1,18 @@
-# translation of fr.po to French
+# translation of fr.po to FranÃ§ais
 # Translation of git-gui to French.
 # Copyright (C) 2008 Shawn Pearce, et al.
 # This file is distributed under the same license as the git package.
 #
 # Christian Couder <chriscool@tuxfamily.org>, 2008.
+# Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-03-14 07:18+0100\n"
-"PO-Revision-Date: 2008-04-04 22:05+0200\n"
-"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
-"Language-Team: French\n"
+"PO-Revision-Date: 2008-08-11 16:28-0400\n"
+"Last-Translator: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>\n"
+"Language-Team: FranÃ§ais <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +27,15 @@ msgstr "git-gui: erreur fatale"
 #: git-gui.sh:593
 #, tcl-format
 msgid "Invalid font specified in %s:"
-msgstr "Invalide fonte spÃ©cifiÃ©e dans %s :"
+msgstr "Police invalide spÃ©cifiÃ©e dans %s :"
 
 #: git-gui.sh:620
 msgid "Main Font"
-msgstr "Fonte principale"
+msgstr "Police principale"
 
 #: git-gui.sh:621
 msgid "Diff/Console Font"
-msgstr "Fonte diff/console"
+msgstr "Police diff/console"
 
 #: git-gui.sh:635
 msgid "Cannot find git in PATH."
@@ -65,7 +66,7 @@ msgstr ""
 
 #: git-gui.sh:918
 msgid "Git directory not found:"
-msgstr "Impossible de trouver le rÃ©pertoire de Git :"
+msgstr "Impossible de trouver le rÃ©pertoire git :"
 
 #: git-gui.sh:925
 msgid "Cannot move to top of working directory:"
@@ -73,11 +74,11 @@ msgstr "Impossible d'aller Ã  la racine du rÃ©pertoire de travail :"
 
 #: git-gui.sh:932
 msgid "Cannot use funny .git directory:"
-msgstr "Impossible d'utiliser un drÃ´le de rÃ©pertoire git :"
+msgstr "Impossible d'utiliser le rÃ©pertoire .git:"
 
 #: git-gui.sh:937
 msgid "No working directory"
-msgstr "Pas de rÃ©pertoire de travail"
+msgstr "Aucun rÃ©pertoire de travail"
 
 #: git-gui.sh:1084 lib/checkout_op.tcl:283
 msgid "Refreshing file status..."
@@ -97,23 +98,23 @@ msgstr "Non modifiÃ©"
 
 #: git-gui.sh:1592
 msgid "Modified, not staged"
-msgstr "ModifiÃ©, non prÃ©-commitÃ©"
+msgstr "ModifiÃ©, pas indexÃ©"
 
 #: git-gui.sh:1593 git-gui.sh:1598
 msgid "Staged for commit"
-msgstr "PrÃ©-commitÃ©"
+msgstr "IndexÃ©"
 
 #: git-gui.sh:1594 git-gui.sh:1599
 msgid "Portions staged for commit"
-msgstr "En partie prÃ©-commitÃ©"
+msgstr "Portions indexÃ©es"
 
 #: git-gui.sh:1595 git-gui.sh:1600
 msgid "Staged for commit, missing"
-msgstr "PrÃ©-commitÃ©, manquant"
+msgstr "IndexÃ©s, manquant"
 
 #: git-gui.sh:1597
 msgid "Untracked, not staged"
-msgstr "Non suivi, non prÃ©-commitÃ©"
+msgstr "Non versionnÃ©, non indexÃ©"
 
 #: git-gui.sh:1602
 msgid "Missing"
@@ -121,11 +122,11 @@ msgstr "Manquant"
 
 #: git-gui.sh:1603
 msgid "Staged for removal"
-msgstr "PrÃ©-commitÃ© pour suppression"
+msgstr "IndexÃ© pour suppression"
 
 #: git-gui.sh:1604
 msgid "Staged for removal, still present"
-msgstr "PrÃ©-commitÃ© pour suppression, toujours prÃ©sent"
+msgstr "IndexÃ© pour suppression, toujours prÃ©sent"
 
 #: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
 msgid "Requires merge resolution"
@@ -133,7 +134,7 @@ msgstr "NÃ©cessite la rÃ©solution d'une fusion"
 
 #: git-gui.sh:1644
 msgid "Starting gitk... please wait..."
-msgstr "Lancement de gitk... merci de patienter..."
+msgstr "Lancement de gitk... un instant..."
 
 #: git-gui.sh:1653
 #, tcl-format
@@ -148,11 +149,11 @@ msgstr ""
 
 #: git-gui.sh:1860 lib/choose_repository.tcl:36
 msgid "Repository"
-msgstr "RÃ©fÃ©rentiel"
+msgstr "DÃ©pÃ´t"
 
 #: git-gui.sh:1861
 msgid "Edit"
-msgstr "Editer"
+msgstr "Edition"
 
 #: git-gui.sh:1863 lib/choose_rev.tcl:561
 msgid "Branch"
@@ -168,15 +169,15 @@ msgstr "Fusionner"
 
 #: git-gui.sh:1870 lib/choose_rev.tcl:557
 msgid "Remote"
-msgstr "RÃ©fÃ©rentiel distant"
+msgstr "DÃ©pÃ´t distant"
 
 #: git-gui.sh:1879
 msgid "Browse Current Branch's Files"
-msgstr "Visionner fichiers dans branche courante"
+msgstr "Naviguer dans la branche courante"
 
 #: git-gui.sh:1883
 msgid "Browse Branch Files..."
-msgstr "Visionner fichiers de branche"
+msgstr "Naviguer dans la branche..."
 
 #: git-gui.sh:1888
 msgid "Visualize Current Branch's History"
@@ -184,29 +185,29 @@ msgstr "Visualiser historique branche courante"
 
 #: git-gui.sh:1892
 msgid "Visualize All Branch History"
-msgstr "Visualiser historique toutes branches"
+msgstr "Voir l'historique de toutes les branches"
 
 #: git-gui.sh:1899
 #, tcl-format
 msgid "Browse %s's Files"
-msgstr "Visionner fichiers de %s"
+msgstr "Naviguer l'arborescence de %s"
 
 #: git-gui.sh:1901
 #, tcl-format
 msgid "Visualize %s's History"
-msgstr "Visualiser historique de %s"
+msgstr "Voir l'historique de la branche: %s"
 
 #: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
-msgstr "Statistiques base de donnÃ©e"
+msgstr "Statistiques du dÃ©pÃ´t"
 
 #: git-gui.sh:1909 lib/database.tcl:34
 msgid "Compress Database"
-msgstr "Comprimer base de donnÃ©e"
+msgstr "Comprimer le dÃ©pÃ´t"
 
 #: git-gui.sh:1912
 msgid "Verify Database"
-msgstr "VÃ©rifier base de donnÃ©e"
+msgstr "VÃ©rifier le dÃ©pÃ´t"
 
 #: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
@@ -253,7 +254,7 @@ msgstr "CrÃ©er..."
 
 #: git-gui.sh:1974
 msgid "Checkout..."
-msgstr "Emprunter... "
+msgstr "Charger (checkout)..."
 
 #: git-gui.sh:1980
 msgid "Rename..."
@@ -277,27 +278,27 @@ msgstr "Corriger dernier commit"
 
 #: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
-msgstr "Resynchroniser"
+msgstr "Recharger modifs."
 
 #: git-gui.sh:2025
 msgid "Stage To Commit"
-msgstr "Commiter un prÃ©-commit"
+msgstr "Indexer"
 
 #: git-gui.sh:2031
 msgid "Stage Changed Files To Commit"
-msgstr "Commiter fichiers modifiÃ©s dans prÃ©-commit"
+msgstr "Indexer toutes modifications"
 
 #: git-gui.sh:2037
 msgid "Unstage From Commit"
-msgstr "Commit vers prÃ©-commit"
+msgstr "DÃ©sindexer"
 
 #: git-gui.sh:2042 lib/index.tcl:395
 msgid "Revert Changes"
-msgstr "Inverser modification"
+msgstr "Annuler les modifications (revert)"
 
 #: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
 msgid "Sign Off"
-msgstr "Se dÃ©sinscrire"
+msgstr "Signer"
 
 #: git-gui.sh:2053 git-gui.sh:2372
 msgid "Commit@@verb"
@@ -323,7 +324,7 @@ msgstr "Pomme"
 #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
-msgstr "A propos de %s"
+msgstr "Ã€ propos de %s"
 
 #: git-gui.sh:2099
 msgid "Preferences..."
@@ -352,15 +353,15 @@ msgstr "Branche courante :"
 
 #: git-gui.sh:2292
 msgid "Staged Changes (Will Commit)"
-msgstr "Modifications prÃ©-commitÃ©es"
+msgstr "Modifs. indexÃ©es (pour commit)"
 
 #: git-gui.sh:2312
 msgid "Unstaged Changes"
-msgstr "Modifications non prÃ©-commitÃ©es"
+msgstr "Modifs. non indexÃ©es"
 
 #: git-gui.sh:2362
 msgid "Stage Changed"
-msgstr "PrÃ©-commit modifiÃ©"
+msgstr "Indexer modifs."
 
 #: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
 msgid "Push"
@@ -416,19 +417,19 @@ msgstr "Rafraichir"
 
 #: git-gui.sh:2631
 msgid "Decrease Font Size"
-msgstr "RÃ©duire fonte"
+msgstr "Diminuer la police"
 
 #: git-gui.sh:2635
 msgid "Increase Font Size"
-msgstr "Agrandir fonte"
+msgstr "Agrandir la police"
 
 #: git-gui.sh:2646
 msgid "Unstage Hunk From Commit"
-msgstr "Enlever section prÃ©-commitÃ©e"
+msgstr "DÃ©sindexer la section"
 
 #: git-gui.sh:2648
 msgid "Stage Hunk For Commit"
-msgstr "PrÃ©-commiter section"
+msgstr "Indexer la section"
 
 #: git-gui.sh:2667
 msgid "Initializing..."
@@ -545,11 +546,11 @@ msgstr "CopiÃ© ou dÃ©placÃ© ici par :"
 
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
-msgstr "Emprunter branche"
+msgstr "Charger la branche (checkout)"
 
 #: lib/branch_checkout.tcl:23
 msgid "Checkout"
-msgstr "Emprunter"
+msgstr "Charger (checkout)"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
@@ -568,11 +569,11 @@ msgstr "Options"
 
 #: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
 msgid "Fetch Tracking Branch"
-msgstr "Branche suivant rÃ©cupÃ©ration"
+msgstr "RÃ©cupÃ©rer la branche de suivi"
 
 #: lib/branch_checkout.tcl:44
 msgid "Detach From Local Branch"
-msgstr "DÃ©tacher de branche locale"
+msgstr "DÃ©tacher de la branche locale"
 
 #: lib/branch_create.tcl:22
 msgid "Create Branch"
@@ -600,7 +601,7 @@ msgstr "Trouver nom de branche de suivi"
 
 #: lib/branch_create.tcl:66
 msgid "Starting Revision"
-msgstr "DÃ©but de rÃ©vision"
+msgstr "RÃ©vision initiale"
 
 #: lib/branch_create.tcl:72
 msgid "Update Existing Branch:"
@@ -612,7 +613,7 @@ msgstr "Non"
 
 #: lib/branch_create.tcl:80
 msgid "Fast Forward Only"
-msgstr "Avance rapide seulement"
+msgstr "Mise-Ã -jour rectiligne seulement (fast-forward)"
 
 #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 msgid "Reset"
@@ -620,20 +621,20 @@ msgstr "RÃ©initialiser"
 
 #: lib/branch_create.tcl:97
 msgid "Checkout After Creation"
-msgstr "Emprunt aprÃ¨s crÃ©ation"
+msgstr "Charger (checkout) aprÃ¨s crÃ©ation"
 
 #: lib/branch_create.tcl:131
 msgid "Please select a tracking branch."
-msgstr "Merci de choisir une branche de suivi"
+msgstr "Choisissez une branche de suivi"
 
 #: lib/branch_create.tcl:140
 #, tcl-format
 msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr "La branche de suivi %s n'est pas une branche dans le rÃ©fÃ©rentiel distant."
+msgstr "La branche de suivi %s n'est pas une branche dans le dÃ©pÃ´t distant."
 
 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 msgid "Please supply a branch name."
-msgstr "Merci de fournir un nom de branche."
+msgstr "Fournissez un nom de branche."
 
 #: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
 #, tcl-format
@@ -712,7 +713,7 @@ msgstr "La branche '%s' existe dÃ©jÃ ."
 #: lib/branch_rename.tcl:117
 #, tcl-format
 msgid "Failed to rename '%s'."
-msgstr "Le renommage de '%s' a Ã©chouÃ©."
+msgstr "Ã‰chec pour renommer '%s'."
 
 #: lib/browser.tcl:17
 msgid "Starting..."
@@ -733,13 +734,13 @@ msgstr "[Jusqu'au parent]"
 
 #: lib/browser.tcl:267 lib/browser.tcl:273
 msgid "Browse Branch Files"
-msgstr "Visionner fichiers de branches"
+msgstr "Naviguer dans les fichiers de le branche"
 
 #: lib/browser.tcl:278 lib/choose_repository.tcl:387
 #: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
 #: lib/choose_repository.tcl:987
 msgid "Browse"
-msgstr "Visionner"
+msgstr "Naviguer"
 
 #: lib/checkout_op.tcl:79
 #, tcl-format
@@ -770,7 +771,7 @@ msgid ""
 msgstr ""
 "La branche '%s' existe dÃ©jÃ .\n"
 "\n"
-"Impossible d'avancer rapidement Ã  %s.\n"
+"Impossible de faire une avance rapide (fast forward) vers %s.\n"
 "Une fusion est nÃ©cessaire."
 
 #: lib/checkout_op.tcl:220
@@ -785,7 +786,7 @@ msgstr "La mise Ã  jour de '%s' a Ã©chouÃ©e."
 
 #: lib/checkout_op.tcl:251
 msgid "Staging area (index) is already locked."
-msgstr "L'espace de prÃ©-commit ('index' ou 'staging') est dÃ©jÃ  vÃ©rouillÃ©."
+msgstr "L'index (staging area) est dÃ©jÃ  vÃ©rouillÃ©"
 
 #: lib/checkout_op.tcl:266
 msgid ""
@@ -796,9 +797,9 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du rÃ©fÃ©rentiel.\n"
+"L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du dÃ©pÃ´t\n"
 "\n"
-"Un autre programme Git a modifiÃ© ce rÃ©fÃ©rentiel depuis la derniÃ¨re synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir modifier la branche courante.\n"
+"Un autre programme Git a modifiÃ© ce dÃ©pÃ´t depuis la derniÃ¨re synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir modifier la branche courante.\n"
 "\n"
 "Cela va Ãªtre fait tout de suite automatiquement.\n"
 
@@ -809,12 +810,12 @@ msgstr "Mise Ã  jour du rÃ©pertoire courant avec '%s'..."
 
 #: lib/checkout_op.tcl:323
 msgid "files checked out"
-msgstr "fichiers empruntÃ©s"
+msgstr "fichiers chargÃ©s"
 
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
-msgstr "Emprunt de '%s' abandonnÃ©. (Il est nÃ©cessaire de fusionner des fichiers.)"
+msgstr "Chargement de '%s' abandonnÃ© (il est nÃ©cessaire de fusionner des fichiers)."
 
 #: lib/checkout_op.tcl:354
 msgid "File level merge required."
@@ -840,7 +841,7 @@ msgstr ""
 #: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
 #, tcl-format
 msgid "Checked out '%s'."
-msgstr "'%s' empruntÃ©."
+msgstr "'%s' chargÃ©."
 
 #: lib/checkout_op.tcl:478
 #, tcl-format
@@ -884,15 +885,15 @@ msgstr "SÃ©lectionner"
 
 #: lib/choose_font.tcl:53
 msgid "Font Family"
-msgstr "Famille de fonte"
+msgstr "Familles de polices"
 
 #: lib/choose_font.tcl:74
 msgid "Font Size"
-msgstr "Taille de fonte"
+msgstr "Taille de police"
 
 #: lib/choose_font.tcl:91
 msgid "Font Example"
-msgstr "Exemple de fonte"
+msgstr "Exemple de police"
 
 #: lib/choose_font.tcl:103
 msgid ""
@@ -900,7 +901,7 @@ msgid ""
 "If you like this text, it can be your font."
 msgstr ""
 "C'est un texte d'exemple.\n"
-"Si vous aimez ce texte, vous pouvez choisir cette fonte."
+"Si vous aimez ce texte, vous pouvez choisir cette police"
 
 #: lib/choose_repository.tcl:28
 msgid "Git Gui"
@@ -908,7 +909,7 @@ msgstr "Git Gui"
 
 #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
 msgid "Create New Repository"
-msgstr "CrÃ©er nouveau rÃ©fÃ©rentiel"
+msgstr "CrÃ©er nouveau dÃ©pÃ´t"
 
 #: lib/choose_repository.tcl:87
 msgid "New..."
@@ -916,7 +917,7 @@ msgstr "Nouveau..."
 
 #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
 msgid "Clone Existing Repository"
-msgstr "Cloner rÃ©fÃ©rentiel existant"
+msgstr "Cloner dÃ©pÃ´t existant"
 
 #: lib/choose_repository.tcl:100
 msgid "Clone..."
@@ -924,7 +925,7 @@ msgstr "Cloner..."
 
 #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
 msgid "Open Existing Repository"
-msgstr "Ouvrir rÃ©fÃ©rentiel existant"
+msgstr "Ouvrir dÃ©pÃ´t existant"
 
 #: lib/choose_repository.tcl:113
 msgid "Open..."
@@ -932,17 +933,17 @@ msgstr "Ouvrir..."
 
 #: lib/choose_repository.tcl:126
 msgid "Recent Repositories"
-msgstr "RÃ©fÃ©rentiels rÃ©cents"
+msgstr "DÃ©pÃ´t rÃ©cemment utilisÃ©s"
 
 #: lib/choose_repository.tcl:132
 msgid "Open Recent Repository:"
-msgstr "Ouvrir rÃ©fÃ©rentiel rÃ©cent :"
+msgstr "Ouvrir dÃ©pÃ´t rÃ©cent :"
 
 #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
 #: lib/choose_repository.tcl:310
 #, tcl-format
 msgid "Failed to create repository %s:"
-msgstr "La crÃ©ation du rÃ©fÃ©rentiel %s a Ã©chouÃ©e :"
+msgstr "La crÃ©ation du dÃ©pÃ´t %s a Ã©chouÃ©e :"
 
 #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
 msgid "Directory:"
@@ -951,7 +952,7 @@ msgstr "RÃ©pertoire :"
 #: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
 #: lib/choose_repository.tcl:1011
 msgid "Git Repository"
-msgstr "RÃ©fÃ©rentiel Git"
+msgstr "DÃ©pÃ´t Git"
 
 #: lib/choose_repository.tcl:437
 #, tcl-format
@@ -992,15 +993,15 @@ msgstr "PartagÃ© (le plus rapide, non recommandÃ©, pas de sauvegarde)"
 #: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
 #, tcl-format
 msgid "Not a Git repository: %s"
-msgstr "'%s' n'est pas un rÃ©fÃ©rentiel Git."
+msgstr "'%s' n'est pas un dÃ©pÃ´t Git."
 
 #: lib/choose_repository.tcl:579
 msgid "Standard only available for local repository."
-msgstr "Standard n'est disponible que pour un rÃ©fÃ©rentiel local."
+msgstr "Standard n'est disponible que pour un dÃ©pÃ´t local."
 
 #: lib/choose_repository.tcl:583
 msgid "Shared only available for local repository."
-msgstr "PartagÃ© n'est disponible que pour un rÃ©fÃ©rentiel local."
+msgstr "PartagÃ© n'est disponible que pour un dÃ©pÃ´t local."
 
 #: lib/choose_repository.tcl:604
 #, tcl-format
@@ -1013,7 +1014,7 @@ msgstr "La configuration de l'origine a Ã©chouÃ©e."
 
 #: lib/choose_repository.tcl:627
 msgid "Counting objects"
-msgstr "Comptage des objets"
+msgstr "DÃ©compte des objets"
 
 #: lib/choose_repository.tcl:628
 msgid "buckets"
@@ -1032,11 +1033,11 @@ msgstr "Il n'y a rien Ã  cloner depuis %s."
 #: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
 #: lib/choose_repository.tcl:916
 msgid "The 'master' branch has not been initialized."
-msgstr "Cette branche 'master' n'a pas Ã©tÃ© initialisÃ©e."
+msgstr "La branche 'master' n'a pas Ã©tÃ© initialisÃ©e."
 
 #: lib/choose_repository.tcl:703
 msgid "Hardlinks are unavailable.  Falling back to copying."
-msgstr "Les liens durs ne sont pas disponibles. On se rÃ©soud Ã  copier."
+msgstr "Les liens durs ne sont pas supportÃ©s. Une copie sera effectuÃ©e Ã  la place."
 
 #: lib/choose_repository.tcl:715
 #, tcl-format
@@ -1078,7 +1079,7 @@ msgstr ""
 #: lib/choose_repository.tcl:856
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
-"Impossible de rÃ©cupÃ©rer les marques. Voir la sortie console pour plus de "
+"Impossible de rÃ©cupÃ©rer les marques (tags). Voir la sortie console pour plus de "
 "dÃ©tails."
 
 #: lib/choose_repository.tcl:880
@@ -1114,7 +1115,7 @@ msgstr "fichiers"
 
 #: lib/choose_repository.tcl:955
 msgid "Initial file checkout failed."
-msgstr "L'emprunt initial de fichier a Ã©chouÃ©."
+msgstr "Chargement initial du fichier Ã©chouÃ©."
 
 #: lib/choose_repository.tcl:971
 msgid "Open"
@@ -1122,12 +1123,12 @@ msgstr "Ouvrir"
 
 #: lib/choose_repository.tcl:981
 msgid "Repository:"
-msgstr "RÃ©fÃ©rentiel :"
+msgstr "DÃ©pÃ´t :"
 
 #: lib/choose_repository.tcl:1031
 #, tcl-format
 msgid "Failed to open repository %s:"
-msgstr "Impossible d'ouvrir le rÃ©fÃ©rentiel %s :"
+msgstr "Impossible d'ouvrir le dÃ©pÃ´t %s :"
 
 #: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
@@ -1143,11 +1144,11 @@ msgstr "Branche locale"
 
 #: lib/choose_rev.tcl:79
 msgid "Tracking Branch"
-msgstr "Suivi de branche"
+msgstr "Branche de suivi"
 
 #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
 msgid "Tag"
-msgstr "Marque"
+msgstr "Marque (tag)"
 
 #: lib/choose_rev.tcl:317
 #, tcl-format
@@ -1164,7 +1165,7 @@ msgstr "L'expression de rÃ©vision est vide."
 
 #: lib/choose_rev.tcl:531
 msgid "Updated"
-msgstr "Misa Ã  jour"
+msgstr "Ã€ jour (updated)"
 
 #: lib/choose_rev.tcl:559
 msgid "URL"
@@ -1218,9 +1219,9 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 "L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du "
-"rÃ©fÃ©rentiel.\n"
+"dÃ©pÃ´t.\n"
 "\n"
-"Un autre programme Git a modifiÃ© ce rÃ©fÃ©rentiel depuis la derniÃ¨re "
+"Un autre programme Git a modifiÃ© ce dÃ©pÃ´t depuis la derniÃ¨re "
 "synchronisation. Une resynshronisation doit Ãªtre effectuÃ©e avant de pouvoir "
 "crÃ©er un nouveau commit.\n"
 "\n"
@@ -1258,7 +1259,7 @@ msgid ""
 msgstr ""
 "Pas de modification Ã  commiter.\n"
 "\n"
-"Vous devez prÃ©-commiter au moins 1 fichier avant de pouvoir commiter.\n"
+"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n"
 
 #: lib/commit.tcl:183
 msgid ""
@@ -1285,19 +1286,19 @@ msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
 
 #: lib/commit.tcl:221
 msgid "Calling pre-commit hook..."
-msgstr "Appel du programme externe d'avant commit..."
+msgstr "Lancement de l'action d'avant-commit..."
 
 #: lib/commit.tcl:236
 msgid "Commit declined by pre-commit hook."
-msgstr "Commit refusÃ© par le programme externe d'avant commit."
+msgstr "Commit refusÃ© par l'action d'avant-commit."
 
 #: lib/commit.tcl:259
 msgid "Calling commit-msg hook..."
-msgstr "Appel du programme externe de message de commit..."
+msgstr "Lancement de l'action \"message de commit\"..."
 
 #: lib/commit.tcl:274
 msgid "Commit declined by commit-msg hook."
-msgstr "Commit refusÃ© par le programme externe de message de commit."
+msgstr "Commit refusÃ© par l'action \"message de commit\"."
 
 #: lib/commit.tcl:287
 msgid "Committing changes..."
@@ -1406,7 +1407,7 @@ msgid ""
 "\n"
 "Compress the database now?"
 msgstr ""
-"Ce rÃ©fÃ©rentiel comprend actuellement environ %i objets ayant leur fichier "
+"Ce dÃ©pÃ´t comprend actuellement environ %i objets ayant leur fichier "
 "particulier.\n"
 "\n"
 "Pour conserver une performance optimale, il est fortement recommandÃ© de "
@@ -1459,7 +1460,7 @@ msgstr "Erreur lors du chargement du fichier :"
 
 #: lib/diff.tcl:122
 msgid "Git Repository (subproject)"
-msgstr "RÃ©fÃ©rentiel Git (sous projet)"
+msgstr "DÃ©pÃ´t Git (sous projet)"
 
 #: lib/diff.tcl:134
 msgid "* Binary file (not showing content)."
@@ -1471,11 +1472,11 @@ msgstr "Erreur lors du chargement des diffÃ©rences :"
 
 #: lib/diff.tcl:303
 msgid "Failed to unstage selected hunk."
-msgstr "La suppression dans le prÃ©-commit de la section sÃ©lectionnÃ©e a Ã©chouÃ©e."
+msgstr "Ã‰chec lors de la dÃ©sindexation de la section sÃ©lectionnÃ©e."
 
 #: lib/diff.tcl:310
 msgid "Failed to stage selected hunk."
-msgstr "Le prÃ©-commit de la section sÃ©lectionnÃ©e a Ã©chouÃ©."
+msgstr "Ã‰chec lors de l'indexation de la section."
 
 #: lib/error.tcl:20 lib/error.tcl:114
 msgid "error"
@@ -1491,17 +1492,17 @@ msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
 
 #: lib/index.tcl:6
 msgid "Unable to unlock the index."
-msgstr "Impossible de dÃ©vÃ©rouiller le prÃ©-commit."
+msgstr "Impossible de dÃ©vÃ©rouiller l'index."
 
 #: lib/index.tcl:15
 msgid "Index Error"
-msgstr "Erreur de prÃ©-commit"
+msgstr "Erreur de l'index"
 
 #: lib/index.tcl:21
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
-msgstr "Le prÃ©-commit a Ã©chouÃ©. Une resynchronisation va Ãªtre lancÃ©e automatiquement."
+msgstr "Ã‰chec de la mise Ã  jour de l'index. Une resynchronisation va Ãªtre lancÃ©e automatiquement."
 
 #: lib/index.tcl:27
 msgid "Continue"
@@ -1509,12 +1510,12 @@ msgstr "Continuer"
 
 #: lib/index.tcl:31
 msgid "Unlock Index"
-msgstr "DÃ©vÃ©rouiller le prÃ©-commit"
+msgstr "DÃ©verouiller l'index"
 
 #: lib/index.tcl:282
 #, tcl-format
 msgid "Unstaging %s from commit"
-msgstr "Supprimer %s du commit"
+msgstr "DÃ©sindexation de: %s"
 
 #: lib/index.tcl:313
 msgid "Ready to commit."
@@ -1523,23 +1524,23 @@ msgstr "PrÃªt Ã  Ãªtre commitÃ©."
 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"
-msgstr "Ajouter %s"
+msgstr "Ajout de %s"
 
 #: lib/index.tcl:381
 #, tcl-format
 msgid "Revert changes in file %s?"
-msgstr "Inverser les modifications dans le fichier %s ? "
+msgstr "Annuler les modifications dans le fichier %s ? "
 
 #: lib/index.tcl:383
 #, tcl-format
 msgid "Revert changes in these %i files?"
-msgstr "Inverser les modifications dans ces %i fichiers ?"
+msgstr "Annuler les modifications dans ces %i fichiers ?"
 
 #: lib/index.tcl:391
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
-"Toutes les modifications non prÃ©-commitÃ©es seront dÃ©finitivement perdues "
-"lors de l'inversion."
+"Toutes les modifications non-indexÃ©es seront dÃ©finitivement perdues "
+"par l'annulation."
 
 #: lib/index.tcl:394
 msgid "Do Nothing"
@@ -1551,7 +1552,7 @@ msgid ""
 "\n"
 "You must finish amending this commit before starting any type of merge.\n"
 msgstr ""
-"Impossible de fucionner pendant une correction.\n"
+"Impossible de fusionner pendant une correction.\n"
 "\n"
 "Vous devez finir de corriger ce commit avant de lancer une quelconque "
 "fusion.\n"
@@ -1566,9 +1567,9 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 "L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du "
-"rÃ©fÃ©rentiel.\n"
+"dÃ©pÃ´t.\n"
 "\n"
-"Un autre programme Git a modifiÃ© ce rÃ©fÃ©rentiel depuis la derniÃ¨re "
+"Un autre programme Git a modifiÃ© ce dÃ©pÃ´t depuis la derniÃ¨re "
 "synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir "
 "fusionner de nouveau.\n"
 "\n"
@@ -1588,8 +1589,8 @@ msgstr ""
 "\n"
 "Le fichier %s a des conflicts de fusion.\n"
 "\n"
-"Vous devez les rÃ©soudre, puis prÃ©-commiter le fichier, et enfin commiter "
-"pour terminer la fusion courante. SeulementÃ  ce moment lÃ , il sera possible "
+"Vous devez les rÃ©soudre, puis indexer le fichier, et enfin commiter "
+"pour terminer la fusion courante. Seulement Ã  ce moment lÃ  sera-t-il possible "
 "d'effectuer une nouvelle fusion.\n"
 
 #: lib/merge.tcl:54
@@ -1704,11 +1705,11 @@ msgstr "Sauvegarder"
 #: lib/option.tcl:109
 #, tcl-format
 msgid "%s Repository"
-msgstr "RÃ©fÃ©rentiel de %s"
+msgstr "DÃ©pÃ´t: %s"
 
 #: lib/option.tcl:110
 msgid "Global (All Repositories)"
-msgstr "Globales (tous les rÃ©fÃ©rentiels)"
+msgstr "Globales (tous les dÃ©pÃ´ts)"
 
 #: lib/option.tcl:116
 msgid "User Name"
@@ -1736,7 +1737,7 @@ msgstr "Faire confiance aux dates de modification de fichiers "
 
 #: lib/option.tcl:124
 msgid "Prune Tracking Branches During Fetch"
-msgstr "Nettoyer les branches de suivi pendant la rÃ©cupÃ©ration"
+msgstr "Purger les branches de suivi pendant la rÃ©cupÃ©ration"
 
 #: lib/option.tcl:125
 msgid "Match Tracking Branches"
@@ -1760,7 +1761,7 @@ msgstr "Dictionnaire d'orthographe :"
 
 #: lib/option.tcl:216
 msgid "Change Font"
-msgstr "Modifier les fontes"
+msgstr "Modifier les polices"
 
 #: lib/option.tcl:220
 #, tcl-format
@@ -1785,7 +1786,7 @@ msgstr "Supprimer branche distante"
 
 #: lib/remote_branch_delete.tcl:47
 msgid "From Repository"
-msgstr "RÃ©fÃ©rentiel"
+msgstr "DÃ©pÃ´t source"
 
 #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
@@ -1856,7 +1857,7 @@ msgstr "Supprimer les branches de %s"
 
 #: lib/remote_branch_delete.tcl:286
 msgid "No repository selected."
-msgstr "Aucun rÃ©fÃ©rentiel n'est sÃ©lectionnÃ©."
+msgstr "Aucun dÃ©pÃ´t n'est sÃ©lectionnÃ©."
 
 #: lib/remote_branch_delete.tcl:291
 #, tcl-format
@@ -1865,7 +1866,7 @@ msgstr "Synchronisation de %s..."
 
 #: lib/remote.tcl:165
 msgid "Prune from"
-msgstr "Nettoyer de"
+msgstr "Purger de"
 
 #: lib/remote.tcl:170
 msgid "Fetch from"
@@ -1914,7 +1915,7 @@ msgstr "Aucune suggestion"
 
 #: lib/spellcheck.tcl:381
 msgid "Unexpected EOF from spell checker"
-msgstr "Fin de fichier innatendue envoyÃ©e par le vÃ©rificateur d'orthographe"
+msgstr "EOF inattendue envoyÃ©e par le vÃ©rificateur d'orthographe"
 
 #: lib/spellcheck.tcl:385
 msgid "Spell Checker Failed"
@@ -1938,7 +1939,7 @@ msgstr "RÃ©cupÃ©ration des derniÃ¨res modifications de %s"
 #: lib/transport.tcl:18
 #, tcl-format
 msgid "remote prune %s"
-msgstr "nettoyer Ã  distance %s"
+msgstr "purger Ã  distance %s"
 
 #: lib/transport.tcl:19
 #, tcl-format
@@ -1970,11 +1971,11 @@ msgstr "Branches source"
 
 #: lib/transport.tcl:120
 msgid "Destination Repository"
-msgstr "RÃ©fÃ©rentiel de destination"
+msgstr "DÃ©pÃ´t de destination"
 
 #: lib/transport.tcl:158
 msgid "Transfer Options"
-msgstr "TransfÃ©rer options"
+msgstr "Options de transfert"
 
 #: lib/transport.tcl:160
 msgid "Force overwrite existing branch (may discard changes)"
@@ -1988,5 +1989,5 @@ msgstr "Utiliser des petits paquets (pour les connexions lentes)"
 
 #: lib/transport.tcl:168
 msgid "Include tags"
-msgstr "Inclure les marques"
+msgstr "Inclure les marques (tags)"
 
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH] git-gui: update all remaining translations to French.
  2008-08-11 21:19     ` [PATCH] git-gui: " Alexandre Bourget
@ 2008-08-11 21:19       ` Alexandre Bourget
  0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Bourget @ 2008-08-11 21:19 UTC (permalink / raw)
  To: git; +Cc: Alexandre Bourget

Simply..

Signed-off-by: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
---
 git-gui/po/fr.po |  553 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 299 insertions(+), 254 deletions(-)

diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po
index 128cd69..26b866f 100644
--- a/git-gui/po/fr.po
+++ b/git-gui/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 07:18+0100\n"
-"PO-Revision-Date: 2008-08-11 16:28-0400\n"
+"POT-Creation-Date: 2008-08-02 14:45-0700\n"
+"PO-Revision-Date: 2008-08-11 17:12-0400\n"
 "Last-Translator: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>\n"
 "Language-Team: FranÃ§ais <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,33 +19,33 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
-#: git-gui.sh:763
+#: git-gui.sh:41 git-gui.sh:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
+#: git-gui.sh:817
 msgid "git-gui: fatal error"
 msgstr "git-gui: erreur fatale"
 
-#: git-gui.sh:593
+#: git-gui.sh:644
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Police invalide spÃ©cifiÃ©e dans %s :"
 
-#: git-gui.sh:620
+#: git-gui.sh:674
 msgid "Main Font"
 msgstr "Police principale"
 
-#: git-gui.sh:621
+#: git-gui.sh:675
 msgid "Diff/Console Font"
 msgstr "Police diff/console"
 
-#: git-gui.sh:635
+#: git-gui.sh:689
 msgid "Cannot find git in PATH."
 msgstr "Impossible de trouver git dans PATH."
 
-#: git-gui.sh:662
+#: git-gui.sh:716
 msgid "Cannot parse Git version string:"
 msgstr "Impossible de parser la version de Git :"
 
-#: git-gui.sh:680
+#: git-gui.sh:734
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -64,378 +64,381 @@ msgstr ""
 "\n"
 "Peut'on considÃ©rer que '%s' est en version 1.5.0 ?\n"
 
-#: git-gui.sh:918
+#: git-gui.sh:972
 msgid "Git directory not found:"
 msgstr "Impossible de trouver le rÃ©pertoire git :"
 
-#: git-gui.sh:925
+#: git-gui.sh:979
 msgid "Cannot move to top of working directory:"
 msgstr "Impossible d'aller Ã  la racine du rÃ©pertoire de travail :"
 
-#: git-gui.sh:932
+#: git-gui.sh:986
 msgid "Cannot use funny .git directory:"
 msgstr "Impossible d'utiliser le rÃ©pertoire .git:"
 
-#: git-gui.sh:937
+#: git-gui.sh:991
 msgid "No working directory"
 msgstr "Aucun rÃ©pertoire de travail"
 
-#: git-gui.sh:1084 lib/checkout_op.tcl:283
+#: git-gui.sh:1138 lib/checkout_op.tcl:305
 msgid "Refreshing file status..."
 msgstr "Rafraichissement du status des fichiers..."
 
-#: git-gui.sh:1149
+#: git-gui.sh:1194
 msgid "Scanning for modified files ..."
 msgstr "Recherche de fichiers modifiÃ©s..."
 
-#: git-gui.sh:1324 lib/browser.tcl:246
+#: git-gui.sh:1369 lib/browser.tcl:246
 msgid "Ready."
 msgstr "PrÃªt."
 
-#: git-gui.sh:1590
+#: git-gui.sh:1635
 msgid "Unmodified"
 msgstr "Non modifiÃ©"
 
-#: git-gui.sh:1592
+#: git-gui.sh:1637
 msgid "Modified, not staged"
 msgstr "ModifiÃ©, pas indexÃ©"
 
-#: git-gui.sh:1593 git-gui.sh:1598
+#: git-gui.sh:1638 git-gui.sh:1643
 msgid "Staged for commit"
 msgstr "IndexÃ©"
 
-#: git-gui.sh:1594 git-gui.sh:1599
+#: git-gui.sh:1639 git-gui.sh:1644
 msgid "Portions staged for commit"
 msgstr "Portions indexÃ©es"
 
-#: git-gui.sh:1595 git-gui.sh:1600
+#: git-gui.sh:1640 git-gui.sh:1645
 msgid "Staged for commit, missing"
 msgstr "IndexÃ©s, manquant"
 
-#: git-gui.sh:1597
+#: git-gui.sh:1642
 msgid "Untracked, not staged"
 msgstr "Non versionnÃ©, non indexÃ©"
 
-#: git-gui.sh:1602
+#: git-gui.sh:1647
 msgid "Missing"
 msgstr "Manquant"
 
-#: git-gui.sh:1603
+#: git-gui.sh:1648
 msgid "Staged for removal"
 msgstr "IndexÃ© pour suppression"
 
-#: git-gui.sh:1604
+#: git-gui.sh:1649
 msgid "Staged for removal, still present"
 msgstr "IndexÃ© pour suppression, toujours prÃ©sent"
 
-#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
+#: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
 msgid "Requires merge resolution"
 msgstr "NÃ©cessite la rÃ©solution d'une fusion"
 
-#: git-gui.sh:1644
+#: git-gui.sh:1689
 msgid "Starting gitk... please wait..."
 msgstr "Lancement de gitk... un instant..."
 
-#: git-gui.sh:1653
-#, tcl-format
-msgid ""
-"Unable to start gitk:\n"
-"\n"
-"%s does not exist"
-msgstr ""
-"Impossible de lancer gitk :\n"
-"\n"
-"%s inexistant"
+#: git-gui.sh:1698
+msgid "Couldn't find gitk in PATH"
+msgstr "Impossible de trouver gitk dans PATH."
 
-#: git-gui.sh:1860 lib/choose_repository.tcl:36
+#: git-gui.sh:1948 lib/choose_repository.tcl:36
 msgid "Repository"
 msgstr "DÃ©pÃ´t"
 
-#: git-gui.sh:1861
+#: git-gui.sh:1949
 msgid "Edit"
 msgstr "Edition"
 
-#: git-gui.sh:1863 lib/choose_rev.tcl:561
+#: git-gui.sh:1951 lib/choose_rev.tcl:561
 msgid "Branch"
 msgstr "Branche"
 
-#: git-gui.sh:1866 lib/choose_rev.tcl:548
+#: git-gui.sh:1954 lib/choose_rev.tcl:548
 msgid "Commit@@noun"
 msgstr "Commit"
 
-#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
+#: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
 msgid "Merge"
 msgstr "Fusionner"
 
-#: git-gui.sh:1870 lib/choose_rev.tcl:557
+#: git-gui.sh:1958 lib/choose_rev.tcl:557
 msgid "Remote"
 msgstr "DÃ©pÃ´t distant"
 
-#: git-gui.sh:1879
+#: git-gui.sh:1967
 msgid "Browse Current Branch's Files"
 msgstr "Naviguer dans la branche courante"
 
-#: git-gui.sh:1883
+#: git-gui.sh:1971
 msgid "Browse Branch Files..."
 msgstr "Naviguer dans la branche..."
 
-#: git-gui.sh:1888
+#: git-gui.sh:1976
 msgid "Visualize Current Branch's History"
 msgstr "Visualiser historique branche courante"
 
-#: git-gui.sh:1892
+#: git-gui.sh:1980
 msgid "Visualize All Branch History"
 msgstr "Voir l'historique de toutes les branches"
 
-#: git-gui.sh:1899
+#: git-gui.sh:1987
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Naviguer l'arborescence de %s"
 
-#: git-gui.sh:1901
+#: git-gui.sh:1989
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Voir l'historique de la branche: %s"
 
-#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "Statistiques du dÃ©pÃ´t"
 
-#: git-gui.sh:1909 lib/database.tcl:34
+#: git-gui.sh:1997 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "Comprimer le dÃ©pÃ´t"
 
-#: git-gui.sh:1912
+#: git-gui.sh:2000
 msgid "Verify Database"
 msgstr "VÃ©rifier le dÃ©pÃ´t"
 
-#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
+#: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "CrÃ©er icÃ´ne sur bureau"
 
-#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
+#: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
 msgid "Quit"
 msgstr "Quitter"
 
-#: git-gui.sh:1939
+#: git-gui.sh:2031
 msgid "Undo"
 msgstr "DÃ©faire"
 
-#: git-gui.sh:1942
+#: git-gui.sh:2034
 msgid "Redo"
 msgstr "Refaire"
 
-#: git-gui.sh:1946 git-gui.sh:2443
+#: git-gui.sh:2038 git-gui.sh:2545
 msgid "Cut"
 msgstr "Couper"
 
-#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr "Copier"
 
-#: git-gui.sh:1952 git-gui.sh:2449
+#: git-gui.sh:2044 git-gui.sh:2551
 msgid "Paste"
 msgstr "Coller"
 
-#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
+#: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Supprimer"
 
-#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
+#: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
 msgid "Select All"
 msgstr "Tout sÃ©lectionner"
 
-#: git-gui.sh:1968
+#: git-gui.sh:2060
 msgid "Create..."
 msgstr "CrÃ©er..."
 
-#: git-gui.sh:1974
+#: git-gui.sh:2066
 msgid "Checkout..."
 msgstr "Charger (checkout)..."
 
-#: git-gui.sh:1980
+#: git-gui.sh:2072
 msgid "Rename..."
 msgstr "Renommer..."
 
-#: git-gui.sh:1985 git-gui.sh:2085
+#: git-gui.sh:2077 git-gui.sh:2187
 msgid "Delete..."
 msgstr "Supprimer..."
 
-#: git-gui.sh:1990
+#: git-gui.sh:2082
 msgid "Reset..."
 msgstr "RÃ©initialiser..."
 
-#: git-gui.sh:2002 git-gui.sh:2389
+#: git-gui.sh:2094 git-gui.sh:2491
 msgid "New Commit"
 msgstr "Nouveau commit"
 
-#: git-gui.sh:2010 git-gui.sh:2396
+#: git-gui.sh:2102 git-gui.sh:2498
 msgid "Amend Last Commit"
 msgstr "Corriger dernier commit"
 
-#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "Recharger modifs."
 
-#: git-gui.sh:2025
+#: git-gui.sh:2117
 msgid "Stage To Commit"
 msgstr "Indexer"
 
-#: git-gui.sh:2031
+#: git-gui.sh:2123
 msgid "Stage Changed Files To Commit"
 msgstr "Indexer toutes modifications"
 
-#: git-gui.sh:2037
+#: git-gui.sh:2129
 msgid "Unstage From Commit"
 msgstr "DÃ©sindexer"
 
-#: git-gui.sh:2042 lib/index.tcl:395
+#: git-gui.sh:2134 lib/index.tcl:395
 msgid "Revert Changes"
 msgstr "Annuler les modifications (revert)"
 
-#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
+#: git-gui.sh:2141 git-gui.sh:2702
+msgid "Show Less Context"
+msgstr "Montrer moins de contexte"
+
+#: git-gui.sh:2145 git-gui.sh:2706
+msgid "Show More Context"
+msgstr "Montrer plus de contexte"
+
+#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
 msgid "Sign Off"
 msgstr "Signer"
 
-#: git-gui.sh:2053 git-gui.sh:2372
+#: git-gui.sh:2155 git-gui.sh:2474
 msgid "Commit@@verb"
 msgstr "Commiter"
 
-#: git-gui.sh:2064
+#: git-gui.sh:2166
 msgid "Local Merge..."
 msgstr "Fusion locale..."
 
-#: git-gui.sh:2069
+#: git-gui.sh:2171
 msgid "Abort Merge..."
 msgstr "Abandonner fusion..."
 
-#: git-gui.sh:2081
+#: git-gui.sh:2183
 msgid "Push..."
 msgstr "Pousser..."
 
-#: git-gui.sh:2092 lib/choose_repository.tcl:41
-msgid "Apple"
-msgstr "Pomme"
-
-#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
 #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "Ã€ propos de %s"
 
-#: git-gui.sh:2099
+#: git-gui.sh:2201
 msgid "Preferences..."
 msgstr "PrÃ©fÃ©rences..."
 
-#: git-gui.sh:2107 git-gui.sh:2639
+#: git-gui.sh:2209 git-gui.sh:2740
 msgid "Options..."
 msgstr "Options..."
 
-#: git-gui.sh:2113 lib/choose_repository.tcl:47
+#: git-gui.sh:2215 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "Aide"
 
-#: git-gui.sh:2154
+#: git-gui.sh:2256
 msgid "Online Documentation"
 msgstr "Documentation en ligne"
 
-#: git-gui.sh:2238
+#: git-gui.sh:2340
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
-msgstr "erreur fatale : pas d'infos sur le chemin %s : Fichier ou rÃ©pertoire inexistant"
+msgstr ""
+"erreur fatale : pas d'infos sur le chemin %s : Fichier ou rÃ©pertoire "
+"inexistant"
 
-#: git-gui.sh:2271
+#: git-gui.sh:2373
 msgid "Current Branch:"
 msgstr "Branche courante :"
 
-#: git-gui.sh:2292
+#: git-gui.sh:2394
 msgid "Staged Changes (Will Commit)"
 msgstr "Modifs. indexÃ©es (pour commit)"
 
-#: git-gui.sh:2312
+#: git-gui.sh:2414
 msgid "Unstaged Changes"
 msgstr "Modifs. non indexÃ©es"
 
-#: git-gui.sh:2362
+#: git-gui.sh:2464
 msgid "Stage Changed"
 msgstr "Indexer modifs."
 
-#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
 msgid "Push"
 msgstr "Pousser"
 
-#: git-gui.sh:2408
+#: git-gui.sh:2510
 msgid "Initial Commit Message:"
 msgstr "Message de commit initial :"
 
-#: git-gui.sh:2409
+#: git-gui.sh:2511
 msgid "Amended Commit Message:"
 msgstr "Message de commit corrigÃ© :"
 
-#: git-gui.sh:2410
+#: git-gui.sh:2512
 msgid "Amended Initial Commit Message:"
 msgstr "Message de commit initial corrigÃ© :"
 
-#: git-gui.sh:2411
+#: git-gui.sh:2513
 msgid "Amended Merge Commit Message:"
 msgstr "Message de commit de fusion corrigÃ© :"
 
-#: git-gui.sh:2412
+#: git-gui.sh:2514
 msgid "Merge Commit Message:"
 msgstr "Message de commit de fusion :"
 
-#: git-gui.sh:2413
+#: git-gui.sh:2515
 msgid "Commit Message:"
 msgstr "Message de commit :"
 
-#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
+#: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
 msgid "Copy All"
 msgstr "Copier tout"
 
-#: git-gui.sh:2483 lib/blame.tcl:107
+#: git-gui.sh:2585 lib/blame.tcl:100
 msgid "File:"
 msgstr "Fichier :"
 
-#: git-gui.sh:2589
+#: git-gui.sh:2691
 msgid "Apply/Reverse Hunk"
 msgstr "Appliquer/Inverser section"
 
-#: git-gui.sh:2595
-msgid "Show Less Context"
-msgstr "Montrer moins de contexte"
-
-#: git-gui.sh:2602
-msgid "Show More Context"
-msgstr "Montrer plus de contexte"
+#: git-gui.sh:2696
+msgid "Apply/Reverse Line"
+msgstr "Appliquer/Inverser la ligne"
 
-#: git-gui.sh:2610
+#: git-gui.sh:2711
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#: git-gui.sh:2631
+#: git-gui.sh:2732
 msgid "Decrease Font Size"
 msgstr "Diminuer la police"
 
-#: git-gui.sh:2635
+#: git-gui.sh:2736
 msgid "Increase Font Size"
 msgstr "Agrandir la police"
 
-#: git-gui.sh:2646
+#: git-gui.sh:2747
 msgid "Unstage Hunk From Commit"
 msgstr "DÃ©sindexer la section"
 
-#: git-gui.sh:2648
+#: git-gui.sh:2748
+msgid "Unstage Line From Commit"
+msgstr "DÃ©sindexer la ligne"
+
+#: git-gui.sh:2750
 msgid "Stage Hunk For Commit"
 msgstr "Indexer la section"
 
-#: git-gui.sh:2667
+#: git-gui.sh:2751
+msgid "Stage Line For Commit"
+msgstr "Indexer la ligne"
+
+#: git-gui.sh:2771
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: git-gui.sh:2762
+#: git-gui.sh:2876
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -452,7 +455,7 @@ msgstr ""
 "sous-processus de Git lancÃ©s par %s\n"
 "\n"
 
-#: git-gui.sh:2792
+#: git-gui.sh:2906
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
@@ -462,7 +465,7 @@ msgstr ""
 "Ceci est du Ã  un problÃ¨me connu avec\n"
 "le binaire Tcl distribuÃ© par Cygwin."
 
-#: git-gui.sh:2797
+#: git-gui.sh:2911
 #, tcl-format
 msgid ""
 "\n"
@@ -483,64 +486,80 @@ msgstr ""
 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - une interface graphique utilisateur pour Git"
 
-#: lib/blame.tcl:77
+#: lib/blame.tcl:70
 msgid "File Viewer"
 msgstr "Visionneur de fichier"
 
-#: lib/blame.tcl:81
+#: lib/blame.tcl:74
 msgid "Commit:"
 msgstr "Commit :"
 
-#: lib/blame.tcl:264
+#: lib/blame.tcl:257
 msgid "Copy Commit"
 msgstr "Copier commit"
 
-#: lib/blame.tcl:384
+#: lib/blame.tcl:260
+msgid "Do Full Copy Detection"
+msgstr "Lancer la dÃ©tection approfondie des copies"
+
+#: lib/blame.tcl:388
 #, tcl-format
 msgid "Reading %s..."
 msgstr "Lecture de %s..."
 
-#: lib/blame.tcl:488
+#: lib/blame.tcl:492
 msgid "Loading copy/move tracking annotations..."
 msgstr "Chargement des annotations de suivi des copies/dÃ©placements..."
 
-#: lib/blame.tcl:508
+#: lib/blame.tcl:512
 msgid "lines annotated"
 msgstr "lignes annotÃ©es"
 
-#: lib/blame.tcl:689
+#: lib/blame.tcl:704
 msgid "Loading original location annotations..."
 msgstr "Chargement des annotations d'emplacement original"
 
-#: lib/blame.tcl:692
+#: lib/blame.tcl:707
 msgid "Annotation complete."
 msgstr "Annotation terminÃ©e."
 
-#: lib/blame.tcl:746
+#: lib/blame.tcl:737
+msgid "Busy"
+msgstr "OccupÃ©"
+
+#: lib/blame.tcl:738
+msgid "Annotation process is already running."
+msgstr "Annotation en cours d'exÃ©cution."
+
+#: lib/blame.tcl:777
+msgid "Running thorough copy detection..."
+msgstr "Recherche de copie approfondie en cours..."
+
+#: lib/blame.tcl:827
 msgid "Loading annotation..."
 msgstr "Chargement des annotations..."
 
-#: lib/blame.tcl:802
+#: lib/blame.tcl:883
 msgid "Author:"
 msgstr "Auteur :"
 
-#: lib/blame.tcl:806
+#: lib/blame.tcl:887
 msgid "Committer:"
 msgstr "Commiteur :"
 
-#: lib/blame.tcl:811
+#: lib/blame.tcl:892
 msgid "Original File:"
 msgstr "Fichier original :"
 
-#: lib/blame.tcl:925
+#: lib/blame.tcl:1006
 msgid "Originally By:"
 msgstr "A l'origine par :"
 
-#: lib/blame.tcl:931
+#: lib/blame.tcl:1012
 msgid "In File:"
 msgstr "Dans le fichier :"
 
-#: lib/blame.tcl:936
+#: lib/blame.tcl:1017
 msgid "Copied Or Moved Here By:"
 msgstr "CopiÃ© ou dÃ©placÃ© ici par :"
 
@@ -554,7 +573,7 @@ msgstr "Charger (checkout)"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:171
 #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr "Annuler"
@@ -563,7 +582,7 @@ msgstr "Annuler"
 msgid "Revision"
 msgstr "RÃ©vision"
 
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
 msgid "Options"
 msgstr "Options"
 
@@ -615,7 +634,7 @@ msgstr "Non"
 msgid "Fast Forward Only"
 msgstr "Mise-Ã -jour rectiligne seulement (fast-forward)"
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
 msgid "Reset"
 msgstr "RÃ©initialiser"
 
@@ -655,7 +674,7 @@ msgstr "Branches locales"
 
 #: lib/branch_delete.tcl:52
 msgid "Delete Only If Merged Into"
-msgstr "Supprimer ssi fusion dedans"
+msgstr "Supprimer seulement si fusionnÃ©e dans:"
 
 #: lib/branch_delete.tcl:54
 msgid "Always (Do not perform merge test.)"
@@ -705,7 +724,7 @@ msgstr "Nouveau nom :"
 msgid "Please select a branch to rename."
 msgstr "Merci de sÃ©lectionner une branche Ã  renommer."
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
 #, tcl-format
 msgid "Branch '%s' already exists."
 msgstr "La branche '%s' existe dÃ©jÃ ."
@@ -737,31 +756,36 @@ msgid "Browse Branch Files"
 msgstr "Naviguer dans les fichiers de le branche"
 
 #: lib/browser.tcl:278 lib/choose_repository.tcl:387
-#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
-#: lib/choose_repository.tcl:987
+#: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
+#: lib/choose_repository.tcl:985
 msgid "Browse"
 msgstr "Naviguer"
 
-#: lib/checkout_op.tcl:79
+#: lib/checkout_op.tcl:84
 #, tcl-format
 msgid "Fetching %s from %s"
 msgstr "RÃ©cupÃ©ration de %s Ã  partir de %s"
 
-#: lib/checkout_op.tcl:127
+#: lib/checkout_op.tcl:132
 #, tcl-format
 msgid "fatal: Cannot resolve %s"
 msgstr "erreur fatale : Impossible de rÃ©soudre %s"
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
 msgid "Close"
 msgstr "Fermer"
 
-#: lib/checkout_op.tcl:169
+#: lib/checkout_op.tcl:174
 #, tcl-format
 msgid "Branch '%s' does not exist."
 msgstr "La branche '%s' n'existe pas."
 
-#: lib/checkout_op.tcl:206
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr "Ã‰chec de la configuration simplifiÃ©e de git-pull pour '%s'."
+
+#: lib/checkout_op.tcl:228
 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"
@@ -774,21 +798,21 @@ msgstr ""
 "Impossible de faire une avance rapide (fast forward) vers %s.\n"
 "Une fusion est nÃ©cessaire."
 
-#: lib/checkout_op.tcl:220
+#: lib/checkout_op.tcl:242
 #, tcl-format
 msgid "Merge strategy '%s' not supported."
 msgstr "La stratÃ©gie de fusion '%s' n'est pas supportÃ©e."
 
-#: lib/checkout_op.tcl:239
+#: lib/checkout_op.tcl:261
 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr "La mise Ã  jour de '%s' a Ã©chouÃ©e."
 
-#: lib/checkout_op.tcl:251
+#: lib/checkout_op.tcl:273
 msgid "Staging area (index) is already locked."
 msgstr "L'index (staging area) est dÃ©jÃ  vÃ©rouillÃ©"
 
-#: lib/checkout_op.tcl:266
+#: lib/checkout_op.tcl:288
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -797,36 +821,39 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du dÃ©pÃ´t\n"
+"L'Ã©tat lors de la derniÃ¨re synchronisation ne correspond plus Ã  l'Ã©tat du "
+"dÃ©pÃ´t\n"
 "\n"
-"Un autre programme Git a modifiÃ© ce dÃ©pÃ´t depuis la derniÃ¨re synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir modifier la branche courante.\n"
+"Un autre programme Git a modifiÃ© ce dÃ©pÃ´t depuis la derniÃ¨re "
+"synchronisation. Une resynchronisation doit Ãªtre effectuÃ©e avant de pouvoir "
+"modifier la branche courante.\n"
 "\n"
 "Cela va Ãªtre fait tout de suite automatiquement.\n"
 
-#: lib/checkout_op.tcl:322
+#: lib/checkout_op.tcl:344
 #, tcl-format
 msgid "Updating working directory to '%s'..."
 msgstr "Mise Ã  jour du rÃ©pertoire courant avec '%s'..."
 
-#: lib/checkout_op.tcl:323
+#: lib/checkout_op.tcl:345
 msgid "files checked out"
 msgstr "fichiers chargÃ©s"
 
-#: lib/checkout_op.tcl:353
+#: lib/checkout_op.tcl:375
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr "Chargement de '%s' abandonnÃ© (il est nÃ©cessaire de fusionner des fichiers)."
 
-#: lib/checkout_op.tcl:354
+#: lib/checkout_op.tcl:376
 msgid "File level merge required."
 msgstr "Il est nÃ©cessaire de fusionner des fichiers."
 
-#: lib/checkout_op.tcl:358
+#: lib/checkout_op.tcl:380
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr "Le rÃ©pertoire de travail reste sur la branche '%s'."
 
-#: lib/checkout_op.tcl:429
+#: lib/checkout_op.tcl:451
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
@@ -838,30 +865,30 @@ msgstr ""
 "Si vous vouliez Ãªtre sur une branche, crÃ©ez en une maintenant en partant de "
 "'Cet emprunt dÃ©tachÃ©'."
 
-#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' chargÃ©."
 
-#: lib/checkout_op.tcl:478
+#: lib/checkout_op.tcl:500
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr "RÃ©initialiser '%s' Ã  '%s' va faire perdre les commits suivants :"
 
-#: lib/checkout_op.tcl:500
+#: lib/checkout_op.tcl:522
 msgid "Recovering lost commits may not be easy."
 msgstr "RÃ©cupÃ©rer les commits perdus ne sera peut Ãªtre pas facile."
 
-#: lib/checkout_op.tcl:505
+#: lib/checkout_op.tcl:527
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr "RÃ©initialiser '%s' ?"
 
-#: lib/checkout_op.tcl:510 lib/merge.tcl:163
+#: lib/checkout_op.tcl:532 lib/merge.tcl:163
 msgid "Visualize"
 msgstr "Visualiser"
 
-#: lib/checkout_op.tcl:578
+#: lib/checkout_op.tcl:600
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -915,7 +942,7 @@ msgstr "CrÃ©er nouveau dÃ©pÃ´t"
 msgid "New..."
 msgstr "Nouveau..."
 
-#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
 msgid "Clone Existing Repository"
 msgstr "Cloner dÃ©pÃ´t existant"
 
@@ -923,7 +950,7 @@ msgstr "Cloner dÃ©pÃ´t existant"
 msgid "Clone..."
 msgstr "Cloner..."
 
-#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
 msgid "Open Existing Repository"
 msgstr "Ouvrir dÃ©pÃ´t existant"
 
@@ -945,187 +972,187 @@ msgstr "Ouvrir dÃ©pÃ´t rÃ©cent :"
 msgid "Failed to create repository %s:"
 msgstr "La crÃ©ation du dÃ©pÃ´t %s a Ã©chouÃ©e :"
 
-#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
 msgid "Directory:"
 msgstr "RÃ©pertoire :"
 
-#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
-#: lib/choose_repository.tcl:1011
+#: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
+#: lib/choose_repository.tcl:1007
 msgid "Git Repository"
 msgstr "DÃ©pÃ´t Git"
 
-#: lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:435
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Le rÃ©pertoire %s existe dÃ©jÃ ."
 
-#: lib/choose_repository.tcl:441
+#: lib/choose_repository.tcl:439
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Le fichier %s existe dÃ©jÃ ."
 
-#: lib/choose_repository.tcl:455
+#: lib/choose_repository.tcl:453
 msgid "Clone"
 msgstr "Cloner"
 
-#: lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:466
 msgid "URL:"
 msgstr "URL :"
 
-#: lib/choose_repository.tcl:489
+#: lib/choose_repository.tcl:487
 msgid "Clone Type:"
 msgstr "Type de clonage :"
 
-#: lib/choose_repository.tcl:495
+#: lib/choose_repository.tcl:493
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Standard (rapide, semi-redondant, liens durs)"
 
-#: lib/choose_repository.tcl:501
+#: lib/choose_repository.tcl:499
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Copy complÃ¨te (plus lent, sauvegarde redondante)"
 
-#: lib/choose_repository.tcl:507
+#: lib/choose_repository.tcl:505
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "PartagÃ© (le plus rapide, non recommandÃ©, pas de sauvegarde)"
 
-#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
-#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
-#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
+#: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
+#: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "'%s' n'est pas un dÃ©pÃ´t Git."
 
-#: lib/choose_repository.tcl:579
+#: lib/choose_repository.tcl:577
 msgid "Standard only available for local repository."
 msgstr "Standard n'est disponible que pour un dÃ©pÃ´t local."
 
-#: lib/choose_repository.tcl:583
+#: lib/choose_repository.tcl:581
 msgid "Shared only available for local repository."
 msgstr "PartagÃ© n'est disponible que pour un dÃ©pÃ´t local."
 
-#: lib/choose_repository.tcl:604
+#: lib/choose_repository.tcl:602
 #, tcl-format
 msgid "Location %s already exists."
 msgstr "L'emplacement %s existe dÃ©jÃ ."
 
-#: lib/choose_repository.tcl:615
+#: lib/choose_repository.tcl:613
 msgid "Failed to configure origin"
 msgstr "La configuration de l'origine a Ã©chouÃ©e."
 
-#: lib/choose_repository.tcl:627
+#: lib/choose_repository.tcl:625
 msgid "Counting objects"
 msgstr "DÃ©compte des objets"
 
-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:626
 msgid "buckets"
 msgstr "paniers"
 
-#: lib/choose_repository.tcl:652
+#: lib/choose_repository.tcl:650
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Impossible de copier 'objects/info/alternates' : %s"
 
-#: lib/choose_repository.tcl:688
+#: lib/choose_repository.tcl:686
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Il n'y a rien Ã  cloner depuis %s."
 
-#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
-#: lib/choose_repository.tcl:916
+#: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:914
 msgid "The 'master' branch has not been initialized."
 msgstr "La branche 'master' n'a pas Ã©tÃ© initialisÃ©e."
 
-#: lib/choose_repository.tcl:703
+#: lib/choose_repository.tcl:701
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Les liens durs ne sont pas supportÃ©s. Une copie sera effectuÃ©e Ã  la place."
 
-#: lib/choose_repository.tcl:715
+#: lib/choose_repository.tcl:713
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Clonage depuis %s"
 
-#: lib/choose_repository.tcl:746
+#: lib/choose_repository.tcl:744
 msgid "Copying objects"
 msgstr "Copie des objets"
 
-#: lib/choose_repository.tcl:747
+#: lib/choose_repository.tcl:745
 msgid "KiB"
 msgstr "KiB"
 
-#: lib/choose_repository.tcl:771
+#: lib/choose_repository.tcl:769
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Impossible de copier l'objet : %s"
 
-#: lib/choose_repository.tcl:781
+#: lib/choose_repository.tcl:779
 msgid "Linking objects"
 msgstr "Liaison des objets"
 
-#: lib/choose_repository.tcl:782
+#: lib/choose_repository.tcl:780
 msgid "objects"
 msgstr "objets"
 
-#: lib/choose_repository.tcl:790
+#: lib/choose_repository.tcl:788
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Impossible crÃ©er un lien dur pour l'objet : %s"
 
-#: lib/choose_repository.tcl:845
+#: lib/choose_repository.tcl:843
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Impossible de rÃ©cupÃ©rer les branches et objets. Voir la sortie console pour "
 "plus de dÃ©tails."
 
-#: lib/choose_repository.tcl:856
+#: lib/choose_repository.tcl:854
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
-"Impossible de rÃ©cupÃ©rer les marques (tags). Voir la sortie console pour plus de "
-"dÃ©tails."
+"Impossible de rÃ©cupÃ©rer les marques (tags). Voir la sortie console pour plus "
+"de dÃ©tails."
 
-#: lib/choose_repository.tcl:880
+#: lib/choose_repository.tcl:878
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "Impossible de dÃ©terminer HEAD. Voir la sortie console pour plus de dÃ©tails."
 
-#: lib/choose_repository.tcl:889
+#: lib/choose_repository.tcl:887
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Impossible de nettoyer %s"
 
-#: lib/choose_repository.tcl:895
+#: lib/choose_repository.tcl:893
 msgid "Clone failed."
 msgstr "Le clonage a Ã©chouÃ©."
 
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:900
 msgid "No default branch obtained."
 msgstr "Aucune branche par dÃ©faut n'a Ã©tÃ© obtenue."
 
-#: lib/choose_repository.tcl:913
+#: lib/choose_repository.tcl:911
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Impossible de rÃ©soudre %s comme commit."
 
-#: lib/choose_repository.tcl:925
+#: lib/choose_repository.tcl:923
 msgid "Creating working directory"
 msgstr "CrÃ©ation du rÃ©pertoire de travail"
 
-#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
 #: lib/index.tcl:193
 msgid "files"
 msgstr "fichiers"
 
-#: lib/choose_repository.tcl:955
+#: lib/choose_repository.tcl:953
 msgid "Initial file checkout failed."
 msgstr "Chargement initial du fichier Ã©chouÃ©."
 
-#: lib/choose_repository.tcl:971
+#: lib/choose_repository.tcl:969
 msgid "Open"
 msgstr "Ouvrir"
 
-#: lib/choose_repository.tcl:981
+#: lib/choose_repository.tcl:979
 msgid "Repository:"
 msgstr "DÃ©pÃ´t :"
 
-#: lib/choose_repository.tcl:1031
+#: lib/choose_repository.tcl:1027
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Impossible d'ouvrir le dÃ©pÃ´t %s :"
@@ -1165,7 +1192,7 @@ msgstr "L'expression de rÃ©vision est vide."
 
 #: lib/choose_rev.tcl:531
 msgid "Updated"
-msgstr "Ã€ jour (updated)"
+msgstr "Mise-Ã -jour:"
 
 #: lib/choose_rev.tcl:559
 msgid "URL"
@@ -1421,7 +1448,7 @@ msgstr ""
 msgid "Invalid date from Git: %s"
 msgstr "Date invalide de Git : %s"
 
-#: lib/diff.tcl:42
+#: lib/diff.tcl:44
 #, tcl-format
 msgid ""
 "No differences detected.\n"
@@ -1444,40 +1471,48 @@ msgstr ""
 "Une resynchronisation va Ãªtre lancÃ©e automatiquement pour trouver d'autres "
 "fichiers qui pourraient se trouver dans le mÃªme Ã©tat."
 
-#: lib/diff.tcl:81
+#: lib/diff.tcl:83
 #, tcl-format
 msgid "Loading diff of %s..."
 msgstr "Chargement des diffÃ©rences de %s..."
 
-#: lib/diff.tcl:114 lib/diff.tcl:184
+#: lib/diff.tcl:116 lib/diff.tcl:190
 #, tcl-format
 msgid "Unable to display %s"
 msgstr "Impossible d'afficher %s"
 
-#: lib/diff.tcl:115
+#: lib/diff.tcl:117
 msgid "Error loading file:"
 msgstr "Erreur lors du chargement du fichier :"
 
-#: lib/diff.tcl:122
+#: lib/diff.tcl:124
 msgid "Git Repository (subproject)"
 msgstr "DÃ©pÃ´t Git (sous projet)"
 
-#: lib/diff.tcl:134
+#: lib/diff.tcl:136
 msgid "* Binary file (not showing content)."
 msgstr "* Fichier binaire (pas d'apperÃ§u du contenu)."
 
-#: lib/diff.tcl:185
+#: lib/diff.tcl:191
 msgid "Error loading diff:"
 msgstr "Erreur lors du chargement des diffÃ©rences :"
 
-#: lib/diff.tcl:303
+#: lib/diff.tcl:313
 msgid "Failed to unstage selected hunk."
 msgstr "Ã‰chec lors de la dÃ©sindexation de la section sÃ©lectionnÃ©e."
 
-#: lib/diff.tcl:310
+#: lib/diff.tcl:320
 msgid "Failed to stage selected hunk."
 msgstr "Ã‰chec lors de l'indexation de la section."
 
+#: lib/diff.tcl:386
+msgid "Failed to unstage selected line."
+msgstr "Ã‰chec lors de la dÃ©sindexation de la ligne sÃ©lectionnÃ©e."
+
+#: lib/diff.tcl:394
+msgid "Failed to stage selected line."
+msgstr "Ã‰chec lors de l'indexation de la ligne."
+
 #: lib/error.tcl:20 lib/error.tcl:114
 msgid "error"
 msgstr "erreur"
@@ -1502,7 +1537,9 @@ msgstr "Erreur de l'index"
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
-msgstr "Ã‰chec de la mise Ã  jour de l'index. Une resynchronisation va Ãªtre lancÃ©e automatiquement."
+msgstr ""
+"Ã‰chec de la mise Ã  jour de l'index. Une resynchronisation va Ãªtre lancÃ©e "
+"automatiquement."
 
 #: lib/index.tcl:27
 msgid "Continue"
@@ -1539,8 +1576,8 @@ msgstr "Annuler les modifications dans ces %i fichiers ?"
 #: lib/index.tcl:391
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
-"Toutes les modifications non-indexÃ©es seront dÃ©finitivement perdues "
-"par l'annulation."
+"Toutes les modifications non-indexÃ©es seront dÃ©finitivement perdues par "
+"l'annulation."
 
 #: lib/index.tcl:394
 msgid "Do Nothing"
@@ -1589,8 +1626,8 @@ msgstr ""
 "\n"
 "Le fichier %s a des conflicts de fusion.\n"
 "\n"
-"Vous devez les rÃ©soudre, puis indexer le fichier, et enfin commiter "
-"pour terminer la fusion courante. Seulement Ã  ce moment lÃ  sera-t-il possible "
+"Vous devez les rÃ©soudre, puis indexer le fichier, et enfin commiter pour "
+"terminer la fusion courante. Seulement Ã  ce moment lÃ  sera-t-il possible "
 "d'effectuer une nouvelle fusion.\n"
 
 #: lib/merge.tcl:54
@@ -1686,11 +1723,11 @@ msgstr "Abandon"
 msgid "files reset"
 msgstr "fichiers rÃ©initialisÃ©s"
 
-#: lib/merge.tcl:265
+#: lib/merge.tcl:266
 msgid "Abort failed."
 msgstr "L'abandon a Ã©chouÃ©."
 
-#: lib/merge.tcl:267
+#: lib/merge.tcl:268
 msgid "Abort completed.  Ready."
 msgstr "Abandon teminÃ©. PrÃªt."
 
@@ -1744,42 +1781,62 @@ msgid "Match Tracking Branches"
 msgstr "Faire correspondre les branches de suivi"
 
 #: lib/option.tcl:126
+msgid "Blame Copy Only On Changed Files"
+msgstr "Annoter les copies seulement sur fichiers modifiÃ©s"
+
+#: lib/option.tcl:127
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Minimum de caratÃ¨res pour annoter une copie"
+
+#: lib/option.tcl:128
 msgid "Number of Diff Context Lines"
 msgstr "Nombre de lignes de contexte dans les diffs"
 
-#: lib/option.tcl:127
+#: lib/option.tcl:129
 msgid "Commit Message Text Width"
 msgstr "Largeur du texte de message de commit"
 
-#: lib/option.tcl:128
+#: lib/option.tcl:130
 msgid "New Branch Name Template"
 msgstr "Nouveau modÃ¨le de nom de branche"
 
-#: lib/option.tcl:192
+#: lib/option.tcl:194
 msgid "Spelling Dictionary:"
 msgstr "Dictionnaire d'orthographe :"
 
-#: lib/option.tcl:216
+#: lib/option.tcl:218
 msgid "Change Font"
 msgstr "Modifier les polices"
 
-#: lib/option.tcl:220
+#: lib/option.tcl:222
 #, tcl-format
 msgid "Choose %s"
 msgstr "Choisir %s"
 
-#: lib/option.tcl:226
+#: lib/option.tcl:228
 msgid "pt."
 msgstr "pt."
 
-#: lib/option.tcl:240
+#: lib/option.tcl:242
 msgid "Preferences"
 msgstr "PrÃ©fÃ©rences"
 
-#: lib/option.tcl:275
+#: lib/option.tcl:277
 msgid "Failed to completely save options:"
 msgstr "La sauvegarde complÃ¨te des options a Ã©chouÃ©e :"
 
+#: lib/remote.tcl:165
+msgid "Prune from"
+msgstr "Purger de"
+
+#: lib/remote.tcl:170
+msgid "Fetch from"
+msgstr "RÃ©cupÃ©rer de"
+
+#: lib/remote.tcl:213
+msgid "Push to"
+msgstr "Pousser vers"
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr "Supprimer branche distante"
@@ -1864,18 +1921,6 @@ msgstr "Aucun dÃ©pÃ´t n'est sÃ©lectionnÃ©."
 msgid "Scanning %s..."
 msgstr "Synchronisation de %s..."
 
-#: lib/remote.tcl:165
-msgid "Prune from"
-msgstr "Purger de"
-
-#: lib/remote.tcl:170
-msgid "Fetch from"
-msgstr "RÃ©cupÃ©rer de"
-
-#: lib/remote.tcl:213
-msgid "Push to"
-msgstr "Pousser vers"
-
 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
 msgid "Cannot write shortcut:"
 msgstr "Impossible d'Ã©crire le raccourcis :"
@@ -1909,15 +1954,15 @@ msgstr "La vÃ©rification d'orthographe a Ã©chouÃ©e silentieusement au dÃ©marrage
 msgid "Unrecognized spell checker"
 msgstr "VÃ©rificateur d'orthographe non reconnu"
 
-#: lib/spellcheck.tcl:180
+#: lib/spellcheck.tcl:186
 msgid "No Suggestions"
 msgstr "Aucune suggestion"
 
-#: lib/spellcheck.tcl:381
+#: lib/spellcheck.tcl:387
 msgid "Unexpected EOF from spell checker"
 msgstr "EOF inattendue envoyÃ©e par le vÃ©rificateur d'orthographe"
 
-#: lib/spellcheck.tcl:385
+#: lib/spellcheck.tcl:391
 msgid "Spell Checker Failed"
 msgstr "Le vÃ©rificateur d'orthographe a Ã©chouÃ©"
 
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] Update french translation
  2008-08-11 21:17     ` Alexandre Bourget
@ 2008-08-11 22:04       ` Matthieu Moy
  0 siblings, 0 replies; 9+ messages in thread
From: Matthieu Moy @ 2008-08-11 22:04 UTC (permalink / raw)
  To: alexandre.bourget; +Cc: git

Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> writes:

> Le lundi 11 août 2008 à 21:19 +0200, Matthieu Moy a écrit :
>> General remark: you should split your patch into
>> 
>> * Some word substitution on the one side (s/référentiel/dépos/g,
>>   s/fonte/police/g, ...)
>> 
>> * Some manual rephrasing.
>
> This is funny requirement, especially when I see what you've let in as a
> "french" translation :) I doubt 

??

Your patch is deadly long, and 90% of it is just about changing the
translation of 3 words (police, dépos and index). Really, my review
would have been _much_ more efficient with a clean patch serie.

BTW, the requirement of splitting a patch to small and related changes
is indeed not at all uncommon here.

> http://www.granddictionnaire.com reveals us that "supporter" is a
> computer-related term that means just what we need here, and it's been
> reviewed by the "Office de la langue française" in 2002.

Interesting. Still, this is all about Canadian-french, not
France-french. According to
http://atilf.atilf.fr/dendien/scripts/tlfiv5/visusel.exe?13;s=3509465295;r=1;nat=;sol=2
this is indeed both anglicism and "canadianism" ;-).

Well, anyway, that's just nitpick, your translation is at least good
in the sense that everybody understands it.

>> >  #: lib/choose_rev.tcl:531
>> >  msgid "Updated"
>> > -msgstr "Misa à jour"
>> > +msgstr "À jour (updated)"
>> 
>> If you go for "indexé" elsewhere, you should s/updated/indexé/ here
>> also.
>
> Have you looked at the context ?

No, and you're rigth. Sorry for the noise.

-- 
Matthieu

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH] git-gui: update french translation
  2010-02-01 15:16 git-gui translation updates needed Shawn O. Pearce
@ 2010-02-02 12:18 ` Emmanuel Trillaud
  0 siblings, 0 replies; 9+ messages in thread
From: Emmanuel Trillaud @ 2010-02-02 12:18 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: git, Christian Couder


Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
---
 po/fr.po |  686 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 366 insertions(+), 320 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index a944ace..8170696 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 13:56-0800\n"
-"PO-Revision-Date: 2008-11-20 10:20+0100\n"
+"POT-Creation-Date: 2010-01-26 15:47-0800\n"
+"PO-Revision-Date: 2010-02-02 12:59+0100\n"
 "Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -19,33 +19,33 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
-#: git-gui.sh:866
+#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
+#: git-gui.sh:922
 msgid "git-gui: fatal error"
 msgstr "git-gui: erreur fatale"
 
-#: git-gui.sh:689
+#: git-gui.sh:743
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Police invalide spécifiée dans %s :"
 
-#: git-gui.sh:723
+#: git-gui.sh:779
 msgid "Main Font"
 msgstr "Police principale"
 
-#: git-gui.sh:724
+#: git-gui.sh:780
 msgid "Diff/Console Font"
 msgstr "Police diff/console"
 
-#: git-gui.sh:738
+#: git-gui.sh:794
 msgid "Cannot find git in PATH."
 msgstr "Impossible de trouver git dans PATH."
 
-#: git-gui.sh:765
+#: git-gui.sh:821
 msgid "Cannot parse Git version string:"
 msgstr "Impossible de parser la version de Git :"
 
-#: git-gui.sh:783
+#: git-gui.sh:839
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -64,446 +64,475 @@ msgstr ""
 "\n"
 "Peut-on considérer que '%s' est en version 1.5.0 ?\n"
 
-#: git-gui.sh:1062
+#: git-gui.sh:1128
 msgid "Git directory not found:"
 msgstr "Impossible de trouver le répertoire git :"
 
-#: git-gui.sh:1069
+#: git-gui.sh:1146
 msgid "Cannot move to top of working directory:"
 msgstr "Impossible d'aller à la racine du répertoire de travail :"
 
-#: git-gui.sh:1076
-msgid "Cannot use funny .git directory:"
-msgstr "Impossible d'utiliser le répertoire .git:"
+#: git-gui.sh:1154
+msgid "Cannot use bare repository:"
+msgstr "Impossible d'utiliser un dépôt nu (bare) :"
 
-#: git-gui.sh:1081
+#: git-gui.sh:1162
 msgid "No working directory"
 msgstr "Aucun répertoire de travail"
 
-#: git-gui.sh:1247 lib/checkout_op.tcl:305
+#: git-gui.sh:1334 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr "Rafraîchissement du statut des fichiers..."
 
-#: git-gui.sh:1303
+#: git-gui.sh:1390
 msgid "Scanning for modified files ..."
 msgstr "Recherche de fichiers modifiés..."
 
-#: git-gui.sh:1367
+#: git-gui.sh:1454
 msgid "Calling prepare-commit-msg hook..."
 msgstr "Lancement de l'action de préparation du message de commit..."
 
-#: git-gui.sh:1384
+#: git-gui.sh:1471
 msgid "Commit declined by prepare-commit-msg hook."
 msgstr "Commit refusé par l'action de préparation du message de commit."
 
-#: git-gui.sh:1542 lib/browser.tcl:246
+#: git-gui.sh:1629 lib/browser.tcl:246
 msgid "Ready."
 msgstr "Prêt."
 
-#: git-gui.sh:1819
+#: git-gui.sh:1787
+#, tcl-format
+msgid "Displaying only %s of %s files."
+msgstr "Affiche seulement %s fichiers sur %s."
+
+#: git-gui.sh:1913
 msgid "Unmodified"
 msgstr "Non modifié"
 
-#: git-gui.sh:1821
+#: git-gui.sh:1915
 msgid "Modified, not staged"
 msgstr "Modifié, pas indexé"
 
-#: git-gui.sh:1822 git-gui.sh:1830
+#: git-gui.sh:1916 git-gui.sh:1924
 msgid "Staged for commit"
 msgstr "Indexé"
 
-#: git-gui.sh:1823 git-gui.sh:1831
+#: git-gui.sh:1917 git-gui.sh:1925
 msgid "Portions staged for commit"
 msgstr "Portions indexées"
 
-#: git-gui.sh:1824 git-gui.sh:1832
+#: git-gui.sh:1918 git-gui.sh:1926
 msgid "Staged for commit, missing"
 msgstr "Indexés, manquant"
 
-#: git-gui.sh:1826
+#: git-gui.sh:1920
 msgid "File type changed, not staged"
 msgstr "Le type de fichier a changé, non indexé"
 
-#: git-gui.sh:1827
+#: git-gui.sh:1921
 msgid "File type changed, staged"
 msgstr "Le type de fichier a changé, indexé"
 
-#: git-gui.sh:1829
+#: git-gui.sh:1923
 msgid "Untracked, not staged"
 msgstr "Non versionné, non indexé"
 
-#: git-gui.sh:1834
+#: git-gui.sh:1928
 msgid "Missing"
 msgstr "Manquant"
 
-#: git-gui.sh:1835
+#: git-gui.sh:1929
 msgid "Staged for removal"
 msgstr "Indexé pour suppression"
 
-#: git-gui.sh:1836
+#: git-gui.sh:1930
 msgid "Staged for removal, still present"
 msgstr "Indexé pour suppression, toujours présent"
 
-#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
-#: git-gui.sh:1842 git-gui.sh:1843
+#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
+#: git-gui.sh:1936 git-gui.sh:1937
 msgid "Requires merge resolution"
 msgstr "Nécessite la résolution d'une fusion"
 
-#: git-gui.sh:1878
+#: git-gui.sh:1972
 msgid "Starting gitk... please wait..."
 msgstr "Lancement de gitk... un instant..."
 
-#: git-gui.sh:1887
+#: git-gui.sh:1984
 msgid "Couldn't find gitk in PATH"
 msgstr "Impossible de trouver gitk dans PATH."
 
-#: git-gui.sh:2280 lib/choose_repository.tcl:36
+#: git-gui.sh:2043
+msgid "Couldn't find git gui in PATH"
+msgstr "Impossible de trouver git gui dans PATH"
+
+#: git-gui.sh:2455 lib/choose_repository.tcl:36
 msgid "Repository"
 msgstr "Dépôt"
 
-#: git-gui.sh:2281
+#: git-gui.sh:2456
 msgid "Edit"
 msgstr "Édition"
 
-#: git-gui.sh:2283 lib/choose_rev.tcl:561
+#: git-gui.sh:2458 lib/choose_rev.tcl:561
 msgid "Branch"
 msgstr "Branche"
 
-#: git-gui.sh:2286 lib/choose_rev.tcl:548
+#: git-gui.sh:2461 lib/choose_rev.tcl:548
 msgid "Commit@@noun"
 msgstr "Commit"
 
-#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "Fusionner"
 
-#: git-gui.sh:2290 lib/choose_rev.tcl:557
+#: git-gui.sh:2465 lib/choose_rev.tcl:557
 msgid "Remote"
 msgstr "Dépôt distant"
 
-#: git-gui.sh:2293
+#: git-gui.sh:2468
 msgid "Tools"
 msgstr "Outils"
 
-#: git-gui.sh:2302
+#: git-gui.sh:2477
 msgid "Explore Working Copy"
 msgstr "Explorer la copie de travail"
 
-#: git-gui.sh:2307
+#: git-gui.sh:2483
 msgid "Browse Current Branch's Files"
 msgstr "Naviguer dans la branche courante"
 
-#: git-gui.sh:2311
+#: git-gui.sh:2487
 msgid "Browse Branch Files..."
 msgstr "Naviguer dans la branche..."
 
-#: git-gui.sh:2316
+#: git-gui.sh:2492
 msgid "Visualize Current Branch's History"
 msgstr "Visualiser l'historique de la branche courante"
 
-#: git-gui.sh:2320
+#: git-gui.sh:2496
 msgid "Visualize All Branch History"
 msgstr "Voir l'historique de toutes les branches"
 
-#: git-gui.sh:2327
+#: git-gui.sh:2503
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Parcourir l'arborescence de %s"
 
-#: git-gui.sh:2329
+#: git-gui.sh:2505
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Voir l'historique de la branche : %s"
 
-#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "Statistiques du dépôt"
 
-#: git-gui.sh:2337 lib/database.tcl:34
+#: git-gui.sh:2513 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "Comprimer le dépôt"
 
-#: git-gui.sh:2340
+#: git-gui.sh:2516
 msgid "Verify Database"
 msgstr "Vérifier le dépôt"
 
-#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
-#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
+#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
+#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
 msgid "Create Desktop Icon"
 msgstr "Créer une icône sur le bureau"
 
-#: git-gui.sh:2363 lib/choose_repository.tcl:183
lib/choose_repository.tcl:191 +#: git-gui.sh:2539
lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 msgid "Quit"
 msgstr "Quitter"
 
-#: git-gui.sh:2371
+#: git-gui.sh:2547
 msgid "Undo"
 msgstr "Défaire"
 
-#: git-gui.sh:2374
+#: git-gui.sh:2550
 msgid "Redo"
 msgstr "Refaire"
 
-#: git-gui.sh:2378 git-gui.sh:2923
+#: git-gui.sh:2554 git-gui.sh:3109
 msgid "Cut"
 msgstr "Couper"
 
-#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
+#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr "Copier"
 
-#: git-gui.sh:2384 git-gui.sh:2929
+#: git-gui.sh:2560 git-gui.sh:3115
 msgid "Paste"
 msgstr "Coller"
 
-#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
+#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Supprimer"
 
-#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
+#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: git-gui.sh:2400
+#: git-gui.sh:2576
 msgid "Create..."
 msgstr "Créer..."
 
-#: git-gui.sh:2406
+#: git-gui.sh:2582
 msgid "Checkout..."
 msgstr "Charger (checkout)..."
 
-#: git-gui.sh:2412
+#: git-gui.sh:2588
 msgid "Rename..."
 msgstr "Renommer..."
 
-#: git-gui.sh:2417
+#: git-gui.sh:2593
 msgid "Delete..."
 msgstr "Supprimer..."
 
-#: git-gui.sh:2422
+#: git-gui.sh:2598
 msgid "Reset..."
 msgstr "Réinitialiser..."
 
-#: git-gui.sh:2432
+#: git-gui.sh:2608
 msgid "Done"
 msgstr "Effectué"
 
-#: git-gui.sh:2434
+#: git-gui.sh:2610
 msgid "Commit@@verb"
 msgstr "Commiter@@verb"
 
-#: git-gui.sh:2443 git-gui.sh:2864
+#: git-gui.sh:2619 git-gui.sh:3050
 msgid "New Commit"
 msgstr "Nouveau commit"
 
-#: git-gui.sh:2451 git-gui.sh:2871
+#: git-gui.sh:2627 git-gui.sh:3057
 msgid "Amend Last Commit"
 msgstr "Corriger dernier commit"
 
-#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "Recharger modifs."
 
-#: git-gui.sh:2467
+#: git-gui.sh:2643
 msgid "Stage To Commit"
 msgstr "Indexer"
 
-#: git-gui.sh:2473
+#: git-gui.sh:2649
 msgid "Stage Changed Files To Commit"
 msgstr "Indexer toutes modifications"
 
-#: git-gui.sh:2479
+#: git-gui.sh:2655
 msgid "Unstage From Commit"
 msgstr "Désindexer"
 
-#: git-gui.sh:2484 lib/index.tcl:410
+#: git-gui.sh:2661 lib/index.tcl:412
 msgid "Revert Changes"
 msgstr "Annuler les modifications"
 
-#: git-gui.sh:2491 git-gui.sh:3069
+#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
 msgid "Show Less Context"
 msgstr "Montrer moins de contexte"
 
-#: git-gui.sh:2495 git-gui.sh:3073
+#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
 msgid "Show More Context"
 msgstr "Montrer plus de contexte"
 
-#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
+#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
 msgid "Sign Off"
 msgstr "Signer"
 
-#: git-gui.sh:2518
+#: git-gui.sh:2696
 msgid "Local Merge..."
 msgstr "Fusion locale..."
 
-#: git-gui.sh:2523
+#: git-gui.sh:2701
 msgid "Abort Merge..."
 msgstr "Abandonner fusion..."
 
-#: git-gui.sh:2535 git-gui.sh:2575
+#: git-gui.sh:2713 git-gui.sh:2741
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: git-gui.sh:2539
+#: git-gui.sh:2717
 msgid "Push..."
 msgstr "Pousser..."
 
-#: git-gui.sh:2543
+#: git-gui.sh:2721
 msgid "Delete Branch..."
 msgstr "Supprimer branche..."
 
-#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
-#, tcl-format
-msgid "About %s"
-msgstr "À propos de %s"
-
-#: git-gui.sh:2557
-msgid "Preferences..."
-msgstr "Préférences..."
-
-#: git-gui.sh:2565 git-gui.sh:3115
+#: git-gui.sh:2731 git-gui.sh:3292
 msgid "Options..."
 msgstr "Options..."
 
-#: git-gui.sh:2576
+#: git-gui.sh:2742
 msgid "Remove..."
 msgstr "Supprimer..."
 
-#: git-gui.sh:2585 lib/choose_repository.tcl:50
+#: git-gui.sh:2751 lib/choose_repository.tcl:50
 msgid "Help"
 msgstr "Aide"
 
-#: git-gui.sh:2611
+#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr "À propos de %s"
+
+#: git-gui.sh:2783
 msgid "Online Documentation"
 msgstr "Documentation en ligne"
 
-#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
 msgid "Show SSH Key"
 msgstr "Montrer la clé SSH"
 
-#: git-gui.sh:2707
+#: git-gui.sh:2893
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire "
 "inexistant"
 
-#: git-gui.sh:2740
+#: git-gui.sh:2926
 msgid "Current Branch:"
 msgstr "Branche courante :"
 
-#: git-gui.sh:2761
+#: git-gui.sh:2947
 msgid "Staged Changes (Will Commit)"
 msgstr "Modifs. indexées (pour commit)"
 
-#: git-gui.sh:2781
+#: git-gui.sh:2967
 msgid "Unstaged Changes"
 msgstr "Modifs. non indexées"
 
-#: git-gui.sh:2831
+#: git-gui.sh:3017
 msgid "Stage Changed"
 msgstr "Indexer modifs."
 
-#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
 msgid "Push"
 msgstr "Pousser"
 
-#: git-gui.sh:2885
+#: git-gui.sh:3071
 msgid "Initial Commit Message:"
 msgstr "Message de commit initial :"
 
-#: git-gui.sh:2886
+#: git-gui.sh:3072
 msgid "Amended Commit Message:"
 msgstr "Message de commit corrigé :"
 
-#: git-gui.sh:2887
+#: git-gui.sh:3073
 msgid "Amended Initial Commit Message:"
 msgstr "Message de commit initial corrigé :"
 
-#: git-gui.sh:2888
+#: git-gui.sh:3074
 msgid "Amended Merge Commit Message:"
 msgstr "Message de commit de fusion corrigé :"
 
-#: git-gui.sh:2889
+#: git-gui.sh:3075
 msgid "Merge Commit Message:"
 msgstr "Message de commit de fusion :"
 
-#: git-gui.sh:2890
+#: git-gui.sh:3076
 msgid "Commit Message:"
 msgstr "Message de commit :"
 
-#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
+#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
 msgid "Copy All"
 msgstr "Copier tout"
 
-#: git-gui.sh:2963 lib/blame.tcl:104
+#: git-gui.sh:3149 lib/blame.tcl:104
 msgid "File:"
 msgstr "Fichier :"
 
-#: git-gui.sh:3078
+#: git-gui.sh:3255
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: git-gui.sh:3099
+#: git-gui.sh:3276
 msgid "Decrease Font Size"
 msgstr "Diminuer la police"
 
-#: git-gui.sh:3103
+#: git-gui.sh:3280
 msgid "Increase Font Size"
 msgstr "Agrandir la police"
 
-#: git-gui.sh:3111 lib/blame.tcl:281
+#: git-gui.sh:3288 lib/blame.tcl:281
 msgid "Encoding"
 msgstr "Codage des caractères"
 
-#: git-gui.sh:3122
+#: git-gui.sh:3299
 msgid "Apply/Reverse Hunk"
 msgstr "Appliquer/Inverser section"
 
-#: git-gui.sh:3127
+#: git-gui.sh:3304
 msgid "Apply/Reverse Line"
 msgstr "Appliquer/Inverser la ligne"
 
-#: git-gui.sh:3137
+#: git-gui.sh:3323
 msgid "Run Merge Tool"
 msgstr "Lancer l'outil de fusion"
 
-#: git-gui.sh:3142
+#: git-gui.sh:3328
 msgid "Use Remote Version"
 msgstr "Utiliser la version distante"
 
-#: git-gui.sh:3146
+#: git-gui.sh:3332
 msgid "Use Local Version"
 msgstr "Utiliser la version locale"
 
-#: git-gui.sh:3150
+#: git-gui.sh:3336
 msgid "Revert To Base"
 msgstr "Revenir à la version de base"
 
-#: git-gui.sh:3169
+#: git-gui.sh:3354
+msgid "Visualize These Changes In The Submodule"
+msgstr "Voir les changments dans le sous-module"
+
+#: git-gui.sh:3358
+msgid "Visualize Current Branch History In The Submodule"
+msgstr "Voir l'historique de la branche courante du sous-module"
+
+#: git-gui.sh:3362
+msgid "Visualize All Branch History In The Submodule"
+msgstr "Voir l'historique de toutes les branches du sous-module"
+
+#: git-gui.sh:3367
+msgid "Start git gui In The Submodule"
+msgstr "Démarrer git gui dans le sous-module"
+
+#: git-gui.sh:3389
 msgid "Unstage Hunk From Commit"
 msgstr "Désindexer la section"
 
-#: git-gui.sh:3170
+#: git-gui.sh:3391
+msgid "Unstage Lines From Commit"
+msgstr "Désindexer la ligne du commit"
+
+#: git-gui.sh:3393
 msgid "Unstage Line From Commit"
 msgstr "Désindexer la ligne"
 
-#: git-gui.sh:3172
+#: git-gui.sh:3396
 msgid "Stage Hunk For Commit"
 msgstr "Indexer la section"
 
-#: git-gui.sh:3173
+#: git-gui.sh:3398
+msgid "Stage Lines For Commit"
+msgstr "Indexer les lignes"
+
+#: git-gui.sh:3400
 msgid "Stage Line For Commit"
 msgstr "Indexer la ligne"
 
-#: git-gui.sh:3196
+#: git-gui.sh:3424
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: git-gui.sh:3301
+#: git-gui.sh:3541
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -520,7 +549,7 @@ msgstr ""
 "sous-processus de Git lancés par %s\n"
 "\n"
 
-#: git-gui.sh:3331
+#: git-gui.sh:3570
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
@@ -530,7 +559,7 @@ msgstr ""
 "Ceci est dû à un problème connu avec\n"
 "le binaire Tcl distribué par Cygwin."
 
-#: git-gui.sh:3336
+#: git-gui.sh:3575
 #, tcl-format
 msgid ""
 "\n"
@@ -616,43 +645,43 @@ msgstr "Recherche de copie approfondie en cours..."
 msgid "Loading annotation..."
 msgstr "Chargement des annotations..."
 
-#: lib/blame.tcl:964
+#: lib/blame.tcl:963
 msgid "Author:"
 msgstr "Auteur :"
 
-#: lib/blame.tcl:968
+#: lib/blame.tcl:967
 msgid "Committer:"
 msgstr "Commiteur :"
 
-#: lib/blame.tcl:973
+#: lib/blame.tcl:972
 msgid "Original File:"
 msgstr "Fichier original :"
 
-#: lib/blame.tcl:1021
+#: lib/blame.tcl:1020
 msgid "Cannot find HEAD commit:"
 msgstr "Impossible de trouver le commit HEAD :"
 
-#: lib/blame.tcl:1076
+#: lib/blame.tcl:1075
 msgid "Cannot find parent commit:"
 msgstr "Impossible de trouver le commit parent :"
 
-#: lib/blame.tcl:1091
+#: lib/blame.tcl:1090
 msgid "Unable to display parent"
 msgstr "Impossible d'afficher le parent"
 
-#: lib/blame.tcl:1092 lib/diff.tcl:297
+#: lib/blame.tcl:1091 lib/diff.tcl:320
 msgid "Error loading diff:"
 msgstr "Erreur lors du chargement des différences :"
 
-#: lib/blame.tcl:1232
+#: lib/blame.tcl:1231
 msgid "Originally By:"
 msgstr "À l'origine par :"
 
-#: lib/blame.tcl:1238
+#: lib/blame.tcl:1237
 msgid "In File:"
 msgstr "Dans le fichier :"
 
-#: lib/blame.tcl:1243
+#: lib/blame.tcl:1242
 msgid "Copied Or Moved Here By:"
 msgstr "Copié ou déplacé ici par :"
 
@@ -666,10 +695,10 @@ msgstr "Charger (checkout)"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
 #: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
 #: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:97
+#: lib/transport.tcl:108
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -697,7 +726,7 @@ msgstr "Créer une branche"
 msgid "Create New Branch"
 msgstr "Créer une nouvelle branche"
 
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
 msgid "Create"
 msgstr "Créer"
 
@@ -729,7 +758,7 @@ msgstr "Non"
 msgid "Fast Forward Only"
 msgstr "Mise à jour rectiligne seulement (fast-forward)"
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -771,15 +800,25 @@ msgstr "Branches locales"
 msgid "Delete Only If Merged Into"
 msgstr "Supprimer seulement si fusionnée dans :"
 
-#: lib/branch_delete.tcl:54
-msgid "Always (Do not perform merge test.)"
-msgstr "Toujours (Ne pas faire de test de fusion.)"
+#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
+msgstr "Toujours (ne pas vérifier les fusions)"
 
 #: lib/branch_delete.tcl:103
 #, tcl-format
 msgid "The following branches are not completely merged into %s:"
 msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :"
 
+#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"Il est difficile de récupérer des branches supprimées.\n"
+"\n"
+"Supprimer les branches sélectionnées ?"
+
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
@@ -809,7 +848,7 @@ msgstr "Nouveau nom :"
 msgid "Please select a branch to rename."
 msgstr "Merci de sélectionner une branche à renommer."
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
 #, tcl-format
 msgid "Branch '%s' already exists."
 msgstr "La branche '%s' existe déjà."
@@ -840,38 +879,38 @@ msgstr "[Jusqu'au parent]"
 msgid "Browse Branch Files"
 msgstr "Naviguer dans les fichiers de le branche"
 
-#: lib/browser.tcl:278 lib/choose_repository.tcl:394
-#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
-#: lib/choose_repository.tcl:995
+#: lib/browser.tcl:278 lib/choose_repository.tcl:398
+#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
+#: lib/choose_repository.tcl:1028
 msgid "Browse"
 msgstr "Naviguer"
 
-#: lib/checkout_op.tcl:84
+#: lib/checkout_op.tcl:85
 #, tcl-format
 msgid "Fetching %s from %s"
 msgstr "Récupération de %s à partir de %s"
 
-#: lib/checkout_op.tcl:132
+#: lib/checkout_op.tcl:133
 #, tcl-format
 msgid "fatal: Cannot resolve %s"
 msgstr "erreur fatale : Impossible de résoudre %s"
 
-#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
 #: lib/sshkey.tcl:53
 msgid "Close"
 msgstr "Fermer"
 
-#: lib/checkout_op.tcl:174
+#: lib/checkout_op.tcl:175
 #, tcl-format
 msgid "Branch '%s' does not exist."
 msgstr "La branche '%s' n'existe pas."
 
-#: lib/checkout_op.tcl:193
+#: lib/checkout_op.tcl:194
 #, tcl-format
 msgid "Failed to configure simplified git-pull for '%s'."
 msgstr "Échec de la configuration simplifiée de git-pull pour '%s'."
 
-#: lib/checkout_op.tcl:228
+#: lib/checkout_op.tcl:229
 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"
@@ -884,21 +923,21 @@ msgstr ""
 "Impossible de faire une avance rapide (fast forward) vers %s.\n"
 "Une fusion est nécessaire."
 
-#: lib/checkout_op.tcl:242
+#: lib/checkout_op.tcl:243
 #, tcl-format
 msgid "Merge strategy '%s' not supported."
 msgstr "La stratégie de fusion '%s' n'est pas supportée."
 
-#: lib/checkout_op.tcl:261
+#: lib/checkout_op.tcl:262
 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr "La mise à jour de '%s' a échoué."
 
-#: lib/checkout_op.tcl:273
+#: lib/checkout_op.tcl:274
 msgid "Staging area (index) is already locked."
 msgstr "L'index (staging area) est déjà verrouillé."
 
-#: lib/checkout_op.tcl:288
+#: lib/checkout_op.tcl:289
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -916,30 +955,31 @@ msgstr ""
 "\n"
 "Cela va être fait tout de suite automatiquement.\n"
 
-#: lib/checkout_op.tcl:344
+#: lib/checkout_op.tcl:345
 #, tcl-format
 msgid "Updating working directory to '%s'..."
 msgstr "Mise à jour du répertoire courant avec '%s'..."
 
-#: lib/checkout_op.tcl:345
+#: lib/checkout_op.tcl:346
 msgid "files checked out"
 msgstr "fichiers chargés"
 
-#: lib/checkout_op.tcl:375
+#: lib/checkout_op.tcl:376
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
-msgstr "Chargement de '%s' abandonné (il est nécessaire de fusionner des
fichiers)." +msgstr ""
+"Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)."
 
-#: lib/checkout_op.tcl:376
+#: lib/checkout_op.tcl:377
 msgid "File level merge required."
 msgstr "Il est nécessaire de fusionner des fichiers."
 
-#: lib/checkout_op.tcl:380
+#: lib/checkout_op.tcl:381
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr "Le répertoire de travail reste sur la branche '%s'."
 
-#: lib/checkout_op.tcl:451
+#: lib/checkout_op.tcl:452
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
@@ -951,30 +991,30 @@ msgstr ""
 "Si vous vouliez être sur une branche, créez-en une maintenant en partant de
" "'Cet emprunt détaché'."
 
-#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
+#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' chargé."
 
-#: lib/checkout_op.tcl:500
+#: lib/checkout_op.tcl:535
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr "Réinitialiser '%s' à '%s' va faire perdre les commits suivants :"
 
-#: lib/checkout_op.tcl:522
+#: lib/checkout_op.tcl:557
 msgid "Recovering lost commits may not be easy."
 msgstr "Récupérer les commits perdus ne sera peut être pas facile."
 
-#: lib/checkout_op.tcl:527
+#: lib/checkout_op.tcl:562
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr "Réinitialiser '%s' ?"
 
-#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
 msgid "Visualize"
 msgstr "Visualiser"
 
-#: lib/checkout_op.tcl:600
+#: lib/checkout_op.tcl:635
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -1020,7 +1060,7 @@ msgstr ""
 msgid "Git Gui"
 msgstr "Git Gui"
 
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382
+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
 msgid "Create New Repository"
 msgstr "Créer nouveau dépôt"
 
@@ -1028,7 +1068,7 @@ msgstr "Créer nouveau dépôt"
 msgid "New..."
 msgstr "Nouveau..."
 
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
 msgid "Clone Existing Repository"
 msgstr "Cloner un dépôt existant"
 
@@ -1036,7 +1076,7 @@ msgstr "Cloner un dépôt existant"
 msgid "Clone..."
 msgstr "Cloner..."
 
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
 msgid "Open Existing Repository"
 msgstr "Ouvrir un dépôt existant"
 
@@ -1052,197 +1092,199 @@ msgstr "Dépôts récemment utilisés"
 msgid "Open Recent Repository:"
 msgstr "Ouvrir un dépôt récent :"
 
-#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
-#: lib/choose_repository.tcl:316
+#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
+#: lib/choose_repository.tcl:320
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "La création du dépôt %s a échoué :"
 
-#: lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:391
 msgid "Directory:"
 msgstr "Répertoire :"
 
-#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1017
+#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
+#: lib/choose_repository.tcl:1052
 msgid "Git Repository"
 msgstr "Dépôt Git"
 
-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:448
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Le répertoire %s existe déjà."
 
-#: lib/choose_repository.tcl:446
+#: lib/choose_repository.tcl:452
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Le fichier %s existe déjà."
 
-#: lib/choose_repository.tcl:460
+#: lib/choose_repository.tcl:466
 msgid "Clone"
 msgstr "Cloner"
 
-#: lib/choose_repository.tcl:473
+#: lib/choose_repository.tcl:479
 msgid "Source Location:"
 msgstr "Emplacement source :"
 
-#: lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:490
 msgid "Target Directory:"
 msgstr "Répertoire cible :"
 
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:502
 msgid "Clone Type:"
 msgstr "Type de clonage :"
 
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:508
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Standard (rapide, semi-redondant, liens durs)"
 
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:514
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Copy complète (plus lent, sauvegarde redondante)"
 
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:520
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)"
 
-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
-#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
+#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
+#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
+#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "'%s' n'est pas un dépôt Git."
 
-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:592
 msgid "Standard only available for local repository."
 msgstr "Standard n'est disponible que pour un dépôt local."
 
-#: lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:596
 msgid "Shared only available for local repository."
 msgstr "Partagé n'est disponible que pour un dépôt local."
 
-#: lib/choose_repository.tcl:611
+#: lib/choose_repository.tcl:617
 #, tcl-format
 msgid "Location %s already exists."
 msgstr "L'emplacement %s existe déjà."
 
-#: lib/choose_repository.tcl:622
+#: lib/choose_repository.tcl:628
 msgid "Failed to configure origin"
 msgstr "La configuration de l'origine a échoué."
 
-#: lib/choose_repository.tcl:634
+#: lib/choose_repository.tcl:640
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
-#: lib/choose_repository.tcl:635
+#: lib/choose_repository.tcl:641
 msgid "buckets"
 msgstr "paniers"
 
-#: lib/choose_repository.tcl:659
+#: lib/choose_repository.tcl:665
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Impossible de copier 'objects/info/alternates' : %s"
 
-#: lib/choose_repository.tcl:695
+#: lib/choose_repository.tcl:701
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Il n'y a rien à cloner depuis %s."
 
-#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
-#: lib/choose_repository.tcl:923
+#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
+#: lib/choose_repository.tcl:929
 msgid "The 'master' branch has not been initialized."
 msgstr "La branche 'master' n'a pas été initialisée."
 
-#: lib/choose_repository.tcl:710
+#: lib/choose_repository.tcl:716
 msgid "Hardlinks are unavailable.  Falling back to copying."
-msgstr "Les liens durs ne sont pas supportés. Une copie sera effectuée à la
place." +msgstr ""
+"Les liens durs ne sont pas supportés. Une copie sera effectuée à la place."
 
-#: lib/choose_repository.tcl:722
+#: lib/choose_repository.tcl:728
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Clonage depuis %s"
 
-#: lib/choose_repository.tcl:753
+#: lib/choose_repository.tcl:759
 msgid "Copying objects"
 msgstr "Copie des objets"
 
-#: lib/choose_repository.tcl:754
+#: lib/choose_repository.tcl:760
 msgid "KiB"
 msgstr "KiB"
 
-#: lib/choose_repository.tcl:778
+#: lib/choose_repository.tcl:784
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Impossible de copier l'objet : %s"
 
-#: lib/choose_repository.tcl:788
+#: lib/choose_repository.tcl:794
 msgid "Linking objects"
 msgstr "Liaison des objets"
 
-#: lib/choose_repository.tcl:789
+#: lib/choose_repository.tcl:795
 msgid "objects"
 msgstr "objets"
 
-#: lib/choose_repository.tcl:797
+#: lib/choose_repository.tcl:803
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Impossible créer un lien dur pour l'objet : %s"
 
-#: lib/choose_repository.tcl:852
+#: lib/choose_repository.tcl:858
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Impossible de récupérer les branches et objets. Voir la sortie console pour
" "plus de détails."
 
-#: lib/choose_repository.tcl:863
+#: lib/choose_repository.tcl:869
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 "Impossible de récupérer les marques (tags). Voir la sortie console pour
plus " "de détails."
 
-#: lib/choose_repository.tcl:887
+#: lib/choose_repository.tcl:893
 msgid "Cannot determine HEAD.  See console output for details."
-msgstr "Impossible de déterminer HEAD. Voir la sortie console pour plus de
détails." +msgstr ""
+"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails."
 
-#: lib/choose_repository.tcl:896
+#: lib/choose_repository.tcl:902
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Impossible de nettoyer %s"
 
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:908
 msgid "Clone failed."
 msgstr "Le clonage a échoué."
 
-#: lib/choose_repository.tcl:909
+#: lib/choose_repository.tcl:915
 msgid "No default branch obtained."
 msgstr "Aucune branche par défaut n'a été obtenue."
 
-#: lib/choose_repository.tcl:920
+#: lib/choose_repository.tcl:926
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Impossible de résoudre %s comme commit."
 
-#: lib/choose_repository.tcl:932
+#: lib/choose_repository.tcl:938
 msgid "Creating working directory"
 msgstr "Création du répertoire de travail"
 
-#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
-#: lib/index.tcl:196
+#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
+#: lib/index.tcl:198
 msgid "files"
 msgstr "fichiers"
 
-#: lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:968
 msgid "Initial file checkout failed."
 msgstr "Le chargement initial du fichier a échoué."
 
-#: lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:1011
 msgid "Open"
 msgstr "Ouvrir"
 
-#: lib/choose_repository.tcl:988
+#: lib/choose_repository.tcl:1021
 msgid "Repository:"
 msgstr "Dépôt :"
 
-#: lib/choose_repository.tcl:1037
+#: lib/choose_repository.tcl:1072
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Impossible d'ouvrir le dépôt %s :"
@@ -1314,19 +1356,24 @@ msgstr ""
 "terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous "
 "abandonnez la fusion courante.\n"
 
-#: lib/commit.tcl:49
+#: lib/commit.tcl:48
 msgid "Error loading commit data for amend:"
 msgstr "Erreur lors du chargement des données de commit pour correction :"
 
-#: lib/commit.tcl:76
+#: lib/commit.tcl:75
 msgid "Unable to obtain your identity:"
 msgstr "Impossible d'obtenir votre identité :"
 
-#: lib/commit.tcl:81
+#: lib/commit.tcl:80
 msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr "GIT_COMMITTER_IDENT invalide :"
 
-#: lib/commit.tcl:133
+#: lib/commit.tcl:129
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "attention : Tcl ne supporte pas le codage '%s'."
+
+#: lib/commit.tcl:149
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -1344,7 +1391,7 @@ msgstr ""
 "\n"
 "Cela va être fait tout de suite automatiquement.\n"
 
-#: lib/commit.tcl:156
+#: lib/commit.tcl:172
 #, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"
@@ -1357,7 +1404,7 @@ msgstr ""
 "Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-"
 "commiter le fichier avant de pouvoir commiter.\n"
 
-#: lib/commit.tcl:164
+#: lib/commit.tcl:180
 #, tcl-format
 msgid ""
 "Unknown file state %s detected.\n"
@@ -1368,7 +1415,7 @@ msgstr ""
 "\n"
 "Le fichier %s ne peut pas être commité par ce programme.\n"
 
-#: lib/commit.tcl:172
+#: lib/commit.tcl:188
 msgid ""
 "No changes to commit.\n"
 "\n"
@@ -1378,7 +1425,7 @@ msgstr ""
 "\n"
 "Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n"
 
-#: lib/commit.tcl:187
+#: lib/commit.tcl:203
 msgid ""
 "Please supply a commit message.\n"
 "\n"
@@ -1396,45 +1443,40 @@ msgstr ""
 "- Deuxième ligne : rien.\n"
 "- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n"
 
-#: lib/commit.tcl:211
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "attention : Tcl ne supporte pas le codage '%s'."
-
-#: lib/commit.tcl:227
+#: lib/commit.tcl:234
 msgid "Calling pre-commit hook..."
 msgstr "Lancement de l'action d'avant-commit..."
 
-#: lib/commit.tcl:242
+#: lib/commit.tcl:249
 msgid "Commit declined by pre-commit hook."
 msgstr "Commit refusé par l'action d'avant-commit."
 
-#: lib/commit.tcl:265
+#: lib/commit.tcl:272
 msgid "Calling commit-msg hook..."
 msgstr "Lancement de l'action \"message de commit\"..."
 
-#: lib/commit.tcl:280
+#: lib/commit.tcl:287
 msgid "Commit declined by commit-msg hook."
 msgstr "Commit refusé par l'action \"message de commit\"."
 
-#: lib/commit.tcl:293
+#: lib/commit.tcl:300
 msgid "Committing changes..."
 msgstr "Commit des modifications..."
 
-#: lib/commit.tcl:309
+#: lib/commit.tcl:316
 msgid "write-tree failed:"
 msgstr "write-tree a échoué :"
 
-#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
+#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
 msgid "Commit failed."
 msgstr "Le commit a échoué."
 
-#: lib/commit.tcl:327
+#: lib/commit.tcl:334
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Le commit %s semble être corrompu"
 
-#: lib/commit.tcl:332
+#: lib/commit.tcl:339
 msgid ""
 "No changes to commit.\n"
 "\n"
@@ -1449,19 +1491,19 @@ msgstr ""
 "\n"
 "Une resynchronisation va être lancée tout de suite automatiquement.\n"
 
-#: lib/commit.tcl:339
+#: lib/commit.tcl:346
 msgid "No changes to commit."
 msgstr "Pas de modifications à commiter."
 
-#: lib/commit.tcl:353
+#: lib/commit.tcl:360
 msgid "commit-tree failed:"
 msgstr "commit-tree a échoué :"
 
-#: lib/commit.tcl:373
+#: lib/commit.tcl:381
 msgid "update-ref failed:"
 msgstr "update-ref a échoué :"
 
-#: lib/commit.tcl:461
+#: lib/commit.tcl:469
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "Commit %s créé : %s"
@@ -1514,13 +1556,13 @@ msgstr "Compression de la base des objets"
 msgid "Verifying the object database with fsck-objects"
 msgstr "Vérification de la base des objets avec fsck-objects"
 
-#: lib/database.tcl:108
+#: lib/database.tcl:107
 #, tcl-format
 msgid ""
 "This repository currently has approximately %i loose objects.\n"
 "\n"
 "To maintain optimal performance it is strongly recommended that you
compress " -"the database when more than %i loose objects exist.\n"
+"the database.\n"
 "\n"
 "Compress the database now?"
 msgstr ""
@@ -1528,8 +1570,7 @@ msgstr ""
 "particulier.\n"
 "\n"
 "Pour conserver une performance optimale, il est fortement recommandé de "
-"comprimer la base quand plus de %i objets ayant leur fichier particulier "
-"existent.\n"
+"comprimer la base de donnée.\n"
 "\n"
 "Comprimer la base maintenant ?"
 
@@ -1538,7 +1579,7 @@ msgstr ""
 msgid "Invalid date from Git: %s"
 msgstr "Date invalide de Git : %s"
 
-#: lib/diff.tcl:59
+#: lib/diff.tcl:64
 #, tcl-format
 msgid ""
 "No differences detected.\n"
@@ -1561,12 +1602,12 @@ msgstr ""
 "Une resynchronisation va être lancée automatiquement pour trouver d'autres "
 "fichiers qui pourraient se trouver dans le même état."
 
-#: lib/diff.tcl:99
+#: lib/diff.tcl:104
 #, tcl-format
 msgid "Loading diff of %s..."
 msgstr "Chargement des différences de %s..."
 
-#: lib/diff.tcl:120
+#: lib/diff.tcl:125
 msgid ""
 "LOCAL: deleted\n"
 "REMOTE:\n"
@@ -1574,7 +1615,7 @@ msgstr ""
 "LOCAL : supprimé\n"
 "DISTANT :\n"
 
-#: lib/diff.tcl:125
+#: lib/diff.tcl:130
 msgid ""
 "REMOTE: deleted\n"
 "LOCAL:\n"
@@ -1582,32 +1623,32 @@ msgstr ""
 "DISTANT : supprimé\n"
 "LOCAL :\n"
 
-#: lib/diff.tcl:132
+#: lib/diff.tcl:137
 msgid "LOCAL:\n"
 msgstr "LOCAL :\n"
 
-#: lib/diff.tcl:135
+#: lib/diff.tcl:140
 msgid "REMOTE:\n"
 msgstr "DISTANT :\n"
 
-#: lib/diff.tcl:197 lib/diff.tcl:296
+#: lib/diff.tcl:202 lib/diff.tcl:319
 #, tcl-format
 msgid "Unable to display %s"
 msgstr "Impossible d'afficher %s"
 
-#: lib/diff.tcl:198
+#: lib/diff.tcl:203
 msgid "Error loading file:"
 msgstr "Erreur lors du chargement du fichier :"
 
-#: lib/diff.tcl:205
+#: lib/diff.tcl:210
 msgid "Git Repository (subproject)"
 msgstr "Dépôt Git (sous projet)"
 
-#: lib/diff.tcl:217
+#: lib/diff.tcl:222
 msgid "* Binary file (not showing content)."
 msgstr "* Fichier binaire (pas d'apperçu du contenu)."
 
-#: lib/diff.tcl:222
+#: lib/diff.tcl:227
 #, tcl-format
 msgid ""
 "* Untracked file is %d bytes.\n"
@@ -1616,7 +1657,7 @@ msgstr ""
 "* Le fichier non suivi fait %d octets.\n"
 "* Seuls les %d premiers octets sont montrés.\n"
 
-#: lib/diff.tcl:228
+#: lib/diff.tcl:233
 #, tcl-format
 msgid ""
 "\n"
@@ -1627,19 +1668,19 @@ msgstr ""
 "* Fichier suivi raccourcis ici de %s.\n"
 "* Pour voir le fichier entier, utilisez un éditeur externe.\n"
 
-#: lib/diff.tcl:436
+#: lib/diff.tcl:482
 msgid "Failed to unstage selected hunk."
 msgstr "Échec lors de la désindexation de la section sélectionnée."
 
-#: lib/diff.tcl:443
+#: lib/diff.tcl:489
 msgid "Failed to stage selected hunk."
 msgstr "Échec lors de l'indexation de la section."
 
-#: lib/diff.tcl:509
+#: lib/diff.tcl:568
 msgid "Failed to unstage selected line."
 msgstr "Échec lors de la désindexation de la ligne sélectionnée."
 
-#: lib/diff.tcl:517
+#: lib/diff.tcl:576
 msgid "Failed to stage selected line."
 msgstr "Échec lors de l'indexation de la ligne."
 
@@ -1676,7 +1717,7 @@ msgstr "Impossible de déverrouiller l'index."
 msgid "Index Error"
 msgstr "Erreur de l'index"
 
-#: lib/index.tcl:21
+#: lib/index.tcl:17
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
@@ -1684,7 +1725,7 @@ msgstr ""
 "Échec de la mise à jour de l'index. Une resynchronisation va être lancée "
 "automatiquement."
 
-#: lib/index.tcl:27
+#: lib/index.tcl:28
 msgid "Continue"
 msgstr "Continuer"
 
@@ -1692,45 +1733,45 @@ msgstr "Continuer"
 msgid "Unlock Index"
 msgstr "Déverrouiller l'index"
 
-#: lib/index.tcl:287
+#: lib/index.tcl:289
 #, tcl-format
 msgid "Unstaging %s from commit"
 msgstr "Désindexation de : %s"
 
-#: lib/index.tcl:326
+#: lib/index.tcl:328
 msgid "Ready to commit."
 msgstr "Prêt à être commité."
 
-#: lib/index.tcl:339
+#: lib/index.tcl:341
 #, tcl-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: lib/index.tcl:396
+#: lib/index.tcl:398
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "Annuler les modifications dans le fichier %s ? "
 
-#: lib/index.tcl:398
+#: lib/index.tcl:400
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr "Annuler les modifications dans ces %i fichiers ?"
 
-#: lib/index.tcl:406
+#: lib/index.tcl:408
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Toutes les modifications non-indexées seront définitivement perdues par "
 "l'annulation."
 
-#: lib/index.tcl:409
+#: lib/index.tcl:411
 msgid "Do Nothing"
 msgstr "Ne rien faire"
 
-#: lib/index.tcl:427
+#: lib/index.tcl:429
 msgid "Reverting selected files"
 msgstr "Annuler modifications dans fichiers selectionnés"
 
-#: lib/index.tcl:431
+#: lib/index.tcl:433
 #, tcl-format
 msgid "Reverting %s"
 msgstr "Annulation des modifications dans %s"
@@ -1913,7 +1954,8 @@ msgstr ""
 #: lib/mergetool.tcl:45
 #, tcl-format
 msgid "File %s seems to have unresolved conflicts, still stage?"
-msgstr "Le fichier %s semble avoir des conflits non résolus, indexer quand
même ?" +msgstr ""
+"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?"
 
 #: lib/mergetool.tcl:60
 #, tcl-format
@@ -1922,7 +1964,9 @@ msgstr "Ajouter une résolution pour %s"
 
 #: lib/mergetool.tcl:141
 msgid "Cannot resolve deletion or link conflicts using a tool"
-msgstr "Impossible de résoudre la suppression ou de relier des conflits en
utilisant un outil" +msgstr ""
+"Impossible de résoudre la suppression ou de relier des conflits en
utilisant " +"un outil"
 
 #: lib/mergetool.tcl:146
 msgid "Conflict file does not exist"
@@ -2171,7 +2215,8 @@ msgstr "Récupération de %s"
 msgid "Do not know how to initialize repository at location '%s'."
 msgstr "Pas de méthode connue pour initialiser le dépôt à l'emplacement
'%s'." 
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
+#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
+#: lib/transport.tcl:81
 #, tcl-format
 msgid "push %s"
 msgstr "pousser %s"
@@ -2189,11 +2234,11 @@ msgstr "Supprimer une branche à distance"
 msgid "From Repository"
 msgstr "Dépôt source"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
 msgid "Remote:"
 msgstr "Branche distante :"
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
 msgid "Arbitrary Location:"
 msgstr "Emplacement arbitraire :"
 
@@ -2209,10 +2254,6 @@ msgstr "Supprimer seulement si"
 msgid "Merged Into:"
 msgstr "Fusionné dans :"
 
-#: lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr "Toujours (ne pas vérifier les fusions)"
-
 #: lib/remote_branch_delete.tcl:152
 msgid "A branch is required for 'Merged Into'."
 msgstr "Une branche est nécessaire pour 'Fusionné dans'."
@@ -2235,32 +2276,23 @@ msgid ""
 "necessary commits.  Try fetching from %s first."
 msgstr ""
 "Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas "
-"récupéré les commits nécessaires. Essayez de récupérer à partir de %s
d'abord." +"récupéré les commits nécessaires. Essayez de récupérer à partir
de %s " +"d'abord."
 
 #: lib/remote_branch_delete.tcl:207
 msgid "Please select one or more branches to delete."
 msgstr "Merci de sélectionner une ou plusieurs branches à supprimer."
 
-#: lib/remote_branch_delete.tcl:216
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr ""
-"Il est difficile de récupérer des branches supprimées.\n"
-"\n"
-"Supprimer les branches sélectionnées ?"
-
 #: lib/remote_branch_delete.tcl:226
 #, tcl-format
 msgid "Deleting branches from %s"
 msgstr "Suppression des branches de %s"
 
-#: lib/remote_branch_delete.tcl:286
+#: lib/remote_branch_delete.tcl:292
 msgid "No repository selected."
 msgstr "Aucun dépôt n'est sélectionné."
 
-#: lib/remote_branch_delete.tcl:291
+#: lib/remote_branch_delete.tcl:297
 #, tcl-format
 msgid "Scanning %s..."
 msgstr "Synchronisation de %s..."
@@ -2281,11 +2313,11 @@ msgstr "Précédent"
 msgid "Case-Sensitive"
 msgstr "Sensible à la casse"
 
-#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
 msgid "Cannot write shortcut:"
 msgstr "Impossible d'écrire le raccourci :"
 
-#: lib/shortcut.tcl:136
+#: lib/shortcut.tcl:137
 msgid "Cannot write icon:"
 msgstr "Impossible d'écrire l'icône :"
 
@@ -2440,7 +2472,8 @@ msgstr "Montrer une boîte de dialogue avant le
lancement" 
 #: lib/tools_dlg.tcl:80
 msgid "Ask the user to select a revision (sets $REVISION)"
-msgstr "Demander à l'utilisateur de sélectionner une révision (change
$REVISION)" +msgstr ""
+"Demander à l'utilisateur de sélectionner une révision (change $REVISION)"
 
 #: lib/tools_dlg.tcl:85
 msgid "Ask the user for additional arguments (sets $ARGS)"
@@ -2521,38 +2554,51 @@ msgstr "Nettoyer les branches de suivi supprimées de
%s" msgid "Pushing changes to %s"
 msgstr "Les modifications sont poussées vers %s"
 
-#: lib/transport.tcl:72
+#: lib/transport.tcl:64
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr "Dupliquer dans %s"
+
+#: lib/transport.tcl:82
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr "Pousse %s %s vers %s"
 
-#: lib/transport.tcl:89
+#: lib/transport.tcl:100
 msgid "Push Branches"
 msgstr "Pousser branches"
 
-#: lib/transport.tcl:103
+#: lib/transport.tcl:114
 msgid "Source Branches"
 msgstr "Branches source"
 
-#: lib/transport.tcl:120
+#: lib/transport.tcl:131
 msgid "Destination Repository"
 msgstr "Dépôt de destination"
 
-#: lib/transport.tcl:158
+#: lib/transport.tcl:169
 msgid "Transfer Options"
 msgstr "Options de transfert"
 
-#: lib/transport.tcl:160
+#: lib/transport.tcl:171
 msgid "Force overwrite existing branch (may discard changes)"
 msgstr ""
 "Forcer l'écrasement d'une branche existante (peut supprimer des "
 "modifications)"
 
-#: lib/transport.tcl:164
+#: lib/transport.tcl:175
 msgid "Use thin pack (for slow network connections)"
 msgstr "Utiliser des petits paquets (pour les connexions lentes)"
 
-#: lib/transport.tcl:168
+#: lib/transport.tcl:179
 msgid "Include tags"
 msgstr "Inclure les marques (tags)"

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2010-02-02 12:16 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-11 14:39 Bizarre french translation - fixes Alexandre Bourget
2008-08-11 14:39 ` [PATCH] Update french translation Alexandre Bourget
2008-08-11 15:20   ` Shawn O. Pearce
2008-08-11 19:19   ` Matthieu Moy
2008-08-11 21:17     ` Alexandre Bourget
2008-08-11 22:04       ` Matthieu Moy
2008-08-11 21:19     ` [PATCH] git-gui: " Alexandre Bourget
2008-08-11 21:19       ` [PATCH] git-gui: update all remaining translations to French Alexandre Bourget
  -- strict thread matches above, loose matches on Subject: below --
2010-02-01 15:16 git-gui translation updates needed Shawn O. Pearce
2010-02-02 12:18 ` [PATCH] git-gui: update french translation Emmanuel Trillaud

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).