mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-08 23:46:08 +02:00
Code

object.c: mark more 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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-07-21 09:49:33 +02:00 committed by Junio C Hamano
parent 31a55e91bc
commit 42246589b8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
object.c
View File

@ -49,7 +49,7 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle)
if (gentle)
return -1;
die("invalid object type \"%s\"", str);
die(_("invalid object type \"%s\""), str);
}
/*
@ -169,7 +169,7 @@ void *object_as_type(struct object *obj, enum object_type type, int quiet)
}
else {
if (!quiet)
error("object %s is a %s, not a %s",
error(_("object %s is a %s, not a %s"),
oid_to_hex(&obj->oid),
type_name(obj->type), type_name(type));
return NULL;
@ -229,7 +229,7 @@ struct object *parse_object_buffer(const struct object_id *oid, enum object_type
obj = &tag->object;
}
} else {
warning("object %s has unknown type id %d", oid_to_hex(oid), type);
warning(_("object %s has unknown type id %d"), oid_to_hex(oid), type);
obj = NULL;
}
return obj;
@ -262,7 +262,7 @@ struct object *parse_object(const struct object_id *oid)
(!obj && has_object_file(oid) &&
oid_object_info(the_repository, oid, NULL) == OBJ_BLOB)) {
if (check_object_signature(repl, NULL, 0, NULL) < 0) {
error("sha1 mismatch %s", oid_to_hex(oid));
error(_("sha1 mismatch %s"), oid_to_hex(oid));
return NULL;
}
parse_blob_buffer(lookup_blob(oid), NULL, 0);
@ -273,7 +273,7 @@ struct object *parse_object(const struct object_id *oid)
if (buffer) {
if (check_object_signature(repl, buffer, size, type_name(type)) < 0) {
free(buffer);
error("sha1 mismatch %s", oid_to_hex(repl));
error(_("sha1 mismatch %s"), oid_to_hex(repl));
return NULL;
}

2
t/t1450-fsck.sh
View File

@ -372,7 +372,7 @@ test_expect_success 'rev-list --verify-objects with bad sha1' '
test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out &&
cat out &&
grep -q "error: sha1 mismatch 63ffffffffffffffffffffffffffffffffffffff" out
test_i18ngrep -q "error: sha1 mismatch 63ffffffffffffffffffffffffffffffffffffff" out
'
test_expect_success 'force fsck to ignore double author' '