mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2011-02-22 23:41:43 +00:00
committed by Junio C Hamano
parent 9398cc4bd4
commit 08eaa4be03
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/checkout.c
View File

@ -546,17 +546,19 @@ static void update_refs_for_switch(struct checkout_opts *opts,
if (new->path) { if (new->path) {
create_symref("HEAD", new->path, msg.buf); create_symref("HEAD", new->path, msg.buf);
if (!opts->quiet) { if (!opts->quiet) {
if (old->path && !strcmp(new->path, old->path)) if (old->path && !strcmp(new->path, old->path)) {
fprintf(stderr, _("Already on '%s'\n"), fprintf(stderr, _("Already on '%s'\n"),
new->name); new->name);
else if (opts->new_branch) } else if (opts->new_branch) {
fprintf(stderr, "Switched to%s branch '%s'\n", if (opts->branch_exists)
opts->branch_exists ? " and reset" : " a new", fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
new->name);
else else
fprintf(stderr, _("Switched to a new branch '%s'\n"), new->name);
} else {
fprintf(stderr, _("Switched to branch '%s'\n"), fprintf(stderr, _("Switched to branch '%s'\n"),
new->name); new->name);
} }
}
if (old->path && old->name) { if (old->path && old->name) {
char log_file[PATH_MAX], ref_file[PATH_MAX]; char log_file[PATH_MAX], ref_file[PATH_MAX];