From 88f7b3d34561bdd5f8356231b21864e194807ae4 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Sep 2022 09:46:49 +0200 Subject: [PATCH] Added option to (un)hide Kolab folders --- dev/Model/FolderCollection.js | 3 ++- dev/Settings/User/Folders.js | 2 ++ dev/Stores/User/Settings.js | 2 ++ .../v/0.0.0/app/libraries/RainLoop/Actions.php | 2 ++ .../app/libraries/RainLoop/Actions/Accounts.php | 1 + .../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/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 + .../app/templates/Views/User/SettingsFolders.html | 12 ++++++++++++ 44 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js index 4453ba339..e43b9fa82 100644 --- a/dev/Model/FolderCollection.js +++ b/dev/Model/FolderCollection.js @@ -364,7 +364,8 @@ export class FolderModel extends AbstractModel { canBeEdited: () => FolderType.User === folder.type() && folder.exists/* && folder.selectable()*/, - isSystemFolder: () => FolderType.User !== folder.type() /*| !!folder.kolabType()*/, + isSystemFolder: () => FolderType.User !== folder.type() + | (FolderUserStore.allowKolab() && !!folder.kolabType() & !SettingsUserStore.unhideKolabFolders()), canBeSelected: () => folder.selectable() && !folder.isSystemFolder(), diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js index 6664d97c5..4ff262f27 100644 --- a/dev/Settings/User/Folders.js +++ b/dev/Settings/User/Folders.js @@ -46,6 +46,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ { this.folderListOptimized = FolderUserStore.folderListOptimized; this.folderListError = FolderUserStore.folderListError; this.hideUnsubscribed = SettingsUserStore.hideUnsubscribed; + this.unhideKolabFolders = SettingsUserStore.unhideKolabFolders; this.loading = FolderUserStore.foldersChanging; @@ -54,6 +55,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ { this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'editing'] }); SettingsUserStore.hideUnsubscribed.subscribe(value => Remote.saveSetting('HideUnsubscribed', value)); + SettingsUserStore.unhideKolabFolders.subscribe(value => Remote.saveSetting('UnhideKolabFolders', value)); } folderEditOnEnter(folder) { diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js index eabf47a26..118884553 100644 --- a/dev/Stores/User/Settings.js +++ b/dev/Stores/User/Settings.js @@ -25,6 +25,7 @@ export const SettingsUserStore = new class { replySameFolder: 0, hideUnsubscribed: 0, hideDeleted: 1, + unhideKolabFolders: 0, autoLogout: 0, requestReadReceipt: 0, @@ -84,6 +85,7 @@ export const SettingsUserStore = new class { self.hideUnsubscribed(SettingsGet('HideUnsubscribed')); self.hideDeleted(SettingsGet('HideDeleted')); + self.unhideKolabFolders(SettingsGet('UnhideKolabFolders')); self.requestReadReceipt(SettingsGet('requestReadReceipt')); self.requestDsn(SettingsGet('requestDsn')); 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 3168906f1..65dcc90b9 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -738,6 +738,7 @@ class Actions 'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true), 'HideUnsubscribed' => false, 'HideDeleted' => true, + 'UnhideKolabFolders' => false, 'MainEmail' => '', 'UserBackgroundName' => '', 'UserBackgroundHash' => '' @@ -837,6 +838,7 @@ class Actions $aResult['UseThreads'] = (bool)$oSettingsLocal->GetConf('UseThreads', $aResult['UseThreads']); $aResult['ReplySameFolder'] = (bool)$oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']); $aResult['HideDeleted'] = (bool)$oSettingsLocal->GetConf('HideDeleted', $aResult['HideDeleted']); + $aResult['UnhideKolabFolders'] = (bool)$oSettingsLocal->GetConf('UnhideKolabFolders', $aResult['UnhideKolabFolders']); } if ($oConfig->Get('login', 'determine_user_language', true)) { diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php index 45a4f7319..c46257d12 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php @@ -160,6 +160,7 @@ trait Accounts $aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $oConfig->Get('defaults', 'mail_use_threads', false)); $aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $oConfig->Get('defaults', 'mail_reply_same_folder', false)); $aResult['HideDeleted'] = (bool) $oSettingsLocal->GetConf('HideDeleted', true); + $aResult['UnhideKolabFolders'] = (bool) $oSettingsLocal->GetConf('UnhideKolabFolders', false); } // $this->Plugins()->InitAppData($bAdmin, $aResult, $oAccount); 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 2ebcfc5ee..9c99e1ddd 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 @@ -356,6 +356,7 @@ trait User $this->setSettingsFromParams($oSettingsLocal, 'ReplySameFolder', 'bool'); $this->setSettingsFromParams($oSettingsLocal, 'HideUnsubscribed', 'bool'); $this->setSettingsFromParams($oSettingsLocal, 'HideDeleted', 'bool'); + $this->setSettingsFromParams($oSettingsLocal, 'UnhideKolabFolders', 'bool'); return $this->DefaultResponse(__FUNCTION__, $this->SettingsProvider()->Save($oAccount, $oSettings) && 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 f0207e856..d154789fc 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "إخفاء\\إظهار المجلد", "HELP_CHECK_FOR_NEW_MESSAGES": "تأكد\\لاتتأكد من وصول ايميلات جديدة", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 fed65d3e3..8d5303678 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Покажи\/скрий папка", "HELP_CHECK_FOR_NEW_MESSAGES": "Провери\/не проверявай за нови съобщения", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 f29539336..c9a8027f3 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Zobrazit\/skrýt složku", "HELP_CHECK_FOR_NEW_MESSAGES": "Kontrovat\/nekontrolovat nové příchozí zprávy", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 39e15ae23..508232cbe 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Vis\/skjul mappe", "HELP_CHECK_FOR_NEW_MESSAGES": "Markér\/fjern markering for nye meddelelser", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 b5e094cb0..847c0b996 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Ordner ein-\/ausblenden", "HELP_CHECK_FOR_NEW_MESSAGES": "Auf neue Nachrichten prüfen\/nicht prüfen", "HIDE_UNSUBSCRIBED": "Nicht abonnierte Ordner ausblenden", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Kalender", "TYPE_CONFIGURATION": "Konfiguration", "TYPE_CONTACTS": "Kontakte", 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 0882b8e81..1547b67d7 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 147e4b097..bf2dafa54 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 9256872be..fed12f3d0 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 23e1e7acb..5ca09ecdf 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar carpeta", "HELP_CHECK_FOR_NEW_MESSAGES": "Chequear\/no chequear nuevos mensajes", "HIDE_UNSUBSCRIBED": "Ocultar carpetas dadas de baja", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendario", "TYPE_CONFIGURATION": "Configuración", "TYPE_CONTACTS": "Contactos", 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 20d1d26cb..78bd3bd9b 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Näita\/peida kaust", "HELP_CHECK_FOR_NEW_MESSAGES": "Kontrolli\/ära kontrolli uusi kirju", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 95a707ec7..d15b365a7 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "نمایش\/مخفی‌بودن پوشه", "HELP_CHECK_FOR_NEW_MESSAGES": "بررسی\/عدم‌بررسی برای پیام جدید", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 04829d548..e1a96d33b 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Näytä\/Piilota kansio", "HELP_CHECK_FOR_NEW_MESSAGES": "Tarkista\/Älä tarkista uudet viestit", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 406b20c92..ba5cfc0b3 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Afficher\/masquer le dossier", "HELP_CHECK_FOR_NEW_MESSAGES": "Cocher\/Décocher pour les nouveaux messages", "HIDE_UNSUBSCRIBED": "Masquer les dossiers désabonnés", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendrier", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 99ca6b46e..e73a553ca 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Mappa mutatás\/elrejtés", "HELP_CHECK_FOR_NEW_MESSAGES": "Ellenőrizze\/ne ellenőrizze az új üzeneteket", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Naptár", "TYPE_CONFIGURATION": "Konfiguráció", "TYPE_CONTACTS": "Kapcsolatok", 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 0713e629b..c59837d1a 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Tampil\/lenyapkan folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Cek\/jangan cek pesan baru", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 f81d1b072..51622c677 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Birta\/fela möppu", "HELP_CHECK_FOR_NEW_MESSAGES": "Athuga\/ekki athuga með ný skilaboð", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 d40c2a352..8bf6c5329 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Mostra\/nascondi cartella", "HELP_CHECK_FOR_NEW_MESSAGES": "Controlla\/non controlla la presenza di nuovi messaggi", "HIDE_UNSUBSCRIBED": "Nascondi le cartelle non sottoscritte", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendario", "TYPE_CONFIGURATION": "Configurazione", "TYPE_CONTACTS": "Contatti", 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 78dc6d5b8..11c5089c6 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "フォルダーの表示\/非表示", "HELP_CHECK_FOR_NEW_MESSAGES": "新しいメッセージをチェックする\/しない", "HIDE_UNSUBSCRIBED": "購読していないフォルダを隠す", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 1b8eb78c3..f8911145f 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "폴더 표시\/숨기기", "HELP_CHECK_FOR_NEW_MESSAGES": "새 메시지 확인\/확인 취소", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 eeb9133e7..b4f532dba 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Rodyti\/Slėpti katalogą", "HELP_CHECK_FOR_NEW_MESSAGES": "Tikrinti\/Netikrinti ar yra naujų laiškų", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 57da36856..7799ef100 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 34bc4eb70..a2b45d1e2 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Vis\/skjul mappe", "HELP_CHECK_FOR_NEW_MESSAGES": "Se\/ikke se etter nye meldinger", "HIDE_UNSUBSCRIBED": "Skjul mapper som bruker ikke abonnerer på", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Kalender", "TYPE_CONFIGURATION": "Oppsett", "TYPE_CONTACTS": "Kontakter", 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 269cc8d9e..cfe2254ad 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Toon\/verberg map", "HELP_CHECK_FOR_NEW_MESSAGES": "Controleer wel of niet op nieuwe berichten", "HIDE_UNSUBSCRIBED": "Verberg niet geabonneerde mappen", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Kalender", "TYPE_CONFIGURATION": "Configuratie", "TYPE_CONTACTS": "Contacten", 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 b5f4acae5..40df6217b 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Pokaż\/ukryj folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Sprawdzaj\/nie sprawdzaj nowych wiadomości", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 d44e49704..d29af07c3 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Mostrar\/esconder pasta", "HELP_CHECK_FOR_NEW_MESSAGES": "Ativar\/Desativar verificação por novas mensagens", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 ddc3c9c02..c1eea9093 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar pasta", "HELP_CHECK_FOR_NEW_MESSAGES": "Procurar\/não procurar novas mensagens", "HIDE_UNSUBSCRIBED": "Esconder pastas não-subscritas", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendário", "TYPE_CONFIGURATION": "Configuração", "TYPE_CONTACTS": "Contactos", 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 ddc3c9c02..c1eea9093 100644 --- a/snappymail/v/0.0.0/app/localization/pt/user.json +++ b/snappymail/v/0.0.0/app/localization/pt/user.json @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar pasta", "HELP_CHECK_FOR_NEW_MESSAGES": "Procurar\/não procurar novas mensagens", "HIDE_UNSUBSCRIBED": "Esconder pastas não-subscritas", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendário", "TYPE_CONFIGURATION": "Configuração", "TYPE_CONTACTS": "Contactos", 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 22a1dea73..df59a1062 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 b28a00718..707a06bc7 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Показывать\/прятать папку", "HELP_CHECK_FOR_NEW_MESSAGES": "Проверять\/не проверять новые сообщения", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 4b32cfe04..d19ab10e0 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 506105b3f..1815ea1c1 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Prikaži\/skrij mapo", "HELP_CHECK_FOR_NEW_MESSAGES": "Preverjaj\/ne preverjaj za nova sporočila", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 04a92a1b4..049735e83 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Visa\/dölj mapp", "HELP_CHECK_FOR_NEW_MESSAGES": "Kontrollera\/inte söka efter nya meddelanden", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Kalender", "TYPE_CONFIGURATION": "Konfiguration", "TYPE_CONTACTS": "Kontakter", 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 ae2fe1dd9..220f0aad1 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 4e778219e..aa2597eb6 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Відобразити\/приховати теку", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", 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 73187742f..fc64477a5 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Hiển thị\/ẩn đi thư mục", "HELP_CHECK_FOR_NEW_MESSAGES": "Kiểm tra\/không kiểm tra xem có thư mới không", "HIDE_UNSUBSCRIBED": "Ẩn đi những thư mục đã bỏ theo dõi", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Lịch", "TYPE_CONFIGURATION": "Cấu hình", "TYPE_CONTACTS": "Danh bạ", 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 c95a04d5f..aee4c4828 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "显示\/隐藏文件夹", "HELP_CHECK_FOR_NEW_MESSAGES": "检查\/不检查新邮件", "HIDE_UNSUBSCRIBED": "隐藏未订阅的文件夹", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "日历", "TYPE_CONFIGURATION": "配置", "TYPE_CONTACTS": "联系人", 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 bc199223a..dca938639 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 @@ -454,6 +454,7 @@ "HELP_SHOW_HIDE_FOLDER": "Show\/hide folder", "HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages", "HIDE_UNSUBSCRIBED": "Hide unsubscribed folders", + "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders", "TYPE_CALENDAR": "Calendar", "TYPE_CONFIGURATION": "Configuration", "TYPE_CONTACTS": "Contacts", diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html index 164353a82..4d3ce9d5c 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html @@ -3,6 +3,7 @@     +
+ + +
+ +