summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c3bfcf)
raw | patch | inline | side by side (parent: 6c3bfcf)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Thu, 2 Sep 2010 16:58:54 +0000 (16:58 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:10:19 +0000 (07:10 +0000) |
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
builtin/commit.c | patch | blob | history |
diff --git a/builtin/commit.c b/builtin/commit.c
index 5c01bf5f85a2493af3460b2b1e9e287dd92bd81e..0252dad4fe583b6e7f6f1c7380c4c2ecad17f22d 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
};
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"
"You can suppress this message by setting them explicitly:\n"
"\n"
"\n"
"If the identity used for this commit is wrong, you can fix it with:\n"
"\n"
-" git commit --amend --author='Your Name <you@example.com>'\n";
+" git commit --amend --author='Your Name <you@example.com>'\n");
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"
-"remove the commit entirely with \"git reset HEAD^\".\n";
+"remove the commit entirely with \"git reset HEAD^\".\n");
static unsigned char head_sha1[20];
!(amend && is_a_merge(head_sha1))) {
run_status(stdout, index_file, prefix, 0, s);
if (amend)
- fputs(empty_amend_advice, stderr);
+ fputs(_(empty_amend_advice), stderr);
return 0;
}
strbuf_addbuf_percentquote(&format, &committer_ident);
if (advice_implicit_identity) {
strbuf_addch(&format, '\n');
- strbuf_addstr(&format, implicit_ident_advice);
+ strbuf_addstr(&format, _(implicit_ident_advice));
}
}
strbuf_release(&author_ident);