From b2e7e8ecf5086328fd27e371e58058d87c973b36 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Jul 2019 19:06:37 +0200 Subject: [PATCH] Remove old upstream URL, display of the build date and old IRC. Signed-off-by: Chris --- amarok/src/app.cpp | 7 ++----- amarok/src/collectionscanner/main.cpp | 4 +--- amarok/src/scripts/playlist2html/Playlist.py | 5 ++--- amarok/src/scripts/webcontrol/template.thtml | 3 +-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index 8a2a65b9..2d367e38 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -120,9 +120,7 @@ appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/) LIBAMAROK_EXPORT TDEAboutData aboutData( "amarok", I18N_NOOP( "Amarok" ), APP_VERSION, I18N_NOOP( "The audio player for TDE" ), TDEAboutData::License_GPL, - I18N_NOOP( "(C) 2002-2003, Mark Kretschmann\n(C) 2003-2007, The Amarok Development Squad\n(C) 2007-2011, The Trinity Desktop Project" ), - I18N_NOOP( "IRC:\nirc.freenode.net - #amarok, #amarok.de, #amarok.es\n\nFeedback:\namarok@kde.org\n\n(Build Date: " __DATE__ ")" ), - ( "http://amarok.kde.org" ) ); + I18N_NOOP( "(C) 2002-2003, Mark Kretschmann\n(C) 2003-2007, The Amarok Development Squad\n(C) 2007-2011, The Trinity Desktop Project" )); App::App() : TDEApplication(TDEApplication::openX11RGBADisplay()) @@ -563,8 +561,7 @@ void App::showHyperThreadingWarning() // SLOT "configuration.

" "

If your system has hyperthreading, you can improve Amarok's stability by using the Linux kernel option 'NOHT', " "or by disabling HyperThreading in your BIOS setup.

" - "

More information can be found in the README file. For further assistance " - "join us at #amarok on irc.freenode.net.

" ); + "

More information can be found in the README file.

" ); KMessageBox::information( 0, text, i18n( "Warning" ), "showHyperThreadingWarning" ); } diff --git a/amarok/src/collectionscanner/main.cpp b/amarok/src/collectionscanner/main.cpp index a78f1a68..c23262e5 100644 --- a/amarok/src/collectionscanner/main.cpp +++ b/amarok/src/collectionscanner/main.cpp @@ -32,9 +32,7 @@ int main( int argc, char *argv[] ) const TDEAboutData about( "amarokcollectionscanner", I18N_NOOP( "Amarok Collection Scanner\n\nNote: For debugging purposes this application can be invoked from the command line, but it will not actually build a collection this way." ), "0.1", I18N_NOOP( "Collection Scanner for Amarok" ), TDEAboutData::License_GPL, - I18N_NOOP( "(C) 2003-2006, The Amarok Developers" ), - I18N_NOOP( "IRC:\nserver: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n\nFeedback:\namarok@kde.org" ), - I18N_NOOP( "http://amarok.kde.org" ) ); + I18N_NOOP( "(C) 2003-2006, The Amarok Developers" ) ); static TDECmdLineOptions options[] = diff --git a/amarok/src/scripts/playlist2html/Playlist.py b/amarok/src/scripts/playlist2html/Playlist.py index fad92173..e91f2944 100644 --- a/amarok/src/scripts/playlist2html/Playlist.py +++ b/amarok/src/scripts/playlist2html/Playlist.py @@ -67,9 +67,8 @@ class Playlist: AmaroK playlist\n -
current - amarok - playlist of %s
+
current + amarok playlist of %s
\n
%s
\n \n diff --git a/amarok/src/scripts/webcontrol/template.thtml b/amarok/src/scripts/webcontrol/template.thtml index f1e01be1..2f3af8d1 100644 --- a/amarok/src/scripts/webcontrol/template.thtml +++ b/amarok/src/scripts/webcontrol/template.thtml @@ -18,8 +18,7 @@ code = """ \n %s\n \n
current - amarok - playlist of %s
\n + amarok playlist of %s\n \n
 
\n