Merge pull request #85 from twitchyliquid64/master

Corrected grammar and spelling mistakes

templates/home.tmpl

@@ -3,7 +3,7 @@
 <div id="body" class="container">
 	{{if not .Repos}}
 	<h4>Hey there, welcome to the land of Gogs!</h4>
-	<p>If you just get your Gogs server running, go <a href="/install">install</a> guide page will help you setup things for your first-time run.</p>
+	<p>If you just got your Gogs server running, go to the <a href="/install">install</a> guide page, which will guide you through your initial setup.</p>
 	<img src="http://gowalker.org/public/gogs_demo.gif">
 	{{else}}
 	<h4>Hey there, welcome to the land of Gogs!</h4>

templates/install.tmpl

@@ -4,7 +4,7 @@
         {{.CsrfTokenHtml}}
         <h3>Install Steps For First-time Run</h3>
         {{template "base/alert" .}}
-        <p class="help-block text-center">Gogs requires MySQL or PostgreSQL, SQLite3 only available for official binary version</p>
+        <p class="help-block text-center">Gogs requires MySQL, SQLite3. or PostgreSQL. SQLite3 is only available in the official binary version.</p>
         <div class="form-group">
             <label class="col-md-3 control-label">Database Type: </label>
             <div class="col-md-8">
@@ -204,4 +204,4 @@
 
     </form>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}

templates/mail/auth/active_email.tmpl

@@ -15,11 +15,11 @@
                         Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,
                     </div>
                     <div style="font-size:14px; padding:0 15px;">
-						<p style="margin:0;padding:0 0 9px 0;">Please click following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p>
+						<p style="margin:0;padding:0 0 9px 0;">Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p>
 						<p style="margin:0;padding:0 0 9px 0;">
 							<a href="{{.AppUrl}}user/activate?code={{.Code}}">{{.AppUrl}}user/activate?code={{.Code}}</a>
 						</p>
-						<p style="margin:0;padding:0 0 9px 0;">Copy and paste it to your browser if the link is not working.</p>
+						<p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p>
                     </div>
                 </div>
             </div>
@@ -30,4 +30,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>

templates/mail/auth/register_success.tmpl

@@ -12,14 +12,14 @@
                 <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/{{.AppLogo}}" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
                 <div style="padding:40px 15px;">
                     <div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
-                        Hi <span style="color: #00BFFF;">{{.User.Name}}</span>, welcome to register {{.AppName}}!
+                        Hi <span style="color: #00BFFF;">{{.User.Name}}</span>, this is your registration email for {{.AppName}}!
                     </div>
                     <div style="font-size:14px; padding:0 15px;">
-						<p style="margin:0;padding:0 0 9px 0;">Please click following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p>
+						<p style="margin:0;padding:0 0 9px 0;">Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p>
 						<p style="margin:0;padding:0 0 9px 0;">
 							<a href="{{.AppUrl}}user/activate?code={{.Code}}">{{.AppUrl}}user/activate?code={{.Code}}</a>
 						</p>
-						<p style="margin:0;padding:0 0 9px 0;">Copy and paste it to your browser if the link is not working.</p>
+						<p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p>
                     </div>
                 </div>
             </div>
@@ -30,4 +30,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>

templates/mail/auth/reset_passwd.tmpl

@@ -15,11 +15,11 @@
                         Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,
                     </div>
                     <div style="font-size:14px; padding:0 15px;">
-						<p style="margin:0;padding:0 0 9px 0;">Please click following link to reset your password within <b>{{.ActiveCodeLives}} hours</b>.</p>
+						<p style="margin:0;padding:0 0 9px 0;">Please click the following link to reset your password within <b>{{.ActiveCodeLives}} hours</b>.</p>
 						<p style="margin:0;padding:0 0 9px 0;">
 							<a href="{{.AppUrl}}user/reset_password?code={{.Code}}">{{.AppUrl}}user/reset_password?code={{.Code}}</a>
 						</p>
-						<p style="margin:0;padding:0 0 9px 0;">Copy and paste it to your browser if the link is not working.</p>
+						<p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p>
                     </div>
                 </div>
             </div>
@@ -30,4 +30,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>

templates/status/404.tmpl

@@ -4,6 +4,6 @@
     <p style="margin-top: 80px"><img src="/img/404.png" alt="404"/></p>
     <hr/>
     <p>Application Version: {{AppVer}}</p>
-    <p>If you think it is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p>
+    <p>If you think this is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}

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" .}}
+{{template "base/footer" .}}

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" .}}
+{{template "base/footer" .}}

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" .}}
+{{template "base/footer" .}}

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>

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" .}}
+{{template "base/footer" .}}

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" .}}
+{{template "base/footer" .}}

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" .}}
+{{template "base/footer" .}}

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>