mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: bundle: mark strings for translation

Browse Source 
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
2012-04-23 19:30:30 +07:00
committed by Junio C Hamano
parent c2b97ecf51
commit 8a1e7eac68
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bundle.c
View File

@ -33,7 +33,7 @@ static int parse_bundle_header(int fd, struct bundle_header *header,
if (strbuf_getwholeline_fd(&buf, fd, '\n') || if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
strcmp(buf.buf, bundle_signature)) { strcmp(buf.buf, bundle_signature)) {
if (report_path) 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); report_path);
status = -1; status = -1;
goto abort; goto abort;
@ -60,7 +60,7 @@ static int parse_bundle_header(int fd, struct bundle_header *header,
(40 <= buf.len && !isspace(buf.buf[40])) || (40 <= buf.len && !isspace(buf.buf[40])) ||
(!is_prereq && buf.len <= 40)) { (!is_prereq && buf.len <= 40)) {
if (report_path) if (report_path)
error("unrecognized header: %s%s (%d)", error(_("unrecognized header: %s%s (%d)"),
(is_prereq ? "-" : ""), buf.buf, (int)buf.len); (is_prereq ? "-" : ""), buf.buf, (int)buf.len);
status = -1; status = -1;
break; break;
@ -86,7 +86,7 @@ int read_bundle_header(const char *path, struct bundle_header *header)
int fd = open(path, O_RDONLY); int fd = open(path, O_RDONLY);
if (fd < 0) 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 object_array refs;
struct commit *commit; struct commit *commit;
int i, ret = 0, req_nr; 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); init_revisions(&revs, NULL);
for (i = 0; i < p->nr; i++) { for (i = 0; i < p->nr; i++) {
@ -161,7 +161,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
revs.leak_pending = 1; revs.leak_pending = 1;
if (prepare_revision_walk(&revs)) if (prepare_revision_walk(&revs))
die("revision walk setup failed"); die(_("revision walk setup failed"));
i = req_nr; i = req_nr;
while (i && (commit = get_revision(&revs))) while (i && (commit = get_revision(&revs)))
@ -183,12 +183,16 @@ int verify_bundle(struct bundle_header *header, int verbose)
struct ref_list *r; struct ref_list *r;
r = &header->references; r = &header->references;
printf("The bundle contains %d ref%s\n", printf_ln(Q_("The bundle contains %d ref",
r->nr, (1 < r->nr) ? "s" : ""); "The bundle contains %d refs",
r->nr),
r->nr);
list_refs(r, 0, NULL); list_refs(r, 0, NULL);
r = &header->prerequisites; r = &header->prerequisites;
printf("The bundle requires these %d ref%s\n", printf_ln(Q_("The bundle requires this ref",
r->nr, (1 < r->nr) ? "s" : ""); "The bundle requires these %d refs",
r->nr),
r->nr);
list_refs(r, 0, NULL); list_refs(r, 0, NULL);
} }
return ret; return ret;
@ -283,13 +287,13 @@ int create_bundle(struct bundle_header *header, const char *path,
strbuf_release(&buf); strbuf_release(&buf);
fclose(rls_fout); fclose(rls_fout);
if (finish_command(&rls)) if (finish_command(&rls))
return error("rev-list died"); return error(_("rev-list died"));
/* write references */ /* write references */
argc = setup_revisions(argc, argv, &revs, NULL); argc = setup_revisions(argc, argv, &revs, NULL);
if (argc > 1) 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. * constraints.
*/ */
if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) { 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); e->name);
free(ref); free(ref);
continue; continue;
@ -369,7 +373,7 @@ int create_bundle(struct bundle_header *header, const char *path,
free(ref); free(ref);
} }
if (!ref_count) if (!ref_count)
die ("Refusing to create empty bundle."); die(_("Refusing to create empty bundle."));
/* end header */ /* end header */
write_or_die(bundle_fd, "\n", 1); 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.out = bundle_fd;
rls.git_cmd = 1; rls.git_cmd = 1;
if (start_command(&rls)) 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); close(rls.in);
if (finish_command(&rls)) if (finish_command(&rls))
return error ("pack-objects died"); return error(_("pack-objects died"));
if (!bundle_to_stdout) { if (!bundle_to_stdout) {
if (commit_lock_file(&lock)) 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.no_stdout = 1;
ip.git_cmd = 1; ip.git_cmd = 1;
if (run_command(&ip)) if (run_command(&ip))
return error("index-pack died"); return error(_("index-pack died"));
return 0; return 0;
} }