@codingame/monaco-vscode-user-data-sync-service-override 17.2.1 → 18.0.1

package/index.js

@@ -3,9 +3,9 @@ import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IUserDataSyncLocalStoreService, IUserDataSyncResourceProviderService, IUserDataSyncLogService, IUserDataSyncService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncStoreManagementService, IUserDataAutoSyncService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { UserDataSyncAccountService } from './vscode/src/vs/platform/userDataSync/common/userDataSyncAccount.js';
 import { IUserDataSyncAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSyncAccount.service';
-import { UserDataSyncMachinesService } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/userDataSyncMachines';
+import { UserDataSyncMachinesService } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/userDataSyncMachines';
 import { IUserDataSyncMachinesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSyncMachines.service';
-import { UserDataSyncStoreService, UserDataSyncStoreManagementService } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/userDataSyncStoreService';
+import { UserDataSyncStoreService, UserDataSyncStoreManagementService } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/userDataSyncStoreService';
 import { UserDataAutoSyncService } from './vscode/src/vs/platform/userDataSync/common/userDataAutoSyncService.js';
 import { WebUserDataSyncEnablementService } from './vscode/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.js';
 import { UserDataSyncService } from './vscode/src/vs/platform/userDataSync/common/userDataSyncService.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "17.2.1",
+  "version": "18.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - user-data-sync service-override",
   "keywords": [],
@@ -15,20 +15,20 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "17.2.1",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "17.2.1",
-    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "17.2.1",
-    "@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common": "17.2.1",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "17.2.1",
-    "@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common": "17.2.1",
-    "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common": "17.2.1",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "17.2.1",
-    "@codingame/monaco-vscode-api": "17.2.1",
-    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "17.2.1",
-    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "17.2.1",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "17.2.1",
-    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "17.2.1",
-    "@codingame/monaco-vscode-user-data-profile-service-override": "17.2.1"
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "18.0.1",
+    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "18.0.1",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "18.0.1",
+    "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common": "18.0.1",
+    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "18.0.1",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "18.0.1",
+    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "18.0.1",
+    "@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common": "18.0.1",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.0.1",
+    "@codingame/monaco-vscode-api": "18.0.1",
+    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "18.0.1",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "18.0.1",
+    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "18.0.1",
+    "@codingame/monaco-vscode-user-data-profile-service-override": "18.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/userDataSync/common/promptsSync/promptsSync.d.ts

@@ -7,7 +7,7 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IUserDataProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { AbstractSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer";
+import { AbstractSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IRemoteUserData, ISyncData, IUserDataSynchroniser } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
 import { IUserDataSyncLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";

package/vscode/src/vs/platform/userDataSync/common/promptsSync/promptsSync.js

@@ -7,10 +7,10 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
-import { isPromptOrInstructionsFile } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/constants';
+import { isPromptOrInstructionsFile } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { merge, areSame } from './promptsMerge.js';
-import { AbstractSynchroniser } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
+import { AbstractSynchroniser } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { FileOperationError, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { SyncResource, USER_DATA_SYNC_SCHEME, Change } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';

package/vscode/src/vs/platform/userDataSync/common/userDataAutoSyncService.js

@@ -406,28 +406,28 @@ class AutoSync extends Disposable {
         if (this.manifest === null && (await this.userDataSyncService.hasPreviouslySynced())) {
             if (this.hasSyncServiceChanged()) {
                 if (await this.hasDefaultServiceChanged()) {
-                    throw ( new UserDataAutoSyncError(( localize(2367, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2373, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 }
                 else {
-                    throw ( new UserDataAutoSyncError(( localize(2368, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2374, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             }
             else {
-                throw ( new UserDataAutoSyncError(( localize(2369, "Cannot sync because syncing is turned off in the cloud")), UserDataSyncErrorCode.TurnedOff));
+                throw ( new UserDataAutoSyncError(( localize(2375, "Cannot sync because syncing is turned off in the cloud")), UserDataSyncErrorCode.TurnedOff));
             }
         }
         const sessionId = this.storageService.get(sessionIdKey, StorageScope.APPLICATION);
         if (sessionId && this.manifest && sessionId !== this.manifest.session) {
             if (this.hasSyncServiceChanged()) {
                 if (await this.hasDefaultServiceChanged()) {
-                    throw ( new UserDataAutoSyncError(( localize(2367, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2373, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 }
                 else {
-                    throw ( new UserDataAutoSyncError(( localize(2368, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2374, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             }
             else {
-                throw ( new UserDataAutoSyncError(( localize(2370, "Cannot sync because current session is expired")), UserDataSyncErrorCode.SessionExpired));
+                throw ( new UserDataAutoSyncError(( localize(2376, "Cannot sync because current session is expired")), UserDataSyncErrorCode.SessionExpired));
             }
         }
         const machines = await this.userDataSyncMachinesService.getMachines(this.manifest || undefined);
@@ -437,7 +437,7 @@ class AutoSync extends Disposable {
         const currentMachine = machines.find(machine => machine.isCurrent);
         if (currentMachine?.disabled) {
             throw ( new UserDataAutoSyncError(( localize(
-                2371,
+                2377,
                 "Cannot sync because syncing is turned off on this machine from another machine."
             )), UserDataSyncErrorCode.TurnedOff));
         }

package/vscode/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.d.ts

@@ -8,8 +8,8 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IUserDataProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
-import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer";
-import { IRemoteUserData, IUserDataSynchroniser, ISyncUserDataProfile, ISyncData, IUserDataResourceManifest } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
+import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer";
+import { IRemoteUserData, ISyncData, ISyncUserDataProfile, IUserDataResourceManifest, IUserDataSynchroniser } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
 import { IUserDataSyncLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
 import { IUserDataSyncEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
 import { IUserDataSyncLocalStoreService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";

package/vscode/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.js

@@ -8,7 +8,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
-import { AbstractSynchroniser } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
+import { AbstractSynchroniser } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { merge } from './userDataProfilesManifestMerge.js';
 import { SyncResource, USER_DATA_SYNC_SCHEME, Change, UserDataSyncError, UserDataSyncErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
@@ -169,6 +169,7 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
             if (canAddRemoteProfiles) {
                 for (const profile of remote?.added || []) {
                     const collection = await this.userDataSyncStoreService.createCollection(this.syncHeaders);
+                    this.logService.trace(`${this.syncResourceLogLabel}: Created collection "${collection}" for "${profile.name}".`);
                     addedCollections.push(collection);
                     remoteProfiles.push({ id: profile.id, name: profile.name, collection, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
                 }

package/vscode/src/vs/platform/userDataSync/common/userDataSyncLog.js

@@ -10,7 +10,7 @@ import { USER_DATA_SYNC_LOG_ID } from '@codingame/monaco-vscode-api/vscode/vs/pl
 let UserDataSyncLogService = class UserDataSyncLogService extends AbstractLogger {
     constructor(loggerService, environmentService) {
         super();
-        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${USER_DATA_SYNC_LOG_ID}.log`), { id: USER_DATA_SYNC_LOG_ID, name: ( localize(2377, "Settings Sync")) }));
+        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${USER_DATA_SYNC_LOG_ID}.log`), { id: USER_DATA_SYNC_LOG_ID, name: ( localize(2383, "Settings Sync")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);

package/vscode/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.d.ts

@@ -11,7 +11,7 @@ import { IUserDataSyncStoreService } from "@codingame/monaco-vscode-api/vscode/v
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IUserDataSyncMachine } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/userDataSyncMachines";
+import { IUserDataSyncMachine } from "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/userDataSyncMachines";
 export declare class UserDataSyncResourceProviderService implements IUserDataSyncResourceProviderService {
     private readonly userDataSyncStoreService;
     private readonly userDataSyncLocalStoreService;

package/vscode/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.js

@@ -4,13 +4,13 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { getServiceMachineId } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/externalServices/common/serviceMachineId';
+import { getServiceMachineId } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/externalServices/common/serviceMachineId';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { SyncResource, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM, USER_DATA_SYNC_SCHEME, UserDataSyncError, UserDataSyncErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
-import { isSyncData } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
+import { isSyncData } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { parseSnippets } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/snippetsSync';
 import { parseSettingsSyncContent } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/settingsSync';
 import { getKeybindingsContentFromSyncContent } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/keybindingsSync';
@@ -455,7 +455,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             this.logService.error(error);
         }
         throw ( new UserDataSyncError(( localize(
-            2379,
+            2385,
             "Cannot parse sync data as it is not compatible with the current version."
         )), UserDataSyncErrorCode.IncompatibleRemoteContent, syncResource));
     }

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.js

@@ -32,12 +32,12 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
         switch (error.code) {
             case UserDataSyncErrorCode.LocalTooManyRequests: {
                 const message = isWeb ? ( localize(
-                    11358,
+                    11625,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please reload {0} to resume.",
                     this.productService.nameLong
                 ))
                     : ( localize(
-                    11359,
+                    11626,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please restart {0} to resume.",
                     this.productService.nameLong
                 ));
@@ -48,12 +48,12 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
                         primary: [
                             toAction({
                                 id: 'Show Sync Logs',
-                                label: ( localize(11360, "Show Log")),
+                                label: ( localize(11627, "Show Log")),
                                 run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                             }),
                             toAction({
                                 id: 'Restart',
-                                label: isWeb ? ( localize(11361, "Reload")) : ( localize(11362, "Restart")),
+                                label: isWeb ? ( localize(11628, "Reload")) : ( localize(11629, "Restart")),
                                 run: () => this.hostService.restart()
                             })
                         ]
@@ -62,20 +62,20 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
                 return;
             }
             case UserDataSyncErrorCode.TooManyRequests: {
-                const operationId = error.operationId ? ( localize(11363, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(11630, "Operation Id: {0}", error.operationId)) : undefined;
                 const message = ( localize(
-                    11364,
+                    11631,
                     "Settings sync is disabled because the current device is making too many requests. Please wait for 10 minutes and turn on sync."
                 ));
                 this.notificationService.notify({
                     severity: Severity.Error,
                     message: operationId ? `${message} ${operationId}` : message,
-                    source: error.operationId ? ( localize(11365, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
+                    source: error.operationId ? ( localize(11632, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
                     actions: {
                         primary: [
                             toAction({
                                 id: 'Show Sync Logs',
-                                label: ( localize(11360, "Show Log")),
+                                label: ( localize(11627, "Show Log")),
                                 run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                             })
                         ]