Re: [PATCH 07/13] i18n: merge-recursive: mark error messages for translation

[Junio C Hamano]

Vasco Almeida  writes:

> Lowercase first word of such error messages following the usual style.

"Change X to lowercase" is fine, but "Lowercase" is not a verb.

I'd reword it to "Downcase the first word...".

Other than that all 04-13/13 looked fine to me.

Thanks.

[PATCH 07/13] i18n: merge-recursive: mark error messages for translation

[Vasco Almeida]

Lowercase first word of such error messages following the usual style.

Signed-off-by: Vasco Almeida 
---
 builtin/merge-recursive.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index fd2c455..0bc88a7 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -42,30 +42,30 @@ int cmd_merge_recursive(int argc, const char **argv, const 
char *prefix)
if (!arg[2])
break;
if (parse_merge_opt(, 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(_("cannot handle more than %d bases. "
+ "Ignoring %s."),
(int)ARRAY_SIZE(bases)-1, argv[i]);
}
if (argc - i != 3) /* "--" "" "" */
-   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, ))
-   die("Could not resolve ref '%s'", o.branch1);
+   die(_("could not resolve ref '%s'"), o.branch1);
if (get_oid(o.branch2, ))
-   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);
-- 
2.7.4