i18n: git-revert basic messages

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

diff --git a/builtin/revert.c b/builtin/revert.c
index dc1b702edc6b4bd95ebf41c12bf1da6fe9d6850d..1ca08da5eccc4aeeb3b92834bc58ae61b41d837f 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -96,7 +96,7 @@ static void parse_args(int argc, const char **argv)
                        OPT_END(),
                };
                if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
                        OPT_END(),
                };
                if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))

-                       die("program error");
+                       die(_("program error"));

        }
 
        commit_argc = parse_options(argc, argv, NULL, options, usage_str,
        }
 
        commit_argc = parse_options(argc, argv, NULL, options, usage_str,


@@ -168,7 +168,7 @@ static char *get_encoding(const char *message)
        const char *p = message, *eol;
 
        if (!p)
        const char *p = message, *eol;
 
        if (!p)

-               die ("Could not read commit message of %s",
+               die (_("Could not read commit message of %s"),

                                sha1_to_hex(commit->object.sha1));
        while (*p && *p != '\n') {
                for (eol = p + 1; *eol && *eol != '\n'; eol++)
                                sha1_to_hex(commit->object.sha1));
        while (*p && *p != '\n') {
                for (eol = p + 1; *eol && *eol != '\n'; eol++)


@@ -202,7 +202,7 @@ static void set_author_ident_env(const char *message)
 {
        const char *p = message;
        if (!p)
 {
        const char *p = message;
        if (!p)

-               die ("Could not read commit message of %s",
+               die (_("Could not read commit message of %s"),

                                sha1_to_hex(commit->object.sha1));
        while (*p && *p != '\n') {
                const char *eol;
                                sha1_to_hex(commit->object.sha1));
        while (*p && *p != '\n') {
                const char *eol;


@@ -216,7 +216,7 @@ static void set_author_ident_env(const char *message)
                        line = xmemdupz(p, eol - p);
                        email = strchr(line, '<');
                        if (!email)
                        line = xmemdupz(p, eol - p);
                        email = strchr(line, '<');
                        if (!email)

-                               die ("Could not extract author email from %s",
+                               die (_("Could not extract author email from %s"),

                                        sha1_to_hex(commit->object.sha1));
                        if (email == line)
                                pend = line;
                                        sha1_to_hex(commit->object.sha1));
                        if (email == line)
                                pend = line;


@@ -228,7 +228,7 @@ static void set_author_ident_env(const char *message)
                        email++;
                        timestamp = strchr(email, '>');
                        if (!timestamp)
                        email++;
                        timestamp = strchr(email, '>');
                        if (!timestamp)

-                               die ("Could not extract author time from %s",
+                               die (_("Could not extract author time from %s"),

                                        sha1_to_hex(commit->object.sha1));
                        *timestamp = '\0';
                        for (timestamp++; *timestamp && isspace(*timestamp);
                                        sha1_to_hex(commit->object.sha1));
                        *timestamp = '\0';
                        for (timestamp++; *timestamp && isspace(*timestamp);


@@ -244,7 +244,7 @@ static void set_author_ident_env(const char *message)
                if (*p == '\n')
                        p++;
        }
                if (*p == '\n')
                        p++;
        }

-       die ("No author information found in %s",
+       die (_("No author information found in %s"),

                        sha1_to_hex(commit->object.sha1));
 }
 
                        sha1_to_hex(commit->object.sha1));
 }
 


@@ -281,10 +281,10 @@ static void write_message(struct strbuf *msgbuf, const char *filename)
        int msg_fd = hold_lock_file_for_update(&msg_file, filename,
                                               LOCK_DIE_ON_ERROR);
        if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0)
        int msg_fd = hold_lock_file_for_update(&msg_file, filename,
                                               LOCK_DIE_ON_ERROR);
        if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0)

-               die_errno("Could not write to %s.", filename);
+               die_errno(_("Could not write to %s."), filename);

        strbuf_release(msgbuf);
        if (commit_lock_file(&msg_file) < 0)
        strbuf_release(msgbuf);
        if (commit_lock_file(&msg_file) < 0)

-               die("Error wrapping up %s", filename);
+               die(_("Error wrapping up %s"), filename);

 }
 
 static struct tree *empty_tree(void)
 }
 
 static struct tree *empty_tree(void)


@@ -420,10 +420,10 @@ static int do_pick_commit(void)
                 * to work on.
                 */
                if (write_cache_as_tree(head, 0, NULL))
                 * to work on.
                 */
                if (write_cache_as_tree(head, 0, NULL))

-                       die ("Your index file is unmerged.");
+                       die (_("Your index file is unmerged."));

        } else {
                if (get_sha1("HEAD", head))
        } else {
                if (get_sha1("HEAD", head))

-                       die ("You do not have a valid HEAD");
+                       die (_("You do not have a valid HEAD"));

                if (index_differs_from("HEAD", 0))
                        die_dirty_index(me);
        }
                if (index_differs_from("HEAD", 0))
                        die_dirty_index(me);
        }


@@ -431,7 +431,7 @@ static int do_pick_commit(void)
 
        if (!commit->parents) {
                if (action == REVERT)
 
        if (!commit->parents) {
                if (action == REVERT)

-                       die ("Cannot revert a root commit");
+                       die (_("Cannot revert a root commit"));

                parent = NULL;
        }
        else if (commit->parents->next) {
                parent = NULL;
        }
        else if (commit->parents->next) {


@@ -440,7 +440,7 @@ static int do_pick_commit(void)
                struct commit_list *p;
 
                if (!mainline)
                struct commit_list *p;
 
                if (!mainline)

-                       die("Commit %s is a merge but no -m option was given.",
+                       die(_("Commit %s is a merge but no -m option was given."),

                            sha1_to_hex(commit->object.sha1));
 
                for (cnt = 1, p = commit->parents;
                            sha1_to_hex(commit->object.sha1));
 
                for (cnt = 1, p = commit->parents;


@@ -448,11 +448,11 @@ static int do_pick_commit(void)
                     cnt++)
                        p = p->next;
                if (cnt != mainline || !p)
                     cnt++)
                        p = p->next;
                if (cnt != mainline || !p)

-                       die("Commit %s does not have parent %d",
+                       die(_("Commit %s does not have parent %d"),

                            sha1_to_hex(commit->object.sha1), mainline);
                parent = p->item;
        } else if (0 < mainline)
                            sha1_to_hex(commit->object.sha1), mainline);
                parent = p->item;
        } else if (0 < mainline)

-               die("Mainline was specified but commit %s is not a merge.",
+               die(_("Mainline was specified but commit %s is not a merge."),

                    sha1_to_hex(commit->object.sha1));
        else
                parent = commit->parents->item;
                    sha1_to_hex(commit->object.sha1));
        else
                parent = commit->parents->item;


@@ -465,7 +465,7 @@ static int do_pick_commit(void)
                    me, sha1_to_hex(parent->object.sha1));
 
        if (get_message(commit->buffer, &msg) != 0)
                    me, sha1_to_hex(parent->object.sha1));
 
        if (get_message(commit->buffer, &msg) != 0)

-               die("Cannot get commit message for %s",
+               die(_("Cannot get commit message for %s"),

                                sha1_to_hex(commit->object.sha1));
 
        /*
                                sha1_to_hex(commit->object.sha1));
 
        /*


@@ -556,10 +556,10 @@ static void prepare_revs(struct rev_info *revs)
                usage(*revert_or_cherry_pick_usage());
 
        if (prepare_revision_walk(revs))
                usage(*revert_or_cherry_pick_usage());
 
        if (prepare_revision_walk(revs))

-               die("revision walk setup failed");
+               die(_("revision walk setup failed"));

 
        if (!revs->commits)
 
        if (!revs->commits)

-               die("empty commit set passed");
+               die(_("empty commit set passed"));

 }
 
 static void read_and_refresh_cache(const char *me)
 }
 
 static void read_and_refresh_cache(const char *me)


@@ -567,12 +567,12 @@ static void read_and_refresh_cache(const char *me)
        static struct lock_file index_lock;
        int index_fd = hold_locked_index(&index_lock, 0);
        if (read_index_preload(&the_index, NULL) < 0)
        static struct lock_file index_lock;
        int index_fd = hold_locked_index(&index_lock, 0);
        if (read_index_preload(&the_index, NULL) < 0)

-               die("git %s: failed to read the index", me);
+               die(_("git %s: failed to read the index"), me);

        refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
        if (the_index.cache_changed) {
                if (write_index(&the_index, index_fd) ||
                    commit_locked_index(&index_lock))
        refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
        if (the_index.cache_changed) {
                if (write_index(&the_index, index_fd) ||
                    commit_locked_index(&index_lock))

-                       die("git %s: failed to refresh the index", me);
+                       die(_("git %s: failed to refresh the index"), me);

        }
        rollback_lock_file(&index_lock);
 }
        }
        rollback_lock_file(&index_lock);
 }


@@ -588,13 +588,13 @@ static int revert_or_cherry_pick(int argc, const char **argv)
 
        if (allow_ff) {
                if (signoff)
 
        if (allow_ff) {
                if (signoff)

-                       die("cherry-pick --ff cannot be used with --signoff");
+                       die(_("cherry-pick --ff cannot be used with --signoff"));

                if (no_commit)
                if (no_commit)

-                       die("cherry-pick --ff cannot be used with --no-commit");
+                       die(_("cherry-pick --ff cannot be used with --no-commit"));

                if (no_replay)
                if (no_replay)

-                       die("cherry-pick --ff cannot be used with -x");
+                       die(_("cherry-pick --ff cannot be used with -x"));

                if (edit)
                if (edit)

-                       die("cherry-pick --ff cannot be used with --edit");
+                       die(_("cherry-pick --ff cannot be used with --edit"));

        }
 
        read_and_refresh_cache(me);
        }
 
        read_and_refresh_cache(me);