Skip to content

LEGO: Pull request from lego/hb_aa4ddd3b-37ca-4d87-a058-1e95d9ca2d38_20250729184529337 to net10.0 #30917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2025
Merged

LEGO: Pull request from lego/hb_aa4ddd3b-37ca-4d87-a058-1e95d9ca2d38_20250729184529337 to net10.0 #30917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions loc/zh-Hans/src/Controls/src/Build.Tasks/ErrorMessages.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot set the content of "{0}" as it doesn't have a [ContentProperty]5D; attribute.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[无法设置“{0}”的内容，因为它没有 [ContentProperty]5D; 属性。]]></Val>
<Val><![CDATA[无法设置“{0}”的内容，因为它没有 [ContentProperty]5D; 特性。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -167,7 +167,7 @@
<Str Cat="Text">
<Val><![CDATA[Invalid Xaml "{0}".]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Xaml“{0}”无效。]]></Val>
<Val><![CDATA[XAML“{0}”无效。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -230,7 +230,7 @@
<Str Cat="Text">
<Val><![CDATA[Property, Property setter or BindableProperty "{0}" is deprecated.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[属性、属性资源库或 BindableProperty "{0}" 已弃用。]]></Val>
<Val><![CDATA[属性、属性资源库或 BindableProperty“{0}”已弃用。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -266,7 +266,7 @@
<Str Cat="Text">
<Val><![CDATA[Resources in ResourceDictionary require a x:Key attribute.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[ResourceDictionary 中的资源需具有 x:Key 属性。]]></Val>
<Val><![CDATA[ResourceDictionary 中的资源需具有 x:Key 特性。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -311,7 +311,7 @@
<Str Cat="Text">
<Val><![CDATA[Source property is not a string literal.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[源属性不是字符串文本。]]></Val>
<Val><![CDATA[源属性不是字符串字面量。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -332,7 +332,7 @@
<Str Cat="Text">
<Val><![CDATA[Style property or Content is not a string literal.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[样式属性或内容不是字符串文本。]]></Val>
<Val><![CDATA[样式属性或内容不是字符串字面量。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -350,7 +350,7 @@
<Str Cat="Text">
<Val><![CDATA[Consider attributing the markup extension "{0}" with [RequireService]5D; or [AcceptEmptyServiceProvider]5D; if it doesn't require any.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[如果标记扩展 "{0}" 不需要任何服务，请考虑使用 [RequireService]5D; 或 [AcceptEmptyServiceProvider]5D; 来标注它。]]></Val>
<Val><![CDATA[如果标记扩展“{0}”不需要任何服务，请考虑使用 [RequireService]5D; 或 [AcceptEmptyServiceProvider]5D; 来标注它。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
20 changes: 19 additions & 1 deletion loc/zh-Hans/src/Controls/src/SourceGen/MauiGResources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,29 @@
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Str" Disp="true" LocTbl="false" />
<Item ItemId=";AmbiguousTypeMessage" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Multiple names found in the current xml namespace. use a more specific prefix.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[在当前 XML 命名空间中找到多个名称。请使用更具体的前缀。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";AmbiguousTypeTitle" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Ambiguous Type]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[不明确的类型]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XamlParsingErrorMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[An error occured while parsing Xaml: {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[分析 Xaml 时出错： {0}。]]></Val>
<Val><![CDATA[分析 XAML 时出错: {0}。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
32 changes: 27 additions & 5 deletions .../templates/maui-aspire-servicedefaults/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="C:\a\_work\1\s\src\Templates\src\templates\maui-aspire-servicedefaults\.template.config\localize\templatestrings.json" PsrId="306" SrcCul="en-US" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx" TgtCul="zh-CN">
<LCX SchemaVersion="6.0" Name="C:\a\_work\1\s\src\Templates\src\templates\maui-aspire-servicedefaults\.template.config\localize\templatestrings.json" PsrId="306" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
<OwnedComments>
<Cmt Name="Dev" />
<Cmt Name="LcxAdmin" />
<Cmt Name="Rccx" />
</OwnedComments>
<Settings Name="@vsLocTools@\default.lss" Type="Lss" />
<Item ItemId=";String Table" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";Strings" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Str" Disp="true" LocTbl="false" />
<Item ItemId=";author" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Microsoft]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Microsoft]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[A project template for creating a .NET Aspire service defaults project for .NET MAUI.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[一个项目模板，用于为 .NET MAUI 创建“.NET Aspire 服务默认值”项目。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[.NET MAUI for .NET Aspire Service Defaults]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[.NET MAUI for .NET Aspire 服务默认值]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[{Locked='.NET MAUI', Locked='.NET Aspire', Locked='Service Defaults'}]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";postActions/restore/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Restore NuGet packages required by this project.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[还原此项目所需的 NuGet 包。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/restore/manualInstructions/default/text" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Run 'dotnet restore']]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[运行 "dotnet restore"]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/Framework/choices/DOTNET_TFM_VALUE/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Target DOTNET_TFM_VALUE]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[目标 DOTNET_TFM_VALUE]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/Framework/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The target framework for the project.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[项目的目标框架。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/skipRestore/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[If specified, skips the automatic restore of the project on create.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[如果已指定，则在创建时跳过项目的自动还原。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
<Settings Name="@vsLocTools@\default.lss" Type="Lss" /></LCX>
</LCX>
16 changes: 8 additions & 8 deletions ...tes/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Str Cat="Text">
<Val><![CDATA[A multi-project app for creating a .NET MAUI Blazor Hybrid application with a Blazor Web project with a shared user interface.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[用于使用共享用户界面通过 Blazor Web 项目创建 .NET MAUI Blazor 混合应用程序的多项目应用。]]></Val>
<Val><![CDATA[用于使用共享用户界面通过 Blazor Web 项目创建 .NET MAUI Blazor Hybrid 应用程序的多项目应用。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -50,7 +50,7 @@
<Str Cat="Text">
<Val><![CDATA[Configures whether to make every page interactive by applying an interactive render mode at the top level. If false, pages will use static server rendering by default, and can be marked interactive on a per-page or per-component basis.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[配置是否通过在顶层应用交互式呈现模式来使每个页面都交互。如果为 false，则默认情况下，页面将使用静态服务器呈现，并且可以按每页或每组件标记为交互。]]></Val>
<Val><![CDATA[配置是否通过在顶层应用交互式呈现模式来使每个页面都具备交互性。如果为 false，页面将默认使用静态服务器呈现，并且可按每页或每组件标记为具有交互性。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -59,7 +59,7 @@
<Str Cat="Text">
<Val><![CDATA[_Enable interactive rendering globally throughout the site]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[_在整个网站全局启用交互式呈现]]></Val>
<Val><![CDATA[在整个网站全局启用交互式呈现(_E)]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -140,7 +140,7 @@
<Str Cat="Text">
<Val><![CDATA[No interactivity (static server rendering only)]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[没有交互性 (仅限静态服务器呈现)]]></Val>
<Val><![CDATA[没有交互性(仅限静态服务器呈现)]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -203,7 +203,7 @@
<Str Cat="Text">
<Val><![CDATA[_Interactive render mode]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[交互式(_I)呈现模式]]></Val>
<Val><![CDATA[交互式呈现模式(_I)]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -212,7 +212,7 @@
<Str Cat="Text">
<Val><![CDATA[Whether to turn off HTTPS. This option only applies if Individual isn't used for --auth.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[是否关闭 HTTPS。仅当 Individual 不用于 --auth 时，此选项才适用。]]></Val>
<Val><![CDATA[是否禁用 HTTPS。只有当未对 --auth 使用“个人”时，此选项才适用。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -266,7 +266,7 @@
<Str Cat="Text">
<Val><![CDATA[Port number to use for the IIS Express HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if Individual auth is used).]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 Induvidual 身份验证，则将忽略 no-https)。]]></Val>
<Val><![CDATA[要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当未使用 no-https 参数时，此选项才适用(如果使用个人身份验证，则将忽略 no-https)。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -284,7 +284,7 @@
<Str Cat="Text">
<Val><![CDATA[Port number to use for the HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if Individual auth is used).]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[要用于 launchSettings.json 中 HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 Induvidual 身份验证，则将忽略 no-https)。]]></Val>
<Val><![CDATA[要用于 launchSettings.json 中 HTTPS 终结点的端口号。仅当未使用 no-https 参数时，此选项才适用(如果使用个人身份验证，则将忽略 no-https)。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
6 changes: 3 additions & 3 deletions ...rc/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
</Item>
<Item ItemId=";description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI, and Tizen using Blazor Hybrid]]></Val>
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst and WinUI using Blazor Hybrid]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[用于使用 Blazor Hybrid 创建适用于 iOS、Android、Mac Catalyst、WinUI 和 Tizen 的 .NET MAUI 应用程序的项目]]></Val>
<Val><![CDATA[一个项目，用于使用 Blazor Hybrid 创建适用于 iOS、Android、Mac Catalyst 和 WinUI 的 .NET MAUI 应用程序]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI, and Tizen using Blazor]]></Val>
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI, and Tizen using Blazor Hybrid]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
Expand Down
2 changes: 1 addition & 1 deletion .../src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Item ItemId=";name" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[.NET MAUI ContentPage (C#)]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
Expand Down
2 changes: 1 addition & 1 deletion ...es/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Item ItemId=";name" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[.NET MAUI ContentPage (XAML)]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
Expand Down
2 changes: 1 addition & 1 deletion .../src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Item ItemId=";name" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[.NET MAUI ContentView (C#)]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
Expand Down
2 changes: 1 addition & 1 deletion ...es/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Item ItemId=";name" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[.NET MAUI ContentView (XAML)]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
Expand Down
12 changes: 6 additions & 6 deletions ...rc/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
</Item>
<Item ItemId=";description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI and Tizen]]></Val>
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst and WinUI]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[用于创建适用于 iOS、Android、Mac Catalyst、WinUI 和 Tizen 的 .NET MAUI 应用程序的项目]]></Val>
<Val><![CDATA[一个项目，用于创建适用于 iOS、Android、Mac Catalyst 和 WinUI 的 .NET MAUI 应用程序]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, Tizen, and WinUI]]></Val>
<Val><![CDATA[A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI and Tizen]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Item ItemId=";name" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[.NET MAUI App]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
Expand Down Expand Up @@ -101,7 +101,7 @@
<Str Cat="Text">
<Val><![CDATA[_Include sample content]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[_Include 示例内容]]></Val>
<Val><![CDATA[包含示例内容(_I)]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -119,7 +119,7 @@
<Str Cat="Text">
<Val><![CDATA[If specified, skips the automatic restore of the project on create.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[如果指定，则在创建时跳过项目的自动还原。]]></Val>
<Val><![CDATA[如果已指定，则在创建时跳过项目的自动还原。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
Loading
Loading