summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2018-11-24 15:04:29 +0100
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-11-25 00:49:55 +0900
commit9e0b54c3a969137ccf891a1e80485271639f4d36 (patch)
treee3c0426cbc68f2a6f08739dbd40c14f532c617fd
parentf936bd76af24d2a634b8ad5cd0c672cb5f71c892 (diff)
downloadtdepim-9e0b54c3a969137ccf891a1e80485271639f4d36.tar.gz
tdepim-9e0b54c3a969137ccf891a1e80485271639f4d36.zip
Update About Info for kmail, kontact and korganizer, this relates to bug 2401
Signed-off-by: gregory guy <g-gregory@gmx.fr> (cherry picked from commit 74cbb937c7d08a77954e8b05dc6011ef04cb309e) Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--kmail/aboutdata.cpp2
-rw-r--r--kmail/kmreaderwin.cpp14
-rw-r--r--kmail/kmversion.h2
-rw-r--r--kontact/src/main.cpp6
-rw-r--r--korganizer/aboutdata.cpp2
-rw-r--r--korganizer/version.h2
6 files changed, 15 insertions, 13 deletions
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index ef18bb17a..91bc1607f 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -212,7 +212,7 @@ namespace KMail {
: TDEAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION,
I18N_NOOP("TDE Email Client"), License_GPL,
I18N_NOOP("(c) 1997-2008, The KMail developers"), 0,
- "http://kontact.kde.org/kmail/" )
+ "http://www.trinitydesktop.org" )
{
using KMail::authors;
using KMail::credits;
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 26fffd8c5..6c5acd10c 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1332,15 +1332,15 @@ void KMReaderWin::displayAboutPage()
"%7: First-time user text (only shown on first start); "
"%8: generated list of important changes; "
"--- end of comment ---",
- "<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email client for the K "
+ "<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email client for the Trinity "
"Desktop Environment. It is designed to be fully compatible with "
"Internet mailing standards including MIME, SMTP, POP3 and IMAP."
"</p>\n"
"<ul><li>KMail has many powerful features which are described in the "
"<a href=\"%2\">documentation</a></li>\n"
- "<li>The <a href=\"%3\">KMail homepage</A> offers information about "
+ "<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about "
"new versions of KMail</li></ul>\n"
- "%8\n" // important changes
+ "%8\n" // important changes
"<p>Some of the new features in this release of KMail include "
"(compared to KMail %4, which is part of TDE %5):</p>\n"
"<ul>\n%6</ul>\n"
@@ -1348,10 +1348,10 @@ void KMReaderWin::displayAboutPage()
"<p>We hope that you will enjoy KMail.</p>\n"
"<p>Thank you,</p>\n"
"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>")
- .arg(KMAIL_VERSION) // KMail version
- .arg("help:/kmail/index.html") // KMail help:// URL
- .arg("http://kontact.kde.org/kmail/") // KMail homepage URL
- .arg("1.8").arg("3.4"); // prior KMail and TDE version
+ .arg(KMAIL_VERSION) // KMail version
+ .arg("help:/kmail/index.html") // KMail help:// URL
+ .arg("http://www.trinitydesktop.org") // homepage URL
+ .arg("1.8").arg("3.4"); // prior KMail and TDE version
TQString featureItems;
for ( int i = 0 ; i < numKMailNewFeatures ; i++ )
diff --git a/kmail/kmversion.h b/kmail/kmversion.h
index 98706ae1b..8a7e68586 100644
--- a/kmail/kmversion.h
+++ b/kmail/kmversion.h
@@ -3,6 +3,6 @@
#ifndef kmversion_h
#define kmversion_h
-#define KMAIL_VERSION "1.9.10 (enterprise35 0.20100827.1168748)"
+#define KMAIL_VERSION "1.9.10"
#endif /*kmversion_h*/
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index a243db711..576eb48c0 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -47,7 +47,7 @@ using namespace std;
static const char description[] =
I18N_NOOP( "TDE personal information manager" );
-static const char version[] = "1.2.9 (enterprise35 0.20100827.1168748)";
+static const char version[] = "1.2.9";
class KontactApp : public KUniqueApplication {
public:
@@ -145,7 +145,9 @@ int KontactApp::newInstance()
int main( int argc, char **argv )
{
TDEAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
- TDEAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" );
+ TDEAboutData::License_GPL,
+ I18N_NOOP("(C) 2008-2018 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"),
+ 0, "http://www.trinitydesktop.org" );
about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" );
about.addAuthor( "Don Sanders", 0, "sanders@kde.org" );
about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
diff --git a/korganizer/aboutdata.cpp b/korganizer/aboutdata.cpp
index 6153d92c9..e9625fbad 100644
--- a/korganizer/aboutdata.cpp
+++ b/korganizer/aboutdata.cpp
@@ -36,7 +36,7 @@ AboutData::AboutData()
"(c) 2000-2004 Cornelius Schumacher\n"
"(c) 2004-2005 Reinhold Kainhofer\n"
"(c) 2009-2010 Timothy Pearson", 0,
- "http://korganizer.kde.org" )
+ "http://www.trinitydesktop.org" )
{
addAuthor("Timothy Pearson",I18N_NOOP("Current Developer/Maintainer"),
"kb9vqf@pearsoncomputing.net");
diff --git a/korganizer/version.h b/korganizer/version.h
index c74a7ed34..9dded1c73 100644
--- a/korganizer/version.h
+++ b/korganizer/version.h
@@ -53,6 +53,6 @@
3.2 alpha1
*/
-static const char korgVersion[] = "3.5.9 (enterprise35 0.20100827.1168748)";
+static const char korgVersion[] = "3.5.9";
#endif