Update bug report dialog with additional information

This closes Bug 754
(cherry picked from commit c2fb83dad7c2d075c0e9eec083b9d267c79abb6b)

4 files changed, 14 insertions, 6 deletions

diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp
index e32dd22eb..3fbec3d6d 100644
--- a/kdeui/kaboutkde.cpp
+++ b/kdeui/kaboutkde.cpp
@@ -79,7 +79,7 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
   setTitle(i18n("Trinity Desktop Environment. Release %1").
 	   arg(TQString::fromLatin1(KDE_VERSION_STRING)) );
   addTextPage( i18n("About Trinity","&About"), text1, true );
-  addTextPage( i18n("&Report Bugs or Wishes"), text2, true );
+  addTextPage( i18n("&Report Bugs/Request Enhancements"), text2, true );
   addTextPage( i18n("&Join the Trinity Team"), text3, true );
   addTextPage( i18n("&Support Trinity"), text4, true );
   setImage( locate( "data", TQString::fromLatin1("kdeui/pics/aboutkde.png")) );
diff --git a/kdeui/kbugreport.cpp b/kdeui/kbugreport.cpp
index 1ededa824..ebd9f7f69 100644
--- a/kdeui/kbugreport.cpp
+++ b/kdeui/kbugreport.cpp
@@ -250,9 +250,17 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
     // Point to the web form
 
     lay->addSpacing(10);
-    TQString text = i18n("To submit a bug report, click on the button below.\n"
-                        "This will open a web browser window on http://bugs.pearsoncomputing.net where you will find a form to fill in.\n"
-                        "The information displayed above will be transferred to that server.");
+    TQString text = i18n("Reporting bugs and requesting enhancements are maintained using the Bugzilla reporting system.\n"
+                        "You'll need a login account and password to use the reporting system.\n"
+                        "To control spam and rogue elements the login requires a valid email address.\n"
+                        "Consider using any large email service if you want to avoid using your private email address.\n"
+                        "\n"
+                        "Selecting the button below opens your web browser to http://bugs.trinitydesktop.org,\n"
+                        "where you will find the report form.\n"
+                        "The information displayed above will be transferred to the reporting system.\n"
+                        "Session cookies must be enabled to use the reporting system.\n"
+                        "\n"
+                        "Thank you for helping!");
     TQLabel * label = new TQLabel( text, parent, "label");
     lay->addWidget( label );
     lay->addSpacing(10);
diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp
index 330362d45..071db1248 100644
--- a/kdeui/khelpmenu.cpp
+++ b/kdeui/khelpmenu.cpp
@@ -148,7 +148,7 @@ KPopupMenu* KHelpMenu::menu()
     {
       if (need_separator)
         mMenu->insertSeparator();
-      mMenu->insertItem( i18n( "&Report Bug..." ), menuReportBug );
+      mMenu->insertItem( i18n( "&Report Bug/Request Enhancement..." ), menuReportBug );
       mMenu->connectItem( menuReportBug, this, TQT_SLOT(reportBug()) );
       need_separator = true;
     }
diff --git a/kdeui/kstdaction_p.h b/kdeui/kstdaction_p.h
index bc60115b1..f7e649fa8 100644
--- a/kdeui/kstdaction_p.h
+++ b/kdeui/kstdaction_p.h
@@ -108,7 +108,7 @@ static const KStdActionInfo g_rgActionInfo[] =
 	{ HelpContents,  KStdAccel::Help, "help_contents", I18N_NOOP("%1 &Handbook"), 0, "contents" },
 	{ WhatsThis,     KStdAccel::WhatsThis, "help_whats_this", I18N_NOOP("What's &This?"), 0, "contexthelp" },
 	{ TipofDay,      KStdAccel::AccelNone, "help_show_tip", I18N_NOOP("Tip of the &Day"), 0, "idea" },
-	{ ReportBug,     KStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug..."), 0, 0 },
+	{ ReportBug,     KStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug/Request Enhancement..."), 0, 0 },
 	{ SwitchApplicationLanguage,     KStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
 	{ AboutApp,      KStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
 	{ AboutKDE,      KStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },