kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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