Handle one more plural correctly.

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 4f1f071..f265055 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -3143,10 +3143,12 @@
         <source>Aborted! Waiting for running jobs to terminate...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="570"/>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation type="unfinished"></translation>
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <location filename="../../src/Dialog_Processing.cpp" line="598"/>

diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index e375243..f04ba82 100644 (file)
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -2399,10 +2399,6 @@
         <translation>Abbruch! Laufende Jobs werden beendet...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>Kodiere: %1 von %2 Dateien abgeschlossen, bitte warten...</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation>Erzeuge Wiedergabeliste, bitte warten...</translation>
     </message>
@@ -2553,6 +2549,13 @@
             <numerusform>%n Millisekunden</numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
+        <translation>
+            <numerusform>Kodiere: %n Datei von %1 abgeschlossen, bitte warten...</numerusform>
+            <numerusform>Kodiere: %n Dateien von %1 abgeschlossen, bitte warten...</numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts
index 21cb15b..6e435ef 100644 (file)
--- a/etc/Translation/LameXP_EN.ts
+++ b/etc/Translation/LameXP_EN.ts
@@ -74,6 +74,14 @@
 <context>
     <name>ProcessingDialog</name>
     <message numerus="yes">
+        <location filename="../../src/Dialog_Processing.cpp" line="570"/>
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
+        <translation>
+            <numerusform>Encoding: %n file of %1 completed so far, please wait...</numerusform>
+            <numerusform>Encoding: %n files of %1 completed so far, please wait...</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="608"/>
         <source>Process was aborted by the user after %n file(s)!</source>
         <translation>

diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index 614049a..442939a 100644 (file)
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -2398,10 +2398,6 @@
         <translation>¡Cancelado! Esperando a que finalicen las tareas que se están ejecutando...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>Codificando: %1 de %2 archivos completados hasta ahora, espere por favor...</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation>Creando el archivo de lista de reproducción, espere por favor...</translation>
     </message>
@@ -2552,6 +2548,13 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>ProgressModel</name>

diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 952d894..cac45f0 100644 (file)
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -2408,10 +2408,6 @@ Ouvrir le dossier récursivement...</translation>
         <translation>Abandonné ! En attente pour la fin de l&apos;exécution des travaux...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>Encodage : %1 fichier(s) sur %2 terminé(s), patientez...</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation>Création de la liste de lecture, patientez...</translation>
     </message>
@@ -2562,6 +2558,13 @@ Ouvrir le dossier récursivement...</translation>
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</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 4fb6140..438171a 100644 (file)
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -2399,10 +2399,6 @@
         <translation>Fermato! Attendi che venga concluso il lavoro in corso...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>In codifica: %1 files di %2 completati finora, attendere prego...</translation>
-    </message>
-    <message>
         <source>LameXP - Aborted</source>
         <translation>LameXP - Abortito</translation>
     </message>
@@ -2553,6 +2549,13 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</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 486670d..4e887ff 100644 (file)
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -2402,10 +2402,6 @@
         <translation type="unfinished">중단됨! 종료를 위해 실행중인 작업을 대기중...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation type="unfinished">편집중: 현재 %1/%2 파일 완료됨, 잠시만 기다려 주십시오...</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation type="unfinished">재생 목록 파일 생성중, 잠시 기다려 주십시오...</translation>
     </message>
@@ -2539,6 +2535,12 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</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 6c4d78c..97e2f8e 100644 (file)
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -3160,10 +3160,14 @@
         <source>Aborted! Waiting for running jobs to terminate...</source>
         <translation type="unfinished">Przerwano! Czekanie na wyłączenie procesu...</translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="570"/>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation type="unfinished">Kompresja: Prosze czekać, jak dotąd wykonano %1 z %2 plików...</translation>
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <location filename="../../src/Dialog_Processing.cpp" line="598"/>

diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index 2b4c73b..ff38721 100644 (file)
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -2421,10 +2421,6 @@
         <translation type="unfinished">Отменено! Ожидание завершения запущенных заданий...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>Кодирование: %1 из %2 завершено.</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation type="unfinished">Создаю плэйлист, пожалуйста, подождите...</translation>
     </message>
@@ -2573,6 +2569,14 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</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 34264c9..1d81590 100644 (file)
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -3153,10 +3153,13 @@
         <source>Aborted! Waiting for running jobs to terminate...</source>
         <translation>Avbrutet! Väntar på att aktiva processer skall avslutas...</translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location filename="../../src/Dialog_Processing.cpp" line="570"/>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>Omkodning: %1 fil(er) av %2 bearbetade hittills, vänta...</translation>
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <location filename="../../src/Dialog_Processing.cpp" line="598"/>

diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts
index e2211d6..88c4d4b 100644 (file)
--- a/etc/Translation/LameXP_TW.ts
+++ b/etc/Translation/LameXP_TW.ts
@@ -2390,10 +2390,6 @@
         <translation>中止! 正在等待運行項目終止...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>編碼:到目前為止,已完成的 %2/%1 ,請稍候...</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation>創建播放列表文件,請稍候...</translation>
     </message>
@@ -2539,6 +2535,12 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</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 466ff44..a062595 100644 (file)
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -2411,10 +2411,6 @@
         <translation>Перервано! Чекаємо на завершення запущених завдань...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>Кодування: %1 файлів з %2 оброблено, будь ласка, зачекайте...</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation>Йде створення списку відтворення, будь ласка, зачекайте...</translation>
     </message>
@@ -2566,6 +2562,14 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</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 f80a3d7..f0b309c 100644 (file)
--- a/etc/Translation/LameXP_ZH.ts
+++ b/etc/Translation/LameXP_ZH.ts
@@ -2390,10 +2390,6 @@
         <translation>中止! 正在等待运行项目终止...</translation>
     </message>
     <message>
-        <source>Encoding: %1 files of %2 completed so far, please wait...</source>
-        <translation>编码:到目前为止,已完成的 %2/%1 ,请稍候...</translation>
-    </message>
-    <message>
         <source>Creating the playlist file, please wait...</source>
         <translation>创建播放列表文件,请稍候...</translation>
     </message>
@@ -2539,6 +2535,12 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message numerus="yes">
+        <source>Encoding: %n file(s) of %1 completed so far, please wait...</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 4c74057..987266c 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 5f1210d..a5d9a83 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 7d00fc6..dc06ae2 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 489a698..015a37e 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 1d4a0ed..ac5b692 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 ceee741..9090906 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 f376995..e7d1984 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 8f57e62..8d3c741 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 cf284b2..3440187 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 5a92862..a305816 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 455ef9b..a5fb325 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 a38ea39..d268aae 100644 (file)
Binary files a/res/localization/LameXP_ZH.qm and b/res/localization/LameXP_ZH.qm differ

diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index d0e64f2..eaf03bb 100644 (file)
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -567,7 +567,7 @@ void ProcessingDialog::doneEncoding(void)
        
        if(!m_userAborted)
        {
-               SET_PROGRESS_TEXT(tr("Encoding: %1 files of %2 completed so far, please wait...").arg(QString::number(ui->progressBar->value()), QString::number(ui->progressBar->maximum())));
+               SET_PROGRESS_TEXT(tr("Encoding: %n file(s) of %1 completed so far, please wait...", "", ui->progressBar->value()).arg(QString::number(ui->progressBar->maximum())));
                WinSevenTaskbar::setTaskbarProgress(this, ui->progressBar->value(), ui->progressBar->maximum());
        }