fetch-pack: move capability names out of i18n strings

This reduces the work on translators since they only have one string to
translate (and I think it's still enough context to translate). It also
makes sure no capability name is translated by accident.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/fetch-pack.c b/fetch-pack.c
index 1c10f54e788ca53b548a226a66dd1eec96a8cb22..0532029f2c4978b4d59a1fc40f3c9c55319e93e5 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -907,32 +907,32 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
        if (args->depth > 0 || args->deepen_since || args->deepen_not)
                args->deepen = 1;
        if (server_supports("multi_ack_detailed")) {
        if (args->depth > 0 || args->deepen_since || args->deepen_not)
                args->deepen = 1;
        if (server_supports("multi_ack_detailed")) {

-               print_verbose(args, _("Server supports multi_ack_detailed"));
+               print_verbose(args, _("Server supports %s"), "multi_ack_detailed");

                multi_ack = 2;
                if (server_supports("no-done")) {
                multi_ack = 2;
                if (server_supports("no-done")) {

-                       print_verbose(args, _("Server supports no-done"));
+                       print_verbose(args, _("Server supports %s"), "no-done");

                        if (args->stateless_rpc)
                                no_done = 1;
                }
        }
        else if (server_supports("multi_ack")) {
                        if (args->stateless_rpc)
                                no_done = 1;
                }
        }
        else if (server_supports("multi_ack")) {

-               print_verbose(args, _("Server supports multi_ack"));
+               print_verbose(args, _("Server supports %s"), "multi_ack");

                multi_ack = 1;
        }
        if (server_supports("side-band-64k")) {
                multi_ack = 1;
        }
        if (server_supports("side-band-64k")) {

-               print_verbose(args, _("Server supports side-band-64k"));
+               print_verbose(args, _("Server supports %s"), "side-band-64k");

                use_sideband = 2;
        }
        else if (server_supports("side-band")) {
                use_sideband = 2;
        }
        else if (server_supports("side-band")) {

-               print_verbose(args, _("Server supports side-band"));
+               print_verbose(args, _("Server supports %s"), "side-band");

                use_sideband = 1;
        }
        if (server_supports("allow-tip-sha1-in-want")) {
                use_sideband = 1;
        }
        if (server_supports("allow-tip-sha1-in-want")) {

-               print_verbose(args, _("Server supports allow-tip-sha1-in-want"));
+               print_verbose(args, _("Server supports %s"), "allow-tip-sha1-in-want");

                allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
        }
        if (server_supports("allow-reachable-sha1-in-want")) {
                allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
        }
        if (server_supports("allow-reachable-sha1-in-want")) {

-               print_verbose(args, _("Server supports allow-reachable-sha1-in-want"));
+               print_verbose(args, _("Server supports %s"), "allow-reachable-sha1-in-want");

                allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
        }
        if (!server_supports("thin-pack"))
                allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
        }
        if (!server_supports("thin-pack"))


@@ -942,13 +942,13 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
        if (!server_supports("include-tag"))
                args->include_tag = 0;
        if (server_supports("ofs-delta"))
        if (!server_supports("include-tag"))
                args->include_tag = 0;
        if (server_supports("ofs-delta"))

-               print_verbose(args, _("Server supports ofs-delta"));
+               print_verbose(args, _("Server supports %s"), "ofs-delta");

        else
                prefer_ofs_delta = 0;
 
        if (server_supports("filter")) {
                server_supports_filtering = 1;
        else
                prefer_ofs_delta = 0;
 
        if (server_supports("filter")) {
                server_supports_filtering = 1;

-               print_verbose(args, _("Server supports filter"));
+               print_verbose(args, _("Server supports %s"), "filter");

        } else if (args->filter_options.choice) {
                warning("filtering not recognized by server, ignoring");
        }
        } else if (args->filter_options.choice) {
                warning("filtering not recognized by server, ignoring");
        }