Skip to content

Commit 0ae0a2b

Browse files
author
Paul van Brenk
committed
Merge remote-tracking branch 'Microsoft/master'
2 parents 79ce38f + 38eca35 commit 0ae0a2b

File tree

53 files changed

+37575
-3438
lines changed

Some content is hidden

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

53 files changed

+37575
-3438
lines changed

‎Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterTe
106106

107107
TelemetryHelper.LogSearchNpm();
108108

109-
var relativeUri = string.Format("/-/v1/search?text={0}", WebUtility.UrlEncode(filterText));
109+
var relativeUri = string.Format("/-/v1/search?text=\"{0}\"", WebUtility.UrlEncode(filterText));
110110
var searchUri = new Uri(defaultRegistryUri, relativeUri);
111111

112112
var request = WebRequest.Create(searchUri);

‎loc/lcl/CHS/Microsoft.NodejsTools.InteractiveWindow.dll.lcl‎

Lines changed: 91 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<LCX SchemaVersion="6.0" Name="E:\A\_work\4\s\BuildOutput\Release\Binaries\InteractiveWindow\Microsoft.NodejsTools.InteractiveWindow.dll" PsrId="211" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
33
<OwnedComments>
44
<Cmt Name="Dev" />
@@ -16,6 +16,9 @@
1616
<Item ItemId=";CanNotCreateWindow" ItemType="0" PsrId="211" Leaf="true">
1717
<Str Cat="Text">
1818
<Val><![CDATA[Cannot create Interactive window]]></Val>
19+
<Tgt Cat="Text" Stat="Loc" Orig="New">
20+
<Val><![CDATA[无法创建交互式窗口]]></Val>
21+
</Tgt>
1922
</Str>
2023
<Disp Icon="Str" />
2124
</Item>
@@ -39,18 +42,27 @@
3942
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},12288" ItemType=";Button" PsrId="240" Leaf="true">
4043
<Str Cat="Combo Box">
4144
<Val><![CDATA[Scopes: ]]></Val>
45+
<Tgt Cat="Combo Box" Stat="Loc" Orig="New">
46+
<Val><![CDATA[范围: ]]></Val>
47+
</Tgt>
4248
</Str>
4349
<Disp Icon="Str" Expand="true" />
4450
</Item>
4551
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},12288" ItemType=";CommandName" PsrId="240" Leaf="true">
4652
<Str Cat="Combo Box">
4753
<Val><![CDATA[DropDown Combo]]></Val>
54+
<Tgt Cat="Combo Box" Stat="Loc" Orig="New">
55+
<Val><![CDATA[下拉组合框]]></Val>
56+
</Tgt>
4857
</Str>
4958
<Disp Icon="Str" Expand="true" />
5059
</Item>
5160
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},12288" ItemType=";Tooltip" PsrId="240" Leaf="true">
5261
<Str Cat="Combo Box">
5362
<Val><![CDATA[Selects the current file scope that the interactive window is executing against.]]></Val>
63+
<Tgt Cat="Combo Box" Stat="Loc" Orig="New">
64+
<Val><![CDATA[选择交互式窗口正针对执行的当前文件范围。]]></Val>
65+
</Tgt>
5466
</Str>
5567
<Disp Icon="Str" Expand="true" />
5668
</Item>
@@ -60,12 +72,18 @@
6072
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},259" ItemType=";Button" PsrId="240" Leaf="true">
6173
<Str Cat="Button">
6274
<Val><![CDATA[Execute or Paste Input]]></Val>
75+
<Tgt Cat="Button" Stat="Loc" Orig="New">
76+
<Val><![CDATA[执行或粘贴输入]]></Val>
77+
</Tgt>
6378
</Str>
6479
<Disp Icon="Str" Expand="true" />
6580
</Item>
6681
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},259" ItemType=";CommandName" PsrId="240" Leaf="true">
6782
<Str Cat="Button">
6883
<Val><![CDATA[cmdidSmartExecute]]></Val>
84+
<Tgt Cat="Button" Stat="Loc" Orig="New">
85+
<Val><![CDATA[cmdidSmartExecute]]></Val>
86+
</Tgt>
6987
</Str>
7088
<Disp Icon="Str" Expand="true" />
7189
</Item>
@@ -75,12 +93,18 @@
7593
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},261" ItemType=";Button" PsrId="240" Leaf="true">
7694
<Str Cat="Button">
7795
<Val><![CDATA[Reset]]></Val>
96+
<Tgt Cat="Button" Stat="Loc" Orig="New">
97+
<Val><![CDATA[重置]]></Val>
98+
</Tgt>
7899
</Str>
79100
<Disp Icon="Str" Expand="true" />
80101
</Item>
81102
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},261" ItemType=";CommandName" PsrId="240" Leaf="true">
82103
<Str Cat="Button">
83104
<Val><![CDATA[cmdIdResetRepl]]></Val>
105+
<Tgt Cat="Button" Stat="Loc" Orig="New">
106+
<Val><![CDATA[cmdIdResetRepl]]></Val>
107+
</Tgt>
84108
</Str>
85109
<Disp Icon="Str" Expand="true" />
86110
</Item>
@@ -90,12 +114,18 @@
90114
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},262" ItemType=";Button" PsrId="240" Leaf="true">
91115
<Str Cat="Button">
92116
<Val><![CDATA[History Next]]></Val>
117+
<Tgt Cat="Button" Stat="Loc" Orig="New">
118+
<Val><![CDATA[下一个历史记录]]></Val>
119+
</Tgt>
93120
</Str>
94121
<Disp Icon="Str" Expand="true" />
95122
</Item>
96123
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},262" ItemType=";CommandName" PsrId="240" Leaf="true">
97124
<Str Cat="Button">
98125
<Val><![CDATA[cmdidReplHistoryNext]]></Val>
126+
<Tgt Cat="Button" Stat="Loc" Orig="New">
127+
<Val><![CDATA[cmdidReplHistoryNext]]></Val>
128+
</Tgt>
99129
</Str>
100130
<Disp Icon="Str" Expand="true" />
101131
</Item>
@@ -105,12 +135,18 @@
105135
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},263" ItemType=";Button" PsrId="240" Leaf="true">
106136
<Str Cat="Button">
107137
<Val><![CDATA[History Previous]]></Val>
138+
<Tgt Cat="Button" Stat="Loc" Orig="New">
139+
<Val><![CDATA[上一个历史记录]]></Val>
140+
</Tgt>
108141
</Str>
109142
<Disp Icon="Str" Expand="true" />
110143
</Item>
111144
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},263" ItemType=";CommandName" PsrId="240" Leaf="true">
112145
<Str Cat="Button">
113146
<Val><![CDATA[cmdidReplHistoryPrevious]]></Val>
147+
<Tgt Cat="Button" Stat="Loc" Orig="New">
148+
<Val><![CDATA[cmdidReplHistoryPrevious]]></Val>
149+
</Tgt>
114150
</Str>
115151
<Disp Icon="Str" Expand="true" />
116152
</Item>
@@ -120,12 +156,18 @@
120156
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},264" ItemType=";Button" PsrId="240" Leaf="true">
121157
<Str Cat="Button">
122158
<Val><![CDATA[Clear Screen]]></Val>
159+
<Tgt Cat="Button" Stat="Loc" Orig="New">
160+
<Val><![CDATA[清除屏幕]]></Val>
161+
</Tgt>
123162
</Str>
124163
<Disp Icon="Str" Expand="true" />
125164
</Item>
126165
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},264" ItemType=";CommandName" PsrId="240" Leaf="true">
127166
<Str Cat="Button">
128167
<Val><![CDATA[cmdidReplClearScreen]]></Val>
168+
<Tgt Cat="Button" Stat="Loc" Orig="New">
169+
<Val><![CDATA[cmdidReplClearScreen]]></Val>
170+
</Tgt>
129171
</Str>
130172
<Disp Icon="Str" Expand="true" />
131173
</Item>
@@ -135,12 +177,18 @@
135177
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},265" ItemType=";Button" PsrId="240" Leaf="true">
136178
<Str Cat="Button">
137179
<Val><![CDATA[Break Line]]></Val>
180+
<Tgt Cat="Button" Stat="Loc" Orig="New">
181+
<Val><![CDATA[分隔线]]></Val>
182+
</Tgt>
138183
</Str>
139184
<Disp Icon="Str" Expand="true" />
140185
</Item>
141186
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},265" ItemType=";CommandName" PsrId="240" Leaf="true">
142187
<Str Cat="Button">
143188
<Val><![CDATA[cmdidBreakLine]]></Val>
189+
<Tgt Cat="Button" Stat="Loc" Orig="New">
190+
<Val><![CDATA[cmdidBreakLine]]></Val>
191+
</Tgt>
144192
</Str>
145193
<Disp Icon="Str" Expand="true" />
146194
</Item>
@@ -150,12 +198,18 @@
150198
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},266" ItemType=";Button" PsrId="240" Leaf="true">
151199
<Str Cat="Button">
152200
<Val><![CDATA[Search History Next]]></Val>
201+
<Tgt Cat="Button" Stat="Loc" Orig="New">
202+
<Val><![CDATA[搜索下一个历史记录]]></Val>
203+
</Tgt>
153204
</Str>
154205
<Disp Icon="Str" Expand="true" />
155206
</Item>
156207
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},266" ItemType=";CommandName" PsrId="240" Leaf="true">
157208
<Str Cat="Button">
158209
<Val><![CDATA[cmdidReplHistoryNext]]></Val>
210+
<Tgt Cat="Button" Stat="Loc" Orig="New">
211+
<Val><![CDATA[cmdidReplHistoryNext]]></Val>
212+
</Tgt>
159213
</Str>
160214
<Disp Icon="Str" Expand="true" />
161215
</Item>
@@ -165,12 +219,18 @@
165219
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},267" ItemType=";Button" PsrId="240" Leaf="true">
166220
<Str Cat="Button">
167221
<Val><![CDATA[Search History Previous]]></Val>
222+
<Tgt Cat="Button" Stat="Loc" Orig="New">
223+
<Val><![CDATA[搜索上一个历史记录]]></Val>
224+
</Tgt>
168225
</Str>
169226
<Disp Icon="Str" Expand="true" />
170227
</Item>
171228
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},267" ItemType=";CommandName" PsrId="240" Leaf="true">
172229
<Str Cat="Button">
173230
<Val><![CDATA[cmdidReplHistoryNext]]></Val>
231+
<Tgt Cat="Button" Stat="Loc" Orig="New">
232+
<Val><![CDATA[cmdidReplHistoryNext]]></Val>
233+
</Tgt>
174234
</Str>
175235
<Disp Icon="Str" Expand="true" />
176236
</Item>
@@ -180,12 +240,18 @@
180240
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},268" ItemType=";Button" PsrId="240" Leaf="true">
181241
<Str Cat="Button">
182242
<Val><![CDATA[Reset]]></Val>
243+
<Tgt Cat="Button" Stat="Loc" Orig="New">
244+
<Val><![CDATA[重置]]></Val>
245+
</Tgt>
183246
</Str>
184247
<Disp Icon="Str" Expand="true" />
185248
</Item>
186249
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},268" ItemType=";CommandName" PsrId="240" Leaf="true">
187250
<Str Cat="Button">
188251
<Val><![CDATA[cmdIdResetRepl]]></Val>
252+
<Tgt Cat="Button" Stat="Loc" Orig="New">
253+
<Val><![CDATA[cmdIdResetRepl]]></Val>
254+
</Tgt>
189255
</Str>
190256
<Disp Icon="Str" Expand="true" />
191257
</Item>
@@ -195,12 +261,18 @@
195261
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},269" ItemType=";Button" PsrId="240" Leaf="true">
196262
<Str Cat="Button">
197263
<Val><![CDATA[Clear Screen]]></Val>
264+
<Tgt Cat="Button" Stat="Loc" Orig="New">
265+
<Val><![CDATA[清除屏幕]]></Val>
266+
</Tgt>
198267
</Str>
199268
<Disp Icon="Str" Expand="true" />
200269
</Item>
201270
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},269" ItemType=";CommandName" PsrId="240" Leaf="true">
202271
<Str Cat="Button">
203272
<Val><![CDATA[cmdidReplClearScreen]]></Val>
273+
<Tgt Cat="Button" Stat="Loc" Orig="New">
274+
<Val><![CDATA[cmdidReplClearScreen]]></Val>
275+
</Tgt>
204276
</Str>
205277
<Disp Icon="Str" Expand="true" />
206278
</Item>
@@ -210,6 +282,9 @@
210282
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},8192" ItemType=";Menu" PsrId="240" Leaf="true">
211283
<Str Cat="Menu Item">
212284
<Val><![CDATA[Interactive Window]]></Val>
285+
<Tgt Cat="Menu Item" Stat="Loc" Orig="New">
286+
<Val><![CDATA[交互式窗口]]></Val>
287+
</Tgt>
213288
</Str>
214289
<Disp Icon="Str" Expand="true" />
215290
</Item>
@@ -219,6 +294,9 @@
219294
<Item ItemId=";{220c57e5-228f-46b5-af80-d0ab55a44902},8448" ItemType=";Menu" PsrId="240" Leaf="true">
220295
<Str Cat="Menu Item">
221296
<Val><![CDATA[Interactive Console]]></Val>
297+
<Tgt Cat="Menu Item" Stat="Loc" Orig="New">
298+
<Val><![CDATA[交互式控制台]]></Val>
299+
</Tgt>
222300
</Str>
223301
<Disp Icon="Str" Expand="true" />
224302
</Item>
@@ -229,6 +307,9 @@
229307
<Item ItemId=";112" ItemType="0" PsrId="211" Leaf="true">
230308
<Str Cat="Text">
231309
<Val><![CDATA[Node.js Tools - Interactive Window]]></Val>
310+
<Tgt Cat="Text" Stat="Loc" Orig="New">
311+
<Val><![CDATA[Node.js 工具 - 交互式窗口]]></Val>
312+
</Tgt>
232313
</Str>
233314
<Disp Icon="Str" />
234315
</Item>
@@ -243,20 +324,23 @@
243324
<Disp Icon="Str" />
244325
</Item>
245326
<Item ItemId=";CompanyName" ItemType="0" PsrId="211" Leaf="true">
246-
<Str Cat="Text">
327+
<Str Cat="Text" UsrLk="true">
247328
<Val><![CDATA[Microsoft Corporation]]></Val>
248329
</Str>
249330
<Disp Icon="Str" />
250331
</Item>
251332
<Item ItemId=";FileDescription" ItemType="0" PsrId="211" Leaf="true">
252333
<Str Cat="Text">
253334
<Val><![CDATA[Node.js Tools for Visual Studio - Interactive Window]]></Val>
335+
<Tgt Cat="Text" Stat="Loc" Orig="New">
336+
<Val><![CDATA[针对 Visual Studio 的 Node.js 工具 - 交互式窗口]]></Val>
337+
</Tgt>
254338
</Str>
255339
<Disp Icon="Str" />
256340
</Item>
257341
<Item ItemId=";FileVersion" ItemType="0" PsrId="211" Leaf="true">
258342
<Str Cat="Text" DevLk="true">
259-
<Val><![CDATA[1.4.10712.2]]></Val>
343+
<Val><![CDATA[1.4.10719.3]]></Val>
260344
</Str>
261345
<Disp Icon="Str" />
262346
</Item>
@@ -269,6 +353,9 @@
269353
<Item ItemId=";LegalCopyright" ItemType="0" PsrId="211" Leaf="true">
270354
<Str Cat="Text">
271355
<Val><![CDATA[© Microsoft Corporation. All rights reserved.]]></Val>
356+
<Tgt Cat="Text" Stat="Loc" Orig="New">
357+
<Val><![CDATA[© Microsoft Corporation。保留所有权利。]]></Val>
358+
</Tgt>
272359
</Str>
273360
<Disp Icon="Str" />
274361
</Item>
@@ -280,7 +367,7 @@
280367
</Item>
281368
<Item ItemId=";ProductVersion" ItemType="0" PsrId="211" Leaf="true">
282369
<Str Cat="Text" DevLk="true">
283-
<Val><![CDATA[1.4.10712.2 commit:b7b0a11634dd5cd2c4898c3a84cbc010253efdca]]></Val>
370+
<Val><![CDATA[1.4.10719.3 commit:78ad38f4a71b0327b97ae283494986e4e5f06e1d]]></Val>
284371
</Str>
285372
<Disp Icon="Str" />
286373
</Item>

0 commit comments

Comments
 (0)