From bc8d72666c371cc674128011cede929d4ce1ae80 Mon Sep 17 00:00:00 2001 From: Patrick G Date: Sat, 21 Oct 2017 09:30:21 -0400 Subject: [PATCH] Admin grammar fixes and improvements (#2056) --- options/locale/locale_en-US.ini | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f66482782..088aa05a9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1162,7 +1162,7 @@ first_page = First last_page = Last total = Total: %d -dashboard.statistic = Statistic +dashboard.statistic = Statistics dashboard.operations = Operations dashboard.system_status = System Monitor Status dashboard.statistic_info = Gitea database has %d users, %d organizations, %d public keys, %d repositories, %d watches, %d stars, %d actions, %d accesses, %d issues, %d comments, %d social accounts, %d follows, %d mirrors, %d releases, %d login sources, %d webhooks, %d milestones, %d labels, %d hook tasks, %d teams, %d update tasks, %d attachments. @@ -1179,8 +1179,8 @@ dashboard.delete_missing_repos = Delete all repository records which are missing 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_sshkeys = Rewrite '.ssh/authorized_keys' file (for Gitea SSH keys). There is no need to do this if you are using the built-in SSH server. +dashboard.resync_all_sshkeys_success = All public keys controlled by Gitea 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 missing Git repositories for which records exist @@ -1237,17 +1237,17 @@ 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) -users.is_activated = This account has completed activation -users.prohibit_login = This account is blocked from logging in -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.is_activated = Account activated +users.prohibit_login = Login disabled +users.is_admin = Administrator permissions +users.allow_git_hook = Allowed to create git hooks +users.allow_import_local = Allowed to import local repositories +users.allow_create_organization = Allowed to create organizations users.update_profile = Update Account Profile -users.delete_account = Delete This Account -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. +users.delete_account = Delete Account +users.still_own_repo = This user still owns one or more repositories. These repositories need to be deleted or transferred first. +users.still_has_org = This user is still is a member of one or more organizations. This user needs to leave or delete them first. +users.deletion_success = Account deleted successfully. orgs.org_manage_panel = Organization Management orgs.name = Name @@ -1279,7 +1279,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 highly privileged account. +auths.bind_password_helper = Warning: This password is stored in plain text. It is highly recommended to use read-only account. auths.user_base = User Search Base auths.user_dn = User DN auths.attribute_username = Username attribute @@ -1314,8 +1314,8 @@ auths.tips.oauth2.general = OAuth2 Authentication auths.tips.oauth2.general.tip = When registering a new OAuth2 authentication, the callback/redirect URL should be: /user/oauth2//callback auths.tip.oauth2_provider = OAuth2 Provider auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user//oauth-consumers/new and add the permission "Account"-"Read" -auths.tip.dropbox = Create a new App on https://www.dropbox.com/developers/apps -auths.tip.facebook = Register a new App on https://developers.facebook.com/apps and add the product "Facebook Login" +auths.tip.dropbox = Create a new application at https://www.dropbox.com/developers/apps +auths.tip.facebook = Register a new application at https://developers.facebook.com/apps and add the product "Facebook Login" auths.tip.github = Register a new OAuth application on https://github.com/settings/applications/new auths.tip.gitlab = Register a new application on https://gitlab.com/profile/applications auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console (https://console.developers.google.com/) @@ -1328,9 +1328,9 @@ 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 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.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 one or more users, please delete or convert them to another login source first. +auths.deletion_success = Authentication has been deleted successfully. auths.login_source_exist = Login source '%s' already exists. config.server_config = Server Configuration