-
- Notifications
You must be signed in to change notification settings - Fork 6.2k
Admin grammar fixes and improvements #2056
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits Select commit Hold shift + click to select a range
ccd2aa9 Admin grammar fixes and improvements
pgaskin 0aee581 Update locale_en-US.ini
pgaskin c7ef869 Merge branch 'master' into patch-8
pgaskin 7aa28d5 Improve as asked in reviews
lafriks d20481d Merge branch 'master' into patch-8
lafriks 20a5f78 Merge branch 'master' into patch-8
lafriks 774ca7e Merge branch 'master' into patch-8
bkcsoft d82192c Merge branch 'master' into patch-8
lafriks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| | @@ -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 <b>%d</b> users, <b>%d</b> organizations, <b>%d</b> public keys, <b>%d</b> repositories, <b>%d</b> watches, <b>%d</b> stars, <b>%d</b> actions, <b>%d</b> accesses, <b>%d</b> issues, <b>%d</b> comments, <b>%d</b> social accounts, <b>%d</b> follows, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> login sources, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> labels, <b>%d</b> hook tasks, <b>%d</b> teams, <b>%d</b> update tasks, <b>%d</b> 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. | ||
| There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this true? Is it not only if you're an Owner of an Org? | ||
| 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: <host>/user/oauth2/<Authentication Name>/callback | ||
| auths.tip.oauth2_provider = OAuth2 Provider | ||
| auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user/<your username>/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 | ||
| | ||
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The above ones are checkboxes on the user edit page, so no need to say
This account. This is why I changed these lines.