Skip to content
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

Admin grammar fixes and improvements #2056

Merged
merged 8 commits into from
Oct 21, 2017
Merged

Admin grammar fixes and improvements #2056

merged 8 commits into from
Oct 21, 2017

Conversation

pgaskin
Copy link
Contributor

@pgaskin pgaskin commented Jun 24, 2017

Admin grammar fixes and improvements.

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.

@lunny lunny added the type/docs This PR mainly updates/creates documentation label Jun 24, 2017
@lunny lunny added this to the 1.x.x milestone Jun 24, 2017
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

@cez81
Copy link
Contributor

cez81 commented Jun 27, 2017

LGTM

@tboerger tboerger added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 27, 2017
Copy link
Member

@bkcsoft bkcsoft left a comment

Choose a reason for hiding this comment

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

I know it's just a grammar-check, but we might as well touch some of them up while we're at it 😉

@@ -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 = 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.
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 [...]

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.
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?

@@ -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 ?

@andreynering
Copy link
Contributor

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 7, 2017
@lafriks
Copy link
Member

lafriks commented Jul 7, 2017

Please do not merge this before 1.2.0 is released as this will break already translated strings

Copy link
Member

@bkcsoft bkcsoft left a comment

Choose a reason for hiding this comment

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

@lafriks You can do empty "request changes" to "stall" PRs ;)

@lafriks
Copy link
Member

lafriks commented Jul 12, 2017

@geek1011 rebase

@lunny
Copy link
Member

lunny commented Aug 28, 2017

Any update? Or we should close this one?

@pgaskin
Copy link
Contributor Author

pgaskin commented Aug 28, 2017

Sorry, I have been quite busy for the last few weeks. I will update it soon.

@lunny
Copy link
Member

lunny commented Sep 16, 2017

need rebase

@pgaskin
Copy link
Contributor Author

pgaskin commented Sep 16, 2017

@lunny @bkcsoft

Also, sorry for the delay, I have been really busy recently.

@codecov-io
Copy link

codecov-io commented Sep 16, 2017

Codecov Report

Merging #2056 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2056   +/-   ##
=======================================
  Coverage   26.91%   26.91%           
=======================================
  Files          87       87           
  Lines       17286    17286           
=======================================
  Hits         4652     4652           
  Misses      11955    11955           
  Partials      679      679

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7131c7d...d82192c. Read the comment docs.

@lafriks
Copy link
Member

lafriks commented Oct 18, 2017

@bkcsoft need your approval

@lunny
Copy link
Member

lunny commented Oct 19, 2017

@lafriks CI failed

@lunny
Copy link
Member

lunny commented Oct 20, 2017

need @bkcsoft approval

@lunny lunny modified the milestones: 1.x.x, 1.3.0 Oct 20, 2017
@lafriks
Copy link
Member

lafriks commented Oct 21, 2017

Make LG-TM work again

@lafriks lafriks merged commit bc8d726 into go-gitea:master Oct 21, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants