From 5886637a2fb6e22200d53bc4b86d3f7ae12ab1bc Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Fri, 14 Oct 2016 11:43:36 +0000 Subject: i18n: apply: mark info messages for translation Mark messages for translation printed to stderr. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- apply.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apply.c') diff --git a/apply.c b/apply.c index 201d3a7358..13b2064ef0 100644 --- a/apply.c +++ b/apply.c @@ -3554,7 +3554,7 @@ static int try_threeway(struct apply_state *state, return error("repository lacks the necessary blob to fall back on 3-way merge."); if (state->apply_verbosity > verbosity_silent) - fprintf(stderr, "Falling back to three-way merge...\n"); + fprintf(stderr, _("Falling back to three-way merge...\n")); img = strbuf_detach(&buf, &len); prepare_image(&tmp_image, img, len, 1); @@ -3586,7 +3586,7 @@ static int try_threeway(struct apply_state *state, if (status < 0) { if (state->apply_verbosity > verbosity_silent) fprintf(stderr, - "Failed to fall back on three-way merge...\n"); + _("Failed to fall back on three-way merge...\n")); return status; } @@ -3600,12 +3600,12 @@ static int try_threeway(struct apply_state *state, oidcpy(&patch->threeway_stage[2], &post_oid); if (state->apply_verbosity > verbosity_silent) fprintf(stderr, - "Applied patch to '%s' with conflicts.\n", + _("Applied patch to '%s' with conflicts.\n"), patch->new_name); } else { if (state->apply_verbosity > verbosity_silent) fprintf(stderr, - "Applied patch to '%s' cleanly.\n", + _("Applied patch to '%s' cleanly.\n"), patch->new_name); } return 0; -- cgit v1.2.3