-
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Improve multiple strings in en-US locale #26213
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
Changes from 3 commits
8d85589
6c03a40
5edb210
49658e0
5512eff
3fe1184
3c72fe7
68fb2d3
be23fc7
ac34d7e
5fbaaf5
79de8c2
120be75
8fc9f79
73740e9
6853fce
7fa1786
d27d5af
251ddfa
32ce04c
70ba259
1c24fe7
b99767b
7069d0d
c52d4b7
40c02f0
3e8b38a
2672036
95ab0ed
1e61c11
ff67ca4
85d2b9b
607941d
0a04406
d51db06
da755b4
3903db3
60eb6d2
9a85c89
faf68dc
0b87ed3
98440f2
696975d
c29d08c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -170,7 +170,7 @@ string.desc = Z - A | |||||
|
||||||
[error] | ||||||
occurred = An error occurred | ||||||
report_message = If you are sure this is a Gitea bug, please search for issues on <a href="https://github.com/go-gitea/gitea/issues" target="_blank">GitHub</a> or open a new issue if necessary. | ||||||
report_message = If believe that this is a Gitea bug, please search for issues on <a href="https://github.com/go-gitea/gitea/issues" target="_blank">GitHub</a> or open a new issue if necessary. | ||||||
missing_csrf = Bad Request: no CSRF token present | ||||||
invalid_csrf = Bad Request: invalid CSRF token | ||||||
not_found = The target couldn't be found. | ||||||
|
@@ -360,7 +360,7 @@ remember_me = Remember This Device | |||||
forgot_password_title= Forgot Password | ||||||
forgot_password = Forgot password? | ||||||
sign_up_now = Need an account? Register now. | ||||||
sign_up_successful = Account was successfully created. | ||||||
sign_up_successful = Account successfully created. Welcome! | ||||||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
confirmation_mail_sent_prompt = A new confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the registration process. | ||||||
must_change_password = Update your password | ||||||
allow_password_change = Require user to change password (recommended) | ||||||
|
@@ -609,7 +609,7 @@ form.name_chars_not_allowed = User name "%s" contains invalid characters. | |||||
[settings] | ||||||
profile = Profile | ||||||
account = Account | ||||||
appearance = Appearance | ||||||
appearance = Interface | ||||||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
password = Password | ||||||
security = Security | ||||||
avatar = Avatar | ||||||
|
@@ -622,11 +622,11 @@ delete = Delete Account | |||||
twofa = Two-Factor Authentication | ||||||
account_link = Linked Accounts | ||||||
organization = Organizations | ||||||
uid = Uid | ||||||
uid = UID | ||||||
webauthn = Security Keys | ||||||
|
||||||
public_profile = Public Profile | ||||||
biography_placeholder = Tell us a little bit about yourself | ||||||
biography_placeholder = Tell us a little bit about yourself! (Markdown enabled) | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
profile_desc = Your email address will be used for notifications and other operations. | ||||||
password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details. | ||||||
full_name = Full Name | ||||||
|
@@ -691,7 +691,7 @@ emails = Email Addresses | |||||
manage_emails = Manage Email Addresses | ||||||
manage_themes = Select default theme | ||||||
manage_openid = Manage OpenID Addresses | ||||||
email_desc = Your primary email address will be used for notifications and other operations. | ||||||
email_desc = Your primary email address will be used for notifications and Git operations made using the web interface. | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The sentence reads strange, because IMO:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
If I make a commit using a secondary email that is not primary, my primary email address will not be used. Unless if you mean pull requests.
Good point. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I see your point and I misunderstood it before. I think it means "this email will be used as the committer email for web Git operations"
Suggested change
Like this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll change it to web-based, I think it's very much clear as day and I don't think it will confuse more advanced users that would presumably use the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keep in mind, there's many users (myself included, 2 months ago) that do not get that hiding the email address results in a noreply email address being used - this should be mentioned somewhere. It's why I made that change with the padlock - the recommendation to add a tooltip that someone made to the PR (as well as a previous commit that would never make emails accessible to everyone on the Internet) has vastly improved the situation, as people are less likely to hide it. Maybe a tooltip over the "Hide Email Address" option could help later. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 32ce04c makes the text much longer, but I think that the consequences of email-related settings are very well defined. I hope that we won't have to revisit this later down the line. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The sentence There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think I can come up with a better combination of being accurate, easy to read and being transparent. I'm not a native speaker either, and we have to consider that many will use the software in this locale despite not being native speakers, so I'm definitely open to recommendations. |
||||||
theme_desc = This will be your default theme across the site. | ||||||
primary = Primary | ||||||
activated = Activated | ||||||
|
@@ -797,9 +797,9 @@ ssh_disabled = SSH Disabled | |||||
ssh_signonly = SSH is currently disabled so these keys are only used for commit signature verification. | ||||||
ssh_externally_managed = This SSH key is externally managed for this user | ||||||
manage_social = Manage Associated Social Accounts | ||||||
social_desc = These social accounts are linked to your Gitea account. Make sure you recognize all of them as they can be used to sign in to your Gitea account. | ||||||
social_desc = These social accounts can be used to sign in to your account. Make sure you recognize all of them. | ||||||
unbind = Unlink | ||||||
unbind_success = The social account has been unlinked from your Gitea account. | ||||||
unbind_success = The social account has been removed successfully. | ||||||
|
||||||
manage_access_token = Manage Access Tokens | ||||||
generate_new_token = Generate New Token | ||||||
|
@@ -833,8 +833,8 @@ remove_oauth2_application_desc = Removing an OAuth2 application will revoke acce | |||||
remove_oauth2_application_success = The application has been deleted. | ||||||
create_oauth2_application = Create a new OAuth2 Application | ||||||
create_oauth2_application_button = Create Application | ||||||
create_oauth2_application_success = You've successfully created a new OAuth2 application. | ||||||
update_oauth2_application_success = You've successfully updated the OAuth2 application. | ||||||
create_oauth2_application_success = You have successfully created a new OAuth2 application. | ||||||
update_oauth2_application_success = You have successfully updated the OAuth2 application. | ||||||
oauth2_application_name = Application Name | ||||||
oauth2_confidential_client = Confidential Client. Select for apps that keep the secret confidential, such as web apps. Do not select for native apps including desktop and mobile apps. | ||||||
oauth2_redirect_uris = Redirect URIs. Please use a new line for every URI. | ||||||
|
@@ -849,18 +849,18 @@ oauth2_application_create_description = OAuth2 applications gives your third-par | |||||
oauth2_application_remove_description = Removing an OAuth2 application will prevent it to access authorized user accounts on this instance. Continue? | ||||||
|
||||||
authorized_oauth2_applications = Authorized OAuth2 Applications | ||||||
authorized_oauth2_applications_description = You've granted access to your personal Gitea account to these third party applications. Please revoke access for applications no longer needed. | ||||||
authorized_oauth2_applications_description = You have granted access to your personal Gitea account to these third party applications. Please revoke access for applications no longer needed. | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
revoke_key = Revoke | ||||||
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 = You've revoked access successfully. | ||||||
revoke_oauth2_grant_success = Access revoked successfully. | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
twofa_desc = Two-factor authentication enhances the security of your account. | ||||||
twofa_is_enrolled = Your account is currently <strong>enrolled</strong> in two-factor authentication. | ||||||
twofa_not_enrolled = Your account is not currently enrolled in two-factor authentication. | ||||||
twofa_disable = Disable Two-Factor Authentication | ||||||
twofa_scratch_token_regenerate = Regenerate Scratch Token | ||||||
twofa_scratch_token_regenerated = Your scratch token is now %s. Store it in a safe place. | ||||||
twofa_scratch_token_regenerated = Your scratch token is now %s. Please store it in a safe place now, as it will not be shown again later. | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
twofa_enroll = Enroll into Two-Factor Authentication | ||||||
twofa_disable_note = You can disable two-factor authentication if needed. | ||||||
twofa_disable_desc = Disabling two-factor authentication will make your account less secure. Continue? | ||||||
|
@@ -890,7 +890,7 @@ remove_account_link_success = The linked account has been removed. | |||||
hooks.desc = Add webhooks which will be triggered for <strong>all repositories</strong> owned by this user. | ||||||
|
||||||
orgs_none = You are not a member of any organizations. | ||||||
repos_none = You do not own any repositories | ||||||
repos_none = You do not own any repositories. | ||||||
|
||||||
delete_account = Delete Your Account | ||||||
delete_prompt = This operation will permanently delete your user account. It <strong>CANNOT</strong> be undone. | ||||||
|
@@ -914,7 +914,7 @@ visibility.private = Private | |||||
visibility.private_tooltip = Visible only to organization members | ||||||
|
||||||
[repo] | ||||||
new_repo_helper = A repository contains all project files, including revision history. Already have it elsewhere? <a href="%s">Migrate repository.</a> | ||||||
new_repo_helper = A repository contains all project files, including revision history. Already hosting one elsewhere? <a href="%s">Migrate repository.</a> | ||||||
owner = Owner | ||||||
owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit. | ||||||
repo_name = Repository Name | ||||||
|
@@ -972,8 +972,8 @@ mirror_interval_invalid = The mirror interval is not valid. | |||||
mirror_sync_on_commit = Sync when commits are pushed | ||||||
mirror_address = Clone From URL | ||||||
mirror_address_desc = Put any required credentials in the Authorization section. | ||||||
mirror_address_url_invalid = The provided url is invalid. You must escape all components of the url correctly. | ||||||
mirror_address_protocol_invalid = The provided url is invalid. Only http(s):// or git:// locations can be mirrored from. | ||||||
mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the url correctly. | ||||||
mirror_address_protocol_invalid = The provided URL is invalid. Only http(s):// or git:// locations can be used for mirroring. | ||||||
mirror_lfs = Large File Storage (LFS) | ||||||
mirror_lfs_desc = Activate mirroring of LFS data. | ||||||
mirror_lfs_endpoint = LFS Endpoint | ||||||
|
@@ -1005,8 +1005,8 @@ transfer.accept = Accept Transfer | |||||
transfer.accept_desc = Transfer to "%s" | ||||||
transfer.reject = Reject Transfer | ||||||
transfer.reject_desc = Cancel transfer to "%s" | ||||||
transfer.no_permission_to_accept = You do not have permission to Accept | ||||||
transfer.no_permission_to_reject = You do not have permission to Reject | ||||||
transfer.no_permission_to_accept = You do not have permission to accept this transfer. | ||||||
transfer.no_permission_to_reject = You do not have permission to reject this transfer. | ||||||
|
||||||
desc.private = Private | ||||||
desc.public = Public | ||||||
|
@@ -1027,8 +1027,8 @@ template.issue_labels = Issue Labels | |||||
template.one_item = Must select at least one template item | ||||||
template.invalid = Must select a template repository | ||||||
|
||||||
archive.title = This repo is archived. You can view files and clone it, but cannot push or open issues/pull-requests. | ||||||
archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or open issues/pull-requests. | ||||||
archive.title = This repo is archived. You can view files and clone it, but cannot push or open issues and pull requests. | ||||||
archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or open issues and pull requests. | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
archive.issue.nocomment = This repo is archived. You cannot comment on issues. | ||||||
archive.pull.nocomment = This repo is archived. You cannot comment on pull requests. | ||||||
|
||||||
|
@@ -1045,7 +1045,7 @@ migrate_options_lfs = Migrate LFS files | |||||
migrate_options_lfs_endpoint.label = LFS Endpoint | ||||||
migrate_options_lfs_endpoint.description = Migration will attempt to use your Git remote to <a target="_blank" rel="noopener noreferrer" href="%s">determine the LFS server</a>. You can also specify a custom endpoint if the repository LFS data is stored somewhere else. | ||||||
migrate_options_lfs_endpoint.description.local = A local server path is supported too. | ||||||
migrate_options_lfs_endpoint.placeholder = Leave blank to derive from clone URL | ||||||
migrate_options_lfs_endpoint.placeholder = If left blank, the endpoint will be derived from the clone URL | ||||||
migrate_items = Migration Items | ||||||
migrate_items_wiki = Wiki | ||||||
migrate_items_milestones = Milestones | ||||||
|
@@ -1421,7 +1421,7 @@ issues.filter_sort.moststars = Most stars | |||||
issues.filter_sort.feweststars = Fewest stars | ||||||
issues.filter_sort.mostforks = Most forks | ||||||
issues.filter_sort.fewestforks = Fewest forks | ||||||
issues.keyword_search_unavailable = Currently searching by keyword is not available. Please contact your site administrator. | ||||||
issues.keyword_search_unavailable = Searching by keyword is currently not available. Please contact your site administrator. | ||||||
issues.action_open = Open | ||||||
issues.action_close = Close | ||||||
issues.action_label = Label | ||||||
|
@@ -1564,7 +1564,7 @@ issues.due_date_form = "yyyy-mm-dd" | |||||
issues.due_date_form_add = "Add due date" | ||||||
issues.due_date_form_edit = "Edit" | ||||||
issues.due_date_form_remove = "Remove" | ||||||
issues.due_date_not_writer = "You need repository write access to update an issue's due date." | ||||||
issues.due_date_not_writer = "You need write access to this repository in order to update an issue's due date." | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
issues.due_date_not_set = "No due date set." | ||||||
issues.due_date_added = "added the due date %s %s" | ||||||
issues.due_date_modified = "modified the due date from %[2]s to %[1]s %[3]s" | ||||||
|
@@ -1700,12 +1700,12 @@ pulls.is_empty = "The changes on this branch are already on the target branch. T | |||||
pulls.required_status_check_failed = Some required checks were not successful. | ||||||
pulls.required_status_check_missing = Some required checks are missing. | ||||||
pulls.required_status_check_administrator = As an administrator, you may still merge this pull request. | ||||||
pulls.blocked_by_approvals = "This Pull Request doesn't have enough approvals yet. %d of %d approvals granted." | ||||||
pulls.blocked_by_rejection = "This Pull Request has changes requested by an official reviewer." | ||||||
pulls.blocked_by_official_review_requests = "This Pull Request has official review requests." | ||||||
pulls.blocked_by_outdated_branch = "This Pull Request is blocked because it's outdated." | ||||||
pulls.blocked_by_changed_protected_files_1= "This Pull Request is blocked because it changes a protected file:" | ||||||
pulls.blocked_by_changed_protected_files_n= "This Pull Request is blocked because it changes protected files:" | ||||||
pulls.blocked_by_approvals = "This pull request doesn't have enough approvals yet. %d of %d approvals granted." | ||||||
pulls.blocked_by_rejection = "This pull request has changes requested by an official reviewer." | ||||||
pulls.blocked_by_official_review_requests = "This pull request has official review requests." | ||||||
pulls.blocked_by_outdated_branch = "This pull request is blocked because it's outdated." | ||||||
pulls.blocked_by_changed_protected_files_1= "This pull request is blocked because it changes a protected file:" | ||||||
pulls.blocked_by_changed_protected_files_n= "This pull request is blocked because it changes protected files:" | ||||||
pulls.can_auto_merge_desc = This pull request can be merged automatically. | ||||||
pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts. | ||||||
pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts. | ||||||
|
@@ -1723,7 +1723,7 @@ pulls.no_merge_desc = This pull request cannot be merged because all repository | |||||
pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually. | ||||||
pulls.no_merge_wip = This pull request cannot be merged because it is marked as being a work in progress. | ||||||
pulls.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks. | ||||||
pulls.no_merge_access = You are not authorized to merge this pull request. | ||||||
pulls.no_merge_access = You are not authorized to merge This pull request. | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
pulls.merge_pull_request = Create merge commit | ||||||
pulls.rebase_merge_pull_request = Rebase then fast-forward | ||||||
pulls.rebase_merge_commit_pull_request = Rebase then create merge commit | ||||||
|
@@ -1772,7 +1772,7 @@ pulls.auto_merge_has_pending_schedule = %[1]s scheduled this pull request to aut | |||||
|
||||||
pulls.auto_merge_cancel_schedule = Cancel auto merge | ||||||
pulls.auto_merge_not_scheduled = This pull request is not scheduled to auto merge. | ||||||
pulls.auto_merge_canceled_schedule = The auto merge was canceled for this pull request. | ||||||
pulls.auto_merge_canceled_schedule = The auto merge was cancelled for this pull request. | ||||||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
pulls.auto_merge_newly_scheduled_comment = `scheduled this pull request to auto merge when all checks succeed %[1]s` | ||||||
pulls.auto_merge_canceled_schedule_comment = `canceled auto merging this pull request when all checks succeed %[1]s` | ||||||
|
@@ -1788,7 +1788,7 @@ milestones.update_ago = Updated %s | |||||
milestones.no_due_date = No due date | ||||||
milestones.open = Open | ||||||
milestones.close = Close | ||||||
milestones.new_subheader = Milestones organize issues and track progress. | ||||||
milestones.new_subheader = Milestones can help you organize issues and track their progress. | ||||||
milestones.completeness = <strong>%d%%</strong> Completed | ||||||
milestones.create = Create Milestone | ||||||
milestones.title = Title | ||||||
|
@@ -2308,17 +2308,17 @@ settings.matrix.room_id = Room ID | |||||
settings.matrix.message_type = Message Type | ||||||
settings.archive.button = Archive Repo | ||||||
settings.archive.header = Archive This Repo | ||||||
settings.archive.text = Archiving the repo will make it entirely read-only. It is hidden from the dashboard, cannot be committed to and no issues or pull-requests can be created. | ||||||
settings.archive.text = Archiving the repo will make it entirely read-only. It will be hidden from the dashboard. Nobody (not even you!) will be able to make new commits, issues and pull requests. | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
settings.archive.success = The repo was successfully archived. | ||||||
settings.archive.error = An error occurred while trying to archive the repo. See the log for more details. | ||||||
settings.archive.error_ismirror = You cannot archive a mirrored repo. | ||||||
settings.archive.branchsettings_unavailable = Branch settings are not available if the repo is archived. | ||||||
settings.archive.tagsettings_unavailable = Tag settings are not available if the repo is archived. | ||||||
settings.unarchive.button = Un-Archive Repo | ||||||
settings.unarchive.header = Un-Archive This Repo | ||||||
settings.unarchive.text = Un-Archiving the repo will restore its ability to receive commits and pushes, as well as new issues and pull-requests. | ||||||
settings.unarchive.success = The repo was successfully un-archived. | ||||||
settings.unarchive.error = An error occurred while trying to un-archive the repo. See the log for more details. | ||||||
settings.unarchive.button = Unarchive Repo | ||||||
settings.unarchive.header = Unarchive This Repo | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
settings.unarchive.text = Unarchiving the repo will restore its ability to receive commits and pushes, as well as new issues and pull-requests. | ||||||
settings.unarchive.success = The repo was successfully unarchived. | ||||||
settings.unarchive.error = An error occurred while trying to unarchive the repo. See the log for more details. | ||||||
settings.update_avatar_success = The repository avatar has been updated. | ||||||
settings.lfs=LFS | ||||||
settings.lfs_filelist=LFS files stored in this repository | ||||||
|
@@ -2442,7 +2442,7 @@ release.edit_release = Update Release | |||||
release.delete_release = Delete Release | ||||||
release.delete_tag = Delete Tag | ||||||
release.deletion = Delete Release | ||||||
release.deletion_desc = Deleting a release only removes it from Gitea. Git tag, repository contents and history remain unchanged. Continue? | ||||||
release.deletion_desc = Deleting a release only removes it from Gitea. The Git tag, your repository's contents and its history will not be affected. Continue? | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
release.deletion_success = The release has been deleted. | ||||||
release.deletion_tag_desc = Will delete this tag from repository. Repository contents and history remain unchanged. Continue? | ||||||
release.deletion_tag_success = The tag has been deleted. | ||||||
|
@@ -2463,7 +2463,7 @@ branch.already_exists = A branch named "%s" already exists. | |||||
branch.delete_head = Delete | ||||||
branch.delete = Delete Branch "%s" | ||||||
branch.delete_html = Delete Branch | ||||||
branch.delete_desc = Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue? | ||||||
branch.delete_desc = Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue? | ||||||
n0toose marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
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. | ||||||
|
Uh oh!
There was an error while loading. Please reload this page.