|
|
11.
|
|
|
Please, commit your changes before merging.
|
|
|
|
|
Veuillez valider vos changements avant de fusionner.
|
|
Translated by
Jean-Noël AVILA
|
|
|
|
Located in
advice.c:211
|
|
|
12.
|
|
|
Exiting because of unfinished merge.
|
|
|
|
|
Abandon à cause d'une fusion non terminée.
|
|
Translated by
Jean-Noël AVILA
|
|
|
|
Located in
advice.c:212
|
|
|
13.
|
|
|
Note: checking out ' %s'. 
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b <new-branch-name>
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
Note [nbsp]: extraction de ' %s'.
Vous êtes dans l'état « [nbsp]HEAD détachée [nbsp]». Vous pouvez visiter, faire des modifications
expérimentales et les valider. Il vous suffit de faire une autre extraction pour
abandonner les commits que vous faites dans cet état sans impacter les autres branches
Si vous voulez créer une nouvelle branche pour conserver les commits que vous créez,
il vous suffit d'utiliser « [nbsp]checkout -b [nbsp]» (maintenant ou plus tard) comme ceci [nbsp]:
git checkout -b <nom-de-la-nouvelle-branche>
|
|
Translated by
Jean-Noël AVILA
|
|
|
|
Located in
advice.c:130
|
|
|
14.
|
|
|
unrecognized whitespace option '%s'
|
|
|
|
|
option d'espace non reconnue '%s'
|
|
Translated by
FlashCode
|
|
|
|
Located in
apply.c:70
|
|
|
15.
|
|
|
unrecognized whitespace ignore option '%s'
|
|
|
|
|
option d'ignorance d'espace non reconnue '%s'
|
|
Translated by
FlashCode
|
|
|
|
Located in
apply.c:86
|
|
|
16.
|
|
|
--reject and --3way cannot be used together.
|
|
|
|
|
--reject et --3way ne peuvent pas être utilisés ensemble.
|
|
Translated by
Jean-Noël AVILA
|
|
|
|
Located in
apply.c:136
|
|
|
17.
|
|
|
--cached and --3way cannot be used together.
|
|
|
|
|
--cached et --3way ne peuvent pas être utilisés ensemble.
|
|
Translated by
Jean-Noël AVILA
|
|
|
|
Located in
apply.c:137
|
|
|
18.
|
|
|
--3way outside a repository
|
|
|
|
|
--3way hors d'un dépôt
|
|
Translated by
FlashCode
|
|
|
|
Located in
apply.c:139
|
|
|
19.
|
|
|
--index outside a repository
|
|
|
|
|
--index hors d'un dépôt
|
|
Translated by
FlashCode
|
|
|
|
Located in
apply.c:150
|
|
|
20.
|
|
|
--cached outside a repository
|
|
|
|
|
--cached hors d'un dépôt
|
|
Translated by
FlashCode
|
|
|
|
Located in
apply.c:153
|
