diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-10-14 11:43:36 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-14 10:53:51 -0700 |
| commit | 5886637a2fb6e22200d53bc4b86d3f7ae12ab1bc (patch) | |
| tree | d78e7e708e9c9d71a253898d52cfb4b464e1050b /apply.c | |
| parent | 965d5c851ac8cea3521e805a3370c587fed78143 (diff) | |
| download | git-5886637a2fb6e22200d53bc4b86d3f7ae12ab1bc.tar.gz git-5886637a2fb6e22200d53bc4b86d3f7ae12ab1bc.tar.xz | |
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>
Diffstat (limited to 'apply.c')
| -rw-r--r-- | apply.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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; |