Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: fr: don't translate "merge" as a parameter
author
Vasco Almeida
<vascomalmeida@sapo.pt>
Tue, 15 Mar 2016 00:34:22 +0000
(23:34 -0100)
committer
Vasco Almeida
<vascomalmeida@sapo.pt>
Fri, 25 Mar 2016 15:04:58 +0000
(14:04 -0100)
At builtin/checkout.c:1154, merge is a parameter to --conflict=<style>
(git checkout --conflict=merge).
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
po/fr.po
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
abf5795
)
diff --git
a/po/fr.po
b/po/fr.po
index 868514e924e37a1f337af7db7abe9df1f231ffb6..55ca387ba4bf3fc174baf4cd72e70455180cf05b 100644
(file)
--- a/
po/fr.po
+++ b/
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"