Skip to content

Commit

Permalink
Merge main to release/6.0.1xx (#5090)
Browse files Browse the repository at this point in the history
* Add localization from OneLocBuild (2021-04-27)

* Merge conflicts (#5079)

* Add localization from OneLocBuild (2021-04-28)

Co-authored-by: Jon Fortescue <jonfortescue@protonmail.com>
Co-authored-by: Buyaa Namnan <bunamnan@microsoft.com>
Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
Co-authored-by: Jonathon Marolf <jmarolf@users.noreply.github.com>
  • Loading branch information
5 people authored May 11, 2021
1 parent 068ae34 commit 516079f
Show file tree
Hide file tree
Showing 54 changed files with 101 additions and 101 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
</trans-unit>
<trans-unit id="PreferIsKindDescription">
<source>Prefer 'syntax.IsKind(kind)' to 'syntax.Kind() == kind' when checking syntax kinds. Code using 'IsKind' is slightly more efficient at runtime, so consistent use of this form where applicable helps improve performance in complex analysis scenarios.</source>
<target state="translated">Utilisez 'syntax.IsKind(kind)' au lieu de 'syntax.Kind() == kind' pour la vérification des genres de syntaxe. Dans la mesure où le code utilisant 'IsKind' est légèrement plus efficace au moment de l'exécution, l'utilisation systématique de cette forme permet d'améliorer les performances dans les scénarios d'analyse complexes.</target>
<target state="translated">Utilisez 'syntax.IsKind(kind)' au lieu de 'syntax.Kind() == kind' pour la vérification des genres de syntaxe. Dans la mesure où le code utilisant 'IsKind' est légèrement plus efficace au moment de l'exécution, l'utilisation cohérente de ce formulaire permet d'améliorer les performances dans les scénarios d'analyse complexes.</target>
<note />
</trans-unit>
<trans-unit id="PreferIsKindFix">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
</trans-unit>
<trans-unit id="RemoveDuplicateEntriesBetweenAnalyzerReleasesRuleTitle">
<source>Remove duplicate entries for diagnostic ID between analyzer releases</source>
<target state="translated">アナライザー リリース間で診断 ID の重複しているエントリを削除してください。</target>
<target state="translated">アナライザー リリース間で診断 ID の重複しているエントリを削除する</target>
<note />
</trans-unit>
<trans-unit id="RemoveDuplicateEntriesForAnalyzerReleaseRuleDescription">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@
</trans-unit>
<trans-unit id="OverrideGetFixAllProviderDescription">
<source>A CodeFixProvider should provide FixAll support to enable users to fix multiple instances of the underlying diagnostic with a single code fix. See documentation at https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md for further details.</source>
<target state="translated">사용자가 단일 코드 수정 사항을 사용하여 기본 진단의 여러 인스턴스를 수정할 수 있도록 하려면 CodeFixProvider가 FixAll 지원을 제공해야 합니다. 자세한 내용은 https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md의 설명서를 참조하세요.</target>
<target state="translated">사용자가 단일 코드 수정 사항을 사용하여 기본 진단의 여러 인스턴스를 수정할 수 있도록 하려면 CodeFixProvider가 FixAll 지원을 제공해야 합니다. 자세한 내용은 https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md에 있는 문서를 참조하세요.</target>
<note />
</trans-unit>
<trans-unit id="OverrideGetFixAllProviderCodeFixTitle">
Expand Down Expand Up @@ -692,4 +692,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@
</trans-unit>
<trans-unit id="OverrideGetFixAllProviderDescription">
<source>A CodeFixProvider should provide FixAll support to enable users to fix multiple instances of the underlying diagnostic with a single code fix. See documentation at https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md for further details.</source>
<target state="translated">CodeFixProvider должен предоставлять поддержку FixAll, чтобы пользователи могли исправить несколько экземпляров базовых диагностических данных с помощью одного исправления кода. Дополнительные сведения см. в документации на странице https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md.</target>
<target state="translated">CodeFixProvider должен предоставлять поддержку FixAll, чтобы пользователи могли исправить несколько экземпляров базовых диагностических данных с помощью одного исправления кода. Дополнительные сведения см. в документации по адресу https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md.</target>
<note />
</trans-unit>
<trans-unit id="OverrideGetFixAllProviderCodeFixTitle">
Expand Down Expand Up @@ -692,4 +692,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANS" original="../CodeAnalysisDiagnosticsResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../CodeAnalysisDiagnosticsResources.resx">
<body>
<trans-unit id="AddEntryForDiagnosticIdInAnalyzerReleaseCodeFixTitle">
<source>Add rule entry to unshipped release file</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANT" original="../CodeAnalysisDiagnosticsResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../CodeAnalysisDiagnosticsResources.resx">
<body>
<trans-unit id="AddEntryForDiagnosticIdInAnalyzerReleaseCodeFixTitle">
<source>Add rule entry to unshipped release file</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANS" original="../BannedApiAnalyzerResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../BannedApiAnalyzerResources.resx">
<body>
<trans-unit id="DuplicateBannedSymbolDescription">
<source>The list of banned symbols contains a duplicate.</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANT" original="../BannedApiAnalyzerResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../BannedApiAnalyzerResources.resx">
<body>
<trans-unit id="DuplicateBannedSymbolDescription">
<source>The list of banned symbols contains a duplicate.</source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">Přidat přetížení System.Uri</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">„System.Uri“-Überladungen hinzufügen</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">Agregar sobrecargas de 'System.Uri'</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
</trans-unit>
<trans-unit id="OperatorOverloadsHaveNamedAlternatesCodeFixTitle">
<source>Add operator overload named alternate</source>
<target state="translated">Ajouter une surcharge d'opérateur nommée alternative</target>
<target state="translated">Ajouter une surcharge d'opérateur nommée alternate</target>
<note />
</trans-unit>
<trans-unit id="RemoveRedundantElementInitializationCodeFixTitle">
Expand All @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">Ajouter une surcharge « System.Uri »</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">Aggiungi overload 'System.Uri'</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">'System.Uri' のオーバーロードを追加する</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">'System.Uri' 오버로드 추가</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">Dodaj przeciążenia 'System.Uri'</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">Adicionar sobrecarga 'System.Uri'.</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">Добавить перегрузки 'System.Uri'</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">'System.Uri' aşırı yüklemeleri ekle</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANS" original="../MicrosoftCodeQualityAnalyzersResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../MicrosoftCodeQualityAnalyzersResources.resx">
<body>
<trans-unit id="AppendConfigureAwaitTrue">
<source>Append .ConfigureAwait(true)</source>
Expand Down Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">添加 “System.Uri” 过载</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANT" original="../MicrosoftCodeQualityAnalyzersResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../MicrosoftCodeQualityAnalyzersResources.resx">
<body>
<trans-unit id="AppendConfigureAwaitTrue">
<source>Append .ConfigureAwait(true)</source>
Expand Down Expand Up @@ -269,7 +269,7 @@
</trans-unit>
<trans-unit id="UriParametersShouldNotBeStringsCodeFixTitle">
<source>Add 'System.Uri' overloads</source>
<target state="new">Add 'System.Uri' overloads</target>
<target state="translated">新增 'System.Uri' 多載</target>
<note>{Locked="System.Uri"}</note>
</trans-unit>
<trans-unit id="UseGenericEventHandlerInstancesTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@ static bool UnsupportedFirstSuppressed(Versions attribute, Versions callSiteAttr
callSiteAttribute.SupportedFirst != null && callSiteAttribute.SupportedFirst.IsGreaterThanOrEqualTo(attribute.SupportedFirst) ||
SuppressedByCallSiteUnsupported(callSiteAttribute, attribute.UnsupportedFirst!);

// As optional if call site supports that platform, their versions should match
// As optianal if call site supports that platform, their versions should match
static bool OptionalOsSupportSuppressed(Versions callSiteAttribute, Versions attribute) =>
(callSiteAttribute.SupportedFirst == null || callSiteAttribute.SupportedFirst.IsGreaterThanOrEqualTo(attribute.SupportedFirst)) &&
(callSiteAttribute.SupportedSecond == null || callSiteAttribute.SupportedSecond.IsGreaterThanOrEqualTo(attribute.SupportedFirst));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@
</trans-unit>
<trans-unit id="DoNotCallDangerousMethodsInDeserializationMessage">
<source>When deserializing an instance of class {0}, method {1} can call dangerous method {2}. The potential method invocations are: {3}.</source>
<target state="translated">클래스 {0}인스턴스를 역직렬화할 때 메서드 {1}이(가) 위험한 메서드 {2}을(를) 호출할 수 있습니다. 잠재적인 메서드 호출은 {3}입니다.</target>
<target state="translated">{0} 클래스의 인스턴스를 역직렬화할 때 {1} 메서드가 위험한 메서드 {2}을(를) 호출할 수 있습니다. 잠재적인 메서드 호출은 {3}입니다</target>
<note />
</trans-unit>
<trans-unit id="DoNotCallOverridableMethodsInConstructorsDescription">
Expand Down Expand Up @@ -2434,4 +2434,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
Original file line number Diff line number Diff line change
Expand Up @@ -2434,4 +2434,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANS" original="../MicrosoftNetCoreAnalyzersResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../MicrosoftNetCoreAnalyzersResources.resx">
<body>
<trans-unit id="AddNonSerializedAttributeCodeActionTitle">
<source>Add the 'NonSerialized' attribute to this field.</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANT" original="../MicrosoftNetCoreAnalyzersResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../MicrosoftNetCoreAnalyzersResources.resx">
<body>
<trans-unit id="AddNonSerializedAttributeCodeActionTitle">
<source>Add the 'NonSerialized' attribute to this field.</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANS" original="../MicrosoftNetFrameworkAnalyzersResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../MicrosoftNetFrameworkAnalyzersResources.resx">
<body>
<trans-unit id="SpecifyMessageBoxOptionsTitle">
<source>Specify MessageBoxOptions</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANT" original="../MicrosoftNetFrameworkAnalyzersResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../MicrosoftNetFrameworkAnalyzersResources.resx">
<body>
<trans-unit id="SpecifyMessageBoxOptionsTitle">
<source>Specify MessageBoxOptions</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-HANS" original="../AnalyzersResources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../AnalyzersResources.resx">
<body>
<trans-unit id="ClosureCaptureRuleMessage">
<source>The compiler will emit a class that will hold this as a field to allow capturing of this closure</source>
Expand Down
Loading

0 comments on commit 516079f

Please sign in to comment.