Improve English grammar and consistency. (#3614)

* Start improving English grammar and consistency.

* Apply review comments, push translation further.

* Additional review changes; expand translation.

* Undo team/organization change, further translation.

* Add site administration; review comments; merge.

* Update hardcoded branch protection string tests.

* Update hardcoded branch deletion string test.

* Update another hardcoded translation string test.

* Add my nickname to the list of translators.

* Implement @lafriks review comments.

* Remove (now) unused branch deletion warnings.

* Remove (now) unused branch deletion warnings.

integrations/editor_test.go

@@ -52,7 +52,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 	// Check if master branch has been locked successfully
 	flashCookie := session.GetCookie("macaron_flash")
 	assert.NotNil(t, flashCookie)
-	assert.EqualValues(t, "success%3DBranch%2Bmaster%2Bprotect%2Boptions%2Bchanged%2Bsuccessfully.", flashCookie.Value)
+	assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 
 	// Request editor page
 	req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
@@ -73,7 +73,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	// Check body for error message
-	assert.Contains(t, resp.Body.String(), "Can not commit to protected branch 'master'.")
+	assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch 'master'.")
 
 	// remove the protected branch
 	csrf = GetCSRF(t, session, "/user2/repo1/settings/branches")
@@ -86,7 +86,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 	// Check if master branch has been locked successfully
 	flashCookie = session.GetCookie("macaron_flash")
 	assert.NotNil(t, flashCookie)
-	assert.EqualValues(t, "success%3DBranch%2Bmaster%2Bprotect%2Boptions%2Bremoved%2Bsuccessfully", flashCookie.Value)
+	assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bdisabled.", flashCookie.Value)
 
 }
 

integrations/pull_merge_test.go

@@ -121,5 +121,5 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
 	htmlDoc := NewHTMLParser(t, resp.Body)
 	resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
 
-	assert.EqualValues(t, "user1/feature/test has been deleted.", resultMsg)
+	assert.EqualValues(t, "Branch 'user1/feature/test' has been deleted.", resultMsg)
 }

options/locale/TRANSLATORS

@@ -14,6 +14,7 @@ Antoine GIRARD <sapk AT sapk DOT fr>
 Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com>
 Aurelien Darragon <aurelien DOT darragon AT gmail DOT com>
 Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com>
+bugreport0
 Camille Baronnet <gogs AT camillebaronnet DOT fr>
 Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com>
 Cysioland

templates/repo/branch/list.tmpl

@@ -73,8 +73,6 @@
 	</div>
 	<div class="content">
 		<p>{{.i18n.Tr "repo.branch.delete_desc"}}</p>
-		{{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br>
-		{{.i18n.Tr "repo.branch.delete_notices_html"}} <span class="branch-name"></span><br>
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>

templates/repo/issue/view_content.tmpl

@@ -138,8 +138,6 @@
 	</div>
 	<div class="content">
 		<p>{{.i18n.Tr "repo.branch.delete_desc"}}</p>
-		{{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br>
-		{{.i18n.Tr "repo.branch.delete_notices_2" .HeadTarget}}<br>
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>