From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 3 Sep 2010 23:59:27 +0000 (+0000)
Subject: gettextize: git-fetch split up "(non-fast-forward)" message
X-Git-Tag: ko-pu~10^2~107
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc8523a0a3bf3e03828f6c14df60fe9887cd1211;p=git.git

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

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 6d0b62160..a0b71b93c 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -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;
 	}
 }