diff --git a/LameXP.sln b/LameXP_VS2008.sln similarity index 94% rename from LameXP.sln rename to LameXP_VS2008.sln index 4efe7282..6e7336a7 100644 --- a/LameXP.sln +++ b/LameXP_VS2008.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LameXP", "LameXP.vcproj", "{00FE736A-8DB1-41B3-B915-4CD8DB09EF48}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LameXP", "LameXP_VS2008.vcproj", "{00FE736A-8DB1-41B3-B915-4CD8DB09EF48}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/LameXP.vcproj b/LameXP_VS2008.vcproj similarity index 99% rename from LameXP.vcproj rename to LameXP_VS2008.vcproj index c0229ecc..00800427 100644 --- a/LameXP.vcproj +++ b/LameXP_VS2008.vcproj @@ -94,7 +94,7 @@ @@ -1455,7 +1455,7 @@ @@ -1465,7 +1465,7 @@ diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat index f985a954..4fb8c3cb 100644 --- a/etc/Deployment/_deploy.bat +++ b/etc/Deployment/_deploy.bat @@ -40,7 +40,7 @@ REM ------------------------------------------ REM :: BUILD BINARIES :: REM ------------------------------------------ call _lupdate.bat -call _build.bat "..\..\LameXP.sln" "%LAMEXP_CONFIG%" +call _build.bat "%PATH_VCPROJ%" "%LAMEXP_CONFIG%" if not "%LAMEXP_ERROR%"=="0" ( call _error.bat "BUILD HAS FAILED" GOTO:EOF diff --git a/etc/Deployment/_paths.bat b/etc/Deployment/_paths.bat index c0c6ec11..9169b468 100644 --- a/etc/Deployment/_paths.bat +++ b/etc/Deployment/_paths.bat @@ -8,6 +8,7 @@ set "PATH_MKNSIS=" set "PATH_MSVC90=" set "PATH_QTMSVC=" set "PATH_GNUPG1=" +set "PATH_VCPROJ=" REM ------------------------------------------ for /f "tokens=2,*" %%s in (buildenv.txt) do ( if "%%s"=="PATH_SEVENZ" set "PATH_SEVENZ=%%~t" @@ -17,14 +18,17 @@ for /f "tokens=2,*" %%s in (buildenv.txt) do ( if "%%s"=="PATH_MSVC90" set "PATH_MSVC90=%%~t" if "%%s"=="PATH_QTMSVC" set "PATH_QTMSVC=%%~t" if "%%s"=="PATH_GNUPG1" set "PATH_GNUPG1=%%~t" + if "%%s"=="PATH_VCPROJ" set "PATH_VCPROJ=%%~t" ) REM ------------------------------------------ -:: echo PATH_SEVENZ=%PATH_SEVENZ% -:: echo PATH_MPRESS=%PATH_MPRESS% -:: echo PATH_UPXBIN=%PATH_UPXBIN% -:: echo PATH_MKNSIS=%PATH_MKNSIS% -:: echo PATH_MSVC90=%PATH_MSVC90% -:: echo PATH_QTMSVC=%PATH_QTMSVC% +echo PATH_SEVENZ ="%PATH_SEVENZ%" +echo PATH_MPRESS ="%PATH_MPRESS%" +echo PATH_UPXBIN ="%PATH_UPXBIN%" +echo PATH_MKNSIS ="%PATH_MKNSIS%" +echo PATH_MSVC90 ="%PATH_MSVC90%" +echo PATH_QTMSVC ="%PATH_QTMSVC%" +echo PATH_GNUPG1 ="%PATH_GNUPG1%" +echo PATH_VCPROJ ="%PATH_VCPROJ%" REM ------------------------------------------ set "LAMEXP_ERROR=1" REM ------------------------------------------ @@ -39,5 +43,7 @@ if not exist "%PATH_QTMSVC%\bin\uic.exe" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\moc.exe" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\rcc.exe" GOTO:EOF if not exist "%PATH_GNUPG1%\gpg.exe" GOTO:EOF +if not exist "%PATH_GNUPG1%\gpg.exe" GOTO:EOF +if not exist "%PATH_VCPROJ%" GOTO:EOF REM ------------------------------------------ set "LAMEXP_ERROR=0" diff --git a/etc/Deployment/buildenv.txt b/etc/Deployment/buildenv.txt index 1745122d..bedc6080 100644 --- a/etc/Deployment/buildenv.txt +++ b/etc/Deployment/buildenv.txt @@ -5,3 +5,4 @@ #define PATH_MSVC90 "D:\Microsoft Visual Studio 9.0" #define PATH_QTMSVC "E:\Qt\4.7.2" #define PATH_GNUPG1 "E:\GnuPG" +#define PATH_VCPROJ "..\..\LameXP_VS2008.sln" diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 60261f0d..2689db75 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -7,10 +7,6 @@ LameXP − Audio Encoder Front-end - - DEMO VERSION - - Please visit %1 for news and updates! @@ -199,6 +195,10 @@ n/a + + Note: This demo (pre-release) version of LameXP will expire at %1. + + AudioFileModel diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index bbf04387..9f2830f7 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -196,8 +196,8 @@ Silk Icons − Über 700 Symbole im PNG Format - DEMO VERSION - DEMO VERSION + Note: This demo (pre-release) version of LameXP will expire at %1. + @@ -1538,7 +1538,7 @@ Close - Schießen + Schließen Encoding Files diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index ccb12972..c0a6af33 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -196,8 +196,8 @@ GNU Wget − Software para descarga de archivos mediante HTTP - DEMO VERSION - VERSIÓN DEMO + Note: This demo (pre-release) version of LameXP will expire at %1. + diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index a7d354ed..794a8b66 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -200,8 +200,8 @@ GNU Wget − Logiciel permettant de récupérer des fichiers à l'aide du HTTP - DEMO VERSION - VERSION DE DEMO + Note: This demo (pre-release) version of LameXP will expire at %1. + diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index a8fd5842..8e49c3a7 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -196,8 +196,8 @@ - DEMO VERSION - VERSIONE DEMO + Note: This demo (pre-release) version of LameXP will expire at %1. + diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index 58e84bee..4061f193 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -7,10 +7,6 @@ LameXP − Audio Encoder Front-end LameXP − Audio Encoder Front-end - - DEMO VERSION - ДЕМО ВЕРСИЯ - Please visit %1 for news and updates! Пожайлуйста посетите %1 за новостями и обновлениями! @@ -199,6 +195,10 @@ n/a н/д + + Note: This demo (pre-release) version of LameXP will expire at %1. + + AudioFileModel diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index d2c0be9f..b32d6b7d 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -196,8 +196,8 @@ - DEMO VERSION - ДЕМО ВЕРСІЯ + Note: This demo (pre-release) version of LameXP will expire at %1. + diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index f2836a81..839432ed 100644 Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ diff --git a/res/localization/LameXP_ES.qm b/res/localization/LameXP_ES.qm index f424acce..e8577337 100644 Binary files a/res/localization/LameXP_ES.qm and b/res/localization/LameXP_ES.qm differ diff --git a/res/localization/LameXP_FR.qm b/res/localization/LameXP_FR.qm index 53f3e7f9..51728fd9 100644 Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ diff --git a/res/localization/LameXP_IT.qm b/res/localization/LameXP_IT.qm index 44ec567a..7e84b2d3 100644 Binary files a/res/localization/LameXP_IT.qm and b/res/localization/LameXP_IT.qm differ diff --git a/res/localization/LameXP_RU.qm b/res/localization/LameXP_RU.qm index 539fca0b..8b307278 100644 Binary files a/res/localization/LameXP_RU.qm and b/res/localization/LameXP_RU.qm differ diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm index f7be62c0..c92648f9 100644 Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ