From 13c76d395ee83bb18a2aa3bf182a0de49b4f6605 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 10 Jun 2024 12:28:58 +0200
Subject: [PATCH] Added for #1545
---
dev/Settings/User/Security.js | 7 +++++--
dev/Storage/Passphrases.js | 10 ++++++----
dev/Stores/User/Settings.js | 2 ++
.../v/0.0.0/app/libraries/RainLoop/Actions.php | 2 ++
.../v/0.0.0/app/libraries/RainLoop/Actions/User.php | 1 +
snappymail/v/0.0.0/app/localization/ar/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/be/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/bg/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/cs/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/da/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/de/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/el/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/en/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/es/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/et/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/eu/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/fa/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/fi/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/fr/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/hu/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/id/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/is/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/it/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/ja/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/ko/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/lt/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/lv/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/nb/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/nl/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/pl/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/pt-BR/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/pt/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/ro/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/ru/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/sk/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/sl/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/sv/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/tr/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/uk/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/vi/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/zh-TW/user.json | 3 ++-
snappymail/v/0.0.0/app/localization/zh/user.json | 3 ++-
.../app/templates/Views/User/SettingsSecurity.html | 13 +++++++++++++
43 files changed, 103 insertions(+), 43 deletions(-)
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index 5ee4a8f62..337f65240 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -26,9 +26,9 @@ export class UserSettingsSecurity extends AbstractViewSettings {
this.autoLogoutOptions = koComputable(() => {
translateTrigger();
return [
- { id: 0, name: i18n('SETTINGS_SECURITY/AUTOLOGIN_NEVER_OPTION_NAME') },
+ { id: 0, name: i18n('SETTINGS_SECURITY/NEVER') },
{ id: 5, name: relativeTime(300) },
- { id: 10, name: relativeTime(600) },
+ { id: 15, name: relativeTime(900) },
{ id: 30, name: relativeTime(1800) },
{ id: 60, name: relativeTime(3600) },
{ id: 120, name: relativeTime(7200) },
@@ -38,6 +38,9 @@ export class UserSettingsSecurity extends AbstractViewSettings {
});
this.addSetting('AutoLogout');
+ this.keyPassForget = SettingsUserStore.keyPassForget;
+ this.addSetting('keyPassForget');
+
this.gnupgPublicKeys = GnuPGUserStore.publicKeys;
this.gnupgPrivateKeys = GnuPGUserStore.privateKeys;
diff --git a/dev/Storage/Passphrases.js b/dev/Storage/Passphrases.js
index eb3c7e563..db43925a0 100644
--- a/dev/Storage/Passphrases.js
+++ b/dev/Storage/Passphrases.js
@@ -1,4 +1,5 @@
import { AskPopupView } from 'View/Popup/Ask';
+import { SettingsUserStore } from 'Stores/User/Settings';
export const Passphrases = new WeakMap();
@@ -8,12 +9,13 @@ Passphrases.ask = async (key, sAskDesc, btnText) =>
: await AskPopupView.password(sAskDesc, btnText, 5);
const timeouts = {};
-// get/set accessor to control deletion after 15 minutes of inactivity
+// get/set accessor to control deletion after N minutes of inactivity
Passphrases.handle = (key, pass) => {
- if (!timeouts[key]) {
- timeouts[key] = (()=>Passphrases.delete(key)).debounce(900000);
+ const timeout = SettingsUserStore.keyPassForget();
+ if (timeout && !timeouts[key]) {
+ timeouts[key] = (()=>Passphrases.delete(key)).debounce(timeout * 1000);
}
pass && Passphrases.set(key, pass);
- timeouts[key]();
+ timeout && timeouts[key]();
return Passphrases.get(key);
};
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 67d14318c..98d9620c6 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -35,6 +35,7 @@ export const SettingsUserStore = new class {
hideDeleted: 1,
unhideKolabFolders: 0,
autoLogout: 0,
+ keyPassForget: 15,
showUnreadCount: 0,
messageNewWindow: 0,
messageReadAuto: 0,
@@ -157,5 +158,6 @@ export const SettingsUserStore = new class {
self.checkMailInterval(pInt(SettingsGet('CheckMailInterval')));
self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
self.autoLogout(pInt(SettingsGet('AutoLogout')));
+ self.keyPassForget(pInt(SettingsGet('keyPassForget')));
}
};
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 1b3464040..587bfc573 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -598,6 +598,7 @@ class Actions
'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true),
'showNextMessage' => (bool) $oConfig->Get('defaults', 'view_show_next_message', false),
'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30),
+ 'keyPassForget' => 15,
'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true)
],
@@ -691,6 +692,7 @@ class Actions
$aResult['showNextMessage'] = (bool)$oSettings->GetConf('showNextMessage', $aResult['showNextMessage']);
$aResult['AllowDraftAutosave'] = (bool)$oSettings->GetConf('AllowDraftAutosave', $aResult['AllowDraftAutosave']);
$aResult['AutoLogout'] = (int)$oSettings->GetConf('AutoLogout', $aResult['AutoLogout']);
+ $aResult['keyPassForget'] = (int)$oSettings->GetConf('keyPassForget', $aResult['keyPassForget']);
$aResult['Layout'] = (int)$oSettings->GetConf('Layout', $aResult['Layout']);
$aResult['Resizer4Width'] = (int)$oSettings->GetConf('Resizer4Width', 0);
$aResult['Resizer5Width'] = (int)$oSettings->GetConf('Resizer5Width', 0);
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 db887460c..6367cd79e 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
@@ -192,6 +192,7 @@ trait User
$this->setSettingsFromParams($oSettings, 'UseCheckboxesInList', 'bool');
$this->setSettingsFromParams($oSettings, 'AllowDraftAutosave', 'bool');
$this->setSettingsFromParams($oSettings, 'AutoLogout', 'int');
+ $this->setSettingsFromParams($oSettings, 'keyPassForget', 'int');
$this->setSettingsFromParams($oSettings, 'messageNewWindow', 'bool');
$this->setSettingsFromParams($oSettings, 'messageReadAuto', 'bool');
$this->setSettingsFromParams($oSettings, 'MessageReadDelay', 'int');
diff --git a/snappymail/v/0.0.0/app/localization/ar/user.json b/snappymail/v/0.0.0/app/localization/ar/user.json
index 7f592931d..7ccec90e6 100644
--- a/snappymail/v/0.0.0/app/localization/ar/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "الأمان",
"LABEL_AUTOLOGOUT": "تسجيل الخروج التلقائي",
- "AUTOLOGIN_NEVER_OPTION_NAME": "أبداَ"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "أبداَ"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "اللغة",
diff --git a/snappymail/v/0.0.0/app/localization/be/user.json b/snappymail/v/0.0.0/app/localization/be/user.json
index d6f596212..74deabbe3 100644
--- a/snappymail/v/0.0.0/app/localization/be/user.json
+++ b/snappymail/v/0.0.0/app/localization/be/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Бяспека",
"LABEL_AUTOLOGOUT": "Азтаматычны ўваход",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Ніколі"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Ніколі"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Мова",
diff --git a/snappymail/v/0.0.0/app/localization/bg/user.json b/snappymail/v/0.0.0/app/localization/bg/user.json
index 81d66c046..95ac26304 100644
--- a/snappymail/v/0.0.0/app/localization/bg/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Сигурност",
"LABEL_AUTOLOGOUT": "Автоматично излизане",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Никога"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Никога"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Език",
diff --git a/snappymail/v/0.0.0/app/localization/cs/user.json b/snappymail/v/0.0.0/app/localization/cs/user.json
index cd20066cf..56c665313 100644
--- a/snappymail/v/0.0.0/app/localization/cs/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Zabezpečení",
"LABEL_AUTOLOGOUT": "Automatické odhlášení",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nikdy"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nikdy"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Jazyk",
diff --git a/snappymail/v/0.0.0/app/localization/da/user.json b/snappymail/v/0.0.0/app/localization/da/user.json
index bcb6c99b5..a3bc88c5a 100644
--- a/snappymail/v/0.0.0/app/localization/da/user.json
+++ b/snappymail/v/0.0.0/app/localization/da/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Sikkerhed",
"LABEL_AUTOLOGOUT": "Automatisk log ud",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Aldrig"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Aldrig"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Sprog",
diff --git a/snappymail/v/0.0.0/app/localization/de/user.json b/snappymail/v/0.0.0/app/localization/de/user.json
index 68c2f0da5..b0525adf7 100644
--- a/snappymail/v/0.0.0/app/localization/de/user.json
+++ b/snappymail/v/0.0.0/app/localization/de/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Sicherheit",
"LABEL_AUTOLOGOUT": "Automatische Abmeldung",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nie"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nie"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Sprache",
diff --git a/snappymail/v/0.0.0/app/localization/el/user.json b/snappymail/v/0.0.0/app/localization/el/user.json
index b96bf382b..8db9cd7ae 100644
--- a/snappymail/v/0.0.0/app/localization/el/user.json
+++ b/snappymail/v/0.0.0/app/localization/el/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Ασφάλεια",
"LABEL_AUTOLOGOUT": "Αυτόματη αποσύνδεση",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Ποτέ"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Ποτέ"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Γλώσσα",
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 ea33dc42c..89bd4103d 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Security",
"LABEL_AUTOLOGOUT": "Auto Logout",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Never"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Never"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Language",
diff --git a/snappymail/v/0.0.0/app/localization/es/user.json b/snappymail/v/0.0.0/app/localization/es/user.json
index 2628f82a2..979606a3b 100644
--- a/snappymail/v/0.0.0/app/localization/es/user.json
+++ b/snappymail/v/0.0.0/app/localization/es/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Seguridad",
"LABEL_AUTOLOGOUT": "Salir Automáticamente",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nunca"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nunca"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Idioma",
diff --git a/snappymail/v/0.0.0/app/localization/et/user.json b/snappymail/v/0.0.0/app/localization/et/user.json
index 2d4b32ff9..2d41c2fdf 100644
--- a/snappymail/v/0.0.0/app/localization/et/user.json
+++ b/snappymail/v/0.0.0/app/localization/et/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Turvalisus",
"LABEL_AUTOLOGOUT": "Automaatne välja logimine",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Mitte kunagi"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Mitte kunagi"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Keel",
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 d72ea5d77..3882767ab 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Segurtasuna",
"LABEL_AUTOLOGOUT": "Saioa automatikoki itxi",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Inoiz"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Inoiz"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Hizkuntza",
diff --git a/snappymail/v/0.0.0/app/localization/fa/user.json b/snappymail/v/0.0.0/app/localization/fa/user.json
index bb734ca1f..966a4e3a1 100644
--- a/snappymail/v/0.0.0/app/localization/fa/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "امنیت",
"LABEL_AUTOLOGOUT": "خروج خودکار",
- "AUTOLOGIN_NEVER_OPTION_NAME": "هرگز"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "هرگز"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "زبان",
diff --git a/snappymail/v/0.0.0/app/localization/fi/user.json b/snappymail/v/0.0.0/app/localization/fi/user.json
index 27aeb5ea1..d5e17a1d7 100644
--- a/snappymail/v/0.0.0/app/localization/fi/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Turvallisuus",
"LABEL_AUTOLOGOUT": "Automaattinen uloskirjautuminen",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Ei koskaan"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Ei koskaan"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Kieli",
diff --git a/snappymail/v/0.0.0/app/localization/fr/user.json b/snappymail/v/0.0.0/app/localization/fr/user.json
index 55c23f047..73ff53850 100644
--- a/snappymail/v/0.0.0/app/localization/fr/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Sécurité",
"LABEL_AUTOLOGOUT": "Déconnexion automatique",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Jamais"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Jamais"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Langue",
diff --git a/snappymail/v/0.0.0/app/localization/hu/user.json b/snappymail/v/0.0.0/app/localization/hu/user.json
index ecc810ad5..9aed3f8d1 100644
--- a/snappymail/v/0.0.0/app/localization/hu/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Biztonság",
"LABEL_AUTOLOGOUT": "Automatikus kijelentkezés",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Soha"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Soha"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Nyelv",
diff --git a/snappymail/v/0.0.0/app/localization/id/user.json b/snappymail/v/0.0.0/app/localization/id/user.json
index fa8240a4d..bf4c36395 100644
--- a/snappymail/v/0.0.0/app/localization/id/user.json
+++ b/snappymail/v/0.0.0/app/localization/id/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Keamanan",
"LABEL_AUTOLOGOUT": "Logout otomatis",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Tidak pernah"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Tidak pernah"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Bahasa",
diff --git a/snappymail/v/0.0.0/app/localization/is/user.json b/snappymail/v/0.0.0/app/localization/is/user.json
index 1905d3f8c..9820f5a6a 100644
--- a/snappymail/v/0.0.0/app/localization/is/user.json
+++ b/snappymail/v/0.0.0/app/localization/is/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Öryggi",
"LABEL_AUTOLOGOUT": "Sjálfvirk útskráning",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Aldrei"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Aldrei"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Tungumál",
diff --git a/snappymail/v/0.0.0/app/localization/it/user.json b/snappymail/v/0.0.0/app/localization/it/user.json
index ea94514e4..d52cd2b40 100644
--- a/snappymail/v/0.0.0/app/localization/it/user.json
+++ b/snappymail/v/0.0.0/app/localization/it/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Sicurezza",
"LABEL_AUTOLOGOUT": "Disconnessione automatica",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Mai"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Mai"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Lingua",
diff --git a/snappymail/v/0.0.0/app/localization/ja/user.json b/snappymail/v/0.0.0/app/localization/ja/user.json
index 94cd4c262..d0dd1a596 100644
--- a/snappymail/v/0.0.0/app/localization/ja/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "セキュリティ",
"LABEL_AUTOLOGOUT": "自動ログアウト",
- "AUTOLOGIN_NEVER_OPTION_NAME": "しない"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "しない"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "言語",
diff --git a/snappymail/v/0.0.0/app/localization/ko/user.json b/snappymail/v/0.0.0/app/localization/ko/user.json
index 905965c60..442e0564e 100644
--- a/snappymail/v/0.0.0/app/localization/ko/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "보안",
"LABEL_AUTOLOGOUT": "자동 로그아웃",
- "AUTOLOGIN_NEVER_OPTION_NAME": "설정하지 않음"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "설정하지 않음"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "언어",
diff --git a/snappymail/v/0.0.0/app/localization/lt/user.json b/snappymail/v/0.0.0/app/localization/lt/user.json
index b4f30adca..5ada7a3e1 100644
--- a/snappymail/v/0.0.0/app/localization/lt/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Sauga",
"LABEL_AUTOLOGOUT": "Automatinis atsijungimas",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Niekada"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Niekada"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Kalba",
diff --git a/snappymail/v/0.0.0/app/localization/lv/user.json b/snappymail/v/0.0.0/app/localization/lv/user.json
index e764f2fb3..6dd047c87 100644
--- a/snappymail/v/0.0.0/app/localization/lv/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Security",
"LABEL_AUTOLOGOUT": "Auto Logout",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Never"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Never"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Valoda",
diff --git a/snappymail/v/0.0.0/app/localization/nb/user.json b/snappymail/v/0.0.0/app/localization/nb/user.json
index 7a69ec11e..bae63fbb9 100644
--- a/snappymail/v/0.0.0/app/localization/nb/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Sikkerhet",
"LABEL_AUTOLOGOUT": "Logg ut automatisk etter",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Aldri"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Aldri"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Språk",
diff --git a/snappymail/v/0.0.0/app/localization/nl/user.json b/snappymail/v/0.0.0/app/localization/nl/user.json
index 3de714705..491f16b00 100644
--- a/snappymail/v/0.0.0/app/localization/nl/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Beveiliging",
"LABEL_AUTOLOGOUT": "Automatisch uitloggen",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nooit"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nooit"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Taal",
diff --git a/snappymail/v/0.0.0/app/localization/pl/user.json b/snappymail/v/0.0.0/app/localization/pl/user.json
index 75dee045d..408f9cf43 100644
--- a/snappymail/v/0.0.0/app/localization/pl/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Bezpieczeństwo",
"LABEL_AUTOLOGOUT": "Automatyczne wylogowanie",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nigdy"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nigdy"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Język",
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 3dd5bb241..ad4a24242 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
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Segurança",
"LABEL_AUTOLOGOUT": "Deslogar Automaticamente",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nunca"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nunca"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Idioma",
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 eecfd1c84..baa57b31e 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Segurança",
"LABEL_AUTOLOGOUT": "Terminar sessão auto.",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nunca"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nunca"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Idioma",
diff --git a/snappymail/v/0.0.0/app/localization/ro/user.json b/snappymail/v/0.0.0/app/localization/ro/user.json
index ff45337d5..4c212c103 100644
--- a/snappymail/v/0.0.0/app/localization/ro/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Security",
"LABEL_AUTOLOGOUT": "Auto Logout",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Never"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Never"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Limbă",
diff --git a/snappymail/v/0.0.0/app/localization/ru/user.json b/snappymail/v/0.0.0/app/localization/ru/user.json
index 97873e165..9301ec2dd 100644
--- a/snappymail/v/0.0.0/app/localization/ru/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Безопасность",
"LABEL_AUTOLOGOUT": "Автоматический выход",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Никогда"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Никогда"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Язык",
diff --git a/snappymail/v/0.0.0/app/localization/sk/user.json b/snappymail/v/0.0.0/app/localization/sk/user.json
index 2a6cf9448..cb3de6cce 100644
--- a/snappymail/v/0.0.0/app/localization/sk/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Security",
"LABEL_AUTOLOGOUT": "Auto Logout",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Never"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Never"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Jazyk",
diff --git a/snappymail/v/0.0.0/app/localization/sl/user.json b/snappymail/v/0.0.0/app/localization/sl/user.json
index 840ce31fd..1631a1945 100644
--- a/snappymail/v/0.0.0/app/localization/sl/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Varnost",
"LABEL_AUTOLOGOUT": "Samodejna odjava",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Nikoli"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Nikoli"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Jezik",
diff --git a/snappymail/v/0.0.0/app/localization/sv/user.json b/snappymail/v/0.0.0/app/localization/sv/user.json
index 1e59a91de..87cc314a8 100644
--- a/snappymail/v/0.0.0/app/localization/sv/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Säkerhet",
"LABEL_AUTOLOGOUT": "Automatisk utloggning",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Aldrig"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Aldrig"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Språk",
diff --git a/snappymail/v/0.0.0/app/localization/tr/user.json b/snappymail/v/0.0.0/app/localization/tr/user.json
index e5d4cc4c8..4e5a74b2a 100644
--- a/snappymail/v/0.0.0/app/localization/tr/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Security",
"LABEL_AUTOLOGOUT": "Auto Logout",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Never"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Never"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Dil",
diff --git a/snappymail/v/0.0.0/app/localization/uk/user.json b/snappymail/v/0.0.0/app/localization/uk/user.json
index 1993b0a4c..4ba59886c 100644
--- a/snappymail/v/0.0.0/app/localization/uk/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "Безпека",
"LABEL_AUTOLOGOUT": "Автовихід",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Ніколи"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Ніколи"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Мова",
diff --git a/snappymail/v/0.0.0/app/localization/vi/user.json b/snappymail/v/0.0.0/app/localization/vi/user.json
index 6622de9b7..fb1ad4de0 100644
--- a/snappymail/v/0.0.0/app/localization/vi/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "An ninh",
"LABEL_AUTOLOGOUT": "Tự động đăng xuất",
- "AUTOLOGIN_NEVER_OPTION_NAME": "Không tự động đăng xuất"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "Không tự động đăng xuất"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "Ngôn ngữ",
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 c3f155d80..9d7899dbc 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
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "安全性",
"LABEL_AUTOLOGOUT": "自動登出",
- "AUTOLOGIN_NEVER_OPTION_NAME": "永不"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "永不"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "語言",
diff --git a/snappymail/v/0.0.0/app/localization/zh/user.json b/snappymail/v/0.0.0/app/localization/zh/user.json
index 4269dd110..56fbcf33a 100644
--- a/snappymail/v/0.0.0/app/localization/zh/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh/user.json
@@ -443,7 +443,8 @@
"SETTINGS_SECURITY": {
"LEGEND_SECURITY": "安全",
"LABEL_AUTOLOGOUT": "自动登出",
- "AUTOLOGIN_NEVER_OPTION_NAME": "从不"
+ "FORGET_KEY_PASS": "Forget private key passphrase",
+ "NEVER": "从不"
},
"SETTINGS_GENERAL": {
"LANGUAGE": "语言",
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index 68c12379f..a516d4b4e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -13,6 +13,19 @@
}
}">
+
OpenPGP