From d3cadac2bfb653d7d7791656a754dcfe7b8ffbe7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 6 Dec 2014 15:15:51 -0600 Subject: [PATCH] Update About dialogs of Konqueror and Konsole for release --- konqueror/konq_factory.cc | 4 ++-- konqueror/version.h | 3 ++- konsole/konsole/main.cpp | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 9921b7126..d89cbf9a6 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -219,9 +219,9 @@ const TDEAboutData *KonqFactory::aboutData() KONQUEROR_VERSION, I18N_NOOP("Web browser, file manager, ..."), TDEAboutData::License_GPL, - I18N_NOOP("(c) 1999-2010, The Konqueror developers"), + I18N_NOOP("(c) 2011-2014, The Trinity Desktop project\n(c) 1999-2010, The Konqueror developers"), 0, - I18N_NOOP("http://konqueror.kde.org") ); + I18N_NOOP("https://www.trinitydesktop.org") ); s_aboutData->addAuthor( "Timothy Pearson", I18N_NOOP("Maintainer, Trinity bugfixes"), "kb9vqf@pearsoncomputing.net" ); s_aboutData->addAuthor( "David Faure", I18N_NOOP("developer (framework, parts, JavaScript, I/O lib) and maintainer"), "faure@kde.org" ); s_aboutData->addAuthor( "Simon Hausmann", I18N_NOOP("developer (framework, parts)"), "hausmann@kde.org" ); diff --git a/konqueror/version.h b/konqueror/version.h index 2133986cd..54a13ccd6 100644 --- a/konqueror/version.h +++ b/konqueror/version.h @@ -1,3 +1,4 @@ #ifndef _VERSION_H -#define KONQUEROR_VERSION "3.5.10" +#include "config.h" +#define KONQUEROR_VERSION VERSION #endif diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index a44196601..e18d52c6a 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -164,11 +164,12 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) TDEAboutData aboutData( "konsole", I18N_NOOP("Konsole"), KONSOLE_VERSION, description, TDEAboutData::License_GPL_V2, - "Copyright (c) 1997-2006, Lars Doelle"); - aboutData.addAuthor("Robert Knight",I18N_NOOP("Maintainer"), "robertknight@gmail.com"); + "Copyright (c) 2011-2014, The Trinity Desktop project\nCopyright (c) 1997-2006, Lars Doelle"); + aboutData.addAuthor( "Timothy Pearson", I18N_NOOP("Maintainer, Trinity bugfixes"), "kb9vqf@pearsoncomputing.net" ); + aboutData.addAuthor("Robert Knight",I18N_NOOP("Previous Maintainer"), "robertknight@gmail.com"); aboutData.addAuthor("Lars Doelle",I18N_NOOP("Author"), "lars.doelle@on-line.de"); aboutData.addCredit("Kurt V. Hindenburg", - I18N_NOOP("bug fixing and improvements"), + I18N_NOOP("bug fixing and improvements"), "kurt.hindenburg@gmail.com"); aboutData.addCredit("Waldo Bastian", I18N_NOOP("bug fixing and improvements"),