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>

diff --git a/apply.c b/apply.c
index 201d3a73586bdd52131439a8d259345e5f188d19..13b2064ef079d9710b241e656710d20416d72fe6 100644 (file)
--- 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)
                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);
 
        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,
        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;
        }
 
                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,
                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,
                                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;
                                patch->new_name);
        }
        return 0;