diff --git a/README.md b/README.md
index 40d5e83..fc26ed9 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 =========
 
 GitBucket is a Git platform powered by Scala offering:
-- easy installation
-- high extensibility by plugins
+- Easy installation
+- High extensibility by plugins
 - API compatibility with Github
 
 Features
@@ -17,14 +17,14 @@
 - Account and group management with LDAP integration
 - Plug-in system
 
-If you want to try the development version of GitBucket, see [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
+If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
 
 Installation
 --------
-GitBucket requires **Java8**. You have to install beforehand when it's not installed.
+GitBucket requires **Java8**. You have to install it if it is not already installed.
 
-1. Download latest **gitbucket.war** from [the release page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
-2. Access `http://[hostname]:8080/` and logged in with **root** / **root**.
+1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
+2. Go to `http://[hostname]:8080/` and log in with **root** / **root**.
 
 You can specify following options:
 
@@ -33,29 +33,29 @@
 - `--host=[HOSTNAME]`
 - `--gitbucket.home=[DATA_DIR]`
 
-Of course, you can also deploy gitbucket.war to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
+You can also deploy gitbucket.war to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
 
-About installation on Mac or Windows Server (with IIS), configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
+For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
 
-To upgrade GitBucket, only replace gitbucket.war after stop GitBucket. All GitBucket data is stored in `HOME/.gitbucket` in default. So if you want to back up GitBucket data, copy this directory to the other disk.
+To upgrade GitBucket, replace `gitbucket.war` with the new version, after stopping GitBucket. All GitBucket data is stored in `HOME/.gitbucket` by default. So if you want to back up GitBucket's data, copy this directory to the backup location.
 
-Plug-ins
+Plugins
 --------
-GitBucket has the plug-in system to extend GitBucket from outside of GitBucket. We are providing some official plug-ins:
+GitBucket has a plug-in system to allow extensions to GitBucket. We provide some official plug-ins:
 
 - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
 - [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
 
-You can find more plugins made by community at [gitbucket community plugins](http://gitbucket-plugins.github.io/).
+You can find more plugins made by the community at [GitBucket community plugins](http://gitbucket-plugins.github.io/).
 
 Support
 --------
 
-- If you have any question about GitBucket, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raise an issue.
-- Make sure check whether there is a same question or request in the past.
-- When raise a new issue, write subject in **English** at least.
-- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- First priority of GitBucket is easy installation and API compatibility with GitHub, so we might reject if your request is against it.
+- If you have any questions about GitBucket, send it to the [gitter room](https://gitter.im/gitbucket/gitbucket) before opening an issue.
+- Make sure check whether there is the same question or request in the past.
+- When raise a new issue, write at least the subject in **English**.
+- We can also provide support in Japanese at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
+- The first priority of GitBucket is easy installation and API compatibility with GitHub, so we might reject if your request is against it.
 
 Release Notes
 -------------
diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index fd3b8e7..a065e66 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -10,7 +10,7 @@
         @if(personalTokens.isEmpty && gneratedToken.isEmpty){
           No tokens.
         } else {
-          Tokens you have generated that can be used to access the GitBucket API.
+          Tokens you have generated which can be used to access the GitBucket API.
           <hr style="margin-top: 10px;">
         }
         @gneratedToken.map { case (token, tokenString) =>
@@ -42,7 +42,7 @@
             <label for="note" class="strong">Token description</label>
             <div><span id="error-note" class="error"></span></div>
             <input type="text" name="note" id="note" class="form-control"/>
-            <p class="muted">What's this token for?</p>
+            <p class="muted">What is this token for?</p>
           </fieldset>
           <input type="submit" class="btn btn-success" value="Generate token"/>
         </div>
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
index 2cf2bc4..6f6397b 100644
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -6,7 +6,7 @@
   <div class="content body">
     <h2>Create a new repository</h2>
     <p class="muted">
-      A repository contains all the files for your project, including the revision history.
+      A repository contains all the files for your project including the revision history.
     </p>
     <form id="form" method="post" action="@context.path/new" validate="true">
       <fieldset class="border-top form-group">
diff --git a/src/main/twirl/gitbucket/core/admin/system.scala.html b/src/main/twirl/gitbucket/core/admin/system.scala.html
index 549f32e..cae8a03 100644
--- a/src/main/twirl/gitbucket/core/admin/system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -36,8 +36,8 @@
           </fieldset>
           <p class="muted">
             The base URL is used for redirect, notification email, git repository URL box and more.
-            If the base URL is empty, GitBucket generates URL from request information.
-            You can use this property to adjust URL difference between the reverse proxy and GitBucket.
+            If the base URL is empty, GitBucket generates URL from the request information.
+            You can use this property to adjust to URL differences between the reverse proxy and GitBucket.
           </p>
           <!--====================================================================-->
           <!-- Information -->
@@ -59,19 +59,19 @@
             </label>
             <label class="radio">
               <input type="radio" name="allowAccountRegistration" value="false"@if(!context.settings.allowAccountRegistration){ checked}>
-              <span class="strong">Deny</span> - <span class="normal">Only administrators can create accounts.</span>
+              <span class="strong">Deny</span> <span class="normal">- Only administrators can create accounts.</span>
             </label>
           </fieldset>
           <hr>
-          <label class="strong">Default option to create a new repository</label>
+          <label class="strong">Default permissions when creating a new repository</label>
           <fieldset>
             <label class="radio">
               <input type="radio" name="isCreateRepoOptionPublic" value="true"@if(context.settings.isCreateRepoOptionPublic){ checked}>
-              <span class="strong">Public</span> <span class="normal">- All users and guests can read that repository.</span>
+              <span class="strong">Public</span> <span class="normal">- All users and guests can read the repository.</span>
             </label>
             <label class="radio">
               <input type="radio" name="isCreateRepoOptionPublic" value="false"@if(!context.settings.isCreateRepoOptionPublic){ checked}>
-              <span class="strong">Private</span> <span class="normal">- Only collaborators can read that repository.</span>
+              <span class="strong">Private</span> <span class="normal">- Only collaborators can read the repository.</span>
             </label>
           </fieldset>
           <!--====================================================================-->
@@ -82,7 +82,7 @@
           <fieldset>
             <label class="radio">
               <input type="radio" name="allowAnonymousAccess" value="true"@if(context.settings.allowAnonymousAccess){ checked}>
-              <span class="strong">Allow</span> <span class="normal">- Anyone can view public repositories, user/group profiles.</span>
+              <span class="strong">Allow</span> <span class="normal">- Anyone can view public repositories and user/group profiles.</span>
             </label>
             <label class="radio">
               <input type="radio" name="allowAnonymousAccess" value="false"@if(!context.settings.allowAnonymousAccess){ checked}>
@@ -93,7 +93,7 @@
           <!-- Activity -->
           <!--====================================================================-->
           <hr>
-          <label><span class="strong">Limit of activity logs</span> (Unlimited if it's not specified or zero)</label>
+          <label><span class="strong">Limit of activity logs</span> (Unlimited if it is not specified or zero)</label>
           <fieldset>
             <div class="form-group">
               <label class="control-label col-md-3" for="activityLogLimit">Limit</label>
@@ -111,7 +111,7 @@
           <fieldset>
             <label class="checkbox">
               <input type="checkbox" name="gravatar"@if(context.settings.gravatar){ checked}/>
-              Use Gravatar for Profile-Images
+              Use Gravatar for profile images
             </label>
           </fieldset>
           <!--====================================================================-->
@@ -123,7 +123,7 @@
             <label class="checkbox">
               <input type="checkbox" id="ssh" name="ssh"@if(context.settings.ssh){ checked}/>
               Enable SSH access to git repository
-              <span class="muted normal">(Both of SSH host and Base URL are required if SSH access is enabled)</span>
+              <span class="muted normal">(Both SSH host and Base URL are required if SSH access is enabled)</span>
             </label>
           </fieldset>
           <div class="ssh">
@@ -257,7 +257,7 @@
             <label class="checkbox">
               <input type="checkbox" id="useSMTP" name="useSMTP" @if(context.settings.useSMTP){ checked}/>
               SMTP
-              <span class="muted normal">(Enable notification not only SMTP configuration if you want to send notification email)</span>
+              <span class="muted normal">(Enable notification as well as SMTP configuration if you want to send notification email too)</span>
             </label>
           </fieldset>
           <div class="useSMTP">
@@ -317,7 +317,7 @@
           @*
           <hr>
           <label class="strong">
-            GitLFS <span class="muted normal">(Put LFS server url to enable GitLFS support)</span>
+            GitLFS <span class="muted normal">(Enter the LFS server url to enable GitLFS support)</span>
           </label>
           <div class="form-group">
             <label class="control-label col-md-3" for="smtpHost">LFS server url</label>
diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
index 94dcbbb..85e862c 100644
--- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
@@ -34,7 +34,7 @@
           <div>
             <span class="strong">Pull request successfully merged and closed</span>
           </div>
-          <span class="small muted">You're all set-the <span class="label label-info monospace">@pullreq.requestBranch</span> branch can be safely deleted.</span>
+          <span class="small muted">You're all set. The <span class="label label-info monospace">@pullreq.requestBranch</span> branch can now be safely deleted.</span>
         </div>
       </div>
     }
diff --git a/src/main/twirl/gitbucket/core/repo/guide.scala.html b/src/main/twirl/gitbucket/core/repo/guide.scala.html
index 3c9e62c..921afd6 100644
--- a/src/main/twirl/gitbucket/core/repo/guide.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/guide.scala.html
@@ -14,7 +14,7 @@
          <a href="@sshUrl" class="git-protocol-selector">SSH</a>
       }
       </div>
-      <h3 style="margin-top: 30px;">Create a new repository on the command line</h3>
+      <h3 style="margin-top: 30px;">Create a new repository from the command line</h3>
       @helpers.pre {
         touch README.md
         git init
diff --git a/src/main/twirl/gitbucket/core/search/code.scala.html b/src/main/twirl/gitbucket/core/search/code.scala.html
index 30b7943..ebc48b9 100644
--- a/src/main/twirl/gitbucket/core/search/code.scala.html
+++ b/src/main/twirl/gitbucket/core/search/code.scala.html
@@ -10,7 +10,7 @@
       @if(files.isEmpty) {
         <h4>We couldn't find any code matching '@query'</h4>
       } else {
-        <h4>We've found @files.size code @helpers.plural(files.size, "result")</h4>
+        <h4>We have found @files.size code @helpers.plural(files.size, "result")</h4>
       }
     }
     @files.drop((page - 1) * RepositorySearchService.CodeLimit).take(RepositorySearchService.CodeLimit).map { file =>
diff --git a/src/main/twirl/gitbucket/core/search/repositories.scala.html b/src/main/twirl/gitbucket/core/search/repositories.scala.html
index f2b34b7..eb450ce 100644
--- a/src/main/twirl/gitbucket/core/search/repositories.scala.html
+++ b/src/main/twirl/gitbucket/core/search/repositories.scala.html
@@ -10,7 +10,7 @@
       <input type="submit" value="Search" class="btn btn-default"/>
     </form>
     @if(repositories.isEmpty) {
-      <h4>We couldn't find any repository matching '@query'</h4>
+      <h4>We couldn't find any repositories matching '@query'</h4>
     } else {
       <h4>We've found @repositories.size @helpers.plural(repositories.size, "repository", "repositories")</h4>
     }
diff --git a/src/main/twirl/gitbucket/core/search/wiki.scala.html b/src/main/twirl/gitbucket/core/search/wiki.scala.html
index fa4bba5..234784d 100644
--- a/src/main/twirl/gitbucket/core/search/wiki.scala.html
+++ b/src/main/twirl/gitbucket/core/search/wiki.scala.html
@@ -8,7 +8,7 @@
   @gitbucket.core.search.html.menu("wiki", query, repository){
     @if(query.nonEmpty) {
       @if(wikis.isEmpty) {
-        <h4>We couldn't find any code matching '@query'</h4>
+        <h4>We could not find any code matching '@query'</h4>
       } else {
         <h4>We've found @wikis.size @helpers.plural(wikis.size, "page")</h4>
       }
diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
index 59dda9f..1a988fd 100644
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -44,7 +44,7 @@
                 <input type="checkbox" id="allowFork" name="allowFork"@if(repository.repository.options.allowFork){ checked}/>
                 Forks<br>
                 <div class="normal muted">
-                  Allow repository forking to users who can access this repository.
+                  Allow users who can access this repository to fork it.
                 </div>
               </label>
             </fieldset>
@@ -56,7 +56,7 @@
             <fieldset class="form-group">
               <div class="radio">
                 <label>
-                  <input type="radio" name="issuesOption" value="DISABLE" @if(repository.repository.options.issuesOption == "DISABLE"){ checked}> Disables issues tracking system
+                  <input type="radio" name="issuesOption" value="DISABLE" @if(repository.repository.options.issuesOption == "DISABLE"){ checked}> Disable issues tracking system
                 </label>
               </div>
               <div class="radio">
@@ -75,7 +75,7 @@
                 </label>
               </div>
               <label for="externalIssuesUrl" class="strong">External URL:
-                <span class="normal muted">(Put if you have the external issue tracking system for this project)</span>
+                <span class="normal muted">(Fill if you use an external issue tracking system for this project)</span>
               </label>
               <input type="text" class="form-control" id="externalIssuesUrl" name="externalIssuesUrl" value="@repository.repository.options.externalIssuesUrl"/>
             </fieldset>
@@ -87,7 +87,7 @@
             <fieldset class="form-group">
               <div class="radio">
                 <label>
-                  <input type="radio" name="wikiOption" value="DISABLE" @if(repository.repository.options.wikiOption == "DISABLE"){ checked}> Disables wiki
+                  <input type="radio" name="wikiOption" value="DISABLE" @if(repository.repository.options.wikiOption == "DISABLE"){ checked}> Disable wiki
                 </label>
               </div>
               <div class="radio">
@@ -106,7 +106,7 @@
                 </label>
               </div>
               <label for="externalWikiUrl" class="strong">External URL:
-                <span class="normal muted">(Put if you have the external Wiki for this project)</span>
+                <span class="normal muted">(Fill if you use an external wiki for this project)</span>
               </label>
               <input type="text" class="form-control" id="externalWikiUrl" name="externalWikiUrl" value="@repository.repository.options.externalWikiUrl"/>
             </fieldset>