diff --git a/dev/Sieve/Commands.js b/dev/Sieve/Commands.js index 45c2199c21..de9d32cdb7 100644 --- a/dev/Sieve/Commands.js +++ b/dev/Sieve/Commands.js @@ -11,7 +11,8 @@ import { DiscardCommand, FileIntoCommand, KeepCommand, - RedirectCommand + RedirectCommand, + ForceUnspamCommand } from 'Sieve/Commands/Actions'; import { @@ -75,6 +76,7 @@ export const FileIntoCommand, KeepCommand, RedirectCommand, + ForceUnspamCommand, // Test commands AddressTest, AllOfTest, diff --git a/dev/Sieve/Commands/Actions.js b/dev/Sieve/Commands/Actions.js index 3d0665a7d9..091f38e7df 100644 --- a/dev/Sieve/Commands/Actions.js +++ b/dev/Sieve/Commands/Actions.js @@ -109,3 +109,10 @@ export class KeepCommand extends ActionCommand export class DiscardCommand extends ActionCommand { } + +/** + * https://tools.ietf.org/html/rfc5228#section-4.4 + */ +export class ForceUnspamCommand extends ActionCommand +{ +} \ No newline at end of file diff --git a/dev/Sieve/Model/Filter.js b/dev/Sieve/Model/Filter.js index 8b13b7262a..c406b3f7ca 100644 --- a/dev/Sieve/Model/Filter.js +++ b/dev/Sieve/Model/Filter.js @@ -16,7 +16,8 @@ export const FilterAction = { Discard: 'Discard', Vacation: 'Vacation', Reject: 'Reject', - Forward: 'Forward' + Forward: 'Forward', + ForceUnspam: 'ForceUnspam' }; /** @@ -93,6 +94,9 @@ export class FilterModel extends AbstractModel { case FilterAction.Discard: result = rl.i18n(root + 'DISCARD'); break; + case FilterAction.ForceUnspam: + result = rl.i18n(root + 'FORCE_UNSPAM'); + break; // no default } @@ -112,6 +116,8 @@ export class FilterModel extends AbstractModel { return result + 'None'; case FilterAction.Discard: return result + 'Discard'; + case FilterAction.ForceUnspam: + return result + 'ForceUnspam'; case FilterAction.MoveTo: default: return result + 'MoveToFolder'; diff --git a/dev/Sieve/Model/Script.js b/dev/Sieve/Model/Script.js index d9182dd98d..ab0e16d9c3 100644 --- a/dev/Sieve/Model/Script.js +++ b/dev/Sieve/Model/Script.js @@ -139,6 +139,10 @@ function filtersToSieveScript(filters) case 'Discard': result.push(sTab + 'discard;'); break; + case 'ForceUnspam': + require.fileinto = 1; + result.push(sTab + 'fileinto "INBOX";'); + break; case 'Vacation': if (value) { require.vacation = 1; diff --git a/dev/Sieve/View/Filter.js b/dev/Sieve/View/Filter.js index 14c6d0b380..79023dcb85 100644 --- a/dev/Sieve/View/Filter.js +++ b/dev/Sieve/View/Filter.js @@ -150,6 +150,8 @@ export class FilterPopupView extends rl.pluginPopupView { this.actionTypeOptions.push({ id: FilterAction.Discard, name: i18nFilter('ACTION_DISCARD') }); + this.actionTypeOptions.push({ id: FilterAction.ForceUnspam, name: i18nFilter('FORCE_UNSPAM') }); + this.typeOptionsSize([ { id: FilterConditionType.Over, name: i18nFilter('TYPE_OVER') }, { id: FilterConditionType.Under, name: i18nFilter('TYPE_UNDER') } diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json index 756e5e5764..a766118ce8 100644 --- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json +++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "الرفض", "SELECT_ACTION_VACATION_MESSAGE": "رسالة العطلة", "SELECT_ACTION_DISCARD": "تجاهل", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "المستلمين (الى أو نسخة الى)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "\"%EMAIL%\" إعادة توجيه الى", "SUBNAME_REJECT": "رفض", "SUBNAME_VACATION_MESSAGE": "رسالة العطلة", - "SUBNAME_DISCARD": "تجاهل" + "SUBNAME_DISCARD": "تجاهل", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "الأمان", diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json index b6a522584d..eed23095cb 100644 --- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json +++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Отхвърли", "SELECT_ACTION_VACATION_MESSAGE": "Съобщение в отпуска", "SELECT_ACTION_DISCARD": "Отхвърли", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Получатели (\"До\" и \"Копие до\")", "SELECT_FIELD_HEADER": "Заглавие", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Препрати към \"%EMAIL%\"", "SUBNAME_REJECT": "Откажи", "SUBNAME_VACATION_MESSAGE": "Съобщение в отпуска", - "SUBNAME_DISCARD": "Отхвърли" + "SUBNAME_DISCARD": "Отхвърли", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Сигурност", diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json index b004352e24..dcd9f013b7 100644 --- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json +++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Odmítnout", "SELECT_ACTION_VACATION_MESSAGE": "Odpověď v nepřítomnosti", "SELECT_ACTION_DISCARD": "Zahodit", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Příjemci (Komu nebo Kopie)", "SELECT_FIELD_HEADER": "Hlavička", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Přeposlat to \"%EMAIL%\"", "SUBNAME_REJECT": "Odmítnout", "SUBNAME_VACATION_MESSAGE": "Odpověď v nepřítomnosti", - "SUBNAME_DISCARD": "Zahodit" + "SUBNAME_DISCARD": "Zahodit", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Zabezpečení", diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json index 82eeb32536..f57d9ec51f 100644 --- a/snappymail/v/0.0.0/app/localization/da-DK/user.json +++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Afvis", "SELECT_ACTION_VACATION_MESSAGE": "Feriemeddelelse", "SELECT_ACTION_DISCARD": "Kassér", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Modtagere (Til eller CC)", "SELECT_FIELD_HEADER": "Meddelelsesoplysninger", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Videresend til \"%EMAIL%\"", "SUBNAME_REJECT": "Afvis", "SUBNAME_VACATION_MESSAGE": "Feriemeddelelse", - "SUBNAME_DISCARD": "Kassér" + "SUBNAME_DISCARD": "Kassér", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Sikkerhed", diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json index 43cfb8e9d6..9630d03c62 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/user.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Ablehnen", "SELECT_ACTION_VACATION_MESSAGE": "Urlaubsbenachrichtigung", "SELECT_ACTION_DISCARD": "Verwerfen", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Empfänger (An oder CC)", "SELECT_FIELD_HEADER": "Nachrichtenkopf", "SELECT_FIELD_BODY": "Nachrichteninhalt", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Weiterleiten nach \"%EMAIL%\"", "SUBNAME_REJECT": "Ablehnen", "SUBNAME_VACATION_MESSAGE": "Urlaubsbenachrichtigung", - "SUBNAME_DISCARD": "Verwerfen" + "SUBNAME_DISCARD": "Verwerfen", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Sicherheit", diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json index c756a18a06..b45dac6d7a 100644 --- a/snappymail/v/0.0.0/app/localization/el-GR/user.json +++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Απόρριψη", "SELECT_ACTION_VACATION_MESSAGE": "Μήνυμα διακοπών", "SELECT_ACTION_DISCARD": "Απόρριψη", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Παραλήπτες (Προς ή κοινοποίηση)", "SELECT_FIELD_HEADER": "Επικεφαλίδα", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Προώθηση στο \"%EMAIL%\"", "SUBNAME_REJECT": "Απόρριψη", "SUBNAME_VACATION_MESSAGE": "Μήνυμα διακοπών", - "SUBNAME_DISCARD": "Απόρριψη" + "SUBNAME_DISCARD": "Απόρριψη", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Ασφάλεια", diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json index 36dffb0b34..8046c33fcf 100644 --- a/snappymail/v/0.0.0/app/localization/en-GB/user.json +++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Reject", "SELECT_ACTION_VACATION_MESSAGE": "Vacation message", "SELECT_ACTION_DISCARD": "Discard", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,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", diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json index 7a1107766e..f46ecc4fd3 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Reject", "SELECT_ACTION_VACATION_MESSAGE": "Vacation message", "SELECT_ACTION_DISCARD": "Discard", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,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", diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json index 260bbd78a3..9b5f2bf282 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/user.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Rechazar", "SELECT_ACTION_VACATION_MESSAGE": "Mensaje fuera de línea", "SELECT_ACTION_DISCARD": "Descartar", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Destinatarios (A o CC)", "SELECT_FIELD_HEADER": "Encabezado", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Reenviar a \"%EMAIL%\"", "SUBNAME_REJECT": "Rechazar", "SUBNAME_VACATION_MESSAGE": "Mensaje de vacaciones", - "SUBNAME_DISCARD": "Descartar" + "SUBNAME_DISCARD": "Descartar", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Seguridad", diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json index 70765db9e9..64b9c32090 100644 --- a/snappymail/v/0.0.0/app/localization/et-EE/user.json +++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Lükka tagasi", "SELECT_ACTION_VACATION_MESSAGE": "Puhkuse teade", "SELECT_ACTION_DISCARD": "Hülga", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Saaja", "SELECT_FIELD_HEADER": "Päis", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Edasta aadressile \"%EMAIL%\"", "SUBNAME_REJECT": "Lükka tagasi", "SUBNAME_VACATION_MESSAGE": "Puhkuse teade", - "SUBNAME_DISCARD": "Hülga" + "SUBNAME_DISCARD": "Hülga", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Turvalisus", diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json index e314cd312c..409ea4208f 100644 --- a/snappymail/v/0.0.0/app/localization/eu/user.json +++ b/snappymail/v/0.0.0/app/localization/eu/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Errefusatu", "SELECT_ACTION_VACATION_MESSAGE": "Opor mezua", "SELECT_ACTION_DISCARD": "Baztertu", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Hartzaileak (Nori edo CC)", "SELECT_FIELD_HEADER": "Goiburua", "SELECT_FIELD_BODY": "Gorputza", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Birbidali \"%EMAIL%\"-era", "SUBNAME_REJECT": "Errefusatu", "SUBNAME_VACATION_MESSAGE": "Opor-mezua", - "SUBNAME_DISCARD": "Baztertu" + "SUBNAME_DISCARD": "Baztertu", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Segurtasuna", diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json index 7eb52c305b..11d23f4b2f 100644 --- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json +++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "رد کردن", "SELECT_ACTION_VACATION_MESSAGE": "پیام تعطیلات", "SELECT_ACTION_DISCARD": "دور انداختن", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "گیرندگان (به یا رونوشت)", "SELECT_FIELD_HEADER": "سرصفحه", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "ارسال به \"%EMAIL%\"", "SUBNAME_REJECT": "برگشت‌زدن", "SUBNAME_VACATION_MESSAGE": "پیام تعطیلات", - "SUBNAME_DISCARD": "دور انداختن" + "SUBNAME_DISCARD": "دور انداختن", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "امنیت", diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json index f4612120b6..52904ff278 100644 --- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json +++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Hylkää", "SELECT_ACTION_VACATION_MESSAGE": "Lomaviesti", "SELECT_ACTION_DISCARD": "Poista", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Vastaanottajat (Vast. ott. tai CC)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Välitä osoitteeseen \"%EMAIL%\"", "SUBNAME_REJECT": "Hylkää", "SUBNAME_VACATION_MESSAGE": "Lomaviesti", - "SUBNAME_DISCARD": "Poista" + "SUBNAME_DISCARD": "Poista", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Turvallisuus", diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json index 81ad34b7c1..f46816446c 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json @@ -156,7 +156,7 @@ "TAGS": "Étiquettes", "NEW_TAG": "Nouvelle étiquette", "ENABLE_TRACKING_LINKS": "Activer les liens de suivi", - "TRACKING_ENABLED": "Les liens sont désormais suivis lorsque vous cliquez dessus !" + "TRACKING_ENABLED": "Les liens sont désormais suivis lorsque vous cliquez dessus !" }, "MESSAGE_TAGS": { "$important": "Important", @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Rejeter", "SELECT_ACTION_VACATION_MESSAGE": "Message d'absence", "SELECT_ACTION_DISCARD": "Exclure", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Destinataires (A ou CC)", "SELECT_FIELD_HEADER": "En-tête", "SELECT_FIELD_BODY": "Contenu", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Faire suivre à \"%EMAIL%\"", "SUBNAME_REJECT": "Rejeter", "SUBNAME_VACATION_MESSAGE": "Message d'absence", - "SUBNAME_DISCARD": "Exclure" + "SUBNAME_DISCARD": "Exclure", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Sécurité", diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json index a148541f75..ada0b428d0 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Visszautasít", "SELECT_ACTION_VACATION_MESSAGE": "Vakáció üzenet", "SELECT_ACTION_DISCARD": "Elvetés", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Címzettek (címzett vagy másolat)", "SELECT_FIELD_HEADER": "Fejléc", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Továbbítás ide: \"%EMAIL%\"", "SUBNAME_REJECT": "Visszautasít", "SUBNAME_VACATION_MESSAGE": "Vakáció üzenet", - "SUBNAME_DISCARD": "Elvetés" + "SUBNAME_DISCARD": "Elvetés", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Biztonság", diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json index 770c586876..87cd59283c 100644 --- a/snappymail/v/0.0.0/app/localization/id-ID/user.json +++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Tolak", "SELECT_ACTION_VACATION_MESSAGE": "Pesan liburan", "SELECT_ACTION_DISCARD": "Buang", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Penerima (Kepada atau tembusan)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Teruskan ke \"%EMAIL%\"", "SUBNAME_REJECT": "Tolak", "SUBNAME_VACATION_MESSAGE": "Pesan liburan", - "SUBNAME_DISCARD": "Buang" + "SUBNAME_DISCARD": "Buang", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Keamanan", diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json index 2cf8e3bc0f..9b1b14bcc8 100644 --- a/snappymail/v/0.0.0/app/localization/is-IS/user.json +++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Hafna", "SELECT_ACTION_VACATION_MESSAGE": "Skilaboð vegna fría", "SELECT_ACTION_DISCARD": "Henda", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Viðtakendur (Til eða CC)", "SELECT_FIELD_HEADER": "Haus", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Áframsenda til \"%EMAIL%\"", "SUBNAME_REJECT": "Hafna", "SUBNAME_VACATION_MESSAGE": "Skilaboð vegna fría", - "SUBNAME_DISCARD": "Henda" + "SUBNAME_DISCARD": "Henda", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Öryggi", diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json index 7950366b0e..186c35e016 100644 --- a/snappymail/v/0.0.0/app/localization/it-IT/user.json +++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Rifiuta", "SELECT_ACTION_VACATION_MESSAGE": "Messaggio fuori-ufficio", "SELECT_ACTION_DISCARD": "Scarta", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Destinatari (A oppure CC)", "SELECT_FIELD_HEADER": "Intestazione", "SELECT_FIELD_BODY": "Corpo", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Inoltra a \"%EMAIL%\"", "SUBNAME_REJECT": "Rifiuta", "SUBNAME_VACATION_MESSAGE": "Messaggio fuori-ufficio", - "SUBNAME_DISCARD": "Scarta" + "SUBNAME_DISCARD": "Scarta", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Sicurezza", diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json index 9fb82ac053..fb7f148a79 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "拒否", "SELECT_ACTION_VACATION_MESSAGE": "バケーションメッセージ", "SELECT_ACTION_DISCARD": "破棄", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "受信者(To or CC)", "SELECT_FIELD_HEADER": "ヘッダー", "SELECT_FIELD_BODY": "本文", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "\"%EMAIL%\"へ転送", "SUBNAME_REJECT": "拒否", "SUBNAME_VACATION_MESSAGE": "バケーションメッセージ", - "SUBNAME_DISCARD": "破棄" + "SUBNAME_DISCARD": "破棄", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "セキュリティ", diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json index c4651276e5..74d8174048 100644 --- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json +++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "거부", "SELECT_ACTION_VACATION_MESSAGE": "부재 중 메시지", "SELECT_ACTION_DISCARD": "Discard", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "수신인 (받는 사람 또는 참조)", "SELECT_FIELD_HEADER": "헤더", "SELECT_FIELD_BODY": "Body", @@ -431,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": "보안", diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json index ad5ee34ddd..bbc4f219fa 100644 --- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json +++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Atmesti", "SELECT_ACTION_VACATION_MESSAGE": "Atostogų atsakiklis", "SELECT_ACTION_DISCARD": "Nepaisyti", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Gavėjai (Kam ar CC)", "SELECT_FIELD_HEADER": "Antraštė", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "persiūsti \"%EMAIL%\"", "SUBNAME_REJECT": "Atmesti", "SUBNAME_VACATION_MESSAGE": "Atostogų žinutė", - "SUBNAME_DISCARD": "Nepaisyti" + "SUBNAME_DISCARD": "Nepaisyti", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Sauga", diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json index 27359e93e1..5ce3f63f45 100644 --- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json +++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Reject", "SELECT_ACTION_VACATION_MESSAGE": "Vacation message", "SELECT_ACTION_DISCARD": "Discard", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,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", diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json index 3a908a7842..6e51251634 100644 --- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json +++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Avvis", "SELECT_ACTION_VACATION_MESSAGE": "Feriemelding", "SELECT_ACTION_DISCARD": "Forkast", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Hoved- eller kopimottaker", "SELECT_FIELD_HEADER": "Meldingshode", "SELECT_FIELD_BODY": "Brødtekst", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Videresend til «%EMAIL%»", "SUBNAME_REJECT": "Avvis", "SUBNAME_VACATION_MESSAGE": "Feriemelding", - "SUBNAME_DISCARD": "Forkast" + "SUBNAME_DISCARD": "Forkast", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Sikkerhet", diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json index 654b2a2538..d24a38eb5d 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Afwijzen", "SELECT_ACTION_VACATION_MESSAGE": "Afwezigheidbericht", "SELECT_ACTION_DISCARD": "Gooi weg", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Ontvanger(s) (Aan of CC)", "SELECT_FIELD_HEADER": "Berichtkop", "SELECT_FIELD_BODY": "Berichtinhoud", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Doorsturen naar \"%EMAIL%\"", "SUBNAME_REJECT": "Afwijzen", "SUBNAME_VACATION_MESSAGE": "Afwezigheidsbericht", - "SUBNAME_DISCARD": "Gooi weg" + "SUBNAME_DISCARD": "Gooi weg", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Beveiliging", diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json index 85087ff7a9..777a970d3d 100644 --- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json +++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Odrzuć", "SELECT_ACTION_VACATION_MESSAGE": "Wiadomość urlopowa", "SELECT_ACTION_DISCARD": "Porzuć", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Adresaci (Do lub DW)", "SELECT_FIELD_HEADER": "Nagłówek", "SELECT_FIELD_BODY": "Treść", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Przekaż do \"%EMAIL%\"", "SUBNAME_REJECT": "Odrzuć", "SUBNAME_VACATION_MESSAGE": "Wiadomość urlopowa", - "SUBNAME_DISCARD": "Porzuć" + "SUBNAME_DISCARD": "Porzuć", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Bezpieczeństwo", diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json index 161b91ee46..3b861cd7bc 100644 --- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json +++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Rejeitar", "SELECT_ACTION_VACATION_MESSAGE": "Mensagem de férias", "SELECT_ACTION_DISCARD": "Descartar", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Destinatários (Para ou Cc)", "SELECT_FIELD_HEADER": "Cabeçalho", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"", "SUBNAME_REJECT": "Rejeitar", "SUBNAME_VACATION_MESSAGE": "Mensagem de férias", - "SUBNAME_DISCARD": "Descartar" + "SUBNAME_DISCARD": "Descartar", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Segurança", diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json index dc1340f61a..3ee1a3c901 100644 --- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json +++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Rejeitar", "SELECT_ACTION_VACATION_MESSAGE": "Mensagem de férias", "SELECT_ACTION_DISCARD": "Descartar", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Destinatários (Para ou Cc)", "SELECT_FIELD_HEADER": "Cebeçalho", "SELECT_FIELD_BODY": "Corpo", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"", "SUBNAME_REJECT": "Rejeitar", "SUBNAME_VACATION_MESSAGE": "Mensagem de férias", - "SUBNAME_DISCARD": "Descartar" + "SUBNAME_DISCARD": "Descartar", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Segurança", diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json index dc1340f61a..3ee1a3c901 100644 --- a/snappymail/v/0.0.0/app/localization/pt/user.json +++ b/snappymail/v/0.0.0/app/localization/pt/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Rejeitar", "SELECT_ACTION_VACATION_MESSAGE": "Mensagem de férias", "SELECT_ACTION_DISCARD": "Descartar", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Destinatários (Para ou Cc)", "SELECT_FIELD_HEADER": "Cebeçalho", "SELECT_FIELD_BODY": "Corpo", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"", "SUBNAME_REJECT": "Rejeitar", "SUBNAME_VACATION_MESSAGE": "Mensagem de férias", - "SUBNAME_DISCARD": "Descartar" + "SUBNAME_DISCARD": "Descartar", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Segurança", diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json index 4cd3481a6a..c8965bf8d2 100644 --- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json +++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Reject", "SELECT_ACTION_VACATION_MESSAGE": "Vacation message", "SELECT_ACTION_DISCARD": "Discard", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,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", diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json index 35c3915f95..0d86690f6d 100644 --- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json +++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Не принимать", "SELECT_ACTION_VACATION_MESSAGE": "Автоответчик", "SELECT_ACTION_DISCARD": "Уничтожить", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Получатели (To или CC)", "SELECT_FIELD_HEADER": "Заголовок", "SELECT_FIELD_BODY": "Тело", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Переслать на \"%EMAIL%\"", "SUBNAME_REJECT": "Не принимать", "SUBNAME_VACATION_MESSAGE": "Сообщение автоответчика", - "SUBNAME_DISCARD": "Уничтожить" + "SUBNAME_DISCARD": "Уничтожить", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Безопасность", diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json index 8ed55e0a5b..5f0b8d1364 100644 --- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json +++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Reject", "SELECT_ACTION_VACATION_MESSAGE": "Vacation message", "SELECT_ACTION_DISCARD": "Discard", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)", "SELECT_FIELD_HEADER": "Záhlavie", "SELECT_FIELD_BODY": "Body", @@ -431,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", diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json index 1c3b140aed..2ba593151a 100644 --- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json +++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Zavrni", "SELECT_ACTION_VACATION_MESSAGE": "Sporočilo odsotnosti", "SELECT_ACTION_DISCARD": "Zavrzi", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Prejemniki (Za ali Kp)", "SELECT_FIELD_HEADER": "Glava", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Posreduj na \"%EMAIL%\"", "SUBNAME_REJECT": "Zavrni", "SUBNAME_VACATION_MESSAGE": "Sporočilo odsotnosti", - "SUBNAME_DISCARD": "Zavrzi" + "SUBNAME_DISCARD": "Zavrzi", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Varnost", diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json index 6274ce90c1..31988e0c01 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Avvisa", "SELECT_ACTION_VACATION_MESSAGE": "Autosvar", "SELECT_ACTION_DISCARD": "Ta bort", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Mottagare (Till eller CC)", "SELECT_FIELD_HEADER": "Rubrik", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Vidarebefordra till \"%EMAIL%\"", "SUBNAME_REJECT": "Avvisa", "SUBNAME_VACATION_MESSAGE": "semestermeddelande", - "SUBNAME_DISCARD": "Kassera" + "SUBNAME_DISCARD": "Kassera", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Säkerhet", diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json index 9ee6fc5b1c..0727f9db17 100644 --- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json +++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Reject", "SELECT_ACTION_VACATION_MESSAGE": "Vacation message", "SELECT_ACTION_DISCARD": "Discard", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)", "SELECT_FIELD_HEADER": "Header", "SELECT_FIELD_BODY": "Body", @@ -431,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", diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json index 43335174d0..841f100553 100644 --- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json +++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Відклонити", "SELECT_ACTION_VACATION_MESSAGE": "Повідомлення про відпустку", "SELECT_ACTION_DISCARD": "Відклонити", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Отримувачі (To or CC)", "SELECT_FIELD_HEADER": "Заголовок", "SELECT_FIELD_BODY": "Body", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"", "SUBNAME_REJECT": "Reject", "SUBNAME_VACATION_MESSAGE": "Повідомлення про відпустку", - "SUBNAME_DISCARD": "Відклонити" + "SUBNAME_DISCARD": "Відклонити", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "Безпека", diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json index 003630ac10..04e258277a 100644 --- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json +++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "Từ chối", "SELECT_ACTION_VACATION_MESSAGE": "Thư thông báo bạn đang nghỉ lễ", "SELECT_ACTION_DISCARD": "Loại bỏ", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "Người nhận (Gửi đến trực tiếp hay CC bản sao thư)", "SELECT_FIELD_HEADER": "Phần đầu", "SELECT_FIELD_BODY": "Phần thân", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "Chuyển tiếp đến \"%EMAIL%\"", "SUBNAME_REJECT": "Từ chối", "SUBNAME_VACATION_MESSAGE": "Thư thông báo bạn đang nghỉ lễ", - "SUBNAME_DISCARD": "Loại bỏ" + "SUBNAME_DISCARD": "Loại bỏ", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "An ninh", diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json index 5713854fc9..c6b9d45f8a 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "拒收", "SELECT_ACTION_VACATION_MESSAGE": "假期自动回复", "SELECT_ACTION_DISCARD": "取消", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "接收人 (To 或 CC)", "SELECT_FIELD_HEADER": "标题", "SELECT_FIELD_BODY": "内容", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "转发到 \"%EMAIL%\"", "SUBNAME_REJECT": "拒绝", "SUBNAME_VACATION_MESSAGE": "假期自动回复", - "SUBNAME_DISCARD": "取消" + "SUBNAME_DISCARD": "取消", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "安全", diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json index fa80031cfc..54a4822a4c 100644 --- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json @@ -326,6 +326,7 @@ "SELECT_ACTION_REJECT": "拒絕", "SELECT_ACTION_VACATION_MESSAGE": "休假訊息", "SELECT_ACTION_DISCARD": "捨棄", + "SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox", "SELECT_FIELD_RECIPIENTS": "收件人 (收件者或副本)", "SELECT_FIELD_HEADER": "標題", "SELECT_FIELD_BODY": "內文", @@ -431,7 +432,8 @@ "SUBNAME_FORWARD_TO": "轉寄至「%EMAIL%」", "SUBNAME_REJECT": "拒絕", "SUBNAME_VACATION_MESSAGE": "休假訊息", - "SUBNAME_DISCARD": "捨棄" + "SUBNAME_DISCARD": "捨棄", + "SUBNAME_FORCE_UNSPAM": "Force Unspam" }, "SETTINGS_SECURITY": { "LEGEND_SECURITY": "安全性", diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForceUnspam.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForceUnspam.html new file mode 100644 index 0000000000..ad5a4ca84d --- /dev/null +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForceUnspam.html @@ -0,0 +1,9 @@ +
+
+