Change 'overwrite' to 'override' in setting screens

philiparola · philiparola · commit b6d41d7bfa1c · 2018-10-26T23:36:02.000-07:00
Overwrite implies that the setting will be changed rather than superseded.
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -95,7 +95,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 	}
 
 	protected createHeader(): void {
-		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyUserSettingsHeader', "Place your settings here to overwrite the Default Settings."));
+		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyUserSettingsHeader', "Place your settings here to override the Default Settings."));
 	}
 
 	public render(): void {
@@ -191,7 +191,7 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
 	}
 
 	protected createHeader(): void {
-		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyWorkspaceSettingsHeader', "Place your settings here to overwrite the User Settings."));
+		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyWorkspaceSettingsHeader', "Place your settings here to override the User Settings."));
 	}
 
 	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
@@ -217,7 +217,7 @@ export class FolderSettingsRenderer extends UserSettingsRenderer implements IPre
 	}
 
 	protected createHeader(): void {
-		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyFolderSettingsHeader', "Place your folder settings here to overwrite those from the Workspace Settings."));
+		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyFolderSettingsHeader', "Place your folder settings here to override those from the Workspace Settings."));
 	}
 
 }
diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
@@ -246,6 +246,6 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 	}
 
 	private getEmptyContent(EOL: string): string {
-		return '// ' + localize('emptyKeybindingsHeader', "Place your key bindings in this file to overwrite the defaults") + EOL + '[]';
+		return '// ' + localize('emptyKeybindingsHeader', "Place your key bindings in this file to override the defaults") + EOL + '[]';
 	}
 }
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -257,7 +257,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		*/
 		this.telemetryService.publicLog('openKeybindings', { textual });
 		if (textual) {
-			const emptyContents = '// ' + nls.localize('emptyKeybindingsHeader', "Place your key bindings in this file to overwrite the defaults") + '\n[\n]';
+			const emptyContents = '// ' + nls.localize('emptyKeybindingsHeader', "Place your key bindings in this file to override the defaults") + '\n[\n]';
 			const editableKeybindings = URI.file(this.environmentService.appKeybindingsPath);
 			const openDefaultKeybindings = !!this.configurationService.getValue('workbench.settings.openDefaultKeybindings');
 
diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -1126,7 +1126,7 @@ function escapeInvisibleChars(enumValue: string): string {
 }
 
 export function defaultKeybindingsContents(keybindingService: IKeybindingService): string {
-	const defaultsHeader = '// ' + nls.localize('defaultKeybindingsHeader', "Overwrite key bindings by placing them into your key bindings file.");
+	const defaultsHeader = '// ' + nls.localize('defaultKeybindingsHeader', "Override key bindings by placing them into your key bindings file.");
 	return defaultsHeader + '\n' + keybindingService.getDefaultKeybindingsContent();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`protected createHeader(): void {`
`98`		`- this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyUserSettingsHeader', "Place your settings here to overwrite the Default Settings."));`
	`98`	`+ this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyUserSettingsHeader', "Place your settings here to override the Default Settings."));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public render(): void {`
`@@ -191,7 +191,7 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`protected createHeader(): void {`
`194`		`- this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyWorkspaceSettingsHeader', "Place your settings here to overwrite the User Settings."));`
	`194`	`+ this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyWorkspaceSettingsHeader', "Place your settings here to override the User Settings."));`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {`
`@@ -217,7 +217,7 @@ export class FolderSettingsRenderer extends UserSettingsRenderer implements IPre`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`protected createHeader(): void {`
`220`		`- this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyFolderSettingsHeader', "Place your folder settings here to overwrite those from the Workspace Settings."));`
	`220`	`+ this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyFolderSettingsHeader', "Place your folder settings here to override those from the Workspace Settings."));`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,6 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`private getEmptyContent(EOL: string): string {`
`249`		`- return '// ' + localize('emptyKeybindingsHeader', "Place your key bindings in this file to overwrite the defaults") + EOL + '[]';`
	`249`	`+ return '// ' + localize('emptyKeybindingsHeader', "Place your key bindings in this file to override the defaults") + EOL + '[]';`
`250`	`250`	`}`
`251`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1126,7 +1126,7 @@ function escapeInvisibleChars(enumValue: string): string {`
`1126`	`1126`	`}`
`1127`	`1127`
`1128`	`1128`	`export function defaultKeybindingsContents(keybindingService: IKeybindingService): string {`
`1129`		`- const defaultsHeader = '// ' + nls.localize('defaultKeybindingsHeader', "Overwrite key bindings by placing them into your key bindings file.");`
	`1129`	`+ const defaultsHeader = '// ' + nls.localize('defaultKeybindingsHeader', "Override key bindings by placing them into your key bindings file.");`
`1130`	`1130`	`return defaultsHeader + '\n' + keybindingService.getDefaultKeybindingsContent();`
`1131`	`1131`	`}`
`1132`	`1132`