From c154161f2bcdf0ad1b9b194464b0e2de3dc2c4c5 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 23 Jan 2012 18:47:15 +0000 Subject: fixed '--help' output git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2561 90c681e8-e032-0410-971d-27865f9a5e38 --- src/app/builtincommandlineoption.cpp | 26 +++++++++++++------------- src/app/qmmpstarter.cpp | 11 ++++++----- src/app/translations/qmmp_cs.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_de.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_es.ts | 19 ++++++++++++------- src/app/translations/qmmp_hu.ts | 13 +++++++++---- src/app/translations/qmmp_it.ts | 19 ++++++++++++------- src/app/translations/qmmp_ja.ts | 13 +++++++++---- src/app/translations/qmmp_lt.ts | 13 +++++++++---- src/app/translations/qmmp_nl.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_pl_PL.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_pt_BR.ts | 21 +++++++++++++-------- src/app/translations/qmmp_ru.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_sk.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_tr.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_uk_UA.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_zh_CN.ts | 25 +++++++++++++++---------- src/app/translations/qmmp_zh_TW.ts | 25 +++++++++++++++---------- 18 files changed, 233 insertions(+), 152 deletions(-) (limited to 'src/app') 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Nápady, patche, hlášení chyb posílejte na forkotov02@hotmail.ru (anglicky) + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command Neznámý příkaz - - - QMMP version: - Verze QMMP: - - - - Qt version: - Verze Qt: - 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Ideen, Patches und Bugreports an <forkotov02@hotmail.ru> senden + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command Unbekannter Befehl - - - QMMP version: - Qmmp-Version: - - - - Qt version: - Qt-Version: - 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 @@ -91,10 +91,20 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Enviar ideas, parches, errores a: forkotov02@hotmail.ru + + + QMMP version: %1 + + - Qt version: - Versión de Qt: + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + @@ -111,10 +121,5 @@ Don't start the application No iniciar la aplicación - - - QMMP version: - Versión de QMMP: - 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 @@ - QMMP version: - QMMP verzió: + QMMP version: %1 + - Qt version: - Qt verzió: + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + 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 @@ -91,10 +91,20 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Per idee, modifiche, segnalazione di errori scrivire a: forkotov02@hotmail.ru + + + QMMP version: %1 + + - Qt version: - Versione Qt: + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + @@ -111,10 +121,5 @@ Don't start the application - - - QMMP version: - Versione di Qmmp: - 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 @@ - QMMP version: - QMMP のバージョン: + QMMP version: %1 + - Qt version: - Qt のバージョン: + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + 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 @@ - QMMP version: - QMMP versija: + QMMP version: %1 + - Qt version: - Qt versija: + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Ideëen, patches, foutrapporten zenden naar forkotov02@hotmail.ru (anglicky) + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command Onbekend commando - - - QMMP version: - QMMP versie: - - - - Qt version: - Qt versie: - 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Pomysły, poprawki, raporty o błędach proszę wysyłać na forkotov02@hotmail.ru + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command Nieznane polecenie - - - QMMP version: - Wersja QMMP: - - - - Qt version: - Wersja QT: - 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 @@ - - Display this text and exit + + QMMP version: %1 - - Unknown command + + Compiled with Qt version: %1 - - QMMP version: + + Using Qt version: %1 - - Qt version: + + Display this text and exit + + + + + Unknown command 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Идеи, исправления, отчёты об ошибках: forkotov02@hotmail.ru + + + QMMP version: %1 + Версия QMMP: %1 + + + + Compiled with Qt version: %1 + Собрано с версией Qt: %1 + + + + Using Qt version: %1 + Используемая версия Qt: %1 + Display this text and exit @@ -106,15 +121,5 @@ Unknown command Неизвестная команда - - - QMMP version: - Версия QMMP: - - - - Qt version: - Версия Qt: - 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Nápady, záplaty, hlásenie chýb posílejte na forkotov02@hotmail.ru (anglicky) + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command Neznámý príkaz - - - QMMP version: - Verzia QMMP: - - - - Qt version: - Verzia Qt: - 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Fikirleinizi, yamalarınızı, hata raporlarınızı forkotov02@hotmail.ru adresine gönderin + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command - - - QMMP version: - QMMP sürümü: - - - - Qt version: - Qt sürümü: - 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru Ідеї, виправлення, звіти про помилки: forkotov02@hotmail.ru + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command Невідома команда - - - QMMP version: - Версія QMMP: - - - - Qt version: - Версія Qt: - 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru 建议、补丁或提交 bug 请发送到 forkotov02@hotmail.ru + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command 未知指令 - - - QMMP version: - Qmmp 版本： - - - - Qt version: - Qt 版本： - 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 @@ -96,6 +96,21 @@ Ideas, patches, bugreports send to forkotov02@hotmail.ru 建議、補丁或提交 bug 請傳送到 forkotov02@hotmail.ru + + + QMMP version: %1 + + + + + Compiled with Qt version: %1 + + + + + Using Qt version: %1 + + Display this text and exit @@ -106,15 +121,5 @@ Unknown command 未知指令 - - - QMMP version: - Qmmp 版本： - - - - Qt version: - Qt 版本： - -- cgit v1.2.3-13-gbd6f