{"thread":{"id":"18497","subject":"[PATCH v3 1/2] git-gui: various French translation fixes","startedAt":"2009-03-23T23:39:24Z","lastAt":"2009-03-25T15:44:16Z","messageCount":15,"participants":["Sam Hocevar","Christian Couder","Shawn O. Pearce","Sverre Rabbelier","David Kastrup","Mike Hommey","Samuel Tardieu","Johannes Schindelin"],"isPatch":true,"patchVersion":3,"patchTotal":2},"messages":[{"id":"109118","messageId":"20090323233924.GA29922@zoy.org","threadId":"18497","inReplyTo":null,"subject":"[PATCH v3 1/2] git-gui: various French translation fixes","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-23T23:39:24Z","receivedAt":"2009-03-23T23:39:24Z","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---\n This patch includes everything acked by Christian and Nicolas, without\nthe part that tried to find a better translation for \"revert\". These will\nneed to be discussed later.\n\n po/fr.po |  202 +++++++++++++++++++++++++++++++-------------------------------\n 1 files changed, 101 insertions(+), 101 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex 45773ab..e6bf1b4 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 \"Annuler 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@@ -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@@ -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@@ -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,8 +2244,8 @@ 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-\"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord.\"\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é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@@ -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@@ -2462,7 +2462,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@@ -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.1\n"},{"id":"109120","messageId":"20090323234224.GA29986@zoy.org","threadId":"18497","inReplyTo":"20090323233924.GA29922@zoy.org","subject":"[PATCH v3 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-23T23:42:24Z","receivedAt":"2009-03-23T23:42:24Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"Properly spell \"successful\" and slightly rewrite a couple of strings\nthat actually say the same thing in order to reduce translation work.\n\nUpdate .pot and .po files accordingly since no new translation is\nrequired.\n---\n This patch is unchanged since the last version.\n\n lib/branch_delete.tcl        |    4 ++--\n lib/remote_branch_delete.tcl |    4 +---\n lib/tools.tcl                |    2 +-\n po/de.po                     |   12 +-----------\n po/fr.po                     |   12 +-----------\n po/git-gui.pot               |    9 +--------\n po/hu.po                     |   12 +-----------\n po/it.po                     |   12 +-----------\n po/ja.po                     |   12 +-----------\n po/nb.po                     |   12 +-----------\n po/ru.po                     |   10 ----------\n po/sv.po                     |   12 +-----------\n po/zh_cn.po                  |   10 ----------\n 13 files changed, 12 insertions(+), 111 deletions(-)\n\ndiff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\nindex ef1930b..20d5e42 100644\n--- a/lib/branch_delete.tcl\n+++ b/lib/branch_delete.tcl\n@@ -51,7 +51,7 @@ constructor dialog {} {\n \t\t$w.check \\\n \t\t[mc \"Delete Only If Merged Into\"] \\\n \t\t]\n-\t$w_check none [mc \"Always (Do not perform merge test.)\"]\n+\t$w_check none [mc \"Always (Do not perform merge checks)\"]\n \tpack $w.check -anchor nw -fill x -pady 5 -padx 5\n \n \tforeach h [load_all_heads] {\n@@ -112,7 +112,7 @@ method _delete {} {\n \t}\n \tif {$to_delete eq {}} return\n \tif {$check_cmt eq {}} {\n-\t\tset msg [mc \"Recovering deleted branches is difficult. \\n\\n Delete the selected branches?\"]\n+\t\tset msg [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]\n \t\tif {[tk_messageBox \\\n \t\t\t-icon warning \\\n \t\t\t-type yesno \\\ndiff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\nindex 89eb0f7..4e02fc0 100644\n--- a/lib/remote_branch_delete.tcl\n+++ b/lib/remote_branch_delete.tcl\n@@ -213,9 +213,7 @@ method _delete {} {\n \t\t-type yesno \\\n \t\t-title [wm title $w] \\\n \t\t-parent $w \\\n-\t\t-message [mc \"Recovering deleted branches is difficult.\n-\n-Delete the selected branches?\"]] ne yes} {\n+\t\t-message [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]] ne yes} {\n \t\treturn\n \t}\n \ndiff --git a/lib/tools.tcl b/lib/tools.tcl\nindex 6ae63b6..95e6e55 100644\n--- a/lib/tools.tcl\n+++ b/lib/tools.tcl\n@@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {\n \t}\n \n \tif {$ok} {\n-\t\tset msg [mc \"Tool completed succesfully: %s\" $fullname]\n+\t\tset msg [mc \"Tool completed successfully: %s\" $fullname]\n \t} else {\n \t\tset msg [mc \"Tool failed: %s\" $fullname]\n \t}\ndiff --git a/po/de.po b/po/de.po\nindex a6f730b..51abb50 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -773,16 +773,6 @@ msgstr \"Immer (ohne Zusammenführungstest)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\\n\"\n-\"\\n\"\n-\"Gewählte Zweige jetzt löschen?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2506,7 +2496,7 @@ msgstr \"Starten: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Werkzeug erfolgreich abgeschlossen: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/fr.po b/po/fr.po\nindex e6bf1b4..9b828a2 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -780,16 +780,6 @@ msgstr \"Toujours (Ne pas faire de test de fusion.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Les branches suivantes ne sont pas complètement fusionnées dans %s :\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Il est difficile de récupérer des branches supprimées.\\n\"\n-\"\\n\"\n-\"Supprimer les branches sélectionnées ?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2412,7 +2402,7 @@ msgstr \"Lancement de : %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"L'outil a terminé avec succès : %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex 15aea0d..53b7d36 100644\n--- a/po/git-gui.pot\n+++ b/po/git-gui.pot\n@@ -753,13 +753,6 @@ msgstr \"\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2220,7 +2213,7 @@ msgstr \"\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/hu.po b/po/hu.po\nindex f761b64..0f87bc1 100644\n--- a/po/hu.po\n+++ b/po/hu.po\n@@ -776,16 +776,6 @@ msgstr \"Mindig (Ne legyen merge teszt.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"A törölt branchek visszaállítása bonyolult. \\n\"\n-\"\\n\"\n-\" Biztosan törli a kiválasztott brancheket?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2399,7 +2389,7 @@ msgstr \"Futtatás: %s...\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Az eszköz sikeresen befejeződött: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/it.po b/po/it.po\nindex 294e595..762632c 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -778,16 +778,6 @@ msgstr \"Sempre (Non effettuare verifiche di fusione).\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"I rami seguenti non sono stati fusi completamente in %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Ricomporre rami cancellati può essere complicato. \\n\"\n-\"\\n\"\n-\" Eliminare i rami selezionati?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2418,7 +2408,7 @@ msgstr \"Eseguo: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Il programma esterno è terminato con successo: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/ja.po b/po/ja.po\nindex 09d60be..63c4695 100644\n--- a/po/ja.po\n+++ b/po/ja.po\n@@ -773,16 +773,6 @@ msgstr \"無条件(マージテストしない)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"以下のブランチは %s に完全にマージされていません:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"ブランチを削除すると元に戻すのは困難です。 \\n\"\n-\"\\n\"\n-\" 選択したブランチを削除しますか？\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2382,7 +2372,7 @@ msgstr \"実行中: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"ツールが完了しました: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/nb.po b/po/nb.po\nindex 1c5137d..6de93c2 100644\n--- a/po/nb.po\n+++ b/po/nb.po\n@@ -761,16 +761,6 @@ msgstr \"Alltid (Ikke utfør sammenslåingstest.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Følgende grener er ikke fullstendig slått sammen med %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Gjenoppretting av fjernede grener er vanskelig. \\n\"\n-\"\\n\"\n-\" Fjern valgte grener?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2331,7 +2321,7 @@ msgstr \"Kjører: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Verktøyet ble fullført med suksess: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/ru.po b/po/ru.po\nindex db55b3e..04df2aa 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -661,16 +661,6 @@ msgstr \"Всегда (не выполнять проверку на объеди\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Следующие ветви объединены с %s не полностью:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Восстанавливать удаленные ветви сложно. \\n\"\n-\"\\n\"\n-\" Удалить выбранные ветви?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\ndiff --git a/po/sv.po b/po/sv.po\nindex 167654c..c1535f9 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -780,16 +780,6 @@ msgstr \"Alltid (utför inte sammanslagningstest).\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Följande grenar är inte till fullo sammanslagna med %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Det är svårt att återställa borttagna grenar.\\n\"\n-\"\\n\"\n-\" Ta bort valda grenar?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2398,7 +2388,7 @@ msgstr \"Exekverar: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Verktyget avslutades framgångsrikt: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/zh_cn.po b/po/zh_cn.po\nindex d2c6866..91c1be2 100644\n--- a/po/zh_cn.po\n+++ b/po/zh_cn.po\n@@ -676,16 +676,6 @@ msgstr \"总是合并 (不作合并测试.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"下列分支没有完全被合并到 %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"恢复被删除的分支非常困难.\\n\"\n-\"\\n\"\n-\"是否要删除所选分支?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n-- \n1.6.2.1\n"},{"id":"109243","messageId":"c07716ae0903241400h779077bdy3077b49d48f2a035@mail.gmail.com","threadId":"18497","inReplyTo":"20090323233924.GA29922@zoy.org","subject":"Re: [PATCH v3 1/2] git-gui: various French translation fixes","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2009-03-24T21:00:19Z","receivedAt":"2009-03-24T21:00:19Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Hi Sam,\n\n2009/3/24 Sam Hocevar <sam@zoy.org>:\n> Mostly grammar, spelling and typography fixes, but also a few wording\n> enhancements here and there.\n> ---\n>  This patch includes everything acked by Christian and Nicolas, without\n> the part that tried to find a better translation for \"revert\". These will\n> need to be discussed later.\n\nThank you for this newer version. It's all good. Shawn please apply.\n\nAcked-by: Christian Couder <chriscool@tuxfamily.org>\n\nBest regards,\nChristian.\n"},{"id":"109261","messageId":"20090324230238.GQ23521@spearce.org","threadId":"18497","inReplyTo":"20090323233924.GA29922@zoy.org","subject":"Re: [PATCH v3 1/2] git-gui: various French translation fixes","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-24T23:02:38Z","receivedAt":"2009-03-24T23:02:38Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Sam Hocevar <sam@zoy.org> wrote:\n> Mostly grammar, spelling and typography fixes, but also a few wording\n> enhancements here and there.\n\nI can't apply; I suspect your mailer mangled the character encoding.\nCan you please resend as an attachment?\n\n\n>  po/fr.po |  202 +++++++++++++++++++++++++++++++-------------------------------\n>  1 files changed, 101 insertions(+), 101 deletions(-)\n> \n> diff --git a/po/fr.po b/po/fr.po\n> index 45773ab..e6bf1b4 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\n-- \nShawn.\n"},{"id":"109263","messageId":"20090324231538.GA14967@zoy.org","threadId":"18497","inReplyTo":"20090324230238.GQ23521@spearce.org","subject":"[PATCH v4 1/2] git-gui: various French translation fixes","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-24T23:15:38Z","receivedAt":"2009-03-24T23:15:38Z","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 Re-sending using one UTF-8 character (♥) so that Mutt does not\ntry to use iso8859-1.\n\n po/fr.po |  202 +++++++++++++++++++++++++++++++-------------------------------\n 1 files changed, 101 insertions(+), 101 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex 45773ab..e6bf1b4 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 \"Annuler 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@@ -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@@ -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@@ -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,8 +2244,8 @@ 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-\"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord.\"\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é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@@ -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@@ -2462,7 +2462,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@@ -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.1\n"},{"id":"109265","messageId":"20090324231900.GB14967@zoy.org","threadId":"18497","inReplyTo":"20090324230238.GQ23521@spearce.org","subject":"[PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-24T23:19:00Z","receivedAt":"2009-03-24T23:19:00Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"Properly spell \"successful\" and slightly rewrite a couple of strings\nthat actually say the same thing in order to reduce translation work.\n\nUpdate .pot and .po files accordingly since no new translation is\nrequired.\n\nSigned-off-by: Sam Hocevar <sam@zoy.org>\n---\n ▁▂▃▄▅▆▇█\n lib/branch_delete.tcl        |    4 ++--\n lib/remote_branch_delete.tcl |    4 +---\n lib/tools.tcl                |    2 +-\n po/de.po                     |   12 +-----------\n po/fr.po                     |   12 +-----------\n po/git-gui.pot               |    9 +--------\n po/hu.po                     |   12 +-----------\n po/it.po                     |   12 +-----------\n po/ja.po                     |   12 +-----------\n po/nb.po                     |   12 +-----------\n po/ru.po                     |   10 ----------\n po/sv.po                     |   12 +-----------\n po/zh_cn.po                  |   10 ----------\n 13 files changed, 12 insertions(+), 111 deletions(-)\n\ndiff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\nindex ef1930b..20d5e42 100644\n--- a/lib/branch_delete.tcl\n+++ b/lib/branch_delete.tcl\n@@ -51,7 +51,7 @@ constructor dialog {} {\n \t\t$w.check \\\n \t\t[mc \"Delete Only If Merged Into\"] \\\n \t\t]\n-\t$w_check none [mc \"Always (Do not perform merge test.)\"]\n+\t$w_check none [mc \"Always (Do not perform merge checks)\"]\n \tpack $w.check -anchor nw -fill x -pady 5 -padx 5\n \n \tforeach h [load_all_heads] {\n@@ -112,7 +112,7 @@ method _delete {} {\n \t}\n \tif {$to_delete eq {}} return\n \tif {$check_cmt eq {}} {\n-\t\tset msg [mc \"Recovering deleted branches is difficult. \\n\\n Delete the selected branches?\"]\n+\t\tset msg [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]\n \t\tif {[tk_messageBox \\\n \t\t\t-icon warning \\\n \t\t\t-type yesno \\\ndiff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\nindex 89eb0f7..4e02fc0 100644\n--- a/lib/remote_branch_delete.tcl\n+++ b/lib/remote_branch_delete.tcl\n@@ -213,9 +213,7 @@ method _delete {} {\n \t\t-type yesno \\\n \t\t-title [wm title $w] \\\n \t\t-parent $w \\\n-\t\t-message [mc \"Recovering deleted branches is difficult.\n-\n-Delete the selected branches?\"]] ne yes} {\n+\t\t-message [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]] ne yes} {\n \t\treturn\n \t}\n \ndiff --git a/lib/tools.tcl b/lib/tools.tcl\nindex 6ae63b6..95e6e55 100644\n--- a/lib/tools.tcl\n+++ b/lib/tools.tcl\n@@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {\n \t}\n \n \tif {$ok} {\n-\t\tset msg [mc \"Tool completed succesfully: %s\" $fullname]\n+\t\tset msg [mc \"Tool completed successfully: %s\" $fullname]\n \t} else {\n \t\tset msg [mc \"Tool failed: %s\" $fullname]\n \t}\ndiff --git a/po/de.po b/po/de.po\nindex a6f730b..51abb50 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -773,16 +773,6 @@ msgstr \"Immer (ohne Zusammenführungstest)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\\n\"\n-\"\\n\"\n-\"Gewählte Zweige jetzt löschen?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2506,7 +2496,7 @@ msgstr \"Starten: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Werkzeug erfolgreich abgeschlossen: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/fr.po b/po/fr.po\nindex e6bf1b4..9b828a2 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -780,16 +780,6 @@ msgstr \"Toujours (Ne pas faire de test de fusion.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Les branches suivantes ne sont pas complètement fusionnées dans %s :\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Il est difficile de récupérer des branches supprimées.\\n\"\n-\"\\n\"\n-\"Supprimer les branches sélectionnées ?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2412,7 +2402,7 @@ msgstr \"Lancement de : %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"L'outil a terminé avec succès : %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex 15aea0d..53b7d36 100644\n--- a/po/git-gui.pot\n+++ b/po/git-gui.pot\n@@ -753,13 +753,6 @@ msgstr \"\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2220,7 +2213,7 @@ msgstr \"\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/hu.po b/po/hu.po\nindex f761b64..0f87bc1 100644\n--- a/po/hu.po\n+++ b/po/hu.po\n@@ -776,16 +776,6 @@ msgstr \"Mindig (Ne legyen merge teszt.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"A törölt branchek visszaállítása bonyolult. \\n\"\n-\"\\n\"\n-\" Biztosan törli a kiválasztott brancheket?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2399,7 +2389,7 @@ msgstr \"Futtatás: %s...\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Az eszköz sikeresen befejeződött: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/it.po b/po/it.po\nindex 294e595..762632c 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -778,16 +778,6 @@ msgstr \"Sempre (Non effettuare verifiche di fusione).\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"I rami seguenti non sono stati fusi completamente in %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Ricomporre rami cancellati può essere complicato. \\n\"\n-\"\\n\"\n-\" Eliminare i rami selezionati?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2418,7 +2408,7 @@ msgstr \"Eseguo: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Il programma esterno è terminato con successo: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/ja.po b/po/ja.po\nindex 09d60be..63c4695 100644\n--- a/po/ja.po\n+++ b/po/ja.po\n@@ -773,16 +773,6 @@ msgstr \"無条件(マージテストしない)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"以下のブランチは %s に完全にマージされていません:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"ブランチを削除すると元に戻すのは困難です。 \\n\"\n-\"\\n\"\n-\" 選択したブランチを削除しますか？\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2382,7 +2372,7 @@ msgstr \"実行中: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"ツールが完了しました: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/nb.po b/po/nb.po\nindex 1c5137d..6de93c2 100644\n--- a/po/nb.po\n+++ b/po/nb.po\n@@ -761,16 +761,6 @@ msgstr \"Alltid (Ikke utfør sammenslåingstest.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Følgende grener er ikke fullstendig slått sammen med %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Gjenoppretting av fjernede grener er vanskelig. \\n\"\n-\"\\n\"\n-\" Fjern valgte grener?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2331,7 +2321,7 @@ msgstr \"Kjører: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Verktøyet ble fullført med suksess: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/ru.po b/po/ru.po\nindex db55b3e..04df2aa 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -661,16 +661,6 @@ msgstr \"Всегда (не выполнять проверку на объеди\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Следующие ветви объединены с %s не полностью:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Восстанавливать удаленные ветви сложно. \\n\"\n-\"\\n\"\n-\" Удалить выбранные ветви?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\ndiff --git a/po/sv.po b/po/sv.po\nindex 167654c..c1535f9 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -780,16 +780,6 @@ msgstr \"Alltid (utför inte sammanslagningstest).\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Följande grenar är inte till fullo sammanslagna med %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Det är svårt att återställa borttagna grenar.\\n\"\n-\"\\n\"\n-\" Ta bort valda grenar?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2398,7 +2388,7 @@ msgstr \"Exekverar: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Verktyget avslutades framgångsrikt: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/zh_cn.po b/po/zh_cn.po\nindex d2c6866..91c1be2 100644\n--- a/po/zh_cn.po\n+++ b/po/zh_cn.po\n@@ -676,16 +676,6 @@ msgstr \"总是合并 (不作合并测试.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"下列分支没有完全被合并到 %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"恢复被删除的分支非常困难.\\n\"\n-\"\\n\"\n-\"是否要删除所选分支?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n-- \n1.6.2.1\n"},{"id":"109264","messageId":"20090324231909.GS23521@spearce.org","threadId":"18497","inReplyTo":"20090323234224.GA29986@zoy.org","subject":"Re: [PATCH v3 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-24T23:19:09Z","receivedAt":"2009-03-24T23:19:09Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Sam Hocevar <sam@zoy.org> wrote:\n> Properly spell \"successful\" and slightly rewrite a couple of strings\n> that actually say the same thing in order to reduce translation work.\n> \n> Update .pot and .po files accordingly since no new translation is\n> required.\n> ---\n>  This patch is unchanged since the last version.\n\nThanks, applied.\n \n-- \nShawn.\n"},{"id":"109266","messageId":"20090324231942.GT23521@spearce.org","threadId":"18497","inReplyTo":"20090324231538.GA14967@zoy.org","subject":"Re: [PATCH v4 1/2] git-gui: various French translation fixes","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-24T23:19:42Z","receivedAt":"2009-03-24T23:19:42Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Sam Hocevar <sam@zoy.org> wrote:\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> ---\n>  Re-sending using one UTF-8 character (???) so that Mutt does not\n> try to use iso8859-1.\n\nThanks, that worked.  :-)\n \n\n-- \nShawn.\n"},{"id":"109353","messageId":"fabb9a1e0903250604t2909e9bbg66c6dab82dcf3333@mail.gmail.com","threadId":"18497","inReplyTo":"20090324231900.GB14967@zoy.org","subject":"Re: [PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-03-25T13:04:08Z","receivedAt":"2009-03-25T13:04:08Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Mar 25, 2009 at 00:19, Sam Hocevar <sam@zoy.org> wrote:\n> ---\n>  �x�y�z�{�|�}�~��\n\nI'm curious, where'd this come from?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"109357","messageId":"20090325152338.GD30959@zoy.org","threadId":"18497","inReplyTo":"fabb9a1e0903250604t2909e9bbg66c6dab82dcf3333@mail.gmail.com","subject":"Re: [PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-25T15:23:38Z","receivedAt":"2009-03-25T15:23:38Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"On Wed, Mar 25, 2009, Sverre Rabbelier wrote:\n> Heya,\n> \n> On Wed, Mar 25, 2009 at 00:19, Sam Hocevar <sam@zoy.org> wrote:\n> > ---\n> >  ▁▂▃▄▅▆▇█\n> \n> I'm curious, where'd this come from?\n\n   Just a few characters from the \"Block Elements\" Unicode block.\nFor some reason, even though my locale is en_GB.UTF-8, Mutt insists\non converting my messages to iso8859-1 when doing so does not lose\ninformation, resulting in corrupted patches, hence my addition of the\nabove characters.\n\n   By the way, your own mailer seems to be mangling those Unicode\ncharacters when answering.\n\nCheers,\n-- \nSam.\n"},{"id":"109358","messageId":"fabb9a1e0903250826i3a13b634md43136d30ce9c83a@mail.gmail.com","threadId":"18497","inReplyTo":"20090325152338.GD30959@zoy.org","subject":"Re: [PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-03-25T15:26:10Z","receivedAt":"2009-03-25T15:26:10Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Mar 25, 2009 at 16:23, Sam Hocevar <sam@zoy.org> wrote:\n> On Wed, Mar 25, 2009, Sverre Rabbelier wrote:\n>> Heya,\n>>\n>> On Wed, Mar 25, 2009 at 00:19, Sam Hocevar <sam@zoy.org> wrote:\n>> > ---\n>> >  �x�y�z�{�|�}�~��\n>>\n>> I'm curious, where'd this come from?\n>\n>   Just a few characters from the \"Block Elements\" Unicode block.\n> For some reason, even though my locale is en_GB.UTF-8, Mutt insists\n> on converting my messages to iso8859-1 when doing so does not lose\n> information, resulting in corrupted patches, hence my addition of the\n> above characters.\n\nAaah, similar to the <3 in the other git-gui translation patch.\n\n>   By the way, your own mailer seems to be mangling those Unicode\n> characters when answering.\n\nYeah, GMail is not that good about encoding and stuff, good thing I\nnever really need it do be :P. (The main downside is that I sometimes\nget base-64 encoded emails as a bunch of unreadable text).\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"109360","messageId":"20090325152740.GA22719@glandium.org","threadId":"18497","inReplyTo":"20090325152338.GD30959@zoy.org","subject":"Re: [PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2009-03-25T15:27:41Z","receivedAt":"2009-03-25T15:27:41Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Wed, Mar 25, 2009 at 04:23:38PM +0100, Sam Hocevar <sam@zoy.org> wrote:\n> On Wed, Mar 25, 2009, Sverre Rabbelier wrote:\n> > Heya,\n> > \n> > On Wed, Mar 25, 2009 at 00:19, Sam Hocevar <sam@zoy.org> wrote:\n> > > ---\n> > >  ▁▂▃▄▅▆▇█\n> > \n> > I'm curious, where'd this come from?\n> \n>    Just a few characters from the \"Block Elements\" Unicode block.\n> For some reason, even though my locale is en_GB.UTF-8, Mutt insists\n> on converting my messages to iso8859-1 when doing so does not lose\n> information, resulting in corrupted patches, hence my addition of the\n> above characters.\n\necho 'set send_charset=\"utf-8\"' >> $HOME/.mutt/muttrc\n\nMike\n"},{"id":"109359","messageId":"86d4c54o6b.fsf@lola.quinscape.zz","threadId":"18497","inReplyTo":"20090325152338.GD30959@zoy.org","subject":"Re: [PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"David Kastrup","fromEmail":"dak@gnu.org","sentAt":"2009-03-25T15:28:28Z","receivedAt":"2009-03-25T15:28:28Z","isPatch":true,"sender":{"key":"dak@gnu.org","avatar":"https://avatars.githubusercontent.com/u/52141349?v=4"},"body":"Sam Hocevar <sam@zoy.org> writes:\n\n> On Wed, Mar 25, 2009, Sverre Rabbelier wrote:\n>> Heya,\n>> \n>> On Wed, Mar 25, 2009 at 00:19, Sam Hocevar <sam@zoy.org> wrote:\n>> > ---\n>> >  ▁▂▃▄▅▆▇█\n>> \n>> I'm curious, where'd this come from?\n>\n>    Just a few characters from the \"Block Elements\" Unicode block.\n> For some reason, even though my locale is en_GB.UTF-8, Mutt insists\n> on converting my messages to iso8859-1 when doing so does not lose\n> information, resulting in corrupted patches, hence my addition of the\n> above characters.\n>\n>    By the way, your own mailer seems to be mangling those Unicode\n> characters when answering.\n\nNo, he just chose to encode them using GB2312 rather than utf-8.  But\nthat is not prohibited.\n\n-- \nDavid Kastrup\n"},{"id":"109361","messageId":"2009-03-25-16-34-26+trackit+sam@rfc1149.net","threadId":"18497","inReplyTo":"20090325152338.GD30959@zoy.org","subject":"Re: [PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Samuel Tardieu","fromEmail":"sam@rfc1149.net","sentAt":"2009-03-25T15:34:26Z","receivedAt":"2009-03-25T15:34:26Z","isPatch":true,"sender":{"key":"sam@rfc1149.net","avatar":"https://avatars.githubusercontent.com/u/44656?v=4"},"body":">>>>> \"Sam\" == Sam Hocevar <sam@zoy.org> writes:\n\nSam> On Wed, Mar 25, 2009, Sverre Rabbelier wrote:\n>> Heya,\n>> \n>> On Wed, Mar 25, 2009 at 00:19, Sam Hocevar <sam@zoy.org> wrote:\n>> > --- > ▁▂▃▄▅▆▇█\n>> \n>> I'm curious, where'd this come from?\n\nSam>    Just a few characters from the \"Block Elements\" Unicode block.\nSam> For some reason, even though my locale is en_GB.UTF-8, Mutt\nSam> insists on converting my messages to iso8859-1 when doing so does\nSam> not lose information, resulting in corrupted patches, hence my\nSam> addition of the above characters.\n\nIn what way would patches get corrupted if there is no loss of\ninformation?\n\nAlternately, you could use\n\n  set send_charset=\"utf-8\"\n\nto have mutt send mails in utf-8 only (in your .muttrc).\n\n  Sam\n-- \nSamuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/\n"},{"id":"109362","messageId":"alpine.DEB.1.00.0903251644030.26370@intel-tinevez-2-302","threadId":"18497","inReplyTo":"20090325152338.GD30959@zoy.org","subject":"Re: [PATCH v4 2/2] git-gui: minor spelling fix and string factorisation.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-03-25T15:44:16Z","receivedAt":"2009-03-25T15:44:16Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 25 Mar 2009, Sam Hocevar wrote:\n\n> On Wed, Mar 25, 2009, Sverre Rabbelier wrote:\n> > Heya,\n> > \n> > On Wed, Mar 25, 2009 at 00:19, Sam Hocevar <sam@zoy.org> wrote:\n> > > ---\n> > >  ▁▂▃▄▅▆▇█\n> > \n> > I'm curious, where'd this come from?\n> \n>    Just a few characters from the \"Block Elements\" Unicode block.\n> For some reason, even though my locale is en_GB.UTF-8, Mutt insists\n> on converting my messages to iso8859-1 when doing so does not lose\n> information, resulting in corrupted patches, hence my addition of the\n> above characters.\n> \n>    By the way, your own mailer seems to be mangling those Unicode\n> characters when answering.\n\nWorks correctly here.\n\nCiao,\nDscho\n"}]}