diff options
| author |  Vasco Almeida <vascomalmeida@sapo.pt> | 2016-09-15 14:59:01 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-09-15 13:17:32 -0700 |
| commit | ccf7813139f0cb8800b0490d572a22c864a2f0f6 (patch) | |
| tree | 9578f5060b79511b2d3eecd09370c531395c1e80 /builtin | |
| parent | i18n: config: mark error message for translation (diff) | |
| download | tgif-ccf7813139f0cb8800b0490d572a22c864a2f0f6.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge-recursive.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index fd2c4556e1..3b09610063 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -42,30 +42,33 @@ 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); |