From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:41:54 GMT Subject: [PATCH v4 35/73] gettextize: git-fetch split up "(non-fast-forward)" message Message-ID: <1298418152-27789-36-git-send-email-avarab@gmail.com> In-Reply-To: <7vhbbwdjnm.fsf@alter.siamese.dyndns.org> Split up the "(non-fast-forward)" message from printf directives and make it translatable. Signed-off-by: Ævar Arnfjörð Bjarmason --- 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