Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
archive-tar.c: mark more strings for translation
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Sat, 21 Jul 2018 07:49:20 +0000
(09:49 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 23 Jul 2018 18:19:09 +0000
(11:19 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
archive-tar.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
1a07e59
)
diff --git
a/archive-tar.c
b/archive-tar.c
index b6f58ddf38767d86f866bd9413292e279c6cfa73..68e72d91765c64a98646bc503b17ead64ef61692 100644
(file)
--- a/
archive-tar.c
+++ b/
archive-tar.c
@@
-121,7
+121,7
@@
static int stream_blocked(const struct object_id *oid)
st = open_istream(oid, &type, &sz, NULL);
if (!st)
st = open_istream(oid, &type, &sz, NULL);
if (!st)
- return error(
"cannot stream blob %s"
, oid_to_hex(oid));
+ return error(
_("cannot stream blob %s")
, oid_to_hex(oid));
for (;;) {
readlen = read_istream(st, buf, sizeof(buf));
if (readlen <= 0)
for (;;) {
readlen = read_istream(st, buf, sizeof(buf));
if (readlen <= 0)
@@
-256,7
+256,7
@@
static int write_tar_entry(struct archiver_args *args,
*header.typeflag = TYPEFLAG_REG;
mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
} else {
*header.typeflag = TYPEFLAG_REG;
mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
} else {
- return error(
"unsupported file mode: 0%o (SHA1: %s)"
,
+ return error(
_("unsupported file mode: 0%o (SHA1: %s)")
,
mode, oid_to_hex(oid));
}
if (pathlen > sizeof(header.name)) {
mode, oid_to_hex(oid));
}
if (pathlen > sizeof(header.name)) {
@@
-283,7
+283,7
@@
static int write_tar_entry(struct archiver_args *args,
enum object_type type;
buffer = object_file_to_archive(args, path, oid, old_mode, &type, &size);
if (!buffer)
enum object_type type;
buffer = object_file_to_archive(args, path, oid, old_mode, &type, &size);
if (!buffer)
- return error(
"cannot read %s"
, oid_to_hex(oid));
+ return error(
_("cannot read %s")
, oid_to_hex(oid));
} else {
buffer = NULL;
size = 0;
} else {
buffer = NULL;
size = 0;
@@
-454,17
+454,17
@@
static int write_tar_filter_archive(const struct archiver *ar,
filter.in = -1;
if (start_command(&filter) < 0)
filter.in = -1;
if (start_command(&filter) < 0)
- die_errno(
"unable to start '%s' filter"
, argv[0]);
+ die_errno(
_("unable to start '%s' filter")
, argv[0]);
close(1);
if (dup2(filter.in, 1) < 0)
close(1);
if (dup2(filter.in, 1) < 0)
- die_errno(
"unable to redirect descriptor"
);
+ die_errno(
_("unable to redirect descriptor")
);
close(filter.in);
r = write_tar_archive(ar, args);
close(1);
if (finish_command(&filter) != 0)
close(filter.in);
r = write_tar_archive(ar, args);
close(1);
if (finish_command(&filter) != 0)
- die(
"'%s' filter reported error"
, argv[0]);
+ die(
_("'%s' filter reported error")
, argv[0]);
strbuf_release(&cmd);
return r;
strbuf_release(&cmd);
return r;