summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c3cae0)
raw | patch | inline | side by side (parent: 6c3cae0)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sun, 5 Sep 2010 14:34:40 +0000 (14:34 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:58:15 +0000 (07:58 +0000) |
Translate messages that use the `me' variable. These are all error
messages referencing the command name, so the name shouldn't be
translated.
Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
messages referencing the command name, so the name shouldn't be
translated.
Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
builtin/revert.c | patch | blob | history |
diff --git a/builtin/revert.c b/builtin/revert.c
index 515fcf6913fe72dc9f0688d01fb83f165413c108..48b13735778b1fa46232b2a0d825233b26e49323 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
if (active_cache_changed &&
(write_cache(index_fd, active_cache, active_nr) ||
commit_locked_index(&index_lock)))
- die("%s: Unable to write new index file", me);
+ /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
+ die(_("%s: Unable to write new index file"), me);
rollback_lock_file(&index_lock);
if (!clean) {
return fast_forward_to(commit->object.sha1, head);
if (parent && parse_commit(parent) < 0)
- die("%s: cannot parse parent commit %s",
+ /* TRANSLATORS: The first %s will be "revert" or
+ "cherry-pick", the second %s a SHA1 */
+ die(_("%s: cannot parse parent commit %s"),
me, sha1_to_hex(parent->object.sha1));
if (get_message(commit->buffer, &msg) != 0)
}
if (read_cache() < 0)
- die("git %s: failed to read the index", me);
+ /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
+ die(_("git %s: failed to read the index"), me);
prepare_revs(&revs);