From 70a4e12ca660cbc4c50affc72d5bbb0e8a814965 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Sun, 25 Jun 2023 23:09:15 -0700 Subject: [PATCH] Better words for encryption errors (#186131) Based on @deepak1556's feedback --- .../secrets/electron-sandbox/secretStorageService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/secrets/electron-sandbox/secretStorageService.ts b/src/vs/platform/secrets/electron-sandbox/secretStorageService.ts index 0856f5daa80..b8a58eb2a09 100644 --- a/src/vs/platform/secrets/electron-sandbox/secretStorageService.ts +++ b/src/vs/platform/secrets/electron-sandbox/secretStorageService.ts @@ -53,7 +53,7 @@ export class NativeSecretStorageService extends BaseSecretStorageService { }; buttons.push(troubleshootingButton); - let errorMessage = localize('encryptionNotAvailableJustTroubleshootingGuide', "Secrets are not being stored on disk because encryption is not available in this environment."); + let errorMessage = localize('encryptionNotAvailableJustTroubleshootingGuide', "An OS keyring couldn't be identified for storing the encryption related data in your current desktop environment."); if (!isLinux) { this._notificationService.prompt(Severity.Error, errorMessage, buttons); @@ -66,9 +66,9 @@ export class NativeSecretStorageService extends BaseSecretStorageService { } else if (isKwallet(provider)) { errorMessage = localize('isKwallet', "You're running in a KDE environment but encryption is not available. Ensure you have kwallet running."); } else if (provider === KnownStorageProvider.basicText) { - errorMessage += ' ' + localize('usePlainTextExtraSentence', "Open the troubleshooting guide or you can use plain text obfuscation instead."); + errorMessage += ' ' + localize('usePlainTextExtraSentence', "Open the troubleshooting guide to address this or you can use weaker encryption that doesn't use the OS keyring."); const usePlainTextButton: IPromptChoice = { - label: localize('usePlainText', "Use plain text (restart required)"), + label: localize('usePlainText', "Use weaker encryption (restart required)"), run: async () => { this._encryptionService.setUsePlainTextEncryption(); await this._nativeHostService.relaunch();