[PATCH 34/72] gettextize: git-fetch split up "(non-fast-forward)" message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 19, 2011, 19:24 UTC
- Message-ID
- <1298143495-3681-35-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1298143495-3681-1-git-send-email-avarab@gmail.com>
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 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index 4f622fd..ee2c5f5 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; } }
-- 1.7.2.3