Skip to content

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.

Sign up for GitHub

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 8 commits into from
Oct 21, 2017
Merged

Admin grammar fixes and improvements #2056

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ccd2aa9
Admin grammar fixes and improvements
pgaskin Jun 24, 2017
0aee581
Update locale_en-US.ini
pgaskin Jun 27, 2017
c7ef869
Merge branch 'master' into patch-8
pgaskin Sep 16, 2017
7aa28d5
Improve as asked in reviews
lafriks Oct 18, 2017
d20481d
Merge branch 'master' into patch-8
lafriks Oct 19, 2017
20a5f78
Merge branch 'master' into patch-8
lafriks Oct 19, 2017
774ca7e
Merge branch 'master' into patch-8
bkcsoft Oct 21, 2017
d82192c
Merge branch 'master' into patch-8
lafriks Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,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.
Expand All @@ -1080,8 +1080,8 @@ dashboard.delete_missing_repos = Delete all repository records which have lost t
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 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). Do not use this if you are using the built-in SSH server.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be Disabled if you are using the built-in SSH server. no? As in it won't do anything...

dashboard.resync_all_sshkeys_success = All Gitea public keys have been rewritten.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All public keys controlled by Gitea [...]

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
Expand Down Expand Up @@ -1138,17 +1138,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
Copy link
Contributor Author

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.

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.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 transfered first.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

transferred

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

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.
Copy link
Member

Choose a reason for hiding this comment

The 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
Expand Down Expand Up @@ -1180,7 +1180,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. Do not use a high privilege account.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe Only use a read-only account ?

auths.user_base = User Search Base
auths.user_dn = User DN
auths.attribute_username = Username attribute
Expand All @@ -1196,7 +1196,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 empty to not restrict any 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
Expand All @@ -1215,8 +1215,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/)
Expand All @@ -1229,9 +1229,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 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.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
Expand Down