fixed '--help' output

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2561 90c681e8-e032-0410-971d-27865f9a5e38

21 files changed, 242 insertions, 161 deletions

diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp
index 50e834f05..6f8fae9c4 100644
--- a/src/app/builtincommandlineoption.cpp
+++ b/src/app/builtincommandlineoption.cpp
@@ -56,19 +56,19 @@ bool BuiltinCommandLineOption::identify(const QString &str) const
 const QString BuiltinCommandLineOption::helpString() const
 {
     return QString(
-               "-e, --enqueue        "+tr("Don't clear the playlist") + "\n" +
-               "-p, --play           "+tr("Start playing current song")+"\n" +
-               "-u, --pause          "+tr("Pause current song")+ "\n"
-               "-t, --play-pause     "+tr("Pause if playing, play otherwise")+ "\n"
-               "-s, --stop           "+tr("Stop current song")+ "\n" +
-               "-j, --jump-to-file   "+tr("Display Jump to File dialog")+ "\n" +
-               "-q, --quit           "+tr("Quit application") + "\n" +
-               "--volume <0..100>    "+tr("Set playback volume (example: qmmp --volume 20)") + "\n"
-               "--next               "+tr("Skip forward in playlist")+ "\n" +
-               "--previous           "+tr("Skip backwards in playlist")+"\n" +
-               "--toggle-visibility  "+tr("Show/hide application")+ "\n" +
-               "--add-file           "+tr("Display Add File dialog")+ "\n" +
-               "--add-dir            "+tr("Display Add Directory dialog")
+               "-e, --enqueue            "+tr("Don't clear the playlist") + "\n" +
+               "-p, --play               "+tr("Start playing current song")+"\n" +
+               "-u, --pause              "+tr("Pause current song")+ "\n"
+               "-t, --play-pause         "+tr("Pause if playing, play otherwise")+ "\n"
+               "-s, --stop               "+tr("Stop current song")+ "\n" +
+               "-j, --jump-to-file       "+tr("Display Jump to File dialog")+ "\n" +
+               "-q, --quit               "+tr("Quit application") + "\n" +
+               "--volume <0..100>        "+tr("Set playback volume (example: qmmp --volume 20)") + "\n"
+               "--next                   "+tr("Skip forward in playlist")+ "\n" +
+               "--previous               "+tr("Skip backwards in playlist")+"\n" +
+               "--toggle-visibility      "+tr("Show/hide application")+ "\n" +
+               "--add-file               "+tr("Display Add File dialog")+ "\n" +
+               "--add-dir                "+tr("Display Add Directory dialog")
            );
 }
 
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index 507880174..36bb87a3d 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -260,14 +260,15 @@ void QMMPStarter::printUsage()
     cout << "--------" << endl;
     cout << qPrintable(m_option_manager->helpString()) << endl;
     CommandLineManager::printUsage();
-    cout << "--no-start           " << qPrintable(tr("Don't start the application")) << endl;
-    cout << "--help               " << qPrintable(tr("Display this text and exit")) << endl;
-    cout << "--version            " << qPrintable(tr("Print version number and exit")) << endl;
+    cout << "--no-start               " << qPrintable(tr("Don't start the application")) << endl;
+    cout << "--help                   " << qPrintable(tr("Display this text and exit")) << endl;
+    cout << "--version                " << qPrintable(tr("Print version number and exit")) << endl;
     cout << qPrintable(tr("Ideas, patches, bugreports send to forkotov02@hotmail.ru")) << endl;
 }
 
 void QMMPStarter::printVersion()
 {
-    cout << qPrintable(tr("QMMP version:")) << " " << qPrintable(Qmmp::strVersion()) << endl;
-    cout << qPrintable(tr("Qt version:")) << " " << QT_VERSION_STR << endl;
+    cout << qPrintable(tr("QMMP version: %1").arg(Qmmp::strVersion())) << endl;
+    cout << qPrintable(tr("Compiled with Qt version: %1").arg(QT_VERSION_STR)) << endl;
+    cout << qPrintable(tr("Using Qt version: %1").arg(qVersion())) << endl;
 }
diff --git a/src/app/translations/qmmp_cs.ts b/src/app/translations/qmmp_cs.ts
index b84da6df1..06b9347a7 100644
--- a/src/app/translations/qmmp_cs.ts
+++ b/src/app/translations/qmmp_cs.ts
@@ -97,6 +97,21 @@
         <translation>Nápady, patche, hlášení chyb posílejte na forkotov02@hotmail.ru (anglicky)</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Zobrazit tento text a skončit</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>Neznámý příkaz</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Verze QMMP:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Verze Qt:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_de.ts b/src/app/translations/qmmp_de.ts
index 03d24c804..cddefb708 100644
--- a/src/app/translations/qmmp_de.ts
+++ b/src/app/translations/qmmp_de.ts
@@ -97,6 +97,21 @@
         <translation>Ideen, Patches und Bugreports an &lt;forkotov02@hotmail.ru&gt; senden</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Zeigt diesen Hilfetext an</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>Unbekannter Befehl</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Qmmp-Version:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt-Version:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_es.ts b/src/app/translations/qmmp_es.ts
index fd4a79c59..b7b6c9d44 100644
--- a/src/app/translations/qmmp_es.ts
+++ b/src/app/translations/qmmp_es.ts
@@ -92,9 +92,19 @@
         <translation>Enviar ideas, parches, errores a: forkotov02@hotmail.ru</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Versión de Qt:</translation>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
@@ -111,10 +121,5 @@
         <source>Don&apos;t start the application</source>
         <translation>No iniciar la aplicación</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Versión de QMMP: </translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_hu.ts b/src/app/translations/qmmp_hu.ts
index 25c16d71c..f3e8dbbb3 100644
--- a/src/app/translations/qmmp_hu.ts
+++ b/src/app/translations/qmmp_hu.ts
@@ -108,13 +108,18 @@
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>QMMP verzió:</translation>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt verzió:</translation>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_it.ts b/src/app/translations/qmmp_it.ts
index 9a8a4b425..c34f22ebd 100644
--- a/src/app/translations/qmmp_it.ts
+++ b/src/app/translations/qmmp_it.ts
@@ -92,9 +92,19 @@
         <translation>Per idee, modifiche, segnalazione di errori scrivire a: forkotov02@hotmail.ru</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Versione Qt:</translation>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
@@ -111,10 +121,5 @@
         <source>Don&apos;t start the application</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Versione di Qmmp: </translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_ja.ts b/src/app/translations/qmmp_ja.ts
index 031ef8148..153cbee86 100644
--- a/src/app/translations/qmmp_ja.ts
+++ b/src/app/translations/qmmp_ja.ts
@@ -108,13 +108,18 @@
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>QMMP のバージョン:</translation>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt のバージョン:</translation>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_lt.ts b/src/app/translations/qmmp_lt.ts
index 1ee096b8b..747150075 100644
--- a/src/app/translations/qmmp_lt.ts
+++ b/src/app/translations/qmmp_lt.ts
@@ -108,13 +108,18 @@
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>QMMP versija:</translation>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt versija:</translation>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_nl.ts b/src/app/translations/qmmp_nl.ts
index a47d5cc8f..15d0d1ba1 100644
--- a/src/app/translations/qmmp_nl.ts
+++ b/src/app/translations/qmmp_nl.ts
@@ -97,6 +97,21 @@
         <translation>Ideëen, patches, foutrapporten zenden naar forkotov02@hotmail.ru (anglicky)</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Toon dit tekstje en sluit</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>Onbekend commando</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>QMMP versie:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt versie:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_pl_PL.ts b/src/app/translations/qmmp_pl_PL.ts
index 357e0cad4..6cbb16510 100644
--- a/src/app/translations/qmmp_pl_PL.ts
+++ b/src/app/translations/qmmp_pl_PL.ts
@@ -97,6 +97,21 @@
         <translation>Pomysły, poprawki, raporty o błędach proszę wysyłać na forkotov02@hotmail.ru</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Wyświetla ten tekst i wychodzi</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>Nieznane polecenie</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Wersja QMMP:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Wersja QT:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_pt_BR.ts b/src/app/translations/qmmp_pt_BR.ts
index c7f393d82..61d3f86f9 100644
--- a/src/app/translations/qmmp_pt_BR.ts
+++ b/src/app/translations/qmmp_pt_BR.ts
@@ -97,23 +97,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qmmpstarter.cpp" line="264"/>
-        <source>Display this text and exit</source>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qmmpstarter.cpp" line="79"/>
-        <source>Unknown command</source>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
+        <location filename="../qmmpstarter.cpp" line="264"/>
+        <source>Display this text and exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="79"/>
+        <source>Unknown command</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/app/translations/qmmp_ru.ts b/src/app/translations/qmmp_ru.ts
index 181469df3..c93d6824a 100644
--- a/src/app/translations/qmmp_ru.ts
+++ b/src/app/translations/qmmp_ru.ts
@@ -97,6 +97,21 @@
         <translation>Идеи, исправления, отчёты об ошибках:  forkotov02@hotmail.ru</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation>Версия QMMP: %1</translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation>Собрано с версией Qt: %1</translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation>Используемая версия Qt: %1</translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Показать этот текст и выйти</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>Неизвестная команда</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Версия QMMP:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Версия Qt:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_sk.ts b/src/app/translations/qmmp_sk.ts
index 756f680db..540355c15 100644
--- a/src/app/translations/qmmp_sk.ts
+++ b/src/app/translations/qmmp_sk.ts
@@ -97,6 +97,21 @@
         <translation>Nápady, záplaty, hlásenie chýb posílejte na forkotov02@hotmail.ru (anglicky)</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Zobraziť tento text a skončiť</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>Neznámý príkaz</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Verzia QMMP:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Verzia Qt:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_tr.ts b/src/app/translations/qmmp_tr.ts
index d05f2a467..2c3237003 100644
--- a/src/app/translations/qmmp_tr.ts
+++ b/src/app/translations/qmmp_tr.ts
@@ -97,6 +97,21 @@
         <translation>Fikirleinizi, yamalarınızı, hata raporlarınızı forkotov02@hotmail.ru adresine gönderin</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Bu metni göster ve çık</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>QMMP sürümü:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt sürümü:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_uk_UA.ts b/src/app/translations/qmmp_uk_UA.ts
index 550eefe14..98d4ac6e6 100644
--- a/src/app/translations/qmmp_uk_UA.ts
+++ b/src/app/translations/qmmp_uk_UA.ts
@@ -97,6 +97,21 @@
         <translation>Ідеї, виправлення, звіти про помилки:  forkotov02@hotmail.ru</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>Показати цей текст та вийти</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>Невідома команда</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Версія QMMP:</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Версія Qt:</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_zh_CN.ts b/src/app/translations/qmmp_zh_CN.ts
index d77d076f8..efd4451d5 100644
--- a/src/app/translations/qmmp_zh_CN.ts
+++ b/src/app/translations/qmmp_zh_CN.ts
@@ -97,6 +97,21 @@
         <translation>建议、补丁或提交 bug 请发送到 forkotov02@hotmail.ru</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>显示这些文本并退出</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>未知指令</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Qmmp 版本：</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt 版本：</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/app/translations/qmmp_zh_TW.ts b/src/app/translations/qmmp_zh_TW.ts
index 51c715c6a..52f234b3a 100644
--- a/src/app/translations/qmmp_zh_TW.ts
+++ b/src/app/translations/qmmp_zh_TW.ts
@@ -97,6 +97,21 @@
         <translation>建議、補丁或提交 bug 請傳送到 forkotov02@hotmail.ru</translation>
     </message>
     <message>
+        <location filename="../qmmpstarter.cpp" line="271"/>
+        <source>QMMP version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="272"/>
+        <source>Compiled with Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmmpstarter.cpp" line="273"/>
+        <source>Using Qt version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qmmpstarter.cpp" line="264"/>
         <source>Display this text and exit</source>
         <translation>察看這些字檔並結束</translation>
@@ -106,15 +121,5 @@
         <source>Unknown command</source>
         <translation>未知指令</translation>
     </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="271"/>
-        <source>QMMP version:</source>
-        <translation>Qmmp 版本：</translation>
-    </message>
-    <message>
-        <location filename="../qmmpstarter.cpp" line="272"/>
-        <source>Qt version:</source>
-        <translation>Qt 版本：</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index 5384bcb39..d34e53e56 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2010 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2012 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -41,8 +41,8 @@ bool IncDecVolumeCommandLineOption::identify(const QString & str) const
 const QString IncDecVolumeCommandLineOption::helpString() const
 {
     return  QString(
-                "--volume-inc         " + tr("Increase volume with step 5")+"\n"
-                "--volume-dec         " + tr("Decrease volume with step 5")+"\n"
+                "--volume-inc             " + tr("Increase volume with step 5")+"\n"
+                "--volume-dec             " + tr("Decrease volume with step 5")+"\n"
             );
 }
 
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
index e8dbacd30..59382bdea 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
@@ -35,9 +35,9 @@ bool SeekOption::identify(const QString &str) const
 const QString SeekOption::helpString() const
 {
     QString help;
-    help += QString("--seek <time>        ") + tr("Seek to position in the current track") + "\n";
-    help += QString("--seek-fwd <time>    ") + tr("Seek forward") + "\n";
-    help += QString("--seek-bwd <time>    ") + tr("Seek backwards") + "\n";
+    help += QString("--seek <time>            ") + tr("Seek to position in the current track") + "\n";
+    help += QString("--seek-fwd <time>        ") + tr("Seek forward") + "\n";
+    help += QString("--seek-bwd <time>        ") + tr("Seek backwards") + "\n";
     return  help;
 }
 
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 2a46c076a..bf878e549 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -36,10 +36,10 @@ bool StatusOption::identify(const QString &str) const
 const QString StatusOption::helpString() const
 {
     QString help;
-    help += QString("--status             ") + tr("Print playback status") + "\n";
-    help += QString("--nowplaying <fmt>   ")
+    help += QString("--status                 ") + tr("Print playback status") + "\n";
+    help += QString("--nowplaying <fmt>       ")
             + tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")") + "\n";
-    help += QString("--nowplaying-syntax  ") + tr("Print --nowplaying syntax") + "\n";
+    help += QString("--nowplaying-syntax      ") + tr("Print --nowplaying syntax") + "\n";
     return  help;
 }