Minor copy changes (#3074)

* Minor copy changes
Fixes #3058

* Use TrN for translations that depend on count
Fix minor type with branches count

Author: techknowlogick

modules/context/repo.go

@@ -407,7 +407,7 @@ func RepoAssignment() macaron.Handler {
 			return
 		}
 		ctx.Data["Branches"] = brs
-		ctx.Data["BrancheCount"] = len(brs)
+		ctx.Data["BranchesCount"] = len(brs)
 
 		// If not branch selected, try default one.
 		// If default branch doesn't exists, fall back to some other branch.

options/locale/locale_en-US.ini

@@ -539,6 +539,7 @@ pulls = Pull Requests
 labels = Labels
 milestones = Milestones
 commits = Commits
+commit = Commit
 releases = Releases
 file_raw = Raw
 file_history = History

templates/repo/sub_menu.tmpl

@@ -2,12 +2,12 @@
 	<div class="ui two horizontal center link list">
 		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}}
 			<div class="item{{if .PageIsCommits}} active{{end}}">
-				<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr "repo.commits"}}</a>
+				<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a>
 			</div>
 		{{end}}
 		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo) }}
 			<div class="item{{if .PageIsBranches}} active{{end}}">
-				<a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BrancheCount}}</b> {{.i18n.Tr "repo.branches"}}</a>
+				<a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BranchesCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }}</a>
 			</div>
 		{{end}}
 	</div>