Branch: master

d3cadac2 2014-12-06 15:15:51 Timothy Pearson
Update About dialogs of Konqueror and Konsole for release
M konqueror/konq_factory.cc
M konqueror/version.h
M konsole/konsole/main.cpp
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index 9921b71..d89cbf9 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -219,9 +219,9 @@
                         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@..." );
     s_aboutData->addAuthor( "David Faure", I18N_NOOP("developer (framework, parts, JavaScript, I/O lib) and maintainer"), "faure@..." );
     s_aboutData->addAuthor( "Simon Hausmann", I18N_NOOP("developer (framework, parts)"), "hausmann@..." );
diff --git a/konqueror/version.h b/konqueror/version.h
index 2133986..54a13cc 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 a441966..e18d52c 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -164,11 +164,12 @@
 
   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@...");
+    "Copyright (c) 2011-2014, The Trinity Desktop project\nCopyright (c) 1997-2006, Lars Doelle");
+  aboutData.addAuthor( "Timothy Pearson", I18N_NOOP("Maintainer, Trinity bugfixes"), "kb9vqf@..." );
+  aboutData.addAuthor("Robert Knight",I18N_NOOP("Previous Maintainer"), "robertknight@...");
   aboutData.addAuthor("Lars Doelle",I18N_NOOP("Author"), "lars.doelle@...");
   aboutData.addCredit("Kurt V. Hindenburg",
-    I18N_NOOP("bug fixing and improvements"), 
+    I18N_NOOP("bug fixing and improvements"),
     "kurt.hindenburg@...");
   aboutData.addCredit("Waldo Bastian",
     I18N_NOOP("bug fixing and improvements"),