diff --git a/templates/home.tmpl b/templates/home.tmpl index 5827f61810e0..b08d1c245153 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -3,7 +3,7 @@
{{if not .Repos}}

Hey there, welcome to the land of Gogs!

-

If you just get your Gogs server running, go install guide page will help you setup things for your first-time run.

+

If you just got your Gogs server running, go to the install guide page, which will guide you through your initial setup.

{{else}}

Hey there, welcome to the land of Gogs!

diff --git a/templates/install.tmpl b/templates/install.tmpl index c1fd76659c33..2ed7e569d158 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -4,7 +4,7 @@ {{.CsrfTokenHtml}}

Install Steps For First-time Run

{{template "base/alert" .}} -

Gogs requires MySQL or PostgreSQL, SQLite3 only available for official binary version

+

Gogs requires MySQL, SQLite3. or PostgreSQL. SQLite3 is only available in the official binary version.

@@ -204,4 +204,4 @@
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/mail/auth/active_email.tmpl b/templates/mail/auth/active_email.tmpl index c04ddc8a30f9..72d9948bd48f 100644 --- a/templates/mail/auth/active_email.tmpl +++ b/templates/mail/auth/active_email.tmpl @@ -15,11 +15,11 @@ Hi {{.User.Name}},
-

Please click following link to verify your e-mail address within {{.ActiveCodeLives}} hours.

+

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours.

{{.AppUrl}}user/activate?code={{.Code}}

-

Copy and paste it to your browser if the link is not working.

+

Not working? Try copying and pasting it to your browser.

@@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/templates/mail/auth/register_success.tmpl b/templates/mail/auth/register_success.tmpl index 0a6928084702..ffbe2c973276 100644 --- a/templates/mail/auth/register_success.tmpl +++ b/templates/mail/auth/register_success.tmpl @@ -12,14 +12,14 @@

{{.AppName}}

- Hi {{.User.Name}}, welcome to register {{.AppName}}! + Hi {{.User.Name}}, this is your registration email for {{.AppName}}!
-

Please click following link to verify your e-mail address within {{.ActiveCodeLives}} hours.

+

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours.

{{.AppUrl}}user/activate?code={{.Code}}

-

Copy and paste it to your browser if the link is not working.

+

Not working? Try copying and pasting it to your browser.

@@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index 11861f4e208b..c85fc61798fc 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -15,11 +15,11 @@ Hi {{.User.Name}},
-

Please click following link to reset your password within {{.ActiveCodeLives}} hours.

+

Please click the following link to reset your password within {{.ActiveCodeLives}} hours.

{{.AppUrl}}user/reset_password?code={{.Code}}

-

Copy and paste it to your browser if the link is not working.

+

Not working? Try copying and pasting it to your browser.

@@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index f68676fe23c8..6adb3d716366 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -4,6 +4,6 @@

404

Application Version: {{AppVer}}

-

If you think it is an error, please open an issue on GitHub.

+

If you think this is an error, please open an issue on GitHub.

-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/activate.tmpl b/templates/user/activate.tmpl index 9cac069dce07..1df3646b6d64 100644 --- a/templates/user/activate.tmpl +++ b/templates/user/activate.tmpl @@ -8,29 +8,29 @@ {{if .ServiceNotEnabled}}

Sorry, Register Mail Confirmation has been disabled.

{{else if .ResendLimited}} -

Sorry, you are sending activation e-mail too frequently, please wait 3 minutes.

+

Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.

{{else}} -

New confirmation e-mail has been sent to {{.SignedUser.Email}}, please check your inbox within {{.Hours}} hours to complete your registeration.

+

A new confirmation e-mail has been sent to {{.SignedUser.Email}}, please check your inbox within the next {{.Hours}} hours to complete your registration.

Sign in to your e-mail {{end}} {{else}} {{if .IsSendRegisterMail}} -

A confirmation e-mail has been sent to {{.Email}}, please check your inbox within {{.Hours}} hours to complete your registeration.

+

A confirmation e-mail has been sent to {{.Email}}, please check your inbox within the next {{.Hours}} hours to complete your registration.

Sign in to your e-mail {{else if .IsActivateFailed}} -

Sorry, your confirmation code has been exipired or not valid.

+

Sorry, your confirmation code has exipired or not valid.

{{else}} -

Hi, {{.SignedUser.Name}}, you have an unconfirmed email address({{.SignedUser.Email}}). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.

+

Hi, {{.SignedUser.Name}}, you have an unconfirmed email address({{.SignedUser.Email}}). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.

- +
{{end}} {{end}} -{{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 bc363ddaab2a..9781b8db1e3b 100644 --- a/templates/user/dashboard.tmpl +++ b/templates/user/dashboard.tmpl @@ -22,7 +22,7 @@ {{else}} -
  • No any activity yet.
    • +
  • Oh. Looks like there isn't any activity here yet. Get Busy!
    • {{end}} @@ -51,4 +51,4 @@ -{{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 7990ab18cd24..57564ffd4f92 100644 --- a/templates/user/forgot_passwd.tmpl +++ b/templates/user/forgot_passwd.tmpl @@ -19,14 +19,14 @@
    - +
    {{else if .IsResetDisable}}

    Sorry, mail service is not enabled.

    {{else if .ResendLimited}} -

    Sorry, you are sending e-mail too frequently, please wait 3 minutes.

    +

    Sorry, you are sending an e-mail too frequently, please wait another 3 minutes and try again.

    {{end}} -{{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 e80b2394ca4b..0319f46c2e0a 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -53,7 +53,7 @@ {{else}} -
  • No any public activity yet.
    • +
  • No public activity yet.
    • {{end}} diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl index 29cfd8f0ebb0..8eb7be487ca6 100644 --- a/templates/user/publickey.tmpl +++ b/templates/user/publickey.tmpl @@ -30,7 +30,7 @@
    - +
    @@ -55,4 +55,4 @@
    -{{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 966b6cb3b5f6..e65c43d5d9de 100644 --- a/templates/user/reset_passwd.tmpl +++ b/templates/user/reset_passwd.tmpl @@ -19,8 +19,8 @@ {{else}} -

    Sorry, your confirmation code has been exipired or not valid.

    +

    Sorry, your confirmation code has exipired or is not valid.

    {{end}} -{{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 762dc33b7fbd..59357d7c93d3 100644 --- a/templates/user/setting.tmpl +++ b/templates/user/setting.tmpl @@ -8,7 +8,7 @@
    {{.CsrfTokenHtml}} {{template "base/alert" .}} -

    Your Email will be public and used for Account related notifications and any web based operations made via the web.

    +

    Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.

    @@ -54,4 +54,4 @@
    -{{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 029515994354..d6af74c1a81e 100644 --- a/templates/user/signup.tmpl +++ b/templates/user/signup.tmpl @@ -4,7 +4,7 @@ {{.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}}

    Social login: 2nd step complete information