From: Ævar Arnfjörð Bjarmason Date: Sun, 10 Apr 2011 19:34:07 +0000 (+0000) Subject: i18n: mark checkout --detach messages for translation X-Git-Tag: v1.7.5.4~11^2~19 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=20fc73e3b0bb2b115d88e54514db13ffaf11b025;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/checkout.c b/builtin/checkout.c index eece5d6ac..0b65edde2 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -961,9 +961,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) die (_("--patch is incompatible with all other options")); if (opts.force_detach && (opts.new_branch || opts.new_orphan_branch)) - die("--detach cannot be used with -b/-B/--orphan"); + die(_("--detach cannot be used with -b/-B/--orphan")); if (opts.force_detach && 0 < opts.track) - die("--detach cannot be used with -t"); + die(_("--detach cannot be used with -t")); /* --track without -b should DWIM */ if (0 < opts.track && !opts.new_branch) { @@ -1043,7 +1043,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) } if (opts.force_detach) - die("git checkout: --detach does not take a path argument"); + die(_("git checkout: --detach does not take a path argument")); if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge) die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index."));