From 426c92fe3376d9df74f9ca7d8b15a88c04ee49f6 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Fri, 3 Feb 2023 14:40:56 +0100 Subject: [PATCH] Make collapse quotes optional for #902 --- dev/Common/Html.js | 1 + dev/Settings/User/General.js | 4 ++-- dev/Stores/User/Settings.js | 2 ++ snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 2 ++ snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php | 1 + snappymail/v/0.0.0/app/localization/ar-SA/user.json | 1 + snappymail/v/0.0.0/app/localization/bg-BG/user.json | 1 + snappymail/v/0.0.0/app/localization/cs-CZ/user.json | 1 + snappymail/v/0.0.0/app/localization/da-DK/user.json | 1 + snappymail/v/0.0.0/app/localization/de-DE/user.json | 1 + snappymail/v/0.0.0/app/localization/el-GR/user.json | 1 + snappymail/v/0.0.0/app/localization/en-GB/user.json | 1 + snappymail/v/0.0.0/app/localization/en/user.json | 1 + snappymail/v/0.0.0/app/localization/es-ES/user.json | 1 + snappymail/v/0.0.0/app/localization/et-EE/user.json | 1 + snappymail/v/0.0.0/app/localization/eu/user.json | 1 + snappymail/v/0.0.0/app/localization/fa-IR/user.json | 1 + snappymail/v/0.0.0/app/localization/fi-FI/user.json | 1 + snappymail/v/0.0.0/app/localization/fr-FR/user.json | 1 + snappymail/v/0.0.0/app/localization/hu-HU/user.json | 1 + snappymail/v/0.0.0/app/localization/id-ID/user.json | 1 + snappymail/v/0.0.0/app/localization/is-IS/user.json | 1 + snappymail/v/0.0.0/app/localization/it-IT/user.json | 1 + snappymail/v/0.0.0/app/localization/ja-JP/user.json | 1 + snappymail/v/0.0.0/app/localization/ko-KR/user.json | 1 + snappymail/v/0.0.0/app/localization/lt-LT/user.json | 1 + snappymail/v/0.0.0/app/localization/lv-LV/user.json | 1 + snappymail/v/0.0.0/app/localization/nb-NO/user.json | 1 + snappymail/v/0.0.0/app/localization/nl-NL/user.json | 1 + snappymail/v/0.0.0/app/localization/pl-PL/user.json | 1 + snappymail/v/0.0.0/app/localization/pt-BR/user.json | 1 + snappymail/v/0.0.0/app/localization/pt-PT/user.json | 1 + snappymail/v/0.0.0/app/localization/pt/user.json | 1 + snappymail/v/0.0.0/app/localization/ro-RO/user.json | 1 + snappymail/v/0.0.0/app/localization/ru-RU/user.json | 1 + snappymail/v/0.0.0/app/localization/sk-SK/user.json | 1 + snappymail/v/0.0.0/app/localization/sl-SI/user.json | 1 + snappymail/v/0.0.0/app/localization/sv-SE/user.json | 1 + snappymail/v/0.0.0/app/localization/tr-TR/user.json | 1 + snappymail/v/0.0.0/app/localization/uk-UA/user.json | 1 + snappymail/v/0.0.0/app/localization/vi-VN/user.json | 1 + snappymail/v/0.0.0/app/localization/zh-CN/user.json | 1 + snappymail/v/0.0.0/app/localization/zh-TW/user.json | 1 + .../v/0.0.0/app/templates/Views/User/SettingsGeneral.html | 7 +++++++ 44 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dev/Common/Html.js b/dev/Common/Html.js index 81759956a..09739fb00 100644 --- a/dev/Common/Html.js +++ b/dev/Common/Html.js @@ -22,6 +22,7 @@ const return result; }, blockquoteSwitcher = () => { + SettingsUserStore.collapseBlockquotes() && // tpl.content.querySelectorAll('blockquote').forEach(node => { [...tpl.content.querySelectorAll('blockquote')].reverse().forEach(node => { let h = node.clientHeight || getRealHeight(node); diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js index 199037b68..496ce2206 100644 --- a/dev/Settings/User/General.js +++ b/dev/Settings/User/General.js @@ -45,7 +45,7 @@ export class UserSettingsGeneral extends AbstractViewSettings { ['layout', 'messageReadDelay', 'messagesPerPage', 'checkMailInterval', 'editorDefaultType', 'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt', 'viewHTML', 'viewImages', 'viewImagesWhitelist', 'removeColors', - 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList', + 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList', 'collapseBlockquotes', 'useCheckboxesInList', 'listGrouped', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck' ].forEach(name => this[name] = SettingsUserStore[name]); @@ -104,7 +104,7 @@ export class UserSettingsGeneral extends AbstractViewSettings { this.addSettings(['ViewHTML', 'ViewImages', 'ViewImagesWhitelist', 'HideDeleted', 'ListInlineAttachments', 'simpleAttachmentsList', 'UseCheckboxesInList', 'listGrouped', 'ReplySameFolder', 'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt', 'allowSpellcheck', - 'DesktopNotifications', 'SoundNotification']); + 'DesktopNotifications', 'SoundNotification', 'CollapseBlockquotes']); const fReloadLanguageHelper = (saveSettingsStep) => () => { this.languageTrigger(saveSettingsStep); diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js index 2cdc49d23..2238dd963 100644 --- a/dev/Stores/User/Settings.js +++ b/dev/Stores/User/Settings.js @@ -19,6 +19,7 @@ export const SettingsUserStore = new class { viewImages: 0, viewImagesWhitelist: '', removeColors: 0, + collapseBlockquotes: 1, listInlineAttachments: 0, simpleAttachmentsList: 0, useCheckboxesInList: 1, @@ -86,6 +87,7 @@ export const SettingsUserStore = new class { self.viewImages(SettingsGet('ViewImages')); self.viewImagesWhitelist(SettingsGet('ViewImagesWhitelist')); self.removeColors(SettingsGet('RemoveColors')); + self.collapseBlockquotes(SettingsGet('CollapseBlockquotes')); self.listInlineAttachments(SettingsGet('ListInlineAttachments')); self.simpleAttachmentsList(SettingsGet('simpleAttachmentsList')); self.useCheckboxesInList(SettingsGet('UseCheckboxesInList')); 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 ec8b8c11f..f80d1c408 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -692,6 +692,7 @@ class Actions 'ViewImagesWhitelist' => '', 'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false), 'ListInlineAttachments' => false, + 'CollapseBlockquotes' => true, 'simpleAttachmentsList' => false, 'listGrouped' => false, 'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25), @@ -802,6 +803,7 @@ class Actions $aResult['ViewImagesWhitelist'] = $oSettings->GetConf('ViewImagesWhitelist', ''); $aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']); $aResult['ListInlineAttachments'] = (bool)$oSettings->GetConf('ListInlineAttachments', $aResult['ListInlineAttachments']); + $aResult['CollapseBlockquotes'] = (bool)$oSettings->GetConf('CollapseBlockquotes', $aResult['CollapseBlockquotes']); $aResult['simpleAttachmentsList'] = (bool)$oSettings->GetConf('simpleAttachmentsList', $aResult['simpleAttachmentsList']); $aResult['listGrouped'] = (bool)$oSettings->GetConf('listGrouped', $aResult['listGrouped']); $aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php index 214658d76..f698fd3ce 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php @@ -182,6 +182,7 @@ trait User $this->setSettingsFromParams($oSettings, 'ViewImagesWhitelist', 'string'); $this->setSettingsFromParams($oSettings, 'RemoveColors', 'bool'); $this->setSettingsFromParams($oSettings, 'ListInlineAttachments', 'bool'); + $this->setSettingsFromParams($oSettings, 'CollapseBlockquotes', 'bool'); $this->setSettingsFromParams($oSettings, 'simpleAttachmentsList', 'bool'); $this->setSettingsFromParams($oSettings, 'listGrouped', 'bool'); $this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool'); 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 4166e4ad0..ff652848d 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "صوت التنبيهات", "CHROME_NOTIFICATION_DESC": "إظهار نافذة منبثقة في حالة قدوم ايميل جديد", "CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 3bacfec26..e68ce83fc 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Звуково известяване", "CHROME_NOTIFICATION_DESC": "Покажи известие при ново съобщение", "CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 96f7ac884..d277f7eac 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Zvukové notifikace", "CHROME_NOTIFICATION_DESC": "Zobrazovat upozornění na nové zprávy", "CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 d14274a6c..3076b8f3f 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Lyd notifikationer", "CHROME_NOTIFICATION_DESC": "Vis ny meddelelses notifikations popup", "CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 be1f39e17..f69f74631 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Benachrichtigungston", "CHROME_NOTIFICATION_DESC": "Popups einblenden, wenn neue Nachrichten vorhanden sind", "CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert.)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Inline-Anhänge in der Liste anzeigen", "LIST_SIMPLE_ATTACHMENTS": "Vereinfachte Liste der Anhänge", "LIST_MESSAGES_GROUPED": "Nachrichten bei Sortierung nach Datum oder Absender gruppieren", 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 fc9399c76..c92311fed 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Ηχητική επισήμανση", "CHROME_NOTIFICATION_DESC": "Να εμφανίζονται τα νέα μηνύματα σε αναδυόμενες επισημάνσεις", "CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 2ce6c7a49..76cad8cd5 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sound notification", "CHROME_NOTIFICATION_DESC": "Show new messages notification popups", "CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 33c4fc4bd..9a214e02c 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sound notification", "CHROME_NOTIFICATION_DESC": "Show new messages notification popups", "CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 5361f4e86..72e3baf37 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sonido de la notificación", "CHROME_NOTIFICATION_DESC": "Mostrar notificación de nuevos mensajes en Popup", "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el explorador)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 3b76b59f4..7db81615b 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Teavitused heliga", "CHROME_NOTIFICATION_DESC": "Näita uute kirjade teavitust hüpikaknaga", "CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 33f08b64d..2e0f6927e 100644 --- a/snappymail/v/0.0.0/app/localization/eu/user.json +++ b/snappymail/v/0.0.0/app/localization/eu/user.json @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Soinu-jakinarazpena", "CHROME_NOTIFICATION_DESC": "Erakutsi mezu berrien jakinarazpen popup-ak", "CHROME_NOTIFICATION_DESC_DENIED": "(Nabigatzaileak blokeatuta)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Erakutsi sareko eranskinak zerrendan", "LIST_SIMPLE_ATTACHMENTS": "Eranskinen zerrenda arrunta", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 348075d55..3ee0f6b28 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "آگاه‌سازی با صدا", "CHROME_NOTIFICATION_DESC": "پنجره اعلان دریافت پیام جدید را نمایش بده", "CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 d56347eb8..3af082b4a 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Äänimerkit", "CHROME_NOTIFICATION_DESC": "Näytä uusien viestien ponnahdusikkuna", "CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 a586f8d6a..f7254cae9 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Son de notification", "CHROME_NOTIFICATION_DESC": "Afficher un pop-up de notification pour les nouveaux messages", "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 cb14d4683..6901c5606 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Hangos értesítés", "CHROME_NOTIFICATION_DESC": "Új üzenetek értesítő ablakainak megjelenítése", "CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 d3487132d..944eab57d 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Notifikasi suara", "CHROME_NOTIFICATION_DESC": "Tampilkan jendela sembul notifikasi pesan", "CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 6e613d539..4b79c42f9 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Tilkynningarhljóð", "CHROME_NOTIFICATION_DESC": "Sýna tilkynningarglugga fyrir ný skilaboð", "CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 ec6317c8c..dd6396fcf 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Notifica sonora", "CHROME_NOTIFICATION_DESC": "Mostra le notifiche in caso di nuovi messaggi", "CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 e1d87f350..03525e2f3 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "サウンド通知", "CHROME_NOTIFICATION_DESC": "新しいメッセージを受信したらポップアップで知らせる", "CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 b8efac2c3..a50819491 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "소리 알림", "CHROME_NOTIFICATION_DESC": "새 메시지 알림 팝업 사용", "CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 927a8973d..7af2e7db7 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Garsinis pranešimas", "CHROME_NOTIFICATION_DESC": "Rodyti iššokančius pranešimus apie naujas žinutes", "CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 6d2482754..18d641eb0 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sound notification", "CHROME_NOTIFICATION_DESC": "Rādīt jaunus paziņojumus kā izlecošus logus", "CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 9191ea7e9..702050aff 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Lydvarsel", "CHROME_NOTIFICATION_DESC": "Vis sprettopp-varsel om nye meldinger", "CHROME_NOTIFICATION_DESC_DENIED": "(blokkert av nettleser)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 151f357da..c0b85bca4 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Notificatie geluid", "CHROME_NOTIFICATION_DESC": "Toon nieuwe berichten popup", "CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Toon inline bijlagen in lijst", "LIST_SIMPLE_ATTACHMENTS": "Simpele bijlagen lijst", "LIST_MESSAGES_GROUPED": "Toon berichten gegroepeerd (bij sorteren op Datum of Van)", 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 310177a91..1b7e90c18 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Powiadomienia dźwiękowe", "CHROME_NOTIFICATION_DESC": "Wyświetlaj powiadomienia o nowych wiadomościach", "CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 1e9f8b903..fa8e864a7 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Notificação sonora", "CHROME_NOTIFICATION_DESC": "Mostrar notificação popup para novas mensagens", "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 2128fac0f..e7ea5acad 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Notificações sonoras", "CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens", "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 59a385428..4c37c9f16 100644 --- a/snappymail/v/0.0.0/app/localization/pt/user.json +++ b/snappymail/v/0.0.0/app/localization/pt/user.json @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Notificações sonoras", "CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens", "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 3a2f60bab..f218742bf 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sound notification", "CHROME_NOTIFICATION_DESC": "Afișați notificări desktop pentru mesaje noi", "CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 5a88ab004..c993cfbc4 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Звуковые уведомления", "CHROME_NOTIFICATION_DESC": "Показывать уведомления о новых сообщениях в всплывающих подсказках", "CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 bace0db05..f75c48b25 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sound notification", "CHROME_NOTIFICATION_DESC": "Zobrazovať upozornenia na nové správy", "CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 248a2dec6..49cd330f5 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Zvočno obvestilo", "CHROME_NOTIFICATION_DESC": "Prikaži obvestila ob novih sporočilih", "CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 a93b78654..6991b4365 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Ljudnotifikation", "CHROME_NOTIFICATION_DESC": "Visa nya meddelande-aviseringar som popup-fönster", "CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 9c9affbd9..759a34e00 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sound notification", "CHROME_NOTIFICATION_DESC": "Yeni mesajları pop-up ile göster", "CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 8ba971655..0cbd43d88 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Звукове сповіщення", "CHROME_NOTIFICATION_DESC": "Показувати сповіщення про нові повідомлення у підказках", "CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 ff7f0b1e7..eb4769b6a 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Thông báo âm thanh", "CHROME_NOTIFICATION_DESC": "Hiện thị thông báo nẩy lên nhanh khi có thư mới", "CHROME_NOTIFICATION_DESC_DENIED": "(Đang bị chặn bởi trình duyệt web)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 45bdc5171..5376a44e1 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "提示音", "CHROME_NOTIFICATION_DESC": "显示新邮件弹窗", "CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件", "LIST_SIMPLE_ATTACHMENTS": "简洁附件列表", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", 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 6f7187c7b..d53661ca5 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 @@ -413,6 +413,7 @@ "SOUND_NOTIFICATION": "Sound notification", "CHROME_NOTIFICATION_DESC": "顯示新郵件彈窗", "CHROME_NOTIFICATION_DESC_DENIED": "(被瀏覽器阻止)", + "COLLAPSE_BLOCKQUOTES": "Collapse quoted text", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)", diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html index cee22436c..c4c72780d 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html @@ -178,6 +178,13 @@
+