i18n: apply: mark info messages for translation
Mark messages for translation printed to stderr. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Oct 14, 2016 at 11:43 UTC
5886637a2fb6e22200d53bc4b86d3f7ae12ab1bc
1 file changed
+4
-4
apply.c
+4
-4
@@ -3554,7 +3554,7 @@ static int try_threeway(struct apply_state *state,
3554
return error("repository lacks the necessary blob to fall back on 3-way merge.");
3555
3556
if (state->apply_verbosity > verbosity_silent)
3557
- fprintf(stderr, "Falling back to three-way merge...\n");
3557
+ fprintf(stderr, _("Falling back to three-way merge...\n"));
3558
3559
img = strbuf_detach(&buf, &len);
3560
prepare_image(&tmp_image, img, len, 1);
@@ -3586,7 +3586,7 @@ static int try_threeway(struct apply_state *state,
3586
if (status < 0) {
3587
if (state->apply_verbosity > verbosity_silent)
3588
fprintf(stderr,
3589
- "Failed to fall back on three-way merge...\n");
3589
+ _("Failed to fall back on three-way merge...\n"));
3590
return status;
3591
}
3592
@@ -3600,12 +3600,12 @@ static int try_threeway(struct apply_state *state,
3600
oidcpy(&patch->threeway_stage[2], &post_oid);
3601
if (state->apply_verbosity > verbosity_silent)
3602
fprintf(stderr,
3603
- "Applied patch to '%s' with conflicts.\n",
3603
+ _("Applied patch to '%s' with conflicts.\n"),
3604
patch->new_name);
3605
} else {
3606
if (state->apply_verbosity > verbosity_silent)
3607
fprintf(stderr,
3608
- "Applied patch to '%s' cleanly.\n",
3608
+ _("Applied patch to '%s' cleanly.\n"),
3609
patch->new_name);
3610
}
3611
return 0;