Merge branch 'main' into fix47668

# Conflicts:
#	src/compiler/diagnosticMessages.json

.github/workflows/ensure-related-repos-run-crons.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Configure git and update package-lock.json
+    - name: Configure git
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "TypeScript Bot"
@@ -30,6 +30,7 @@ jobs:
       run:  |
         cd ts-site
         git commit --allow-empty -m "Monthly Bump"
+        git config --unset-all http.https://github.com/.extraheader
         git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Website.git
 
     - uses: actions/checkout@v2
@@ -41,4 +42,5 @@ jobs:
       run:  |
         cd monaco-builds
         git commit --allow-empty -m "Monthly Bump"
+        git config --unset-all http.https://github.com/.extraheader
         git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Make-Monaco-Builds.git

lib/zh-cn/diagnosticMessages.generated.json

@@ -130,7 +130,7 @@
   "Add_await_to_initializer_for_0_95084": "将 \"await\" 添加到 \"{0}\" 的初始值设定项",
   "Add_await_to_initializers_95089": "将 \"await\" 添加到初始值设定项",
   "Add_braces_to_arrow_function_95059": "向箭头函数添加大括号",
-  "Add_class_tag_95102": "添加“@类”标记",
+  "Add_class_tag_95102": "添加“@class”标记",
   "Add_const_to_all_unresolved_variables_95082": "将 \"const\" 添加到所有未解析变量",
   "Add_const_to_unresolved_variable_95081": "将 \"const\" 添加到未解析的变量",
   "Add_default_import_0_to_existing_import_declaration_from_1_90033": "将默认导入 \"{0}\" 从 \"{1}\" 添加到现有导入声明。",
@@ -154,7 +154,7 @@
   "Add_parameter_name_90034": "添加参数名称",
   "Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037": "将限定符添加到匹配成员名称的所有未解析变量",
   "Add_this_parameter_95104": "添加“此”参数。",
-  "Add_this_tag_95103": "添加“@此”标记",
+  "Add_this_tag_95103": "添加“@this”标记",
   "Add_to_all_uncalled_decorators_95044": "将 \"()\" 添加到所有未调用的修饰器",
   "Add_ts_ignore_to_all_error_messages_95042": "将 \"@ts-ignore\" 添加到所有错误消息",
   "Add_undefined_to_a_type_when_accessed_using_an_index_6674": "使用索引访问时，将 “undefined” 添加到类型。",
@@ -1784,4 +1784,4 @@
   "with_statements_are_not_allowed_in_strict_mode_1101": "严格模式下不允许使用 \"with\" 语句。",
   "yield_expression_implicitly_results_in_an_any_type_because_its_containing_generator_lacks_a_return_t_7057": "\"yield\" 表达式隐式导致 \"any\" 类型，因为它的包含生成器缺少返回类型批注。",
   "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523": "不能在参数初始化表达式中使用 \"yield\" 表达式。"
-}
+}

package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.6.0",
+    "version": "4.7.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [