Fix some OpenPGP translations

dev/View/Popup/OpenPgpImport.js

@@ -13,7 +13,7 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
 			keyErrorMessage: '',
 
 			saveGnuPG: true,
-			saveServer: true
+			saveServer: false
 		});
 
 		this.canGnuPG = GnuPGUserStore.isSupported();

dev/View/User/MailBox/MessageView.js

@@ -650,7 +650,7 @@ export class MailMessageView extends AbstractViewRight {
 			}
 /*
 			if (result && result.success) {
-				i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
+				i18n('OPENPGP/GOOD_SIGNATURE', {
 					USER: validKey.user + ' (' + validKey.id + ')'
 				});
 				message.getText()
@@ -660,7 +660,7 @@ export class MailMessageView extends AbstractViewRight {
 						? keyIds.map(item => (item && item.toHex ? item.toHex() : null)).filter(v => v).join(', ')
 						: '';
 
-				i18n('PGP_NOTIFICATIONS/PGP_ERROR', {
+				i18n('OPENPGP/ERROR', {
 					ERROR: 'message'
 				}) + (additional ? ' (' + additional + ')' : '');
 			}

snappymail/v/0.0.0/app/localization/ar-SA/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "الملحقات",
 		"MESSAGE_VIEW_DESC": "حدد رسالة من القائمة ليتم عرضها هنا",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message",
-		"BUTTON_PGP_VERIFY": "click to verify",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message",
 		"LINK_DOWNLOAD_AS_ZIP": "zip تنزيل كـ",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "تسجيل",
 		"LABEL_ENCRYPT": "تشفير",
-		"BUTTON_DECRYPT": "فك تشفير"
+		"BUTTON_DECRYPT": "فك تشفير",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP signed message",
+		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "توقيع جيد من  %USER%",
+		"ERROR": "OpenPGP error: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "إنشاء عامل تصفية؟",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "..جاري التحميل",
 		"DEFAULT_IDENTITY_LABEL": "الافتراضي"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": " إستيراد مفتاح",
 		"BUTTON_GENERATE_KEY_PAIR": " توليد مفتاح",
 		"TITLE_PRIVATE": "خاص",
 		"TITLE_PUBLIC": "عام",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "مساعدة في إختصارات لوحة المفاتيح",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "إرسال الرسالة",
 		"LABEL_CLOSE_COMPOSE": "إغلاق الرسالة"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "توقيع جيد من  %USER%",
-		"PGP_ERROR": "OpenPGP error: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "خاطىء token",
 		"AUTH_ERROR": "خطأ في كلمة السر \\اسم المستخدم",

snappymail/v/0.0.0/app/localization/bg-BG/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Прикрепени файлове",
 		"MESSAGE_VIEW_DESC": "Изберете съобщение, за да го видите тук.",
 		"MESSAGE_VIEW_MOVE_DESC": "Изберете цел от папките в лявото поле",
-		"PGP_SIGNED_MESSAGE_DESC": "Подписано с OpenPGP",
-		"BUTTON_PGP_VERIFY": "кликни за проверка",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Шифровано с OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Свали като ZIP файл",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Подпиши",
 		"LABEL_ENCRYPT": "Шифровай",
-		"BUTTON_DECRYPT": "Дешифрирай"
+		"BUTTON_DECRYPT": "Дешифрирай",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Подписано с OpenPGP",
+		"ENCRYPTED_MESSAGE": "Шифровано с OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Валиден подпис за %USER%",
+		"ERROR": "OpenPGP грешка: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Създай филтър?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Обновяване на списъка с акаунти",
 		"DEFAULT_IDENTITY_LABEL": "по подразбиране"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Внеси ключ",
 		"BUTTON_GENERATE_KEY_PAIR": "Генерирай ключ",
 		"TITLE_PRIVATE": "Частен",
 		"TITLE_PUBLIC": "Публичен",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматично запазване на чернова"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматично запазване на чернова",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Помощ за клавишните комбинации",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Изпрати съобщението",
 		"LABEL_CLOSE_COMPOSE": "Затвори създаването"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Валиден подпис за %USER%",
-		"PGP_ERROR": "OpenPGP грешка: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Невалиден токен",
 		"AUTH_ERROR": "Неуспешно удостоверяване",

snappymail/v/0.0.0/app/localization/cs-CZ/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Přílohy",
 		"MESSAGE_VIEW_DESC": "Vyberte zprávu ze seznamu pro její zobrazení zde.",
 		"MESSAGE_VIEW_MOVE_DESC": "Vyberte cílovou složku v levém panelu.",
-		"PGP_SIGNED_MESSAGE_DESC": "Zpráva podepsaná OpenPGP",
-		"BUTTON_PGP_VERIFY": "klikněte pro ověření",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Zpráva šifrovaná OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Stáhnout jako zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Podpis",
 		"LABEL_ENCRYPT": "Šifrování",
-		"BUTTON_DECRYPT": "Dešifrovat"
+		"BUTTON_DECRYPT": "Dešifrovat",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Zpráva podepsaná OpenPGP",
+		"ENCRYPTED_MESSAGE": "Zpráva šifrovaná OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Ověřený podpis od %USER%",
+		"ERROR": "OpenPGP chyba: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Vytvořit filtr?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Aktualizace seznamu účtů",
 		"DEFAULT_IDENTITY_LABEL": "výchozí"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importovat klíč",
 		"BUTTON_GENERATE_KEY_PAIR": "Generovat klíče",
 		"TITLE_PRIVATE": "Soukromý",
 		"TITLE_PUBLIC": "Veřejný",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložit koncept"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložit koncept",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Klávesové zkratky",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Odeslat zprávu",
 		"LABEL_CLOSE_COMPOSE": "Zavřít okno se zprávou"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Ověřený podpis od %USER%",
-		"PGP_ERROR": "OpenPGP chyba: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Neplatný token",
 		"AUTH_ERROR": "Ověření selhalo",

snappymail/v/0.0.0/app/localization/da-DK/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Vedhæftninger",
 		"MESSAGE_VIEW_DESC": "Vælg meddelelse i oversigten for visning.",
 		"MESSAGE_VIEW_MOVE_DESC": "Vælg modtagemappe i panelet til venstre.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP signeret meddelelse",
-		"BUTTON_PGP_VERIFY": "tryk for at verificere",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP krypteret meddelelse",
 		"LINK_DOWNLOAD_AS_ZIP": "Hent som zip-fil",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Signér",
 		"LABEL_ENCRYPT": "Krypter",
-		"BUTTON_DECRYPT": "Dekrypter"
+		"BUTTON_DECRYPT": "Dekrypter",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP signeret meddelelse",
+		"ENCRYPTED_MESSAGE": "OpenPGP krypteret meddelelse",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Accepteret signatur for %USER\"",
+		"ERROR": "OpenPGP fejl: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Opret filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Opdaterer...",
 		"DEFAULT_IDENTITY_LABEL": "standard"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importer nøgle",
 		"BUTTON_GENERATE_KEY_PAIR": "Generer nøgler",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Offentlig",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Gem kladde automatisk"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Gem kladde automatisk",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Hjælp til tasteturgenveje",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send meddelelse",
 		"LABEL_CLOSE_COMPOSE": "Luk forfatter mode"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Accepteret signatur for %USER\"",
-		"PGP_ERROR": "OpenPGP fejl: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Ugyldigt tegn",
 		"AUTH_ERROR": "Godkendelse fejlede",

snappymail/v/0.0.0/app/localization/de-DE/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Anhänge",
 		"MESSAGE_VIEW_DESC": "Wählen Sie eine Nachricht aus der Liste aus, um sie anzuzeigen.",
 		"MESSAGE_VIEW_MOVE_DESC": "Klicke auf den Ordnernamen auf der linken Seite, um die Nachricht zu verschieben.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP-signierte Nachricht",
-		"BUTTON_PGP_VERIFY": "klicken, um zu überprüfen",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP-verschlüsselte Nachricht",
 		"LINK_DOWNLOAD_AS_ZIP": "Als ZIP-Datei herunterladen",
 		"SPAM_SCORE": "Spam-Score",
 		"HAS_VIRUS_WARNING": "WARNUNG: Virus erkannt"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Unterschrift",
 		"LABEL_ENCRYPT": "Verschlüsselung",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP-signierte Nachricht",
+		"ENCRYPTED_MESSAGE": "OpenPGP-verschlüsselte Nachricht",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Gültige Unterschrift von %USER%",
+		"ERROR": "OpenPGP-Fehler: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Filter erstellen?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Aktualisiere Kontenliste",
 		"DEFAULT_IDENTITY_LABEL": "Standard"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Schlüssel importieren",
 		"BUTTON_GENERATE_KEY_PAIR": "Schlüssel generieren",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Öffentlich",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Tastaturkürzel-Hilfe",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Nachricht senden",
 		"LABEL_CLOSE_COMPOSE": "Popup schließen"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Gültige Unterschrift von %USER%",
-		"PGP_ERROR": "OpenPGP-Fehler: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Ungültiger Token",
 		"AUTH_ERROR": "Authentifizierung fehlgeschlagen",

snappymail/v/0.0.0/app/localization/el-GR/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Συνημμένα",
 		"MESSAGE_VIEW_DESC": "Επιλέξτε ένα μήνυμα από τη λίστα για να εμφανιστεί εδώ.",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "Μήνυμα υπογεγραμμένο με OpenPGP",
-		"BUTTON_PGP_VERIFY": "κάντε κλικ για έλεγχο",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Μήνυμα κωδικοποιημένο με OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Μεταφόρτωση σαν zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Υπογραφή",
 		"LABEL_ENCRYPT": "Κρυπτογράφηση",
-		"BUTTON_DECRYPT": "Αποκρυπτογράφηση"
+		"BUTTON_DECRYPT": "Αποκρυπτογράφηση",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Μήνυμα υπογεγραμμένο με OpenPGP",
+		"ENCRYPTED_MESSAGE": "Μήνυμα κωδικοποιημένο με OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "OpenPGP error: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Δημιουργία φίλτρου;",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Updating...",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Keyboard shortcuts help",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send message",
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"PGP_ERROR": "OpenPGP error: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Invalid token",
 		"AUTH_ERROR": "Authentication failed",

snappymail/v/0.0.0/app/localization/en/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Attachments",
 		"MESSAGE_VIEW_DESC": "Select any message in the list to view it here.",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message",
-		"BUTTON_PGP_VERIFY": "click to verify",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Sign",
 		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP signed message",
+		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "OpenPGP error: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Create a filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Updating...",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Key Pair",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Keyboard shortcuts help",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send message",
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"PGP_ERROR": "OpenPGP error: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Invalid token",
 		"AUTH_ERROR": "Authentication failed",

snappymail/v/0.0.0/app/localization/es-ES/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Adjuntos",
 		"MESSAGE_VIEW_DESC": "Seleccione un mensaje de la lista para verlo aquí.",
 		"MESSAGE_VIEW_MOVE_DESC": "Haga clic en el nombre de la carpeta del panel izquierdo para seleccionar el destino.",
-		"PGP_SIGNED_MESSAGE_DESC": "Mensaje firmado mediante OpenPGP",
-		"BUTTON_PGP_VERIFY": "click para verificar",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Mensaje cifrado mediante OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Descargar todo (archivo ZIP)",
 		"SPAM_SCORE": "Puntuación de spam",
 		"HAS_VIRUS_WARNING": "ADVERTENCIA: virus detectado"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Firmar",
 		"LABEL_ENCRYPT": "Encriptar",
-		"BUTTON_DECRYPT": "Descifrar"
+		"BUTTON_DECRYPT": "Descifrar",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Mensaje firmado mediante OpenPGP",
+		"ENCRYPTED_MESSAGE": "Mensaje cifrado mediante OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Buena firma de %USER%",
+		"ERROR": "Error OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "¿Crear un filtro?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Actualizando lista de cuentas",
 		"DEFAULT_IDENTITY_LABEL": "predeterminado"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importar llave",
 		"BUTTON_GENERATE_KEY_PAIR": "Generar llaves",
 		"TITLE_PRIVATE": "Privado",
 		"TITLE_PUBLIC": "Público",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Ayuda de atajos de teclado",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Enviar mensaje",
 		"LABEL_CLOSE_COMPOSE": "Cerrar componer"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Buena firma de %USER%",
-		"PGP_ERROR": "Error OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Elemento no válido",
 		"AUTH_ERROR": "Autentificación fallida",

snappymail/v/0.0.0/app/localization/et-EE/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Manused",
 		"MESSAGE_VIEW_DESC": "Vali nimekirjast kiri, mida siin näidata",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP abil signeeritud kiri",
-		"BUTTON_PGP_VERIFY": "kliki verifitseerimiseks",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP abil krüpteeritud kiri",
 		"LINK_DOWNLOAD_AS_ZIP": "Laadi alla .zip failina",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Allkirjasta",
 		"LABEL_ENCRYPT": "Krüpteeri",
-		"BUTTON_DECRYPT": "Dekrüpteeri"
+		"BUTTON_DECRYPT": "Dekrüpteeri",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP abil signeeritud kiri",
+		"ENCRYPTED_MESSAGE": "OpenPGP abil krüpteeritud kiri",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Korralik signatuur kasutajalt %USER%",
+		"ERROR": "OpenPGP viga: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Filtri loomine",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Värskendan...",
 		"DEFAULT_IDENTITY_LABEL": "vaikimisi"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Impordi võti",
 		"BUTTON_GENERATE_KEY_PAIR": "Genereeri võti",
 		"TITLE_PRIVATE": "Privaatne",
 		"TITLE_PUBLIC": "Avalik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Klaviatuuri kombinatsioonide abi",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Saada kiri",
 		"LABEL_CLOSE_COMPOSE": "Sulge kirja koostamise aken"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Korralik signatuur kasutajalt %USER%",
-		"PGP_ERROR": "OpenPGP viga: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Puudulik tõend",
 		"AUTH_ERROR": "Autentimine ebaõnnestus",

snappymail/v/0.0.0/app/localization/fa-IR/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "پیوست‌ها",
 		"MESSAGE_VIEW_DESC": "پیام را در لیست جهت مشاهده انتخاب کنید",
 		"MESSAGE_VIEW_MOVE_DESC": "بر روی نام شاخه در پنل سمت راست جهت انتخاب مقصد کلیک کنید",
-		"PGP_SIGNED_MESSAGE_DESC": "پیام توسط  OpenPGP امضاء شد",
-		"BUTTON_PGP_VERIFY": "برای بررسی کلیک کنید",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "پیام توسط  OpenPGP رمزنگاری شد",
 		"LINK_DOWNLOAD_AS_ZIP": "دریافت با پسوند zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "امضاء",
 		"LABEL_ENCRYPT": "رمزنگاری",
-		"BUTTON_DECRYPT": "رمزگشایی"
+		"BUTTON_DECRYPT": "رمزگشایی",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "پیام توسط  OpenPGP امضاء شد",
+		"ENCRYPTED_MESSAGE": "پیام توسط  OpenPGP رمزنگاری شد",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "امضای صحیح از %USER%",
+		"ERROR": "خطای OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "یک فیلتر ایجاد شود؟",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "بروزرسانی...",
 		"DEFAULT_IDENTITY_LABEL": "پیش‌فرض"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "وارد کردن کلید",
 		"BUTTON_GENERATE_KEY_PAIR": "تولید کلیدهای",
 		"TITLE_PRIVATE": "خصوصی",
 		"TITLE_PUBLIC": "عمومی",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "ذخیره خودکار پیش‌نویس"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "ذخیره خودکار پیش‌نویس",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "راهنمای میانبر‌های کیبرد",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "فرستادن پیام",
 		"LABEL_CLOSE_COMPOSE": "بستن صفحه ایجاد"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "امضای صحیح از %USER%",
-		"PGP_ERROR": "خطای OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "توکن نامعتبر",
 		"AUTH_ERROR": "احراز هویت با موفقیت همراه نبود",

snappymail/v/0.0.0/app/localization/fi-FI/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Liite",
 		"MESSAGE_VIEW_DESC": "Valitse viesti listasta nähdäksesi sen tässä",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP allekirjoitettu viesti",
-		"BUTTON_PGP_VERIFY": "klikkaa verifioidaksesi",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP salattu visti",
 		"LINK_DOWNLOAD_AS_ZIP": "Lataa zip-tiedostona",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Allekirjoita",
 		"LABEL_ENCRYPT": "Salaa",
-		"BUTTON_DECRYPT": "Pura"
+		"BUTTON_DECRYPT": "Pura",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP allekirjoitettu viesti",
+		"ENCRYPTED_MESSAGE": "OpenPGP salattu visti",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Oikea allekirjoitus %USER% lle",
+		"ERROR": "OpenPGP virhe: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Luo suodatin?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Päivitetään...",
 		"DEFAULT_IDENTITY_LABEL": "oletus"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Tuo avain",
 		"BUTTON_GENERATE_KEY_PAIR": "Luo avain",
 		"TITLE_PRIVATE": "Yksityinen",
 		"TITLE_PUBLIC": "Julkinen",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Näppäimistö oikotie apu",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Lähetä viesti",
 		"LABEL_CLOSE_COMPOSE": "Sule luo viesti"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Oikea allekirjoitus %USER% lle",
-		"PGP_ERROR": "OpenPGP virhe: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Väärä suojaustunnus",
 		"AUTH_ERROR": "Tunnistusvirhe",

snappymail/v/0.0.0/app/localization/fr-FR/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Pièces jointes",
 		"MESSAGE_VIEW_DESC": "Sélectionner un message dans la liste pour l'afficher ici.",
 		"MESSAGE_VIEW_MOVE_DESC": "Cliquez sur le nom du dossier dans le panneau de gauche pour sélectionner la destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "Message signé par OpenPGP",
-		"BUTTON_PGP_VERIFY": "cliquer pour vérifier",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Message chiffré par OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Télécharger le zip",
 		"SPAM_SCORE": "Score de spam",
 		"HAS_VIRUS_WARNING": "ATTENTION : virus détecté"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Signer",
 		"LABEL_ENCRYPT": "Chiffer",
-		"BUTTON_DECRYPT": "Déchiffrer"
+		"BUTTON_DECRYPT": "Déchiffrer",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Message signé par OpenPGP",
+		"ENCRYPTED_MESSAGE": "Message chiffré par OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Signature valide pour %USER%",
+		"ERROR": "Erreur OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Créer un filtre ?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Mise à jour de la liste des comptes",
 		"DEFAULT_IDENTITY_LABEL": "défaut"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importer la clé",
 		"BUTTON_GENERATE_KEY_PAIR": "Générer les clés",
 		"TITLE_PRIVATE": "Privée",
 		"TITLE_PUBLIC": "Publique",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Brouillon sauvegardé automatiquement"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Brouillon sauvegardé automatiquement",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Aide pour les raccourcis clavier",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Envoyer le message",
 		"LABEL_CLOSE_COMPOSE": "Fermer la fenêtre d'édition"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Signature valide pour %USER%",
-		"PGP_ERROR": "Erreur OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Jeton invalide",
 		"AUTH_ERROR": "L'authentification a échoué",

snappymail/v/0.0.0/app/localization/hu-HU/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Mellékletek",
 		"MESSAGE_VIEW_DESC": "Válassz egy üzenetet a listából, hogy megjelenjen itt.",
 		"MESSAGE_VIEW_MOVE_DESC": "A cél kiválasztásához a bal oldali panelen kattints a mappa nevére.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP aláírt üzenet",
-		"BUTTON_PGP_VERIFY": "kattints az ellenőrzéshez",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP kódolt üzenet",
 		"LINK_DOWNLOAD_AS_ZIP": "Letöltés zip fájlként",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "FIGYELEM: vírust észleltünk"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Aláírás",
 		"LABEL_ENCRYPT": "Titkosítás",
-		"BUTTON_DECRYPT": "Visszafejtés"
+		"BUTTON_DECRYPT": "Visszafejtés",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP aláírt üzenet",
+		"ENCRYPTED_MESSAGE": "OpenPGP kódolt üzenet",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Jó aláírás tőle: %USER%",
+		"ERROR": "OpenPGP hiba: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Szűrő létrehozás?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Fiók lista frissítés",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Kulcs importálás",
 		"BUTTON_GENERATE_KEY_PAIR": "Kulcs generálás",
 		"TITLE_PRIVATE": "Privát",
 		"TITLE_PUBLIC": "Publikus",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Piszkozat automatikus mentése"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Piszkozat automatikus mentése",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Billentyű kombináció súgó",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Üzenet küldés",
 		"LABEL_CLOSE_COMPOSE": "Levélírás bezárása"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Jó aláírás tőle: %USER%",
-		"PGP_ERROR": "OpenPGP hiba: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Érvénytelen kulcs",
 		"AUTH_ERROR": "Érvénytelen hitelesítés",

snappymail/v/0.0.0/app/localization/id-ID/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Lampiran",
 		"MESSAGE_VIEW_DESC": "Pilih pesan pada daftar untuk menampilkannya di sini.",
 		"MESSAGE_VIEW_MOVE_DESC": "Klik pada nama folder pada panel kiri untuk memilih tujuan.",
-		"PGP_SIGNED_MESSAGE_DESC": "Pesan bertanda-tangan OpenPGP",
-		"BUTTON_PGP_VERIFY": "klik untuk verifikasi",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Pesan terenkripsi OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Unduh sebagai berkas zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Tandatangan",
 		"LABEL_ENCRYPT": "Enkripsi",
-		"BUTTON_DECRYPT": "Deskripsi"
+		"BUTTON_DECRYPT": "Deskripsi",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Pesan bertanda-tangan OpenPGP",
+		"ENCRYPTED_MESSAGE": "Pesan terenkripsi OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Tandatangan sah dari user %USER%",
+		"ERROR": "Kesalahan OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Buat filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Memperbarui...",
 		"DEFAULT_IDENTITY_LABEL": "Bawaan"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Impor kunci",
 		"BUTTON_GENERATE_KEY_PAIR": "Buat kunci",
 		"TITLE_PRIVATE": "Pribadi",
 		"TITLE_PUBLIC": "Publik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Simpan konsep otomatis"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Simpan konsep otomatis",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Bantuan pintasan keyboard",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Kirim pesan",
 		"LABEL_CLOSE_COMPOSE": "Tutup buat pesan"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Tandatangan sah dari user %USER%",
-		"PGP_ERROR": "Kesalahan OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Token tidak sah",
 		"AUTH_ERROR": "Otentikasi gagal",

snappymail/v/0.0.0/app/localization/is-IS/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Viðhengi",
 		"MESSAGE_VIEW_DESC": "Veldu skilaboð úr listanum til að skoða hér.",
 		"MESSAGE_VIEW_MOVE_DESC": "Smelltu á heiti möppu á spjaldinu til vinstri til að velja áfangastaðinn.",
-		"PGP_SIGNED_MESSAGE_DESC": "Skeyti undirritað með OpenPGP",
-		"BUTTON_PGP_VERIFY": "smelltu til að sannvotta",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Skeyti dulritað með OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Sækja sem .zip skrá",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Undirrita",
 		"LABEL_ENCRYPT": "Dulrita",
-		"BUTTON_DECRYPT": "Afkóða"
+		"BUTTON_DECRYPT": "Afkóða",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Skeyti undirritað með OpenPGP",
+		"ENCRYPTED_MESSAGE": "Skeyti dulritað með OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Gild undirritun frá %USER%",
+		"ERROR": "OpenPGP villa: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Búa til síu?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Uppfæri aðgangslista",
 		"DEFAULT_IDENTITY_LABEL": "sjálfgefið"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Flytja inn lykil",
 		"BUTTON_GENERATE_KEY_PAIR": "Búa til lykla",
 		"TITLE_PRIVATE": "Einkalykill",
 		"TITLE_PUBLIC": "Dreifilykill",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Vista drög sjálfkrafa"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Vista drög sjálfkrafa",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Hjálp fyrir flýtilykla",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Senda skilaboð",
 		"LABEL_CLOSE_COMPOSE": "Loka ritli"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Gild undirritun frá %USER%",
-		"PGP_ERROR": "OpenPGP villa: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Rangt tákn",
 		"AUTH_ERROR": "Auðkenning mistókst",

snappymail/v/0.0.0/app/localization/it-IT/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Allegati",
 		"MESSAGE_VIEW_DESC": "Seleziona un messaggio dalla lista per visualizzarlo qui",
 		"MESSAGE_VIEW_MOVE_DESC": "Clicca sul nome della cartella nel pannello sinistro per selezionare la destinazione.",
-		"PGP_SIGNED_MESSAGE_DESC": "Messaggio firmato con OpenPGP",
-		"BUTTON_PGP_VERIFY": "clicca qui per verificarlo",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Messaggio cifrato con OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Scarica come archivio ZIP",
 		"SPAM_SCORE": "Punteggio Spam",
 		"HAS_VIRUS_WARNING": "AVVISO: rilevato virus"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Firma",
 		"LABEL_ENCRYPT": "Cifra",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Messaggio firmato con OpenPGP",
+		"ENCRYPTED_MESSAGE": "Messaggio cifrato con OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Firma valida da %USER%",
+		"ERROR": "Errore di OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Creo un filtro?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Aggiornamento della lista degli account...",
 		"DEFAULT_IDENTITY_LABEL": "predefinito"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importa chiave",
 		"BUTTON_GENERATE_KEY_PAIR": "Genera chiave",
 		"TITLE_PRIVATE": "Privata",
 		"TITLE_PUBLIC": "Pubblica",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salva automaticamente la bozza"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salva automaticamente la bozza",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Aiuto sulle scorciatoie da tastiera",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Invia messaggio",
 		"LABEL_CLOSE_COMPOSE": "Chiudi finestra di scrittura"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Firma valida da %USER%",
-		"PGP_ERROR": "Errore di OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Token invalido",
 		"AUTH_ERROR": "Autenticazione fallita",

snappymail/v/0.0.0/app/localization/ja-JP/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "添付ファイル",
 		"MESSAGE_VIEW_DESC": "選択したメールがここに表示されます。",
 		"MESSAGE_VIEW_MOVE_DESC": "左側のパネルでフォルダ名をクリックして移動先を選択します。",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP 署名済みメッセージ",
-		"BUTTON_PGP_VERIFY": "クリックして検証",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP 暗号化メッセージ",
 		"LINK_DOWNLOAD_AS_ZIP": "Zip としてダウンロード",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "署名",
 		"LABEL_ENCRYPT": "暗号化",
-		"BUTTON_DECRYPT": "復号化"
+		"BUTTON_DECRYPT": "復号化",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP 署名済みメッセージ",
+		"ENCRYPTED_MESSAGE": "OpenPGP 暗号化メッセージ",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "%USER% からの正しい署名",
+		"ERROR": "OpenPGP エラー: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "フィルターを作成しますか?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "更新中",
 		"DEFAULT_IDENTITY_LABEL": "デフォルト"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "キーをインポート",
 		"BUTTON_GENERATE_KEY_PAIR": "キーを生成",
 		"TITLE_PRIVATE": "プライベート",
 		"TITLE_PUBLIC": "パブリック",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "下書きを自動的に保存する"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "下書きを自動的に保存する",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "キーボード ショートカット ヘルプ",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "メッセージを送信",
 		"LABEL_CLOSE_COMPOSE": "作成画面を閉じる"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "%USER% からの正しい署名",
-		"PGP_ERROR": "OpenPGP エラー: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "無効なトークン",
 		"AUTH_ERROR": "認証に失敗しました",

snappymail/v/0.0.0/app/localization/ko-KR/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "첨부파일",
 		"MESSAGE_VIEW_DESC": "목록에서 선택한 메시지가 여기에 표시됩니다.",
 		"MESSAGE_VIEW_MOVE_DESC": "왼쪽 패널에서 폴더명을 클릭하여 위치를 선택하세요.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP로 서명된 메세지입니다.",
-		"BUTTON_PGP_VERIFY": "인증하려면 클릭하세요",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP로 암호화된 메세지입니다.",
 		"LINK_DOWNLOAD_AS_ZIP": ".zip 파일로 다운로드",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "로그인",
 		"LABEL_ENCRYPT": "암호화",
-		"BUTTON_DECRYPT": "복호화"
+		"BUTTON_DECRYPT": "복호화",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP로 서명된 메세지입니다.",
+		"ENCRYPTED_MESSAGE": "OpenPGP로 암호화된 메세지입니다.",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "%USER%(으)로부터 수신한 양호한 서명",
+		"ERROR": "OpenPGP 오류: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "필터를 생성할까요?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "업데이트 중...",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "키 가져오기",
 		"BUTTON_GENERATE_KEY_PAIR": "키 생성",
 		"TITLE_PRIVATE": "비공개",
 		"TITLE_PUBLIC": "공개",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "작성 중인 메시지 자동 저장"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "작성 중인 메시지 자동 저장",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "키보드 바로가기 도움말",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "메시지 보내기",
 		"LABEL_CLOSE_COMPOSE": "쓰기 창 닫기"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "%USER%(으)로부터 수신한 양호한 서명",
-		"PGP_ERROR": "OpenPGP 오류: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "잘못된 토큰입니다.",
 		"AUTH_ERROR": "인증에 실패했습니다",

snappymail/v/0.0.0/app/localization/lt-LT/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Priedai",
 		"MESSAGE_VIEW_DESC": "Pasirinkite žinutę sąraše, kad matytumėte jos turinį čia.",
 		"MESSAGE_VIEW_MOVE_DESC": "Kairėje pasirinkite katalogą, į kurį norite perkelti.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP pasirašytas pranešimas",
-		"BUTTON_PGP_VERIFY": "spustelkite patikrinimui",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP šifruotas pranešimas",
 		"LINK_DOWNLOAD_AS_ZIP": "Atsisiųsti zip archyvą",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Parašas",
 		"LABEL_ENCRYPT": "Šifravimas",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP pasirašytas pranešimas",
+		"ENCRYPTED_MESSAGE": "OpenPGP šifruotas pranešimas",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Tinkamas parašas nuo %USER%",
+		"ERROR": "OpenPGP klaida: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Sukurti filtrą?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Atnaujinamas paskyrų sąrašas",
 		"DEFAULT_IDENTITY_LABEL": "numatytasis"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importuoti raktą",
 		"BUTTON_GENERATE_KEY_PAIR": "Sukurti raktus",
 		"TITLE_PRIVATE": "Privatus",
 		"TITLE_PUBLIC": "Viešas",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Sparčiųjų klavišų pagalba",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Siųsti laišką",
 		"LABEL_CLOSE_COMPOSE": "Uždaryti laišką"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Tinkamas parašas nuo %USER%",
-		"PGP_ERROR": "OpenPGP klaida: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Neteisingas raktas",
 		"AUTH_ERROR": "Autorizacija nepavyko",

snappymail/v/0.0.0/app/localization/lv-LV/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Pielikumi",
 		"MESSAGE_VIEW_DESC": "Izvēlaties ziņojumu no saraksta lai to apskatītu.",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message",
-		"BUTTON_PGP_VERIFY": "click to verify",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Sign",
 		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP signed message",
+		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "OpenPGP error: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Create a filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Atjauno kontu sarakstu",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Keyboard shortcuts help",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send message",
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"PGP_ERROR": "OpenPGP error: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Nepareizs tokens",
 		"AUTH_ERROR": "Autorizācija neizdevās",

snappymail/v/0.0.0/app/localization/nb-NO/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Vedlegg",
 		"MESSAGE_VIEW_DESC": "Trykk på en melding for å lese den",
 		"MESSAGE_VIEW_MOVE_DESC": "Trykk på mappenavn i panelet til venstre for å velge mål.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP-signert melding",
-		"BUTTON_PGP_VERIFY": "trykk for å bekrefte",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP-kryptert melding",
 		"LINK_DOWNLOAD_AS_ZIP": "Last ned som zip-fil",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Signer",
 		"LABEL_ENCRYPT": "Krypter",
-		"BUTTON_DECRYPT": "Dekrypter"
+		"BUTTON_DECRYPT": "Dekrypter",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP-signert melding",
+		"ENCRYPTED_MESSAGE": "OpenPGP-kryptert melding",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Gyldig signatur fra %USER%",
+		"ERROR": "OpenPGP-feil: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Vil du lage et filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Oppdaterer …",
 		"DEFAULT_IDENTITY_LABEL": "Standard"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importer nøkkel",
 		"BUTTON_GENERATE_KEY_PAIR": "Lag nøkler",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Offentlig",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Lagre utkast automatisk"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Lagre utkast automatisk",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Tastatursnarveier",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send melding",
 		"LABEL_CLOSE_COMPOSE": "Lukk ny melding"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Gyldig signatur fra %USER%",
-		"PGP_ERROR": "OpenPGP-feil: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Ugyldig info",
 		"AUTH_ERROR": "Autentisering mislyktes",

snappymail/v/0.0.0/app/localization/nl-NL/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Bijlagen",
 		"MESSAGE_VIEW_DESC": "Selecteer een bericht in de lijst om hier te bekijken",
 		"MESSAGE_VIEW_MOVE_DESC": "Klik op de doel map in het linker paneel.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP ondertekend bericht",
-		"BUTTON_PGP_VERIFY": "klik om te verifiëren",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP versleuteld bericht",
 		"LINK_DOWNLOAD_AS_ZIP": "Download als zip",
 		"SPAM_SCORE": "Spamscore",
 		"HAS_VIRUS_WARNING": "WAARSCHUWING: virus gedetecteerd"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Ondertekenen",
 		"LABEL_ENCRYPT": "Versleutelen",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP ondertekend bericht",
+		"ENCRYPTED_MESSAGE": "OpenPGP versleuteld bericht",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Juiste handtekening van %USER%",
+		"ERROR": "OpenPGP foutmelding: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Filter toevoegen",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Account lijst aan het bijwerken",
 		"DEFAULT_IDENTITY_LABEL": "standaard"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importeer sleutel",
 		"BUTTON_GENERATE_KEY_PAIR": "Genereer sleutels",
 		"TITLE_PRIVATE": "Privé sleutel",
 		"TITLE_PUBLIC": "Publieke sleutel",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Hulp bij toetsenbord sneltoetsen",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Bericht versturen",
 		"LABEL_CLOSE_COMPOSE": "Nieuw bericht venster sluiten"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Juiste handtekening van %USER%",
-		"PGP_ERROR": "OpenPGP foutmelding: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Ongeldige token",
 		"AUTH_ERROR": "Authenticatie mislukt",

snappymail/v/0.0.0/app/localization/pl-PL/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Załączniki",
 		"MESSAGE_VIEW_DESC": "Wybierz wiadomość do wyświetlenia.",
 		"MESSAGE_VIEW_MOVE_DESC": "Kliknij nazwę folderu w lewym panelu, aby wybrać folder docelowy.",
-		"PGP_SIGNED_MESSAGE_DESC": "Wiadomość podpisana OpenPGP",
-		"BUTTON_PGP_VERIFY": "kliknij aby zweryfikować",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Wiadomość zaszyfrowana OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Pobierz jako plik zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Podpisz",
 		"LABEL_ENCRYPT": "Zaszyfruj",
-		"BUTTON_DECRYPT": "Odszyfruj"
+		"BUTTON_DECRYPT": "Odszyfruj",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Wiadomość podpisana OpenPGP",
+		"ENCRYPTED_MESSAGE": "Wiadomość zaszyfrowana OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Poprawnie podpisana przez %USER%",
+		"ERROR": "Błąd OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Czy stworzyć filtr?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Trwa aktualizowanie listy kont",
 		"DEFAULT_IDENTITY_LABEL": "domyślna"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importuj klucz",
 		"BUTTON_GENERATE_KEY_PAIR": "Generuj klucz",
 		"TITLE_PRIVATE": "Prywatny",
 		"TITLE_PUBLIC": "Publiczny",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatycznie zapisuj szkic"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatycznie zapisuj szkic",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Pomoc dotycząca skrótów klawiaturowych",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Wyślij wiadomość",
 		"LABEL_CLOSE_COMPOSE": "Zamknij okno tworzenia wiadomości"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Poprawnie podpisana przez %USER%",
-		"PGP_ERROR": "Błąd OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Nieprawidłowy token",
 		"AUTH_ERROR": "Błąd autoryzacji",

snappymail/v/0.0.0/app/localization/pt-BR/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Anexos",
 		"MESSAGE_VIEW_DESC": "Selecione uma mensagem para visualizá-la aqui.",
 		"MESSAGE_VIEW_MOVE_DESC": "Clique no nome da pasta no painel esquerdo para selecionar o destino.",
-		"PGP_SIGNED_MESSAGE_DESC": "Mensagem assinada com OpenPGP",
-		"BUTTON_PGP_VERIFY": "clique para verificar",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Mensagem criptografada com OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Baixar como zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Assinar",
 		"LABEL_ENCRYPT": "Criptografar",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Mensagem assinada com OpenPGP",
+		"ENCRYPTED_MESSAGE": "Mensagem criptografada com OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
+		"ERROR": "Erro OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Criar um filtro?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Atualizando a lista de contas",
 		"DEFAULT_IDENTITY_LABEL": "padrão"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importa chave",
 		"BUTTON_GENERATE_KEY_PAIR": "Gerar chave",
 		"TITLE_PRIVATE": "Privado",
 		"TITLE_PUBLIC": "Público",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvar automaticamente rascunho"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvar automaticamente rascunho",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Ajuda com os atalhos de teclado",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Enviar mensagem",
 		"LABEL_CLOSE_COMPOSE": "Fechar composição"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
-		"PGP_ERROR": "Erro OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Senha inválida",
 		"AUTH_ERROR": "Falha na autenticação",

snappymail/v/0.0.0/app/localization/pt-PT/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Anexos",
 		"MESSAGE_VIEW_DESC": "Selecione uma mensagem na lista para ver o conteúdo aqui.",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "Mensagem assinada com OpenPGP",
-		"BUTTON_PGP_VERIFY": "clique para verificar",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Mensagem encriptada com OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Transferir em arquivo zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Assinar",
 		"LABEL_ENCRYPT": "Encriptar",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Mensagem assinada com OpenPGP",
+		"ENCRYPTED_MESSAGE": "Mensagem encriptada com OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
+		"ERROR": "Erro OpenPGP: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Criar um filtro?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "A atualizar...",
 		"DEFAULT_IDENTITY_LABEL": "predefinida"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importar chave",
 		"BUTTON_GENERATE_KEY_PAIR": "Gerar chaves",
 		"TITLE_PRIVATE": "Privada",
 		"TITLE_PUBLIC": "Pública",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Ajuda para atalhos de teclado",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Enviar mensagem",
 		"LABEL_CLOSE_COMPOSE": "Fechar janela de composição"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
-		"PGP_ERROR": "Erro OpenPGP: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Token inválido",
 		"AUTH_ERROR": "Falha na autenticação",

snappymail/v/0.0.0/app/localization/ro-RO/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Atașament",
 		"MESSAGE_VIEW_DESC": "Selectați un mesaj pentru a-l vizualiza.",
 		"MESSAGE_VIEW_MOVE_DESC": "Faceți clic pe numele dosarului din panoul din stânga pentru a selecta destinația.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message",
-		"BUTTON_PGP_VERIFY": "click to verify",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Sign",
 		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP signed message",
+		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "OpenPGP error: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Create a filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Actualizez lista de conturi",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvează ciorna automat"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvează ciorna automat",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Keyboard shortcuts help",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send message",
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"PGP_ERROR": "OpenPGP error: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Semn invalid",
 		"AUTH_ERROR": "Nu se poate realiza conectarea",

snappymail/v/0.0.0/app/localization/ru-RU/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Файлы",
 		"MESSAGE_VIEW_DESC": "Выберите сообщение для просмотра.",
 		"MESSAGE_VIEW_MOVE_DESC": "Выберите имя папки в левой панели, чтобы переместить сообщение.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP подписанное сообщение",
-		"BUTTON_PGP_VERIFY": "нажмите, чтобы подтвердить",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP шифрованное сообщение",
 		"LINK_DOWNLOAD_AS_ZIP": "Сохранить как zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Подпись",
 		"LABEL_ENCRYPT": "Шифрование",
-		"BUTTON_DECRYPT": "Расшифровать"
+		"BUTTON_DECRYPT": "Расшифровать",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP подписанное сообщение",
+		"ENCRYPTED_MESSAGE": "OpenPGP шифрованное сообщение",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Подтвержденная сигнатура для %USER%",
+		"ERROR": "OpenPGP ошибка: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Создать фильтр?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Обновление списка аккаунтов",
 		"DEFAULT_IDENTITY_LABEL": "основной"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Ипортировать ключ",
 		"BUTTON_GENERATE_KEY_PAIR": "Новый ключ",
 		"TITLE_PRIVATE": "Приватный",
 		"TITLE_PUBLIC": "Публичный",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматически сохранять черновик"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматически сохранять черновик",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Сочетания клавиш",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Отправить сообщение",
 		"LABEL_CLOSE_COMPOSE": "Закрыть сообщение"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Подтвержденная сигнатура для %USER%",
-		"PGP_ERROR": "OpenPGP ошибка: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Неверный токен запроса",
 		"AUTH_ERROR": "Не удалось авторизоваться",

snappymail/v/0.0.0/app/localization/sk-SK/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Prílohy",
 		"MESSAGE_VIEW_DESC": "Vyberte správu zo zoznamu pre jej zobrazenie.",
 		"MESSAGE_VIEW_MOVE_DESC": "Zvoľte cieľ kliknutím na názov priečinka v ľavom stĺpci.",
-		"PGP_SIGNED_MESSAGE_DESC": "Správa podpísaná s OpenPGP",
-		"BUTTON_PGP_VERIFY": "kliknite pre overenie",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Správa šifrovaná s OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Prevziať ako zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Sign",
 		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Správa podpísaná s OpenPGP",
+		"ENCRYPTED_MESSAGE": "Správa šifrovaná s OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "OpenPGP error: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Create a filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Aktualizácia zoznamu účtov",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložiť koncept."
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložiť koncept.",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Keyboard shortcuts help",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send message",
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"PGP_ERROR": "OpenPGP error: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Neplatný token",
 		"AUTH_ERROR": "Overenie zlyhalo",

snappymail/v/0.0.0/app/localization/sl-SI/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Priloge",
 		"MESSAGE_VIEW_DESC": "Izberite sporočilo s seznama za ogled.",
 		"MESSAGE_VIEW_MOVE_DESC": "Za izbor cilja kliknite na ime mape na levi strani.",
-		"PGP_SIGNED_MESSAGE_DESC": "Sporočilo, podpisano z OpenPGP",
-		"BUTTON_PGP_VERIFY": "kliknite za overovitev",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "Sporočilo, šifrirano z OpenPGP",
 		"LINK_DOWNLOAD_AS_ZIP": "Prenesi kot .zip datoteko",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Podpis",
 		"LABEL_ENCRYPT": "Šifriranje",
-		"BUTTON_DECRYPT": "Dešifriraj"
+		"BUTTON_DECRYPT": "Dešifriraj",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "Sporočilo, podpisano z OpenPGP",
+		"ENCRYPTED_MESSAGE": "Sporočilo, šifrirano z OpenPGP",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Dober podpis od %USER%",
+		"ERROR": "OpenPGP napaka: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Ustvarim filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Posodabljanje...",
 		"DEFAULT_IDENTITY_LABEL": "privzeto"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Uvozi ključ",
 		"BUTTON_GENERATE_KEY_PAIR": "Generiraj ključe",
 		"TITLE_PRIVATE": "Zasebni",
 		"TITLE_PUBLIC": "Javni",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Samodejno shrani osnutek"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Samodejno shrani osnutek",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Tipkovne bližnjice",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Pošlji sporočilo",
 		"LABEL_CLOSE_COMPOSE": "Zapri sestavljanje"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Dober podpis od %USER%",
-		"PGP_ERROR": "OpenPGP napaka: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Neveljaven žeton",
 		"AUTH_ERROR": "Spodletelo overjanje",

snappymail/v/0.0.0/app/localization/sv-SE/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Bilagor",
 		"MESSAGE_VIEW_DESC": "Välj meddelande i listan att visa här.",
 		"MESSAGE_VIEW_MOVE_DESC": "Klicka på mapp till vänster för att välja mål mapp.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP-signerat meddelande",
-		"BUTTON_PGP_VERIFY": "klicka för att verifiera",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP-krypterat meddelande",
 		"LINK_DOWNLOAD_AS_ZIP": "Ladda ner som ZIP-fil",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "VARNING: virus upptäckt"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Signera",
 		"LABEL_ENCRYPT": "Kryptera",
-		"BUTTON_DECRYPT": "Avkryptera"
+		"BUTTON_DECRYPT": "Avkryptera",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP-signerat meddelande",
+		"ENCRYPTED_MESSAGE": "OpenPGP-krypterat meddelande",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Godkänd signatur för %USER%",
+		"ERROR": "OpenPGP-fel: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Skapa ett filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Uppdaterar kontolista",
 		"DEFAULT_IDENTITY_LABEL": "standard"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importera nyckel",
 		"BUTTON_GENERATE_KEY_PAIR": "Skapa nycklar",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Publik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Spara utkast automatiskt"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Spara utkast automatiskt",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Tangentbordsgenvägar hjälp",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Skicka meddelande",
 		"LABEL_CLOSE_COMPOSE": "Stäng fönster"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Godkänd signatur för %USER%",
-		"PGP_ERROR": "OpenPGP-fel: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Ogiltigt tecken",
 		"AUTH_ERROR": "Autentisering misslyckades",

snappymail/v/0.0.0/app/localization/tr-TR/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Ekler",
 		"MESSAGE_VIEW_DESC": "Burada görüntülemek için listeden mesaj seçin.",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP imzalı mesaj",
-		"BUTTON_PGP_VERIFY": "onay için tıklayın",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP şifreli mesaj",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Giriş Yap",
 		"LABEL_ENCRYPT": "Şifrele",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP imzalı mesaj",
+		"ENCRYPTED_MESSAGE": "OpenPGP şifreli mesaj",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Geçerli imza %USER%",
+		"ERROR": "OpenPGP hatası: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Create a filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Hesap listesi güncelleniyor",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Key İçe Aktar",
 		"BUTTON_GENERATE_KEY_PAIR": "Key Oluştur",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Klavye kısayolları yardım",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Mesajı Gönder",
 		"LABEL_CLOSE_COMPOSE": "Oluşturulanı Kapat"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Geçerli imza %USER%",
-		"PGP_ERROR": "OpenPGP hatası: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Geçersiz token",
 		"AUTH_ERROR": "Kimlik doğrulama başarısız oldu",

snappymail/v/0.0.0/app/localization/uk-UA/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "Файли",
 		"MESSAGE_VIEW_DESC": "Виберіть повідомлення для перегляду.",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP підписане повідомлення",
-		"BUTTON_PGP_VERIFY": "натисніть, щоб підтвердити",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP шифроване повідомлення",
 		"LINK_DOWNLOAD_AS_ZIP": "Завантажити як zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Підпис",
 		"LABEL_ENCRYPT": "Шифрування",
-		"BUTTON_DECRYPT": "Дешифрувати"
+		"BUTTON_DECRYPT": "Дешифрувати",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP підписане повідомлення",
+		"ENCRYPTED_MESSAGE": "OpenPGP шифроване повідомлення",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Підтверджена сигнатура для %USER%",
+		"ERROR": "OpenPGP помилка: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Створити фільтер?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "Оновлення списку акаунтів",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Імпортувати ключ",
 		"BUTTON_GENERATE_KEY_PAIR": "Новий ключ",
 		"TITLE_PRIVATE": "Приватний",
 		"TITLE_PUBLIC": "Публічний",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Сполучення клавіш",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Надіслати повідомлення",
 		"LABEL_CLOSE_COMPOSE": "Закрити повідомлення"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Підтверджена сигнатура для %USER%",
-		"PGP_ERROR": "OpenPGP помилка: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "Невірний токен запиту",
 		"AUTH_ERROR": "Не вдалося авторизуватися",

snappymail/v/0.0.0/app/localization/zh-CN/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "附件",
 		"MESSAGE_VIEW_DESC": "在此查看列表中选中的邮件。",
 		"MESSAGE_VIEW_MOVE_DESC": "点击左侧面板的文件夹作为目的地",
-		"PGP_SIGNED_MESSAGE_DESC": "由 OpenPGP 签名",
-		"BUTTON_PGP_VERIFY": "点击验证",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "由 OpenPGP 加密",
 		"LINK_DOWNLOAD_AS_ZIP": "下载为zip压缩包",
 		"SPAM_SCORE": "垃圾邮件分数",
 		"HAS_VIRUS_WARNING": "警告：检测到病毒"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "签名",
 		"LABEL_ENCRYPT": "加密",
-		"BUTTON_DECRYPT": "解密"
+		"BUTTON_DECRYPT": "解密",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "由 OpenPGP 签名",
+		"ENCRYPTED_MESSAGE": "由 OpenPGP 加密",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "来自 %USER% 的可用签名",
+		"ERROR": "OpenPGP 错误： %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "创建筛选条件？",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "更新账户列表中",
 		"DEFAULT_IDENTITY_LABEL": "默认"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "导入 密钥",
 		"BUTTON_GENERATE_KEY_PAIR": "生成 密钥",
 		"TITLE_PRIVATE": "私有",
 		"TITLE_PUBLIC": "公开",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "自动保存草稿"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "自动保存草稿",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "快捷键说明",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "发送邮件",
 		"LABEL_CLOSE_COMPOSE": "退出新邮件"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "来自 %USER% 的可用签名",
-		"PGP_ERROR": "OpenPGP 错误： %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "无效标记",
 		"AUTH_ERROR": "认证失败",

snappymail/v/0.0.0/app/localization/zh-TW/user.json

@@ -148,9 +148,6 @@
 		"PRINT_LABEL_ATTACHMENTS": "附件",
 		"MESSAGE_VIEW_DESC": "在此查看列表中選中的郵件。",
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message",
-		"BUTTON_PGP_VERIFY": "click to verify",
-		"PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
 		"HAS_VIRUS_WARNING": "WARNING: virus detected"
@@ -262,7 +259,14 @@
 		"LABEL_KEY_TYPE": "Type",
 		"LABEL_SIGN": "Sign",
 		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt"
+		"BUTTON_DECRYPT": "Decrypt",
+		"BUTTON_VERIFY": "Verify",
+		"SIGNED_MESSAGE": "OpenPGP signed message",
+		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "OpenPGP error: %ERROR%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Create a filter?",
@@ -448,12 +452,13 @@
 		"LOADING_PROCESS": "更新帳戶列表中",
 		"DEFAULT_IDENTITY_LABEL": "default"
 	},
-	"SETTINGS_OPEN_PGP": {
+	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "導入 Key",
 		"BUTTON_GENERATE_KEY_PAIR": "生成 密鑰",
 		"TITLE_PRIVATE": "私有",
 		"TITLE_PUBLIC": "公開",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft"
+		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Keyboard shortcuts help",
@@ -494,10 +499,6 @@
 		"LABEL_SEND_MESSAGE": "Send message",
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
-	"PGP_NOTIFICATIONS": {
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"PGP_ERROR": "OpenPGP error: %ERROR%"
-	},
 	"NOTIFICATIONS": {
 		"INVALID_TOKEN": "無效標記",
 		"AUTH_ERROR": "認證失敗",

snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html

@@ -265,12 +265,12 @@
 						</div>
 
 						<div class="openpgp-control encrypted" data-bind="visible: message().pgpEncrypted() || message().isPgpEncrypted()">
-							<span data-icon="🔒" data-i18n="MESSAGE/PGP_ENCRYPTED_MESSAGE_DESC"></span>
+							<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
 							<button class="btn" data-bind="visible: pgpSupported, click: pgpDecrypt" data-i18n="OPENPGP/BUTTON_DECRYPT"></button>
 						</div>
 						<div class="openpgp-control signed" data-bind="visible: message().pgpSigned(), css: {'success': message().pgpVerified() && message().pgpVerified().success, 'error': message().pgpVerified() && !message().pgpVerified().success}">
-							<span data-icon="✍" data-i18n="MESSAGE/PGP_SIGNED_MESSAGE_DESC"></span>
+							<span data-icon="✍" data-i18n="OPENPGP/SIGNED_MESSAGE"></span>
-							<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="MESSAGE/BUTTON_PGP_VERIFY"></button>
+							<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="OPENPGP/BUTTON_VERIFY"></button>
 						</div>
 
 						<div class="bodyText" data-bind="initDom: messagesBodiesDom"></div>

snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html

@@ -8,18 +8,20 @@
 		<textarea class="inputKey input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: key" required=""></textarea>
 	</div>
 	<div class="control-group">
+<!--
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Store (encrypted) on server',
+				label: 'OPENPGP/BACKUP_ON_SERVER',
 				value: saveServer
 			}
 		}"></div>
 		<br/>
+-->
 		<div data-bind="visible: canGnuPG, component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Store on server in GnuPG',
+				label: 'OPENPGP/STORE_IN_GNUPG',
 				value: saveGnuPG
 			}
 		}"></div>

snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html

@@ -1,8 +1,8 @@
 <div class="legend">OpenPGP</div>
-<button class="btn" data-bind="click: addOpenPgpKey" data-icon="✚" data-i18n="SETTINGS_OPEN_PGP/BUTTON_IMPORT_KEY"></button>
+<button class="btn" data-bind="click: addOpenPgpKey" data-icon="✚" data-i18n="SETTINGS_OPENPGP/BUTTON_IMPORT_KEY"></button>
 <!-- ko if: canOpenPGP || canGnuPG -->
 &nbsp;&nbsp;
-<button class="btn" data-bind="click: generateOpenPgpKey" data-icon="🔑" data-i18n="SETTINGS_OPEN_PGP/BUTTON_GENERATE_KEY_PAIR"></button>
+<button class="btn" data-bind="click: generateOpenPgpKey" data-icon="🔑" data-i18n="SETTINGS_OPENPGP/BUTTON_GENERATE_KEY_PAIR"></button>
 <!-- /ko -->
 
 <br />
@@ -11,7 +11,7 @@
 	<div data-bind="component: {
 		name: 'Checkbox',
 		params: {
-			label: 'SETTINGS_OPEN_PGP/LABEL_ALLOW_DRAFT_AUTOSAVE',
+			label: 'SETTINGS_OPENPGP/LABEL_ALLOW_DRAFT_AUTOSAVE',
 			value: allowDraftAutosave
 		}
 	}"></div>
@@ -22,7 +22,7 @@
 <details>
 <summary class="legend">GnuPG</summary>
 <table class="table table-hover list-table">
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPEN_PGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
 	<tbody data-bind="foreach: gnupgPrivateKeys, i18nUpdate: gnupgPrivateKeys">
 		<tr>
 			<td data-bind="click: view">
@@ -42,7 +42,7 @@
 			</td>
 		</tr>
 	</tbody>
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPEN_PGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
 	<tbody data-bind="foreach: gnupgPublicKeys, i18nUpdate: gnupgPublicKeys">
 		<tr>
 			<td data-bind="click: view">
@@ -70,11 +70,11 @@
 <details>
 <summary class="legend">OpenPGP.js</summary>
 <table class="table table-hover list-table">
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPEN_PGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
 	<tbody data-bind="foreach: openpgpkeysPrivate, i18nUpdate: openpgpkeysPrivate">
 		<tr>
 			<td data-bind="click: view">
-				<span class="fontastic" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE">🔒</span>
+				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PRIVATE">🔒</span>
 				<span class="key-id" data-bind="text: id"></span>
 				<!-- ko foreach: emails -->
 				<span class="key-user" data-bind="text: $data"></span>
@@ -89,11 +89,11 @@
 			</td>
 		</tr>
 	</tbody>
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPEN_PGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
 	<tbody data-bind="foreach: openpgpkeysPublic, i18nUpdate: openpgpkeysPublic">
 		<tr>
 			<td data-bind="click: view">
-				<span class="fontastic" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC">🔑</span>
+				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PUBLIC">🔑</span>
 				<span class="key-id" data-bind="text: id"></span>
 				<!-- ko foreach: emails -->
 				<span class="key-user" data-bind="text: $data"></span>
@@ -112,9 +112,8 @@
 </details>
 <!-- /ko -->
 
-<!-- ko if: canMailvelope -->
 <details>
 <summary class="legend">Mailvelope</summary>
-<div id="mailvelope-settings" style="height:40em"></div>
+<a data-bind="visible: !canMailvelope" href="https://mailvelope.com/en/help" target="_blank" data-i18n="SETTINGS_OPENPGP/GET_MAILVELOPE"></a>
+<div id="mailvelope-settings" style="height:40em" data-bind="visible: canMailvelope"></div>
 </details>
-<!-- /ko -->