From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: git@vger.kernel.org, Jiang Xin <worldhello.net@gmail.com>
Subject: Re: [PATCH] wt-status: allow "ahead " to be picked up by l10n
Date: Mon, 14 Mar 2016 08:57:09 -0700 [thread overview]
Message-ID: <xmqqk2l5aw8a.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <3b88641beff6b34ae8b86bf353e6fbb8f9e636f1.1457969307.git.git@drmicha.warpmail.net> (Michael J. Gruber's message of "Mon, 14 Mar 2016 16:30:33 +0100")
Michael J Gruber <git@drmicha.warpmail.net> writes:
> The extra pair of parentheses keeps the l10n engine from picking up the
> string. Remove them so that "ahead " ends up in git.pot.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
Thanks, will apply.
> wt-status.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/wt-status.c b/wt-status.c
> index ab4f80d..ef74864 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1677,10 +1677,10 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
> color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
> color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
> } else if (!num_theirs) {
> - color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
> + color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
> color_fprintf(s->fp, branch_color_local, "%d", num_ours);
> } else {
> - color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
> + color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
> color_fprintf(s->fp, branch_color_local, "%d", num_ours);
> color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
> color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
next prev parent reply other threads:[~2016-03-14 15:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-10 23:04 [ANNOUNCE] Git v2.8.0-rc2 Junio C Hamano
2016-03-12 9:11 ` Max Horn
2016-03-14 18:10 ` Junio C Hamano
2016-03-14 15:29 ` Michael J Gruber
2016-03-14 15:30 ` [PATCH] wt-status: allow "ahead " to be picked up by l10n Michael J Gruber
2016-03-14 15:57 ` Junio C Hamano [this message]
2016-03-14 15:56 ` [ANNOUNCE] Git v2.8.0-rc2 Junio C Hamano
2016-03-14 17:47 ` Junio C Hamano
2016-03-16 13:33 ` Michael J Gruber
2016-03-16 13:40 ` Duy Nguyen
2016-03-16 15:32 ` Michael J Gruber
2016-03-16 16:30 ` Junio C Hamano
2016-03-17 14:51 ` Michael J Gruber
2016-03-17 15:14 ` [RFC/PATCH] Makefile: allow po generation through po target Michael J Gruber
2016-03-17 22:42 ` Junio C Hamano
2016-03-17 16:15 ` [ANNOUNCE] Git v2.8.0-rc2 Junio C Hamano
2016-03-20 9:45 ` Jiang Xin
2016-03-20 15:11 ` Michael J Gruber
2016-03-21 20:01 ` Junio C Hamano
2016-03-22 10:00 ` Michael J Gruber
2016-03-22 17:43 ` Junio C Hamano
2016-03-15 16:42 ` Jiang Xin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk2l5aw8a.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=worldhello.net@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).