Skip to content

Commit

Permalink
Merge pull request #7472 from dotnet/merges/release/dev16.4-to-releas…
Browse files Browse the repository at this point in the history
…e/fsharp5

Merge release/dev16.4 to release/fsharp5
  • Loading branch information
dotnet-automerge-bot committed Aug 30, 2019
2 parents 384e125 + dbc260c commit bfe6ee4
Show file tree
Hide file tree
Showing 104 changed files with 320 additions and 331 deletions.
11 changes: 8 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
<add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
<add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
<add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
<add key="vssdk" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
<add key="vs-impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
<add key="devcore" value="https://vside.myget.org/F/devcore/api/v3/index.json" />
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
5 changes: 2 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@
https://dotnet.myget.org/F/interactive-window/api/v3/index.json;
https://myget.org/F/vs-devcore/api/v3/index.json;
https://myget.org/F/vs-editor/api/v3/index.json;
https://vside.myget.org/F/vssdk/api/v3/index.json;
https://vside.myget.org/F/vs-impl/api/v3/index.json;
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json;
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
https://myget.org/F/roslyn_concord/api/v3/index.json;
https://vside.myget.org/F/devcore/api/v3/index.json;
</RestoreSources>
<!-- version numbers from files -->
<RoslynVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\RoslynPackageVersion.txt').Trim())</RoslynVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">F# {1} {0}</target>
<target state="translated">F# {1} のための {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">Hodnota maxDegreeOfParallelism musí být kladná, ale vyskytla se hodnota {0}.</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism muss positiv sein, lautete jedoch "{0}".</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism debe ser positivo, era {0}</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism doit être positif, était {0}</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">Il valore di maxDegreeOfParallelism deve essere positivo. È {0}</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism には正の値を指定する必要がありますが、{0} が指定されました</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism은 양수여야 하는데 {0}였습니다.</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">Wartość maxDegreeOfParallelism musi być dodatnia, a była równa {0}</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism deve ser positivo, foi {0}</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">Параметр maxDegreeOfParallelism должен иметь положительное значение, указано значение {0}</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism pozitif olmalıdır, değeri: {0}</target>
<note />
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/xlf/FSCore.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism 必须是正数,它之前是 {0}</target>
<note />
</trans-unit>
</body>
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/FSharp.Core/xlf/FSCore.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
</trans-unit>
<trans-unit id="printfBadIntegerForDynamicFomatter">
<source>Bad integer supplied to dynamic formatter</source>
<target state="translated">提供給動態格式子的整數錯誤</target>
<target state="translated">提供給動態格式器的整數錯誤</target>
<note />
</trans-unit>
<trans-unit id="printfExpectedPrecision">
Expand Down Expand Up @@ -709,7 +709,7 @@
</trans-unit>
<trans-unit id="maxDegreeOfParallelismNotPositive">
<source>maxDegreeOfParallelism must be positive, was {0}</source>
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
<target state="translated">maxDegreeOfParallelism 必須為正數,原先為 {0}</target>
<note />
</trans-unit>
</body>
Expand Down
12 changes: 6 additions & 6 deletions src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
</trans-unit>
<trans-unit id="fsiInputFiles">
<source>- INPUT FILES -</source>
<target state="translated">- EINGABEDATEIEN -</target>
<target state="translated"> EINGABEDATEIEN </target>
<note />
</trans-unit>
<trans-unit id="fsiCodeGeneration">
<source>- CODE GENERATION -</source>
<target state="translated">- CODEGENERIERUNG -</target>
<target state="translated"> CODEGENERIERUNG </target>
<note />
</trans-unit>
<trans-unit id="fsiErrorsAndWarnings">
<source>- ERRORS AND WARNINGS -</source>
<target state="translated">- FEHLER UND WARNUNGEN -</target>
<target state="translated"> FEHLER UND WARNUNGEN </target>
<note />
</trans-unit>
<trans-unit id="fsiLanguage">
<source>- LANGUAGE -</source>
<target state="translated">- SPRACHE -</target>
<target state="translated"> SPRACHE </target>
<note />
</trans-unit>
<trans-unit id="fsiMiscellaneous">
<source>- MISCELLANEOUS -</source>
<target state="translated">- VERSCHIEDENES -</target>
<target state="translated"> VERSCHIEDENES </target>
<note />
</trans-unit>
<trans-unit id="fsiAdvanced">
Expand Down Expand Up @@ -199,7 +199,7 @@
</trans-unit>
<trans-unit id="fsiAbortingMainThread">
<source>- Aborting main thread...</source>
<target state="translated">- Hauptthread wird abgebrochen...</target>
<target state="translated"> Hauptthread wird abgebrochen...</target>
<note />
</trans-unit>
<trans-unit id="fsiCouldNotInstallCtrlCHandler">
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</trans-unit>
<trans-unit id="fsiTimeInfoGCGenerationLabelSomeShorthandForTheWordGeneration">
<source>gen</source>
<target state="translated">gen</target>
<target state="translated">全般</target>
<note />
</trans-unit>
<trans-unit id="fsiExceptionDuringPrettyPrinting">
Expand Down
12 changes: 6 additions & 6 deletions src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</trans-unit>
<trans-unit id="fsiGui">
<source>Execute interactions on a Windows Forms event loop (on by default)</source>
<target state="translated">在 Windows Form 事件迴圈上執行互動 (預設為開啟)</target>
<target state="translated">在 Windows Forms 事件迴圈上執行互動 (預設為開啟)</target>
<note />
</trans-unit>
<trans-unit id="fsiQuiet">
Expand All @@ -99,7 +99,7 @@
</trans-unit>
<trans-unit id="fsiConsoleProblem">
<source>A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools-&gt;Options-&gt;F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.</source>
<target state="translated">啟動 F# Interactive 處理序時發生問題。這可能是因為背景處理序主控台對於支援某些 Windows 系統上具備 Unicode 支援功能之應用程式的已知問題所造成。請嘗試選取 [工具]5D; -&gt; [選項]5D; -&gt; [F# Interactive for Visual Studio]5D;,然後輸入 '--fsi-server-no-unicode'。</target>
<target state="translated">啟動 F# 互動處理序時發生問題。這可能是因為背景處理序主控台對於支援某些 Windows 系統上具備 Unicode 支援功能之應用程式的已知問題所造成。請嘗試選取 [工具] -&gt; [選項] -&gt; [F# Interactive for Visual Studio],然後輸入 '--fsi-server-no-unicode'。</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidAssembly">
Expand Down Expand Up @@ -139,7 +139,7 @@
</trans-unit>
<trans-unit id="fsiIntroTextHeader1directives">
<source> F# Interactive directives:</source>
<target state="translated"> F# Interactive 指示詞:</target>
<target state="translated">F# 互動指示詞:</target>
<note />
</trans-unit>
<trans-unit id="fsiIntroTextHashrInfo">
Expand Down Expand Up @@ -174,7 +174,7 @@
</trans-unit>
<trans-unit id="fsiIntroTextHeader2commandLine">
<source> F# Interactive command line options:</source>
<target state="translated"> F# Interactive 命令列選項:</target>
<target state="translated">F# 互動命令列選項:</target>
<note />
</trans-unit>
<trans-unit id="fsiIntroTextHeader3">
Expand Down Expand Up @@ -214,7 +214,7 @@
</trans-unit>
<trans-unit id="fsiDidAHashrWithLockWarning">
<source>--&gt; Referenced '{0}' (file may be locked by F# Interactive process)</source>
<target state="translated">--&gt; 參考的 '{0}' (檔案可能已被 F# Interactive 處理序鎖定)</target>
<target state="translated">--&gt; 參考的 '{0}' (檔案可能已被 F# 互動處理序鎖定)</target>
<note />
</trans-unit>
<trans-unit id="fsiDidAHashrWithStaleWarning">
Expand Down Expand Up @@ -264,7 +264,7 @@
</trans-unit>
<trans-unit id="shadowCopyReferences">
<source>Prevents references from being locked by the F# Interactive process</source>
<target state="translated">避免參考遭 F# 互動式處理序封鎖</target>
<target state="translated">避免參考遭 F# 互動處理序封鎖</target>
<note />
</trans-unit>
</body>
Expand Down
18 changes: 9 additions & 9 deletions src/fsharp/xlf/FSComp.txt.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@
</trans-unit>
<trans-unit id="optsLangVersion">
<source>Display the allowed values for language version, specify language version such as 'latest' or 'preview'</source>
<target state="new">Display the allowed values for language version, specify language version such as 'latest' or 'preview'</target>
<target state="translated">Zobrazte si povolené hodnoty verze jazyka a pak zadejte požadovanou verzi, například latest nebo preview.</target>
<note />
</trans-unit>
<trans-unit id="optsSupportedLangVersions">
<source>Supported language versions:</source>
<target state="new">Supported language versions:</target>
<target state="translated">Podporované jazykové verze:</target>
<note />
</trans-unit>
<trans-unit id="optsUnrecognizedLanguageVersion">
<source>Unrecognized value '{0}' for --langversion use --langversion:? for complete list</source>
<target state="new">Unrecognized value '{0}' for --langversion use --langversion:? for complete list</target>
<target state="translated">Nerozpoznaná hodnota {0} pro parametr --langversion; seznam možností zobrazíte zadáním --langversion:?</target>
<note />
</trans-unit>
<trans-unit id="parsUnexpectedSymbolDot">
<source>Unexpected symbol '.' in member definition. Expected 'with', '=' or other token.</source>
<target state="new">Unexpected symbol '.' in member definition. Expected 'with', '=' or other token.</target>
<target state="translated">Neočekávaný symbol . v definici členu. Očekávalo se with, = nebo jiný token.</target>
<note />
</trans-unit>
<trans-unit id="optsChecksumAlgorithm">
<source>Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default)</source>
<target state="new">Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default)</target>
<target state="translated">Zadejte algoritmus pro výpočet kontrolního součtu zdrojového souboru uloženého v PDB. Podporované hodnoty jsou: SHA1 nebo SHA256 (výchozí).</target>
<note />
</trans-unit>
<trans-unit id="optsUnknownChecksumAlgorithm">
<source>Algorithm '{0}' is not supported</source>
<target state="new">Algorithm '{0}' is not supported</target>
<target state="translated">Algoritmus {0} není podporovaný.</target>
<note />
</trans-unit>
<trans-unit id="undefinedNameNamespace">
Expand Down Expand Up @@ -2034,7 +2034,7 @@
</trans-unit>
<trans-unit id="parsTypeAnnotationsOnGetSet">
<source>Type annotations on property getters and setters must be given after the 'get()' or 'set(v)', e.g. 'with get() : string = ...'</source>
<target state="translated">Poznámky typu u metod getter nebo setter vlastnosti se musí předávat až po get() nebo set(v). Příklad: with get() : string = </target>
<target state="translated">Poznámky typu u metod getter nebo setter vlastnosti se musí předávat až po get() nebo set(v). Příklad: with get() : string = ...</target>
<note />
</trans-unit>
<trans-unit id="parsGetterMustHaveAtLeastOneArgument">
Expand Down Expand Up @@ -7194,12 +7194,12 @@
</trans-unit>
<trans-unit id="expressionHasNoName">
<source>Expression does not have a name.</source>
<target state="new">Expression does not have a name.</target>
<target state="translated">Výraz není pojmenovaný.</target>
<note />
</trans-unit>
<trans-unit id="chkNoFirstClassNameOf">
<source>Using the 'nameof' operator as a first-class function value is not permitted.</source>
<target state="new">Using the 'nameof' operator as a first-class function value is not permitted.</target>
<target state="translated">Použití operátoru nameof jako hodnoty funkce první třídy není povolené.</target>
<note />
</trans-unit>
<trans-unit id="optsPathMap">
Expand Down
Loading

0 comments on commit bfe6ee4

Please sign in to comment.