Corrected grammar and spelling mistakes in templates. Normalizing to American English.

8 files changed, 20 insertions, 20 deletions

diff --git a/templates/user/activate.tmpl b/templates/user/activate.tmpl
index 9cac069dce..1df3646b6d 100644
--- a/templates/user/activate.tmpl
+++ b/templates/user/activate.tmpl
@@ -8,29 +8,29 @@
             {{if .ServiceNotEnabled}}
             <p>Sorry, Register Mail Confirmation has been disabled.</p>
             {{else if .ResendLimited}}
-            <p>Sorry, you are sending activation e-mail too frequently, please wait 3 minutes.</p>
+            <p>Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.</p>
             {{else}}
-            <p>New confirmation e-mail has been sent to <b>{{.SignedUser.Email}}</b>, please check your inbox within {{.Hours}} hours to complete your registeration.</p>
+            <p>A new confirmation e-mail has been sent to <b>{{.SignedUser.Email}}</b>, please check your inbox within the next {{.Hours}} hours to complete your registration.</p>
             <hr/>
             <a href="http://{{Mail2Domain .SignedUser.Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
             {{end}}
         {{else}}
             {{if .IsSendRegisterMail}}
-            <p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within {{.Hours}} hours to complete your registeration.</p>
+            <p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within the next {{.Hours}} hours to complete your registration.</p>
             <hr/>
             <a href="http://{{Mail2Domain .Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
             {{else if .IsActivateFailed}}
-            <p>Sorry, your confirmation code has been exipired or not valid.</p>
+            <p>Sorry, your confirmation code has exipired or not valid.</p>
             {{else}}
-    		<p>Hi, {{.SignedUser.Name}}, you have an unconfirmed email address(<b>{{.SignedUser.Email}}</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.</p>
+    		<p>Hi, {{.SignedUser.Name}}, you have an unconfirmed email address(<b>{{.SignedUser.Email}}</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.</p>
     		<hr/>
             <div class="form-group">
                 <div class="col-md-offset-4 col-md-6">
-                    <button type="submit" class="btn btn-lg btn-primary">Click here to resend your active e-mail</button>
+                    <button type="submit" class="btn btn-lg btn-primary">Click here to resend your activation e-mail</button>
                 </div>
             </div>
             {{end}}
         {{end}}
     </form>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index bc363ddaab..9781b8db1e 100644
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -22,7 +22,7 @@
                 <span class="clearfix"></span>
             </li>
         {{else}}
-            <li>No any activity yet.</li>
+            <li>Oh. Looks like there isn't any activity here yet. Get Busy!</li>
         {{end}}
         </ul>
     </div>
@@ -51,4 +51,4 @@
         </div>
     </div>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/user/forgot_passwd.tmpl b/templates/user/forgot_passwd.tmpl
index 7990ab18cd..57564ffd4f 100644
--- a/templates/user/forgot_passwd.tmpl
+++ b/templates/user/forgot_passwd.tmpl
@@ -19,14 +19,14 @@
         <hr/>
         <div class="form-group">
             <div class="col-md-offset-4 col-md-6">
-                <button type="submit" class="btn btn-lg btn-primary">Click here to send reset confirmation e-mail</button>
+                <button type="submit" class="btn btn-lg btn-primary">Click here to send resend confirmation e-mail</button>
             </div>
         </div>
         {{else if .IsResetDisable}}
         <p>Sorry, mail service is not enabled.</p>
         {{else if .ResendLimited}}
-        <p>Sorry, you are sending e-mail too frequently, please wait 3 minutes.</p>
+        <p>Sorry, you are sending an e-mail too frequently, please wait another 3 minutes and try again.</p>
         {{end}}
     </form>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index e80b2394ca..0319f46c2e 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -53,7 +53,7 @@
                         <span class="clearfix"></span>
                     </li>
                 {{else}}
-                    <li>No any public activity yet.</li>
+                    <li>No public activity yet.</li>
                 {{end}}
                 </ul>
             </div>
diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl
index 29cfd8f0eb..8eb7be487c 100644
--- a/templates/user/publickey.tmpl
+++ b/templates/user/publickey.tmpl
@@ -30,7 +30,7 @@
 
                         <div class="modal-body">
                             <div class="form-group">
-                                <label class="col-md-3 control-label">The name of key<strong class="text-danger">*</strong></label>
+                                <label class="col-md-3 control-label">Key Name<strong class="text-danger">*</strong></label>
                                 <div class="col-md-8">
                                     <input name="keyname" class="form-control" placeholder="Type your preferred name" required="required">
                                 </div>
@@ -55,4 +55,4 @@
         </div>
     </div>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/user/reset_passwd.tmpl b/templates/user/reset_passwd.tmpl
index 966b6cb3b5..e65c43d5d9 100644
--- a/templates/user/reset_passwd.tmpl
+++ b/templates/user/reset_passwd.tmpl
@@ -19,8 +19,8 @@
             </div>
         </div>
         {{else}}
-        <p>Sorry, your confirmation code has been exipired or not valid.</p>
+        <p>Sorry, your confirmation code has exipired or is not valid.</p>
         {{end}}
     </form>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index 762dc33b7f..59357d7c93 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -8,7 +8,7 @@
             <form class="form-horizontal" id="password-form" method="post" action="/user/setting">
                 {{.CsrfTokenHtml}}
                 {{template "base/alert" .}}
-                <p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p>
+                <p>Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.</p>
                 <div class="form-group">
                     <label class="col-md-2 control-label" for="user-setting-username">Username<strong class="text-danger">*</strong></label>
                     <div class="col-md-8">
@@ -54,4 +54,4 @@
         </div>
     </div>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index 0295159943..d6af74c1a8 100644
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -4,7 +4,7 @@
 	<form action="/user/sign_up" method="post" class="form-horizontal card" id="login-card">
 		{{.CsrfTokenHtml}}
 		{{if .DisenableRegisteration}}
-		Sorry, registeration has been disenabled, you can only get account from administrator.
+		Sorry, registration has been disabled. Please contact the site administrator.
 		{{else}}
 		{{if .IsSocialLogin}}
 		<h3>Social login: 2nd step <small>complete information</small></h3>