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>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 147fcb2ea3d6c29fe96141bfc29f8f62c54800f0..48dccea48307679a780f4e7978b42218f163bc05 100644 (file)
--- 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 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)
 }
 
 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 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)
 }
 
 static int checkout_merged(int pos, struct checkout *state)