Skip to content

Commit

Permalink
Fixed a few strings
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Nov 8, 2021
1 parent ec2c174 commit c4017e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const EncryptionConfigScreen = (props: Props) => {
mkComps.push(renderMasterKey(mk));
}

const headerComp = isEnabledMasterKeys ? <h2>{_('Encryption Keys')}</h2> : <a onClick={() => toggleShowDisabledMasterKeys() } style={{ ...theme.urlStyle, display: 'inline-block', marginBottom: 10 }} href="#">{showTable ? _('Hide disabled keys') : _('Show disabled keys')}</a>;
const headerComp = isEnabledMasterKeys ? <h2>{_('Encryption keys')}</h2> : <a onClick={() => toggleShowDisabledMasterKeys() } style={{ ...theme.urlStyle, display: 'inline-block', marginBottom: 10 }} href="#">{showTable ? _('Hide disabled keys') : _('Show disabled keys')}</a>;
const infoComp: any = null; // isEnabledMasterKeys ? <p>{'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.'}</p> : null;
const tableComp = !showTable ? null : (
<table>
Expand Down Expand Up @@ -247,7 +247,7 @@ const EncryptionConfigScreen = (props: Props) => {
{_('Encryption:')} <strong>{props.encryptionEnabled ? _('Enabled') : _('Disabled')}</strong>
</p>
<p>
{_('Public-Private Key Pair:')} <strong>{props.ppk ? _('Generated') : _('Not generated')}</strong>
{_('Public-private key pair:')} <strong>{props.ppk ? _('Generated') : _('Not generated')}</strong>
</p>
{decryptedItemsInfo}
{toggleButton}
Expand Down Expand Up @@ -319,7 +319,7 @@ const EncryptionConfigScreen = (props: Props) => {

nonExistingMasterKeySection = (
<div className="section">
<h2>{_('Missing Keys')}</h2>
<h2>{_('Missing keys')}</h2>
<p>{_('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.')}</p>
<table>
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/services/share/ShareService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit c4017e5

Please sign in to comment.