i18n: merge-recursive: mark error messages for translation
Spell the first word of such error messages in lowercase, following the usual style. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Sep 15, 2016 at 14:59 UTC
ccf7813139f0cb8800b0490d572a22c864a2f0f6
1 file changed
+10
-7
builtin/merge-recursive.c
+10
-7
@@ -42,30 +42,33 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
42
if (!arg[2])
43
break;
44
if (parse_merge_opt(&o, arg + 2))
45
- die("Unknown option %s", arg);
45
+ die(_("unknown option %s"), arg);
46
continue;
47
}
48
if (bases_count < ARRAY_SIZE(bases)-1) {
49
struct object_id *oid = xmalloc(sizeof(struct object_id));
50
if (get_oid(argv[i], oid))
51
- die("Could not parse object '%s'", argv[i]);
51
+ die(_("could not parse object '%s'"), argv[i]);
52
bases[bases_count++] = oid;
53
}
54
else
55
- warning("Cannot handle more than %d bases. "
56
- "Ignoring %s.",
55
+ warning(Q_("cannot handle more than %d base. "
56
+ "Ignoring %s.",
57
+ "cannot handle more than %d bases. "
58
+ "Ignoring %s.",
59
+ (int)ARRAY_SIZE(bases)-1),
60
(int)ARRAY_SIZE(bases)-1, argv[i]);
61
}
62
if (argc - i != 3) /* "--" "<head>" "<remote>" */
60
- die("Not handling anything other than two heads merge.");
63
+ die(_("not handling anything other than two heads merge."));
64
65
o.branch1 = argv[++i];
66
o.branch2 = argv[++i];
67
68
if (get_oid(o.branch1, &h1))
66
- die("Could not resolve ref '%s'", o.branch1);
69
+ die(_("could not resolve ref '%s'"), o.branch1);
70
if (get_oid(o.branch2, &h2))
68
- die("Could not resolve ref '%s'", o.branch2);
71
+ die(_("could not resolve ref '%s'"), o.branch2);
72
73
o.branch1 = better_branch_name(o.branch1);
74
o.branch2 = better_branch_name(o.branch2);