Skip to content

Commit

Permalink
Merge pull request #10439 from dotnet/merges/main-to-feature/tasks
Browse files Browse the repository at this point in the history 
Merge main to feature/tasks
  • Loading branch information
@KevinRansom
KevinRansom authored Nov 12, 2020
2 parents 2f70d35 + 8c0e000 commit 4632933
Show file tree
Hide file tree
Showing 165 changed files with 6,223 additions and 5,596 deletions.
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</PropertyGroup>
<PropertyGroup>
<VSMajorVersion>16</VSMajorVersion>
<VSMinorVersion>7</VSMinorVersion>
<VSMinorVersion>8</VSMinorVersion>
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot obsahuje duplicitní položky {0} s konfliktními metadaty {1}: {2} a {3}</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">Hodnota SourceRoot.ContainingRoot nebyla v položkách SourceRoot nalezena nebo odpovídající položka není zdrojový kořen nejvyšší úrovně: {0}</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">Pokud má DeterministicSourcePaths hodnotu true, položky SourceRoot musí zahrnovat nejméně jednu položku nejvyšší úrovně (nevnořenou).</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">Cesty SourceRoot musí končit lomítkem nebo zpětným lomítkem: {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot enthält doppelte Elemente "{0}" mit widersprüchlichen Metadaten "{1}": "{2}" und "{3}"</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">Der Wert von "SourceRoot.ContainingRoot" wurde in SourceRoot-Elementen nicht gefunden, oder das entsprechende Element ist kein Quellstamm der obersten Ebene: {0}</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">SourceRoot-Elemente müssen mindestens ein Element der obersten Ebene (nicht geschachtelt) enthalten, wenn "DeterministicSourcePaths" auf TRUE festgelegt ist.</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">SourceRoot-Pfade müssen mit einem Schrägstrich oder einem umgekehrten Schrägstrich enden: {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot contiene elementos "{0}" duplicados con metadatos en conflicto "{1}": "{2}" y "{3}"</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">No se encontró el valor de SourceRoot.ContainingRoot en los elementos SourceRoot o el elemento correspondiente no es una raíz de origen de nivel superior: "{0}"</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">Los elementos SourceRoot deben incluir al menos un elemento de nivel superior (no anidado) cuando DeterministicSourcePaths es verdadero.</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">Se requiere que las rutas de acceso SourceRoot finalicen con una barra diagonal o una barra diagonal inversa: "{0}"</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot contient des éléments en double '{0}' avec des métadonnées '{1}' en conflit : '{2}' et '{3}'</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">La valeur de SourceRoot.ContainingRoot est introuvable dans les éléments SourceRoot, ou l'élément correspondant n'est pas une racine source de niveau supérieur : '{0}'</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">Les éléments SourceRoot doivent inclure au moins un élément de niveau supérieur (non imbriqué) quand DeterministicSourcePaths a la valeur true</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">Les chemins SourceRoot doivent finir par une barre oblique ou une barre oblique inverse : '{0}'</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot contiene elementi duplicati '{0}' con metadati in conflitto '{1}': '{2}' e '{3}'</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">Il valore di SourceRoot.ContainingRoot non è stato trovato negli elementi SourceRoot oppure l'elemento corrispondente non è una radice di origine di primo livello: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">Quando DeterministicSourcePaths è true, gli elementi SourceRoot devono includere almeno un elemento di primo livello (non annidato)</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">I percorsi di SourceRoot devono terminare con una barra o una barra rovesciata: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot に、競合するメタデータ '{1}': '{2}' および '{3}' を持つ重複する項目 '{0}' が含まれています</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">SourceRoot.ContainingRoot の値が SourceRoot 項目にないか、対応する項目が最上位ソース ルートではありません: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">DeterministicSourcePaths が true の場合、SourceRoot 項目には (入れ子になっていない) 最上位項目が少なくとも 1 つ必要です</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">SourceRoot パスの最後はスラッシュまたはバックスラッシュでなければなりません: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot에 충돌하는 메타데이터 '{1}': '{2}' 및 '{3}'이(가) 포함된 중복 항목 '{0}'이(가) 있습니다.</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">SourceRoot.ContainingRoot 값을 SourceRoot 항목에서 찾을 수 없거나 해당 항목이 최상위 소스 루트가 아닙니다. '{0}'</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">SourceRoot 항목은 DeterministicSourcePaths가 true인 경우 최상위(중첩되지 않은) 항목을 하나 이상 포함해야 합니다.</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">SourceRoot 경로는 슬래시 또는 백슬래시로 끝나야 합니다. '{0}'</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.pl.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<body>
<trans-unit id="mapSourceRootsContainsDuplicate">
<source>SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</source>
<target state="new">SourceRoot contains duplicate items '{0}' with conflicting metadata '{1}': '{2}' and '{3}'</target>
<target state="translated">SourceRoot zawiera zduplikowane elementy "{0}" z metadanymi powodującymi konflikt "{1}": "{2}" i "{3}"</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoSuchTopLevelSourceRoot">
<source>The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</source>
<target state="new">The value of SourceRoot.ContainingRoot was not found in SourceRoot items, or the corresponding item is not a top-level source root: '{0}'</target>
<target state="translated">Nie odnaleziono wartości SourceRoot.ContainingRoot w elementach SourceRoot bądź odpowiadający element nie jest źródłowym elementem głównym najwyższego poziomu: „{0}”</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsNoTopLevelSourceRoot">
<source>SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</source>
<target state="new">SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true</target>
<target state="translated">Elementy SourceRoot muszą zawierać co najmniej jeden niezagnieżdżony element najwyższego poziomu, gdy właściwość DeterministicSourcePaths ma wartość true</target>
<note />
</trans-unit>
<trans-unit id="mapSourceRootsPathMustEndWithSlashOrBackslash">
<source>SourceRoot paths are required to end with a slash or backslash: '{0}'</source>
<target state="new">SourceRoot paths are required to end with a slash or backslash: '{0}'</target>
<target state="translated">Ścieżki elementów SourceRoot muszą kończyć się ukośnikiem lub ukośnikiem odwrotnym: „{0}”</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
Loading

0 comments on commit 4632933

Please sign in to comment.