Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: zh_CN: for git v2.8.0 l10n round 2
l10n: fr.po v2.8.0 round 2
l10n: ru.po: update Russian translation
l10n: ko: Update Korean translation
l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)
l10n: zh_CN: for git v2.8.0 l10n round 1
l10n: de.po: translate 48 new messages
l10n: de.po: translate "command" as "Befehl"
l10n: de.po: fix interactive rebase message
l10n: de.po: add space to abbreviation "z. B."
l10n: de.po: fix typo
l10n: TEAMS: update Ralf Thielow's email address
l10n: sv.po: Update Swedish translation (2509t0f0u)
l10n: sv.po: Fix inconsistent translation of "progress meter"
l10n: ko.po: Update Korean translation
l10n: ru.po: update Russian translation
l10n: vi.po (2509t): Updated Vietnamese translation
l10n: fr.po v2.8.0 round 1 2509t
l10n: fr.po: Correct case in sentence
l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)

diff --git a/wt-status.c b/wt-status.c
index ab4f80d6d0415e449cade48e986c77c933bfecac..ef7486474a1eafb7d5d1344323cd6abf012c31db 100644 (file)
--- 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);