Merge branch 'main' into main

microsoft · Dec 14, 2024 · 5deeef5 · 5deeef5
2 parents a5db438 + ab7bebf
commit 5deeef5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Extension/i18n/chs/package.i18n.json b/Extension/i18n/chs/package.i18n.json
@@ -160,7 +160,7 @@
 	"c_cpp.configuration.vcFormat.space.removeBeforeSemicolon.description": "将移除每个分号前的空格。",
 	"c_cpp.configuration.vcFormat.space.insertAfterSemicolon.description": "在每个分号后面插入一个空格。",
 	"c_cpp.configuration.vcFormat.space.removeAroundUnaryOperator.description": "移除一元运算符和操作数之间的空格。",
-	"c_cpp.configuration.vcFormat.space.aroundBinaryOperator.description": "二进制运算符周围的空格。",
+	"c_cpp.configuration.vcFormat.space.aroundBinaryOperator.description": "二元运算符周围的空格。",
 	"c_cpp.configuration.vcFormat.space.aroundAssignmentOperator.description": "赋值运算符周围的空格。",
 	"c_cpp.configuration.vcFormat.space.pointerReferenceAlignment.description": "指针和引用运算符周围的空格。",
 	"c_cpp.configuration.vcFormat.space.pointerReferenceAlignment.left.description": "指针和引用运算符左对齐。",
@@ -449,4 +449,4 @@
 	"c_cpp.configuration.refactoring.includeHeader.never.description": "从不包含头文件。",
 	"c_cpp.languageModelTools.configuration.displayName": "C/C++ 配置",
 	"c_cpp.languageModelTools.configuration.userDescription": "活动 C 或 C++ 文件的配置，例如语言标准版本和目标平台。"
-}
+}
diff --git a/Extension/package.nls.json b/Extension/package.nls.json
@@ -410,7 +410,12 @@
     "c_cpp.configuration.vcFormat.space.removeBeforeSemicolon.description": "Spaces are removed before every semicolon.",
     "c_cpp.configuration.vcFormat.space.insertAfterSemicolon.description": "A space is inserted after every semicolon.",
     "c_cpp.configuration.vcFormat.space.removeAroundUnaryOperator.description": "Spaces between unary operators and operands are removed.",
-    "c_cpp.configuration.vcFormat.space.aroundBinaryOperator.description": "Spaces around binary operators.",
+    "c_cpp.configuration.vcFormat.space.aroundBinaryOperator.description": {
+        "message": "Spaces around binary operators.",
+        "comment": [
+            "The term \"binary operators\" refers to operators that takes two operands and not operators on binary numbers."
+        ]
+    },
     "c_cpp.configuration.vcFormat.space.aroundAssignmentOperator.description": "Spaces around assignment operators.",
     "c_cpp.configuration.vcFormat.space.pointerReferenceAlignment.description": "Spaces around pointer and reference operators.",
     "c_cpp.configuration.vcFormat.space.pointerReferenceAlignment.left.description": "Pointer and reference operators are aligned to the left.",

diff --git a/Extension/src/nativeStrings.json b/Extension/src/nativeStrings.json
@@ -157,8 +157,8 @@
     "fallback_to_64_bit_mode2": "Failed to query compiler. Falling back to 64-bit intelliSenseMode.",
     "fallback_to_no_bitness": "Failed to query compiler. Falling back to no bitness.",
     "intellisense_client_creation_aborted": "IntelliSense client creation aborted: {0}",
-    "include_errors_config_provider_intellisense_disabled ": "#include errors detected based on information provided by the configurationProvider setting. IntelliSense features for this translation unit ({0}) will be provided by the Tag Parser.",
-    "include_errors_config_provider_squiggles_disabled ": "#include errors detected based on information provided by the configurationProvider setting. Squiggles are disabled for this translation unit ({0}).",
+    "include_errors_config_provider_intellisense_disabled": "#include errors detected based on information provided by the configurationProvider setting. IntelliSense features for this translation unit ({0}) will be provided by the Tag Parser.",
+    "include_errors_config_provider_squiggles_disabled": "#include errors detected based on information provided by the configurationProvider setting. Squiggles are disabled for this translation unit ({0}).",
     "preprocessor_keyword": {
         "text": "preprocessor keyword",
         "hint": "Refers to C/C++ processor keywords"
@@ -479,6 +479,6 @@
     "refactor_extract_xborder_jump": "Jumps between the selected code and the surrounding code are present.",
     "refactor_extract_missing_return": "In the selected code, some control paths exit without setting the return value. This is supported only for scalar, numeric, and pointer return types.",
     "expand_selection": "Expand selection (to enable 'Extract to function')",
-    "copilot_hover_link": "Generate Copilot summary",
-    "file_not_found_in_path2": "\"{0}\" not found in compile_commands.json files. 'includePath' from c_cpp_properties.json in folder '{1}' will be used for this file instead."
+    "file_not_found_in_path2": "\"{0}\" not found in compile_commands.json files. 'includePath' from c_cpp_properties.json in folder '{1}' will be used for this file instead.",
+    "copilot_hover_link": "Generate Copilot summary"
 }