Revert "Revert "Fix bug reports link in about dialog""

The reversion was done by mistake and inadvertently. Sorry for the
mess :-(

This reverts commit dcb480334c.
pull/16/head
Michele Calgaro 6 years ago
parent 02639199e2
commit 74686afc04

@ -236,8 +236,8 @@ So, here are some tips on bug reporting:
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. :-)

@ -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>

@ -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>

@ -1 +1 @@
<para>Problemen en suggesties kunnen op de website <ulink url="http://bugs.kde.org">http://bugs.kde.nl</ulink> gemeld worden.</para>
<para>Problemen en suggesties kunnen op de website <ulink url="http://bugs.trinitydesktop.org">http://bugs.trinitydesktop.org</ulink> gemeld worden.</para>

@ -625,8 +625,10 @@ TDECmdLineArgs::parseAllArgs()
{
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@bugs.trinitydesktop.org"
|| 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() ) );

@ -20,7 +20,7 @@
static TDECmdLineOptions options[] = {
{ "subject <argument>", I18N_NOOP("Subject line"), 0 },
{ "recipient <argument>", I18N_NOOP("Recipient"), "submit@bugs.kde.org" },
{ "recipient <argument>", I18N_NOOP("Recipient"), "submit@bugs.trinitydesktop.org" },
TDECmdLineLastOption
};
@ -60,7 +60,7 @@ int main(int argc, char **argv) {
TDELocale::setMainCatalogue("tdelibs");
TDEAboutData d("tdesendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
I18N_NOOP("Sends a short bug report to submit@bugs.trinitydesktop.org"),
TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow");
d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
@ -72,7 +72,7 @@ int main(int argc, char **argv) {
TQCString recipient = args->getOption("recipient");
if (recipient.isEmpty())
recipient = "submit@bugs.kde.org";
recipient = "submit@bugs.trinitydesktop.org";
else {
if (recipient.at(0) == '\'') {
recipient = recipient.mid(1).left(recipient.length() - 2);
@ -117,7 +117,7 @@ int main(int argc, char **argv) {
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);

@ -243,7 +243,7 @@ TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &err
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 @@ TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &err
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 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er
"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 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er
"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;

@ -57,7 +57,7 @@ void KAutoMount::slotResult( TDEIO::Job * job )
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" );

@ -48,7 +48,7 @@ int main(int argc, char **argv) {
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" );

@ -343,7 +343,7 @@ int main(int argc, char **argv)
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

@ -86,7 +86,7 @@ void KPrintProcess::slotExited( TDEProcess* )
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;
}
}

@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
TQWidget * parent = plainPage();
d->submitBugButton = 0;
//if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") )
//if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.trinitydesktop.org") )
//{
// // This is a core KDE application -> redirect to the web form
// Always redirect to the Web form for Trinity
@ -284,7 +284,7 @@ KBugReport::~KBugReport()
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 @@ void KBugReport::slotOk( void )
{
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 @@ bool KBugReport::sendBugReport()
{
TQString recipient ( m_aboutData ?
m_aboutData->bugAddress() :
TQString::fromLatin1("submit@bugs.pearsoncomputing.net") );
TQString::fromLatin1("submit@bugs.trinitydesktop.org") );
TQString command;
command = locate("exe", "tdesendbugmail");

@ -71,7 +71,7 @@ protected slots:
*/
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 &);

@ -113,8 +113,10 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData )
KActiveLabel* activeLabel = new KActiveLabel( authorPage );
if (!aboutData->customAuthorTextEnabled())
{
if ( aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@bugs.pearsoncomputing.net")
text = i18n( "Please use <a href=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</a> to report bugs.\n" );
if ( aboutData->bugAddress().isEmpty()
|| aboutData->bugAddress() == "submit@bugs.trinitydesktop.org"
|| aboutData->bugAddress() == "http://bugs.trinitydesktop.org")
text = i18n( "Please use <a href=\"http://bugs.trinitydesktop.org\">http://bugs.trinitydesktop.org</a> to report bugs.\n" );
else {
if( aboutData->authors().count() == 1 && ( aboutData->authors().first().emailAddress() == aboutData->bugAddress() ) )
{

@ -52,7 +52,7 @@ TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal )
"do so. However, you - the user - must tell us when "
"something does not work as expected or could be done better.<br><br>"
"The Trinity Desktop Environment has a bug tracking system. Visit "
"<A HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</A> or "
"<a href=\"http://bugs.trinitydesktop.org\">http://bugs.trinitydesktop.org</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 "

Loading…
Cancel
Save