From d45302a6bafef3e0d496fd4e1af5a0021811527a Mon Sep 17 00:00:00 2001 From: Angus Gibson Date: Wed, 2 Dec 2015 15:21:24 +1100 Subject: [PATCH 1/2] Update English translations Just some phrasing changes to make the English translations sound more natural. --- conf/locale/locale_en-US.ini | 88 ++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 763e3e5df9..2fd5344dba 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -18,7 +18,7 @@ user_profile_and_more = User profile and more signed_in_as = Signed in as username = Username -email = E-mail +email = Email password = Password re_type = Re-Type captcha = Captcha @@ -84,14 +84,14 @@ ssh_port_helper = Port number which your SSH server is using, leave it empty to http_port = HTTP Port http_port_helper = Port number which application will listen on. app_url = Application URL -app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in e-mail. +app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in email. optional_title = Optional Settings -email_title = E-mail Service Settings +email_title = Email Service Settings smtp_host = SMTP Host smtp_from = From smtp_from_helper = Mail from address, RFC 5322. It can be just an email address, or the "Name" format. -mailer_user = Sender E-mail +mailer_user = Sender Email mailer_password = Sender Password register_confirm = Enable Register Confirmation mail_notify = Enable Mail Notification @@ -111,7 +111,7 @@ admin_title = Admin Account Settings admin_name = Username admin_password = Password confirm_password = Confirm Password -admin_email = Admin E-mail +admin_email = Admin Email install_gogs = Install Gogs test_git_failed = Fail to test 'git' command: %v sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version. @@ -123,7 +123,7 @@ invalid_admin_setting = Admin account setting is invalid: %v install_success = Welcome! We're glad that you chose Gogs, have fun and take care. [home] -uname_holder = Username or E-mail +uname_holder = Username or email password_holder = Password switch_dashboard_context = Switch Dashboard Context my_repos = My Repositories @@ -147,13 +147,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 %s, please check your inbox within the next %d hours to complete the registration process. +confirmation_mail_sent_prompt = A new confirmation email has been sent to %s, please check your inbox within the next %d hours to complete the registration process. active_your_account = Activate Your Account 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 (%s). 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 is not associated with any account. -send_reset_mail = Click here to (re)send your password reset e-mail +has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (%s). If you haven't received a confirmation email or need to resend a new one, please click on the button below. +resend_mail = Click here to resend your activation email +email_not_associate = This email address is not associated with any account. +send_reset_mail = Click here to (re)send your password reset email reset_password = Reset Your Password invalid_code = Sorry, your confirmation code has expired or not valid. reset_password_helper = Click here to reset your password @@ -161,9 +161,9 @@ password_too_short = Password length cannot be less then 6. [mail] activate_account = Please activate your account -activate_email = Verify your e-mail address +activate_email = Verify your email address reset_password = Reset your password -register_success = Register success, Welcome +register_success = Registration successful, welcome register_notify = Welcome on board [modal] @@ -174,7 +174,7 @@ modify = Modify [form] UserName = Username RepoName = Repository name -Email = E-mail address +Email = Email address Password = Password Retype = Re-type password SSHTitle = SSH key name @@ -182,7 +182,7 @@ HttpsUrl = HTTPS URL PayloadUrl = Payload URL TeamName = Team name AuthName = Authorization name -AdminEmail = Admin E-mail +AdminEmail = Admin email require_error = ` cannot be empty.` alpha_dash_error = ` must be valid alpha or numeric or dash(-_) characters.` @@ -190,18 +190,18 @@ alpha_dash_dot_error = ` must be valid alpha or numeric or dash(-_) or dot chara size_error = ` must be size %s.` min_size_error = ` must contain at least %s characters.` max_size_error = ` must contain at most %s characters.` -email_error = ` is not a valid e-mail address.` +email_error = ` is not a valid email address.` url_error = ` is not a valid URL.` include_error = ` must contain substring '%s'.` unknown_error = Unknown error: captcha_incorrect = Captcha didn't match. password_not_match = Password and confirm password are not same. -username_been_taken = Username has been already taken. -repo_name_been_taken = Repository name has been already taken. -org_name_been_taken = Organization name has been already taken. -team_name_been_taken = Team name has been already taken. -email_been_used = E-mail address has been already used. +username_been_taken = Username has already been taken. +repo_name_been_taken = Repository name has already been taken. +org_name_been_taken = Organization name has already been taken. +team_name_been_taken = Team name has already been taken. +email_been_used = Email address has already been used. illegal_team_name = Team name contains illegal characters. username_password_incorrect = Username or password is not correct. enterred_invalid_repo_name = Please make sure that the repository name you entered is correct. @@ -218,7 +218,7 @@ still_own_repo = Your account still has ownership over at least one repository, 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 is in use by at least one user, please remove them from the authentication and try again. +still_own_user = This authentication is still 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. @@ -246,7 +246,7 @@ delete = Delete Account uid = Uid public_profile = Public Profile -profile_desc = Your E-mail address is public and will be used for any account related notifications, and any web based operations made via the site. +profile_desc = Your email address is public and will be used for any account related notifications, and any web based operations made via the site. full_name = Full Name website = Website location = Location @@ -272,19 +272,19 @@ retype_new_password = Retype New Password password_incorrect = Current password is not correct. 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 -email_desc = Your primary e-mail address will be used for notifications and other operations. +emails = Email Addresses +manage_emails = Manage email addresses +email_desc = Your primary email address will be used for notifications and other operations. primary = Primary primary_email = Set as primary delete_email = Delete -email_deletion = E-mail Deletion -email_deletion_desc = Delete this e-mail address will remove related information from your account. Do you want to continue? -email_deletion_success = E-mail has been deleted successfully! -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 '%s', 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. +email_deletion = Email Deletion +email_deletion_desc = Deleting this email address will remove related information from your account. Do you want to continue? +email_deletion_success = Email has been deleted successfully! +add_new_email = Add new email address +add_email = Add email +add_email_confirmation_sent = A new confirmation email has been sent to '%s', please check your inbox within the next %d hours to complete the confirmation process. +add_email_success = Your new email address was successfully added. manage_ssh_keys = Manage SSH Keys add_key = Add Key @@ -370,7 +370,7 @@ migrate.invalid_local_path = Invalid local path, it does not exist or not a dire migrate.failed = Migration failed: %v forked_from = forked from -fork_from_self = You cannot fork repository you already owned! +fork_from_self = You cannot fork a repository you already own! copy_link = Copy copy_link_success = Copied! copy_link_error = Press ⌘-C or Ctrl-C to copy @@ -482,7 +482,7 @@ issues.label_edit = Edit issues.label_delete = Delete issues.label_modify = Label Modification issues.label_deletion = Label Deletion -issues.label_deletion_desc = Delete this label will remove its information in all related issues. Do you want to continue? +issues.label_deletion_desc = Deleting this label will remove its information in all related issues. Do you want to continue? issues.label_deletion_success = Label has been deleted successfully! pulls.new = New Pull Request @@ -527,12 +527,12 @@ milestones.clear = Clear milestones.invalid_due_date_format = Due date format is invalid, must be 'yyyy-mm-dd'. milestones.create_success = Milestone '%s' has been created successfully! milestones.edit = Edit Milestone -milestones.edit_subheader = Use better description for milestones so people won't be confused. +milestones.edit_subheader = Use a better description for milestones so people won't be confused. milestones.cancel = Cancel milestones.modify = Modify Milestone milestones.edit_success = Changes of milestone '%s' has been saved successfully! milestones.deletion = Milestone Deletion -milestones.deletion_desc = Delete this milestone will remove its information in all related issues. Do you want to continue? +milestones.deletion_desc = Deleting this milestone will remove its information in all related issues. Do you want to continue? milestones.deletion_success = Milestone has been deleted successfully! wiki = Wiki @@ -633,10 +633,10 @@ settings.no_deploy_keys = You haven't added any deploy key. settings.title = Title settings.deploy_key_content = Content settings.key_been_used = Deploy key content has been used. -settings.key_name_used = Deploy key with same name has already existed. +settings.key_name_used = Deploy key with the same name already exists. settings.add_key_success = New deploy key '%s' has been added successfully! settings.deploy_key_deletion = Delete Deploy Key -settings.deploy_key_deletion_desc = Delete this deploy key will remove all related accesses for this repository. Do you want to continue? +settings.deploy_key_deletion_desc = Deleting this deploy key will remove all related accesses for this repository. Do you want to continue? settings.deploy_key_deletion_success = Deploy key has been deleted successfully! diff.browse_source = Browse Source @@ -667,16 +667,16 @@ release.write = Write release.preview = Preview release.loading = Loading... release.prerelease_desc = This is a pre-release -release.prerelease_helper = We’ll point out that this release is not production-ready. +release.prerelease_helper = We'll point out that this release is not production-ready. release.cancel = Cancel release.publish = Publish Release release.save_draft = Save Draft release.edit_release = Edit Release release.delete_release = Delete This Release release.deletion = Release Deletion -release.deletion_desc = Delete this release will delete corresponding Git tag. Do you want to continue? +release.deletion_desc = Deleting this release will delete the corresponding Git tag. Do you want to continue? release.deletion_success = Release has been deleted successfully! -release.tag_name_already_exist = Release with this tag name has already existed. +release.tag_name_already_exist = Release with this tag name already exists. release.downloads = Downloads [org] @@ -882,7 +882,7 @@ auths.attribute_username = Username attribute auths.attribute_username_placeholder = Leave empty to use sign-in form field value for user name. auths.attribute_name = First name attribute auths.attribute_surname = Surname attribute -auths.attribute_mail = E-mail attribute +auths.attribute_mail = Email attribute auths.filter = User Filter auths.admin_filter = Admin Filter auths.ms_ad_sa = Ms Ad SA @@ -930,7 +930,7 @@ config.db_ssl_mode_helper = (for "postgres" only) config.db_path = Path config.db_path_helper = (for "sqlite3" and "tidb") config.service_config = Service Configuration -config.register_email_confirm = Require E-mail Confirmation +config.register_email_confirm = Require email confirmation config.disable_register = Disable Registration config.show_registration_button = Show Register Button config.require_sign_in_view = Require Sign In View From db30ea03d89f3fc862231b0497f277a392099ac9 Mon Sep 17 00:00:00 2001 From: Angus Gibson Date: Wed, 2 Dec 2015 15:43:56 +1100 Subject: [PATCH 2/2] Fix casing in English translation --- conf/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 2fd5344dba..18bd3ca664 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -930,7 +930,7 @@ config.db_ssl_mode_helper = (for "postgres" only) config.db_path = Path config.db_path_helper = (for "sqlite3" and "tidb") config.service_config = Service Configuration -config.register_email_confirm = Require email confirmation +config.register_email_confirm = Require Email Confirmation config.disable_register = Disable Registration config.show_registration_button = Show Register Button config.require_sign_in_view = Require Sign In View