Skip to content

Commit 506851e

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* 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)
2 parents 30278e0 + d73623d commit 506851e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1959
-891
lines changed

.eslintrc.yaml

+9-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ overrides:
4747
- files: ["web_src/**/*"]
4848
globals:
4949
__webpack_public_path__: true
50-
htmx: true
5150
process: false # https://github.com/webpack/webpack/issues/15833
5251
- files: ["web_src/**/*", "docs/**/*"]
5352
env:
@@ -58,7 +57,15 @@ overrides:
5857
worker: true
5958
rules:
6059
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]
61-
- files: ["*.config.*", "**/*.d.ts"]
60+
- files: ["*.config.*"]
61+
rules:
62+
i/no-unused-modules: [0]
63+
- files: ["**/*.d.ts"]
64+
rules:
65+
i/no-unused-modules: [0]
66+
"@typescript-eslint/consistent-type-definitions": [0]
67+
"@typescript-eslint/consistent-type-imports": [0]
68+
- files: ["web_src/js/types.ts"]
6269
rules:
6370
i/no-unused-modules: [0]
6471
- files: ["**/*.test.*", "web_src/js/test/setup.ts"]

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Please **DO NOT** file a public issue, instead send your report privately to `se
1414

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

17-
The PGP key is valid until June 24, 2024.
17+
The PGP key is valid until July 9, 2025.
1818

1919
```
2020
Key ID: 6FCD2D5B

options/locale/locale_cs-CZ.ini

-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ activate_email=Ověřte vaši e-mailovou adresu
471471
activate_email.title=%s, prosím ověřte vaši e-mailovou adresu
472472
activate_email.text=Pro aktivaci vašeho účtu do <b>%s</b> klikněte na následující odkaz:
473473

474-
register_notify=Vítejte v Gitea
475474
register_notify.title=%[1]s vítejte v %[2]s
476475
register_notify.text_1=toto je váš potvrzovací e-mail pro %s!
477476
register_notify.text_2=Nyní se můžete přihlásit přes uživatelské jméno: %s.

options/locale/locale_de-DE.ini

-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ activate_email=Bestätige deine E-Mail-Adresse
465465
activate_email.title=%s, bitte verifiziere deine E-Mail-Adresse
466466
activate_email.text=Bitte klicke innerhalb von <b>%s</b> auf folgenden Link, um dein Konto zu aktivieren:
467467

468-
register_notify=Willkommen bei Gitea
469468
register_notify.title=%[1]s, willkommen bei %[2]s
470469
register_notify.text_1=dies ist deine Bestätigungs-E-Mail für %s!
471470
register_notify.text_2=Du kannst dich jetzt mit dem Benutzernamen "%s" anmelden.

options/locale/locale_el-GR.ini

-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ activate_email=Επιβεβαιώστε τη διεύθυνση email σας
431431
activate_email.title=%s, παρακαλώ επαληθεύστε τη διεύθυνση email σας
432432
activate_email.text=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να επαληθεύσετε τη διεύθυνση email σας στο <b>%s</b>:
433433

434-
register_notify=Καλώς ήλθατε στο Gitea
435434
register_notify.title=%[1]s, καλώς ήρθατε στο %[2]s
436435
register_notify.text_1=αυτό είναι το email επιβεβαίωσης εγγραφής για το %s!
437436
register_notify.text_2=Τώρα μπορείτε να συνδεθείτε μέσω του ονόματος χρήστη: %s.

options/locale/locale_en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ activate_email = Verify your email address
477477
activate_email.title = %s, please verify your email address
478478
activate_email.text = Please click the following link to verify your email address within <b>%s</b>:
479479
480-
register_notify = Welcome to Gitea
480+
register_notify = Welcome to %s
481481
register_notify.title = %[1]s, welcome to %[2]s
482482
register_notify.text_1 = this is your registration confirmation email for %s!
483483
register_notify.text_2 = You can now login via username: %s.

options/locale/locale_es-ES.ini

-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ activate_email=Verifique su correo electrónico
428428
activate_email.title=%s, por favor verifique su dirección de correo electrónico
429429
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>:
430430

431-
register_notify=¡Bienvenido a Gitea
432431
register_notify.title=%[1]s, bienvenido a %[2]s
433432
register_notify.text_1=este es tu correo de confirmación de registro para %s!
434433
register_notify.text_2=Ahora puede iniciar sesión vía nombre de usuario: %s.

options/locale/locale_fa-IR.ini

-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ activate_account.text_2=لطفاً روی پیوند زیر کلیک کنید ت
332332
activate_email=نشانی ایمیل خود را تایید کنید
333333
activate_email.text=لطفاً روی پیوند زیر کلیک کنید تا رایانامه‌ی خود را در <b>%s</b> تأیید کنید:
334334

335-
register_notify=به گیتی یا گیت‌گو خوش آمدید
336335
register_notify.title=%[1]s، به %[2]s خوش‌آمدید
337336
register_notify.text_1=این رایانامه‌ی تأیید عضویت شما در %s است!
338337
register_notify.text_2=حالا شما می‌توانید با نام کاربری وارد شوید: %s.

options/locale/locale_fi-FI.ini

-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ activate_account=Ole hyvä ja aktivoi tilisi
336336

337337
activate_email=Vahvista sähköpostiosoitteesi
338338

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

342341
reset_password=Palauta käyttäjätili

options/locale/locale_fr-FR.ini

-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ activate_email=Veuillez vérifier votre adresse courriel
471471
activate_email.title=%s, veuillez vérifier votre adresse courriel
472472
activate_email.text=Veuillez cliquer sur le lien suivant pour vérifier votre adresse courriel dans <b>%s</b>:
473473
474-
register_notify=Bienvenue sur Gitea
475474
register_notify.title=%[1]s, bienvenue à %[2]s
476475
register_notify.text_1=ceci est votre courriel de confirmation d'inscription pour %s!
477476
register_notify.text_2=Vous pouvez maintenant vous connecter avec le nom d'utilisateur : %s.

options/locale/locale_hu-HU.ini

-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ activate_account=Kérjük aktiválja a fiókját
287287

288288
activate_email=E-mail cím megerősítése
289289

290-
register_notify=A Gitea üdvözli
291290

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

options/locale/locale_id-ID.ini

-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ activate_account=Silakan aktifkan akun anda
207207

208208
activate_email=Verifikasi alamat surel anda
209209

210-
register_notify=Selamat Datang di Gitea
211210

212211
reset_password=Pulihkan akun Anda
213212

options/locale/locale_is-IS.ini

-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ activate_account.text_2=Vinsamlegast smelltu á eftirfarandi tengil til að virk
298298
activate_email=Staðfestu netfangið þitt
299299
activate_email.text=Vinsamlegast smelltu á eftirfarandi tengil til að staðfesta netfangið þitt innan <b>%s</b>:
300300

301-
register_notify=Velkomin(n) í Gitea
302301
register_notify.title=%[1]s, velkomin(n) í %[2]s
303302
register_notify.text_1=þetta er staðfestingarpóstur þinn fyrir skráningu á %s!
304303
register_notify.text_2=Þú getur nú skráð þig inn með notandanafni: %s.

options/locale/locale_it-IT.ini

-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ activate_account.text_2=Clicca sul seguente link per attivare il tuo account ent
357357
activate_email=Verifica il tuo indirizzo e-mail
358358
activate_email.text=Clicca sul seguente link per verificare il tuo indirizzo email entro <b>%s</b>:
359359
360-
register_notify=Benvenuto su Gitea
361360
register_notify.title=%[1]s, benvenuto in %[2]s
362361
register_notify.text_1=questa è la tua email di conferma di registrazione per %s!
363362
register_notify.text_2=Ora è possibile accedere tramite nome utente: %s.

options/locale/locale_ja-JP.ini

-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@ activate_email=メール アドレスを確認します
477477
activate_email.title=%s さん、メールアドレス確認をお願いします
478478
activate_email.text=あなたのメールアドレスを確認するため、<b>%s</b>以内に次のリンクをクリックしてください:
479479

480-
register_notify=Giteaへようこそ
481480
register_notify.title=%[1]s さん、%[2]s にようこそ
482481
register_notify.text_1=これは %s への登録確認メールです!
483482
register_notify.text_2=あなたはユーザー名 %s でログインできるようになりました。

options/locale/locale_ko-KR.ini

-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ activate_account=계정을 활성화하세요
270270

271271
activate_email=이메일 주소 확인
272272

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

275274
reset_password=계정 복구
276275

options/locale/locale_lv-LV.ini

-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ activate_email=Apstipriniet savu e-pasta adresi
431431
activate_email.title=%s, apstipriniet savu e-pasta adresi
432432
activate_email.text=Nospiediet uz saites, lai apstiprinātu savu e-pasta adresi lapā <b>%s</b>:
433433

434-
register_notify=Laipni lūdzam Gitea
435434
register_notify.title=%[1]s, esat reģistrējies %[2]s
436435
register_notify.text_1=šis ir reģistrācijas apstiprinājuma e-pasts lapai %s!
437436
register_notify.text_2=Tagad varat autorizēties ar lietotāja vārdu: %s.

options/locale/locale_nl-NL.ini

-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ activate_account.text_2=Klik op de volgende link om uw account te activeren binn
356356
activate_email=Verifieer uw e-mailadres
357357
activate_email.text=Klik op de volgende link om je e-mailadres te bevestigen in <b>%s</b>:
358358

359-
register_notify=Welkom bij Gitea
360359
register_notify.title=%[1]s, welkom bij %[2]s
361360
register_notify.text_1=dit is uw registratie bevestigingsemail voor %s!
362361
register_notify.text_2=U kunt nu inloggen via de gebruikersnaam: %s.

options/locale/locale_pl-PL.ini

-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ activate_account.text_2=Kliknij poniższy link, aby aktywować swoje konto w ci
349349
activate_email=Potwierdź swój adres e-mail
350350
activate_email.text=Aby zweryfikować swój adres e-mail, w ciągu następnych <b>%s</b> kliknij poniższy link:
351351

352-
register_notify=Witamy w Gitea
353352
register_notify.title=%[1]s, witaj w %[2]s
354353
register_notify.text_1=to jest Twój e-mail z potwierdzeniem rejestracji dla %s!
355354
register_notify.text_2=Możesz teraz zalogować się za pomocą nazwy użytkownika: %s.

options/locale/locale_pt-BR.ini

-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ activate_email=Verifique seu endereço de e-mail
431431
activate_email.title=%s, por favor verifique o seu endereço de e-mail
432432
activate_email.text=Por favor clique no link a seguir para verificar o seu endereço de e-mail em <b>%s</b>:
433433

434-
register_notify=Bem-vindo ao Gitea
435434
register_notify.title=%[1]s, bem-vindo(a) a %[2]s
436435
register_notify.text_1=este é o seu e-mail de confirmação de registro para %s!
437436
register_notify.text_2=Agora você pode entrar com o nome de usuário: %s.

options/locale/locale_pt-PT.ini

-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@ activate_email=Valide o seu endereço de email
477477
activate_email.title=%s, por favor valide o seu endereço de email
478478
activate_email.text=Por favor clique na seguinte ligação para validar o seu endereço de email dentro de <b>%s</b>:
479479

480-
register_notify=Bem-vindo(a) ao Gitea
481480
register_notify.title=%[1]s, bem-vindo(a) a %[2]s
482481
register_notify.text_1=este é o seu email de confirmação de registo para %s!
483482
register_notify.text_2=Agora pode iniciar a sessão com o nome de utilizador: %s.

options/locale/locale_ru-RU.ini

-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ activate_email=Подтвердите адрес своей электронно
429429
activate_email.title=%s, пожалуйста, подтвердите ваш адрес электронной почты
430430
activate_email.text=Пожалуйста, перейдите по ссылке, чтобы подтвердить ваш адрес электронной почты в течение <b>%s</b>:
431431

432-
register_notify=Добро пожаловать на Gitea
433432
register_notify.title=%[1]s, добро пожаловать в %[2]s
434433
register_notify.text_1=это письмо с вашим подтверждением регистрации в %s!
435434
register_notify.text_2=Теперь вы можете войти через логин: %s.

options/locale/locale_si-LK.ini

-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ activate_account.text_2=<b>%s</b>තුළ ඔබගේ ගිණුම සක
321321
activate_email=ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කරන්න
322322
activate_email.text=තුළ ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කිරීමට පහත සබැඳිය ක්ලික් කරන්න <b>%s</b>:
323323

324-
register_notify=ගිටියා වෙත සාදරයෙන් පිළිගනිමු
325324
register_notify.title=%[1]s, %[2]s වෙත සාදරයෙන් පිළිගනිමු
326325
register_notify.text_1=මෙය %sසඳහා ඔබගේ ලියාපදිංචි තහවුරු කිරීමේ විද්යුත් තැපෑලයි!
327326
register_notify.text_2=ඔබට දැන් පරිශීලක නාමය හරහා පිවිසිය හැකිය: %s.

options/locale/locale_sk-SK.ini

-1
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ activate_account.text_2=Pre aktiváciu vašeho účtu kliknite, prosím, na nasl
414414
activate_email=Overte svoju e-mailovú adresu
415415
activate_email.text=Pre overenie vašej e-mailovej adresy kliknite, prosím, na nasledovný odkaz do <b>%s</b>:
416416

417-
register_notify=Vitajte v Gitea
418417
register_notify.title=%[1]s, vitajte v %[2]s
419418
register_notify.text_1=toto je e-mail potvrdzujúci vašu registráciu pre %s!
420419
register_notify.text_2=Teraz sa môžete prihlásiť s používateľským menom: %s.

options/locale/locale_sv-SE.ini

-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ activate_account=Vänligen aktivera ditt konto
299299

300300
activate_email=Verifiera din epostaddress
301301

302-
register_notify=Välkommen till Gitea
303302

304303
reset_password=Återställ ditt konto
305304

options/locale/locale_tr-TR.ini

-1
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,6 @@ activate_email=E-posta adresinizi doğrulayın
469469
activate_email.title=%s, lütfen e-posta adresinizi doğrulayın
470470
activate_email.text=E posta adresinizi doğrulamak için lütfen <b>%s</b> içinde linke tıklayın:
471471

472-
register_notify=Gitea'ya Hoş Geldiniz
473472
register_notify.title=%[1]s, %[2]s e hoşgeldiniz
474473
register_notify.text_1=bu %s için kayıt onay e postanızdır!
475474
register_notify.text_2=Artık %s kullanıcı adı ile oturum açabilirsiniz.

options/locale/locale_uk-UA.ini

-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ activate_account.text_2=Перейдіть за цим посиланням, щ
335335
activate_email=Підтвердить вашу адресу електронної пошти
336336
activate_email.text=Перейдіть за цим посиланням, щоб підтвердити вашу електронну адресу в <b>%s</b>:
337337

338-
register_notify=Ласкаво просимо у Gitea
339338
register_notify.title=%[1]s, ласкаво просимо до %[2]s
340339
register_notify.text_1=це ваша е-пошта для підтвердження реєстрації для %s!
341340
register_notify.text_2=Тепер ви можете увійти як: %s.

options/locale/locale_zh-CN.ini

-1
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ activate_email=请验证您的邮箱地址
470470
activate_email.title=%s,请验证您的邮箱
471471
activate_email.text=请在 <b>%s</b> 时间内,点击以下链接,以验证你的电子邮件地址:
472472

473-
register_notify=欢迎来到 Gitea
474473
register_notify.title=%[1]s,欢迎来到 %[2]s
475474
register_notify.text_1=这是您的 %s 注册确认电子邮件 !
476475
register_notify.text_2=您现在可以以用户名 %s 登录。

options/locale/locale_zh-HK.ini

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ activate_account=請啟用您的帳戶
147147

148148
activate_email=請驗證您的郵箱地址
149149

150-
register_notify=歡迎來到 Gitea
151150

152151

153152
register_success=註冊成功

options/locale/locale_zh-TW.ini

-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ activate_account.text_2=請在 <b>%s</b>內點擊下列連結以啟用您的帳
399399
activate_email=請驗證您的電子信箱
400400
activate_email.text=請在 <b>%s</b>內點擊下列連結以驗證您的電子信箱:
401401

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

0 commit comments

Comments
 (0)