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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:41 UTC
321a153c5a85320505e6eee9acd3f87b79cd873a
1 file changed
+3
-3
builtin/fetch.c
+3
-3
@@ -317,9 +317,9 @@ static int update_local_ref(struct ref *ref,
317
r ? _("unable to update local ref") : _("forced update"));
318
return r;
319
} else {
320
- sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
321
- TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
322
- pretty_ref);
320
+ sprintf(display, "! %-*s %-*s -> %s %s",
321
+ TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
322
+ pretty_ref, _("(non-fast-forward)"));
323
return 1;
324
}
325
}