diff options
-rwxr-xr-x | projects/generate | 6 | ||||
-rw-r--r-- | projects/langs_vs100.vcxproj | 12 | ||||
-rw-r--r-- | projects/langs_vs100.vcxproj.filters | 4 | ||||
-rw-r--r-- | projects/langs_vs140.vcxproj | 12 | ||||
-rw-r--r-- | projects/langs_vs140.vcxproj.filters | 4 | ||||
-rw-r--r-- | projects/langs_vs141.vcxproj | 12 | ||||
-rw-r--r-- | projects/langs_vs141.vcxproj.filters | 4 | ||||
-rw-r--r-- | projects/langs_vs80.vcproj | 12 | ||||
-rw-r--r-- | projects/langs_vs90.vcproj | 12 |
9 files changed, 40 insertions, 38 deletions
diff --git a/projects/generate b/projects/generate index 2111798f0..28fd25552 100755 --- a/projects/generate +++ b/projects/generate @@ -190,9 +190,11 @@ load_main_data() { load_lang_data() { RES="" - for i in `ls $1` + # Windows Folder sort and Linux Folder sort are slightly different. + # By removing the extension and sorting it on Linux, they are the same. + for i in `ls $1 | sed s~.txt$~~g | sort` do - i=`basename $i | sed s~.txt$~~g` + i=`basename $i` if [ "$i" == "english" ] then continue diff --git a/projects/langs_vs100.vcxproj b/projects/langs_vs100.vcxproj index fc77e03be..88cce9e10 100644 --- a/projects/langs_vs100.vcxproj +++ b/projects/langs_vs100.vcxproj @@ -317,18 +317,18 @@ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish_MX.txt"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs> - </CustomBuild> <CustomBuild Include="..\src\lang\spanish.txt"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs> </CustomBuild> + <CustomBuild Include="..\src\lang\spanish_MX.txt"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs> + </CustomBuild> <CustomBuild Include="..\src\lang\swedish.txt"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> diff --git a/projects/langs_vs100.vcxproj.filters b/projects/langs_vs100.vcxproj.filters index 0afc8c969..bf5257ec8 100644 --- a/projects/langs_vs100.vcxproj.filters +++ b/projects/langs_vs100.vcxproj.filters @@ -142,10 +142,10 @@ <CustomBuild Include="..\src\lang\slovenian.txt"> <Filter>Translations</Filter> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish_MX.txt"> + <CustomBuild Include="..\src\lang\spanish.txt"> <Filter>Translations</Filter> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish.txt"> + <CustomBuild Include="..\src\lang\spanish_MX.txt"> <Filter>Translations</Filter> </CustomBuild> <CustomBuild Include="..\src\lang\swedish.txt"> diff --git a/projects/langs_vs140.vcxproj b/projects/langs_vs140.vcxproj index 317fd34a1..25e7160bf 100644 --- a/projects/langs_vs140.vcxproj +++ b/projects/langs_vs140.vcxproj @@ -317,18 +317,18 @@ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish_MX.txt"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs> - </CustomBuild> <CustomBuild Include="..\src\lang\spanish.txt"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs> </CustomBuild> + <CustomBuild Include="..\src\lang\spanish_MX.txt"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs> + </CustomBuild> <CustomBuild Include="..\src\lang\swedish.txt"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> diff --git a/projects/langs_vs140.vcxproj.filters b/projects/langs_vs140.vcxproj.filters index 0afc8c969..bf5257ec8 100644 --- a/projects/langs_vs140.vcxproj.filters +++ b/projects/langs_vs140.vcxproj.filters @@ -142,10 +142,10 @@ <CustomBuild Include="..\src\lang\slovenian.txt"> <Filter>Translations</Filter> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish_MX.txt"> + <CustomBuild Include="..\src\lang\spanish.txt"> <Filter>Translations</Filter> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish.txt"> + <CustomBuild Include="..\src\lang\spanish_MX.txt"> <Filter>Translations</Filter> </CustomBuild> <CustomBuild Include="..\src\lang\swedish.txt"> diff --git a/projects/langs_vs141.vcxproj b/projects/langs_vs141.vcxproj index 2444b0e0e..c554c6e37 100644 --- a/projects/langs_vs141.vcxproj +++ b/projects/langs_vs141.vcxproj @@ -317,18 +317,18 @@ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish_MX.txt"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs> - </CustomBuild> <CustomBuild Include="..\src\lang\spanish.txt"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs> </CustomBuild> + <CustomBuild Include="..\src\lang\spanish_MX.txt"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs> + </CustomBuild> <CustomBuild Include="..\src\lang\swedish.txt"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command> diff --git a/projects/langs_vs141.vcxproj.filters b/projects/langs_vs141.vcxproj.filters index 0afc8c969..bf5257ec8 100644 --- a/projects/langs_vs141.vcxproj.filters +++ b/projects/langs_vs141.vcxproj.filters @@ -142,10 +142,10 @@ <CustomBuild Include="..\src\lang\slovenian.txt"> <Filter>Translations</Filter> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish_MX.txt"> + <CustomBuild Include="..\src\lang\spanish.txt"> <Filter>Translations</Filter> </CustomBuild> - <CustomBuild Include="..\src\lang\spanish.txt"> + <CustomBuild Include="..\src\lang\spanish_MX.txt"> <Filter>Translations</Filter> </CustomBuild> <CustomBuild Include="..\src\lang\swedish.txt"> diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj index e683d5735..909613b59 100644 --- a/projects/langs_vs80.vcproj +++ b/projects/langs_vs80.vcproj @@ -739,32 +739,32 @@ </FileConfiguration> </File> <File - RelativePath="..\src\lang\spanish_MX.txt" + RelativePath="..\src\lang\spanish.txt" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Generating spanish_MX language file" + Description="Generating spanish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
exit 0
" AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe" - Outputs="..\bin\lang\spanish_MX.lng" + Outputs="..\bin\lang\spanish.lng" /> </FileConfiguration> </File> <File - RelativePath="..\src\lang\spanish.txt" + RelativePath="..\src\lang\spanish_MX.txt" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Generating spanish language file" + Description="Generating spanish_MX language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
exit 0
" AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe" - Outputs="..\bin\lang\spanish.lng" + Outputs="..\bin\lang\spanish_MX.lng" /> </FileConfiguration> </File> diff --git a/projects/langs_vs90.vcproj b/projects/langs_vs90.vcproj index c1f028233..583e0f9a5 100644 --- a/projects/langs_vs90.vcproj +++ b/projects/langs_vs90.vcproj @@ -740,32 +740,32 @@ </FileConfiguration> </File> <File - RelativePath="..\src\lang\spanish_MX.txt" + RelativePath="..\src\lang\spanish.txt" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Generating spanish_MX language file" + Description="Generating spanish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
exit 0
" AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe" - Outputs="..\bin\lang\spanish_MX.lng" + Outputs="..\bin\lang\spanish.lng" /> </FileConfiguration> </File> <File - RelativePath="..\src\lang\spanish.txt" + RelativePath="..\src\lang\spanish_MX.txt" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Generating spanish language file" + Description="Generating spanish_MX language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
exit 0
" AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe" - Outputs="..\bin\lang\spanish.lng" + Outputs="..\bin\lang\spanish_MX.lng" /> </FileConfiguration> </File> |