kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Vasco Almeida 2016-09-15 14:59:01 +00:00 committed by Junio C Hamano
parent ccf6380154
commit ccf7813139
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/merge-recursive.c
View File

@ -42,30 +42,33 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
if (!arg[2]) if (!arg[2])
break; break;
if (parse_merge_opt(&o, arg + 2)) if (parse_merge_opt(&o, arg + 2))
die("Unknown option %s", arg); die(_("unknown option %s"), arg);
continue; continue;
} }
if (bases_count < ARRAY_SIZE(bases)-1) { if (bases_count < ARRAY_SIZE(bases)-1) {
struct object_id *oid = xmalloc(sizeof(struct object_id)); struct object_id *oid = xmalloc(sizeof(struct object_id));
if (get_oid(argv[i], oid)) 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; bases[bases_count++] = oid;
} }
else else
warning("Cannot handle more than %d bases. " warning(Q_("cannot handle more than %d base. "
"Ignoring %s.", "Ignoring %s.",
"cannot handle more than %d bases. "
"Ignoring %s.",
(int)ARRAY_SIZE(bases)-1),
(int)ARRAY_SIZE(bases)-1, argv[i]); (int)ARRAY_SIZE(bases)-1, argv[i]);
} }
if (argc - i != 3) /* "--" "<head>" "<remote>" */ 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.branch1 = argv[++i];
o.branch2 = argv[++i]; o.branch2 = argv[++i];


if (get_oid(o.branch1, &h1)) 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)) 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.branch1 = better_branch_name(o.branch1);
o.branch2 = better_branch_name(o.branch2); o.branch2 = better_branch_name(o.branch2);