add POPUP SUBNAME and template

2026-09-08 00:47:04 +03:00 · 2024-03-22 17:37:46 +01:00 · 2024-03-22 17:37:46 +01:00 · 6ce4f3988b
commit 6ce4f3988b
parent 004b6cc816
41 changed files with 8677 additions and 780 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "رفض",
 		"SUBNAME_VACATION_MESSAGE": "رسالة العطلة",
 		"SUBNAME_DISCARD": "تجاهل"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "الأمان",
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Откажи",
 		"SUBNAME_VACATION_MESSAGE": "Съобщение в отпуска",
 		"SUBNAME_DISCARD": "Отхвърли"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Сигурност",
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Odmítnout",
 		"SUBNAME_VACATION_MESSAGE": "Odpověď v nepřítomnosti",
 		"SUBNAME_DISCARD": "Zahodit"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Zabezpečení",
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Afvis",
 		"SUBNAME_VACATION_MESSAGE": "Feriemeddelelse",
 		"SUBNAME_DISCARD": "Kassér"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhed",
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Ablehnen",
 		"SUBNAME_VACATION_MESSAGE": "Urlaubsbenachrichtigung",
 		"SUBNAME_DISCARD": "Verwerfen"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sicherheit",
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Απόρριψη",
 		"SUBNAME_VACATION_MESSAGE": "Μήνυμα διακοπών",
 		"SUBNAME_DISCARD": "Απόρριψη"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Ασφάλεια",
--- a/snappymail/v/0.0.0/app/localization/en-GB/user.json
+++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json
@ -432,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@ -432,7 +432,9 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",,
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Rechazar",
 		"SUBNAME_VACATION_MESSAGE": "Mensaje de vacaciones",
 		"SUBNAME_DISCARD": "Descartar"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Seguridad",
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Lükka tagasi",
 		"SUBNAME_VACATION_MESSAGE": "Puhkuse teade",
 		"SUBNAME_DISCARD": "Hülga"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Turvalisus",
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Errefusatu",
 		"SUBNAME_VACATION_MESSAGE": "Opor-mezua",
 		"SUBNAME_DISCARD": "Baztertu"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Segurtasuna",
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "برگشت‌زدن",
 		"SUBNAME_VACATION_MESSAGE": "پیام تعطیلات",
 		"SUBNAME_DISCARD": "دور انداختن"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "امنیت",
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Hylkää",
 		"SUBNAME_VACATION_MESSAGE": "Lomaviesti",
 		"SUBNAME_DISCARD": "Poista"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Turvallisuus",
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Rejeter",
 		"SUBNAME_VACATION_MESSAGE": "Message d'absence",
 		"SUBNAME_DISCARD": "Exclure"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sécurité",
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Visszautasít",
 		"SUBNAME_VACATION_MESSAGE": "Vakáció üzenet",
 		"SUBNAME_DISCARD": "Elvetés"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Biztonság",
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Tolak",
 		"SUBNAME_VACATION_MESSAGE": "Pesan liburan",
 		"SUBNAME_DISCARD": "Buang"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Keamanan",
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Hafna",
 		"SUBNAME_VACATION_MESSAGE": "Skilaboð vegna fría",
 		"SUBNAME_DISCARD": "Henda"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Öryggi",
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Rifiuta",
 		"SUBNAME_VACATION_MESSAGE": "Messaggio fuori-ufficio",
 		"SUBNAME_DISCARD": "Scarta"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sicurezza",
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "拒否",
 		"SUBNAME_VACATION_MESSAGE": "バケーションメッセージ",
 		"SUBNAME_DISCARD": "破棄"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "セキュリティ",
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@ -432,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "\"%EMAIL%\"(으)로 전달",
 		"SUBNAME_REJECT": "거부",
 		"SUBNAME_VACATION_MESSAGE": "부재 중 메시지",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "보안",
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Atmesti",
 		"SUBNAME_VACATION_MESSAGE": "Atostogų žinutė",
 		"SUBNAME_DISCARD": "Nepaisyti"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sauga",
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@ -432,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Avvis",
 		"SUBNAME_VACATION_MESSAGE": "Feriemelding",
 		"SUBNAME_DISCARD": "Forkast"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhet",
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Afwijzen",
 		"SUBNAME_VACATION_MESSAGE": "Afwezigheidsbericht",
 		"SUBNAME_DISCARD": "Gooi weg"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Beveiliging",
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Odrzuć",
 		"SUBNAME_VACATION_MESSAGE": "Wiadomość urlopowa",
 		"SUBNAME_DISCARD": "Porzuć"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Bezpieczeństwo",
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Rejeitar",
 		"SUBNAME_VACATION_MESSAGE": "Mensagem de férias",
 		"SUBNAME_DISCARD": "Descartar"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Rejeitar",
 		"SUBNAME_VACATION_MESSAGE": "Mensagem de férias",
 		"SUBNAME_DISCARD": "Descartar"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Rejeitar",
 		"SUBNAME_VACATION_MESSAGE": "Mensagem de férias",
 		"SUBNAME_DISCARD": "Descartar"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@ -432,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Не принимать",
 		"SUBNAME_VACATION_MESSAGE": "Сообщение автоответчика",
 		"SUBNAME_DISCARD": "Уничтожить"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Безопасность",
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@ -432,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Zavrni",
 		"SUBNAME_VACATION_MESSAGE": "Sporočilo odsotnosti",
 		"SUBNAME_DISCARD": "Zavrzi"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Varnost",
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Avvisa",
 		"SUBNAME_VACATION_MESSAGE": "semestermeddelande",
 		"SUBNAME_DISCARD": "Kassera"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Säkerhet",
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@ -432,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Повідомлення про відпустку",
 		"SUBNAME_DISCARD": "Відклонити"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Безпека",
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "Từ chối",
 		"SUBNAME_VACATION_MESSAGE": "Thư thông báo bạn đang nghỉ lễ",
 		"SUBNAME_DISCARD": "Loại bỏ"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "An ninh",
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "拒绝",
 		"SUBNAME_VACATION_MESSAGE": "假期自动回复",
 		"SUBNAME_DISCARD": "取消"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "安全",
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@ -433,6 +433,7 @@
 		"SUBNAME_REJECT": "拒絕",
 		"SUBNAME_VACATION_MESSAGE": "休假訊息",
 		"SUBNAME_DISCARD": "捨棄"
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "安全性",
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForceUnspam.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForceUnspam.html
@ -0,0 +1,9 @@
+<div class="control-group" data-bind="css: {'error': actionValueError}" style="margin-bottom: 0">
+	<div data-bind="component: {
+		name: 'Checkbox',
+		params: {
+			label: 'POPUPS_FILTER/STOP_LABEL',
+			value: stop
+		}
+	}"></div>
+</div>
--- a/yarn.lock
+++ b/yarn.lock