diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-03-15 00:34:22 (GMT) |
|---|---|---|
| committer | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-03-25 15:04:58 (GMT) |
| commit | bb310722467d0adda499cb70429d86fbaa755dac (patch) | |
| tree | f9519494b61c5a9d11c00b50ddeb01027ef07f2c /po | |
| parent | abf579559252af1da773b5b70dbe24a84cc73de4 (diff) | |
| download | git-bb310722467d0adda499cb70429d86fbaa755dac.zip git-bb310722467d0adda499cb70429d86fbaa755dac.tar.gz git-bb310722467d0adda499cb70429d86fbaa755dac.tar.bz2 | |
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>
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |