From: Vasco Almeida Date: Fri, 17 Jun 2016 20:20:50 +0000 (+0000) Subject: i18n: builtin/remote.c: fix mark for translation X-Git-Tag: v2.10.0-rc0~45^2~14 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/070b7e441649b9c2543fda7bfbef0ad58761f869?ds=inline i18n: builtin/remote.c: fix mark for translation The second string inside _() was not being extracted for translation by xgettext, meaning that, although the string was passed to gettext, there was no translation available. Mark each individual string instead of marking the result of ternary if. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- diff --git a/builtin/remote.c b/builtin/remote.c index d33766be39..ae74da64b2 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -963,9 +963,9 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data) printf(" %-*s ", show_info->width, item->string); if (branch_info->rebase) { - printf_ln(_(branch_info->rebase == INTERACTIVE_REBASE ? - "rebases interactively onto remote %s" : - "rebases onto remote %s"), merge->items[0].string); + printf_ln(branch_info->rebase == INTERACTIVE_REBASE + ? _("rebases interactively onto remote %s") + : _("rebases onto remote %s"), merge->items[0].string); return 0; } else if (show_info->any_rebase) { printf_ln(_(" merges with remote %s"), merge->items[0].string);