summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 380c3f2)
raw | patch | inline | side by side (parent: 380c3f2)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Wed, 1 Sep 2010 19:21:38 +0000 (19:21 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:10:11 +0000 (07:10 +0000) |
Split up the "Switched to and reset branch" and "Switched to a new
branch" messages to make them easier to translate.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
branch" messages to make them easier to translate.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
builtin/checkout.c | patch | blob | history |
diff --git a/builtin/checkout.c b/builtin/checkout.c
index b510f1d2b55842bc752d0e1bef314cf9d327d8ad..dd6f3b92ab22ffed4d88c19c7d6dedee4b15a9fd 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
fprintf(stderr, _("Already on '%s'\n"),
new->name);
else if (opts->new_branch)
- fprintf(stderr, "Switched to%s branch '%s'\n",
- opts->branch_exists ? " and reset" : " a new",
- new->name);
+ if (opts->branch_exists)
+ fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
+ else
+ fprintf(stderr, _("Switched to a new branch '%s'\n"), new->name);
else
fprintf(stderr, _("Switched to branch '%s'\n"),
new->name);