Skip to content

Commit 05be06b

Browse files
DavidARaygozaDavidARaygoza
authored
Merge branch 'dev17' into lego/hb_c6b0fab9-0fae-487d-80e8-3fa70d2eb932_20260124074630898
2 parents 2194a7e + 8b3fdbd commit 05be06b

58 files changed

Lines changed: 388 additions & 901 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎loc/lcl/CHS/GoogleTestAdapter.Core.dll.lcl‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,24 @@
775775
</Str>
776776
<Disp Icon="Str" />
777777
</Item>
778+
<Item ItemId=";OptionShowFixtureMethodNode" ItemType="0" PsrId="211" Leaf="true">
779+
<Str Cat="Text">
780+
<Val><![CDATA[Show fixture method node]]></Val>
781+
<Tgt Cat="Text" Stat="Loc" Orig="New">
782+
<Val><![CDATA[显示固定例程方法节点]]></Val>
783+
</Tgt>
784+
</Str>
785+
<Disp Icon="Str" />
786+
</Item>
787+
<Item ItemId=";OptionShowFixtureMethodNodeDescription" ItemType="0" PsrId="211" Leaf="true">
788+
<Str Cat="Text">
789+
<Val><![CDATA[Show placeholder nodes in test explorer representing status of fixture methods. ]]></Val>
790+
<Tgt Cat="Text" Stat="Loc" Orig="New">
791+
<Val><![CDATA[在测试资源管理器中显示表示固定例程方法状态的占位符节点。]]></Val>
792+
</Tgt>
793+
</Str>
794+
<Disp Icon="Str" />
795+
</Item>
778796
<Item ItemId=";OptionShowReleaseNotes" ItemType="0" PsrId="211" Leaf="true">
779797
<Str Cat="Text">
780798
<Val><![CDATA[Show release notes after update]]></Val>
@@ -905,7 +923,7 @@
905923
<Str Cat="Text">
906924
<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>
907925
<Tgt Cat="Text" Stat="Loc" Orig="New">
908-
<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>
926+
<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>
909927
</Tgt>
910928
</Str>
911929
<Disp Icon="Str" />

‎loc/lcl/CHS/GoogleTestAdapter.DiaResolver.dll.lcl‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@
107107
</Item>
108108
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
109109
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
110-
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
111-
<Str Cat="Text" DevLk="true">
112-
<Val><![CDATA[0.10.1.0]]></Val>
113-
</Str>
114-
<Disp Icon="Str" />
115-
</Item>
116110
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
117111
<Str Cat="Text">
118112
<Val><![CDATA[Encapsulation of the Dia DLL]]></Val>
@@ -140,12 +134,6 @@
140134
</Str>
141135
<Disp Icon="Str" />
142136
</Item>
143-
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
144-
<Str Cat="Text" DevLk="true">
145-
<Val><![CDATA[0.10.1.0]]></Val>
146-
</Str>
147-
<Disp Icon="Str" />
148-
</Item>
149137
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
150138
<Str Cat="Text" DevLk="true">
151139
<Val><![CDATA[GoogleTestAdapter.DiaResolver.dll]]></Val>
@@ -176,12 +164,6 @@
176164
</Str>
177165
<Disp Icon="Str" />
178166
</Item>
179-
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
180-
<Str Cat="Text" DevLk="true">
181-
<Val><![CDATA[0.10.1.0]]></Val>
182-
</Str>
183-
<Disp Icon="Str" />
184-
</Item>
185167
</Item>
186168
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
187169
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />

‎loc/lcl/CHS/GoogleTestAdapter.TestAdapter.dll.lcl‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,11 @@
333333
<Item ItemId=";Managed Resources" ItemType="0" PsrId="211" Leaf="true">
334334
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
335335
</Item>
336+
<Item ItemId=";TestPropertySettings.xsd" ItemType="0" PsrId="210" Leaf="true">
337+
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" Path=" \ ;XML \ 0 \ 0" />
338+
</Item>
336339
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
337340
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
338-
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
339-
<Str Cat="Text" DevLk="true">
340-
<Val><![CDATA[0.10.1.1]]></Val>
341-
</Str>
342-
<Disp Icon="Str" />
343-
</Item>
344341
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
345342
<Str Cat="Text">
346343
<Val><![CDATA[Provides main Visual Studio integration of the Test Adapter]]></Val>
@@ -368,12 +365,6 @@
368365
</Str>
369366
<Disp Icon="Str" />
370367
</Item>
371-
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
372-
<Str Cat="Text" DevLk="true">
373-
<Val><![CDATA[0.10.1.1]]></Val>
374-
</Str>
375-
<Disp Icon="Str" />
376-
</Item>
377368
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
378369
<Str Cat="Text" DevLk="true">
379370
<Val><![CDATA[GoogleTestAdapter.TestAdapter.dll]]></Val>
@@ -404,12 +395,6 @@
404395
</Str>
405396
<Disp Icon="Str" />
406397
</Item>
407-
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
408-
<Str Cat="Text" DevLk="true">
409-
<Val><![CDATA[0.10.1.1]]></Val>
410-
</Str>
411-
<Disp Icon="Str" />
412-
</Item>
413398
</Item>
414399
<Item ItemId=";XML" ItemType="0" PsrId="210" Leaf="true">
415400
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />

‎loc/lcl/CHS/GoogleTestAdapter.VsPackage.TAfGT.dll.lcl‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,18 @@
7070
<Disp Icon="Str" Expand="true" />
7171
</Item>
7272
</Item>
73+
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},260" ItemType="0" PsrId="240" Leaf="false">
74+
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
75+
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},260" ItemType=";Button" PsrId="240" Leaf="true">
76+
<Str Cat="Button">
77+
<Val><![CDATA[Show Fixture Node]]></Val>
78+
<Tgt Cat="Button" Stat="Loc" Orig="New">
79+
<Val><![CDATA[显示固定例程节点]]></Val>
80+
</Tgt>
81+
</Str>
82+
<Disp Icon="Str" Expand="true" />
83+
</Item>
84+
</Item>
7385
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},4096" ItemType="0" PsrId="240" Leaf="false">
7486
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
7587
<Item ItemId=";{e0d9835f-9c16-4d27-a9ad-4df7568650f7},4096" ItemType=";Menu" PsrId="240" Leaf="true">
@@ -161,12 +173,6 @@
161173
</Item>
162174
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
163175
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
164-
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
165-
<Str Cat="Text" DevLk="true">
166-
<Val><![CDATA[0.10.1.1]]></Val>
167-
</Str>
168-
<Disp Icon="Str" />
169-
</Item>
170176
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
171177
<Str Cat="Text">
172178
<Val><![CDATA[Visual Studio options integration of the Test Adapter for Google Test.]]></Val>
@@ -194,12 +200,6 @@
194200
</Str>
195201
<Disp Icon="Str" />
196202
</Item>
197-
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
198-
<Str Cat="Text" DevLk="true">
199-
<Val><![CDATA[0.10.1.1]]></Val>
200-
</Str>
201-
<Disp Icon="Str" />
202-
</Item>
203203
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
204204
<Str Cat="Text" DevLk="true">
205205
<Val><![CDATA[GoogleTestAdapter.VsPackage.TAfGT.dll]]></Val>
@@ -230,12 +230,6 @@
230230
</Str>
231231
<Disp Icon="Str" />
232232
</Item>
233-
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
234-
<Str Cat="Text" DevLk="true">
235-
<Val><![CDATA[0.10.1.1]]></Val>
236-
</Str>
237-
<Disp Icon="Str" />
238-
</Item>
239233
</Item>
240234
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
241235
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />

‎loc/lcl/CHS/NewProjectWizard.dll.lcl‎

Lines changed: 3 additions & 21 deletions
Large diffs are not rendered by default.

‎loc/lcl/CHT/GoogleTestAdapter.DiaResolver.dll.lcl‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@
107107
</Item>
108108
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
109109
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
110-
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
111-
<Str Cat="Text" DevLk="true">
112-
<Val><![CDATA[0.10.1.0]]></Val>
113-
</Str>
114-
<Disp Icon="Str" />
115-
</Item>
116110
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
117111
<Str Cat="Text">
118112
<Val><![CDATA[Encapsulation of the Dia DLL]]></Val>
@@ -140,12 +134,6 @@
140134
</Str>
141135
<Disp Icon="Str" />
142136
</Item>
143-
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
144-
<Str Cat="Text" DevLk="true">
145-
<Val><![CDATA[0.10.1.0]]></Val>
146-
</Str>
147-
<Disp Icon="Str" />
148-
</Item>
149137
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
150138
<Str Cat="Text" DevLk="true">
151139
<Val><![CDATA[GoogleTestAdapter.DiaResolver.dll]]></Val>
@@ -176,12 +164,6 @@
176164
</Str>
177165
<Disp Icon="Str" />
178166
</Item>
179-
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
180-
<Str Cat="Text" DevLk="true">
181-
<Val><![CDATA[0.10.1.0]]></Val>
182-
</Str>
183-
<Disp Icon="Str" />
184-
</Item>
185167
</Item>
186168
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
187169
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />

‎loc/lcl/CHT/GoogleTestAdapter.TestAdapter.dll.lcl‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,11 @@
333333
<Item ItemId=";Managed Resources" ItemType="0" PsrId="211" Leaf="true">
334334
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
335335
</Item>
336+
<Item ItemId=";TestPropertySettings.xsd" ItemType="0" PsrId="210" Leaf="true">
337+
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" Path=" \ ;XML \ 0 \ 0" />
338+
</Item>
336339
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">
337340
<Disp Icon="Ver" Disp="true" LocTbl="false" Path=" \ ;Version \ 8 \ 0" />
338-
<Item ItemId=";AssemblyVersion" ItemType="0" PsrId="211" Leaf="true">
339-
<Str Cat="Text" DevLk="true">
340-
<Val><![CDATA[0.10.1.1]]></Val>
341-
</Str>
342-
<Disp Icon="Str" />
343-
</Item>
344341
<Item ItemId=";Comments" ItemType="0" PsrId="211" Leaf="true">
345342
<Str Cat="Text">
346343
<Val><![CDATA[Provides main Visual Studio integration of the Test Adapter]]></Val>
@@ -368,12 +365,6 @@
368365
</Str>
369366
<Disp Icon="Str" />
370367
</Item>
371-
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
372-
<Str Cat="Text" DevLk="true">
373-
<Val><![CDATA[0.10.1.1]]></Val>
374-
</Str>
375-
<Disp Icon="Str" />
376-
</Item>
377368
<Item ItemId=";InternalName" ItemType="0" PsrId="211" Leaf="true">
378369
<Str Cat="Text" DevLk="true">
379370
<Val><![CDATA[GoogleTestAdapter.TestAdapter.dll]]></Val>
@@ -404,12 +395,6 @@
404395
</Str>
405396
<Disp Icon="Str" />
406397
</Item>
407-
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
408-
<Str Cat="Text" DevLk="true">
409-
<Val><![CDATA[0.10.1.1]]></Val>
410-
</Str>
411-
<Disp Icon="Str" />
412-
</Item>
413398
</Item>
414399
<Item ItemId=";XML" ItemType="0" PsrId="210" Leaf="true">
415400
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />

0 commit comments

Comments
 (0)