Skip to content

Commit 597a2cd

Browse files
authored
Merge pull request #45996 from dotnet/merges/release/dev16.7-to-master
Merge release/dev16.7 to master
2 parents 2d642c3 + b6b6ad7 commit 597a2cd

22 files changed

+185
-105
lines changed

src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,11 @@
203203
<!-- This column appears empty to sighted users, but provides an improved screenreader
204204
experience that avoids moving cell-by-cell through the DataGrid -->
205205
<DataGridTextColumn x:Name="automationHeader" IsReadOnly="True" Width="0">
206+
<DataGridTextColumn.HeaderStyle>
207+
<Style TargetType="{x:Type DataGridColumnHeader}">
208+
<Setter Property="AutomationProperties.Name" Value="{Binding ElementName=dialog, Path=CurrentParameter}" />
209+
</Style>
210+
</DataGridTextColumn.HeaderStyle>
206211
<DataGridTextColumn.CellStyle>
207212
<Style TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellStyle}">
208213
<Setter Property="AutomationProperties.Name" Value="{Binding FullAutomationText}"/>

src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ internal partial class ChangeSignatureDialog : DialogWindow
2222

2323
// Expose localized strings for binding
2424
public string ChangeSignatureDialogTitle { get { return ServicesVSResources.Change_Signature; } }
25+
public string CurrentParameter { get { return ServicesVSResources.Current_parameter; } }
2526
public string Parameters { get { return ServicesVSResources.Parameters_colon2; } }
2627
public string PreviewMethodSignature { get { return ServicesVSResources.Preview_method_signature_colon; } }
2728
public string PreviewReferenceChanges { get { return ServicesVSResources.Preview_reference_changes; } }

src/VisualStudio/Core/Def/ServicesVSResources.resx

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->
@@ -983,11 +983,11 @@ Additional information: {1}</value>
983983
</data>
984984
<data name="Decompiler_Legal_Notice_Message" xml:space="preserve">
985985
<value>IMPORTANT: Visual Studio includes decompiling functionality (“Decompiler”) that enables reproducing source code from binary code. By accessing and using the Decompiler, you agree to the Visual Studio license terms and the terms for the Decompiler below. If you do not agree with these combined terms, do not access or use the Decompiler.
986-
987-
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
986+
987+
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
988988
(i) confirm that the license terms governing your use of the binary code do not contain a provision which prohibits you from decompiling the software; or
989989
(ii) obtain permission to decompile the binary code from the owner of the software.
990-
990+
991991
Your use of the Decompiler is optional. Microsoft is not responsible and disclaims all liability for your use of the Decompiler that violates any laws or any software license terms which prohibit decompiling of the software.
992992

993993
I agree to all of the foregoing:</value>
@@ -1529,6 +1529,9 @@ I agree to all of the foregoing:</value>
15291529
<data name="Warning_colon_type_does_not_bind" xml:space="preserve">
15301530
<value>Warning: type does not bind</value>
15311531
</data>
1532+
<data name="Current_parameter" xml:space="preserve">
1533+
<value>Current parameter</value>
1534+
</data>
15321535
<data name="Bitness32" xml:space="preserve">
15331536
<value>32-bit</value>
15341537
</data>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@
167167
<target state="translated">Aktuální dokument</target>
168168
<note />
169169
</trans-unit>
170+
<trans-unit id="Current_parameter">
171+
<source>Current parameter</source>
172+
<target state="new">Current parameter</target>
173+
<note />
174+
</trans-unit>
170175
<trans-unit id="Edit">
171176
<source>_Edit</source>
172177
<target state="new">_Edit</target>
@@ -2245,15 +2250,15 @@ Další informace: {1}</target>
22452250
</trans-unit>
22462251
<trans-unit id="Decompiler_Legal_Notice_Message">
22472252
<source>IMPORTANT: Visual Studio includes decompiling functionality (“Decompiler”) that enables reproducing source code from binary code. By accessing and using the Decompiler, you agree to the Visual Studio license terms and the terms for the Decompiler below. If you do not agree with these combined terms, do not access or use the Decompiler.
2248-
2249-
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
2253+
2254+
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
22502255
(i) confirm that the license terms governing your use of the binary code do not contain a provision which prohibits you from decompiling the software; or
22512256
(ii) obtain permission to decompile the binary code from the owner of the software.
2252-
2257+
22532258
Your use of the Decompiler is optional. Microsoft is not responsible and disclaims all liability for your use of the Decompiler that violates any laws or any software license terms which prohibit decompiling of the software.
22542259

22552260
I agree to all of the foregoing:</source>
2256-
<target state="translated">DŮLEŽITÉ: Visual Studio zahrnuje funkci dekompilace („Dekompilátor“), která umožňuje reprodukovat zdrojový kód z binárního kódu. Spuštěním a otevřením Dekompilátoru vyjadřujete svůj souhlasit s licenčními podmínkami sady Visual Studio a s níže uvedenými podmínkami pro Dekompilátor. Pokud s těmito kombinovanými podmínkami nesouhlasíte, nesmíte Dekompilátor spouštět ani používat.
2261+
<target state="needs-review-translation">DŮLEŽITÉ: Visual Studio zahrnuje funkci dekompilace („Dekompilátor“), která umožňuje reprodukovat zdrojový kód z binárního kódu. Spuštěním a otevřením Dekompilátoru vyjadřujete svůj souhlasit s licenčními podmínkami sady Visual Studio a s níže uvedenými podmínkami pro Dekompilátor. Pokud s těmito kombinovanými podmínkami nesouhlasíte, nesmíte Dekompilátor spouštět ani používat.
22572262

22582263
Uznáváte, že binární kód a zdrojový kód mohou být chráněny na základě zákonů o autorských právech a ochranných známkách. Před použitím Dekompilátoru na libovolný binární kód musíte napřed:
22592264
(i) ověřit, že licenční podmínky vztahující se na vaše použití binárního kódu neobsahují ustanovení, které by vám dekompilaci softwaru zakazovalo; nebo

src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@
167167
<target state="translated">Aktuelles Dokument</target>
168168
<note />
169169
</trans-unit>
170+
<trans-unit id="Current_parameter">
171+
<source>Current parameter</source>
172+
<target state="new">Current parameter</target>
173+
<note />
174+
</trans-unit>
170175
<trans-unit id="Edit">
171176
<source>_Edit</source>
172177
<target state="new">_Edit</target>
@@ -2245,15 +2250,15 @@ Zusätzliche Informationen: {1}</target>
22452250
</trans-unit>
22462251
<trans-unit id="Decompiler_Legal_Notice_Message">
22472252
<source>IMPORTANT: Visual Studio includes decompiling functionality (“Decompiler”) that enables reproducing source code from binary code. By accessing and using the Decompiler, you agree to the Visual Studio license terms and the terms for the Decompiler below. If you do not agree with these combined terms, do not access or use the Decompiler.
2248-
2249-
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
2253+
2254+
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
22502255
(i) confirm that the license terms governing your use of the binary code do not contain a provision which prohibits you from decompiling the software; or
22512256
(ii) obtain permission to decompile the binary code from the owner of the software.
2252-
2257+
22532258
Your use of the Decompiler is optional. Microsoft is not responsible and disclaims all liability for your use of the Decompiler that violates any laws or any software license terms which prohibit decompiling of the software.
22542259

22552260
I agree to all of the foregoing:</source>
2256-
<target state="translated">WICHTIG: Visual Studio umfasst eine Funktionalität für die Dekompilierung ("Decompiler"), der das Reproduzieren von Quellcode aus Binärcode ermöglicht. Indem Sie auf den Decompiler zugreifen und ihn verwenden, stimmen Sie den nachstehend aufgeführten Visual Studio-Lizenzbedingungen und den Bedingungen für den Decompiler zu. Wenn Sie diesen kombinierten Nutzungsbedingungen nicht zustimmen, greifen Sie nicht auf den Decompiler zu, und verwenden Sie ihn nicht.
2261+
<target state="needs-review-translation">WICHTIG: Visual Studio umfasst eine Funktionalität für die Dekompilierung ("Decompiler"), der das Reproduzieren von Quellcode aus Binärcode ermöglicht. Indem Sie auf den Decompiler zugreifen und ihn verwenden, stimmen Sie den nachstehend aufgeführten Visual Studio-Lizenzbedingungen und den Bedingungen für den Decompiler zu. Wenn Sie diesen kombinierten Nutzungsbedingungen nicht zustimmen, greifen Sie nicht auf den Decompiler zu, und verwenden Sie ihn nicht.
22572262

22582263
Sie erkennen an, dass der Binärcode und der Quellcode möglicherweise durch Urheberrechts- und Markengesetze geschützt sind. Bevor Sie den Compiler für Binärcode einsetzen, müssen Sie Folgendes sicherstellen:
22592264
(i) Vergewissern Sie sich, dass die Lizenzbedingungen zur Verwendung des Binärcodes keine Klausel enthalten, die das Dekompilieren der Software verbietet. Oder:

src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@
167167
<target state="translated">Documento actual</target>
168168
<note />
169169
</trans-unit>
170+
<trans-unit id="Current_parameter">
171+
<source>Current parameter</source>
172+
<target state="new">Current parameter</target>
173+
<note />
174+
</trans-unit>
170175
<trans-unit id="Edit">
171176
<source>_Edit</source>
172177
<target state="new">_Edit</target>
@@ -2245,15 +2250,15 @@ Información adicional: {1}</target>
22452250
</trans-unit>
22462251
<trans-unit id="Decompiler_Legal_Notice_Message">
22472252
<source>IMPORTANT: Visual Studio includes decompiling functionality (“Decompiler”) that enables reproducing source code from binary code. By accessing and using the Decompiler, you agree to the Visual Studio license terms and the terms for the Decompiler below. If you do not agree with these combined terms, do not access or use the Decompiler.
2248-
2249-
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
2253+
2254+
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
22502255
(i) confirm that the license terms governing your use of the binary code do not contain a provision which prohibits you from decompiling the software; or
22512256
(ii) obtain permission to decompile the binary code from the owner of the software.
2252-
2257+
22532258
Your use of the Decompiler is optional. Microsoft is not responsible and disclaims all liability for your use of the Decompiler that violates any laws or any software license terms which prohibit decompiling of the software.
22542259

22552260
I agree to all of the foregoing:</source>
2256-
<target state="translated">IMPORTANTE: Visual Studio incluye la funcionalidad de decompilación ("Decompilador") que permite la reproducción de código fuente a partir de código binario. Al acceder y utilizar el Decompilador, acepta los términos de licencia de Visual Studio y los términos del Decompilador que figuran a continuación. Si no acepta estos términos combinados, no acceda al Decompilador ni lo utilice.
2261+
<target state="needs-review-translation">IMPORTANTE: Visual Studio incluye la funcionalidad de decompilación ("Decompilador") que permite la reproducción de código fuente a partir de código binario. Al acceder y utilizar el Decompilador, acepta los términos de licencia de Visual Studio y los términos del Decompilador que figuran a continuación. Si no acepta estos términos combinados, no acceda al Decompilador ni lo utilice.
22572262

22582263
Reconoce que el código binario y el código fuente pueden estar protegidos por leyes de propiedad intelectual y marcas comerciales. Antes de utilizar el Decompilador en cualquier código binario, primero tiene que hacer lo siguiente:
22592264
i) configurar que los términos de licencia que rigen el uso del código binario no contienen ninguna disposición que le prohíba decompilar el software; o

src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@
167167
<target state="translated">Document en cours</target>
168168
<note />
169169
</trans-unit>
170+
<trans-unit id="Current_parameter">
171+
<source>Current parameter</source>
172+
<target state="new">Current parameter</target>
173+
<note />
174+
</trans-unit>
170175
<trans-unit id="Edit">
171176
<source>_Edit</source>
172177
<target state="new">_Edit</target>
@@ -2245,15 +2250,15 @@ Informations supplémentaires : {1}</target>
22452250
</trans-unit>
22462251
<trans-unit id="Decompiler_Legal_Notice_Message">
22472252
<source>IMPORTANT: Visual Studio includes decompiling functionality (“Decompiler”) that enables reproducing source code from binary code. By accessing and using the Decompiler, you agree to the Visual Studio license terms and the terms for the Decompiler below. If you do not agree with these combined terms, do not access or use the Decompiler.
2248-
2249-
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
2253+
2254+
You acknowledge that binary code and source code might be protected by copyright and trademark laws. Before using the Decompiler on any binary code, you need to first:
22502255
(i) confirm that the license terms governing your use of the binary code do not contain a provision which prohibits you from decompiling the software; or
22512256
(ii) obtain permission to decompile the binary code from the owner of the software.
2252-
2257+
22532258
Your use of the Decompiler is optional. Microsoft is not responsible and disclaims all liability for your use of the Decompiler that violates any laws or any software license terms which prohibit decompiling of the software.
22542259

22552260
I agree to all of the foregoing:</source>
2256-
<target state="translated">IMPORTANT : Visual Studio inclut une fonctionnalité de décompilation ("Décompileur") qui permet de reproduire du code source à partir de code binaire. En accédant au Décompileur et en l'utilisant, vous acceptez les termes du contrat de licence Visual Studio et les termes du Décompileur ci-dessous. Si vous n'êtes pas d'accord avec ces termes combinés, n'accédez pas au Décompileur et ne l'utilisez pas.
2261+
<target state="needs-review-translation">IMPORTANT : Visual Studio inclut une fonctionnalité de décompilation ("Décompileur") qui permet de reproduire du code source à partir de code binaire. En accédant au Décompileur et en l'utilisant, vous acceptez les termes du contrat de licence Visual Studio et les termes du Décompileur ci-dessous. Si vous n'êtes pas d'accord avec ces termes combinés, n'accédez pas au Décompileur et ne l'utilisez pas.
22572262

22582263
Vous reconnaissez que le code binaire et le code source peuvent être protégés par des lois sur les droits d'auteur et le droit des marques. Avant d'utiliser le Décompileur sur du code binaire, vous devez d'abord :
22592264
(i) confirmer que les termes du contrat de licence régissant votre utilisation du code binaire ne contiennent aucune disposition vous interdisant de décompiler le logiciel ; ou

0 commit comments

Comments
 (0)