mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
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>
This commit is contained in:
parent
d3ee177e50
commit
b9c993e017
1 changed files with 5 additions and 2 deletions
|
@ -362,7 +362,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
|
|||
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) {
|
||||
|
@ -469,7 +470,9 @@ static int do_pick_commit(void)
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue