i18n: remote.c: mark error(...) messages for translation

Mark up the error(...) messages in remote.c for translation. The likes
of "unable to push to unqualified destination" are relatively big
parts of the UI, i.e. error messages shown when "git push" fails.

I don't think any of these are plumbing, an the entire test suite
passes when running the tests with GIT_GETTEXT_POISON=1 (after
building with GETTEXT_POISON).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 695b379a443a148b11579ef240ba44903986bcbe..35fe8a178f6902be3c31cd2c89418e14a80eebdc 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -406,7 +406,7 @@ static int handle_config(const char *key, const char *value, void *cb)
                if (!remote->receivepack)
                        remote->receivepack = v;
                else
                if (!remote->receivepack)
                        remote->receivepack = v;
                else

-                       error("more than one receivepack given, using the first");
+                       error(_("more than one receivepack given, using the first"));

        } else if (!strcmp(subkey, "uploadpack")) {
                const char *v;
                if (git_config_string(&v, key, value))
        } else if (!strcmp(subkey, "uploadpack")) {
                const char *v;
                if (git_config_string(&v, key, value))


@@ -414,7 +414,7 @@ static int handle_config(const char *key, const char *value, void *cb)
                if (!remote->uploadpack)
                        remote->uploadpack = v;
                else
                if (!remote->uploadpack)
                        remote->uploadpack = v;
                else

-                       error("more than one uploadpack given, using the first");
+                       error(_("more than one uploadpack given, using the first"));

        } else if (!strcmp(subkey, "tagopt")) {
                if (!strcmp(value, "--no-tags"))
                        remote->fetch_tags = -1;
        } else if (!strcmp(subkey, "tagopt")) {
                if (!strcmp(value, "--no-tags"))
                        remote->fetch_tags = -1;


@@ -707,7 +707,7 @@ static void query_refspecs_multiple(struct refspec *rs,
        int find_src = !query->src;
 
        if (find_src && !query->dst)
        int find_src = !query->src;
 
        if (find_src && !query->dst)

-               error("query_refspecs_multiple: need either src or dst");
+               error(_("query_refspecs_multiple: need either src or dst"));

 
        for (i = 0; i < rs->nr; i++) {
                struct refspec_item *refspec = &rs->items[i];
 
        for (i = 0; i < rs->nr; i++) {
                struct refspec_item *refspec = &rs->items[i];


@@ -735,7 +735,7 @@ int query_refspecs(struct refspec *rs, struct refspec_item *query)
        char **result = find_src ? &query->src : &query->dst;
 
        if (find_src && !query->dst)
        char **result = find_src ? &query->src : &query->dst;
 
        if (find_src && !query->dst)

-               return error("query_refspecs: need either src or dst");
+               return error(_("query_refspecs: need either src or dst"));

 
        for (i = 0; i < rs->nr; i++) {
                struct refspec_item *refspec = &rs->items[i];
 
        for (i = 0; i < rs->nr; i++) {
                struct refspec_item *refspec = &rs->items[i];


@@ -996,12 +996,12 @@ static int match_explicit_lhs(struct ref *src,
                 * way to delete 'other' ref at the remote end.
                 */
                if (try_explicit_object_name(rs->src, match) < 0)
                 * way to delete 'other' ref at the remote end.
                 */
                if (try_explicit_object_name(rs->src, match) < 0)

-                       return error("src refspec %s does not match any.", rs->src);
+                       return error(_("src refspec %s does not match any."), rs->src);

                if (allocated_match)
                        *allocated_match = 1;
                return 0;
        default:
                if (allocated_match)
                        *allocated_match = 1;
                return 0;
        default:

-               return error("src refspec %s matches more than one.", rs->src);
+               return error(_("src refspec %s matches more than one."), rs->src);

        }
 }
 
        }
 }
 


@@ -1041,32 +1041,33 @@ static int match_explicit(struct ref *src, struct ref *dst,
        case 0:
                if (starts_with(dst_value, "refs/")) {
                        matched_dst = make_linked_ref(dst_value, dst_tail);
        case 0:
                if (starts_with(dst_value, "refs/")) {
                        matched_dst = make_linked_ref(dst_value, dst_tail);

+

                } else if (is_null_oid(&matched_src->new_oid)) {
                } else if (is_null_oid(&matched_src->new_oid)) {

-                       error("unable to delete '%s': remote ref does not exist",
+                       error(_("unable to delete '%s': remote ref does not exist"),

                              dst_value);
                } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
                        matched_dst = make_linked_ref(dst_guess, dst_tail);
                        free(dst_guess);
                } else {
                              dst_value);
                } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
                        matched_dst = make_linked_ref(dst_guess, dst_tail);
                        free(dst_guess);
                } else {

-                       error("unable to push to unqualified destination: %s\n"
-                             "The destination refspec neither matches an "
-                             "existing ref on the remote nor\n"
-                             "begins with refs/, and we are unable to "
-                             "guess a prefix based on the source ref.",
+                       error(_("unable to push to unqualified destination: %s\n"
+                               "The destination refspec neither matches an "
+                               "existing ref on the remote nor\n"
+                               "begins with refs/, and we are unable to "
+                               "guess a prefix based on the source ref."),

                              dst_value);
                }
                break;
        default:
                matched_dst = NULL;
                              dst_value);
                }
                break;
        default:
                matched_dst = NULL;

-               error("dst refspec %s matches more than one.",
+               error(_("dst refspec %s matches more than one."),

                      dst_value);
                break;
        }
        if (!matched_dst)
                return -1;
        if (matched_dst->peer_ref)
                      dst_value);
                break;
        }
        if (!matched_dst)
                return -1;
        if (matched_dst->peer_ref)

-               return error("dst ref %s receives from more than one src.",
-                     matched_dst->name);
+               return error(_("dst ref %s receives from more than one src."),
+                            matched_dst->name);

        else {
                matched_dst->peer_ref = allocated_src ?
                                        matched_src :
        else {
                matched_dst->peer_ref = allocated_src ?
                                        matched_src :


@@ -1797,7 +1798,7 @@ int get_fetch_map(const struct ref *remote_refs,
                        if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
                            check_refname_format((*rmp)->peer_ref->name, 0)) {
                                struct ref *ignore = *rmp;
                        if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
                            check_refname_format((*rmp)->peer_ref->name, 0)) {
                                struct ref *ignore = *rmp;

-                               error("* Ignoring funny ref '%s' locally",
+                               error(_("* Ignoring funny ref '%s' locally"),

                                      (*rmp)->peer_ref->name);
                                *rmp = (*rmp)->next;
                                free(ignore->peer_ref);
                                      (*rmp)->peer_ref->name);
                                *rmp = (*rmp)->next;
                                free(ignore->peer_ref);


@@ -2165,7 +2166,7 @@ static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, i
        else if (!colon[1])
                oidclr(&entry->expect);
        else if (get_oid(colon + 1, &entry->expect))
        else if (!colon[1])
                oidclr(&entry->expect);
        else if (get_oid(colon + 1, &entry->expect))

-               return error("cannot parse expected object name '%s'", colon + 1);
+               return error(_("cannot parse expected object name '%s'"), colon + 1);

        return 0;
 }
 
        return 0;
 }