i18n: mark checkout --detach messages for translation
Mark messages added in v1.7.5-rc0~117^2~2 (checkout: introduce --detach synonym for "git checkout foo^{commit}") by Junio C Hamano for translation. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Apr 10, 2011 at 19:34 UTC
20fc73e3b0bb2b115d88e54514db13ffaf11b025
1 file changed
+3
-3
builtin/checkout.c
+3
-3
@@ -961,9 +961,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
961
die (_("--patch is incompatible with all other options"));
962
963
if (opts.force_detach && (opts.new_branch || opts.new_orphan_branch))
964
- die("--detach cannot be used with -b/-B/--orphan");
964
+ die(_("--detach cannot be used with -b/-B/--orphan"));
965
if (opts.force_detach && 0 < opts.track)
966
- die("--detach cannot be used with -t");
966
+ die(_("--detach cannot be used with -t"));
967
968
/* --track without -b should DWIM */
969
if (0 < opts.track && !opts.new_branch) {
@@ -1043,7 +1043,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
1043
}
1044
1045
if (opts.force_detach)
1046
- die("git checkout: --detach does not take a path argument");
1046
+ die(_("git checkout: --detach does not take a path argument"));
1047
1048
if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
1049
die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index."));