| 74686afc | 2018-07-26 08:01:52 | Michele Calgaro |
Revert "Revert "Fix bug reports link in about dialog"" The reversion was done by mistake and inadvertently. Sorry for the mess :-( This reverts commit dcb480334c2e8a53fd5ca421b6bd686ea594d4ac. |
||
|
M README M kdoctools/customization/de/entities/report-bugs.docbook M kdoctools/customization/es/entities/report-bugs.docbook M kdoctools/customization/nl/entities/report-bugs.docbook M tdecore/tdecmdlineargs.cpp M tdeio/misc/tdesendbugmail/main.cpp M tdeio/tdeio/global.cpp M tdeio/tdeio/kautomount.cpp M tdeio/tests/kprotocolinfotest.cpp M tdeio/tests/kurifiltertest.cpp M tdeprint/kprintprocess.cpp M tdeui/kbugreport.cpp M tdeui/kbugreport.h M tdeui/tdeaboutapplication.cpp M tdeui/tdeabouttde.cpp |
||
READMEdiff --git a/README b/README index e2eba8a..6740935 100644 --- a/README +++ b/README @@ -236,8 +236,8 @@ older, deprecated versions usually don't get that much attention :-) * Also the chance is high that another one experienced your problem. The - bug report wizard at http://bugs.kde.org will help you to find out if your - problem has already been reported. + bug report wizard at http://bugs.trinitydesktop.org will help you to + find out if your problem has already been reported. * The best bug report for a project based on voluntary work is of course one that comes with a patch that solves the problem. :-) kdoctools/customization/de/entities/report-bugs.docbookdiff --git a/kdoctools/customization/de/entities/report-bugs.docbook b/kdoctools/customization/de/entities/report-bugs.docbook index 26ac76a..bdab680 100644 --- a/kdoctools/customization/de/entities/report-bugs.docbook +++ b/kdoctools/customization/de/entities/report-bugs.docbook @@ -1 +1 @@ -<para>Berichten Sie ��ber Probleme und W��nsche auf der Internetseite <ulink url="http://bugs.kde.org">http://bugs.kde.org</ulink>.</para> +<para>Berichten Sie ��ber Probleme und W��nsche auf der Internetseite <ulink url="http://bugs.trinitydesktop.org">http://bugs.trinitydesktop.org</ulink>.</para> kdoctools/customization/es/entities/report-bugs.docbookdiff --git a/kdoctools/customization/es/entities/report-bugs.docbook b/kdoctools/customization/es/entities/report-bugs.docbook index 7becde3..9a54332 100644 --- a/kdoctools/customization/es/entities/report-bugs.docbook +++ b/kdoctools/customization/es/entities/report-bugs.docbook @@ -1 +1 @@ -<para>Si encuentra alg��n error en la documentaci��n o en su traducci��n dirijase a la p��gina <ulink url="http://bugs.kde.org">http://bugs.kde.org</ulink> para informar del error.</para> +<para>Si encuentra alg��n error en la documentaci��n o en su traducci��n dirijase a la p��gina <ulink url="http://bugs.trinitydesktop.org">http://bugs.trinitydesktop.org</ulink> para informar del error.</para> kdoctools/customization/nl/entities/report-bugs.docbookdiff --git a/kdoctools/customization/nl/entities/report-bugs.docbook b/kdoctools/customization/nl/entities/report-bugs.docbook index c07a3d2..6c50092 100644 --- a/kdoctools/customization/nl/entities/report-bugs.docbook +++ b/kdoctools/customization/nl/entities/report-bugs.docbook @@ -1 +1 @@ -<para>Problemen en suggesties kunnen op de website <ulink url="http://bugs.kde.org">http://bugs.kde.nl</ulink> gemeld worden.</para> \ No newline at end of file +<para>Problemen en suggesties kunnen op de website <ulink url="http://bugs.trinitydesktop.org">http://bugs.trinitydesktop.org</ulink> gemeld worden.</para> tdecore/tdecmdlineargs.cppdiff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp index 46d1b9f..0b9e269 100644 --- a/tdecore/tdecmdlineargs.cpp +++ b/tdecore/tdecmdlineargs.cpp @@ -625,8 +625,10 @@ {
if (!about->customAuthorTextEnabled ()) {
- if (about->bugAddress().isEmpty() || about->bugAddress() == "bugs.pearsoncomputing.net" ) - printQ( i18n( "Please use http://bugs.pearsoncomputing.net to report bugs.\n" ) ); + if (about->bugAddress().isEmpty() + || about->bugAddress() == "submit@..." + || about->bugAddress() == "http://bugs.trinitydesktop.org" ) + printQ( i18n( "Please use http://bugs.trinitydesktop.org to report bugs.\n" ) ); else {
if( about->authors().count() == 1 && about->authors().first().emailAddress() == about->bugAddress() ) printQ( i18n( "Please report bugs to %1.\n" ).arg( about->authors().first().emailAddress() ) ); tdeio/misc/tdesendbugmail/main.cppdiff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index 3246503..bf30990 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -20,7 +20,7 @@ static TDECmdLineOptions options[] = {
{ "subject <argument>", I18N_NOOP("Subject line"), 0 },
- { "recipient <argument>", I18N_NOOP("Recipient"), "submit@..." },
+ { "recipient <argument>", I18N_NOOP("Recipient"), "submit@..." },
TDECmdLineLastOption }; @@ -60,7 +60,7 @@ TDELocale::setMainCatalogue("tdelibs");
TDEAboutData d("tdesendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
- I18N_NOOP("Sends a short bug report to submit@..."),
+ I18N_NOOP("Sends a short bug report to submit@..."),
TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow"); d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@...");
@@ -72,7 +72,7 @@ TQCString recipient = args->getOption("recipient");
if (recipient.isEmpty()) - recipient = "submit@..."; + recipient = "submit@..."; else {
if (recipient.at(0) == '\'') {
recipient = recipient.mid(1).left(recipient.length() - 2); @@ -117,7 +117,7 @@ TQString server = emailConfig.getSetting(KEMailSettings::OutServer); if (server.isEmpty()) - server=TQString::fromLatin1("bugs.kde.org");
+ server=TQString::fromLatin1("bugs.trinitydesktop.org");
SMTP *sm = new SMTP; BugMailer bm(sm); tdeio/tdeio/global.cppdiff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp index a75cc22..4a5819b 100644 --- a/tdeio/tdeio/global.cpp +++ b/tdeio/tdeio/global.cpp @@ -243,7 +243,7 @@ result = i18n( "Could not start process %1." ).arg( errorText ); break; case TDEIO::ERR_INTERNAL: - result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.kde.org\n%1" ).arg( errorText ); + result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.trinitydesktop.org\n%1" ).arg( errorText ); break; case TDEIO::ERR_MALFORMED_URL: result = i18n( "Malformed URL %1." ).arg( errorText ); @@ -429,7 +429,7 @@ result = i18n( "Could not access %1.\nOffline mode active.").arg( errorText ); break; default: - result = i18n( "Unknown error code %1\n%2\nPlease send a full bug report at http://bugs.kde.org." ).arg( errorCode ).arg( errorText ); + result = i18n( "Unknown error code %1\n%2\nPlease send a full bug report at http://bugs.trinitydesktop.org." ).arg( errorCode ).arg( errorText ); break; } @@ -608,7 +608,7 @@ "high quality bug report. If the software is provided by a third party, " "please contact them directly. Otherwise, first look to see if " "the same bug has been submitted by someone else by searching at the " - "<a href=\"http://bugs.pearsoncomputing.net//\">TDE bug reporting website</a>. If not, take " + "<a href=\"http://bugs.trinitydesktop.org/\">TDE bug reporting website</a>. If not, take " "note of the details given above, and include them in your bug report, along " "with as many other details as you think might help." ); TQString cNetwork = i18n( "There may have been a problem with your network " @@ -1118,8 +1118,8 @@ "authentication details, the authentication failed because the " "method that the server is using is not supported by the TDE " "program implementing the protocol %1." ).arg( protocol ); - solutions << i18n( "Please file a bug at <a href=\"http://bugs.kde.org/\">" - "http://bugs.pearsoncomputing.net/</a> to inform the TDE team of the unsupported " + solutions << i18n( "Please file a bug at <a href=\"http://bugs.trinitydesktop.org/\">" + "http://bugs.trinitydesktop.org/</a> to inform the TDE team of the unsupported " "authentication method." ) << sSysadmin; break; tdeio/tdeio/kautomount.cppdiff --git a/tdeio/tdeio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp index f167a6c..c6fa723 100644 --- a/tdeio/tdeio/kautomount.cpp +++ b/tdeio/tdeio/kautomount.cpp @@ -57,7 +57,7 @@ if ( mountpoint.path().isEmpty() ) kdWarning(7015) << m_strDevice << " was correctly mounted, but TDEIO::findDeviceMountPoint didn't find it. " - << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl; + << "This looks like a bug, please report it on http://bugs.trinitydesktop.org, together with your /etc/fstab line" << endl; else if ( m_bShowFilemanagerWindow ) KRun::runURL( mountpoint, "inode/directory" ); tdeio/tests/kprotocolinfotest.cppdiff --git a/tdeio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp index d951f36..8285396 100644 --- a/tdeio/tests/kprotocolinfotest.cpp +++ b/tdeio/tests/kprotocolinfotest.cpp @@ -48,7 +48,7 @@ assert( TDEGlobalSettings::showFilePreview( "audiocd:/" ) == false ); TQString proxy; - TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.kde.org", proxy ); + TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.trinitydesktop.org", proxy ); assert( protocol == "http" ); TQStringList capabilities = KProtocolInfo::capabilities( "imap" ); tdeio/tests/kurifiltertest.cppdiff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index d9f6cdf..9de62e1 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -343,7 +343,7 @@ TQCString sc; filter( sc.sprintf("gg%cfoo bar",delimiter), "http://www.google.com/search?q=foo+bar&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );
- filter( sc.sprintf("bug%c55798", delimiter), "http://bugs.pearsoncomputing.net/show_bug.cgi?id=55798", KURIFilterData::NET_PROTOCOL );
+ filter( sc.sprintf("bug%c55798", delimiter), "http://bugs.trinitydesktop.org/show_bug.cgi?id=55798", KURIFilterData::NET_PROTOCOL );
filter( sc.sprintf("gg%cC++", delimiter), "http://www.google.com/search?q=C%2B%2B&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );
filter( sc.sprintf("ya%cfoo bar was here", delimiter), 0, -1 ); // this triggers default search, i.e. google
tdeprint/kprintprocess.cppdiff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index 89ef5e2..2b0c0f6 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -86,7 +86,7 @@ break; default: emit printError( this, "Internal error, printing terminated in unexpected state. " - "Report bug at <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a>." ); + "Report bug at <a href=\"http://bugs.trinitydesktop.org\">http://bugs.trinitydesktop.org</a>." ); break; } } tdeui/kbugreport.cppdiff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 7a2862c..4424371 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -88,7 +88,7 @@ TQWidget * parent = plainPage(); d->submitBugButton = 0; - //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@...") )
+ //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@...") )
//{
// // This is a core KDE application -> redirect to the web form // Always redirect to the Web form for Trinity @@ -284,7 +284,7 @@ void KBugReport::updateURL() {
- KURL url ( "http://bugs.pearsoncomputing.net/enter_bug.cgi" ); + KURL url ( "http://bugs.trinitydesktop.org/enter_bug.cgi" ); url.addQueryItem( "product", "TDE" ); url.addQueryItem( "op_sys", d->os ); url.addQueryItem( "cf_kde_compiler", KDE_COMPILER_VERSION ); @@ -419,7 +419,7 @@ {
TQString msg = i18n("Unable to send the bug report.\n"
"Please submit a bug report manually...\n" - "See http://bugs.pearsoncomputing.net/ for instructions."); + "See http://bugs.trinitydesktop.org/ for instructions."); KMessageBox::error(this, msg + "\n\n" + d->lastError); return; } @@ -487,7 +487,7 @@ {
TQString recipient ( m_aboutData ? m_aboutData->bugAddress() : - TQString::fromLatin1("submit@...") );
+ TQString::fromLatin1("submit@...") );
TQString command; command = locate("exe", "tdesendbugmail");
tdeui/kbugreport.hdiff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h index e95c499..3110d3d 100644 --- a/tdeui/kbugreport.h +++ b/tdeui/kbugreport.h @@ -71,7 +71,7 @@ */ virtual void slotSetFrom(); /** - * The URL-Label "http://bugs.pearsoncomputing.net/" was clicked. + * The URL-Label "http://bugs.trinitydesktop.org/" was clicked. * @deprecated remove in KDE4.0 */ virtual void slotUrlClicked(const TQString &); tdeui/tdeaboutapplication.cppdiff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp index ef9efb1..e9eb2f4 100644 --- a/tdeui/tdeaboutapplication.cpp +++ b/tdeui/tdeaboutapplication.cpp @@ -113,8 +113,10 @@ KActiveLabel* activeLabel = new KActiveLabel( authorPage ); if (!aboutData->customAuthorTextEnabled()) {
- if ( aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@...")** Diff limit reached (max: 250 lines) ** |
||