diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a6be3c5d8..27e549446 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -88,13 +88,13 @@ lfs_path = Git LFS Root Path lfs_path_helper = Files tracked by Git LFS will be stored in this directory. Leave empty to disable. run_user = Run As Username run_user_helper = Enter the operating system username that runs Gitea. Note that this user must have access to the repository root path. -domain = SSH Domain +domain = Server SSH Domain domain_helper = Domain or host address for SSH clone URLs. -ssh_port = SSH Port +ssh_port = Server SSH Port ssh_port_helper = Port number your SSH server listens on. Leave empty to disable. -http_port = HTTP Port -http_port_helper = Port number that the Gitea web interface will listen on. -app_url = Site URL +http_port = Gitea HTTP Listen Port +http_port_helper = Port number the Giteas web server will listen on. +app_url = Gitea Base URL app_url_helper = Base address for HTTP(S) clone URLs and email notifications. log_root_path = Log Path log_root_path_helper = Log files will be written to this directory. @@ -127,10 +127,10 @@ require_sign_in_view = Require Sign-In to View Pages require_sign_in_view_popup = Limit page access to signed-in users. Visitors will only see the 'sign in' and registration pages. admin_setting_desc = Creating an administrator account is optional. The first registered user will automatically become an administrator. admin_title = Administrator Account Settings -admin_name = Username +admin_name = Administrator Username admin_password = Password confirm_password = Confirm Password -admin_email = Administrator Email Address +admin_email = Email Address install_btn_confirm = Install Gitea test_git_failed = Could not test 'git' command: %v sqlite3_not_available = This Gitea version does not support SQLite3. Please download the official binary version from %s (not the 'gobuild' version). @@ -264,12 +264,12 @@ 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. -team_no_units_error = Enable at least on unit for the subgroup. +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. username_password_incorrect = Username or password is incorrect. enterred_invalid_repo_name = The repository name you entered is incorrect. -enterred_invalid_owner_name = The owner 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. @@ -532,7 +532,7 @@ push_exist_repo = Pushing an existing repository from the command line bare_message = This repository does not contain any content. code = Code -code.desc = Code is where the code is stored +code.desc = Access source code, files, commits and branches. branch = Branch tree = Tree filter_branch_and_tag = Filter branch or tag @@ -607,10 +607,10 @@ commits.newer = Newer commits.signed_by = Signed by commits.gpg_key_id = GPG key ID -ext_issues = Ext Issues -ext_issues.desc = Ext Issues link to an external issue management page +ext_issues = Ext. Issues +ext_issues.desc = Link to an external issue tracker. -issues.desc = Issues is the place to manage tasks and bugs +issues.desc = Organize bug reports, tasks and milestones. issues.new = New Issue issues.new.labels = Labels issues.new.no_label = No Label @@ -733,7 +733,7 @@ issues.cancel_tracking = Cancel issues.cancel_tracking_history = `cancelled time tracking %s` issues.time_spent_total = Total Time Spent -pulls.desc = Pulls management your code review and merge requests +pulls.desc = Enable merge requests and code reviews. pulls.new = New Pull Request pulls.compare_changes = New Pull Request pulls.compare_changes_desc = Select the branch to merge into and the branch to pull from. @@ -795,13 +795,13 @@ milestones.filter_sort.most_complete = Most complete milestones.filter_sort.most_issues = Most issues milestones.filter_sort.least_issues = Least issues -ext_wiki = Ext Wiki -ext_wiki.desc = Ext Wiki links to an external wiki system +ext_wiki = Ext. Wiki +ext_wiki.desc = Link to an external wiki. wiki = Wiki wiki.welcome = Welcome to the Wiki. wiki.welcome_desc = The wiki lets you write and share documentation with collaborators. -wiki.desc = Wiki is a place to store documentation +wiki.desc = Write and share documentation with collaborators. wiki.create_first_page = Create the First Page wiki.page = Page wiki.filter_page = Filter page @@ -868,7 +868,7 @@ settings = Settings settings.desc = Settings is where you can manage the settings for the repository settings.options = Repository settings.collaboration = Collaborators -settings.collaboration.admin = Administer +settings.collaboration.admin = Administrator settings.collaboration.write = Write settings.collaboration.read = Read settings.collaboration.undefined = Undefined @@ -928,7 +928,7 @@ settings.delete_notices_1 = - This operation CANNOT be undone. settings.delete_notices_2 = - This operation will permanently delete the %s repository including code, issues, comments, wiki data and collaborator settings. settings.delete_notices_fork_1 = - Forks of this repository will become independent after deletion. settings.deletion_success = The repository has been deleted. -settings.update_settings_success = Repository settings have been updated. +settings.update_settings_success = The repository settings have been updated. settings.transfer_owner = New Owner settings.make_transfer = Perform Transfer settings.transfer_succeed = The repository has been transferred. @@ -937,7 +937,7 @@ settings.add_collaborator = Add Collaborator settings.add_collaborator_success = The collaborator has been added. settings.delete_collaborator = Remove settings.collaborator_deletion = Remove Collaborator -settings.collaborator_deletion_desc = Removing a collaborator will revoke the user's access to this repository. Continue? +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. @@ -1009,29 +1009,29 @@ 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.branches=Branches -settings.protected_branch=Branch Protection -settings.protected_branch_can_push=Allow push? -settings.protected_branch_can_push_yes=You can push -settings.protected_branch_can_push_no=You can not push -settings.branch_protection = Branch Protection for %s -settings.protect_this_branch = Protect this branch -settings.protect_this_branch_desc = Disable force pushes and prevent deletion. -settings.protect_whitelist_committers = Whitelist who can push to this branch -settings.protect_whitelist_committers_desc = Add users or subgroups to this branch's whitelist. Whitelisted users bypass the typical push restrictions. -settings.protect_whitelist_users = Users who can push to this branch -settings.protect_whitelist_search_users = Search users -settings.protect_whitelist_teams = Subgroups whose members can push to this branch. -settings.protect_whitelist_search_teams = Search subgroups -settings.add_protected_branch=Enable protection -settings.delete_protected_branch=Disable protection -settings.update_protect_branch_success = Branch %s protect options changed. -settings.remove_protected_branch_success= Branch %s protect options removed. -settings.protected_branch_deletion=To delete a protected branch -settings.protected_branch_deletion_desc=Anyone with write permissions will be able to push directly to this branch. Continue? -settings.default_branch_desc = The default branch is considered the "base" branch in your repository against which all pull requests and code commits are automatically made, unless you specify a different branch. +settings.branches = Branches +settings.protected_branch = Branch Protection +settings.protected_branch_can_push = Allow push? +settings.protected_branch_can_push_yes = You can push +settings.protected_branch_can_push_no = You can not push +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_users = Whitelisted users: +settings.protect_whitelist_search_users = Search users… +settings.protect_whitelist_teams = Whitelisted subgroups: +settings.protect_whitelist_search_teams = Search subgroups… +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. +settings.remove_protected_branch_success = Branch protection for branch '%s' has been disabled. +settings.protected_branch_deletion = Disable Branch Protection +settings.protected_branch_deletion_desc = Disabling branch protection allows users with write permission to push to the branch. Continue? +settings.default_branch_desc = Select a default repository branch for pull requests and code commits: settings.choose_branch = Choose a branch… -settings.no_protected_branch = There are no protected branches +settings.no_protected_branch = There are no protected branches. diff.browse_source = Browse Source diff.parent = parent @@ -1046,7 +1046,7 @@ diff.view_file = View File diff.file_suppressed = File diff suppressed because it is too large diff.too_many_files = Some files were not shown because too many files changed in this diff -releases.desc = Releases is the place to manage versions of your project +releases.desc = Track project versions and downloads. release.releases = Releases release.new_release = New Release release.draft = Draft @@ -1106,7 +1106,7 @@ branch.protected_deletion_failed = It's not possible to delete protected branch [org] org_name_holder = Group Name org_full_name_holder = Group Full Name -org_name_helper = Great group names are short and memorable. +org_name_helper = Group names should be short and memorable. create_org = Create Group repo_updated = Updated people = People @@ -1117,10 +1117,10 @@ create_new_team = New Subgroup org_desc = Description team_name = Subgroup Name team_desc = Description -team_name_helper = You will use this name to mention this subgroup in conversations. -team_desc_helper = What is this subgroup for? -team_permission_desc = What permissions should this subgroup have? -team_unit_desc = Which units should this subgroup have access to? +team_name_helper = Subgroup names should be short and memorable. +team_desc_helper = Describe the purpose or role of the subgroup. +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. @@ -1159,24 +1159,24 @@ members.invite_now = Invite Now teams.join = Join teams.leave = Leave teams.read_access = Read Access -teams.read_access_helper = This subgroup will be able to view and clone its repositories. +teams.read_access_helper = Members can view and clone subgroup repositories. teams.write_access = Write Access -teams.write_access_helper = This subgroup will be able to read and push to its repositories. +teams.write_access_helper = Members can read and push to subgroup repositories. teams.admin_access = Administrator Access -teams.admin_access_helper = This subgroup will be able to push and pull to its repositories, as well as add other collaborators to them. +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.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.update_settings = Update Settings -teams.delete_team = Delete This Subgroup +teams.delete_team = Delete Subgroup teams.add_team_member = Add Subgroup Member teams.delete_team_title = Delete Subgroup -teams.delete_team_desc = Because this subgroup will be deleted, members of this subgroup may lose access to some repositories. Continue? +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 the subgroup's repositories. -teams.write_permission_desc = This subgroup grants Write access: members can read from and push to the subgroup's repositories. -teams.admin_permission_desc = This subgroup grants Admin access: members can read from, push to and add collaborators to the subgroup's repositories. +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.search_repo_placeholder = Search repository… teams.add_team_repository = Add Subgroup Repository @@ -1289,7 +1289,7 @@ orgs.org_manage_panel = Group Management orgs.name = Name orgs.teams = Subgroups orgs.members = Members -orgs.new_orga = Create Group +orgs.new_orga = New Group repos.repo_manage_panel = Repository Management repos.owner = Owner @@ -1574,5 +1574,5 @@ error.not_signed_commit = "Not a signed commit" error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer account" [units] -error.no_unit_allowed_repo = Cannot find any unit on this repository which you are allowed to access -error.unit_not_allowed = You are not allowed to visit this repository unit +error.no_unit_allowed_repo = You are not allowed to access any section of this repository. +error.unit_not_allowed = You are not allowed to access this repository section.