From c4b5b121a56310c53b2ece53d09837cbe67b7eff Mon Sep 17 00:00:00 2001 From: Patrick G Date: Thu, 18 May 2017 01:03:43 +0000 Subject: [PATCH] Fix bad grammar and wordiness (#1741) * Fix bad grammar and wordiness * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini --- options/locale/locale_en-US.ini | 320 ++++++++++++++++---------------- 1 file changed, 160 insertions(+), 160 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8565b42a7..f2586db63 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -9,7 +9,7 @@ sign_in_with = Sign in with sign_out = Sign Out sign_up = Sign Up link_account = Link Account -link_account_signin_or_signup = Login with existing credentials to link your existing account to this new account, or sign up for a new account +link_account_signin_or_signup = Login with existing credentials to link your existing account to this account, or sign up for a new one register = Register website = Website version = Version @@ -54,9 +54,9 @@ cancel = Cancel [install] install = Installation -title = Install Steps For First-time Run -docker_helper = If you're running Gitea inside Docker, please read the Guidelines carefully before you change anything on this page! -requite_db_desc = Gitea requires MySQL, PostgreSQL, SQLite3 or TiDB. +title = Initial configuration +docker_helper = If you are running Gitea inside Docker, please read the guidelines carefully before changing anything on this page. +requite_db_desc = Gitea requires MySQL, PostgreSQL, SQLite3, or TiDB. db_title = Database Settings db_type = Database Type host = Host @@ -66,17 +66,17 @@ db_name = Database Name db_helper = Please use the INNODB engine with utf8_general_ci charset for MySQL. ssl_mode = SSL Mode path = Path -sqlite_helper = The file path of SQLite3 or TiDB database.
Please use the absolute path when you start as service. +sqlite_helper = The file path to the SQLite3 or TiDB database.
Please use the absolute path when you start as service. err_empty_db_path = SQLite3 or TiDB database path cannot be empty. err_invalid_tidb_name = TiDB database name does not allow characters "." and "-". no_admin_and_disable_registration = You cannot disable registration without creating an admin account. err_empty_admin_password = Admin password cannot be empty. -general_title = Application General Settings +general_title = General Application Settings app_name = Application Name -app_name_helper = Put your organization name here huge and loud! +app_name_helper = You can put your organization name here. repo_path = Repository Root Path -repo_path_helper = All Git remote repositories will be saved to this directory. +repo_path_helper = All remote Git repositories will be saved to this directory. lfs_path = LFS Root Path lfs_path_helper = Files stored with Git LFS will be stored in this directory. Leave empty to disable LFS. run_user = Run User @@ -84,11 +84,11 @@ run_user_helper = The user must have access to Repository Root Path and run Gite domain = Domain domain_helper = This affects SSH clone URLs. ssh_port = SSH Port -ssh_port_helper = Port number which your SSH server is using, leave it empty to disable SSH feature. +ssh_port_helper = Port number which your SSH server is using, leave it empty to disable. 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 email. +app_url_helper = This affects HTTP/HTTPS clone URL and some email notifications. log_root_path = Log Path log_root_path_helper = Directory to write log files to. @@ -96,14 +96,14 @@ optional_title = Optional 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. +smtp_from_helper = Mail from address, RFC 5322. It can be only an email address, or the "Name" format. mailer_user = Sender User mailer_password = Sender Password register_confirm = Enable Register Confirmation -mail_notify = Enable Mail Notification +mail_notify = Enable Mail Notifications server_service_title = Server and Other Services Settings offline_mode = Enable Offline Mode -offline_mode_popup = Disable CDN even in production mode, all resource files will be served locally. +offline_mode_popup = Disable CDN so all resource files will be served locally. disable_gravatar = Disable Gravatar Service disable_gravatar_popup = Disable Gravatar and custom sources. All avatars must be uploaded by users or the default avatar will be used. federated_avatar_lookup = Enable Federated Avatars Lookup @@ -114,7 +114,7 @@ enable_captcha = Enable Captcha enable_captcha_popup = Require a CAPTCHA for user self-registration. require_sign_in_view = Enable Require Sign In to View Pages require_sign_in_view_popup = Only signed in users can view pages, visitors will only be able to see sign in/up pages. -admin_setting_desc = You do not have to create an admin account right now. The first user who registers on the site will gain admin access automatically. +admin_setting_desc = You do not need to create an admin account right now. The first user who registers on the site will gain admin access automatically. admin_title = Admin Account Settings admin_name = Username admin_password = Password @@ -122,17 +122,17 @@ confirm_password = Confirm Password admin_email = Admin Email install_btn_confirm = Install Gitea test_git_failed = Could not 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. +sqlite3_not_available = Your current version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version. invalid_db_setting = Database setting is not correct: %v invalid_repo_path = Repository root path is invalid: %v -run_user_not_match = Run user isn't the current user: %s -> %s -save_config_failed = Fail to save configuration: %v +run_user_not_match = Run user is not the current user: %s -> %s +save_config_failed = Failed to save configuration: %v invalid_admin_setting = Admin account setting is invalid: %v -install_success = Welcome! We're glad that you chose Gitea, have fun and take care. +install_success = Welcome! Thank you for choosing Gitea, have fun and take care. invalid_log_root_path = Log root path is invalid: %v default_keep_email_private = Default Value for Keep Email Private default_keep_email_private_popup = This is the default value for the visibility of the user's email address. If set to true the email address of all new users will be hidden until the user changes his setting. -default_allow_create_organization = Default permission value for new users to create Organizations +default_allow_create_organization = Default permission value for new users to create organizations default_allow_create_organization_popup = This is default permission value that will be assigned for new users. If set to true new users will be allowed to create Organizations. no_reply_address = No-reply Address no_reply_address_helper = Domain for the user's email address in git logs if he keeps his email address private. E.g. user 'joe' and 'noreply.example.org' will be 'joe@noreply.example.org' @@ -142,7 +142,7 @@ uname_holder = Username or email password_holder = Password switch_dashboard_context = Switch Dashboard Context my_repos = My Repositories -show_more_repos = Show more repositories... +show_more_repos = Show more repositories ... collaborative_repos = Collaborative Repositories my_orgs = My Organizations my_mirrors = My Mirrors @@ -156,14 +156,14 @@ repos = Repositories users = Users organizations = Organizations search = Search -repo_no_results = There are no matched repositories found. -user_no_results = There are no matched users found. -org_no_results = There are no matched organizations found. +repo_no_results = No matching repositories have been found. +user_no_results = No matching users have been found. +org_no_results = No matching organizations have been found. [auth] -create_new_account = Create New Account +create_new_account = Create Account register_helper_msg = Already have an account? Sign in now! -social_register_helper_msg = Already have an account? Bind now! +social_register_helper_msg = Already have an account? Join it now! disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator. disable_register_mail = Sorry, Register Mail Confirmation has been disabled. remember_me = Remember Me @@ -178,10 +178,10 @@ prohibit_login_desc = Your account is prohibited to login, please contact the si resent_limit_prompt = Sorry, you have already requested an activation email recently. Please wait 3 minutes then try again. 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 +email_not_associate = The email address is not associated with any account. +send_reset_mail = Click here to resend your password reset email reset_password = Reset Your Password -invalid_code = Sorry, your confirmation code has expired or not valid. +invalid_code = Sorry, your confirmation code has expired or is not valid. reset_password_helper = Click here to reset your password password_too_short = Password length cannot be less then %d. non_local_account = Non-local accounts cannot change passwords through the Gitea web interface. @@ -195,9 +195,9 @@ login_userpass = User / Password login_openid = OpenID openid_connect_submit = Connect openid_connect_title = Connect to an existing account -openid_connect_desc = The entered OpenID URIs is not know by the system, here you can associate it to an existing account. +openid_connect_desc = The chosen OpenID URIs is not known by the system, you can join it an existing account. openid_register_title = Create new account -openid_register_desc = The entered OpenID URIs is not know by the system, here you can associate it to a new account. +openid_register_desc = The chosen OpenID URIs is not known by the system, you can associate it to a new account here. openid_signin_desc = Example URIs: https://anne.me, bob.openid.org.cn, gnusocial.net/carry disable_forgot_password_mail = Sorry, password reset has been disabled. Please contact the site administrator. @@ -206,7 +206,7 @@ activate_account = Please activate your account activate_email = Verify your email address reset_password = Reset your password register_success = Registration successful -register_notify = Welcome on board +register_notify = Welcome to Gitea [modal] yes = Yes @@ -244,30 +244,30 @@ 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 is incorrect. -password_not_match = Password and confirm password are not same. - -username_been_taken = Username has already been taken. -repo_name_been_taken = Repository name has already been used. -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. -openid_been_used = OpenID address '%s' has already been used. -username_password_incorrect = Username or password is not correct. -enterred_invalid_repo_name = Please make sure that the repository name you entered is correct. -enterred_invalid_owner_name = Please make sure that the owner name you entered is correct. -enterred_invalid_password = Please make sure the that password you entered is correct. -user_not_exist = The given user does not exist. -last_org_owner = Removing the last user from a owner team isn't allowed because 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 -invalid_gpg_key = Sorry, we're not able to verify your GPG key: %s -unable_verify_ssh_key = Gitea cannot verify your SSH key, but we are assuming that it is valid, please double-check it. +captcha_incorrect = CAPTCHA response is incorrect. +password_not_match = Your chosen passwords do not match. + +username_been_taken = Username already taken. +repo_name_been_taken = Repository name already used. +org_name_been_taken = Organization name already taken. +team_name_been_taken = Team name already taken. +email_been_used = Email already used. +openid_been_used = OpenID address '%s' already used. +username_password_incorrect = Incorrect username or password. +enterred_invalid_repo_name = Please ensure that the repository name you entered is correct. +enterred_invalid_owner_name = Please ensure that the owner name you entered is correct. +enterred_invalid_password = Please ensure the that password you entered is correct. +user_not_exist = The user does not exist. +last_org_owner = Removing the last user from the owner team is not allowed because there must always be at least one owner in any given organization. + +invalid_ssh_key = Sorry, we were not able to verify your SSH key: %s +invalid_gpg_key = Sorry, we were not able to verify your GPG key: %s +unable_verify_ssh_key = The ssh key could not be verified, please double-check it for any mistakes. auth_failed = Authentication failed: %v -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 has membership in at least one organization, you have to leave or delete your memberships first. -org_still_own_repo = This organization still owns repositories, you must delete or transfer them first. +still_own_repo = Your account still has ownership of at least one repository, you need to delete or transfer them first. +still_has_org = Your account still is still a member of least one organization, you need to leave them first. +org_still_own_repo = This organization still owns repositories, you need to delete or transfer them first. target_branch_not_exist = Target branch does not exist. @@ -282,8 +282,8 @@ following = Following follow = Follow unfollow = Unfollow -form.name_reserved = Username '%s' is reserved. -form.name_pattern_not_allowed = Username pattern '%s' is not allowed. +form.name_reserved = The username '%s' is reserved. +form.name_pattern_not_allowed = The username pattern '%s' is not allowed. [settings] profile = Profile @@ -299,15 +299,15 @@ account_link = External Accounts uid = Uid public_profile = Public Profile -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. -password_username_disabled = Non-local type users are not allowed to change their username. +profile_desc = Your email address is public and will be used for any account related notifications and web based operations made through the web interface. +password_username_disabled = Non-local users are not allowed to change their username. Please contact your system administrator for more details. full_name = Full Name website = Website location = Location update_profile = Update Profile -update_profile_success = Your profile has been updated successfully. +update_profile_success = Your profile has been updated. change_username = Username Changed -change_username_prompt = This change will affect the way how links relate to your account. +change_username_prompt = This change will change the links to your account. continue = Continue cancel = Cancel @@ -318,7 +318,7 @@ choose_new_avatar = Choose new avatar update_avatar = Update Avatar Setting delete_current_avatar = Delete Current Avatar uploaded_avatar_not_a_image = Uploaded file is not a image. -update_avatar_success = Your avatar setting has been updated successfully. +update_avatar_success = Your avatar setting has been updated. change_password = Change Password old_password = Current Password @@ -335,17 +335,17 @@ email_desc = Your primary email address will be used for notifications and other primary = Primary primary_email = Set as primary delete_email = Delete -email_deletion = Email Deletion -email_deletion_desc = Deleting this email address will remove all related information from your account. Do you want to continue? +email_deletion = Delete Email +email_deletion_desc = Deleting this email address will remove all related information from your account. Git commits using this email will remain unchanged. Do you want to continue? email_deletion_success = Email has been deleted successfully! openid_deletion = OpenID Deletion -openid_deletion_desc = Deleting this OpenID address will prevent you from signing in using it, are you sure you want to continue ? +openid_deletion_desc = Deleting this OpenID address from your account will prevent you from signing in with it. Are you sure you want to continue ? openid_deletion_success = OpenID has been deleted successfully! add_new_email = Add new email address add_new_openid = Add new OpenID URI add_email = Add email add_openid = Add OpenID URI -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_confirmation_sent = A new confirmation email has been sent to '%s'. Please check your inbox within the next %d hours to confirm your email. add_email_success = Your new email address was successfully added. add_openid_success = Your new OpenID address was successfully added. keep_email_private = Keep Email Address Private @@ -355,36 +355,36 @@ openid_desc = Your OpenID addresses will let you delegate authentication to your manage_ssh_keys = Manage SSH Keys manage_gpg_keys = Manage GPG Keys add_key = Add Key -ssh_desc = This is a list of SSH keys associated with your account. Because these keys allow anyone using them to gain access to your repositories, it is highly important that you make sure you recognize them. -gpg_desc = This is a list of GPG keys associated with your account. Because these keys allow verification of commit, it is highly important that you keep safe the corresponding private key. -ssh_helper = Don't know how? Check out GitHub's guide to create your own SSH keys or solve common problems you might encounter using SSH. -gpg_helper = Don't know how? Check out GitHub's guide about GPG. +ssh_desc = These are the SSH keys associated with your account. Because these keys allow anyone using them to gain access to your repositories, it is very important you make sure you recognize them. +gpg_desc = These are the GPG keys associated with your account. Because these keys allow commits to be verified, it is very important that you keep the corresponding private key safe. +ssh_helper = Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH. +gpg_helper = Need help? Have a look at GitHub's guide about GPG. add_new_key = Add SSH Key add_new_gpg_key = Add GPG Key -ssh_key_been_used = Public key content has already been used. -ssh_key_name_used = Public key with same name already exists. -gpg_key_id_used = Public GPG key with same id already exists. -gpg_key_email_not_found = The email attached to the GPG key couldn't be found or is not yet confirmed: %s +ssh_key_been_used = This public key has already been used. +ssh_key_name_used = A public key with same name already exists. +gpg_key_id_used = A public GPG key with same id already exists. +gpg_key_email_not_found = The email attached to the GPG key couldn't be found or is not confirmed yet: %s subkeys = Subkeys key_id = Key ID key_name = Key Name key_content = Content -add_key_success = Your new SSH key '%s' has been added successfully! -add_gpg_key_success = Your new GPG key '%s' has been added successfully! +add_key_success = Your SSH key '%s' has been added. +add_gpg_key_success = Your GPG key '%s' has been added. delete_key = Delete ssh_key_deletion = SSH Key Deletion gpg_key_deletion = GPG Key Deletion -ssh_key_deletion_desc = Delete this SSH key will disable all access using this SSH key for your account. Do you want to continue? -gpg_key_deletion_desc = Delete this GPG key will disable all commit verification sign with this GPG key. Do you want to continue? -ssh_key_deletion_success = SSH key has been deleted successfully! -gpg_key_deletion_success = GPG key has been deleted successfully! +ssh_key_deletion_desc = Deleting this SSH key will revoke all access using this SSH key for your account. Do you want to continue? +gpg_key_deletion_desc = Deleting this GPG key will unverify all commits signed with this GPG key. Are you sure you want to continue? +ssh_key_deletion_success = The SSH key has been deleted. +gpg_key_deletion_success = The GPG key has been deleted. add_on = Added on valid_until = Valid until never = never last_used = Last used on no_activity = No recent activity -key_state_desc = This key is used in last 7 days -token_state_desc = This token is used in last 7 days +key_state_desc = This key has been used in the last 7 days +token_state_desc = This token has been used in the last 7 days show_openid = Show on profile hide_openid = Hide from profile @@ -402,51 +402,51 @@ generate_token = Generate Token generate_token_succees = Your access token was successfully generated! Be sure to copy it right now, because you will not be able to see it again later! delete_token = Delete access_token_deletion = Personal Access Token Deletion -access_token_deletion_desc = Delete this personal access token will disable access for any application using this token. Do you want to continue? -delete_token_success = Personal access token has been removed successfully! Don't forget to update any applications using this token as well. +access_token_deletion_desc = Delete this personal access token will revoke access for any application using this token. Do you want to continue? +delete_token_success = The personal access token has been removed. Don't forget to update any applications using this token. -twofa_desc = Gitea supports two-factor authentication to provide additional security for your account. -twofa_is_enrolled = Your account is enrolled in two-factor authentication. +twofa_desc = Gitea supports two-factor authentication to enhance the security of your account. +twofa_is_enrolled = Your account is currently enrolled in two-factor authentication. twofa_not_enrolled = Your account is not currently enrolled in two-factor authentication. twofa_disable = Disable two-factor authentication twofa_scratch_token_regenerate = Regenerate scratch token twofa_scratch_token_regenerated = Your scratch token has been regenerated. It is now %s. Keep it in a safe place. twofa_enroll = Enroll into two-factor authentication twofa_disable_note = If needed, you can disable two-factor authentication. -twofa_disable_desc = Disabling two-factor authentication will make your account less secure. Are you sure you want to proceed? -regenerate_scratch_token_desc = If you misplaced your scratch token, or had to use it to log in, you can reset it. +twofa_disable_desc = Disabling two-factor authentication will make your account less secure. Are you sure you want to continue? +regenerate_scratch_token_desc = If you misplaced your scratch token, or have already used it to log in, you can reset it here. twofa_disabled = Two-factor authentication has been disabled. scan_this_image = Scan this image with your authentication application: or_enter_secret = Or enter the secret: %s -then_enter_passcode = Then enter the passcode the application gives you: +then_enter_passcode = And enter the passcode the application gives you: passcode_invalid = That passcode is invalid. Try again. twofa_enrolled = Your account has now been enrolled in two-factor authentication. Make sure to save your scratch token (%s), as it will only be shown once! manage_account_links = Manage account links manage_account_links_desc = External accounts linked to this account -account_links_not_available = There are no external accounts linked to this account +account_links_not_available = There are currently no external accounts linked to this account remove_account_link = Remove linked account -remove_account_link_desc = Delete this account link will remove all related access for your account. Do you want to continue? +remove_account_link_desc = Removing this linked account will revoke all related access using this account. Do you want to continue? remove_account_link_success = Account link has been removed successfully! delete_account = Delete Your Account delete_prompt = The operation will delete your account permanently, and CANNOT be undone! confirm_delete_account = Confirm Deletion delete_account_title = Account Deletion -delete_account_desc = This account is going to be deleted permanently, do you want to continue? +delete_account_desc = Are you sure you want to permanently delete this account? [repo] owner = Owner repo_name = Repository Name -repo_name_helper = A good repository name is usually composed of short, memorable, and unique keywords. +repo_name_helper = A good repository name is composed of short, memorable, and unique keywords. visibility = Visibility visiblity_helper = This repository is Private -visiblity_helper_forced = Site admin has forced all new repositories to be Private +visiblity_helper_forced = Your system administrator has forced all new repositories to be Private visiblity_fork_helper = (Change of this value will affect all forks) clone_helper = Need help cloning? Visit Help! fork_repo = Fork Repository fork_from = Fork From -fork_visiblity_helper = You cannot alter the visibility of a forked repository. +fork_visiblity_helper = You cannot change the visibility of a forked repository. repo_desc = Description repo_lang = Language repo_gitignore_helper = Select .gitignore templates @@ -458,17 +458,17 @@ auto_init = Initialize this repository with selected files and template create_repo = Create Repository default_branch = Default Branch mirror_prune = Prune -mirror_prune_desc = Remove any remote-tracking references that no longer exist on the remote +mirror_prune_desc = Remove any remote-tracking references which no longer exist on the remote mirror_interval = Mirror interval (valid time units are "h", "m", "s") mirror_interval_invalid = Mirror interval is not valid mirror_address = Mirror Address -mirror_address_desc = Please include necessary user credentials in the address. +mirror_address_desc = Please include any necessary user credentials in the address. mirror_last_synced = Last Synced watchers = Watchers stargazers = Stargazers forks = Forks -form.reach_limit_of_creation = You have reached your maximum creation limit of %d repositories. +form.reach_limit_of_creation = You have already reached your limit of %d repositories. form.name_reserved = The repository name '%s' is reserved. form.name_pattern_not_allowed = The repository name pattern '%s' is not allowed. @@ -500,9 +500,9 @@ download_archive = Download this repository no_desc = No Description quick_guide = Quick Guide clone_this_repo = Clone this repository -create_new_repo_command = Create a new repository on the command line -push_exist_repo = Push an existing repository from the command line -bare_message = This repository does not have any content yet. +create_new_repo_command = Creating a new repository on the command line +push_exist_repo = Pushing an existing repository from the command line +bare_message = This repository does not contain any content. code = Code branch = Branch @@ -529,7 +529,7 @@ editor.new_file = New file editor.upload_file = Upload file editor.edit_file = Edit file editor.preview_changes = Preview Changes -editor.cannot_edit_non_text_files = Cannot edit non-text files +editor.cannot_edit_non_text_files = Cannot edit binary files from the web interface editor.edit_this_file = Edit this file editor.must_be_on_a_branch = You must be on a branch to make or propose changes to this file editor.fork_before_edit = You must fork this repository before editing the file @@ -666,8 +666,8 @@ issues.label_edit = Edit issues.label_delete = Delete issues.label_modify = Label Modification issues.label_deletion = Label Deletion -issues.label_deletion_desc = Deleting this label will remove its information in all related issues. Are you sure you want to continue? -issues.label_deletion_success = This label has been deleted successfully! +issues.label_deletion_desc = Deleting this label will remove it from all issues. Are you sure you want to continue? +issues.label_deletion_success = The label has been deleted successfully! issues.label.filter_sort.alphabetically = Alphabetically issues.label.filter_sort.reverse_alphabetically = Reverse alphabetically issues.label.filter_sort.by_size = Size @@ -695,14 +695,14 @@ pulls.tab_commits = Commits pulls.tab_files = Files changed pulls.reopen_to_merge = Please reopen this pull request to perform a merge. pulls.merged = Merged -pulls.has_merged = This pull request has been merged successfully! +pulls.has_merged = This pull request has been merged successfully. pulls.data_broken = Data of this pull request has been broken due to deletion of fork information. pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments. pulls.can_auto_merge_desc = This pull request can be merged automatically. pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically because there are conflicts. pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts. pulls.merge_pull_request = Merge Pull Request -pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.` +pulls.open_unmerged_pull_exists = `You cannot perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.` milestones.new = New Milestone milestones.open_tab = %d Open @@ -720,12 +720,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 a better description for milestones so people won't be confused. +milestones.edit_subheader = Use a good 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 = Deleting this milestone will remove its information in all related issues. Do you want to continue? +milestones.deletion_desc = Deleting this milestone will remove it from all related issues. Do you want to continue? milestones.deletion_success = Milestone has been deleted successfully! milestones.filter_sort.closest_due_date = Closest due date milestones.filter_sort.furthest_due_date = Furthest due date @@ -735,8 +735,8 @@ milestones.filter_sort.most_issues = Most issues milestones.filter_sort.least_issues = Least issues wiki = Wiki -wiki.welcome = Welcome to the project wiki! -wiki.welcome_desc = A wiki allows you or your users to easily document your project. +wiki.welcome = Welcome to the project wiki +wiki.welcome_desc = A wiki allows you and your collaborators to easily document your project. wiki.create_first_page = Create the first page wiki.page = Page wiki.filter_page = Filter page @@ -764,7 +764,7 @@ settings.githooks = Git Hooks settings.basic_settings = Basic Settings settings.mirror_settings = Mirror Settings settings.sync_mirror = Sync Now -settings.mirror_sync_in_progress = Mirror syncing is in progress, please refresh page in about a minute. +settings.mirror_sync_in_progress = Mirror sync in progress. Please refresh the page to check again in a minute. settings.site = Official Site settings.update_settings = Update Settings settings.advanced_settings = Advanced Settings @@ -792,7 +792,7 @@ settings.convert = Convert To Regular Repository settings.convert_desc = You can convert this mirror to a regular repository. This cannot be undone. settings.convert_notices_1 = - This operation will convert this repository mirror into a regular repository and cannot be undone. settings.convert_confirm = Confirm Conversion -settings.convert_succeed = Repository has been converted to a regular repository successfully. +settings.convert_succeed = Repository has been converted to a regular repository. settings.transfer = Transfer Ownership settings.transfer_desc = Transfer this repository to another user or to an organization in which you have admin rights. settings.transfer_notices_1 = - You will lose access if the new owner is a individual user. @@ -801,17 +801,17 @@ settings.transfer_form_title = Please enter the following information to confirm settings.wiki_delete = Erase Wiki Data settings.wiki_delete_desc = Once you erase wiki data there is no going back. Please be certain. settings.wiki_delete_notices_1 = - This will delete and disable the wiki for %s -settings.wiki_deletion_success = Repository wiki data have been erased successfully. +settings.wiki_deletion_success = Repository wiki data have been erased. settings.delete = Delete This Repository settings.delete_desc = Once you delete a repository, there is no going back. Please be certain. settings.delete_notices_1 = - This operation CANNOT be undone. -settings.delete_notices_2 = - This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators. +settings.delete_notices_2 = - This operation will permanently delete the everything of this repository, including code, issues, comments, the wiki, and the permissions of collaborators. settings.delete_notices_fork_1 = - All forks will become independent after deletion. -settings.deletion_success = Repository has been deleted successfully! -settings.update_settings_success = Repository options has been updated successfully. +settings.deletion_success = Repository has been deleted. +settings.update_settings_success = Repository options have been updated. settings.transfer_owner = New Owner settings.make_transfer = Make Transfer -settings.transfer_succeed = Repository ownership has been transferred successfully. +settings.transfer_succeed = Repository ownership has been transferred. settings.confirm_delete = Confirm Deletion settings.add_collaborator = Add New Collaborator settings.add_collaborator_success = New collaborator has been added. @@ -879,7 +879,7 @@ settings.key_been_used = Deploy key content has been used. 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 = Deleting 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 prevent this repository from being accessed with it. Do you want to continue? settings.deploy_key_deletion_success = The deploy key has been deleted successfully! settings.branches=Branches settings.protected_branch=Branch Protection @@ -936,17 +936,17 @@ release.save_draft = Save Draft release.edit_release = Edit Release release.delete_release = Delete This Release release.deletion = Release Deletion -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.deletion_desc = Deleting this release will delete the corresponding Git tag. You will not lose any code. Do you want to continue? +release.deletion_success = The release has been deleted. release.tag_name_already_exist = Release with this tag name already exists. release.tag_name_invalid = Tag name is not valid. release.downloads = Downloads branch.delete = Delete Branch %s -branch.delete_desc = Once you delete a branch, there is no going back. Please be certain. +branch.delete_desc = Deleting a branch is permanent. There is no way to undo it. branch.delete_notices_1 = - This operation CANNOT be undone. -branch.delete_notices_2 = - This operation will permanently delete everything of branch %s. -branch.deletion_success = %s has been deleted successfully! +branch.delete_notices_2 = - This operation will permanently delete everything in branch %s. +branch.deletion_success = %s has been deleted. branch.deletion_failed = Failed to delete branch %s. branch.delete_branch_has_new_commits = %s cannot be deleted because it has new commits after merging. @@ -965,9 +965,9 @@ create_new_team = Create New Team org_desc = Description team_name = Team Name team_desc = Description -team_name_helper = You'll use this name to mention this team in conversations. +team_name_helper = You will use this name to mention this team in conversations. team_desc_helper = What is this team for? -team_permission_desc = What permission level should this team have? +team_permission_desc = What permissions should this team have? form.name_reserved = Organization name '%s' is reserved. form.name_pattern_not_allowed = Organization name pattern '%s' is not allowed. @@ -979,15 +979,15 @@ settings.full_name = Full Name settings.website = Website settings.location = Location settings.update_settings = Update Settings -settings.update_setting_success = Organization settings has been updated successfully. -settings.change_orgname_prompt = This change will affect how links relate to the organization. -settings.update_avatar_success = Organization avatar setting has been updated successfully. +settings.update_setting_success = Organization settings have been updated. +settings.change_orgname_prompt = This change will change the links to the organization. +settings.update_avatar_success = The organization avatar has been updated. settings.delete = Delete Organization settings.delete_account = Delete This Organization settings.delete_prompt = The organization will be permanently removed, and this CANNOT 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? +settings.delete_org_desc = This organization is going to be deleted permanently, are you sure you want to continue? settings.hooks_desc = Add webhooks that will be triggered for all repositories under this organization. members.membership_visibility = Membership Visibility: @@ -1020,7 +1020,7 @@ teams.delete_team = Delete This Team teams.add_team_member = Add Team Member teams.delete_team_title = Team Deletion 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.delete_team_success = The team has been deleted. teams.read_permission_desc = This team grants Read access: members can view and clone the team's repositories. teams.write_permission_desc = This team grants Write access: members can read from and push to the team's repositories. teams.admin_permission_desc = This team grants Admin access: members can read from, push to, and add collaborators to the team's repositories. @@ -1050,22 +1050,22 @@ dashboard.statistic_info = Gitea database has %d users, %d organiz dashboard.operation_name = Operation Name dashboard.operation_switch = Switch dashboard.operation_run = Run -dashboard.clean_unbind_oauth = Clean unbound OAuthes -dashboard.clean_unbind_oauth_success = All unbound OAuthes have been deleted successfully. +dashboard.clean_unbind_oauth = Clean unbound OAuth connections +dashboard.clean_unbind_oauth_success = All unbound OAuth connections have been deleted. dashboard.delete_inactivate_accounts = Delete all inactive accounts -dashboard.delete_inactivate_accounts_success = All inactivate accounts have been deleted successfully. +dashboard.delete_inactivate_accounts_success = All inactive accounts have been deleted. dashboard.delete_repo_archives = Delete all repositories archives -dashboard.delete_repo_archives_success = All repositories archives have been deleted successfully. +dashboard.delete_repo_archives_success = All repositories archives have been deleted. dashboard.delete_missing_repos = Delete all repository records which have lost their corresponding Git files -dashboard.delete_missing_repos_success = All repository records which have lost their corresponding Git files have been deleted successfully. +dashboard.delete_missing_repos_success = All repository records which have lost their corresponding Git files have been deleted. dashboard.git_gc_repos = Execute garbage collection on all repositories -dashboard.git_gc_repos_success = All repositories have executed garbage collection successfully. +dashboard.git_gc_repos_success = All repositories have finished executing garbage collection. dashboard.resync_all_sshkeys = Rewrite '.ssh/authorized_keys' file (for Gitea SSH keys) -dashboard.resync_all_sshkeys_success = All public keys have been rewritten successfully. +dashboard.resync_all_sshkeys_success = All public keys have been rewritten. dashboard.resync_all_hooks = Resync pre-receive, update and post-receive hooks of all repositories. -dashboard.resync_all_hooks_success = All repositories' pre-receive, update and post-receive hooks have been resynced successfully. +dashboard.resync_all_hooks_success = All repositories' pre-receive, update and post-receive hooks have been resynced. dashboard.reinit_missing_repos = Reinitialize all lost Git repositories for which records exist -dashboard.reinit_missing_repos_success = All lost Git repositories for which records existed have been reinitialized successfully. +dashboard.reinit_missing_repos_success = All lost Git repositories for which records existed have been reinitialized. dashboard.sync_external_users = Synchronize external user data dashboard.sync_external_users_started = External user synchronization started dashboard.server_uptime = Server Uptime @@ -1098,7 +1098,7 @@ dashboard.total_gc_pause = Total GC Pause dashboard.last_gc_pause = Last GC Pause dashboard.gc_times = GC Times -users.user_manage_panel = User Manage Panel +users.user_manage_panel = User Management Panel users.new_account = Create New Account users.name = Name users.activated = Activated @@ -1108,13 +1108,13 @@ users.created = Created users.last_login = Last Login users.never_login = Never Login users.send_register_notify = Send Registration Notification To User -users.new_success = New account '%s' has been created successfully. +users.new_success = The account '%s' has been created. users.edit = Edit users.auth_source = Authentication Source users.local = Local users.auth_login_name = Authentication Login Name users.password_helper = Leave it empty to remain unchanged. -users.update_profile_success = Account profile has been updated successfully. +users.update_profile_success = Account profile has been updated. users.edit_account = Edit Account users.max_repo_creation = Maximum Repository Creation Limit users.max_repo_creation_desc = (Set -1 to use global default limit) @@ -1123,19 +1123,19 @@ users.prohibit_login = This account is prohibited to login users.is_admin = This account has administrator permissions users.allow_git_hook = This account has permission to create Git hooks users.allow_import_local = This account has permissions to import local repositories -users.allow_create_organization = This account has permissions to create Organizations +users.allow_create_organization = This account has permissions to create organizations users.update_profile = Update Account Profile users.delete_account = Delete This Account -users.still_own_repo = This account still has ownership over at least one repository, you need to delete or transfer them first. -users.still_has_org = This account still has membership in at least one organization, you need to leave or delete the organizations first. -users.deletion_success = Account has been deleted successfully! +users.still_own_repo = This account still owns at least one repository, you need to delete or transfer them first. +users.still_has_org = This account still is a member of at least one organization, you need to leave or delete the organizations first. +users.deletion_success = Account has been deleted successfully. -orgs.org_manage_panel = Organization Manage Panel +orgs.org_manage_panel = Organization Management orgs.name = Name orgs.teams = Teams orgs.members = Members -repos.repo_manage_panel = Repository Manage Panel +repos.repo_manage_panel = Repository Management repos.owner = Owner repos.name = Name repos.private = Private @@ -1144,7 +1144,7 @@ repos.stars = Stars repos.issues = Issues repos.size = Size -auths.auth_manage_panel = Authentication Manage Panel +auths.auth_manage_panel = Authentication Management auths.new = Add New Source auths.name = Name auths.type = Type @@ -1159,7 +1159,7 @@ auths.host = Host auths.port = Port auths.bind_dn = Bind DN auths.bind_password = Bind Password -auths.bind_password_helper = Warning: This password is stored in plain text. Do not use a high privileged account. +auths.bind_password_helper = Warning: This password is stored in plain text. Do not use a highly privileged account. auths.user_base = User Search Base auths.user_dn = User DN auths.attribute_username = Username attribute @@ -1201,14 +1201,14 @@ auths.tip.gitlab = Register a new application on https://gitlab.com/profile/appl auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console (https://console.developers.google.com/) auths.tip.openid_connect = Use the OpenID Connect Discovery URL (/.well-known/openid-configuration) to specify the endpoints auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled. -auths.edit = Edit Authentication Setting +auths.edit = Edit Authentication Settings auths.activated = This authentication is activated -auths.new_success = New authentication '%s' has been added successfully. -auths.update_success = The authentication settings have been updated successfully. -auths.update = Update Authentication Setting +auths.new_success = The authentication '%s' has been added. +auths.update_success = The authentication settings have been updated. +auths.update = Update Authentication Settings auths.delete = Delete This Authentication Source -auths.delete_auth_title = Authentication Deletion -auths.delete_auth_desc = This authentication source is going to be deleted, do you want to continue? +auths.delete_auth_title = Delete Authentication Source +auths.delete_auth_desc = This authentication source is going to be deleted, are you sure you want to continue? auths.still_in_used = This authentication source is still used by some users, please delete or convert these users to another login type first. auths.deletion_success = Authentication has been deleted successfully! auths.login_source_exist = Login source '%s' already exists. @@ -1263,7 +1263,7 @@ config.mail_notify = Mail Notification config.disable_key_size_check = Disable Minimum Key Size Check config.enable_captcha = Enable Captcha config.active_code_lives = Active Code Lives -config.reset_password_code_lives = Reset Password Code Lives +config.reset_password_code_lives = Reset Password Code Expiry Time config.default_keep_email_private = Default Value for Keep Email Private config.default_allow_create_organization = Default permission to create Organizations config.no_reply_address = No-reply Address @@ -1271,7 +1271,7 @@ config.no_reply_address = No-reply Address config.webhook_config = Webhook Configuration config.queue_length = Queue Length config.deliver_timeout = Deliver Timeout -config.skip_tls_verify = Skip TLS Verify +config.skip_tls_verify = Skip TLS Verification config.mailer_config = Mailer Configuration config.mailer_enabled = Enabled @@ -1344,7 +1344,7 @@ notices.type = Type notices.type_1 = Repository notices.desc = Description notices.op = Op. -notices.delete_success = System notices have been deleted successfully. +notices.delete_success = The system notices have been deleted. [action] create_repo = created repository %s @@ -1360,7 +1360,7 @@ comment_issue = `commented on issue %s#%[2]s` merge_pull_request = `merged pull request %s#%[2]s` transfer_repo = transferred repository %s to %s push_tag = pushed tag %[2]s to %[3]s -compare_commits = View comparison for these %d commits +compare_commits = Compare %d commits [tool] ago = ago @@ -1384,7 +1384,7 @@ raw_seconds = seconds raw_minutes = minutes [dropzone] -default_message = Drop files here or click to upload. +default_message = Drop files or click to upload. invalid_input_type = You can't upload files of this type. file_too_big = File size ({{filesize}} MB) exceeds the maximum size of ({{maxFilesize}} MB). remove_file = Remove file @@ -1402,7 +1402,7 @@ mark_as_unread = Mark as unread [gpg] error.extract_sign = Failed to extract signature error.generate_hash = Failed to generate hash of commit -error.no_committer_account = No account linked to committer email +error.no_committer_account = No account linked to committer's email error.no_gpg_keys_found = "No known key found for this signature in database" error.not_signed_commit = "Not a signed commit" error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer account"