mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-13 21:46:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request 'i18n: Improve clarity of confirmation email messages' (#4980) from fnetx/activation-code-clarity into forgejo
Some checks are pending
/ release (push) Waiting to run
Details
testing / backend-checks (push) Waiting to run
Details
testing / frontend-checks (push) Waiting to run
Details
testing / test-unit (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:docker.io/bitnami/redis:7.2 port:6379]) (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:docker.io/bitnami/valkey:7.2 port:6379]) (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Blocked by required conditions
Details
testing / test-mysql (push) Blocked by required conditions
Details
testing / test-pgsql (push) Blocked by required conditions
Details
testing / test-sqlite (push) Blocked by required conditions
Details
testing / security-check (push) Blocked by required conditions
Details

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4980
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
Otto 2024-08-17 15:31:48 +00:00
commit 4760c5029d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
options/locale/locale_en-US.ini
View file

@ -413,10 +413,10 @@ hint_login = Already have an account? <a href="%s">Sign in now!</a>
hint_register = Need an account? <a href="%s">Register now.</a> hint_register = Need an account? <a href="%s">Register now.</a>
sign_up_button = Register now. sign_up_button = Register now.
sign_up_successful = Account was successfully created. Welcome! 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. If the email is incorrect, you can log in, and request another confirmation email to be sent to a different address. confirmation_mail_sent_prompt = A new confirmation email has been sent to <b>%s</b>. To complete the registration process, please check your inbox and follow the provided link within the next %s. If the email is incorrect, you can log in, and request another confirmation email to be sent to a different address.
must_change_password = Update your password must_change_password = Update your password
allow_password_change = Require user to change password (recommended) 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. reset_password_mail_sent_prompt = A confirmation email has been sent to <b>%s</b>. To complete the account recovery process, please check your inbox and follow the provided link within the next %s.
active_your_account = Activate your account active_your_account = Activate your account
account_activated = Account has been activated account_activated = Account has been activated
prohibit_login = Account is suspended prohibit_login = Account is suspended
@ -831,7 +831,7 @@ 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_email = Add email address
add_openid = Add OpenID URI 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. add_email_confirmation_sent = A confirmation email has been sent to "%s". To confirm your email address, please check your inbox and follow the provided link within the next %s.
add_email_success = The new email address has been added. add_email_success = The new email address has been added.
email_preference_set_success = Email preference has been set successfully. email_preference_set_success = Email preference has been set successfully.
add_openid_success = The new OpenID address has been added. add_openid_success = The new OpenID address has been added.