development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

l10n: fr: don't translate "merge" as a parameter

Browse source 
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:
Vasco Almeida 2016-03-14 23:34:22 -01:00
parent abf5795592
commit bb31072246
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
po/fr.po
View file

@ -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"