Andrew's git / gitweb.git / diff
?
i18n: merge-recursive: mark error messages for translation
authorVasco Almeida <vascomalmeida@sapo.pt>
Thu, 15 Sep 2016 14:59:01 +0000 (14:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2016 20:17:32 +0000 (13:17 -0700)
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>
builtin/merge-recursive.c patch | blob | history
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index fd2c4556e1d648d82d3fb78675187623180c6261..3b0961006385dd9b011d9795ba8b9db7d4afe7f0 100644 (file)
--- 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))
                        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))
                        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
                        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>" */
                                (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))
 
        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))
        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);
 
        o.branch1 = better_branch_name(o.branch1);
        o.branch2 = better_branch_name(o.branch2);