From 6d97f43c4e2c7165fd05789e628576e60234e93b Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 16 Jul 2019 01:58:10 +0200 Subject: [PATCH] Fix old upstream URLs for visible parts. Signed-off-by: Chris Signed-off-by: Michele Calgaro (cherry picked from commit 9b2c6a283082eb866d4e8e824ce1279b5b41bc52) --- README | 22 ++----------------- chalk/ui/kis_aboutdata.h | 3 +-- doc/api/mainheader.html | 2 +- filters/karbon/svg/svgexport.cc | 2 +- filters/kword/wml/wmlexport.cc | 2 +- karbon/karbon_aboutdata.h | 3 +-- kchart/kchart_aboutdata.h | 4 +--- kexi/core/kexiaboutdata.cpp | 7 +++--- kexi/tests/newapi/main.cpp | 3 +-- kformula/kformula_aboutdata.h | 3 +-- kivio/kiviopart/kivio_aboutdata.h | 3 +-- kplato/kptaboutdata.h | 3 +-- kpresenter/KPrAboutData.h | 3 +-- kpresenter/KPrWebPresentation.cpp | 4 ++-- kspread/kspread_aboutdata.h | 3 +-- .../kspread_plugininsertcalendar.cc | 3 +-- kugar/part/kugar_about.h | 2 +- kword/KWAboutData.h | 3 +-- 18 files changed, 22 insertions(+), 53 deletions(-) diff --git a/README b/README index 6615a4b5..aa61bef8 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 @@ this is done is because those developers want to have a good office suite, and 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 @@ document structure (not the XML DTD), see the lib/store/SPEC file. 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@kde.org -Developer mailing list: mailto:koffice-devel@kde.org - -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@kde.org - - - -Thomas Zander -Chris Lee diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h index 60d10645..bf8ad395 100644 --- a/chalk/ui/kis_aboutdata.h +++ b/chalk/ui/kis_aboutdata.h @@ -34,8 +34,7 @@ TDEAboutData * newChalkAboutData() TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2006 The Chalk team.\n"), "", - "http://www.koffice.org/chalk", - "submit@bugs.kde.org"); + "bugs.trinitydesktop.org"); aboutData->addAuthor("Adrian Page", 0, "Adrian.Page@tesco.net"); aboutData->addAuthor("Alan Horkan", 0, "", "http://www.openclipart.org"); aboutData->addAuthor("Bart Coppens", 0, "kde@bartcoppens.be"); diff --git a/doc/api/mainheader.html b/doc/api/mainheader.html index 780ae3d7..e7e5ae8b 100644 --- a/doc/api/mainheader.html +++ b/doc/api/mainheader.html @@ -54,7 +54,7 @@ td.mdname { font-weight: bold; color: #602020; } diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc index a5ed9b40..41fd6a54 100644 --- a/filters/karbon/svg/svgexport.cc +++ b/filters/karbon/svg/svgexport.cc @@ -131,7 +131,7 @@ SvgExport::visitVDocument( VDocument& document ) // add some PR. one line is more than enough. *m_defs << - "" << endl; + "" << endl; *m_defs << "\n"; - result += "\n"; + result += "\n"; result += "\n"; result += "\n"; diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h index 8b9d9840..c87a7b3d 100644 --- a/karbon/karbon_aboutdata.h +++ b/karbon/karbon_aboutdata.h @@ -19,8 +19,7 @@ TDEAboutData * newKarbonAboutData() 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, diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h index 5e53ed37..59446444 100644 --- a/kchart/kchart_aboutdata.h +++ b/kchart/kchart_aboutdata.h @@ -35,9 +35,7 @@ TDEAboutData * newKChartAboutData() { 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@klaralvdalens-datakonsult.se\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@kde.org"); aboutData->addAuthor("Laurent Montel", 0, "lmontel@mandrakesoft.com"); aboutData->addAuthor("Karl-Heinz Zimmer", 0, "khz@kde.org"); diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp index f3573887..41ec076d 100644 --- a/kexi/core/kexiaboutdata.cpp +++ b/kexi/core/kexiaboutdata.cpp @@ -49,12 +49,11 @@ TDEAboutData* Kexi::createAboutData() 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.kde.org" + "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@iidea.pl"); diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp index d0099ffc..a4cb54f0 100644 --- a/kexi/tests/newapi/main.cpp +++ b/kexi/tests/newapi/main.cpp @@ -121,8 +121,7 @@ int main(int argc, char** argv) "(c) 2003-2006, Kexi Team\n" "(c) 2003-2006, OpenOffice Polska Ltd.\n", "", - "http://www.koffice.org/kexi", - "submit@bugs.kde.org" + "bugs.trinitydesktop.org" ) ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h index 20d5d5e2..ba787095 100644 --- a/kformula/kformula_aboutdata.h +++ b/kformula/kformula_aboutdata.h @@ -33,8 +33,7 @@ TDEAboutData * newKFormulaAboutData() { 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@gmail.com", diff --git a/kivio/kiviopart/kivio_aboutdata.h b/kivio/kiviopart/kivio_aboutdata.h index 6348f757..03cf8e9e 100644 --- a/kivio/kiviopart/kivio_aboutdata.h +++ b/kivio/kiviopart/kivio_aboutdata.h @@ -32,8 +32,7 @@ TDEAboutData * newKivioAboutData() { 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@linux.se"); aboutData->addAuthor("Ian Reinhart Geiser", I18N_NOOP("Development"), "geiseri@kde.org"); aboutData->addAuthor("Laurent Montel", I18N_NOOP("Development"), "montel@kde.org"); diff --git a/kplato/kptaboutdata.h b/kplato/kptaboutdata.h index ccb6fb21..d53c87c2 100644 --- a/kplato/kptaboutdata.h +++ b/kplato/kptaboutdata.h @@ -34,8 +34,7 @@ TDEAboutData * newAboutData() { 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@sonofthor.dk"); aboutData->addAuthor("Dag Andersen", 0, "danders@get2net.dk"); diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h index f85a74c6..52f302a8 100644 --- a/kpresenter/KPrAboutData.h +++ b/kpresenter/KPrAboutData.h @@ -31,8 +31,7 @@ TDEAboutData * newKPresenterAboutData() { 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@kde.org"); aboutData->addAuthor("Werner Trobin", 0, "trobin@kde.org"); aboutData->addAuthor("David Faure", 0, "faure@kde.org"); diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 90053b31..ff9e3aea 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -510,7 +510,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) htmlAuthor=escapeHtmlText( codec, author ); else htmlAuthor=TQString("%2").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); - streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by %2 with KPresenter" ) + streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by %2 with KPresenter" ) .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) ); streamOut << "
\n"; @@ -561,7 +561,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) // footer: author name, e-mail TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) : TQString("%2").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); - streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by %2 with KPresenter" ) + streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by %2 with KPresenter" ) .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) ); streamOut << "\n\n"; diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h index 618fc132..338fd841 100644 --- a/kspread/kspread_aboutdata.h +++ b/kspread/kspread_aboutdata.h @@ -36,8 +36,7 @@ TDEAboutData * newAboutData() { 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@kde.org"); aboutData->addAuthor("Laurent Montel", 0, "montel@kde.org"); aboutData->addAuthor("John Dailey", 0, "dailey@vt.edu"); diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc index ba6f2335..e2f9d954 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc @@ -90,8 +90,7 @@ TDEAboutData* PluginInsertCalendar::createAboutData() I18N_NOOP("KSpread Insert Calendar Plugin"), //short description TDEAboutData::License_BSD, //license type I18N_NOOP("(c) 2005, The KSpread Team"), //copyright - 0,//I18N_NOOP("The Insert Calendar plugin can be used in spreadsheets"), //text - "http://www.koffice.org/kspread/"); + 0 ); //I18N_NOOP("The Insert Calendar plugin can be used in spreadsheets"), //text aboutData->addAuthor("Raphael Langerhorst", 0, "Raphael.Langerhorst@kdemail.net"); return aboutData; diff --git a/kugar/part/kugar_about.h b/kugar/part/kugar_about.h index 965cd282..78712abb 100644 --- a/kugar/part/kugar_about.h +++ b/kugar/part/kugar_about.h @@ -30,7 +30,7 @@ TDEAboutData *newKugarAboutData() { TDEAboutData * aboutData = new TDEAboutData( "kugar", I18N_NOOP( "Kugar" ), VERSION, I18N_NOOP( "Report viewer(generator)" ), TDEAboutData::License_GPL, - I18N_NOOP( "(c) 1999-2006, The Kugar Team" ), 0, "http://www.koffice.org" ); + I18N_NOOP( "(c) 1999-2006, The Kugar Team" ), 0 ); aboutData->addAuthor( "Alexander Dymo", I18N_NOOP( "Maintainer, Report Designer, Kugar library enhancements" ), "cloudtemple@mksat.net", diff --git a/kword/KWAboutData.h b/kword/KWAboutData.h index 909fc6ef..08e4bb21 100644 --- a/kword/KWAboutData.h +++ b/kword/KWAboutData.h @@ -36,8 +36,7 @@ TDEAboutData * newKWordAboutData() { TDEAboutData * aboutData=new TDEAboutData( "kword", I18N_NOOP("KWord"), KWORD_VERSION, KWORD_DESCRIPTION, TDEAboutData::License_LGPL, - I18N_NOOP("(c) 1998-2006, The KWord Team"), 0, - "http://www.koffice.org/kword/" ); + I18N_NOOP("(c) 1998-2006, The KWord Team"), 0 ); aboutData->addAuthor("David Faure", 0, "faure@kde.org"); aboutData->addAuthor("Reginald Stadlbauer", 0, "reggie@kde.org"); aboutData->addAuthor("Thomas Zander");