diff options
| author |  Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 20:21:14 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-06-17 15:45:49 -0700 |
| commit | 5313827f7eb5a54391da357ae01f2651fde28c8f (patch) | |
| tree | 0603bd96527c764a67c74c74fef941d869572e81 /builtin/worktree.c | |
| parent | i18n: transport-helper.c: change N_() call to _() (diff) | |
| download | tgif-5313827f7eb5a54391da357ae01f2651fde28c8f.tar.xz | |
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>
Diffstat (limited to 'builtin/worktree.c')
0 files changed, 0 insertions, 0 deletions