Handle two more plurals correctly.

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index f265055..e9c1a13 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -3182,15 +3182,26 @@
         <source>Process finished after %1.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="636"/>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="636"/>
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="640"/>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <location filename="../../src/Dialog_Processing.cpp" line="642"/>
@@ -3202,10 +3213,12 @@
         <source>At least one file has failed!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="654"/>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished"></translation>
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <location filename="../../src/Dialog_Processing.cpp" line="658"/>

diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index f04ba82..9e17407 100644 (file)
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -2411,10 +2411,6 @@
         <translation>Der Vorgang wurde vom Benutzer abgebrochen.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>Fehler: %1 von %2 Dateien sind fehlgeschlagen. Doppelklicken um detaillierte Informationen anzuzeigen!</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - Fehler</translation>
     </message>
@@ -2503,14 +2499,6 @@
         <translation>Alle Einträge anzeigen</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation>Fehler: %1 von %2 Dateien sind fehlgeschlagen (%3 übersprungen). Doppelklicken um Details anzuzeigen!</translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation>Alle Dateien wurden erfolgreich umgewandelt. %1 Dateien wurden übersprungen.</translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation>Keiner der Einträge entspricht den aktuellen Filterregeln</translation>
     </message>
@@ -2556,6 +2544,34 @@
             <numerusform>Kodiere: %n Dateien von %1 abgeschlossen, bitte warten...</numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation>
+            <numerusform>Fehler: %1 von %n Datei fehlgeschlagen (%2). Doppelklicken um Details anzuzeigen!</numerusform>
+            <numerusform>Fehler: %1 von %n Dateien fehlgeschlagen (%2). Doppelklicken um Details anzuzeigen!</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation>
+            <numerusform>%n Datei übersprungen</numerusform>
+            <numerusform>%n Dateien übersprungen</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation>
+            <numerusform>Fehler: %1 von %n Datei fehlgeschlagen. Doppelklicken um detaillierte Informationen anzuzeigen!</numerusform>
+            <numerusform>Fehler: %1 von %n Dateien fehlgeschlagen. Doppelklicken um detaillierte Informationen anzuzeigen!</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation>
+            <numerusform>Alle Dateien wurden erfolgreich umgewandelt. %n Datei wurde übersprungen.</numerusform>
+            <numerusform>Alle Dateien wurden erfolgreich umgewandelt. %n Dateien wurden übersprungen.</numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts
index 6e435ef..9c9ff0b 100644 (file)
--- a/etc/Translation/LameXP_EN.ts
+++ b/etc/Translation/LameXP_EN.ts
@@ -90,6 +90,38 @@
         </translation>
     </message>
     <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="636"/>
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation>
+            <numerusform>Error: %1 of %n file failed (%2). Double-click failed items for detailed information!</numerusform>
+            <numerusform>Error: %1 of %n files failed (%2). Double-click failed items for detailed information!</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="636"/>
+        <source>%n file(s) skipped</source>
+        <translation>
+            <numerusform>%n file skipped</numerusform>
+            <numerusform>%n files skipped</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="640"/>
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation>
+            <numerusform>Error: %1 of %n file failed. Double-click failed items for detailed information!</numerusform>
+            <numerusform>Error: %1 of %n files failed. Double-click failed items for detailed information!</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="654"/>
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation>
+            <numerusform>All files completed successfully. Skipped %n file.</numerusform>
+            <numerusform>All files completed successfully. Skipped %n files.</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="1291"/>
         <source>%n hour(s)</source>
         <translation>

diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index a44d460..f22f1e5 100644 (file)
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -2410,10 +2410,6 @@
         <translation>El proceso ha sido cancelado por el usuario.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>Error: %1 de %2 archivos fallidos. ¡Haga doble clic en los elementos fallidos para obtener información detallada!</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - Error</translation>
     </message>
@@ -2502,16 +2498,6 @@
         <translation>Mostrar todos los archivos</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translatorcomment>Plural: &quot;Error: %1 de %2 archivos fallidos (%3 archivo omitidos). ¡Haga doble clic en los archivos para ver información más detallada!&quot;</translatorcomment>
-        <translation>Error: %1 de %2 archivo fallido (%3 archivo omitido). ¡Haga doble clic en el archivo para ver información más detallada!</translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translatorcomment>Plural: &quot;Todos los archivos han sido procesados. Se han omitido %1 archivos.&quot;</translatorcomment>
-        <translation>Todos los archivos han sido procesados. Se ha omitido %1 archivo.</translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation>Ninguno de los archivos concuerda con las reglas de filtrado</translation>
     </message>
@@ -2554,6 +2540,35 @@
         <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
         <translation>
             <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
 </context>

diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index cac45f0..3d67c34 100644 (file)
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -2420,10 +2420,6 @@ Ouvrir le dossier récursivement...</translation>
         <translation>Le processus a été abandonné par l&apos;utilisateur.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>Erreur : %1 de %2 fichier(s) a échoué. Double-cliquez sur les éléments défectueux pour les informations détaillées!</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - Erreur</translation>
     </message>
@@ -2512,14 +2508,6 @@ Ouvrir le dossier récursivement...</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2565,6 +2553,34 @@ Ouvrir le dossier récursivement...</translation>
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 438171a..32d7105 100644 (file)
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -2407,10 +2407,6 @@
         <translation>Il processo è stato abortito dall&apos;utente.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>Errore: %1 di %2 files hanno fallito. Clicca due volte sull&apos;elemento non riuscito per informazioni dettagliate!</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - Errore</translation>
     </message>
@@ -2503,14 +2499,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2556,6 +2544,34 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts
index 77117a8..14b1680 100644 (file)
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -2419,10 +2419,6 @@
         <translation type="unfinished">처리가 사용자에 의해 중단되었습니다.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation type="unfinished">오류: %1 /%2 파일 실패됨. 자세한 정보를 보려면 실패된 항목을 더블 클릭하십시오!</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation type="unfinished">LameXP - 오류</translation>
     </message>
@@ -2495,14 +2491,6 @@
         <translation type="unfinished">모든 항목 표시</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished">오류: %1 / %2 파일 실패됨 (%3 파일 건너뜀). 자세한 정보를 보려면 실패된 항목을 더블 클릭하십시오!</translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished">모든 파일들이 성공적으로 완료되었습니다. %1 파일 건너뜀.</translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation>현재 필터링 규칙과 일치하지 항목이 없습니다.</translation>
     </message>
@@ -2542,6 +2530,30 @@
             <numerusform>인코딩: 현재 %n / %1 파일 완료됨, 잠시만 기다려 주십시오...</numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index 97e2f8e..19d8415 100644 (file)
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -3203,15 +3203,41 @@
         <source>Process finished after %1.</source>
         <translation type="unfinished">Proces został zakończony po %1.</translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="636"/>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="636"/>
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="640"/>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation type="unfinished">Błąd: %1 z %2 plików nie zostało skompresowanych. Kliknij dwukrotnie na plik aby zobaczyć szczegóły!</translation>
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="654"/>
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <location filename="../../src/Dialog_Processing.cpp" line="642"/>
@@ -3224,11 +3250,6 @@
         <translation type="unfinished">Przynajmniej jeden plik nie został skompresowany!</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_Processing.cpp" line="654"/>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../../src/Dialog_Processing.cpp" line="658"/>
         <location filename="../../src/Dialog_Processing.cpp" line="660"/>
         <source>All files completed successfully.</source>

diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index ff38721..ae29b6d 100644 (file)
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -2437,11 +2437,6 @@
         <translation type="unfinished">Процесс был прерван пользователем.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translatorcomment>бред -_-</translatorcomment>
-        <translation type="unfinished">Ошибка с %1 из %2 файлов. Дважды щелкните по файлам с ошибкой для подробностей!</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - Ошибка</translation>
     </message>
@@ -2518,14 +2513,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2577,6 +2564,38 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index c1638bf..aa41e8a 100644 (file)
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -3194,15 +3194,37 @@
         <source>Process finished after %1.</source>
         <translation>Åtgärden slutförd efter %1.</translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="636"/>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation>Fel! %1 av %2 filer misslyckades (%3 överhoppade). Dubbelklicka misslyckade objekt för detaljerad info!</translation>
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="636"/>
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="640"/>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>Fel: %1 av %2 filer misslyckades. Dubbelklicka på det misslyckade objektet för detaljerad information!</translation>
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="654"/>
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <location filename="../../src/Dialog_Processing.cpp" line="642"/>
@@ -3215,11 +3237,6 @@
         <translation>Minst en fil har misslyckats!</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_Processing.cpp" line="654"/>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation>Alla filer klara. %1 hoppades över.</translation>
-    </message>
-    <message>
         <location filename="../../src/Dialog_Processing.cpp" line="658"/>
         <location filename="../../src/Dialog_Processing.cpp" line="660"/>
         <source>All files completed successfully.</source>

diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts
index 88c4d4b..64cc9d2 100644 (file)
--- a/etc/Translation/LameXP_TW.ts
+++ b/etc/Translation/LameXP_TW.ts
@@ -2402,10 +2402,6 @@
         <translation>進程被用戶終止.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>錯誤: %1 的 %2 文件失敗.雙擊失敗的項目的詳細信息 !</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - 錯誤</translation>
     </message>
@@ -2494,14 +2490,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2541,6 +2529,30 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 2ea9527..7690175 100644 (file)
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -2427,10 +2427,6 @@
         <translation>Процес було перервано користувачем.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>Помилка:збій при обробці %1 з %2 файлів. Подвійний клік мишею на записах зі збоєм для відображення детальної інформації!</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - Помилка</translation>
     </message>
@@ -2511,14 +2507,6 @@
         <translation>Відображати всі записи</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation>Помилка: обробка %1 з %2 файлів завершилась невдачею (%3 файлів пропущено). Для одержання більш детальної інформації необхідно зробити подвійний клік на записах, що відповідають завершеним невдало елементам!</translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation>Обробка усіх файлів завершена успішно. Пропущено %1 файлів.</translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation>Жодного запису не підпадає під поточні правила фільтрування</translation>
     </message>
@@ -2570,6 +2558,38 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts
index f0b309c..a43b8db 100644 (file)
--- a/etc/Translation/LameXP_ZH.ts
+++ b/etc/Translation/LameXP_ZH.ts
@@ -2402,10 +2402,6 @@
         <translation>进程被用户终止.</translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
-        <translation>错误: %1 的 %2 文件失败.双击失败的项目的详细信息 !</translation>
-    </message>
-    <message>
         <source>LameXP - Error</source>
         <translation>LameXP - 错误</translation>
     </message>
@@ -2494,14 +2490,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files completed successfully. Skipped %1 files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>None of the items matches the current filtering rules</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2541,6 +2529,30 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>All files completed successfully. Skipped %n file(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index 987266c..29e2463 100644 (file)
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 a5d9a83..b3d7edb 100644 (file)
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 dc06ae2..0dbfd31 100644 (file)
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 015a37e..dec0bc7 100644 (file)
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 ac5b692..9da67ce 100644 (file)
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 9090906..b55a748 100644 (file)
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 e7d1984..a4545dc 100644 (file)
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 8d3c741..eb0501d 100644 (file)
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 3440187..560cad0 100644 (file)
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 a305816..6b96129 100644 (file)
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 635f2b8..faa23ca 100644 (file)
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 d268aae..87accea 100644 (file)
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 83d0139..93e0ef8 100644 (file)
--- 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 eaf03bb..675d161 100644 (file)
--- 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
                        {