From: Vasco Almeida Date: Tue, 19 Apr 2016 13:19:21 GMT Subject: [PATCH v3 4/7] i18n: builtin/pull.c: mark placeholders for translation Message-ID: <1461071964-323-4-git-send-email-vascomalmeida@sapo.pt> In-Reply-To: <1461071964-323-1-git-send-email-vascomalmeida@sapo.pt> Some translations might also translate "" and "". Signed-off-by: Vasco Almeida --- I opted to mark also the brackets of placeholders, which I think is a good compromise between consistency and letting the translators know what they're translating. builtin/pull.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index d98f481..c199f28 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -474,13 +474,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs fprintf_ln(stderr, _("Please specify which branch you want to merge with.")); fprintf_ln(stderr, _("See git-pull(1) for details.")); fprintf(stderr, "\n"); - fprintf_ln(stderr, " git pull "); + fprintf_ln(stderr, " git pull %s %s", _(""), _("")); fprintf(stderr, "\n"); } else if (!curr_branch->merge_nr) { const char *remote_name = NULL; if (for_each_remote(get_only_remote, &remote_name) || !remote_name) - remote_name = ""; + remote_name = _(""); fprintf_ln(stderr, _("There is no tracking information for the current branch.")); if (opt_rebase) @@ -489,7 +489,7 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs fprintf_ln(stderr, _("Please specify which branch you want to merge with.")); fprintf_ln(stderr, _("See git-pull(1) for details.")); fprintf(stderr, "\n"); - fprintf_ln(stderr, " git pull "); + fprintf_ln(stderr, " git pull %s %s", _(""), _("")); fprintf(stderr, "\n"); fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:\n" "\n" -- 2.1.4