From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 1 Sep 2010 19:21:38 +0000 (+0000)
Subject: gettextize: git-checkout "Switched to a .. branch" message
X-Git-Tag: ko-pu~10^2~118
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6517b9874807a11b8bf13b9328925cb519375057;p=git.git

gettextize: git-checkout "Switched to a .. branch" message

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>
---

diff --git a/builtin/checkout.c b/builtin/checkout.c
index b510f1d2b..dd6f3b92a 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -550,9 +550,10 @@ static void update_refs_for_switch(struct checkout_opts *opts,
 				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);