mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
i18n: git-checkout: our/their version message
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:
parent
e8a8a4d76b
commit
9f97ab08c2
1 changed files with 8 additions and 6 deletions
|
@ -103,9 +103,10 @@ static int check_stage(int stage, struct cache_entry *ce, int pos)
|
|||
return 0;
|
||||
pos++;
|
||||
}
|
||||
return error("path '%s' does not have %s version",
|
||||
ce->name,
|
||||
(stage == 2) ? "our" : "their");
|
||||
if (stage == 2)
|
||||
return error(_("path '%s' does not have our version"), ce->name);
|
||||
else
|
||||
return error(_("path '%s' does not have their version"), ce->name);
|
||||
}
|
||||
|
||||
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);
|
||||
pos++;
|
||||
}
|
||||
return error("path '%s' does not have %s version",
|
||||
ce->name,
|
||||
(stage == 2) ? "our" : "their");
|
||||
if (stage == 2)
|
||||
return error(_("path '%s' does not have our version"), ce->name);
|
||||
else
|
||||
return error(_("path '%s' does not have their version"), ce->name);
|
||||
}
|
||||
|
||||
static int checkout_merged(int pos, struct checkout *state)
|
||||
|
|
Loading…
Reference in a new issue