diff --git a/dev/Common/Links.js b/dev/Common/Links.js index 8ed3a9da7..82ea80755 100644 --- a/dev/Common/Links.js +++ b/dev/Common/Links.js @@ -67,16 +67,6 @@ export const */ staticLink = path => VERSION_PREFIX + 'static/' + path, - /** - * @returns {string} - */ - openPgpJs = () => staticLink('js/min/openpgp.min.js'), - - /** - * @returns {string} - */ - openPgpWorkerJs = () => staticLink('js/min/openpgp.worker.min.js'), - /** * @param {string} theme * @returns {string} diff --git a/dev/Model/Message.js b/dev/Model/Message.js index f9e92f29f..c17cd24bb 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -102,6 +102,7 @@ export class MessageModel extends AbstractModel { hasExternals: false, pgpSigned: null, + pgpEncrypted: null, isPgpEncrypted: false, pgpSignedVerifyStatus: SignedVerifyStatus.None, pgpSignedVerifyUser: '', @@ -181,6 +182,7 @@ export class MessageModel extends AbstractModel { this.attachments(new AttachmentCollectionModel); this.pgpSigned(null); + this.pgpEncrypted(null); this.isPgpEncrypted(false); this.pgpSignedVerifyStatus(SignedVerifyStatus.None); this.pgpSignedVerifyUser(''); diff --git a/dev/Settings/User/OpenPgp.js b/dev/Settings/User/OpenPgp.js index 9967b6b9e..1685ca8d6 100644 --- a/dev/Settings/User/OpenPgp.js +++ b/dev/Settings/User/OpenPgp.js @@ -7,8 +7,8 @@ import Remote from 'Remote/User/Fetch'; import { showScreenPopup } from 'Knoin/Knoin'; -import { AddOpenPgpKeyPopupView } from 'View/Popup/AddOpenPgpKey'; -import { NewOpenPgpKeyPopupView } from 'View/Popup/NewOpenPgpKey'; +import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport'; +import { OpenPgpGeneratePopupView } from 'View/Popup/OpenPgpGenerate'; import { ViewOpenPgpKeyPopupView } from 'View/Popup/ViewOpenPgpKey'; import { Capa } from 'Common/Enums'; @@ -22,9 +22,7 @@ export class OpenPgpUserSettings /*extends AbstractViewSettings*/ { this.openpgpkeysPrivate = PgpUserStore.openpgpPrivateKeys; this.openPgpKeyForDeletion = ko.observable(null).deleteAccessHelper(); -// this.canOpenPGP = !!PgpUserStore.openpgpKeyring; this.canOpenPGP = Settings.capa(Capa.OpenPGP); -// this.canGnuPG = !!PgpUserStore.gnupgKeyring; this.canGnuPG = Settings.capa(Capa.GnuPG); this.canMailvelope = !!window.mailvelope; @@ -34,11 +32,11 @@ export class OpenPgpUserSettings /*extends AbstractViewSettings*/ { } addOpenPgpKey() { - showScreenPopup(AddOpenPgpKeyPopupView); + showScreenPopup(OpenPgpImportPopupView); } generateOpenPgpKey() { - showScreenPopup(NewOpenPgpKeyPopupView); + showScreenPopup(OpenPgpGeneratePopupView); } viewOpenPgpKey(openPgpKey) { diff --git a/dev/Stores/User/Pgp.js b/dev/Stores/User/Pgp.js index b4876cf23..c5dccf570 100644 --- a/dev/Stores/User/Pgp.js +++ b/dev/Stores/User/Pgp.js @@ -2,16 +2,16 @@ import ko from 'ko'; import { Capa } from 'Common/Enums'; import { doc, createElement, Settings } from 'Common/Globals'; -import { openPgpJs, openPgpWorkerJs } from 'Common/Links'; +import { staticLink } from 'Common/Links'; import { isArray, arrayLength } from 'Common/Utils'; import { delegateRunOnDestroy } from 'Common/UtilsUser'; -import { showScreenPopup } from 'Knoin/Knoin'; +//import { showScreenPopup } from 'Knoin/Knoin'; -import { MessageOpenPgpPopupView } from 'View/Popup/MessageOpenPgp'; +//import { MessageOpenPgpPopupView } from 'View/Popup/MessageOpenPgp'; -import { EmailModel } from 'Model/Email'; -import { OpenPgpKeyModel } from 'Model/OpenPgpKey'; +//import { EmailModel } from 'Model/Email'; +//import { OpenPgpKeyModel } from 'Model/OpenPgpKey'; import Remote from 'Remote/User/Fetch'; @@ -19,6 +19,60 @@ const findKeyByHex = (keys, hash) => keys.find(item => item && (hash === item.id || item.ids.includes(hash))); +/** + * OpenPGP.js v5 removed the localStorage (keyring) + * This should be compatible with the old OpenPGP.js v2 + */ +const + publicKeysItem = 'openpgp-public-keys', + privateKeysItem = 'openpgp-private-keys', + storage = window.localStorage, + loadOpenPgpKeys = async itemname => { + let keys = [], key, + armoredKeys = JSON.parse(storage.getItem(itemname)), + i = arrayLength(armoredKeys); + if (i) { + while (i--) { + key = await openpgp.readKey({armoredKey:armoredKeys[i]}); + if (!key.err) { + const aEmails = []; + if (key.users) { + key.users.forEach(user => { + if (user.userID.email) { + aEmails.push(user.userID.email); + } + }); + } + keys.push({ + id: key.getKeyID().toHex(), + fingerprint: key.getFingerprint(), + can_encrypt: !!key.getEncryptionKey(), + can_sign: !!key.getSigningKey(), + emails: aEmails, + armor: armoredKeys[i], + deleteAccess: ko.observable(false) + }); +// key.getUserIDs() +// key.getPrimaryUser() + } + } + } + return keys; +/* + }, + storeKeys = async (itemname, keys) => { + let armoredKeys = [], i = arrayLength(keys); + if (i) { + while (i--) { + armoredKeys.push(await keys[i].armor()); + } + storage.setItem(itemname, JSON.stringify(armoredKeys)); + } else { + storage.removeItem(itemname); + } +*/ + }; + export const PgpUserStore = new class { constructor() { /** @@ -29,7 +83,6 @@ export const PgpUserStore = new class { this.gnupgKeys = ko.observableArray(); // OpenPGP.js - this.openpgpKeyring = null; this.openpgpPublicKeys = ko.observableArray(); this.openpgpPrivateKeys = ko.observableArray(); @@ -39,21 +92,12 @@ export const PgpUserStore = new class { init() { if (Settings.capa(Capa.OpenPGP) && window.crypto && crypto.getRandomValues) { - const script = createElement('script', {src:openPgpJs()}); - script.onload = () => { - if (window.Worker) { - try { - openpgp.initWorker({ path: openPgpWorkerJs() }); - } catch (e) { - console.error(e); - } - } - this.loadKeyrings(); - }; + const script = createElement('script', {src:staticLink('js/min/openpgp.min.js')}); + script.onload = () => this.loadKeyrings(); script.onerror = () => { this.loadKeyrings(); console.error(script.src); - } + }; doc.head.append(script); } else { this.loadKeyrings(); @@ -82,8 +126,14 @@ export const PgpUserStore = new class { } if (openpgp) { - this.openpgpKeyring = new openpgp.Keyring(); - this.reloadOpenPgpKeys(); + loadOpenPgpKeys(publicKeysItem).then(keys => { + this.openpgpPublicKeys(keys || []); + console.log('openpgp.js public keys loaded'); + }); + loadOpenPgpKeys(privateKeysItem).then(keys => { + this.openpgpPrivateKeys(keys || []) + console.log('openpgp.js private keys loaded'); + }); } if (Settings.capa(Capa.GnuPG)) { @@ -101,69 +151,6 @@ export const PgpUserStore = new class { } } - reloadOpenPgpKeys() { - if (this.openpgpKeyring) { - const publicKeys = [], - privateKeys = [], - email = new EmailModel(); - - this.openpgpKeyring.getAllKeys().forEach(oItem => { - if (oItem && oItem.primaryKey) { - const aEmails = [], - aUsers = [], - primaryUser = oItem.getPrimaryUser(), - user = - primaryUser && primaryUser.user - ? primaryUser.user.userId.userid - : oItem.users && oItem.users[0] - ? oItem.users[0].userId.userid - : ''; - - if (oItem.users) { - oItem.users.forEach(item => { - if (item.userId) { - email.clear(); - email.parse(item.userId.userid); - if (email.validate()) { - aEmails.push(email.email); - aUsers.push(item.userId.userid); - } - } - }); - } - - if (aEmails.length) { - (oItem.isPrivate() ? privateKeys : publicKeys).push( - new OpenPgpKeyModel( - oItem.primaryKey.getFingerprint(), - oItem.primaryKey - .getKeyId() - .toHex() - .toLowerCase(), - oItem.getKeyIds() - .map(item => (item && item.toHex ? item.toHex() : null)) - .validUnique(), - aUsers, - aEmails, - oItem.isPrivate(), - oItem.armor(), - user - ) - ); - } - } - }); - - delegateRunOnDestroy(this.openpgpPublicKeys()); - this.openpgpPublicKeys(publicKeys); - - delegateRunOnDestroy(this.openpgpPrivateKeys()); - this.openpgpPrivateKeys(privateKeys); - - console.log('openpgp.js ready'); - } - } - /** * @returns {boolean} */ @@ -186,6 +173,29 @@ export const PgpUserStore = new class { } } + /** + keyPair.privateKey + keyPair.publicKey + keyPair.revocationCertificate + keyPair.onServer + keyPair.inGnuPG + keyPair.uid.name + keyPair.uid.email + */ + storeKeyPair(keyPair, callback) { +// if (Settings.capa(Capa.GnuPG)) { + Remote.request('PgpStoreKeyPair', + (iError, oData) => { + if (oData && oData.Result) { +// this.gnupgKeyring = oData.Result; + } + callback && callback(iError, oData); + }, keyPair + ); +// storeKeys(publicKeysItem); +// storeKeys(privateKeysItem); + } + /** * Checks if verifying/encrypting a message is possible with given email addresses. * Returns the first library that can. @@ -199,8 +209,8 @@ export const PgpUserStore = new class { return 'gnupg'; } - length = this.openpgpKeyring && recipients.filter(email => - this.openpgpKeyring.publicKeys.getForAddress(email).length + length = recipients.filter(email => + this.openpgpPublicKeys().find(key => key.emails.includes(email)) ).length; if (openpgp && (!all || openpgp === count)) { return 'openpgp'; @@ -218,19 +228,29 @@ export const PgpUserStore = new class { return false; } + getGnuPGPrivateKeyFor(email, sign) { + let key = this.gnupgKeyring && this.gnupgKeyring[email]; + if (key && key[sign?'can_sign':'can_decrypt']) { + return ['gnupg', key]; + } + } + + getOpenPGPPrivateKeyFor(email/*, sign*/) { + let key = this.openpgpPrivateKeys().find(key => key.emails.includes(email)); + if (key && key.length) { + return ['openpgp', key[0]]; + } + } + + getOpenPGPPublicKeyFor(email/*, sign*/) { + return this.gnupgKeyring && this.openpgpKeyring.publicKeys.getForAddress(email); + } + /** * Checks if signing a message is possible with given email address. * Returns the first library that can. */ - async hasPrivateKeyFor(email, sign) { - if (this.gnupgKeyring && this.gnupgKeyring[email] && this.gnupgKeyring[email][sign?'can_sign':'can_decrypt']) { - return 'gnupg'; - } - - if (this.openpgpKeyring && this.openpgpKeyring.privateKeys.getForAddress(email).length) { - return 'openpgp'; - } - + async getMailvelopePrivateKeyFor(email/*, sign*/) { let keyring = this.mailvelopeKeyring; if (keyring) { /** @@ -238,7 +258,7 @@ export const PgpUserStore = new class { */ let keys = await keyring.validKeyForAddress([email]); if (keys && keys[email] && await keyring.hasPrivateKey(keys[email].keys[0].fingerprint)) { - return 'mailvelope'; + return ['mailvelope', keys[email].keys[0].fingerprint]; } } @@ -249,16 +269,20 @@ export const PgpUserStore = new class { * Checks if signing a message is possible with given email address. * Returns the first library that can. */ - async hasKeyForSigning(email) { - return await this.hasPrivateKeyFor(email, 1); + async getKeyForSigning(email) { + return this.getGnuPGPrivateKeyFor(email, 1) + || this.getOpenPGPPrivateKeyFor(email, 1) + || await this.getMailvelopePrivateKeyFor(email, 1); } /** * Checks if decrypting a message is possible with given email address. * Returns the first library that can. */ - async hasKeyForDecrypting(email) { - return await this.hasPrivateKeyFor(email, 0); + async getKeyForDecrypting(email) { + return await this.getMailvelopePrivateKeyFor(email) + || this.getGnuPGPrivateKeyFor(email) + || this.getOpenPGPPrivateKeyFor(email); } /** @@ -289,10 +313,10 @@ export const PgpUserStore = new class { if (items[0] || items[1]) { openpgpKeyring.store(); } -// this.reloadOpenPgpKeys(); } } +/* decryptMessage(message, recipients, fCallback) { if (message && message.getEncryptionKeyIds) { // findPrivateKeysByEncryptionKeyIds @@ -352,6 +376,7 @@ export const PgpUserStore = new class { return false; } +*/ verifyMessage(message, fCallback) { if (message && message.getSigningKeyIds) { diff --git a/dev/Styles/User/OpenPgpKey.less b/dev/Styles/User/OpenPgpKey.less index 6d1e39373..8e5970dc5 100644 --- a/dev/Styles/User/OpenPgpKey.less +++ b/dev/Styles/User/OpenPgpKey.less @@ -1,4 +1,4 @@ -#V-PopupsViewOpenPgpKey, #V-PopupsNewOpenPgpKey { +#V-PopupsViewOpenPgpKey, #V-PopupsOpenPgpGenerate { max-width: 570px; } @@ -9,124 +9,7 @@ } } -#V-PopupsComposeOpenPgp { - max-width: 800px; - - .key-list { - - background-color: #f9f9f9; - border-radius: 5px; - padding: 10px 15px; - - &-wrp { - - &:hover { - overflow: auto; - } - - &:hover .key-list__item-name { - overflow: visible; - } - - &.empty { - text-align: center; - padding-top: 10px; - color: #aaa; - font-size: 16px; - } - } - - &__item { - - color: #333; - white-space: nowrap; - padding-bottom: 4px; - display: flex; - - &:last-child { - padding-bottom: 0; - } - - &-delete { - cursor: pointer; - - &.disabled { - cursor: not-allowed; - } - } - - &-names { - color: #333; - width: 80%; - - &.empty { - color: red; - } - } - - &-name { - overflow: hidden; - text-overflow: ellipsis; - } - - &-error { - color: red; - width: 80%; - } - - &-hash { - color: #aaa; - width: 20%; - } - } - } - - .key-actions { - margin-top: 10px; - min-height: 40px; - - select option:nth-child(even) { - background-color: rgba(128, 128, 128, 0.1); - } - } -} - -#V-PopupsMessageOpenPgp { - max-width: 700px; - - .key-list { - - margin-top: 5px; - overflow: hidden; - - &__item { - - color: #555; - cursor: pointer; - text-overflow: ellipsis; - white-space: nowrap; - - &__radio { - padding: 3px 5px 0 0; - vertical-align: top; - } - - &__name { - border-bottom: 1px solid transparent; - } - - &__names { - display: inline-block; - - &:hover .key-list__item__name { - border-bottom: 1px dashed #555; - } - } - } - } -} - -#V-PopupsAddOpenPgpKey { +#V-PopupsOpenPgpImport { max-width: 645px; .inputKey { diff --git a/dev/Styles/User/SettingsOpenPGP.less b/dev/Styles/User/SettingsOpenPGP.less index 86534d410..57697082e 100644 --- a/dev/Styles/User/SettingsOpenPGP.less +++ b/dev/Styles/User/SettingsOpenPGP.less @@ -1,40 +1,18 @@ -V-Settings-OpenPgp { +#V-Settings-OpenPgp { + td * { + cursor: pointer; + } td + td { width: 1%; } - table { - - .open-pgp-key-img { - margin-right: 10px; - vertical-align: top; - } - - .open-pgp-key-id, .open-pgp-key-user { - display: inline-block; - word-break: break-all; - box-sizing: border-box; - line-height: 22px; - cursor: default; - } - - .open-pgp-key-user-address:first-child { - line-height: 30px; - margin-bottom: -4px; - } + .open-pgp-key-user { + white-space: nowrap; } - .open-pgp-key-item { - - .delete-open-pgp-key, .view-open-pgp-key { - cursor: pointer; - opacity: 0.7; - - &:hover { - opacity: 0.9; - } - } + .delete-open-pgp-key:not(:hover) { + opacity: 0.7; } } diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 032a48c90..4e4eb3257 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -279,9 +279,9 @@ class ComposePopupView extends AbstractViewPopup { currentIdentity: value => { this.canPgpSign(false); - value && PgpUserStore.hasKeyForSigning(value.email()).then(result => { + value && PgpUserStore.getKeyForSigning(value.email()).then(result => { console.log({canPgpSign:result}); - this.canPgpSign(result) + this.canPgpSign(!!result) }); }, @@ -458,11 +458,10 @@ class ComposePopupView extends AbstractViewPopup { if ('openpgp' == sign) { let privateKey; try { - const keys = PgpUserStore.openpgpKeyring.privateKeys.getForAddress(this.currentIdentity().email()); + const keys = PgpUserStore.getOpenPGPPrivateKeyFor(this.currentIdentity().email()); if (keys[0]) { keys[0].decrypt(window.prompt('Password', '')); - privateKey = keys[0]; - cfg.privateKeys = [privateKey]; + cfg.privateKey = privateKey = keys[0]; } } catch (e) { console.error(e); @@ -478,7 +477,7 @@ class ComposePopupView extends AbstractViewPopup { // error 'sign and encrypt must be same engine'; } else if ('openpgp' == encrypt) { this.allRecipients().forEach(recEmail => { - cfg.publicKeys = cfg.publicKeys.concat(PgpUserStore.openpgpKeyring.publicKeys.getForAddress(recEmail)); + cfg.publicKeys = cfg.publicKeys.concat(PgpUserStore.getOpenPGPPublicKeyFor(recEmail)); }); pgpPromise = openpgp.encrypt(cfg); } else if ('openpgp' == sign) { @@ -1502,7 +1501,8 @@ class ComposePopupView extends AbstractViewPopup { allRecipients() { const email = new EmailModel(); return [ -// this.currentIdentity.email(), + // From/sender is also recipient (Sent mailbox) + this.currentIdentity().email(), this.to(), this.cc(), this.bcc() diff --git a/dev/View/Popup/MessageOpenPgp.js b/dev/View/Popup/MessageOpenPgp.js deleted file mode 100644 index 0f32e1228..000000000 --- a/dev/View/Popup/MessageOpenPgp.js +++ /dev/null @@ -1,121 +0,0 @@ -import ko from 'ko'; - -import { pString } from 'Common/Utils'; -import { Scope } from 'Common/Enums'; - -import { decorateKoCommands } from 'Knoin/Knoin'; -import { AbstractViewPopup } from 'Knoin/AbstractViews'; - -class MessageOpenPgpPopupView extends AbstractViewPopup { - constructor() { - super('MessageOpenPgp'); - - this.addObservables({ - notification: '', - selectedKey: null, - password: '', - submitRequest: false - }); - this.privateKeys = ko.observableArray(); - - this.resultCallback = null; - - decorateKoCommands(this, { - doCommand: self => !self.submitRequest() - }); - } - - doCommand() { - this.submitRequest(true); - - setTimeout(() => { - let privateKey = null; - - try { - if (this.resultCallback && this.selectedKey()) { - const privateKeys = this.selectedKey().getNativeKeys(); - privateKey = privateKeys && privateKeys[0] ? privateKeys[0] : null; - - if (privateKey) { - try { - if (!privateKey.decrypt(pString(this.password()))) { - console.log('Error: Private key cannot be decrypted'); - privateKey = null; - } - } catch (e) { - console.log(e); - privateKey = null; - } - } else { - console.log('Error: Private key cannot be found'); - } - } - } catch (e) { - console.log(e); - privateKey = null; - } - - this.submitRequest(false); - - this.cancelCommand(); - this.resultCallback(privateKey); - }, 100); - } - - clearPopup() { - this.notification(''); - - this.password(''); - - this.selectedKey(false); - this.submitRequest(false); - - this.resultCallback = null; - this.privateKeys([]); - } - - onBuild(oDom) { -// shortcuts.add('tab', 'shift', Scope.MessageOpenPgp, () => { - shortcuts.add('tab', '', Scope.MessageOpenPgp, () => { - let btn = this.querySelector('.inputPassword'); - if (btn.matches(':focus')) { - btn = this.querySelector('.buttonDo'); - } - btn.focus(); - return false; - }); - - const self = this; - - oDom.addEventListener('click', event => { - const el = event.target.closestWithin('.key-list__item', oDom); - if (el) { - oDom.querySelectorAll('.key-list__item .key-list__item__radio').forEach(node => - node.textContent = el === node ? '⦿' : '○' - ); - - self.selectedKey(ko.dataFor(el)); - -// this.querySelector('.inputPassword').focus(); - } - }); - } - - onHideWithDelay() { - this.clearPopup(); - } - - onShow(fCallback, privateKeys) { - this.clearPopup(); - - this.resultCallback = fCallback; - this.privateKeys(privateKeys); - - if (this.viewModelDom) { - const el = this.querySelector('.key-list__item'); - el && el.click(); - } - } -} - -export { MessageOpenPgpPopupView, MessageOpenPgpPopupView as default }; diff --git a/dev/View/Popup/NewOpenPgpKey.js b/dev/View/Popup/NewOpenPgpKey.js deleted file mode 100644 index 673bfc9f8..000000000 --- a/dev/View/Popup/NewOpenPgpKey.js +++ /dev/null @@ -1,105 +0,0 @@ -import { pInt } from 'Common/Utils'; - -import { PgpUserStore } from 'Stores/User/Pgp'; -import { IdentityUserStore } from 'Stores/User/Identity'; - -import { decorateKoCommands } from 'Knoin/Knoin'; -import { AbstractViewPopup } from 'Knoin/AbstractViews'; - -class NewOpenPgpKeyPopupView extends AbstractViewPopup { - constructor() { - super('NewOpenPgpKey'); - - this.identities = IdentityUserStore; - - this.addObservables({ - email: '', - emailError: false, - - name: '', - password: '', - keyBitLength: 4096, - - submitRequest: false, - submitError: '' - }); - - this.email.subscribe(() => this.emailError(false)); - - decorateKoCommands(this, { - generateOpenPgpKeyCommand: 1 - }); - } - - generateOpenPgpKeyCommand() { - const userId = {}, - openpgpKeyring = PgpUserStore.openpgpKeyring; - - this.emailError(!this.email().trim()); - if (!openpgpKeyring || this.emailError()) { - return false; - } - - userId.email = this.email(); - if (this.name()) { - userId.name = this.name(); - } - - this.submitRequest(true); - this.submitError(''); - - setTimeout(() => { - try { - openpgp - .generateKey({ - userIds: [userId], - numBits: pInt(this.keyBitLength()), - passphrase: this.password().trim() - }) - .then((keyPair) => { - this.submitRequest(false); - - if (keyPair && keyPair.privateKeyArmored) { - openpgpKeyring.privateKeys.importKey(keyPair.privateKeyArmored); - openpgpKeyring.publicKeys.importKey(keyPair.publicKeyArmored); - - openpgpKeyring.store(); - - PgpUserStore.reloadOpenPgpKeys(); - - PgpUserStore.gnupgImportKey(keyPair.privateKeyArmored); - - this.cancelCommand(); - } - }) - .catch((e) => { - this.submitRequest(false); - this.showError(e); - }); - } catch (e) { - this.submitRequest(false); - this.showError(e); - } - }, 100); - - return true; - } - - showError(e) { - console.log(e); - if (e && e.message) { - this.submitError(e.message); - } - } - - onShow() { - this.name(IdentityUserStore()[0].name()); - this.password(''); - this.email(IdentityUserStore()[0].email()); - this.emailError(false); - this.keyBitLength(4096); - this.submitError(''); - } -} - -export { NewOpenPgpKeyPopupView, NewOpenPgpKeyPopupView as default }; diff --git a/dev/View/Popup/OpenPgpGenerate.js b/dev/View/Popup/OpenPgpGenerate.js new file mode 100644 index 000000000..5cacc0050 --- /dev/null +++ b/dev/View/Popup/OpenPgpGenerate.js @@ -0,0 +1,102 @@ +//import { pInt } from 'Common/Utils'; + +import { PgpUserStore } from 'Stores/User/Pgp'; +import { IdentityUserStore } from 'Stores/User/Identity'; + +import { decorateKoCommands } from 'Knoin/Knoin'; +import { AbstractViewPopup } from 'Knoin/AbstractViews'; + +import { Capa } from 'Common/Enums'; +import { Settings } from 'Common/Globals'; + +export class OpenPgpGeneratePopupView extends AbstractViewPopup { + constructor() { + super('OpenPgpGenerate'); + + this.identities = IdentityUserStore; + + this.addObservables({ + email: '', + emailError: false, + + name: '', + password: '', + keyType: 'ECC', + + submitRequest: false, + submitError: '', + + saveGnuPG: true, + saveServer: true + }); + + this.canGnuPG = Settings.capa(Capa.GnuPG); + + this.email.subscribe(() => this.emailError(false)); + + decorateKoCommands(this, { + generateOpenPgpKeyCommand: 1 + }); + } + + generateOpenPgpKeyCommand() { + const type = this.keyType().toLowerCase(), + userId = { + name: this.name(), + email: this.email() + }, + cfg = { + type: type, + userIDs: [userId], + passphrase: this.password().trim() +// format: 'armored' // output key format, defaults to 'armored' (other options: 'binary' or 'object') + } +/* + if ('ecc' === type) { + cfg.curve = 'curve25519'; + } else { + cfg.rsaBits = pInt(this.keyBitLength()); + } +*/ + this.emailError(!this.email().trim()); + if (this.emailError()) { + return false; + } + + this.submitRequest(true); + this.submitError(''); + + openpgp.generateKey(cfg).then(keyPair => { + if (keyPair) { + keyPair.onServer = !!this.saveServer(); + keyPair.inGnuPG = !!this.saveGnuPG(); + keyPair.uid = userId; + PgpUserStore.storeKeyPair(keyPair, ()=>{ + this.submitRequest(false); + this.cancelCommand(); + }); + } + }) + .catch((e) => { + this.submitRequest(false); + this.showError(e); + }); + + return true; + } + + showError(e) { + console.log(e); + if (e && e.message) { + this.submitError(e.message); + } + } + + onShow() { + this.name(''/*IdentityUserStore()[0].name()*/); + this.password(''); + this.email(''/*IdentityUserStore()[0].email()*/); + this.emailError(false); + this.submitError(''); + } +} diff --git a/dev/View/Popup/AddOpenPgpKey.js b/dev/View/Popup/OpenPgpImport.js similarity index 78% rename from dev/View/Popup/AddOpenPgpKey.js rename to dev/View/Popup/OpenPgpImport.js index a7345bc94..55f886782 100644 --- a/dev/View/Popup/AddOpenPgpKey.js +++ b/dev/View/Popup/OpenPgpImport.js @@ -6,9 +6,9 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews'; import { Capa } from 'Common/Enums'; import { Settings } from 'Common/Globals'; -class AddOpenPgpKeyPopupView extends AbstractViewPopup { +export class OpenPgpImportPopupView extends AbstractViewPopup { constructor() { - super('AddOpenPgpKey'); + super('OpenPgpImport'); this.addObservables({ key: '', @@ -16,11 +16,10 @@ class AddOpenPgpKeyPopupView extends AbstractViewPopup { keyErrorMessage: '', saveGnuPG: true, - saveOpenPGP: true + saveServer: true }); this.canGnuPG = Settings.capa(Capa.GnuPG); - this.canOpenPGP = Settings.capa(Capa.OpenPGP); this.key.subscribe(() => { this.keyError(false); @@ -50,8 +49,7 @@ class AddOpenPgpKeyPopupView extends AbstractViewPopup { count = 30, done = false; // eslint-disable-next-line max-len - const reg = /[-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}[\s\S]+?[-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}/gi, - keyring = PgpUserStore.openpgpKeyring; + const reg = /[-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}[\s\S]+?[-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}/gi; do { match = reg.exec(keyTrimmed); @@ -61,14 +59,15 @@ class AddOpenPgpKeyPopupView extends AbstractViewPopup { if (this.saveGnuPG()) { PgpUserStore.gnupgImportKey(this.key()); } +/* if (this.canOpenPGP && this.saveOpenPGP()) { if ('PRIVATE' === match[1]) { - err = keyring.privateKeys.importKey(match[0]); + err = PgpUserStore.openpgpKeyring.privateKeys.importKey(match[0]); } else if ('PUBLIC' === match[1]) { - err = keyring.publicKeys.importKey(match[0]); + err = PgpUserStore.openpgpKeyring.publicKeys.importKey(match[0]); } } - +*/ if (err) { this.keyError(true); this.keyErrorMessage(err && err[0] ? '' + err[0] : ''); @@ -83,12 +82,6 @@ class AddOpenPgpKeyPopupView extends AbstractViewPopup { } } while (!done); - if (this.canOpenPGP && this.saveOpenPGP()) { - keyring.store(); - } - -// PgpUserStore.reloadOpenPgpKeys(); - if (this.keyError()) { return false; } @@ -103,5 +96,3 @@ class AddOpenPgpKeyPopupView extends AbstractViewPopup { this.keyErrorMessage(''); } } - -export { AddOpenPgpKeyPopupView, AddOpenPgpKeyPopupView as default }; diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 99474bb3f..2a8832c78 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -182,7 +182,7 @@ export class MailMessageView extends AbstractViewRight { pgpSigned: () => currentMessage() && !!currentMessage().pgpSigned(), pgpEncrypted: () => currentMessage() - && currentMessage().isPgpEncrypted(), + && !!(currentMessage().pgpEncrypted() || currentMessage().isPgpEncrypted()), pgpSupported: () => currentMessage() && PgpUserStore.isSupported(), messageListOrViewLoading: @@ -625,7 +625,8 @@ export class MailMessageView extends AbstractViewRight { } pgpDecrypt(self) { - if (self.pgpEncrypted()) { + const pgpInfo = self.pgpEncrypted(); + if (pgpInfo) { const message = self.message(); if (window.mailvelope) { /** @@ -657,10 +658,37 @@ export class MailMessageView extends AbstractViewRight { }); } /* + else { + // TODO: which key to decrypt, use pgpInfo.KeyIds + + PgpUserStore.getKeyForDecrypting(message.email()).then(result => { + console.log({canPgpSign:result}); + this.canPgpSign(!!result) + }); + else if (window.openpgp) { decryptMessage(message, recipients, fCallback) } else if (Settings.capa(Capa.GnuPG)) { + message. + + let params = { + Folder: message.folder, + Uid: message.uid, + PartId: message.pgpEncrypted().PartId, + KeyId: '', + Passphrase: prompt("Passphrase", ''), + Data: '' // optional + } + rl.app.Remote.post('GnupgDecrypt', null, params) + .then(data => { + // TODO + console.dir(data); + }) + .catch(error => { + // TODO + console.dir(error); + }); } */ } diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json index 47e130a11..3238a76e4 100644 --- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json +++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message", "BUTTON_PGP_VERIFY": "click to verify", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message", - "BUTTON_PGP_DECRYPT": "click to decrypt", "LINK_DOWNLOAD_AS_ZIP": "zip تنزيل كـ", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "لم تنتهي عملية الإرفاق بعد", "BUTTON_REQUEST_READ_RECEIPT": "اطلب اعلاماً بالقراءة", "BUTTON_MARK_AS_IMPORTANT": "تحديده كـ هام", - "BUTTON_OPEN_PGP": "OpenPGP (Plain Text Only)", "BUTTON_REQUEST_DSN": "اطلب اعلاماً بايصال البريد" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "في حال بدء العملية , فلا يمكن ايقافها او الغائها", "TITLE_CLEARING_PROCESS": "...يتم دمج المجلد" }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "OpenPGP استيراد مفتاح", - "BUTTON_IMPORT_OPEN_PGP_KEY": "استيراد" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "عرض OpenPGP key", - "BUTTON_SELECT": "تحديد" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "OpenPGP توليد مفتاح", - "LABEL_KEY_BIT_LENGTH": "طول المفتاح", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "قم بالتوليد" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Sign\/Encrypt", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "OpenPGP استيراد مفتاح", + "POPUP_IMPORT_BUTTON": "استيراد", + "POPUP_VIEW_TITLE": "عرض OpenPGP key", + "POPUP_VIEW_BUTTON": "تحديد", + "POPUP_GENERATE_TITLE": "OpenPGP توليد مفتاح", + "POPUP_GENERATE_BUTTON": "قم بالتوليد", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "تسجيل", "LABEL_ENCRYPT": "تشفير", - "BUTTON_SIGN": "تسجيل", - "BUTTON_ENCRYPT": "تشفير", - "BUTTON_SIGN_AND_ENCRYPT": "سجل و قم بالتشفير" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP فك تشفير", - "LABEL_KEY": "مفتاح خاص", "BUTTON_DECRYPT": "فك تشفير" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "OpenPGP توليد مفتاح", "TITLE_PRIVATE": "خاص", "TITLE_PUBLIC": "عام", - "GENERATE_ONLY_HTTPS": "HTTPS فقط", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json index 5046068a7..8ea93bbe3 100644 --- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json +++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Подписано с OpenPGP", "BUTTON_PGP_VERIFY": "кликни за проверка", "PGP_ENCRYPTED_MESSAGE_DESC": "Шифровано с OpenPGP", - "BUTTON_PGP_DECRYPT": "кликни за проверка", "LINK_DOWNLOAD_AS_ZIP": "Свали като ZIP файл", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Все още не са качени всички прикрепени файлове", "BUTTON_REQUEST_READ_RECEIPT": "Поискайте разписка за прочитане на съобщението", "BUTTON_MARK_AS_IMPORTANT": "Отбележи като важно", - "BUTTON_OPEN_PGP": "OpenPGP (Чист текст)", "BUTTON_REQUEST_DSN": "Уведомяване при доставка" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Веднъж започнат, този процес не може да бъде прекратен или отказан.", "TITLE_CLEARING_PROCESS": "Прочистване на папката..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Внасяне на OpenPGP ключ", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Внеси" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Виж OpenPGP ключа", - "BUTTON_SELECT": "Избери" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Създаване на OpenPGP ключове", - "LABEL_KEY_BIT_LENGTH": "Дължина на ключа", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Създай" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Подпиши\/шифровай с OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Внасяне на OpenPGP ключ", + "POPUP_IMPORT_BUTTON": "Внеси", + "POPUP_VIEW_TITLE": "Виж OpenPGP ключа", + "POPUP_VIEW_BUTTON": "Избери", + "POPUP_GENERATE_TITLE": "Създаване на OpenPGP ключове", + "POPUP_GENERATE_BUTTON": "Създай", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Подпиши", "LABEL_ENCRYPT": "Шифровай", - "BUTTON_SIGN": "Подпиши", - "BUTTON_ENCRYPT": "Шифровай", - "BUTTON_SIGN_AND_ENCRYPT": "Подпиши и шифровай" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Дешифриране с OpenPGP", - "LABEL_KEY": "Частен ключ", "BUTTON_DECRYPT": "Дешифрирай" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Генерирай OpenPGP ключ", "TITLE_PRIVATE": "Частен", "TITLE_PUBLIC": "Публичен", - "GENERATE_ONLY_HTTPS": "Само през HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматично запазване на чернова" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json index b0f80e1b6..674694bc0 100644 --- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json +++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Zpráva podepsaná OpenPGP", "BUTTON_PGP_VERIFY": "klikněte pro ověření", "PGP_ENCRYPTED_MESSAGE_DESC": "Zpráva šifrovaná OpenPGP", - "BUTTON_PGP_DECRYPT": "klikněte pro dešifraci", "LINK_DOWNLOAD_AS_ZIP": "Stáhnout jako zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Některé přílohy ještě nebyly nahrány", "BUTTON_REQUEST_READ_RECEIPT": "Vyžádat si potvrzení o přečtení", "BUTTON_MARK_AS_IMPORTANT": "Označit jako důležité", - "BUTTON_OPEN_PGP": "OpenPGP (jen prostý text)", "BUTTON_REQUEST_DSN": "Vyžádat si potvrzení o přijetí" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Tento proces není možné přerušit.", "TITLE_CLEARING_PROCESS": "Odstraňuje se složka..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Import OpenPGP klíče", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Import" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Zobrazit OpenPGP klíč", - "BUTTON_SELECT": "Vybrat" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generovat OpenPGP klíče", - "LABEL_KEY_BIT_LENGTH": "Délka klíče", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generovat" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Podpis\/Šifrování", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Import OpenPGP klíče", + "POPUP_IMPORT_BUTTON": "Import", + "POPUP_VIEW_TITLE": "Zobrazit OpenPGP klíč", + "POPUP_VIEW_BUTTON": "Vybrat", + "POPUP_GENERATE_TITLE": "Generovat OpenPGP klíče", + "POPUP_GENERATE_BUTTON": "Generovat", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Podpis", "LABEL_ENCRYPT": "Šifrování", - "BUTTON_SIGN": "Podepsat", - "BUTTON_ENCRYPT": "Šifrovat", - "BUTTON_SIGN_AND_ENCRYPT": "Podepsat a šifrovat" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Dešifrování", - "LABEL_KEY": "Soukromý klíč", "BUTTON_DECRYPT": "Dešifrovat" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generovat OpenPGP klíče", "TITLE_PRIVATE": "Soukromý", "TITLE_PUBLIC": "Veřejný", - "GENERATE_ONLY_HTTPS": "Pouze HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložit koncept" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json index 45c07cd32..92d470ca8 100644 --- a/snappymail/v/0.0.0/app/localization/da-DK/user.json +++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP signeret meddelelse", "BUTTON_PGP_VERIFY": "tryk for at verificere", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP krypteret meddelelse", - "BUTTON_PGP_DECRYPT": "tryk for at dekryptere", "LINK_DOWNLOAD_AS_ZIP": "Hent som zip-fil", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Overførsel af vedhæftninger igang.", "BUTTON_REQUEST_READ_RECEIPT": "Bed om kvittering for læsning", "BUTTON_MARK_AS_IMPORTANT": "Markér som vigtig", - "BUTTON_OPEN_PGP": "OpenPGP (kun plain tekst)", "BUTTON_REQUEST_DSN": "Bed om kvittering for modtagelse" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Handlingen kan ikke afbrydes når den er startet.", "TITLE_CLEARING_PROCESS": "Tømmer mappe..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importer OpenPGP nøgle", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importer" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Vis OpenPGP nøgle", - "BUTTON_SELECT": "Vælg" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generér OpenPGP nøgler", - "LABEL_KEY_BIT_LENGTH": "Nøglelængde", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generér" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP signér\/krypter", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importer OpenPGP nøgle", + "POPUP_IMPORT_BUTTON": "Importer", + "POPUP_VIEW_TITLE": "Vis OpenPGP nøgle", + "POPUP_VIEW_BUTTON": "Vælg", + "POPUP_GENERATE_TITLE": "Generér OpenPGP nøgler", + "POPUP_GENERATE_BUTTON": "Generér", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Signér", "LABEL_ENCRYPT": "Krypter", - "BUTTON_SIGN": "Signér", - "BUTTON_ENCRYPT": "Krypter", - "BUTTON_SIGN_AND_ENCRYPT": "Signér og krypter" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP dekrypter", - "LABEL_KEY": "Privat nøgle", "BUTTON_DECRYPT": "Dekrypter" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generer OpenPGP nøgler", "TITLE_PRIVATE": "Privat", "TITLE_PUBLIC": "Offentlig", - "GENERATE_ONLY_HTTPS": "Kun HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Gem kladde automatisk" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json index 2ae7e6745..5d18dd173 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/user.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP-signierte Nachricht", "BUTTON_PGP_VERIFY": "klicken, um zu überprüfen", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP-verschlüsselte Nachricht", - "BUTTON_PGP_DECRYPT": "klicken, um zu entschlüsseln", "LINK_DOWNLOAD_AS_ZIP": "Als ZIP-Datei herunterladen", "SPAM_SCORE": "Spam-Score", "HAS_VIRUS_WARNING": "WARNUNG: Virus erkannt" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Es wurden noch nicht alle Anhänge hochgeladen.", "BUTTON_REQUEST_READ_RECEIPT": "Empfangsbestätigung anfordern", "BUTTON_MARK_AS_IMPORTANT": "Als Wichtig markieren", - "BUTTON_OPEN_PGP": "OpenPGP (nur bei unformatiertem Text)", "BUTTON_REQUEST_DSN": "Übermittlungsstatus anfordern" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Einmal begonnen, kann dieser Vorgang nicht mehr abgebrochen oder beendet werden.", "TITLE_CLEARING_PROCESS": "Ordner wird gelöscht ..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "OpenPGP-Schlüssel importieren", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importieren" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "OpenPGP-Schlüssel anzeigen", - "BUTTON_SELECT": "Auswählen" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "OpenPGP-Schlüssel generieren", - "LABEL_KEY_BIT_LENGTH": "Schlüssellänge", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generieren" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP unterschreiben\/verschlüsseln", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "OpenPGP-Schlüssel importieren", + "POPUP_IMPORT_BUTTON": "Importieren", + "POPUP_VIEW_TITLE": "OpenPGP-Schlüssel anzeigen", + "POPUP_VIEW_BUTTON": "Auswählen", + "POPUP_GENERATE_TITLE": "OpenPGP-Schlüssel generieren", + "POPUP_GENERATE_BUTTON": "Generieren", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Unterschrift", "LABEL_ENCRYPT": "Verschlüsselung", - "BUTTON_SIGN": "Unterschreiben", - "BUTTON_ENCRYPT": "Verschlüsseln", - "BUTTON_SIGN_AND_ENCRYPT": "Unterschreiben und verschlüsseln" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "OpenPGP-Schlüssel generieren", "TITLE_PRIVATE": "Privat", "TITLE_PUBLIC": "Öffentlich", - "GENERATE_ONLY_HTTPS": "Nur HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json index 5153cb49b..5fbe23778 100644 --- a/snappymail/v/0.0.0/app/localization/el-GR/user.json +++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Μήνυμα υπογεγραμμένο με OpenPGP", "BUTTON_PGP_VERIFY": "κάντε κλικ για έλεγχο", "PGP_ENCRYPTED_MESSAGE_DESC": "Μήνυμα κωδικοποιημένο με OpenPGP", - "BUTTON_PGP_DECRYPT": "κάντε κλίκ για αποκωδικοποίηση", "LINK_DOWNLOAD_AS_ZIP": "Μεταφόρτωση σαν zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Δεν έχουν μεταφορτωθεί ακόμη όλα τα συνημμένα.", "BUTTON_REQUEST_READ_RECEIPT": "Ζητήστε αποδεικτικό ανάγνωσης", "BUTTON_MARK_AS_IMPORTANT": "Σημειώστε το σαν σημαντικό", - "BUTTON_OPEN_PGP": "OpenPGP (Απλό κείμενο μόνο)", "BUTTON_REQUEST_DSN": "Ζητήστε αποδεικτικό παράδοσης" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Αφού ξεκινήσει, η διαδικασία δεν σταματά ή ακυρώνεται.", "TITLE_CLEARING_PROCESS": "Διαγραφή όλων των μηνυμάτων στο φάκελο..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Εισαγωγή κλειδιού OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Εισαγωγή" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Προβολή κλειδιού OpenPGP", - "BUTTON_SELECT": "Επιλογή" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Δημιουργία κλειδιών OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Μήκος κλειδιού", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Δημιουργία" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Υπογραφή\/Κρυπρογράφηση", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Εισαγωγή κλειδιού OpenPGP", + "POPUP_IMPORT_BUTTON": "Εισαγωγή", + "POPUP_VIEW_TITLE": "Προβολή κλειδιού OpenPGP", + "POPUP_VIEW_BUTTON": "Επιλογή", + "POPUP_GENERATE_TITLE": "Δημιουργία κλειδιών OpenPGP", + "POPUP_GENERATE_BUTTON": "Δημιουργία", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Υπογραφή", "LABEL_ENCRYPT": "Κρυπτογράφηση", - "BUTTON_SIGN": "Υπογραφή", - "BUTTON_ENCRYPT": "Κρυπτογράφηση", - "BUTTON_SIGN_AND_ENCRYPT": "Υπογραφή και κρυπτογράφηση" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Αποκρυπτογράφηση OpenPGP", - "LABEL_KEY": "Προσωπικό κλειδί", "BUTTON_DECRYPT": "Αποκρυπτογράφηση" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP Keys", "TITLE_PRIVATE": "Private", "TITLE_PUBLIC": "Public", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { 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 f94017cd9..20c15ba9a 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message", "BUTTON_PGP_VERIFY": "click to verify", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message", - "BUTTON_PGP_DECRYPT": "click to decrypt", "LINK_DOWNLOAD_AS_ZIP": "Download as zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet.", "BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt", "BUTTON_MARK_AS_IMPORTANT": "Mark as important", - "BUTTON_OPEN_PGP": "OpenPGP (Plain Text Only)", "BUTTON_REQUEST_DSN": "Request a delivery receipt" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Once started, the process cannot be aborted or cancelled.", "TITLE_CLEARING_PROCESS": "Purging the folder..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Import OpenPGP key", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Import" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "View OpenPGP key", - "BUTTON_SELECT": "Select" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP keys", - "LABEL_KEY_BIT_LENGTH": "Key length", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Sign\/Encrypt", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Import OpenPGP key", + "POPUP_IMPORT_BUTTON": "Import", + "POPUP_VIEW_TITLE": "View OpenPGP key", + "POPUP_VIEW_BUTTON": "Select", + "POPUP_GENERATE_TITLE": "Generate OpenPGP key", + "POPUP_GENERATE_BUTTON": "Generate", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Sign", "LABEL_ENCRYPT": "Encrypt", - "BUTTON_SIGN": "Sign", - "BUTTON_ENCRYPT": "Encrypt", - "BUTTON_SIGN_AND_ENCRYPT": "Sign and encrypt" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP Keys", "TITLE_PRIVATE": "Private", "TITLE_PUBLIC": "Public", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json index 22c3c1199..e12cbdf94 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/user.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Mensaje firmado mediante OpenPGP", "BUTTON_PGP_VERIFY": "click para verificar", "PGP_ENCRYPTED_MESSAGE_DESC": "Mensaje cifrado mediante OpenPGP", - "BUTTON_PGP_DECRYPT": "click para desencriptar", "LINK_DOWNLOAD_AS_ZIP": "Descargar todo (archivo ZIP)", "SPAM_SCORE": "Puntuación de spam", "HAS_VIRUS_WARNING": "ADVERTENCIA: virus detectado" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "No se han subido todos los archivos adjuntos.", "BUTTON_REQUEST_READ_RECEIPT": "Solicitar confirmación de lectura", "BUTTON_MARK_AS_IMPORTANT": "Marcar como importante", - "BUTTON_OPEN_PGP": "OpenPGP (solo texto plano)", "BUTTON_REQUEST_DSN": "Solicitar una confirmación de entrega" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Una vez comenzado el proceso no se puede abortar ni cancelar.", "TITLE_CLEARING_PROCESS": "Purgando carpeta..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importar clave OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importar" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Ver clave OpenPGP", - "BUTTON_SELECT": "Seleccionar" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generar clave OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Longitud de la clave", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generar" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Firmar\/Cifrar con OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importar clave OpenPGP", + "POPUP_IMPORT_BUTTON": "Importar", + "POPUP_VIEW_TITLE": "Ver clave OpenPGP", + "POPUP_VIEW_BUTTON": "Seleccionar", + "POPUP_GENERATE_TITLE": "Generar clave OpenPGP", + "POPUP_GENERATE_BUTTON": "Generar", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Firmar", "LABEL_ENCRYPT": "Encriptar", - "BUTTON_SIGN": "Firmar", - "BUTTON_ENCRYPT": "Encriptar", - "BUTTON_SIGN_AND_ENCRYPT": "Firmar y encriptar" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Descifrar OpenPGP", - "LABEL_KEY": "Clave privada", "BUTTON_DECRYPT": "Descifrar" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generar llaves OpenPGP", "TITLE_PRIVATE": "Privado", "TITLE_PUBLIC": "Público", - "GENERATE_ONLY_HTTPS": "Solo HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json index fd561353d..052dca7c0 100644 --- a/snappymail/v/0.0.0/app/localization/et-EE/user.json +++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP abil signeeritud kiri", "BUTTON_PGP_VERIFY": "kliki verifitseerimiseks", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP abil krüpteeritud kiri", - "BUTTON_PGP_DECRYPT": "kliki dekrüpteerimiseks", "LINK_DOWNLOAD_AS_ZIP": "Laadi alla .zip failina", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Kõiki manuseid ei ole veel üles laetud.", "BUTTON_REQUEST_READ_RECEIPT": "Palu lugemise kohta kinnitust", "BUTTON_MARK_AS_IMPORTANT": "Tähista olulisena", - "BUTTON_OPEN_PGP": "OpenPGP (Vaid lihttekstina)", "BUTTON_REQUEST_DSN": "Palu kättesaamise kohta kinnitust" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Juba alustatud protsessi ei saa tühistada või katkestada.", "TITLE_CLEARING_PROCESS": "Tühjendan kausta..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Impordi OpenPGP võti", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Impordi" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Vaata OpenPGP võtit", - "BUTTON_SELECT": "Vali" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Genereeri OpenPGP võtmed", - "LABEL_KEY_BIT_LENGTH": "Võtme pikkus", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Genereeri" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP allkirjastamine\/krüpteerimine", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Impordi OpenPGP võti", + "POPUP_IMPORT_BUTTON": "Impordi", + "POPUP_VIEW_TITLE": "Vaata OpenPGP võtit", + "POPUP_VIEW_BUTTON": "Vali", + "POPUP_GENERATE_TITLE": "Genereeri OpenPGP võtmed", + "POPUP_GENERATE_BUTTON": "Genereeri", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Allkirjasta", "LABEL_ENCRYPT": "Krüpteeri", - "BUTTON_SIGN": "Allkirjasta", - "BUTTON_ENCRYPT": "Krüpteeri", - "BUTTON_SIGN_AND_ENCRYPT": "Allkirjasta ja krüpteeri" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP dekrüpteerimine", - "LABEL_KEY": "Privaatne võti ", "BUTTON_DECRYPT": "Dekrüpteeri" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Genereeri OpenPGP võti", "TITLE_PRIVATE": "Privaatne", "TITLE_PUBLIC": "Avalik", - "GENERATE_ONLY_HTTPS": "Ainult HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json index c4c2deefc..ada90d4f4 100644 --- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json +++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "پیام توسط OpenPGP امضاء شد", "BUTTON_PGP_VERIFY": "برای بررسی کلیک کنید", "PGP_ENCRYPTED_MESSAGE_DESC": "پیام توسط OpenPGP رمزنگاری شد", - "BUTTON_PGP_DECRYPT": "برای خارج شدن از حالت رمز کلیک کنید", "LINK_DOWNLOAD_AS_ZIP": "دریافت با پسوند zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "همه پیوست‌ها هنوز بارگذاری نشده است.", "BUTTON_REQUEST_READ_RECEIPT": "درخواست دریافت رسید خواندن", "BUTTON_MARK_AS_IMPORTANT": "علامت زدن به عنوان مهم", - "BUTTON_OPEN_PGP": "OpenPGP (فقط متن ساده)", "BUTTON_REQUEST_DSN": "درخواست دریافت رسید تحویل درمقصد" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "زمانی که این عملیات شروع شود قابل لغو یا انصراف نیست.", "TITLE_CLEARING_PROCESS": "خالی کردن شاخه..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "واردکردن کلید OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "وارد‌کردن" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "مشاهده کلید OpenGPG", - "BUTTON_SELECT": "انتخاب" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "تولید کلید‌های OpenPGP", - "LABEL_KEY_BIT_LENGTH": "طول کلید", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "تولید" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "امضاء\/رمزنگاری OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "واردکردن کلید OpenPGP", + "POPUP_IMPORT_BUTTON": "وارد‌کردن", + "POPUP_VIEW_TITLE": "مشاهده کلید OpenGPG", + "POPUP_VIEW_BUTTON": "انتخاب", + "POPUP_GENERATE_TITLE": "تولید کلید‌های OpenPGP", + "POPUP_GENERATE_BUTTON": "تولید", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "امضاء", "LABEL_ENCRYPT": "رمزنگاری", - "BUTTON_SIGN": "امضاء", - "BUTTON_ENCRYPT": "رمزنگاری", - "BUTTON_SIGN_AND_ENCRYPT": "امضاء و رمزنگاری" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "رمزگشایی OpenPGP", - "LABEL_KEY": "کلید خصوصی", "BUTTON_DECRYPT": "رمزگشایی" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "تولید کلیدهای OpenPGP", "TITLE_PRIVATE": "خصوصی", "TITLE_PUBLIC": "عمومی", - "GENERATE_ONLY_HTTPS": "تنها HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "ذخیره خودکار پیش‌نویس" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json index abbb991eb..774940740 100644 --- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json +++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP allekirjoitettu viesti", "BUTTON_PGP_VERIFY": "klikkaa verifioidaksesi", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP salattu visti", - "BUTTON_PGP_DECRYPT": "klikkaa avataksesi salaus", "LINK_DOWNLOAD_AS_ZIP": "Lataa zip-tiedostona", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Kaikkia liitetiedostoja ei ole vielä ladattu.", "BUTTON_REQUEST_READ_RECEIPT": "Pyydä kuittaus", "BUTTON_MARK_AS_IMPORTANT": "Merkitse tärkeäksi", - "BUTTON_OPEN_PGP": "OpenPGP (pelkkä teksti)", "BUTTON_REQUEST_DSN": "Pyydä toimituskuittaus" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Tätä toimintoa ei voi peruuttaa.", "TITLE_CLEARING_PROCESS": "Tyhjennetään kansiota..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Tuo OpenPGP avain", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Tuo" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Näytä OpenPGP avain", - "BUTTON_SELECT": "Valitse" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Luo OpenPGP avain", - "LABEL_KEY_BIT_LENGTH": "Avaimen pituus", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generoi" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Allekirjoitus\/Salaus", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Tuo OpenPGP avain", + "POPUP_IMPORT_BUTTON": "Tuo", + "POPUP_VIEW_TITLE": "Näytä OpenPGP avain", + "POPUP_VIEW_BUTTON": "Valitse", + "POPUP_GENERATE_TITLE": "Luo OpenPGP avain", + "POPUP_GENERATE_BUTTON": "Generoi", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Allekirjoita", "LABEL_ENCRYPT": "Salaa", - "BUTTON_SIGN": "Allekirjoita", - "BUTTON_ENCRYPT": "Salaa", - "BUTTON_SIGN_AND_ENCRYPT": "Allekirjoita ja salaa" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Pura OpenPGP", - "LABEL_KEY": "Yksityinen avain", "BUTTON_DECRYPT": "Pura" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Luo OpenPGP avain", "TITLE_PRIVATE": "Yksityinen", "TITLE_PUBLIC": "Julkinen", - "GENERATE_ONLY_HTTPS": "Vain HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json index 0a8e9f0a4..fb89f4125 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Message signé par OpenPGP", "BUTTON_PGP_VERIFY": "cliquer pour vérifier", "PGP_ENCRYPTED_MESSAGE_DESC": "Message chiffré par OpenPGP", - "BUTTON_PGP_DECRYPT": "cliquer pour déchiffrer", "LINK_DOWNLOAD_AS_ZIP": "Télécharger le zip", "SPAM_SCORE": "Score de spam", "HAS_VIRUS_WARNING": "ATTENTION : virus détecté" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Toutes les pièces jointes n'ont pas encore été téléchargées", "BUTTON_REQUEST_READ_RECEIPT": "Demander une confirmation de lecture", "BUTTON_MARK_AS_IMPORTANT": "Marquer comme important", - "BUTTON_OPEN_PGP": "OpenPGP (Texte non formaté uniquement)", "BUTTON_REQUEST_DSN": "Demander un accusé de réception" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Une fois lancé, le processus ne peut pas être interrompu ou annulé.", "TITLE_CLEARING_PROCESS": "Purge du dossier..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importer la clef OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importer" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Voir la clef OpenPGP", - "BUTTON_SELECT": "Sélectionner" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Générer les clés OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Longueur de la clé", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Générer" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Signer\/chiffrer avec OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importer la clef OpenPGP", + "POPUP_IMPORT_BUTTON": "Importer", + "POPUP_VIEW_TITLE": "Voir la clef OpenPGP", + "POPUP_VIEW_BUTTON": "Sélectionner", + "POPUP_GENERATE_TITLE": "Générer les clés OpenPGP", + "POPUP_GENERATE_BUTTON": "Générer", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Signer", "LABEL_ENCRYPT": "Chiffer", - "BUTTON_SIGN": "Signer", - "BUTTON_ENCRYPT": "Chiffrer", - "BUTTON_SIGN_AND_ENCRYPT": "Signer et chiffrer" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Clé Privée", "BUTTON_DECRYPT": "Déchiffrer" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Générer les clés OpenPGP", "TITLE_PRIVATE": "Privée", "TITLE_PUBLIC": "Publique", - "GENERATE_ONLY_HTTPS": "HTTPS seulement", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Brouillon sauvegardé automatiquement" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json index 9115217b4..201e82791 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP aláírt üzenet", "BUTTON_PGP_VERIFY": "kattints az ellenőrzéshez", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP kódolt üzenet", - "BUTTON_PGP_DECRYPT": "kattints a visszafejtéshez", "LINK_DOWNLOAD_AS_ZIP": "Letöltés zip fájlként", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "FIGYELEM: vírust észleltünk" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Még nem lett feltöltve minden melléklet.", "BUTTON_REQUEST_READ_RECEIPT": "Olvasási visszaigazolás kérése", "BUTTON_MARK_AS_IMPORTANT": "Megjelölés fontosként", - "BUTTON_OPEN_PGP": "OpenPGP (csak egyszerű szöveg)", "BUTTON_REQUEST_DSN": "Továbbítási visszaigazolás kérés" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Ha egyszer elindult, a folyamatot nem lehet megszakítani.", "TITLE_CLEARING_PROCESS": "Mappa ürítés..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "OpenPGP kulcs importálás", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importálás" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "OpenPGP kulcs megtekintés", - "BUTTON_SELECT": "Kiválasztás" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "OpenPGP kulcs generálás", - "LABEL_KEY_BIT_LENGTH": "Kulcs hossz", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generálás" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP aláírás\/titkosítás", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "OpenPGP kulcs importálás", + "POPUP_IMPORT_BUTTON": "Importálás", + "POPUP_VIEW_TITLE": "OpenPGP kulcs megtekintés", + "POPUP_VIEW_BUTTON": "Kiválasztás", + "POPUP_GENERATE_TITLE": "OpenPGP kulcs generálás", + "POPUP_GENERATE_BUTTON": "Generálás", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Aláírás", "LABEL_ENCRYPT": "Titkosítás", - "BUTTON_SIGN": "Aláírás", - "BUTTON_ENCRYPT": "Titkosítás", - "BUTTON_SIGN_AND_ENCRYPT": "Aláírás és titkosítás" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP visszafejtés", - "LABEL_KEY": "Privát kulcs", "BUTTON_DECRYPT": "Visszafejtés" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "OpenPGP kulcs generálás", "TITLE_PRIVATE": "Privát", "TITLE_PUBLIC": "Publikus", - "GENERATE_ONLY_HTTPS": "csak HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Piszkozat automatikus mentése" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json index 3bde60f27..1c6317869 100644 --- a/snappymail/v/0.0.0/app/localization/id-ID/user.json +++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Pesan bertanda-tangan OpenPGP", "BUTTON_PGP_VERIFY": "klik untuk verifikasi", "PGP_ENCRYPTED_MESSAGE_DESC": "Pesan terenkripsi OpenPGP", - "BUTTON_PGP_DECRYPT": "klik untuk mendekripsi", "LINK_DOWNLOAD_AS_ZIP": "Unduh sebagai berkas zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Belum semua lampiran terunggah.", "BUTTON_REQUEST_READ_RECEIPT": "Minta pemberitahuan telah dibaca", "BUTTON_MARK_AS_IMPORTANT": "Tandai sebagai pesan penting", - "BUTTON_OPEN_PGP": "OpenPGP (Teks Biasa)", "BUTTON_REQUEST_DSN": "Minta pemberitahuan berhasil kirim" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Begitu dimulai, proses tidak dapat dibatalkan atau ditunda.", "TITLE_CLEARING_PROCESS": "Membersihkan folder..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Impor kunci OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Impor" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Tampikan kunci OpenPGP", - "BUTTON_SELECT": "Pilih" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Buat kunci OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Panjang kunci", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Buat" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Tandatangan\/Enkripsi", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Impor kunci OpenPGP", + "POPUP_IMPORT_BUTTON": "Impor", + "POPUP_VIEW_TITLE": "Tampikan kunci OpenPGP", + "POPUP_VIEW_BUTTON": "Pilih", + "POPUP_GENERATE_TITLE": "Buat kunci OpenPGP", + "POPUP_GENERATE_BUTTON": "Buat", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Tandatangan", "LABEL_ENCRYPT": "Enkripsi", - "BUTTON_SIGN": "Tandatangani", - "BUTTON_ENCRYPT": "Enkripsi", - "BUTTON_SIGN_AND_ENCRYPT": "Tandatangani dan Enkripsi" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Deksipsi", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Deskripsi" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Buat kunci OpenPGP", "TITLE_PRIVATE": "Pribadi", "TITLE_PUBLIC": "Publik", - "GENERATE_ONLY_HTTPS": "Hanya HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Simpan konsep otomatis" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json index fb56f166e..a5702d5d6 100644 --- a/snappymail/v/0.0.0/app/localization/is-IS/user.json +++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Skeyti undirritað með OpenPGP", "BUTTON_PGP_VERIFY": "smelltu til að sannvotta", "PGP_ENCRYPTED_MESSAGE_DESC": "Skeyti dulritað með OpenPGP", - "BUTTON_PGP_DECRYPT": "smelltu til að afkóða", "LINK_DOWNLOAD_AS_ZIP": "Sækja sem .zip skrá", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Ekki er búið að senda inn öll viðhengi.", "BUTTON_REQUEST_READ_RECEIPT": "Biðja um staðfestingu á lestri", "BUTTON_MARK_AS_IMPORTANT": "Merkja sem mikilvægt", - "BUTTON_OPEN_PGP": "OpenPGP (einungis hreinn texti)", "BUTTON_REQUEST_DSN": "Biðja um staðfestingu á afhendingu" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Það er ekki hægt að hætta við aðgerðina eftir að búið er að keyra hana.", "TITLE_CLEARING_PROCESS": "Tæmi möppu..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Flytja inn OpenPGP-lykil", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Flytja inn" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Skoða OpenPGP-lykil", - "BUTTON_SELECT": "Velja" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Búa til OpenPGP-lykla", - "LABEL_KEY_BIT_LENGTH": "Lengd lykils", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Útbúa" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Undirrita\/Dulrita OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Flytja inn OpenPGP-lykil", + "POPUP_IMPORT_BUTTON": "Flytja inn", + "POPUP_VIEW_TITLE": "Skoða OpenPGP-lykil", + "POPUP_VIEW_BUTTON": "Velja", + "POPUP_GENERATE_TITLE": "Búa til OpenPGP-lykla", + "POPUP_GENERATE_BUTTON": "Útbúa", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Undirrita", "LABEL_ENCRYPT": "Dulrita", - "BUTTON_SIGN": "Undirrita", - "BUTTON_ENCRYPT": "Dulrita", - "BUTTON_SIGN_AND_ENCRYPT": "Undirrita og dulrita" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Afkóða OpenPGP", - "LABEL_KEY": "Einkalykill", "BUTTON_DECRYPT": "Afkóða" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Búa til OpenPGP-lykla", "TITLE_PRIVATE": "Einkalykill", "TITLE_PUBLIC": "Dreifilykill", - "GENERATE_ONLY_HTTPS": "Einungis HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Vista drög sjálfkrafa" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json index 750d455eb..ff5ca4feb 100644 --- a/snappymail/v/0.0.0/app/localization/it-IT/user.json +++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Messaggio firmato con OpenPGP", "BUTTON_PGP_VERIFY": "clicca qui per verificarlo", "PGP_ENCRYPTED_MESSAGE_DESC": "Messaggio cifrato con OpenPGP", - "BUTTON_PGP_DECRYPT": "clicca qui per decifrarlo", "LINK_DOWNLOAD_AS_ZIP": "Scarica come archivio ZIP", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Non tutti gli allegati sono stati caricati al momento.", "BUTTON_REQUEST_READ_RECEIPT": "Richiedi conferma di lettura", "BUTTON_MARK_AS_IMPORTANT": "Marca come importante", - "BUTTON_OPEN_PGP": "OpenPGP (Solo testo semplice)", "BUTTON_REQUEST_DSN": "Richiedi conferma del ricevimento" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Una volta iniziato, il processo non può più essere annullato.", "TITLE_CLEARING_PROCESS": "Eliminazione cartella..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importa chiave OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importa" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Visualizza chiave OpenPGP", - "BUTTON_SELECT": "Seleziona tutto" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Genera chiavi OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Lunghezza della chiave", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Genera" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Firma\/Cifra con OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importa chiave OpenPGP", + "POPUP_IMPORT_BUTTON": "Importa", + "POPUP_VIEW_TITLE": "Visualizza chiave OpenPGP", + "POPUP_VIEW_BUTTON": "Seleziona tutto", + "POPUP_GENERATE_TITLE": "Genera chiavi OpenPGP", + "POPUP_GENERATE_BUTTON": "Genera", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Firma", "LABEL_ENCRYPT": "Cifra", - "BUTTON_SIGN": "Firma", - "BUTTON_ENCRYPT": "Cifra", - "BUTTON_SIGN_AND_ENCRYPT": "Firma e cifra" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Genera chiave OpenPGP", "TITLE_PRIVATE": "Privata", "TITLE_PUBLIC": "Pubblica", - "GENERATE_ONLY_HTTPS": "solo tramite HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Salva automaticamente la bozza" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json index 1beaa3c52..df784d75e 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP 署名済みメッセージ", "BUTTON_PGP_VERIFY": "クリックして検証", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP 暗号化メッセージ", - "BUTTON_PGP_DECRYPT": "クリックして復号化", "LINK_DOWNLOAD_AS_ZIP": "Zip としてダウンロード", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "すべての添付ファイルがアップロードされているわけではありません。", "BUTTON_REQUEST_READ_RECEIPT": "開封確認を要求する", "BUTTON_MARK_AS_IMPORTANT": "重要フラグをつける", - "BUTTON_OPEN_PGP": "OpenPGP (プレーンテキストのみ)", "BUTTON_REQUEST_DSN": "配信確認を要求する" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "一度始めると、中止やキャンセルができません。", "TITLE_CLEARING_PROCESS": "フォルダを消去しています..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "OpenPGP キーをインポート", - "BUTTON_IMPORT_OPEN_PGP_KEY": "インポート" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "OpenPGP キーを表示", - "BUTTON_SELECT": "選択" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "OpenPGP キーを生成", - "LABEL_KEY_BIT_LENGTH": "キーの長さ", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "生成" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP 署名\/暗号化", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "OpenPGP キーをインポート", + "POPUP_IMPORT_BUTTON": "インポート", + "POPUP_VIEW_TITLE": "OpenPGP キーを表示", + "POPUP_VIEW_BUTTON": "選択", + "POPUP_GENERATE_TITLE": "OpenPGP キーを生成", + "POPUP_GENERATE_BUTTON": "生成", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "署名", "LABEL_ENCRYPT": "暗号化", - "BUTTON_SIGN": "署名", - "BUTTON_ENCRYPT": "暗号化", - "BUTTON_SIGN_AND_ENCRYPT": "署名と暗号化" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP 復号化", - "LABEL_KEY": "秘密鍵", "BUTTON_DECRYPT": "復号化" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "OpenPGP キーを生成", "TITLE_PRIVATE": "プライベート", "TITLE_PUBLIC": "パブリック", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "下書きを自動的に保存する" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json index 3016a5a02..a43ff4b28 100644 --- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json +++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP로 서명된 메세지입니다.", "BUTTON_PGP_VERIFY": "인증하려면 클릭하세요", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP로 암호화된 메세지입니다.", - "BUTTON_PGP_DECRYPT": "복호화하려면 클릭하세요", "LINK_DOWNLOAD_AS_ZIP": ".zip 파일로 다운로드", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "첨부파일이 아직 업로드되지 않았습니다.", "BUTTON_REQUEST_READ_RECEIPT": "수신 확인 요청", "BUTTON_MARK_AS_IMPORTANT": "중요 표시", - "BUTTON_OPEN_PGP": "OpenPGP (평문만)", "BUTTON_REQUEST_DSN": "수신 확인 요청" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "작업이 시작되면 중지하거나 취소할 수 없습니다.", "TITLE_CLEARING_PROCESS": "폴더를 비우는 중..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "OpenPGP 키 가져오기", - "BUTTON_IMPORT_OPEN_PGP_KEY": "가져오기" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "OpenPGP 키 보기", - "BUTTON_SELECT": "선택" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "OpenPGP 키 생성", - "LABEL_KEY_BIT_LENGTH": "키 길이", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "생성" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP 서명\/암호화", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "OpenPGP 키 가져오기", + "POPUP_IMPORT_BUTTON": "가져오기", + "POPUP_VIEW_TITLE": "OpenPGP 키 보기", + "POPUP_VIEW_BUTTON": "선택", + "POPUP_GENERATE_TITLE": "OpenPGP 키 생성", + "POPUP_GENERATE_BUTTON": "생성", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "로그인", "LABEL_ENCRYPT": "암호화", - "BUTTON_SIGN": "로그인", - "BUTTON_ENCRYPT": "암호화", - "BUTTON_SIGN_AND_ENCRYPT": "서명 및 암호화" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP 복호화", - "LABEL_KEY": "비공개 키", "BUTTON_DECRYPT": "복호화" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "OpenPGP 키 생성", "TITLE_PRIVATE": "비공개", "TITLE_PUBLIC": "공개", - "GENERATE_ONLY_HTTPS": "HTTPS만", "LABEL_ALLOW_DRAFT_AUTOSAVE": "작성 중인 메시지 자동 저장" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json index cf7711273..a5980301f 100644 --- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json +++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP pasirašytas pranešimas", "BUTTON_PGP_VERIFY": "spustelkite patikrinimui", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP šifruotas pranešimas", - "BUTTON_PGP_DECRYPT": "spustelkite iššifravimui", "LINK_DOWNLOAD_AS_ZIP": "Atsisiųsti zip archyvą", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Dar ne visi priedai buvo įkelti", "BUTTON_REQUEST_READ_RECEIPT": "Prašyti pranešti kada bus perskaitytas", "BUTTON_MARK_AS_IMPORTANT": "Žymėti svarbiu", - "BUTTON_OPEN_PGP": "OpenPGP (Tik paprastas tekstas)", "BUTTON_REQUEST_DSN": "Prašyti laiško gavimo pažymos" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Pradėjus veiksmą, jis nebesustabdomas.", "TITLE_CLEARING_PROCESS": "Valomas katalogas..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importuoti OpenPGP raktą", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importuoti" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Peržiūrėti OpenPGP raktą", - "BUTTON_SELECT": "Pasirinkti" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Sukurti OpenPGP raktą", - "LABEL_KEY_BIT_LENGTH": "Rakto ilgis", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Sukurti" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Parašas\/Šifravimas", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importuoti OpenPGP raktą", + "POPUP_IMPORT_BUTTON": "Importuoti", + "POPUP_VIEW_TITLE": "Peržiūrėti OpenPGP raktą", + "POPUP_VIEW_BUTTON": "Pasirinkti", + "POPUP_GENERATE_TITLE": "Sukurti OpenPGP raktą", + "POPUP_GENERATE_BUTTON": "Sukurti", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Parašas", "LABEL_ENCRYPT": "Šifravimas", - "BUTTON_SIGN": "Pasirašyti", - "BUTTON_ENCRYPT": "Šifruoti", - "BUTTON_SIGN_AND_ENCRYPT": "Pasirašyti ir šifruoti" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Sukurti OpenPGP raktus", "TITLE_PRIVATE": "Privatus", "TITLE_PUBLIC": "Viešas", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json index bdbc1d500..364c1bc12 100644 --- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json +++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message", "BUTTON_PGP_VERIFY": "click to verify", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message", - "BUTTON_PGP_DECRYPT": "click to decrypt", "LINK_DOWNLOAD_AS_ZIP": "Download as zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet", "BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt", "BUTTON_MARK_AS_IMPORTANT": "Mark as important", - "BUTTON_OPEN_PGP": "OpenPGP (Plain Text Only)", "BUTTON_REQUEST_DSN": "Request a delivery receipt" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Šo procesu nevarēs apturēt.", "TITLE_CLEARING_PROCESS": "Mape tiek iztīrīta..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Import OpenPGP key", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Import" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "View OpenPGP key", - "BUTTON_SELECT": "Select" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP keys", - "LABEL_KEY_BIT_LENGTH": "Key length", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Sign\/Encrypt", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Import OpenPGP key", + "POPUP_IMPORT_BUTTON": "Import", + "POPUP_VIEW_TITLE": "View OpenPGP key", + "POPUP_VIEW_BUTTON": "Select", + "POPUP_GENERATE_TITLE": "Generate OpenPGP keys", + "POPUP_GENERATE_BUTTON": "Generate", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Sign", "LABEL_ENCRYPT": "Encrypt", - "BUTTON_SIGN": "Sign", - "BUTTON_ENCRYPT": "Encrypt", - "BUTTON_SIGN_AND_ENCRYPT": "Sign and encrypt" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP Keys", "TITLE_PRIVATE": "Private", "TITLE_PUBLIC": "Public", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json index ccc559e82..cfa68401f 100644 --- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json +++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP-signert melding", "BUTTON_PGP_VERIFY": "trykk for å bekrefte", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP-kryptert melding", - "BUTTON_PGP_DECRYPT": "trykk for å dekryptere", "LINK_DOWNLOAD_AS_ZIP": "Last ned som zip-fil", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Ett eller flere vedlegg er ikke blitt lastet opp enda", "BUTTON_REQUEST_READ_RECEIPT": "Be om en bekreftelse fra mottaker på at meldinga er lest", "BUTTON_MARK_AS_IMPORTANT": "Marker som viktig", - "BUTTON_OPEN_PGP": "OpenPGP (kun ren tekst)", "BUTTON_REQUEST_DSN": "Be om leveringsbekreftelse" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Hvis du går videre, blir meldingene slettet for godt.", "TITLE_CLEARING_PROCESS": "Tømmer mappe …" }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importer OpenPGP-nøkkel", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importer" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Vis OpenPGP-nøkkel", - "BUTTON_SELECT": "Velg" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Lag OpenPGP-nøkler", - "LABEL_KEY_BIT_LENGTH": "Nøkkellengde", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Lag" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Signer\/krypter med OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importer OpenPGP-nøkkel", + "POPUP_IMPORT_BUTTON": "Importer", + "POPUP_VIEW_TITLE": "Vis OpenPGP-nøkkel", + "POPUP_VIEW_BUTTON": "Velg", + "POPUP_GENERATE_TITLE": "Lag OpenPGP-nøkler", + "POPUP_GENERATE_BUTTON": "Lag", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Signer", "LABEL_ENCRYPT": "Krypter", - "BUTTON_SIGN": "Signer", - "BUTTON_ENCRYPT": "Krypter", - "BUTTON_SIGN_AND_ENCRYPT": "Signer og krypter" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Dekrypter med OpenPGP", - "LABEL_KEY": "Privatnøkkel", "BUTTON_DECRYPT": "Dekrypter" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Lag OpenPGP-nøkler", "TITLE_PRIVATE": "Privat", "TITLE_PUBLIC": "Offentlig", - "GENERATE_ONLY_HTTPS": "Kun HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Lagre utkast automatisk" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json index ebf60f3a8..d09ea26c7 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP ondertekend bericht", "BUTTON_PGP_VERIFY": "klik om te verifiëren", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP versleuteld bericht", - "BUTTON_PGP_DECRYPT": "klik om te ontsleutelen", "LINK_DOWNLOAD_AS_ZIP": "Download als zip", "SPAM_SCORE": "Spamscore", "HAS_VIRUS_WARNING": "WAARSCHUWING: virus gedetecteerd" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Toevoegen van bijlage(n) is nog niet gereed", "BUTTON_REQUEST_READ_RECEIPT": "Leesbevestiging vragen", "BUTTON_MARK_AS_IMPORTANT": "Markeer als belangrijk", - "BUTTON_OPEN_PGP": "OpenPGP (alleen bij Platte Tekst)", "BUTTON_REQUEST_DSN": "Ontvangstbevestiging vragen" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Eens in gang gezet kan het proces niet geannuleerd worden!", "TITLE_CLEARING_PROCESS": "Folder aan het leegmaken..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importeer OpenPGP sleutel", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importeer" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Bekijk OpenPGP sleutel", - "BUTTON_SELECT": "Selecteer" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Genereer OpenPGP sleutels", - "LABEL_KEY_BIT_LENGTH": "Sleutel lengte", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Genereer" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP ondertekenen\/versleutelen", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importeer OpenPGP sleutel", + "POPUP_IMPORT_BUTTON": "Importeer", + "POPUP_VIEW_TITLE": "Bekijk OpenPGP sleutel", + "POPUP_VIEW_BUTTON": "Selecteer", + "POPUP_GENERATE_TITLE": "Genereer OpenPGP sleutels", + "POPUP_GENERATE_BUTTON": "Genereer", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Ondertekenen", "LABEL_ENCRYPT": "Versleutelen", - "BUTTON_SIGN": "Ondertekenen", - "BUTTON_ENCRYPT": "Versleutelen", - "BUTTON_SIGN_AND_ENCRYPT": "Ondertekenen en versleutelen" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Privé sleutel", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Genereer OpenPGP sleutels", "TITLE_PRIVATE": "Privé sleutel", "TITLE_PUBLIC": "Publieke sleutel", - "GENERATE_ONLY_HTTPS": "Alleen HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json index e743df156..689ebc186 100644 --- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json +++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Wiadomość podpisana OpenPGP", "BUTTON_PGP_VERIFY": "kliknij aby zweryfikować", "PGP_ENCRYPTED_MESSAGE_DESC": "Wiadomość zaszyfrowana OpenPGP", - "BUTTON_PGP_DECRYPT": "kliknij aby odszyfrować", "LINK_DOWNLOAD_AS_ZIP": "Pobierz jako plik zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Jeszcze nie wszystkie załączniki zostały przesłane na serwer.", "BUTTON_REQUEST_READ_RECEIPT": "Żądaj potwierdzenia przeczytania wiadomości", "BUTTON_MARK_AS_IMPORTANT": "Oznacz jako ważną", - "BUTTON_OPEN_PGP": "OpenPGP (tylko wiadomości tekstowe)", "BUTTON_REQUEST_DSN": "Żądaj potwierdzenia dostarczenia wiadomości" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Po rozpoczęciu nie będzie możliwe przerwanie lub anulowanie zadania.", "TITLE_CLEARING_PROCESS": "Trwa usuwanie wszystkich wiadomości z folderu..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importowanie klucza OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importuj" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Podgląd klucza OpenPGP", - "BUTTON_SELECT": "Zaznacz" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generowanie klucza OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Długość klucza", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generuj" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Podpisywanie\/szyfrowanie OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importowanie klucza OpenPGP", + "POPUP_IMPORT_BUTTON": "Importuj", + "POPUP_VIEW_TITLE": "Podgląd klucza OpenPGP", + "POPUP_VIEW_BUTTON": "Zaznacz", + "POPUP_GENERATE_TITLE": "Generowanie klucza OpenPGP", + "POPUP_GENERATE_BUTTON": "Generuj", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Podpisz", "LABEL_ENCRYPT": "Zaszyfruj", - "BUTTON_SIGN": "Podpisz", - "BUTTON_ENCRYPT": "Zaszyfruj", - "BUTTON_SIGN_AND_ENCRYPT": "Podpisz i zaszyfruj" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Odszyfrowywanie OpenPGP", - "LABEL_KEY": "Klucz prywatny", "BUTTON_DECRYPT": "Odszyfruj" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generuj klucz OpenPGP", "TITLE_PRIVATE": "Prywatny", "TITLE_PUBLIC": "Publiczny", - "GENERATE_ONLY_HTTPS": "Tylko HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatycznie zapisuj szkic" }, "SHORTCUTS_HELP": { 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 9fc90b3d6..452c99ce9 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 @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Mensagem assinada com OpenPGP", "BUTTON_PGP_VERIFY": "clique para verificar", "PGP_ENCRYPTED_MESSAGE_DESC": "Mensagem criptografada com OpenPGP", - "BUTTON_PGP_DECRYPT": "clique para descriptografar", "LINK_DOWNLOAD_AS_ZIP": "Baixar como zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Alguns anexos ainda não foram completamente enviados", "BUTTON_REQUEST_READ_RECEIPT": "Pedir recibo de leitura", "BUTTON_MARK_AS_IMPORTANT": "Marcar como importante", - "BUTTON_OPEN_PGP": "OpenPGP (Somente Texto)", "BUTTON_REQUEST_DSN": "Pedir recibo de entrega" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Uma vez iniciado, o processo não poderá ser interrompido ou cancelado.", "TITLE_CLEARING_PROCESS": "Excluindo a pasta..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importar chave OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importar" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Ver chave OpenPGP", - "BUTTON_SELECT": "Selecionar" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Gerar chave OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Tamanho da chave", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Gerar" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Assinar\/Criptografar", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importar chave OpenPGP", + "POPUP_IMPORT_BUTTON": "Importar", + "POPUP_VIEW_TITLE": "Ver chave OpenPGP", + "POPUP_VIEW_BUTTON": "Selecionar", + "POPUP_GENERATE_TITLE": "Gerar chave OpenPGP", + "POPUP_GENERATE_BUTTON": "Gerar", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Assinar", "LABEL_ENCRYPT": "Criptografar", - "BUTTON_SIGN": "Assinar", - "BUTTON_ENCRYPT": "Criptografar", - "BUTTON_SIGN_AND_ENCRYPT": "Assinar e criptografar" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Gerar chave OpenPGP", "TITLE_PRIVATE": "Privado", "TITLE_PUBLIC": "Público", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvar automaticamente rascunho" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json index bf430e03b..10cf2b84f 100644 --- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json +++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Mensagem assinada com OpenPGP", "BUTTON_PGP_VERIFY": "clique para verificar", "PGP_ENCRYPTED_MESSAGE_DESC": "Mensagem encriptada com OpenPGP", - "BUTTON_PGP_DECRYPT": "clique para desencriptar", "LINK_DOWNLOAD_AS_ZIP": "Transferir em arquivo zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Ainda não foram carregados todos os anexos", "BUTTON_REQUEST_READ_RECEIPT": "Pedir um recibo de leitura", "BUTTON_MARK_AS_IMPORTANT": "Marcar como importante", - "BUTTON_OPEN_PGP": "OpenPGP (apenas texto simples)", "BUTTON_REQUEST_DSN": "Pedir um recibo de entrega" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Uma vez iniciado, o processo não pode ser interrompido ou cancelado.", "TITLE_CLEARING_PROCESS": "A eliminar a pasta..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importar chave OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importar" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Ver chave OpenPGP", - "BUTTON_SELECT": "Escolher" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Gerar chaves OpenPGP", - "LABEL_KEY_BIT_LENGTH": "Comprimento da chave", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Gerar" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "Assinar\/Encriptar com OpenPGP", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importar chave OpenPGP", + "POPUP_IMPORT_BUTTON": "Importar", + "POPUP_VIEW_TITLE": "Ver chave OpenPGP", + "POPUP_VIEW_BUTTON": "Escolher", + "POPUP_GENERATE_TITLE": "Gerar chaves OpenPGP", + "POPUP_GENERATE_BUTTON": "Gerar", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Assinar", "LABEL_ENCRYPT": "Encriptar", - "BUTTON_SIGN": "Assinar", - "BUTTON_ENCRYPT": "Encriptar", - "BUTTON_SIGN_AND_ENCRYPT": "Assinar e encriptar" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Gerar chaves OpenPGP", "TITLE_PRIVATE": "Privada", "TITLE_PUBLIC": "Pública", - "GENERATE_ONLY_HTTPS": "Apenas HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json index 03bb69f05..78b077aca 100644 --- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json +++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message", "BUTTON_PGP_VERIFY": "click to verify", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message", - "BUTTON_PGP_DECRYPT": "click to decrypt", "LINK_DOWNLOAD_AS_ZIP": "Download as zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet", "BUTTON_REQUEST_READ_RECEIPT": "Cere confirmare de citire", "BUTTON_MARK_AS_IMPORTANT": "Mark as important", - "BUTTON_OPEN_PGP": "OpenPGP (Plain Text Only)", "BUTTON_REQUEST_DSN": "Request a delivery receipt" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "După începerea procesului de curățare nu mai puteți<\/strong> anula procesul.", "TITLE_CLEARING_PROCESS": "Curăț dosarul..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Import OpenPGP key", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Import" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "View OpenPGP key", - "BUTTON_SELECT": "Select" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP keys", - "LABEL_KEY_BIT_LENGTH": "Key length", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Sign\/Encrypt", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Import OpenPGP key", + "POPUP_IMPORT_BUTTON": "Import", + "POPUP_VIEW_TITLE": "View OpenPGP key", + "POPUP_VIEW_BUTTON": "Select", + "POPUP_GENERATE_TITLE": "Generate OpenPGP keys", + "POPUP_GENERATE_BUTTON": "Generate", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Sign", "LABEL_ENCRYPT": "Encrypt", - "BUTTON_SIGN": "Sign", - "BUTTON_ENCRYPT": "Encrypt", - "BUTTON_SIGN_AND_ENCRYPT": "Sign and encrypt" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP Keys", "TITLE_PRIVATE": "Private", "TITLE_PUBLIC": "Public", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvează ciorna automat" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json index fc1d5b86f..e10e90b38 100644 --- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json +++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP подписанное сообщение", "BUTTON_PGP_VERIFY": "нажмите, чтобы подтвердить", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP шифрованное сообщение", - "BUTTON_PGP_DECRYPT": "нажмите, чтобы расшифровать", "LINK_DOWNLOAD_AS_ZIP": "Сохранить как zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Не все прикреплённые файлы были загружены", "BUTTON_REQUEST_READ_RECEIPT": "Запрос о прочтении письма", "BUTTON_MARK_AS_IMPORTANT": "Отметить как важное", - "BUTTON_OPEN_PGP": "OpenPGP (только обычный текст)", "BUTTON_REQUEST_DSN": "Запросить уведомление о доставке" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "После начала очистки, процесс нельзя<\/strong> будет остановить или отменить.", "TITLE_CLEARING_PROCESS": "Очистка папки..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Импорт OpenPGP ключа", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Импорт" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Просмотр OpenPGP ключа", - "BUTTON_SELECT": "Выбрать" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Генерация OpenPGP ключа", - "LABEL_KEY_BIT_LENGTH": "Длина ключа", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Создать" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP подпись и шифрование", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Импорт OpenPGP ключа", + "POPUP_IMPORT_BUTTON": "Импорт", + "POPUP_VIEW_TITLE": "Просмотр OpenPGP ключа", + "POPUP_VIEW_BUTTON": "Выбрать", + "POPUP_GENERATE_TITLE": "Генерация OpenPGP ключа", + "POPUP_GENERATE_BUTTON": "Создать", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Подпись", "LABEL_ENCRYPT": "Шифрование", - "BUTTON_SIGN": "Подпись", - "BUTTON_ENCRYPT": "Шифрование", - "BUTTON_SIGN_AND_ENCRYPT": "Подпись и шифрование" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "Расшифровать (OpenPGP)", - "LABEL_KEY": "Приватный ключ", "BUTTON_DECRYPT": "Расшифровать" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Новый OpenPGP ключ", "TITLE_PRIVATE": "Приватный", "TITLE_PUBLIC": "Публичный", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматически сохранять черновик" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json index b3651af7e..a0a52c470 100644 --- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json +++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json @@ -151,7 +151,6 @@ "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", - "BUTTON_PGP_DECRYPT": "kliknite pre dešifrovanie", "LINK_DOWNLOAD_AS_ZIP": "Prevziať ako zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Nie všetky prílohy boli už nahraté na server.", "BUTTON_REQUEST_READ_RECEIPT": "Vyžiadať potvrdenie o prečítaní", "BUTTON_MARK_AS_IMPORTANT": "Označiť ako dôležité", - "BUTTON_OPEN_PGP": "Open PGP (iba text)", "BUTTON_REQUEST_DSN": "Vyžiadať potvrdenie o doručení" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Tento proces nie je možné prerušiť.", "TITLE_CLEARING_PROCESS": "Odstraňujem priečinok..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Importovať kľúč OpenPGP", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Import" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Zobraziť kľúč OpenPGP", - "BUTTON_SELECT": "Vybrať" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP keys", - "LABEL_KEY_BIT_LENGTH": "Key length", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Sign\/Encrypt", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Importovať kľúč OpenPGP", + "POPUP_IMPORT_BUTTON": "Import", + "POPUP_VIEW_TITLE": "Zobraziť kľúč OpenPGP", + "POPUP_VIEW_BUTTON": "Vybrať", + "POPUP_GENERATE_TITLE": "Generate OpenPGP keys", + "POPUP_GENERATE_BUTTON": "Generate", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Sign", "LABEL_ENCRYPT": "Encrypt", - "BUTTON_SIGN": "Sign", - "BUTTON_ENCRYPT": "Encrypt", - "BUTTON_SIGN_AND_ENCRYPT": "Sign and encrypt" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generate OpenPGP Keys", "TITLE_PRIVATE": "Private", "TITLE_PUBLIC": "Public", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložiť koncept." }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json index 7f5e17948..44a737631 100644 --- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json +++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "Sporočilo, podpisano z OpenPGP", "BUTTON_PGP_VERIFY": "kliknite za overovitev", "PGP_ENCRYPTED_MESSAGE_DESC": "Sporočilo, šifrirano z OpenPGP", - "BUTTON_PGP_DECRYPT": "kliknite za dešifriranje", "LINK_DOWNLOAD_AS_ZIP": "Prenesi kot .zip datoteko", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Priloge še niso bile naložene v celoti.", "BUTTON_REQUEST_READ_RECEIPT": "Zahtevaj potrdilo o branju", "BUTTON_MARK_AS_IMPORTANT": "Označi kot pomembno", - "BUTTON_OPEN_PGP": "OpenPGP (Navadno besedilo)", "BUTTON_REQUEST_DSN": "Zahtevaj potrdilo o dostavi" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Tega postopka ne bo mogoče preklicati ali zaustaviti.", "TITLE_CLEARING_PROCESS": "Čistim mapo." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Uvoz OpenPGP ključa", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Uvozi" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Ogled OpenPGP ključa", - "BUTTON_SELECT": "Izberi" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Generiraj OpenPGP ključe", - "LABEL_KEY_BIT_LENGTH": "Dolžina ključa", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generiraj" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP podpis\/šifriranje", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Uvoz OpenPGP ključa", + "POPUP_IMPORT_BUTTON": "Uvozi", + "POPUP_VIEW_TITLE": "Ogled OpenPGP ključa", + "POPUP_VIEW_BUTTON": "Izberi", + "POPUP_GENERATE_TITLE": "Generiraj OpenPGP ključe", + "POPUP_GENERATE_BUTTON": "Generiraj", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Podpis", "LABEL_ENCRYPT": "Šifriranje", - "BUTTON_SIGN": "Podpiši", - "BUTTON_ENCRYPT": "Šifriraj", - "BUTTON_SIGN_AND_ENCRYPT": "Podpiši in šifriraj" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP dešifriranje", - "LABEL_KEY": "Zasebni ključ", "BUTTON_DECRYPT": "Dešifriraj" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Generiraj OpenPGP ključe", "TITLE_PRIVATE": "Zasebni", "TITLE_PUBLIC": "Javni", - "GENERATE_ONLY_HTTPS": "Samo HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Samodejno shrani osnutek" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json index aa7a787bd..2a79cb95c 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP-signerat meddelande", "BUTTON_PGP_VERIFY": "klicka för att verifiera", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP-krypterat meddelande", - "BUTTON_PGP_DECRYPT": "klicka för att dekryptera", "LINK_DOWNLOAD_AS_ZIP": "Ladda ner som ZIP-fil", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "VARNING: virus upptäckt" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Alla bilagor är inte uppladddade än", "BUTTON_REQUEST_READ_RECEIPT": "Begär mottagningskvitto", "BUTTON_MARK_AS_IMPORTANT": "Markera som viktigt", - "BUTTON_OPEN_PGP": "OpenPGP (Endast enkel text)", "BUTTON_REQUEST_DSN": "Begär ett leveranskvitto" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "När detta är startat kan det inte avbrytas.", "TITLE_CLEARING_PROCESS": "Rensar mappen..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Import av OpenPGP-nyckel", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Importera" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Visa OpenPGP-nyckel", - "BUTTON_SELECT": "Välj" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Skapa OpenPGP-nycklar", - "LABEL_KEY_BIT_LENGTH": "Nyckellängd", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Skapa" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP signera\/kryptera", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Import av OpenPGP-nyckel", + "POPUP_IMPORT_BUTTON": "Importera", + "POPUP_VIEW_TITLE": "Visa OpenPGP-nyckel", + "POPUP_VIEW_BUTTON": "Välj", + "POPUP_GENERATE_TITLE": "Skapa OpenPGP-nycklar", + "POPUP_GENERATE_BUTTON": "Skapa", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Signera", "LABEL_ENCRYPT": "Kryptera", - "BUTTON_SIGN": "Singera", - "BUTTON_ENCRYPT": "Kryptera", - "BUTTON_SIGN_AND_ENCRYPT": "Signera och kryptera" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP avkryptera", - "LABEL_KEY": "Privat Key", "BUTTON_DECRYPT": "Avkryptera" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Skapa OpenPGP-nycklar", "TITLE_PRIVATE": "Privat", "TITLE_PUBLIC": "Publik", - "GENERATE_ONLY_HTTPS": "Endast HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Spara utkast automatiskt" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json index d92d82c96..2b3bb313c 100644 --- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json +++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP imzalı mesaj", "BUTTON_PGP_VERIFY": "onay için tıklayın", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP şifreli mesaj", - "BUTTON_PGP_DECRYPT": "çözmek için tıklayın", "LINK_DOWNLOAD_AS_ZIP": "Download as zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet", "BUTTON_REQUEST_READ_RECEIPT": "Okundu bilgisi iste", "BUTTON_MARK_AS_IMPORTANT": "Mark as important", - "BUTTON_OPEN_PGP": "OpenPGP (Plain Text Only)", "BUTTON_REQUEST_DSN": "Request a delivery receipt" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Bu işlem bir kez başladıktan sonra, işlem durdurulamaz veya iptal edilemez.", "TITLE_CLEARING_PROCESS": "Klasör temizleniyor..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "OpenPGP key'i içe aktar", - "BUTTON_IMPORT_OPEN_PGP_KEY": "İçe aktar" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "OpenPGP key'i göster", - "BUTTON_SELECT": "Seç" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "OpenPGP key'leri Oluştur", - "LABEL_KEY_BIT_LENGTH": "Key Uzunluğu", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Oluştur" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Giriş\/Şifrele", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "OpenPGP key'i içe aktar", + "POPUP_IMPORT_BUTTON": "İçe aktar", + "POPUP_VIEW_TITLE": "OpenPGP key'i göster", + "POPUP_VIEW_BUTTON": "Seç", + "POPUP_GENERATE_TITLE": "OpenPGP key'leri Oluştur", + "POPUP_GENERATE_BUTTON": "Oluştur", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Giriş Yap", "LABEL_ENCRYPT": "Şifrele", - "BUTTON_SIGN": "Giriş Yap", - "BUTTON_ENCRYPT": "Şifrele", - "BUTTON_SIGN_AND_ENCRYPT": "Giriş Yap and şifrele" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "OpenPGP Key Oluştur", "TITLE_PRIVATE": "Private", "TITLE_PUBLIC": "Public", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json index b7c7ee85d..639b365b4 100644 --- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json +++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP підписане повідомлення", "BUTTON_PGP_VERIFY": "натисніть, щоб підтвердити", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP шифроване повідомлення", - "BUTTON_PGP_DECRYPT": "натисніть, щоб розшифрувати", "LINK_DOWNLOAD_AS_ZIP": "Завантажити як zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet", "BUTTON_REQUEST_READ_RECEIPT": "Запит про прочитання листа", "BUTTON_MARK_AS_IMPORTANT": "Mark as important", - "BUTTON_OPEN_PGP": "OpenPGP (Plain Text Only)", "BUTTON_REQUEST_DSN": "Request a delivery receipt" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "Після початку очищення, процес неможливо<\/strong> буде зупинити чи відмінити.", "TITLE_CLEARING_PROCESS": "Очищення теки..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "Імпорт OpenPGP ключа", - "BUTTON_IMPORT_OPEN_PGP_KEY": "Імпорт" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "Перегляд OpenPGP ключа", - "BUTTON_SELECT": "Вибрати" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "Генерація OpenPGP ключа", - "LABEL_KEY_BIT_LENGTH": "Довжина ключа", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "Створити" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP підпис і шифрування", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "Імпорт OpenPGP ключа", + "POPUP_IMPORT_BUTTON": "Імпорт", + "POPUP_VIEW_TITLE": "Перегляд OpenPGP ключа", + "POPUP_VIEW_BUTTON": "Вибрати", + "POPUP_GENERATE_TITLE": "Генерація OpenPGP ключа", + "POPUP_GENERATE_BUTTON": "Створити", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Підпис", "LABEL_ENCRYPT": "Шифрування", - "BUTTON_SIGN": "Підпис", - "BUTTON_ENCRYPT": "Шифрування", - "BUTTON_SIGN_AND_ENCRYPT": "Підпис и шифрування" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Дешифрувати" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "Новий OpenPGP ключ", "TITLE_PRIVATE": "Приватний", "TITLE_PUBLIC": "Публічний", - "GENERATE_ONLY_HTTPS": "тільки HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json index e745a656d..0abd8771e 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "由 OpenPGP 签名", "BUTTON_PGP_VERIFY": "点击验证", "PGP_ENCRYPTED_MESSAGE_DESC": "由 OpenPGP 加密", - "BUTTON_PGP_DECRYPT": "点击解密", "LINK_DOWNLOAD_AS_ZIP": "下载为zip压缩包", "SPAM_SCORE": "垃圾邮件分数", "HAS_VIRUS_WARNING": "警告：检测到病毒" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "还有附件正在上传。", "BUTTON_REQUEST_READ_RECEIPT": "要求已读回执", "BUTTON_MARK_AS_IMPORTANT": "标记为“重要”", - "BUTTON_OPEN_PGP": "OpenPGP (仅限纯文本)", "BUTTON_REQUEST_DSN": "要求送达回执" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "一旦操作执行，将不可中断和撤销！", "TITLE_CLEARING_PROCESS": "文件夹清理中..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "导入 OpenPGP 密钥", - "BUTTON_IMPORT_OPEN_PGP_KEY": "导入" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "查看 OpenPGP 密钥", - "BUTTON_SELECT": "选择" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "生成 OpenPGP 密钥", - "LABEL_KEY_BIT_LENGTH": "密钥长度", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "生成" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP 签名\/加密", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "导入 OpenPGP 密钥", + "POPUP_IMPORT_BUTTON": "导入", + "POPUP_VIEW_TITLE": "查看 OpenPGP 密钥", + "POPUP_VIEW_BUTTON": "选择", + "POPUP_GENERATE_TITLE": "生成 OpenPGP 密钥", + "POPUP_GENERATE_BUTTON": "生成", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "签名", "LABEL_ENCRYPT": "加密", - "BUTTON_SIGN": "签名", - "BUTTON_ENCRYPT": "加密", - "BUTTON_SIGN_AND_ENCRYPT": "签名并加密" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP 解密", - "LABEL_KEY": "私钥", "BUTTON_DECRYPT": "解密" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "生成 OpenPGP 密钥", "TITLE_PRIVATE": "私有", "TITLE_PUBLIC": "公开", - "GENERATE_ONLY_HTTPS": "仅限HTTPS", "LABEL_ALLOW_DRAFT_AUTOSAVE": "自动保存草稿" }, "SHORTCUTS_HELP": { 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 10ef110c6..400bbf0c1 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 @@ -151,7 +151,6 @@ "PGP_SIGNED_MESSAGE_DESC": "OpenPGP signed message", "BUTTON_PGP_VERIFY": "click to verify", "PGP_ENCRYPTED_MESSAGE_DESC": "OpenPGP encrypted message", - "BUTTON_PGP_DECRYPT": "click to decrypt", "LINK_DOWNLOAD_AS_ZIP": "Download as zip", "SPAM_SCORE": "Spam Score", "HAS_VIRUS_WARNING": "WARNING: virus detected" @@ -216,7 +215,6 @@ "ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet", "BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt", "BUTTON_MARK_AS_IMPORTANT": "Mark as important", - "BUTTON_OPEN_PGP": "OpenPGP (Plain Text Only)", "BUTTON_REQUEST_DSN": "Request a delivery receipt" }, "POPUPS_ASK": { @@ -254,30 +252,16 @@ "DANGER_DESC_HTML_2": "一旦操作執行，不可中斷和撤銷！", "TITLE_CLEARING_PROCESS": "資料夾清理中..." }, - "POPUPS_IMPORT_OPEN_PGP_KEY": { - "TITLE_IMPORT_OPEN_PGP_KEY": "導入 OpenPGP 密鑰", - "BUTTON_IMPORT_OPEN_PGP_KEY": "導入" - }, - "POPUPS_VIEW_OPEN_PGP_KEY": { - "TITLE_VIEW_OPEN_PGP_KEY": "查看 OpenPGP 密鑰", - "BUTTON_SELECT": "選擇" - }, - "POPUPS_GENERATE_OPEN_PGP_KEYS": { - "TITLE_GENERATE_OPEN_PGP_KEYS": "生成 OpenPGP 密鑰", - "LABEL_KEY_BIT_LENGTH": "密鑰長度", - "BUTTON_GENERATE_OPEN_PGP_KEYS": "生成" - }, - "POPUPS_COMPOSE_OPEN_PGP": { - "TITLE_COMPOSE_OPEN_PGP": "OpenPGP Sign\/Encrypt", + "OPENPGP": { + "POPUP_IMPORT_TITLE": "導入 OpenPGP 密鑰", + "POPUP_IMPORT_BUTTON": "導入", + "POPUP_VIEW_TITLE": "查看 OpenPGP 密鑰", + "POPUP_VIEW_BUTTON": "選擇", + "POPUP_GENERATE_TITLE": "生成 OpenPGP 密鑰", + "POPUP_GENERATE_BUTTON": "生成", + "LABEL_KEY_TYPE": "Type", "LABEL_SIGN": "Sign", "LABEL_ENCRYPT": "Encrypt", - "BUTTON_SIGN": "Sign", - "BUTTON_ENCRYPT": "Encrypt", - "BUTTON_SIGN_AND_ENCRYPT": "Sign and encrypt" - }, - "POPUPS_MESSAGE_OPEN_PGP": { - "TITLE_MESSAGE_OPEN_PGP": "OpenPGP Decrypt", - "LABEL_KEY": "Private Key", "BUTTON_DECRYPT": "Decrypt" }, "POPUPS_FILTER": { @@ -469,7 +453,6 @@ "BUTTON_GENERATE_OPEN_PGP_KEYS": "生成 OpenPGP 密鑰", "TITLE_PRIVATE": "私有", "TITLE_PUBLIC": "公開", - "GENERATE_ONLY_HTTPS": "HTTPS only", "LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft" }, "SHORTCUTS_HELP": { diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html index 736b12a7f..7e887e8b5 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -323,7 +323,7 @@
🔒 - +
✍️ diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html index 24b6d7d4e..6acef1a5e 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html @@ -85,13 +85,13 @@
  • - +
  • - +
    • diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html deleted file mode 100644 index bf01dd23b..000000000 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html +++ /dev/null @@ -1,37 +0,0 @@ -
    - × -

    -
    -
    -
    -
    - -
    -
    - -
    -
    - ○ -
    -
    - -   - [] -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html similarity index 53% rename from snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html rename to snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html index dd9132131..d1dac25e2 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html @@ -1,6 +1,6 @@
    × -

    +

    @@ -9,7 +9,14 @@
    - + + + + + +
    @@ -24,13 +31,29 @@ data-bind="value: password" />
    - - + + +
    +
    +
    +
    diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html similarity index 66% rename from snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html rename to snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html index 2f468d80e..6f5f7c635 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html @@ -1,6 +1,6 @@
    × -

    +

    @@ -9,27 +9,27 @@
    +
    -
    diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html index b91aa15e5..b6586420a 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html @@ -1,6 +1,6 @@
    × -

    +

    @@ -16,6 +16,6 @@ 🔑 - + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html index a91b3c658..b6135ded9 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html @@ -5,7 +5,7 @@    -
    +