undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-checkout: our/their version message

Browse Source 
Split up the "does not have our/their version" message to make it
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:40 +00:00 committed by Junio C Hamano
parent e8a8a4d76b
commit 9f97ab08c2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/checkout.c
View File

@ -103,9 +103,10 @@ static int check_stage(int stage, struct cache_entry *ce, int pos)
return 0; return 0;
pos++; pos++;
} }
return error("path '%s' does not have %s version", if (stage == 2)
ce->name, return error(_("path '%s' does not have our version"), ce->name);
(stage == 2) ? "our" : "their"); else
return error(_("path '%s' does not have their version"), ce->name);
} }
static int check_all_stages(struct cache_entry *ce, int pos) static int check_all_stages(struct cache_entry *ce, int pos)
@ -130,9 +131,10 @@ static int checkout_stage(int stage, struct cache_entry *ce, int pos,
return checkout_entry(active_cache[pos], state, NULL); return checkout_entry(active_cache[pos], state, NULL);
pos++; pos++;
} }
return error("path '%s' does not have %s version", if (stage == 2)
ce->name, return error(_("path '%s' does not have our version"), ce->name);
(stage == 2) ? "our" : "their"); else
return error(_("path '%s' does not have their version"), ce->name);
} }
static int checkout_merged(int pos, struct checkout *state) static int checkout_merged(int pos, struct checkout *state)