summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:57 (GMT)
commitb9c993e017715e07615df30091b0fe5f556df13d (patch)
tree20042fc53ccf47b87012c93a0b33ab79b0a4947e
parentd3ee177e5059c81e0e73be091741f60ebfbce520 (diff)
downloadgit-b9c993e017715e07615df30091b0fe5f556df13d.zip
git-b9c993e017715e07615df30091b0fe5f556df13d.tar.gz
git-b9c993e017715e07615df30091b0fe5f556df13d.tar.bz2
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>
-rw-r--r--builtin/revert.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 02c23c9..b0a5ffb 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -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)