git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c5077f)
i18n: notes: mark strings for translation
authorVasco Almeida <redacted>
Fri, 17 Jun 2016 20:21:14 +0000 (20:21 +0000)
committerJunio C Hamano <redacted>
Fri, 17 Jun 2016 22:45:49 +0000 (15:45 -0700)
commit5313827f7eb5a54391da357ae01f2651fde28c8f
tree0603bd96527c764a67c74c74fef941d869572e81tree | snapshot
parent3c5077fe338c5af4f003e298267aa4071c125c8acommit | diff
i18n: notes: mark strings for translation

Mark strings of messages for the user as translatable.

Update tests t3310-notes-merge-manual-resolve.sh and
t3320-notes-merge-worktrees.sh to reflect new translatable messages.

Tests that grep for .git/NOTES_MERGE_WORKTREE reflect the translatable
string "Automatic notes merge failed. Fix conflicts in %s and [...]".

Signed-off-by: Vasco Almeida <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/notes.c diff | blob | history
t/t3310-notes-merge-manual-resolve.sh diff | blob | history
t/t3320-notes-merge-worktrees.sh diff | blob | history
git clone https://git.99rst.org/PROJECT