From c4017e52dc33718c31ed87b016f609caf9491edf Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 8 Nov 2021 10:00:11 +0000 Subject: [PATCH] Fixed a few strings --- .../gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx | 6 +++--- packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx | 2 +- packages/lib/services/share/ShareService.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx index 8fd628e14a7..96a932a47f1 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx @@ -167,7 +167,7 @@ const EncryptionConfigScreen = (props: Props) => { mkComps.push(renderMasterKey(mk)); } - const headerComp = isEnabledMasterKeys ?

{_('Encryption Keys')}

: toggleShowDisabledMasterKeys() } style={{ ...theme.urlStyle, display: 'inline-block', marginBottom: 10 }} href="#">{showTable ? _('Hide disabled keys') : _('Show disabled keys')}; + const headerComp = isEnabledMasterKeys ?

{_('Encryption keys')}

: toggleShowDisabledMasterKeys() } style={{ ...theme.urlStyle, display: 'inline-block', marginBottom: 10 }} href="#">{showTable ? _('Hide disabled keys') : _('Show disabled keys')}; const infoComp: any = null; // isEnabledMasterKeys ?

{'Note: Only one key is going to be used for encryption (the one marked as "active"). Any of the keys might be used for decryption, depending on how the notes or notebooks were originally encrypted.'}

: null; const tableComp = !showTable ? null : ( @@ -247,7 +247,7 @@ const EncryptionConfigScreen = (props: Props) => { {_('Encryption:')} {props.encryptionEnabled ? _('Enabled') : _('Disabled')}

- {_('Public-Private Key Pair:')} {props.ppk ? _('Generated') : _('Not generated')} + {_('Public-private key pair:')} {props.ppk ? _('Generated') : _('Not generated')}

{decryptedItemsInfo} {toggleButton} @@ -319,7 +319,7 @@ const EncryptionConfigScreen = (props: Props) => { nonExistingMasterKeySection = (
-

{_('Missing Keys')}

+

{_('Missing keys')}

{_('The keys with these IDs are used to encrypt some of your items, however the application does not currently have access to them. It is likely they will eventually be downloaded via synchronisation.')}

diff --git a/packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx b/packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx index 7edd51175d7..d2aabe492f1 100644 --- a/packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx +++ b/packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx @@ -201,7 +201,7 @@ export default function(props: Props) { } } - const dialogTitle = mode === Mode.Set ? _('Manager master password') : `⚠️ ${_('Reset master password')} ⚠️`; + const dialogTitle = mode === Mode.Set ? _('Manage master password') : `⚠️ ${_('Reset master password')} ⚠️`; const okButtonLabel = mode === Mode.Set ? _('Save') : `⚠️ ${_('Reset master password')} ⚠️`; function renderDialogWrapper() { diff --git a/packages/lib/services/share/ShareService.ts b/packages/lib/services/share/ShareService.ts index 917482f3513..656942c5741 100644 --- a/packages/lib/services/share/ShareService.ts +++ b/packages/lib/services/share/ShareService.ts @@ -268,7 +268,7 @@ export default class ShareService { if (!masterKey) throw new Error(`Cannot find master key with ID "${masterKeyId}"`); const recipientPublicKey: PublicPrivateKeyPair = await this.userPublicKey(recipientEmail); - if (!recipientPublicKey) throw new Error(_('Cannot share notebook with recipient %s because they do not have a public key. Ask them to create one from the menu "%s"', recipientEmail, 'Tools > Generate Public-Private Key pair')); + if (!recipientPublicKey) throw new Error(_('Cannot share encrypted notebook with recipient %s because they have not enabled end-to-end encryption. They may do so from the screen Configuration > Encryption.', recipientEmail)); logger.info('Reencrypting master key with recipient public key', recipientPublicKey);