diff --git a/extensions/css/package.json b/extensions/css/package.json index 2aa7ed5e0cef1030f29c78968538002ce00361fb..56058f2bde82ab2ec023207f43c478ac2a4d5fdd 100644 --- a/extensions/css/package.json +++ b/extensions/css/package.json @@ -33,10 +33,10 @@ "path": "./snippets/css.json" }], "configuration": { + "order": 20, "allOf": [{ "id": "css", - "order": 20, - "title": "CSS configuration", + "title": "CSS", "allOf": [ { "title": "Controls CSS validation and problem severities.", @@ -161,7 +161,7 @@ { "id": "scss", "order": 24, - "title": "SCSS (Sass) configuration", + "title": "SCSS (Sass)", "allOf": [ { "title": "Controls SCSS validation and problem severities.", @@ -359,7 +359,7 @@ "id": "less", "order": 22, "type": "object", - "title": "LESS configuration", + "title": "LESS", "allOf": [ { "title": "Controls LESS validation and problem severities.", diff --git a/extensions/json/package.json b/extensions/json/package.json index a8a1186ec8739c1eb2cff39738af6f6131367187..cd9a9c908f1ebdab9a16cbca4eb5b09dfd82e193 100644 --- a/extensions/json/package.json +++ b/extensions/json/package.json @@ -95,7 +95,7 @@ "id": "json", "order": 20, "type": "object", - "title": "JSON configuration", + "title": "JSON", "properties" : { "json.schemas" : { "type": "array", diff --git a/extensions/markdown/package.json b/extensions/markdown/package.json index d4edf59ae7ade6f3efaf703cd0feef1effaa26b2..77f17c24ce74934c8c8533d41f6c930ac8ee55e4 100644 --- a/extensions/markdown/package.json +++ b/extensions/markdown/package.json @@ -111,7 +111,8 @@ ], "configuration": { "type": "object", - "title": "Markdown preview configuration", + "title": "Markdown", + "order": 20, "properties": { "markdown.styles": { "type": "array", diff --git a/extensions/php/package.json b/extensions/php/package.json index 138adcf85fcf364532935993cb530772443794aa..45bcc6afb1403156e14a81d4cd1caa85302bac22 100644 --- a/extensions/php/package.json +++ b/extensions/php/package.json @@ -28,6 +28,7 @@ "configuration": { "title": "%configuration.title%", "type": "object", + "order": 20, "properties": { "php.validate.enable": { "type": "boolean", diff --git a/extensions/php/package.nls.json b/extensions/php/package.nls.json index 5f1d915b06a3c89414c71644cb4708173f585590..170a5a38f1da623aa41ceba430d60033d91f4ae2 100644 --- a/extensions/php/package.nls.json +++ b/extensions/php/package.nls.json @@ -2,5 +2,5 @@ "configuration.validate.enable": "Whether php validation is enabled or not.", "configuration.validate.executablePath": "Points to the php executable.", "configuration.validate.run": "Whether the linter is run on save or on type.", - "configuration.title": "PHP Configuration options" + "configuration.title": "PHP" } \ No newline at end of file diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json index e7aef0fcba1ee555882b13433e26e060074ac7af..62ab4f18ca6a5f5fc8ca5111d308fd511eb02422 100644 --- a/extensions/typescript/package.json +++ b/extensions/typescript/package.json @@ -65,6 +65,7 @@ "configuration": { "type": "object", "title": "%configuration.typescript%", + "order": 20, "properties": { "typescript.tsdk": { "type": ["string", "null"], diff --git a/extensions/typescript/package.nls.json b/extensions/typescript/package.nls.json index 56b9b09113cbc0a67890f1ef060e85ce9955b7e6..61eb997c95cb98f6142f89364071e402ae88bda7 100644 --- a/extensions/typescript/package.nls.json +++ b/extensions/typescript/package.nls.json @@ -1,7 +1,7 @@ { "typescript.reloadProjects.title": "Reload TypeScript Project", "javascript.reloadProjects.title": "Reload JavaScript Project", - "configuration.typescript": "TypeScript configuration", + "configuration.typescript": "TypeScript", "typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete functions with their parameter signature.", "typescript.tsdk.desc": "Specifies the folder path containing the tsserver and lib*.d.ts files to use.", "typescript.tsserver.trace": "Enables tracing of messages send to the TS server", diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index aeb47cef80abedf665829b8e5bf103aeaed5e9a7..e50325a77593c12407a8d33b5648a72915ff37a2 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -529,7 +529,7 @@ let editorConfiguration:IConfigurationNode = { 'id': 'editor', 'order': 5, 'type': 'object', - 'title': nls.localize('editorConfigurationTitle', "Editor configuration"), + 'title': nls.localize('editorConfigurationTitle', "Editor"), 'properties' : { 'editor.fontFamily' : { 'type': 'string', diff --git a/src/vs/languages/html/common/html.contribution.ts b/src/vs/languages/html/common/html.contribution.ts index 2c26a934bb4089bcdfdf1ab1e94935d803743f57..6d26f8e2d78ce77d22f4f7d37c765fc91e579a56 100644 --- a/src/vs/languages/html/common/html.contribution.ts +++ b/src/vs/languages/html/common/html.contribution.ts @@ -25,7 +25,7 @@ configurationRegistry.registerConfiguration({ 'id': 'html', 'order': 20, 'type': 'object', - 'title': nls.localize('htmlConfigurationTitle', "HTML configuration"), + 'title': nls.localize('htmlConfigurationTitle', "HTML"), 'properties': { 'html.format.wrapLineLength': { 'type': 'integer', diff --git a/src/vs/platform/configuration/common/model.ts b/src/vs/platform/configuration/common/model.ts index df1cfbc8a8f961f4f5115b935172891fd8829e18..6fe822132e7f9d6a0fb934da95374acb8a0f8599 100644 --- a/src/vs/platform/configuration/common/model.ts +++ b/src/vs/platform/configuration/common/model.ts @@ -140,7 +140,11 @@ function processDefaultValues(withConfig: (config: configurationRegistry.IConfig if (typeof c2.order !== 'number') { return -1; } - + if (c1.order === c2.order) { + let title1 = c1.title || ''; + let title2 = c2.title || ''; + return title1.localeCompare(title2); + } return c1.order - c2.order; }).forEach((config) => { visit(config, 0); @@ -182,7 +186,7 @@ export function getDefaultValuesContent(indent: string): string { handled = true; if (isTop) { result.push(''); - result.push('//-------- ' + config.title + ' --------'); + result.push('// ' + config.title); } else { result.push(indent + '// ' + config.title); } diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts index 8f37c1953cec23814140081e24df99e1f322750c..3f6594e1a3c378cb34eb4507b4653967651a5b27 100644 --- a/src/vs/platform/telemetry/common/telemetryService.ts +++ b/src/vs/platform/telemetry/common/telemetryService.ts @@ -158,9 +158,9 @@ const TELEMETRY_SECTION_ID = 'telemetry'; Registry.as(Extensions.Configuration).registerConfiguration({ 'id': TELEMETRY_SECTION_ID, - 'order': 20, + 'order': 110, 'type': 'object', - 'title': localize('telemetryConfigurationTitle', "Telemetry configuration"), + 'title': localize('telemetryConfigurationTitle', "Telemetry"), 'properties': { 'telemetry.enableTelemetry': { 'type': 'boolean', diff --git a/src/vs/workbench/browser/actions/openSettings.ts b/src/vs/workbench/browser/actions/openSettings.ts index 9f61a27dc54c6534a378cd4c7561dfa422d47d63..49ad059f5411cad07225944538053042d63c9051 100644 --- a/src/vs/workbench/browser/actions/openSettings.ts +++ b/src/vs/workbench/browser/actions/openSettings.ts @@ -211,6 +211,7 @@ class DefaultSettingsInput extends StringEditorInput { let defaults = getDefaultValuesContent(editorConfig.editor.insertSpaces ? strings.repeat(' ', editorConfig.editor.tabSize) : '\t'); let defaultsHeader = '// ' + nls.localize('defaultSettingsHeader', "Overwrite settings by placing them into your settings file."); + defaultsHeader += '\n// ' + nls.localize('defaultSettingsHeader2', "See http://go.microsoft.com/fwlink/?LinkId=808995 for the most commonly used settings."); DefaultSettingsInput.INSTANCE = instantiationService.createInstance(DefaultSettingsInput, nls.localize('defaultName', "Default Settings"), null, defaultsHeader + '\n' + defaults, 'application/json', false); } diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index 163d11fae088b9b5b394b9d4dcf772d8b707fee6..8a9fd19199f1a9755eb044ad4dde39c3ace1e49b 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -378,7 +378,7 @@ let configurationRegistry = Registry.as(ConfigurationExt configurationRegistry.registerConfiguration({ 'id': 'workbench', 'order': 7, - 'title': nls.localize('workbenchConfigurationTitle', "Workbench configuration"), + 'title': nls.localize('workbenchConfigurationTitle', "Workbench"), 'type': 'object', 'properties': { 'workbench.editor.showTabs': { diff --git a/src/vs/workbench/electron-browser/crashReporter.ts b/src/vs/workbench/electron-browser/crashReporter.ts index 208263296e1bcfb0f825c00866690ba0cc07c582..2092099bd5d31c9582e363562085fc9c47f2ca32 100644 --- a/src/vs/workbench/electron-browser/crashReporter.ts +++ b/src/vs/workbench/electron-browser/crashReporter.ts @@ -19,9 +19,8 @@ let TELEMETRY_SECTION_ID = 'telemetry'; let configurationRegistry = Registry.as(Extensions.Configuration); configurationRegistry.registerConfiguration({ 'id': TELEMETRY_SECTION_ID, - 'order': 20, + 'order': 110.5, 'type': 'object', - 'title': nls.localize('telemetryConfigurationTitle', "Telemetry configuration"), 'properties': { 'telemetry.enableCrashReporter': { 'type': 'boolean', diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts index dfa74e52f955b4e8506c4d2e0c80349de129c5c0..19f6f2ffa1931847494d64228155880e4360deaa 100644 --- a/src/vs/workbench/electron-browser/main.contribution.ts +++ b/src/vs/workbench/electron-browser/main.contribution.ts @@ -42,7 +42,7 @@ const configurationRegistry = Registry.as(ConfigurationE configurationRegistry.registerConfiguration({ 'id': 'window', 'order': 8, - 'title': nls.localize('windowConfigurationTitle', "Window configuration"), + 'title': nls.localize('windowConfigurationTitle', "Window"), 'type': 'object', 'properties': { 'window.openFilesInNewWindow': { @@ -73,7 +73,7 @@ configurationRegistry.registerConfiguration({ configurationRegistry.registerConfiguration({ 'id': 'update', 'order': 15, - 'title': nls.localize('updateConfigurationTitle', "Update configuration"), + 'title': nls.localize('updateConfigurationTitle', "Update"), 'type': 'object', 'properties': { 'update.channel': { diff --git a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts index 78ec0607fe4324d87c6efe2031399f2470b362f4..6d2be639db575e2c0ef28e76168f9cd7d11d9db4 100644 --- a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts @@ -130,7 +130,7 @@ export var schemaId = 'vscode://schemas/launch'; const schema: IJSONSchema = { id: schemaId, type: 'object', - title: nls.localize('app.launch.json.title', "Launch configuration"), + title: nls.localize('app.launch.json.title', "Launch"), required: ['version', 'configurations'], properties: { version: { diff --git a/src/vs/workbench/parts/emmet/node/emmet.contribution.ts b/src/vs/workbench/parts/emmet/node/emmet.contribution.ts index 793b9b849781f837d31f359250c288f4a5c78a20..4e329dc431d48ca8cac12cb8bd9b504650800398 100644 --- a/src/vs/workbench/parts/emmet/node/emmet.contribution.ts +++ b/src/vs/workbench/parts/emmet/node/emmet.contribution.ts @@ -31,7 +31,7 @@ const configurationRegistry = Registry.as(ConfigurationE configurationRegistry.registerConfiguration({ 'id': 'emmet', 'order': 6, - 'title': nls.localize('emmetConfigurationTitle', "Emmet configuration"), + 'title': nls.localize('emmetConfigurationTitle', "Emmet"), 'type': 'object', 'properties': { 'emmet.triggerExpansionOnTab': { diff --git a/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts index ac1f0608bb3db58de7c1a6ec628d7a166c9494ff..b29ff412282ee906fc1f02622f6831f3945b1cb2 100644 --- a/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts @@ -28,7 +28,7 @@ let configurationRegistry = Registry.as(Extensions.Confi configurationRegistry.registerConfiguration({ 'id': 'externalTerminal', 'order': 100, - 'title': nls.localize('terminalConfigurationTitle', "External terminal configuration"), + 'title': nls.localize('terminalConfigurationTitle', "External Terminal"), 'type': 'object', 'properties': { 'terminal.external.windowsExec': { diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts index fe7e3440c06a7e97d6c654d04d58485c16efb27c..49c431bc8253b77a72ce27c75ab78da812fc6c49 100644 --- a/src/vs/workbench/parts/files/browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/browser/files.contribution.ts @@ -162,7 +162,7 @@ let configurationRegistry = Registry.as(ConfigurationExt configurationRegistry.registerConfiguration({ 'id': 'files', 'order': 9, - 'title': nls.localize('filesConfigurationTitle', "Files configuration"), + 'title': nls.localize('filesConfigurationTitle', "Files"), 'type': 'object', 'properties': { 'files.exclude': { @@ -235,7 +235,7 @@ configurationRegistry.registerConfiguration({ configurationRegistry.registerConfiguration({ 'id': 'explorer', 'order': 10, - 'title': nls.localize('explorerConfigurationTitle', "File Explorer configuration"), + 'title': nls.localize('explorerConfigurationTitle', "File Explorer"), 'type': 'object', 'properties': { 'explorer.openEditors.visible': { diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts index 5a9dcd17fec96c9312b746a9d1f1dcb94da715bf..0a4f9fc75065ee710cdf9a11cbc7a8e6a0d981de 100644 --- a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts +++ b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts @@ -510,7 +510,7 @@ export function registerContributions(): void { configurationRegistry.registerConfiguration({ id: 'git', order: 15, - title: nls.localize('gitConfigurationTitle', "Git configuration"), + title: nls.localize('gitConfigurationTitle', "Git"), type: 'object', properties: { 'git.enabled': { diff --git a/src/vs/workbench/parts/markers/common/messages.ts b/src/vs/workbench/parts/markers/common/messages.ts index 68d6ee194d7a29c89eef25a3593ea88c5ad05d5d..809b1b0e6c7d8d898824baac435c1d44d2f3018e 100644 --- a/src/vs/workbench/parts/markers/common/messages.ts +++ b/src/vs/workbench/parts/markers/common/messages.ts @@ -13,7 +13,7 @@ export default class Messages { public static MARKERS_PANEL_VIEW_CATEGORY:string= nls.localize('viewCategory', "View"); public static MARKERS_PANEL_TOGGLE_LABEL:string= nls.localize('problems.view.show.label', "Show Problems"); - public static PROBLEMS_PANEL_CONFIGURATION_TITLE:string= nls.localize('problems.panel.configuration.title', "Problems view configuration"); + public static PROBLEMS_PANEL_CONFIGURATION_TITLE:string= nls.localize('problems.panel.configuration.title', "Problems View"); public static PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL:string= nls.localize('problems.panel.configuration.autoreveal', "Controls if Problems view should automatically reveal files when opening them"); public static MARKERS_PANEL_TITLE_NO_PROBLEMS:string= nls.localize('markers.panel.title.no.problems', "No problems"); diff --git a/src/vs/workbench/parts/search/browser/search.contribution.ts b/src/vs/workbench/parts/search/browser/search.contribution.ts index 5e0f95a66ab815178cb2d47de9e9f7e05d4e7fa8..fe05a1521096344123891bd945a3cd5e19be1232 100644 --- a/src/vs/workbench/parts/search/browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/browser/search.contribution.ts @@ -160,7 +160,7 @@ const configurationRegistry = Registry.as(ConfigurationE configurationRegistry.registerConfiguration({ 'id': 'search', 'order': 13, - 'title': nls.localize('searchConfigurationTitle', "Search configuration"), + 'title': nls.localize('searchConfigurationTitle', "Search"), 'type': 'object', 'properties': { 'search.exclude': { diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts index cd4c1343625f2f35d1b4cb199888db847415c416..fdac9f3c0a0867fe5e4931e4f154f2aa7d40e9cf 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -21,7 +21,7 @@ let configurationRegistry = Registry.as(Extensions.Confi configurationRegistry.registerConfiguration({ 'id': 'terminal', 'order': 100, - 'title': nls.localize('terminalIntegratedConfigurationTitle', "Integrated terminal configuration"), + 'title': nls.localize('terminalIntegratedConfigurationTitle', "Integrated Terminal"), 'type': 'object', 'properties': { 'terminal.integrated.shell.linux': { diff --git a/src/vs/workbench/services/request/node/requestService.ts b/src/vs/workbench/services/request/node/requestService.ts index 98f0a0a4b9f4ee58242a4935da1b5d262f7216a7..8cd434b93f8d0c37a13ce340e1c782b681917ae6 100644 --- a/src/vs/workbench/services/request/node/requestService.ts +++ b/src/vs/workbench/services/request/node/requestService.ts @@ -146,7 +146,7 @@ let confRegistry = platform.Registry.as(Extensions.Confi confRegistry.registerConfiguration({ id: 'http', order: 15, - title: nls.localize('httpConfigurationTitle', "HTTP configuration"), + title: nls.localize('httpConfigurationTitle', "HTTP"), type: 'object', properties: { 'http.proxy': {