i18n: index-pack: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index dd1c5c961db087d1a9f649463d41c0ccbd7a5199..83555e56353a8787a8582d69e50ec2147d9c4929 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -81,7 +81,7 @@ static int mark_link(struct object *obj, int type, void *data)
                return -1;
 
        if (type != OBJ_ANY && obj->type != type)
                return -1;
 
        if (type != OBJ_ANY && obj->type != type)

-               die("object type mismatch at %s", sha1_to_hex(obj->sha1));
+               die(_("object type mismatch at %s"), sha1_to_hex(obj->sha1));

 
        obj->flags |= FLAG_LINK;
        return 0;
 
        obj->flags |= FLAG_LINK;
        return 0;


@@ -101,7 +101,7 @@ static void check_object(struct object *obj)
                unsigned long size;
                int type = sha1_object_info(obj->sha1, &size);
                if (type != obj->type || type <= 0)
                unsigned long size;
                int type = sha1_object_info(obj->sha1, &size);
                if (type != obj->type || type <= 0)

-                       die("object of unexpected type");
+                       die(_("object of unexpected type"));

                obj->flags |= FLAG_CHECKED;
                return;
        }
                obj->flags |= FLAG_CHECKED;
                return;
        }


@@ -138,15 +138,18 @@ static void *fill(int min)
        if (min <= input_len)
                return input_buffer + input_offset;
        if (min > sizeof(input_buffer))
        if (min <= input_len)
                return input_buffer + input_offset;
        if (min > sizeof(input_buffer))

-               die("cannot fill %d bytes", min);
+               die(Q_("cannot fill %d byte",
+                      "cannot fill %d bytes",
+                      min),
+                   min);

        flush();
        do {
                ssize_t ret = xread(input_fd, input_buffer + input_len,
                                sizeof(input_buffer) - input_len);
                if (ret <= 0) {
                        if (!ret)
        flush();
        do {
                ssize_t ret = xread(input_fd, input_buffer + input_len,
                                sizeof(input_buffer) - input_len);
                if (ret <= 0) {
                        if (!ret)

-                               die("early EOF");
-                       die_errno("read error on input");
+                               die(_("early EOF"));
+                       die_errno(_("read error on input"));

                }
                input_len += ret;
                if (from_stdin)
                }
                input_len += ret;
                if (from_stdin)


@@ -158,14 +161,14 @@ static void *fill(int min)
 static void use(int bytes)
 {
        if (bytes > input_len)
 static void use(int bytes)
 {
        if (bytes > input_len)

-               die("used more bytes than were available");
+               die(_("used more bytes than were available"));

        input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
        input_len -= bytes;
        input_offset += bytes;
 
        /* make sure off_t is sufficiently large not to wrap */
        if (signed_add_overflows(consumed_bytes, bytes))
        input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
        input_len -= bytes;
        input_offset += bytes;
 
        /* make sure off_t is sufficiently large not to wrap */
        if (signed_add_overflows(consumed_bytes, bytes))

-               die("pack too large for current definition of off_t");
+               die(_("pack too large for current definition of off_t"));

        consumed_bytes += bytes;
 }
 
        consumed_bytes += bytes;
 }
 


@@ -181,12 +184,12 @@ static const char *open_pack_file(const char *pack_name)
                } else
                        output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
                if (output_fd < 0)
                } else
                        output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
                if (output_fd < 0)

-                       die_errno("unable to create '%s'", pack_name);
+                       die_errno(_("unable to create '%s'"), pack_name);

                pack_fd = output_fd;
        } else {
                input_fd = open(pack_name, O_RDONLY);
                if (input_fd < 0)
                pack_fd = output_fd;
        } else {
                input_fd = open(pack_name, O_RDONLY);
                if (input_fd < 0)

-                       die_errno("cannot open packfile '%s'", pack_name);
+                       die_errno(_("cannot open packfile '%s'"), pack_name);

                output_fd = -1;
                pack_fd = input_fd;
        }
                output_fd = -1;
                pack_fd = input_fd;
        }


@@ -200,7 +203,7 @@ static void parse_pack_header(void)
 
        /* Header consistency check */
        if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
 
        /* Header consistency check */
        if (hdr->hdr_signature != htonl(PACK_SIGNATURE))

-               die("pack signature mismatch");
+               die(_("pack signature mismatch"));

        if (!pack_version_ok(hdr->hdr_version))
                die("pack version %"PRIu32" unsupported",
                        ntohl(hdr->hdr_version));
        if (!pack_version_ok(hdr->hdr_version))
                die("pack version %"PRIu32" unsupported",
                        ntohl(hdr->hdr_version));


@@ -220,7 +223,7 @@ static NORETURN void bad_object(unsigned long offset, const char *format, ...)
        va_start(params, format);
        vsnprintf(buf, sizeof(buf), format, params);
        va_end(params);
        va_start(params, format);
        vsnprintf(buf, sizeof(buf), format, params);
        va_end(params);

-       die("pack has bad object at offset %lu: %s", offset, buf);
+       die(_("pack has bad object at offset %lu: %s"), offset, buf);

 }
 
 static struct base_data *alloc_base_data(void)
 }
 
 static struct base_data *alloc_base_data(void)


@@ -294,7 +297,7 @@ static void *unpack_entry_data(unsigned long offset, unsigned long size)
                use(input_len - stream.avail_in);
        } while (status == Z_OK);
        if (stream.total_out != size || status != Z_STREAM_END)
                use(input_len - stream.avail_in);
        } while (status == Z_OK);
        if (stream.total_out != size || status != Z_STREAM_END)

-               bad_object(offset, "inflate returned %d", status);
+               bad_object(offset, _("inflate returned %d"), status);

        git_inflate_end(&stream);
        return buf;
 }
        git_inflate_end(&stream);
        return buf;
 }


@@ -339,7 +342,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_
                while (c & 128) {
                        base_offset += 1;
                        if (!base_offset || MSB(base_offset, 7))
                while (c & 128) {
                        base_offset += 1;
                        if (!base_offset || MSB(base_offset, 7))

-                               bad_object(obj->idx.offset, "offset value overflow for delta base object");
+                               bad_object(obj->idx.offset, _("offset value overflow for delta base object"));

                        p = fill(1);
                        c = *p;
                        use(1);
                        p = fill(1);
                        c = *p;
                        use(1);


@@ -347,7 +350,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_
                }
                delta_base->offset = obj->idx.offset - base_offset;
                if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset)
                }
                delta_base->offset = obj->idx.offset - base_offset;
                if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset)

-                       bad_object(obj->idx.offset, "delta base offset is out of bound");
+                       bad_object(obj->idx.offset, _("delta base offset is out of bound"));

                break;
        case OBJ_COMMIT:
        case OBJ_TREE:
                break;
        case OBJ_COMMIT:
        case OBJ_TREE:


@@ -355,7 +358,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_
        case OBJ_TAG:
                break;
        default:
        case OBJ_TAG:
                break;
        default:

-               bad_object(obj->idx.offset, "unknown object type %d", obj->type);
+               bad_object(obj->idx.offset, _("unknown object type %d"), obj->type);

        }
        obj->hdr_size = consumed_bytes - obj->idx.offset;
 
        }
        obj->hdr_size = consumed_bytes - obj->idx.offset;
 


@@ -384,9 +387,12 @@ static void *get_data_from_pack(struct object_entry *obj)
                ssize_t n = (len < 64*1024) ? len : 64*1024;
                n = pread(pack_fd, inbuf, n, from);
                if (n < 0)
                ssize_t n = (len < 64*1024) ? len : 64*1024;
                n = pread(pack_fd, inbuf, n, from);
                if (n < 0)

-                       die_errno("cannot pread pack file");
+                       die_errno(_("cannot pread pack file"));

                if (!n)
                if (!n)

-                       die("premature end of pack file, %lu bytes missing", len);
+                       die(Q_("premature end of pack file, %lu byte missing",
+                              "premature end of pack file, %lu bytes missing",
+                              len),
+                           len);

                from += n;
                len -= n;
                stream.next_in = inbuf;
                from += n;
                len -= n;
                stream.next_in = inbuf;


@@ -396,7 +402,7 @@ static void *get_data_from_pack(struct object_entry *obj)
 
        /* This has been inflated OK when first encountered, so... */
        if (status != Z_STREAM_END || stream.total_out != obj->size)
 
        /* This has been inflated OK when first encountered, so... */
        if (status != Z_STREAM_END || stream.total_out != obj->size)

-               die("serious inflate inconsistency");
+               die(_("serious inflate inconsistency"));

 
        git_inflate_end(&stream);
        free(inbuf);
 
        git_inflate_end(&stream);
        free(inbuf);


@@ -467,10 +473,10 @@ static void sha1_object(const void *data, unsigned long size,
                unsigned long has_size;
                has_data = read_sha1_file(sha1, &has_type, &has_size);
                if (!has_data)
                unsigned long has_size;
                has_data = read_sha1_file(sha1, &has_type, &has_size);
                if (!has_data)

-                       die("cannot read existing object %s", sha1_to_hex(sha1));
+                       die(_("cannot read existing object %s"), sha1_to_hex(sha1));

                if (size != has_size || type != has_type ||
                    memcmp(data, has_data, size) != 0)
                if (size != has_size || type != has_type ||
                    memcmp(data, has_data, size) != 0)

-                       die("SHA1 COLLISION FOUND WITH %s !", sha1_to_hex(sha1));
+                       die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1));

                free(has_data);
        }
        if (strict) {
                free(has_data);
        }
        if (strict) {


@@ -479,7 +485,7 @@ static void sha1_object(const void *data, unsigned long size,
                        if (blob)
                                blob->object.flags |= FLAG_CHECKED;
                        else
                        if (blob)
                                blob->object.flags |= FLAG_CHECKED;
                        else

-                               die("invalid blob object %s", sha1_to_hex(sha1));
+                               die(_("invalid blob object %s"), sha1_to_hex(sha1));

                } else {
                        struct object *obj;
                        int eaten;
                } else {
                        struct object *obj;
                        int eaten;


@@ -491,11 +497,11 @@ static void sha1_object(const void *data, unsigned long size,
                         */
                        obj = parse_object_buffer(sha1, type, size, buf, &eaten);
                        if (!obj)
                         */
                        obj = parse_object_buffer(sha1, type, size, buf, &eaten);
                        if (!obj)

-                               die("invalid %s", typename(type));
+                               die(_("invalid %s"), typename(type));

                        if (fsck_object(obj, 1, fsck_error_function))
                        if (fsck_object(obj, 1, fsck_error_function))

-                               die("Error in object");
+                               die(_("Error in object"));

                        if (fsck_walk(obj, mark_link, NULL))
                        if (fsck_walk(obj, mark_link, NULL))

-                               die("Not all child objects of %s are reachable", sha1_to_hex(obj->sha1));
+                               die(_("Not all child objects of %s are reachable"), sha1_to_hex(obj->sha1));

 
                        if (obj->type == OBJ_TREE) {
                                struct tree *item = (struct tree *) obj;
 
                        if (obj->type == OBJ_TREE) {
                                struct tree *item = (struct tree *) obj;


@@ -567,7 +573,7 @@ static void *get_base_data(struct base_data *c)
                                &c->size);
                        free(raw);
                        if (!c->data)
                                &c->size);
                        free(raw);
                        if (!c->data)

-                               bad_object(obj->idx.offset, "failed to apply delta");
+                               bad_object(obj->idx.offset, _("failed to apply delta"));

                        base_cache_used += c->size;
                        prune_base_data(c);
                }
                        base_cache_used += c->size;
                        prune_base_data(c);
                }


@@ -593,7 +599,7 @@ static void resolve_delta(struct object_entry *delta_obj,
                                   delta_data, delta_obj->size, &result->size);
        free(delta_data);
        if (!result->data)
                                   delta_data, delta_obj->size, &result->size);
        free(delta_data);
        if (!result->data)

-               bad_object(delta_obj->idx.offset, "failed to apply delta");
+               bad_object(delta_obj->idx.offset, _("failed to apply delta"));

        sha1_object(result->data, result->size, delta_obj->real_type,
                    delta_obj->idx.sha1);
        nr_resolved_deltas++;
        sha1_object(result->data, result->size, delta_obj->real_type,
                    delta_obj->idx.sha1);
        nr_resolved_deltas++;


@@ -697,7 +703,7 @@ static void parse_pack_objects(unsigned char *sha1)
         */
        if (verbose)
                progress = start_progress(
         */
        if (verbose)
                progress = start_progress(

-                               from_stdin ? "Receiving objects" : "Indexing objects",
+                               from_stdin ? _("Receiving objects") : _("Indexing objects"),

                                nr_objects);
        for (i = 0; i < nr_objects; i++) {
                struct object_entry *obj = &objects[i];
                                nr_objects);
        for (i = 0; i < nr_objects; i++) {
                struct object_entry *obj = &objects[i];


@@ -719,15 +725,15 @@ static void parse_pack_objects(unsigned char *sha1)
        flush();
        git_SHA1_Final(sha1, &input_ctx);
        if (hashcmp(fill(20), sha1))
        flush();
        git_SHA1_Final(sha1, &input_ctx);
        if (hashcmp(fill(20), sha1))

-               die("pack is corrupted (SHA1 mismatch)");
+               die(_("pack is corrupted (SHA1 mismatch)"));

        use(20);
 
        /* If input_fd is a file, we should have reached its end now. */
        if (fstat(input_fd, &st))
        use(20);
 
        /* If input_fd is a file, we should have reached its end now. */
        if (fstat(input_fd, &st))

-               die_errno("cannot fstat packfile");
+               die_errno(_("cannot fstat packfile"));

        if (S_ISREG(st.st_mode) &&
                        lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)
        if (S_ISREG(st.st_mode) &&
                        lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)

-               die("pack has junk at the end");
+               die(_("pack has junk at the end"));

 
        if (!nr_deltas)
                return;
 
        if (!nr_deltas)
                return;


@@ -745,7 +751,7 @@ static void parse_pack_objects(unsigned char *sha1)
         *   for some more deltas.
         */
        if (verbose)
         *   for some more deltas.
         */
        if (verbose)

-               progress = start_progress("Resolving deltas", nr_deltas);
+               progress = start_progress(_("Resolving deltas"), nr_deltas);

        for (i = 0; i < nr_objects; i++) {
                struct object_entry *obj = &objects[i];
                struct base_data *base_obj = alloc_base_data();
        for (i = 0; i < nr_objects; i++) {
                struct object_entry *obj = &objects[i];
                struct base_data *base_obj = alloc_base_data();


@@ -778,7 +784,7 @@ static int write_compressed(struct sha1file *f, void *in, unsigned int size)
        } while (status == Z_OK);
 
        if (status != Z_STREAM_END)
        } while (status == Z_OK);
 
        if (status != Z_STREAM_END)

-               die("unable to deflate appended object (%d)", status);
+               die(_("unable to deflate appended object (%d)"), status);

        size = stream.total_out;
        git_deflate_end(&stream);
        return size;
        size = stream.total_out;
        git_deflate_end(&stream);
        return size;


@@ -857,7 +863,7 @@ static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved)
 
                if (check_sha1_signature(d->base.sha1, base_obj->data,
                                base_obj->size, typename(type)))
 
                if (check_sha1_signature(d->base.sha1, base_obj->data,
                                base_obj->size, typename(type)))

-                       die("local object %s is corrupt", sha1_to_hex(d->base.sha1));
+                       die(_("local object %s is corrupt"), sha1_to_hex(d->base.sha1));

                base_obj->obj = append_obj_to_pack(f, d->base.sha1,
                                        base_obj->data, base_obj->size, type);
                find_unresolved_deltas(base_obj);
                base_obj->obj = append_obj_to_pack(f, d->base.sha1,
                                        base_obj->data, base_obj->size, type);
                find_unresolved_deltas(base_obj);


@@ -881,7 +887,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
                fsync_or_die(output_fd, curr_pack_name);
                err = close(output_fd);
                if (err)
                fsync_or_die(output_fd, curr_pack_name);
                err = close(output_fd);
                if (err)

-                       die_errno("error while closing pack file");
+                       die_errno(_("error while closing pack file"));

        }
 
        if (keep_msg) {
        }
 
        if (keep_msg) {


@@ -894,7 +900,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 
                if (keep_fd < 0) {
                        if (errno != EEXIST)
 
                if (keep_fd < 0) {
                        if (errno != EEXIST)

-                               die_errno("cannot write keep file '%s'",
+                               die_errno(_("cannot write keep file '%s'"),

                                          keep_name);
                } else {
                        if (keep_msg_len > 0) {
                                          keep_name);
                } else {
                        if (keep_msg_len > 0) {


@@ -902,7 +908,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
                                write_or_die(keep_fd, "\n", 1);
                        }
                        if (close(keep_fd) != 0)
                                write_or_die(keep_fd, "\n", 1);
                        }
                        if (close(keep_fd) != 0)

-                               die_errno("cannot close written keep file '%s'",
+                               die_errno(_("cannot close written keep file '%s'"),

                                    keep_name);
                        report = "keep";
                }
                                    keep_name);
                        report = "keep";
                }


@@ -915,7 +921,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
                        final_pack_name = name;
                }
                if (move_temp_to_file(curr_pack_name, final_pack_name))
                        final_pack_name = name;
                }
                if (move_temp_to_file(curr_pack_name, final_pack_name))

-                       die("cannot store pack file");
+                       die(_("cannot store pack file"));

        } else if (from_stdin)
                chmod(final_pack_name, 0444);
 
        } else if (from_stdin)
                chmod(final_pack_name, 0444);
 


@@ -926,7 +932,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
                        final_index_name = name;
                }
                if (move_temp_to_file(curr_index_name, final_index_name))
                        final_index_name = name;
                }
                if (move_temp_to_file(curr_index_name, final_index_name))

-                       die("cannot store index file");
+                       die(_("cannot store index file"));

        } else
                chmod(final_index_name, 0444);
 
        } else
                chmod(final_index_name, 0444);
 


@@ -1015,9 +1021,9 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
        struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1);
 
        if (!p)
        struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1);
 
        if (!p)

-               die("Cannot open existing pack file '%s'", pack_name);
+               die(_("Cannot open existing pack file '%s'"), pack_name);

        if (open_pack_index(p))
        if (open_pack_index(p))

-               die("Cannot open existing pack idx file for '%s'", pack_name);
+               die(_("Cannot open existing pack idx file for '%s'"), pack_name);

 
        /* Read the attributes from the existing idx file */
        opts->version = p->index_version;
 
        /* Read the attributes from the existing idx file */
        opts->version = p->index_version;


@@ -1064,15 +1070,18 @@ static void show_pack_info(int stat_only)
        }
 
        if (baseobjects)
        }
 
        if (baseobjects)

-               printf("non delta: %d object%s\n",
-                      baseobjects, baseobjects > 1 ? "s" : "");
+               printf_ln(Q_("non delta: %d object",
+                            "non delta: %d objects",
+                            baseobjects),
+                         baseobjects);

        for (i = 0; i < deepest_delta; i++) {
                if (!chain_histogram[i])
                        continue;
        for (i = 0; i < deepest_delta; i++) {
                if (!chain_histogram[i])
                        continue;

-               printf("chain length = %d: %lu object%s\n",
-                      i + 1,
-                      chain_histogram[i],
-                      chain_histogram[i] > 1 ? "s" : "");
+               printf_ln(Q_("chain length = %d: %lu object",
+                            "chain length = %d: %lu objects",
+                            chain_histogram[i]),
+                         i + 1,
+                         chain_histogram[i]);

        }
 }
 
        }
 }
 


@@ -1095,7 +1104,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
        reset_pack_idx_option(&opts);
        git_config(git_index_pack_config, &opts);
        if (prefix && chdir(prefix))
        reset_pack_idx_option(&opts);
        git_config(git_index_pack_config, &opts);
        if (prefix && chdir(prefix))

-               die("Cannot come back to cwd");
+               die(_("Cannot come back to cwd"));

 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];


@@ -1128,10 +1137,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                                hdr->hdr_signature = htonl(PACK_SIGNATURE);
                                hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
                                if (*c != ',')
                                hdr->hdr_signature = htonl(PACK_SIGNATURE);
                                hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
                                if (*c != ',')

-                                       die("bad %s", arg);
+                                       die(_("bad %s"), arg);

                                hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
                                if (*c)
                                hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
                                if (*c)

-                                       die("bad %s", arg);
+                                       die(_("bad %s"), arg);

                                input_len = sizeof(*hdr);
                        } else if (!strcmp(arg, "-v")) {
                                verbose = 1;
                                input_len = sizeof(*hdr);
                        } else if (!strcmp(arg, "-v")) {
                                verbose = 1;


@@ -1143,11 +1152,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                                char *c;
                                opts.version = strtoul(arg + 16, &c, 10);
                                if (opts.version > 2)
                                char *c;
                                opts.version = strtoul(arg + 16, &c, 10);
                                if (opts.version > 2)

-                                       die("bad %s", arg);
+                                       die(_("bad %s"), arg);

                                if (*c == ',')
                                        opts.off32_limit = strtoul(c+1, &c, 0);
                                if (*c || opts.off32_limit & 0x80000000)
                                if (*c == ',')
                                        opts.off32_limit = strtoul(c+1, &c, 0);
                                if (*c || opts.off32_limit & 0x80000000)

-                                       die("bad %s", arg);
+                                       die(_("bad %s"), arg);

                        } else
                                usage(index_pack_usage);
                        continue;
                        } else
                                usage(index_pack_usage);
                        continue;


@@ -1161,11 +1170,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
        if (!pack_name && !from_stdin)
                usage(index_pack_usage);
        if (fix_thin_pack && !from_stdin)
        if (!pack_name && !from_stdin)
                usage(index_pack_usage);
        if (fix_thin_pack && !from_stdin)

-               die("--fix-thin cannot be used without --stdin");
+               die(_("--fix-thin cannot be used without --stdin"));

        if (!index_name && pack_name) {
                int len = strlen(pack_name);
                if (!has_extension(pack_name, ".pack"))
        if (!index_name && pack_name) {
                int len = strlen(pack_name);
                if (!has_extension(pack_name, ".pack"))

-                       die("packfile name '%s' does not end with '.pack'",
+                       die(_("packfile name '%s' does not end with '.pack'"),

                            pack_name);
                index_name_buf = xmalloc(len);
                memcpy(index_name_buf, pack_name, len - 5);
                            pack_name);
                index_name_buf = xmalloc(len);
                memcpy(index_name_buf, pack_name, len - 5);


@@ -1175,7 +1184,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
        if (keep_msg && !keep_name && pack_name) {
                int len = strlen(pack_name);
                if (!has_extension(pack_name, ".pack"))
        if (keep_msg && !keep_name && pack_name) {
                int len = strlen(pack_name);
                if (!has_extension(pack_name, ".pack"))

-                       die("packfile name '%s' does not end with '.pack'",
+                       die(_("packfile name '%s' does not end with '.pack'"),

                            pack_name);
                keep_name_buf = xmalloc(len);
                memcpy(keep_name_buf, pack_name, len - 5);
                            pack_name);
                keep_name_buf = xmalloc(len);
                memcpy(keep_name_buf, pack_name, len - 5);


@@ -1184,7 +1193,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
        }
        if (verify) {
                if (!index_name)
        }
        if (verify) {
                if (!index_name)

-                       die("--verify with no packfile name given");
+                       die(_("--verify with no packfile name given"));

                read_idx_option(&opts, index_name);
                opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
        }
                read_idx_option(&opts, index_name);
                opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
        }


@@ -1208,7 +1217,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                        int nr_unresolved = nr_deltas - nr_resolved_deltas;
                        int nr_objects_initial = nr_objects;
                        if (nr_unresolved <= 0)
                        int nr_unresolved = nr_deltas - nr_resolved_deltas;
                        int nr_objects_initial = nr_objects;
                        if (nr_unresolved <= 0)

-                               die("confusion beyond insanity");
+                               die(_("confusion beyond insanity"));

                        objects = xrealloc(objects,
                                           (nr_objects + nr_unresolved + 1)
                                           * sizeof(*objects));
                        objects = xrealloc(objects,
                                           (nr_objects + nr_unresolved + 1)
                                           * sizeof(*objects));


@@ -1227,7 +1236,9 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                                    "(disk corruption?)", curr_pack);
                }
                if (nr_deltas != nr_resolved_deltas)
                                    "(disk corruption?)", curr_pack);
                }
                if (nr_deltas != nr_resolved_deltas)

-                       die("pack has %d unresolved deltas",
+                       die(Q_("pack has %d unresolved delta",
+                              "pack has %d unresolved deltas",
+                              nr_deltas - nr_resolved_deltas),

                            nr_deltas - nr_resolved_deltas);
        }
        free(deltas);
                            nr_deltas - nr_resolved_deltas);
        }
        free(deltas);