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
Show file tree
Hide file tree
Changes from 22 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
83 changes: 43 additions & 40 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ username = Username
email = Email Address
password = Password
access_token = Access Token
re_type = Re-Type Password
re_type = Confirm Password
captcha = CAPTCHA
twofa = Two-Factor Authentication
twofa_scratch = Two-Factor Scratch Code
Expand Down Expand Up @@ -170,7 +170,7 @@ string.desc = Z - A

[error]
occurred = An error occurred
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.
report_message = If you 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.
Expand Down Expand Up @@ -368,7 +368,7 @@ reset_password_mail_sent_prompt = A confirmation email has been sent to <b>%s</b
active_your_account = Activate Your Account
account_activated = Account has been activated
prohibit_login = Sign In Prohibited
prohibit_login_desc = Your account is prohibited to sign in, please contact your site administrator.
prohibit_login_desc = Your account has been banned, please contact your site administrator for more information.
resent_limit_prompt = You have already requested an activation email recently. Please wait 3 minutes and try again.
has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (<b>%s</b>). If you haven't received a confirmation email or need to resend a new one, please click on the button below.
resend_mail = Click here to resend your activation email
Expand All @@ -378,7 +378,7 @@ reset_password = Account Recovery
invalid_code = Your confirmation code is invalid or has expired.
invalid_password = Your password does not match the password that was used to create the account.
reset_password_helper = Recover Account
reset_password_wrong_user = You are signed in as %s, but the account recovery link is for %s
reset_password_wrong_user = You are signed in as %s, but the account recovery link is meant for %s
password_too_short = Password length cannot be less than %d characters.
non_local_account = Non-local users cannot update their password through the Gitea web interface.
verify = Verify
Expand All @@ -403,7 +403,7 @@ openid_connect_title = Connect to an existing account
openid_connect_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
openid_register_title = Create new account
openid_register_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.openid.org.cn or gnusocial.net/carry.
openid_signin_desc = Enter your OpenID URI. For example: alice.openid.example.org or https://openid.example.org/alice.
disable_forgot_password_mail = Account recovery is disabled because no email is set up. Please contact your site administrator.
disable_forgot_password_mail_admin = Account recovery is only available when email is set up. Please set up email to enable account recovery.
email_domain_blacklisted = You cannot register with your email address.
Expand All @@ -413,9 +413,9 @@ authorize_application_created_by = This application was created by %s.
authorize_application_description = If you grant the access, it will be able to access and write to all your account information, including private repos and organisations.
authorize_title = Authorize "%s" to access your account?
authorization_failed = Authorization failed
authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you've tried to authorize.
authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you have tried to authorize.
sspi_auth_failed = SSPI authentication failed
password_pwned = The password you chose is on a <a target="_blank" rel="noopener noreferrer" href="https://haveibeenpwned.com/Passwords">list of stolen passwords</a> previously exposed in public data breaches. Please try again with a different password.
password_pwned = The password you chose is on a <a target="_blank" rel="noopener noreferrer" href="https://haveibeenpwned.com/Passwords">list of stolen passwords</a> previously exposed in public data breaches. Please try again with a different password and consider changing this password elsewhere too.
password_pwned_err = Could not complete request to HaveIBeenPwned

[mail]
Expand All @@ -430,7 +430,7 @@ activate_account.text_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s!
activate_account.text_2 = Please click the following link to activate your account within <b>%s</b>:

activate_email = Verify your email address
activate_email.title = %s, please verify your e-mail address
activate_email.title = %s, please verify your email address
activate_email.text = Please click the following link to verify your email address within <b>%s</b>:

register_notify = Welcome to Gitea
Expand Down Expand Up @@ -496,7 +496,7 @@ UserName = Username
RepoName = Repository name
Email = Email address
Password = Password
Retype = Re-Type Password
Retype = Confirm Password
SSHTitle = SSH key name
HttpsUrl = HTTPS URL
PayloadUrl = Payload URL
Expand Down Expand Up @@ -628,6 +628,7 @@ webauthn = Security Keys

public_profile = Public Profile
biography_placeholder = Tell us a little bit about yourself! (You can use Markdown)
location_placeholder = Share your approximate location with others
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 @@ -683,7 +684,7 @@ update_user_avatar_success = The user's avatar has been updated.
change_password = Update Password
old_password = Current Password
new_password = New Password
retype_new_password = Re-Type New Password
retype_new_password = Confirm New Password
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 Gitea web interface.
Expand All @@ -692,7 +693,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 Git operations made using the web interface.
email_desc = Your primary email address will be used for notifications, password recovery and, provided that it is not hidden, web-based Git operations.
theme_desc = This will be your default theme across the site.
primary = Primary
activated = Activated
Expand Down Expand Up @@ -844,7 +845,7 @@ oauth2_client_id = Client ID
oauth2_client_secret = Client Secret
oauth2_regenerate_secret = Regenerate Secret
oauth2_regenerate_secret_hint = Lost your secret?
oauth2_client_secret_hint = The secret won't be visible if you revisit this page. Please save 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
oauth2_application_create_description = OAuth2 applications gives your third-party application access to user accounts on this instance.
oauth2_application_remove_description = Removing an OAuth2 application will prevent it to access authorized user accounts on this instance. Continue?
Expand Down Expand Up @@ -888,7 +889,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.

hooks.desc = Add webhooks which will be triggered for <strong>all repositories</strong> owned by this user.
hooks.desc = Add webhooks which will be triggered for <strong>all repositories</strong> that you own.

orgs_none = You are not a member of any organizations.
repos_none = You do not own any repositories.
Expand All @@ -912,7 +913,7 @@ visibility.public_tooltip = Visible to everyone
visibility.limited = Limited
visibility.limited_tooltip = Visible to authenticated users only
visibility.private = Private
visibility.private_tooltip = Visible only to organization members
visibility.private_tooltip = Visible only to members of organizations you have joined

[repo]
new_repo_helper = A repository contains all project files, including revision history. Already hosting one elsewhere? <a href="%s">Migrate repository.</a>
Expand All @@ -927,7 +928,7 @@ template_helper = Make repository a template
template_description = Template repositories let users generate new repositories with the same directory structure, files, and optional settings.
visibility = Visibility
visibility_description = Only the owner or the organization members if they have rights, will be able to see it.
visibility_helper = Make Repository Private
visibility_helper = Make repository private
visibility_helper_forced = Your site administrator forces new repositories to be private.
visibility_fork_helper = (Changing this will affect all forks.)
clone_helper = Need help cloning? Visit <a target="_blank" rel="noopener noreferrer" href="%s">Help</a>.
Expand Down Expand Up @@ -1541,7 +1542,7 @@ issues.tracking_already_started = `You have already started time tracking on <a
issues.stop_tracking = Stop Timer
issues.stop_tracking_history = `stopped working %s`
issues.cancel_tracking = Discard
issues.cancel_tracking_history = `cancelled time tracking %s`
issues.cancel_tracking_history = `canceled time tracking %s`
issues.add_time = Manually Add Time
issues.del_time = Delete this time log
issues.add_time_short = Add Time
Expand Down Expand Up @@ -1773,7 +1774,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 cancelled for this pull request.
pulls.auto_merge_canceled_schedule = The auto merge was canceled 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 Down Expand Up @@ -1813,19 +1814,19 @@ milestones.filter_sort.most_complete = Most complete
milestones.filter_sort.most_issues = Most issues
milestones.filter_sort.least_issues = Least issues

signing.will_sign = This commit will be signed with key "%s"
signing.wont_sign.error = There was an error whilst checking if the commit could be signed
signing.wont_sign.nokey = There is no key available to sign this commit
signing.wont_sign.never = Commits are never signed
signing.wont_sign.always = Commits are always signed
signing.wont_sign.pubkey = The commit will not be signed because you do not have a public key associated with your account
signing.wont_sign.twofa = You must have two factor authentication enabled to have commits signed
signing.wont_sign.parentsigned = The commit will not be signed as the parent commit is not signed
signing.wont_sign.basesigned = The merge will not be signed as the base commit is not signed
signing.wont_sign.headsigned = The merge will not be signed as the head commit is not signed
signing.wont_sign.commitssigned = The merge will not be signed as all the associated commits are not signed
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
signing.will_sign = This commit will be signed with key "%s".
signing.wont_sign.error = There was an error whilst checking if the commit could be signed.
signing.wont_sign.nokey = There is no key available to sign this commit.
signing.wont_sign.never = Commits are never signed.
signing.wont_sign.always = Commits are always signed.
signing.wont_sign.pubkey = The commit will not be signed because you do not have a public key associated with your account.
signing.wont_sign.twofa = You must have two factor authentication enabled to have commits signed.
signing.wont_sign.parentsigned = The commit will not be signed as the parent commit is not signed.
signing.wont_sign.basesigned = The merge will not be signed as the base commit is not signed.
signing.wont_sign.headsigned = The merge will not be signed as the head commit is not signed.
signing.wont_sign.commitssigned = The merge will not be signed as all the associated commits are not signed.
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.desc = Link to an external wiki.
Expand Down Expand Up @@ -1955,7 +1956,9 @@ settings.mirror_settings.docs.disabled_push_mirror.info = Push mirrors have been
settings.mirror_settings.docs.no_new_mirrors = Your repository is mirroring changes to or from another repository. Please keep in mind that you can't create any new mirrors at this time.
settings.mirror_settings.docs.can_still_use = Although you can't modify existing mirrors or create new ones, you may still use your existing mirror.
settings.mirror_settings.docs.pull_mirror_instructions = To set up a pull mirror, please consult:
settings.mirror_settings.docs.more_information_if_disabled = You can find out more about push and pull mirrors here:
settings.mirror_settings.docs.doc_link_title = How do I mirror repositories?
settings.mirror_settings.docs.doc_link_pull_section = the "Pulling from a remote repository" section of the documentation.
settings.mirror_settings.docs.pulling_remote_title = Pulling from a remote repository
settings.mirror_settings.mirrored_repository = Mirrored repository
settings.mirror_settings.direction = Direction
Expand Down Expand Up @@ -2033,7 +2036,7 @@ settings.transfer.rejected = Repository transfer was rejected.
settings.transfer.success = Repository transfer was successful.
settings.transfer_abort = Cancel transfer
settings.transfer_abort_invalid = You cannot cancel a non existent repository transfer.
settings.transfer_abort_success = The repository transfer to %s was successfully cancelled.
settings.transfer_abort_success = The repository transfer to %s was successfully canceled.
settings.transfer_desc = Transfer this repository to a user or to an organization for which you have administrator rights.
settings.transfer_form_title = Enter the repository name as confirmation:
settings.transfer_in_progress = There is currently an ongoing transfer. Please cancel it if you will like to transfer this repository to another user.
Expand Down Expand Up @@ -2464,7 +2467,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 continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
branch.delete_desc = Deleting a branch is permanent. Although the deleted branch may continue existing for a short time before it actually gets purged, 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 Expand Up @@ -2633,7 +2636,7 @@ teams.all_repositories_helper = Team has access to all repositories. Selecting t
teams.all_repositories_read_permission_desc = This team grants <strong>Read</strong> access to <strong>all repositories</strong>: members can view and clone repositories.
teams.all_repositories_write_permission_desc = This team grants <strong>Write</strong> access to <strong>all repositories</strong>: members can read from and push to repositories.
teams.all_repositories_admin_permission_desc = This team grants <strong>Admin</strong> access to <strong>all repositories</strong>: members can read from, push to and add collaborators to repositories.
teams.invite.title = You've been invited to join team <strong>%s</strong> in organization <strong>%s</strong>.
teams.invite.title = You have been invited to join team <strong>%s</strong> in organization <strong>%s</strong>.
teams.invite.by = Invited by %s
teams.invite.description = Please click the button below to join the team.

Expand Down Expand Up @@ -2666,13 +2669,13 @@ dashboard.clean_unbind_oauth = Clean unbound OAuth connections
dashboard.clean_unbind_oauth_success = All unbound OAuth connections have been deleted.
dashboard.task.started=Started Task: %[1]s
dashboard.task.process=Task: %[1]s
dashboard.task.cancelled=Task: %[1]s cancelled: %[3]s
dashboard.task.cancelled=Task: %[1]s canceled: %[3]s
dashboard.task.error=Error in Task: %[1]s: %[3]s
dashboard.task.finished=Task: %[1]s started by %[2]s has finished
dashboard.task.unknown=Unknown task: %[1]s
dashboard.cron.started=Started Cron: %[1]s
dashboard.cron.process=Cron: %[1]s
dashboard.cron.cancelled=Cron: %[1]s cancelled: %[3]s
dashboard.cron.cancelled=Cron: %[1]s canceled: %[3]s
dashboard.cron.error=Error in Cron: %s: %[3]s
dashboard.cron.finished=Cron: %[1]s has finished
dashboard.delete_inactive_accounts = Delete all unactivated accounts
Expand Down Expand Up @@ -3369,17 +3372,17 @@ settings.delete.success = The package has been deleted.
settings.delete.error = Failed to delete the package.
owner.settings.cargo.title = Cargo Registry Index
owner.settings.cargo.initialize = Initialize Index
owner.settings.cargo.initialize.description = To use the Cargo registry a special index git repository is needed. Here you can (re)create it with the required config.
owner.settings.cargo.initialize.description = A special index Git repository is needed to use the Cargo registry. Using this option will (re-)create it with all required configurations.
Copy link
Member

Choose a reason for hiding this comment

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

Isn't configuration a word like sheep or fish whose plural is its singular?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is correct. Bear in mind that I work on this PR very late at night so that I can actually handle the mundane-ness of it, which is good for progress but still results in many little errors. I'll fix 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.

Hm,

I think we are both right, but it may be the case that using plural in the first place makes the idea that is meant to be conveyed here too inaccurate.

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 tried something else here: faf68dc

owner.settings.cargo.initialize.error = Failed to initialize Cargo index: %v
owner.settings.cargo.initialize.success = The Cargo index was successfully created.
owner.settings.cargo.rebuild = Rebuild Index
owner.settings.cargo.rebuild.description = If the index is out of sync with the cargo packages stored you can rebuild it here.
owner.settings.cargo.rebuild.description = Rebuilding can be useful if the index is not synchronized with the stored Cargo packages.
owner.settings.cargo.rebuild.error = Failed to rebuild Cargo index: %v
owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuild.
owner.settings.cleanuprules.title = Manage Cleanup Rules
owner.settings.cleanuprules.add = Add Cleanup Rule
owner.settings.cleanuprules.edit = Edit Cleanup Rule
owner.settings.cleanuprules.none = No cleanup rules available. Read the docs to learn more.
owner.settings.cleanuprules.none = No cleanup rules available. Please consult the documentation.
owner.settings.cleanuprules.preview = Cleanup Rule Preview
owner.settings.cleanuprules.preview.overview = %d packages are scheduled to be removed.
owner.settings.cleanuprules.preview.none = Cleanup rule does not match any packages.
Expand All @@ -3398,7 +3401,7 @@ owner.settings.cleanuprules.success.update = Cleanup rule has been updated.
owner.settings.cleanuprules.success.delete = Cleanup rule has been deleted.
owner.settings.chef.title = Chef Registry
owner.settings.chef.keypair = Generate key pair
owner.settings.chef.keypair.description = Generate a key pair used to authenticate against the Chef registry. The previous key can not be used afterwards.
owner.settings.chef.keypair.description = A key pair is necessary to authenticate to the Chef registry. If you have generated a key pair before, doing so again will discard the old key pair.

[secrets]
secrets = Secrets
Expand All @@ -3425,7 +3428,7 @@ status.waiting = "Waiting"
status.running = "Running"
status.success = "Success"
status.failure = "Failure"
status.cancelled = "Cancelled"
status.cancelled = "Canceled"
status.skipped = "Skipped"
status.blocked = "Blocked"

Expand Down
Loading