Merge branch 'vs/completion-branch-fully-spelled-d-m-r'

diff --git a/builtin/notes.c b/builtin/notes.c
index c65b59ad9a340e9b68e4d09ea8912499227fce66..f848b896927a34e884f8377ea9c98271237be5fc 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -91,7 +91,7 @@ static const char * const git_notes_get_ref_usage[] = {
 };
 
 static const char note_template[] =
-       "\nWrite/edit the notes for the following object:\n";
+       N_("Write/edit the notes for the following object:");
 
 struct note_data {
        int given;
@@ -179,7 +179,8 @@ static void prepare_note_data(const unsigned char *object, struct note_data *d,
                        copy_obj_to_fd(fd, old_note);
 
                strbuf_addch(&buf, '\n');
-               strbuf_add_commented_lines(&buf, note_template, strlen(note_template));
+               strbuf_add_commented_lines(&buf, "\n", strlen("\n"));
+               strbuf_add_commented_lines(&buf, _(note_template), strlen(_(note_template)));
                strbuf_addch(&buf, '\n');
                write_or_die(fd, buf.buf, buf.len);
 
@@ -749,7 +750,7 @@ static int git_config_get_notes_strategy(const char *key,
        if (git_config_get_string(key, &value))
                return 1;
        if (parse_notes_merge_strategy(value, strategy))
-               git_die_config(key, "unknown notes merge strategy %s", value);
+               git_die_config(key, _("unknown notes merge strategy %s"), value);
 
        free(value);
        return 0;
@@ -788,15 +789,15 @@ static int merge(int argc, const char **argv, const char *prefix)
        if (strategy || do_commit + do_abort == 0)
                do_merge = 1;
        if (do_merge + do_commit + do_abort != 1) {
-               error("cannot mix --commit, --abort or -s/--strategy");
+               error(_("cannot mix --commit, --abort or -s/--strategy"));
                usage_with_options(git_notes_merge_usage, options);
        }
 
        if (do_merge && argc != 1) {
-               error("Must specify a notes ref to merge");
+               error(_("Must specify a notes ref to merge"));
                usage_with_options(git_notes_merge_usage, options);
        } else if (!do_merge && argc) {
-               error("too many parameters");
+               error(_("too many parameters"));
                usage_with_options(git_notes_merge_usage, options);
        }
 
@@ -817,7 +818,7 @@ static int merge(int argc, const char **argv, const char *prefix)
 
        if (strategy) {
                if (parse_notes_merge_strategy(strategy, &o.strategy)) {
-                       error("Unknown -s/--strategy: %s", strategy);
+                       error(_("Unknown -s/--strategy: %s"), strategy);
                        usage_with_options(git_notes_merge_usage, options);
                }
        } else {
@@ -857,11 +858,11 @@ static int merge(int argc, const char **argv, const char *prefix)
                        die(_("A notes merge into %s is already in-progress at %s"),
                            default_notes_ref(), wt->path);
                if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
-                       die("Failed to store link to current notes ref (%s)",
+                       die(_("Failed to store link to current notes ref (%s)"),
                            default_notes_ref());
-               printf("Automatic notes merge failed. Fix conflicts in %s and "
-                      "commit the result with 'git notes merge --commit', or "
-                      "abort the merge with 'git notes merge --abort'.\n",
+               printf(_("Automatic notes merge failed. Fix conflicts in %s and "
+                        "commit the result with 'git notes merge --commit', or "
+                        "abort the merge with 'git notes merge --abort'.\n"),
                       git_path(NOTES_MERGE_WORKTREE));
        }
 
@@ -934,8 +935,8 @@ static int prune(int argc, const char **argv, const char *prefix)
        struct notes_tree *t;
        int show_only = 0, verbose = 0;
        struct option options[] = {
-               OPT__DRY_RUN(&show_only, "do not remove, show only"),
-               OPT__VERBOSE(&verbose, "report pruned notes"),
+               OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
+               OPT__VERBOSE(&verbose, N_("report pruned notes")),
                OPT_END()
        };
 
@@ -964,7 +965,7 @@ static int get_ref(int argc, const char **argv, const char *prefix)
                             git_notes_get_ref_usage, 0);
 
        if (argc) {
-               error("too many parameters");
+               error(_("too many parameters"));
                usage_with_options(git_notes_get_ref_usage, options);
        }