Code

gettextize: git-fetch split up "(non-fast-forward)" message
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Fri, 3 Sep 2010 23:59:27 +0000 (23:59 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 30 Oct 2010 07:10:21 +0000 (07:10 +0000)
Split up the "(non-fast-forward)" message from printf directives and
make it translatable.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
builtin/fetch.c

index 6d0b62160617df72ec4f577dd71bc3174eb0f18f..a0b71b93c02da30e1113d263679f36ebf303b478 100644 (file)
@@ -305,9 +305,9 @@ static int update_local_ref(struct ref *ref,
                        r ? _("unable to update local ref") : _("forced update"));
                return r;
        } else {
-               sprintf(display, "! %-*s %-*s -> %s  (non-fast-forward)",
-                       TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
-                       pretty_ref);
+               sprintf(display, "! %-*s %-*s -> %s  %s",
+                       TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
+                       pretty_ref, _("(non-fast-forward)"));
                return 1;
        }
 }