diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini
index c6faee5cf6..532bb4626f 100644
--- a/options/locale/locale_bg-BG.ini
+++ b/options/locale/locale_bg-BG.ini
@@ -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@example.com>".
 mailer_user=SMTP потребител
@@ -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 конфигурация
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 2b7c18ca12..389a259628 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -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@example.com>.
 mailer_user=Uživatelské jméno SMTP
@@ -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
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index b4e59e504a..fa8b470a0f 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -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@example.com>“ ein.
 mailer_user=SMTP-Benutzername
@@ -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
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index c123bd6d26..94b8eb9a15 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -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@example.com>.
 mailer_user=Όνομα Χρήστη SMTP
@@ -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
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 4507bc553b..15222272b3 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -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@example.com>.
 mailer_user=Nombre de usuario SMTP
@@ -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
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index 9999425f15..5595de24c3 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -158,7 +158,6 @@ log_root_path_helper=فایل‌های گزارش روی این مسیر ذخی
 
 optional_title=تنظیمات اختیاری
 email_title=تنظیمات ایمیل
-smtp_host=میزبان SMTP
 smtp_from=ارسال ایمیل به عنوان
 smtp_from_helper=آدرس ایمیلی که گیتی استفاده میکند. یک ایمیل وارد کنید یا به "Name" <email@example.com> شکل استفاده کنید.
 mailer_user=نام کاربری SMTP
@@ -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=مسیر ارسال ایمیل مستقیم
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 2699598ed9..e0cd500bdd 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -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@example.com> -muodossa.
 mailer_user=SMTP-käyttäjätunnus
@@ -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
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index acd17f88c5..ac1d950534 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -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@example.com>.
 mailer_user=Utilisateur SMTP
@@ -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
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
index a98bbedf3e..b09ffdba11 100644
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@@ -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
@@ -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
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
index 34c7db6b23..bfd7e6f31d 100644
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@@ -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@example.com>.
 mailer_user=Nama Pengguna SMTP
@@ -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
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
index 9503c3c277..f41fab0f52 100644
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@@ -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@example.com> sniðið.
 mailer_user=SMTP Notandanafn
@@ -1265,7 +1264,6 @@ config.db_path=Slóð
 
 
 config.mailer_name=Heiti
-config.mailer_host=Hýsill
 config.mailer_user=Notandi
 
 
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index 7fd8298737..6e7e64d2a3 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -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@example.com>.
 mailer_user=Nome utente SMTP
@@ -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. test@example.com)
 config.send_test_mail=Invia email di prova
 config.test_mail_failed=Impossibile inviare mail di prova a '%s': %v
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index b91f3c87e7..6411646640 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -179,7 +179,6 @@ log_root_path_helper=ログファイルがこのディレクトリに書き込
 
 optional_title=オプション設定
 email_title=メール設定
-smtp_host=SMTPホスト
 smtp_from=メール送信者
 smtp_from_helper=Giteaが使用するメールアドレス。 メールアドレスのみ、または、 "名前" <email@example.com> の形式で入力してください。
 mailer_user=SMTPユーザー名
@@ -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のパス
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
index ab8908e531..002007508c 100644
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@@ -126,7 +126,6 @@ log_root_path_helper=로그파일은 이 디렉토리에 저장됩니다.
 
 optional_title=추가설정
 email_title=이메일 설정
-smtp_host=SMTP 호스트
 smtp_from=이메일 발신인
 smtp_from_helper=Gitea 가 사용할 이메일 주소. 이메일 주소 또는 "이름" <email@example.com> 형식으로 입력하세요.
 mailer_user=SMTP 사용자이름
@@ -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 경로
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index 5cecb321dc..3aaeba081c 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -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" <epasts@domens.lv> formātu.
 mailer_user=SMTP lietotāja vārds
@@ -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
diff --git a/options/locale/locale_ml-IN.ini b/options/locale/locale_ml-IN.ini
index 27e4f11279..5befd50bbf 100644
--- a/options/locale/locale_ml-IN.ini
+++ b/options/locale/locale_ml-IN.ini
@@ -112,7 +112,6 @@ log_root_path_helper=ലോഗ് ഫയലുകൾ ഈ ഡയറക്ടറ
 
 optional_title=ഐച്ഛികമായ ക്രമീകരണങ്ങൾ
 email_title=ഇമെയിൽ ക്രമീകരണങ്ങൾ
-smtp_host=SMTP ഹോസ്റ്റ്
 smtp_from=ഈ വിലാസത്തില്‍ ഇമെയിൽ അയയ്‌ക്കുക
 smtp_from_helper=ഗിറ്റീ ഉപയോഗിയ്ക്കുന്ന ഇമെയില്‍ വിലാസം. ഒരു സാധാ ഇമെയിൽ വിലാസം നൽകുക അല്ലെങ്കിൽ "പേര്"<email@example.com> എന്ന ഘടന ഉപയോഗിക്കുക.
 mailer_user=SMTP ഉപയോക്തൃനാമം
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index 4a7de692ce..99857b96e1 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -179,7 +179,8 @@ log_root_path_helper=Logboekbestanden worden geschreven naar deze map.
 
 optional_title=Optionele instellingen
 email_title=E-mail instellingen
-smtp_host=SMTP host
+smtp_addr=SMTP Host
+smtp_port=SMTP Poort
 smtp_from=E-mails versturen als
 smtp_from_helper=E-mailadres dat Gitea gaat gebruiken. Voer een gewoon e-mailadres in of gebruik de "Naam" <email@example.com> -indeling.
 mailer_user=SMTP gebruikersnaam
@@ -1242,6 +1243,7 @@ issues.add_label=voegde het %s label %s toe
 issues.add_labels=voegde de %s labels %s toe
 issues.remove_label=verwijderde het %s label %s
 issues.remove_labels=verwijderde de %s labels %s
+issues.add_remove_labels=voegde de %s toe en verwijderde de %s labels %s
 issues.add_milestone_at=`heeft dit %[2]s aan de mijlpaal <b>%[1]s</b> toegevoegd`
 issues.add_project_at=`heeft dit toegevoegd aan het <b>%s</b> project %s`
 issues.change_milestone_at='mijlpaal bewerkt van <b>%s</b> <b>%s</b> %s'
@@ -1255,6 +1257,9 @@ issues.add_assignee_at=`was toegekend door <b>%s</b> %s`
 issues.remove_assignee_at=`is niet toegewezen door <b>%s</b> %s`
 issues.remove_self_assignment=`heeft %s zijn/haar toewijzing verwijderd`
 issues.change_title_at='titel aangepast van <b><strike>%s</strike></b> naar <b>%s</b> %s'
+issues.change_ref_at=`wijzig referentie van <b><strike>%s</strike></b> naar <b>%s</b> %s`
+issues.remove_ref_at=`heeft referentie <b>%s</b> verwijderd %s`
+issues.add_ref_at=`heeft referentie <b>%s</b> toegevoegd %s`
 issues.delete_branch_at=`heeft %[2]s de branch <b>%[1]s</b> verwijderd.`
 issues.filter_label=Label
 issues.filter_label_exclude=`Gebruik <code>alt</code> + <code>klik/voer</code> in om labels uit te sluiten
@@ -1268,6 +1273,7 @@ issues.filter_type.all_issues=Alle kwesties
 issues.filter_type.assigned_to_you=Aan jou toegewezen
 issues.filter_type.created_by_you=Aangemaakt door jou
 issues.filter_type.mentioning_you=Vermelden jou
+issues.filter_type.review_requested=Review aangevraagd
 issues.filter_sort=Sorteer
 issues.filter_sort.latest=Nieuwste
 issues.filter_sort.oldest=Oudste
@@ -1281,6 +1287,7 @@ issues.filter_sort.moststars=Meeste sterren
 issues.filter_sort.feweststars=Minste sterren
 issues.filter_sort.mostforks=Meeste forks
 issues.filter_sort.fewestforks=Minste forks
+issues.keyword_search_unavailable=Zoeken op trefwoord is momenteel niet beschikbaar. Neem contact op met de websitebeheerder.
 issues.action_open=Open
 issues.action_close=Sluit
 issues.action_label=Label
@@ -2629,16 +2636,15 @@ config.queue_length=Lengte van wachtrij
 config.deliver_timeout=Bezorging verlooptijd
 config.skip_tls_verify=TLS-verificatie overslaan
 
-config.mailer_config=SMTP Mailerconfiguatie
 config.mailer_enabled=Ingeschakeld
-config.mailer_disable_helo=Schakel HELO uit
 config.mailer_name=Naam
-config.mailer_host=Host
+config.mailer_smtp_port=SMTP Poort
 config.mailer_user=Gebruiker
 config.mailer_use_sendmail=Gebruik Sendmail
 config.mailer_sendmail_path=Sendmail pad
 config.mailer_sendmail_args=Extra argumenten voor Sendmail
 config.mailer_sendmail_timeout=Sendmail time-out
+config.mailer_use_dummy=Dummy
 config.test_email_placeholder=E-mailadres (bijv. test@example.com)
 config.send_test_mail=Test e-mail verzenden
 config.test_mail_failed=Verzenden van een testmail naar '%s' is mislukt: %v
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index 75c3d6287c..f4a4521fb9 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -177,7 +177,6 @@ log_root_path_helper=Pliki logów będą zapisywane w tym katalogu.
 
 optional_title=Ustawienia opcjonalne
 email_title=Ustawienia e-mail
-smtp_host=Serwer SMTP
 smtp_from=Wyślij e-mail jako
 smtp_from_helper=Adres e-mail, z którego Gitea będzie korzystać. Wpisz prosty adres e-mail, lub użyj formatu "Nazwa" <email@example.com>.
 mailer_user=Nazwa użytkownika SMTP
@@ -2494,11 +2493,8 @@ config.queue_length=Długość kolejki
 config.deliver_timeout=Limit czasu doręczenia
 config.skip_tls_verify=Pomiń weryfikację TLS
 
-config.mailer_config=Konfiguracja dostawcy SMTP
 config.mailer_enabled=Włączona
-config.mailer_disable_helo=Wyłącz HELO
 config.mailer_name=Nazwa
-config.mailer_host=Serwer
 config.mailer_user=Użytkownik
 config.mailer_use_sendmail=Używaj Sendmail
 config.mailer_sendmail_path=Ścieżka Sendmail
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 99d8fb2db1..765c69b8d7 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -179,7 +179,8 @@ log_root_path_helper=Arquivos de log serão gravados neste diretório.
 
 optional_title=Configurações opcionais
 email_title=Configurações de e-mail
-smtp_host=Host SMTP
+smtp_addr=Host SMTP
+smtp_port=Porta SMTP
 smtp_from=Enviar e-mail como
 smtp_from_helper=Endereço de e-mail que o Gitea irá usar. Digite um endereço de e-mail simples ou use o formato "Nome" <email@example.com>.
 mailer_user=Nome de usuário do SMTP
@@ -799,6 +800,7 @@ email_notifications.enable=Habilitar notificações de e-mail
 email_notifications.onmention=Somente e-mail com menção
 email_notifications.disable=Desabilitar notificações de e-mail
 email_notifications.submit=Atualizar preferências de e-mail
+email_notifications.andyourown=E Suas Próprias Notificações
 
 visibility=Visibilidade do usuário
 visibility.public=Pública
@@ -2773,11 +2775,11 @@ config.queue_length=Tamanho da fila
 config.deliver_timeout=Intervalo de entrega
 config.skip_tls_verify=Ignorar verificação de TLS
 
-config.mailer_config=Configuração SMTP para envio de e-mail
+config.mailer_config=Configuração de Envio de E-mail
 config.mailer_enabled=Habilitado
-config.mailer_disable_helo=Desabilitar HELO
 config.mailer_name=Nome
-config.mailer_host=Servidor
+config.mailer_protocol=Protocolo
+config.mailer_smtp_port=Porta SMTP
 config.mailer_user=Usuário
 config.mailer_use_sendmail=Usar o Sendmail
 config.mailer_sendmail_path=Caminho do Sendmail
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index 57254925c4..50b92a95c5 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -179,7 +179,8 @@ log_root_path_helper=Os ficheiros de registo serão escritos nesta pasta.
 
 optional_title=Configurações opcionais
 email_title=Configurações de email
-smtp_host=Servidor SMTP
+smtp_addr=Servidor SMTP
+smtp_port=Porto do SMTP
 smtp_from=Email do remetente
 smtp_from_helper=Endereço de email que o Gitea vai usar. Insira um endereço de email simples ou use o formato "Nome" <email@exemplo.com>.
 mailer_user=Nome de utilizador do SMTP
@@ -2795,16 +2796,19 @@ config.queue_length=Tamanho da fila
 config.deliver_timeout=Prazo da entrega
 config.skip_tls_verify=Ignorar validação TLS
 
-config.mailer_config=Configuração da aplicação SMTP
+config.mailer_config=Configuração de envio de email
 config.mailer_enabled=Habilitado
-config.mailer_disable_helo=Desabilitar HELO
+config.mailer_enable_helo=Habilitar HELO
 config.mailer_name=Nome
-config.mailer_host=Servidor
+config.mailer_protocol=Protocolo
+config.mailer_smtp_addr=Endereço SMTP
+config.mailer_smtp_port=Porto do SMTP
 config.mailer_user=Utilizador
 config.mailer_use_sendmail=Usar o sendmail
 config.mailer_sendmail_path=Caminho do sendmail
 config.mailer_sendmail_args=Argumentos extras para o sendmail
 config.mailer_sendmail_timeout=Tempo limite do Sendmail
+config.mailer_use_dummy=Fictício
 config.test_email_placeholder=Email (ex.: teste@exemplo.com)
 config.send_test_mail=Enviar email de teste
 config.test_mail_failed=Falhou o envio de um email de teste para '%s': %v
@@ -3114,6 +3118,8 @@ rubygems.install=Para instalar o pacote usando o gem, execute o seguinte comando
 rubygems.install2=ou adicione-o ao ficheiro <code>Gemfile</code>:
 rubygems.dependencies.runtime=Dependências do tempo de execução (runtime)
 rubygems.dependencies.development=Dependências de desenvolvimento
+rubygems.required.ruby=Requer a versão do Ruby
+rubygems.required.rubygems=Requer a versão do RubyGem
 rubygems.documentation=Para obter mais informações sobre o registo do RubyGems, consulte <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/rubygems/">a documentação</a>.
 settings.link=Vincular este pacote a um repositório
 settings.link.description=Se você vincular um pacote a um repositório, o pacote será listado na lista de pacotes do repositório.
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index ad8ee86d02..35fc93d441 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -177,7 +177,6 @@ log_root_path_helper=Файлы журнала будут записыватьс
 
 optional_title=Расширенные настройки
 email_title=Настройки электронной почты
-smtp_host=Узел SMTP
 smtp_from=Отправить эл. почту как
 smtp_from_helper=Адрес электронной почты, который будет использоваться Gitea. Введите обычный адрес электронной почты или используйте формат "Имя" <email@example.com>.
 mailer_user=SMTP логин
@@ -2681,11 +2680,8 @@ config.queue_length=Длина очереди
 config.deliver_timeout=Задержка доставки
 config.skip_tls_verify=Пропустить проверку TLS
 
-config.mailer_config=Настройки почты
 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
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
index 069a871045..17fbf54467 100644
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
@@ -151,7 +151,6 @@ log_root_path_helper=ලොග් ගොනු මෙම ඩිරෙක්ට
 
 optional_title=වෛකල්පිත සැකසුම්
 email_title=වි-තැපෑලේ සැකසුම්
-smtp_host=SMTP සත්කාරක
 smtp_from=ලෙස වි-තැපෑල යවන්න
 smtp_from_helper=විද්යුත් තැපැල් ලිපිනය Gitea භාවිතා කරනු ඇත. සරල විද්යුත් තැපැල් ලිපිනයක් ඇතුළත් කරන්න හෝ “නම” <email@example.com> ආකෘතිය භාවිතා කරන්න.
 mailer_user=SMTP පරිශීලක නාමය
@@ -2508,11 +2507,8 @@ config.queue_length=පෝලිම් දිග
 config.deliver_timeout=කාලය ගලවාගන්න
 config.skip_tls_verify=TLS සත්යාපනය මඟ හරින්න
 
-config.mailer_config=SMTP තැපැල්කරු වින්යාසය
 config.mailer_enabled=සබල කර ඇත
-config.mailer_disable_helo=හෙලෝ අක්රීය කරන්න
 config.mailer_name=නම
-config.mailer_host=සත්කාරක
 config.mailer_user=පරිශීලක
 config.mailer_use_sendmail=සෙන්ඩ්මේල් භාවිතා කරන්න
 config.mailer_sendmail_path=සෙන්ඩ්මේල් මාර්ගය
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index 717481ec54..3adf6ce0ab 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -138,7 +138,6 @@ log_root_path_helper=Loggfiler kommer skrivas till denna katalog.
 
 optional_title=Övriga inställningar
 email_title=Mejlinställningar
-smtp_host=SMTP-server
 smtp_from=Skicka Mejl Som
 smtp_from_helper=Mejladress som Gitea kommer att använda. Anges i simpelt ('email@example.com') eller fullständigt ('Name <email@example.com>') format.
 mailer_user=SMTP-Användarnamn
@@ -1969,11 +1968,8 @@ config.queue_length=Kölängd
 config.deliver_timeout=Tidsfrist för leverans
 config.skip_tls_verify=Skippa TLS verifiering
 
-config.mailer_config=SMTP-Mailer konfiguration
 config.mailer_enabled=Aktiverad
-config.mailer_disable_helo=Avaktivera HELO
 config.mailer_name=Namn
-config.mailer_host=Server
 config.mailer_user=Användare
 config.mailer_use_sendmail=Använd Sendmail
 config.mailer_sendmail_path=Sendmail sökväg
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index d56e02b395..eb5f8a6436 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -179,7 +179,8 @@ log_root_path_helper=Günlük dosyaları bu dizine kaydedilecektir.
 
 optional_title=İsteğe Bağlı Ayarlar
 email_title=E-posta Ayarları
-smtp_host=SMTP Sunucusu
+smtp_addr=SMTP Sunucusu
+smtp_port=SMTP Portu
 smtp_from=E-posta Gönderen
 smtp_from_helper=Gitea'nın kullanacağı e-posta adresi. Yalın bir e-posta adresi girin veya "İsim" <eposta@ornek.com> biçimini kullanın.
 mailer_user=SMTP Kullanıcı Adı
@@ -2708,11 +2709,8 @@ config.queue_length=Kuyruk Uzunluğu
 config.deliver_timeout=Dağıtım Zaman Aşımı
 config.skip_tls_verify=TLS Doğrulamasını Geç
 
-config.mailer_config=SMTP Mailer Yapılandırması
 config.mailer_enabled=Aktif
-config.mailer_disable_helo=HELO'yu Devre Dışı Bırak
 config.mailer_name=İsim
-config.mailer_host=Sunucu
 config.mailer_user=Kullanıcı
 config.mailer_use_sendmail=Sendmail Kullan
 config.mailer_sendmail_path=Sendmail Yolu
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 49be51a4de..a5f26fd220 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -161,7 +161,6 @@ log_root_path_helper=Файли журналу будуть записані в
 
 optional_title=Додаткові налаштування
 email_title=Налаштування Email
-smtp_host=SMTP хост
 smtp_from=Відправляти Email від імені
 smtp_from_helper=Електронна пошта для використання в Gіtea. Введіть звичайну електронну адресу або використовуйте формат: "Ім'я" <email@example.com>.
 mailer_user=SMTP Ім'я кристувача
@@ -2582,11 +2581,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
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index fb7c0e5055..ef239d0e3f 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -179,7 +179,6 @@ log_root_path_helper=日志文件将写入此目录。
 
 optional_title=可选设置
 email_title=电子邮箱设置
-smtp_host=SMTP 主机
 smtp_from=电子邮件发件人
 smtp_from_helper=电子邮件地址 Gitea 将使用。输入一个普通的电子邮件地址或使用 "名称" <email@example.com> 格式。
 mailer_user=SMTP 用户名
@@ -2788,11 +2787,8 @@ config.queue_length=队列长度
 config.deliver_timeout=推送超时
 config.skip_tls_verify=跳过 TLS 验证
 
-config.mailer_config=邮件配置
 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 路径
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
index c6ea7ce673..587ee5bb23 100644
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@@ -64,7 +64,6 @@ repo_path=儲存庫的根目錄
 log_root_path=日誌路徑
 
 optional_title=可選設定
-smtp_host=SMTP 主機
 federated_avatar_lookup_popup=開啟聯合頭像查詢並使用基於開放源碼的 libravatar 服務
 enable_captcha_popup=要求在用戶註冊時輸入驗證碼
 admin_password=管理員密碼
@@ -760,9 +759,7 @@ config.deliver_timeout=推送超時
 config.skip_tls_verify=略過 TLS 驗證
 
 config.mailer_enabled=啟用服務
-config.mailer_disable_helo=禁用 HELO 操作
 config.mailer_name=發送者名稱
-config.mailer_host=郵件主機地址
 config.mailer_user=發送者帳號
 
 config.oauth_config=社交帳號設定
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index 8d89c51a1d..0e0dc6d59f 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -179,7 +179,6 @@ log_root_path_helper=日誌檔將寫入此目錄。
 
 optional_title=可選設定
 email_title=電子郵件設定
-smtp_host=SMTP 主機
 smtp_from=電子郵件寄件者
 smtp_from_helper=Gitea 將會使用的電子信箱，直接輸入電子信箱或使用「"名稱" <email@example.com>」的格式。
 mailer_user=SMTP 帳號
@@ -2788,11 +2787,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 路徑