Andrew's git / gitweb.git / blobdiff
?
t7610: run 'git reset --hard' after each test to clean up
[gitweb.git] / builtin / merge-recursive.c
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index fd2c4556e1d648d82d3fb78675187623180c6261..0dd902195878aedef76559ad67ad6dc9384141b3 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -42,36 +42,39 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
                        if (!arg[2])
                                break;
                        if (parse_merge_opt(&o, arg + 2))
-                               die("Unknown option %s", arg);
+                               die(_("unknown option %s"), arg);
                        continue;
                }
                if (bases_count < ARRAY_SIZE(bases)-1) {
                        struct object_id *oid = xmalloc(sizeof(struct object_id));
                        if (get_oid(argv[i], oid))
-                               die("Could not parse object '%s'", argv[i]);
+                               die(_("could not parse object '%s'"), argv[i]);
                        bases[bases_count++] = oid;
                }
                else
-                       warning("Cannot handle more than %d bases. "
-                               "Ignoring %s.",
+                       warning(Q_("cannot handle more than %d base. "
+                                  "Ignoring %s.",
+                                  "cannot handle more than %d bases. "
+                                  "Ignoring %s.",
+                                   (int)ARRAY_SIZE(bases)-1),
                                (int)ARRAY_SIZE(bases)-1, argv[i]);
        }
        if (argc - i != 3) /* "--" "<head>" "<remote>" */
-               die("Not handling anything other than two heads merge.");
+               die(_("not handling anything other than two heads merge."));
 
        o.branch1 = argv[++i];
        o.branch2 = argv[++i];
 
        if (get_oid(o.branch1, &h1))
-               die("Could not resolve ref '%s'", o.branch1);
+               die(_("could not resolve ref '%s'"), o.branch1);
        if (get_oid(o.branch2, &h2))
-               die("Could not resolve ref '%s'", o.branch2);
+               die(_("could not resolve ref '%s'"), o.branch2);
 
        o.branch1 = better_branch_name(o.branch1);
        o.branch2 = better_branch_name(o.branch2);
 
        if (o.verbosity >= 3)
-               printf("Merging %s with %s\n", o.branch1, o.branch2);
+               printf(_("Merging %s with %s\n"), o.branch1, o.branch2);
 
        failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
        if (failed < 0)