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
  Fix the JS error "EventSource is not defined" caused by some non-standard browsers (go-gitea#20584)
  Send correct NuGet status codes (go-gitea#20647)
  Add default commit messages to PR for squash merge (go-gitea#20618)
  • Loading branch information
zjjhot committed Aug 4, 2022
2 parents 51c8e7a + b6bb389 commit ff8df2f
Show file tree
Hide file tree
Showing 35 changed files with 118 additions and 175 deletions.
6 changes: 3 additions & 3 deletions integrations/api_packages_nuget_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func TestPackageNuGet(t *testing.T) {

req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content))
req = AddBasicAuthHeader(req, user.Name)
MakeRequest(t, req, http.StatusBadRequest)
MakeRequest(t, req, http.StatusConflict)
})

t.Run("SymbolPackage", func(t *testing.T) {
Expand Down Expand Up @@ -208,7 +208,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)

req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createPackage(packageName, "SymbolsPackage"))
req = AddBasicAuthHeader(req, user.Name)
MakeRequest(t, req, http.StatusBadRequest)
MakeRequest(t, req, http.StatusConflict)
})
})

Expand Down Expand Up @@ -352,7 +352,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)

req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName, packageVersion))
req = AddBasicAuthHeader(req, user.Name)
MakeRequest(t, req, http.StatusOK)
MakeRequest(t, req, http.StatusNoContent)

pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNuGet)
assert.NoError(t, err)
Expand Down
3 changes: 0 additions & 3 deletions options/locale/locale_bg-BG.ini
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ log_root_path_helper=Директория, в която да се съхран

optional_title=Опционални настройки
email_title=Имейл настройки
smtp_host=SMTP сървър
smtp_from=Изпрати имейл като
smtp_from_helper=E-mail адрес, който да се използва от Gitea. Въведете само E-mail адреса или име и E-mail във формат "Name <[email protected]>".
mailer_user=SMTP потребител
Expand Down Expand Up @@ -1151,9 +1150,7 @@ config.queue_length=Дължина на опашка
config.deliver_timeout=Време за отказ при изпращане

config.mailer_enabled=Активен
config.mailer_disable_helo=Изключи HELO
config.mailer_name=Име
config.mailer_host=Сървър
config.mailer_user=Потребител

config.oauth_config=OAuth конфигурация
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_cs-CZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ log_root_path_helper=Soubory protokolu budou zapsány do tohoto adresáře.

optional_title=Dodatečná nastavení
email_title=Nastavení e-mailu
smtp_host=Server SMTP
smtp_from=Odeslat e-mail jako
smtp_from_helper=E-mailová adresa, kterou bude Gitea používat. Zadejte běžnou e-mailovou adresu, nebo použijte formát "Jméno"<[email protected]>.
mailer_user=Uživatelské jméno SMTP
Expand Down Expand Up @@ -2661,11 +2660,8 @@ config.queue_length=Délka fronty
config.deliver_timeout=Časový limit doručení
config.skip_tls_verify=Přeskočit verifikaci TLS

config.mailer_config=Konfigurace služby SMTP
config.mailer_enabled=Zapnutý
config.mailer_disable_helo=Zakázat HELO
config.mailer_name=Název
config.mailer_host=Server
config.mailer_user=Uživatel
config.mailer_use_sendmail=Použít Sendmail
config.mailer_sendmail_path=Cesta k Sendmail
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_de-DE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ log_root_path_helper=Log-Dateien werden in diesem Verzeichnis gespeichert.

optional_title=Optionale Einstellungen
email_title=E-Mail-Einstellungen
smtp_host=SMTP-Server
smtp_from=E-Mail senden als
smtp_from_helper=E-Mail-Adresse, die von Gitea genutzt werden soll. Bitte gib die E-Mail-Adresse im Format „"Name" <[email protected]>“ ein.
mailer_user=SMTP-Benutzername
Expand Down Expand Up @@ -2790,11 +2789,8 @@ config.queue_length=Warteschlangenlänge
config.deliver_timeout=Zeitlimit für Zustellung
config.skip_tls_verify=TLS-Verifikation überspringen

config.mailer_config=SMTP-Mailer-Konfiguration
config.mailer_enabled=Aktiviert
config.mailer_disable_helo=HELO deaktivieren
config.mailer_name=Name
config.mailer_host=Host
config.mailer_user=Benutzer
config.mailer_use_sendmail=Sendmail benutzen
config.mailer_sendmail_path=Sendmail-Pfad
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_el-GR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ log_root_path_helper=Τα αρχεία καταγραφής θα γράφοντ

optional_title=Προαιρετικές Ρυθμίσεις
email_title=Ρυθμίσεις Email
smtp_host=Διακομιστής SMTP
smtp_from=Αποστολή Email Ως
smtp_from_helper=Η διεύθυνση email που θα χρησιμοποιεί το Gitea. Εισάγετε μια απλή διεύθυνση ηλεκτρονικού ταχυδρομείου ή χρησιμοποιήστε τη μορφή "Όνομα" <[email protected]>.
mailer_user=Όνομα Χρήστη SMTP
Expand Down Expand Up @@ -2794,11 +2793,8 @@ config.queue_length=Μέγεθος Ουράς
config.deliver_timeout=Χρονικό Όριο Παράδοσης
config.skip_tls_verify=Παράλειψη Επαλήθευσης TLS

config.mailer_config=Ρυθμίσεις SMTP Mailer
config.mailer_enabled=Ενεργοποιημένο
config.mailer_disable_helo=Απενεργοποίηση HELO
config.mailer_name=Όνομα
config.mailer_host=Διακομιστής
config.mailer_user=Χρήστης
config.mailer_use_sendmail=Χρήση Sendmail
config.mailer_sendmail_path=Διαδρομή Sendmail
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_es-ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ log_root_path_helper=Archivos de registro se escribirán en este directorio.

optional_title=Configuración opcional
email_title=Configuración de Correo
smtp_host=Servidor SMTP
smtp_from=Enviar correos electrónicos como
smtp_from_helper=Dirección de correo electrónico que utilizará Gitea. Introduzca una dirección de correo electrónico normal o utilice el formato "Nombre" <[email protected]>.
mailer_user=Nombre de usuario SMTP
Expand Down Expand Up @@ -2795,11 +2794,8 @@ config.queue_length=Tamaño de Cola de Envío
config.deliver_timeout=Timeout de Entrega
config.skip_tls_verify=Saltar verificación TLS

config.mailer_config=Configuración del servidor de correo
config.mailer_enabled=Activado
config.mailer_disable_helo=Desactivar HELO
config.mailer_name=Nombre
config.mailer_host=Servidor
config.mailer_user=Usuario
config.mailer_use_sendmail=Usar Sendmail
config.mailer_sendmail_path=Ruta de Sendmail
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_fa-IR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ log_root_path_helper=فایل‌های گزارش روی این مسیر ذخی

optional_title=تنظیمات اختیاری
email_title=تنظیمات ایمیل
smtp_host=میزبان SMTP
smtp_from=ارسال ایمیل به عنوان
smtp_from_helper=آدرس ایمیلی که گیتی استفاده میکند. یک ایمیل وارد کنید یا به "Name" <[email protected]> شکل استفاده کنید.
mailer_user=نام کاربری SMTP
Expand Down Expand Up @@ -2576,11 +2575,8 @@ config.queue_length=طول صف
config.deliver_timeout=مهلت تحویل
config.skip_tls_verify=صرف نظر از اعتبارسنجی TLS

config.mailer_config=پیکربندی سامانه ایمیلی SMTP
config.mailer_enabled=فعال شده
config.mailer_disable_helo=غیر فعال کردن HELO
config.mailer_name=نام
config.mailer_host=میزبان
config.mailer_user=کاربر
config.mailer_use_sendmail=استفاده از ارسال رایانامه (ایمیل) مستقیم
config.mailer_sendmail_path=مسیر ارسال ایمیل مستقیم
Expand Down
3 changes: 0 additions & 3 deletions options/locale/locale_fi-FI.ini
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ log_root_path_helper=Lokitiedostot kirjoitetaan tähän kansioon.

optional_title=Valinnaiset asetukset
email_title=Sähköpostiasetukset
smtp_host=SMTP isäntä
smtp_from=Lähetä sähköpostit osoitteella
smtp_from_helper=Sähköpostiosoite, jota Gitea käyttää. Kirjoita osoite ”nimi” <[email protected]> -muodossa.
mailer_user=SMTP-käyttäjätunnus
Expand Down Expand Up @@ -1217,9 +1216,7 @@ config.queue_length=Jonon pituus
config.deliver_timeout=Toimitus aikakatkaisu

config.mailer_enabled=Käytössä
config.mailer_disable_helo=Poista käytöstä HELO
config.mailer_name=Nimi
config.mailer_host=Isäntä
config.mailer_user=Käyttäjä

config.oauth_config=OAuth asetukset
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_fr-FR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ log_root_path_helper=Les fichiers de journalisation seront écrits dans ce répe

optional_title=Paramètres facultatifs
email_title=Paramètres E-mail
smtp_host=Hôte SMTP
smtp_from=Envoyer les e-mails en tant que
smtp_from_helper=Adresse e-mail utilisée par Gitea. Veuillez entrer votre e-mail directement ou sous la forme <[email protected]>.
mailer_user=Utilisateur SMTP
Expand Down Expand Up @@ -2494,11 +2493,8 @@ config.queue_length=Longueur de la file d'attente
config.deliver_timeout=Expiration d'Envoi
config.skip_tls_verify=Passer la vérification TLS
config.mailer_config=Configuration du service SMTP
config.mailer_enabled=Activé
config.mailer_disable_helo=Désactiver HELO
config.mailer_name=Nom
config.mailer_host=Hôte
config.mailer_user=Utilisateur
config.mailer_use_sendmail=Utiliser Sendmail
config.mailer_sendmail_path=Chemin d’accès à Sendmail
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_hu-HU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ log_root_path_helper=A naplófájlok ebbe a mappába fognak íródni.

optional_title=További beállítások
email_title=E-mail beállítások
smtp_host=SMTP kiszolgáló
smtp_from=E-mail küldése mint
smtp_from_helper=Az E-mail cím a mit a Gitea használni fog. Megadhatja sima email címként vagy "Név<email@példa.hu>" formátumban.
mailer_user=SMTP-felhasználónév
Expand Down Expand Up @@ -1625,11 +1624,8 @@ config.queue_length=Várakozási Sor Hossza
config.deliver_timeout=Kézbesítési Időtúllépés
config.skip_tls_verify=A TLS Hitelesítés Kihagyása

config.mailer_config=SMTP levelező Beállítások
config.mailer_enabled=Engedélyezett
config.mailer_disable_helo=HELO Letiltása
config.mailer_name=Név
config.mailer_host=Kiszolgáló
config.mailer_user=Felhasználó
config.mailer_use_sendmail=Sendmail Használata
config.mailer_sendmail_path=Sendmail Elérési Útja
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_id-ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ log_root_path_helper=Berkas log akan ditulis ke direktori ini.

optional_title=Pengaturan Opsional
email_title=Pengaturan Surel
smtp_host=Host SMTP
smtp_from=Kirim Surel sebagai
smtp_from_helper=Alamat surel Gitea akan digunakan. Masukkan alamat surel atau gunakan fomat "Nama" <[email protected]>.
mailer_user=Nama Pengguna SMTP
Expand Down Expand Up @@ -1235,11 +1234,8 @@ config.queue_length=Panjang antrian
config.deliver_timeout=Berikan waktu habis
config.skip_tls_verify=Melewatkan verifikasi TLS

config.mailer_config=Pengaturan SMTP Mailer
config.mailer_enabled=Diaktifkan
config.mailer_disable_helo=Nonaktifkan HELO
config.mailer_name=Nama
config.mailer_host=Host
config.mailer_user=Pengguna
config.mailer_use_sendmail=Menggunakan Sendmail
config.mailer_sendmail_path=Jalur Sendmail
Expand Down
2 changes: 0 additions & 2 deletions options/locale/locale_is-IS.ini
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ log_root_path_helper=Annálaskrár verða skrifaðar í þessa möppu.

optional_title=Valfrjálsar Stillingar
email_title=Tölvupóstsstillingar
smtp_host=SMTP Hýsill
smtp_from=Senda Tölvupóst Sem
smtp_from_helper=Netfang sem Gitea mun nota. Sláðu inn venjulegt netfang eða notaðu „Nafn“ <[email protected]> sniðið.
mailer_user=SMTP Notandanafn
Expand Down Expand Up @@ -1265,7 +1264,6 @@ config.db_path=Slóð


config.mailer_name=Heiti
config.mailer_host=Hýsill
config.mailer_user=Notandi


Expand Down
12 changes: 8 additions & 4 deletions options/locale/locale_it-IT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ log_root_path_helper=I file di log saranno scritti in questa directory.
optional_title=Impostazioni Facoltative
email_title=Impostazioni Email
smtp_host=Host SMTP
smtp_addr=Host SMTP
smtp_port=Porta SMTP
smtp_from=Invia Email come
smtp_from_helper=Indirizzo Email che Gitea utilizzerà. Inserisci un indirizzo email o usa il formato "Name" <[email protected]>.
mailer_user=Nome utente SMTP
Expand Down Expand Up @@ -2795,16 +2796,19 @@ config.queue_length=Lunghezza della coda
config.deliver_timeout=Tempo Limite di Consegna
config.skip_tls_verify=Salta autenticazione TLS
config.mailer_config=Configurazione Mailer SMTP
config.mailer_config=Configurazione Mailer
config.mailer_enabled=Attivo
config.mailer_disable_helo=Disattiva HELO
config.mailer_enable_helo=Abilita HELO
config.mailer_name=Nome
config.mailer_host=Host
config.mailer_protocol=Protocollo
config.mailer_smtp_addr=Indirizzo SMTP
config.mailer_smtp_port=Porta SMTP
config.mailer_user=Utente
config.mailer_use_sendmail=Utilizza Sendmail
config.mailer_sendmail_path=Percorso Sendmail
config.mailer_sendmail_args=Argomenti aggiuntivi per Sendmail
config.mailer_sendmail_timeout=Timeout Sendmail
config.mailer_use_dummy=Dummy
config.test_email_placeholder=Email (es. [email protected])
config.send_test_mail=Invia email di prova
config.test_mail_failed=Impossibile inviare mail di prova a '%s': %v
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_ja-JP.ini
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ log_root_path_helper=ログファイルがこのディレクトリに書き込

optional_title=オプション設定
email_title=メール設定
smtp_host=SMTPホスト
smtp_from=メール送信者
smtp_from_helper=Giteaが使用するメールアドレス。 メールアドレスのみ、または、 "名前" <[email protected]> の形式で入力してください。
mailer_user=SMTPユーザー名
Expand Down Expand Up @@ -2795,11 +2794,8 @@ config.queue_length=キューの長さ
config.deliver_timeout=送信タイムアウト
config.skip_tls_verify=TLS検証を省略

config.mailer_config=SMTPメーラーの設定
config.mailer_enabled=有効
config.mailer_disable_helo=HELOコマンド無効
config.mailer_name=名称
config.mailer_host=ホスト
config.mailer_user=ユーザー
config.mailer_use_sendmail=Sendmailを使う
config.mailer_sendmail_path=Sendmailのパス
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_ko-KR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ log_root_path_helper=로그파일은 이 디렉토리에 저장됩니다.

optional_title=추가설정
email_title=이메일 설정
smtp_host=SMTP 호스트
smtp_from=이메일 발신인
smtp_from_helper=Gitea 가 사용할 이메일 주소. 이메일 주소 또는 "이름" <[email protected]> 형식으로 입력하세요.
mailer_user=SMTP 사용자이름
Expand Down Expand Up @@ -1450,11 +1449,8 @@ config.queue_length=큐 길이
config.deliver_timeout=시간 제한 사용
config.skip_tls_verify=TLS 검증 건너뛰기

config.mailer_config=SMTP 메일러 설정
config.mailer_enabled=활성화됨
config.mailer_disable_helo=HELO 비활성화
config.mailer_name=이름
config.mailer_host=호스트
config.mailer_user=사용자
config.mailer_use_sendmail=Sendmail 사용
config.mailer_sendmail_path=Sendmail 경로
Expand Down
4 changes: 0 additions & 4 deletions options/locale/locale_lv-LV.ini
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ log_root_path_helper=Žurnalizēšanas faili tiks rakstīti šajā direktorijā.

optional_title=Neobligātie iestatījumi
email_title=E-pastu iestatījumi
smtp_host=SMTP resursdators
smtp_from=Nosūtīt e-pastu kā
smtp_from_helper=E-pasta adrese, ko Gitea izmantos. Ievadiet tika e-pasta adrese vai izmantojiet "Vārds" <[email protected]> formātu.
mailer_user=SMTP lietotāja vārds
Expand Down Expand Up @@ -2783,11 +2782,8 @@ config.queue_length=Rindas garums
config.deliver_timeout=Piegādes noildze
config.skip_tls_verify=Izlaist TLS pārbaudi
config.mailer_config=SMTP sūtītāja konfigurācija
config.mailer_enabled=Iespējota
config.mailer_disable_helo=Atspējot HELO
config.mailer_name=Nosaukums
config.mailer_host=Resursdators
config.mailer_user=Lietotājs
config.mailer_use_sendmail=Izmantot Sendmail
config.mailer_sendmail_path=Ceļš līdz sendmail programmai
Expand Down
1 change: 0 additions & 1 deletion options/locale/locale_ml-IN.ini
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ log_root_path_helper=ലോഗ് ഫയലുകൾ ഈ ഡയറക്ടറ

optional_title=ഐച്ഛികമായ ക്രമീകരണങ്ങൾ
email_title=ഇമെയിൽ ക്രമീകരണങ്ങൾ
smtp_host=SMTP ഹോസ്റ്റ്
smtp_from=ഈ വിലാസത്തില്‍ ഇമെയിൽ അയയ്‌ക്കുക
smtp_from_helper=ഗിറ്റീ ഉപയോഗിയ്ക്കുന്ന ഇമെയില്‍ വിലാസം. ഒരു സാധാ ഇമെയിൽ വിലാസം നൽകുക അല്ലെങ്കിൽ "പേര്"<[email protected]> എന്ന ഘടന ഉപയോഗിക്കുക.
mailer_user=SMTP ഉപയോക്തൃനാമം
Expand Down
Loading

0 comments on commit ff8df2f

Please sign in to comment.