summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-06-17 20:20:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-17 22:45:47 (GMT)
commit070b7e441649b9c2543fda7bfbef0ad58761f869 (patch)
tree87289673af09a99d1f9a26db9cb289f436a9d2b7
parent7bafc6758c73805a453b36dcd41720c17bf25216 (diff)
downloadgit-070b7e441649b9c2543fda7bfbef0ad58761f869.zip
git-070b7e441649b9c2543fda7bfbef0ad58761f869.tar.gz
git-070b7e441649b9c2543fda7bfbef0ad58761f869.tar.bz2
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 <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/remote.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index d33766b..ae74da6 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);