From fe8165cd4f201cbdc7e675a3227bd5a157f57181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 22 Feb 2011 23:41:46 +0000 Subject: i18n: git-commit formatting messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- builtin/commit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'builtin/commit.c') diff --git a/builtin/commit.c b/builtin/commit.c index e944c4d77d..c1da66c2d7 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -695,12 +695,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix, char *ai_tmp, *ci_tmp; if (in_merge) status_printf_ln(s, GIT_COLOR_NORMAL, - "\n" + _("\n" "It looks like you may be committing a MERGE.\n" "If this is not correct, please remove the file\n" " %s\n" "and try again.\n" - "", + ""), git_path("MERGE_HEAD")); fprintf(s->fp, "\n"); @@ -725,15 +725,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix, ci_tmp = cut_ident_timestamp_part(committer_ident.buf); if (strcmp(author_ident->buf, committer_ident.buf)) status_printf_ln(s, GIT_COLOR_NORMAL, - "%s" - "Author: %s", + _("%s" + "Author: %s"), ident_shown++ ? "" : "\n", author_ident->buf); if (!user_ident_sufficiently_given()) status_printf_ln(s, GIT_COLOR_NORMAL, - "%s" - "Committer: %s", + _("%s" + "Committer: %s"), ident_shown++ ? "" : "\n", committer_ident.buf); -- cgit v1.2.1