From 435b590b3eb28cb5d5c25ac8b4eb376e6ea65747 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Sat, 30 Apr 2022 00:43:38 +0200 Subject: [PATCH] Drop mail composer HTML/Plain Forced to prevent confusions like in #355 --- dev/Common/EnumsUser.js | 4 +--- dev/Settings/User/General.js | 4 +--- dev/Stores/User/Settings.js | 4 +--- dev/Styles/User/SquireUI.less | 4 ---- dev/View/Popup/Compose.js | 6 +++--- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 7 ++----- .../v/0.0.0/app/libraries/RainLoop/Config/Application.php | 2 +- snappymail/v/0.0.0/app/localization/ar-SA/user.json | 2 -- snappymail/v/0.0.0/app/localization/bg-BG/user.json | 2 -- snappymail/v/0.0.0/app/localization/cs-CZ/user.json | 2 -- snappymail/v/0.0.0/app/localization/da-DK/user.json | 2 -- snappymail/v/0.0.0/app/localization/de-DE/user.json | 2 -- snappymail/v/0.0.0/app/localization/el-GR/user.json | 2 -- snappymail/v/0.0.0/app/localization/en/user.json | 2 -- snappymail/v/0.0.0/app/localization/es-ES/user.json | 2 -- snappymail/v/0.0.0/app/localization/et-EE/user.json | 2 -- snappymail/v/0.0.0/app/localization/fa-IR/user.json | 2 -- snappymail/v/0.0.0/app/localization/fi-FI/user.json | 2 -- snappymail/v/0.0.0/app/localization/fr-FR/user.json | 2 -- snappymail/v/0.0.0/app/localization/hu-HU/user.json | 2 -- snappymail/v/0.0.0/app/localization/id-ID/user.json | 2 -- snappymail/v/0.0.0/app/localization/is-IS/user.json | 2 -- snappymail/v/0.0.0/app/localization/it-IT/user.json | 2 -- snappymail/v/0.0.0/app/localization/ja-JP/user.json | 2 -- snappymail/v/0.0.0/app/localization/ko-KR/user.json | 2 -- snappymail/v/0.0.0/app/localization/lt-LT/user.json | 2 -- snappymail/v/0.0.0/app/localization/lv-LV/user.json | 2 -- snappymail/v/0.0.0/app/localization/nb-NO/user.json | 2 -- snappymail/v/0.0.0/app/localization/nl-NL/user.json | 2 -- snappymail/v/0.0.0/app/localization/pl-PL/user.json | 2 -- snappymail/v/0.0.0/app/localization/pt-BR/user.json | 2 -- snappymail/v/0.0.0/app/localization/pt-PT/user.json | 2 -- snappymail/v/0.0.0/app/localization/ro-RO/user.json | 2 -- snappymail/v/0.0.0/app/localization/ru-RU/user.json | 2 -- snappymail/v/0.0.0/app/localization/sk-SK/user.json | 2 -- snappymail/v/0.0.0/app/localization/sl-SI/user.json | 2 -- snappymail/v/0.0.0/app/localization/sv-SE/user.json | 2 -- snappymail/v/0.0.0/app/localization/tr-TR/user.json | 2 -- snappymail/v/0.0.0/app/localization/uk-UA/user.json | 2 -- snappymail/v/0.0.0/app/localization/zh-CN/user.json | 2 -- snappymail/v/0.0.0/app/localization/zh-TW/user.json | 2 -- 41 files changed, 9 insertions(+), 90 deletions(-) diff --git a/dev/Common/EnumsUser.js b/dev/Common/EnumsUser.js index 032ed7f2a..142ee27b5 100644 --- a/dev/Common/EnumsUser.js +++ b/dev/Common/EnumsUser.js @@ -105,9 +105,7 @@ export const MessagePriority = { */ export const EditorDefaultType = { Html: 'Html', - Plain: 'Plain', - HtmlForced: 'HtmlForced', - PlainForced: 'PlainForced' + Plain: 'Plain' }; /** diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js index 28cb69176..caedc7301 100644 --- a/dev/Settings/User/General.js +++ b/dev/Settings/User/General.js @@ -72,9 +72,7 @@ export class UserSettingsGeneral extends AbstractViewSettings { translatorTrigger(); return [ { id: EditorDefaultType.Html, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML') }, - { id: EditorDefaultType.Plain, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN') }, - { id: EditorDefaultType.HtmlForced, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCED') }, - { id: EditorDefaultType.PlainForced, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED') } + { id: EditorDefaultType.Plain, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN') } ]; }, diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js index 50597f36b..3bb3b5cad 100644 --- a/dev/Stores/User/Settings.js +++ b/dev/Stores/User/Settings.js @@ -18,9 +18,7 @@ export const SettingsUserStore = new class { self.editorDefaultType = ko.observable('Html').extend({ limitedList: [ EditorDefaultType.Html, - EditorDefaultType.Plain, - EditorDefaultType.HtmlForced, - EditorDefaultType.PlainForced + EditorDefaultType.Plain ] }); diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less index 72f290898..0a5942f1b 100644 --- a/dev/Styles/User/SquireUI.less +++ b/dev/Styles/User/SquireUI.less @@ -165,7 +165,3 @@ Secondly, we can't rely on MUA's what to do with :empty .rl-mobile #V-PopupsCompose { min-height: calc(100% - 12px); } - -#V-PopupsCompose[data-wysiwyg*=Forced] #squire-toolgroup-mode { - display: none; -} diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 3168e6756..31a7c00c7 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -124,7 +124,7 @@ const isPlainEditor = () => { let type = SettingsUserStore.editorDefaultType(); - return EditorDefaultType.Html !== type && EditorDefaultType.HtmlForced !== type; + return EditorDefaultType.Html !== type; }, /** @@ -1079,8 +1079,8 @@ export class ComposePopupView extends AbstractViewPopup { encrypted || editor.setHtml(sText); if (encrypted - || EditorDefaultType.PlainForced === SettingsUserStore.editorDefaultType() - || (!message.isHtml() && EditorDefaultType.HtmlForced !== SettingsUserStore.editorDefaultType()) + || EditorDefaultType.Plain === SettingsUserStore.editorDefaultType() + || !message.isHtml() ) { editor.modePlain(); } diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 8ef92d73a..0f5d98e3b 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -734,7 +734,7 @@ class Actions 'NotificationSound' => 'new-mail', 'DesktopNotifications' => true, 'Layout' => (int) $oConfig->Get('defaults', 'view_layout', Enumerations\Layout::SIDE_PREVIEW), - 'EditorDefaultType' => (string) $oConfig->Get('defaults', 'view_editor_type', ''), + 'EditorDefaultType' => \str_replace('Forced', '', $oConfig->Get('defaults', 'view_editor_type', '')), 'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true), 'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30), 'UseThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false), @@ -857,7 +857,7 @@ class Actions $oSettings->SetConf('MessagesPerPage', $oSettings->GetConf('MPP', $aResult['MessagesPerPage'])); } - $aResult['EditorDefaultType'] = (string)$oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']); + $aResult['EditorDefaultType'] = \str_replace('Forced', '', $oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType'])); $aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']); $aResult['ShowImages'] = (bool)$oSettings->GetConf('ShowImages', $aResult['ShowImages']); $aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']); @@ -927,9 +927,6 @@ class Actions $aResult['StaticLibsJs'] = $this->StaticPath('js/' . ($bAppJsDebug ? '' : 'min/') . 'libs' . ($bAppJsDebug ? '' : '.min') . '.js'); - $aResult['EditorDefaultType'] = \in_array($aResult['EditorDefaultType'], array('Plain', 'Html', 'HtmlForced', 'PlainForced')) - ? $aResult['EditorDefaultType'] : 'Plain'; - // IDN $aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']); $aResult['MailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['MailToEmail']); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index d0fb69e24..a1de8f390 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -245,7 +245,7 @@ Values: ), 'defaults' => array( - 'view_editor_type' => array('Html', 'Editor mode used by default (Plain, Html, HtmlForced or PlainForced)'), + 'view_editor_type' => array('Html', 'Editor mode used by default (Plain, Html)'), 'view_layout' => array(1, 'layout: 0 - no preview, 1 - side preview, 2 - bottom preview'), 'view_use_checkboxes' => array(true), 'autologout' => array(30), 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 adbb2a1b0..53412e63f 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "المحرر النصي الأساسي", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "عادي", - "LABEL_EDITOR_HTML_FORCED": "Html (إجباري)", - "LABEL_EDITOR_PLAIN_FORCED": "عادي (إجباري)", "LABEL_VIEW_OPTIONS": "إظهار الخيارات", "LABEL_USE_PREVIEW_PANE": "استخدام جزئية العرض الجانبي", "LABEL_USE_CHECKBOXES_IN_LIST": "عرض مربعات التحديد في القائمة", 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 f2425b3ed..ad3f7235b 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Текстов редактор по подразбиране", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Чист текст", - "LABEL_EDITOR_HTML_FORCED": "HTML (задължително)", - "LABEL_EDITOR_PLAIN_FORCED": "Чист текст (задължително)", "LABEL_VIEW_OPTIONS": "Настройки на изгледа", "LABEL_USE_PREVIEW_PANE": "Използвай поле за преглед", "LABEL_USE_CHECKBOXES_IN_LIST": "Показавай отметките в списъка", 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 53361b441..4a33ed5d0 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Přednastavený editor zpráv", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Text", - "LABEL_EDITOR_HTML_FORCED": "Html (vynucený)", - "LABEL_EDITOR_PLAIN_FORCED": "Text (vynucený)", "LABEL_VIEW_OPTIONS": "Možnosti zobrazení", "LABEL_USE_PREVIEW_PANE": "Používáte panel rychlého zobrazení", "LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazení zaškrtávacích políček v seznamu", 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 a3daed7e7..19a757574 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Standard tekst program", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Plain", - "LABEL_EDITOR_HTML_FORCED": "Html (gennemtvunget)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (gennemtvunget)", "LABEL_VIEW_OPTIONS": "Visningsindstillinger", "LABEL_USE_PREVIEW_PANE": "Brug preview panel", "LABEL_USE_CHECKBOXES_IN_LIST": "Vis afkrydsningsfelt i oversigten", 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 3b3403b5c..c4c481b41 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Standard-Texteditor", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Unformatierter Text", - "LABEL_EDITOR_HTML_FORCED": "HTML (erzwungen)", - "LABEL_EDITOR_PLAIN_FORCED": "Unformatierter Text (erzwungen)", "LABEL_VIEW_OPTIONS": "Optionen anzeigen", "LABEL_USE_PREVIEW_PANE": "Vorschaufenster nutzen", "LABEL_USE_CHECKBOXES_IN_LIST": "Kontrollkästchen in der Liste anzeigen", 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 2868e00ab..77b2cd940 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Προεπιλεγμένος συντάκτης κειμένου", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Απλό", - "LABEL_EDITOR_HTML_FORCED": "Html (επιβολή)", - "LABEL_EDITOR_PLAIN_FORCED": "Απλό (επιβολή)", "LABEL_VIEW_OPTIONS": "Επιλογές προβολής", "LABEL_USE_PREVIEW_PANE": "Χρήση προεπισκόπησης ", "LABEL_USE_CHECKBOXES_IN_LIST": "Εμφάνιση των κουτιών επιλογής σε λίστα", 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 373fbff65..19c2df5d7 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Default text editor", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Plain", - "LABEL_EDITOR_HTML_FORCED": "Html (forced)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)", "LABEL_VIEW_OPTIONS": "View options", "LABEL_USE_PREVIEW_PANE": "Use preview pane", "LABEL_USE_CHECKBOXES_IN_LIST": "Display checkboxes in list", 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 d38f66645..30045482e 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Editor de texto predeterminado", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Texto plano", - "LABEL_EDITOR_HTML_FORCED": "Html (forzado)", - "LABEL_EDITOR_PLAIN_FORCED": "Texto plano (forzado)", "LABEL_VIEW_OPTIONS": "Ver opciones", "LABEL_USE_PREVIEW_PANE": "Utilice el panel de vista previa", "LABEL_USE_CHECKBOXES_IN_LIST": "Mostrar casillas de verificación en la lista", 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 f34c5049b..b00c471c3 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Vaikimisi tekstiredaktor", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Lihttekst", - "LABEL_EDITOR_HTML_FORCED": "HTML (kohustuslik)", - "LABEL_EDITOR_PLAIN_FORCED": "Lihttekst (kohustuslik)", "LABEL_VIEW_OPTIONS": "Vaate seaded", "LABEL_USE_PREVIEW_PANE": "Kasuta eelvaadet", "LABEL_USE_CHECKBOXES_IN_LIST": "Kuva nimekirjas valikukastikesi", 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 4b58fa679..172d9c85e 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "ویرایشگر پیش‌فرض", "LABEL_EDITOR_HTML": "تحت فرمت Html", "LABEL_EDITOR_PLAIN": "ساده", - "LABEL_EDITOR_HTML_FORCED": "Html (اجباری)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (اجباری)", "LABEL_VIEW_OPTIONS": "مشاهده گزینه‌ها", "LABEL_USE_PREVIEW_PANE": "استفاده از پنجره پیش‌نمایش", "LABEL_USE_CHECKBOXES_IN_LIST": "نمایش چک‌باکس در لیست", 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 185b3e93f..99d434e83 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Oletus tekstieditori", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Pelkkä teksti", - "LABEL_EDITOR_HTML_FORCED": "Html (pakotettu)", - "LABEL_EDITOR_PLAIN_FORCED": "Pelkkä teksti (pakotettu)", "LABEL_VIEW_OPTIONS": "Näyttö-valinnat", "LABEL_USE_PREVIEW_PANE": "Käytä esikatselua", "LABEL_USE_CHECKBOXES_IN_LIST": "Näytä valintaruudut listassa", 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 3a2eb27c0..4a7b76f9e 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Éditeur de texte par défaut", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Non-formaté", - "LABEL_EDITOR_HTML_FORCED": "HTML (forcé)", - "LABEL_EDITOR_PLAIN_FORCED": "Non-formaté (forcé)", "LABEL_VIEW_OPTIONS": "Voir les options", "LABEL_USE_PREVIEW_PANE": "Utiliser le panneau de prévisualisation", "LABEL_USE_CHECKBOXES_IN_LIST": "Afficher des cases à cocher dans la liste", 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 a092c5479..5da7b4321 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Alapértelmezett szövegszerkesztő", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Egyszerű", - "LABEL_EDITOR_HTML_FORCED": "HTML (kényszerített)", - "LABEL_EDITOR_PLAIN_FORCED": "Egyszerű (kényszerített)", "LABEL_VIEW_OPTIONS": "Nézet beállítások", "LABEL_USE_PREVIEW_PANE": "Előnézeti ablak használata", "LABEL_USE_CHECKBOXES_IN_LIST": "Jelölőnégyzetek megjelenítése a listában", 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 61edaf701..d93eb6c03 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Editor teks bawaan", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Polos", - "LABEL_EDITOR_HTML_FORCED": "Html (paksa)", - "LABEL_EDITOR_PLAIN_FORCED": "Polos (paksa)", "LABEL_VIEW_OPTIONS": "Tampilkan Opsi", "LABEL_USE_PREVIEW_PANE": "Gunakan panel pratinjau", "LABEL_USE_CHECKBOXES_IN_LIST": "Tampilkan centang dalam daftar", 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 81c13535b..fa8d19478 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Sjálfgefinn textaritill", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Venjulegt", - "LABEL_EDITOR_HTML_FORCED": "HTML (þvingað)", - "LABEL_EDITOR_PLAIN_FORCED": "Einfalt (þvingað)", "LABEL_VIEW_OPTIONS": "Valkostir skoðunar", "LABEL_USE_PREVIEW_PANE": "Nota forskoðunarham", "LABEL_USE_CHECKBOXES_IN_LIST": "Sýna valkassa í listanum", 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 02021f87a..5dbcfa530 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Editor di testo predefinito", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Testo semplice", - "LABEL_EDITOR_HTML_FORCED": "Html (forzato)", - "LABEL_EDITOR_PLAIN_FORCED": "Testo semplice (forzato)", "LABEL_VIEW_OPTIONS": "Impostazioni di visualizzazione", "LABEL_USE_PREVIEW_PANE": "Mostra l'anteprima del messaggio", "LABEL_USE_CHECKBOXES_IN_LIST": "Mostra le caselle di spunta nella lista", 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 402ac233d..158be02ae 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "メール形式", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "プレーンテキスト", - "LABEL_EDITOR_HTML_FORCED": "Html (強制)", - "LABEL_EDITOR_PLAIN_FORCED": "プレーンテキスト (強制)", "LABEL_VIEW_OPTIONS": "表示", "LABEL_USE_PREVIEW_PANE": "プレビューペインを使用する", "LABEL_USE_CHECKBOXES_IN_LIST": "リストにチェックボックスを表示", 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 dc30449ea..01a9d2818 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "기본 텍스트 편집기", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "평문", - "LABEL_EDITOR_HTML_FORCED": "HTML (강제 적용)", - "LABEL_EDITOR_PLAIN_FORCED": "평문 (강제 적용)", "LABEL_VIEW_OPTIONS": "보기 옵션", "LABEL_USE_PREVIEW_PANE": "미리보기 창 사용", "LABEL_USE_CHECKBOXES_IN_LIST": "목록에서 확인상자 표시", 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 a64a7e90c..6a60e1a3b 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Numatytas teksto redaktorius", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Paprastas", - "LABEL_EDITOR_HTML_FORCED": "Html (priverstinis)", - "LABEL_EDITOR_PLAIN_FORCED": "Paprastas (priverstinis)", "LABEL_VIEW_OPTIONS": "Peržiūros parinktys", "LABEL_USE_PREVIEW_PANE": "Naudokite peržiūros sritį", "LABEL_USE_CHECKBOXES_IN_LIST": "Rodyti žymėjimo langelius sąraše", 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 9ba1e277f..8491a560d 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Galvenais teksta editors", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Teksts", - "LABEL_EDITOR_HTML_FORCED": "Html (forced)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)", "LABEL_VIEW_OPTIONS": "Apskates opcijas", "LABEL_USE_PREVIEW_PANE": "Lietot priekšskatu", "LABEL_USE_CHECKBOXES_IN_LIST": "Rādīt checkboxes sarakstā", 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 cebf0584b..67126114e 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Standard tekstbehandler", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Ren tekst", - "LABEL_EDITOR_HTML_FORCED": "Html (tvungen)", - "LABEL_EDITOR_PLAIN_FORCED": "Ren tekst (tvungen)", "LABEL_VIEW_OPTIONS": "Vis valg", "LABEL_USE_PREVIEW_PANE": "Bruk forhåndsvisningsrute", "LABEL_USE_CHECKBOXES_IN_LIST": "Vis avkrysningsbokser i liste", 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 0f193622f..864ab2198 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Standaard tekst editor", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Platte tekst", - "LABEL_EDITOR_HTML_FORCED": "Html (geforceerd)", - "LABEL_EDITOR_PLAIN_FORCED": "Platte tekst (geforceerd)", "LABEL_VIEW_OPTIONS": "Bekijk opties", "LABEL_USE_PREVIEW_PANE": "Toon leesvenster", "LABEL_USE_CHECKBOXES_IN_LIST": "Toon selectievakjes in de lijst", 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 453ed4b2c..f85b2d2c3 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Format wiadomości", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "zwykły tekst", - "LABEL_EDITOR_HTML_FORCED": "HTML (wymuszony)", - "LABEL_EDITOR_PLAIN_FORCED": "zwykły tekst (wymuszony)", "LABEL_VIEW_OPTIONS": "Opcje wyświetlania", "LABEL_USE_PREVIEW_PANE": "Wyświetl okno podglądu", "LABEL_USE_CHECKBOXES_IN_LIST": "Pokazuj pola zaznaczenia na listach", 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 46cc82780..395aa7cf3 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Editor de texto padrão", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Texto Simples", - "LABEL_EDITOR_HTML_FORCED": "Html (forçado)", - "LABEL_EDITOR_PLAIN_FORCED": "Texto Simples (forçado)", "LABEL_VIEW_OPTIONS": "Opções de Visualização", "LABEL_USE_PREVIEW_PANE": "Usar painel de pré-visualização", "LABEL_USE_CHECKBOXES_IN_LIST": "Exibir caixas de seleção na lista", 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 f24e71d7d..739f98cff 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Editor de texto padrão", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Texto simples", - "LABEL_EDITOR_HTML_FORCED": "Html (forçado)", - "LABEL_EDITOR_PLAIN_FORCED": "Texto simples (forçado)", "LABEL_VIEW_OPTIONS": "Ver opções", "LABEL_USE_PREVIEW_PANE": "Use o painel de pré-visualização", "LABEL_USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista", 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 690838d99..4fa687d1d 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Editor de text implicit", "LABEL_EDITOR_HTML": "Formatat", "LABEL_EDITOR_PLAIN": "Simplu", - "LABEL_EDITOR_HTML_FORCED": "Html (forced)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)", "LABEL_VIEW_OPTIONS": "Afișare", "LABEL_USE_PREVIEW_PANE": "Folosiți un mod de afișare cu trei coloane", "LABEL_USE_CHECKBOXES_IN_LIST": "Afișează listele checkbox", 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 e1104fc0e..6f0261417 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Редактор текста по умолчанию", "LABEL_EDITOR_HTML": "Форматированный", "LABEL_EDITOR_PLAIN": "Простой", - "LABEL_EDITOR_HTML_FORCED": "Форматированный (форсированный)", - "LABEL_EDITOR_PLAIN_FORCED": "Простой (форсированный)", "LABEL_VIEW_OPTIONS": "Отображение", "LABEL_USE_PREVIEW_PANE": "Использовать трехколоночный режим отображения", "LABEL_USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках", 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 6d4849a19..7b6b0fe5c 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Predvolený editor správ", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Text", - "LABEL_EDITOR_HTML_FORCED": "Html (forced)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)", "LABEL_VIEW_OPTIONS": "Možnosti zobrazenia", "LABEL_USE_PREVIEW_PANE": "Používať panel rýchleho zobrazenia", "LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazenie zaštkrtávacích políčok v zozname", 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 0164daee2..191a699ca 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Privzeta vrsta besedila", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Navadno besedilo", - "LABEL_EDITOR_HTML_FORCED": "HTML (obvezno)", - "LABEL_EDITOR_PLAIN_FORCED": "Navadno besedilo (obvezno)", "LABEL_VIEW_OPTIONS": "Možnosti ogleda", "LABEL_USE_PREVIEW_PANE": "Uporabi polje za predogled", "LABEL_USE_CHECKBOXES_IN_LIST": "Na seznamu pokaži kvadratke za izbor", 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 26e3060c6..21dde9186 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Textredigerare", "LABEL_EDITOR_HTML": "HTML", "LABEL_EDITOR_PLAIN": "Oformaterad text", - "LABEL_EDITOR_HTML_FORCED": "HTML (tvinga)", - "LABEL_EDITOR_PLAIN_FORCED": "Oformaterad text (tvinga)", "LABEL_VIEW_OPTIONS": "Visa alternativ", "LABEL_USE_PREVIEW_PANE": "Avänd förhandsgranskningsfönster", "LABEL_USE_CHECKBOXES_IN_LIST": "Visa kryssrutor i listan", 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 ec9c8dae8..a270389d8 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Varsayılan text editör", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Düz", - "LABEL_EDITOR_HTML_FORCED": "Html (forced)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)", "LABEL_VIEW_OPTIONS": "Ayarları görüntüle", "LABEL_USE_PREVIEW_PANE": "Önizleme bölmesini kullanın", "LABEL_USE_CHECKBOXES_IN_LIST": "Listede ekran onay kutularını göster", 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 50a4ea25f..d4ac75a09 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "Редактор тексту за змовчуванням", "LABEL_EDITOR_HTML": "Форматований", "LABEL_EDITOR_PLAIN": "Простий", - "LABEL_EDITOR_HTML_FORCED": "Html (forced)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)", "LABEL_VIEW_OPTIONS": "Відображення", "LABEL_USE_PREVIEW_PANE": "Використовувати трьохколонний режим відображення", "LABEL_USE_CHECKBOXES_IN_LIST": "Показувати чекбокси у списках", 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 68c77ebed..aea25e676 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "默认格式", "LABEL_EDITOR_HTML": "html文本", "LABEL_EDITOR_PLAIN": "普通文本", - "LABEL_EDITOR_HTML_FORCED": "强制HTML文本", - "LABEL_EDITOR_PLAIN_FORCED": "强制普通文本", "LABEL_VIEW_OPTIONS": "视图选项", "LABEL_USE_PREVIEW_PANE": "使用预览", "LABEL_USE_CHECKBOXES_IN_LIST": "列表中显示多选框", 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 b931500d5..cee9c40db 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 @@ -380,8 +380,6 @@ "LABEL_EDITOR": "默認格式", "LABEL_EDITOR_HTML": "Html", "LABEL_EDITOR_PLAIN": "Plain", - "LABEL_EDITOR_HTML_FORCED": "Html (forced)", - "LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)", "LABEL_VIEW_OPTIONS": "視圖選項", "LABEL_USE_PREVIEW_PANE": "使用預覽", "LABEL_USE_CHECKBOXES_IN_LIST": "清單中顯示多選框",