Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
<DefineConstants>$(DefineConstants);NO_STRONG_NAMES</DefineConstants>
<DefineConstants>$(DefineConstants);LOCALIZATION_FSCOMP</DefineConstants>
<FsLexOutputFolder Condition="'$(TargetFramework)' != ''">$(TargetFramework)\</FsLexOutputFolder>
<FsYaccOutputFolder Condition="'$(TargetFramework)' != ''">$(TargetFramework)\</FsYaccOutputFolder>
<OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
Expand Down Expand Up @@ -289,6 +288,7 @@
<Compile Include="$(FSharpSourcesRoot)\fsharp\SimulatedMSBuildReferenceResolver.fs">
<Link>ReferenceResolution/SimulatedMSBuildReferenceResolver.fs</Link>
</Compile>
<EmbeddedText Include="$(FSharpSourcesRoot)\utils\UtilsStrings.txt" />
<Compile Include="$(FSharpSourcesRoot)/utils/CompilerLocationUtils.fs">
<Link>CompilerLocation/CompilerLocationUtils.fs</Link>
</Compile>
Expand Down
3 changes: 1 addition & 2 deletions src/fsharp/CompileOps.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2418,8 +2418,7 @@ type TcConfigBuilder =
deterministic = false
preferredUiLang = None
lcid = None
// See bug 6071 for product banner spec
productNameForBannerText = FSComp.SR.buildProductName(FSharpEnvironment.FSharpBannerVersion)
productNameForBannerText = FSharpEnvironment.FSharpProductName
showBanner = true
showTimes = false
showLoadedAssemblies = false
Expand Down
3 changes: 0 additions & 3 deletions src/fsharp/FSComp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ tupleRequiredInAbstractMethod,"\nA tuple type is required for one or more argume
203,buildInvalidWarningNumber,"Invalid warning number '%s'"
204,buildInvalidVersionString,"Invalid version string '%s'"
205,buildInvalidVersionFile,"Invalid version file '%s'"
buildProductName,"Microsoft (R) F# Compiler version %s"
buildProductNameCommunity,"F# Compiler for F# %s"
206,buildProblemWithFilename,"Problem with filename '%s': %s"
207,buildNoInputsSpecified,"No inputs specified"
209,buildPdbRequiresDebug,"The '--pdb' option requires the '--debug' option to be used"
Expand Down Expand Up @@ -1493,7 +1491,6 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl
3351,chkFeatureNotRuntimeSupported,"Feature '%s' is not supported by target runtime."
3352,typrelInterfaceMemberNoMostSpecificImplementation,"Interface member '%s' does not have a most specific implementation."
useSdkRefs,"Use reference assemblies for .NET framework references when available (Enabled by default)."
fSharpBannerVersion,"%s for F# %s"
optsLangVersion,"Display the allowed values for language version, specify language version such as 'latest' or 'preview'"
optsSupportedLangVersions,"Supported language versions:"
nativeResourceFormatError,"Stream does not begin with a null resource and is not in '.RES' format."
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Build/FSBuild.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# FSharp.Build resource strings
toolpathUnknown,"ToolPath is unknown; specify the path to the tool."
fSharpBannerVersion,"%s for F# %s"
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Build/FSharp.Build.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ItemGroup>
<InternalsVisibleTo Include="VisualFSharp.UnitTests" />
<EmbeddedText Include="FSBuild.txt" />
<EmbeddedText Include="..\..\utils\UtilsStrings.txt" />
<Compile Include="..\..\utils\CompilerLocationUtils.fs" />
<Compile Include="FSharpCommandLineBuilder.fs" />
<Compile Include="Fsc.fs" />
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="cs" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} pro F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">Parametr ToolPath není známý. Zadejte cestu k nástroji.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="de" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} für F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath unbekannt. Geben Sie den Pfad zum Tool an.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="es" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} para F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath se desconoce; especifique la ruta de acceso a la herramienta.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="fr" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} pour F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath est inconnu, spécifiez le chemin de l'outil.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="it" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} per F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">Il valore di ToolPath è sconosciuto. Specificare il percorso dello strumento.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="ja" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">F# {1} のための {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath が不明です。ツールンパスを指定します。</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="ko" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">F# {1}용 {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath를 알 수 없습니다. 도구 경로를 지정하세요.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="pl" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} dla języka F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">Właściwość ToolPath jest nieznana. Określ ścieżkę do narzędzia.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="pt-BR" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} para F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath desconhecido. Especifique o caminho para a ferramenta.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="ru" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} для F# {1}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">Путь к инструменту (ToolPath) неизвестен, укажите путь к инструменту.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="tr" original="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">F# {1} için {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath bilinmiyor; aracın yolunu belirtin.</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">F# {1} 的 {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath 未知;请指定工具的路径。</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<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="../FSBuild.resx">
<body>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">F # {1} 的 {0}</target>
<note />
</trans-unit>
<trans-unit id="toolpathUnknown">
<source>ToolPath is unknown; specify the path to the tool.</source>
<target state="translated">ToolPath 未知; 請指定工具的路徑。</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
<Compile Include="..\SimulatedMSBuildReferenceResolver.fs">
<Link>ReferenceResolution/SimulatedMSBuildReferenceResolver.fs</Link>
</Compile>
<EmbeddedText Include="..\..\utils\UtilsStrings.txt" />
<Compile Include="..\..\utils\CompilerLocationUtils.fs">
<Link>CompilerLocation\CompilerLocationUtils.fs</Link>
</Compile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

<ItemGroup>
<EmbeddedText Include="DependencyManager.txt" />
<Compile Include="$(FSharpSourcesRoot)\utils\CompilerLocationUtils.fs" />
<EmbeddedText Include="..\..\utils\UtilsStrings.txt" />
<Compile Include="..\..\utils\CompilerLocationUtils.fs" />
<Compile Include="AssemblyResolveHandler.fsi" />
<Compile Include="AssemblyResolveHandler.fs" />
<Compile Include="$(FSharpSourcesRoot)\utils\CompilerLocationUtils.fs" />
<Compile Include="NativeDllResolveHandler.fsi" />
<Compile Include="NativeDllResolveHandler.fs" />
<Compile Include="DependencyProvider.fsi" />
Expand Down
15 changes: 0 additions & 15 deletions src/fsharp/xlf/FSComp.txt.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
<target state="new">Assembly attribute '{0}' refers to a designer assembly '{1}' which cannot be loaded or doesn't exist. The exception reported was: {2} - {3}</target>
<note />
</trans-unit>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} pro F# {1}</target>
<note />
</trans-unit>
<trans-unit id="featureAndBang">
<source>applicative computation expressions</source>
<target state="new">applicative computation expressions</target>
Expand Down Expand Up @@ -437,16 +432,6 @@
<target state="translated">Neplatný soubor verze {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProductName">
<source>Microsoft (R) F# Compiler version {0}</source>
<target state="translated">Microsoft (R) F# Compiler verze {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProductNameCommunity">
<source>F# Compiler for F# {0}</source>
<target state="translated">Kompilátor jazyka F# pro F# {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProblemWithFilename">
<source>Problem with filename '{0}': {1}</source>
<target state="translated">Problém s názvem souboru {0}: {1}</target>
Expand Down
15 changes: 0 additions & 15 deletions src/fsharp/xlf/FSComp.txt.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
<target state="new">Assembly attribute '{0}' refers to a designer assembly '{1}' which cannot be loaded or doesn't exist. The exception reported was: {2} - {3}</target>
<note />
</trans-unit>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} für F# {1}</target>
<note />
</trans-unit>
<trans-unit id="featureAndBang">
<source>applicative computation expressions</source>
<target state="new">applicative computation expressions</target>
Expand Down Expand Up @@ -437,16 +432,6 @@
<target state="translated">Ungültige Versionsdatei "{0}".</target>
<note />
</trans-unit>
<trans-unit id="buildProductName">
<source>Microsoft (R) F# Compiler version {0}</source>
<target state="translated">Microsoft (R) F# Compiler, Version {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProductNameCommunity">
<source>F# Compiler for F# {0}</source>
<target state="translated">F# Compiler für F# {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProblemWithFilename">
<source>Problem with filename '{0}': {1}</source>
<target state="translated">Problem mit Dateinamen "{0}": {1}</target>
Expand Down
15 changes: 0 additions & 15 deletions src/fsharp/xlf/FSComp.txt.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
<target state="new">Assembly attribute '{0}' refers to a designer assembly '{1}' which cannot be loaded or doesn't exist. The exception reported was: {2} - {3}</target>
<note />
</trans-unit>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} para F# {1}</target>
<note />
</trans-unit>
<trans-unit id="featureAndBang">
<source>applicative computation expressions</source>
<target state="new">applicative computation expressions</target>
Expand Down Expand Up @@ -437,16 +432,6 @@
<target state="translated">Archivo de versión '{0}' no válido.</target>
<note />
</trans-unit>
<trans-unit id="buildProductName">
<source>Microsoft (R) F# Compiler version {0}</source>
<target state="translated">Compilador de Microsoft (R) F#, versión {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProductNameCommunity">
<source>F# Compiler for F# {0}</source>
<target state="translated">Compilador F# para F# {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProblemWithFilename">
<source>Problem with filename '{0}': {1}</source>
<target state="translated">Problema con el nombre de archivo '{0}': {1}.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/fsharp/xlf/FSComp.txt.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
<target state="new">Assembly attribute '{0}' refers to a designer assembly '{1}' which cannot be loaded or doesn't exist. The exception reported was: {2} - {3}</target>
<note />
</trans-unit>
<trans-unit id="fSharpBannerVersion">
<source>{0} for F# {1}</source>
<target state="translated">{0} pour F# {1}</target>
<note />
</trans-unit>
<trans-unit id="featureAndBang">
<source>applicative computation expressions</source>
<target state="new">applicative computation expressions</target>
Expand Down Expand Up @@ -437,16 +432,6 @@
<target state="translated">Fichier de version non valide '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildProductName">
<source>Microsoft (R) F# Compiler version {0}</source>
<target state="translated">Compilateur F# Microsoft (R) version {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProductNameCommunity">
<source>F# Compiler for F# {0}</source>
<target state="translated">Compilateur F# pour F# {0}</target>
<note />
</trans-unit>
<trans-unit id="buildProblemWithFilename">
<source>Problem with filename '{0}': {1}</source>
<target state="translated">Problème avec le nom de fichier '{0}' : {1}</target>
Expand Down
Loading