diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index f2650550..e9c1a130 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -3182,15 +3182,26 @@ Process finished after %1. - + - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + - + + + %n file(s) skipped + + + + + - Error: %1 of %2 files failed. Double-click failed items for detailed information! - + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + @@ -3202,10 +3213,12 @@ At least one file has failed! - + - All files completed successfully. Skipped %1 files. - + All files completed successfully. Skipped %n file(s). + + + diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index f04ba827..9e174077 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -2410,10 +2410,6 @@ Process was aborted by the user. Der Vorgang wurde vom Benutzer abgebrochen. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - Fehler: %1 von %2 Dateien sind fehlgeschlagen. Doppelklicken um detaillierte Informationen anzuzeigen! - LameXP - Error LameXP - Fehler @@ -2502,14 +2498,6 @@ Show All Items Alle Einträge anzeigen - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - Fehler: %1 von %2 Dateien sind fehlgeschlagen (%3 übersprungen). Doppelklicken um Details anzuzeigen! - - - All files completed successfully. Skipped %1 files. - Alle Dateien wurden erfolgreich umgewandelt. %1 Dateien wurden übersprungen. - None of the items matches the current filtering rules Keiner der Einträge entspricht den aktuellen Filterregeln @@ -2556,6 +2544,34 @@ Kodiere: %n Dateien von %1 abgeschlossen, bitte warten... + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + Fehler: %1 von %n Datei fehlgeschlagen (%2). Doppelklicken um Details anzuzeigen! + Fehler: %1 von %n Dateien fehlgeschlagen (%2). Doppelklicken um Details anzuzeigen! + + + + %n file(s) skipped + + %n Datei übersprungen + %n Dateien übersprungen + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + Fehler: %1 von %n Datei fehlgeschlagen. Doppelklicken um detaillierte Informationen anzuzeigen! + Fehler: %1 von %n Dateien fehlgeschlagen. Doppelklicken um detaillierte Informationen anzuzeigen! + + + + All files completed successfully. Skipped %n file(s). + + Alle Dateien wurden erfolgreich umgewandelt. %n Datei wurde übersprungen. + Alle Dateien wurden erfolgreich umgewandelt. %n Dateien wurden übersprungen. + + ProgressModel diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts index 6e435ef5..9c9ff0b2 100644 --- a/etc/Translation/LameXP_EN.ts +++ b/etc/Translation/LameXP_EN.ts @@ -89,6 +89,38 @@ Process was aborted by the user after %n files! + + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + Error: %1 of %n file failed (%2). Double-click failed items for detailed information! + Error: %1 of %n files failed (%2). Double-click failed items for detailed information! + + + + + %n file(s) skipped + + %n file skipped + %n files skipped + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + Error: %1 of %n file failed. Double-click failed items for detailed information! + Error: %1 of %n files failed. Double-click failed items for detailed information! + + + + + All files completed successfully. Skipped %n file(s). + + All files completed successfully. Skipped %n file. + All files completed successfully. Skipped %n files. + + %n hour(s) diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index a44d4601..f22f1e54 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -2409,10 +2409,6 @@ Process was aborted by the user. El proceso ha sido cancelado por el usuario. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - Error: %1 de %2 archivos fallidos. ¡Haga doble clic en los elementos fallidos para obtener información detallada! - LameXP - Error LameXP - Error @@ -2501,16 +2497,6 @@ Show All Items Mostrar todos los archivos - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - Plural: "Error: %1 de %2 archivos fallidos (%3 archivo omitidos). ¡Haga doble clic en los archivos para ver información más detallada!" - Error: %1 de %2 archivo fallido (%3 archivo omitido). ¡Haga doble clic en el archivo para ver información más detallada! - - - All files completed successfully. Skipped %1 files. - Plural: "Todos los archivos han sido procesados. Se han omitido %1 archivos." - Todos los archivos han sido procesados. Se ha omitido %1 archivo. - None of the items matches the current filtering rules Ninguno de los archivos concuerda con las reglas de filtrado @@ -2554,6 +2540,35 @@ Encoding: %n file(s) of %1 completed so far, please wait... + + + + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + + %n file(s) skipped + + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + + All files completed successfully. Skipped %n file(s). + + + diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index cac45f07..3d67c340 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -2419,10 +2419,6 @@ Ouvrir le dossier récursivement... Process was aborted by the user. Le processus a été abandonné par l'utilisateur. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - Erreur : %1 de %2 fichier(s) a échoué. Double-cliquez sur les éléments défectueux pour les informations détaillées! - LameXP - Error LameXP - Erreur @@ -2511,14 +2507,6 @@ Ouvrir le dossier récursivement... Show All Items - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - - - - All files completed successfully. Skipped %1 files. - - None of the items matches the current filtering rules @@ -2565,6 +2553,34 @@ Ouvrir le dossier récursivement... + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + + %n file(s) skipped + + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + + All files completed successfully. Skipped %n file(s). + + + + + ProgressModel diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 438171a6..32d71057 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -2406,10 +2406,6 @@ Process was aborted by the user. Il processo è stato abortito dall'utente. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - Errore: %1 di %2 files hanno fallito. Clicca due volte sull'elemento non riuscito per informazioni dettagliate! - LameXP - Error LameXP - Errore @@ -2502,14 +2498,6 @@ Show All Items - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - - - - All files completed successfully. Skipped %1 files. - - None of the items matches the current filtering rules @@ -2556,6 +2544,34 @@ + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + + %n file(s) skipped + + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + + All files completed successfully. Skipped %n file(s). + + + + + ProgressModel diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index 77117a8d..14b1680a 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -2418,10 +2418,6 @@ Process was aborted by the user. 처리가 사용자에 의해 중단되었습니다. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - 오류: %1 /%2 파일 실패됨. 자세한 정보를 보려면 실패된 항목을 더블 클릭하십시오! - LameXP - Error LameXP - 오류 @@ -2494,14 +2490,6 @@ Show All Items 모든 항목 표시 - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - 오류: %1 / %2 파일 실패됨 (%3 파일 건너뜀). 자세한 정보를 보려면 실패된 항목을 더블 클릭하십시오! - - - All files completed successfully. Skipped %1 files. - 모든 파일들이 성공적으로 완료되었습니다. %1 파일 건너뜀. - None of the items matches the current filtering rules 현재 필터링 규칙과 일치하지 항목이 없습니다. @@ -2542,6 +2530,30 @@ 인코딩: 현재 %n / %1 파일 완료됨, 잠시만 기다려 주십시오... + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + %n file(s) skipped + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + All files completed successfully. Skipped %n file(s). + + + + ProgressModel diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 97e2f8ec..19d84158 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -3203,15 +3203,41 @@ Process finished after %1. Proces został zakończony po %1. - + - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + - + + + %n file(s) skipped + + + + + + + - Error: %1 of %2 files failed. Double-click failed items for detailed information! - Błąd: %1 z %2 plików nie zostało skompresowanych. Kliknij dwukrotnie na plik aby zobaczyć szczegóły! + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + + + + All files completed successfully. Skipped %n file(s). + + + + + @@ -3223,11 +3249,6 @@ At least one file has failed! Przynajmniej jeden plik nie został skompresowany! - - - All files completed successfully. Skipped %1 files. - - diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index ff387216..ae29b6dd 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -2436,11 +2436,6 @@ Process was aborted by the user. Процесс был прерван пользователем. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - бред -_- - Ошибка с %1 из %2 файлов. Дважды щелкните по файлам с ошибкой для подробностей! - LameXP - Error LameXP - Ошибка @@ -2517,14 +2512,6 @@ Show All Items - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - - - - All files completed successfully. Skipped %1 files. - - None of the items matches the current filtering rules @@ -2577,6 +2564,38 @@ + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + + + %n file(s) skipped + + + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + + + All files completed successfully. Skipped %n file(s). + + + + + + ProgressModel diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts index c1638bf0..aa41e8ad 100644 --- a/etc/Translation/LameXP_SV.ts +++ b/etc/Translation/LameXP_SV.ts @@ -3194,15 +3194,37 @@ Process finished after %1. Åtgärden slutförd efter %1. - + - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - Fel! %1 av %2 filer misslyckades (%3 överhoppade). Dubbelklicka misslyckade objekt för detaljerad info! + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + - + + + %n file(s) skipped + + + + + + - Error: %1 of %2 files failed. Double-click failed items for detailed information! - Fel: %1 av %2 filer misslyckades. Dubbelklicka på det misslyckade objektet för detaljerad information! + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + + + All files completed successfully. Skipped %n file(s). + + + + @@ -3214,11 +3236,6 @@ At least one file has failed! Minst en fil har misslyckats! - - - All files completed successfully. Skipped %1 files. - Alla filer klara. %1 hoppades över. - diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts index 88c4d4bd..64cc9d2c 100644 --- a/etc/Translation/LameXP_TW.ts +++ b/etc/Translation/LameXP_TW.ts @@ -2401,10 +2401,6 @@ Process was aborted by the user. 進程被用戶終止. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - 錯誤: %1 的 %2 文件失敗.雙擊失敗的項目的詳細信息 ! - LameXP - Error LameXP - 錯誤 @@ -2493,14 +2489,6 @@ Show All Items - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - - - - All files completed successfully. Skipped %1 files. - - None of the items matches the current filtering rules @@ -2541,6 +2529,30 @@ + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + %n file(s) skipped + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + All files completed successfully. Skipped %n file(s). + + + + ProgressModel diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 2ea9527e..76901758 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -2426,10 +2426,6 @@ Process was aborted by the user. Процес було перервано користувачем. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - Помилка:збій при обробці %1 з %2 файлів. Подвійний клік мишею на записах зі збоєм для відображення детальної інформації! - LameXP - Error LameXP - Помилка @@ -2510,14 +2506,6 @@ Show All Items Відображати всі записи - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - Помилка: обробка %1 з %2 файлів завершилась невдачею (%3 файлів пропущено). Для одержання більш детальної інформації необхідно зробити подвійний клік на записах, що відповідають завершеним невдало елементам! - - - All files completed successfully. Skipped %1 files. - Обробка усіх файлів завершена успішно. Пропущено %1 файлів. - None of the items matches the current filtering rules Жодного запису не підпадає під поточні правила фільтрування @@ -2570,6 +2558,38 @@ + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + + + %n file(s) skipped + + + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + + + All files completed successfully. Skipped %n file(s). + + + + + + ProgressModel diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index f0b309cc..a43b8db4 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -2401,10 +2401,6 @@ Process was aborted by the user. 进程被用户终止. - - Error: %1 of %2 files failed. Double-click failed items for detailed information! - 错误: %1 的 %2 文件失败.双击失败的项目的详细信息 ! - LameXP - Error LameXP - 错误 @@ -2493,14 +2489,6 @@ Show All Items - - Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - - - - All files completed successfully. Skipped %1 files. - - None of the items matches the current filtering rules @@ -2541,6 +2529,30 @@ + + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! + + + + + + %n file(s) skipped + + + + + + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! + + + + + + All files completed successfully. Skipped %n file(s). + + + + ProgressModel diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 987266cb..29e24635 100644 Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ diff --git a/res/localization/LameXP_EN.qm b/res/localization/LameXP_EN.qm index a5d9a839..b3d7edb3 100644 Binary files a/res/localization/LameXP_EN.qm and b/res/localization/LameXP_EN.qm differ diff --git a/res/localization/LameXP_ES.qm b/res/localization/LameXP_ES.qm index dc06ae2f..0dbfd31a 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 015a37ed..dec0bc71 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 ac5b6927..9da67cef 100644 Binary files a/res/localization/LameXP_IT.qm and b/res/localization/LameXP_IT.qm differ diff --git a/res/localization/LameXP_KR.qm b/res/localization/LameXP_KR.qm index 90909063..b55a748b 100644 Binary files a/res/localization/LameXP_KR.qm and b/res/localization/LameXP_KR.qm differ diff --git a/res/localization/LameXP_PL.qm b/res/localization/LameXP_PL.qm index e7d19842..a4545dcf 100644 Binary files a/res/localization/LameXP_PL.qm and b/res/localization/LameXP_PL.qm differ diff --git a/res/localization/LameXP_RU.qm b/res/localization/LameXP_RU.qm index 8d3c741b..eb0501d7 100644 Binary files a/res/localization/LameXP_RU.qm and b/res/localization/LameXP_RU.qm differ diff --git a/res/localization/LameXP_SV.qm b/res/localization/LameXP_SV.qm index 3440187c..560cad08 100644 Binary files a/res/localization/LameXP_SV.qm and b/res/localization/LameXP_SV.qm differ diff --git a/res/localization/LameXP_TW.qm b/res/localization/LameXP_TW.qm index a305816a..6b96129f 100644 Binary files a/res/localization/LameXP_TW.qm and b/res/localization/LameXP_TW.qm differ diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm index 635f2b86..faa23ca3 100644 Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ diff --git a/res/localization/LameXP_ZH.qm b/res/localization/LameXP_ZH.qm index d268aae5..87accea0 100644 Binary files a/res/localization/LameXP_ZH.qm and b/res/localization/LameXP_ZH.qm differ diff --git a/src/Config.h b/src/Config.h index 83d01395..93e0ef8c 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 7 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 1233 +#define VER_LAMEXP_BUILD 1234 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp index eaf03bb7..675d1613 100644 --- a/src/Dialog_Processing.cpp +++ b/src/Dialog_Processing.cpp @@ -633,11 +633,11 @@ void ProcessingDialog::doneEncoding(void) WinSevenTaskbar::setOverlayIcon(this, &QIcon(":/icons/exclamation.png")); if(m_skippedJobs.count() > 0) { - SET_PROGRESS_TEXT(tr("Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!").arg(QString::number(m_failedJobs.count()), QString::number(m_failedJobs.count() + m_succeededJobs.count() + m_skippedJobs.count()), QString::number(m_skippedJobs.count()))); + SET_PROGRESS_TEXT(tr("Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!", "", m_failedJobs.count() + m_succeededJobs.count() + m_skippedJobs.count()).arg(QString::number(m_failedJobs.count()), tr("%n file(s) skipped", "", m_skippedJobs.count()))); } else { - SET_PROGRESS_TEXT(tr("Error: %1 of %2 files failed. Double-click failed items for detailed information!").arg(QString::number(m_failedJobs.count()), QString::number(m_failedJobs.count() + m_succeededJobs.count()))); + SET_PROGRESS_TEXT(tr("Error: %1 of %n file(s) failed. Double-click failed items for detailed information!", "", m_failedJobs.count() + m_succeededJobs.count()).arg(QString::number(m_failedJobs.count()))); } m_systemTray->showMessage(tr("LameXP - Error"), tr("At least one file has failed!"), QSystemTrayIcon::Critical); m_systemTray->setIcon(QIcon(":/icons/cd_delete.png")); @@ -651,7 +651,7 @@ void ProcessingDialog::doneEncoding(void) WinSevenTaskbar::setOverlayIcon(this, &QIcon(":/icons/accept.png")); if(m_skippedJobs.count() > 0) { - SET_PROGRESS_TEXT(tr("All files completed successfully. Skipped %1 files.").arg(QString::number(m_skippedJobs.count()))); + SET_PROGRESS_TEXT(tr("All files completed successfully. Skipped %n file(s).", "", m_skippedJobs.count())); } else {