kdelibs update to Trinity v3.5.11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 25 insertions, 27 deletions

diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp
index f6fe8cde9..ba4e84fad 100644
--- a/kdeui/kaboutkde.cpp
+++ b/kdeui/kaboutkde.cpp
@@ -32,20 +32,22 @@ KAboutKDE::KAboutKDE( QWidget *parent, const char *name, bool modal )
 		 parent, name, modal )
 {
   const QString text1 = i18n(""
-    "The <b>K Desktop Environment</b> is written and maintained by the "
-    "KDE Team, a world-wide network of software engineers committed to "
-    "<a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> development.<br><br>"
-    "No single group, company or organization controls the KDE source "
-    "code. Everyone is welcome to contribute to KDE.<br><br>"
-    "Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> for "
-    "more information on the KDE project. ");
+    "The <b>Trinity Desktop Environment</b> is a fork of the "
+    "K Desktop Environment version 3.5, which was originally written by the KDE Team, "
+    "a world-wide network of software engineers committed to <a "
+    "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+    "development.<br><br>No single group, company or organization controls the "
+    "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
+    "HREF=\"http://trinity.pearsoncomputing.net/\">http://trinity.pearsoncomputing.net</A> for more information "
+    "about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
+    "for more information on the KDE project. ");
 
   const QString text2 = i18n(""
-    "Software can always be improved, and the KDE Team is ready to "
+    "Software can always be improved, and the Trinity Team is ready to "
     "do so. However, you - the user - must tell us when "
     "something does not work as expected or could be done better.<br><br>"
-    "The K Desktop Environment has a bug tracking system. Visit "
-    "<A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> or "
+    "The Trinity Desktop Environment has a bug tracking system. Visit "
+    "<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
     "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
     "If you have a suggestion for improvement then you are welcome to use "
     "the bug tracking system to register your wish. Make sure you use the "
@@ -53,37 +55,33 @@ KAboutKDE::KAboutKDE( QWidget *parent, const char *name, bool modal )
 
   const QString text3 = i18n(""
     "You do not have to be a software developer to be a member of the "
-    "KDE team. You can join the national teams that translate "
+    "Trinity team. You can join the national teams that translate "
     "program interfaces. You can provide graphics, themes, sounds, and "
     "improved documentation. You decide!"
     "<br><br>"
     "Visit "
-    "<A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
+    "<A HREF=\"http://trinity.pearsoncomputing.net/jobs/\">http://trinity.pearsoncomputing.net/jobs/</A> "
     "for information on some projects in which you can participate."
     "<br><br>"
     "If you need more information or documentation, then a visit to "
-    "<A HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
+    "<A HREF=\"http://trinity.pearsoncomputing.net/docs/\">http://trinity.pearsoncomputing.net/docs/</A> "
     "will provide you with what you need.");
   const QString text4 = i18n(""
-    "KDE is available free of charge, but making it is not free.<br><br>"
-    "Thus, the KDE team formed the KDE e.V., a non-profit organization"
-    " legally founded in Tuebingen, Germany. The KDE e.V. represents"
-    " the KDE project in legal and financial matters."
-    " See <a href=\"http://www.kde-ev.org/\">http://www.kde-ev.org</a>"
-    " for information on the KDE e.V.<br><br>"
-    "The KDE team does need financial support. Most of the money is used to "
+    "Trinity is available free of charge, but making it is not free.<br><br>"
+    "<br><br>"
+    "The Trinity team does need financial support. Most of the money is used to "
     "reimburse members and others on expenses they experienced when "
-    "contributing to KDE. You are encouraged to support KDE through a financial "
+    "contributing to Trinity. You are encouraged to support Trinity through a financial "
     "donation, using one of the ways described at "
-    "<a href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>."
-    "<br><br>Thank you very much in advance for your support.");
+    "<a href=\"http://trinity.pearsoncomputing.net/support/\">http://trinity.pearsoncomputing.net/support/</a>."
+    "<br><br>Thank you very much in advance for your support!");
   setHelp( QString::fromLatin1("khelpcenter/main.html"), QString::null );
-  setTitle(i18n("K Desktop Environment. Release %1").
+  setTitle(i18n("Trinity Desktop Environment. Release %1").
 	   arg(QString::fromLatin1(KDE_VERSION_STRING)) );
-  addTextPage( i18n("About KDE","&About"), text1, true );
+  addTextPage( i18n("About Trinity","&About"), text1, true );
   addTextPage( i18n("&Report Bugs or Wishes"), text2, true );
-  addTextPage( i18n("&Join the KDE Team"), text3, true );
-  addTextPage( i18n("&Support KDE"), text4, true );
+  addTextPage( i18n("&Join the Trinity Team"), text3, true );
+  addTextPage( i18n("&Support Trinity"), text4, true );
   setImage( locate( "data", QString::fromLatin1("kdeui/pics/aboutkde.png")) );
   setImageBackgroundColor( white );
 }