{"thread":{"id":"18385","subject":"[PATCH] git-gui: various French translation fixes","startedAt":"2009-03-18T20:54:10Z","lastAt":"2009-03-21T18:57:45Z","messageCount":27,"participants":["Sam Hocevar","Christian Couder","Mike Hommey","Nicolas Sebrecht","Alexandre Bourget","Shawn O. Pearce","Nicolas Pitre"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"108419","messageId":"20090318205410.GA900@zoy.org","threadId":"18385","inReplyTo":null,"subject":"[PATCH] git-gui: various French translation fixes","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-18T20:54:10Z","receivedAt":"2009-03-18T20:54:10Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"Mostly grammar, spelling and typography fixes, but also a few wording\nenhancements here and there.\n\nSigned-off-by: Sam Hocevar <sam@zoy.org>\n---\n po/fr.po |  196 +++++++++++++++++++++++++++++++-------------------------------\n 1 files changed, 98 insertions(+), 98 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex 45773ab..eb5f68e 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -62,7 +62,7 @@ msgstr \"\"\n \"\\n\"\n \"%s nécessite au moins Git 1.5.0.\\n\"\n \"\\n\"\n-\"Peut'on considérer que '%s' est en version 1.5.0 ?\\n\"\n+\"Peut-on considérer que '%s' est en version 1.5.0 ?\\n\"\n \n #: git-gui.sh:1062\n msgid \"Git directory not found:\"\n@@ -82,7 +82,7 @@ msgstr \"Aucun répertoire de travail\"\n \n #: git-gui.sh:1247 lib/checkout_op.tcl:305\n msgid \"Refreshing file status...\"\n-msgstr \"Rafraichissement du status des fichiers...\"\n+msgstr \"Rafraîchissement du statut des fichiers...\"\n \n #: git-gui.sh:1303\n msgid \"Scanning for modified files ...\"\n@@ -163,7 +163,7 @@ msgstr \"Dépôt\"\n \n #: git-gui.sh:2281\n msgid \"Edit\"\n-msgstr \"Edition\"\n+msgstr \"Édition\"\n \n #: git-gui.sh:2283 lib/choose_rev.tcl:561\n msgid \"Branch\"\n@@ -199,7 +199,7 @@ msgstr \"Naviguer dans la branche...\"\n \n #: git-gui.sh:2316\n msgid \"Visualize Current Branch's History\"\n-msgstr \"Visualiser historique branche courante\"\n+msgstr \"Visualiser l'historique de la branche courante\"\n \n #: git-gui.sh:2320\n msgid \"Visualize All Branch History\"\n@@ -208,12 +208,12 @@ msgstr \"Voir l'historique de toutes les branches\"\n #: git-gui.sh:2327\n #, tcl-format\n msgid \"Browse %s's Files\"\n-msgstr \"Naviguer l'arborescence de %s\"\n+msgstr \"Parcourir l'arborescence de %s\"\n \n #: git-gui.sh:2329\n #, tcl-format\n msgid \"Visualize %s's History\"\n-msgstr \"Voir l'historique de la branche: %s\"\n+msgstr \"Voir l'historique de la branche : %s\"\n \n #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67\n msgid \"Database Statistics\"\n@@ -230,7 +230,7 @@ msgstr \"Vérifier le dépôt\"\n #: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7\n #: lib/shortcut.tcl:39 lib/shortcut.tcl:71\n msgid \"Create Desktop Icon\"\n-msgstr \"Créer icône sur bureau\"\n+msgstr \"Créer une icône sur le bureau\"\n \n #: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191\n msgid \"Quit\"\n@@ -320,7 +320,7 @@ msgstr \"Désindexer\"\n \n #: git-gui.sh:2484 lib/index.tcl:410\n msgid \"Revert Changes\"\n-msgstr \"Annuler les modifications (revert)\"\n+msgstr \"Révoquer les modifications\"\n \n #: git-gui.sh:2491 git-gui.sh:3069\n msgid \"Show Less Context\"\n@@ -382,7 +382,7 @@ msgstr \"Documentation en ligne\"\n \n #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n msgid \"Show SSH Key\"\n-msgstr \"Montrer clé SSH\"\n+msgstr \"Montrer la clé SSH\"\n \n #: git-gui.sh:2707\n #, tcl-format\n@@ -445,7 +445,7 @@ msgstr \"Fichier :\"\n \n #: git-gui.sh:3078\n msgid \"Refresh\"\n-msgstr \"Rafraichir\"\n+msgstr \"Rafraîchir\"\n \n #: git-gui.sh:3099\n msgid \"Decrease Font Size\"\n@@ -457,7 +457,7 @@ msgstr \"Agrandir la police\"\n \n #: git-gui.sh:3111 lib/blame.tcl:281\n msgid \"Encoding\"\n-msgstr \"Encodage\"\n+msgstr \"Codage des caractères\"\n \n #: git-gui.sh:3122\n msgid \"Apply/Reverse Hunk\"\n@@ -469,7 +469,7 @@ msgstr \"Appliquer/Inverser la ligne\"\n \n #: git-gui.sh:3137\n msgid \"Run Merge Tool\"\n-msgstr \"Lancer outil de merge\"\n+msgstr \"Lancer l'outil de fusion\"\n \n #: git-gui.sh:3142\n msgid \"Use Remote Version\"\n@@ -527,7 +527,7 @@ msgid \"\"\n \"Tcl binary distributed by Cygwin.\"\n msgstr \"\"\n \"\\n\"\n-\"Ceci est du à un problème connu avec\\n\"\n+\"Ceci est dû à un problème connu avec\\n\"\n \"le binaire Tcl distribué par Cygwin.\"\n \n #: git-gui.sh:3336\n@@ -630,11 +630,11 @@ msgstr \"Fichier original :\"\n \n #: lib/blame.tcl:1021\n msgid \"Cannot find HEAD commit:\"\n-msgstr \"Impossible de trouver le commit HEAD:\"\n+msgstr \"Impossible de trouver le commit HEAD :\"\n \n #: lib/blame.tcl:1076\n msgid \"Cannot find parent commit:\"\n-msgstr \"Impossible de trouver le commit parent:\"\n+msgstr \"Impossible de trouver le commit parent :\"\n \n #: lib/blame.tcl:1091\n msgid \"Unable to display parent\"\n@@ -646,7 +646,7 @@ msgstr \"Erreur lors du chargement des différences :\"\n \n #: lib/blame.tcl:1232\n msgid \"Originally By:\"\n-msgstr \"A l'origine par :\"\n+msgstr \"À l'origine par :\"\n \n #: lib/blame.tcl:1238\n msgid \"In File:\"\n@@ -691,11 +691,11 @@ msgstr \"Détacher de la branche locale\"\n \n #: lib/branch_create.tcl:22\n msgid \"Create Branch\"\n-msgstr \"Créer branche\"\n+msgstr \"Créer une branche\"\n \n #: lib/branch_create.tcl:27\n msgid \"Create New Branch\"\n-msgstr \"Créer nouvelle branche\"\n+msgstr \"Créer une nouvelle branche\"\n \n #: lib/branch_create.tcl:31 lib/choose_repository.tcl:377\n msgid \"Create\"\n@@ -719,7 +719,7 @@ msgstr \"Révision initiale\"\n \n #: lib/branch_create.tcl:72\n msgid \"Update Existing Branch:\"\n-msgstr \"Mettre à jour branche existante :\"\n+msgstr \"Mettre à jour une branche existante :\"\n \n #: lib/branch_create.tcl:75\n msgid \"No\"\n@@ -727,7 +727,7 @@ msgstr \"Non\"\n \n #: lib/branch_create.tcl:80\n msgid \"Fast Forward Only\"\n-msgstr \"Mise-à-jour rectiligne seulement (fast-forward)\"\n+msgstr \"Mise à jour rectiligne seulement (fast-forward)\"\n \n #: lib/branch_create.tcl:85 lib/checkout_op.tcl:536\n msgid \"Reset\"\n@@ -769,7 +769,7 @@ msgstr \"Branches locales\"\n \n #: lib/branch_delete.tcl:52\n msgid \"Delete Only If Merged Into\"\n-msgstr \"Supprimer seulement si fusionnée dans:\"\n+msgstr \"Supprimer seulement si fusionnée dans :\"\n \n #: lib/branch_delete.tcl:54\n msgid \"Always (Do not perform merge test.)\"\n@@ -786,7 +786,7 @@ msgid \"\"\n \"\\n\"\n \" Delete the selected branches?\"\n msgstr \"\"\n-\"Récupérer des branches supprimées est difficile.\\n\"\n+\"Il est difficile de récupérer des branches supprimées.\\n\"\n \"\\n\"\n \"Supprimer les branches sélectionnées ?\"\n \n@@ -796,7 +796,7 @@ msgid \"\"\n \"Failed to delete branches:\\n\"\n \"%s\"\n msgstr \"\"\n-\"La suppression des branches suivantes a échouée :\\n\"\n+\"La suppression des branches suivantes a échoué :\\n\"\n \"%s\"\n \n #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n@@ -902,11 +902,11 @@ msgstr \"La stratégie de fusion '%s' n'est pas supportée.\"\n #: lib/checkout_op.tcl:261\n #, tcl-format\n msgid \"Failed to update '%s'.\"\n-msgstr \"La mise à jour de '%s' a échouée.\"\n+msgstr \"La mise à jour de '%s' a échoué.\"\n \n #: lib/checkout_op.tcl:273\n msgid \"Staging area (index) is already locked.\"\n-msgstr \"L'index (staging area) est déjà vérouillé\"\n+msgstr \"L'index (staging area) est déjà verrouillé.\"\n \n #: lib/checkout_op.tcl:288\n msgid \"\"\n@@ -918,7 +918,7 @@ msgid \"\"\n \"The rescan will be automatically started now.\\n\"\n msgstr \"\"\n \"L'état lors de la dernière synchronisation ne correspond plus à l'état du \"\n-\"dépôt\\n\"\n+\"dépôt.\\n\"\n \"\\n\"\n \"Un autre programme Git a modifié ce dépôt depuis la dernière \"\n \"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir \"\n@@ -956,9 +956,9 @@ msgid \"\"\n \"If you wanted to be on a branch, create one now starting from 'This Detached \"\n \"Checkout'.\"\n msgstr \"\"\n-\"Vous n'êtes plus ur une branche locale.\\n\"\n+\"Vous n'êtes plus sur une branche locale.\\n\"\n \"\\n\"\n-\"Si vous vouliez être sur une branche, créez en une maintenant en partant de \"\n+\"Si vous vouliez être sur une branche, créez-en une maintenant en partant de \"\n \"'Cet emprunt détaché'.\"\n \n #: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472\n@@ -1000,7 +1000,7 @@ msgstr \"\"\n \"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a \"\n \"échouée.\\n\"\n \"\\n\"\n-\"Cela n'aurait pas du se produire. %s va abandonner et se terminer.\"\n+\"Cela n'aurait pas dû se produire. %s va abandonner et se terminer.\"\n \n #: lib/choose_font.tcl:39\n msgid \"Select\"\n@@ -1023,8 +1023,8 @@ msgid \"\"\n \"This is example text.\\n\"\n \"If you like this text, it can be your font.\"\n msgstr \"\"\n-\"C'est un texte d'exemple.\\n\"\n-\"Si vous aimez ce texte, vous pouvez choisir cette police\"\n+\"Ceci est un texte d'exemple.\\n\"\n+\"Si vous aimez ce texte, vous pouvez choisir cette police.\"\n \n #: lib/choose_repository.tcl:28\n msgid \"Git Gui\"\n@@ -1040,7 +1040,7 @@ msgstr \"Nouveau...\"\n \n #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465\n msgid \"Clone Existing Repository\"\n-msgstr \"Cloner dépôt existant\"\n+msgstr \"Cloner un dépôt existant\"\n \n #: lib/choose_repository.tcl:106\n msgid \"Clone...\"\n@@ -1048,7 +1048,7 @@ msgstr \"Cloner...\"\n \n #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983\n msgid \"Open Existing Repository\"\n-msgstr \"Ouvrir dépôt existant\"\n+msgstr \"Ouvrir un dépôt existant\"\n \n #: lib/choose_repository.tcl:119\n msgid \"Open...\"\n@@ -1056,17 +1056,17 @@ msgstr \"Ouvrir...\"\n \n #: lib/choose_repository.tcl:132\n msgid \"Recent Repositories\"\n-msgstr \"Dépôt récemment utilisés\"\n+msgstr \"Dépôts récemment utilisés\"\n \n #: lib/choose_repository.tcl:138\n msgid \"Open Recent Repository:\"\n-msgstr \"Ouvrir dépôt récent :\"\n+msgstr \"Ouvrir un dépôt récent :\"\n \n #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309\n #: lib/choose_repository.tcl:316\n #, tcl-format\n msgid \"Failed to create repository %s:\"\n-msgstr \"La création du dépôt %s a échouée :\"\n+msgstr \"La création du dépôt %s a échoué :\"\n \n #: lib/choose_repository.tcl:387\n msgid \"Directory:\"\n@@ -1093,11 +1093,11 @@ msgstr \"Cloner\"\n \n #: lib/choose_repository.tcl:473\n msgid \"Source Location:\"\n-msgstr \"Emplacement source:\"\n+msgstr \"Emplacement source :\"\n \n #: lib/choose_repository.tcl:484\n msgid \"Target Directory:\"\n-msgstr \"Répertoire cible:\"\n+msgstr \"Répertoire cible :\"\n \n #: lib/choose_repository.tcl:496\n msgid \"Clone Type:\"\n@@ -1137,7 +1137,7 @@ msgstr \"L'emplacement %s existe déjà.\"\n \n #: lib/choose_repository.tcl:622\n msgid \"Failed to configure origin\"\n-msgstr \"La configuration de l'origine a échouée.\"\n+msgstr \"La configuration de l'origine a échoué.\"\n \n #: lib/choose_repository.tcl:634\n msgid \"Counting objects\"\n@@ -1242,7 +1242,7 @@ msgstr \"fichiers\"\n \n #: lib/choose_repository.tcl:962\n msgid \"Initial file checkout failed.\"\n-msgstr \"Chargement initial du fichier échoué.\"\n+msgstr \"Le chargement initial du fichier a échoué.\"\n \n #: lib/choose_repository.tcl:978\n msgid \"Open\"\n@@ -1292,7 +1292,7 @@ msgstr \"L'expression de révision est vide.\"\n \n #: lib/choose_rev.tcl:531\n msgid \"Updated\"\n-msgstr \"Mise-à-jour:\"\n+msgstr \"Mise à jour:\"\n \n #: lib/choose_rev.tcl:559\n msgid \"URL\"\n@@ -1320,8 +1320,8 @@ msgid \"\"\n msgstr \"\"\n \"Impossible de corriger pendant une fusion.\\n\"\n \"\\n\"\n-\"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement \"\n-\"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous \"\n+\"Vous êtes actuellement au milieu d'une fusion qui n'a pas été complètement \"\n+\"terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous \"\n \"abandonnez la fusion courante.\\n\"\n \n #: lib/commit.tcl:49\n@@ -1409,7 +1409,7 @@ msgstr \"\"\n #: lib/commit.tcl:211\n #, tcl-format\n msgid \"warning: Tcl does not support encoding '%s'.\"\n-msgstr \"attention : Tcl ne supporte pas l'encodage '%s'.\"\n+msgstr \"attention : Tcl ne supporte pas le codage '%s'.\"\n \n #: lib/commit.tcl:227\n msgid \"Calling pre-commit hook...\"\n@@ -1469,12 +1469,12 @@ msgstr \"commit-tree a échoué :\"\n \n #: lib/commit.tcl:373\n msgid \"update-ref failed:\"\n-msgstr \"update-ref a échoué\"\n+msgstr \"update-ref a échoué :\"\n \n #: lib/commit.tcl:461\n #, tcl-format\n msgid \"Created commit %s: %s\"\n-msgstr \"Commit créé %s : %s\"\n+msgstr \"Commit %s créé : %s\"\n \n #: lib/console.tcl:59\n msgid \"Working... please wait...\"\n@@ -1581,24 +1581,24 @@ msgid \"\"\n \"LOCAL: deleted\\n\"\n \"REMOTE:\\n\"\n msgstr \"\"\n-\"LOCAL: supprimé\\n\"\n-\"DISTANT:\\n\"\n+\"LOCAL : supprimé\\n\"\n+\"DISTANT :\\n\"\n \n #: lib/diff.tcl:125\n msgid \"\"\n \"REMOTE: deleted\\n\"\n \"LOCAL:\\n\"\n msgstr \"\"\n-\"DISTANT: supprimé\\n\"\n-\"LOCAL:\\n\"\n+\"DISTANT : supprimé\\n\"\n+\"LOCAL :\\n\"\n \n #: lib/diff.tcl:132\n msgid \"LOCAL:\\n\"\n-msgstr \"LOCAL:\\n\"\n+msgstr \"LOCAL :\\n\"\n \n #: lib/diff.tcl:135\n msgid \"REMOTE:\\n\"\n-msgstr \"DISTANT:\\n\"\n+msgstr \"DISTANT :\\n\"\n \n #: lib/diff.tcl:197 lib/diff.tcl:296\n #, tcl-format\n@@ -1624,7 +1624,7 @@ msgid \"\"\n \"* Showing only first %d bytes.\\n\"\n msgstr \"\"\n \"* Le fichier non suivi fait %d octets.\\n\"\n-\"* On montre seulement les premiers %d octets.\\n\"\n+\"* Seuls les %d premiers octets sont montrés.\\n\"\n \n #: lib/diff.tcl:228\n #, tcl-format\n@@ -1635,7 +1635,7 @@ msgid \"\"\n msgstr \"\"\n \"\\n\"\n \"* Fichier suivi raccourcis ici de %s.\\n\"\n-\"* Pour voir le fichier entier, utiliser un éditeur externe.\\n\"\n+\"* Pour voir le fichier entier, utilisez un éditeur externe.\\n\"\n \n #: lib/diff.tcl:436\n msgid \"Failed to unstage selected hunk.\"\n@@ -1680,7 +1680,7 @@ msgstr \"Vous devez corriger les erreurs suivantes avant de pouvoir commiter.\"\n \n #: lib/index.tcl:6\n msgid \"Unable to unlock the index.\"\n-msgstr \"Impossible de dévérouiller l'index.\"\n+msgstr \"Impossible de déverrouiller l'index.\"\n \n #: lib/index.tcl:15\n msgid \"Index Error\"\n@@ -1700,12 +1700,12 @@ msgstr \"Continuer\"\n \n #: lib/index.tcl:31\n msgid \"Unlock Index\"\n-msgstr \"Déverouiller l'index\"\n+msgstr \"Déverrouiller l'index\"\n \n #: lib/index.tcl:287\n #, tcl-format\n msgid \"Unstaging %s from commit\"\n-msgstr \"Désindexation de: %s\"\n+msgstr \"Désindexation de : %s\"\n \n #: lib/index.tcl:326\n msgid \"Ready to commit.\"\n@@ -1719,18 +1719,18 @@ msgstr \"Ajout de %s\"\n #: lib/index.tcl:396\n #, tcl-format\n msgid \"Revert changes in file %s?\"\n-msgstr \"Annuler les modifications dans le fichier %s ? \"\n+msgstr \"Révoquer les modifications dans le fichier %s ? \"\n \n #: lib/index.tcl:398\n #, tcl-format\n msgid \"Revert changes in these %i files?\"\n-msgstr \"Annuler les modifications dans ces %i fichiers ?\"\n+msgstr \"Révoquer les modifications dans ces %i fichiers ?\"\n \n #: lib/index.tcl:406\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"\"\n \"Toutes les modifications non-indexées seront définitivement perdues par \"\n-\"l'annulation.\"\n+\"la révocation.\"\n \n #: lib/index.tcl:409\n msgid \"Do Nothing\"\n@@ -1738,12 +1738,12 @@ msgstr \"Ne rien faire\"\n \n #: lib/index.tcl:427\n msgid \"Reverting selected files\"\n-msgstr \"Annuler modifications dans fichiers selectionnés\"\n+msgstr \"Révocation en cours des fichiers selectionnés\"\n \n #: lib/index.tcl:431\n #, tcl-format\n msgid \"Reverting %s\"\n-msgstr \"Annulation des modifications dans %s\"\n+msgstr \"Révocation en cours de %s\"\n \n #: lib/merge.tcl:13\n msgid \"\"\n@@ -1804,11 +1804,11 @@ msgid \"\"\n msgstr \"\"\n \"Vous êtes au milieu d'une modification.\\n\"\n \"\\n\"\n-\"Le fichier %s est modifié.\\n\"\n+\"Le fichier %s a été modifié.\\n\"\n \"\\n\"\n \"Vous devriez terminer le commit courant avant de lancer une fusion. En \"\n \"faisait comme cela, vous éviterez de devoir éventuellement abandonner une \"\n-\"fusion ayant échouée.\\n\"\n+\"fusion ayant échoué.\\n\"\n \n #: lib/merge.tcl:107\n #, tcl-format\n@@ -1826,7 +1826,7 @@ msgstr \"La fusion s'est faite avec succès.\"\n \n #: lib/merge.tcl:133\n msgid \"Merge failed.  Conflict resolution is required.\"\n-msgstr \"La fusion a echouée. Il est nécessaire de résoudre les conflicts.\"\n+msgstr \"La fusion a echoué. Il est nécessaire de résoudre les conflits.\"\n \n #: lib/merge.tcl:158\n #, tcl-format\n@@ -1914,16 +1914,16 @@ msgid \"\"\n \"\\n\"\n \"This operation can be undone only by restarting the merge.\"\n msgstr \"\"\n-\"Noter que le diff ne montre que les modifications en conflict.\\n\"\n+\"Noter que le diff ne montre que les modifications en conflit.\\n\"\n \"\\n\"\n \"%s sera écrasé.\\n\"\n \"\\n\"\n-\"Cette opération ne peut être défaite qu'en relançant la fusion.\"\n+\"Cette opération ne peut être inversée qu'en relançant la fusion.\"\n \n #: lib/mergetool.tcl:45\n #, tcl-format\n msgid \"File %s seems to have unresolved conflicts, still stage?\"\n-msgstr \"Le fichier %s semble avoir des conflicts non résolus, indéxer quand même ?\"\n+msgstr \"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?\"\n \n #: lib/mergetool.tcl:60\n #, tcl-format\n@@ -1932,11 +1932,11 @@ msgstr \"Ajouter une résolution pour %s\"\n \n #: lib/mergetool.tcl:141\n msgid \"Cannot resolve deletion or link conflicts using a tool\"\n-msgstr \"Impossible de résoudre la suppression ou de relier des conflicts en utilisant un outil\"\n+msgstr \"Impossible de résoudre la suppression ou de relier des conflits en utilisant un outil\"\n \n #: lib/mergetool.tcl:146\n msgid \"Conflict file does not exist\"\n-msgstr \"Le fichier en conflict n'existe pas.\"\n+msgstr \"Le fichier en conflit n'existe pas.\"\n \n #: lib/mergetool.tcl:264\n #, tcl-format\n@@ -1958,7 +1958,7 @@ msgid \"\"\n \"Error retrieving versions:\\n\"\n \"%s\"\n msgstr \"\"\n-\"Erreur lors de la récupération des versions:\\n\"\n+\"Erreur lors de la récupération des versions :\\n\"\n \"%s\"\n \n #: lib/mergetool.tcl:343\n@@ -1968,7 +1968,7 @@ msgid \"\"\n \"\\n\"\n \"%s\"\n msgstr \"\"\n-\"Impossible de lancer l'outil de fusion:\\n\"\n+\"Impossible de lancer l'outil de fusion :\\n\"\n \"\\n\"\n \"%s\"\n \n@@ -1983,12 +1983,12 @@ msgstr \"L'outil de fusion a échoué.\"\n #: lib/option.tcl:11\n #, tcl-format\n msgid \"Invalid global encoding '%s'\"\n-msgstr \"Encodage global invalide '%s'\"\n+msgstr \"Codage global '%s' invalide\"\n \n #: lib/option.tcl:19\n #, tcl-format\n msgid \"Invalid repo encoding '%s'\"\n-msgstr \"Encodage de dépôt invalide '%s'\"\n+msgstr \"Codage de dépôt '%s' invalide\"\n \n #: lib/option.tcl:117\n msgid \"Restore Defaults\"\n@@ -2001,7 +2001,7 @@ msgstr \"Sauvegarder\"\n #: lib/option.tcl:131\n #, tcl-format\n msgid \"%s Repository\"\n-msgstr \"Dépôt: %s\"\n+msgstr \"Dépôt : %s\"\n \n #: lib/option.tcl:132\n msgid \"Global (All Repositories)\"\n@@ -2069,7 +2069,7 @@ msgstr \"Nouveau modèle de nom de branche\"\n \n #: lib/option.tcl:155\n msgid \"Default File Contents Encoding\"\n-msgstr \"Encodage du contenu des fichiers par défaut\"\n+msgstr \"Codage du contenu des fichiers par défaut\"\n \n #: lib/option.tcl:203\n msgid \"Change\"\n@@ -2098,11 +2098,11 @@ msgstr \"Préférences\"\n \n #: lib/option.tcl:314\n msgid \"Failed to completely save options:\"\n-msgstr \"La sauvegarde complète des options a échouée :\"\n+msgstr \"La sauvegarde complète des options a échoué :\"\n \n #: lib/remote.tcl:163\n msgid \"Remove Remote\"\n-msgstr \"Supprimer dépôt distant\"\n+msgstr \"Supprimer un dépôt distant\"\n \n #: lib/remote.tcl:168\n msgid \"Prune from\"\n@@ -2118,11 +2118,11 @@ msgstr \"Pousser vers\"\n \n #: lib/remote_add.tcl:19\n msgid \"Add Remote\"\n-msgstr \"Ajouter dépôt distant\"\n+msgstr \"Ajouter un dépôt distant\"\n \n #: lib/remote_add.tcl:24\n msgid \"Add New Remote\"\n-msgstr \"Ajouter nouveau dépôt distant\"\n+msgstr \"Ajouter un nouveau dépôt distant\"\n \n #: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36\n msgid \"Add\"\n@@ -2134,7 +2134,7 @@ msgstr \"Détails des dépôts distants\"\n \n #: lib/remote_add.tcl:50\n msgid \"Location:\"\n-msgstr \"Emplacement:\"\n+msgstr \"Emplacement :\"\n \n #: lib/remote_add.tcl:62\n msgid \"Further Action\"\n@@ -2146,7 +2146,7 @@ msgstr \"Récupérer immédiatement\"\n \n #: lib/remote_add.tcl:71\n msgid \"Initialize Remote Repository and Push\"\n-msgstr \"Initialiser dépôt distant et pousser\"\n+msgstr \"Initialiser un dépôt distant et pousser\"\n \n #: lib/remote_add.tcl:77\n msgid \"Do Nothing Else Now\"\n@@ -2193,7 +2193,7 @@ msgstr \"Mise en place de %s (à %s)\"\n \n #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n msgid \"Delete Branch Remotely\"\n-msgstr \"Supprimer branche à distance\"\n+msgstr \"Supprimer une branche à distance\"\n \n #: lib/remote_branch_delete.tcl:47\n msgid \"From Repository\"\n@@ -2244,7 +2244,7 @@ msgid \"\"\n \"One or more of the merge tests failed because you have not fetched the \"\n \"necessary commits.  Try fetching from %s first.\"\n msgstr \"\"\n-\"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas \"\n+\"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas \"\n \"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord.\"\n \n #: lib/remote_branch_delete.tcl:207\n@@ -2257,14 +2257,14 @@ msgid \"\"\n \"\\n\"\n \"Delete the selected branches?\"\n msgstr \"\"\n-\"Récupérer des branches supprimées est difficile.\\n\"\n+\"Il est difficile de récupérer des branches supprimées.\\n\"\n \"\\n\"\n-\"Souhaitez vous supprimer les branches sélectionnées ?\"\n+\"Supprimer les branches sélectionnées ?\"\n \n #: lib/remote_branch_delete.tcl:226\n #, tcl-format\n msgid \"Deleting branches from %s\"\n-msgstr \"Supprimer les branches de %s\"\n+msgstr \"Suppression des branches de %s\"\n \n #: lib/remote_branch_delete.tcl:286\n msgid \"No repository selected.\"\n@@ -2285,7 +2285,7 @@ msgstr \"Suivant\"\n \n #: lib/search.tcl:24\n msgid \"Prev\"\n-msgstr \"Précédant\"\n+msgstr \"Précédent\"\n \n #: lib/search.tcl:25\n msgid \"Case-Sensitive\"\n@@ -2293,7 +2293,7 @@ msgstr \"Sensible à la casse\"\n \n #: lib/shortcut.tcl:20 lib/shortcut.tcl:61\n msgid \"Cannot write shortcut:\"\n-msgstr \"Impossible d'écrire le raccourcis :\"\n+msgstr \"Impossible d'écrire le raccourci :\"\n \n #: lib/shortcut.tcl:136\n msgid \"Cannot write icon:\"\n@@ -2318,7 +2318,7 @@ msgstr \"Réinitialisation du dictionnaire à %s.\"\n \n #: lib/spellcheck.tcl:73\n msgid \"Spell checker silently failed on startup\"\n-msgstr \"La vérification d'orthographe a échouée silentieusement au démarrage\"\n+msgstr \"La vérification d'orthographe a échoué silencieusement au démarrage\"\n \n #: lib/spellcheck.tcl:80\n msgid \"Unrecognized spell checker\"\n@@ -2351,11 +2351,11 @@ msgstr \"Générer une clé\"\n \n #: lib/sshkey.tcl:56\n msgid \"Copy To Clipboard\"\n-msgstr \"Copier dans le presse papier\"\n+msgstr \"Copier dans le presse-papier\"\n \n #: lib/sshkey.tcl:70\n msgid \"Your OpenSSH Public Key\"\n-msgstr \"Votre clé publique Open SSH\"\n+msgstr \"Votre clé publique OpenSSH\"\n \n #: lib/sshkey.tcl:78\n msgid \"Generating...\"\n@@ -2368,7 +2368,7 @@ msgid \"\"\n \"\\n\"\n \"%s\"\n msgstr \"\"\n-\"Impossible de lancer ssh-keygen:\\n\"\n+\"Impossible de lancer ssh-keygen :\\n\"\n \"\\n\"\n \"%s\"\n \n@@ -2398,7 +2398,7 @@ msgstr \"Lancer %s nécessite qu'un fichier soit sélectionné.\"\n #: lib/tools.tcl:90\n #, tcl-format\n msgid \"Are you sure you want to run %s?\"\n-msgstr \"Êtes vous sûr de vouloir lancer %s ?\"\n+msgstr \"Êtes-vous sûr de vouloir lancer %s ?\"\n \n #: lib/tools.tcl:110\n #, tcl-format\n@@ -2422,11 +2422,11 @@ msgstr \"L'outil a échoué : %s\"\n \n #: lib/tools_dlg.tcl:22\n msgid \"Add Tool\"\n-msgstr \"Ajouter outil\"\n+msgstr \"Ajouter un outil\"\n \n #: lib/tools_dlg.tcl:28\n msgid \"Add New Tool Command\"\n-msgstr \"Ajouter nouvelle commande d'outil\"\n+msgstr \"Ajouter une nouvelle commande d'outil\"\n \n #: lib/tools_dlg.tcl:33\n msgid \"Add globally\"\n@@ -2438,7 +2438,7 @@ msgstr \"Détails sur l'outil\"\n \n #: lib/tools_dlg.tcl:48\n msgid \"Use '/' separators to create a submenu tree:\"\n-msgstr \"Utiliser les séparateurs '/' pour créer un arbre de sous menus :\"\n+msgstr \"Utiliser les séparateurs '/' pour créer un arbre de sous-menus :\"\n \n #: lib/tools_dlg.tcl:61\n msgid \"Command:\"\n@@ -2479,7 +2479,7 @@ msgid \"\"\n \"Could not add tool:\\n\"\n \"%s\"\n msgstr \"\"\n-\"Impossible d'ajouter l'outil:\\n\"\n+\"Impossible d'ajouter l'outil :\\n\"\n \"%s\"\n \n #: lib/tools_dlg.tcl:190\n-- \n1.6.2\n"},{"id":"108473","messageId":"200903190609.25344.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"20090318205410.GA900@zoy.org","subject":"Re: [PATCH] git-gui: various French translation fixes","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-19T05:09:25Z","receivedAt":"2009-03-19T05:09:25Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le mercredi 18 mars 2009, Sam Hocevar a écrit :\n> Mostly grammar, spelling and typography fixes, but also a few wording\n> enhancements here and there.\n\nIt looks mostly good to me.\n\n> Signed-off-by: Sam Hocevar <sam@zoy.org>\n> ---\n>  po/fr.po |  196\n> +++++++++++++++++++++++++++++++------------------------------- 1 files\n> changed, 98 insertions(+), 98 deletions(-)\n>\n>  #: git-gui.sh:2484 lib/index.tcl:410\n>  msgid \"Revert Changes\"\n> -msgstr \"Annuler les modifications (revert)\"\n> +msgstr \"Révoquer les modifications\"\n\nI am not sure that \"Révoquer\" is better than \"Annuler\".\n\n[...]\n\n>  #: lib/index.tcl:326\n>  msgid \"Ready to commit.\"\n> @@ -1719,18 +1719,18 @@ msgstr \"Ajout de %s\"\n>  #: lib/index.tcl:396\n>  #, tcl-format\n>  msgid \"Revert changes in file %s?\"\n> -msgstr \"Annuler les modifications dans le fichier %s ? \"\n> +msgstr \"Révoquer les modifications dans le fichier %s ? \"\n>\n>  #: lib/index.tcl:398\n>  #, tcl-format\n>  msgid \"Revert changes in these %i files?\"\n> -msgstr \"Annuler les modifications dans ces %i fichiers ?\"\n> +msgstr \"Révoquer les modifications dans ces %i fichiers ?\"\n>\n>  #: lib/index.tcl:406\n>  msgid \"Any unstaged changes will be permanently lost by the revert.\"\n>  msgstr \"\"\n>  \"Toutes les modifications non-indexées seront définitivement perdues par\n> \" -\"l'annulation.\"\n> +\"la révocation.\"\n\nSame thing for the 3 strings above.\n\n[...]\n\n>  #: lib/index.tcl:427\n>  msgid \"Reverting selected files\"\n> -msgstr \"Annuler modifications dans fichiers selectionnés\"\n> +msgstr \"Révocation en cours des fichiers selectionnés\"\n>\n>  #: lib/index.tcl:431\n>  #, tcl-format\n>  msgid \"Reverting %s\"\n> -msgstr \"Annulation des modifications dans %s\"\n> +msgstr \"Révocation en cours de %s\"\n\nSame thing above.\n\n>  #: lib/remote_branch_delete.tcl:47\n>  msgid \"From Repository\"\n> @@ -2244,7 +2244,7 @@ msgid \"\"\n>  \"One or more of the merge tests failed because you have not fetched the\n> \" \"necessary commits.  Try fetching from %s first.\"\n>  msgstr \"\"\n> -\"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez\n> pas \"\n> +\"Un ou plusieurs des tests de fusion ont échoué parce que vous \n> n'avez pas \"\n> \"récupéré les commits nécessaires. Essayez de récupéré à \n> partir de %s d'abord.\"\n\nThe last \"récupéré\" should be changed to \"récupérer\".\n\nThanks,\nChristian.\n"},{"id":"108475","messageId":"200903190714.25211.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"200903190609.25344.chriscool@tuxfamily.org","subject":"Re: [PATCH] git-gui: various French translation fixes","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-19T06:14:25Z","receivedAt":"2009-03-19T06:14:25Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Hi Sam,\n\nLe jeudi 19 mars 2009, Christian Couder a écrit :\n> Le mercredi 18 mars 2009, Sam Hocevar a écrit :\n> > Mostly grammar, spelling and typography fixes, but also a few wording\n> > enhancements here and there.\n>\n> It looks mostly good to me.\n>\n> > Signed-off-by: Sam Hocevar <sam@zoy.org>\n> > ---\n> >  po/fr.po |  196\n> > +++++++++++++++++++++++++++++++------------------------------- 1 files\n> > changed, 98 insertions(+), 98 deletions(-)\n> >\n> >  #: git-gui.sh:2484 lib/index.tcl:410\n> >  msgid \"Revert Changes\"\n> > -msgstr \"Annuler les modifications (revert)\"\n> > +msgstr \"Révoquer les modifications\"\n>\n> I am not sure that \"Révoquer\" is better than \"Annuler\".\n\nPerhaps \"Inverser\"?\n\nThanks,\nChristian.\n"},{"id":"108479","messageId":"20090319070246.GA6561@glandium.org","threadId":"18385","inReplyTo":"200903190609.25344.chriscool@tuxfamily.org","subject":"Re: [PATCH] git-gui: various French translation fixes","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2009-03-19T07:02:46Z","receivedAt":"2009-03-19T07:02:46Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Thu, Mar 19, 2009 at 06:09:25AM +0100, Christian Couder wrote:\n> Le mercredi 18 mars 2009, Sam Hocevar a écrit :\n> > Mostly grammar, spelling and typography fixes, but also a few wording\n> > enhancements here and there.\n> \n> It looks mostly good to me.\n> \n> > Signed-off-by: Sam Hocevar <sam@zoy.org>\n> > ---\n> >  po/fr.po |  196\n> > +++++++++++++++++++++++++++++++------------------------------- 1 files\n> > changed, 98 insertions(+), 98 deletions(-)\n> >\n> >  #: git-gui.sh:2484 lib/index.tcl:410\n> >  msgid \"Revert Changes\"\n> > -msgstr \"Annuler les modifications (revert)\"\n> > +msgstr \"Révoquer les modifications\"\n> \n> I am not sure that \"Révoquer\" is better than \"Annuler\".\n> \n> [...]\n> \n> >  #: lib/index.tcl:326\n> >  msgid \"Ready to commit.\"\n> > @@ -1719,18 +1719,18 @@ msgstr \"Ajout de %s\"\n> >  #: lib/index.tcl:396\n> >  #, tcl-format\n> >  msgid \"Revert changes in file %s?\"\n> > -msgstr \"Annuler les modifications dans le fichier %s ? \"\n> > +msgstr \"Révoquer les modifications dans le fichier %s ? \"\n> >\n> >  #: lib/index.tcl:398\n> >  #, tcl-format\n> >  msgid \"Revert changes in these %i files?\"\n> > -msgstr \"Annuler les modifications dans ces %i fichiers ?\"\n> > +msgstr \"Révoquer les modifications dans ces %i fichiers ?\"\n> >\n> >  #: lib/index.tcl:406\n> >  msgid \"Any unstaged changes will be permanently lost by the revert.\"\n> >  msgstr \"\"\n> >  \"Toutes les modifications non-indexées seront définitivement perdues par\n> > \" -\"l'annulation.\"\n> > +\"la révocation.\"\n> \n> Same thing for the 3 strings above.\n\nI'm not sure i like \"non-indexées\" for \"unstaged\"\n\n> [...]\n> \n> >  #: lib/index.tcl:427\n> >  msgid \"Reverting selected files\"\n> > -msgstr \"Annuler modifications dans fichiers selectionnés\"\n> > +msgstr \"Révocation en cours des fichiers selectionnés\"\n> >\n> >  #: lib/index.tcl:431\n> >  #, tcl-format\n> >  msgid \"Reverting %s\"\n> > -msgstr \"Annulation des modifications dans %s\"\n> > +msgstr \"Révocation en cours de %s\"\n> \n> Same thing above.\n> \n> >  #: lib/remote_branch_delete.tcl:47\n> >  msgid \"From Repository\"\n> > @@ -2244,7 +2244,7 @@ msgid \"\"\n> >  \"One or more of the merge tests failed because you have not fetched the\n> > \" \"necessary commits.  Try fetching from %s first.\"\n> >  msgstr \"\"\n> > -\"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez\n> > pas \"\n> > +\"Un ou plusieurs des tests de fusion ont échoué parce que vous \n> > n'avez pas \"\n> > \"récupéré les commits nécessaires. Essayez de récupéré à \n> > partir de %s d'abord.\"\n> \n> The last \"récupéré\" should be changed to \"récupérer\".\n\nNo it shouldn't, it's \"vous n'avez pas récupéré\"\n\nMike\n"},{"id":"108480","messageId":"200903190811.52956.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"20090319070246.GA6561@glandium.org","subject":"Re: [PATCH] git-gui: various French translation fixes","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-19T07:11:52Z","receivedAt":"2009-03-19T07:11:52Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le jeudi 19 mars 2009, Mike Hommey a écrit :\n> On Thu, Mar 19, 2009 at 06:09:25AM +0100, Christian Couder wrote:\n> > Le mercredi 18 mars 2009, Sam Hocevar a écrit :\n> > >  #: lib/remote_branch_delete.tcl:47\n> > >  msgid \"From Repository\"\n> > > @@ -2244,7 +2244,7 @@ msgid \"\"\n> > >  \"One or more of the merge tests failed because you have not fetched\n> > > the \" \"necessary commits.  Try fetching from %s first.\"\n> > >  msgstr \"\"\n> > > -\"Une ou plusieurs des tests de fusion ont échoués parce que vous\n> > > n'avez pas \"\n> > > +\"Un ou plusieurs des tests de fusion ont échoué parce que vous\n> > > n'avez pas \"\n> > > \"récupéré les commits nécessaires. Essayez de récupéré à\n> > > partir de %s d'abord.\"\n> >\n> > The last \"récupéré\" should be changed to \"récupérer\".\n>\n> No it shouldn't, it's \"vous n'avez pas récupéré\"\n\nThe last one is \"Essayez de récupéré\" but it should be \"Essayez de \nrécupérer\".\n\nRegards,\nChristian.\n"},{"id":"108486","messageId":"20090319075855.GJ27280@zoy.org","threadId":"18385","inReplyTo":"200903190714.25211.chriscool@tuxfamily.org","subject":"Re: [PATCH] git-gui: various French translation fixes","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-19T07:58:55Z","receivedAt":"2009-03-19T07:58:55Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"On Thu, Mar 19, 2009, Christian Couder wrote:\n> > >  #: git-gui.sh:2484 lib/index.tcl:410\n> > >  msgid \"Revert Changes\"\n> > > -msgstr \"Annuler les modifications (revert)\"\n> > > +msgstr \"Révoquer les modifications\"\n> >\n> > I am not sure that \"Révoquer\" is better than \"Annuler\".\n> \n> Perhaps \"Inverser\"?\n\n   I suggested \"révoquer\" because it was close enough to \"revert\" that\nthere was no need to specify \"(revert)\" in the translation itself.\nIt's what the French Wikipedia interface used to say to revert edits.\nBut I see they now use \"défaire\" (undo), so apparently they deemed\nit inappropriate for some reason. I have no strong preference for\n\"Inverser\" or even \"Annuler\", I just want it to be consistent and to get\nrid of the \"(revert)\" at the end of this message.\n\nCheers,\n-- \nSam.\n"},{"id":"108523","messageId":"20090319124901.GM27280@zoy.org","threadId":"18385","inReplyTo":"20090319075855.GJ27280@zoy.org","subject":"Re: [PATCH] git-gui: various French translation fixes","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-19T12:49:02Z","receivedAt":"2009-03-19T12:49:02Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"On Thu, Mar 19, 2009, Sam Hocevar wrote:\n> On Thu, Mar 19, 2009, Christian Couder wrote:\n> > > >  #: git-gui.sh:2484 lib/index.tcl:410\n> > > >  msgid \"Revert Changes\"\n> > > > -msgstr \"Annuler les modifications (revert)\"\n> > > > +msgstr \"Révoquer les modifications\"\n> > >\n> > > I am not sure that \"Révoquer\" is better than \"Annuler\".\n> > \n> > Perhaps \"Inverser\"?\n> \n>    I suggested \"révoquer\" because it was close enough to \"revert\" that\n> there was no need to specify \"(revert)\" in the translation itself.\n> It's what the French Wikipedia interface used to say to revert edits.\n> But I see they now use \"défaire\" (undo), so apparently they deemed\n> it inappropriate for some reason. I have no strong preference for\n> \"Inverser\" or even \"Annuler\", I just want it to be consistent and to get\n> rid of the \"(revert)\" at the end of this message.\n\n   Sorry, I misread the Wikipedia interface because I wasn't logged in\nand only admins can truly revert edits. So it does have \"revert\" (to\ncancel an edit) and \"undo\" (to perform the opposite edit of a given\nedit), which get translated to \"révoquer\" and \"défaire\". I therefore\nthink \"révoquer\" is just as good as the others.\n\n-- \nSam.\n"},{"id":"108562","messageId":"20090319183839.GA12913@vidovic","threadId":"18385","inReplyTo":"20090319124901.GM27280@zoy.org","subject":"[PATCH] Re: git-gui: various French translation fixes","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-19T18:38:39Z","receivedAt":"2009-03-19T18:38:39Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\nOn Thu, Mar 19, 2009 at 01:49:02PM +0100, Sam Hocevar wrote:\n> \n> On Thu, Mar 19, 2009, Sam Hocevar wrote:\n> > On Thu, Mar 19, 2009, Christian Couder wrote:\n> > > > >  #: git-gui.sh:2484 lib/index.tcl:410\n> > > > >  msgid \"Revert Changes\"\n> > > > > -msgstr \"Annuler les modifications (revert)\"\n> > > > > +msgstr \"Révoquer les modifications\"\n> > > >\n> > > > I am not sure that \"Révoquer\" is better than \"Annuler\".\n> > > \n> > > Perhaps \"Inverser\"?\n\n[...]\n\n>    Sorry, I misread the Wikipedia interface because I wasn't logged in\n> and only admins can truly revert edits.\n\nI don't think that we have to conform to Wikipédia.\n\n>                                         So it does have \"revert\" (to\n> cancel an edit) and \"undo\" (to perform the opposite edit of a given\n> edit), which get translated to \"révoquer\" and \"défaire\". I therefore\n> think \"révoquer\" is just as good as the others.\n\nI disagree here.\n\n\"Annuler\", \"Révoquer\", \"Inverser\" or \"Défaire\" usualy stands for the\nsame thing but : \n- thoses words doesn't have stricly the same meanings ;\n- we are in a special case here because of the underlying technical\n  result.\n\nWe should care that the revert operation does *not* remove a commit but\nadd a new one (this makes sense to Git). As a consequence, we should avoid\n\"Annuler\", \"Révoquer\" and \"Défaire\".\n\n\"Inverser\" looks like the best translation.\n\n-- \nNicolas Sebrecht\n"},{"id":"108635","messageId":"1237510442-29534-1-git-send-email-nicolas.s-dev@laposte.net","threadId":"18385","inReplyTo":"20090318205410.GA900@zoy.org","subject":"git-gui: some French translation enhancements","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-20T00:54:01Z","receivedAt":"2009-03-20T00:54:01Z","isPatch":false,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\nThis one is built on top of the previous Sam's patch.\n"},{"id":"108636","messageId":"5b4295c484a9659d1c5813e1859f192c34d6a99e.1237506346.git.nicolas.s-dev@laposte.net","threadId":"18385","inReplyTo":"20090318205410.GA900@zoy.org","subject":"[PATCH 2/2] git-gui: some French translation enhancements","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-20T00:54:02Z","receivedAt":"2009-03-20T00:54:02Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\n\nSigned-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>\n---\n po/fr.po |   21 ++++++++++-----------\n 1 files changed, 10 insertions(+), 11 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex eb5f68e..2f96054 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -316,11 +316,11 @@ msgstr \"Indexer toutes modifications\"\n \n #: git-gui.sh:2479\n msgid \"Unstage From Commit\"\n-msgstr \"Désindexer\"\n+msgstr \"Retirer de l'index\"\n \n #: git-gui.sh:2484 lib/index.tcl:410\n msgid \"Revert Changes\"\n-msgstr \"Révoquer les modifications\"\n+msgstr \"Inverser les modifications (revert)\"\n \n #: git-gui.sh:2491 git-gui.sh:3069\n msgid \"Show Less Context\"\n@@ -485,11 +485,11 @@ msgstr \"Revenir à la version de base\"\n \n #: git-gui.sh:3169\n msgid \"Unstage Hunk From Commit\"\n-msgstr \"Désindexer la section\"\n+msgstr \"Enlever la section de l'index\"\n \n #: git-gui.sh:3170\n msgid \"Unstage Line From Commit\"\n-msgstr \"Désindexer la ligne\"\n+msgstr \"Enlever la ligne de l'index\"\n \n #: git-gui.sh:3172\n msgid \"Stage Hunk For Commit\"\n@@ -1705,7 +1705,7 @@ msgstr \"Déverrouiller l'index\"\n #: lib/index.tcl:287\n #, tcl-format\n msgid \"Unstaging %s from commit\"\n-msgstr \"Désindexation de : %s\"\n+msgstr \"Enlève %s de l'index\"\n \n #: lib/index.tcl:326\n msgid \"Ready to commit.\"\n@@ -1719,18 +1719,17 @@ msgstr \"Ajout de %s\"\n #: lib/index.tcl:396\n #, tcl-format\n msgid \"Revert changes in file %s?\"\n-msgstr \"Révoquer les modifications dans le fichier %s ? \"\n+msgstr \"Inverser les modifications dans le fichier %s ? \"\n \n #: lib/index.tcl:398\n #, tcl-format\n msgid \"Revert changes in these %i files?\"\n-msgstr \"Révoquer les modifications dans ces %i fichiers ?\"\n+msgstr \"Inverser les modifications dans ces %i fichiers ?\"\n \n #: lib/index.tcl:406\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"\"\n-\"Toutes les modifications non-indexées seront définitivement perdues par \"\n-\"la révocation.\"\n+\"Toutes les modifications non-indexées seront définitivement perdues.\"\n \n #: lib/index.tcl:409\n msgid \"Do Nothing\"\n@@ -1738,12 +1737,12 @@ msgstr \"Ne rien faire\"\n \n #: lib/index.tcl:427\n msgid \"Reverting selected files\"\n-msgstr \"Révocation en cours des fichiers selectionnés\"\n+msgstr \"Inversion en cours des fichiers selectionnés\"\n \n #: lib/index.tcl:431\n #, tcl-format\n msgid \"Reverting %s\"\n-msgstr \"Révocation en cours de %s\"\n+msgstr \"Inversion en cours de %s\"\n \n #: lib/merge.tcl:13\n msgid \"\"\n-- \n1.6.2.169.g92418\n"},{"id":"108658","messageId":"200903200745.50700.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"20090319183839.GA12913@vidovic","subject":"Re: [PATCH] Re: git-gui: various French translation fixes","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-20T06:45:50Z","receivedAt":"2009-03-20T06:45:50Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le jeudi 19 mars 2009, Nicolas Sebrecht a écrit :\n> On Thu, Mar 19, 2009 at 01:49:02PM +0100, Sam Hocevar wrote:\n> > On Thu, Mar 19, 2009, Sam Hocevar wrote:\n> > > On Thu, Mar 19, 2009, Christian Couder wrote:\n> > > > > >  #: git-gui.sh:2484 lib/index.tcl:410\n> > > > > >  msgid \"Revert Changes\"\n> > > > > > -msgstr \"Annuler les modifications (revert)\"\n> > > > > > +msgstr \"Révoquer les modifications\"\n> > > > >\n> > > > > I am not sure that \"Révoquer\" is better than \"Annuler\".\n> > > >\n> > > > Perhaps \"Inverser\"?\n>\n> [...]\n>\n> >    Sorry, I misread the Wikipedia interface because I wasn't logged in\n> > and only admins can truly revert edits.\n>\n> I don't think that we have to conform to Wikipédia.\n>\n> >                                         So it does have \"revert\" (to\n> > cancel an edit) and \"undo\" (to perform the opposite edit of a given\n> > edit), which get translated to \"révoquer\" and \"défaire\". I therefore\n> > think \"révoquer\" is just as good as the others.\n>\n> I disagree here.\n>\n> \"Annuler\", \"Révoquer\", \"Inverser\" or \"Défaire\" usualy stands for the\n> same thing but :\n> - thoses words doesn't have stricly the same meanings ;\n> - we are in a special case here because of the underlying technical\n>   result.\n>\n> We should care that the revert operation does *not* remove a commit but\n> add a new one (this makes sense to Git). As a consequence, we should\n> avoid \"Annuler\", \"Révoquer\" and \"Défaire\".\n>\n> \"Inverser\" looks like the best translation.\n\nYeah, I agree with that reasoning.\n\nRegards,\nChristian.\n"},{"id":"108662","messageId":"20090320071316.GB5693@glandium.org","threadId":"18385","inReplyTo":"5b4295c484a9659d1c5813e1859f192c34d6a99e.1237506346.git.nicolas.s-dev@laposte.net","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2009-03-20T07:13:16Z","receivedAt":"2009-03-20T07:13:16Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> \n> \n> Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>\n> ---\n>  po/fr.po |   21 ++++++++++-----------\n>  1 files changed, 10 insertions(+), 11 deletions(-)\n> \n> diff --git a/po/fr.po b/po/fr.po\n> index eb5f68e..2f96054 100644\n> --- a/po/fr.po\n> +++ b/po/fr.po\n> @@ -316,11 +316,11 @@ msgstr \"Indexer toutes modifications\"\n>  \n>  #: git-gui.sh:2479\n>  msgid \"Unstage From Commit\"\n> -msgstr \"Désindexer\"\n> +msgstr \"Retirer de l'index\"\n\nIMHO, we should find a better way to say that than to use the \"index\"\nword at all. This obviously applies to all uses of \"index\" in french\nwhere we avoided it in english.\n\nOTOH, the best I can find for \"staging area\" is \"zone de préparation\",\nand that doesn't help finding a word for stage and unstage.\n\nMike\n"},{"id":"108665","messageId":"20090320073751.GO27280@zoy.org","threadId":"18385","inReplyTo":"5b4295c484a9659d1c5813e1859f192c34d6a99e.1237506346.git.nicolas.s-dev@laposte.net","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-20T07:37:51Z","receivedAt":"2009-03-20T07:37:51Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"On Fri, Mar 20, 2009, Nicolas Sebrecht wrote:\n\n   Last minor fix :\n\n> -msgstr \"Révocation en cours des fichiers selectionnés\"\n> +msgstr \"Inversion en cours des fichiers selectionnés\"\n                                            ^\n\t\t\t\t\t   sélectionnés\n\n-- \nSam.\n"},{"id":"108666","messageId":"200903200841.02052.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"5b4295c484a9659d1c5813e1859f192c34d6a99e.1237506346.git.nicolas.s-dev@laposte.net","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-20T07:41:01Z","receivedAt":"2009-03-20T07:41:01Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le vendredi 20 mars 2009, Nicolas Sebrecht a écrit :\n> Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>\n> ---\n>  po/fr.po |   21 ++++++++++-----------\n>  1 files changed, 10 insertions(+), 11 deletions(-)\n\nAcked-by: Christian Couder <chriscool@tuxfamily.org>\n\nShawn,\n\nCould you add Sam's patch and this one on top of Sam's patch?\n\nCould you also squash the following change:\n\ns/Essayez de récupéré/Essayez de récupérer/\n\nIf you prefer me to send yet another patch for this last change, please tell \nme.\n\nThanks,\nChristian.\n"},{"id":"108722","messageId":"1237559694.25283.46.camel@alexandre-desktop","threadId":"18385","inReplyTo":"20090320071316.GB5693@glandium.org","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Alexandre Bourget","fromEmail":"alexandre.bourget@savoirfairelinux.com","sentAt":"2009-03-20T14:34:54Z","receivedAt":"2009-03-20T14:34:54Z","isPatch":true,"sender":{"key":"alexandre.bourget@savoirfairelinux.com","avatar":null},"body":"Le vendredi 20 mars 2009 à 08:13 +0100, Mike Hommey a écrit :\n> On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> IMHO, we should find a better way to say that than to use the \"index\"\n> word at all. This obviously applies to all uses of \"index\" in french\n> where we avoided it in english.\n> \n> OTOH, the best I can find for \"staging area\" is \"zone de préparation\",\n> and that doesn't help finding a word for stage and unstage.\n\n\"zone de préparation\" sounds good to me.\n\n\n-------------\n\n> [from another e-mail]\n> > We should care that the revert operation does *not* remove a commit but\n> > add a new one (this makes sense to Git). As a consequence, we should\n> > avoid \"Annuler\", \"Révoquer\" and \"Défaire\".\n> >\n> > \"Inverser\" looks like the best translation.\n\n> Yeah, I agree with that reasoning.\n\nHmm.. if you look at the git-gui program, when we use \"Revert\", it's not\nalways the usage of the git-revert command that is invoked.\n\nMost of the time, it's the equivalent of running \"git reset --hard\", or\n\"git checkout path/filename.ext\" (in fact, it uses git-checkout-index,\nsee git-gui/lib/index.tcl::revert_helper..).\n\nThat is true for example in the \"Commit\" menu, 3rd to last item, which\nreads in french \"Inverser les modifications\" or \"Révoker les\nmodifications\" as I modified it at some point.\n\nWhat happens here, is really not inversion of modifications; we're just\nwiping out all changes from the working dir, back to HEAD. Several of\nthe translated messages are used in *that* context. \n\n\nSo, considering this, which one of: \"Annuler\", \"Révoquer\", \"Défaire\",\n\"Effacer\", \"Restaurer l'original\", \"Scrapper\", \"Trucider\", \"Supprimer\" +\n\"les modifications\" would be best ?\n\nIt should be obvious that it's going to affect the blue icons, and that\nthose modifications will dissapear forever.\n\nAlso note that \"svn revert\" does like git-checkout-index, and not like\ngit-revert, so the terms must be clear here, even in English.\n\n\nAlexandre\n\n-- \nAlexandre Bourget\nDirecteur adjoint au développement\nConsultant en Logiciel Libre\nSavoir-faire Linux Inc.\nalexandre.bourget@savoirfairelinux.com\n514-276-5468 poste 124\n"},{"id":"108724","messageId":"20090320150336.GA23521@spearce.org","threadId":"18385","inReplyTo":"200903200841.02052.chriscool@tuxfamily.org","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-20T15:03:36Z","receivedAt":"2009-03-20T15:03:36Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Christian Couder <chriscool@tuxfamily.org> wrote:\n> Le vendredi 20 mars 2009, Nicolas Sebrecht a ?crit :\n> > Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>\n> > ---\n> >  po/fr.po |   21 ++++++++++-----------\n> >  1 files changed, 10 insertions(+), 11 deletions(-)\n> \n> Acked-by: Christian Couder <chriscool@tuxfamily.org>\n> \n> Shawn,\n> \n> Could you add Sam's patch and this one on top of Sam's patch?\n> \n> Could you also squash the following change:\n> \n> s/Essayez de r?cup?r?/Essayez de r?cup?rer/\n> \n> If you prefer me to send yet another patch for this last change, please tell \n> me.\n\nIt would really help me if translation patches didn't require me\nto hand-edit them.  My email client mangles them bad enough as\nit is, and I can only read English, so its very likely I'd wind\nup mangling a translation of \"revert\" into \"your cow ate my pig,\nplease give me your truck as payment\".\n\n\n-- \nShawn.\n"},{"id":"108745","messageId":"alpine.LFD.2.00.0903201438570.30483@xanadu.home","threadId":"18385","inReplyTo":"1237559694.25283.46.camel@alexandre-desktop","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Nicolas Pitre","fromEmail":"nico@cam.org","sentAt":"2009-03-20T18:42:50Z","receivedAt":"2009-03-20T18:42:50Z","isPatch":true,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"On Fri, 20 Mar 2009, Alexandre Bourget wrote:\n\n> Le vendredi 20 mars 2009 à 08:13 +0100, Mike Hommey a écrit :\n> > On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> > IMHO, we should find a better way to say that than to use the \"index\"\n> > word at all. This obviously applies to all uses of \"index\" in french\n> > where we avoided it in english.\n> > \n> > OTOH, the best I can find for \"staging area\" is \"zone de préparation\",\n> > and that doesn't help finding a word for stage and unstage.\n> \n> \"zone de préparation\" sounds good to me.\n\nWhat about:\n\n\t\"staging area\" -> \"zone de regroupement\"\n\t\"to stage\" -> \"regrouper\"\n\t\"to unstage\" -> \"dégrouper\"\n\nBut admitedly this doesn't convay the actual meaning perfectly either.\n\n\nNicolas\n"},{"id":"108751","messageId":"20090320194356.GA17190@glandium.org","threadId":"18385","inReplyTo":"alpine.LFD.2.00.0903201438570.30483@xanadu.home","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2009-03-20T19:43:56Z","receivedAt":"2009-03-20T19:43:56Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Fri, Mar 20, 2009 at 02:42:50PM -0400, Nicolas Pitre wrote:\n> On Fri, 20 Mar 2009, Alexandre Bourget wrote:\n> \n> > Le vendredi 20 mars 2009 à 08:13 +0100, Mike Hommey a écrit :\n> > > On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> > > IMHO, we should find a better way to say that than to use the \"index\"\n> > > word at all. This obviously applies to all uses of \"index\" in french\n> > > where we avoided it in english.\n> > > \n> > > OTOH, the best I can find for \"staging area\" is \"zone de préparation\",\n> > > and that doesn't help finding a word for stage and unstage.\n> > \n> > \"zone de préparation\" sounds good to me.\n> \n> What about:\n> \n> \t\"staging area\" -> \"zone de regroupement\"\n> \t\"to stage\" -> \"regrouper\"\n> \t\"to unstage\" -> \"dégrouper\"\n> \n> But admitedly this doesn't convay the actual meaning perfectly either.\n\nIt sounds kinda weird. Staging is not really close to gathering.\n\nMike\n"},{"id":"108782","messageId":"200903210448.19368.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"1237559694.25283.46.camel@alexandre-desktop","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-21T03:48:19Z","receivedAt":"2009-03-21T03:48:19Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le vendredi 20 mars 2009, Alexandre Bourget a écrit :\n> Le vendredi 20 mars 2009 à 08:13 +0100, Mike Hommey a écrit :\n> > On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> > IMHO, we should find a better way to say that than to use the \"index\"\n> > word at all. This obviously applies to all uses of \"index\" in french\n> > where we avoided it in english.\n> >\n> > OTOH, the best I can find for \"staging area\" is \"zone de préparation\",\n> > and that doesn't help finding a word for stage and unstage.\n>\n> \"zone de préparation\" sounds good to me.\n>\n>\n> -------------\n>\n> > [from another e-mail]\n> >\n> > > We should care that the revert operation does *not* remove a commit\n> > > but add a new one (this makes sense to Git). As a consequence, we\n> > > should avoid \"Annuler\", \"Révoquer\" and \"Défaire\".\n> > >\n> > > \"Inverser\" looks like the best translation.\n> >\n> > Yeah, I agree with that reasoning.\n>\n> Hmm.. if you look at the git-gui program, when we use \"Revert\", it's not\n> always the usage of the git-revert command that is invoked.\n>\n> Most of the time, it's the equivalent of running \"git reset --hard\", or\n> \"git checkout path/filename.ext\" (in fact, it uses git-checkout-index,\n> see git-gui/lib/index.tcl::revert_helper..).\n>\n> That is true for example in the \"Commit\" menu, 3rd to last item, which\n> reads in french \"Inverser les modifications\" or \"Révoker les\n> modifications\" as I modified it at some point.\n>\n> What happens here, is really not inversion of modifications; we're just\n> wiping out all changes from the working dir, back to HEAD. Several of\n> the translated messages are used in *that* context.\n>\n>\n> So, considering this, which one of: \"Annuler\", \"Révoquer\", \"Défaire\",\n> \"Effacer\", \"Restaurer l'original\", \"Scrapper\", \"Trucider\", \"Supprimer\" +\n> \"les modifications\" would be best ?\n\nConsidering what you said, I think \"Annuler\" is best, but we really should \nremove \"(revert)\"  in \"Annuler les modifications (revert)\" as it is \ndefinitely misleading translators ;-)\n\nSam could you please send a newer version of you original patch with the \nabove change and:\n\ns/Essayez de récupéré/Essayez de récupérer/\ns/selectionnés/sélectionnés/\n\nAbout the index/staging area/adding/staging/unstaging, I think there is not \nyet an agreeement about how we should translate that so we should discuss \nit further.\n\nThanks,\nChristian.\n"},{"id":"108783","messageId":"200903210454.34296.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"alpine.LFD.2.00.0903201438570.30483@xanadu.home","subject":"Re: [PATCH 2/2] git-gui: some French translation enhancements","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-21T03:54:34Z","receivedAt":"2009-03-21T03:54:34Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le vendredi 20 mars 2009, Nicolas Pitre a écrit :\n> On Fri, 20 Mar 2009, Alexandre Bourget wrote:\n> > Le vendredi 20 mars 2009 à 08:13 +0100, Mike Hommey a écrit :\n> > > On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> > > IMHO, we should find a better way to say that than to use the \"index\"\n> > > word at all. This obviously applies to all uses of \"index\" in french\n> > > where we avoided it in english.\n> > >\n> > > OTOH, the best I can find for \"staging area\" is \"zone de\n> > > préparation\", and that doesn't help finding a word for stage and\n> > > unstage.\n> >\n> > \"zone de préparation\" sounds good to me.\n>\n> What about:\n>\n> \t\"staging area\" -> \"zone de regroupement\"\n> \t\"to stage\" -> \"regrouper\"\n> \t\"to unstage\" -> \"dégrouper\"\n>\n> But admitedly this doesn't convay the actual meaning perfectly either.\n\nWhat about something like:\n\n\t\"staging area\" -> \"panier\"\n\t\"to stage\" -> \"ajouter au panier\"\n\t\"to unstage\" -> \"enlever du panier\"\n\nRegards,\nChristian.\n"},{"id":"108788","messageId":"20090321093336.GA12971@vidovic","threadId":"18385","inReplyTo":"20090320150336.GA23521@spearce.org","subject":"[PATCH 2/2] Re: git-gui: some French translation enhancements","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-21T09:33:36Z","receivedAt":"2009-03-21T09:33:36Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\nOn Fri, Mar 20, 2009 at 08:03:36AM -0700, Shawn O. Pearce wrote:\n\n> It would really help me if translation patches didn't require me\n> to hand-edit them.  My email client mangles them bad enough as\n> it is, and I can only read English, so its very likely I'd wind\n> up mangling a translation of \"revert\" into \"your cow ate my pig,\n> please give me your truck as payment\".\n\nYes, I'm going to work that way. I'll provide a new (complete) version\nof this topic when most french people here will agree with proposed\npatches.\n\n-- \nNicolas Sebrecht\n"},{"id":"108789","messageId":"20090321101426.GB12971@vidovic","threadId":"18385","inReplyTo":"1237559694.25283.46.camel@alexandre-desktop","subject":"[PATCH 2/2] Re: git-gui: some French translation enhancements","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-21T10:14:26Z","receivedAt":"2009-03-21T10:14:26Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\nOn Fri, Mar 20, 2009 at 10:34:54AM -0400, Alexandre Bourget wrote:                                                                                                           \n>\n> Le vendredi 20 mars 2009 à 08:13 +0100, Mike Hommey a écrit :\n> > On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> > IMHO, we should find a better way to say that than to use the \"index\"\n> > word at all. This obviously applies to all uses of \"index\" in french\n> > where we avoided it in english.\n> >\n> > OTOH, the best I can find for \"staging area\" is \"zone de préparation\",\n> > and that doesn't help finding a word for stage and unstage.\n>\n> \"zone de préparation\" sounds good to me.\n\nI'm not sure we are doing more good than bad. The \"index\" is a\ntechnical's Git word which has its own sense in Git.\n\nWe could provide a pure \"only french terms\" translation but I'm not sure\nit's the best way to work in software translation.\n\n\"Index\" is a one of theses terms having a \"special meaning in place\".\nIt stands in English for \"staging area\" and could have the same meaning\nin french mainly because we don't have a good french word to that\nspecial use case.\n\n\"Index\" as-is in the french po is NOT a non-sense. Also, french people\nnewbie in Git would easily find help for the index (most websites are in\nenglish).\n\n-- \nNicolas Sebrecht\n"},{"id":"108790","messageId":"20090321102748.GC12971@vidovic","threadId":"18385","inReplyTo":"1237559694.25283.46.camel@alexandre-desktop","subject":"[PATCH 2/2] Re: git-gui: some French translation enhancements","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-21T10:27:48Z","receivedAt":"2009-03-21T10:27:48Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\nOn Fri, Mar 20, 2009 at 10:34:54AM -0400, Alexandre Bourget wrote:\n\n> Hmm.. if you look at the git-gui program, when we use \"Revert\", it's not\n> always the usage of the git-revert command that is invoked.\n> \n> Most of the time, it's the equivalent of running \"git reset --hard\", or\n> \"git checkout path/filename.ext\" (in fact, it uses git-checkout-index,\n> see git-gui/lib/index.tcl::revert_helper..).\n> \n> That is true for example in the \"Commit\" menu, 3rd to last item, which\n> reads in french \"Inverser les modifications\" or \"Révoker les\n> modifications\" as I modified it at some point.\n> \n> What happens here, is really not inversion of modifications; we're just\n> wiping out all changes from the working dir, back to HEAD. Several of\n> the translated messages are used in *that* context. \n\nGood point. Thanks.\n\n-- \nNicolas Sebrecht\n"},{"id":"108795","messageId":"7102a296e91c8602c200b1431a74c7eb6592146e.1237646585.git.nicolas.s-dev@laposte.net","threadId":"18385","inReplyTo":"20090321102748.GC12971@vidovic","subject":"[PATCH v2 1/2] git-gui: various French translation fixes","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-21T14:47:05Z","receivedAt":"2009-03-21T14:47:05Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\nFrom: Sam Hocevar <sam@zoy.org>\n\nMostly grammar, spelling and typography fixes, but also a few wording\nenhancements here and there.\n\nSigned-off-by: Sam Hocevar <sam@zoy.org>\nSigned-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>\n---\n po/fr.po |  196 +++++++++++++++++++++++++++++++-------------------------------\n 1 files changed, 98 insertions(+), 98 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex 45773ab..eb5f68e 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -62,7 +62,7 @@ msgstr \"\"\n \"\\n\"\n \"%s nécessite au moins Git 1.5.0.\\n\"\n \"\\n\"\n-\"Peut'on considérer que '%s' est en version 1.5.0 ?\\n\"\n+\"Peut-on considérer que '%s' est en version 1.5.0 ?\\n\"\n \n #: git-gui.sh:1062\n msgid \"Git directory not found:\"\n@@ -82,7 +82,7 @@ msgstr \"Aucun répertoire de travail\"\n \n #: git-gui.sh:1247 lib/checkout_op.tcl:305\n msgid \"Refreshing file status...\"\n-msgstr \"Rafraichissement du status des fichiers...\"\n+msgstr \"Rafraîchissement du statut des fichiers...\"\n \n #: git-gui.sh:1303\n msgid \"Scanning for modified files ...\"\n@@ -163,7 +163,7 @@ msgstr \"Dépôt\"\n \n #: git-gui.sh:2281\n msgid \"Edit\"\n-msgstr \"Edition\"\n+msgstr \"Édition\"\n \n #: git-gui.sh:2283 lib/choose_rev.tcl:561\n msgid \"Branch\"\n@@ -199,7 +199,7 @@ msgstr \"Naviguer dans la branche...\"\n \n #: git-gui.sh:2316\n msgid \"Visualize Current Branch's History\"\n-msgstr \"Visualiser historique branche courante\"\n+msgstr \"Visualiser l'historique de la branche courante\"\n \n #: git-gui.sh:2320\n msgid \"Visualize All Branch History\"\n@@ -208,12 +208,12 @@ msgstr \"Voir l'historique de toutes les branches\"\n #: git-gui.sh:2327\n #, tcl-format\n msgid \"Browse %s's Files\"\n-msgstr \"Naviguer l'arborescence de %s\"\n+msgstr \"Parcourir l'arborescence de %s\"\n \n #: git-gui.sh:2329\n #, tcl-format\n msgid \"Visualize %s's History\"\n-msgstr \"Voir l'historique de la branche: %s\"\n+msgstr \"Voir l'historique de la branche : %s\"\n \n #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67\n msgid \"Database Statistics\"\n@@ -230,7 +230,7 @@ msgstr \"Vérifier le dépôt\"\n #: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7\n #: lib/shortcut.tcl:39 lib/shortcut.tcl:71\n msgid \"Create Desktop Icon\"\n-msgstr \"Créer icône sur bureau\"\n+msgstr \"Créer une icône sur le bureau\"\n \n #: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191\n msgid \"Quit\"\n@@ -320,7 +320,7 @@ msgstr \"Désindexer\"\n \n #: git-gui.sh:2484 lib/index.tcl:410\n msgid \"Revert Changes\"\n-msgstr \"Annuler les modifications (revert)\"\n+msgstr \"Révoquer les modifications\"\n \n #: git-gui.sh:2491 git-gui.sh:3069\n msgid \"Show Less Context\"\n@@ -382,7 +382,7 @@ msgstr \"Documentation en ligne\"\n \n #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n msgid \"Show SSH Key\"\n-msgstr \"Montrer clé SSH\"\n+msgstr \"Montrer la clé SSH\"\n \n #: git-gui.sh:2707\n #, tcl-format\n@@ -445,7 +445,7 @@ msgstr \"Fichier :\"\n \n #: git-gui.sh:3078\n msgid \"Refresh\"\n-msgstr \"Rafraichir\"\n+msgstr \"Rafraîchir\"\n \n #: git-gui.sh:3099\n msgid \"Decrease Font Size\"\n@@ -457,7 +457,7 @@ msgstr \"Agrandir la police\"\n \n #: git-gui.sh:3111 lib/blame.tcl:281\n msgid \"Encoding\"\n-msgstr \"Encodage\"\n+msgstr \"Codage des caractères\"\n \n #: git-gui.sh:3122\n msgid \"Apply/Reverse Hunk\"\n@@ -469,7 +469,7 @@ msgstr \"Appliquer/Inverser la ligne\"\n \n #: git-gui.sh:3137\n msgid \"Run Merge Tool\"\n-msgstr \"Lancer outil de merge\"\n+msgstr \"Lancer l'outil de fusion\"\n \n #: git-gui.sh:3142\n msgid \"Use Remote Version\"\n@@ -527,7 +527,7 @@ msgid \"\"\n \"Tcl binary distributed by Cygwin.\"\n msgstr \"\"\n \"\\n\"\n-\"Ceci est du à un problème connu avec\\n\"\n+\"Ceci est dû à un problème connu avec\\n\"\n \"le binaire Tcl distribué par Cygwin.\"\n \n #: git-gui.sh:3336\n@@ -630,11 +630,11 @@ msgstr \"Fichier original :\"\n \n #: lib/blame.tcl:1021\n msgid \"Cannot find HEAD commit:\"\n-msgstr \"Impossible de trouver le commit HEAD:\"\n+msgstr \"Impossible de trouver le commit HEAD :\"\n \n #: lib/blame.tcl:1076\n msgid \"Cannot find parent commit:\"\n-msgstr \"Impossible de trouver le commit parent:\"\n+msgstr \"Impossible de trouver le commit parent :\"\n \n #: lib/blame.tcl:1091\n msgid \"Unable to display parent\"\n@@ -646,7 +646,7 @@ msgstr \"Erreur lors du chargement des différences :\"\n \n #: lib/blame.tcl:1232\n msgid \"Originally By:\"\n-msgstr \"A l'origine par :\"\n+msgstr \"À l'origine par :\"\n \n #: lib/blame.tcl:1238\n msgid \"In File:\"\n@@ -691,11 +691,11 @@ msgstr \"Détacher de la branche locale\"\n \n #: lib/branch_create.tcl:22\n msgid \"Create Branch\"\n-msgstr \"Créer branche\"\n+msgstr \"Créer une branche\"\n \n #: lib/branch_create.tcl:27\n msgid \"Create New Branch\"\n-msgstr \"Créer nouvelle branche\"\n+msgstr \"Créer une nouvelle branche\"\n \n #: lib/branch_create.tcl:31 lib/choose_repository.tcl:377\n msgid \"Create\"\n@@ -719,7 +719,7 @@ msgstr \"Révision initiale\"\n \n #: lib/branch_create.tcl:72\n msgid \"Update Existing Branch:\"\n-msgstr \"Mettre à jour branche existante :\"\n+msgstr \"Mettre à jour une branche existante :\"\n \n #: lib/branch_create.tcl:75\n msgid \"No\"\n@@ -727,7 +727,7 @@ msgstr \"Non\"\n \n #: lib/branch_create.tcl:80\n msgid \"Fast Forward Only\"\n-msgstr \"Mise-à-jour rectiligne seulement (fast-forward)\"\n+msgstr \"Mise à jour rectiligne seulement (fast-forward)\"\n \n #: lib/branch_create.tcl:85 lib/checkout_op.tcl:536\n msgid \"Reset\"\n@@ -769,7 +769,7 @@ msgstr \"Branches locales\"\n \n #: lib/branch_delete.tcl:52\n msgid \"Delete Only If Merged Into\"\n-msgstr \"Supprimer seulement si fusionnée dans:\"\n+msgstr \"Supprimer seulement si fusionnée dans :\"\n \n #: lib/branch_delete.tcl:54\n msgid \"Always (Do not perform merge test.)\"\n@@ -786,7 +786,7 @@ msgid \"\"\n \"\\n\"\n \" Delete the selected branches?\"\n msgstr \"\"\n-\"Récupérer des branches supprimées est difficile.\\n\"\n+\"Il est difficile de récupérer des branches supprimées.\\n\"\n \"\\n\"\n \"Supprimer les branches sélectionnées ?\"\n \n@@ -796,7 +796,7 @@ msgid \"\"\n \"Failed to delete branches:\\n\"\n \"%s\"\n msgstr \"\"\n-\"La suppression des branches suivantes a échouée :\\n\"\n+\"La suppression des branches suivantes a échoué :\\n\"\n \"%s\"\n \n #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n@@ -902,11 +902,11 @@ msgstr \"La stratégie de fusion '%s' n'est pas supportée.\"\n #: lib/checkout_op.tcl:261\n #, tcl-format\n msgid \"Failed to update '%s'.\"\n-msgstr \"La mise à jour de '%s' a échouée.\"\n+msgstr \"La mise à jour de '%s' a échoué.\"\n \n #: lib/checkout_op.tcl:273\n msgid \"Staging area (index) is already locked.\"\n-msgstr \"L'index (staging area) est déjà vérouillé\"\n+msgstr \"L'index (staging area) est déjà verrouillé.\"\n \n #: lib/checkout_op.tcl:288\n msgid \"\"\n@@ -918,7 +918,7 @@ msgid \"\"\n \"The rescan will be automatically started now.\\n\"\n msgstr \"\"\n \"L'état lors de la dernière synchronisation ne correspond plus à l'état du \"\n-\"dépôt\\n\"\n+\"dépôt.\\n\"\n \"\\n\"\n \"Un autre programme Git a modifié ce dépôt depuis la dernière \"\n \"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir \"\n@@ -956,9 +956,9 @@ msgid \"\"\n \"If you wanted to be on a branch, create one now starting from 'This Detached \"\n \"Checkout'.\"\n msgstr \"\"\n-\"Vous n'êtes plus ur une branche locale.\\n\"\n+\"Vous n'êtes plus sur une branche locale.\\n\"\n \"\\n\"\n-\"Si vous vouliez être sur une branche, créez en une maintenant en partant de \"\n+\"Si vous vouliez être sur une branche, créez-en une maintenant en partant de \"\n \"'Cet emprunt détaché'.\"\n \n #: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472\n@@ -1000,7 +1000,7 @@ msgstr \"\"\n \"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a \"\n \"échouée.\\n\"\n \"\\n\"\n-\"Cela n'aurait pas du se produire. %s va abandonner et se terminer.\"\n+\"Cela n'aurait pas dû se produire. %s va abandonner et se terminer.\"\n \n #: lib/choose_font.tcl:39\n msgid \"Select\"\n@@ -1023,8 +1023,8 @@ msgid \"\"\n \"This is example text.\\n\"\n \"If you like this text, it can be your font.\"\n msgstr \"\"\n-\"C'est un texte d'exemple.\\n\"\n-\"Si vous aimez ce texte, vous pouvez choisir cette police\"\n+\"Ceci est un texte d'exemple.\\n\"\n+\"Si vous aimez ce texte, vous pouvez choisir cette police.\"\n \n #: lib/choose_repository.tcl:28\n msgid \"Git Gui\"\n@@ -1040,7 +1040,7 @@ msgstr \"Nouveau...\"\n \n #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465\n msgid \"Clone Existing Repository\"\n-msgstr \"Cloner dépôt existant\"\n+msgstr \"Cloner un dépôt existant\"\n \n #: lib/choose_repository.tcl:106\n msgid \"Clone...\"\n@@ -1048,7 +1048,7 @@ msgstr \"Cloner...\"\n \n #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983\n msgid \"Open Existing Repository\"\n-msgstr \"Ouvrir dépôt existant\"\n+msgstr \"Ouvrir un dépôt existant\"\n \n #: lib/choose_repository.tcl:119\n msgid \"Open...\"\n@@ -1056,17 +1056,17 @@ msgstr \"Ouvrir...\"\n \n #: lib/choose_repository.tcl:132\n msgid \"Recent Repositories\"\n-msgstr \"Dépôt récemment utilisés\"\n+msgstr \"Dépôts récemment utilisés\"\n \n #: lib/choose_repository.tcl:138\n msgid \"Open Recent Repository:\"\n-msgstr \"Ouvrir dépôt récent :\"\n+msgstr \"Ouvrir un dépôt récent :\"\n \n #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309\n #: lib/choose_repository.tcl:316\n #, tcl-format\n msgid \"Failed to create repository %s:\"\n-msgstr \"La création du dépôt %s a échouée :\"\n+msgstr \"La création du dépôt %s a échoué :\"\n \n #: lib/choose_repository.tcl:387\n msgid \"Directory:\"\n@@ -1093,11 +1093,11 @@ msgstr \"Cloner\"\n \n #: lib/choose_repository.tcl:473\n msgid \"Source Location:\"\n-msgstr \"Emplacement source:\"\n+msgstr \"Emplacement source :\"\n \n #: lib/choose_repository.tcl:484\n msgid \"Target Directory:\"\n-msgstr \"Répertoire cible:\"\n+msgstr \"Répertoire cible :\"\n \n #: lib/choose_repository.tcl:496\n msgid \"Clone Type:\"\n@@ -1137,7 +1137,7 @@ msgstr \"L'emplacement %s existe déjà.\"\n \n #: lib/choose_repository.tcl:622\n msgid \"Failed to configure origin\"\n-msgstr \"La configuration de l'origine a échouée.\"\n+msgstr \"La configuration de l'origine a échoué.\"\n \n #: lib/choose_repository.tcl:634\n msgid \"Counting objects\"\n@@ -1242,7 +1242,7 @@ msgstr \"fichiers\"\n \n #: lib/choose_repository.tcl:962\n msgid \"Initial file checkout failed.\"\n-msgstr \"Chargement initial du fichier échoué.\"\n+msgstr \"Le chargement initial du fichier a échoué.\"\n \n #: lib/choose_repository.tcl:978\n msgid \"Open\"\n@@ -1292,7 +1292,7 @@ msgstr \"L'expression de révision est vide.\"\n \n #: lib/choose_rev.tcl:531\n msgid \"Updated\"\n-msgstr \"Mise-à-jour:\"\n+msgstr \"Mise à jour:\"\n \n #: lib/choose_rev.tcl:559\n msgid \"URL\"\n@@ -1320,8 +1320,8 @@ msgid \"\"\n msgstr \"\"\n \"Impossible de corriger pendant une fusion.\\n\"\n \"\\n\"\n-\"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement \"\n-\"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous \"\n+\"Vous êtes actuellement au milieu d'une fusion qui n'a pas été complètement \"\n+\"terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous \"\n \"abandonnez la fusion courante.\\n\"\n \n #: lib/commit.tcl:49\n@@ -1409,7 +1409,7 @@ msgstr \"\"\n #: lib/commit.tcl:211\n #, tcl-format\n msgid \"warning: Tcl does not support encoding '%s'.\"\n-msgstr \"attention : Tcl ne supporte pas l'encodage '%s'.\"\n+msgstr \"attention : Tcl ne supporte pas le codage '%s'.\"\n \n #: lib/commit.tcl:227\n msgid \"Calling pre-commit hook...\"\n@@ -1469,12 +1469,12 @@ msgstr \"commit-tree a échoué :\"\n \n #: lib/commit.tcl:373\n msgid \"update-ref failed:\"\n-msgstr \"update-ref a échoué\"\n+msgstr \"update-ref a échoué :\"\n \n #: lib/commit.tcl:461\n #, tcl-format\n msgid \"Created commit %s: %s\"\n-msgstr \"Commit créé %s : %s\"\n+msgstr \"Commit %s créé : %s\"\n \n #: lib/console.tcl:59\n msgid \"Working... please wait...\"\n@@ -1581,24 +1581,24 @@ msgid \"\"\n \"LOCAL: deleted\\n\"\n \"REMOTE:\\n\"\n msgstr \"\"\n-\"LOCAL: supprimé\\n\"\n-\"DISTANT:\\n\"\n+\"LOCAL : supprimé\\n\"\n+\"DISTANT :\\n\"\n \n #: lib/diff.tcl:125\n msgid \"\"\n \"REMOTE: deleted\\n\"\n \"LOCAL:\\n\"\n msgstr \"\"\n-\"DISTANT: supprimé\\n\"\n-\"LOCAL:\\n\"\n+\"DISTANT : supprimé\\n\"\n+\"LOCAL :\\n\"\n \n #: lib/diff.tcl:132\n msgid \"LOCAL:\\n\"\n-msgstr \"LOCAL:\\n\"\n+msgstr \"LOCAL :\\n\"\n \n #: lib/diff.tcl:135\n msgid \"REMOTE:\\n\"\n-msgstr \"DISTANT:\\n\"\n+msgstr \"DISTANT :\\n\"\n \n #: lib/diff.tcl:197 lib/diff.tcl:296\n #, tcl-format\n@@ -1624,7 +1624,7 @@ msgid \"\"\n \"* Showing only first %d bytes.\\n\"\n msgstr \"\"\n \"* Le fichier non suivi fait %d octets.\\n\"\n-\"* On montre seulement les premiers %d octets.\\n\"\n+\"* Seuls les %d premiers octets sont montrés.\\n\"\n \n #: lib/diff.tcl:228\n #, tcl-format\n@@ -1635,7 +1635,7 @@ msgid \"\"\n msgstr \"\"\n \"\\n\"\n \"* Fichier suivi raccourcis ici de %s.\\n\"\n-\"* Pour voir le fichier entier, utiliser un éditeur externe.\\n\"\n+\"* Pour voir le fichier entier, utilisez un éditeur externe.\\n\"\n \n #: lib/diff.tcl:436\n msgid \"Failed to unstage selected hunk.\"\n@@ -1680,7 +1680,7 @@ msgstr \"Vous devez corriger les erreurs suivantes avant de pouvoir commiter.\"\n \n #: lib/index.tcl:6\n msgid \"Unable to unlock the index.\"\n-msgstr \"Impossible de dévérouiller l'index.\"\n+msgstr \"Impossible de déverrouiller l'index.\"\n \n #: lib/index.tcl:15\n msgid \"Index Error\"\n@@ -1700,12 +1700,12 @@ msgstr \"Continuer\"\n \n #: lib/index.tcl:31\n msgid \"Unlock Index\"\n-msgstr \"Déverouiller l'index\"\n+msgstr \"Déverrouiller l'index\"\n \n #: lib/index.tcl:287\n #, tcl-format\n msgid \"Unstaging %s from commit\"\n-msgstr \"Désindexation de: %s\"\n+msgstr \"Désindexation de : %s\"\n \n #: lib/index.tcl:326\n msgid \"Ready to commit.\"\n@@ -1719,18 +1719,18 @@ msgstr \"Ajout de %s\"\n #: lib/index.tcl:396\n #, tcl-format\n msgid \"Revert changes in file %s?\"\n-msgstr \"Annuler les modifications dans le fichier %s ? \"\n+msgstr \"Révoquer les modifications dans le fichier %s ? \"\n \n #: lib/index.tcl:398\n #, tcl-format\n msgid \"Revert changes in these %i files?\"\n-msgstr \"Annuler les modifications dans ces %i fichiers ?\"\n+msgstr \"Révoquer les modifications dans ces %i fichiers ?\"\n \n #: lib/index.tcl:406\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"\"\n \"Toutes les modifications non-indexées seront définitivement perdues par \"\n-\"l'annulation.\"\n+\"la révocation.\"\n \n #: lib/index.tcl:409\n msgid \"Do Nothing\"\n@@ -1738,12 +1738,12 @@ msgstr \"Ne rien faire\"\n \n #: lib/index.tcl:427\n msgid \"Reverting selected files\"\n-msgstr \"Annuler modifications dans fichiers selectionnés\"\n+msgstr \"Révocation en cours des fichiers selectionnés\"\n \n #: lib/index.tcl:431\n #, tcl-format\n msgid \"Reverting %s\"\n-msgstr \"Annulation des modifications dans %s\"\n+msgstr \"Révocation en cours de %s\"\n \n #: lib/merge.tcl:13\n msgid \"\"\n@@ -1804,11 +1804,11 @@ msgid \"\"\n msgstr \"\"\n \"Vous êtes au milieu d'une modification.\\n\"\n \"\\n\"\n-\"Le fichier %s est modifié.\\n\"\n+\"Le fichier %s a été modifié.\\n\"\n \"\\n\"\n \"Vous devriez terminer le commit courant avant de lancer une fusion. En \"\n \"faisait comme cela, vous éviterez de devoir éventuellement abandonner une \"\n-\"fusion ayant échouée.\\n\"\n+\"fusion ayant échoué.\\n\"\n \n #: lib/merge.tcl:107\n #, tcl-format\n@@ -1826,7 +1826,7 @@ msgstr \"La fusion s'est faite avec succès.\"\n \n #: lib/merge.tcl:133\n msgid \"Merge failed.  Conflict resolution is required.\"\n-msgstr \"La fusion a echouée. Il est nécessaire de résoudre les conflicts.\"\n+msgstr \"La fusion a echoué. Il est nécessaire de résoudre les conflits.\"\n \n #: lib/merge.tcl:158\n #, tcl-format\n@@ -1914,16 +1914,16 @@ msgid \"\"\n \"\\n\"\n \"This operation can be undone only by restarting the merge.\"\n msgstr \"\"\n-\"Noter que le diff ne montre que les modifications en conflict.\\n\"\n+\"Noter que le diff ne montre que les modifications en conflit.\\n\"\n \"\\n\"\n \"%s sera écrasé.\\n\"\n \"\\n\"\n-\"Cette opération ne peut être défaite qu'en relançant la fusion.\"\n+\"Cette opération ne peut être inversée qu'en relançant la fusion.\"\n \n #: lib/mergetool.tcl:45\n #, tcl-format\n msgid \"File %s seems to have unresolved conflicts, still stage?\"\n-msgstr \"Le fichier %s semble avoir des conflicts non résolus, indéxer quand même ?\"\n+msgstr \"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?\"\n \n #: lib/mergetool.tcl:60\n #, tcl-format\n@@ -1932,11 +1932,11 @@ msgstr \"Ajouter une résolution pour %s\"\n \n #: lib/mergetool.tcl:141\n msgid \"Cannot resolve deletion or link conflicts using a tool\"\n-msgstr \"Impossible de résoudre la suppression ou de relier des conflicts en utilisant un outil\"\n+msgstr \"Impossible de résoudre la suppression ou de relier des conflits en utilisant un outil\"\n \n #: lib/mergetool.tcl:146\n msgid \"Conflict file does not exist\"\n-msgstr \"Le fichier en conflict n'existe pas.\"\n+msgstr \"Le fichier en conflit n'existe pas.\"\n \n #: lib/mergetool.tcl:264\n #, tcl-format\n@@ -1958,7 +1958,7 @@ msgid \"\"\n \"Error retrieving versions:\\n\"\n \"%s\"\n msgstr \"\"\n-\"Erreur lors de la récupération des versions:\\n\"\n+\"Erreur lors de la récupération des versions :\\n\"\n \"%s\"\n \n #: lib/mergetool.tcl:343\n@@ -1968,7 +1968,7 @@ msgid \"\"\n \"\\n\"\n \"%s\"\n msgstr \"\"\n-\"Impossible de lancer l'outil de fusion:\\n\"\n+\"Impossible de lancer l'outil de fusion :\\n\"\n \"\\n\"\n \"%s\"\n \n@@ -1983,12 +1983,12 @@ msgstr \"L'outil de fusion a échoué.\"\n #: lib/option.tcl:11\n #, tcl-format\n msgid \"Invalid global encoding '%s'\"\n-msgstr \"Encodage global invalide '%s'\"\n+msgstr \"Codage global '%s' invalide\"\n \n #: lib/option.tcl:19\n #, tcl-format\n msgid \"Invalid repo encoding '%s'\"\n-msgstr \"Encodage de dépôt invalide '%s'\"\n+msgstr \"Codage de dépôt '%s' invalide\"\n \n #: lib/option.tcl:117\n msgid \"Restore Defaults\"\n@@ -2001,7 +2001,7 @@ msgstr \"Sauvegarder\"\n #: lib/option.tcl:131\n #, tcl-format\n msgid \"%s Repository\"\n-msgstr \"Dépôt: %s\"\n+msgstr \"Dépôt : %s\"\n \n #: lib/option.tcl:132\n msgid \"Global (All Repositories)\"\n@@ -2069,7 +2069,7 @@ msgstr \"Nouveau modèle de nom de branche\"\n \n #: lib/option.tcl:155\n msgid \"Default File Contents Encoding\"\n-msgstr \"Encodage du contenu des fichiers par défaut\"\n+msgstr \"Codage du contenu des fichiers par défaut\"\n \n #: lib/option.tcl:203\n msgid \"Change\"\n@@ -2098,11 +2098,11 @@ msgstr \"Préférences\"\n \n #: lib/option.tcl:314\n msgid \"Failed to completely save options:\"\n-msgstr \"La sauvegarde complète des options a échouée :\"\n+msgstr \"La sauvegarde complète des options a échoué :\"\n \n #: lib/remote.tcl:163\n msgid \"Remove Remote\"\n-msgstr \"Supprimer dépôt distant\"\n+msgstr \"Supprimer un dépôt distant\"\n \n #: lib/remote.tcl:168\n msgid \"Prune from\"\n@@ -2118,11 +2118,11 @@ msgstr \"Pousser vers\"\n \n #: lib/remote_add.tcl:19\n msgid \"Add Remote\"\n-msgstr \"Ajouter dépôt distant\"\n+msgstr \"Ajouter un dépôt distant\"\n \n #: lib/remote_add.tcl:24\n msgid \"Add New Remote\"\n-msgstr \"Ajouter nouveau dépôt distant\"\n+msgstr \"Ajouter un nouveau dépôt distant\"\n \n #: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36\n msgid \"Add\"\n@@ -2134,7 +2134,7 @@ msgstr \"Détails des dépôts distants\"\n \n #: lib/remote_add.tcl:50\n msgid \"Location:\"\n-msgstr \"Emplacement:\"\n+msgstr \"Emplacement :\"\n \n #: lib/remote_add.tcl:62\n msgid \"Further Action\"\n@@ -2146,7 +2146,7 @@ msgstr \"Récupérer immédiatement\"\n \n #: lib/remote_add.tcl:71\n msgid \"Initialize Remote Repository and Push\"\n-msgstr \"Initialiser dépôt distant et pousser\"\n+msgstr \"Initialiser un dépôt distant et pousser\"\n \n #: lib/remote_add.tcl:77\n msgid \"Do Nothing Else Now\"\n@@ -2193,7 +2193,7 @@ msgstr \"Mise en place de %s (à %s)\"\n \n #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n msgid \"Delete Branch Remotely\"\n-msgstr \"Supprimer branche à distance\"\n+msgstr \"Supprimer une branche à distance\"\n \n #: lib/remote_branch_delete.tcl:47\n msgid \"From Repository\"\n@@ -2244,7 +2244,7 @@ msgid \"\"\n \"One or more of the merge tests failed because you have not fetched the \"\n \"necessary commits.  Try fetching from %s first.\"\n msgstr \"\"\n-\"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas \"\n+\"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas \"\n \"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord.\"\n \n #: lib/remote_branch_delete.tcl:207\n@@ -2257,14 +2257,14 @@ msgid \"\"\n \"\\n\"\n \"Delete the selected branches?\"\n msgstr \"\"\n-\"Récupérer des branches supprimées est difficile.\\n\"\n+\"Il est difficile de récupérer des branches supprimées.\\n\"\n \"\\n\"\n-\"Souhaitez vous supprimer les branches sélectionnées ?\"\n+\"Supprimer les branches sélectionnées ?\"\n \n #: lib/remote_branch_delete.tcl:226\n #, tcl-format\n msgid \"Deleting branches from %s\"\n-msgstr \"Supprimer les branches de %s\"\n+msgstr \"Suppression des branches de %s\"\n \n #: lib/remote_branch_delete.tcl:286\n msgid \"No repository selected.\"\n@@ -2285,7 +2285,7 @@ msgstr \"Suivant\"\n \n #: lib/search.tcl:24\n msgid \"Prev\"\n-msgstr \"Précédant\"\n+msgstr \"Précédent\"\n \n #: lib/search.tcl:25\n msgid \"Case-Sensitive\"\n@@ -2293,7 +2293,7 @@ msgstr \"Sensible à la casse\"\n \n #: lib/shortcut.tcl:20 lib/shortcut.tcl:61\n msgid \"Cannot write shortcut:\"\n-msgstr \"Impossible d'écrire le raccourcis :\"\n+msgstr \"Impossible d'écrire le raccourci :\"\n \n #: lib/shortcut.tcl:136\n msgid \"Cannot write icon:\"\n@@ -2318,7 +2318,7 @@ msgstr \"Réinitialisation du dictionnaire à %s.\"\n \n #: lib/spellcheck.tcl:73\n msgid \"Spell checker silently failed on startup\"\n-msgstr \"La vérification d'orthographe a échouée silentieusement au démarrage\"\n+msgstr \"La vérification d'orthographe a échoué silencieusement au démarrage\"\n \n #: lib/spellcheck.tcl:80\n msgid \"Unrecognized spell checker\"\n@@ -2351,11 +2351,11 @@ msgstr \"Générer une clé\"\n \n #: lib/sshkey.tcl:56\n msgid \"Copy To Clipboard\"\n-msgstr \"Copier dans le presse papier\"\n+msgstr \"Copier dans le presse-papier\"\n \n #: lib/sshkey.tcl:70\n msgid \"Your OpenSSH Public Key\"\n-msgstr \"Votre clé publique Open SSH\"\n+msgstr \"Votre clé publique OpenSSH\"\n \n #: lib/sshkey.tcl:78\n msgid \"Generating...\"\n@@ -2368,7 +2368,7 @@ msgid \"\"\n \"\\n\"\n \"%s\"\n msgstr \"\"\n-\"Impossible de lancer ssh-keygen:\\n\"\n+\"Impossible de lancer ssh-keygen :\\n\"\n \"\\n\"\n \"%s\"\n \n@@ -2398,7 +2398,7 @@ msgstr \"Lancer %s nécessite qu'un fichier soit sélectionné.\"\n #: lib/tools.tcl:90\n #, tcl-format\n msgid \"Are you sure you want to run %s?\"\n-msgstr \"Êtes vous sûr de vouloir lancer %s ?\"\n+msgstr \"Êtes-vous sûr de vouloir lancer %s ?\"\n \n #: lib/tools.tcl:110\n #, tcl-format\n@@ -2422,11 +2422,11 @@ msgstr \"L'outil a échoué : %s\"\n \n #: lib/tools_dlg.tcl:22\n msgid \"Add Tool\"\n-msgstr \"Ajouter outil\"\n+msgstr \"Ajouter un outil\"\n \n #: lib/tools_dlg.tcl:28\n msgid \"Add New Tool Command\"\n-msgstr \"Ajouter nouvelle commande d'outil\"\n+msgstr \"Ajouter une nouvelle commande d'outil\"\n \n #: lib/tools_dlg.tcl:33\n msgid \"Add globally\"\n@@ -2438,7 +2438,7 @@ msgstr \"Détails sur l'outil\"\n \n #: lib/tools_dlg.tcl:48\n msgid \"Use '/' separators to create a submenu tree:\"\n-msgstr \"Utiliser les séparateurs '/' pour créer un arbre de sous menus :\"\n+msgstr \"Utiliser les séparateurs '/' pour créer un arbre de sous-menus :\"\n \n #: lib/tools_dlg.tcl:61\n msgid \"Command:\"\n@@ -2479,7 +2479,7 @@ msgid \"\"\n \"Could not add tool:\\n\"\n \"%s\"\n msgstr \"\"\n-\"Impossible d'ajouter l'outil:\\n\"\n+\"Impossible d'ajouter l'outil :\\n\"\n \"%s\"\n \n #: lib/tools_dlg.tcl:190\n-- \n1.6.2.169.g92418\n"},{"id":"108796","messageId":"1d6ecc17e1e0e9524aebfb38b7cd1d8a8fc375a7.1237646585.git.nicolas.s-dev@laposte.net","threadId":"18385","inReplyTo":"20090321102748.GC12971@vidovic","subject":"[PATCH v2 2/2] git-gui: impove some French translations","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-03-21T14:47:06Z","receivedAt":"2009-03-21T14:47:06Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\n\nSigned-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>\n---\n po/fr.po |   47 ++++++++++++++++++++++-------------------------\n 1 files changed, 22 insertions(+), 25 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex eb5f68e..15f326f 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -106,7 +106,7 @@ msgstr \"Non modifié\"\n \n #: git-gui.sh:1821\n msgid \"Modified, not staged\"\n-msgstr \"Modifié, pas indexé\"\n+msgstr \"Modifié, non indexé\"\n \n #: git-gui.sh:1822 git-gui.sh:1830\n msgid \"Staged for commit\"\n@@ -171,7 +171,7 @@ msgstr \"Branche\"\n \n #: git-gui.sh:2286 lib/choose_rev.tcl:548\n msgid \"Commit@@noun\"\n-msgstr \"Commit\"\n+msgstr \"Commit@@noun\"\n \n #: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n msgid \"Merge\"\n@@ -195,7 +195,7 @@ msgstr \"Naviguer dans la branche courante\"\n \n #: git-gui.sh:2311\n msgid \"Browse Branch Files...\"\n-msgstr \"Naviguer dans la branche...\"\n+msgstr \"Naviguer dans une branche...\"\n \n #: git-gui.sh:2316\n msgid \"Visualize Current Branch's History\"\n@@ -304,7 +304,7 @@ msgstr \"Corriger dernier commit\"\n \n #: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99\n msgid \"Rescan\"\n-msgstr \"Recharger modifs.\"\n+msgstr \"Recharger les modifications\"\n \n #: git-gui.sh:2467\n msgid \"Stage To Commit\"\n@@ -312,11 +312,11 @@ msgstr \"Indexer\"\n \n #: git-gui.sh:2473\n msgid \"Stage Changed Files To Commit\"\n-msgstr \"Indexer toutes modifications\"\n+msgstr \"Indexer toutes les modifications\"\n \n #: git-gui.sh:2479\n msgid \"Unstage From Commit\"\n-msgstr \"Désindexer\"\n+msgstr \"Enlever de l'index\"\n \n #: git-gui.sh:2484 lib/index.tcl:410\n msgid \"Revert Changes\"\n@@ -397,15 +397,15 @@ msgstr \"Branche courante :\"\n \n #: git-gui.sh:2761\n msgid \"Staged Changes (Will Commit)\"\n-msgstr \"Modifs. indexées (pour commit)\"\n+msgstr \"Modifications indexées (à commiter)\"\n \n #: git-gui.sh:2781\n msgid \"Unstaged Changes\"\n-msgstr \"Modifs. non indexées\"\n+msgstr \"Modifications non indexées\"\n \n #: git-gui.sh:2831\n msgid \"Stage Changed\"\n-msgstr \"Indexer modifs.\"\n+msgstr \"Indexer les modifications\"\n \n #: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182\n msgid \"Push\"\n@@ -485,11 +485,11 @@ msgstr \"Revenir à la version de base\"\n \n #: git-gui.sh:3169\n msgid \"Unstage Hunk From Commit\"\n-msgstr \"Désindexer la section\"\n+msgstr \"Enlever la section de l'index\"\n \n #: git-gui.sh:3170\n msgid \"Unstage Line From Commit\"\n-msgstr \"Désindexer la ligne\"\n+msgstr \"Enlever la ligne de l'index\"\n \n #: git-gui.sh:3172\n msgid \"Stage Hunk For Commit\"\n@@ -711,7 +711,7 @@ msgstr \"Nom :\"\n \n #: lib/branch_create.tcl:58\n msgid \"Match Tracking Branch Name\"\n-msgstr \"Trouver nom de branche de suivi\"\n+msgstr \"Correspond au nom de la branche de suivi\"\n \n #: lib/branch_create.tcl:66\n msgid \"Starting Revision\"\n@@ -1109,7 +1109,7 @@ msgstr \"Standard (rapide, semi-redondant, liens durs)\"\n \n #: lib/choose_repository.tcl:508\n msgid \"Full Copy (Slower, Redundant Backup)\"\n-msgstr \"Copy complète (plus lent, sauvegarde redondante)\"\n+msgstr \"Copie complète (plus lent, sauvegarde redondante)\"\n \n #: lib/choose_repository.tcl:514\n msgid \"Shared (Fastest, Not Recommended, No Backup)\"\n@@ -1284,7 +1284,7 @@ msgstr \"Révision invalide : %s\"\n \n #: lib/choose_rev.tcl:338\n msgid \"No revision selected.\"\n-msgstr \"Pas de révision selectionnée.\"\n+msgstr \"Pas de révision sélectionnée.\"\n \n #: lib/choose_rev.tcl:346\n msgid \"Revision expression is empty.\"\n@@ -1534,12 +1534,10 @@ msgid \"\"\n \"\\n\"\n \"Compress the database now?\"\n msgstr \"\"\n-\"Ce dépôt comprend actuellement environ %i objets ayant leur fichier \"\n-\"particulier.\\n\"\n+\"Ce dépôt comprend actuellement environ %i objets inutilisés.\\n\"\n \"\\n\"\n \"Pour conserver une performance optimale, il est fortement recommandé de \"\n-\"comprimer la base quand plus de %i objets ayant leur fichier particulier \"\n-\"existent.\\n\"\n+\"comprimer la base quand plus de %i objets inutilisés existent.\\n\"\n \"\\n\"\n \"Comprimer la base maintenant ?\"\n \n@@ -1705,7 +1703,7 @@ msgstr \"Déverrouiller l'index\"\n #: lib/index.tcl:287\n #, tcl-format\n msgid \"Unstaging %s from commit\"\n-msgstr \"Désindexation de : %s\"\n+msgstr \"Enlève %s de l'index\"\n \n #: lib/index.tcl:326\n msgid \"Ready to commit.\"\n@@ -1729,8 +1727,7 @@ msgstr \"Révoquer les modifications dans ces %i fichiers ?\"\n #: lib/index.tcl:406\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"\"\n-\"Toutes les modifications non-indexées seront définitivement perdues par \"\n-\"la révocation.\"\n+\"Toutes les modifications non-indexées seront définitivement perdues.\"\n \n #: lib/index.tcl:409\n msgid \"Do Nothing\"\n@@ -1738,7 +1735,7 @@ msgstr \"Ne rien faire\"\n \n #: lib/index.tcl:427\n msgid \"Reverting selected files\"\n-msgstr \"Révocation en cours des fichiers selectionnés\"\n+msgstr \"Révocation en cours des fichiers sélectionnés\"\n \n #: lib/index.tcl:431\n #, tcl-format\n@@ -1918,7 +1915,7 @@ msgstr \"\"\n \"\\n\"\n \"%s sera écrasé.\\n\"\n \"\\n\"\n-\"Cette opération ne peut être inversée qu'en relançant la fusion.\"\n+\"Cette opération ne peut être annulée qu'en relançant la fusion.\"\n \n #: lib/mergetool.tcl:45\n #, tcl-format\n@@ -2245,7 +2242,7 @@ msgid \"\"\n \"necessary commits.  Try fetching from %s first.\"\n msgstr \"\"\n \"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas \"\n-\"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord.\"\n+\"récupéré les commits nécessaires. Essayez de récupérer à partir de %s d'abord.\"\n \n #: lib/remote_branch_delete.tcl:207\n msgid \"Please select one or more branches to delete.\"\n@@ -2462,7 +2459,7 @@ msgstr \"Ne pas montrer la fenêtre de sortie des commandes\"\n \n #: lib/tools_dlg.tcl:97\n msgid \"Run only if a diff is selected ($FILENAME not empty)\"\n-msgstr \"Lancer seulement si un diff est selectionné ($FILENAME non vide)\"\n+msgstr \"Lancer seulement si un diff est sélectionné ($FILENAME non vide)\"\n \n #: lib/tools_dlg.tcl:121\n msgid \"Please supply a name for the tool.\"\n-- \n1.6.2.169.g92418\n"},{"id":"108801","messageId":"20090321172657.GB32452@glandium.org","threadId":"18385","inReplyTo":"20090321101426.GB12971@vidovic","subject":"Re: [PATCH 2/2] Re: git-gui: some French translation enhancements","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2009-03-21T17:26:57Z","receivedAt":"2009-03-21T17:26:57Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Sat, Mar 21, 2009 at 11:14:26AM +0100, Nicolas Sebrecht wrote:\n> \n> On Fri, Mar 20, 2009 at 10:34:54AM -0400, Alexandre Bourget wrote:                                                                                                           \n> >\n> > Le vendredi 20 mars 2009 à 08:13 +0100, Mike Hommey a écrit :\n> > > On Fri, Mar 20, 2009 at 01:54:02AM +0100, Nicolas Sebrecht wrote:\n> > > IMHO, we should find a better way to say that than to use the \"index\"\n> > > word at all. This obviously applies to all uses of \"index\" in french\n> > > where we avoided it in english.\n> > >\n> > > OTOH, the best I can find for \"staging area\" is \"zone de préparation\",\n> > > and that doesn't help finding a word for stage and unstage.\n> >\n> > \"zone de préparation\" sounds good to me.\n> \n> I'm not sure we are doing more good than bad. The \"index\" is a\n> technical's Git word which has its own sense in Git.\n> \n> We could provide a pure \"only french terms\" translation but I'm not sure\n> it's the best way to work in software translation.\n> \n> \"Index\" is a one of theses terms having a \"special meaning in place\".\n> It stands in English for \"staging area\" and could have the same meaning\n> in french mainly because we don't have a good french word to that\n> special use case.\n> \n> \"Index\" as-is in the french po is NOT a non-sense. Also, french people\n> newbie in Git would easily find help for the index (most websites are in\n> english).\n\nExcept that the english version tends to move away from the \"index\"\nterm, in favour of \"staging area\", if my understanding of what was said\nat GitTogether is right.\n\nMike\n"},{"id":"108807","messageId":"200903211957.46252.chriscool@tuxfamily.org","threadId":"18385","inReplyTo":"7102a296e91c8602c200b1431a74c7eb6592146e.1237646585.git.nicolas.s-dev@laposte.net","subject":"Re: [PATCH v2 1/2] git-gui: various French translation fixes","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-03-21T18:57:45Z","receivedAt":"2009-03-21T18:57:45Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le samedi 21 mars 2009, Nicolas Sebrecht a écrit :\n> From: Sam Hocevar <sam@zoy.org>\n>\n> Mostly grammar, spelling and typography fixes, but also a few wording\n> enhancements here and there.\n>\n> Signed-off-by: Sam Hocevar <sam@zoy.org>\n> Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>\n\n[...]\n\n>  #: git-gui.sh:2484 lib/index.tcl:410\n>  msgid \"Revert Changes\"\n> -msgstr \"Annuler les modifications (revert)\"\n> +msgstr \"Révoquer les modifications\"\n\nThanks but as I said in another email, I'd prefer a new patch from Sam \nwithout the changes like the above one, (But with \"(revert)\" removed.)\n\nRegards,\nChristian.\n"}]}