loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

[I18N] Fixes and improvements to English locale (#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:
![image](/attachments/5d2dc089-519e-4655-8f8b-f78964ff179a)

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.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3912
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>

0ko c3ffa30e 8790ce18

+18 -18
+18 -18
options/locale/locale_en-US.ini
··· 351 351 env_config_keys_prompt = The following environment variables will also be applied to your configuration file: 352 352 353 353 [home] 354 - uname_holder = Username or Email address 354 + uname_holder = Username or email address 355 355 password_holder = Password 356 - switch_dashboard_context = Switch Dashboard Context 356 + switch_dashboard_context = Switch dashboard context 357 357 my_repos = Repositories 358 358 my_orgs = Organizations 359 359 show_more_repos = Show more repositories… 360 - collaborative_repos = Collaborative Repositories 360 + collaborative_repos = Collaborative repositories 361 361 view_home = View %s 362 - filter = Other Filters 362 + filter = Other filters 363 363 filter_by_team_repositories = Filter by team repositories 364 364 feed_of = Feed of "%s" 365 365 ··· 390 390 relevant_repositories = Only relevant repositories are being shown, <a href="%s">show unfiltered results</a>. 391 391 392 392 [auth] 393 - create_new_account = Register Account 393 + create_new_account = Register account 394 394 register_helper_msg = Already have an account? Sign in now! 395 395 social_register_helper_msg = Already have an account? Link it now! 396 396 disable_register_prompt = Registration is disabled. Please contact your site administrator. ··· 398 398 manual_activation_only = Contact your site administrator to complete activation. 399 399 remember_me = Remember this device 400 400 remember_me.compromised = The login token is not valid anymore which may indicate a compromised account. Please check your account for unusual activities. 401 - forgot_password_title= Forgot Password 401 + forgot_password_title= Forgot password 402 402 forgot_password = Forgot password? 403 403 sign_up_now = Need an account? Register now. 404 404 sign_up_successful = Account was successfully created. Welcome! ··· 406 406 must_change_password = Update your password 407 407 allow_password_change = Require user to change password (recommended) 408 408 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. 409 - active_your_account = Activate Your Account 409 + active_your_account = Activate your account 410 410 account_activated = Account has been activated 411 411 prohibit_login = Signing in is prohibited 412 412 prohibit_login_desc = Your account is prohibited from signing in, please contact your site administrator. ··· 417 417 change_unconfirmed_email_error = Unable to change the email address: %v 418 418 resend_mail = Click here to resend your activation email 419 419 email_not_associate = The email address is not associated with any account. 420 - send_reset_mail = Send Account Recovery Email 421 - reset_password = Account Recovery 420 + send_reset_mail = Send recovery email 421 + reset_password = Account recovery 422 422 invalid_code = Your confirmation code is invalid or has expired. 423 423 invalid_code_forgot_password = Your confirmation code is invalid or has expired. Click <a href="%s">here</a> to start a new session. 424 424 invalid_password = Your password does not match the password that was used to create the account. ··· 436 436 tab_signin = Sign In 437 437 tab_signup = Sign Up 438 438 tab_openid = OpenID 439 - oauth_signup_tab = Register New Account 440 - oauth_signup_title = Complete New Account 441 - oauth_signup_submit = Complete Account 439 + oauth_signup_tab = Register new account 440 + oauth_signup_title = Complete new account 441 + oauth_signup_submit = Complete account 442 442 oauth_signin_tab = Link to an existing account 443 443 oauth_signin_title = Sign in to authorize linked account 444 - oauth_signin_submit = Link Account 444 + oauth_signin_submit = Link account 445 445 oauth.signin.error = There was an error processing the authorization request. If this error persists, please contact the site administrator. 446 446 oauth.signin.error.access_denied = The authorization request was denied. 447 447 oauth.signin.error.temporarily_unavailable = Authorization failed because the authentication server is temporarily unavailable. Please try again later. ··· 1605 1605 issues.role.first_time_contributor = First-time contributor 1606 1606 issues.role.first_time_contributor_helper = This is the first contribution of this user to the repository. 1607 1607 issues.role.contributor = Contributor 1608 - issues.role.contributor_helper = This user has previously committed to the repository. 1608 + issues.role.contributor_helper = This user has previously committed in this repository. 1609 1609 issues.re_request_review=Re-request review 1610 1610 issues.is_stale = There have been changes to this PR since this review 1611 1611 issues.remove_request_review=Remove review request ··· 1888 1888 pulls.merge_out_of_date = Merge failed: Whilst generating the merge, the base was updated. Hint: Try again. 1889 1889 pulls.head_out_of_date = Merge failed: Whilst generating the merge, the head was updated. Hint: Try again. 1890 1890 pulls.has_merged = Failed: The pull request has been merged, you cannot merge again or change the target branch. 1891 - pulls.push_rejected = Push Failed: The push was rejected. Review the Git hooks for this repository. 1891 + pulls.push_rejected = Push failed: The push was rejected. Review the Git hooks for this repository. 1892 1892 pulls.push_rejected_summary = Full rejection message 1893 - pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. Review the Git hooks for this repository 1893 + pulls.push_rejected_no_message = Push failed: The push was rejected but there was no remote message. Review the Git hooks for this repository 1894 1894 pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` 1895 1895 pulls.status_checking = Some checks are pending 1896 1896 pulls.status_checks_success = All checks were successful ··· 2033 2033 activity.period.semiyearly = 6 months 2034 2034 activity.period.yearly = 1 year 2035 2035 activity.overview = Overview 2036 - activity.active_prs_count_1 = <strong>%d</strong> Active pull request 2037 - activity.active_prs_count_n = <strong>%d</strong> Active pull requests 2036 + activity.active_prs_count_1 = <strong>%d</strong> active pull request 2037 + activity.active_prs_count_n = <strong>%d</strong> active pull requests 2038 2038 activity.merged_prs_count_1 = Merged pull request 2039 2039 activity.merged_prs_count_n = Merged pull requests 2040 2040 activity.opened_prs_count_1 = Proposed pull request