From 01bc64859d271a8361e9bc71633de884e5783ab6 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 23 Oct 2011 18:05:27 +0200 Subject: [PATCH] Added a hint that the version number in the name of the ZIP file, which Nero offers for download, doesn't tell the whole truth. --- etc/Translation/Blank.ts | 271 ++++++++++++++++----------------- etc/Translation/LameXP_DE.ts | 4 + etc/Translation/LameXP_ES.ts | 4 + etc/Translation/LameXP_FR.ts | 4 + etc/Translation/LameXP_IT.ts | 4 + etc/Translation/LameXP_KR.ts | 4 + etc/Translation/LameXP_PL.ts | 273 +++++++++++++++++----------------- etc/Translation/LameXP_RU.ts | 4 + etc/Translation/LameXP_UK.ts | 4 + res/localization/LameXP_DE.qm | Bin 72580 -> 72934 bytes src/Config.h | 6 +- src/Dialog_MainWindow.cpp | 3 +- src/Dialog_Processing.cpp | 2 +- 13 files changed, 311 insertions(+), 272 deletions(-) diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 3d570f8f..12b7b1c7 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -1410,13 +1410,13 @@ - + Disable Update Reminder - + Disable Sound Effects @@ -1502,7 +1502,7 @@ - + Access Denied @@ -1654,17 +1654,17 @@ - - + - - + + + Discard - + Don't Show Again @@ -1680,8 +1680,8 @@ - - + + Update Reminder @@ -1722,473 +1722,478 @@ + (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 - + 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 62450449..7d9e88c4 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -1690,6 +1690,10 @@ LameXP will <i>not</i> hibernate the computer on shutdown from now on. LameXP wird den Computer fortan <i>nicht</i> in den Ruhezustand versetzen. + + (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!) + MetaInfo diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index bb8175db..192d548c 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -1689,6 +1689,10 @@ LameXP will <i>not</i> hibernate the computer on shutdown from now on. + + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + MetaInfo diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index e24d3760..70389ce9 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -1699,6 +1699,10 @@ Ouvrir le dossier récursivement... LameXP will <i>not</i> hibernate the computer on shutdown from now on. + + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + MetaInfo diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 9e9e8d4c..898e61db 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -1690,6 +1690,10 @@ LameXP will <i>not</i> hibernate the computer on shutdown from now on. + + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + MetaInfo diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index cff42a54..6250ab9a 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -1689,6 +1689,10 @@ LameXP will <i>not</i> hibernate the computer on shutdown from now on. + + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + MetaInfo diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index cf519e0a..3624ae60 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -1410,13 +1410,13 @@ - + Disable Update Reminder Wyłącz przypominanie o aktualizacji - + Disable Sound Effects Wyłącz efekty dźwiękowe @@ -1502,7 +1502,7 @@ - + Access Denied Dostęp zablokowany @@ -1649,17 +1649,17 @@ - - + - - + + + Discard Zamknij - + Don't Show Again Nie pokazuj ponownie @@ -1675,8 +1675,8 @@ - - + + Update Reminder Powiadomienie aktualizacji @@ -1716,74 +1716,74 @@ 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. @@ -1793,402 +1793,407 @@ - + + (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 - + 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 22becbbd..7d1eff61 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -1695,6 +1695,10 @@ LameXP will <i>not</i> hibernate the computer on shutdown from now on. + + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + MetaInfo diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 29b2b13c..34cc686c 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -1690,6 +1690,10 @@ LameXP will <i>not</i> hibernate the computer on shutdown from now on. + + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) + + MetaInfo diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 4f76f8b4ee0e0790ec909cf5bf7f29f81d90d500..c1e09ba1ae7ab849e5b5de1a0fdc18e939106a1f 100644 GIT binary patch delta 4608 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 diff --git a/src/Config.h b/src/Config.h index 593b7a15..601f361d 100644 --- a/src/Config.h +++ b/src/Config.h @@ -28,9 +28,9 @@ #define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 3 -#define VER_LAMEXP_TYPE Beta -#define VER_LAMEXP_PATCH 6 -#define VER_LAMEXP_BUILD 753 +#define VER_LAMEXP_TYPE RC +#define VER_LAMEXP_PATCH 1 +#define VER_LAMEXP_BUILD 754 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index fcc03cb2..21c9e90d 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -1029,7 +1029,8 @@ void MainWindow::windowShown(void) 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) + "
"; + messageText += "" + LINK(AboutDialog::neroAacUrl) + "

"; + messageText += NOBR(tr("(Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!)")).append("
"); QMessageBox::information(this, tr("AAC Encoder Outdated"), messageText); } } diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp index 331c9fe6..a8d12a58 100644 --- a/src/Dialog_Processing.cpp +++ b/src/Dialog_Processing.cpp @@ -833,7 +833,7 @@ void ProcessingDialog::systemTrayActivated(QSystemTrayIcon::ActivationReason rea bool ProcessingDialog::shutdownComputer(void) { - const int iTimeout = 30; + const int iTimeout = m_settings->hibernateComputer() ? 10 : 30; const Qt::WindowFlags flags = Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint; const QString text = QString("%1%2%1").arg(QString().fill(' ', 18), tr("Warning: Computer will shutdown in %1 seconds..."));