gitk : french translation

[Emmanuel Trillaud]

Hello all,
I made an attempt to translate gitk in french. The translation is
_almost_ complete
and I would really appreciate to have some comments by the french people here.
I also need to improve some translations I am not happy with so it's
really a work in progress.

Best regards,

Emmanuel Trillaud

[Thomas Moulard]

On Fri, Nov 6, 2009 at 3:05 PM, Emmanuel Trillaud <[hidden email]> wrote:
> Hello all,
> I made an attempt to translate gitk in french. The translation is
> _almost_ complete
> and I would really appreciate to have some comments by the french people here.
> I also need to improve some translations I am not happy with so it's
> really a work in progress.

Here is an updated translation with the following changes:
- translated strings which was still untranslated
- fixed some fuzzy translations
- make some consistency changes
 * s/diff/différences/
 * s/patch/correctif/ everywhere
- fixed some spelling problems.

IMHO the most important should be to decide how to translate the git vocabulary.
The Subversion project has guidelines concerning that issue:
http://svn.collab.net/viewvc/svn/trunk/subversion/po/fr.po?revision=39920&view=markup
It may be a good idea to stick with what they are doing if possible.

The only exception should their translation of ``commit'' by
``propagation'' which
I find awkward. Especially in a Git context , ``git commit'' really
does not propagate anything.

BTW any reason to translate the GUIs (gitk / git-gui) but not the
command line tools?
--
Thomas Moulard

[Emmanuel Trillaud]

> Here is an updated translation with the following changes:
> - translated strings which was still untranslated
> - fixed some fuzzy translations
> - make some consistency changes
>  * s/diff/différences/
>  * s/patch/correctif/ everywhere
> - fixed some spelling problems.
Thank you for your work!

> IMHO the most important should be to decide how to translate the git vocabulary.
> The Subversion project has guidelines concerning that issue:
> http://svn.collab.net/viewvc/svn/trunk/subversion/po/fr.po?revision=39920&view=markup
> It may be a good idea to stick with what they are doing if possible.
> The only exception should their translation of ``commit'' by
> ``propagation'' which
> I find awkward. Especially in a Git context , ``git commit'' really
> does not propagate anything.
I just had a quick look at this file. I don't like "propagation"
either and I prefer to use the
terms "commit" and "commiter".

> BTW any reason to translate the GUIs (gitk / git-gui) but not the
> command line tools?
The command line tools are not internationalized.

Right now, I don't have time to look at your change and to discuss
about them, but tomorow I will.

Best regards

Emmanuel
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Nicolas Sebrecht-3]

[
  Please, conform to Documentation/SubmittingPatches of the git.git
  project and send your patches inline to make the work for reviewers
  easier.

  Both of your patches lack the Signed-off-by but maybe you don't want
  them to be merged?
]

The 06/11/09, Emmanuel Trillaud wrote:

> > Here is an updated translation with the following changes:

<...>

> > - make some consistency changes
> >  * s/diff/différences/
> >  * s/patch/correctif/ everywhere

I disagree here. Words like "diff", "commit", "patch", etc should be
kept as is. Translation of those terms make things harder for the users.

> > IMHO the most important should be to decide how to translate the git vocabulary.
> > The Subversion project has guidelines concerning that issue:
> > http://svn.collab.net/viewvc/svn/trunk/subversion/po/fr.po?revision=39920&view=markup
> > It may be a good idea to stick with what they are doing if possible.

No, no. SVN and Git vocabulary/operations are not identical (not only
for 'commit' as you stated). Please, don't make things harder than it
already is.

--
Nicolas Sebrecht
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Matthieu Moy-2]

Nicolas Sebrecht <[hidden email]> writes:

>> > - make some consistency changes
>> >  * s/diff/différences/
>> >  * s/patch/correctif/ everywhere
>
> I disagree here. Words like "diff", "commit", "patch", etc should be
> kept as is. Translation of those terms make things harder for the users.

Metoo.

One day or another, the user will have to face the words "diff",
"commit" and "patch" even in a 100% french-speaking context (for
example when requesting help and someone answering "open a terminal
and type 'git commit --whatever'" or so).

Matching the command-line concepts and the GUI concepts is made really
hard by over-translating.

(and BTW, "correctif" is not a very good translation of "patch", since
a patch is not necessarilly a correction of something).

--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Emmanuel Trillaud]

2009/11/7 Nicolas Sebrecht <[hidden email]>:
> [
>  Please, conform to Documentation/SubmittingPatches of the git.git
>  project and send your patches inline to make the work for reviewers
>  easier.
>
>  Both of your patches lack the Signed-off-by but maybe you don't want
>  them to be merged?
> ]
I am aware of this recommendation but this translation is almost 22kb and
I tought that put it inline wouldn't make the review easier. I will
submit a patch
gathering my workand those of the reviewers soon.

> The 06/11/09, Emmanuel Trillaud wrote:
>
>> > Here is an updated translation with the following changes:
>
> <...>
>
>> > - make some consistency changes
>> >  * s/diff/différences/
>> >  * s/patch/correctif/ everywhere
>
> I disagree here. Words like "diff", "commit", "patch", etc should be
> kept as is. Translation of those terms make things harder for the users.

I agree with you when those terms refers to _commands_ names, but the
main goal of a
translation is to _translate_ and we have to make the best effort to
use french word if they _exist_
and _are_ appropriate (that's why I'm not sure about translate
"cherry-pick" by "ceullir").
I prefer to translate "Diff this -> selected" by "Différence entre ça
et selection"
because it is what the user do when he make a diff. I am also ok to
translate "merge" by "fusion"
because it's what "merge" is in french and I don't this we mislead the
user by using the term
"fusion".

>> > IMHO the most important should be to decide how to translate the git vocabulary.
>> > The Subversion project has guidelines concerning that issue:
>> > http://svn.collab.net/viewvc/svn/trunk/subversion/po/fr.po?revision=39920&view=markup
>> > It may be a good idea to stick with what they are doing if possible.
>
> No, no. SVN and Git vocabulary/operations are not identical (not only
> for 'commit' as you stated). Please, don't make things harder than it
> already is.
Have you read this document? I read it and it contains some
interesting _advices_ in it
(especially for an amateur translator like me) and some translations
ideas. That said, I agree with
your concerns to not make things harder for the user and to choose the
good translations
for the Git vocabulary. I will make a glossary of the Git words and
the proposed translations for them

Cordiallement

Emmanuel
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Nicolas Sebrecht-3]

The 08/11/09, Emmanuel Trillaud wrote:
> 2009/11/7 Nicolas Sebrecht <[hidden email]>:

> > [
> >  Please, conform to Documentation/SubmittingPatches of the git.git
> >  project and send your patches inline to make the work for reviewers
> >  easier.
> >
> >  Both of your patches lack the Signed-off-by but maybe you don't want
> >  them to be merged?
> > ]
> I am aware of this recommendation but this translation is almost 22kb and
> I tought that put it inline wouldn't make the review easier. I will
> submit a patch
> gathering my workand those of the reviewers soon.

Thanks, it will really help. If the patch is very long, you could split
it into more patches for the review purpose, maybe relying on the
semantic fields. Regardless you split it or not, inline patches are the
good way to contribute here.

Side note : you _must_ have the signed-off-by from Thomas if you want to
use his work.

Oh, and please, submit the new version in this thread.

> > I disagree here. Words like "diff", "commit", "patch", etc should be
> > kept as is. Translation of those terms make things harder for the users.
>
> I agree with you when those terms refers to _commands_ names, but the
> main goal of a
> translation is to _translate_ and we have to make the best effort to
> use french word if they _exist_

I don't think so. Here is _why_: the user-frienliness of a translated
software comes from "how hard is it to connect a word with the
underlying concept".

IOW, we want to have good words to refer to the _concepts_. In the
computer science world (and more _specially_ for a SCM), those concepts
are much more well-known with the english terms. Keeping english words
help users to directly understand what it is about, without making the
users have to search for "what the fucking translators are refering to
here?".

> and _are_ appropriate (that's why I'm not sure about translate
> "cherry-pick" by "ceullir").

I don't have strong opinion for this one because :
- the translation is good enough to be directly understood ;
- where "cueillir" (or so) is used, we have the fallback to the english
  term between round brackets.

> I prefer to translate "Diff this -> selected" by "Différence entre ça
> et selection"
> because it is what the user do when he make a diff.

Looks ok to me, except that "Diff" is better than "Différence" for the
reason I give above. A "diff" is clearly about a _patch_ where
"différence" may be used to much more concepts. French people don't use
the word "différence" to talk about a diff, they use "diff" as is.

> because it is what the user do when he make a diff. I am also ok to
> translate "merge" by "fusion"
> because it's what "merge" is in french and I don't this we mislead the
> user by using the term
> "fusion".

I don't have a strong opinion on this because both english and french
words are known. That said, I tend to think that the english word is
better here too.

--
Nicolas Sebrecht
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Maximilien Noal]

Nicolas Sebrecht wrote :

>>> I disagree here. Words like "diff", "commit", "patch", etc should be
>>> kept as is. Translation of those terms make things harder for the users.
>> I agree with you when those terms refers to _commands_ names, but the
>> main goal of a
>> translation is to _translate_ and we have to make the best effort to
>> use french word if they _exist_
>
> I don't think so. Here is _why_: the user-frienliness of a translated
> software comes from "how hard is it to connect a word with the
> underlying concept".
>
> IOW, we want to have good words to refer to the _concepts_. In the
> computer science world (and more _specially_ for a SCM), those concepts
> are much more well-known with the english terms. Keeping english words
> help users to directly understand what it is about, without making the
> users have to search for "what the fucking translators are refering to
> here?".

Why not put the translation first, then the english word between () ?
At least for English words above that are not used by French devs "as
is" (not like "diff") ?

That way, newbies to SCMs' concepts get the idea, and old SCM users
don't have to translate back.

But if it isn't done _everywhere_ (and not used anywhere for words we
don't want to translate because there's no need or no good translation,
like "diff" for the first case, and "patch" for the second one), it will
make the situation worse.

Just my two cents.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Maximilien Noal]

Maximilien Noal a écrit :

> Nicolas Sebrecht wrote :
>>>> I disagree here. Words like "diff", "commit", "patch", etc should be
>>>> kept as is. Translation of those terms make things harder for the
>>>> users.
>>> I agree with you when those terms refers to _commands_ names, but the
>>> main goal of a
>>> translation is to _translate_ and we have to make the best effort to
>>> use french word if they _exist_
>>
>> I don't think so. Here is _why_: the user-frienliness of a translated
>> software comes from "how hard is it to connect a word with the
>> underlying concept".
>>
>> IOW, we want to have good words to refer to the _concepts_. In the
>> computer science world (and more _specially_ for a SCM), those concepts
>> are much more well-known with the english terms. Keeping english words
>> help users to directly understand what it is about, without making the
>> users have to search for "what the fucking translators are refering to
>> here?".
> Why not put the translation first, then the english word between () ?
> At least for English words above that are not used by French devs "as
> is" (not like "diff") ?
>
> That way, newbies to SCMs' concepts get the idea, and old SCM users
> don't have to translate back.
>
> But if it isn't done _everywhere_ (and not used anywhere for words we
> don't want to translate because there's no need or no good translation,
> like "diff" for the first case, and "patch" for the second one), it will
> make the situation worse.
>
> Just my two cents.

I had in mind a man page when I wrote this, not gitk! Oh well.. Instead
of "French Translated Word (<English Word>)" idea, may be the tooltip
text (the text that pops up on a mouse over a control) can be used when
there is no pixel space left in the UI for the extra (<English Word>) text.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Nicolas Sebrecht-3]

The 09/11/09, Maximilien Noal wrote:

> Why not put the translation first, then the english word between () ?
> At least for English words above that are not used by French devs "as  
> is" (not like "diff") ?

Because it would decrease the readability. The () tip can't be used
everywhere seriously.

> That way, newbies to SCMs' concepts get the idea, and old SCM users  
> don't have to translate back.

Newbies learning Git's concepts have more interest to learn the english
words too ; the GUIs should help them to do so. Matthieu Moy explained
why very well in this thread.

--
Nicolas Sebrecht
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Nicolas Pitre-2]

On Sun, 8 Nov 2009, Matthieu Moy wrote:

> Nicolas Sebrecht <[hidden email]> writes:
>
> >> > - make some consistency changes
> >> >  * s/diff/différences/
> >> >  * s/patch/correctif/ everywhere
> >
> > I disagree here. Words like "diff", "commit", "patch", etc should be
> > kept as is. Translation of those terms make things harder for the users.
>
> Metoo.
>
> One day or another, the user will have to face the words "diff",
> "commit" and "patch" even in a 100% french-speaking context (for
> example when requesting help and someone answering "open a terminal
> and type 'git commit --whatever'" or so).
>
> Matching the command-line concepts and the GUI concepts is made really
> hard by over-translating.

Striking a good balance is the key.  Not translating enough might simply
look "cheap" to a new user who was not exposed to the concepts in the
first place.

It is not like if we were facing issues like:

"Made in Turkey" -> "Fait en dinde"

"arm rest and pad assembly" -> "armer le repos et rembourer l'assemblée"

It's like those stu**d people who decided that "email" was too hard to
translate.  So they declared that "email" was "imél" in French.  
Fortunately some non European people came up with a refreshing idea and
translated "email" into "courriel" instead.  And with a step back, you
must admit that "courriel" is so much clearer and more descriptive
semantically.

Therefore I think that it is a good thing to _try_ to translate stuff
appropriately.  but this is often much harder than it may seem.

> (and BTW, "correctif" is not a very good translation of "patch", since
> a patch is not necessarilly a correction of something).

In this case I think "retouche" would be a better choice.


Nicolas

[Matthieu Moy-2]

Nicolas Pitre <[hidden email]> writes:

> It's like those stu**d people who decided that "email" was too hard to
> translate.  So they declared that "email" was "imél" in French.

This one is not _as_ stupid as it seems to be. It's not "imél", it's
"mél.", and it's a shortcut for "messagerie électronique", like "tél."
is a shortcut for "téléphone" (the kind of things to put on your visit
card or on the header of a letter).

http://www.culture.gouv.fr/culture/dglf/mel.htm

--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Maximilien Noal]

Matthieu Moy a écrit :

> Nicolas Pitre <[hidden email]> writes:
>
>> It's like those stu**d people who decided that "email" was too hard to
>> translate.  So they declared that "email" was "imél" in French.
>
> This one is not _as_ stupid as it seems to be. It's not "imél", it's
> "mél.", and it's a shortcut for "messagerie électronique", like "tél."
> is a shortcut for "téléphone" (the kind of things to put on your visit
> card or on the header of a letter).
>
> http://www.culture.gouv.fr/culture/dglf/mel.htm
>

mél is ugly as hell to the ear.

Courriel sounds way better!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Emmanuel Trillaud]

Subject : [PATCHv2] French translation of gitk

Signed-off-by: Emmanuel Trillaud <[hidden email]>
Signed-off-by: Thomas Moulard <[hidden email]>
Signed-off-by: Guy Brand <[hidden email]>
---
This translation is complete and has been proofread (thanks to Thomas and Guy).
I will (again) appreciate the feedback on this translation or on the
glossary that will follow.
Maybe we could start speaking french since it is a de facto
"francophone" thread.
 gitk-git/po/fr.po | 1243 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1243 insertions(+), 0 deletions(-)
 create mode 100644 gitk-git/po/fr.po

diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po
new file mode 100644
index 0000000..ff5e251
--- /dev/null
+++ b/gitk-git/po/fr.po
@@ -0,0 +1,1243 @@
+# French translation of the gitk package
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gitk package.
+# Translators:
+# Emmanuel Trillaud <[hidden email]>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-05 15:16+0200\n"
+"PO-Revision-Date: 2009-11-10 18:17+0100\n"
+"Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
+"Language-Team: FRENCH\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+
+#: gitk:113
+msgid "Couldn't get list of unmerged files:"
+msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
+
+#: gitk:269
+msgid "Error parsing revisions:"
+msgstr "Erreur lors du parcours des révisions :"
+
+#: gitk:324
+msgid "Error executing --argscmd command:"
+msgstr "Erreur à l'exécution de la commande --argscmd :"
+
+#: gitk:337
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr "Aucun fichier sélectionné : --merge précisé, mais tous les
fichiers sont fusionnés."
+
+#FIXME : améliorer la traduction de 'file limite'
+#: gitk:340
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr "Aucun fichier sélectionné : --merge précisé mais aucun
fichier non fusionné n'est dans la limite des fichiers."
+
+#: gitk:362 gitk:509
+msgid "Error executing git log:"
+msgstr "Erreur à l'exécution de git log :"
+
+#: gitk:380 gitk:525
+msgid "Reading"
+msgstr "Lecture en cours"
+
+#: gitk:440 gitk:4123
+msgid "Reading commits..."
+msgstr "Lecture des commits..."
+
+#: gitk:443 gitk:1561 gitk:4126
+msgid "No commits selected"
+msgstr "Aucun commit sélectionné"
+
+#: gitk:1437
+msgid "Can't parse git log output:"
+msgstr "Impossible de lire le résultat de git log :"
+
+#: gitk:1657
+msgid "No commit information available"
+msgstr "Aucune information disponible sur le commit"
+
+#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498
+msgid "OK"
+msgstr "OK"
+
+#: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788
+#: gitk:10323 gitk:10499
+msgid "Cancel"
+msgstr "Annuler"
+
+#: gitk:1919
+msgid "Update"
+msgstr "Mise à jour"
+
+#: gitk:1920
+msgid "Reload"
+msgstr "Recharger"
+
+#: gitk:1921
+msgid "Reread references"
+msgstr "Relire les références"
+
+#: gitk:1922
+msgid "List references"
+msgstr "Lister les références"
+
+#: gitk:1924
+msgid "Start git gui"
+msgstr "Démarrer git gui"
+
+#: gitk:1926
+msgid "Quit"
+msgstr "Quitter"
+
+#: gitk:1918
+msgid "File"
+msgstr "Fichier"
+
+#: gitk:1930
+msgid "Preferences"
+msgstr "Préférences"
+
+#: gitk:1929
+msgid "Edit"
+msgstr "Éditer"
+
+#: gitk:1934
+msgid "New view..."
+msgstr "Nouvelle vue ..."
+
+#: gitk:1935
+msgid "Edit view..."
+msgstr "Éditer la vue ..."
+
+#: gitk:1936
+msgid "Delete view"
+msgstr "Supprimer la vue"
+
+#: gitk:1938
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: gitk:1933 gitk:3670
+msgid "View"
+msgstr "Vue"
+
+#: gitk:1943 gitk:1953 gitk:2654
+msgid "About gitk"
+msgstr "À propos de gitk"
+
+#: gitk:1944 gitk:1958
+msgid "Key bindings"
+msgstr "Raccourcis clavier"
+
+#: gitk:1942 gitk:1957
+msgid "Help"
+msgstr "Aide"
+
+#: gitk:2018
+msgid "SHA1 ID: "
+msgstr "ID SHA1 :"
+
+#: gitk:2049
+msgid "Row"
+msgstr "Colonne"
+
+#: gitk:2080
+msgid "Find"
+msgstr "Recherche"
+
+#: gitk:2081
+msgid "next"
+msgstr "suivant"
+
+#: gitk:2082
+msgid "prev"
+msgstr "précédent"
+
+#: gitk:2083
+msgid "commit"
+msgstr "commit"
+
+#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344
+#: gitk:6428
+msgid "containing:"
+msgstr "contient :"
+
+#: gitk:2089 gitk:3162 gitk:3167 gitk:4359
+msgid "touching paths:"
+msgstr "chemins modifiés :"
+
+#: gitk:2090 gitk:4364
+msgid "adding/removing string:"
+msgstr "ajoute/supprime la chaîne :"
+
+#: gitk:2099 gitk:2101
+msgid "Exact"
+msgstr "Exact"
+
+#: gitk:2101 gitk:4439 gitk:6240
+msgid "IgnCase"
+msgstr "IgnCasse"
+
+#: gitk:2101 gitk:4333 gitk:4437 gitk:6236
+msgid "Regexp"
+msgstr "Expression régulière"
+
+#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432
+msgid "All fields"
+msgstr "Tous les champs"
+
+#: gitk:2104 gitk:4456 gitk:4488 gitk:6303
+msgid "Headline"
+msgstr "Surligner"
+
+#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866
+msgid "Comments"
+msgstr "Commentaires"
+
+#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063
+#: gitk:8078
+msgid "Author"
+msgstr "Auteur"
+
+#: gitk:2105 gitk:4456 gitk:6303 gitk:6803
+msgid "Committer"
+msgstr "Auteur du commit"
+
+#: gitk:2134
+msgid "Search"
+msgstr "Rechercher"
+
+#: gitk:2141
+msgid "Diff"
+msgstr "Différences"
+
+#: gitk:2143
+msgid "Old version"
+msgstr "Ancienne version"
+
+#: gitk:2145
+msgid "New version"
+msgstr "Nouvelle version"
+
+#: gitk:2147
+msgid "Lines of context"
+msgstr "Lignes de contexte"
+
+#: gitk:2157
+msgid "Ignore space change"
+msgstr "Ignorer les modifications d'espace"
+
+#: gitk:2215
+msgid "Patch"
+msgstr "Patch"
+
+#: gitk:2217
+msgid "Tree"
+msgstr "Arbre"
+
+#: gitk:2361 gitk:2378
+msgid "Diff this -> selected"
+msgstr "Différences entre ceci et la séléction"
+
+#: gitk:2362 gitk:2379
+msgid "Diff selected -> this"
+msgstr "Différence entre séléction et ceci"
+
+#: gitk:2363 gitk:2380
+msgid "Make patch"
+msgstr "Créer patch"
+
+#: gitk:2364 gitk:8441
+msgid "Create tag"
+msgstr "Créer tag"
+
+#: gitk:2365 gitk:8547
+msgid "Write commit to file"
+msgstr "Écrire le commit dans un fichier"
+
+#: gitk:2366 gitk:8604
+msgid "Create new branch"
+msgstr "Créer nouvelle branche"
+
+#: gitk:2367
+msgid "Cherry-pick this commit"
+msgstr "Cueillir (cherry-pick) ce commit"
+
+#: gitk:2368
+msgid "Reset HEAD branch to here"
+msgstr "Réinitialiser la branch HEAD vers cet état"
+
+#: gitk:2369
+msgid "Mark this commit"
+msgstr "Marquer ce commit"
+
+#: gitk:2370
+msgid "Return to mark"
+msgstr "Retourner à la marque"
+
+#: gitk:2371
+msgid "Find descendant of this and mark"
+msgstr "Chercher le descendant de ceci et le marquer"
+
+#: gitk:2372
+msgid "Compare with marked commit"
+msgstr "Comparer avec le commit marqué"
+
+#: gitk:2386
+msgid "Check out this branch"
+msgstr "Récupérer cette branche"
+
+#: gitk:2387
+msgid "Remove this branch"
+msgstr "Supprimer cette branche"
+
+#: gitk:2394
+msgid "Highlight this too"
+msgstr "Surligner également ceci"
+
+#: gitk:2395
+msgid "Highlight this only"
+msgstr "Surligner seulement ceci"
+
+# FIXME: changed for consistency but a better translation is required.
+#: gitk:2396
+msgid "External diff"
+msgstr "Différences externe"
+
+#: gitk:2397
+msgid "Blame parent commit"
+msgstr "Blâmer le commit parent"
+
+#: gitk:2404
+msgid "Show origin of this line"
+msgstr "Montrer l'origine de cette ligne"
+
+#: gitk:2405
+msgid "Run git gui blame on this line"
+msgstr "Exécuter git gui blame sur cette ligne"
+
+#: gitk:2656
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2008 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - visualisateur de commit pour git\n"
+"\n"
+"Copyright © 2005-2008 Paul Mackerras\n"
+"\n"
+"Utilisation et redistribution soumis aux termes de la GNU General
Public License"
+
+#: gitk:2664 gitk:2726 gitk:8969
+msgid "Close"
+msgstr "Fermer"
+
+#: gitk:2683
+msgid "Gitk key bindings"
+msgstr "Raccourcis clavier de Gitk"
+
+#: gitk:2686
+msgid "Gitk key bindings:"
+msgstr "Raccourcis clavier de Gitk :"
+
+#: gitk:2688
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tQuitter"
+
+#: gitk:2689
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Début>\t\tAller au premier commit"
+
+#: gitk:2690
+msgid "<End>\t\tMove to last commit"
+msgstr "<Fin>\t\tAller au dernier commit"
+
+#: gitk:2691
+msgid "<Up>, p, i\tMove up one commit"
+msgstr "<Haut>, p, i\t Aller au commit suivant"
+
+#: gitk:2692
+msgid "<Down>, n, k\tMove down one commit"
+msgstr "<Bas>, n, k\t Aller au commit précédent"
+
+#: gitk:2693
+msgid "<Left>, z, j\tGo back in history list"
+msgstr "<Gauche>, z, j\tAvancer dans l'historique"
+
+#: gitk:2694
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Droite>, x, l\tRemonter dans l'historique"
+
+#: gitk:2695
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
+
+#: gitk:2696
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
+
+#: gitk:2697
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Début>\tAller en haut de la liste des commits"
+
+#: gitk:2698
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tAller en bas de la liste des commits"
+
+#: gitk:2699
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
+
+#: gitk:2700
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
+
+#: gitk:2701
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
+
+#: gitk:2702
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
+
+#: gitk:2703
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Up>\tRecherche en arrière (vers l'avant, commits les
plus anciens)"
+
+#: gitk:2704
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Shift-Down>\tRecherche en avant (vers l'arrière, commit les
plus récents)"
+
+#: gitk:2705
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Supprimer>, b\tMonter d'une page dans la vue des différences"
+
+#: gitk:2706
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\tMonter d'une page dans la vue des différences"
+
+#: gitk:2707
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Espace>\t\tDescendre d'une page dans la vue des différences"
+
+#: gitk:2708
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tMonter de 18 lignes dans la vue des différences"
+
+#: gitk:2709
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tDescendre de 18 lignes dans la vue des différences"
+
+#: gitk:2710
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tRechercher"
+
+#: gitk:2711
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
+
+#: gitk:2712
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\t\tAller au résultat de recherche suivant"
+
+#: gitk:2713
+msgid "/\t\tFocus the search box"
+msgstr "/"
+
+#: gitk:2714
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tAller au résultat de recherche précédent"
+
+#: gitk:2715
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tAller au prochain fichier dans la vue des différences"
+
+#: gitk:2716
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des différences"
+
+#: gitk:2717
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des différences"
+
+#: gitk:2718
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tAugmenter la taille de la police"
+
+#: gitk:2719
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\tAugmenter la taille de la police"
+
+#: gitk:2720
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tDiminuer la taille de la police"
+
+#: gitk:2721
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\tDiminuer la taille de la police"
+
+#: gitk:2722
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tMise à jour"
+
+#: gitk:3177
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Erreur en obtenant \"%s\" de %s:"
+
+#: gitk:3234 gitk:3243
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Erreur lors de la création du répertoire temporaire %s :"
+
+#: gitk:3255
+msgid "command failed:"
+msgstr "échec de la commande :"
+
+#: gitk:3401
+msgid "No such commit"
+msgstr "commit inexistant"
+
+#: gitk:3415
+msgid "git gui blame: command failed:"
+msgstr "git gui blame : échec de la commande"
+
+#: gitk:3446
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Impossible de lire le head de la fusion: %s"
+
+#: gitk:3454
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Erreur à la lecture de l'index : %s"
+
+#: gitk:3479
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "impossible de démarrer git blame : %s"
+
+#: gitk:3482 gitk:6271
+msgid "Searching"
+msgstr "Recherche en cours"
+
+#: gitk:3514
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Erreur à l'exécution de git blame : %s"
+
+#: gitk:3542
+#, tcl-format
+msgid "That line comes from commit %s,  which is not in this view"
+msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue"
+
+#: gitk:3556
+msgid "External diff viewer failed:"
+msgstr "Échec de l'outil externe de visualisation des différences"
+
+#: gitk:3674
+msgid "Gitk view definition"
+msgstr "Définition des vues de Gitk"
+
+#: gitk:3678
+msgid "Remember this view"
+msgstr "Se souvenir de cette vue"
+
+#: gitk:3679
+msgid "References (space separated list):"
+msgstr "Références (liste d'éléments séparer par des espaces) :"
+
+#: gitk:3680
+msgid "Branches & tags:"
+msgstr "Branches & tags :"
+
+#: gitk:3681
+msgid "All refs"
+msgstr "Toutes les références"
+
+#: gitk:3682
+msgid "All (local) branches"
+msgstr "Toutes les branches (locales)"
+
+#: gitk:3683
+msgid "All tags"
+msgstr "Tous les tags"
+
+#: gitk:3684
+msgid "All remote-tracking branches"
+msgstr "Toutes les branches de suivie distante"
+
+#: gitk:3685
+msgid "Commit Info (regular expressions):"
+msgstr "Info sur les commits (expressions régulières) :"
+
+#: gitk:3686
+msgid "Author:"
+msgstr "Auteur :"
+
+#: gitk:3687
+msgid "Committer:"
+msgstr "Committer :"
+
+#: gitk:3688
+msgid "Commit Message:"
+msgstr "Message de commit :"
+
+#: gitk:3689
+msgid "Matches all Commit Info criteria"
+msgstr "Correspond à tous les critères d'Info sur les commits"
+
+#: gitk:3690
+msgid "Changes to Files:"
+msgstr "Changements des fichiers"
+
+#: gitk:3691
+msgid "Fixed String"
+msgstr "Chaîne Figée"
+
+#: gitk:3692
+msgid "Regular Expression"
+msgstr "Expression Régulière"
+
+#: gitk:3693
+msgid "Search string:"
+msgstr "Recherche de la chaîne :"
+
+#: gitk:3694
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
+"2009 15:27:38\") :"
+
+#: gitk:3695
+msgid "Since:"
+msgstr "Depuis :"
+
+#: gitk:3696
+msgid "Until:"
+msgstr "Jusqu'au :"
+
+# FIXME : traduction de "skip"
+#: gitk:3697
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révision :"
+
+#: gitk:3698
+msgid "Number to show:"
+msgstr "Nombre à afficher :"
+
+#: gitk:3699
+msgid "Number to skip:"
+msgstr "Nombre à sauter :"
+
+#: gitk:3700
+msgid "Miscellaneous options:"
+msgstr "Options diverses"
+
+#: gitk:3701
+msgid "Strictly sort by date"
+msgstr "Trier par date"
+
+#FIXME : traduction de "branch sides"
+#: gitk:3702
+msgid "Mark branch sides"
+msgstr "Marquer le flanc des branches"
+
+#: gitk:3703
+msgid "Limit to first parent"
+msgstr "Limiter au premier ancêtre"
+
+#: gitk:3704
+msgid "Simple history"
+msgstr "Historique simple"
+
+#: gitk:3705
+msgid "Additional arguments to git log:"
+msgstr "Arguments supplémentaires de git log :"
+
+#: gitk:3706
+msgid "Enter files and directories to include, one per line:"
+msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
+
+#: gitk:3707
+msgid "Command to generate more commits to include:"
+msgstr "Commande pour générer plus de commits à inclure :"
+
+#: gitk:3829
+msgid "Gitk: edit view"
+msgstr "Gitk : éditer la vue"
+
+#: gitk:3837
+msgid "-- criteria for selecting revisions"
+msgstr "-- critère pour la séléction des révisions"
+
+#: gitk:3842
+msgid "View Name:"
+msgstr "Nom de la vue :"
+
+#: gitk:3917
+msgid "Apply (F5)"
+msgstr "Appliquer (F5)"
+
+#: gitk:3955
+msgid "Error in commit selection arguments:"
+msgstr "Erreur dans les arguments de sélection des commits"
+
+#: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197
+msgid "None"
+msgstr "Aucun"
+
+#: gitk:4456 gitk:6303 gitk:8065 gitk:8080
+msgid "Date"
+msgstr "Date"
+
+#: gitk:4456 gitk:6303
+msgid "CDate"
+msgstr "CDate"
+
+#: gitk:4605 gitk:4610
+msgid "Descendant"
+msgstr "Descendant"
+
+#FIXME : plutôt traduire par "pas un descendant"
+#: gitk:4606
+msgid "Not descendant"
+msgstr "Non descendant"
+
+#: gitk:4613 gitk:4618
+msgid "Ancestor"
+msgstr "Ancêtre"
+
+#FIXME : plutôt traduire par "pas un ancêtre"
+#: gitk:4614
+msgid "Not ancestor"
+msgstr "Non ancêtre"
+
+#: gitk:4904
+msgid "Local changes checked in to index but not committed"
+msgstr "Modifications locales enregistrées dans l'index mais non comittées"
+
+#: gitk:4940
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Modifications locales non enregistrées dans l'index et non committées"
+
+#: gitk:6621
+msgid "many"
+msgstr "nombreux"
+
+#: gitk:6805
+msgid "Tags:"
+msgstr "Tags :"
+
+#: gitk:6822 gitk:6828 gitk:8058
+msgid "Parent"
+msgstr "Parent"
+
+#: gitk:6833
+msgid "Child"
+msgstr "Enfant"
+
+#: gitk:6842
+msgid "Branch"
+msgstr "Branche"
+
+#: gitk:6845
+msgid "Follows"
+msgstr "Suit"
+
+#: gitk:6848
+msgid "Precedes"
+msgstr "Précède"
+
+#: gitk:7346
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Erreur lors de la récupération des différences : %s"
+
+#: gitk:7886
+msgid "Goto:"
+msgstr "Aller à :"
+
+#: gitk:7888
+msgid "SHA1 ID:"
+msgstr "Id SHA1 :"
+
+#: gitk:7907
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "Id SHA1 court %s est ambigu"
+
+#: gitk:7914
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Id SHA1 %s est inconnu"
+
+#: gitk:7924
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "Id SHA1 %s est inconnu"
+
+#: gitk:7926
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "Révision %s n'est pas dans la vue courante"
+
+#: gitk:8068
+msgid "Children"
+msgstr "Enfants"
+
+#: gitk:8125
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Réinitialiser la branche %s vers cet état"
+
+#: gitk:8127
+msgid "Detached head: can't reset"
+msgstr "Head détachée: impossible de réinitialiser"
+
+#: gitk:8236 gitk:8242
+msgid "Skipping merge commit "
+msgstr "Sauter le commit de la fusion "
+
+#: gitk:8251 gitk:8256
+msgid "Error getting patch ID for "
+msgstr "Erreur à l'obtention de l'ID du patch pour "
+
+#: gitk:8252 gitk:8257
+msgid " - stopping\n"
+msgstr " - arrêt en cours\n"
+
+#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292
+msgid "Commit "
+msgstr "Commit "
+
+#: gitk:8266
+msgid ""
+" is the same patch as\n"
+"       "
+msgstr ""
+"est le même patch que \n"
+"       "
+
+#: gitk:8274
+msgid ""
+" differs from\n"
+"       "
+msgstr ""
+"diffère de\n"
+"       "
+
+#: gitk:8276
+msgid "- stopping\n"
+msgstr "- arrêt en cours\n"
+
+#: gitk:8284 gitk:8293
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr "a %s enfants - arrêt en cours\n"
+
+#: gitk:8324
+msgid "Top"
+msgstr "Haut"
+
+#: gitk:8325
+msgid "From"
+msgstr "De"
+
+#: gitk:8330
+msgid "To"
+msgstr "À"
+
+#: gitk:8354
+msgid "Generate patch"
+msgstr "Générer le patch"
+
+#: gitk:8356
+msgid "From:"
+msgstr "De :"
+
+#: gitk:8365
+msgid "To:"
+msgstr "À :"
+
+#: gitk:8374
+msgid "Reverse"
+msgstr "Inverser"
+
+#: gitk:8376 gitk:8561
+msgid "Output file:"
+msgstr "Fichier de sortie :"
+
+#: gitk:8382
+msgid "Generate"
+msgstr "Générer"
+
+#: gitk:8420
+msgid "Error creating patch:"
+msgstr "Erreur à la création du patch :"
+
+#: gitk:8443 gitk:8549 gitk:8606
+msgid "ID:"
+msgstr "ID :"
+
+#: gitk:8452
+msgid "Tag name:"
+msgstr "Nom du Tag :"
+
+#: gitk:8456 gitk:8615
+msgid "Create"
+msgstr "Créer"
+
+#: gitk:8473
+msgid "No tag name specified"
+msgstr "Aucun nom de tag spécifié"
+
+#: gitk:8477
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Le tag \"%s\" existe déjà"
+
+#: gitk:8483
+msgid "Error creating tag:"
+msgstr "Erreur à la création du tag"
+
+#: gitk:8558
+msgid "Command:"
+msgstr "Commande :"
+
+#: gitk:8566
+msgid "Write"
+msgstr "Écrire"
+
+#: gitk:8584
+msgid "Error writing commit:"
+msgstr "Erreur à l'ecriture du commit :"
+
+#: gitk:8611
+msgid "Name:"
+msgstr "Nom :"
+
+#: gitk:8634
+msgid "Please specify a name for the new branch"
+msgstr "Veuillez spécifier un nom pour la nouvelle branche"
+
+#: gitk:8639
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "La branche '%s' existe déjà. Écraser?"
+
+#: gitk:8705
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr "Commit %s est déjà inclus dans la branche %s -- faut-il
vraiment le ré-appliquer?"
+
+# cueillir me parait une bonne traduction de cherry-pick mais faut-il le
+# traduire
+#: gitk:8710
+msgid "Cherry-picking"
+msgstr "Cueillir (Cherry-picking)"
+
+#: gitk:8719
+#, tcl-format
+msgid ""
+"Cherry-pick failed because of local changes to file '%s'.\n"
+"Please commit, reset or stash your changes and try again."
+msgstr "La cueillette a échouée à cause de modifications locale au
fichier '%s'.\n"
+"Veuillez committer, reset ou stash vos changements et essayer de nouveau."
+
+#: gitk:8725
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+"La cueillette (cherry-pick) a échoué à cause d'un conflit lors d'une
fusion.\n"
+"Souhaitez-vous exécuter git citool pour le résoudre?"
+
+#: gitk:8741
+msgid "No changes committed"
+msgstr "Aucun changement committer"
+
+#: gitk:8767
+msgid "Confirm reset"
+msgstr "Confirmer la réinitialisation"
+
+#: gitk:8769
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Réinitialiser la branche %s à %s?"
+
+#: gitk:8773
+msgid "Reset type:"
+msgstr "Type de réinitialisation :"
+
+# FIXME: faut-il traduire working tree par répertoire de travail ou
arbre de travail?
+# FIXME : traduction de Soft/Hard/Mixed
+#: gitk:8777
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Douce: Laisse l'arbre de travail et l'index dans leur état courant"
+
+#: gitk:8780
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "Hybride: Laisse l'arbre de travail dans son état courant,
réinitialise l'index"
+
+#: gitk:8783
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Dur: Réinitialise l'arbre de travail et l'index\n"
+"(abandonne TOUS les changements locaux)"
+
+#: gitk:8800
+msgid "Resetting"
+msgstr "Réinitialisation"
+
+#: gitk:8857
+msgid "Checking out"
+msgstr "Récupération"
+
+#: gitk:8910
+msgid "Cannot delete the currently checked-out branch"
+msgstr "Impossible de supprimer la branche en cours"
+
+#: gitk:8916
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Les commits de la branche %s ne sont dans aucune autre branche.\n"
+"Voulez-vous vraiment supprimer cette branche %s ?"
+
+#: gitk:8947
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Tags et heads : %s"
+
+#: gitk:8962
+msgid "Filter"
+msgstr "Filtrer"
+
+#: gitk:9257
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Erreur à la lecture des informations sur la topology des commits. "
+"Les informations sur les branches et les tags précédents/suivant "
+"seront incomplètes."
+
+#: gitk:10243
+msgid "Tag"
+msgstr "Tag"
+
+#: gitk:10243
+msgid "Id"
+msgstr "Id"
+
+#: gitk:10291
+msgid "Gitk font chooser"
+msgstr "Sélecteur de police de Gitk"
+
+#: gitk:10308
+msgid "B"
+msgstr "B"
+
+#: gitk:10311
+msgid "I"
+msgstr "I"
+
+#: gitk:10407
+msgid "Gitk preferences"
+msgstr "Préférences de Gitk"
+
+#: gitk:10409
+msgid "Commit list display options"
+msgstr "Options d'affichage de la liste des commits"
+
+#: gitk:10412
+msgid "Maximum graph width (lines)"
+msgstr "Longueur maximum du graphe (lignes)"
+
+#FIXME : Traduction standard de "pane"?
+#: gitk:10416
+#, tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Longueur maximum du graphe (% du panneau)"
+
+#: gitk:10420
+msgid "Show local changes"
+msgstr "Montrer les changements locaux"
+
+#: gitk:10423
+msgid "Auto-select SHA1"
+msgstr "Sélection auto. du SHA1"
+
+#: gitk:10427
+msgid "Diff display options"
+msgstr "Options d'affichage des différences"
+
+#: gitk:10429
+msgid "Tab spacing"
+msgstr "Taille des tabulations"
+
+#: gitk:10432
+msgid "Display nearby tags"
+msgstr "Afficher les tags les plus proches"
+
+#: gitk:10435
+msgid "Hide remote refs"
+msgstr "Cacher les refs distantes"
+
+#: gitk:10438
+msgid "Limit diffs to listed paths"
+msgstr "Limiter les différences aux chemins listés"
+
+#: gitk:10441
+msgid "Support per-file encodings"
+msgstr "Support pour un encodage de caractère par fichier"
+
+#: gitk:10447 gitk:10512
+msgid "External diff tool"
+msgstr "Outil de diff externe"
+
+#: gitk:10449
+msgid "Choose..."
+msgstr "Choisir ..."
+
+#: gitk:10454
+msgid "Colors: press to choose"
+msgstr "Couleurs : cliquer pour choisir"
+
+#: gitk:10457
+msgid "Background"
+msgstr "Arrière-plan"
+
+#: gitk:10458 gitk:10488
+msgid "background"
+msgstr "arrière plan"
+
+#: gitk:10461
+msgid "Foreground"
+msgstr "Premier plan"
+
+#: gitk:10462
+msgid "foreground"
+msgstr "premier plan"
+
+#: gitk:10465
+msgid "Diff: old lines"
+msgstr "Différences : anciennes lignes"
+
+#: gitk:10466
+msgid "diff old lines"
+msgstr "différences anciennes lignes"
+
+#: gitk:10470
+msgid "Diff: new lines"
+msgstr "Différences : nouvelles lignes"
+
+#: gitk:10471
+msgid "diff new lines"
+msgstr "différences nouvelles lignes"
+
+#: gitk:10475
+msgid "Diff: hunk header"
+msgstr "Différences : entête de l'extrait"
+
+#: gitk:10477
+msgid "diff hunk header"
+msgstr "différences : entête de l'extrait"
+
+#: gitk:10481
+msgid "Marked line bg"
+msgstr "Arrière-plan de la ligne marquée"
+
+#: gitk:10483
+msgid "marked line background"
+msgstr "Arrière-plan de la ligne marquée"
+
+#: gitk:10487
+msgid "Select bg"
+msgstr "Sélectionner l'arrière-plan"
+
+#: gitk:10491
+msgid "Fonts: press to choose"
+msgstr "Polices : cliquer pour choisir"
+
+#: gitk:10493
+msgid "Main font"
+msgstr "Police principale"
+
+#: gitk:10494
+msgid "Diff display font"
+msgstr "Police d'affichage des différences"
+
+#: gitk:10495
+msgid "User interface font"
+msgstr "Police de l'interface utilisateur"
+
+#: gitk:10522
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk : choisir la couleur de %s"
+
+#: gitk:10973
+msgid ""
+"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
+" Gitk requires at least Tcl/Tk 8.4."
+msgstr ""
+"Désolé, gitk ne peut être exécuté par cette version de Tcl/Tk.\n"
+" Gitk requiert Tcl/Tk version 8.4 ou supérieur."
+
+#: gitk:11101
+msgid "Cannot find a git repository here."
+msgstr "Impossible de trouver un dépôt git ici."
+
+#: gitk:11105
+#, tcl-format
+msgid "Cannot find the git directory \"%s\"."
+msgstr "Impossible de trouver le répertoire git \"%s\"."
+
+#: gitk:11152
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "Argument '%s' ambigu : à la fois une révision et un nom et fichier"
+
+#: gitk:11164
+msgid "Bad arguments to gitk:"
+msgstr "Arguments invalides pour gitk :"
+
+#: gitk:11249
+msgid "Command line"
+msgstr "Ligne de commande"
--
1.6.5.2.74.g610f9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Emmanuel Trillaud]

Here is a glossary which contains the Git words and the proposed translations.

Terme : Traduction(gitk) : Traduction(git-gui)

Branch : branche :
To blame : blâmer : blâmer
Commit : commit : commit
to commit : commiter : commiter
commiter : auteur du commit : commiteur
Check out : Récupérer : charger
to cherry-pick : Ceuillir
Diff : Différence : Diff
Index : Index
Tag : Tag : Marque (tag)
Revision : Révision : Révision
Merge : fusion : fusion
to merge : fusionner : fusionner
Head : Head : Head
to reset : Réinitialiser : Réinitialiser
reset : réinitialisation ;
Hard (Reset) : Dure :
Mixed (reset) : Hybride :
Soft (Reset) : Douce :
Patch : Patch :
To stage : Indexer :

some RFCs :
I am ok with the translation of "patch" by "patch" since it is use in
france in other context
I prefer to translate "Diff" by "Différences" _especially_ when we are
talking about the action of making a "diff"
translation of "Hard", "Mixed", "Soft" in the Reset context
translation of "cherry-pick". For this one we could use "<translation>
(<english-word>) ..." as suggest previously.

Best regards

Emmanuel
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Nicolas Sebrecht-3]

The 10/11/09, Emmanuel Trillaud wrote:

> Here is a glossary which contains the Git words and the proposed translations.
>
> Terme : Traduction(gitk) : Traduction(git-gui)

Nice idea, this will help for consistency.

> Branch : branche :
                     branche (git gui)

> To blame : blâmer : blâmer
> Commit : commit : commit
> to commit : commiter : commiter
> commiter : auteur du commit : commiteur

Why not "commiteur" for gitk too?

> Check out : Récupérer : charger
> to cherry-pick : Ceuillir
> Diff : Différence : Diff

See comment at the end.

> Index : Index
> Tag : Tag : Marque (tag)
> Revision : Révision : Révision
> Merge : fusion : fusion
> to merge : fusionner : fusionner
> Head : Head : Head
> to reset : Réinitialiser : Réinitialiser
> reset : réinitialisation ;
> Hard (Reset) : Dure :
> Mixed (reset) : Hybride :
> Soft (Reset) : Douce :

Léger ?

> Patch : Patch :
> To stage : Indexer :
>
> some RFCs :
> I am ok with the translation of "patch" by "patch" since it is use in
> france in other context
> I prefer to translate "Diff" by "Différences" _especially_ when we are
> talking about the action of making a "diff"

You don't explain _why_. We had 3 points in favour of the "diff" term in
french in this thread (keep Git's commands consistency, rough
translation and english word more used even by french people as for
"patch"). I have another argument to use "diff" now: keep consistency
with 'git gui'.

> translation of "Hard", "Mixed", "Soft" in the Reset context
> translation of "cherry-pick". For this one we could use "<translation>
> (<english-word>) ..." as suggest previously.

I'm fine here.

--
Nicolas Sebrecht
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Nicolas Sebrecht-3]

The 10/11/09, Emmanuel Trillaud wrote:
> Subject : [PATCHv2] French translation of gitk
>
> Signed-off-by: Emmanuel Trillaud <[hidden email]>
> Signed-off-by: Thomas Moulard <[hidden email]>
> Signed-off-by: Guy Brand <[hidden email]>
> ---
> This translation is complete and has been proofread (thanks to Thomas and Guy).

There are still spelling errors in some translations. I'll correct the
patch when we'll find a consensus for the semantic fields of the
translation.

> I will (again) appreciate the feedback on this translation or on the
> glossary that will follow.

My first concerns go there; read the other sub-thread, please.

--
Nicolas Sebrecht
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Nicolas Sebrecht-3]

The 10/11/09, Emmanuel Trillaud wrote:

> +"Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
> +"Language-Team: FRENCH\n"

Please, fill in these fields.

> +#: gitk:337
> +msgid "No files selected: --merge specified but no files are unmerged."
> +msgstr "Aucun fichier sélectionné : --merge précisé, mais tous les
> fichiers sont fusionnés."

Line wraping error; configure your mail user agent to not wrap lines,
please.

> +#FIXME : améliorer la traduction de 'file limite'

If you add some FIXME (which is good), you also should mark the
translation as "fuzzy" like this:

> +#: gitk:340

#, fuzzy

> +msgid ""
> +"No files selected: --merge specified but no unmerged files are within file "
> +"limit."
> +msgstr "Aucun fichier sélectionné : --merge précisé mais aucun
> fichier non fusionné n'est dans la limite des fichiers."

<...>

> +#: gitk:1437
> +msgid "Can't parse git log output:"
> +msgstr "Impossible de lire le résultat de git log :"

s/le résultat/la sortie/

> +#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498
> +msgid "OK"
> +msgstr "OK"

This one should not be required.

> +#: gitk:1934
> +msgid "New view..."
> +msgstr "Nouvelle vue ..."

s/vue /vue/

> +#: gitk:2099 gitk:2101
> +msgid "Exact"
> +msgstr "Exact"

This one should not be required.

> +#: gitk:2215
> +msgid "Patch"
> +msgstr "Patch"

Ditto.

> +#: gitk:2366 gitk:8604
> +msgid "Create new branch"
> +msgstr "Créer nouvelle branche"

"Créer une nouvelle branche"

> +#: gitk:2368
> +msgid "Reset HEAD branch to here"
> +msgstr "Réinitialiser la branch HEAD vers cet état"

"branche" (missing "e").

> +#: gitk:2656
> +msgid ""
> +"\n"
> +"Gitk - a commit viewer for git\n"
> +"\n"
> +"Copyright © 2005-2008 Paul Mackerras\n"
> +"\n"
> +"Use and redistribute under the terms of the GNU General Public License"
> +msgstr ""
> +"\n"
> +"Gitk - visualisateur de commit pour git\n"
> +"\n"
> +"Copyright © 2005-2008 Paul Mackerras\n"
> +"\n"
> +"Utilisation et redistribution soumis aux termes de la GNU General
> Public License"

"soumises"

> +#: gitk:2693
> +msgid "<Left>, z, j\tGo back in history list"
> +msgstr "<Gauche>, z, j\tAvancer dans l'historique"

s/Avancer/Reculer/

> +#: gitk:2694
> +msgid "<Right>, x, l\tGo forward in history list"
> +msgstr "<Droite>, x, l\tRemonter dans l'historique"

s/Remonter/Avancer/

> +#: gitk:2713
> +msgid "/\t\tFocus the search box"
> +msgstr "/"

No idea?

> +#: gitk:3401
> +msgid "No such commit"
> +msgstr "commit inexistant"

s/commit/Commit/

> +#: gitk:3415
> +msgid "git gui blame: command failed:"
> +msgstr "git gui blame : échec de la commande"

Missing ending " :".

> +#: gitk:3446
> +#, tcl-format
> +msgid "Couldn't read merge head: %s"
> +msgstr "Impossible de lire le head de la fusion: %s"

s/fusion/fusion /

> +#: gitk:3479
> +#, tcl-format
> +msgid "Couldn't start git blame: %s"
> +msgstr "impossible de démarrer git blame : %s"

s/impossible/Impossible/

> +#: gitk:3679
> +msgid "References (space separated list):"
> +msgstr "Références (liste d'éléments séparer par des espaces) :"

s/séparer/séparés/

> +#: gitk:3684
> +msgid "All remote-tracking branches"
> +msgstr "Toutes les branches de suivie distante"

"Toutes les branches de suivi distantes"

> +#: gitk:3687
> +msgid "Committer:"
> +msgstr "Committer :"

"Commiter"

> +#: gitk:3690
> +msgid "Changes to Files:"
> +msgstr "Changements des fichiers"

Missing ":".

> +#: gitk:3695
> +msgid "Since:"
> +msgstr "Depuis :"

"De :"

> +# FIXME : traduction de "skip"

"éviter"?

> +#: gitk:3697
> +msgid "Limit and/or skip a number of revisions (positive integer):"
> +msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révision :"
                                                                              ^

"Limiter et/ou éviter un certain nombre (entier positif) de révisions :"

> +#: gitk:3699
> +msgid "Number to skip:"
> +msgstr "Nombre à sauter :"

"éviter"?

> +#FIXME : traduction de "branch sides"
> +#: gitk:3702

#, fuzzy

> +msgid "Mark branch sides"
> +msgstr "Marquer le flanc des branches"

What about "côté"?

> +#: gitk:3837
> +msgid "-- criteria for selecting revisions"
> +msgstr "-- critère pour la séléction des révisions"

"sélection"

> +#: gitk:3955
> +msgid "Error in commit selection arguments:"
> +msgstr "Erreur dans les arguments de sélection des commits"

Missing ":".

> +#: gitk:4456 gitk:6303 gitk:8065 gitk:8080
> +msgid "Date"
> +msgstr "Date"

Should not be required.

> +#: gitk:4456 gitk:6303
> +msgid "CDate"
> +msgstr "CDate"

Ditto.

> +#: gitk:4605 gitk:4610
> +msgid "Descendant"
> +msgstr "Descendant"

Ditto.

> +#FIXME : plutôt traduire par "pas un descendant"
> +#: gitk:4606

#, fuzzy

> +msgid "Not descendant"
> +msgstr "Non descendant"

<...>

> +#FIXME : plutôt traduire par "pas un ancêtre"
> +#: gitk:4614

#, fuzzy

> +msgid "Not ancestor"
> +msgstr "Non ancêtre"

<...>

> +#: gitk:4904
> +msgid "Local changes checked in to index but not committed"
> +msgstr "Modifications locales enregistrées dans l'index mais non comittées"

"commitées"

> +#: gitk:4940
> +msgid "Local uncommitted changes, not checked in to index"
> +msgstr "Modifications locales non enregistrées dans l'index et non committées"

Ditto.

> +#: gitk:6822 gitk:6828 gitk:8058
> +msgid "Parent"
> +msgstr "Parent"

Should not be required.

> +#: gitk:7926
> +#, tcl-format
> +msgid "Revision %s is not in the current view"
> +msgstr "Révision %s n'est pas dans la vue courante"

s/Révision/ La révision/

> +#: gitk:8127
> +msgid "Detached head: can't reset"
> +msgstr "Head détachée: impossible de réinitialiser"

"détaché" instead of "détachée" is better FMPOV.

> +#: gitk:8236 gitk:8242
> +msgid "Skipping merge commit "
> +msgstr "Sauter le commit de la fusion "

"Éviter le commit de fusion "

> +#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292
> +msgid "Commit "
> +msgstr "Commit "

Should not be required.

> +#: gitk:8274
> +msgid ""
> +" differs from\n"
> +"       "
> +msgstr ""
> +"diffère de\n"

Miss the space at the begining?

> +#: gitk:8483
> +msgid "Error creating tag:"
> +msgstr "Erreur à la création du tag"

Missing ":".

> +#: gitk:8705
> +#, tcl-format
> +msgid "Commit %s is already included in branch %s -- really re-apply it?"
> +msgstr "Commit %s est déjà inclus dans la branche %s -- faut-il
> vraiment le ré-appliquer?"

Peut-être :

"ré-appliquer malgré tout ?"

> +#: gitk:8719
> +#, tcl-format
> +msgid ""
> +"Cherry-pick failed because of local changes to file '%s'.\n"
> +"Please commit, reset or stash your changes and try again."
> +msgstr "La cueillette a échouée à cause de modifications locale au
> fichier '%s'.\n"

s/locale/locales/

> +"Veuillez committer, reset ou stash vos changements et essayer de nouveau."

s/committer/commiter/
s/reset/réinitialiser/ (for consistency with this whole translation)
s/stash/stasher/

> +#: gitk:8741
> +msgid "No changes committed"
> +msgstr "Aucun changement committer"

"Aucun changement commité"

> +# FIXME: faut-il traduire working tree par répertoire de travail ou
> arbre de travail?
> +# FIXME : traduction de Soft/Hard/Mixed
> +#: gitk:8777
> +msgid "Soft: Leave working tree and index untouched"
> +msgstr "Douce: Laisse l'arbre de travail et l'index dans leur état courant"

"Léger : laisse les fichiers du work tree et l'index intacts"

> +#: gitk:8780
> +msgid "Mixed: Leave working tree untouched, reset index"
> +msgstr "Hybride: Laisse l'arbre de travail dans son état courant,
> réinitialise l'index"

"Hybride : ne touche pas aux fichiers du work tree, réinitialise l'index"

> +#: gitk:8783
> +msgid ""
> +"Hard: Reset working tree and index\n"
> +"(discard ALL local changes)"
> +msgstr ""
> +"Dur: Réinitialise l'arbre de travail et l'index\n"

"Réinitialise le work tree et l'index"

> +"(abandonne TOUS les changements locaux)"

<...>

> +#: gitk:8857

#, fuzzy

> +msgid "Checking out"
> +msgstr "Récupération"

<...>

> +#: gitk:9257
> +msgid ""
> +"Error reading commit topology information; branch and preceding/following "
> +"tag information will be incomplete."
> +msgstr ""
> +"Erreur à la lecture des informations sur la topology des commits. "

s/topology/topologie/
s/./ ;/

> +"Les informations sur les branches et les tags précédents/suivant "

s/L/l/

> +"seront incomplètes."
> +
> +#: gitk:10243
> +msgid "Tag"
> +msgstr "Tag"

Should not be required.

> +#: gitk:10243
> +msgid "Id"
> +msgstr "Id"

Ditto.

> +#: gitk:10308
> +msgid "B"
> +msgstr "B"

Ditto.

> +#: gitk:10311
> +msgid "I"
> +msgstr "I"

Ditto.

> +#FIXME : Traduction standard de "pane"?
> +#: gitk:10416

#, fuzzy

> +#, tcl-format
> +msgid "Maximum graph width (% of pane)"
> +msgstr "Longueur maximum du graphe (% du panneau)"

<...>

> +#: gitk:10441
> +msgid "Support per-file encodings"
> +msgstr "Support pour un encodage de caractère par fichier"

s/de caractère/ des caractères/

> +#: gitk:10449
> +msgid "Choose..."
> +msgstr "Choisir ..."

No space.

> +#: gitk:10475
> +msgid "Diff: hunk header"
> +msgstr "Différences : entête de l'extrait"

"diff : entête du hunk"

> +#: gitk:10477
> +msgid "diff hunk header"
> +msgstr "différences : entête de l'extrait"

Ditto.

> +#: gitk:10973
> +msgid ""
> +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
> +" Gitk requires at least Tcl/Tk 8.4."
> +msgstr ""
> +"Désolé, gitk ne peut être exécuté par cette version de Tcl/Tk.\n"
> +" Gitk requiert Tcl/Tk version 8.4 ou supérieur."

s/par/avec/

--
Nicolas Sebrecht
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Emmanuel Trillaud]

2009/11/10 Nicolas Sebrecht <[hidden email]>:
>> commiter : auteur du commit : commiteur
>
> Why not "commiteur" for gitk too?
It's ok for me.
>> Check out : Récupérer : charger
>> to cherry-pick : Ceuillir
>> Diff : Différence : Diff
>
> See comment at the end.
>
>> Soft (Reset) : Douce :
>
> Léger ?
Souds better. I will make the change, except if someone has a better
proposal.

>> I prefer to translate "Diff" by "Différences" _especially_ when we are
>> talking about the action of making a "diff"
>
> You don't explain _why_. We had 3 points in favour of the "diff" term in
> french in this thread (keep Git's commands consistency, rough
> translation and english word more used even by french people as for
> "patch"). I have another argument to use "diff" now: keep consistency
> with 'git gui'.
I see now that I have no good reasons to prefer "Différences".

>> translation of "cherry-pick". For this one we could use "<translation>
>> (<english-word>) ..." as suggest previously.
>
> I'm fine here.

Thanks for your comments.

Emmanuel Trillaud
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Thomas Moulard]

2009/11/11 Nicolas Sebrecht <[hidden email]>:
> The 10/11/09, Emmanuel Trillaud wrote:
> [snip...]
>
>> +#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498
>> +msgid "OK"
>> +msgstr "OK"
>
> This one should not be required.

In that case, how do you differentiate untranslated sentences from
translated sentences which have identical translations?

>> +#: gitk:2713
>> +msgid "/\t\tFocus the search box"
>> +msgstr "/"
>
> No idea?

Wikipedia suggests "cible de saisie"[1] for focus but it seems quite verbose,
therefore I propose:

msgid "/\t\tDonner le focus à la boîte de recherche"

Alternative translations:
msgid "/\t\tActiver la boîte de recherche"
msgid "/\t\tCibler la boîte de recherche"

Otherwise everything's ok for me.

[1] http://fr.wikipedia.org/wiki/Focus_%28informatique%29
--
Thomas Moulard
http://www.linkedin.com/in/moulard