From bac6d05e78603ce9bb028f9ba2b77b9ea2975347 Mon Sep 17 00:00:00 2001
From: bugreport0 <32939607+bugreport0@users.noreply.github.com>
Date: Thu, 19 Apr 2018 14:24:31 +0000
Subject: 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.
---
 templates/repo/branch/list.tmpl        | 2 --
 templates/repo/issue/view_content.tmpl | 2 --
 2 files changed, 4 deletions(-)

(limited to 'templates')

diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index c3bc04df27..e4bbc13998 100644
--- a/templates/repo/branch/list.tmpl
+++ b/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>
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 3fb0108942..5271fcb179 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/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>
-- 
cgit v1.2.3