Synced MP3 algorithm quality settings to LAME manual. Now we only use values 9, 7...

diff --git a/doc/Changelog.html b/doc/Changelog.html
index fb33e2d..ca3cef7 100644 (file)
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -33,6 +33,7 @@ a:visited { color: #0000EE; }
 <li>Updated language files (big thank-you to all contributors !!!)
 <li>Fixed handling of certain characters when passing meta tags on the command-line
 <li>Fixed Keccak library to not crash on systems without SSE/SSE2 support
+<li>Fixed LAME algorithm quality selector better match the LAME documentation (<a href="http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/html/detailed.html#q" target="_blank">link</a>)
 </ul><br>
 
 <a name="4.06"></a>Changes between v4.05 and v4.06 [2012-11-04]:<br><ul>

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 55ef578..fdf66d6 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -1740,7 +1740,7 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="718"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3905"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3902"/>
         <source>Access Denied</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1928,7 +1928,7 @@
         <location filename="../../src/Dialog_MainWindow.cpp" line="1372"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1449"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1989"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3848"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2494,7 +2494,7 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3540"/>
-        <source>Best Quality (Very Slow)</source>
+        <source>Best Quality (Slow)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2504,103 +2504,98 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3546"/>
-        <source>Average Quality (Default)</source>
+        <source>Acceptable Quality (Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3549"/>
-        <source>Low Quality (Fast)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3552"/>
         <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3837"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3834"/>
         <source>File name without extension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3838"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3835"/>
         <source>Track number with leading zero</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3839"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3836"/>
         <source>Track title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3840"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3837"/>
         <source>Artist name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3841"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3838"/>
         <source>Album name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3842"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3839"/>
         <source>Year with (at least) four digits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3843"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3840"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3842"/>
         <source>Characters forbidden in file names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3848"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
         <source>Rename Macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3861"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3858"/>
         <source>%n Instance(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3905"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3902"/>
         <source>Cannot write to the selected directory. Please choose another directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Overwrite Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Warning: This mode may overwrite existing files with no way to revert!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4090"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4087"/>
         <source>Already Running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4090"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4087"/>
         <source>LameXP is already running, please use the running instance!</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index c7ffd38..51c8d3b 100644 (file)
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -285,7 +285,7 @@
     </message>
     <message>
         <source>Valdec from AC3Filter Tools - AC3/DTS Decoder</source>
-        <translation type="unfinished"></translation>
+        <translation>Valdec aus den AC3Filter Tools - AC3/DTS Decoder</translation>
     </message>
 </context>
 <context>
@@ -1208,20 +1208,8 @@
         <translation>Bessere Qualität</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation>Beste Qualität (sehr langsam)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
-        <translation>Höhere Qualität (empfohlen)</translation>
-    </message>
-    <message>
-        <source>Average Quality (Default)</source>
-        <translation>Mittlere Qualität (Standard)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation>Niedrige Qualität (schnell)</translation>
+        <translation>Hohe Qualität (empfohlen)</translation>
     </message>
     <message>
         <source>Poor Quality (Very Fast)</source>
@@ -2018,6 +2006,14 @@
             <numerusform>%n Instanzen</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation>Beste Qualität (langsam)</translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation>Akzeptable Qualität (schnell)</translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts
index fea7af8..6a8fa9f 100644 (file)
--- a/etc/Translation/LameXP_EN.ts
+++ b/etc/Translation/LameXP_EN.ts
@@ -63,7 +63,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3861"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3858"/>
         <source>%n Instance(s)</source>
         <translation>
             <numerusform>%n Instance</numerusform>

diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index b113c0e..01e607d 100644 (file)
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1207,22 +1207,10 @@
         <translation>Mayor calidad</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation>Calidad muy alta (muy lento)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation>Calidad alta (recomendado)</translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation>Calidad media (predeterminado)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation>Calidad baja (rápido)</translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation>Calidad muy baja (muy rápido)</translation>
     </message>
@@ -2017,6 +2005,14 @@
             <numerusform>%n instancias</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 7844457..8a97f97 100644 (file)
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1213,23 +1213,10 @@ Votre dossier TEMP est situé ici:</translation>
         <translation>Meilleure qualité</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation>Meilleure qualité (très lent)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation>Haute qualité (recommandé)</translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation>Qualité moyenne (par défaut)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation>  
-Faible qualité (rapide)</translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation>Mauvaise qualité (très rapide)</translation>
     </message>
@@ -2027,6 +2014,14 @@ Ouvrir le dossier récursivement...</translation>
             <numerusform>%n Instances</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 7704153..ba6cca8 100644 (file)
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1208,22 +1208,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2018,6 +2006,14 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts
index d4347e3..cf5d33a 100644 (file)
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -1377,22 +1377,10 @@
         <translation type="unfinished">비압축</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation type="unfinished">최고 품질 (매우 느림)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation type="unfinished">높은 품질 (권장)</translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation type="unfinished">평균 품질 (기본)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation type="unfinished">낮은 품질 (빠름)</translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished">최저 품질 (매우 빠름)</translation>
     </message>
@@ -2010,6 +1998,14 @@
             <numerusform>%n 인스턴스</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index ce57827..c5eb619 100644 (file)
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -1747,7 +1747,7 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="718"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3905"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3902"/>
         <source>Access Denied</source>
         <translation type="unfinished">Dostęp zablokowany</translation>
     </message>
@@ -1877,7 +1877,7 @@
         <location filename="../../src/Dialog_MainWindow.cpp" line="1372"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1449"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1989"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3848"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
         <source>Discard</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
@@ -2509,8 +2509,13 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3540"/>
-        <source>Best Quality (Very Slow)</source>
-        <translation type="unfinished">Najlepsza jakość (Bardzo wolno)</translation>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3546"/>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3543"/>
@@ -2518,67 +2523,57 @@
         <translation type="unfinished">Wysoka jakość (Zalecane)</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3546"/>
-        <source>Average Quality (Default)</source>
-        <translation type="unfinished">Średnia jakość (Domyślnie)</translation>
-    </message>
-    <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3549"/>
-        <source>Low Quality (Fast)</source>
-        <translation type="unfinished">Niska jakość (Szybko)</translation>
-    </message>
-    <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3552"/>
         <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished">Najniższa jakość (Bardzo szybko)</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3837"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3834"/>
         <source>File name without extension</source>
         <translation type="unfinished">Nazwa pliku bez rozszerzenia</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3838"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3835"/>
         <source>Track number with leading zero</source>
         <translation type="unfinished">Numer ścieżki z zerem na początku</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3839"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3836"/>
         <source>Track title</source>
         <translation type="unfinished">Nazwa ścieżki</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3840"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3837"/>
         <source>Artist name</source>
         <translation type="unfinished">Nazwa Artysty</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3841"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3838"/>
         <source>Album name</source>
         <translation type="unfinished">Nazwa Albumu</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3842"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3839"/>
         <source>Year with (at least) four digits</source>
         <translation type="unfinished">Rok z (przynajmniej) czterema cyframi</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3843"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3840"/>
         <source>Comment</source>
         <translation type="unfinished">Komentarz</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3842"/>
         <source>Characters forbidden in file names:</source>
         <translation type="unfinished">Zabronione znaki w nazwach plików:</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3848"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
         <source>Rename Macros</source>
         <translation type="unfinished">Zmień nazwy makr</translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3861"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3858"/>
         <source>%n Instance(s)</source>
         <translation type="unfinished">
             <numerusform>%n wątek</numerusform>
@@ -2587,37 +2582,37 @@
         </translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3905"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3902"/>
         <source>Cannot write to the selected directory. Please choose another directory!</source>
         <translation type="unfinished">Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację!</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Overwrite Mode</source>
         <translation type="unfinished">Tryb nadpisywania</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Warning: This mode may overwrite existing files with no way to revert!</source>
         <translation type="unfinished">Ostrzeżenie: W tym trybie istniejące pliki będą nadpisywane bez możliwości ich odzyskania!</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Continue</source>
         <translation type="unfinished">Kontynuuj</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Revert</source>
         <translation type="unfinished">Cofnij</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4090"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4087"/>
         <source>Already Running</source>
         <translation type="unfinished">Już działa</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4090"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4087"/>
         <source>LameXP is already running, please use the running instance!</source>
         <translation type="unfinished">LameXP już działa, przejdź do działającego procesu!</translation>
     </message>

diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index d8795a0..2ed621d 100644 (file)
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -1319,22 +1319,10 @@
         <translation type="unfinished">Несжатый</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation type="unfinished">Наилучшее качество (очень медленно)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation type="unfinished">Высокое качество (рекомендуется)</translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation type="unfinished">Среднее качество (по умолчанию)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation type="unfinished">Низкое качество (быстро)</translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished">Плохое качество (Очень быстро)</translation>
     </message>
@@ -2031,6 +2019,14 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index 54dbf29..641a6d5 100644 (file)
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -1744,7 +1744,7 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="718"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3905"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3902"/>
         <source>Access Denied</source>
         <translation>Åtkomst nekad</translation>
     </message>
@@ -1936,7 +1936,7 @@
         <location filename="../../src/Dialog_MainWindow.cpp" line="1372"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1449"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1989"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3848"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
         <source>Discard</source>
         <translation>Stäng</translation>
     </message>
@@ -2502,8 +2502,13 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3540"/>
-        <source>Best Quality (Very Slow)</source>
-        <translation>Bäst kvallitet (långsam)</translation>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3546"/>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3543"/>
@@ -2511,67 +2516,57 @@
         <translation>Hög kvallitet (rekommenderas)</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3546"/>
-        <source>Average Quality (Default)</source>
-        <translation>Medelkvallitet (standard)</translation>
-    </message>
-    <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="3549"/>
-        <source>Low Quality (Fast)</source>
-        <translation>Låg kvallitet (snabb)</translation>
-    </message>
-    <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3552"/>
         <source>Poor Quality (Very Fast)</source>
         <translation>Dålig kvallitet (mycket snabb)</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3837"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3834"/>
         <source>File name without extension</source>
         <translation>Filnamn utan filtillägg</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3838"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3835"/>
         <source>Track number with leading zero</source>
         <translation>Spårnummer med inledande nolla</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3839"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3836"/>
         <source>Track title</source>
         <translation>Spårtitel</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3840"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3837"/>
         <source>Artist name</source>
         <translation>Artistnamn</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3841"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3838"/>
         <source>Album name</source>
         <translation>Albumnamn</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3842"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3839"/>
         <source>Year with (at least) four digits</source>
         <translation>Årtal med (minst) fyra siffror</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3843"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3840"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3842"/>
         <source>Characters forbidden in file names:</source>
         <translation>Förbjudna tecken i filnamn:</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3848"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3845"/>
         <source>Rename Macros</source>
         <translation>Namnändra macron</translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3861"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3858"/>
         <source>%n Instance(s)</source>
         <translation>
             <numerusform>%n instans</numerusform>
@@ -2579,37 +2574,37 @@
         </translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3905"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3902"/>
         <source>Cannot write to the selected directory. Please choose another directory!</source>
         <translation>Kan inte skriva till den specificerade mappen. Välj en annan destination!</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Overwrite Mode</source>
         <translation>Överskrivningsläge</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Warning: This mode may overwrite existing files with no way to revert!</source>
         <translation>Varning! Det här läget kan skriva över befintliga filer, utan möjlighet att återskapa!</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Continue</source>
         <translation>Fortsätt</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4025"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4022"/>
         <source>Revert</source>
         <translation>Återställ</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4090"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4087"/>
         <source>Already Running</source>
         <translation>Körs redan</translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="4090"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="4087"/>
         <source>LameXP is already running, please use the running instance!</source>
         <translation>LameXP körs redan, använd den redan startade instansen!</translation>
     </message>

diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts
index dacf996..49f74c3 100644 (file)
--- a/etc/Translation/LameXP_TW.ts
+++ b/etc/Translation/LameXP_TW.ts
@@ -1204,22 +1204,10 @@
         <translation>更好的質量</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation>最好的質量(很慢)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation>高質量(推薦)</translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation>平均質量 (默認值)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation>低質量 (快速)</translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation>質量差(非常快)</translation>
     </message>
@@ -2009,6 +1997,14 @@
             <numerusform>%n 個實例</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 4bd1ff2..f906a00 100644 (file)
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -1291,22 +1291,10 @@
         <translation>Нестиснутий</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation>Найкраща якість (Дуже повільно)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation>Висока якість (Рекомендовано)</translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation>Середня якість (Типово)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation>Низька якість (Швидко)</translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation>Дуже низька якість (Дуже швидко)</translation>
     </message>
@@ -2026,6 +2014,14 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts
index cbead66..c241d61 100644 (file)
--- a/etc/Translation/LameXP_ZH.ts
+++ b/etc/Translation/LameXP_ZH.ts
@@ -1204,22 +1204,10 @@
         <translation>更好的质量</translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
-        <translation>最好的质量(很慢)</translation>
-    </message>
-    <message>
         <source>High Quality (Recommended)</source>
         <translation>高质量(推荐)</translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
-        <translation>平均质量 (默认值)</translation>
-    </message>
-    <message>
-        <source>Low Quality (Fast)</source>
-        <translation>低质量 (快速)</translation>
-    </message>
-    <message>
         <source>Poor Quality (Very Fast)</source>
         <translation>质量差(非常快)</translation>
     </message>
@@ -2009,6 +1997,14 @@
             <numerusform>%n 个实例</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Best Quality (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Acceptable Quality (Fast)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 23613cb..afeb23b 100644 (file)
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -1669,13 +1669,13 @@
                      <item row="1" column="1" colspan="3">
                       <widget class="QSlider" name="sliderLameAlgoQuality">
                        <property name="maximum">
-                        <number>4</number>
+                        <number>3</number>
                        </property>
                        <property name="pageStep">
                         <number>1</number>
                        </property>
                        <property name="value">
-                        <number>3</number>
+                        <number>2</number>
                        </property>
                        <property name="orientation">
                         <enum>Qt::Horizontal</enum>

diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index df05ba4..e22deac 100644 (file)
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ

diff --git a/res/localization/LameXP_ES.qm b/res/localization/LameXP_ES.qm
index d3512c7..bc2028d 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 24cb2c6..87fc549 100644 (file)
Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ

diff --git a/res/localization/LameXP_KR.qm b/res/localization/LameXP_KR.qm
index 055d6e4..5f0b66d 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 940e2ab..cad8336 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 dc1b305..5fbf9f3 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 7547260..8fbb31e 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 7d16816..9f08ca5 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 5133481..0e0e078 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 836833b..36e4136 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 48d1358..7697833 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                                       9
-#define VER_LAMEXP_BUILD                                       1255
+#define VER_LAMEXP_BUILD                                       1256
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)

diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index c77422f..cd203be 100644 (file)
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -3536,17 +3536,14 @@ void MainWindow::updateLameAlgoQuality(int value)
 
        switch(value)
        {
-       case 4:
-               text = tr("Best Quality (Very Slow)");
-               break;
        case 3:
-               text = tr("High Quality (Recommended)");
+               text = tr("Best Quality (Slow)");
                break;
        case 2:
-               text = tr("Average Quality (Default)");
+               text = tr("High Quality (Recommended)");
                break;
        case 1:
-               text = tr("Low Quality (Fast)");
+               text = tr("Acceptable Quality (Fast)");
                break;
        case 0:
                text = tr("Poor Quality (Very Fast)");
@@ -3559,7 +3556,7 @@ void MainWindow::updateLameAlgoQuality(int value)
                ui->labelLameAlgoQuality->setText(text);
        }
 
-       bool warning = (value == 0), notice = (value == 4);
+       bool warning = (value == 0), notice = (value == 3);
        ui->labelLameAlgoQualityWarning->setVisible(warning);
        ui->labelLameAlgoQualityWarningIcon->setVisible(warning);
        ui->labelLameAlgoQualityNotice->setVisible(notice);

diff --git a/src/Encoder_MP3.cpp b/src/Encoder_MP3.cpp
index e4c0c96..c702e1b 100644 (file)
--- a/src/Encoder_MP3.cpp
+++ b/src/Encoder_MP3.cpp
@@ -28,7 +28,7 @@
 #include <QDir>
 #include <limits.h>
 
-static const int g_lameAgorithmQualityLUT[] = {9, 7, 5, 2, 0, INT_MAX};
+static const int g_lameAgorithmQualityLUT[] = {9, 7, 3, 0, INT_MAX};
 
 MP3Encoder::MP3Encoder(void)
 :
@@ -61,14 +61,14 @@ bool MP3Encoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
        switch(m_configRCMode)
        {
        case SettingsModel::VBRMode:
-               args << "-V" << QString::number(9 - qMin(9, m_configBitrate));
+               args << "-V" << QString::number(9 - qBound(0, m_configBitrate, 9));
                break;
        case SettingsModel::ABRMode:
-               args << "--abr" << QString::number(SettingsModel::mp3Bitrates[qMax(0, qMin(13, m_configBitrate))]);
+               args << "--abr" << QString::number(SettingsModel::mp3Bitrates[qBound(0, m_configBitrate, 13)]);
                break;
        case SettingsModel::CBRMode:
                args << "--cbr";
-               args << "-b" << QString::number(SettingsModel::mp3Bitrates[qMax(0, qMin(13, m_configBitrate))]);
+               args << "-b" << QString::number(SettingsModel::mp3Bitrates[qBound(0, m_configBitrate, 13)]);
                break;
        default:
                throw "Bad rate-control mode!";

diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index c1735ce..21de443 100644 (file)
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -404,7 +404,7 @@ LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled, true)
 LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled, !lamexp_portable_mode())
 LAMEXP_MAKE_OPTION_S(currentLanguage, defaultLanguage())
 LAMEXP_MAKE_OPTION_S(currentLanguageFile, QString())
-LAMEXP_MAKE_OPTION_I(lameAlgoQuality, 3)
+LAMEXP_MAKE_OPTION_I(lameAlgoQuality, 2)
 LAMEXP_MAKE_OPTION_I(lameChannelMode, 0)
 LAMEXP_MAKE_OPTION_B(forceStereoDownmix, false)
 LAMEXP_MAKE_OPTION_B(bitrateManagementEnabled, false)