From 9a7df535da09f22b616883f47bc0f4c42d1cb9c6 Mon Sep 17 00:00:00 2001 From: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Date: Sun, 26 May 2024 11:39:48 +0000 Subject: [PATCH] [v7.0/forgejo] [I18N] Fixes and improvements to English locale (#3914) **Backport:** https://codeberg.org/forgejo/forgejo/commit/c3ffa30e7acbc9667564dff7fe7af9cf0a814d29 [forgejo#3912](https://codeberg.org/forgejo/forgejo/pulls/3912) Mostly cap fixes and a few improvements. As for `activity.active_prs_count_`, it currently looks like this in the UI, I fixed it:  Although I'm also the person who [introduced](https://codeberg.org/forgejo/forgejo/commit/4c1af0d9a620a57b22022489a0a6921d16e9bfad) the inconsistency. `send_reset_mail` is a button, removed redundant word from it. It would be good to refactor such keys, but it will be an impossibly long process. Anyway, key refactors are done in separate PRs for easier merges. Co-authored-by: 0ko <0ko@noreply.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3914 Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> --- options/locale/locale_en-US.ini | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c5270322b0..9670a1e9e7 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -351,15 +351,15 @@ env_config_keys = Environment Configuration env_config_keys_prompt = The following environment variables will also be applied to your configuration file: [home] -uname_holder = Username or Email address +uname_holder = Username or email address password_holder = Password -switch_dashboard_context = Switch Dashboard Context +switch_dashboard_context = Switch dashboard context my_repos = Repositories my_orgs = Organizations show_more_repos = Show more repositories… -collaborative_repos = Collaborative Repositories +collaborative_repos = Collaborative repositories view_home = View %s -filter = Other Filters +filter = Other filters filter_by_team_repositories = Filter by team repositories feed_of = Feed of "%s" @@ -390,7 +390,7 @@ relevant_repositories_tooltip = Repositories that are forks or that have no topi relevant_repositories = Only relevant repositories are being shown, <a href="%s">show unfiltered results</a>. [auth] -create_new_account = Register Account +create_new_account = Register account register_helper_msg = Already have an account? Sign in now! social_register_helper_msg = Already have an account? Link it now! disable_register_prompt = Registration is disabled. Please contact your site administrator. @@ -398,7 +398,7 @@ disable_register_mail = Email confirmation for registration is disabled. manual_activation_only = Contact your site administrator to complete activation. remember_me = Remember this device remember_me.compromised = The login token is not valid anymore which may indicate a compromised account. Please check your account for unusual activities. -forgot_password_title= Forgot Password +forgot_password_title= Forgot password forgot_password = Forgot password? sign_up_now = Need an account? Register now. sign_up_successful = Account was successfully created. Welcome! @@ -406,7 +406,7 @@ confirmation_mail_sent_prompt = A new confirmation email has been sent to <b>%s< must_change_password = Update your password allow_password_change = Require user to change password (recommended) reset_password_mail_sent_prompt = A confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the account recovery process. -active_your_account = Activate Your Account +active_your_account = Activate your account account_activated = Account has been activated prohibit_login = Signing in is prohibited prohibit_login_desc = Your account is prohibited from signing in, please contact your site administrator. @@ -417,8 +417,8 @@ change_unconfirmed_email = If you have given the wrong email address during regi change_unconfirmed_email_error = Unable to change the email address: %v resend_mail = Click here to resend your activation email email_not_associate = The email address is not associated with any account. -send_reset_mail = Send Account Recovery Email -reset_password = Account Recovery +send_reset_mail = Send recovery email +reset_password = Account recovery invalid_code = Your confirmation code is invalid or has expired. invalid_code_forgot_password = Your confirmation code is invalid or has expired. Click <a href="%s">here</a> to start a new session. invalid_password = Your password does not match the password that was used to create the account. @@ -436,12 +436,12 @@ login_userpass = Sign In tab_signin = Sign In tab_signup = Sign Up tab_openid = OpenID -oauth_signup_tab = Register New Account -oauth_signup_title = Complete New Account -oauth_signup_submit = Complete Account +oauth_signup_tab = Register new account +oauth_signup_title = Complete new account +oauth_signup_submit = Complete account oauth_signin_tab = Link to an existing account oauth_signin_title = Sign in to authorize linked account -oauth_signin_submit = Link Account +oauth_signin_submit = Link account oauth.signin.error = There was an error processing the authorization request. If this error persists, please contact the site administrator. oauth.signin.error.access_denied = The authorization request was denied. oauth.signin.error.temporarily_unavailable = Authorization failed because the authentication server is temporarily unavailable. Please try again later. @@ -1609,7 +1609,7 @@ issues.role.collaborator_helper = This user has been invited to collaborate on t issues.role.first_time_contributor = First-time contributor issues.role.first_time_contributor_helper = This is the first contribution of this user to the repository. issues.role.contributor = Contributor -issues.role.contributor_helper = This user has previously committed to the repository. +issues.role.contributor_helper = This user has previously committed in this repository. 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 @@ -1892,9 +1892,9 @@ pulls.unrelated_histories = Merge failed: The merge head and base do not share a pulls.merge_out_of_date = Merge failed: Whilst generating the merge, the base was updated. Hint: Try again. pulls.head_out_of_date = Merge failed: Whilst generating the merge, the head was updated. Hint: Try again. pulls.has_merged = Failed: The pull request has been merged, you cannot merge again or change the target branch. -pulls.push_rejected = Push Failed: The push was rejected. Review the Git hooks for this repository. +pulls.push_rejected = Push failed: The push was rejected. Review the Git hooks for this repository. pulls.push_rejected_summary = Full rejection message -pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. Review the Git hooks for this repository +pulls.push_rejected_no_message = Push failed: The push was rejected but there was no remote message. Review the Git hooks for this repository pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` pulls.status_checking = Some checks are pending pulls.status_checks_success = All checks were successful @@ -2035,8 +2035,8 @@ activity.period.quarterly = 3 months activity.period.semiyearly = 6 months activity.period.yearly = 1 year activity.overview = Overview -activity.active_prs_count_1 = <strong>%d</strong> Active pull request -activity.active_prs_count_n = <strong>%d</strong> Active pull requests +activity.active_prs_count_1 = <strong>%d</strong> active pull request +activity.active_prs_count_n = <strong>%d</strong> active pull requests activity.merged_prs_count_1 = Merged pull request activity.merged_prs_count_n = Merged pull requests activity.opened_prs_count_1 = Proposed pull request