diff --git a/Localization/.gitignore b/Localization/.gitignore
new file mode 100644
index 000000000..9bf6e7bb1
--- /dev/null
+++ b/Localization/.gitignore
@@ -0,0 +1 @@
+DefaultLang.resources
\ No newline at end of file
diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
deleted file mode 100644
index a43b04c94..000000000
Binary files a/Localization/DefaultLang.resources and /dev/null differ
diff --git a/Localization/Localization.csproj b/Localization/Localization.csproj
index ceeafbaf3..bc23831da 100644
--- a/Localization/Localization.csproj
+++ b/Localization/Localization.csproj
@@ -12,10 +12,20 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <EmbeddedResource Include="DefaultLang.resources" />
+    <EmbeddedResource Include="DefaultLang.resources" Visible="false" />
   </ItemGroup>
   
   <ItemGroup>
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
+  
+  <Target Name="MakeLangResFile" BeforeTargets="BeforeBuild">
+    <Exec
+      Command="cd ..\Utils\DefaultLanguageResMaker &amp; LanguageResMaker.exe"
+      Condition="$(OS) == 'Windows_NT'" />
+
+    <Exec
+      Command="cd ../Utils/DefaultLanguageResMaker &amp;&amp; mono LanguageResMaker.exe"
+      Condition="$(OS) != 'Windows_NT'" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/_GenerateAllSetups.bat b/_GenerateAllSetups.bat
index 8996b9775..afdcf975b 100644
--- a/_GenerateAllSetups.bat
+++ b/_GenerateAllSetups.bat
@@ -7,10 +7,6 @@ GetSamples.exe _svn\BF BF
 GetSamples.exe _svn\PL0\ PL0\
 cd ..\..
 
-cd utils\DefaultLanguageResMaker\
-LanguageResMaker.exe
-cd ..\..
-
 Utils\IncrementVresion\IncrementVresion.exe Configuration\Version.defs REVISION 1
 Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs Configuration\GlobalAssemblyInfo.cs.tmpl Configuration\GlobalAssemblyInfo.cs
 Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs ReleaseGenerators\PascalABCNET_version.nsh.tmpl ReleaseGenerators\PascalABCNET_version.nsh
diff --git a/_RebuildRelease.sh b/_RebuildRelease.sh
index 6ba36b141..04eb57fcd 100644
--- a/_RebuildRelease.sh
+++ b/_RebuildRelease.sh
@@ -1,8 +1,4 @@
 #!/bin/sh -e
-cd Utils/DefaultLanguageResMaker
-mono LanguageResMaker.exe
-cd ../..
-
 dotnet build -c Release --no-incremental pabcnetc.sln
 dotnet build -c Release --no-incremental PascalABCNETLinux.sln
 mono --aot bin/pabcnetc.exe
diff --git a/_RebuildReleaseAndRunTests.sh b/_RebuildReleaseAndRunTests.sh
index 681dcce57..c4c146fdc 100755
--- a/_RebuildReleaseAndRunTests.sh
+++ b/_RebuildReleaseAndRunTests.sh
@@ -1,8 +1,4 @@
 #!/bin/sh -e
-cd Utils/DefaultLanguageResMaker
-mono LanguageResMaker.exe
-cd ../..
-
 dotnet build -c Release --no-incremental pabcnetc.sln
 dotnet build -c Release --no-incremental PascalABCNETLinux.sln
 mono --aot bin/pabcnetc.exe