mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-commit advice messages

Browse Source 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2011-02-22 23:41:49 +00:00
committed by Junio C Hamano
parent 0b430a17ae
commit fc88e316e7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/commit.c
View File

@ -38,7 +38,7 @@ static const char * const builtin_status_usage[] = {
}; };
static const char implicit_ident_advice[] = static const char implicit_ident_advice[] =
"Your name and email address were configured automatically based\n" N_("Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n" "on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n" "You can suppress this message by setting them explicitly:\n"
"\n" "\n"
@ -47,12 +47,12 @@ static const char implicit_ident_advice[] =
"\n" "\n"
"After doing this, you may fix the identity used for this commit with:\n" "After doing this, you may fix the identity used for this commit with:\n"
"\n" "\n"
" git commit --amend --reset-author\n"; " git commit --amend --reset-author\n");
static const char empty_amend_advice[] = static const char empty_amend_advice[] =
"You asked to amend the most recent commit, but doing so would make\n" N_("You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n" "it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"; "remove the commit entirely with \"git reset HEAD^\".\n");
static unsigned char head_sha1[20]; static unsigned char head_sha1[20];
@ -770,7 +770,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
!(amend && is_a_merge(head_sha1))) { !(amend && is_a_merge(head_sha1))) {
run_status(stdout, index_file, prefix, 0, s); run_status(stdout, index_file, prefix, 0, s);
if (amend) if (amend)
fputs(empty_amend_advice, stderr); fputs(_(empty_amend_advice), stderr);
return 0; return 0;
} }
@ -1197,7 +1197,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
strbuf_addbuf_percentquote(&format, &committer_ident); strbuf_addbuf_percentquote(&format, &committer_ident);
if (advice_implicit_identity) { if (advice_implicit_identity) {
strbuf_addch(&format, '\n'); strbuf_addch(&format, '\n');
strbuf_addstr(&format, implicit_ident_advice); strbuf_addstr(&format, _(implicit_ident_advice));
} }
} }
strbuf_release(&author_ident); strbuf_release(&author_ident);