| commit | 5313827f7eb5a54391da357ae01f2651fde28c8f | |
| author | Vasco Almeida <vascomalmeida@sapo.pt> | |
| Fri, 17 Jun 2016 20:21:14 +0000 (17 20:21 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Jun 2016 22:45:49 +0000 (17 15:45 -0700) | ||
| tree | 0603bd96527c764a67c74c74fef941d869572e81 | treesnapshot (tar.gz zip) |
| parent | 3c5077fe338c5af4f003e298267aa4071c125c8a | commitdiff |
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 <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/notes.c | diffblobblamehistory | |
| t/t3310-notes-merge-manual-resolve.sh | diffblobblamehistory | |
| t/t3320-notes-merge-worktrees.sh | diffblobblamehistory |