diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 27e549446..02f4593a7 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -32,14 +32,14 @@ twofa_scratch = Two-Factor Scratch Code
passcode = Passcode
repository = Repository
-organization = Group
+organization = Organization
mirror = Mirror
new_repo = New Repository
new_migrate = New Migration
new_mirror = New Mirror
new_fork = New Repository Fork
-new_org = New Group
-manage_org = Manage Groups
+new_org = New Organization
+manage_org = Manage Organizations
admin_panel = Site Administration
account_settings = Account Settings
settings = Settings
@@ -143,8 +143,8 @@ install_success = Welcome! Thank you for choosing Gitea. Have fun and take care!
invalid_log_root_path = The log path is invalid: %v
default_keep_email_private = Hide Email Addresses by Default
default_keep_email_private_popup = Hide email addresses of new user accounts by default.
-default_allow_create_organization = Allow Creation of Groups by Default
-default_allow_create_organization_popup = Allow new user accounts to create groups by default.
+default_allow_create_organization = Allow Creation of Organizations by Default
+default_allow_create_organization_popup = Allow new user accounts to create organizations by default.
default_enable_timetracking = Enable Time Tracking by Default
default_enable_timetracking_popup = Enable time tracking for new repositories by default.
no_reply_address = Hidden Email Domain
@@ -157,7 +157,7 @@ switch_dashboard_context = Switch Dashboard Context
my_repos = My Repositories
show_more_repos = Show more repositories…
collaborative_repos = Collaborative Repositories
-my_orgs = My Groups
+my_orgs = My Organizations
my_mirrors = My Mirrors
view_home = View %s
search_repos = Find a repository…
@@ -167,11 +167,11 @@ issues.in_your_repos = In your repositories
[explore]
repos = Repositories
users = Users
-organizations = Groups
+organizations = Organizations
search = Search
repo_no_results = No matching repositories found.
user_no_results = No matching users found.
-org_no_results = No matching groups found.
+org_no_results = No matching organizations found.
[auth]
create_new_account = Register Account
@@ -235,7 +235,7 @@ Retype = Re-Type Password
SSHTitle = SSH key name
HttpsUrl = HTTPS URL
PayloadUrl = Payload URL
-TeamName = Subgroup name
+TeamName = Team name
AuthName = Authorization name
AdminEmail = Admin email
@@ -262,8 +262,8 @@ password_not_match = The passwords do not match.
username_been_taken = The username is already taken.
repo_name_been_taken = The repository name is already used.
-org_name_been_taken = The group name is already taken.
-team_name_been_taken = The subgroup name is already taken.
+org_name_been_taken = The organization name is already taken.
+team_name_been_taken = The team name is already taken.
team_no_units_error = Allow access to at least one repository section.
email_been_used = The email address is already used.
openid_been_used = The OpenID address '%s' is already used.
@@ -272,8 +272,8 @@ enterred_invalid_repo_name = The repository name you entered is incorrect.
enterred_invalid_owner_name = The new owner name is not valid.
enterred_invalid_password = The password you entered is incorrect.
user_not_exist = The user does not exist.
-last_org_owner = You cannot remove the last user from the 'owners' subgroup. There must be at least one owner in any given group.
-cannot_add_org_to_team = A group cannot be added as a subgroup member.
+last_org_owner = You cannot remove the last user from the 'owners' team. There must be at least one owner in any given team.
+cannot_add_org_to_team = An organization cannot be added as a team member.
invalid_ssh_key = Can not verify your SSH key: %s
invalid_gpg_key = Can not verify your GPG key: %s
@@ -281,8 +281,8 @@ unable_verify_ssh_key = "Can not verify the SSH key; double-check it for mistake
auth_failed = Authentication failed: %v
still_own_repo = "Your account owns one or more repositories; delete or transfer them first."
-still_has_org = "Your account is a member of one or more groups; leave them first."
-org_still_own_repo = "This group still owns one or more repositories; delete or transfer them first."
+still_has_org = "Your account is a member of one or more organizations; leave them first."
+org_still_own_repo = "This organization still owns one or more repositories; delete or transfer them first."
target_branch_not_exist = Target branch does not exist.
@@ -308,12 +308,12 @@ avatar = Avatar
ssh_gpg_keys = SSH / GPG Keys
social = Social Accounts
applications = Access Tokens
-orgs = Manage Groups
+orgs = Manage Organizations
repos = Repositories
delete = Delete Account
twofa = Two-Factor Authentication
account_link = Linked Accounts
-organization = Groups
+organization = Organizations
uid = Uid
public_profile = Public Profile
@@ -439,7 +439,7 @@ regenerate_scratch_token_desc = If you misplaced your scratch token or have alre
twofa_disabled = Two-factor authentication has been disabled.
scan_this_image = Scan this image with your authentication application:
or_enter_secret = Or enter the secret: %s
-then_enter_passcode = And enter the passcode the application gives you:
+then_enter_passcode = And enter the passcode shown in the application:
passcode_invalid = The passcode is incorrect. Try again.
twofa_enrolled = Your account has been enrolled into two-factor authentication. Store your scratch token (%s) in a safe place as it is only shown once!
@@ -450,7 +450,7 @@ remove_account_link = Remove Linked Account
remove_account_link_desc = Removing a linked account will revoke its access to your Gitea account. Continue?
remove_account_link_success = The linked account has been removed.
-orgs_none = You are not a member of any groups.
+orgs_none = You are not a member of any organizations.
repos_none = You do not own any repositories
delete_account = Delete Your Account
@@ -482,12 +482,12 @@ auto_init = Initialize Repository (Adds .gitignore, License and README)
create_repo = Create Repository
default_branch = Default Branch
mirror_prune = Prune
-mirror_prune_desc = Remove any remote-tracking references which no longer exist on the remote
-mirror_interval = Mirror interval (valid time units are "h", "m", "s")
-mirror_interval_invalid = Mirror interval is not valid
-mirror_address = Mirror Address
-mirror_address_desc = Please include any necessary user credentials in the address.
-mirror_last_synced = Last Synced
+mirror_prune_desc = Remove obsolete remote-tracking references
+mirror_interval = Mirror Interval (valid time units are 'h', 'm', 's')
+mirror_interval_invalid = The mirror interval is not valid.
+mirror_address = Clone From URL
+mirror_address_desc = Include any required authorization credentials in the URL.
+mirror_last_synced = Last Synchronized
watchers = Watchers
stargazers = Stargazers
forks = Forks
@@ -498,15 +498,15 @@ form.reach_limit_of_creation = You have already reached your limit of %d reposit
form.name_reserved = The repository name '%s' is reserved.
form.name_pattern_not_allowed = The pattern '%s' is not allowed in a repository name.
-need_auth = Need Authorization
+need_auth = Clone Authorization
migrate_type = Migration Type
migrate_type_helper = This repository will be a mirror
migrate_repo = Migrate Repository
-migrate.clone_address = Clone Address
-migrate.clone_address_desc = This can be a HTTP/HTTPS/GIT URL
-migrate.clone_local_path = or local server path
+migrate.clone_address = Migrate / Clone From URL
+migrate.clone_address_desc = The HTTP(S) or Git 'clone' URL of an existing repository
+migrate.clone_local_path = or a local server path
migrate.permission_denied = You are not allowed to import local repositories.
-migrate.invalid_local_path = "Invalid local path; it does not exist or is not a directory."
+migrate.invalid_local_path = "The local path is invalid. It does not exist or is not a directory."
migrate.failed = Migration failed: %v
migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead.
@@ -594,7 +594,7 @@ editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v
editor.upload_files_to_dir = Upload files to '%s'
editor.cannot_commit_to_protected_branch = Cannot commit to protected branch '%s'.
-commits.desc = Commits show the change history of the code
+commits.desc = Browse source code change history.
commits.commits = Commits
commits.search = Search commits…
commits.find = Search
@@ -605,7 +605,7 @@ commits.date = Date
commits.older = Older
commits.newer = Newer
commits.signed_by = Signed by
-commits.gpg_key_id = GPG key ID
+commits.gpg_key_id = GPG Key ID
ext_issues = Ext. Issues
ext_issues.desc = Link to an external issue tracker.
@@ -851,9 +851,9 @@ activity.closed_issue_label = Closed
activity.new_issues_count_1 = New Issue
activity.new_issues_count_n = New Issues
activity.new_issue_label = Opened
-activity.title.unresolved_conv_1 = %d Unresolved conversation
-activity.title.unresolved_conv_n = %d Unresolved conversations
-activity.unresolved_conv_desc = List of all old issues and pull requests that have changed recently but have not been resolved yet.
+activity.title.unresolved_conv_1 = %d Unresolved Conversation
+activity.title.unresolved_conv_n = %d Unresolved Conversations
+activity.unresolved_conv_desc = These recently changed issues and pull requests have not been resolved yet.
activity.unresolved_conv_label = Open
activity.title.releases_1 = %d Release
activity.title.releases_n = %d Releases
@@ -876,8 +876,8 @@ settings.hooks = Webhooks
settings.githooks = Git Hooks
settings.basic_settings = Basic Settings
settings.mirror_settings = Mirror Settings
-settings.sync_mirror = Sync Now
-settings.mirror_sync_in_progress = Mirror sync in progress. Please refresh the page to check again in a minute.
+settings.sync_mirror = Synchronize Now
+settings.mirror_sync_in_progress = Mirror synchronization is in progress. Check back in a minute.
settings.site = Website
settings.update_settings = Update Settings
settings.advanced_settings = Advanced Settings
@@ -908,14 +908,14 @@ settings.pulls.allow_squash_commits = Enable Squashing to Merge Commits
settings.danger_zone = Danger Zone
settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name.
settings.convert = Convert to Regular Repository
-settings.convert_desc = You can convert this repository mirror into a regular repository. This cannot be undone.
-settings.convert_notices_1 = - This operation will convert this repository mirror into a regular repository and cannot be undone.
+settings.convert_desc = You can convert this mirror into a regular repository. This cannot be undone.
+settings.convert_notices_1 = This operation will convert the mirror into a regular repository and cannot be undone.
settings.convert_confirm = Convert Repository
-settings.convert_succeed = The repository mirror has been converted into a regular repository.
+settings.convert_succeed = The mirror has been converted into a regular repository.
settings.transfer = Transfer Ownership
-settings.transfer_desc = Transfer this repository to a user or to a group for which you have administrator rights.
+settings.transfer_desc = Transfer this repository to a user or to an organization for which you have administrator rights.
settings.transfer_notices_1 = - You will lose access to the repository if you transfer it to an individual user.
-settings.transfer_notices_2 = - You will keep access to the repository if you transfer it to a group that you (co-)own.
+settings.transfer_notices_2 = - You will keep access to the repository if you transfer it to an organization that you (co-)own.
settings.transfer_form_title = Enter the repository name as confirmation:
settings.wiki_delete = Delete Wiki Data
settings.wiki_delete_desc = Deleting repository wiki data is permanent and cannot be undone.
@@ -940,75 +940,75 @@ settings.collaborator_deletion = Remove Collaborator
settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue?
settings.remove_collaborator_success = The collaborator has been removed.
settings.search_user_placeholder = Search user…
-settings.org_not_allowed_to_be_collaborator = Groups cannot be added as a collaborator.
-settings.user_is_org_member = The user is group member who cannot be added as a collaborator.
+settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator.
+settings.user_is_org_member = The user is an organization member who cannot be added as a collaborator.
settings.add_webhook = Add Webhook
-settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gitea, we will send a notification to the target host. Learn more in the webhooks guide.
-settings.webhook_deletion = Delete Webhook
-settings.webhook_deletion_desc = Deleting a webhook removes its information and all delivery history. Continue?
-settings.webhook_deletion_success = The webhook has been deleted.
+settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the webhooks guide.
+settings.webhook_deletion = Remove Webhook
+settings.webhook_deletion_desc = Removing a webhook deletes its settings and delivery history. Continue?
+settings.webhook_deletion_success = The webhook has been removed.
settings.webhook.test_delivery = Test Delivery
-settings.webhook.test_delivery_desc = Send a fake push event delivery to test your webhook settings
-settings.webhook.test_delivery_success = Test webhook has been added to the delivery queue. It may take few seconds before it shows up in the delivery history.
+settings.webhook.test_delivery_desc = Test this webhook with a fake event.
+settings.webhook.test_delivery_success = A fake event has been added to the delivery queue. It may take few seconds before it shows up in the delivery history.
settings.webhook.request = Request
settings.webhook.response = Response
settings.webhook.headers = Headers
-settings.webhook.payload = Payload
+settings.webhook.payload = Content
settings.webhook.body = Body
-settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit files of supported hooks in the list below to perform custom operations."
+settings.githooks_desc = "Git hooks are powered by Git itself. You can edit hook files below to set up custom operations."
settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.
settings.githook_name = Hook Name
settings.githook_content = Hook Content
settings.update_githook = Update Hook
-settings.add_webhook_desc = Gitea will send a POST
request to the URL you specify, along with information about the event that occurred. You can also specify what data format you would like to receive upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our webhooks guide.
-settings.payload_url = Payload URL
-settings.content_type = Content Type
+settings.add_webhook_desc = Gitea will send POST
requests with a specified content type to the target URL. Read more in the webhooks guide.
+settings.payload_url = Target URL
+settings.content_type = POST Content Type
settings.secret = Secret
settings.slack_username = Username
settings.slack_icon_url = Icon URL
settings.discord_username = Username
settings.discord_icon_url = Icon URL
settings.slack_color = Color
-settings.event_desc = When should this webhook be triggered?
-settings.event_push_only = Just the push
event.
-settings.event_send_everything = I need everything.
-settings.event_choose = Let me choose what I need.
+settings.event_desc = Trigger On:
+settings.event_push_only = Push Events
+settings.event_send_everything = All Events
+settings.event_choose = Custom Events…
settings.event_create = Create
-settings.event_create_desc = Branch or tag created
+settings.event_create_desc = Branch or tag created.
settings.event_pull_request = Pull Request
settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared or synchronized.
settings.event_push = Push
-settings.event_push_desc = Git push to a repository
+settings.event_push_desc = Git push to a repository.
settings.event_repository = Repository
-settings.event_repository_desc = Repository created or deleted
-settings.active = Active
-settings.active_helper = Information about the event which triggered the hook will be sent as well.
-settings.add_hook_success = New webhook has been added.
+settings.event_repository_desc = Repository created or deleted.
+settings.active = Include Event Details
+settings.active_helper = Add information about the triggering event to requests.
+settings.add_hook_success = The webhook has been added.
settings.update_webhook = Update Webhook
-settings.update_hook_success = Webhook has been updated.
-settings.delete_webhook = Delete Webhook
+settings.update_hook_success = The webhook has been updated.
+settings.delete_webhook = Remove Webhook
settings.recent_deliveries = Recent Deliveries
settings.hook_type = Hook Type
-settings.add_slack_hook_desc = Add Slack integration to your repository.
+settings.add_slack_hook_desc = Integrate Slack into your repository.
settings.slack_token = Token
settings.slack_domain = Domain
settings.slack_channel = Channel
-settings.add_discord_hook_desc = Add Discord integration to your repository.
-settings.add_dingtalk_hook_desc = Add Dingtalk integration to your repository.
+settings.add_discord_hook_desc = Integrate Discord into your repository.
+settings.add_dingtalk_hook_desc = Integrate Dingtalk into your repository.
settings.deploy_keys = Deploy Keys
settings.add_deploy_key = Add Deploy Key
-settings.deploy_key_desc = Deploy keys have read-only access. They are not the same as personal account SSH keys.
-settings.is_writable = Allow write access
-settings.is_writable_info = Can this key be used to push to this repository? Deploy keys always have pull access.
-settings.no_deploy_keys = You haven't added any deploy keys.
+settings.deploy_key_desc = Deploy keys have read-only pull access to the repository.
+settings.is_writable = Enable Write Access
+settings.is_writable_info = Allow this deploy key to push to the repository.
+settings.no_deploy_keys = There are no deploy keys yet.
settings.title = Title
settings.deploy_key_content = Content
-settings.key_been_used = Deploy key content has been used.
-settings.key_name_used = Deploy key with the same name already exists.
+settings.key_been_used = A deploy key with identical content is already in use.
+settings.key_name_used = A deploy key with the same name already exists.
settings.add_key_success = The deploy key '%s' has been added.
-settings.deploy_key_deletion = Delete Deploy Key
-settings.deploy_key_deletion_desc = Deleting a deploy key will prevent this repository from being accessed with it. Continue?
-settings.deploy_key_deletion_success = The deploy key has been deleted.
+settings.deploy_key_deletion = Remove Deploy Key
+settings.deploy_key_deletion_desc = Removing a deploy key will revoke its access to this repository. Continue?
+settings.deploy_key_deletion_success = The deploy key has been removed.
settings.branches = Branches
settings.protected_branch = Branch Protection
settings.protected_branch_can_push = Allow push?
@@ -1018,11 +1018,11 @@ settings.branch_protection = Branch Protection for Branch '%s'
settings.protect_this_branch = Enable Branch Protection
settings.protect_this_branch_desc = Prevent deletion and disable Git force pushing to the branch.
settings.protect_whitelist_committers = Enable Push Whitelist
-settings.protect_whitelist_committers_desc = Allow whitelisted users or subgroups to bypass push restrictions.
+settings.protect_whitelist_committers_desc = Allow whitelisted users or teams to bypass push restrictions.
settings.protect_whitelist_users = Whitelisted users:
settings.protect_whitelist_search_users = Search users…
-settings.protect_whitelist_teams = Whitelisted subgroups:
-settings.protect_whitelist_search_teams = Search subgroups…
+settings.protect_whitelist_teams = Whitelisted teams:
+settings.protect_whitelist_search_teams = Search teams…
settings.add_protected_branch = Enable protection
settings.delete_protected_branch = Disable protection
settings.update_protect_branch_success = Branch protection for branch '%s' has been updated.
@@ -1079,69 +1079,70 @@ release.tag_name_already_exist = A release with this tag name already exists.
release.tag_name_invalid = The tag name is not valid.
release.downloads = Downloads
-branch.name = Branch name
+branch.name = Branch Name
branch.search = Search branches
-branch.already_exists = A branch named %s already exists.
+branch.already_exists = A branch named '%s' already exists.
branch.delete_head = Delete
-branch.delete = Delete Branch %s
+branch.delete = Delete Branch '%s'
branch.delete_html = Delete Branch
-branch.delete_desc = Deleting a branch is permanent. There is no way to undo it.
-branch.delete_notices_1 = - This operation CANNOT be undone.
-branch.delete_notices_2 = - This operation will permanently delete everything in branch %s.
-branch.delete_notices_html = - This operation will permanently delete everything in branch
-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 new commits have been added after merging.
+branch.delete_desc = Deleting a branch is permanent. It CANNOT be undone. Continue?
+branch.delete_notices_1 =
+branch.delete_notices_2 =
+branch.delete_notices_html =
+branch.deletion_success = Branch '%s' has been deleted.
+branch.deletion_failed = Failed to delete branch '%s'.
+branch.delete_branch_has_new_commits = Branch '%s' cannot be deleted because new commits have been added after merging.
branch.create_branch = Create branch %s
branch.create_from = from '%s'
branch.create_success = Branch '%s' has been created.
branch.branch_already_exists = Branch '%s' already exists in this repository.
-branch.branch_name_conflict = Branch name '%s' conflicts with already existing branch '%s'.
-branch.tag_collision = Branch '%s' cannot be created as tag with same name already exists in this repository.
+branch.branch_name_conflict = Branch name '%s' conflicts with the already existing branch '%s'.
+branch.tag_collision = Branch '%s' cannot be created as a tag with same name already exists in the repository.
branch.deleted_by = Deleted by %s
-branch.restore_success = Branch %s has been restored.
-branch.restore_failed = Failed to restore branch %s.
-branch.protected_deletion_failed = It's not possible to delete protected branch %s.
+branch.restore_success = Branch '%s' has been restored.
+branch.restore_failed = Failed to restore branch '%s'.
+branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted.
[org]
-org_name_holder = Group Name
-org_full_name_holder = Group Full Name
-org_name_helper = Group names should be short and memorable.
-create_org = Create Group
+org_name_holder = Organization Name
+org_full_name_holder = Organization Full Name
+org_name_helper = Organization names should be short and memorable.
+create_org = Create Organization
repo_updated = Updated
people = People
-teams = Subgroups
+teams = Teams
lower_members = members
lower_repositories = repositories
-create_new_team = New Subgroup
+create_new_team = New Team
+create_team = Create Team
org_desc = Description
-team_name = Subgroup Name
+team_name = Team Name
team_desc = Description
-team_name_helper = Subgroup names should be short and memorable.
-team_desc_helper = Describe the purpose or role of the subgroup.
+team_name_helper = Team names should be short and memorable.
+team_desc_helper = Describe the purpose or role of the team.
team_permission_desc = Permission
team_unit_desc = Allow Access to Repository Sections
-form.name_reserved = The group name '%s' is reserved.
-form.name_pattern_not_allowed = The pattern '%s' is not allowed in a group name.
-form.create_org_not_allowed = You are not allowed to create a group.
+form.name_reserved = The organization name '%s' is reserved.
+form.name_pattern_not_allowed = The pattern '%s' is not allowed in an organization name.
+form.create_org_not_allowed = You are not allowed to create an organization.
settings = Settings
-settings.options = Group
+settings.options = Organization
settings.full_name = Full Name
settings.website = Website
settings.location = Location
settings.update_settings = Update Settings
-settings.update_setting_success = Group settings have been updated.
-settings.change_orgname_prompt = Note: changing the group name also changes the group's URL.
-settings.update_avatar_success = The group avatar has been updated.
-settings.delete = Delete Group
-settings.delete_account = Delete This Group
-settings.delete_prompt = The group will be permanently removed. And, this CANNOT be undone!
+settings.update_setting_success = Organization settings have been updated.
+settings.change_orgname_prompt = Note: changing the organization name also changes the organization's URL.
+settings.update_avatar_success = The organization's avatar has been updated.
+settings.delete = Delete Organization
+settings.delete_account = Delete This Organization
+settings.delete_prompt = The organization will be permanently removed. This CANNOT be undone!
settings.confirm_delete_account = Confirm Deletion
-settings.delete_org_title = Delete Group
-settings.delete_org_desc = This group will be deleted permanently. Continue?
-settings.hooks_desc = Add webhooks which will be triggered for all repositories under this group.
+settings.delete_org_title = Delete Organization
+settings.delete_org_desc = This organization will be deleted permanently. Continue?
+settings.hooks_desc = Add webhooks which will be triggered for all repositories under this organization.
members.membership_visibility = Membership Visibility:
members.public = Visible
@@ -1159,34 +1160,34 @@ members.invite_now = Invite Now
teams.join = Join
teams.leave = Leave
teams.read_access = Read Access
-teams.read_access_helper = Members can view and clone subgroup repositories.
+teams.read_access_helper = Members can view and clone team repositories.
teams.write_access = Write Access
-teams.write_access_helper = Members can read and push to subgroup repositories.
+teams.write_access_helper = Members can read and push to team repositories.
teams.admin_access = Administrator Access
-teams.admin_access_helper = Members can pull and push to subgroup repositories and add collaborators to them.
-teams.no_desc = This subgroup has no description
+teams.admin_access_helper = Members can pull and push to team repositories and add collaborators to them.
+teams.no_desc = This team has no description
teams.settings = Settings
-teams.owners_permission_desc = Owners have full access to all repositories and have administrator access to the group.
-teams.members = Subgroup Members
+teams.owners_permission_desc = Owners have full access to all repositories and have administrator access to the organization.
+teams.members = Team Members
teams.update_settings = Update Settings
-teams.delete_team = Delete Subgroup
-teams.add_team_member = Add Subgroup Member
-teams.delete_team_title = Delete Subgroup
-teams.delete_team_desc = Deleting a subgroup revokes repository access from its members. Continue?
-teams.delete_team_success = The subgroup has been deleted.
-teams.read_permission_desc = This subgroup grants Read access: members can view and clone subgroup repositories.
-teams.write_permission_desc = This subgroup grants Write access: members can read from and push to subgroup repositories.
-teams.admin_permission_desc = This subgroup grants Admin access: members can read from, push to and add collaborators to subgroup repositories.
-teams.repositories = Subgroup Repositories
+teams.delete_team = Delete Team
+teams.add_team_member = Add Team Member
+teams.delete_team_title = Delete Team
+teams.delete_team_desc = Deleting a team revokes repository access from its members. Continue?
+teams.delete_team_success = The team has been deleted.
+teams.read_permission_desc = This team grants Read access: members can view and clone team repositories.
+teams.write_permission_desc = This team grants Write access: members can read from and push to team repositories.
+teams.admin_permission_desc = This team grants Admin access: members can read from, push to and add collaborators to team repositories.
+teams.repositories = Team Repositories
teams.search_repo_placeholder = Search repository…
-teams.add_team_repository = Add Subgroup Repository
+teams.add_team_repository = Add Team Repository
teams.remove_repo = Remove
teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first."
[admin]
dashboard = Dashboard
users = Users
-organizations = Groups
+organizations = Organizations
repositories = Repositories
authentication = Authentications
config = Configuration
@@ -1199,7 +1200,7 @@ total = Total: %d
dashboard.statistic = Summary
dashboard.operations = Operations
dashboard.system_status = System Monitor Status
-dashboard.statistic_info = The Gitea database holds %d users, %d groups, %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 authentication sources, %d webhooks, %d milestones, %d labels, %d hook tasks, %d subgroups, %d update tasks, %d attachments.
+dashboard.statistic_info = The Gitea database holds %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 authentication sources, %d webhooks, %d milestones, %d labels, %d hook tasks, %d teams, %d update tasks, %d attachments.
dashboard.operation_name = Operation Name
dashboard.operation_switch = Switch
dashboard.operation_run = Run
@@ -1278,18 +1279,18 @@ users.prohibit_login = Sign-in 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 groups
+users.allow_create_organization = Allowed to create organizations
users.update_profile = Update Account Profile
users.delete_account = Delete Account
users.still_own_repo = This user still owns one or more repositories. These repositories need to be deleted or be transferred first.
-users.still_has_org = This user is still is a member of one or more groups. This user needs to leave or delete them 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 = The account has been deleted.
-orgs.org_manage_panel = Group Management
+orgs.org_manage_panel = Organization Management
orgs.name = Name
-orgs.teams = Subgroups
+orgs.teams = Teams
orgs.members = Members
-orgs.new_orga = New Group
+orgs.new_orga = New Organization
repos.repo_manage_panel = Repository Management
repos.owner = Owner
@@ -1422,7 +1423,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 = Hide Email Addresses by Default
-config.default_allow_create_organization = Default permission to create groups
+config.default_allow_create_organization = Default permission to create organizations
config.default_enable_timetracking = Enable time tracking by default
config.default_allow_only_contributors_to_track_time = Allow only contributors to track time by default
config.no_reply_address = No-reply Address