From ef24cd8c5b11f99568ff48db5a396936e9eaeaf4 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Wed, 7 Apr 2010 19:01:41 +0000 Subject: [PATCH] Add some more people to the about box --- src/about.cpp | 34 ++++++ src/about.h | 16 +++ src/about.ui | 17 +-- src/translations/cs.po | 178 +++++++++++++++++------------- src/translations/el.po | 47 +------- src/translations/es.po | 178 +++++++++++++++++------------- src/translations/fr.po | 178 +++++++++++++++++------------- src/translations/pl.po | 178 +++++++++++++++++------------- src/translations/ru.po | 178 +++++++++++++++++------------- src/translations/sk.po | 178 +++++++++++++++++------------- src/translations/translations.pot | 47 +------- 11 files changed, 657 insertions(+), 572 deletions(-) diff --git a/src/about.cpp b/src/about.cpp index 4d101f00d..ad5e4ac84 100644 --- a/src/about.cpp +++ b/src/about.cpp @@ -19,6 +19,8 @@ #include +const char* About::kUrl = "http://code.google.com/p/clementine-player/"; + About::About(QWidget *parent) : QDialog(parent) { @@ -27,4 +29,36 @@ About::About(QWidget *parent) setWindowTitle(tr("About %1").arg(QCoreApplication::applicationName())); ui_.title->setText(QCoreApplication::applicationName()); ui_.version->setText(tr("Version %1").arg(QCoreApplication::applicationVersion())); + + authors_ << Person("David Sansome", "me@davidsansome.com") + << Person("John Maguire", "john.maguire@gmail.com"); + thanks_to_ << Person("Mark Kretschmann", "markey@web.de") + << Person("Max Howell", "max.howell@methylblue.com") + << Person("Jakub Stachowski", "qbast@go2.pl") + << Person("Paul Cifarelli", "paul@cifarelli.net") + << Person("Felipe Rivera", "liebremx@users.sourceforge.net"); + + ui_.content->setHtml(MakeHtml()); +} + +QString About::MakeHtml() const { + QString ret = QString("

%2

" + "

%3:").arg(kUrl, kUrl, tr("Authors")); + + foreach (const Person& person, authors_) + ret += "
" + MakeHtml(person); + + ret += QString("

%3:").arg(tr("Thanks to")); + + foreach (const Person& person, thanks_to_) + ret += "
" + MakeHtml(person); + + ret += "

"; + + return ret; +} + +QString About::MakeHtml(const Person& person) const { + return QString("%1 <%3>") + .arg(person.name, person.email, person.email); } diff --git a/src/about.h b/src/about.h index b55f59adb..7146d7db7 100644 --- a/src/about.h +++ b/src/about.h @@ -26,8 +26,24 @@ class About : public QDialog { public: About(QWidget* parent = 0); + static const char* kUrl; + + struct Person { + Person(const QString& n, const QString& e) : name(n), email(e) {} + + QString name; + QString email; + }; + + private: + QString MakeHtml() const; + QString MakeHtml(const Person& person) const; + private: Ui::About ui_; + + QList authors_; + QList thanks_to_; }; #endif // ABOUT_H diff --git a/src/about.ui b/src/about.ui index 9a9549a8a..165c33f0c 100644 --- a/src/about.ui +++ b/src/about.ui @@ -111,22 +111,7 @@ - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://code.google.com/p/clementine-player/"><span style=" text-decoration: underline; color:#0057ae;">http://code.google.com/p/clementine-player/</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Authors:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">David Sansome &lt;<a href="mailto:me@davidsansome.com"><span style=" text-decoration: underline; color:#0057ae;">me@davidsansome.com</span></a>&gt;</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Thanks to:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Mark Kretschmann &lt;<a href="mailto:markey@web.de"><span style=" text-decoration: underline; color:#0057ae;">markey@web.de</span></a>&gt;</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Max Howell &lt;<a href="mailto:max.howell@methylblue.com"><span style=" text-decoration: underline; color:#0057ae;">max.howell@methylblue.com</span></a>&gt;</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">... and all the Amarok contributors</p></body></html> - + true diff --git a/src/translations/cs.po b/src/translations/cs.po index f3150c5db..3498e8bd5 100644 --- a/src/translations/cs.po +++ b/src/translations/cs.po @@ -333,6 +333,12 @@ msgstr "O %1" msgid "Version %1" msgstr "Verze %1" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "Přidat další proud..." @@ -794,85 +800,6 @@ msgstr "" msgid "Version" msgstr "Verze" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Autoři:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Poděkování:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... a všem přispěvatelům " -"Amaroku

" - msgid "Add Stream" msgstr "Přidat proud" @@ -957,6 +884,99 @@ msgstr "" msgid "Enable equalizer" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "
\n" +#~ "

http://code.google." +#~ "com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Authors:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Thanks to:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... and all the Amarok contributors

" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "

http://code.google.com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Autoři:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Poděkování:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... a všem " +#~ "přispěvatelům Amaroku

" + #~ msgid "&Hide tray icon" #~ msgstr "S&krýt ikonu v systémovém panelu" diff --git a/src/translations/el.po b/src/translations/el.po index 8ee36c31d..47ec2683d 100644 --- a/src/translations/el.po +++ b/src/translations/el.po @@ -333,6 +333,12 @@ msgstr "Περί %1" msgid "Version %1" msgstr "Έκδοση %1" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "Προσθήκη άλλης ροής..." @@ -798,47 +804,6 @@ msgstr "Επέλεξε χρώμα..." msgid "Version" msgstr "Έκδοση" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" - msgid "Add Stream" msgstr "Προσθήκη ροής" diff --git a/src/translations/es.po b/src/translations/es.po index ecbddf045..85b562887 100644 --- a/src/translations/es.po +++ b/src/translations/es.po @@ -332,6 +332,12 @@ msgstr "Sobre %1" msgid "Version %1" msgstr "Versión %1" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "Añadir un flujo de radio..." @@ -801,85 +807,6 @@ msgstr "Elegir color..." msgid "Version" msgstr "Versión" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Autores:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Gracias a:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... y a todos los que " -"contribuyeron con Amarok

" - msgid "Add Stream" msgstr "Añadir Flujo de Radio" @@ -966,6 +893,99 @@ msgstr "" msgid "Enable equalizer" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "
\n" +#~ "

http://code.google." +#~ "com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Authors:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Thanks to:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... and all the Amarok contributors

" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "

http://code.google.com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Autores:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Gracias a:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... y a todos los que " +#~ "contribuyeron con Amarok

" + #~ msgid "&Hide tray icon" #~ msgstr "&Ocultar icono de la bandeja" diff --git a/src/translations/fr.po b/src/translations/fr.po index ad596b7ca..25eef56f9 100644 --- a/src/translations/fr.po +++ b/src/translations/fr.po @@ -335,6 +335,12 @@ msgstr "À propos de %1" msgid "Version %1" msgstr "Version %1" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "Ajouter un autre flux..." @@ -799,85 +805,6 @@ msgstr "Choisir une couleur..." msgid "Version" msgstr "Version" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Auteurs :

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Remerciements à :

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... ainsi qu'à tous ceux " -"qui ont contribué à Amarok

" - msgid "Add Stream" msgstr "Ajouter un flux" @@ -962,6 +889,99 @@ msgstr "" msgid "Enable equalizer" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "
\n" +#~ "

http://code.google." +#~ "com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Authors:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Thanks to:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... and all the Amarok contributors

" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "

http://code.google.com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Auteurs :

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Remerciements à :

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... ainsi qu'à tous " +#~ "ceux qui ont contribué à Amarok

" + #~ msgid "&Hide tray icon" #~ msgstr "&Masquer l'icône" diff --git a/src/translations/pl.po b/src/translations/pl.po index 416a09f3b..af3867399 100644 --- a/src/translations/pl.po +++ b/src/translations/pl.po @@ -332,6 +332,12 @@ msgstr "O programie %1" msgid "Version %1" msgstr "Wersja %1" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "Dodaj następny strumień..." @@ -791,85 +797,6 @@ msgstr "Wybierz kolor..." msgid "Version" msgstr "Wersja" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Autorzy:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Podziękowania dla:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

...oraz dla wszystkich " -"zaangażowanych w rozwój Amaroka.

" - msgid "Add Stream" msgstr "Dodaj URL" @@ -954,5 +881,98 @@ msgstr "" msgid "Enable equalizer" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "
\n" +#~ "

http://code.google." +#~ "com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Authors:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Thanks to:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... and all the Amarok contributors

" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "

http://code.google.com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Autorzy:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Podziękowania dla:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

...oraz dla wszystkich " +#~ "zaangażowanych w rozwój Amaroka.

" + #~ msgid "&Hide tray icon" #~ msgstr "&Ukryj ikonę w trayu" diff --git a/src/translations/ru.po b/src/translations/ru.po index 2bfb0b448..13e91aaa9 100644 --- a/src/translations/ru.po +++ b/src/translations/ru.po @@ -333,6 +333,12 @@ msgstr "О программе %1" msgid "Version %1" msgstr "Версия %1" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "Добавить другой поток..." @@ -790,85 +796,6 @@ msgstr "" msgid "Version" msgstr "Версия" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Авторы:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Выражаем благодарность:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... и всем создателям " -"Amarok

" - msgid "Add Stream" msgstr "Добавить поток" @@ -953,5 +880,98 @@ msgstr "" msgid "Enable equalizer" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "
\n" +#~ "

http://code.google." +#~ "com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Authors:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Thanks to:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... and all the Amarok contributors

" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "

http://code.google.com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Авторы:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Выражаем благодарность:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... и всем создателям " +#~ "Amarok

" + #~ msgid "Don't show notifications" #~ msgstr "Не показывать" diff --git a/src/translations/sk.po b/src/translations/sk.po index 5ed575cb6..f5da7c4ed 100644 --- a/src/translations/sk.po +++ b/src/translations/sk.po @@ -332,6 +332,12 @@ msgstr "O programe %1" msgid "Version %1" msgstr "Verzia %1" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "Pridať ďalší stream..." @@ -796,85 +802,6 @@ msgstr "Vybrať farbu..." msgid "Version" msgstr "Verzia" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Autori:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Poďakovanie:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... a všetkým " -"prispievateľom Amarok-u.

" - msgid "Add Stream" msgstr "Pridať stream" @@ -959,6 +886,99 @@ msgstr "" msgid "Enable equalizer" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "
\n" +#~ "

http://code.google." +#~ "com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Authors:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Thanks to:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... and all the Amarok contributors

" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "

http://code.google.com/p/clementine-player/

\n" +#~ "

\n" +#~ "

Autori:

\n" +#~ "

David Sansome <me@davidsansome.com>

\n" +#~ "

\n" +#~ "

Poďakovanie:

\n" +#~ "

Mark Kretschmann <markey@web.de>

\n" +#~ "

Max Howell <max.howell@methylblue.com>

\n" +#~ "

... a všetkým " +#~ "prispievateľom Amarok-u.

" + #~ msgid "&Hide tray icon" #~ msgstr "&Skryť tray ikonu" diff --git a/src/translations/translations.pot b/src/translations/translations.pot index 08a187af5..1d312d283 100644 --- a/src/translations/translations.pot +++ b/src/translations/translations.pot @@ -331,6 +331,12 @@ msgstr "" msgid "Version %1" msgstr "" +msgid "Authors" +msgstr "" + +msgid "Thanks to" +msgstr "" + msgid "Add another stream..." msgstr "" @@ -780,47 +786,6 @@ msgstr "" msgid "Version" msgstr "" -msgid "" -"\n" -"\n" -"

http://code.google.com/p/clementine-player/

\n" -"

\n" -"

Authors:

\n" -"

David Sansome <me@davidsansome.com>

\n" -"

\n" -"

Thanks to:

\n" -"

Mark Kretschmann <markey@web.de>

\n" -"

Max Howell <max.howell@methylblue.com>

\n" -"

... and all the Amarok " -"contributors

" -msgstr "" - msgid "Add Stream" msgstr ""