From ceb3544697bfd1566f19afda0a98d13acb8e8b3b Mon Sep 17 00:00:00 2001 From: Patrick G Date: Tue, 11 Jul 2017 22:25:45 -0400 Subject: [PATCH] Small grammar fixes (#2144) --- options/locale/locale_en-US.ini | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 935be4a717..293657b2f9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -825,8 +825,8 @@ 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 code, issues, comments, the wiki, and the permissions of collaborators. -settings.delete_notices_fork_1 = - All forks will become independent after deletion. +settings.delete_notices_2 = - This operation will permanently delete everything in this repository including code, issues, comments, the wiki, and collaborators associations. +settings.delete_notices_fork_1 = - All forks will become independent repositories after deletion. settings.deletion_success = Repository has been deleted. settings.update_settings_success = Repository options have been updated. settings.transfer_owner = New Owner @@ -943,7 +943,7 @@ release.new_subheader = Publish releases to keep track of project versions. release.edit_subheader = A detailed changelog can help users understand what has been changed. release.tag_name = Tag name release.target = Target -release.tag_helper = Choose an existing tag, or create a new tag on publish. +release.tag_helper = Choose an existing tag, or create a new tag. release.title = Title release.content = Content release.write = Write @@ -969,7 +969,7 @@ branch.delete_notices_1 = - This operation CANNOT be undone. 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. +branch.delete_branch_has_new_commits = %s cannot be deleted because new commits have been added after merging. [org] org_name_holder = Organization Name @@ -1010,7 +1010,7 @@ settings.delete_prompt = The organization will be permanently removed, and this settings.confirm_delete_account = Confirm Deletion settings.delete_org_title = Organization Deletion 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. +settings.hooks_desc = Add webhooks which will be triggered for all repositories under this organization. members.membership_visibility = Membership Visibility: members.public = Public @@ -1041,7 +1041,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 = As this team will be deleted, members of this team may lose access to some repositories. Do you want to continue? +teams.delete_team_desc = Because this team will be deleted, members of this team may lose access to some repositories. Do you want to continue? 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. @@ -1078,16 +1078,16 @@ dashboard.delete_inactivate_accounts = Delete all inactive accounts 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. -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. +dashboard.delete_missing_repos = Delete all repository records which are missing their Git files +dashboard.delete_missing_repos_success = All repository records which are missing their Git files have been deleted. dashboard.git_gc_repos = Execute garbage collection on all repositories 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. 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. -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. +dashboard.reinit_missing_repos = Reinitialize all missing Git repositories for which records exist +dashboard.reinit_missing_repos_success = All missing 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 @@ -1148,8 +1148,8 @@ users.allow_import_local = This account has permissions to import local reposito 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 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.still_own_repo = This account still owns one or more repositories, you need to delete or transfer them first. +users.still_has_org = This account still is a member of one or more organizations, you need to leave or delete the organizations first. users.deletion_success = Account has been deleted successfully. orgs.org_manage_panel = Organization Management @@ -1198,7 +1198,7 @@ auths.smtp_auth = SMTP Authentication Type auths.smtphost = SMTP Host auths.smtpport = SMTP Port auths.allowed_domains = Allowed Domains -auths.allowed_domains_helper = Leave it empty to not restrict any domains. Multiple domains should be separated by comma ','. +auths.allowed_domains_helper = Leave it empty to allow all domains. Multiple domains should be separated by comma ','. auths.enable_tls = Enable TLS Encryption auths.skip_tls_verify = Skip TLS Verify auths.pam_service_name = PAM Service Name @@ -1231,7 +1231,7 @@ auths.update_success = The authentication settings have been updated. auths.update = Update Authentication Settings auths.delete = Delete This Authentication Source 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.delete_auth_desc = This authentication source will 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. @@ -1256,7 +1256,7 @@ config.reverse_auth_user = Reverse Authentication User config.ssh_config = SSH Configuration config.ssh_enabled = Enabled -config.ssh_start_builtin_server = Start Builtin Server +config.ssh_start_builtin_server = Start built-in Server config.ssh_domain = Domain config.ssh_port = Port config.ssh_listen_port = Listen Port @@ -1289,7 +1289,7 @@ config.enable_captcha = Enable Captcha config.active_code_lives = Active 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.default_allow_create_organization = Default permission to create organizations config.no_reply_address = No-reply Address config.webhook_config = Webhook Configuration