Merge branch 'rs/child-process-init'

diff --git a/builtin/notes.c b/builtin/notes.c
index 05720517628270669d9e231c2030befd2d6325f6..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);