@codingame/monaco-vscode-user-data-sync-service-override 26.2.2 → 28.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "26.2.2",
+  "version": "28.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - user-data-sync service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.2",
-    "@codingame/monaco-vscode-user-data-profile-service-override": "26.2.2"
+    "@codingame/monaco-vscode-api": "28.0.0",
+    "@codingame/monaco-vscode-user-data-profile-service-override": "28.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -1,5 +1,6 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IMeteredConnectionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -22,6 +23,7 @@ export declare class UserDataAutoSyncService extends Disposable implements IUser
     private readonly telemetryService;
     private readonly userDataSyncMachinesService;
     private readonly storageService;
+    private readonly meteredConnectionService;
     _serviceBrand: undefined;
     private readonly autoSync;
     private successiveFailures;
@@ -36,7 +38,7 @@ export declare class UserDataAutoSyncService extends Disposable implements IUser
     private previousProductQuality;
     private get productQuality();
     private set productQuality(value);
-    constructor(productService: IProductService, userDataSyncStoreManagementService: IUserDataSyncStoreManagementService, userDataSyncStoreService: IUserDataSyncStoreService, userDataSyncEnablementService: IUserDataSyncEnablementService, userDataSyncService: IUserDataSyncService, logService: IUserDataSyncLogService, userDataSyncAccountService: IUserDataSyncAccountService, telemetryService: ITelemetryService, userDataSyncMachinesService: IUserDataSyncMachinesService, storageService: IStorageService);
+    constructor(productService: IProductService, userDataSyncStoreManagementService: IUserDataSyncStoreManagementService, userDataSyncStoreService: IUserDataSyncStoreService, userDataSyncEnablementService: IUserDataSyncEnablementService, userDataSyncService: IUserDataSyncService, logService: IUserDataSyncLogService, userDataSyncAccountService: IUserDataSyncAccountService, telemetryService: ITelemetryService, userDataSyncMachinesService: IUserDataSyncMachinesService, storageService: IStorageService, meteredConnectionService: IMeteredConnectionService);
     private updateAutoSync;
     protected startAutoSync(): boolean;
     private isAutoSyncEnabled;

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

@@ -10,6 +10,7 @@ import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IMeteredConnectionService } from '@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
@@ -60,7 +61,8 @@ let UserDataAutoSyncService = class UserDataAutoSyncService extends Disposable {
         userDataSyncAccountService,
         telemetryService,
         userDataSyncMachinesService,
-        storageService
+        storageService,
+        meteredConnectionService
     ) {
         super();
         this.userDataSyncStoreManagementService = userDataSyncStoreManagementService;
@@ -72,6 +74,7 @@ let UserDataAutoSyncService = class UserDataAutoSyncService extends Disposable {
         this.telemetryService = telemetryService;
         this.userDataSyncMachinesService = userDataSyncMachinesService;
         this.storageService = storageService;
+        this.meteredConnectionService = meteredConnectionService;
         this.autoSync = this._register(( new MutableDisposable()));
         this.successiveFailures = 0;
         this.lastSyncTriggerTime = undefined;
@@ -116,6 +119,9 @@ let UserDataAutoSyncService = class UserDataAutoSyncService extends Disposable {
             this._register(
                 this.userDataSyncStoreManagementService.onDidChangeUserDataSyncStore(() => this.triggerSync(["userDataSyncStoreChanged"]))
             );
+            this._register(
+                meteredConnectionService.onDidChangeIsConnectionMetered(() => this.updateAutoSync())
+            );
         }
     }
     updateAutoSync() {
@@ -185,6 +191,12 @@ let UserDataAutoSyncService = class UserDataAutoSyncService extends Disposable {
                 message: "[AutoSync] Suspended until restart."
             };
         }
+        if (this.meteredConnectionService.isConnectionMetered) {
+            return {
+                enabled: false,
+                message: "[AutoSync] Suspended because connection is metered."
+            };
+        }
         return {
             enabled: true
         };
@@ -353,7 +365,7 @@ let UserDataAutoSyncService = class UserDataAutoSyncService extends Disposable {
         return 3_000;
     }
 };
-UserDataAutoSyncService = ( __decorate([( __param(0, IProductService)), ( __param(1, IUserDataSyncStoreManagementService)), ( __param(2, IUserDataSyncStoreService)), ( __param(3, IUserDataSyncEnablementService)), ( __param(4, IUserDataSyncService)), ( __param(5, IUserDataSyncLogService)), ( __param(6, IUserDataSyncAccountService)), ( __param(7, ITelemetryService)), ( __param(8, IUserDataSyncMachinesService)), ( __param(9, IStorageService))], UserDataAutoSyncService));
+UserDataAutoSyncService = ( __decorate([( __param(0, IProductService)), ( __param(1, IUserDataSyncStoreManagementService)), ( __param(2, IUserDataSyncStoreService)), ( __param(3, IUserDataSyncEnablementService)), ( __param(4, IUserDataSyncService)), ( __param(5, IUserDataSyncLogService)), ( __param(6, IUserDataSyncAccountService)), ( __param(7, ITelemetryService)), ( __param(8, IUserDataSyncMachinesService)), ( __param(9, IStorageService)), ( __param(10, IMeteredConnectionService))], UserDataAutoSyncService));
 class AutoSync extends Disposable {
     static {
         this.INTERVAL_SYNCING = "Interval";
@@ -467,24 +479,24 @@ class AutoSync extends Disposable {
         if (this.manifest === null && (await this.userDataSyncService.hasPreviouslySynced())) {
             if (this.hasSyncServiceChanged()) {
                 if (await this.hasDefaultServiceChanged()) {
-                    throw ( new UserDataAutoSyncError(( localize(2461, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2503, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 } else {
-                    throw ( new UserDataAutoSyncError(( localize(2462, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2504, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             } else {
-                throw ( new UserDataAutoSyncError(( localize(2463, "Cannot sync because syncing is turned off in the cloud")), UserDataSyncErrorCode.TurnedOff));
+                throw ( new UserDataAutoSyncError(( localize(2505, "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(2461, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2503, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 } else {
-                    throw ( new UserDataAutoSyncError(( localize(2462, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2504, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             } else {
-                throw ( new UserDataAutoSyncError(( localize(2464, "Cannot sync because current session is expired")), UserDataSyncErrorCode.SessionExpired));
+                throw ( new UserDataAutoSyncError(( localize(2506, "Cannot sync because current session is expired")), UserDataSyncErrorCode.SessionExpired));
             }
         }
         const machines = await this.userDataSyncMachinesService.getMachines(this.manifest || undefined);
@@ -494,7 +506,7 @@ class AutoSync extends Disposable {
         const currentMachine = machines.find(machine => machine.isCurrent);
         if (currentMachine?.disabled) {
             throw ( new UserDataAutoSyncError(( localize(
-                2465,
+                2507,
                 "Cannot sync because syncing is turned off on this machine from another machine."
             )), UserDataSyncErrorCode.TurnedOff));
         }

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

@@ -16,9 +16,9 @@ let UserDataSyncEnablementService$1 = class UserDataSyncEnablementService extend
         this.storageService = storageService;
         this.environmentService = environmentService;
         this.userDataSyncStoreManagementService = userDataSyncStoreManagementService;
-        this._onDidChangeEnablement = ( new Emitter());
+        this._onDidChangeEnablement = this._register(( new Emitter()));
         this.onDidChangeEnablement = this._onDidChangeEnablement.event;
-        this._onDidChangeResourceEnablement = ( new Emitter());
+        this._onDidChangeResourceEnablement = this._register(( new Emitter()));
         this.onDidChangeResourceEnablement = this._onDidChangeResourceEnablement.event;
         this._register(
             storageService.onDidChangeValue(StorageScope.APPLICATION, undefined, this._store)(e => this.onDidStorageChange(e))

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

@@ -13,7 +13,7 @@ let UserDataSyncLogService = class UserDataSyncLogService extends AbstractLogger
         this.logger = this._register(
             loggerService.createLogger(joinPath(environmentService.logsHome, `${USER_DATA_SYNC_LOG_ID}.log`), {
                 id: USER_DATA_SYNC_LOG_ID,
-                name: ( localize(2471, "Settings Sync"))
+                name: ( localize(2513, "Settings Sync"))
             })
         );
     }

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

@@ -580,7 +580,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             this.logService.error(error);
         }
         throw ( new UserDataSyncError(( localize(
-            2473,
+            2515,
             "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

@@ -39,11 +39,11 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
         case UserDataSyncErrorCode.LocalTooManyRequests:
             {
                 const message = isWeb ? ( localize(
-                    13594,
+                    14688,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please reload {0} to resume.",
                     this.productService.nameLong
                 )) : ( localize(
-                    13595,
+                    14689,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please restart {0} to resume.",
                     this.productService.nameLong
                 ));
@@ -53,11 +53,11 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
                     actions: {
                         primary: [toAction({
                             id: "Show Sync Logs",
-                            label: ( localize(13596, "Show Log")),
+                            label: ( localize(14690, "Show Log")),
                             run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                         }), toAction({
                             id: "Restart",
-                            label: isWeb ? ( localize(13597, "Reload")) : ( localize(13598, "Restart")),
+                            label: isWeb ? ( localize(14691, "Reload")) : ( localize(14692, "Restart")),
                             run: () => this.hostService.restart()
                         })]
                     }
@@ -66,19 +66,19 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
             }
         case UserDataSyncErrorCode.TooManyRequests:
             {
-                const operationId = error.operationId ? ( localize(13599, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(14693, "Operation Id: {0}", error.operationId)) : undefined;
                 const message = ( localize(
-                    13600,
+                    14694,
                     "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(13601, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
+                    source: error.operationId ? ( localize(14695, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
                     actions: {
                         primary: [toAction({
                             id: "Show Sync Logs",
-                            label: ( localize(13596, "Show Log")),
+                            label: ( localize(14690, "Show Log")),
                             run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                         })]
                     }

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

@@ -51,33 +51,33 @@ import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severit
 
 const turnOffSyncCommand = {
     id: "workbench.userDataSync.actions.turnOff",
-    title: ( localize2(13602, "Turn Off"))
+    title: ( localize2(14696, "Turn Off"))
 };
 const configureSyncCommand = {
     id: CONFIGURE_SYNC_COMMAND_ID,
-    title: ( localize2(13603, "Configure..."))
+    title: ( localize2(14697, "Configure..."))
 };
 const showConflictsCommandId = "workbench.userDataSync.actions.showConflicts";
 const syncNowCommand = {
     id: "workbench.userDataSync.actions.syncNow",
-    title: ( localize2(13604, "Sync Now")),
+    title: ( localize2(14698, "Sync Now")),
     description(userDataSyncService) {
         if (userDataSyncService.status === SyncStatus.Syncing) {
-            return localize(13605, "syncing");
+            return localize(14699, "syncing");
         }
         if (userDataSyncService.lastSyncTime) {
-            return localize(13606, "synced {0}", fromNow(userDataSyncService.lastSyncTime, true));
+            return localize(14700, "synced {0}", fromNow(userDataSyncService.lastSyncTime, true));
         }
         return undefined;
     }
 };
 const showSyncSettingsCommand = {
     id: "workbench.userDataSync.actions.settings",
-    title: ( localize2(13607, "Show Settings"))
+    title: ( localize2(14701, "Show Settings"))
 };
 const showSyncedDataCommand = {
     id: "workbench.userDataSync.actions.showSyncedData",
-    title: ( localize2(13608, "Show Synced Data"))
+    title: ( localize2(14702, "Show Synced Data"))
 };
 const CONTEXT_TURNING_ON_STATE = ( new RawContextKey("userDataSyncTurningOn", false));
 let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution extends Disposable {
@@ -203,21 +203,21 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 if (!( this.conflictsDisposables.has(key))) {
                     const conflictsArea = getSyncAreaLabel(conflict.syncResource);
                     const handle = this.notificationService.prompt(Severity.Warning, ( localize(
-                        13609,
+                        14703,
                         "Unable to sync due to conflicts in {0}. Please resolve them to continue.",
                         conflictsArea.toLowerCase()
                     )), [{
-                        label: ( localize(13610, "Replace Remote")),
+                        label: ( localize(14704, "Replace Remote")),
                         run: () => {
                             this.acceptLocal(conflict, conflict.conflicts[0]);
                         }
                     }, {
-                        label: ( localize(13611, "Replace Local")),
+                        label: ( localize(14705, "Replace Local")),
                         run: () => {
                             this.acceptRemote(conflict, conflict.conflicts[0]);
                         }
                     }, {
-                        label: ( localize(13612, "Show Conflicts")),
+                        label: ( localize(14706, "Show Conflicts")),
                         run: () => {
                             this.telemetryService.publicLog2("sync/showConflicts", {
                                 source: conflict.syncResource
@@ -248,7 +248,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             );
         } catch (e) {
             this.notificationService.error(( localize(
-                13613,
+                14707,
                 "Error while accepting changes. Please check [logs]({0}) for more details.",
                 `command:${SHOW_SYNC_LOG_COMMAND_ID}`
             )));
@@ -264,7 +264,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             );
         } catch (e) {
             this.notificationService.error(( localize(
-                13613,
+                14707,
                 "Error while accepting changes. Please check [logs]({0}) for more details.",
                 `command:${SHOW_SYNC_LOG_COMMAND_ID}`
             )));
@@ -276,13 +276,13 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             this.notificationService.notify({
                 severity: Severity.Info,
                 message: ( localize(
-                    13614,
+                    14708,
                     "Settings sync was turned off because current session is expired, please sign in again to turn on sync."
                 )),
                 actions: {
                     primary: [toAction({
                         id: "turn on sync",
-                        label: ( localize(13615, "Turn on Settings Sync...")),
+                        label: ( localize(14709, "Turn on Settings Sync...")),
                         run: () => this.turnOn()
                     })]
                 }
@@ -292,13 +292,13 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             this.notificationService.notify({
                 severity: Severity.Info,
                 message: ( localize(
-                    13616,
+                    14710,
                     "Settings sync was turned off from another device, please turn on sync again."
                 )),
                 actions: {
                     primary: [toAction({
                         id: "turn on sync",
-                        label: ( localize(13615, "Turn on Settings Sync...")),
+                        label: ( localize(14709, "Turn on Settings Sync...")),
                         run: () => this.turnOn()
                     })]
                 }
@@ -309,7 +309,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 this.disableSync(error.resource);
                 const sourceArea = getSyncAreaLabel(error.resource);
                 this.handleTooLargeError(error.resource, ( localize(
-                    13617,
+                    14711,
                     "Disabled syncing {0} because size of the {1} file to sync is larger than {2}. Please open the file and reduce the size and enable sync",
                     sourceArea.toLowerCase(),
                     sourceArea.toLowerCase(),
@@ -320,7 +320,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         case UserDataSyncErrorCode.LocalTooManyProfiles:
             this.disableSync(SyncResource.Profiles);
             this.notificationService.error(( localize(
-                13618,
+                14712,
                 "Disabled syncing profiles because there are too many profiles to sync. Settings Sync supports syncing maximum 20 profiles. Please reduce the number of profiles and enable sync"
             )));
             break;
@@ -329,12 +329,12 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         case UserDataSyncErrorCode.UpgradeRequired:
             {
                 const message = ( localize(
-                    13619,
+                    14713,
                     "Settings sync is disabled because the current version ({0}, {1}) is not compatible with the sync service. Please update before turning on sync.",
                     this.productService.version,
                     this.productService.commit
                 ));
-                const operationId = error.operationId ? ( localize(13620, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(14714, "Operation Id: {0}", error.operationId)) : undefined;
                 this.notificationService.notify({
                     severity: Severity.Error,
                     message: operationId ? `${message} ${operationId}` : message
@@ -344,21 +344,21 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         case UserDataSyncErrorCode.MethodNotFound:
             {
                 const message = ( localize(
-                    13621,
+                    14715,
                     "Settings sync is disabled because the client is making invalid requests. Please report an issue with the logs."
                 ));
-                const operationId = error.operationId ? ( localize(13620, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(14714, "Operation Id: {0}", error.operationId)) : undefined;
                 this.notificationService.notify({
                     severity: Severity.Error,
                     message: operationId ? `${message} ${operationId}` : message,
                     actions: {
                         primary: [toAction({
                             id: "Show Sync Logs",
-                            label: ( localize(13622, "Show Log")),
+                            label: ( localize(14716, "Show Log")),
                             run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                         }), toAction({
                             id: "Report Issue",
-                            label: ( localize(13623, "Report Issue")),
+                            label: ( localize(14717, "Report Issue")),
                             run: () => this.workbenchIssueService.openReporter()
                         })]
                     }
@@ -369,17 +369,17 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             this.notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    13624,
+                    14718,
                     "Settings sync is disabled because your data in the cloud is older than that of the client. Please clear your data in the cloud before turning on sync."
                 )),
                 actions: {
                     primary: [toAction({
                         id: "reset",
-                        label: ( localize(13625, "Clear Data in Cloud...")),
+                        label: ( localize(14719, "Clear Data in Cloud...")),
                         run: () => this.userDataSyncWorkbenchService.resetSyncedData()
                     }), toAction({
                         id: "show synced data",
-                        label: ( localize(13626, "Show Synced Data")),
+                        label: ( localize(14720, "Show Synced Data")),
                         run: () => this.userDataSyncWorkbenchService.showSyncActivity()
                     })]
                 }
@@ -388,7 +388,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         case UserDataSyncErrorCode.ServiceChanged:
             this.notificationService.notify({
                 severity: Severity.Info,
-                message: this.userDataSyncStoreManagementService.userDataSyncStore?.type === "insiders" ? ( localize(13627, "Settings Sync has been switched to insiders service")) : ( localize(13628, "Settings Sync has been switched to stable service"))
+                message: this.userDataSyncStoreManagementService.userDataSyncStore?.type === "insiders" ? ( localize(14721, "Settings Sync has been switched to insiders service")) : ( localize(14722, "Settings Sync has been switched to stable service"))
             });
             return;
         case UserDataSyncErrorCode.DefaultServiceChanged:
@@ -396,7 +396,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 this.notificationService.notify({
                     severity: Severity.Info,
                     message: ( localize(
-                        13629,
+                        14723,
                         "Settings sync now uses a separate service, more information is available in the [Settings Sync Documentation](https://aka.ms/vscode-settings-sync-help#_syncing-stable-versus-insiders)."
                     ))
                 });
@@ -405,14 +405,14 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 this.notificationService.notify({
                     severity: Severity.Info,
                     message: ( localize(
-                        13630,
+                        14724,
                         "Settings sync was turned off because {0} now uses a separate service. Please turn on sync again.",
                         this.productService.nameLong
                     )),
                     actions: {
                         primary: [toAction({
                             id: "turn on sync",
-                            label: ( localize(13615, "Turn on Settings Sync...")),
+                            label: ( localize(14709, "Turn on Settings Sync...")),
                             run: () => this.turnOn()
                         })]
                     }
@@ -422,14 +422,14 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         }
     }
     handleTooLargeError(resource, message, error) {
-        const operationId = error.operationId ? ( localize(13620, "Operation Id: {0}", error.operationId)) : undefined;
+        const operationId = error.operationId ? ( localize(14714, "Operation Id: {0}", error.operationId)) : undefined;
         this.notificationService.notify({
             severity: Severity.Error,
             message: operationId ? `${message} ${operationId}` : message,
             actions: {
                 primary: [toAction({
                     id: "open sync file",
-                    label: ( localize(13631, "Open {0} File", getSyncAreaLabel(resource))),
+                    label: ( localize(14725, "Open {0} File", getSyncAreaLabel(resource))),
                     run: () => resource === SyncResource.Settings ? this.preferencesService.openUserSettings({
                         jsonEditor: true
                     }) : this.preferencesService.openGlobalKeybindingSettings(true)
@@ -497,14 +497,14 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         const handle = this.notificationService.notify({
             severity: Severity.Error,
             message: ( localize(
-                13632,
+                14726,
                 "Unable to sync {0} because the content in the file is not valid. Please open the file and correct it.",
                 errorArea.toLowerCase()
             )),
             actions: {
                 primary: [toAction({
                     id: "open sync file",
-                    label: ( localize(13631, "Open {0} File", errorArea)),
+                    label: ( localize(14725, "Open {0} File", errorArea)),
                     run: () => source === SyncResource.Settings ? this.preferencesService.openUserSettings({
                         jsonEditor: true
                     }) : this.preferencesService.openGlobalKeybindingSettings(true)
@@ -530,9 +530,9 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         this.globalActivityBadgeDisposable.clear();
         let badge = undefined;
         if (this.userDataSyncService.conflicts.length && this.userDataSyncEnablementService.isEnabled()) {
-            badge = ( new NumberBadge(this.getConflictsCount(), () => ( localize(13633, "{0}: Conflicts Detected", SYNC_TITLE.value))));
+            badge = ( new NumberBadge(this.getConflictsCount(), () => ( localize(14727, "{0}: Conflicts Detected", SYNC_TITLE.value))));
         } else if (this.turningOnSync) {
-            badge = ( new ProgressBadge(() => ( localize(13634, "Turning on Settings Sync..."))));
+            badge = ( new ProgressBadge(() => ( localize(14728, "Turning on Settings Sync..."))));
         }
         if (badge) {
             this.globalActivityBadgeDisposable.value = this.activityService.showGlobalActivity({
@@ -544,7 +544,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         this.accountBadgeDisposable.clear();
         let badge = undefined;
         if (this.userDataSyncService.status !== SyncStatus.Uninitialized && this.userDataSyncEnablementService.isEnabled() && this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Unavailable) {
-            badge = ( new NumberBadge(1, () => ( localize(13635, "Sign in to Sync Settings"))));
+            badge = ( new NumberBadge(1, () => ( localize(14729, "Sign in to Sync Settings"))));
         }
         if (badge) {
             this.accountBadgeDisposable.value = this.activityService.showAccountsActivity({
@@ -555,7 +555,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
     async turnOn() {
         try {
             if (!this.userDataSyncWorkbenchService.authenticationProviders.length) {
-                throw ( new Error(( localize(13636, "No authentication providers are available."))));
+                throw ( new Error(( localize(14730, "No authentication providers are available."))));
             }
             const turnOn = await this.askToConfigure();
             if (!turnOn) {
@@ -574,7 +574,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 case UserDataSyncErrorCode.TooLarge:
                     if (e.resource === SyncResource.Keybindings || e.resource === SyncResource.Settings || e.resource === SyncResource.Tasks) {
                         this.handleTooLargeError(e.resource, ( localize(
-                            13637,
+                            14731,
                             "Settings sync cannot be turned on because size of the {0} file to sync is larger than {1}. Please open the file and reduce the size and turn on sync",
                             getSyncAreaLabel(e.resource).toLowerCase(),
                             "100kb"
@@ -587,12 +587,12 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 case UserDataSyncErrorCode.UpgradeRequired:
                     {
                         const message = ( localize(
-                            13638,
+                            14732,
                             "Settings sync cannot be turned on because the current version ({0}, {1}) is not compatible with the sync service. Please update before turning on sync.",
                             this.productService.version,
                             this.productService.commit
                         ));
-                        const operationId = e.operationId ? ( localize(13620, "Operation Id: {0}", e.operationId)) : undefined;
+                        const operationId = e.operationId ? ( localize(14714, "Operation Id: {0}", e.operationId)) : undefined;
                         this.notificationService.notify({
                             severity: Severity.Error,
                             message: operationId ? `${message} ${operationId}` : message
@@ -603,17 +603,17 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                     this.notificationService.notify({
                         severity: Severity.Error,
                         message: ( localize(
-                            13639,
+                            14733,
                             "Settings sync cannot be turned on because your data in the cloud is older than that of the client. Please clear your data in the cloud before turning on sync."
                         )),
                         actions: {
                             primary: [toAction({
                                 id: "reset",
-                                label: ( localize(13625, "Clear Data in Cloud...")),
+                                label: ( localize(14719, "Clear Data in Cloud...")),
                                 run: () => this.userDataSyncWorkbenchService.resetSyncedData()
                             }), toAction({
                                 id: "show synced data",
-                                label: ( localize(13626, "Show Synced Data")),
+                                label: ( localize(14720, "Show Synced Data")),
                                 run: () => this.userDataSyncWorkbenchService.showSyncActivity()
                             })]
                         }
@@ -621,16 +621,16 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                     return;
                 case UserDataSyncErrorCode.Unauthorized:
                 case UserDataSyncErrorCode.Forbidden:
-                    this.notificationService.error(( localize(13640, "Error while turning on Settings Sync: Authentication failed.")));
+                    this.notificationService.error(( localize(14734, "Error while turning on Settings Sync: Authentication failed.")));
                     return;
                 }
                 this.notificationService.error(( localize(
-                    13641,
+                    14735,
                     "Error while turning on Settings Sync. Please check [logs]({0}) for more details.",
                     `command:${SHOW_SYNC_LOG_COMMAND_ID}`
                 )));
             } else {
-                this.notificationService.error(( localize(13642, "Error while turning on Settings Sync. {0}", getErrorMessage(e))));
+                this.notificationService.error(( localize(14736, "Error while turning on Settings Sync. {0}", getErrorMessage(e))));
             }
         }
     }
@@ -642,8 +642,8 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             quickPick.title = SYNC_TITLE.value;
             quickPick.ok = false;
             quickPick.customButton = true;
-            quickPick.customLabel = ( localize(13643, "Sign in"));
-            quickPick.description = ( localize(13644, "Please sign in to backup and sync your data across devices."));
+            quickPick.customLabel = ( localize(14737, "Sign in"));
+            quickPick.description = ( localize(14738, "Please sign in to backup and sync your data across devices."));
             quickPick.canSelectMany = true;
             quickPick.ignoreFocusOut = true;
             quickPick.hideInput = true;
@@ -718,8 +718,8 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             const disposables = ( new DisposableStore());
             const quickPick = this.quickInputService.createQuickPick();
             disposables.add(quickPick);
-            quickPick.title = ( localize(13645, "{0}: Configure...", SYNC_TITLE.value));
-            quickPick.placeholder = ( localize(13646, "Choose what to sync"));
+            quickPick.title = ( localize(14739, "{0}: Configure...", SYNC_TITLE.value));
+            quickPick.placeholder = ( localize(14740, "Choose what to sync"));
             quickPick.canSelectMany = true;
             quickPick.ignoreFocusOut = true;
             quickPick.ok = true;
@@ -741,15 +741,15 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
     }
     async turnOff() {
         const result = await this.dialogService.confirm({
-            message: ( localize(13647, "Do you want to turn off sync?")),
+            message: ( localize(14741, "Do you want to turn off sync?")),
             detail: ( localize(
-                13648,
+                14742,
                 "Your settings, keybindings, extensions, snippets and UI State will no longer be synced."
             )),
-            primaryButton: ( localize(13649, "&&Turn off")),
+            primaryButton: ( localize(14743, "&&Turn off")),
             checkbox: this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Available ? {
                 label: ( localize(
-                    13650,
+                    14744,
                     "Turn off sync on all your devices and clear the data from the cloud."
                 ))
             } : undefined
@@ -783,9 +783,9 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         return (new Promise((c, e) => {
             const disposables = ( new DisposableStore());
             const quickPick = disposables.add(this.quickInputService.createQuickPick());
-            quickPick.title = ( localize(13651, "{0}: Select Service", SYNC_TITLE.value));
+            quickPick.title = ( localize(14745, "{0}: Select Service", SYNC_TITLE.value));
             quickPick.description = ( localize(
-                13652,
+                14746,
                 "Ensure you are using the same settings sync service when syncing with multiple environments"
             ));
             quickPick.hideInput = true;
@@ -793,17 +793,17 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             const getDescription = url => {
                 const isDefault = isEqual(url, userDataSyncStore.defaultUrl);
                 if (isDefault) {
-                    return localize(13653, "Default");
+                    return localize(14747, "Default");
                 }
                 return undefined;
             };
             quickPick.items = [{
                 id: "insiders",
-                label: ( localize(13654, "Insiders")),
+                label: ( localize(14748, "Insiders")),
                 description: getDescription(userDataSyncStore.insidersUrl)
             }, {
                 id: "stable",
-                label: ( localize(13655, "Stable")),
+                label: ( localize(14749, "Stable")),
                 description: getDescription(userDataSyncStore.stableUrl)
             }];
             disposables.add(quickPick.onDidAccept(async () => {
@@ -849,7 +849,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.userDataSync.actions.turnOn",
-                    title: ( localize2(13656, "Backup and Sync Settings...")),
+                    title: ( localize2(14750, "Backup and Sync Settings...")),
                     category: SYNC_TITLE,
                     f1: true,
                     precondition: when,
@@ -882,7 +882,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.userData.actions.turningOn",
-                    title: ( localize(13657, "Turning on Settings Sync...")),
+                    title: ( localize(14751, "Turning on Settings Sync...")),
                     precondition: ( ContextKeyExpr.false()),
                     menu: [{
                         group: "3_configuration",
@@ -905,7 +905,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.userData.actions.cancelTurnOn",
-                    title: ( localize(13658, "Cancel")),
+                    title: ( localize(14752, "Cancel")),
                     icon: Codicon.stopCircle,
                     menu: {
                         id: MenuId.ViewContainerTitle,
@@ -928,7 +928,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.userData.actions.signin",
-                    title: ( localize(13659, "Sign in to Sync Settings")),
+                    title: ( localize(14753, "Sign in to Sync Settings")),
                     menu: {
                         group: "3_configuration",
                         id: MenuId.GlobalActivity,
@@ -949,13 +949,13 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             group: "1_settings",
             command: {
                 id,
-                title: ( localize(13660, "Sign in to Sync Settings (1)"))
+                title: ( localize(14754, "Sign in to Sync Settings (1)"))
             },
             when
         })));
     }
     getShowConflictsTitle() {
-        return localize2(13661, "Show Conflicts ({0})", this.getConflictsCount());
+        return localize2(14755, "Show Conflicts ({0})", this.getConflictsCount());
     }
     registerShowConflictsAction() {
         this.conflictsActionDisposable.value = undefined;
@@ -995,7 +995,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.userDataSync.actions.manage",
-                    title: ( localize(13662, "Settings Sync is On")),
+                    title: ( localize(14756, "Settings Sync is On")),
                     toggled: ContextKeyTrueExpr.INSTANCE,
                     menu: [{
                         id: MenuId.GlobalActivity,
@@ -1137,7 +1137,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 } catch (e) {
                     if (!isCancellationError(e)) {
                         that.notificationService.error(( localize(
-                            13663,
+                            14757,
                             "Error while turning off Settings Sync. Please check [logs]({0}) for more details.",
                             `command:${SHOW_SYNC_LOG_COMMAND_ID}`
                         )));
@@ -1156,7 +1156,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                     title: configureSyncCommand.title,
                     category: SYNC_TITLE,
                     icon: Codicon.settingsGear,
-                    tooltip: ( localize(13664, "Configure...")),
+                    tooltip: ( localize(14758, "Configure...")),
                     menu: [{
                         id: MenuId.CommandPalette,
                         when
@@ -1179,8 +1179,8 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: SHOW_SYNC_LOG_COMMAND_ID,
-                    title: ( localize(13665, "{0}: Show Log", SYNC_TITLE.value)),
-                    tooltip: ( localize(13666, "Show Log")),
+                    title: ( localize(14759, "{0}: Show Log", SYNC_TITLE.value)),
+                    tooltip: ( localize(14760, "Show Log")),
                     icon: Codicon.output,
                     menu: [{
                         id: MenuId.CommandPalette,
@@ -1252,7 +1252,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.userDataSync.actions.acceptMerges",
-                    title: ( localize(13667, "Complete Merge")),
+                    title: ( localize(14761, "Complete Merge")),
                     menu: [{
                         id: MenuId.EditorContent,
                         when: ( ContextKeyExpr.and(ctxIsMergeResultEditor, ( ContextKeyExpr.regex(ctxMergeBaseUri.key, ( new RegExp(`^${USER_DATA_SYNC_SCHEME}:`))))))
@@ -1293,7 +1293,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                 const notificationService = accessor.get(INotificationService);
                 const folder = await userDataSyncWorkbenchService.downloadSyncActivity();
                 if (folder) {
-                    notificationService.info(( localize(13668, "Successfully downloaded Settings Sync activity.")));
+                    notificationService.info(( localize(14762, "Successfully downloaded Settings Sync activity.")));
                 }
             }
         }));
@@ -1319,7 +1319,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.actions.syncData.reset",
-                    title: ( localize(13669, "Clear Data in Cloud...")),
+                    title: ( localize(14763, "Clear Data in Cloud...")),
                     menu: [{
                         id: MenuId.ViewContainerTitle,
                         when: ( ContextKeyExpr.equals("viewContainer", SYNC_VIEW_CONTAINER_ID)),

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

@@ -76,7 +76,7 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
     renderTreeView(container) {
         super.renderTreeView(append(container, $("")));
         const that = this;
-        this.treeView.message = ( localize(13670, "Please go through each entry and merge to resolve conflicts."));
+        this.treeView.message = ( localize(14764, "Please go through each entry and merge to resolve conflicts."));
         this.treeView.dataProvider = {
             getChildren() {
                 return that.getTreeItems();
@@ -157,7 +157,7 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
             constructor() {
                 super({
                     id: `workbench.actions.sync.openConflicts`,
-                    title: ( localize(13671, "Show Conflicts"))
+                    title: ( localize(14765, "Show Conflicts"))
                 });
             }
             async run(accessor, handle) {
@@ -169,7 +169,7 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
             constructor() {
                 super({
                     id: `workbench.actions.sync.acceptRemote`,
-                    title: ( localize(13672, "Accept Remote")),
+                    title: ( localize(14766, "Accept Remote")),
                     icon: Codicon.cloudDownload,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -191,7 +191,7 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
             constructor() {
                 super({
                     id: `workbench.actions.sync.acceptLocal`,
-                    title: ( localize(13673, "Accept Local")),
+                    title: ( localize(14767, "Accept Local")),
                     icon: Codicon.cloudUpload,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -222,17 +222,17 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
         ) => isEqual(localResource, conflictToOpen.localResource)))))) {
             return;
         }
-        const remoteResourceName = ( localize(13674, "{0} (Remote)", basename(conflictToOpen.remoteResource)));
-        const localResourceName = ( localize(13675, "{0} (Local)", basename(conflictToOpen.remoteResource)));
+        const remoteResourceName = ( localize(14768, "{0} (Remote)", basename(conflictToOpen.remoteResource)));
+        const localResourceName = ( localize(14769, "{0} (Local)", basename(conflictToOpen.remoteResource)));
         await this.editorService.openEditor({
             input1: {
                 resource: conflictToOpen.remoteResource,
-                label: ( localize(13676, "Theirs")),
+                label: ( localize(14770, "Theirs")),
                 description: remoteResourceName
             },
             input2: {
                 resource: conflictToOpen.localResource,
-                label: ( localize(13677, "Yours")),
+                label: ( localize(14771, "Yours")),
                 description: localResourceName
             },
             base: {

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

@@ -61,7 +61,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
     }
     registerConflictsView(container) {
         const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
-        const viewName = ( localize2(13678, "Conflicts"));
+        const viewName = ( localize2(14772, "Conflicts"));
         const viewDescriptor = {
             id: SYNC_CONFLICTS_VIEW_ID,
             name: viewName,
@@ -77,7 +77,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
     }
     registerMachinesView(container) {
         const id = `workbench.views.sync.machines`;
-        const name = ( localize2(13679, "Synced Machines"));
+        const name = ( localize2(14773, "Synced Machines"));
         const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
         const dataProvider = this.instantiationService.createInstance(UserDataSyncMachinesViewDataProvider, treeView);
         treeView.showRefreshAction = true;
@@ -104,7 +104,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.sync.editMachineName`,
-                    title: ( localize(13680, "Edit Name")),
+                    title: ( localize(14774, "Edit Name")),
                     icon: Codicon.edit,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -124,7 +124,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.sync.turnOffSyncOnMachine`,
-                    title: ( localize(13681, "Turn off Settings Sync")),
+                    title: ( localize(14775, "Turn off Settings Sync")),
                     menu: {
                         id: MenuId.ViewItemContext,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", id)), ( ContextKeyExpr.equals("viewItem", "sync-machine"))))
@@ -140,7 +140,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
     }
     registerActivityView(container, remote) {
         const id = `workbench.views.sync.${remote ? "remote" : "local"}Activity`;
-        const name = remote ? ( localize2(13682, "Sync Activity (Remote)")) : ( localize2(13683, "Sync Activity (Local)"));
+        const name = remote ? ( localize2(14776, "Sync Activity (Remote)")) : ( localize2(14777, "Sync Activity (Local)"));
         const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
         treeView.showCollapseAllAction = true;
         treeView.showRefreshAction = true;
@@ -169,7 +169,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
     }
     registerExternalActivityView(container) {
         const id = `workbench.views.sync.externalActivity`;
-        const name = ( localize2(13684, "Sync Activity (Developer)"));
+        const name = ( localize2(14778, "Sync Activity (Developer)"));
         const dataProvider = this.instantiationService.createInstance(ExtractedUserDataSyncActivityViewDataProvider, undefined);
         const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
         treeView.showCollapseAllAction = false;
@@ -192,7 +192,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.sync.loadActivity`,
-                    title: ( localize(13685, "Load Sync Activity")),
+                    title: ( localize(14779, "Load Sync Activity")),
                     icon: Codicon.cloudUpload,
                     menu: {
                         id: MenuId.ViewTitle,
@@ -204,7 +204,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
             async run(accessor) {
                 const fileDialogService = accessor.get(IFileDialogService);
                 const result = await fileDialogService.showOpenDialog({
-                    title: ( localize(13686, "Select Sync Activity File or Folder")),
+                    title: ( localize(14780, "Select Sync Activity File or Folder")),
                     canSelectFiles: true,
                     canSelectFolders: true,
                     canSelectMany: false
@@ -222,7 +222,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.sync.${viewId}.resolveResource`,
-                    title: ( localize(13687, "Show raw JSON sync data")),
+                    title: ( localize(14781, "Show raw JSON sync data")),
                     menu: {
                         id: MenuId.ViewItemContext,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", viewId)), ( ContextKeyExpr.regex("viewItem", /sync-resource-.*/i))))
@@ -246,7 +246,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.sync.${viewId}.compareWithLocal`,
-                    title: ( localize(13688, "Compare with Local")),
+                    title: ( localize(14782, "Compare with Local")),
                     menu: {
                         id: MenuId.ViewItemContext,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", viewId)), ( ContextKeyExpr.regex("viewItem", /sync-associatedResource-.*/i))))
@@ -266,10 +266,10 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                     remoteResource,
                     localResource,
                     ( localize(
-                    13689,
+                    14783,
                     "{0} ↔ {1}",
-                    localize(13690, "{0} (Remote)", basename(remoteResource)),
-                    localize(13691, "{0} (Local)", basename(localResource))
+                    localize(14784, "{0} (Remote)", basename(remoteResource)),
+                    localize(14785, "{0} (Local)", basename(localResource))
                 )),
                     undefined
                 );
@@ -279,7 +279,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.sync.${viewId}.replaceCurrent`,
-                    title: ( localize(13692, "Restore")),
+                    title: ( localize(14786, "Restore")),
                     icon: Codicon.discard,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -297,7 +297,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                 } = JSON.parse(handle.$treeItemHandle);
                 const result = await dialogService.confirm({
                     message: ( localize(
-                        13693,
+                        14787,
                         "Would you like to replace your current {0} with selected?",
                         getSyncAreaLabel(syncResource)
                     )),
@@ -315,7 +315,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
     }
     registerTroubleShootView(container) {
         const id = `workbench.views.sync.troubleshoot`;
-        const name = ( localize2(13694, "Troubleshoot"));
+        const name = ( localize2(14788, "Troubleshoot"));
         const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
         const dataProvider = this.instantiationService.createInstance(UserDataSyncTroubleshootViewDataProvider);
         treeView.showRefreshAction = true;
@@ -381,7 +381,7 @@ let UserDataSyncActivityViewDataProvider = class UserDataSyncActivityViewDataPro
                     actions: {
                         primary: [toAction({
                             id: "reset",
-                            label: ( localize(13695, "Reset Synced Data")),
+                            label: ( localize(14789, "Reset Synced Data")),
                             run: () => this.userDataSyncWorkbenchService.resetSyncedData()
                         })]
                     }
@@ -445,7 +445,7 @@ let UserDataSyncActivityViewDataProvider = class UserDataSyncActivityViewDataPro
                     id: API_OPEN_DIFF_EDITOR_COMMAND_ID,
                     title: "",
                     arguments: [previousResource, resource, ( localize(
-                        13696,
+                        14790,
                         "{0} ↔ {1}",
                         `${basename(resource)} (${fromNow(syncResourceHandle.previous.created, true)})`,
                         `${basename(resource)} (${fromNow(syncResourceHandle.created, true)})`
@@ -553,7 +553,7 @@ let RemoteUserDataSyncActivityViewDataProvider = class RemoteUserDataSyncActivit
                         id
                     }
                 ) => id === machineId);
-                children[0].description = machine?.isCurrent ? ( localize(13697, "Current")) : machine?.name;
+                children[0].description = machine?.isCurrent ? ( localize(14791, "Current")) : machine?.name;
             }
         }
         return children;
@@ -625,7 +625,7 @@ let ExtractedUserDataSyncActivityViewDataProvider = class ExtractedUserDataSyncA
                         id
                     }
                 ) => id === machineId);
-                children[0].description = machine?.isCurrent ? ( localize(13697, "Current")) : machine?.name;
+                children[0].description = machine?.isCurrent ? ( localize(14791, "Current")) : machine?.name;
             }
         }
         return children;
@@ -661,7 +661,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
         try {
             let machines = await this.getMachines();
             machines = machines.filter(m => !m.disabled).sort((m1, m2) => m1.isCurrent ? -1 : 1);
-            this.treeView.message = machines.length ? undefined : ( localize(13698, "No Machines"));
+            this.treeView.message = machines.length ? undefined : ( localize(14792, "No Machines"));
             return (machines.map((
                 {
                     id,
@@ -675,7 +675,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
                 label: {
                     label: name
                 },
-                description: isCurrent ? ( localize(13697, "Current")) : undefined,
+                description: isCurrent ? ( localize(14791, "Current")) : undefined,
                 themeIcon: platform && isWebPlatform(platform) ? Codicon.globe : Codicon.vm,
                 contextValue: "sync-machine"
             })));
@@ -698,16 +698,16 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
             }
         ) => machineIds.includes(id));
         if (!machinesToDisable.length) {
-            throw ( new Error(( localize(13699, "machine not found with id: {0}", machineIds.join(",")))));
+            throw ( new Error(( localize(14793, "machine not found with id: {0}", machineIds.join(",")))));
         }
         const result = await this.dialogService.confirm({
             type: "info",
-            message: machinesToDisable.length > 1 ? ( localize(13700, "Are you sure you want to turn off sync on selected machines?")) : ( localize(
-                13701,
+            message: machinesToDisable.length > 1 ? ( localize(14794, "Are you sure you want to turn off sync on selected machines?")) : ( localize(
+                14795,
                 "Are you sure you want to turn off sync on {0}?",
                 machinesToDisable[0].name
             )),
-            primaryButton: ( localize(13702, "&&Turn off"))
+            primaryButton: ( localize(14796, "&&Turn off"))
         });
         if (!result.confirmed) {
             return false;
@@ -724,7 +724,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
     async rename(machineId) {
         const disposableStore = ( new DisposableStore());
         const inputBox = disposableStore.add(this.quickInputService.createInputBox());
-        inputBox.placeholder = ( localize(13703, "Enter the name of the machine"));
+        inputBox.placeholder = ( localize(14797, "Enter the name of the machine"));
         inputBox.busy = true;
         inputBox.show();
         const machines = await this.getMachines();
@@ -741,7 +741,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
         if (!machine) {
             inputBox.hide();
             disposableStore.dispose();
-            throw ( new Error(( localize(13699, "machine not found with id: {0}", machineId))));
+            throw ( new Error(( localize(14793, "machine not found with id: {0}", machineId))));
         }
         inputBox.busy = false;
         inputBox.value = machine.name;
@@ -750,7 +750,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
             return machineName && !( enabledMachines.some(m => m.id !== machineId && m.name === machineName)) ? machineName : null;
         };
         disposableStore.add(inputBox.onDidChangeValue(
-            () => inputBox.validationMessage = validateMachineName(inputBox.value) ? "" : ( localize(13704, "Machine name should be unique and not empty"))
+            () => inputBox.validationMessage = validateMachineName(inputBox.value) ? "" : ( localize(14798, "Machine name should be unique and not empty"))
         ));
         return ( new Promise((c, e) => {
             disposableStore.add(inputBox.onDidAccept(async () => {
@@ -789,14 +789,14 @@ let UserDataSyncTroubleshootViewDataProvider = class UserDataSyncTroubleshootVie
                 handle: "SYNC_LOGS",
                 collapsibleState: TreeItemCollapsibleState.Collapsed,
                 label: {
-                    label: ( localize(13705, "Logs"))
+                    label: ( localize(14799, "Logs"))
                 },
                 themeIcon: Codicon.folder
             }, {
                 handle: "LAST_SYNC_STATES",
                 collapsibleState: TreeItemCollapsibleState.Collapsed,
                 label: {
-                    label: ( localize(13706, "Last Synced Remotes"))
+                    label: ( localize(14800, "Last Synced Remotes"))
                 },
                 themeIcon: Codicon.folder
             }];
@@ -848,7 +848,7 @@ let UserDataSyncTroubleshootViewDataProvider = class UserDataSyncTroubleshootVie
                 label: {
                     label: this.uriIdentityService.extUri.basename(logFolder)
                 },
-                description: this.uriIdentityService.extUri.isEqual(logFolder, this.environmentService.logsHome) ? ( localize(13697, "Current")) : undefined,
+                description: this.uriIdentityService.extUri.isEqual(logFolder, this.environmentService.logsHome) ? ( localize(14791, "Current")) : undefined,
                 command: {
                     id: API_OPEN_EDITOR_COMMAND_ID,
                     title: "",

package/vscode/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.js

@@ -347,7 +347,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
     async turnOn() {
         if (!this.authenticationProviders.length) {
             throw ( new Error(( localize(
-                15157,
+                16282,
                 "Settings sync cannot be turned on because there are no authentication providers available."
             ))));
         }
@@ -362,7 +362,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
             throw ( new CancellationError());
         }
         if (this.accountStatus !== AccountStatus.Available) {
-            throw ( new Error(( localize(15158, "No account available"))));
+            throw ( new Error(( localize(16283, "No account available"))));
         }
         const turnOnSyncCancellationToken = this.turnOnSyncCancellationToken = ( new CancellationTokenSource());
         const disposable = isWeb ? Disposable.None : this.lifecycleService.onBeforeShutdown(e => e.veto((async () => {
@@ -370,10 +370,10 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
                 confirmed
             } = await this.dialogService.confirm({
                 type: "warning",
-                message: ( localize(15159, "Settings Sync is being turned on. Would you like to cancel it?")),
-                title: ( localize(15160, "Settings Sync")),
-                primaryButton: ( localize(15161, "&&Yes")),
-                cancelButton: ( localize(15162, "No"))
+                message: ( localize(16284, "Settings Sync is being turned on. Would you like to cancel it?")),
+                title: ( localize(16285, "Settings Sync")),
+                primaryButton: ( localize(16286, "&&Yes")),
+                cancelButton: ( localize(16287, "No"))
             });
             if (confirmed) {
                 turnOnSyncCancellationToken.cancel();
@@ -394,7 +394,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
         if (this.environmentService.options?.settingsSyncOptions?.enablementHandler && this.currentAuthenticationProviderId) {
             this.environmentService.options.settingsSyncOptions.enablementHandler(true, this.currentAuthenticationProviderId);
         }
-        this.notificationService.info(( localize(15163, "{0} is turned on", SYNC_TITLE.value)));
+        this.notificationService.info(( localize(16288, "{0} is turned on", SYNC_TITLE.value)));
         this._onDidTurnOnSync.fire();
     }
     async turnoff(everywhere) {
@@ -442,16 +442,16 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
                 delay: 500
             }, async progress => {
                 progress.report({
-                    message: ( localize(15164, "Turning on..."))
+                    message: ( localize(16289, "Turning on..."))
                 });
                 disposables.add(this.userDataSyncService.onDidChangeStatus(status => {
                     if (status === SyncStatus.HasConflicts) {
                         progress.report({
-                            message: ( localize(15165, "Resolving conflicts..."))
+                            message: ( localize(16290, "Resolving conflicts..."))
                         });
                     } else {
                         progress.report({
-                            message: ( localize(15166, "Turning on..."))
+                            message: ( localize(16291, "Turning on..."))
                         });
                     }
                 }));
@@ -470,7 +470,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
     }
     async handleConflictsWhileTurningOn(token) {
         const conflicts = this.userDataSyncService.conflicts;
-        const andSeparator = ( localize(15167, " and "));
+        const andSeparator = ( localize(16292, " and "));
         let conflictsText = "";
         for (let i = 0; i < conflicts.length; i++) {
             if (i === conflicts.length - 1 && i !== 0) {
@@ -483,10 +483,10 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
         const singleConflictResource = conflicts.length === 1 ? getSyncAreaLabel(conflicts[0].syncResource) : undefined;
         await this.dialogService.prompt({
             type: Severity.Warning,
-            message: ( localize(15168, "Conflicts Detected in {0}", conflictsText)),
-            detail: ( localize(15169, "Please resolve conflicts to turn on...")),
+            message: ( localize(16293, "Conflicts Detected in {0}", conflictsText)),
+            detail: ( localize(16294, "Please resolve conflicts to turn on...")),
             buttons: [{
-                label: ( localize(15170, "&&Show Conflicts")),
+                label: ( localize(16295, "&&Show Conflicts")),
                 run: async () => {
                     const waitUntilConflictsAreResolvedPromise = raceCancellationError(Event.toPromise(Event.filter(
                         this.userDataSyncService.onDidChangeConflicts,
@@ -496,10 +496,10 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
                     await waitUntilConflictsAreResolvedPromise;
                 }
             }, {
-                label: singleConflictResource ? ( localize(15171, "Accept &&Remote {0}", singleConflictResource)) : ( localize(15172, "Accept &&Remote")),
+                label: singleConflictResource ? ( localize(16296, "Accept &&Remote {0}", singleConflictResource)) : ( localize(16297, "Accept &&Remote")),
                 run: async () => this.replace(true)
             }, {
-                label: singleConflictResource ? ( localize(15173, "Accept &&Local {0}", singleConflictResource)) : ( localize(15174, "Accept &&Local")),
+                label: singleConflictResource ? ( localize(16298, "Accept &&Local {0}", singleConflictResource)) : ( localize(16299, "Accept &&Local")),
                 run: () => this.replace(false)
             }],
             cancelButton: {
@@ -540,11 +540,11 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
         } = await this.dialogService.confirm({
             type: "info",
             message: ( localize(
-                15175,
+                16300,
                 "This will clear your data in the cloud and stop sync on all your devices."
             )),
-            title: ( localize(15176, "Clear")),
-            primaryButton: ( localize(15177, "&&Reset"))
+            title: ( localize(16301, "Clear")),
+            primaryButton: ( localize(16302, "&&Reset"))
         });
         if (confirmed) {
             await this.userDataSyncService.resetRemote();
@@ -575,11 +575,11 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
     }
     async downloadSyncActivity() {
         const result = await this.fileDialogService.showOpenDialog({
-            title: ( localize(15178, "Select folder to download Settings Sync activity")),
+            title: ( localize(16303, "Select folder to download Settings Sync activity")),
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            openLabel: ( localize(15179, "Save"))
+            openLabel: ( localize(16304, "Save"))
         });
         if (!result?.[0]) {
             return;
@@ -648,7 +648,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
         } else {
             if (!this.authenticationProviders.length) {
                 throw ( new Error(( localize(
-                    15180,
+                    16305,
                     "Cannot sign in because there are no authentication providers available."
                 ))));
             }
@@ -695,7 +695,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
         quickPick.title = SYNC_TITLE.value;
         quickPick.ok = false;
         quickPick.ignoreFocusOut = true;
-        quickPick.placeholder = ( localize(15181, "Select an account to sign in"));
+        quickPick.placeholder = ( localize(16306, "Select an account to sign in"));
         quickPick.show();
         if (authenticationProviders.length > 1) {
             quickPick.busy = true;
@@ -742,7 +742,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
         if (allAccounts.size) {
             quickPickItems.push({
                 type: "separator",
-                label: ( localize(15182, "Signed in"))
+                label: ( localize(16307, "Signed in"))
             });
             for (const authenticationProvider of authenticationProviders) {
                 const accounts = (allAccounts.get(authenticationProvider.id) || []).sort((
@@ -754,7 +754,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
                 for (const account of accounts) {
                     quickPickItems.push({
                         label: `${account.accountName} (${providerName})`,
-                        description: account.sessionId === this.current?.sessionId ? ( localize(15183, "Last Used with Sync")) : undefined,
+                        description: account.sessionId === this.current?.sessionId ? ( localize(16308, "Last Used with Sync")) : undefined,
                         account,
                         authenticationProvider
                     });
@@ -762,7 +762,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
             }
             quickPickItems.push({
                 type: "separator",
-                label: ( localize(15184, "Others"))
+                label: ( localize(16309, "Others"))
             });
         }
         for (const authenticationProvider of authenticationProviders) {
@@ -770,7 +770,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
             if (!( allAccounts.has(authenticationProvider.id)) || provider.supportsMultipleAccounts) {
                 const providerName = provider.label;
                 quickPickItems.push({
-                    label: ( localize(15185, "Sign in with {0}", providerName)),
+                    label: ( localize(16310, "Sign in with {0}", providerName)),
                     authenticationProvider
                 });
             }