i18n: git-mv basic messages

diff --git a/builtin/commit.c b/builtin/commit.c
index 472c2baed04f549fb1a3c429a2c36747e8229c68..271f31127cc338359fddf423d266bc2abba9dc23 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -38,7 +38,7 @@ static const char * const builtin_status_usage[] = {
 };
 
 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"
@@ -47,12 +47,12 @@ static const char implicit_ident_advice[] =
 "\n"
 "After doing this, you may fix the identity used for this commit with:\n"
 "\n"
-"    git commit --amend --reset-author\n";
+"    git commit --amend --reset-author\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];
 
@@ -695,28 +695,28 @@ 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");
                status_printf(s, GIT_COLOR_NORMAL,
-                       "Please enter the commit message for your changes.");
+                       _("Please enter the commit message for your changes."));
                if (cleanup_mode == CLEANUP_ALL)
                        status_printf_more(s, GIT_COLOR_NORMAL,
-                               " Lines starting\n"
+                               _(" Lines starting\n"
                                "with '#' will be ignored, and an empty"
-                               " message aborts the commit.\n");
+                               " message aborts the commit.\n"));
                else /* CLEANUP_SPACE, that is. */
                        status_printf_more(s, GIT_COLOR_NORMAL,
-                               " Lines starting\n"
+                               _(" Lines starting\n"
                                "with '#' will be kept; you may remove them"
                                " yourself if you want to.\n"
-                               "An empty message aborts the commit.\n");
+                               "An empty message aborts the commit.\n"));
                if (only_include_assumed)
                        status_printf_ln(s, GIT_COLOR_NORMAL,
                                        "%s", only_include_assumed);
@@ -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);
 
@@ -770,7 +770,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
            !(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;
        }
 
@@ -928,9 +928,9 @@ static int parse_and_validate_options(int argc, const char *argv[],
        if (amend && initial_commit)
                die(_("You have nothing to amend."));
        if (amend && in_merge)
-               die("You are in the middle of a merge -- cannot amend.");
+               die(_("You are in the middle of a merge -- cannot amend."));
        if (fixup_message && squash_message)
-               die("Options --squash and --fixup cannot be used together");
+               die(_("Options --squash and --fixup cannot be used together"));
        if (use_message)
                f++;
        if (edit_message)
@@ -1197,7 +1197,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
                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);
@@ -1223,9 +1223,9 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
                !prefixcmp(head, "refs/heads/") ?
                        head + 11 :
                        !strcmp(head, "HEAD") ?
-                               "detached HEAD" :
+                               _("detached HEAD") :
                                head,
-               initial_commit ? " (root-commit)" : "");
+               initial_commit ? _(" (root-commit)") : "");
 
        if (!log_tree_commit(&rev, commit)) {
                rev.always_show_header = 1;