@codingame/monaco-vscode-user-data-sync-service-override 37.2.0 → 37.3.0

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

@@ -51,35 +51,35 @@ import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severit
 
 const turnOffSyncCommand = {
     id: "workbench.userDataSync.actions.turnOff",
-    title: ( localize2(18606, "Turn Off"))
+    title: ( localize2(20749, "Turn Off"))
 };
 const configureSyncCommand = {
     id: CONFIGURE_SYNC_COMMAND_ID,
-    title: ( localize2(18607, "Configure..."))
+    title: ( localize2(20750, "Configure..."))
 };
 const showConflictsCommandId = "workbench.userDataSync.actions.showConflicts";
 const syncNowCommand = {
     id: "workbench.userDataSync.actions.syncNow",
-    title: ( localize2(18608, "Sync Now")),
+    title: ( localize2(20751, "Sync Now")),
     description(userDataSyncService) {
         if (userDataSyncService.status === SyncStatus.Syncing) {
-            return localize(18609, "syncing");
+            return localize(20752, "syncing");
         }
         if (userDataSyncService.lastSyncTime) {
-            return localize(18610, "synced {0}", fromNow(userDataSyncService.lastSyncTime, true));
+            return localize(20753, "synced {0}", fromNow(userDataSyncService.lastSyncTime, true));
         }
         return undefined;
     }
 };
 const showSyncSettingsCommand = {
     id: "workbench.userDataSync.actions.settings",
-    title: ( localize2(18611, "Show Settings"))
+    title: ( localize2(20754, "Show Settings"))
 };
 const showSyncedDataCommand = {
     id: "workbench.userDataSync.actions.showSyncedData",
-    title: ( localize2(18612, "Show Synced Data"))
+    title: ( localize2(20755, "Show Synced Data"))
 };
-const CONTEXT_TURNING_ON_STATE = ( new RawContextKey("userDataSyncTurningOn", false));
+const CONTEXT_TURNING_ON_STATE = new RawContextKey("userDataSyncTurningOn", false);
 let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution extends Disposable {
     constructor(
         userDataSyncEnablementService,
@@ -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(
-                        18613,
+                        20756,
                         "Unable to sync due to conflicts in {0}. Please resolve them to continue.",
                         conflictsArea.toLowerCase()
                     )), [{
-                        label: ( localize(18614, "Replace Remote")),
+                        label: ( localize(20757, "Replace Remote")),
                         run: () => {
                             this.acceptLocal(conflict, conflict.conflicts[0]);
                         }
                     }, {
-                        label: ( localize(18615, "Replace Local")),
+                        label: ( localize(20758, "Replace Local")),
                         run: () => {
                             this.acceptRemote(conflict, conflict.conflicts[0]);
                         }
                     }, {
-                        label: ( localize(18616, "Show Conflicts")),
+                        label: ( localize(20759, "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(
-                18617,
+                20760,
                 "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(
-                18617,
+                20760,
                 "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(
-                    18618,
+                    20761,
                     "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(18619, "Turn on Settings Sync...")),
+                        label: ( localize(20762, "Turn on Settings Sync...")),
                         run: () => this.turnOn()
                     })]
                 }
@@ -292,13 +292,13 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             this.notificationService.notify({
                 severity: Severity.Info,
                 message: ( localize(
-                    18620,
+                    20763,
                     "Settings sync was turned off from another device, please turn on sync again."
                 )),
                 actions: {
                     primary: [toAction({
                         id: "turn on sync",
-                        label: ( localize(18619, "Turn on Settings Sync...")),
+                        label: ( localize(20762, "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(
-                    18621,
+                    20764,
                     "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(
-                18622,
+                20765,
                 "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(
-                    18623,
+                    20766,
                     "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(18624, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(20767, "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(
-                    18625,
+                    20768,
                     "Settings sync is disabled because the client is making invalid requests. Please report an issue with the logs."
                 ));
-                const operationId = error.operationId ? ( localize(18624, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(20767, "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(18626, "Show Log")),
+                            label: ( localize(20769, "Show Log")),
                             run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                         }), toAction({
                             id: "Report Issue",
-                            label: ( localize(18627, "Report Issue")),
+                            label: ( localize(20770, "Report Issue")),
                             run: () => this.workbenchIssueService.openReporter()
                         })]
                     }
@@ -369,17 +369,17 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             this.notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    18628,
+                    20771,
                     "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(18629, "Clear Data in Cloud...")),
+                        label: ( localize(20772, "Clear Data in Cloud...")),
                         run: () => this.userDataSyncWorkbenchService.resetSyncedData()
                     }), toAction({
                         id: "show synced data",
-                        label: ( localize(18630, "Show Synced Data")),
+                        label: ( localize(20773, "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(18631, "Settings Sync has been switched to insiders service")) : ( localize(18632, "Settings Sync has been switched to stable service"))
+                message: this.userDataSyncStoreManagementService.userDataSyncStore?.type === "insiders" ? ( localize(20774, "Settings Sync has been switched to insiders service")) : ( localize(20775, "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(
-                        18633,
+                        20776,
                         "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(
-                        18634,
+                        20777,
                         "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(18619, "Turn on Settings Sync...")),
+                            label: ( localize(20762, "Turn on Settings Sync...")),
                             run: () => this.turnOn()
                         })]
                     }
@@ -422,14 +422,14 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         }
     }
     handleTooLargeError(resource, message, error) {
-        const operationId = error.operationId ? ( localize(18624, "Operation Id: {0}", error.operationId)) : undefined;
+        const operationId = error.operationId ? ( localize(20767, "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(18635, "Open {0} File", getSyncAreaLabel(resource))),
+                    label: ( localize(20778, "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(
-                18636,
+                20779,
                 "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(18635, "Open {0} File", errorArea)),
+                    label: ( localize(20778, "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(18637, "{0}: Conflicts Detected", SYNC_TITLE.value))));
+            badge = ( new NumberBadge(this.getConflictsCount(), () => ( localize(20780, "{0}: Conflicts Detected", SYNC_TITLE.value))));
         } else if (this.turningOnSync) {
-            badge = ( new ProgressBadge(() => ( localize(18638, "Turning on Settings Sync..."))));
+            badge = ( new ProgressBadge(() => ( localize(20781, "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(18639, "Sign in to Sync Settings"))));
+            badge = ( new NumberBadge(1, () => ( localize(20782, "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(18640, "No authentication providers are available."))));
+                throw ( new Error(( localize(20783, "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(
-                            18641,
+                            20784,
                             "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(
-                            18642,
+                            20785,
                             "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(18624, "Operation Id: {0}", e.operationId)) : undefined;
+                        const operationId = e.operationId ? ( localize(20767, "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(
-                            18643,
+                            20786,
                             "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(18629, "Clear Data in Cloud...")),
+                                label: ( localize(20772, "Clear Data in Cloud...")),
                                 run: () => this.userDataSyncWorkbenchService.resetSyncedData()
                             }), toAction({
                                 id: "show synced data",
-                                label: ( localize(18630, "Show Synced Data")),
+                                label: ( localize(20773, "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(18644, "Error while turning on Settings Sync: Authentication failed.")));
+                    this.notificationService.error(( localize(20787, "Error while turning on Settings Sync: Authentication failed.")));
                     return;
                 }
                 this.notificationService.error(( localize(
-                    18645,
+                    20788,
                     "Error while turning on Settings Sync. Please check [logs]({0}) for more details.",
                     `command:${SHOW_SYNC_LOG_COMMAND_ID}`
                 )));
             } else {
-                this.notificationService.error(( localize(18646, "Error while turning on Settings Sync. {0}", getErrorMessage(e))));
+                this.notificationService.error(( localize(20789, "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(18647, "Sign in"));
-            quickPick.description = ( localize(18648, "Please sign in to backup and sync your data across devices."));
+            quickPick.customLabel = ( localize(20790, "Sign in"));
+            quickPick.description = ( localize(20791, "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(18649, "{0}: Configure...", SYNC_TITLE.value));
-            quickPick.placeholder = ( localize(18650, "Choose what to sync"));
+            quickPick.title = ( localize(20792, "{0}: Configure...", SYNC_TITLE.value));
+            quickPick.placeholder = ( localize(20793, "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(18651, "Do you want to turn off sync?")),
+            message: ( localize(20794, "Do you want to turn off sync?")),
             detail: ( localize(
-                18652,
+                20795,
                 "Your settings, keybindings, extensions, snippets and UI State will no longer be synced."
             )),
-            primaryButton: ( localize(18653, "&&Turn off")),
+            primaryButton: ( localize(20796, "&&Turn off")),
             checkbox: this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Available ? {
                 label: ( localize(
-                    18654,
+                    20797,
                     "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(18655, "{0}: Select Service", SYNC_TITLE.value));
+            quickPick.title = ( localize(20798, "{0}: Select Service", SYNC_TITLE.value));
             quickPick.description = ( localize(
-                18656,
+                20799,
                 "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(18657, "Default");
+                    return localize(20800, "Default");
                 }
                 return undefined;
             };
             quickPick.items = [{
                 id: "insiders",
-                label: ( localize(18658, "Insiders")),
+                label: ( localize(20801, "Insiders")),
                 description: getDescription(userDataSyncStore.insidersUrl)
             }, {
                 id: "stable",
-                label: ( localize(18659, "Stable")),
+                label: ( localize(20802, "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(18660, "Backup and Sync Settings...")),
+                    title: ( localize2(20803, "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(18661, "Turning on Settings Sync...")),
+                    title: ( localize(20804, "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(18662, "Cancel")),
+                    title: ( localize(20805, "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(18663, "Sign in to Sync Settings")),
+                    title: ( localize(20806, "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(18664, "Sign in to Sync Settings (1)"))
+                title: ( localize(20807, "Sign in to Sync Settings (1)"))
             },
             when
         })));
     }
     getShowConflictsTitle() {
-        return localize2(18665, "Show Conflicts ({0})", this.getConflictsCount());
+        return localize2(20808, "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(18666, "Settings Sync is On")),
+                    title: ( localize(20809, "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(
-                            18667,
+                            20810,
                             "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(18668, "Configure...")),
+                    tooltip: ( localize(20811, "Configure...")),
                     menu: [{
                         id: MenuId.CommandPalette,
                         when
@@ -1179,8 +1179,8 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: SHOW_SYNC_LOG_COMMAND_ID,
-                    title: ( localize(18669, "{0}: Show Log", SYNC_TITLE.value)),
-                    tooltip: ( localize(18670, "Show Log")),
+                    title: ( localize(20812, "{0}: Show Log", SYNC_TITLE.value)),
+                    tooltip: ( localize(20813, "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(18671, "Complete Merge")),
+                    title: ( localize(20814, "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(18672, "Successfully downloaded Settings Sync activity.")));
+                    notificationService.info(( localize(20815, "Successfully downloaded Settings Sync activity.")));
                 }
             }
         }));
@@ -1319,7 +1319,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: "workbench.actions.syncData.reset",
-                    title: ( localize(18673, "Clear Data in Cloud...")),
+                    title: ( localize(20816, "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(18674, "Please go through each entry and merge to resolve conflicts."));
+        this.treeView.message = ( localize(20817, "Please go through each entry and merge to resolve conflicts."));
         this.treeView.dataProvider = {
             getChildren() {
                 return that.getTreeItems();
@@ -85,11 +85,11 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
     }
     async getTreeItems() {
         const roots = [];
-        const conflictResources = ( this.userDataSyncService.conflicts.map(conflict => ( conflict.conflicts.map(resourcePreview => ({
+        const conflictResources = this.userDataSyncService.conflicts.map(conflict => conflict.conflicts.map(resourcePreview => ({
             ...resourcePreview,
             syncResource: conflict.syncResource,
             profile: conflict.profile
-        }))))).flat().sort(
+        }))).flat().sort(
             (a, b) => a.profile.id === b.profile.id ? 0 : a.profile.isDefault ? -1 : b.profile.isDefault ? 1 : a.profile.name.localeCompare(b.profile.name)
         );
         const conflictResourcesByProfile = [];
@@ -157,7 +157,7 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
             constructor() {
                 super({
                     id: `workbench.actions.sync.openConflicts`,
-                    title: ( localize(18675, "Show Conflicts"))
+                    title: ( localize(20818, "Show Conflicts"))
                 });
             }
             async run(accessor, handle) {
@@ -169,7 +169,7 @@ let UserDataSyncConflictsViewPane = class UserDataSyncConflictsViewPane extends
             constructor() {
                 super({
                     id: `workbench.actions.sync.acceptRemote`,
-                    title: ( localize(18676, "Accept Remote")),
+                    title: ( localize(20819, "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(18677, "Accept Local")),
+                    title: ( localize(20820, "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(18678, "{0} (Remote)", basename(conflictToOpen.remoteResource)));
-        const localResourceName = ( localize(18679, "{0} (Local)", basename(conflictToOpen.remoteResource)));
+        const remoteResourceName = ( localize(20821, "{0} (Remote)", basename(conflictToOpen.remoteResource)));
+        const localResourceName = ( localize(20822, "{0} (Local)", basename(conflictToOpen.remoteResource)));
         await this.editorService.openEditor({
             input1: {
                 resource: conflictToOpen.remoteResource,
-                label: ( localize(18680, "Theirs")),
+                label: ( localize(20823, "Theirs")),
                 description: remoteResourceName
             },
             input2: {
                 resource: conflictToOpen.localResource,
-                label: ( localize(18681, "Yours")),
+                label: ( localize(20824, "Yours")),
                 description: localResourceName
             },
             base: {

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

@@ -23,15 +23,18 @@ let UserDataSyncTrigger = class UserDataSyncTrigger extends Disposable {
     ) {
         super();
         this.userDataProfilesService = userDataProfilesService;
-        const event = Event.filter(Event.any(( Event.map(
+        const event = Event.filter(Event.any(Event.map(
             editorService.onDidActiveEditorChange,
             () => this.getUserDataEditorInputSource(editorService.activeEditor)
-        )), ( Event.map(Event.filter(
+        ), Event.map(Event.filter(
             viewsService.onDidChangeViewContainerVisibility,
             e => e.id === VIEWLET_ID && e.visible
-        ), e => e.id))), source => source !== undefined);
+        ), e => e.id)), source => source !== undefined);
         if (isWeb) {
-            this._register(Event.debounce(Event.any(( Event.map(hostService.onDidChangeFocus, () => "windowFocus")), ( Event.map(event, source => source))), (last, source) => last ? [...last, source] : [source], 1000)(sources => userDataAutoSyncService.triggerSync(sources, {
+            this._register(Event.debounce(Event.any(
+                Event.map(hostService.onDidChangeFocus, () => "windowFocus"),
+                Event.map(event, source => source)
+            ), (last, source) => last ? [...last, source] : [source], 1000)(sources => userDataAutoSyncService.triggerSync(sources, {
                 skipIfSyncedRecently: true
             })));
         } else {