@codingame/monaco-vscode-views-service-override 1.83.2 → 1.83.3

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.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 { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
 import { isEqual, basename } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
@@ -29,10 +29,7 @@ import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
 const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
 const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
-const conflictEditorHelp = ( localize(
-    'userGuide',
-    "Use the actions in the editor tool bar to either undo your changes or overwrite the content of the file with your changes."
-));
+const conflictEditorHelp = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'userGuide', "Use the actions in the editor tool bar to either undo your changes or overwrite the content of the file with your changes.");
 let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable {
     constructor(notificationService, textFileService, contextKeyService, editorService, textModelService, instantiationService, storageService) {
         super();
@@ -92,11 +89,7 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
                 secondaryActions.push(this.instantiationService.createInstance(DoNotShowResolveConflictLearnMoreAction));
             }
             else {
-                message = ( localize(
-                    'staleSaveError',
-                    "Failed to save '{0}': The content of the file is newer. Please compare your version with the file contents or overwrite the content of the file with your changes.",
-                    basename(resource)
-                ));
+                message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'staleSaveError', "Failed to save '{0}': The content of the file is newer. Please compare your version with the file contents or overwrite the content of the file with your changes.", basename(resource));
                 primaryActions.push(this.instantiationService.createInstance(ResolveSaveConflictAction, model));
                 primaryActions.push(this.instantiationService.createInstance(SaveModelIgnoreModifiedSinceAction, model));
                 secondaryActions.push(this.instantiationService.createInstance(ConfigureSaveConflictAction));
@@ -120,42 +113,17 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             primaryActions.push(this.instantiationService.createInstance(DiscardModelAction, model));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
-                    message = isWindows ? ( localize(
-                        'readonlySaveErrorAdmin',
-                        "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
-                        basename(resource)
-                    )) : ( localize(
-                        'readonlySaveErrorSudo',
-                        "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
-                        basename(resource)
-                    ));
+                    message = isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'readonlySaveErrorAdmin', "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.", basename(resource)) : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'readonlySaveErrorSudo', "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.", basename(resource));
                 }
                 else {
-                    message = ( localize(
-                        'readonlySaveError',
-                        "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
-                        basename(resource)
-                    ));
+                    message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'readonlySaveError', "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.", basename(resource));
                 }
             }
             else if (canSaveElevated && isPermissionDenied) {
-                message = isWindows ? ( localize(
-                    'permissionDeniedSaveError',
-                    "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
-                    basename(resource)
-                )) : ( localize(
-                    'permissionDeniedSaveErrorSudo',
-                    "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
-                    basename(resource)
-                ));
+                message = isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'permissionDeniedSaveError', "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.", basename(resource)) : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'permissionDeniedSaveErrorSudo', "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.", basename(resource));
             }
             else {
-                message = ( localize(
-                    { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] },
-                    "Failed to save '{0}': {1}",
-                    basename(resource),
-                    toErrorMessage(error, false)
-                ));
+                message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] }, "Failed to save '{0}': {1}", basename(resource), toErrorMessage(error, false));
             }
         }
         const actions = { primary: primaryActions, secondary: secondaryActions };
@@ -184,7 +152,7 @@ TextFileSaveErrorHandler = ( __decorate([
 ], TextFileSaveErrorHandler));
 let ResolveConflictLearnMoreAction = class ResolveConflictLearnMoreAction extends Action {
     constructor(openerService) {
-        super('workbench.files.action.resolveConflictLearnMore', ( localize('learnMore', "Learn More")));
+        super('workbench.files.action.resolveConflictLearnMore', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'learnMore', "Learn More"));
         this.openerService = openerService;
     }
     async run() {
@@ -196,7 +164,7 @@ ResolveConflictLearnMoreAction = ( __decorate([
 ], ResolveConflictLearnMoreAction));
 let DoNotShowResolveConflictLearnMoreAction = class DoNotShowResolveConflictLearnMoreAction extends Action {
     constructor(storageService) {
-        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localize('dontShowAgain', "Don't Show Again")));
+        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'dontShowAgain', "Don't Show Again"));
         this.storageService = storageService;
     }
     async run(notification) {
@@ -209,7 +177,7 @@ DoNotShowResolveConflictLearnMoreAction = ( __decorate([
 ], DoNotShowResolveConflictLearnMoreAction));
 let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
     constructor(model, editorService, notificationService, instantiationService, productService) {
-        super('workbench.files.action.resolveConflict', ( localize('compareChanges', "Compare")));
+        super('workbench.files.action.resolveConflict', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'compareChanges', "Compare"));
         this.model = model;
         this.editorService = editorService;
         this.notificationService = notificationService;
@@ -220,13 +188,7 @@ let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
         if (!this.model.isDisposed()) {
             const resource = this.model.resource;
             const name = basename(resource);
-            const editorLabel = ( localize(
-                'saveConflictDiffLabel',
-                "{0} (in file) ↔ {1} (in {2}) - Resolve save conflict",
-                name,
-                name,
-                this.productService.nameLong
-            ));
+            const editorLabel = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'saveConflictDiffLabel', "{0} (in file) ↔ {1} (in {2}) - Resolve save conflict", name, name, this.productService.nameLong);
             await TextFileContentProvider.open(resource, CONFLICT_RESOLUTION_SCHEME, editorLabel, this.editorService, { pinned: true });
             const actions = { primary: [this.instantiationService.createInstance(ResolveConflictLearnMoreAction)] };
             const handle = this.notificationService.notify({
@@ -248,7 +210,7 @@ ResolveSaveConflictAction = ( __decorate([
 ], ResolveSaveConflictAction));
 class SaveModelElevatedAction extends Action {
     constructor(model, triedToUnlock) {
-        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localize('overwriteElevated', "Overwrite as Admin...")) : ( localize('overwriteElevatedSudo', "Overwrite as Sudo...")) : isWindows ? ( localize('saveElevated', "Retry as Admin...")) : ( localize('saveElevatedSudo', "Retry as Sudo...")));
+        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwriteElevated', "Overwrite as Admin...") : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwriteElevatedSudo', "Overwrite as Sudo...") : isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'saveElevated', "Retry as Admin...") : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'saveElevatedSudo', "Retry as Sudo..."));
         this.model = model;
         this.triedToUnlock = triedToUnlock;
     }
@@ -264,7 +226,7 @@ class SaveModelElevatedAction extends Action {
 }
 class RetrySaveModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.saveModel', ( localize('retry', "Retry")));
+        super('workbench.files.action.saveModel', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'retry', "Retry"));
         this.model = model;
     }
     async run() {
@@ -275,7 +237,7 @@ class RetrySaveModelAction extends Action {
 }
 class DiscardModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.discardModel', ( localize('discard', "Discard")));
+        super('workbench.files.action.discardModel', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'discard', "Discard"));
         this.model = model;
     }
     async run() {
@@ -318,7 +280,7 @@ SaveModelAsAction = ( __decorate([
 ], SaveModelAsAction));
 class UnlockModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.unlock', ( localize('overwrite', "Overwrite")));
+        super('workbench.files.action.unlock', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwrite', "Overwrite"));
         this.model = model;
     }
     async run() {
@@ -329,7 +291,7 @@ class UnlockModelAction extends Action {
 }
 class SaveModelIgnoreModifiedSinceAction extends Action {
     constructor(model) {
-        super('workbench.files.action.saveIgnoreModifiedSince', ( localize('overwrite', "Overwrite")));
+        super('workbench.files.action.saveIgnoreModifiedSince', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwrite', "Overwrite"));
         this.model = model;
     }
     async run() {
@@ -340,7 +302,7 @@ class SaveModelIgnoreModifiedSinceAction extends Action {
 }
 let ConfigureSaveConflictAction = class ConfigureSaveConflictAction extends Action {
     constructor(preferencesService) {
-        super('workbench.files.action.configureSaveConflict', ( localize('configure', "Configure")));
+        super('workbench.files.action.configureSaveConflict', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'configure', "Configure"));
         this.preferencesService = preferencesService;
     }
     async run() {

package/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js

@@ -1,23 +1,34 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { renameHandler, moveFileToTrashHandler, deleteFileHandler, cutFileHandler, copyFileHandler, pasteFileHandler, openFilePreserveFocusHandler, NEW_FILE_LABEL, NEW_FILE_COMMAND_ID, NEW_FOLDER_LABEL, NEW_FOLDER_COMMAND_ID, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, UPLOAD_COMMAND_ID, UPLOAD_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions';
+import { GlobalCompareResourcesAction, FocusFilesExplorer, ShowActiveFileInExplorer, CompareWithClipboardAction, CompareNewUntitledTextFilesAction, ToggleAutoSaveAction, ShowOpenedFileInNewWindow, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ToggleActiveEditorReadonlyInSession, ResetActiveEditorReadonlyInSession, renameHandler, moveFileToTrashHandler, deleteFileHandler, cutFileHandler, copyFileHandler, pasteFileHandler, openFilePreserveFocusHandler, NEW_FILE_LABEL, NEW_FILE_COMMAND_ID, NEW_FOLDER_LABEL, NEW_FOLDER_COMMAND_ID, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, UPLOAD_COMMAND_ID, UPLOAD_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions';
 import { CONFLICT_RESOLUTION_CONTEXT } from './editors/textFileSaveErrorHandler.js';
-import { MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { registerAction2, MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import './fileCommands.js';
-import { COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_AS_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_UNTITLED_FILE_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, COMPARE_RESOURCE_COMMAND_ID, ResourceSelectedForCompareContext, SELECT_FOR_COMPARE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
+import { COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_AS_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_UNTITLED_FILE_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, COMPARE_RESOURCE_COMMAND_ID, ResourceSelectedForCompareContext, SELECT_FOR_COMPARE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_ALL_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
-import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash, ExplorerResourceCut, ExplorerFolderContext, ExplorerResourceAvailableEditorIdsContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
+import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash, ExplorerResourceCut, ExplorerFolderContext, ExplorerResourceAvailableEditorIdsContext, FoldersViewVisibleContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vscode/vscode/vs/workbench/browser/actions/workspaceCommands';
 import { REOPEN_WITH_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { AutoSaveAfterShortDelayContext } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { WorkbenchListDoubleSelection } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { ResourceContextKey, WorkspaceFolderCountContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, HasWebFileSystemAccess, EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { ResourceContextKey, WorkspaceFolderCountContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, HasWebFileSystemAccess, EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext, ActiveEditorContext, SidebarFocusContext, ActiveEditorCanRevertContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IsWebContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
 
+registerAction2(GlobalCompareResourcesAction);
+registerAction2(FocusFilesExplorer);
+registerAction2(ShowActiveFileInExplorer);
+registerAction2(CompareWithClipboardAction);
+registerAction2(CompareNewUntitledTextFilesAction);
+registerAction2(ToggleAutoSaveAction);
+registerAction2(ShowOpenedFileInNewWindow);
+registerAction2(SetActiveEditorReadonlyInSession);
+registerAction2(SetActiveEditorWriteableInSession);
+registerAction2(ToggleActiveEditorReadonlyInSession);
+registerAction2(ResetActiveEditorReadonlyInSession);
 const explorerCommandsWeightBonus = 10;
 const RENAME_ID = 'renameFile';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -114,15 +125,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 const copyPathCommand = {
     id: COPY_PATH_COMMAND_ID,
-    title: ( nls.localize('copyPath', "Copy Path"))
+    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyPath', "Copy Path")
 };
 const copyRelativePathCommand = {
     id: COPY_RELATIVE_PATH_COMMAND_ID,
-    title: ( nls.localize('copyRelativePath', "Copy Relative Path"))
+    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyRelativePath', "Copy Relative Path")
 };
 appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, copyPathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste');
 appendEditorTitleContextMenuItem(COPY_RELATIVE_PATH_COMMAND_ID, copyRelativePathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste');
-appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, ( nls.localize('revealInSideBar', "Reveal in Explorer View")), ResourceContextKey.IsFileSystemResource, '2_files', 1);
+appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revealInSideBar', "Reveal in Explorer View"), ResourceContextKey.IsFileSystemResource, '2_files', 1);
 function appendEditorTitleContextMenuItem(id, title, when, group, order) {
     MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
         command: { id, title },
@@ -131,8 +142,8 @@ function appendEditorTitleContextMenuItem(id, title, when, group, order) {
         order
     });
 }
-appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', ( nls.localize('acceptLocalChanges', "Use your changes and overwrite file contents")), Codicon.check, -10);
-appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', ( nls.localize('revertLocalChanges', "Discard your changes and revert to file contents")), Codicon.discard, -9);
+appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'acceptLocalChanges', "Use your changes and overwrite file contents"), Codicon.check, -10);
+appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revertLocalChanges', "Discard your changes and revert to file contents"), Codicon.discard, -9);
 function appendSaveConflictEditorTitleAction(id, title, icon, order, command) {
     MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
         command: { id, title, icon },
@@ -151,14 +162,14 @@ function appendToCommandPalette(id, title, category, when) {
         when
     });
 }
-appendToCommandPalette(COPY_PATH_COMMAND_ID, { value: ( nls.localize('copyPathOfActive', "Copy Path of Active File")), original: 'Copy Path of Active File' }, Categories.File);
-appendToCommandPalette(COPY_RELATIVE_PATH_COMMAND_ID, { value: ( nls.localize('copyRelativePathOfActive', "Copy Relative Path of Active File")), original: 'Copy Relative Path of Active File' }, Categories.File);
+appendToCommandPalette(COPY_PATH_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyPathOfActive', "Copy Path of Active File"), original: 'Copy Path of Active File' }, Categories.File);
+appendToCommandPalette(COPY_RELATIVE_PATH_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyRelativePathOfActive', "Copy Relative Path of Active File"), original: 'Copy Relative Path of Active File' }, Categories.File);
 appendToCommandPalette(SAVE_FILE_COMMAND_ID, { value: SAVE_FILE_LABEL, original: 'Save' }, Categories.File);
 appendToCommandPalette(SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, { value: SAVE_FILE_WITHOUT_FORMATTING_LABEL, original: 'Save without Formatting' }, Categories.File);
-appendToCommandPalette(SAVE_ALL_IN_GROUP_COMMAND_ID, { value: ( nls.localize('saveAllInGroup', "Save All in Group")), original: 'Save All in Group' }, Categories.File);
-appendToCommandPalette(SAVE_FILES_COMMAND_ID, { value: ( nls.localize('saveFiles', "Save All Files")), original: 'Save All Files' }, Categories.File);
-appendToCommandPalette(REVERT_FILE_COMMAND_ID, { value: ( nls.localize('revert', "Revert File")), original: 'Revert File' }, Categories.File);
-appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, { value: ( nls.localize('compareActiveWithSaved', "Compare Active File with Saved")), original: 'Compare Active File with Saved' }, Categories.File);
+appendToCommandPalette(SAVE_ALL_IN_GROUP_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'saveAllInGroup', "Save All in Group"), original: 'Save All in Group' }, Categories.File);
+appendToCommandPalette(SAVE_FILES_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'saveFiles', "Save All Files"), original: 'Save All Files' }, Categories.File);
+appendToCommandPalette(REVERT_FILE_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revert', "Revert File"), original: 'Revert File' }, Categories.File);
+appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareActiveWithSaved', "Compare Active File with Saved"), original: 'Compare Active File with Saved' }, Categories.File);
 appendToCommandPalette(SAVE_FILE_AS_COMMAND_ID, { value: SAVE_FILE_AS_LABEL, original: 'Save As...' }, Categories.File);
 appendToCommandPalette(NEW_FILE_COMMAND_ID, { value: NEW_FILE_LABEL, original: 'New File' }, Categories.File, ( WorkspaceFolderCountContext.notEqualsTo('0')));
 appendToCommandPalette(NEW_FOLDER_COMMAND_ID, { value: NEW_FOLDER_LABEL, original: 'New Folder' }, Categories.File, ( WorkspaceFolderCountContext.notEqualsTo('0')));
@@ -166,7 +177,7 @@ appendToCommandPalette(NEW_UNTITLED_FILE_COMMAND_ID, { value: NEW_UNTITLED_FILE_
 const isFileOrUntitledResourceContextKey = ( ContextKeyExpr.or(ResourceContextKey.IsFileSystemResource, ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled))));
 const openToSideCommand = {
     id: OPEN_TO_SIDE_COMMAND_ID,
-    title: ( nls.localize('openToSide', "Open to the Side"))
+    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'openToSide', "Open to the Side")
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: 'navigation',
@@ -179,7 +190,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 10,
     command: {
         id: REOPEN_WITH_COMMAND_ID,
-        title: ( nls.localize('reopenWith', "Reopen Editor With..."))
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'reopenWith', "Reopen Editor With...")
     },
     when: ActiveEditorAvailableEditorIdsContext
 });
@@ -215,7 +226,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 20,
     command: {
         id: REVERT_FILE_COMMAND_ID,
-        title: ( nls.localize('revert', "Revert File")),
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revert', "Revert File"),
         precondition: OpenEditorsDirtyEditorContext
     },
     when: ( ContextKeyExpr.and((
@@ -229,7 +240,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 30,
     command: {
         id: SAVE_ALL_IN_GROUP_COMMAND_ID,
-        title: ( nls.localize('saveAll', "Save All")),
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'saveAll', "Save All"),
         precondition: DirtyWorkingCopiesContext
     },
     when: OpenEditorsGroupContext
@@ -239,14 +250,14 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 10,
     command: {
         id: COMPARE_WITH_SAVED_COMMAND_ID,
-        title: ( nls.localize('compareWithSaved', "Compare with Saved")),
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareWithSaved', "Compare with Saved"),
         precondition: OpenEditorsDirtyEditorContext
     },
     when: ( ContextKeyExpr.and(ResourceContextKey.IsFileSystemResource, ( AutoSaveAfterShortDelayContext.toNegated()), ( WorkbenchListDoubleSelection.toNegated())))
 });
 const compareResourceCommand = {
     id: COMPARE_RESOURCE_COMMAND_ID,
-    title: ( nls.localize('compareWithSelected', "Compare with Selected"))
+    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareWithSelected', "Compare with Selected")
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: '3_compare',
@@ -261,7 +272,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 });
 const selectForCompareCommand = {
     id: SELECT_FOR_COMPARE_COMMAND_ID,
-    title: ( nls.localize('compareSource', "Select for Compare"))
+    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareSource', "Select for Compare")
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: '3_compare',
@@ -275,7 +286,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 });
 const compareSelectedCommand = {
     id: COMPARE_SELECTED_COMMAND_ID,
-    title: ( nls.localize('compareSelected', "Compare Selected"))
+    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareSelected', "Compare Selected")
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: '3_compare',
@@ -292,7 +303,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 10,
     command: {
         id: CLOSE_EDITOR_COMMAND_ID,
-        title: ( nls.localize('close', "Close"))
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'close', "Close")
     },
     when: ( OpenEditorsGroupContext.toNegated())
 });
@@ -301,7 +312,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 20,
     command: {
         id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID,
-        title: ( nls.localize('closeOthers', "Close Others"))
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'closeOthers', "Close Others")
     },
     when: ( OpenEditorsGroupContext.toNegated())
 });
@@ -310,7 +321,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 30,
     command: {
         id: CLOSE_SAVED_EDITORS_COMMAND_ID,
-        title: ( nls.localize('closeSaved', "Close Saved"))
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'closeSaved', "Close Saved")
     }
 });
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -318,7 +329,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 40,
     command: {
         id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
-        title: ( nls.localize('closeAll', "Close All"))
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'closeAll', "Close All")
     }
 });
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
@@ -352,7 +363,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     order: 20,
     command: {
         id: OPEN_WITH_EXPLORER_COMMAND_ID,
-        title: ( nls.localize('explorerOpenWith', "Open With...")),
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'explorerOpenWith', "Open With..."),
     },
     when: ( ContextKeyExpr.and(( ExplorerFolderContext.toNegated()), ExplorerResourceAvailableEditorIdsContext)),
 });
@@ -379,7 +390,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     order: 8,
     command: {
         id: CUT_FILE_ID,
-        title: ( nls.localize('cut', "Cut"))
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'cut', "Cut")
     },
     when: ( ContextKeyExpr.and(( ExplorerRootContext.toNegated()), ExplorerResourceNotReadonlyContext))
 });
@@ -476,7 +487,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     },
     alt: {
         id: DELETE_FILE_ID,
-        title: ( nls.localize('deleteFile', "Delete Permanently")),
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'deleteFile', "Delete Permanently"),
         precondition: ExplorerResourceNotReadonlyContext
     },
     when: ( ContextKeyExpr.and(( ExplorerRootContext.toNegated()), ExplorerResourceMoveableToTrash))
@@ -486,23 +497,84 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     order: 20,
     command: {
         id: DELETE_FILE_ID,
-        title: ( nls.localize('deleteFile', "Delete Permanently")),
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'deleteFile', "Delete Permanently"),
         precondition: ExplorerResourceNotReadonlyContext
     },
     when: ( ContextKeyExpr.and(( ExplorerRootContext.toNegated()), ( ExplorerResourceMoveableToTrash.toNegated())))
 });
 for (const menuId of [MenuId.EmptyEditorGroupContext, MenuId.EditorTabsBarContext]) {
-    MenuRegistry.appendMenuItem(menuId, { command: { id: NEW_UNTITLED_FILE_COMMAND_ID, title: ( nls.localize('newFile', "New Text File")) }, group: '1_file', order: 10 });
-    MenuRegistry.appendMenuItem(menuId, { command: { id: 'workbench.action.quickOpen', title: ( nls.localize('openFile', "Open File...")) }, group: '1_file', order: 20 });
+    MenuRegistry.appendMenuItem(menuId, { command: { id: NEW_UNTITLED_FILE_COMMAND_ID, title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'newFile', "New Text File") }, group: '1_file', order: 10 });
+    MenuRegistry.appendMenuItem(menuId, { command: { id: 'workbench.action.quickOpen', title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'openFile', "Open File...") }, group: '1_file', order: 20 });
 }
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '1_new',
+    command: {
+        id: NEW_UNTITLED_FILE_COMMAND_ID,
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miNewFile', comment: ['&& denotes a mnemonic'] }, "&&New Text File")
+    },
+    order: 1
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '4_save',
+    command: {
+        id: SAVE_FILE_COMMAND_ID,
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miSave', comment: ['&& denotes a mnemonic'] }, "&&Save"),
+        precondition: ( ContextKeyExpr.or(ActiveEditorContext, ( ContextKeyExpr.and(FoldersViewVisibleContext, SidebarFocusContext))))
+    },
+    order: 1
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '4_save',
+    command: {
+        id: SAVE_FILE_AS_COMMAND_ID,
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miSaveAs', comment: ['&& denotes a mnemonic'] }, "Save &&As..."),
+        precondition: ( ContextKeyExpr.or(ActiveEditorContext, ( ContextKeyExpr.and(FoldersViewVisibleContext, SidebarFocusContext))))
+    },
+    order: 2
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '4_save',
+    command: {
+        id: SAVE_ALL_COMMAND_ID,
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miSaveAll', comment: ['&& denotes a mnemonic'] }, "Save A&&ll"),
+        precondition: DirtyWorkingCopiesContext
+    },
+    order: 3
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '5_autosave',
+    command: {
+        id: ToggleAutoSaveAction.ID,
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miAutoSave', comment: ['&& denotes a mnemonic'] }, "A&&uto Save"),
+        toggled: ( ContextKeyExpr.notEquals('config.files.autoSave', 'off'))
+    },
+    order: 1
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '6_close',
+    command: {
+        id: REVERT_FILE_COMMAND_ID,
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miRevert', comment: ['&& denotes a mnemonic'] }, "Re&&vert File"),
+        precondition: ( ContextKeyExpr.or((
+        ContextKeyExpr.and(ActiveEditorCanRevertContext)), (
+        ContextKeyExpr.and(( ResourceContextKey.Scheme.notEqualsTo(Schemas.untitled)), FoldersViewVisibleContext, SidebarFocusContext)))),
+    },
+    order: 1
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '6_close',
+    command: {
+        id: CLOSE_EDITOR_COMMAND_ID,
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miCloseEditor', comment: ['&& denotes a mnemonic'] }, "&&Close Editor"),
+        precondition: ( ContextKeyExpr.or(ActiveEditorContext, ( ContextKeyExpr.and(FoldersViewVisibleContext, SidebarFocusContext))))
+    },
+    order: 2
+}));
 MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '3_global_nav',
     command: {
         id: 'workbench.action.quickOpen',
-        title: ( nls.localize(
-            { key: 'miGotoFile', comment: ['&& denotes a mnemonic'] },
-            "Go to &&File..."
-        ))
+        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miGotoFile', comment: ['&& denotes a mnemonic'] }, "Go to &&File...")
     },
     order: 1
 });

package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.js

@@ -117,7 +117,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         const uri = getResourceForCommand(resource, accessor.get(IListService), editorService);
         if (uri && fileService.hasProvider(uri)) {
             const name = basename(uri);
-            const editorLabel = ( nls.localize('modifiedLabel', "{0} (in file) ↔ {1}", name, name));
+            const editorLabel = nls.localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', 'modifiedLabel', "{0} (in file) ↔ {1}", name, name);
             try {
                 await TextFileContentProvider.open(uri, COMPARE_WITH_SAVED_SCHEMA, editorLabel, editorService, { pinned: true });
                 if (registerEditorListener) {
@@ -353,16 +353,11 @@ async function doSaveEditors(accessor, editors, options) {
             notificationService.notify({
                 id: ( editors.map(({ editor }) => hash(editor.resource?.toString()))).join(),
                 severity: Severity.Error,
-                message: ( nls.localize(
-                    { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] },
-                    "Failed to save '{0}': {1}",
-                    ( editors.map(({ editor }) => editor.getName())).join(', '),
-                    toErrorMessage(error, false)
-                )),
+                message: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] }, "Failed to save '{0}': {1}", ( editors.map(({ editor }) => editor.getName())).join(', '), toErrorMessage(error, false)),
                 actions: {
                     primary: [
-                        toAction({ id: 'workbench.action.files.saveEditors', label: ( nls.localize('retry', "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
-                        toAction({ id: 'workbench.action.files.revertEditors', label: ( nls.localize('discard', "Discard")), run: () => editorService.revert(editors) })
+                        toAction({ id: 'workbench.action.files.saveEditors', label: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', 'retry', "Retry"), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
+                        toAction({ id: 'workbench.action.files.revertEditors', label: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', 'discard', "Discard"), run: () => editorService.revert(editors) })
                     ]
                 }
             });
@@ -452,7 +447,7 @@ CommandsRegistry.registerCommand({
             await editorService.revert(editors.filter(({ editor }) => !editor.hasCapability(4 ) ), { force: true });
         }
         catch (error) {
-            notificationService.error(( nls.localize('genericRevertError', "Failed to revert '{0}': {1}", ( editors.map(({ editor }) => editor.getName())).join(', '), toErrorMessage(error, false))));
+            notificationService.error(nls.localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', 'genericRevertError', "Failed to revert '{0}': {1}", ( editors.map(({ editor }) => editor.getName())).join(', '), toErrorMessage(error, false)));
         }
     }
 });
@@ -597,7 +592,7 @@ CommandsRegistry.registerCommand({
         const editorService = accessor.get(IEditorService);
         const dialogService = accessor.get(IFileDialogService);
         const fileService = accessor.get(IFileService);
-        const createFileLocalized = ( nls.localize('newFileCommand.saveLabel', "Create File"));
+        const createFileLocalized = nls.localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', 'newFileCommand.saveLabel', "Create File");
         const defaultFileUri = joinPath(await dialogService.defaultFilePath(), args?.fileName ?? 'Untitled.txt');
         const saveUri = await dialogService.showSaveDialog({ saveLabel: createFileLocalized, title: createFileLocalized, defaultUri: defaultFileUri });
         if (!saveUri) {