mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
l10n: fr: don't translate "merge" as a parameter
At builtin/checkout.c:1154, merge is a parameter to --conflict=<style> (git checkout --conflict=merge). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
This commit is contained in:
parent
abf5795592
commit
bb31072246
2
po/fr.po
2
po/fr.po
|
@ -4545,7 +4545,7 @@ msgstr "style"
|
|||
|
||||
#: builtin/checkout.c:1154
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "style de conflit (fusion ou diff3)"
|
||||
msgstr "style de conflit (merge (fusion) ou diff3)"
|
||||
|
||||
#: builtin/checkout.c:1157
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
|
|
Loading…
Reference in a new issue