From db73870e0ecfa3acd57b91fad1036c9de45bd694 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sat, 20 Jul 2024 19:29:12 +0500 Subject: [PATCH 1/3] i18n(en): clarify texts in modals for leaving orgs and teams --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e528c62dcd..c0889ee89c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2832,13 +2832,13 @@ members.member = Member members.remove = Remove members.remove.detail = Remove %[1]s from %[2]s? members.leave = Leave -members.leave.detail = Leave %s? +members.leave.detail = Are you sure you want to leave organization "%s"? members.invite_desc = Add a new member to %s: members.invite_now = Invite now teams.join = Join teams.leave = Leave -teams.leave.detail = Leave %s? +teams.leave.detail = Are you sure you want to leave team "%s"? teams.can_create_org_repo = Create repositories teams.can_create_org_repo_helper = Members can create new repositories in organization. Creator will get administrator access to the new repository. teams.none_access = No access From 19dbefc5c83cbdc34d0a2c13bad275e2b988749d Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 21 Jul 2024 09:01:32 +0500 Subject: [PATCH 2/3] i18n(en): don't advertize trying to run Forgejo on Windows Co-authored-by: Otto --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c0889ee89c..c6e22a4ddb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -236,7 +236,7 @@ app_desc = A painless, self-hosted Git service install = Easy to install install_desc = Simply run the binary for your platform, ship it with Docker, or get it packaged. platform = Cross-platform -platform_desc = Forgejo runs anywhere Go can compile for: Windows, macOS, Linux, ARM, etc. Choose the one you love! +platform_desc = Forgejo is confirmed to run on libre operating systems like Linux and FreeBSD, as well as different CPU architectures. Choose the one you love! lightweight = Lightweight lightweight_desc = Forgejo has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy! license = Open Source From d3bb19e03b3489f0b37cc8fc78ddafb3dc1d1b04 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 21 Jul 2024 09:01:50 +0500 Subject: [PATCH 3/3] i18n(en): clarify texts on suspended account screen --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c6e22a4ddb..62535fc034 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -418,8 +418,8 @@ allow_password_change = Require user to change password (recommended) reset_password_mail_sent_prompt = A confirmation email has been sent to %s. Please check your inbox within the next %s to complete the account recovery process. 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. +prohibit_login = Account is suspended +prohibit_login_desc = Your account has been suspended from interacting with the instance. Contact the instance administrator to regain access. 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 (%s). If you haven't received a confirmation email or need to resend a new one, please click on the button below. change_unconfirmed_email_summary = Change the email address activation mail is sent to.