mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
Merge pull request #61926 from philiparola/master
Change 'overwrite' to 'override' in setting screens
This commit is contained in:
commit
3a08ae630c
|
@ -94,7 +94,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 {
|
||||
|
@ -190,7 +190,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 {
|
||||
|
@ -216,7 +216,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."));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -245,6 +245,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 + '[]';
|
||||
}
|
||||
}
|
||||
|
|
|
@ -256,7 +256,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');
|
||||
|
||||
|
|
|
@ -1130,7 +1130,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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue