diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-04-10 19:34:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:12:53 -0700 |
| commit | 20fc73e3b0bb2b115d88e54514db13ffaf11b025 (patch) | |
| tree | fdc033f4f8c47e0363e74d0e8964f28290872f3b | |
| parent | d3e1ddfd390da8ed6fd275821802eec64c2f74ac (diff) | |
| download | git-20fc73e3b0bb2b115d88e54514db13ffaf11b025.tar.gz git-20fc73e3b0bb2b115d88e54514db13ffaf11b025.tar.xz | |
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>
| -rw-r--r-- | builtin/checkout.c | 6 |
1 files changed, 3 insertions, 3 deletions
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.")); |