diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:54 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:54 -0800 |
| commit | 321a153c5a85320505e6eee9acd3f87b79cd873a (patch) | |
| tree | 8801bb048ec5f10917ab70ffe28f7fc20e6cc847 | |
| parent | i18n: git-fetch update_local_ref messages (diff) | |
| download | tgif-321a153c5a85320505e6eee9acd3f87b79cd873a.tar.xz | |
i18n: git-fetch split up "(non-fast-forward)" message
Split up the "(non-fast-forward)" message from printf directives and
make it translatable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/fetch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 4f622fd0a1..ee2c5f50ac 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -317,9 +317,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; } } |