From 4f7eb2caf74a1d641f40689103f26327cd4d5d4f Mon Sep 17 00:00:00 2001 From: Sunny Wan Date: Thu, 4 Jul 2024 21:58:30 -0400 Subject: [PATCH 1/4] changed email title Signed-off-by: Sunny Wan --- options/locale/locale_cs-CZ.ini | 2 +- options/locale/locale_de-DE.ini | 2 +- options/locale/locale_el-GR.ini | 2 +- options/locale/locale_en-US.ini | 4 ++-- options/locale/locale_es-ES.ini | 2 +- options/locale/locale_fi-FI.ini | 2 +- options/locale/locale_fr-FR.ini | 2 +- options/locale/locale_hu-HU.ini | 2 +- options/locale/locale_id-ID.ini | 2 +- options/locale/locale_is-IS.ini | 2 +- options/locale/locale_it-IT.ini | 2 +- options/locale/locale_ja-JP.ini | 2 +- options/locale/locale_ko-KR.ini | 2 +- options/locale/locale_lv-LV.ini | 2 +- options/locale/locale_nl-NL.ini | 2 +- options/locale/locale_pl-PL.ini | 2 +- options/locale/locale_pt-BR.ini | 2 +- options/locale/locale_pt-PT.ini | 2 +- options/locale/locale_ru-RU.ini | 2 +- options/locale/locale_si-LK.ini | 2 +- options/locale/locale_sk-SK.ini | 2 +- options/locale/locale_sv-SE.ini | 2 +- options/locale/locale_tr-TR.ini | 2 +- options/locale/locale_uk-UA.ini | 2 +- options/locale/locale_zh-CN.ini | 2 +- options/locale/locale_zh-HK.ini | 2 +- options/locale/locale_zh-TW.ini | 2 +- services/mailer/mail.go | 3 ++- 28 files changed, 30 insertions(+), 29 deletions(-) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 7f65e1317172c..7e60763d22f2b 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -474,7 +474,7 @@ activate_email=Ověřte vaši e-mailovou adresu activate_email.title=%s, prosím ověřte vaši e-mailovou adresu activate_email.text=Pro aktivaci vašeho účtu do %s klikněte na následující odkaz: -register_notify=Vítejte v Gitea +register_notify=Vítejte v %s register_notify.title=%[1]s vítejte v %[2]s register_notify.text_1=toto je váš potvrzovací e-mail pro %s! register_notify.text_2=Nyní se můžete přihlásit přes uživatelské jméno: %s. diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 8b6296cfdcc40..94563cb8200a6 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -468,7 +468,7 @@ activate_email=Bestätige deine E-Mail-Adresse activate_email.title=%s, bitte verifiziere deine E-Mail-Adresse activate_email.text=Bitte klicke innerhalb von %s auf folgenden Link, um dein Konto zu aktivieren: -register_notify=Willkommen bei Gitea +register_notify=Willkommen bei %s register_notify.title=%[1]s, willkommen bei %[2]s register_notify.text_1=dies ist deine Bestätigungs-E-Mail für %s! register_notify.text_2=Du kannst dich jetzt mit dem Benutzernamen "%s" anmelden. diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 7e6e2ba2cd1e7..0a26457618927 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -434,7 +434,7 @@ activate_email=Επιβεβαιώστε τη διεύθυνση email σας activate_email.title=%s, παρακαλώ επαληθεύστε τη διεύθυνση email σας activate_email.text=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να επαληθεύσετε τη διεύθυνση email σας στο %s: -register_notify=Καλώς ήλθατε στο Gitea +register_notify=Καλώς ήλθατε στο %s register_notify.title=%[1]s, καλώς ήρθατε στο %[2]s register_notify.text_1=αυτό είναι το email επιβεβαίωσης εγγραφής για το %s! register_notify.text_2=Τώρα μπορείτε να συνδεθείτε μέσω του ονόματος χρήστη: %s. diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d10f61f2ffc9e..6fe2bb120b863 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -475,8 +475,8 @@ activate_email = Verify your email address activate_email.title = %s, please verify your email address activate_email.text = Please click the following link to verify your email address within %s: -register_notify = Welcome to Gitea -register_notify.title = %[1]s, welcome to %[2]s +register_notify = Welcome to %s +register_notify.title = %[1]s, welcome to %[2] register_notify.text_1 = this is your registration confirmation email for %s! register_notify.text_2 = You can now login via username: %s. register_notify.text_3 = If this account has been created for you, please set your password first. diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 8c0dc836fd9dc..c4126f8efeb3d 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -431,7 +431,7 @@ activate_email=Verifique su correo electrónico activate_email.title=%s, por favor verifique su dirección de correo electrónico activate_email.text=Por favor, haga clic en el siguiente enlace para verificar su dirección de correo electrónico dentro de %s: -register_notify=¡Bienvenido a Gitea +register_notify=¡Bienvenido a %s register_notify.title=%[1]s, bienvenido a %[2]s register_notify.text_1=este es tu correo de confirmación de registro para %s! register_notify.text_2=Ahora puede iniciar sesión vía nombre de usuario: %s. diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index be0f1f5b6452d..e5c104fe37adf 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -339,7 +339,7 @@ activate_account=Ole hyvä ja aktivoi tilisi activate_email=Vahvista sähköpostiosoitteesi -register_notify=Tervetuloa Giteaan +register_notify=Tervetuloa %s register_notify.text_2=Voit nyt kirjautua käyttäjätunnuksella: %s. reset_password=Palauta käyttäjätili diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index ae32b861f675a..b16fc5a8457b1 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -474,7 +474,7 @@ activate_email=Veuillez vérifier votre adresse courriel activate_email.title=%s, veuillez vérifier votre adresse courriel activate_email.text=Veuillez cliquer sur le lien suivant pour vérifier votre adresse courriel dans %s: -register_notify=Bienvenue sur Gitea +register_notify=Bienvenue sur %s register_notify.title=%[1]s, bienvenue à %[2]s register_notify.text_1=ceci est votre courriel de confirmation d'inscription pour %s! register_notify.text_2=Vous pouvez maintenant vous connecter avec le nom d'utilisateur : %s. diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 617c7d10c0b50..0a7c1c1845954 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -290,7 +290,7 @@ activate_account=Kérjük aktiválja a fiókját activate_email=E-mail cím megerősítése -register_notify=A Gitea üdvözli +register_notify=A %s üdvözli reset_password=Fiókjának visszaállítása diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index cd3257dfde152..faae318910f25 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -210,7 +210,7 @@ activate_account=Silakan aktifkan akun anda activate_email=Verifikasi alamat surel anda -register_notify=Selamat Datang di Gitea +register_notify=Selamat Datang di %s reset_password=Pulihkan akun Anda diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini index 1ec4d990cf241..96964940a2e6d 100644 --- a/options/locale/locale_is-IS.ini +++ b/options/locale/locale_is-IS.ini @@ -301,7 +301,7 @@ activate_account.text_2=Vinsamlegast smelltu á eftirfarandi tengil til að virk activate_email=Staðfestu netfangið þitt activate_email.text=Vinsamlegast smelltu á eftirfarandi tengil til að staðfesta netfangið þitt innan %s: -register_notify=Velkomin(n) í Gitea +register_notify=Velkomin(n) í %s register_notify.title=%[1]s, velkomin(n) í %[2]s register_notify.text_1=þetta er staðfestingarpóstur þinn fyrir skráningu á %s! register_notify.text_2=Þú getur nú skráð þig inn með notandanafni: %s. diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index 1f9e4e6a8e80a..b28194822e7d6 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -360,7 +360,7 @@ activate_account.text_2=Clicca sul seguente link per attivare il tuo account ent activate_email=Verifica il tuo indirizzo e-mail activate_email.text=Clicca sul seguente link per verificare il tuo indirizzo email entro %s: -register_notify=Benvenuto su Gitea +register_notify=Benvenuto su %s register_notify.title=%[1]s, benvenuto in %[2]s register_notify.text_1=questa è la tua email di conferma di registrazione per %s! register_notify.text_2=Ora è possibile accedere tramite nome utente: %s. diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index acce73b0af641..023918e6c2d6d 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -473,7 +473,7 @@ activate_email=メール アドレスを確認します activate_email.title=%s さん、メールアドレス確認をお願いします activate_email.text=あなたのメールアドレスを確認するため、%s以内に次のリンクをクリックしてください: -register_notify=Giteaへようこそ +register_notify=%sへようこそ register_notify.title=%[1]s さん、%[2]s にようこそ register_notify.text_1=これは %s への登録確認メールです! register_notify.text_2=あなたはユーザー名 %s でログインできるようになりました。 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index c5bf621c4752b..933ebba0a20c0 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -273,7 +273,7 @@ activate_account=계정을 활성화하세요 activate_email=이메일 주소 확인 -register_notify=Gitea에 오신것을 환영합니다! +register_notify=%s에 오신것을 환영합니다! reset_password=계정 복구 diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 120d8f340764c..e8aec36fc3fde 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -434,7 +434,7 @@ activate_email=Apstipriniet savu e-pasta adresi activate_email.title=%s, apstipriniet savu e-pasta adresi activate_email.text=Nospiediet uz saites, lai apstiprinātu savu e-pasta adresi lapā %s: -register_notify=Laipni lūdzam Gitea +register_notify=Laipni lūdzam %s register_notify.title=%[1]s, esat reģistrējies %[2]s register_notify.text_1=šis ir reģistrācijas apstiprinājuma e-pasts lapai %s! register_notify.text_2=Tagad varat autorizēties ar lietotāja vārdu: %s. diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 1b232fbf277eb..6ebbab676ae81 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -359,7 +359,7 @@ activate_account.text_2=Klik op de volgende link om uw account te activeren binn activate_email=Verifieer uw e-mailadres activate_email.text=Klik op de volgende link om je e-mailadres te bevestigen in %s: -register_notify=Welkom bij Gitea +register_notify=Welkom bij %s register_notify.title=%[1]s, welkom bij %[2]s register_notify.text_1=dit is uw registratie bevestigingsemail voor %s! register_notify.text_2=U kunt nu inloggen via de gebruikersnaam: %s. diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 0807ae9478f99..7e679346f73ba 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -352,7 +352,7 @@ activate_account.text_2=Kliknij poniższy link, aby aktywować swoje konto w ci activate_email=Potwierdź swój adres e-mail activate_email.text=Aby zweryfikować swój adres e-mail, w ciągu następnych %s kliknij poniższy link: -register_notify=Witamy w Gitea +register_notify=Witamy w %s register_notify.title=%[1]s, witaj w %[2]s register_notify.text_1=to jest Twój e-mail z potwierdzeniem rejestracji dla %s! register_notify.text_2=Możesz teraz zalogować się za pomocą nazwy użytkownika: %s. diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index ec45e839c0ad7..14ffb7c3ed3db 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -434,7 +434,7 @@ activate_email=Verifique seu endereço de e-mail activate_email.title=%s, por favor verifique o seu endereço de e-mail activate_email.text=Por favor clique no link a seguir para verificar o seu endereço de e-mail em %s: -register_notify=Bem-vindo ao Gitea +register_notify=Bem-vindo ao %s register_notify.title=%[1]s, bem-vindo(a) a %[2]s register_notify.text_1=este é o seu e-mail de confirmação de registro para %s! register_notify.text_2=Agora você pode entrar com o nome de usuário: %s. diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index b6ce9adcb35c7..0f274dd2203d7 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -475,7 +475,7 @@ activate_email=Valide o seu endereço de email activate_email.title=%s, por favor valide o seu endereço de email activate_email.text=Por favor clique na seguinte ligação para validar o seu endereço de email dentro de %s: -register_notify=Bem-vindo(a) ao Gitea +register_notify=Bem-vindo(a) ao %s register_notify.title=%[1]s, bem-vindo(a) a %[2]s register_notify.text_1=este é o seu email de confirmação de registo para %s! register_notify.text_2=Agora pode iniciar a sessão com o nome de utilizador: %s. diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 464d6020372c1..99de272715741 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -432,7 +432,7 @@ activate_email=Подтвердите адрес своей электронно activate_email.title=%s, пожалуйста, подтвердите ваш адрес электронной почты activate_email.text=Пожалуйста, перейдите по ссылке, чтобы подтвердить ваш адрес электронной почты в течение %s: -register_notify=Добро пожаловать на Gitea +register_notify=Добро пожаловать на %s register_notify.title=%[1]s, добро пожаловать в %[2]s register_notify.text_1=это письмо с вашим подтверждением регистрации в %s! register_notify.text_2=Теперь вы можете войти через логин: %s. diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 4d839b097733a..e8cc01cfdbe15 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -324,7 +324,7 @@ activate_account.text_2=%sතුළ ඔබගේ ගිණුම සක activate_email=ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කරන්න activate_email.text=තුළ ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කිරීමට පහත සබැඳිය ක්ලික් කරන්න %s: -register_notify=ගිටියා වෙත සාදරයෙන් පිළිගනිමු +register_notify=%s වෙත සාදරයෙන් පිළිගනිමු register_notify.title=%[1]s, %[2]s වෙත සාදරයෙන් පිළිගනිමු register_notify.text_1=මෙය %sසඳහා ඔබගේ ලියාපදිංචි තහවුරු කිරීමේ විද්යුත් තැපෑලයි! register_notify.text_2=ඔබට දැන් පරිශීලක නාමය හරහා පිවිසිය හැකිය: %s. diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini index 079523e38cf73..39d64f92ecc47 100644 --- a/options/locale/locale_sk-SK.ini +++ b/options/locale/locale_sk-SK.ini @@ -417,7 +417,7 @@ activate_account.text_2=Pre aktiváciu vašeho účtu kliknite, prosím, na nasl activate_email=Overte svoju e-mailovú adresu activate_email.text=Pre overenie vašej e-mailovej adresy kliknite, prosím, na nasledovný odkaz do %s: -register_notify=Vitajte v Gitea +register_notify=Vitajte v %s register_notify.title=%[1]s, vitajte v %[2]s register_notify.text_1=toto je e-mail potvrdzujúci vašu registráciu pre %s! register_notify.text_2=Teraz sa môžete prihlásiť s používateľským menom: %s. diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 56c7dc2fb322b..a2acb45c57235 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -302,7 +302,7 @@ activate_account=Vänligen aktivera ditt konto activate_email=Verifiera din epostaddress -register_notify=Välkommen till Gitea +register_notify=Välkommen till %s reset_password=Återställ ditt konto diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 505f5743cd455..611d71e85f006 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -472,7 +472,7 @@ activate_email=E-posta adresinizi doğrulayın activate_email.title=%s, lütfen e-posta adresinizi doğrulayın activate_email.text=E posta adresinizi doğrulamak için lütfen %s içinde linke tıklayın: -register_notify=Gitea'ya Hoş Geldiniz +register_notify=%s'ya Hoş Geldiniz register_notify.title=%[1]s, %[2]s e hoşgeldiniz register_notify.text_1=bu %s için kayıt onay e postanızdır! register_notify.text_2=Artık %s kullanıcı adı ile oturum açabilirsiniz. diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 4b7bf86de8c24..62e74b580a235 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -338,7 +338,7 @@ activate_account.text_2=Перейдіть за цим посиланням, щ activate_email=Підтвердить вашу адресу електронної пошти activate_email.text=Перейдіть за цим посиланням, щоб підтвердити вашу електронну адресу в %s: -register_notify=Ласкаво просимо у Gitea +register_notify=Ласкаво просимо у %s register_notify.title=%[1]s, ласкаво просимо до %[2]s register_notify.text_1=це ваша е-пошта для підтвердження реєстрації для %s! register_notify.text_2=Тепер ви можете увійти як: %s. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 7485d4d68f871..7d5cf393382f9 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -473,7 +473,7 @@ activate_email=请验证您的邮箱地址 activate_email.title=%s,请验证您的邮箱 activate_email.text=请在 %s 时间内,点击以下链接,以验证你的电子邮件地址: -register_notify=欢迎来到 Gitea +register_notify=欢迎来到 %s register_notify.title=%[1]s,欢迎来到 %[2]s register_notify.text_1=这是您的 %s 注册确认电子邮件 ! register_notify.text_2=您现在可以以用户名 %s 登录。 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index a6ae0ffe8ecee..a4ba6f564ba6b 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -148,7 +148,7 @@ activate_account=請啟用您的帳戶 activate_email=請驗證您的郵箱地址 -register_notify=歡迎來到 Gitea +register_notify=歡迎來到 %s register_success=註冊成功 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index ae703233e8489..abebdb4930bfb 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -402,7 +402,7 @@ activate_account.text_2=請在 %s內點擊下列連結以啟用您的帳 activate_email=請驗證您的電子信箱 activate_email.text=請在 %s內點擊下列連結以驗證您的電子信箱: -register_notify=歡迎來到 Gitea +register_notify=歡迎來到 %s register_notify.title=%[1]s,歡迎來到 %[2]s register_notify.text_1=這是您在 %s 的註冊確認信! register_notify.text_2=您現在可以用帳號 %s 登入。 diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 000cc835c8b77..8fed8b48a9a2f 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -158,7 +158,8 @@ func SendRegisterNotifyMail(u *user_model.User) { return } - msg := NewMessage(u.Email, locale.TrString("mail.register_notify"), content.String()) + appname := setting.AppName + msg := NewMessage(u.Email, locale.TrString("mail.register_notify", appname), content.String()) msg.Info = fmt.Sprintf("UID: %d, registration notify", u.ID) SendAsync(msg) From 77b61ab38a35a9a7f490f69388a78b05c5ba7a0f Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 12 Jul 2024 00:51:34 +0200 Subject: [PATCH 2/4] clean --- options/locale/locale_cs-CZ.ini | 2 +- options/locale/locale_de-DE.ini | 2 +- options/locale/locale_el-GR.ini | 2 +- options/locale/locale_es-ES.ini | 2 +- options/locale/locale_fi-FI.ini | 2 +- options/locale/locale_fr-FR.ini | 2 +- options/locale/locale_hu-HU.ini | 2 +- options/locale/locale_id-ID.ini | 2 +- options/locale/locale_is-IS.ini | 2 +- options/locale/locale_it-IT.ini | 2 +- options/locale/locale_ja-JP.ini | 2 +- options/locale/locale_ko-KR.ini | 2 +- options/locale/locale_lv-LV.ini | 2 +- options/locale/locale_nl-NL.ini | 2 +- options/locale/locale_pl-PL.ini | 2 +- options/locale/locale_pt-BR.ini | 2 +- options/locale/locale_pt-PT.ini | 2 +- options/locale/locale_ru-RU.ini | 2 +- options/locale/locale_si-LK.ini | 2 +- options/locale/locale_sk-SK.ini | 2 +- options/locale/locale_sv-SE.ini | 2 +- options/locale/locale_tr-TR.ini | 2 +- options/locale/locale_uk-UA.ini | 2 +- options/locale/locale_zh-CN.ini | 2 +- options/locale/locale_zh-HK.ini | 2 +- options/locale/locale_zh-TW.ini | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index cbe8f6f693ca6..fb2735825ebf5 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -471,7 +471,7 @@ activate_email=Ověřte vaši e-mailovou adresu activate_email.title=%s, prosím ověřte vaši e-mailovou adresu activate_email.text=Pro aktivaci vašeho účtu do %s klikněte na následující odkaz: -register_notify=Vítejte v %s +register_notify=Vítejte v Gitea register_notify.title=%[1]s vítejte v %[2]s register_notify.text_1=toto je váš potvrzovací e-mail pro %s! register_notify.text_2=Nyní se můžete přihlásit přes uživatelské jméno: %s. diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index c709d152b06b3..d66dd13af05ed 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -465,7 +465,7 @@ activate_email=Bestätige deine E-Mail-Adresse activate_email.title=%s, bitte verifiziere deine E-Mail-Adresse activate_email.text=Bitte klicke innerhalb von %s auf folgenden Link, um dein Konto zu aktivieren: -register_notify=Willkommen bei %s +register_notify=Willkommen bei Gitea register_notify.title=%[1]s, willkommen bei %[2]s register_notify.text_1=dies ist deine Bestätigungs-E-Mail für %s! register_notify.text_2=Du kannst dich jetzt mit dem Benutzernamen "%s" anmelden. diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 17885155626b3..557bd3a7ff32e 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -431,7 +431,7 @@ activate_email=Επιβεβαιώστε τη διεύθυνση email σας activate_email.title=%s, παρακαλώ επαληθεύστε τη διεύθυνση email σας activate_email.text=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να επαληθεύσετε τη διεύθυνση email σας στο %s: -register_notify=Καλώς ήλθατε στο %s +register_notify=Καλώς ήλθατε στο Gitea register_notify.title=%[1]s, καλώς ήρθατε στο %[2]s register_notify.text_1=αυτό είναι το email επιβεβαίωσης εγγραφής για το %s! register_notify.text_2=Τώρα μπορείτε να συνδεθείτε μέσω του ονόματος χρήστη: %s. diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index dfe8fa40aaf6b..7fb6eb4dca5da 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -428,7 +428,7 @@ activate_email=Verifique su correo electrónico activate_email.title=%s, por favor verifique su dirección de correo electrónico activate_email.text=Por favor, haga clic en el siguiente enlace para verificar su dirección de correo electrónico dentro de %s: -register_notify=¡Bienvenido a %s +register_notify=¡Bienvenido a Gitea register_notify.title=%[1]s, bienvenido a %[2]s register_notify.text_1=este es tu correo de confirmación de registro para %s! register_notify.text_2=Ahora puede iniciar sesión vía nombre de usuario: %s. diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index e0366cb751622..72c595e0077bd 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -336,7 +336,7 @@ activate_account=Ole hyvä ja aktivoi tilisi activate_email=Vahvista sähköpostiosoitteesi -register_notify=Tervetuloa %s +register_notify=Tervetuloa Giteaan register_notify.text_2=Voit nyt kirjautua käyttäjätunnuksella: %s. reset_password=Palauta käyttäjätili diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index cd8e9ef872c6a..1b57152badfe3 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -471,7 +471,7 @@ activate_email=Veuillez vérifier votre adresse courriel activate_email.title=%s, veuillez vérifier votre adresse courriel activate_email.text=Veuillez cliquer sur le lien suivant pour vérifier votre adresse courriel dans %s: -register_notify=Bienvenue sur %s +register_notify=Bienvenue sur Gitea register_notify.title=%[1]s, bienvenue à %[2]s register_notify.text_1=ceci est votre courriel de confirmation d'inscription pour %s! register_notify.text_2=Vous pouvez maintenant vous connecter avec le nom d'utilisateur : %s. diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 3eea7fa82f438..0a526499ec7df 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -287,7 +287,7 @@ activate_account=Kérjük aktiválja a fiókját activate_email=E-mail cím megerősítése -register_notify=A %s üdvözli +register_notify=A Gitea üdvözli reset_password=Fiókjának visszaállítása diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index aa520d811a423..177806ec86e7f 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -207,7 +207,7 @@ activate_account=Silakan aktifkan akun anda activate_email=Verifikasi alamat surel anda -register_notify=Selamat Datang di %s +register_notify=Selamat Datang di Gitea reset_password=Pulihkan akun Anda diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini index 91e27de993de4..c00e4d81fe599 100644 --- a/options/locale/locale_is-IS.ini +++ b/options/locale/locale_is-IS.ini @@ -298,7 +298,7 @@ activate_account.text_2=Vinsamlegast smelltu á eftirfarandi tengil til að virk activate_email=Staðfestu netfangið þitt activate_email.text=Vinsamlegast smelltu á eftirfarandi tengil til að staðfesta netfangið þitt innan %s: -register_notify=Velkomin(n) í %s +register_notify=Velkomin(n) í Gitea register_notify.title=%[1]s, velkomin(n) í %[2]s register_notify.text_1=þetta er staðfestingarpóstur þinn fyrir skráningu á %s! register_notify.text_2=Þú getur nú skráð þig inn með notandanafni: %s. diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index 6c9058c3fc337..1682399ab3557 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -357,7 +357,7 @@ activate_account.text_2=Clicca sul seguente link per attivare il tuo account ent activate_email=Verifica il tuo indirizzo e-mail activate_email.text=Clicca sul seguente link per verificare il tuo indirizzo email entro %s: -register_notify=Benvenuto su %s +register_notify=Benvenuto su Gitea register_notify.title=%[1]s, benvenuto in %[2]s register_notify.text_1=questa è la tua email di conferma di registrazione per %s! register_notify.text_2=Ora è possibile accedere tramite nome utente: %s. diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 0ea22efb2ed50..4cc10abe78778 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -477,7 +477,7 @@ activate_email=メール アドレスを確認します activate_email.title=%s さん、メールアドレス確認をお願いします activate_email.text=あなたのメールアドレスを確認するため、%s以内に次のリンクをクリックしてください: -register_notify=%sへようこそ +register_notify=Giteaへようこそ register_notify.title=%[1]s さん、%[2]s にようこそ register_notify.text_1=これは %s への登録確認メールです! register_notify.text_2=あなたはユーザー名 %s でログインできるようになりました。 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index 81f0cec0858d6..2a608b805c445 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -270,7 +270,7 @@ activate_account=계정을 활성화하세요 activate_email=이메일 주소 확인 -register_notify=%s에 오신것을 환영합니다! +register_notify=Gitea에 오신것을 환영합니다! reset_password=계정 복구 diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index f068efac96088..460e2bd1a4938 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -431,7 +431,7 @@ activate_email=Apstipriniet savu e-pasta adresi activate_email.title=%s, apstipriniet savu e-pasta adresi activate_email.text=Nospiediet uz saites, lai apstiprinātu savu e-pasta adresi lapā %s: -register_notify=Laipni lūdzam %s +register_notify=Laipni lūdzam Gitea register_notify.title=%[1]s, esat reģistrējies %[2]s register_notify.text_1=šis ir reģistrācijas apstiprinājuma e-pasts lapai %s! register_notify.text_2=Tagad varat autorizēties ar lietotāja vārdu: %s. diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 4eb5f25e15eab..dc6d17faa4a29 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -356,7 +356,7 @@ activate_account.text_2=Klik op de volgende link om uw account te activeren binn activate_email=Verifieer uw e-mailadres activate_email.text=Klik op de volgende link om je e-mailadres te bevestigen in %s: -register_notify=Welkom bij %s +register_notify=Welkom bij Gitea register_notify.title=%[1]s, welkom bij %[2]s register_notify.text_1=dit is uw registratie bevestigingsemail voor %s! register_notify.text_2=U kunt nu inloggen via de gebruikersnaam: %s. diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 4bce7a95cb2f8..36f1c158eb5e9 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -349,7 +349,7 @@ activate_account.text_2=Kliknij poniższy link, aby aktywować swoje konto w ci activate_email=Potwierdź swój adres e-mail activate_email.text=Aby zweryfikować swój adres e-mail, w ciągu następnych %s kliknij poniższy link: -register_notify=Witamy w %s +register_notify=Witamy w Gitea register_notify.title=%[1]s, witaj w %[2]s register_notify.text_1=to jest Twój e-mail z potwierdzeniem rejestracji dla %s! register_notify.text_2=Możesz teraz zalogować się za pomocą nazwy użytkownika: %s. diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index d0d87632dec08..c19bbed63d08e 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -431,7 +431,7 @@ activate_email=Verifique seu endereço de e-mail activate_email.title=%s, por favor verifique o seu endereço de e-mail activate_email.text=Por favor clique no link a seguir para verificar o seu endereço de e-mail em %s: -register_notify=Bem-vindo ao %s +register_notify=Bem-vindo ao Gitea register_notify.title=%[1]s, bem-vindo(a) a %[2]s register_notify.text_1=este é o seu e-mail de confirmação de registro para %s! register_notify.text_2=Agora você pode entrar com o nome de usuário: %s. diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index d189257cbcfe4..ffcc98ec32c84 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -477,7 +477,7 @@ activate_email=Valide o seu endereço de email activate_email.title=%s, por favor valide o seu endereço de email activate_email.text=Por favor clique na seguinte ligação para validar o seu endereço de email dentro de %s: -register_notify=Bem-vindo(a) ao %s +register_notify=Bem-vindo(a) ao Gitea register_notify.title=%[1]s, bem-vindo(a) a %[2]s register_notify.text_1=este é o seu email de confirmação de registo para %s! register_notify.text_2=Agora pode iniciar a sessão com o nome de utilizador: %s. diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 9fe9faa02febe..2a4d0e09b4c2b 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -429,7 +429,7 @@ activate_email=Подтвердите адрес своей электронно activate_email.title=%s, пожалуйста, подтвердите ваш адрес электронной почты activate_email.text=Пожалуйста, перейдите по ссылке, чтобы подтвердить ваш адрес электронной почты в течение %s: -register_notify=Добро пожаловать на %s +register_notify=Добро пожаловать на Gitea register_notify.title=%[1]s, добро пожаловать в %[2]s register_notify.text_1=это письмо с вашим подтверждением регистрации в %s! register_notify.text_2=Теперь вы можете войти через логин: %s. diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 5feea7c3bcbf3..d015ce4d4df8e 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -321,7 +321,7 @@ activate_account.text_2=%sතුළ ඔබගේ ගිණුම සක activate_email=ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කරන්න activate_email.text=තුළ ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කිරීමට පහත සබැඳිය ක්ලික් කරන්න %s: -register_notify=%s වෙත සාදරයෙන් පිළිගනිමු +register_notify=ගිටියා වෙත සාදරයෙන් පිළිගනිමු register_notify.title=%[1]s, %[2]s වෙත සාදරයෙන් පිළිගනිමු register_notify.text_1=මෙය %sසඳහා ඔබගේ ලියාපදිංචි තහවුරු කිරීමේ විද්යුත් තැපෑලයි! register_notify.text_2=ඔබට දැන් පරිශීලක නාමය හරහා පිවිසිය හැකිය: %s. diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini index 14547750a6e3e..651cf120ea782 100644 --- a/options/locale/locale_sk-SK.ini +++ b/options/locale/locale_sk-SK.ini @@ -414,7 +414,7 @@ activate_account.text_2=Pre aktiváciu vašeho účtu kliknite, prosím, na nasl activate_email=Overte svoju e-mailovú adresu activate_email.text=Pre overenie vašej e-mailovej adresy kliknite, prosím, na nasledovný odkaz do %s: -register_notify=Vitajte v %s +register_notify=Vitajte v Gitea register_notify.title=%[1]s, vitajte v %[2]s register_notify.text_1=toto je e-mail potvrdzujúci vašu registráciu pre %s! register_notify.text_2=Teraz sa môžete prihlásiť s používateľským menom: %s. diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index d359fa4e2780f..897877d828d19 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -299,7 +299,7 @@ activate_account=Vänligen aktivera ditt konto activate_email=Verifiera din epostaddress -register_notify=Välkommen till %s +register_notify=Välkommen till Gitea reset_password=Återställ ditt konto diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index c2b4e73f75a2d..46ce912847301 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -469,7 +469,7 @@ activate_email=E-posta adresinizi doğrulayın activate_email.title=%s, lütfen e-posta adresinizi doğrulayın activate_email.text=E posta adresinizi doğrulamak için lütfen %s içinde linke tıklayın: -register_notify=%s'ya Hoş Geldiniz +register_notify=Gitea'ya Hoş Geldiniz register_notify.title=%[1]s, %[2]s e hoşgeldiniz register_notify.text_1=bu %s için kayıt onay e postanızdır! register_notify.text_2=Artık %s kullanıcı adı ile oturum açabilirsiniz. diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index b8dcb3d11d046..007913d1231e5 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -335,7 +335,7 @@ activate_account.text_2=Перейдіть за цим посиланням, щ activate_email=Підтвердить вашу адресу електронної пошти activate_email.text=Перейдіть за цим посиланням, щоб підтвердити вашу електронну адресу в %s: -register_notify=Ласкаво просимо у %s +register_notify=Ласкаво просимо у Gitea register_notify.title=%[1]s, ласкаво просимо до %[2]s register_notify.text_1=це ваша е-пошта для підтвердження реєстрації для %s! register_notify.text_2=Тепер ви можете увійти як: %s. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 6a79d449f7d3d..1b2dcda7348cc 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -470,7 +470,7 @@ activate_email=请验证您的邮箱地址 activate_email.title=%s,请验证您的邮箱 activate_email.text=请在 %s 时间内,点击以下链接,以验证你的电子邮件地址: -register_notify=欢迎来到 %s +register_notify=欢迎来到 Gitea register_notify.title=%[1]s,欢迎来到 %[2]s register_notify.text_1=这是您的 %s 注册确认电子邮件 ! register_notify.text_2=您现在可以以用户名 %s 登录。 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index 0e057cc95fbfc..950bf608a07c6 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -147,7 +147,7 @@ activate_account=請啟用您的帳戶 activate_email=請驗證您的郵箱地址 -register_notify=歡迎來到 %s +register_notify=歡迎來到 Gitea register_success=註冊成功 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index 17bff370b7176..df0501a465689 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -399,7 +399,7 @@ activate_account.text_2=請在 %s內點擊下列連結以啟用您的帳 activate_email=請驗證您的電子信箱 activate_email.text=請在 %s內點擊下列連結以驗證您的電子信箱: -register_notify=歡迎來到 %s +register_notify=歡迎來到 Gitea register_notify.title=%[1]s,歡迎來到 %[2]s register_notify.text_1=這是您在 %s 的註冊確認信! register_notify.text_2=您現在可以用帳號 %s 登入。 From 337c673068ebbe4d9f65f251e84657f5fc39091b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 12 Jul 2024 00:52:58 +0200 Subject: [PATCH 3/4] Update options/locale/locale_en-US.ini --- 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 68f9bbcd1c1d0..ef9e946c0a9e2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -478,7 +478,7 @@ activate_email.title = %s, please verify your email address activate_email.text = Please click the following link to verify your email address within %s: register_notify = Welcome to %s -register_notify.title = %[1]s, welcome to %[2] +register_notify.title = %[1]s, welcome to %[2]s register_notify.text_1 = this is your registration confirmation email for %s! register_notify.text_2 = You can now login via username: %s. register_notify.text_3 = If this account has been created for you, please set your password first. From 67b7780eb6f7c6c897d98d1ba3ef1036db6a33f9 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 12 Jul 2024 00:54:02 +0200 Subject: [PATCH 4/4] fmt --- services/mailer/mail.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/mailer/mail.go b/services/mailer/mail.go index e9d2697cc216a..1f5df6efe7ede 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -158,7 +158,7 @@ func SendRegisterNotifyMail(u *user_model.User) { return } - msg := NewMessage(u.EmailTo(), locale.TrString("mail.register_notify", setting.AppName), content.String()) + msg := NewMessage(u.EmailTo(), locale.TrString("mail.register_notify", setting.AppName), content.String()) msg.Info = fmt.Sprintf("UID: %d, registration notify", u.ID) SendAsync(msg)