@matheusbsbs / matheus-bagliano / commits / fc88e316e7
Fork 0

i18n: git-commit advice messages

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Feb 22, 2011 at 23:41 UTC fc88e316e7c628cf51fcc2fe732f34e2e6e15216
1 file changed +6 -6
builtin/commit.c
+6 -6
@@ -38,7 +38,7 @@ static const char * const builtin_status_usage[] = {
38 };
39
40 static const char implicit_ident_advice[] =
41 -"Your name and email address were configured automatically based\n"
41 +N_("Your name and email address were configured automatically based\n"
42 "on your username and hostname. Please check that they are accurate.\n"
43 "You can suppress this message by setting them explicitly:\n"
44 "\n"
@@ -47,12 +47,12 @@ static const char implicit_ident_advice[] =
47 "\n"
48 "After doing this, you may fix the identity used for this commit with:\n"
49 "\n"
50 -" git commit --amend --reset-author\n";
50 +" git commit --amend --reset-author\n");
51
52 static const char empty_amend_advice[] =
53 -"You asked to amend the most recent commit, but doing so would make\n"
53 +N_("You asked to amend the most recent commit, but doing so would make\n"
54 "it empty. You can repeat your command with --allow-empty, or you can\n"
55 -"remove the commit entirely with \"git reset HEAD^\".\n";
55 +"remove the commit entirely with \"git reset HEAD^\".\n");
56
57 static unsigned char head_sha1[20];
58
@@ -770,7 +770,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
770 !(amend && is_a_merge(head_sha1))) {
771 run_status(stdout, index_file, prefix, 0, s);
772 if (amend)
773 - fputs(empty_amend_advice, stderr);
773 + fputs(_(empty_amend_advice), stderr);
774 return 0;
775 }
776
@@ -1197,7 +1197,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
1197 strbuf_addbuf_percentquote(&format, &committer_ident);
1198 if (advice_implicit_identity) {
1199 strbuf_addch(&format, '\n');
1200 - strbuf_addstr(&format, implicit_ident_advice);
1200 + strbuf_addstr(&format, _(implicit_ident_advice));
1201 }
1202 }
1203 strbuf_release(&author_ident);