From: Emmanuel Trillaud <etrillaud@gmail.com>
Date: Tue, 10 Nov 2009 18:05:30 GMT
Subject: Re: gitk : french translation
Message-ID: <9f50533b0911101005j4839bd93ld69edfa94241c755@mail.gmail.com>
In-Reply-To: <9f50533b0911060605p6ad28ad9neac3620a1809c3db@mail.gmail.com>

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