From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 22 Feb 2011 23:41:54 +0000 (+0000)
Subject: i18n: git-fetch split up "(non-fast-forward)" message
X-Git-Tag: v1.7.5-rc1~19^2~38
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=321a153c5a85320505e6eee9acd3f87b79cd873a;p=git.git

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>
---

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 4f622fd0a..ee2c5f50a 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;
 	}
 }