From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Johannes Sixt" <j.sixt@viscovery.net>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [RFC/PATCH 4/5] gettextize: git-revert: !fixup "Your local changes"
Date: Sun, 31 Oct 2010 11:34:19 +0000 [thread overview]
Message-ID: <1288524860-538-5-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <AANLkTikOgMGqw5fc95c2VGwXxKu9rmsA+=z5_jykD92=@mail.gmail.com>
Gettextize two messages that I missed in 'gettextize: git-revert "Your
local changes" message'.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/revert.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index c8463d2..178b8a0 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -294,9 +294,9 @@ static NORETURN void die_dirty_index(const char *me)
"Please, commit your changes or stash them to proceed."));
} else {
if (action == REVERT)
- die("Your local changes would be overwritten by revert.\n");
+ die(_("Your local changes would be overwritten by revert.\n"));
else
- die("Your local changes would be overwritten by cherry-pick.\n");
+ die(_("Your local changes would be overwritten by cherry-pick.\n"));
}
}
}
--
1.7.3.2.312.ge13a7
next prev parent reply other threads:[~2010-10-31 11:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 7:18 Buglet in i18n? Johannes Sixt
2010-10-22 8:20 ` Ævar Arnfjörð Bjarmason
2010-10-22 8:34 ` Jonathan Nieder
2010-10-23 11:32 ` Ævar Arnfjörð Bjarmason
[not found] ` <20101023182940.GD21040@burratino>
2010-10-30 9:14 ` Ævar Arnfjörð Bjarmason
2010-10-31 11:34 ` [RFC/PATCH 0/5] ab/i18n: Things I'll add in the next iteration Ævar Arnfjörð Bjarmason
2010-10-31 11:34 ` [RFC/PATCH 1/5] gettext: fix bug in git-sh-i18n's eval_gettext() by using envsubst(1) Ævar Arnfjörð Bjarmason
2010-11-02 8:33 ` Johannes Sixt
2010-11-08 22:39 ` Ævar Arnfjörð Bjarmason
2010-11-09 7:33 ` Johannes Sixt
2010-11-09 9:35 ` Ævar Arnfjörð Bjarmason
2010-11-09 9:47 ` Johannes Sixt
2010-11-09 9:49 ` Ævar Arnfjörð Bjarmason
2010-11-09 10:36 ` Johannes Sixt
2010-11-09 10:38 ` Erik Faye-Lund
2010-11-09 10:52 ` Ævar Arnfjörð Bjarmason
2010-11-09 11:42 ` Johannes Sixt
2010-11-09 11:57 ` Ævar Arnfjörð Bjarmason
2010-11-09 12:22 ` Johannes Sixt
2010-11-09 12:38 ` Ævar Arnfjörð Bjarmason
2010-11-09 12:53 ` Johannes Sixt
2010-11-09 13:02 ` Ævar Arnfjörð Bjarmason
2010-10-31 11:34 ` [RFC/PATCH 2/5] gettextize: git-clone: !fixup "basic messages" Ævar Arnfjörð Bjarmason
2010-10-31 11:34 ` [RFC/PATCH 3/5] gettextize: git-init: " Ævar Arnfjörð Bjarmason
2010-10-31 11:34 ` Ævar Arnfjörð Bjarmason [this message]
2010-10-31 11:34 ` [RFC/PATCH 5/5] gettextize: git-merge: " Ævar Arnfjörð Bjarmason
2010-10-22 8:49 ` Buglet in i18n? Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288524860-538-5-git-send-email-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).