Skip to content

LEGO: Pull request from lego/hb_c6b0fab9-0fae-487d-80e8-3fa70d2eb932_20260123074640996 to dev17 #305

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

Open
csigs wants to merge 1 commit into
base: dev17
Choose a base branch
from
Open

LEGO: Pull request from lego/hb_c6b0fab9-0fae-487d-80e8-3fa70d2eb932_20260123074640996 to dev17 #305

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: 13 additions & 1 deletion loc/lcl/CHS/GoogleTestAdapter.Core.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,18 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";OptionShowFixtureMethodNode" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Show fixture method node]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";OptionShowFixtureMethodNodeDescription" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Show placeholder nodes in test explorer representing status of fixture methods. ]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";OptionShowReleaseNotes" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Show release notes after update]]></Val>
Expand Down Expand Up @@ -905,7 +917,7 @@
<Str Cat="Text">
<Val><![CDATA[Allows to override/add traits for testcases matching a regex. Traits are build up in 3 phases. First, traits are assigned to tests according to the 'Traits before' option. Next, the tests' traits (defined via the macros in GTA_Traits.h) are added to the tests, overriding traits from phase 1 with new values. Finally, the 'Traits after' option is evaluated, again in an overriding manner.]D;]A;Syntax: {0} separates the regex from the traits, the trait's name and value are separated by {1} and each pair of regex and trait is separated by {2}.]D;]A;Example: MySuite\.*{0}Type{1}Small{2}MySuite2\.*|MySuite3\.*{0}Type{1}Medium]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[允许替代/添加匹配正则表达式的测试用例的特征。特征由 3 个阶段构成。首先，根据“之前的特征”选项将特征分配给测试。然后，将测试的特征(在 GTA_Traits.h 中通过宏定义的)添加到测试中，使用新值从第 1 阶段替代特征。最后，再次以替代的方式评估“之后的特征”选项。]D;]A;语法: {0} 将正则表达式与特征分隔开，特征名称和值由 {1} 分隔，每对正则表达式和特征由 {2} 分隔。]D;]A;例如: MySuite\.*{0}Type{1}Small{2}MySuite2\.*|MySuite3\.*{0}Type{1}Medium]]></Val>
<Val><![CDATA[允许替代/添加匹配正则表达式的测试用例的特征。特征通过 3 个阶段生成。首先，根据“之前的特征”选项将特征分配给测试。然后，将测试的特征(在 GTA_Traits.h 中通过宏定义)添加到测试中，使用新值替代第 1 阶段的特征。最后，再次以替代的方式评估“之后的特征”选项。]D;]A;语法: {0} 将正则表达式与特征分隔开，特征名称和值由 {1} 分隔，每对正则表达式和特征由 {2} 分隔。]D;]A;例如: MySuite\.*{0}Type{1}Small{2}MySuite2\.*|MySuite3\.*{0}Type{1}Medium]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
18 changes: 0 additions & 18 deletions loc/lcl/CHS/GoogleTestAdapter.DiaResolver.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@
</Item>
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.0]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encapsulation of the Dia DLL]]></Val>
Expand Down Expand Up @@ -140,12 +134,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.0]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[GoogleTestAdapter.DiaResolver.dll]]></Val>
Expand Down Expand Up @@ -176,12 +164,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.0]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down
21 changes: 3 additions & 18 deletions loc/lcl/CHS/GoogleTestAdapter.TestAdapter.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,14 +333,11 @@
<Item ItemId=";Managed Resources" ItemType="0" PsrId="211" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
</Item>
<Item ItemId=";TestPropertySettings.xsd" ItemType="0" PsrId="210" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" Path=" \ ;XML \ 0 \ 0" />
</Item>
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Provides main Visual Studio integration of the Test Adapter]]></Val>
Expand Down Expand Up @@ -368,12 +365,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[GoogleTestAdapter.TestAdapter.dll]]></Val>
Expand Down Expand Up @@ -404,12 +395,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";XML" ItemType="0" PsrId="210" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down
27 changes: 9 additions & 18 deletions loc/lcl/CHS/GoogleTestAdapter.VsPackage.TAfGT.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},260" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},260" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Show Fixture Node]]></Val>
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},4096" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},4096" ItemType=";Menu" PsrId="240" Leaf="true">
Expand Down Expand Up @@ -161,12 +170,6 @@
</Item>
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Visual Studio options integration of the Test Adapter for Google Test.]]></Val>
Expand Down Expand Up @@ -194,12 +197,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[GoogleTestAdapter.VsPackage.TAfGT.dll]]></Val>
Expand Down Expand Up @@ -230,12 +227,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down
24 changes: 3 additions & 21 deletions loc/lcl/CHS/NewProjectWizard.dll.lcl
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion loc/lcl/CHT/GoogleTestAdapter.Core.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
<Str Cat="Text">
<Val><![CDATA[Google Test catches exceptions by default; the according test fails and test execution continues. Choosing false lets exceptions pass through, allowing the debugger to catch them.]D;]A;Google Test option: {0}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[根據預設值; Google 測試會攔截的例外狀況according 的測試失敗，且會繼續測試執行。選擇，則為 false 可讓例外狀況通過，讓偵錯工具攔截。]D;]A;Google 測試選項: {0}]]></Val>
<Val><![CDATA[根據預設值; Google Test 會攔截的例外狀況according 的測試失敗，且會繼續測試執行。選擇，則為 false 可讓例外狀況通過，讓偵錯工具攔截。]D;]A;Google 測試選項: {0}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -775,6 +775,18 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";OptionShowFixtureMethodNode" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Show fixture method node]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";OptionShowFixtureMethodNodeDescription" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Show placeholder nodes in test explorer representing status of fixture methods. ]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";OptionShowReleaseNotes" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Show release notes after update]]></Val>
Expand Down
18 changes: 0 additions & 18 deletions loc/lcl/CHT/GoogleTestAdapter.DiaResolver.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@
</Item>
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.0]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encapsulation of the Dia DLL]]></Val>
Expand Down Expand Up @@ -140,12 +134,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.0]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[GoogleTestAdapter.DiaResolver.dll]]></Val>
Expand Down Expand Up @@ -176,12 +164,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.0]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down
21 changes: 3 additions & 18 deletions loc/lcl/CHT/GoogleTestAdapter.TestAdapter.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,14 +333,11 @@
<Item ItemId=";Managed Resources" ItemType="0" PsrId="211" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
</Item>
<Item ItemId=";TestPropertySettings.xsd" ItemType="0" PsrId="210" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" Path=" \ ;XML \ 0 \ 0" />
</Item>
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Provides main Visual Studio integration of the Test Adapter]]></Val>
Expand Down Expand Up @@ -368,12 +365,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[GoogleTestAdapter.TestAdapter.dll]]></Val>
Expand Down Expand Up @@ -404,12 +395,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";XML" ItemType="0" PsrId="210" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down
27 changes: 9 additions & 18 deletions loc/lcl/CHT/GoogleTestAdapter.VsPackage.TAfGT.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},260" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},260" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Show Fixture Node]]></Val>
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},4096" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},4096" ItemType=";Menu" PsrId="240" Leaf="true">
Expand Down Expand Up @@ -161,12 +170,6 @@
</Item>
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Visual Studio options integration of the Test Adapter for Google Test.]]></Val>
Expand Down Expand Up @@ -194,12 +197,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[GoogleTestAdapter.VsPackage.TAfGT.dll]]></Val>
Expand Down Expand Up @@ -230,12 +227,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[0.10.1.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down
Loading