mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 07:09:21 +01:00
Merge pull request '[v7.0/forgejo] English improvements' (#2929) from bp-v7.0/forgejo-d183d32 into v7.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2929
This commit is contained in:
commit
ece5c97931
1 changed files with 33 additions and 35 deletions
|
@ -146,15 +146,15 @@ name = Name
|
|||
value = Value
|
||||
|
||||
filter = Filter
|
||||
filter.clear = Clear Filter
|
||||
filter.clear = Clear filters
|
||||
filter.is_archived = Archived
|
||||
filter.not_archived = Not Archived
|
||||
filter.not_archived = Not archived
|
||||
filter.is_fork = Forked
|
||||
filter.not_fork = Not Forked
|
||||
filter.not_fork = Not forked
|
||||
filter.is_mirror = Mirrored
|
||||
filter.not_mirror = Not Mirrored
|
||||
filter.not_mirror = Not mirrored
|
||||
filter.is_template = Template
|
||||
filter.not_template = Not Template
|
||||
filter.not_template = Not template
|
||||
filter.public = Public
|
||||
filter.private = Private
|
||||
|
||||
|
@ -222,7 +222,7 @@ missing_csrf = Bad Request: no CSRF token present
|
|||
invalid_csrf = Bad Request: invalid CSRF token
|
||||
not_found = The target couldn't be found.
|
||||
network_error = Network error
|
||||
server_internal = Internal Server Error
|
||||
server_internal = Internal server error
|
||||
|
||||
[startpage]
|
||||
app_desc = A painless, self-hosted Git service
|
||||
|
@ -762,7 +762,6 @@ password_incorrect = The current password is incorrect.
|
|||
change_password_success = Your password has been updated. Sign in using your new password from now on.
|
||||
password_change_disabled = Non-local users cannot update their password through the Forgejo web interface.
|
||||
|
||||
emails = Email addresses
|
||||
manage_emails = Manage email addresses
|
||||
manage_themes = Select default theme
|
||||
manage_openid = Manage OpenID addresses
|
||||
|
@ -893,9 +892,9 @@ repo_and_org_access = Repository and Organization Access
|
|||
permissions_public_only = Public only
|
||||
permissions_access_all = All (public, private, and limited)
|
||||
select_permissions = Select permissions
|
||||
permission_no_access = No Access
|
||||
permission_no_access = No access
|
||||
permission_read = Read
|
||||
permission_write = Read and Write
|
||||
permission_write = Read and write
|
||||
access_token_desc = Selected token permissions limit authorization only to the corresponding <a %s>API</a> routes. Read the <a %s>documentation</a> for more information.
|
||||
at_least_one_permission = You must select at least one permission to create a token
|
||||
permissions_list = Permissions:
|
||||
|
@ -915,8 +914,8 @@ oauth2_confidential_client = Confidential client. Select for apps that keep the
|
|||
oauth2_redirect_uris = Redirect URIs. Please use a new line for every URI.
|
||||
save_application = Save
|
||||
oauth2_client_id = Client ID
|
||||
oauth2_client_secret = Client Secret
|
||||
oauth2_regenerate_secret = Regenerate Secret
|
||||
oauth2_client_secret = Client secret
|
||||
oauth2_regenerate_secret = Regenerate secret
|
||||
oauth2_regenerate_secret_hint = Lost your secret?
|
||||
oauth2_client_secret_hint = The secret will not be shown again after you leave or refresh this page. Please ensure that you have saved it.
|
||||
oauth2_application_edit = Edit
|
||||
|
@ -927,7 +926,7 @@ oauth2_application_locked = Forgejo pre-registers some OAuth2 applications on st
|
|||
authorized_oauth2_applications = Authorized OAuth2 applications
|
||||
authorized_oauth2_applications_description = You have granted access to your personal Forgejo account to these third party applications. Please revoke access for applications that are no longer in use.
|
||||
revoke_key = Revoke
|
||||
revoke_oauth2_grant = Revoke Access
|
||||
revoke_oauth2_grant = Revoke access
|
||||
revoke_oauth2_grant_description = Revoking access for this third party application will prevent this application from accessing your data. Are you sure?
|
||||
revoke_oauth2_grant_success = Access revoked successfully.
|
||||
|
||||
|
@ -1143,7 +1142,6 @@ form.name_pattern_not_allowed = The pattern "%s" is not allowed in a repository
|
|||
|
||||
need_auth = Authorization
|
||||
migrate_options = Migration options
|
||||
migrate_service = Migration service
|
||||
migrate_options_mirror_helper = This repository will be a mirror
|
||||
migrate_options_lfs = Migrate LFS files
|
||||
migrate_options_lfs_endpoint.label = LFS endpoint
|
||||
|
@ -1254,11 +1252,11 @@ n_tag_few=%s tags
|
|||
released_this = released this
|
||||
file.title = %s at %s
|
||||
file_raw = Raw
|
||||
file_follow = Follow Symlink
|
||||
file_follow = Follow symlink
|
||||
file_history = History
|
||||
file_view_source = View Source
|
||||
file_view_rendered = View Rendered
|
||||
file_view_raw = View Raw
|
||||
file_view_source = View source
|
||||
file_view_rendered = View rendered
|
||||
file_view_raw = View raw
|
||||
file_permalink = Permalink
|
||||
file_too_large = The file is too large to be shown.
|
||||
invisible_runes_header = `This file contains invisible Unicode characters`
|
||||
|
@ -1313,8 +1311,8 @@ editor.name_your_file = Name your file…
|
|||
editor.filename_help = Add a directory by typing its name followed by a slash ("/"). Remove a directory by typing backspace at the beginning of the input field.
|
||||
editor.or = or
|
||||
editor.cancel_lower = Cancel
|
||||
editor.commit_signed_changes = Commit Signed Changes
|
||||
editor.commit_changes = Commit Changes
|
||||
editor.commit_signed_changes = Commit signed changes
|
||||
editor.commit_changes = Commit changes
|
||||
editor.add_tmpl = Add "<filename>"
|
||||
editor.add = Add %s
|
||||
editor.update = Update %s
|
||||
|
@ -1342,9 +1340,9 @@ editor.file_is_a_symlink = `"%s" is a symbolic link. Symbolic links cannot be ed
|
|||
editor.filename_is_a_directory = Filename "%s" is already used as a directory name in this repository.
|
||||
editor.file_editing_no_longer_exists = The file being edited, "%s", no longer exists in this repository.
|
||||
editor.file_deleting_no_longer_exists = The file being deleted, "%s", no longer exists in this repository.
|
||||
editor.file_changed_while_editing = The file contents have changed since you started editing. <a target="_blank" rel="noopener noreferrer" href="%s">Click here</a> to see them or <strong>Commit Changes again</strong> to overwrite them.
|
||||
editor.file_changed_while_editing = The file contents have changed since you started editing. <a target="_blank" rel="noopener noreferrer" href="%s">Click here</a> to see them or <strong>Commit changes again</strong> to overwrite them.
|
||||
editor.file_already_exists = A file named "%s" already exists in this repository.
|
||||
editor.commit_id_not_matching = The Commit ID does not match the ID when you began editing. Commit into a patch branch and then merge.
|
||||
editor.commit_id_not_matching = The commit ID does not match the one you was editing. Commit to a new branch and then merge.
|
||||
editor.push_out_of_date = The push appears to be out of date.
|
||||
editor.commit_empty_file_header = Commit an empty file
|
||||
editor.commit_empty_file_text = The file you're about to commit is empty. Proceed?
|
||||
|
@ -1419,26 +1417,26 @@ projects.edit_subheader = Projects organize issues and track progress.
|
|||
projects.modify = Edit project
|
||||
projects.edit_success = Project "%s" has been updated.
|
||||
projects.type.none = None
|
||||
projects.type.basic_kanban = Basic Kanban
|
||||
projects.type.bug_triage = Bug Triage
|
||||
projects.type.basic_kanban = Basic kanban
|
||||
projects.type.bug_triage = Bug triage
|
||||
projects.template.desc = Template
|
||||
projects.template.desc_helper = Select a project template to get started
|
||||
projects.column.edit = Edit Column
|
||||
projects.column.edit = Edit column
|
||||
projects.column.edit_title = Name
|
||||
projects.column.new_title = Name
|
||||
projects.column.new_submit = Create Column
|
||||
projects.column.new = New Column
|
||||
projects.column.set_default = Set Default
|
||||
projects.column.new_submit = Create column
|
||||
projects.column.new = New column
|
||||
projects.column.set_default = Set default
|
||||
projects.column.set_default_desc = Set this column as default for uncategorized issues and pulls
|
||||
projects.column.delete = Delete Column
|
||||
projects.column.delete = Delete column
|
||||
projects.column.deletion_desc = Deleting a project column moves all related issues to the default column. Continue?
|
||||
projects.column.color = Color
|
||||
projects.open = Open
|
||||
projects.close = Close
|
||||
projects.column.assigned_to = Assigned to
|
||||
projects.card_type.desc = Card Previews
|
||||
projects.card_type.images_and_text = Images and Text
|
||||
projects.card_type.text_only = Text Only
|
||||
projects.card_type.desc = Card previews
|
||||
projects.card_type.images_and_text = Images and text
|
||||
projects.card_type.text_only = Text only
|
||||
|
||||
issues.desc = Organize bug reports, tasks and milestones.
|
||||
issues.filter_assignees = Filter Assignee
|
||||
|
@ -1449,7 +1447,7 @@ issues.filter_reviewers = Filter Reviewer
|
|||
issues.new = New issue
|
||||
issues.new.title_empty = Title cannot be empty
|
||||
issues.new.labels = Labels
|
||||
issues.new.no_label = No label
|
||||
issues.new.no_label = No labels
|
||||
issues.new.clear_labels = Clear labels
|
||||
issues.new.projects = Projects
|
||||
issues.new.clear_projects = Clear projects
|
||||
|
@ -1606,7 +1604,7 @@ issues.re_request_review=Re-request review
|
|||
issues.is_stale = There have been changes to this PR since this review
|
||||
issues.remove_request_review=Remove review request
|
||||
issues.remove_request_review_block=Can't remove review request
|
||||
issues.dismiss_review = Dismiss Review
|
||||
issues.dismiss_review = Dismiss review
|
||||
issues.dismiss_review_warning = Are you sure you want to dismiss this review?
|
||||
issues.sign_in_require_desc = <a href="%s">Sign in</a> to join this conversation.
|
||||
issues.edit = Edit
|
||||
|
@ -1980,7 +1978,7 @@ signing.wont_sign.commitssigned = The merge will not be signed as all the associ
|
|||
signing.wont_sign.approved = The merge will not be signed as the PR is not approved.
|
||||
signing.wont_sign.not_signed_in = You are not signed in.
|
||||
|
||||
ext_wiki = Access to External Wiki
|
||||
ext_wiki = Access to external Wiki
|
||||
ext_wiki.desc = Link to an external wiki.
|
||||
|
||||
wiki = Wiki
|
||||
|
@ -3180,7 +3178,7 @@ config.repo_root_path = Repository root path
|
|||
config.lfs_root_path = LFS root path
|
||||
config.log_file_root_path = Log path
|
||||
config.script_type = Script type
|
||||
config.reverse_auth_user = Reverse authentication user
|
||||
config.reverse_auth_user = Reverse proxy authentication user
|
||||
|
||||
config.ssh_config = SSH configuration
|
||||
config.ssh_enabled = Enabled
|
||||
|
|
Loading…
Reference in a new issue