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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:41 UTC
9f97ab08c236927cdaa5b47204f97588f006c61e
1 file changed
+8
-6
builtin/checkout.c
+8
-6
@@ -103,9 +103,10 @@ static int check_stage(int stage, struct cache_entry *ce, int pos)
103
return 0;
104
pos++;
105
}
106
- return error("path '%s' does not have %s version",
107
- ce->name,
108
- (stage == 2) ? "our" : "their");
106
+ if (stage == 2)
107
+ return error(_("path '%s' does not have our version"), ce->name);
108
+ else
109
+ return error(_("path '%s' does not have their version"), ce->name);
110
}
111
112
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,
131
return checkout_entry(active_cache[pos], state, NULL);
132
pos++;
133
}
133
- return error("path '%s' does not have %s version",
134
- ce->name,
135
- (stage == 2) ? "our" : "their");
134
+ if (stage == 2)
135
+ return error(_("path '%s' does not have our version"), ce->name);
136
+ else
137
+ return error(_("path '%s' does not have their version"), ce->name);
138
}
139
140
static int checkout_merged(int pos, struct checkout *state)