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

Improve multiple strings in en-US locale #26213

Merged
merged 44 commits into from
Aug 8, 2023
Merged
Changes from 14 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
8d85589
Improve multiple strings in en-US locale
n0toose Jul 28, 2023
6c03a40
Fix mistake, improve wording in two other strings
n0toose Jul 29, 2023
5edb210
Just one improvement.
n0toose Jul 29, 2023
49658e0
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
5512eff
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
3fe1184
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
3c72fe7
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
68fb2d3
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
be23fc7
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
ac34d7e
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
5fbaaf5
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
79de8c2
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
120be75
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
8fc9f79
Address comments by wxiaoguang
n0toose Jul 29, 2023
73740e9
Put Gitea issues URL in parameters
delvh Jul 29, 2023
6853fce
Address (some) comments by wxiaoguang
n0toose Jul 29, 2023
7fa1786
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
d27d5af
Remove you've in detailed, formal-sounding strings
n0toose Jul 29, 2023
251ddfa
Actually add that new parameter to template
n0toose Jul 29, 2023
32ce04c
Make purpose of primary email much more explicit
n0toose Jul 29, 2023
70ba259
Additional set of string improvements
n0toose Jul 29, 2023
1c24fe7
Remove John Smith example entirely.
n0toose Jul 29, 2023
b99767b
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
7069d0d
Merge branch 'main' into string-improvements
n0toose Jul 29, 2023
c52d4b7
(User feedback) Add new string for Mirror Settings
n0toose Jul 29, 2023
40c02f0
Fix tests
n0toose Jul 29, 2023
3e8b38a
Consistent capitalization in Repository Settings
n0toose Jul 29, 2023
2672036
Replace 'Re-Type' with 'Confirm'
n0toose Jul 29, 2023
95ab0ed
Make 'Private' visibility's tooltip more clear
n0toose Jul 30, 2023
1e61c11
Be explicit on how OAuth secrets disappear
n0toose Jul 30, 2023
ff67ca4
Fix Private visibility tooltip, 'that' sounds too unnatural
n0toose Jul 30, 2023
85d2b9b
Address comment
n0toose Jul 30, 2023
607941d
Merge branch 'main' into string-improvements
n0toose Jul 31, 2023
0a04406
Add periods in signing notice in PRs
n0toose Aug 4, 2023
d51db06
Undo parameter thing
n0toose Aug 4, 2023
da755b4
Do not repeat 'How do I mirror repositories?' title
n0toose Aug 4, 2023
3903db3
Improve 'Packages' menu
n0toose Aug 5, 2023
60eb6d2
Use email description in profile section as well
n0toose Aug 6, 2023
9a85c89
Improve language around what hidden emails do
n0toose Aug 6, 2023
faf68dc
Address delvh's comments
n0toose Aug 6, 2023
0b87ed3
Fix inconsistency in Visibility options
n0toose Aug 6, 2023
98440f2
Make owner.settings.chef.keypair.description more explicit
n0toose Aug 6, 2023
696975d
Fix grammar error in oauth2_application_remove_description
n0toose Aug 8, 2023
c29d08c
Merge branch 'main' into string-improvements
GiteaBot Aug 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 you believe that this is a Gitea bug, please search for issues on <a href="%[1]s" 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.
Expand Down Expand Up @@ -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 was successfully created. Welcome!
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)
Expand Down Expand Up @@ -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! (You can use Markdown)
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
Expand Down Expand Up @@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

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

The sentence reads strange, because IMO:

  1. Not only "Git operations made using the web interface", but all related "Git operations"
  2. Not only notifications, but I think there are also emails for verification or password recovery?

Copy link
Contributor Author

@n0toose n0toose Jul 29, 2023

Choose a reason for hiding this comment

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

Not only "Git operations made using the web interface", but all related "Git operations"

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.

Not only notifications, but I think there are also emails for verification or password recovery?

Good point.

Copy link
Contributor

@wxiaoguang wxiaoguang Jul 29, 2023

Choose a reason for hiding this comment

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

Not only "Git operations made using the web interface", but all related "Git operations"

If I make a commit using a secondary email that is not primary, my primary email address will not be used.

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
email_desc = Your primary email address will be used for notifications and Git operations made using the web interface.
email_desc = Your primary email address will be used for notifications and as the committer email for web Git operations.

Like this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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 tea CLI tool later on.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

The sentence will be used for .... and, provided that it is not hidden, web-based Git operations reads a little difficult to me. But I am not a native English speaker, so I can't comment on it (aka, no more option from my side).

Copy link
Contributor Author

@n0toose n0toose Jul 30, 2023

Choose a reason for hiding this comment

The 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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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 you no longer need.
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.

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. Store it in a safe place, it will never be shown again.
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?
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 or 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 or pull requests.
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.

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 the due date of an issue."
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"
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.

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`
Expand All @@ -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
Expand Down Expand Up @@ -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, or open any issues or pull requests.
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
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
Expand Down Expand Up @@ -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. It will not affect the Git tag, the contents of your repository or its history. Continue?
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.
Expand All @@ -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?
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.
Expand Down