Skip to content

Commit

Permalink
Merge remote-tracking branch 'giteaofficial/main'
Browse files Browse the repository at this point in the history
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Display app name in the registration email title (go-gitea#31562)
  typo on date in security document (go-gitea#31617)
  Update JS dependencies (go-gitea#31616)
  Add types for js globals (go-gitea#31586)
  • Loading branch information
zjjhot committed Jul 12, 2024
2 parents 30278e0 + d73623d commit 506851e
Show file tree
Hide file tree
Showing 43 changed files with 1,959 additions and 891 deletions.
11 changes: 9 additions & 2 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ overrides:
- files: ["web_src/**/*"]
globals:
__webpack_public_path__: true
htmx: true
process: false # https://github.com/webpack/webpack/issues/15833
- files: ["web_src/**/*", "docs/**/*"]
env:
Expand All @@ -58,7 +57,15 @@ overrides:
worker: true
rules:
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top]
- files: ["*.config.*", "**/*.d.ts"]
- files: ["*.config.*"]
rules:
i/no-unused-modules: [0]
- files: ["**/*.d.ts"]
rules:
i/no-unused-modules: [0]
"@typescript-eslint/consistent-type-definitions": [0]
"@typescript-eslint/consistent-type-imports": [0]
- files: ["web_src/js/types.ts"]
rules:
i/no-unused-modules: [0]
- files: ["**/*.test.*", "web_src/js/test/setup.ts"]
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Please **DO NOT** file a public issue, instead send your report privately to `se

Due to the sensitive nature of security information, you can use the below GPG public key to encrypt your mail body.

The PGP key is valid until June 24, 2024.
The PGP key is valid until July 9, 2025.

```
Key ID: 6FCD2D5B
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_cs-CZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ 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 <b>%s</b> klikněte na následující odkaz:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_de-DE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ 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 <b>%s</b> auf folgenden Link, um dein Konto zu aktivieren:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_el-GR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ activate_email=Επιβεβαιώστε τη διεύθυνση email σας
activate_email.title=%s, παρακαλώ επαληθεύστε τη διεύθυνση email σας
activate_email.text=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να επαληθεύσετε τη διεύθυνση email σας στο <b>%s</b>:

register_notify=Καλώς ήλθατε στο Gitea
register_notify.title=%[1]s, καλώς ήρθατε στο %[2]s
register_notify.text_1=αυτό είναι το email επιβεβαίωσης εγγραφής για το %s!
register_notify.text_2=Τώρα μπορείτε να συνδεθείτε μέσω του ονόματος χρήστη: %s.
Expand Down
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ 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 <b>%s</b>:
register_notify = Welcome to Gitea
register_notify = Welcome to %s
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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_es-ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ 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 <b>%s</b>:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_fa-IR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ activate_account.text_2=لطفاً روی پیوند زیر کلیک کنید ت
activate_email=نشانی ایمیل خود را تایید کنید
activate_email.text=لطفاً روی پیوند زیر کلیک کنید تا رایانامه‌ی خود را در <b>%s</b> تأیید کنید:

register_notify=به گیتی یا گیت‌گو خوش آمدید
register_notify.title=%[1]s، به %[2]s خوش‌آمدید
register_notify.text_1=این رایانامه‌ی تأیید عضویت شما در %s است!
register_notify.text_2=حالا شما می‌توانید با نام کاربری وارد شوید: %s.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_fi-FI.ini
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ activate_account=Ole hyvä ja aktivoi tilisi

activate_email=Vahvista sähköpostiosoitteesi

register_notify=Tervetuloa Giteaan
register_notify.text_2=Voit nyt kirjautua käyttäjätunnuksella: %s.

reset_password=Palauta käyttäjätili
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_fr-FR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ 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 <b>%s</b>:
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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_hu-HU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ 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

reset_password=Fiókjának visszaállítása

Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_id-ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ activate_account=Silakan aktifkan akun anda

activate_email=Verifikasi alamat surel anda

register_notify=Selamat Datang di Gitea

reset_password=Pulihkan akun Anda

Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_is-IS.ini
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@ 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 <b>%s</b>:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_it-IT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ 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 <b>%s</b>:
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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_ja-JP.ini
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@ activate_email=メール アドレスを確認します
activate_email.title=%s さん、メールアドレス確認をお願いします
activate_email.text=あなたのメールアドレスを確認するため、<b>%s</b>以内に次のリンクをクリックしてください:

register_notify=Giteaへようこそ
register_notify.title=%[1]s さん、%[2]s にようこそ
register_notify.text_1=これは %s への登録確認メールです!
register_notify.text_2=あなたはユーザー名 %s でログインできるようになりました。
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_ko-KR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ activate_account=계정을 활성화하세요

activate_email=이메일 주소 확인

register_notify=Gitea에 오신것을 환영합니다!

reset_password=계정 복구

Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_lv-LV.ini
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ 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ā <b>%s</b>:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_nl-NL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ 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 <b>%s</b>:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_pl-PL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ 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 <b>%s</b> kliknij poniższy link:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_pt-BR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ 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 <b>%s</b>:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_pt-PT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@ 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 <b>%s</b>:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_ru-RU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@ activate_email=Подтвердите адрес своей электронно
activate_email.title=%s, пожалуйста, подтвердите ваш адрес электронной почты
activate_email.text=Пожалуйста, перейдите по ссылке, чтобы подтвердить ваш адрес электронной почты в течение <b>%s</b>:

register_notify=Добро пожаловать на Gitea
register_notify.title=%[1]s, добро пожаловать в %[2]s
register_notify.text_1=это письмо с вашим подтверждением регистрации в %s!
register_notify.text_2=Теперь вы можете войти через логин: %s.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_si-LK.ini
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ activate_account.text_2=<b>%s</b>තුළ ඔබගේ ගිණුම සක
activate_email=ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කරන්න
activate_email.text=තුළ ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කිරීමට පහත සබැඳිය ක්ලික් කරන්න <b>%s</b>:

register_notify=ගිටියා වෙත සාදරයෙන් පිළිගනිමු
register_notify.title=%[1]s, %[2]s වෙත සාදරයෙන් පිළිගනිමු
register_notify.text_1=මෙය %sසඳහා ඔබගේ ලියාපදිංචි තහවුරු කිරීමේ විද්යුත් තැපෑලයි!
register_notify.text_2=ඔබට දැන් පරිශීලක නාමය හරහා පිවිසිය හැකිය: %s.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_sk-SK.ini
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,6 @@ 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 <b>%s</b>:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_sv-SE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ activate_account=Vänligen aktivera ditt konto

activate_email=Verifiera din epostaddress

register_notify=Välkommen till Gitea

reset_password=Återställ ditt konto

Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_tr-TR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@ 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 <b>%s</b> içinde linke tıklayın:

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.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_uk-UA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ activate_account.text_2=Перейдіть за цим посиланням, щ
activate_email=Підтвердить вашу адресу електронної пошти
activate_email.text=Перейдіть за цим посиланням, щоб підтвердити вашу електронну адресу в <b>%s</b>:

register_notify=Ласкаво просимо у Gitea
register_notify.title=%[1]s, ласкаво просимо до %[2]s
register_notify.text_1=це ваша е-пошта для підтвердження реєстрації для %s!
register_notify.text_2=Тепер ви можете увійти як: %s.
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_zh-CN.ini
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,6 @@ activate_email=请验证您的邮箱地址
activate_email.title=%s,请验证您的邮箱
activate_email.text=请在 <b>%s</b> 时间内,点击以下链接,以验证你的电子邮件地址:

register_notify=欢迎来到 Gitea
register_notify.title=%[1]s,欢迎来到 %[2]s
register_notify.text_1=这是您的 %s 注册确认电子邮件 !
register_notify.text_2=您现在可以以用户名 %s 登录。
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_zh-HK.ini
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ activate_account=請啟用您的帳戶

activate_email=請驗證您的郵箱地址

register_notify=歡迎來到 Gitea


register_success=註冊成功
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_zh-TW.ini
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@ activate_account.text_2=請在 <b>%s</b>內點擊下列連結以啟用您的帳
activate_email=請驗證您的電子信箱
activate_email.text=請在 <b>%s</b>內點擊下列連結以驗證您的電子信箱:

register_notify=歡迎來到 Gitea
register_notify.title=%[1]s,歡迎來到 %[2]s
register_notify.text_1=這是您在 %s 的註冊確認信!
register_notify.text_2=您現在可以用帳號 %s 登入。
Expand Down
Loading

0 comments on commit 506851e

Please sign in to comment.