i18n: git-revert literal "me" messages
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
b9c993e017715e07615df30091b0fe5f556df13d
1 file changed
+5
-2
builtin/revert.c
+5
-2
@@ -362,7 +362,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
362
if (active_cache_changed &&
363
(write_cache(index_fd, active_cache, active_nr) ||
364
commit_locked_index(&index_lock)))
365
- die("%s: Unable to write new index file", me);
365
+ /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
366
+ die(_("%s: Unable to write new index file"), me);
367
rollback_lock_file(&index_lock);
368
369
if (!clean) {
@@ -469,7 +470,9 @@ static int do_pick_commit(void)
470
return fast_forward_to(commit->object.sha1, head);
471
472
if (parent && parse_commit(parent) < 0)
472
- die("%s: cannot parse parent commit %s",
473
+ /* TRANSLATORS: The first %s will be "revert" or
474
+ "cherry-pick", the second %s a SHA1 */
475
+ die(_("%s: cannot parse parent commit %s"),
476
me, sha1_to_hex(parent->object.sha1));
477
478
if (get_message(commit->buffer, &msg) != 0)