diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:40 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:53 -0800 |
| commit | 9f97ab08c236927cdaa5b47204f97588f006c61e (patch) | |
| tree | 0da664b80c069a8cbdb0c26a97f908725c43113c /builtin/checkout.c | |
| parent | i18n: git-checkout basic messages (diff) | |
| download | tgif-9f97ab08c236927cdaa5b47204f97588f006c61e.tar.xz | |
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>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 147fcb2ea3..48dccea483 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -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) |