diff --git a/LameXP.rc b/LameXP.rc index c6d92c4a..ea7af672 100644 --- a/LameXP.rc +++ b/LameXP.rc @@ -114,6 +114,7 @@ IDR_WAVE_WOOHOO WAVE "res\\sounds\\woohoo.wav" IDR_WAVE_SHUTDOWN WAVE "res\\sounds\\shutdown.wav" IDR_WAVE_BEEP WAVE "res\\sounds\\beep.wav" IDR_WAVE_BEEP_LONG WAVE "res\\sounds\\beep2.wav" +IDR_WAVE_WAITING WAVE "res\\sounds\\waiting.wav" ///////////////////////////////////////////////////////////////////////////// // diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index cc63e4a1..256ef1ea 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -1409,7 +1409,7 @@ - + Check for Updates @@ -1450,13 +1450,13 @@ - + Disable Update Reminder - + Disable Sound Effects @@ -1542,7 +1542,7 @@ - + Access Denied @@ -1694,17 +1694,17 @@ - - - - - + + + + + Discard - + Don't Show Again @@ -1719,521 +1719,527 @@ - - - - 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: - - - - - (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) - - - - - 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 - - - - - 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: - - - - - Low Diskspace Warning - - - - - Abort Encoding Process - - - - - Clean Disk Now - - - - + + Ignore - + + Skipping update check this time, please be patient... + + + + + + + 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: + + + + + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + + + + 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 + + + + + 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: + + + + + Low Diskspace Warning + + + + + Abort Encoding Process + + + + + Clean Disk Now + + + + 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. - - - + + + Hibernate Computer - + Do you really want the computer to be hibernated on shutdown? - + LameXP will hibernate the computer on shutdown from now on. - + LameXP will <i>not</i> hibernate the computer on shutdown 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/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 81e39170..f01321cc 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -1726,6 +1726,10 @@ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) (Hinweis: Bitte beachten Sie die enthaltene 'changelog.txt' Datei anstelle des Dateinames der ZIP-Datei!) + + Skipping update check this time, please be patient... + Update-Überprüfung wird übersprungen, bitte warten... + MetaInfo diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index f15fe086..9611464a 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -1725,6 +1725,10 @@ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) (Sugerencia: ¡Por favor, ignore el nombre del archivo ZIP descargado y compruebe el archivo 'changelog.txt' en su lugar!) + + Skipping update check this time, please be patient... + + MetaInfo diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 1a1560b5..b9d631b4 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -1735,6 +1735,10 @@ Ouvrir le dossier récursivement... (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + Skipping update check this time, please be patient... + + MetaInfo diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index a301b97f..51005aaa 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -1726,6 +1726,10 @@ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + Skipping update check this time, please be patient... + + MetaInfo diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index ea249b9b..6475cffc 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -1725,6 +1725,10 @@ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + Skipping update check this time, please be patient... + + MetaInfo diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index c0ab6001..e3704ee2 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -1409,7 +1409,7 @@ - + Check for Updates Sprawdź aktualizacje @@ -1450,13 +1450,13 @@ - + Disable Update Reminder Wyłącz przypominanie o aktualizacji - + Disable Sound Effects Wyłącz efekty dźwiękowe @@ -1542,7 +1542,7 @@ - + Access Denied Dostęp zablokowany @@ -1689,17 +1689,17 @@ - - - - - + + + + + Discard Zamknij - + Don't Show Again Nie pokazuj ponownie @@ -1714,116 +1714,116 @@ Twoja wersja LameXP jest starsza niż rok! Czas na aktualizację! - - - + + + Update Reminder Powiadomienie aktualizacji - + Your last update check was more than 14 days ago. Check for updates now? Ostatnie sprawdzenie aktualizacji było ponad 14 dni temu. Sprawdzić teraz aktualizacje? - + Your did not check for LameXP updates yet. Check for updates now? Nie sprawdzałeś jeszcze aktualizacji LameXP. Sprawdzić teraz aktualizacje? - + Postpone Przełóż - + LameXP detected that your version of the Nero AAC encoder is outdated! LameXP wykrył że Twoja wersja kodera Nero AAC jest nieaktualna! - + The current version available is %1 (or later), but you still have version %2 installed. Wersją dostępną obecnie jest %1, Twoja wersja to %2. - + n/a n/d - + You can download the latest version of the Nero AAC encoder from the Nero website at: Możesz pobrać najnowszą wersję kodera Nero AAC ze strony Nero: - + AAC Encoder Outdated Koder AAC jest nieaktualny - + The Nero AAC encoder could not be found. AAC encoding support will be disabled. Nie można odnaleźć kodera Nero AAC. Kompresja formatu AAC zostanie wyłączona. - + Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! Prosze skopiować 'neroAacEnc.exe', 'neroAacDec.exe', oraz 'neroAacTag.exe' do folderu LameXP! - + Your LameXP directory is located here: Folder aplikacji LameXP znajduje się tutaj: - + You can download the Nero AAC encoder for free from the official Nero website at: Możesz pobrać koder Nero AAC za darmo z oficjalnej strony Nero: - + AAC Support Disabled Wsparcie dla AAC wyłączone - - - + + + LameXP LameXP - + You must add at least one file to the list before proceeding! Powinienieś dodać przynajmniej jeden plik do listy aby zacząć działać! - + Not Found Nie znaleziono - + Your currently selected TEMP folder does not exist anymore: Wybrany przez Ciebie folder tymczasowy TEMP już nie istnieje: - + Restore Default Przywróć domyślne - + Cancel Anuluj - + Low Diskspace Warning Ostrzeżenie o małej ilości miejsca na dysku - + There are less than %1 GB of free diskspace available on your system's TEMP folder. Jest mniej niż %1 GB dostępnego miejsca w systemowym folderze TEMP. @@ -1833,407 +1833,413 @@ - + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) - + It is highly recommend to free up more diskspace before proceeding with the encode! Jest wysoce zalecane zwolnić miejsce na dysku zanim zaczniesz kompresję! - + Your TEMP folder is located at: Twój folder TEMP znajduję się: - + Abort Encoding Process Przerwij proces kompresji - + Clean Disk Now Wykonaj oczyszczanie dysku - + + Ignore Ignoruj - + + Skipping update check this time, please be patient... + + + + Low Diskspace Mało miejsca na dysku - + You are proceeding with low diskspace. Problems might occur! Chcesz zacząć działać z małą ilością miejsca na dysku. Mogą wystąpić problemy! - + Sorry, an unsupported encoder has been chosen! Został wybrany koder, który nie jest wspierany! - + Cannot write to the selected output directory. Nie można zapisać do wybranej lokalizacji. - + Please choose a different directory! Prosze wybrać inną lokalizację! - + Load Translation Zaladuj plik językowy - + Translation Files Pliki językowe - + Do you really want to disable the update reminder? Czy na pewno chcesz wyłączyć przypominanie o aktualizacjach? - - - - - - - + + + + + + + Yes Tak - - - - - - - + + + + + + + No Nie - + The update reminder has been disabled. Przypominanie o aktualizacjach wyłączone. - + Please remember to check for updates at regular intervals! Prosze pamiętać o okresowym sprawdzaniu aktualizacji! - + The update reminder has been re-enabled. Przypominanie o aktualizacjach ponownie włączone. - + Do you really want to disable all sound effects? Czy na pewno chcesz wyłączyć wszystkie dźwiękowe? - - + + Sound Effects Efekty dźwiękowe - + All sound effects have been disabled. Wszystkie efekty dźwiękowe zostały wyłączone. - + The sound effects have been re-enabled. Efekty dźwiękowe zostały ponownie włączone. - - - + + + Nero AAC Notifications Powiadomienia Nero AAC - + Do you really want to disable all Nero AAC Encoder notifications? Czy na pewno chcesz wyłączyć wszystkie powiadomienia Nero AAC? - + All Nero AAC Encoder notifications have been disabled. Wszystkie powiadomienia kodera Nero AAC zostały wyłączone. - + The Nero AAC Encoder notifications have been re-enabled. Powiadomienia Nero AAC zostały ponownie włączone. - - - + + + Slow Startup Notifications Powiadomienia o powolnym starcie - + Do you really want to disable the slow startup notifications? Czy na pewno chcesz wyłączyć powiadomienia o powolnym starcie? - + The slow startup notifications have been disabled. Powiadomienia o powolnym starcie zostały wyłączone. - + The slow startup notifications have been re-enabled. Powiadomienia o powolnym starcie zostały ponownie włączone. - - + + Open Cue Sheet Otwórz plik Cue Sheet - - + + Cue Sheet File Plik Cue Sheet - - - + + + Beta Updates Aktualizacje Beta - + Do you really want LameXP to check for Beta (pre-release) updates? Czy na pewno chcesz aby LameXP sprawdzał aktualizacje Beta? - + LameXP will check for Beta (pre-release) updates from now on. Od teraz LameXP będzie sprawdzał aktualizacje Beta. - + Check Now Sprawdź teraz - + LameXP will <i>not</i> check for Beta (pre-release) updates from now on. LameXP od teraz <i>nie będzie</i> sprawdzał aktualizacji Beta. - - - + + + Hibernate Computer - + Do you really want the computer to be hibernated on shutdown? - + LameXP will hibernate the computer on shutdown from now on. - + LameXP will <i>not</i> hibernate the computer on shutdown from now on. - - - + + + Shell Integration Integracja z systemem - + Do you really want to disable the LameXP shell integration? Czy na pewno chcesz wyłączyć integrację LameXP z systemem? - + The LameXP shell integration has been disabled. Integracja LameXP z systemem zostałą wyłączona. - + The LameXP shell integration has been re-enabled. Integracja LameXP z systemem została ponownie włączona. - - + + Add file(s) Dodaj plik(i) - - + + Add Folder Dodaj folder - - + + New Folder Nowy folder - + Enter the name of the new folder: Wprowadź nazwę nowego folderu: - + Failed to create folder Utworzenie folderu zakończone niepowodzeniem - + The new folder could not be created: Nowy folder nie mógł zostać stworzony: - + Drive is read-only or insufficient access rights! Dysk tylko do odczytu lub brak praw dostępu! - - - - + + + + Quality Level %1 Poziom jakości %1 - - - + + + Compression %1 Kompresja %1 - - - + + + Uncompressed Nieskompresowany - + Best Quality (Very Slow) Najlepsza jakość (Bardzo wolno) - + High Quality (Recommended) Wysoka jakość (Zalecane) - + Average Quality (Default) Średnia jakość (Domyślnie) - + Low Quality (Fast) Niska jakość (Szybko) - + Poor Quality (Very Fast) Najniższa jakość (Bardzo szybko) - + File name without extension Nazwa pliku bez rozszerzenia - + Track number with leading zero Numer ścieżki z zerem na początku - + Track title Nazwa ścieżki - + Artist name Nazwa Artysty - + Album name Nazwa Albumu - + Year with (at least) four digits Rok z (przynajmniej) czterema cyframi - + Comment Komentarz - + Characters forbidden in file names: Zabronione znaki w nazwach plików: - + Rename Macros Zmień nazwy makr - + %1 Instance(s) %1 wątek/ki - + Cannot write to the selected directory. Please choose another directory! Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację! - + Already Running Już działa - + LameXP is already running, please use the running instance! LameXP już działa, przejdź do działającego programu! diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index 54ee3764..2385feac 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -1731,6 +1731,10 @@ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + Skipping update check this time, please be patient... + + MetaInfo diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 15de5c3a..16ea75aa 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -1726,6 +1726,10 @@ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) (Підказка: Будь ласка, не звертайте увагу на назву завантаженого файла ZIP, натомість перевіряйте також присутній в архіві 'changelog.txt'!) + + Skipping update check this time, please be patient... + + MetaInfo diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index b5bdc9e9..5978e568 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -1725,6 +1725,10 @@ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) (提示: 请忽略下载的 ZIP 文件的名称,而是检查包括 'changelog.txt'!) + + Skipping update check this time, please be patient... + + MetaInfo diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 44311527..27582946 100644 Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ diff --git a/res/sounds/waiting.wav b/res/sounds/waiting.wav new file mode 100644 index 00000000..5b09a52d Binary files /dev/null and b/res/sounds/waiting.wav differ diff --git a/src/Config.h b/src/Config.h index dd1d3cb8..969c13fd 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 10 -#define VER_LAMEXP_BUILD 816 +#define VER_LAMEXP_BUILD 817 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index 063d39a2..5f9626c7 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -994,18 +994,24 @@ 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"), NOBR(tr("Your version of LameXP is more than a year old. Time for an update!")), tr("Check for Updates"), tr("Exit Program")) == 0) + int ret = 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"), tr("Ignore")); + switch(ret) { + case 0: if(checkForUpdates()) { QApplication::quit(); return; } - } - else - { + break; + case 1: QApplication::quit(); return; + default: + QEventLoop loop; QTimer::singleShot(7000, &loop, SLOT(quit())); + PlaySound(MAKEINTRESOURCE(IDR_WAVE_WAITING), GetModuleHandle(NULL), SND_RESOURCE | SND_ASYNC); + m_banner->show(tr("Skipping update check this time, please be patient..."), &loop); + break; } } else if(m_settings->autoUpdateEnabled()) diff --git a/src/Resource.h b/src/Resource.h index 048b55b0..3f7a7cd3 100644 --- a/src/Resource.h +++ b/src/Resource.h @@ -35,6 +35,7 @@ #define IDR_WAVE_SHUTDOWN 672 #define IDR_WAVE_BEEP 673 #define IDR_WAVE_BEEP_LONG 674 +#define IDR_WAVE_WAITING 675 /* * Next default values for new objects