UI and translation improvements

options/locale/locale_en-US.ini

@@ -652,9 +652,8 @@ issues.label.filter_sort.reverse_alphabetically = Reverse alphabetically
 issues.num_participants = %d Participants
 issues.attachment.open_tab = `Click to see "%s" in a new tab`
 issues.attachment.download = `Click to download "%s"`
-issues.watch = Watch
-issues.watch_issue = Watch issue
-issues.unwatch_issue = Unwatch issue
+issues.subscribe = Subscribe
+issues.unsubscribe = Unsubscribe
 
 pulls.new = New Pull Request
 pulls.compare_changes = Compare Changes

templates/repo/issue/view_content/sidebar.tmpl

@@ -102,7 +102,7 @@
 		<div class="ui divider"></div>
 
 		<div class="ui watching">
-			<span class="text"><strong>{{.i18n.Tr "repo.issues.watch"}}</strong></span>
+			<span class="text"><strong>{{.i18n.Tr "notification.notifications"}}</strong></span>
 			<div>
 				<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/watch">
 					<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}" />
@@ -110,10 +110,10 @@
 					<button class="fluid ui button">
 						{{if $.IssueWatch.IsWatching}}
 							<i class="octicon octicon-mute"></i>
-							{{.i18n.Tr "repo.issues.unwatch_issue"}}
+							{{.i18n.Tr "repo.issues.unsubscribe"}}
 						{{else}}
-							<i class="octicon octicon-megaphone"></i>
-							{{.i18n.Tr "repo.issues.watch_issue"}}
+							<i class="octicon octicon-unmute"></i>
+							{{.i18n.Tr "repo.issues.subscribe"}}
 						{{end}}
 					</button>
 				</form>