Skip to content

Merge Loc changes #41

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
LukaszMendakiewicz merged 2 commits into from
Sep 19, 2017
Merged

Merge Loc changes #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
427476f
LEGO: check in for dev15loc to temporary branch.
csigs Sep 19, 2017
eb2f10d
LEGO: Merge pull request 40
csigs Sep 19, 2017
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: 10 additions & 4 deletions loc/lcl/CHS/GoogleTestAdapter.Common.Dynamic.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="E:\A\_work\76\s\out\binaries\GoogleTestAdapter\Release\Common.Dynamic.TAfGT\GoogleTestAdapter.Common.Dynamic.dll" PsrId="211" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
<OwnedComments>
<Cmt Name="Dev" />
Expand Down Expand Up @@ -33,9 +33,6 @@
<Val><![CDATA[{0}Check out Test Adapter for Google Test's trouble shooting section at https://go.microsoft.com/fwlink/?linkid=848168]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is empty or a name of a thread followed by space (e.g. "[T0]5D; ")]]></Cmt>
</Cmts>
</Item>
</Item>
</Item>
Expand All @@ -59,12 +56,18 @@
<Item ItemId=";CompanyName" ItemType="0" PsrId="211" 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=";FileDescription" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[GoogleTestAdapter.Common.Dynamic.TAfGT]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[GoogleTestAdapter.Common.Dynamic.TAfGT]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -95,6 +98,9 @@
<Item ItemId=";ProductName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[GoogleTestAdapter.Common.Dynamic.TAfGT]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[GoogleTestAdapter.Common.Dynamic.TAfGT]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
221 changes: 7 additions & 214 deletions loc/lcl/CHS/GoogleTestAdapter.Core.dll.lcl
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 7 additions & 16 deletions loc/lcl/CHS/GoogleTestAdapter.DiaResolver.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="E:\A\_work\76\s\out\binaries\GoogleTestAdapter\Release\DiaResolver\GoogleTestAdapter.DiaResolver.dll" PsrId="211" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
<OwnedComments>
<Cmt Name="Dev" />
Expand All @@ -15,9 +15,6 @@
<Val><![CDATA[Attempts to find PDB: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is a list of locations attempted]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";GenerateFullPDBMessage" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
Expand All @@ -30,36 +27,24 @@
<Val><![CDATA[Failed to locate line number for {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents an unlocalized symbol name (e.g. "foo")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";LoadError" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot load {0}.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents unlocalized file path (e.g c:\test\foo.pdb)]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ParsingFile" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Parsing PDB file {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents unlocalized file path (e.g c:\test\foo.pdb)]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";PdbFileNotFoundError" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Couldn't find the .pdb file of file '{0}'. You will not get any source locations for your tests.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents unlocalized file path (e.g c:\test\foo.exe)]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";UnMapLoad" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
Expand Down Expand Up @@ -107,6 +92,9 @@
<Item ItemId=";FileDescription" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[GoogleTestAdapter.DiaResolver]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[GoogleTestAdapter.DiaResolver]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -137,6 +125,9 @@
<Item ItemId=";ProductName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[GoogleTestAdapter.DiaResolver]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[GoogleTestAdapter.DiaResolver]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
83 changes: 7 additions & 76 deletions loc/lcl/CHS/GoogleTestAdapter.TestAdapter.dll.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="E:\A\_work\76\s\out\binaries\GoogleTestAdapter\Release\TestAdapter\GoogleTestAdapter.TestAdapter.dll" PsrId="211" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
<OwnedComments>
<Cmt Name="Dev" />
Expand All @@ -15,27 +15,18 @@
<Val><![CDATA[Could not attach debugger to process {0}:{1}{2}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents a process id (e.g. "10480"), {1} is a line break, {2} is an exception message]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";DebuggerAttachMessage" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not attach debugger to process {0}, no error message available]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents a process id (e.g. "10480")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";DebuggerAttachTime" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Debugger attached to process {0}, took {1} ms]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents a process id (e.g. "10480"), {1} represents a number (e.g. "12" or "14")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";DebuggingMessage" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
Expand All @@ -48,72 +39,48 @@
<Val><![CDATA[{0} does not match {1}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents an unlocalized test name (e.g. "TestSuite1.Test2"), {1} represents an unlocalized test filter value (e.g. "TestCategory=Nightly")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";EnableDebugMode" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[ (enable debug mode for more information)]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[Optionally used in ErrorAndWarning string]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ErrorAndWarning" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The following errors and warnings have occured during {0} {1}:{2}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is TestDiscovery or TestExecution string, {1} is empty or EnableDebugMode string, {2} is line break]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ErrorMessage" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[ERROR: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is the error message]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";FilterInvalid" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Test case filter is invalid: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents localized exception message (e.g. "Cannot load file")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";IdentifyVSError" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not identify Visual Studio version. {0} requires at least Visual Studio 2012 Update 1.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is ExtensionName string from Common.Dynamic.TAfGT resources file]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";Invalid" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents unlocalized settings name (e.g. "GoogleTestAdapterSettings")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";Matches" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[{0} matches {1}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents an unlocalized test name (e.g. "TestSuite1.Test2"), {1} represents an unlocalized test filter value (e.g. "TestCategory=Nightly")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";MoreInformationMessage" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
Expand All @@ -138,18 +105,12 @@
<Val><![CDATA[Solution settings: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is unlocalized list of settings]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";TestCaseFilter" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Test case filter: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is the user-specified filter]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";TestDiscovery" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
Expand All @@ -162,18 +123,12 @@
<Val><![CDATA[Test discovery completed, overall duration: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents unlocalized duration (e.g. "02:14:18")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";TestDiscoveryExceptionError" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Exception while discovering tests: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents localized exception message (e.g. "Cannot load file")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";TestExecution" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
Expand All @@ -192,90 +147,60 @@
<Val><![CDATA[Google Test execution completed, overall duration: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents unlocalized duration (e.g. "02:14:18")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";TestRunningException" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Exception while running tests: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents localized exception message (e.g. "Cannot load file")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";TraitIgnoreMessage" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Trait has same name as base test property and will thus be ignored for test case filtering: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents unlocalized name for trait (e.g. "Test")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";UnknownEnum" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unknown enum literal: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents a number (e.g. "0" or "1")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";UnknownLiteral" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unknown enum literal: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents a number (e.g. "0" or "1")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";UnknownVisualStudioVersion" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unknown Visual Studio version: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is version number (e.g. "15.0")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";VS2012Error" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[{0} requires at least Visual Studio 2012 Update 1 - please update your Visual Studio installation.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is ExtensionName string from Common.Dynamic.TAfGT resources file]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";VSVersion" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Visual Studio version: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents a number (e.g. "12" or "14")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";VSVersionMessage" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not find out Visual Studio version: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} represents localized exception message (e.g. "Cannot load file")]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";WarningMessage" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Warning: {0}]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="RCCX"><![CDATA[{0} is the warning message]]></Cmt>
</Cmts>
</Item>
</Item>
</Item>
Expand Down Expand Up @@ -308,6 +233,9 @@
<Item ItemId=";FileDescription" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[GoogleTestAdapter.GoogleTestAdapter]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[GoogleTestAdapter.GoogleTestAdapter]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -338,6 +266,9 @@
<Item ItemId=";ProductName" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[GoogleTestAdapter.GoogleTestAdapter]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[GoogleTestAdapter.GoogleTestAdapter]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Loading