#1094: fix locale

conf/locale/locale_en-US.ini

@@ -107,13 +107,13 @@ remember_me = Remember Me
 forgot_password= Forgot Password
 forget_password = Forgot password?
 sign_up_now = Need an account? Sign up now.
-confirmation_mail_sent_prompt = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete your registration.
+confirmation_mail_sent_prompt = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete the registration process.
 sign_in_email = Sign in to your e-mail
 active_your_account = Activate Your Account
-resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.
+resent_limit_prompt = Sorry, you already requested an activation email recently. Please wait 3 minutes then try again.
 has_unconfirmed_mail = Hi %s, you have an unconfirmed e-mail address (<b>%s</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.
 resend_mail = Click here to resend your activation e-mail
-email_not_associate = This e-mail address does not associate to any account.
+email_not_associate = This e-mail address is not associated with any account.
 send_reset_mail = Click here to (re)send your password reset e-mail
 reset_password = Reset Your Password
 invalid_code = Sorry, your confirmation code has expired or not valid.
@@ -155,23 +155,23 @@ illegal_repo_name = Repository name contains illegal characters.
 illegal_org_name = Organization name contains illegal characters.
 illegal_team_name = Team name contains illegal characters.
 username_password_incorrect = Username or password is not correct.
-enterred_invalid_repo_name = Please make sure you entered repository name is correct.
+enterred_invalid_repo_name = Please make sure that the repository name you entered is correct.
-enterred_invalid_owner_name = Please make sure you entered owner name is correct.
+enterred_invalid_owner_name = Please make sure that the owner name you entered is correct.
-enterred_invalid_password = Please make sure you entered password is correct.
+enterred_invalid_password = Please make sure the that password you entered is correct.
 user_not_exist = Given user does not exist.
-last_org_owner = The user to remove is the last member in owner team. There must be another owner.
+last_org_owner = Removing the last user from a owner team isn't allowed, as there must always be at least one owner in any given organization.
 
 invalid_ssh_key = Sorry, we're not able to verify your SSH key: %s
-unable_verify_ssh_key = Gogs cannot verify your SSH key, but we assume that is valid, please make sure yourself.
+unable_verify_ssh_key = Gogs cannot verify your SSH key, but we assume that it is valid, please double-check it.
 auth_failed = Authentication failed: %v
 
-still_own_repo = Your account still have ownership of repository, you have to delete or transfer them first.
+still_own_repo = Your account still has ownership over at least one repository, you have to delete or transfer them first.
-still_has_org = Your account still have membership of organization, you have to left or delete them first.
+still_has_org = Your account still has membership in at least one organization, you have to leave or delete your memberships first.
 org_still_own_repo = This organization still have ownership of repository, you have to delete or transfer them first.
 
-still_own_user = This authentication still has used by some users, you should move them and then delete again.
+still_own_user = This authentication still is in use by at least one user, please remove them from the authentication and try again.
 
-target_branch_not_exist = Target branch does not exist
+target_branch_not_exist = Target branch does not exist.
 
 [user]
 change_avatar = Change your avatar at gravatar.com
@@ -201,7 +201,7 @@ location = Location
 update_profile = Update Profile
 update_profile_success = Your profile has been updated successfully.
 change_username = Username Changed
-change_username_desc = Username has been changed, do you want to continue? This will affect all links relate to your account.
+change_username_desc = You changed your username. This will affect the way how links relate to your account. Do you want to continue?
 continue = Continue
 cancel = Cancel
 
@@ -217,7 +217,7 @@ change_password = Change Password
 old_password = Current Password
 new_password = New Password
 password_incorrect = Current password is not correct.
-change_password_success = Password is changed successfully. You can now sign in via new password.
+change_password_success = Your password was successfully changed. You can now sign using this new password.
 
 emails = E-mail Addresses
 manage_emails = Manage e-mail addresses
@@ -227,12 +227,13 @@ primary_email = Set as primary
 delete_email = Delete
 add_new_email = Add new e-mail address
 add_email = Add e-mail
+add_email_confirmation_sent = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete the confirmation process.
 add_email_success = Your new E-mail address was successfully added.
 
 manage_ssh_keys = Manage SSH Keys
 add_key = Add Key
-ssh_desc = This is a list of SSH keys associated with your account. Remove any keys that you do not recognize.
+ssh_desc = This is a list of SSH keys associated with your account. As these keys allow anyone using them to gain access to your repositories, it is highly important that you make sure you recognize them.
-ssh_helper = <strong>Need help?</strong> Check out GitHub's guide to <a href="%s">generating SSH keys</a> or troubleshoot <a href="%s">common SSH Problems</a>.
+ssh_helper = <strong>Don't know how?</strong> Check out GitHub's guide to <a href="%s">create your own SSH keys</a> or solve <a href="%s">common problems</a> you might encounter using SSH.
 add_new_key = Add SSH Key
 key_name = Key Name
 key_content = Content
@@ -250,12 +251,12 @@ unbind_success = Social account has been unbound.
 manage_access_token = Manage Personal Access Tokens
 generate_new_token = Generate New Token
 tokens_desc = Tokens you have generated that can be used to access the Gogs API.
-new_token_desc = As for now, every token will have full access to your account.
+new_token_desc = Each token will have full access to your account.
 token_name = Token Name
 generate_token = Generate Token
-generate_token_succees = New access token has been generated successfully! Make sure to copy your new personal access token now. You won't be able to see it again!
+generate_token_succees = Your access token was successfully generated! Make sure to copy it right now, as you won't be able to see it again later!
 delete_token = Delete
-delete_token_success = Personal access token has been deleted successfully! Don't forget to update your applications as well.
+delete_token_success = This personal access token has been successfully removed successfully! Don't forget to update your applications as well.
 
 delete_account = Delete Your Account
 delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undone!
@@ -266,12 +267,12 @@ delete_account_desc = This account is going to be deleted permanently, do you wa
 [repo]
 owner = Owner
 repo_name = Repository Name
-repo_name_helper = Great repository names are short, memorable and <strong>unique</strong>.
+repo_name_helper = A good repository name is usually composed of short, memorable and unique keywords.
 visibility = Visibility
 visiblity_helper = This repository is <span class="label label-red label-radius">Private</span>
 fork_repo = Fork Repository
 fork_from = Fork From
-fork_visiblity_helper = Forked repository cannot change its visiblity
+fork_visiblity_helper = You cannot alter the visibility of a forked repository.
 repo_desc = Description
 repo_lang = Language
 repo_lang_helper = Select a .gitignore file
@@ -284,7 +285,7 @@ mirror_interval = Mirror Interval (hour)
 
 need_auth = Need Authorization
 migrate_type = Migration Type
-migrate_type_helper = This repository will be a <span class="label label-blue label-radius">Mirror</span>
+migrate_type_helper = This repository will be a <span class="label label-blue label-radius">mirror</span>
 migrate_repo = Migrate Repository
 migrate.clone_address = Clone Address
 migrate.invalid_local_path = Invalid local path, it does not exist or not a directory.
@@ -337,13 +338,13 @@ settings.danger_zone = Danger Zone
 settings.site = Official Site
 settings.update_settings = Update Settings
 settings.change_reponame = Repository Name Changed
-settings.change_reponame_desc = Repository name has been changed, do you want to continue? This will affect all links relate to this repository.
+settings.change_reponame_desc = Repository name was changed. This will affect how links relate to the repository. Do you want to continue?
 settings.transfer = Transfer Ownership
-settings.transfer_desc = Transfer this repo to another user or to an organization where you have admin rights.
+settings.transfer_desc = Transfer this repository to another user or to an organization in which you have admin rights.
-settings.new_owner_has_same_repo = New owner already has a repository with same name.
+settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name.
 settings.delete = Delete This Repository
 settings.delete_desc = Once you delete a repository, there is no going back. Please be certain.
-settings.transfer_notices = <p>- You will lose access if new owner is a individual user.</p><p>- You will remain access if new owner is an organization and you're one of the owners.</p>
+settings.transfer_notices = <p>- You will lose access if new owner is a individual user.</p><p>- You will conserve access if new owner is an organization and if you're one of the owners.</p>
 settings.update_settings_success = Repository options has been updated successfully.
 settings.transfer_owner = New Owner
 settings.make_transfer = Make Transfer
@@ -354,21 +355,21 @@ settings.add_collaborator_success = New collaborator has been added.
 settings.remove_collaborator_success = Collaborator has been removed.
 settings.user_is_org_member = User is organization member who cannot be added as a collaborator.
 settings.add_webhook = Add Webhook
-settings.hooks_desc = Webhooks allow external services to be notified when certain events happen on Gogs. When the specified events happen, we'll send a POST request to each of the URLs you provide. Learn more in our <a target="_blank" href="%s">Webhooks Guide</a>.
+settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gogs, we will handle the notification to the target host you specify. Learn more in this <a target="_blank" href="%s">Webhooks Guide</a>.
-settings.githooks_desc = Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to apply custom operations.
+settings.githooks_desc = Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to perform custom operations.
-settings.githook_edit_desc = If hook is not active, sample content will be presented. Leave content to be blank will disable this hook.
+settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.
 settings.githook_name = Hook Name
 settings.githook_content = Hook Content
 settings.update_githook = Update Hook
 settings.remove_hook_success = Webhook has been removed.
-settings.add_webhook_desc = We’ll send a <code>POST</code> request to the URL below with details of any subscribed events. You can also specify which data format you'd like to receive (JSON, <code>x-www-form-urlencoded</code>, <em>etc</em>). More information can be found in <a target="_blank" href="%s">Webhooks Guide</a>.
+settings.add_webhook_desc = Gogs will send a <code>POST</code> request to the URL you specify, along with regarding the event that occured. You can also specify what kind of data format you'd like to get upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our <a target="_blank" href="%s">Webhooks Guide</a>.
 settings.payload_url = Payload URL
 settings.content_type = Content Type
 settings.secret = Secret
-settings.event_desc = Which events would you like to trigger this webhook?
+settings.event_desc = Upon which events should this webhook be triggered?
 settings.event_push_only = Just the <code>push</code> event.
 settings.active = Active
-settings.active_helper = We will deliver event details when this hook is triggered.
+settings.active_helper = Details regarding the event which triggered the hook will be delivered as well.
 settings.add_hook_success = New webhook has been added.
 settings.update_webhook = Update Webhook
 settings.update_hook_success = Webhook has been updated.
@@ -407,7 +408,7 @@ release.preview = Preview
 release.content_placeholder = Write some content
 release.loading = Loading...
 release.prerelease_desc = This is a pre-release
-release.prerelease_helper = We’ll point out that this release is identified as non-production ready.
+release.prerelease_helper = We’ll point out that this release is not production-ready.
 release.publish = Publish Release
 release.save_draft = Save Draft
 release.edit_release = Edit Release
@@ -439,11 +440,11 @@ settings.website = Website
 settings.location = Location
 settings.update_settings = Update Settings
 settings.change_orgname = Organization Name Changed
-settings.change_orgname_desc = Organization name has been changed, do you want to continue? This will affect all links relate to this organization.
+settings.change_orgname_desc = Organization name has been changed. This will affect how links relate to the organization. Do you want to continue?
-settings.update_setting_success = Organization setting has been updated successfully.
+settings.update_setting_success = Organization settings were successfully updated.
  settings.delete = Delete Organization
 settings.delete_account = Delete This Organization
-settings.delete_prompt = The operation will delete this organization permanently, and <strong>CANNOT</strong> be undone!
+settings.delete_prompt = The organization will be permanently removed, and this <strong>CANNOT</strong> be undone!
 settings.confirm_delete_account = Confirm Deletion
 settings.delete_org_title = Organization Deletion
 settings.delete_org_desc = This organization is going to be deleted permanently, do you want to continue?
@@ -477,7 +478,7 @@ teams.update_settings = Update Settings
 teams.delete_team = Delete This Team
 teams.add_team_member = Add Team Member
 teams.delete_team_title = Team Deletion
-teams.delete_team_desc = This team is going to be deleted, do you want to continue? Members of this team may lose access to some repositories.
+teams.delete_team_desc = As this team will be deleted, members of this team may lose access to some repositories. Do you want to continue?
 teams.delete_team_success = Given team has been deleted successfully.
 teams.read_permission_desc = This team grants <strong>Read</strong> access: members can view and clone the team's repositories.
 teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to the team's repositories.
@@ -567,8 +568,8 @@ users.is_admin = This account has administrator permissions
 users.allow_git_hook = This account has permissions to create Git hooks
 users.update_profile = Update Account Profile
 users.delete_account = Delete This Account
-users.still_own_repo = This account still have ownership of repository, you have to delete or transfer them first.
+users.still_own_repo = This account still has ownership over at least one repository, you have to delete or transfer them first.
-users.still_has_org = This account still have membership of organization, you have to left or delete them first.
+users.still_has_org = This account still has membership in at least one organization, you have to leave or delete the organizations first.
 
 orgs.org_manage_panel = Organization Manage Panel
 orgs.name = Name

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.6.0.0318 Beta"
+const APP_VER = "0.6.0.0319 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

routers/user/setting.go

@@ -218,7 +218,7 @@ func SettingsEmailPost(ctx *middleware.Context, form auth.AddEmailForm) {
 			if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
 				log.Error(4, "Set cache(MailResendLimit) fail: %v", err)
 			}
-			ctx.Flash.Success(ctx.Tr("settings.add_email_success_confirmation_email_sent"))
+			ctx.Flash.Info(ctx.Tr("settings.add_email_confirmation_sent", cleanEmail, setting.Service.ActiveCodeLives/60))
 		} else {
 			ctx.Flash.Success(ctx.Tr("settings.add_email_success"))
 		}

templates/.VERSION

@@ -1 +1 @@
-0.6.0.0318 Beta
+0.6.0.0319 Beta

templates/ng/base/alert.tmpl

@@ -1,3 +1,3 @@
-{{if .Flash.ErrorMsg}}<span class="alert alert-red alert-radius block text-bold"><i class="octicon octicon-alert"></i>{{.Flash.ErrorMsg}}</span>{{end}}
+{{if .Flash.ErrorMsg}}<span class="alert alert-red alert-radius block text-bold"><i class="octicon octicon-alert"></i>{{.Flash.ErrorMsg|Str2html}}</span>{{end}}
-{{if .Flash.SuccessMsg}}<div class="alert alert-green alert-radius block"><i class="octicon octicon-check"></i>{{.Flash.SuccessMsg}}</div>{{end}}
+{{if .Flash.SuccessMsg}}<div class="alert alert-green alert-radius block"><i class="octicon octicon-check"></i>{{.Flash.SuccessMsg|Str2html}}</div>{{end}}
-{{if .Flash.InfoMsg}}<div class="alert alert-blue alert-radius block"><i class="octicon octicon-info"></i>{{.Flash.InfoMsg}}</div>{{end}}
+{{if .Flash.InfoMsg}}<div class="alert alert-blue alert-radius block"><i class="octicon octicon-info"></i>{{.Flash.InfoMsg|Str2html}}</div>{{end}}