@codingame/monaco-vscode-api 1.83.2 → 1.83.3

package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js

@@ -1,4 +1,4 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { isObject, isString, isUndefined, isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
@@ -127,17 +127,11 @@ function registerActiveEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopyActiveEditor(true, args, accessor),
         description: {
-            description: ( localize(
-                'editorCommand.activeEditorMove.description',
-                "Move the active editor by tabs or groups"
-            )),
+            description: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'editorCommand.activeEditorMove.description', "Move the active editor by tabs or groups"),
             args: [
                 {
-                    name: ( localize('editorCommand.activeEditorMove.arg.name', "Active editor move argument")),
-                    description: ( localize(
-                        'editorCommand.activeEditorMove.arg.description',
-                        "Argument Properties:\n\t* 'to': String value providing where to move.\n\t* 'by': String value providing the unit for move (by tab or by group).\n\t* 'value': Number value providing how many positions or an absolute position to move."
-                    )),
+                    name: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'editorCommand.activeEditorMove.arg.name', "Active editor move argument"),
+                    description: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'editorCommand.activeEditorMove.arg.description', "Argument Properties:\n\t* 'to': String value providing where to move.\n\t* 'by': String value providing the unit for move (by tab or by group).\n\t* 'value': Number value providing how many positions or an absolute position to move."),
                     constraint: isActiveEditorMoveCopyArg,
                     schema: moveCopyJSONSchema
                 }
@@ -151,17 +145,11 @@ function registerActiveEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopyActiveEditor(false, args, accessor),
         description: {
-            description: ( localize(
-                'editorCommand.activeEditorCopy.description',
-                "Copy the active editor by groups"
-            )),
+            description: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'editorCommand.activeEditorCopy.description', "Copy the active editor by groups"),
             args: [
                 {
-                    name: ( localize('editorCommand.activeEditorCopy.arg.name', "Active editor copy argument")),
-                    description: ( localize(
-                        'editorCommand.activeEditorCopy.arg.description',
-                        "Argument Properties:\n\t* 'to': String value providing where to copy.\n\t* 'value': Number value providing how many positions or an absolute position to copy."
-                    )),
+                    name: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'editorCommand.activeEditorCopy.arg.name', "Active editor copy argument"),
+                    description: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'editorCommand.activeEditorCopy.arg.description', "Argument Properties:\n\t* 'to': String value providing where to copy.\n\t* 'value': Number value providing how many positions or an absolute position to copy."),
                     constraint: isActiveEditorMoveCopyArg,
                     schema: moveCopyJSONSchema
                 }
@@ -334,7 +322,7 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: GOTO_NEXT_CHANGE,
-            title: { value: ( localize('compare.nextChange', "Go to Next Change")), original: 'Go to Next Change' },
+            title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare.nextChange', "Go to Next Change"), original: 'Go to Next Change' },
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -347,7 +335,7 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: GOTO_PREVIOUS_CHANGE,
-            title: { value: ( localize('compare.previousChange', "Go to Previous Change")), original: 'Go to Previous Change' },
+            title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare.previousChange', "Go to Previous Change"), original: 'Go to Previous Change' },
         }
     });
     function getActiveTextDiffEditor(accessor) {
@@ -433,10 +421,10 @@ function registerDiffEditorCommands() {
         command: {
             id: TOGGLE_DIFF_SIDE_BY_SIDE,
             title: {
-                value: ( localize('toggleInlineView', "Toggle Inline View")),
+                value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'toggleInlineView', "Toggle Inline View"),
                 original: 'Compare: Toggle Inline View'
             },
-            category: ( localize('compare', "Compare"))
+            category: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare', "Compare")
         },
         when: TextCompareEditorActiveContext
     });
@@ -912,7 +900,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: SPLIT_EDITOR_IN_GROUP,
-                title: { value: ( localize('splitEditorInGroup', "Split Editor in Group")), original: 'Split Editor in Group' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'splitEditorInGroup', "Split Editor in Group"), original: 'Split Editor in Group' },
                 category: Categories.View,
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
@@ -953,7 +941,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: JOIN_EDITOR_IN_GROUP,
-                title: { value: ( localize('joinEditorInGroup', "Join Editor in Group")), original: 'Join Editor in Group' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'joinEditorInGroup', "Join Editor in Group"), original: 'Join Editor in Group' },
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
@@ -972,7 +960,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP,
-                title: { value: ( localize('toggleJoinEditorInGroup', "Toggle Split Editor in Group")), original: 'Toggle Split Editor in Group' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'toggleJoinEditorInGroup', "Toggle Split Editor in Group"), original: 'Toggle Split Editor in Group' },
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext)),
                 f1: true
@@ -993,7 +981,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-                title: { value: ( localize('toggleSplitEditorInGroupLayout', "Toggle Layout of Split Editor in Group")), original: 'Toggle Layout of Split Editor in Group' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'toggleSplitEditorInGroupLayout', "Toggle Layout of Split Editor in Group"), original: 'Toggle Layout of Split Editor in Group' },
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true
@@ -1018,7 +1006,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_FIRST_SIDE_EDITOR,
-                title: { value: ( localize('focusLeftSideEditor', "Focus First Side in Active Editor")), original: 'Focus First Side in Active Editor' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'focusLeftSideEditor', "Focus First Side in Active Editor"), original: 'Focus First Side in Active Editor' },
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1040,7 +1028,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_SECOND_SIDE_EDITOR,
-                title: { value: ( localize('focusRightSideEditor', "Focus Second Side in Active Editor")), original: 'Focus Second Side in Active Editor' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'focusRightSideEditor', "Focus Second Side in Active Editor"), original: 'Focus Second Side in Active Editor' },
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1062,7 +1050,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_OTHER_SIDE_EDITOR,
-                title: { value: ( localize('focusOtherSideEditor', "Focus Other Side in Active Editor")), original: 'Focus Other Side in Active Editor' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'focusOtherSideEditor', "Focus Other Side in Active Editor"), original: 'Focus Other Side in Active Editor' },
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1118,7 +1106,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_LOCK_GROUP_COMMAND_ID,
-                title: { value: ( localize('toggleEditorGroupLock', "Toggle Editor Group Lock")), original: 'Toggle Editor Group Lock' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'toggleEditorGroupLock', "Toggle Editor Group Lock"), original: 'Toggle Editor Group Lock' },
                 category: Categories.View,
                 precondition: MultipleEditorGroupsContext,
                 f1: true
@@ -1132,7 +1120,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: LOCK_GROUP_COMMAND_ID,
-                title: { value: ( localize('lockEditorGroup', "Lock Editor Group")), original: 'Lock Editor Group' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'lockEditorGroup', "Lock Editor Group"), original: 'Lock Editor Group' },
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(MultipleEditorGroupsContext, ( ActiveEditorGroupLockedContext.toNegated()))),
                 f1: true
@@ -1146,7 +1134,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: UNLOCK_GROUP_COMMAND_ID,
-                title: { value: ( localize('unlockEditorGroup', "Unlock Editor Group")), original: 'Unlock Editor Group' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'unlockEditorGroup', "Unlock Editor Group"), original: 'Unlock Editor Group' },
                 precondition: ( ContextKeyExpr.and(MultipleEditorGroupsContext, ActiveEditorGroupLockedContext)),
                 category: Categories.View,
                 f1: true

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
@@ -17,12 +17,12 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
     static { this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: 'workbench.input.interactive',
-            label: ( localize('interactiveWindow', 'Interactive Window')),
+            label: localizeWithPath('vs/workbench/browser/parts/editor/editorConfiguration', 'interactiveWindow', 'Interactive Window'),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-markdown.preview',
-            label: ( localize('markdownPreview', "Markdown Preview")),
+            label: localizeWithPath('vs/workbench/browser/parts/editor/editorConfiguration', 'markdownPreview', "Markdown Preview"),
             priority: RegisteredEditorPriority.builtin
         }
     ]; }
@@ -66,10 +66,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
             properties: {
                 'workbench.editor.autoLockGroups': {
                     type: 'object',
-                    description: ( localize(
-                        'workbench.editor.autoLockGroups',
-                        "If an editor matching one of the listed types is opened as the first in an editor group and more than one group is open, the group is automatically locked. Locked groups will only be used for opening editors when explicitly chosen by a user gesture (for example drag and drop), but not by default. Consequently, the active editor in a locked group is less likely to be replaced accidentally with a different editor."
-                    )),
+                    description: localizeWithPath('vs/workbench/browser/parts/editor/editorConfiguration', 'workbench.editor.autoLockGroups', "If an editor matching one of the listed types is opened as the first in an editor group and more than one group is open, the group is automatically locked. Locked groups will only be used for opening editors when explicitly chosen by a user gesture (for example drag and drop), but not by default. Consequently, the active editor in a locked group is less likely to be replaced accidentally with a different editor."),
                     properties: autoLockGroupConfiguration,
                     default: defaultAutoLockGroupConfiguration,
                     additionalProperties: false
@@ -84,10 +81,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     type: 'string',
                     default: '',
                     enum: [...binaryEditorCandidates, ''],
-                    description: ( localize(
-                        'workbench.editor.defaultBinaryEditor',
-                        "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
-                    )),
+                    description: localizeWithPath('vs/workbench/browser/parts/editor/editorConfiguration', 'workbench.editor.defaultBinaryEditor', "The default editor for files detected as binary. If undefined, the user will be presented with a picker."),
                 }
             }
         };
@@ -97,10 +91,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
             properties: {
                 'workbench.editorAssociations': {
                     type: 'object',
-                    markdownDescription: ( localize(
-                        'editor.editorAssociations',
-                        "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
-                    )),
+                    markdownDescription: localizeWithPath('vs/workbench/browser/parts/editor/editorConfiguration', 'editor.editorAssociations', "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."),
                     patternProperties: {
                         '.*': {
                             type: 'string',
@@ -119,10 +110,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     default: getLargeFileConfirmationLimit(this.environmentService.remoteAuthority) / ByteSize.MB,
                     minimum: 1,
                     scope: 4 ,
-                    markdownDescription: ( localize(
-                        'editorLargeFileSizeConfirmation',
-                        "Controls the minimum size of a file in MB before asking for confirmation when opening in the editor. Note that this setting may not apply to all editor types and environments."
-                    )),
+                    markdownDescription: localizeWithPath('vs/workbench/browser/parts/editor/editorConfiguration', 'editorLargeFileSizeConfirmation', "Controls the minimum size of a file in MB before asking for confirmation when opening in the editor. Note that this setting may not apply to all editor types and environments."),
                 }
             }
         };

package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/editorplaceholder.css.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
 import { isEditorOpenError } from '../../../common/editor.js';
 import { EditorPane } from './editorPane.js';
@@ -113,7 +113,7 @@ EditorPlaceholder = EditorPlaceholder_1 = ( __decorate([
 let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceholderEditor extends EditorPlaceholder {
     static { WorkspaceTrustRequiredPlaceholderEditor_1 = this; }
     static { this.ID = 'workbench.editors.workspaceTrustRequiredEditor'; }
-    static { this.LABEL = ( localize('trustRequiredEditor', "Workspace Trust Required")); }
+    static { this.LABEL = localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'trustRequiredEditor', "Workspace Trust Required"); }
     static { this.DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor_1, WorkspaceTrustRequiredPlaceholderEditor_1.ID, WorkspaceTrustRequiredPlaceholderEditor_1.LABEL); }
     constructor(telemetryService, themeService, commandService, workspaceService, storageService) {
         super(WorkspaceTrustRequiredPlaceholderEditor_1.ID, telemetryService, themeService, storageService);
@@ -127,17 +127,11 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         return {
             icon: '$(workspace-untrusted)',
             label: isSingleFolderWorkspaceIdentifier(toWorkspaceIdentifier(this.workspaceService.getWorkspace())) ?
-                ( localize(
-                    'requiresFolderTrustText',
-                    "The file is not displayed in the editor because trust has not been granted to the folder."
-                )) :
-                ( localize(
-                    'requiresWorkspaceTrustText',
-                    "The file is not displayed in the editor because trust has not been granted to the workspace."
-                )),
+                localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'requiresFolderTrustText', "The file is not displayed in the editor because trust has not been granted to the folder.") :
+                localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'requiresWorkspaceTrustText', "The file is not displayed in the editor because trust has not been granted to the workspace."),
             actions: [
                 {
-                    label: ( localize('manageTrust', "Manage Workspace Trust")),
+                    label: localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'manageTrust', "Manage Workspace Trust"),
                     run: () => this.commandService.executeCommand('workbench.trust.manage')
                 }
             ]
@@ -154,7 +148,7 @@ WorkspaceTrustRequiredPlaceholderEditor = WorkspaceTrustRequiredPlaceholderEdito
 let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlaceholder {
     static { ErrorPlaceholderEditor_1 = this; }
     static { this.ID = 'workbench.editors.errorEditor'; }
-    static { this.LABEL = ( localize('errorEditor', "Error Editor")); }
+    static { this.LABEL = localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'errorEditor', "Error Editor"); }
     static { this.DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor_1, ErrorPlaceholderEditor_1.ID, ErrorPlaceholderEditor_1.LABEL); }
     constructor(telemetryService, themeService, storageService, fileService, dialogService) {
         super(ErrorPlaceholderEditor_1.ID, telemetryService, themeService, storageService);
@@ -168,26 +162,16 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         const isFileNotFound = error?.fileOperationResult === 1 ;
         let label;
         if (isFileNotFound) {
-            label = ( localize(
-                'unavailableResourceErrorEditorText',
-                "The editor could not be opened because the file was not found."
-            ));
+            label = localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'unavailableResourceErrorEditorText', "The editor could not be opened because the file was not found.");
         }
         else if (isEditorOpenError(error) && error.forceMessage) {
             label = error.message;
         }
         else if (error) {
-            label = ( localize(
-                'unknownErrorEditorTextWithError',
-                "The editor could not be opened due to an unexpected error: {0}",
-                toErrorMessage(error)
-            ));
+            label = localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'unknownErrorEditorTextWithError', "The editor could not be opened due to an unexpected error: {0}", toErrorMessage(error));
         }
         else {
-            label = ( localize(
-                'unknownErrorEditorTextWithoutError',
-                "The editor could not be opened due to an unexpected error."
-            ));
+            label = localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'unknownErrorEditorTextWithoutError', "The editor could not be opened due to an unexpected error.");
         }
         let icon = '$(error)';
         if (isEditorOpenError(error)) {
@@ -215,7 +199,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         else if (group) {
             actions = [
                 {
-                    label: ( localize('retry', "Try Again")),
+                    label: localizeWithPath('vs/workbench/browser/parts/editor/editorPlaceholder', 'retry', "Try Again"),
                     run: () => group.openEditor(input, { ...options, source: EditorOpenSource.USER  })
                 }
             ];

package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/editorquickaccess.css.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { quickPickItemScorerAccessor } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import { PickerQuickAccessProvider, TriggerAction } from 'monaco-editor/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
+import { PickerQuickAccessProvider, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
@@ -18,7 +18,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
         super(prefix, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localize('noViewResults', "No matching editors")),
+                label: localizeWithPath('vs/workbench/browser/parts/editor/editorQuickAccess', 'noViewResults', "No matching editors"),
                 groupId: -1
             }
         });
@@ -107,20 +107,10 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 ariaLabel: (() => {
                     if (mapGroupIdToGroupAriaLabel.size > 1) {
                         return isDirty ?
-                            ( localize(
-                                'entryAriaLabelWithGroupDirty',
-                                "{0}, unsaved changes, {1}",
-                                nameAndDescription,
-                                mapGroupIdToGroupAriaLabel.get(groupId)
-                            )) :
-                            ( localize(
-                                'entryAriaLabelWithGroup',
-                                "{0}, {1}",
-                                nameAndDescription,
-                                mapGroupIdToGroupAriaLabel.get(groupId)
-                            ));
+                            localizeWithPath('vs/workbench/browser/parts/editor/editorQuickAccess', 'entryAriaLabelWithGroupDirty', "{0}, unsaved changes, {1}", nameAndDescription, mapGroupIdToGroupAriaLabel.get(groupId)) :
+                            localizeWithPath('vs/workbench/browser/parts/editor/editorQuickAccess', 'entryAriaLabelWithGroup', "{0}, {1}", nameAndDescription, mapGroupIdToGroupAriaLabel.get(groupId));
                     }
-                    return isDirty ? ( localize('entryAriaLabelDirty', "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
+                    return isDirty ? localizeWithPath('vs/workbench/browser/parts/editor/editorQuickAccess', 'entryAriaLabelDirty', "{0}, unsaved changes", nameAndDescription) : nameAndDescription;
                 })(),
                 description,
                 iconClasses: getIconClasses(this.modelService, this.languageService, resource).concat(editor.getLabelExtraClasses()),
@@ -129,7 +119,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                     return [
                         {
                             iconClass: isDirty ? ('dirty-editor ' + ThemeIcon.asClassName(Codicon.closeDirty)) : ThemeIcon.asClassName(Codicon.close),
-                            tooltip: ( localize('closeEditor', "Close Editor")),
+                            tooltip: localizeWithPath('vs/workbench/browser/parts/editor/editorQuickAccess', 'closeEditor', "Close Editor"),
                             alwaysVisible: isDirty
                         }
                     ];