Skip to content

Commit

Permalink
LEGO: check in for master to temporary branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
@csigs
csigs committed Oct 25, 2017
1 parent c87c10d commit ea1364a
Show file tree
Hide file tree
Showing 64 changed files with 3,794 additions and 4,571 deletions.
10 changes: 8 additions & 2 deletions Python/loc/lcl/CHS/Microsoft.PythonTools.Common.dll.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5233,6 +5233,12 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";VirtualEnvSaveDeferredSolution" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Your project must be saved before adding a virtual environment.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";WaitForCompleteAnalysisDialog_Cancel" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cancel]]></Val>
Expand Down Expand Up @@ -5332,7 +5338,7 @@
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[3.0.17291.1]]></Val>
<Val><![CDATA[3.0.17297.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -5368,7 +5374,7 @@
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[3.0.17291.1]]></Val>
<Val><![CDATA[3.0.17297.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
81 changes: 45 additions & 36 deletions Python/loc/lcl/CHS/Microsoft.PythonTools.Profiling.dll.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Reports" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Reports]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[报告]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";SessionAlreadyRemoved" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Session has already been removed]]></Val>
Expand Down Expand Up @@ -508,9 +517,9 @@
</Item>
<Item ItemId=";Menus.ctmenu" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},256" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},256" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},256" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},256" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button" IgnoreHK="true">
<Val><![CDATA[Launch &Python Profiling...]]></Val>
<Tgt Cat="Button" IgnoreHK="true" Stat="Loc" Orig="New">
Expand All @@ -519,7 +528,7 @@
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},256" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},256" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Launch Profiling]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -529,9 +538,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},257" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},257" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},257" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},257" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Python Performance Explorer]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -540,7 +549,7 @@
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},257" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},257" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Performance Explorer]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -550,9 +559,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},258" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},258" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},258" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},258" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Add Performance Session]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -562,21 +571,21 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},259" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},259" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},259" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},259" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Start Profiling]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
<Val><![CDATA[开始分析]]></Val>
<Val><![CDATA[启动分析]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},260" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},260" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},260" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},260" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button" IgnoreHK="true">
<Val><![CDATA[&Start Profiling]]></Val>
<Tgt Cat="Button" IgnoreHK="true" Stat="Loc" Orig="New">
Expand All @@ -586,9 +595,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},261" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},261" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},261" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},261" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button" IgnoreHK="true">
<Val><![CDATA[Set as &Current Session]]></Val>
<Tgt Cat="Button" IgnoreHK="true" Stat="Loc" Orig="New">
Expand All @@ -598,9 +607,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},262" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},262" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},262" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},262" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button" IgnoreHK="true">
<Val><![CDATA[&Compare Performance Reports...]]></Val>
<Tgt Cat="Button" IgnoreHK="true" Stat="Loc" Orig="New">
Expand All @@ -609,7 +618,7 @@
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},262" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},262" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Compare Performance Reports]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -619,9 +628,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},263" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},263" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},263" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},263" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button" IgnoreHK="true">
<Val><![CDATA[&Add Report...]]></Val>
<Tgt Cat="Button" IgnoreHK="true" Stat="Loc" Orig="New">
Expand All @@ -630,7 +639,7 @@
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},263" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},263" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Add Performance Report]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -640,9 +649,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},264" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},264" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},264" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},264" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button" IgnoreHK="true">
<Val><![CDATA[&Open]]></Val>
<Tgt Cat="Button" IgnoreHK="true" Stat="Loc" Orig="New">
Expand All @@ -651,7 +660,7 @@
</Str>
<Disp Icon="Str" Expand="true" />
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},264" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},264" ItemType=";LocCanonical" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Open Performance Report]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -661,9 +670,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},265" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},265" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},265" ItemType=";Button" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},265" ItemType=";Button" PsrId="240" Leaf="true">
<Str Cat="Button">
<Val><![CDATA[Stop Profiling]]></Val>
<Tgt Cat="Button" Stat="Loc" Orig="New">
Expand All @@ -673,9 +682,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8192" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8192" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8192" ItemType=";Menu" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8192" ItemType=";Menu" PsrId="240" Leaf="true">
<Str Cat="Menu Item">
<Val><![CDATA[Python Performance]]></Val>
<Tgt Cat="Menu Item" Stat="Loc" Orig="New">
Expand All @@ -685,9 +694,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8193" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8193" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8193" ItemType=";Menu" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8193" ItemType=";Menu" PsrId="240" Leaf="true">
<Str Cat="Menu Item">
<Val><![CDATA[Performance Context]]></Val>
<Tgt Cat="Menu Item" Stat="Loc" Orig="New">
Expand All @@ -697,9 +706,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8194" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8194" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8194" ItemType=";Menu" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8194" ItemType=";Menu" PsrId="240" Leaf="true">
<Str Cat="Menu Item">
<Val><![CDATA[Performance Reports Context]]></Val>
<Tgt Cat="Menu Item" Stat="Loc" Orig="New">
Expand All @@ -709,9 +718,9 @@
<Disp Icon="Str" Expand="true" />
</Item>
</Item>
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8195" ItemType="0" PsrId="240" Leaf="false">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8195" ItemType="0" PsrId="240" Leaf="false">
<Disp Icon="Menu" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";{c6e7bafe-d4b6-4e04-85af-9c83f18d8c78},8195" ItemType=";Menu" PsrId="240" Leaf="true">
<Item ItemId=";{5b3281a5-d037-4e84-93aa-a6819304dbd9},8195" ItemType=";Menu" PsrId="240" Leaf="true">
<Str Cat="Menu Item">
<Val><![CDATA[Performance Report Context]]></Val>
<Tgt Cat="Menu Item" Stat="Loc" Orig="New">
Expand Down Expand Up @@ -796,7 +805,7 @@
</Item>
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[3.0.17296.1]]></Val>
<Val><![CDATA[3.0.17297.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -832,7 +841,7 @@
</Item>
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
<Str Cat="Text" DevLk="true">
<Val><![CDATA[3.0.17296.1]]></Val>
<Val><![CDATA[3.0.17297.1]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Loading

0 comments on commit ea1364a

Please sign in to comment.