Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: bundle: mark strings for translation
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Mon, 23 Apr 2012 12:30:30 +0000
(19:30 +0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 24 Apr 2012 21:55:48 +0000
(14:55 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
bundle.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c2b97ec
)
diff --git
a/bundle.c
b/bundle.c
index d9cfd90534b6b6b0659576d5a71d1fa216bfa6b5..6d21c77421767161d26a86f744d71b5752e1be76 100644
(file)
--- a/
bundle.c
+++ b/
bundle.c
@@
-33,7
+33,7
@@
static int parse_bundle_header(int fd, struct bundle_header *header,
if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
strcmp(buf.buf, bundle_signature)) {
if (report_path)
if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
strcmp(buf.buf, bundle_signature)) {
if (report_path)
- error(
"'%s' does not look like a v2 bundle file"
,
+ error(
_("'%s' does not look like a v2 bundle file")
,
report_path);
status = -1;
goto abort;
report_path);
status = -1;
goto abort;
@@
-60,7
+60,7
@@
static int parse_bundle_header(int fd, struct bundle_header *header,
(40 <= buf.len && !isspace(buf.buf[40])) ||
(!is_prereq && buf.len <= 40)) {
if (report_path)
(40 <= buf.len && !isspace(buf.buf[40])) ||
(!is_prereq && buf.len <= 40)) {
if (report_path)
- error(
"unrecognized header: %s%s (%d)"
,
+ error(
_("unrecognized header: %s%s (%d)")
,
(is_prereq ? "-" : ""), buf.buf, (int)buf.len);
status = -1;
break;
(is_prereq ? "-" : ""), buf.buf, (int)buf.len);
status = -1;
break;
@@
-86,7
+86,7
@@
int read_bundle_header(const char *path, struct bundle_header *header)
int fd = open(path, O_RDONLY);
if (fd < 0)
int fd = open(path, O_RDONLY);
if (fd < 0)
- return error(
"could not open '%s'"
, path);
+ return error(
_("could not open '%s'")
, path);
return parse_bundle_header(fd, header, path);
}
return parse_bundle_header(fd, header, path);
}
@@
-137,7
+137,7
@@
int verify_bundle(struct bundle_header *header, int verbose)
struct object_array refs;
struct commit *commit;
int i, ret = 0, req_nr;
struct object_array refs;
struct commit *commit;
int i, ret = 0, req_nr;
- const char *message =
"Repository lacks these prerequisite commits:"
;
+ const char *message =
_("Repository lacks these prerequisite commits:")
;
init_revisions(&revs, NULL);
for (i = 0; i < p->nr; i++) {
init_revisions(&revs, NULL);
for (i = 0; i < p->nr; i++) {
@@
-161,7
+161,7
@@
int verify_bundle(struct bundle_header *header, int verbose)
revs.leak_pending = 1;
if (prepare_revision_walk(&revs))
revs.leak_pending = 1;
if (prepare_revision_walk(&revs))
- die(
"revision walk setup failed"
);
+ die(
_("revision walk setup failed")
);
i = req_nr;
while (i && (commit = get_revision(&revs)))
i = req_nr;
while (i && (commit = get_revision(&revs)))
@@
-183,12
+183,16
@@
int verify_bundle(struct bundle_header *header, int verbose)
struct ref_list *r;
r = &header->references;
struct ref_list *r;
r = &header->references;
- printf("The bundle contains %d ref%s\n",
- r->nr, (1 < r->nr) ? "s" : "");
+ printf_ln(Q_("The bundle contains %d ref",
+ "The bundle contains %d refs",
+ r->nr),
+ r->nr);
list_refs(r, 0, NULL);
r = &header->prerequisites;
list_refs(r, 0, NULL);
r = &header->prerequisites;
- printf("The bundle requires these %d ref%s\n",
- r->nr, (1 < r->nr) ? "s" : "");
+ printf_ln(Q_("The bundle requires this ref",
+ "The bundle requires these %d refs",
+ r->nr),
+ r->nr);
list_refs(r, 0, NULL);
}
return ret;
list_refs(r, 0, NULL);
}
return ret;
@@
-283,13
+287,13
@@
int create_bundle(struct bundle_header *header, const char *path,
strbuf_release(&buf);
fclose(rls_fout);
if (finish_command(&rls))
strbuf_release(&buf);
fclose(rls_fout);
if (finish_command(&rls))
- return error(
"rev-list died"
);
+ return error(
_("rev-list died")
);
/* write references */
argc = setup_revisions(argc, argv, &revs, NULL);
if (argc > 1)
/* write references */
argc = setup_revisions(argc, argv, &revs, NULL);
if (argc > 1)
- return error(
"unrecognized argument: %s'"
, argv[1]);
+ return error(
_("unrecognized argument: %s'")
, argv[1]);
object_array_remove_duplicates(&revs.pending);
object_array_remove_duplicates(&revs.pending);
@@
-324,7
+328,7
@@
int create_bundle(struct bundle_header *header, const char *path,
* constraints.
*/
if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
* constraints.
*/
if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
- warning(
"ref '%s' is excluded by the rev-list options"
,
+ warning(
_("ref '%s' is excluded by the rev-list options")
,
e->name);
free(ref);
continue;
e->name);
free(ref);
continue;
@@
-369,7
+373,7
@@
int create_bundle(struct bundle_header *header, const char *path,
free(ref);
}
if (!ref_count)
free(ref);
}
if (!ref_count)
- die
("Refusing to create empty bundle."
);
+ die
(_("Refusing to create empty bundle.")
);
/* end header */
write_or_die(bundle_fd, "\n", 1);
/* end header */
write_or_die(bundle_fd, "\n", 1);
@@
-387,7
+391,7
@@
int create_bundle(struct bundle_header *header, const char *path,
rls.out = bundle_fd;
rls.git_cmd = 1;
if (start_command(&rls))
rls.out = bundle_fd;
rls.git_cmd = 1;
if (start_command(&rls))
- return error(
"Could not spawn pack-objects"
);
+ return error(
_("Could not spawn pack-objects")
);
/*
* start_command closed bundle_fd if it was > 1
/*
* start_command closed bundle_fd if it was > 1
@@
-405,10
+409,10
@@
int create_bundle(struct bundle_header *header, const char *path,
}
close(rls.in);
if (finish_command(&rls))
}
close(rls.in);
if (finish_command(&rls))
- return error
("pack-objects died"
);
+ return error
(_("pack-objects died")
);
if (!bundle_to_stdout) {
if (commit_lock_file(&lock))
if (!bundle_to_stdout) {
if (commit_lock_file(&lock))
- die_errno(
"cannot create '%s'"
, path);
+ die_errno(
_("cannot create '%s'")
, path);
}
return 0;
}
}
return 0;
}
@@
-430,6
+434,6
@@
int unbundle(struct bundle_header *header, int bundle_fd, int flags)
ip.no_stdout = 1;
ip.git_cmd = 1;
if (run_command(&ip))
ip.no_stdout = 1;
ip.git_cmd = 1;
if (run_command(&ip))
- return error(
"index-pack died"
);
+ return error(
_("index-pack died")
);
return 0;
}
return 0;
}