diff --git a/doc/Changelog.html b/doc/Changelog.html index e817c659..ef1684c0 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -23,7 +23,7 @@ a:visited { color: #0000EE; }
  • Added optional support for the FHG AAC Encoder included with Winamp 5.62 (see FAQ doc for details)
  • Added a menu for bookmarking "favorite" output folders to the "output folder" tab
  • Updated Qt runtime libraries to v4.8.0 Beta-1 (2011-07-19), compiled with MSVC 10.0 -
  • Updated MediaInfo to v0.7.48 (2011-08-17), compiled with MSVC 10.0 +
  • Updated MediaInfo to v0.7.49 (2011-09-09), compiled with MSVC 10.0
  • Updated language files (big thank-you to all contributors !!!)
  • Improved "downmix" filter by using explicit channel mappings for each number of input channels
  • Fixed Cue Sheet import for tracks with certain characters in the title diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index d22afe89..c5856b2a 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -705,7 +705,7 @@ - + Show Details @@ -1342,9 +1342,9 @@ - - - + + + Check for Updates @@ -1385,13 +1385,13 @@ - + Disable Update Reminder - + Disable Sound Effects @@ -1466,673 +1466,673 @@ - + Adding file(s), please wait... - - + + Access Denied - + %1 file(s) have been rejected, because read access was not granted! - + This usually means the file is locked by another process. - + CDDA Files - + %1 file(s) have been rejected, because they are dummy CDDA files! - + Sorry, LameXP cannot extract audio tracks from an Audio&minus;CD at present. - + We recommend using %1 for that purpose. - + Cue Sheet - + %1 file(s) have been rejected, because they appear to be Cue Sheet images! - + Please use LameXP's Cue Sheet wizard for importing Cue Sheet files. - + Files Rejected - + %1 file(s) have been rejected, because the file format could not be recognized! - + This usually means the file is damaged or the file format is not supported. - + Scanning folder(s) for files, please wait... - + DEMO VERSION - + You can drop in audio files here! - + Open File in External Application - + Browse File Location - + Browse Selected Folder - + Bookmark Current Output Folder - + License Declined - + You have declined the license. Consequently the application will exit now! - + Goodbye! - + LameXP - Expired - + This demo (pre-release) version of LameXP has expired at %1. - + LameXP is free software and release versions won't expire. - - + + Exit Program - + It seems that a bogus anti-virus software is slowing down the startup of LameXP. - + Please refer to the %1 document for details and solutions! - + Slow Startup - - - - + + + + Discard - - + + Don't Show Again - + Urgent Update - + Your version of LameXP is more than a year old. Time for an update! - - - + + + Update Reminder - + Your last update check was more than 14 days ago. Check for updates now? - + Your did not check for LameXP updates yet. Check for updates now? - + Postpone - + LameXP detected that your version of the Nero AAC encoder is outdated! - + The current version available is %1 (or later), but you still have version %2 installed. - + n/a - + You can download the latest version of the Nero AAC encoder from the Nero website at: - + AAC Encoder Outdated - + The Nero AAC encoder could not be found. AAC encoding support will be disabled. - + Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! - + Your LameXP directory is located here: - + You can download the Nero AAC encoder for free from the official Nero website at: - + AAC Support Disabled - - - + + + LameXP - + You must add at least one file to the list before proceeding! - + Not Found - + Your currently selected TEMP folder does not exist anymore: - + Restore Default - + Cancel - + Low Diskspace Warning - + There are less than %1 GB of free diskspace available on your system's TEMP folder. - + It is highly recommend to free up more diskspace before proceeding with the encode! - + Your TEMP folder is located at: - + Abort Encoding Process - + Clean Disk Now - + Ignore - + Low Diskspace - + You are proceeding with low diskspace. Problems might occur! - + Sorry, an unsupported encoder has been chosen! - + Cannot write to the selected output directory. - + Please choose a different directory! - + Load Translation - + Translation Files - + Do you really want to disable the update reminder? - - - - - - + + + + + + Yes - - - - - - + + + + + + No - + The update reminder has been disabled. - + Please remember to check for updates at regular intervals! - + The update reminder has been re-enabled. - + Do you really want to disable all sound effects? - - + + Sound Effects - + All sound effects have been disabled. - + The sound effects have been re-enabled. - - - + + + Nero AAC Notifications - + Do you really want to disable all Nero AAC Encoder notifications? - + All Nero AAC Encoder notifications have been disabled. - + The Nero AAC Encoder notifications have been re-enabled. - - - + + + Slow Startup Notifications - + Do you really want to disable the slow startup notifications? - + The slow startup notifications have been disabled. - + The slow startup notifications have been re-enabled. - - + + Open Cue Sheet - - + + Cue Sheet File - - - + + + Beta Updates - + Do you really want LameXP to check for Beta (pre-release) updates? - + LameXP will check for Beta (pre-release) updates from now on. - + Check Now - + LameXP will <i>not</i> check for Beta (pre-release) updates from now on. - - - + + + Shell Integration - + Do you really want to disable the LameXP shell integration? - + The LameXP shell integration has been disabled. - + The LameXP shell integration has been re-enabled. - - + + Add file(s) - - + + Add Folder - - + + New Folder - + Enter the name of the new folder: - + Failed to create folder - + The new folder could not be created: - + Drive is read-only or insufficient access rights! - - - - + + + + Quality Level %1 - - - + + + Compression %1 - - - + + + Uncompressed - + Best Quality (Very Slow) - + High Quality (Recommended) - + Average Quality (Default) - + Low Quality (Fast) - + Poor Quality (Very Fast) - + File name without extension - + Track number with leading zero - + Track title - + Artist name - + Album name - + Year with (at least) four digits - + Comment - + Characters forbidden in file names: - + Rename Macros - + %1 Instance(s) - + Cannot write to the selected directory. Please choose another directory! - + Already Running - + LameXP is already running, please use the running instance! diff --git a/res/tools/mediainfo.i386.exe b/res/tools/mediainfo.i386.exe index 1a148568..71570024 100644 Binary files a/res/tools/mediainfo.i386.exe and b/res/tools/mediainfo.i386.exe differ diff --git a/res/tools/mediainfo.x64.exe b/res/tools/mediainfo.x64.exe index 283ce180..5f42de2f 100644 Binary files a/res/tools/mediainfo.x64.exe and b/res/tools/mediainfo.x64.exe differ diff --git a/src/Config.h b/src/Config.h index 5114c62e..29a3ce60 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,8 +29,8 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Beta -#define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 684 +#define VER_LAMEXP_PATCH 2 +#define VER_LAMEXP_BUILD 687 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index d492d184..3470d734 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -75,6 +75,7 @@ #define LINK(URL) QString("%2").arg(URL).arg(URL) #define TEMP_HIDE_DROPBOX(CMD) { bool __dropBoxVisible = m_dropBox->isVisible(); if(__dropBoxVisible) m_dropBox->hide(); {CMD}; if(__dropBoxVisible) m_dropBox->show(); } #define USE_NATIVE_FILE_DIALOG (lamexp_themes_enabled() || ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) < QSysInfo::WV_XP)) +#define NOBR(STR) QString("%1").arg(STR).replace("-", "−") //////////////////////////////////////////////////////////// // Constructor @@ -925,6 +926,10 @@ void MainWindow::windowShown(void) PlaySound(MAKEINTRESOURCE(IDR_WAVE_WOOHOO), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC); m_settings->licenseAccepted(1); + + // + QMessageBox::information(this, "We want you!", QString("We are still looking for LameXP translators!

    If you are willing to translate LameXP to your language or to complete an existing translation, please refer to:
    " + LINK("http://mulder.brhack.net/public/doc/lamexp_translate.html") + "
    ")); + //     } //Check for expiration @@ -947,8 +952,8 @@ void MainWindow::windowShown(void) if(m_settings->slowStartup() && m_settings->antivirNotificationsEnabled()) { QString message; - message += QString("%1
    ").arg(tr("It seems that a bogus anti-virus software is slowing down the startup of LameXP.").replace("-", "−")); - message += QString("%1
    ").arg(tr("Please refer to the %1 document for details and solutions!").replace("-", "−").arg("F.A.Q.")); + message += NOBR(tr("It seems that a bogus anti-virus software is slowing down the startup of LameXP.")); + message += NOBR(tr("Please refer to the %1 document for details and solutions!")).arg("F.A.Q."); if(QMessageBox::warning(this, tr("Slow Startup"), message, tr("Discard"), tr("Don't Show Again")) == 1) { m_settings->antivirNotificationsEnabled(false); @@ -960,7 +965,7 @@ void MainWindow::windowShown(void) if(QDate::currentDate() >= lamexp_version_date().addYears(1)) { qWarning("Binary is more than a year old, time to update!"); - if(QMessageBox::warning(this, tr("Urgent Update"), QString("%1").arg(tr("Your version of LameXP is more than a year old. Time for an update!")).replace("-", "−"), tr("Check for Updates"), tr("Exit Program")) == 0) + if(QMessageBox::warning(this, tr("Urgent Update"), NOBR(tr("Your version of LameXP is more than a year old. Time for an update!")), tr("Check for Updates"), tr("Exit Program")) == 0) { if(checkForUpdates()) { @@ -998,10 +1003,10 @@ void MainWindow::windowShown(void) if(lamexp_tool_version("neroAacEnc.exe") < lamexp_toolver_neroaac()) { QString messageText; - messageText += QString("%1
    ").arg(tr("LameXP detected that your version of the Nero AAC encoder is outdated!")); - messageText += QString("%1

    ").arg(tr("The current version available is %1 (or later), but you still have version %2 installed.").arg(lamexp_version2string("?.?.?.?", lamexp_toolver_neroaac(), tr("n/a")), lamexp_version2string("?.?.?.?", lamexp_tool_version("neroAacEnc.exe"), tr("n/a")))); - messageText += QString("%1
    ").arg(tr("You can download the latest version of the Nero AAC encoder from the Nero website at:")); - messageText += "" + LINK(AboutDialog::neroAacUrl) + "
    "; + messageText += NOBR(tr("LameXP detected that your version of the Nero AAC encoder is outdated!")).append("
    "); + messageText += NOBR(tr("The current version available is %1 (or later), but you still have version %2 installed.").arg(lamexp_version2string("?.?.?.?", lamexp_toolver_neroaac(), tr("n/a")), lamexp_version2string("?.?.?.?", lamexp_tool_version("neroAacEnc.exe"), tr("n/a")))).append("

    "); + messageText += NOBR(tr("You can download the latest version of the Nero AAC encoder from the Nero website at:")).append("
    "); + messageText += "" + LINK(AboutDialog::neroAacUrl) + "
    "; QMessageBox::information(this, tr("AAC Encoder Outdated"), messageText); } } @@ -1013,12 +1018,12 @@ void MainWindow::windowShown(void) QString appPath = QDir(QCoreApplication::applicationDirPath()).canonicalPath(); if(appPath.isEmpty()) appPath = QCoreApplication::applicationDirPath(); QString messageText; - messageText += QString("%1
    ").arg(tr("The Nero AAC encoder could not be found. AAC encoding support will be disabled.").replace("-", "−")); - messageText += QString("%1

    ").arg(tr("Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory!").replace("-", "−")); - messageText += QString("%1
    ").arg(tr("Your LameXP directory is located here:").replace("-", "−")); - messageText += QString("%2

    ").arg(QDir::toNativeSeparators(appPath), QDir::toNativeSeparators(appPath).replace("-", "−")); - messageText += QString("%1
    ").arg(tr("You can download the Nero AAC encoder for free from the official Nero website at:").replace("-", "−")); - messageText += "" + LINK(AboutDialog::neroAacUrl) + "
    "; + messageText += NOBR(tr("The Nero AAC encoder could not be found. AAC encoding support will be disabled.")).append("
    "); + messageText += NOBR(tr("Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory!")).append("

    "); + messageText += NOBR(tr("Your LameXP directory is located here:")).append("
    "); + messageText += QString("%2

    ").arg(QDir::toNativeSeparators(appPath), QDir::toNativeSeparators(appPath).replace("-", "−")); + messageText += NOBR(tr("You can download the Nero AAC encoder for free from the official Nero website at:")).append("
    "); + messageText += "" + LINK(AboutDialog::neroAacUrl) + "
    "; if(QMessageBox::information(this, tr("AAC Support Disabled"), messageText, tr("Discard"), tr("Don't Show Again")) == 1) { m_settings->neroAacNotificationsEnabled(false); diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index bb7d0621..ba85edb0 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -75,8 +75,8 @@ g_lamexp_tools[] = {"df995d8a9e4e5fab551d0e3460b9209320714dead70f662929fcc00a4bd72d8a6d23844a", CPU_TYPE_X86_GEN, "lame.i386.exe", 3990}, {"873faeddc44243b4712cd42dd0bfc3174a07113d245dd834657519ffe5dbd4b1e395ce32", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3990}, {"67933924d68ce319795989648f29e7bd1abaac4ec09c26cbb0ff0d15a67a9df17e257933", CPU_TYPE_ALL_ALL, "mac.exe", 406}, - {"743db1020556b1815c4d6e6093a2538ae813d7fed1e11d254b8809ce54795b77fa696bca", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 748}, - {"86ed4b4bd445b9d0c6ee094987d87fe5161102b59c8c74d11f294206c13f1a2ce899e100", CPU_TYPE_X64_GEN, "mediainfo.x64.exe", 748}, + {"e294ea248768cb05013b1a16d4a0183342459ef03691f8ab6b643807c64f2be458fe7efe", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 749}, + {"7bb673a5632ea0400c7b97f374b9167b502e7798b0494a2f39b7fa8ff5b371573d757234", CPU_TYPE_X64_GEN, "mediainfo.x64.exe", 749}, {"a93ec86187025e66fb78026af35555bd3b4e30fe1a40e8d66f600cfd918f07f431f0b2f2", CPU_TYPE_ALL_ALL, "mpcdec.exe", 435}, {"5a89768010efb1ddfd88ccc378a89433ceaecb403a7b1f83f8716f6848d9a05b3d3c6d93", CPU_TYPE_ALL_ALL, "mpg123.exe", 1133}, {"0c781805dda931c529bd16069215f616a7a4c5e5c2dfb6b75fe85d52b20511830693e528", CPU_TYPE_ALL_ALL, "oggdec.exe", UINT_MAX},