diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:18 -0700 |
| commit | 8969feac7ee119dc3cdae0e2d8c65516aa8f4045 (patch) | |
| tree | 1007bab435d4c18d829ebba5975bede43e4c9f9c /notes-merge.c | |
| parent | e447d3182cf77f45402b6fc8a357a2ab466c49dd (diff) | |
| parent | 850251f33be0e1d0a30d11285b618bdce23be3d7 (diff) | |
| download | git-8969feac7ee119dc3cdae0e2d8c65516aa8f4045.tar.gz | |
Merge branch 'va/i18n-more'
Even more i18n.
* va/i18n-more:
i18n: stash: mark messages for translation
i18n: notes-merge: mark die messages for translation
i18n: ident: mark hint for translation
i18n: i18n: diff: mark die messages for translation
i18n: connect: mark die messages for translation
i18n: commit: mark message for translation
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/notes-merge.c b/notes-merge.c index b3536284c4..5998605acc 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -270,15 +270,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( |