diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-09-19 13:08:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-21 10:20:43 -0700 |
| commit | c041c6d06a7fce3aa563d7b0c4a47feccc541400 (patch) | |
| tree | 8050a5106689367cedd8d2e08d45378de96c3962 | |
| parent | 166e55e328a5b303031140f758a0463df331777a (diff) | |
| download | git-c041c6d06a7fce3aa563d7b0c4a47feccc541400.tar.gz | |
i18n: notes-merge: mark die messages for translation
Update test to reflect changes.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | notes-merge.c | 8 | ||||
| -rwxr-xr-x | t/t3310-notes-merge-manual-resolve.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/notes-merge.c b/notes-merge.c index 97fc42f64b..3bbeb863f8 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -269,15 +269,15 @@ static void check_notes_merge_worktree(struct notes_merge_options *o) if (file_exists(git_path(NOTES_MERGE_WORKTREE)) && !is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) { if (advice_resolve_conflict) - die("You have not concluded your previous " + die(_("You have not concluded your previous " "notes merge (%s exists).\nPlease, use " "'git notes merge --commit' or 'git notes " "merge --abort' to commit/abort the " "previous merge before you start a new " - "notes merge.", git_path("NOTES_MERGE_*")); + "notes merge."), git_path("NOTES_MERGE_*")); else - die("You have not concluded your notes merge " - "(%s exists).", git_path("NOTES_MERGE_*")); + die(_("You have not concluded your notes merge " + "(%s exists)."), git_path("NOTES_MERGE_*")); } if (safe_create_leading_directories_const(git_path( diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 6967436327..baef2d6924 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -225,7 +225,7 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish test -d .git/NOTES_MERGE_WORKTREE && test_must_fail git notes merge z >output 2>&1 && # Output should indicate what is wrong - grep -q "\\.git/NOTES_MERGE_\\* exists" output + test_i18ngrep -q "\\.git/NOTES_MERGE_\\* exists" output ' # Setup non-conflicting merge between x and new notes ref w |