Move more strings to localize2 (take 2) (microsoft#204180)

* Revert "Revert "Adopt localize2 in more spots" (microsoft#204087)"

This reverts commit 5baa693.

* Keep only the localize2 changes

* revert accidental change to launch.json

Author: TylerLeonhardt

src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts

@@ -171,7 +171,7 @@ export function getQuickChatActionForProvider(id: string, label: string) {
 			super({
 				id: `workbench.action.openQuickChat.${id}`,
 				category: CHAT_CATEGORY,
-				title: { value: localize('interactiveSession.open', "Open Quick Chat ({0})", label), original: `Open Quick Chat (${label})` },
+				title: localize2('interactiveSession.open', "Open Quick Chat ({0})", label),
 				f1: true
 			});
 		}

src/vs/workbench/contrib/debug/browser/debug.contribution.ts

@@ -232,8 +232,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { submenu: MenuId.EditorTitleRun
 MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
 	submenu: MenuId.MenubarDebugMenu,
 	title: {
-		value: 'Run',
-		original: 'Run',
+		...nls.localize2('runMenu', "Run"),
 		mnemonicTitle: nls.localize({ key: 'mRun', comment: ['&& denotes a mnemonic'] }, "&&Run")
 	},
 	order: 6

src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts

@@ -899,7 +899,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 	}
 
 	private generateStandaloneOptionCommand(commandId: string, qualifiedName: string, category: string | ILocalizedString | undefined, when: ContextKeyExpression | undefined, remoteGroup: string | undefined) {
-		const command = {
+		const command: IAction2Options = {
 			id: `${continueWorkingOnCommand.id}.${commandId}`,
 			title: { original: qualifiedName, value: qualifiedName },
 			category: typeof category === 'string' ? { original: category, value: category } : category,

src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts

@@ -177,10 +177,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 						super({
 							id: 'workbench.extensions.installLocalExtensions',
 							get title() {
-								return {
-									value: localize('select and install local extensions', "Install Local Extensions in '{0}'...", server.label),
-									original: `Install Local Extensions in '${server.label}'...`,
-								};
+								return localize2('select and install local extensions', "Install Local Extensions in '{0}'...", server.label);
 							},
 							category: REMOTE_CATEGORY,
 							icon: installLocalInRemoteIcon,

src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts

@@ -324,7 +324,7 @@ class SaveModelAsAction extends Action {
 		private model: ITextFileEditorModel,
 		@IEditorService private editorService: IEditorService
 	) {
-		super('workbench.files.action.saveModelAs', SAVE_FILE_AS_LABEL);
+		super('workbench.files.action.saveModelAs', SAVE_FILE_AS_LABEL.value);
 	}
 
 	override async run(): Promise<void> {

src/vs/workbench/contrib/files/browser/fileActions.contribution.ts

@@ -215,13 +215,13 @@ appendToCommandPalette({
 
 appendToCommandPalette({
 	id: SAVE_FILE_COMMAND_ID,
-	title: { value: SAVE_FILE_LABEL, original: 'Save' },
+	title: SAVE_FILE_LABEL,
 	category: Categories.File
 });
 
 appendToCommandPalette({
 	id: SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID,
-	title: { value: SAVE_FILE_WITHOUT_FORMATTING_LABEL, original: 'Save without Formatting' },
+	title: SAVE_FILE_WITHOUT_FORMATTING_LABEL,
 	category: Categories.File
 });
 
@@ -251,26 +251,26 @@ appendToCommandPalette({
 
 appendToCommandPalette({
 	id: SAVE_FILE_AS_COMMAND_ID,
-	title: { value: SAVE_FILE_AS_LABEL, original: 'Save As...' },
+	title: SAVE_FILE_AS_LABEL,
 	category: Categories.File
 });
 
 appendToCommandPalette({
 	id: NEW_FILE_COMMAND_ID,
-	title: { value: NEW_FILE_LABEL, original: 'New File' },
+	title: NEW_FILE_LABEL,
 	category: Categories.File
 }, WorkspaceFolderCountContext.notEqualsTo('0'));
 
 appendToCommandPalette({
 	id: NEW_FOLDER_COMMAND_ID,
-	title: { value: NEW_FOLDER_LABEL, original: 'New Folder' },
+	title: NEW_FOLDER_LABEL,
 	category: Categories.File,
 	metadata: { description: nls.localize2('newFolderDescription', "Create a new folder or directory") }
 }, WorkspaceFolderCountContext.notEqualsTo('0'));
 
 appendToCommandPalette({
 	id: NEW_UNTITLED_FILE_COMMAND_ID,
-	title: { value: NEW_UNTITLED_FILE_LABEL, original: 'New Untitled Text File' },
+	title: NEW_UNTITLED_FILE_LABEL,
 	category: Categories.File
 });
 

src/vs/workbench/contrib/files/browser/fileActions.ts

@@ -61,9 +61,9 @@ import { Categories } from 'vs/platform/action/common/actionCommonCategories';
 import { ILocalizedString } from 'vs/platform/action/common/action';
 
 export const NEW_FILE_COMMAND_ID = 'explorer.newFile';
-export const NEW_FILE_LABEL = nls.localize('newFile', "New File...");
+export const NEW_FILE_LABEL = nls.localize2('newFile', "New File...");
 export const NEW_FOLDER_COMMAND_ID = 'explorer.newFolder';
-export const NEW_FOLDER_LABEL = nls.localize('newFolder', "New Folder...");
+export const NEW_FOLDER_LABEL = nls.localize2('newFolder', "New Folder...");
 export const TRIGGER_RENAME_LABEL = nls.localize('rename', "Rename...");
 export const MOVE_FILE_TO_TRASH_LABEL = nls.localize('delete', "Delete");
 export const COPY_FILE_LABEL = nls.localize('copyFile', "Copy");
@@ -481,12 +481,12 @@ async function askForOverwrite(fileService: IFileService, dialogService: IDialog
 export class GlobalCompareResourcesAction extends Action2 {
 
 	static readonly ID = 'workbench.files.action.compareFileWith';
-	static readonly LABEL = nls.localize('globalCompareFile', "Compare Active File With...");
+	static readonly LABEL = nls.localize2('globalCompareFile', "Compare Active File With...");
 
 	constructor() {
 		super({
 			id: GlobalCompareResourcesAction.ID,
-			title: { value: GlobalCompareResourcesAction.LABEL, original: 'Compare Active File With...' },
+			title: GlobalCompareResourcesAction.LABEL,
 			f1: true,
 			category: Categories.File,
 			precondition: ActiveEditorContext
@@ -609,12 +609,12 @@ export class CloseGroupAction extends Action {
 export class FocusFilesExplorer extends Action2 {
 
 	static readonly ID = 'workbench.files.action.focusFilesExplorer';
-	static readonly LABEL = nls.localize('focusFilesExplorer', "Focus on Files Explorer");
+	static readonly LABEL = nls.localize2('focusFilesExplorer', "Focus on Files Explorer");
 
 	constructor() {
 		super({
 			id: FocusFilesExplorer.ID,
-			title: { value: FocusFilesExplorer.LABEL, original: 'Focus on Files Explorer' },
+			title: FocusFilesExplorer.LABEL,
 			f1: true,
 			category: Categories.File
 		});
@@ -629,12 +629,12 @@ export class FocusFilesExplorer extends Action2 {
 export class ShowActiveFileInExplorer extends Action2 {
 
 	static readonly ID = 'workbench.files.action.showActiveFileInExplorer';
-	static readonly LABEL = nls.localize('showInExplorer', "Reveal Active File in Explorer View");
+	static readonly LABEL = nls.localize2('showInExplorer', "Reveal Active File in Explorer View");
 
 	constructor() {
 		super({
 			id: ShowActiveFileInExplorer.ID,
-			title: { value: ShowActiveFileInExplorer.LABEL, original: 'Reveal Active File in Explorer View' },
+			title: ShowActiveFileInExplorer.LABEL,
 			f1: true,
 			category: Categories.File
 		});
@@ -653,13 +653,13 @@ export class ShowActiveFileInExplorer extends Action2 {
 export class OpenActiveFileInEmptyWorkspace extends Action2 {
 
 	static readonly ID = 'workbench.action.files.showOpenedFileInNewWindow';
-	static readonly LABEL = nls.localize('openFileInEmptyWorkspace', "Open Active File in New Empty Workspace");
+	static readonly LABEL = nls.localize2('openFileInEmptyWorkspace', "Open Active File in New Empty Workspace");
 
 	constructor(
 	) {
 		super({
 			id: OpenActiveFileInEmptyWorkspace.ID,
-			title: { value: OpenActiveFileInEmptyWorkspace.LABEL, original: 'Open Active File in New Empty Workspace' },
+			title: OpenActiveFileInEmptyWorkspace.LABEL,
 			f1: true,
 			category: Categories.File,
 			precondition: EmptyWorkspaceSupportContext
@@ -763,12 +763,12 @@ function getWellFormedFileName(filename: string): string {
 export class CompareNewUntitledTextFilesAction extends Action2 {
 
 	static readonly ID = 'workbench.files.action.compareNewUntitledTextFiles';
-	static readonly LABEL = nls.localize('compareNewUntitledTextFiles', "Compare New Untitled Text Files");
+	static readonly LABEL = nls.localize2('compareNewUntitledTextFiles', "Compare New Untitled Text Files");
 
 	constructor() {
 		super({
 			id: CompareNewUntitledTextFilesAction.ID,
-			title: { value: CompareNewUntitledTextFilesAction.LABEL, original: 'Compare New Untitled Text Files' },
+			title: CompareNewUntitledTextFilesAction.LABEL,
 			f1: true,
 			category: Categories.File
 		});
@@ -788,15 +788,15 @@ export class CompareNewUntitledTextFilesAction extends Action2 {
 export class CompareWithClipboardAction extends Action2 {
 
 	static readonly ID = 'workbench.files.action.compareWithClipboard';
-	static readonly LABEL = nls.localize('compareWithClipboard', "Compare Active File with Clipboard");
+	static readonly LABEL = nls.localize2('compareWithClipboard', "Compare Active File with Clipboard");
 
 	private registrationDisposal: IDisposable | undefined;
 	private static SCHEME_COUNTER = 0;
 
 	constructor() {
 		super({
 			id: CompareWithClipboardAction.ID,
-			title: { value: CompareWithClipboardAction.LABEL, original: 'Compare Active File with Clipboard' },
+			title: CompareWithClipboardAction.LABEL,
 			f1: true,
 			category: Categories.File,
 			keybinding: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyC), weight: KeybindingWeight.WorkbenchContrib }
@@ -1261,12 +1261,12 @@ class BaseSetActiveEditorReadonlyInSession extends Action2 {
 export class SetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
 
 	static readonly ID = 'workbench.action.files.setActiveEditorReadonlyInSession';
-	static readonly LABEL = nls.localize('setActiveEditorReadonlyInSession', "Set Active Editor Read-only in Session");
+	static readonly LABEL = nls.localize2('setActiveEditorReadonlyInSession', "Set Active Editor Read-only in Session");
 
 	constructor() {
 		super(
 			SetActiveEditorReadonlyInSession.ID,
-			{ value: SetActiveEditorReadonlyInSession.LABEL, original: 'Set Active Editor Readonly in Session' },
+			SetActiveEditorReadonlyInSession.LABEL,
 			true
 		);
 	}
@@ -1275,12 +1275,12 @@ export class SetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonl
 export class SetActiveEditorWriteableInSession extends BaseSetActiveEditorReadonlyInSession {
 
 	static readonly ID = 'workbench.action.files.setActiveEditorWriteableInSession';
-	static readonly LABEL = nls.localize('setActiveEditorWriteableInSession', "Set Active Editor Writeable in Session");
+	static readonly LABEL = nls.localize2('setActiveEditorWriteableInSession', "Set Active Editor Writeable in Session");
 
 	constructor() {
 		super(
 			SetActiveEditorWriteableInSession.ID,
-			{ value: SetActiveEditorWriteableInSession.LABEL, original: 'Set Active Editor Writeable in Session' },
+			SetActiveEditorWriteableInSession.LABEL,
 			false
 		);
 	}
@@ -1289,12 +1289,12 @@ export class SetActiveEditorWriteableInSession extends BaseSetActiveEditorReadon
 export class ToggleActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
 
 	static readonly ID = 'workbench.action.files.toggleActiveEditorReadonlyInSession';
-	static readonly LABEL = nls.localize('toggleActiveEditorReadonlyInSession', "Toggle Active Editor Read-only in Session");
+	static readonly LABEL = nls.localize2('toggleActiveEditorReadonlyInSession', "Toggle Active Editor Read-only in Session");
 
 	constructor() {
 		super(
 			ToggleActiveEditorReadonlyInSession.ID,
-			{ value: ToggleActiveEditorReadonlyInSession.LABEL, original: 'Toggle Active Editor Readonly in Session' },
+			ToggleActiveEditorReadonlyInSession.LABEL,
 			'toggle'
 		);
 	}
@@ -1303,12 +1303,12 @@ export class ToggleActiveEditorReadonlyInSession extends BaseSetActiveEditorRead
 export class ResetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
 
 	static readonly ID = 'workbench.action.files.resetActiveEditorReadonlyInSession';
-	static readonly LABEL = nls.localize('resetActiveEditorReadonlyInSession', "Reset Active Editor Read-only in Session");
+	static readonly LABEL = nls.localize2('resetActiveEditorReadonlyInSession', "Reset Active Editor Read-only in Session");
 
 	constructor() {
 		super(
 			ResetActiveEditorReadonlyInSession.ID,
-			{ value: ResetActiveEditorReadonlyInSession.LABEL, original: 'Reset Active Editor Readonly in Session' },
+			ResetActiveEditorReadonlyInSession.LABEL,
 			'reset'
 		);
 	}

src/vs/workbench/contrib/files/browser/fileConstants.ts

@@ -19,14 +19,14 @@ export const COPY_PATH_COMMAND_ID = 'copyFilePath';
 export const COPY_RELATIVE_PATH_COMMAND_ID = 'copyRelativeFilePath';
 
 export const SAVE_FILE_AS_COMMAND_ID = 'workbench.action.files.saveAs';
-export const SAVE_FILE_AS_LABEL = nls.localize('saveAs', "Save As...");
+export const SAVE_FILE_AS_LABEL = nls.localize2('saveAs', "Save As...");
 export const SAVE_FILE_COMMAND_ID = 'workbench.action.files.save';
-export const SAVE_FILE_LABEL = nls.localize('save', "Save");
+export const SAVE_FILE_LABEL = nls.localize2('save', "Save");
 export const SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID = 'workbench.action.files.saveWithoutFormatting';
-export const SAVE_FILE_WITHOUT_FORMATTING_LABEL = nls.localize('saveWithoutFormatting', "Save without Formatting");
+export const SAVE_FILE_WITHOUT_FORMATTING_LABEL = nls.localize2('saveWithoutFormatting', "Save without Formatting");
 
 export const SAVE_ALL_COMMAND_ID = 'saveAll';
-export const SAVE_ALL_LABEL = nls.localize('saveAll', "Save All");
+export const SAVE_ALL_LABEL = nls.localize2('saveAll', "Save All");
 
 export const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup';
 
@@ -45,5 +45,5 @@ export const NEXT_COMPRESSED_FOLDER = 'nextCompressedFolder';
 export const FIRST_COMPRESSED_FOLDER = 'firstCompressedFolder';
 export const LAST_COMPRESSED_FOLDER = 'lastCompressedFolder';
 export const NEW_UNTITLED_FILE_COMMAND_ID = 'workbench.action.files.newUntitledFile';
-export const NEW_UNTITLED_FILE_LABEL = nls.localize('newUntitledFile', "New Untitled Text File");
+export const NEW_UNTITLED_FILE_LABEL = nls.localize2('newUntitledFile', "New Untitled Text File");
 export const NEW_FILE_COMMAND_ID = 'workbench.action.files.newFile';

src/vs/workbench/contrib/files/browser/views/openEditorsView.ts

@@ -835,7 +835,7 @@ registerAction2(class extends Action2 {
 	constructor() {
 		super({
 			id: 'workbench.action.files.saveAll',
-			title: { value: SAVE_ALL_LABEL, original: 'Save All' },
+			title: SAVE_ALL_LABEL,
 			f1: true,
 			icon: Codicon.saveAll,
 			menu: {

src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts

@@ -24,7 +24,7 @@ import { SideBySideEditor, EditorResourceAccessor } from 'vs/workbench/common/ed
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 
 const REVEAL_IN_OS_COMMAND_ID = 'revealFileInOS';
-const REVEAL_IN_OS_LABEL = isWindows ? nls.localize('revealInWindows', "Reveal in File Explorer") : isMacintosh ? nls.localize('revealInMac', "Reveal in Finder") : nls.localize('openContainer', "Open Containing Folder");
+const REVEAL_IN_OS_LABEL = isWindows ? nls.localize2('revealInWindows', "Reveal in File Explorer") : isMacintosh ? nls.localize2('revealInMac', "Reveal in Finder") : nls.localize2('openContainer', "Open Containing Folder");
 const REVEAL_IN_OS_WHEN_CONTEXT = ContextKeyExpr.or(ResourceContextKey.Scheme.isEqualTo(Schemas.file), ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData));
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -57,13 +57,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-appendEditorTitleContextMenuItem(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, REVEAL_IN_OS_WHEN_CONTEXT, '2_files', 0);
+appendEditorTitleContextMenuItem(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL.value, REVEAL_IN_OS_WHEN_CONTEXT, '2_files', 0);
 
 // Menu registration - open editors
 
 const revealInOsCommand = {
 	id: REVEAL_IN_OS_COMMAND_ID,
-	title: REVEAL_IN_OS_LABEL
+	title: REVEAL_IN_OS_LABEL.value
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: 'navigation',
@@ -92,6 +92,6 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 const category = nls.localize2('filesCategory', "File");
 appendToCommandPalette({
 	id: REVEAL_IN_OS_COMMAND_ID,
-	title: { value: REVEAL_IN_OS_LABEL, original: isWindows ? 'Reveal in File Explorer' : isMacintosh ? 'Reveal in Finder' : 'Open Containing Folder' },
+	title: REVEAL_IN_OS_LABEL,
 	category: category
 }, REVEAL_IN_OS_WHEN_CONTEXT);