Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
wt-status: allow "ahead " to be picked up by l10n
author
Michael J Gruber
<git@drmicha.warpmail.net>
Mon, 14 Mar 2016 15:30:33 +0000
(16:30 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 14 Mar 2016 17:45:04 +0000
(10:45 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
wt-status.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
7a76c28
)
diff --git
a/wt-status.c
b/wt-status.c
index b53ce330b9f63974a2f64f28a0697757861fef05..a93e8201bf5337bccce9d00c5b142e4fcb01d180 100644
(file)
--- a/
wt-status.c
+++ b/
wt-status.c
@@
-1492,10
+1492,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_("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, 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);
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);