Merge branch 'main' into refactory-layout-style

# Conflicts: # src/BootstrapBlazor.Server/Locales/en-US.json # src/BootstrapBlazor.Server/Locales/zh-CN.json
dotnetcore · Nov 16, 2024 · c89b9ed · c89b9ed
2 parents ecafc3a + f24b4f4
commit c89b9ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -1194,7 +1194,7 @@
     "P6": "The dotnet new update option checks if there are updates available for the template packages that are currently installed and installs them.",
     "P7": "3. Uninstall project template",
     "SubTitle1": "Bootstrap Blazor App Extension",
-    "P8": "In order to facilitate the use of the <code>Bootstrap Blazor</code> component library, the author has created the <b>Project Template (<code>Bootstrap Blazor Project Template</code>)</b> extension plug-in, which can be installed through <code >Visual Studio IDE</code> When creating a new project, select the <code>Bootstrap Blazor project template</code>, and the solution is built in two types: <code>Server-Side</code> and <cide>wasm</cide> project",
+    "P8": "In order to facilitate the use of the <code>Bootstrap Blazor</code> component library, the author has created the <b>Project Template (<code>Bootstrap Blazor Project Template</code>)</b> extension plug-in, which can be installed through <code >Visual Studio IDE</code> When creating a new project, select the <code>Bootstrap Blazor project template</code>, and the solution is built in two types: <code>Server-Side</code> and <code>wasm</code> project",
     "P9": "Download Project template",
     "P10": "able to pass",
     "P11": "Built-in plugin extensions",

diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -1194,7 +1194,7 @@
     "P6": "注:此命令为检查是否有可用于当前安装的模板包的更新并安装这些更新。",
     "P7": "4. 卸载项目模板",
     "SubTitle1": "Bootstrap Blazor App Extension 扩展插件",
-    "P8": "为了方便使用 <code>Bootstrap Blazor</code> 组件库，作者制作了 <b>项目模板（<code>Bootstrap Blazor Project Template</code>）</b> 扩展插件，安装此插件可通过 <code>Visual Studio</code> 新建项目时选择 <code>Bootstrap Blazor 项目模板</code>，解决方案内置 <code>Server-Side</code> 与 <cide>wasm</cide> 两种类型工程",
+    "P8": "为了方便使用 <code>Bootstrap Blazor</code> 组件库，作者制作了 <b>项目模板（<code>Bootstrap Blazor Project Template</code>）</b> 扩展插件，安装此插件可通过 <code>Visual Studio</code> 新建项目时选择 <code>Bootstrap Blazor 项目模板</code>，解决方案内置 <code>Server-Side</code> 与 <code>wasm</code> 两种类型工程",
     "P9": "下载项目模板",
     "P10": "可以通过",
     "P11": "内置插件扩展",