Skip to content

Commit f814414

Browse files
authored
Merge branch 'main' into bobbrow/telemetryUpdate
2 parents d31eff2 + 0e3dd7a commit f814414

File tree

65 files changed

+2102
-1807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2102
-1807
lines changed

Extension/c_cpp_properties.schema.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
"properties": {
1313
"name": {
1414
"markdownDescription": "Configuration identifier. `Mac`, `Linux`, and `Win32` are special identifiers for configurations that will be auto-selected on those platforms, but the identifier can be anything.",
15-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
15+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
1616
"type": "string"
1717
},
1818
"compilerPath": {
1919
"markdownDescription": "Full path of the compiler being used, e.g. `/usr/bin/gcc`, to enable more accurate IntelliSense.",
20-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
20+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
2121
"type": "string"
2222
},
2323
"compilerArgs": {
2424
"markdownDescription": "Compiler arguments to modify the includes or defines used, e.g. `-nostdinc++`, `-m32`, etc.",
25-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
25+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
2626
"type": "array",
2727
"items": {
2828
"type": "string"
@@ -64,12 +64,12 @@
6464
},
6565
"compileCommands": {
6666
"markdownDescription": "Full path to `compile_commands.json` file for the workspace.",
67-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
67+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
6868
"type": "string"
6969
},
7070
"includePath": {
71-
"markdownDescription": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive. Specify `**` to indicate recursive search. For example, `${workspaceFolder}/**` will search through all subdirectories while `${workspaceFolder}` will not. Usually, this should not include system includes; instead, set `#C_Cpp.default.compilerPath#`.",
72-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
71+
"markdownDescription": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive. Specify `**` to indicate recursive search. For example, `${workspaceFolder}/**` will search through all subdirectories while `${workspaceFolder}` will not. Usually, this should not include system includes; instead, set `C_Cpp.default.compilerPath`.",
72+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
7373
"type": "array",
7474
"items": {
7575
"type": "string"
@@ -84,21 +84,21 @@
8484
},
8585
"windowsSdkVersion": {
8686
"markdownDescription": "Version of the Windows SDK include path to use on Windows, e.g. `10.0.17134.0`.",
87-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
87+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
8888
"type": "string",
8989
"pattern": "^\\d{2}\\.\\d{1}\\.\\d{5}\\.\\d{1}$|^8\\.1$"
9090
},
9191
"defines": {
9292
"markdownDescription": "A list of preprocessor definitions for the IntelliSense engine to use while parsing files. Optionally, use `=` to set a value, e.g. `VERSION=1`.",
93-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
93+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
9494
"type": "array",
9595
"items": {
9696
"type": "string"
9797
}
9898
},
9999
"intelliSenseMode": {
100100
"markdownDescription": "The IntelliSense mode to use that maps to a platform and architecture variant of MSVC, gcc, or Clang. If not set or if set to `${default}`, the extension will choose the default for that platform. Windows defaults to `windows-msvc-x64`, Linux defaults to `linux-gcc-x64`, and macOS defaults to `macos-clang-x64`. IntelliSense modes that only specify `<compiler>-<architecture>` variants (e.g. `gcc-x64`) are legacy modes and are converted automatically to the `<platform>-<compiler>-<architecture>` variants based on the host platform.",
101-
"descriptionHint": "Uses of words 'platform', 'compiler', and 'architecture' are meant to be descriptive placeholders for literal values, so they should be translated, but without changing the surrounding `<>-<>` symbols. All other text inside `` should not be translated.",
101+
"descriptionHint": "Uses of words 'platform', 'compiler', and 'architecture' are meant to be descriptive placeholders for literal values, so they should be translated, but without changing the surrounding `<>-<>` symbols. All other text inside `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
102102
"type": "string",
103103
"enum": [
104104
"macos-clang-x86",
@@ -159,8 +159,8 @@
159159
"type": "object",
160160
"properties": {
161161
"limitSymbolsToIncludedHeaders": {
162-
"markdownDescription": "`true` to process only those files directly or indirectly included as headers, `false` to process all files under the specified include paths.",
163-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
162+
"markdownDescription": "Set to `true` to process only those files directly or indirectly included as headers. Set to `false` to process all files under the specified include paths.",
163+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
164164
"type": [
165165
"boolean",
166166
"string"
@@ -172,7 +172,7 @@
172172
},
173173
"path": {
174174
"markdownDescription": "A list of paths to use for indexing and parsing of workspace symbols (for use by 'Go to Definition', 'Find All References', etc.). Searching on these paths is recursive by default. Specify `*` to indicate non-recursive search. For example, `${workspaceFolder}` will search through all subdirectories while `${workspaceFolder}/*` will not.",
175-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
175+
"descriptionHint": "Text in '' is a command and should be translated in the same way that VS Code itself translates it. Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
176176
"type": "array",
177177
"items": {
178178
"type": "string"
@@ -184,7 +184,7 @@
184184
"customConfigurationVariables": {
185185
"type": "object",
186186
"markdownDescription": "Custom variables that can be queried through the command `${cpptools:activeConfigCustomVariable}` to use for the input variables in `launch.json` or `tasks.json`.",
187-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
187+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
188188
"patternProperties": {
189189
"(^.+$)": {
190190
"type": "string"
@@ -199,7 +199,7 @@
199199
"env": {
200200
"type": "object",
201201
"markdownDescription": "Custom variables that can be reused anywhere in this file using the `${variable}` or `${env:variable}` syntax.",
202-
"descriptionHint": "The word 'variable' within curly braces should be translated. The \"env\" should not be translated, and the punctuation (\"${:}\") should be preserved.",
202+
"descriptionHint": "The word 'variable' within curly braces should be translated. The \"env\" should not be translated, and the capitalization, spacing, and punctuation (\"${:}\", including the ``) should be preserved.",
203203
"patternProperties": {
204204
"(?!^workspaceFolder$)(?!^workspaceRoot$)(?!^workspaceFolderBasename$)(?!^execPath$)(?!^pathSeparator$)(?!^default$)(^.+$)": {
205205
"oneOf": [
@@ -225,7 +225,7 @@
225225
"type": "boolean",
226226
"default": true,
227227
"markdownDescription": "Controls whether the extension will report errors detected in `c_cpp_properties.json`.",
228-
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered."
228+
"descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
229229
}
230230
},
231231
"properties": {

Extension/i18n/chs/c_cpp_properties.schema.json.i18n.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
*--------------------------------------------------------------------------------------------*/
55
// Do not edit this file. It is machine generated.
66
{
7-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.name": "配置标识符。MacLinux 和 Win32 是将在这些平台上自动选定的特殊配置标识符,但标识符可为任何内容",
8-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.compilerPath": "正在使用以便启用更准确的 IntelliSense 的编译器的完整路径,例如 /usr/bin/gcc。",
9-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.compilerArgs": "用于修改所使用的包含或定义的编译器参数,例如 -nostdinc++-m32 等。",
7+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.name": "配置标识符。 `Mac`、`Linux``Win32` 是将在这些平台上自动选择的配置的特殊标识符,但标识符可以为任何内容",
8+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.compilerPath": "正在使用的编译器的完整路径(例如 `/usr/bin/gcc`),以启用更准确的 IntelliSense",
9+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.compilerArgs": "用于修改使用的包含或定义的编译器参数,例如 `-nostdinc++`、`-m32` 等。",
1010
"c_cpp_properties.schema.json.definitions.configurations.items.properties.cStandard": "用于 IntelliSense 的 C 语言标准的版本。注意: GNU 标准仅用于查询设置编译器以获取 GNU 定义,并且 IntelliSense 将模拟等效的 C 标准版本。",
1111
"c_cpp_properties.schema.json.definitions.configurations.items.properties.cppStandard": "用于 IntelliSense 的 C++ 语言标准的版本。注意: GNU 标准仅用于查询设置用来获取 GNU 定义的编译器,并且 IntelliSense 将模拟等效的 C++ 标准版本。",
12-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.compileCommands": "工作区的 compile_commands.json 文件的完整路径。",
13-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.includePath": "在搜索包含的标头时 IntelliSense 引擎要使用的路径列表。对这些路径的搜索不是递归搜索。指定 \"**\" 可指示递归搜索。例如: \"${workspaceFolder}/**\" 将搜索所有子目录,而 \"${workspaceFolder}\" 将不搜索所有子目录",
12+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.compileCommands": "工作区的 `compile_commands.json` 文件的完整路径。",
13+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.includePath": "搜索包含标头时 IntelliSense 引擎要使用的路径列表。在这些路径上进行搜索为非递归搜索。指定 `**` 以指示递归搜索。例如,`${workspaceFolder}/**` 将搜索所有子目录,而 `${workspaceFolder}` 将不进行搜索。通常,此不应包含系统包含;请改为设置 `#C_Cpp.default.compilerPath#`",
1414
"c_cpp_properties.schema.json.definitions.configurations.items.properties.macFrameworkPath": "Intellisense 引擎在 Mac 框架中搜索包含的标头时要使用的路径的列表。仅在 Mac 配置中受支持。",
15-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.windowsSdkVersion": "要在 Windows 上使用的 Windows SDK 包含路径的版本,例如 \"10.0.17134.0\"",
16-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.defines": "分析文件时 IntelliSense 引擎要使用的预处理器定义的列表。(可选)使用 = 设置值,例如 VERSION=1。",
17-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode": "要使用的 IntelliSense 模式,该模式映射到 MSVC、gcc 或 Clang 的平台和体系结构变体。如果未设置或设置为 ${default},则扩展将选择该平台的默认值。Windows 默认为 windows-msvc-x64,Linux 默认为 linux-gcc-x64,macOS 默认为 macos-clang-x64。仅指定 <compiler>-<architecture> 变体(例如 gcc-x64)的 IntelliSense 模式是旧模式,它们会根据主机平台自动转换为 <platform>-<compiler>-<architecture> 变体",
15+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.windowsSdkVersion": "要在 Windows 上使用的 Windows SDK 包含路径的版本,例如 `10.0.17134.0`",
16+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.defines": "分析文件时要使用的 IntelliSense 引擎的预处理器定义列表。(可选)使用 `=` 设置值,例如 `VERSION=1`",
17+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode": "要使用的、映射到 MSVC、gcc 或 Clang 的平台和体系结构变体的 IntelliSense 模式。如果未设置或设置为`${default}`,则扩展将为该平台选择默认值。Windows 默认为 `windows-msvc-x64`,Linux 默认为`linux-gcc-x64`,macOS 默认为 `macos-clang-x64`。仅指定 `<compiler>-<architecture>` 变体(例如 `gcc-x64`)的 IntelliSense 模式为旧模式,且会根据主机平台上的 `<platform>-<compiler>-<architecture>` 变体进行自动转换",
1818
"c_cpp_properties.schema.json.definitions.configurations.items.properties.forcedInclude": "应在翻译单元中包括在任何包含文件之前的文件的列表。",
1919
"c_cpp_properties.schema.json.definitions.configurations.items.properties.configurationProvider": "可为源文件提供 IntelliSense 配置信息的 VS Code 扩展的 ID。",
20-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.limitSymbolsToIncludedHeaders": "如果为 true,则仅处理以标头形式直接或间接包含的文件;如果为 false,则处理指定的包含路径下的所有文件",
20+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.limitSymbolsToIncludedHeaders": "`true`: 仅处理直接或间接包含为标头的文件,`false`: 处理指定包含路径下的所有文件",
2121
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.databaseFilename": "所生成的符号数据库的路径。如果指定了相对路径,则它将相对于工作区的默认存储位置。",
22-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.path": "一个路径列表,这些路径用于为工作区符号编制索引和进行分析(这些符号用于“转到定义”“查找所有引用”等)。默认在这些路径中以递归方式进行搜索。指定 \"*\" 可指示非递归搜索。例如,\"${workspaceFolder}\" 将搜索所有子目录,而 \"${workspaceFolder}/*\" 将不会",
23-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.customConfigurationVariables": "可通过命令 ${cpptools:activeConfigCustomVariable} 查询要用于 launch.json 或 tasks.json 的输入变量的自定义变量",
24-
"c_cpp_properties.schema.json.definitions.env": "可通过 ${变量} 或 ${env:变量} 语法在此文件中的任意位置重用的自定义变量",
22+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.path": "用于索引和分析工作区符号的路径列表(供“转到定义”“查找所有引用”等使用)。默认情况下,在这些路径上进行搜索为递归搜索。指定 `*` 以指示非递归搜索。例如,`${workspaceFolder}` 将搜索所有子目录,而 `${workspaceFolder}/*` 将不进行搜索",
23+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.customConfigurationVariables": "可通过命令`${cpptools:activeConfigCustomVariable}` 查询的自定义变量,用于 `launch.json``tasks.json`. 中的输入变量",
24+
"c_cpp_properties.schema.json.definitions.env": "可以使用 `${变量}``${env:变量}` 语法在此文件中的任何位置重复使用的自定义变量",
2525
"c_cpp_properties.schema.json.definitions.version": "配置文件的版本。此属性由扩展托管。请勿更改它。",
26-
"c_cpp_properties.schema.json.definitions.enableConfigurationSquiggles": "控制扩展是否报告在 c_cpp_properties.json 中检测到的错误。"
26+
"c_cpp_properties.schema.json.definitions.enableConfigurationSquiggles": "控制扩展是否将报告在 `c_cpp_properties.json` 中检测到的错误。"
2727
}

0 commit comments

Comments
 (0)