Branch: master

9b2c6a28 2019-07-16 05:18:03 Chris
Fix old upstream URLs for visible parts.

Signed-off-by: Chris <xchrisx@...>
Signed-off-by: Michele Calgaro <michele.calgaro@...>
M README
M chalk/ui/kis_aboutdata.h
M doc/api/mainheader.html
M filters/karbon/svg/svgexport.cc
M filters/kword/wml/wmlexport.cc
M karbon/karbon_aboutdata.h
M kchart/kchart_aboutdata.h
M kexi/core/kexiaboutdata.cpp
M kexi/tests/newapi/main.cpp
M kformula/kformula_aboutdata.h
M kivio/kiviopart/kivio_aboutdata.h
M kplato/kptaboutdata.h
M kpresenter/KPrAboutData.h
M kpresenter/KPrWebPresentation.cpp
M kspread/kspread_aboutdata.h
M kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
M kugar/part/kugar_about.h
M kword/KWAboutData.h

README

diff --git a/README b/README
index 6615a4b..aa61bef 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-KOffice is based on KDE ( http://www.kde.org ) which is needed to run KOffice.
+KOffice is based on TDE ( http://www.trinitydesktop.org ) which is needed to run KOffice.
 You need tdelibs and tdebase installed if you want to compile and run
 KOffice. Look in the tdelibs sourcedir for the file COMPILING for help. Also
 look at the website as there are many helpfiles available.
@@ -44,7 +44,7 @@
 they don't mind sharing it with you.
 
 If you feel you found a bug or missing feature you can always contact the
-developers of KOffice (via http://www.koffice.org ) or delve into the software
+developers of KOffice (via http://www.trinitydesktop.org ) or delve into the software
 yourself.
 
 The part that is shared between all KOffice applications can be found in the lib
@@ -72,21 +72,3 @@
 
 If you want to see more/fix bugs in this file, feel free to ask or add it 
 yourself.
-
-
-Contacts:
-=========
-
-User mailing list: mailto:koffice@...
-Developer mailing list: mailto:koffice-devel@...
-
-Subscribing and list information: http://www.kde.org/mailinglists
-Archives: http://lists.kde.org
-
-If you have questions about this README file or about KOffice in general,
-please mail to the KOffice mailing list: mailto:koffice@...
-
-
-
-Thomas Zander
-Chris Lee

chalk/ui/kis_aboutdata.h

diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h
index 60d1064..bf8ad39 100644
--- a/chalk/ui/kis_aboutdata.h
+++ b/chalk/ui/kis_aboutdata.h
@@ -34,8 +34,7 @@
             TDEAboutData::License_GPL,
             I18N_NOOP("(c) 1999-2006 The Chalk team.\n"),
             "",
-            "http://www.koffice.org/chalk",
-            "submit@...");
+            "bugs.trinitydesktop.org");
     aboutData->addAuthor("Adrian Page", 0, "Adrian.Page@...");
     aboutData->addAuthor("Alan Horkan", 0, "", "http://www.openclipart.org");
     aboutData->addAuthor("Bart Coppens", 0, "kde@...");

doc/api/mainheader.html

diff --git a/doc/api/mainheader.html b/doc/api/mainheader.html
index 780ae3d..e7e5ae8 100644
--- a/doc/api/mainheader.html
+++ b/doc/api/mainheader.html
@@ -54,7 +54,7 @@
 <div id="nav_header_bottom" align="right">
   <span class="doNotDisplay">:: <a href="#navigation" accesskey="5">Skip to Link Menu</a><br/></span>
   <span id="nav_header_bottom_left">
- / <a href="http://www.koffice.org">KOffice</a>
+ / <a href="http://www.trinitydesktop.org">KOffice</a>
  / <a href="@topdir@">API Docs</a>
 </span>
 </div>

filters/karbon/svg/svgexport.cc

diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc
index a5ed9b4..41fd6a5 100644
--- a/filters/karbon/svg/svgexport.cc
+++ b/filters/karbon/svg/svgexport.cc
@@ -131,7 +131,7 @@
 
 	// add some PR.  one line is more than enough.  
 	*m_defs <<
-		"<!-- Created using Karbon14, part of koffice: http://www.koffice.org/karbon -->" << endl;
+		"<!-- Created using Karbon14, part of koffice: http://www.trinitydesktop.org -->" << endl;
 
 	*m_defs <<
 		"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"" <<

filters/kword/wml/wmlexport.cc

diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc
index 3f4712b..978cb14 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cc
@@ -80,7 +80,7 @@
 {
   result = "<!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\"\n";
   result += "      \"http://www.wapforum.org/DTD/wml_1.1.xml\" >\n";
-  result += "<!-- Created using KWord, see www.koffice.org/kword -->\n";
+  result += "<!-- Created using KWord, see www.trinitydesktop.org -->\n";
   result += "<wml>\n";
   result += "<card>\n";
 

karbon/karbon_aboutdata.h

diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h
index 8b9d984..c87a7b3 100644
--- a/karbon/karbon_aboutdata.h
+++ b/karbon/karbon_aboutdata.h
@@ -19,8 +19,7 @@
 		description,
 		TDEAboutData::License_GPL,
 		I18N_NOOP( "(c) 2001-2006, The Karbon Developers" ),
-		I18N_NOOP( "You are invited to participate in any way." ),
-		"http://www.koffice.org/karbon/");
+		I18N_NOOP( "You are invited to participate in any way." ) );
 	aboutData->addAuthor(
 		"Rob Buis",
 		0,

kchart/kchart_aboutdata.h

diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h
index 5e53ed3..5944644 100644
--- a/kchart/kchart_aboutdata.h
+++ b/kchart/kchart_aboutdata.h
@@ -35,9 +35,7 @@
 {
     TDEAboutData * aboutData= new TDEAboutData("kchart", I18N_NOOP("KChart"),
                                            version, description, TDEAboutData::License_GPL,
-                                           I18N_NOOP("(c) 1998-2006, Kalle Dalheimer and Klarälvdalens Datakonsult AB"),
-                                           I18N_NOOP("The drawing engine which forms the base of KChart\nis also available as a commercial product\nfrom Klarälvdalens Datakonsult AB.\nContact info@...\nfor more information."),
-					   "http://www.koffice.org/kchart/");
+                                           I18N_NOOP("(c) 1998-2006, Kalle Dalheimer and Klarälvdalens Datakonsult AB") );
     aboutData->addAuthor("Kalle Dalheimer", 0, "kalle@...");
     aboutData->addAuthor("Laurent Montel", 0, "lmontel@...");
     aboutData->addAuthor("Karl-Heinz Zimmer", 0, "khz@...");

kexi/core/kexiaboutdata.cpp

diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp
index f357388..41ec076 100644
--- a/kexi/core/kexiaboutdata.cpp
+++ b/kexi/core/kexiaboutdata.cpp
@@ -49,12 +49,11 @@
 		TDEAboutData::License_LGPL_V2,
 		I18N_NOOP(	"(c) 2002-2007, Kexi Team\n"
 					"(c) 2003-2007, OpenOffice Polska LLC\n"),
-		I18N_NOOP(	"This software is developed by Kexi Team - an international group\n"
+		I18N_NOOP(	"This software was developed by Kexi Team - an international group\n"
 					"of independent developers, with additional assistance and support\n"
-					"from the OpenOffice Polska company.\n\n"
+					"from the OpenOffice Polska company and now maintained by the TDE team.\n\n"
 					"Visit the company Home Page: http://www.openoffice.com.pl"),
-		"http://www.koffice.org/kexi",
-		"submit@..."
+		"bugs.trinitydesktop.org"
 	);
 	// authors sorted by last contribution date
 	aboutData->addAuthor("Jarosław Staniek / OpenOffice Polska", I18N_NOOP("Project maintainer & developer, design, KexiDB, commercially supported version, win32 port"), "js@...");

kexi/tests/newapi/main.cpp

diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index d0099ff..a4cb54f 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -121,8 +121,7 @@
 			"(c) 2003-2006, Kexi Team\n"
 			"(c) 2003-2006, OpenOffice Polska Ltd.\n",
 			"",
-			"http://www.koffice.org/kexi",
-			"submit@..."
+			"bugs.trinitydesktop.org"
 		)
 	);
 	TDECmdLineArgs::addCmdLineOptions( options );

kformula/kformula_aboutdata.h

diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h
index 20d5d5e..ba78709 100644
--- a/kformula/kformula_aboutdata.h
+++ b/kformula/kformula_aboutdata.h
@@ -33,8 +33,7 @@
 {
     TDEAboutData * aboutData = new TDEAboutData( "kformula", I18N_NOOP( "KFormula" ),
                                              version, description, TDEAboutData::License_GPL,
-                                             "(c) 1998-2006, The KFormula Team", 0,
-					     "http://www.koffice.org/kformula/" );
+                                             "(c) 1998-2006, The KFormula Team", 0 );
     aboutData->addAuthor( "Alfredo Beaumont", 
                           I18N_NOOP( "current maintainer" ),
                           "alfredo.beaumont@...",

kivio/kiviopart/kivio_aboutdata.h

diff --git a/kivio/kiviopart/kivio_aboutdata.h b/kivio/kiviopart/kivio_aboutdata.h
index 6348f75..03cf8e9 100644
--- a/kivio/kiviopart/kivio_aboutdata.h
+++ b/kivio/kiviopart/kivio_aboutdata.h
@@ -32,8 +32,7 @@
 {
     TDEAboutData * aboutData=new TDEAboutData( "kivio", I18N_NOOP("Kivio"),
                                            version, description, TDEAboutData::License_GPL,
-                                           I18N_NOOP("(C) 2000-2006, The Kivio Team"), 0,
-                                           "http://www.koffice.org/kivio/");
+                                           I18N_NOOP("(C) 2000-2006, The Kivio Team"), 0 );
     aboutData->addAuthor("Peter Simonsson", I18N_NOOP("Maintainer"), "psn@...");
     aboutData->addAuthor("Ian Reinhart Geiser", I18N_NOOP("Development"), "geiseri@...");
     aboutData->addAuthor("Laurent Montel", I18N_NOOP("Development"), "montel@...");

kplato/kptaboutdata.h

diff --git a/kplato/kptaboutdata.h b/kplato/kptaboutdata.h
index ccb6fb2..d53c87c 100644
--- a/kplato/kptaboutdata.h
+++ b/kplato/kptaboutdata.h
@@ -34,8 +34,7 @@
 {
     TDEAboutData * aboutData=new TDEAboutData( "kplato", I18N_NOOP("KPlato"),
                                            KPLATO_VERSION, KPLATO_DESCRIPTION, TDEAboutData::License_GPL,
-                                           I18N_NOOP("(c) 1998-2006, The KPlato Team"), 0,
-					   "http://www.koffice.org/kplato/" );
+                                           I18N_NOOP("(c) 1998-2006, The KPlato Team"), 0 );
     aboutData->addAuthor("Thomas Zander", 0, 0 ); // please don't re-add, I don't like getting personal emails :)
     aboutData->addAuthor("Bo Thorsen", 0, "bo@...");
     aboutData->addAuthor("Dag Andersen", 0, "danders@...");

kpresenter/KPrAboutData.h

diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h
index f85a74c..52f302a 100644
--- a/kpresenter/KPrAboutData.h
+++ b/kpresenter/KPrAboutData.h
@@ -31,8 +31,7 @@
 {
     TDEAboutData * aboutData=new TDEAboutData( "kpresenter", I18N_NOOP("KPresenter"),
                                            version, description, TDEAboutData::License_LGPL,
-                                           I18N_NOOP("(c) 1998-2006, The KPresenter Team"), 0,
-                                           "http://www.koffice.org/kpresenter/");
+                                           I18N_NOOP("(c) 1998-2006, The KPresenter Team"), 0 );
     aboutData->addAuthor("Laurent Montel", I18N_NOOP("current maintainer"), "montel@...");
     aboutData->addAuthor("Werner Trobin", 0, "trobin@...");
     aboutData->addAuthor("David Faure", 0, "faure@...");

kpresenter/KPrWebPresentation.cpp

diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 90053b3..ff9e3ae 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -510,7 +510,7 @@
                 htmlAuthor=escapeHtmlText( codec, author );
             else
                 htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
-            streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
+            streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.trinitydesktop.org\">KPresenter</a>" )
                                           .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
 
             streamOut << "    </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n";
@@ -561,7 +561,7 @@
     // footer: author name, e-mail
     TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) :
                          TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
-    streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
+    streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.trinitydesktop.org\">KPresenter</a>" )
                                       .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
 
     streamOut << "</body>\n</html>\n";

kspread/kspread_aboutdata.h

diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h
index 618fc13..338fd84 100644
--- a/kspread/kspread_aboutdata.h
+++ b/kspread/kspread_aboutdata.h
@@ -36,8 +36,7 @@
 {
     TDEAboutData * aboutData = new TDEAboutData( "kspread", I18N_NOOP("KSpread"),
                                              version, description, TDEAboutData::License_LGPL,
-                                             I18N_NOOP("(c) 1998-2006, The KSpread Team"), 0,
-               "http://www.koffice.org/kspread/");
+                                             I18N_NOOP("(c) 1998-2006, The KSpread Team"), 0 );
     aboutData->addAuthor("Torben Weis", 0, "weis@...");
     aboutData->addAuthor("Laurent Montel", 0, "montel@...");
     aboutData->addAuthor("John Dailey", 0, "dailey@...");

kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc

diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
** Diff limit reached (max: 250 lines) **