[v7.0/forgejo] Improve base locale related to settings and accounts (#3742)

**Backport:** https://codeberg.org/forgejo/forgejo/pulls/3733

- general English improvements
- separated the header of Language part in user settings into a new string for better translatability
- made that header contain "Default", just like the theme one, because this is how this actually works: the bottom selector saves the language temporarily, the selector in the settings saves it permanently. Not many users know about this difference. This clarification will help some
- removed some of "Manage" from the headers where they aren't really needed. This improves the consistency with some other headers

Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3742
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
This commit is contained in:
forgejo-backport-action 2024-05-16 14:15:33 +00:00 committed by 0ko
parent 6bf1bcab57
commit 7a8b2d8eb8
2 changed files with 15 additions and 14 deletions

View file

@ -439,8 +439,8 @@ tab_openid = OpenID
oauth_signup_tab = Register New Account
oauth_signup_title = Complete New Account
oauth_signup_submit = Complete Account
oauth_signin_tab = Link to Existing Account
oauth_signin_title = Sign In to Authorize Linked 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.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.
@ -691,13 +691,13 @@ password = Password
security = Security
avatar = Avatar
ssh_gpg_keys = SSH / GPG keys
social = Social Accounts
social = Social accounts
applications = Applications
orgs = Manage organizations
orgs = Organizations
repos = Repositories
delete = Delete Account
twofa = Two-factor authentication (TOTP)
account_link = Linked Accounts
account_link = Linked accounts
organization = Organizations
uid = UID
webauthn = Two-factor authentication (Security keys)
@ -726,6 +726,7 @@ change_username_redirect_prompt = The old username will redirect until someone c
continue = Continue
cancel = Cancel
language = Language
language.title = Default language
ui = Theme
hints = Hints
additional_repo_units_hint = Suggest to enable additional repository units
@ -776,8 +777,8 @@ change_password_success = Your password has been updated. Sign in using your new
password_change_disabled = Non-local users cannot update their password through the Forgejo web interface.
manage_emails = Manage email addresses
manage_themes = Select default theme
manage_openid = Manage OpenID addresses
manage_themes = Default theme
manage_openid = OpenID addresses
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
@ -797,7 +798,7 @@ openid_deletion = Remove OpenID Address
openid_deletion_desc = Removing this OpenID address from your account will prevent you from signing in with it. Continue?
openid_deletion_success = The OpenID address has been removed.
add_new_email = Add email address
add_new_openid = Add New OpenID URI
add_new_openid = Add new OpenID URI
add_email = Add email address
add_openid = Add OpenID URI
add_email_confirmation_sent = A confirmation email has been sent to "%s". Please check your inbox within the next %s to confirm your email address.
@ -888,7 +889,7 @@ social_desc = These social accounts can be used to sign in to your account. Make
unbind = Unlink
unbind_success = The social account has been removed successfully.
manage_access_token = Manage access tokens
manage_access_token = Access tokens
generate_new_token = Generate new token
tokens_desc = These tokens grant access to your account using the Forgejo API.
token_name = Token name
@ -970,11 +971,11 @@ webauthn_delete_key_desc = If you remove a security key you can no longer sign i
webauthn_key_loss_warning = If you lose your security keys, you will lose access to your account.
webauthn_alternative_tip = You may want to configure an additional authentication method.
manage_account_links = Manage Linked Accounts
manage_account_links = Linked accounts
manage_account_links_desc = These external accounts are linked to your Forgejo account.
account_links_not_available = There are currently no external accounts linked to your Forgejo account.
link_account = Link Account
remove_account_link = Remove Linked Account
link_account = Link account
remove_account_link = Remove linked account
remove_account_link_desc = Removing a linked account will revoke its access to your Forgejo account. Continue?
remove_account_link_success = The linked account has been removed.
@ -3613,7 +3614,7 @@ owner.settings.cargo.rebuild.description = Rebuilding can be useful if the index
owner.settings.cargo.rebuild.error = Failed to rebuild Cargo index: %v
owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuild.
owner.settings.cargo.rebuild.no_index = Cannot rebuild, no index is initialized.
owner.settings.cleanuprules.title = Manage cleanup rules
owner.settings.cleanuprules.title = Cleanup rules
owner.settings.cleanuprules.add = Add cleanup rule
owner.settings.cleanuprules.edit = Edit cleanup rule
owner.settings.cleanuprules.none = There are no cleanup rules yet.

View file

@ -43,7 +43,7 @@
<!-- Language -->
<h4 class="ui top attached header">
{{ctx.Locale.Tr "settings.language"}}
{{ctx.Locale.Tr "settings.language.title"}}
</h4>
<div class="ui attached segment">
<form class="ui form" action="{{.Link}}/language" method="post">