undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch: mark more strings for translation

Browse Source 
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
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 2013-01-28 08:18:16 +07:00 committed by Junio C Hamano
parent 35484d4acd
commit 045e3884bc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/branch.c
View File

@ -466,7 +466,7 @@ static void add_verbose_info(struct strbuf *out, struct ref_item *item,
int verbose, int abbrev) int verbose, int abbrev)
{ {
struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
const char *sub = " **** invalid ref ****"; const char *sub = _(" **** invalid ref ****");
struct commit *commit = item->commit; struct commit *commit = item->commit;
if (commit && !parse_commit(commit)) { if (commit && !parse_commit(commit)) {
@ -590,7 +590,7 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
struct commit *filter; struct commit *filter;
filter = lookup_commit_reference_gently(merge_filter_ref, 0); filter = lookup_commit_reference_gently(merge_filter_ref, 0);
if (!filter) if (!filter)
die("object '%s' does not point to a commit", die(_("object '%s' does not point to a commit"),
sha1_to_hex(merge_filter_ref)); sha1_to_hex(merge_filter_ref));
filter->object.flags |= UNINTERESTING; filter->object.flags |= UNINTERESTING;
@ -854,7 +854,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (!argc) { if (!argc) {
if (detached) if (detached)
die("Cannot give description to detached HEAD"); die(_("Cannot give description to detached HEAD"));
branch_name = head; branch_name = head;
} else if (argc == 1) } else if (argc == 1)
branch_name = argv[0]; branch_name = argv[0];
@ -866,10 +866,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
strbuf_release(&branch_ref); strbuf_release(&branch_ref);
if (!argc) if (!argc)
return error("No commit on branch '%s' yet.", return error(_("No commit on branch '%s' yet."),
branch_name); branch_name);
else else
return error("No such branch '%s'.", branch_name); return error(_("No branch named '%s'."),
branch_name);
} }
strbuf_release(&branch_ref); strbuf_release(&branch_ref);