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

i18n: show-branch: mark error messages for translation

Browse Source 
Spell the first word of messages in lowercase, following the usual
style.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-09-15 14:59:06 +00:00 committed by Junio C Hamano
parent 8ba35a2dc6
commit 8a78d462c9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/show-branch.c
View File

@ -538,7 +538,7 @@ static void append_one_rev(const char *av)
for_each_ref(append_matching_ref, NULL); for_each_ref(append_matching_ref, NULL);
if (saved_matches == ref_name_cnt && if (saved_matches == ref_name_cnt &&
ref_name_cnt < MAX_REVS) ref_name_cnt < MAX_REVS)
error("no matching refs with %s", av); error(_("no matching refs with %s"), av);
if (saved_matches + 1 < ref_name_cnt) if (saved_matches + 1 < ref_name_cnt)
sort_ref_range(saved_matches, ref_name_cnt); sort_ref_range(saved_matches, ref_name_cnt);
return; return;
@ -701,8 +701,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
* *
* Also --all and --remotes do not make sense either. * Also --all and --remotes do not make sense either.
*/ */
die("--reflog is incompatible with --all, --remotes, " die(_("--reflog is incompatible with --all, --remotes, "
"--independent or --merge-base"); "--independent or --merge-base"));
} }
/* If nothing is specified, show all branches by default */ /* If nothing is specified, show all branches by default */
@ -725,16 +725,16 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
av = fake_av; av = fake_av;
ac = 1; ac = 1;
if (!*av) if (!*av)
die("no branches given, and HEAD is not valid"); die(_("no branches given, and HEAD is not valid"));
} }
if (ac != 1) if (ac != 1)
die("--reflog option needs one branch name"); die(_("--reflog option needs one branch name"));
if (MAX_REVS < reflog) if (MAX_REVS < reflog)
die("Only %d entries can be shown at one time.", die("Only %d entries can be shown at one time.",
MAX_REVS); MAX_REVS);
if (!dwim_ref(*av, strlen(*av), oid.hash, &ref)) if (!dwim_ref(*av, strlen(*av), oid.hash, &ref))
die("No such ref %s", *av); die(_("no such ref %s"), *av);
/* Has the base been specified? */ /* Has the base been specified? */
if (reflog_base) { if (reflog_base) {
@ -828,10 +828,10 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
if (MAX_REVS <= num_rev) if (MAX_REVS <= num_rev)
die("cannot handle more than %d revs.", MAX_REVS); die("cannot handle more than %d revs.", MAX_REVS);
if (get_sha1(ref_name[num_rev], revkey.hash)) if (get_sha1(ref_name[num_rev], revkey.hash))
die("'%s' is not a valid ref.", ref_name[num_rev]); die(_("'%s' is not a valid ref."), ref_name[num_rev]);
commit = lookup_commit_reference(revkey.hash); commit = lookup_commit_reference(revkey.hash);
if (!commit) if (!commit)
die("cannot find commit %s (%s)", die(_("cannot find commit %s (%s)"),
ref_name[num_rev], oid_to_hex(&revkey)); ref_name[num_rev], oid_to_hex(&revkey));
parse_commit(commit); parse_commit(commit);
mark_seen(commit, &seen); mark_seen(commit, &seen);