Index: aboutbugreportingdialog.cpp =================================================================== --- aboutbugreportingdialog.cpp (revision 939954) +++ aboutbugreportingdialog.cpp (working copy) @@ -37,11 +37,10 @@ QString text = - i18n("You can help us to improve this software filing a bug report." - "In order to generate an useful bug report we need to fetch some information about the crash and your system." - "We also need you to specify some information about the crash." - "Notice: You are not forced to file a bug report if you don't want to." - "If you have never seen this dialog before and you don't know what to do you can close it." + i18n("You can help us improve this software by filing a bug report." + "Note: It is safe to close this dialog. If you do not want to, you do not have to file a bug report." + "In order to generate a useful bug report we need some information about both the crash and your system." + "Bug Reporting Assistant Steps Guide" "" ); Index: getbacktracewidget.cpp =================================================================== --- getbacktracewidget.cpp (revision 939954) +++ getbacktracewidget.cpp (working copy) @@ -52,7 +52,7 @@ connect( ui.m_copyButton, SIGNAL(clicked()) , this, SLOT(copyClicked()) ); ui.m_copyButton->setEnabled( false ); - ui.m_saveButton->setGuiItem( KGuiItem( i18nc("button action", "&Save to File" ), KIcon("document-save"), i18nc("button explanation", "Use this button to save the crash information (backtrace) to a file. This is useful if you want to take a look on it or to report the bug later" ), i18nc("button explanation", "Use this button to save the crash information (backtrace) to a file. This is useful if you want to take a look on it or to report the bug later" ) ) ); + ui.m_saveButton->setGuiItem( KGuiItem( i18nc("button action", "&Save to File" ), KIcon("document-save"), i18nc("button explanation", "Use this button to save the crash information (backtrace) to a file. This is useful if you want to take a look at it or to report the bug later" ), i18nc("button explanation", "Use this button to save the crash information (backtrace) to a file. This is useful if you want to take a look at it or to report the bug later" ) ) ); connect( ui.m_saveButton, SIGNAL(clicked()) , this, SLOT(saveClicked()) ); ui.m_saveButton->setEnabled( false ); @@ -128,7 +128,7 @@ case BacktraceParser::ProbablyUseless: usefulnessText = i18nc("backtrace rating description", "This crash information is probably useless");break; case BacktraceParser::Useless: - usefulnessText = i18nc("backtrace rating description", "The crash information is useless");break; + usefulnessText = i18nc("backtrace rating description", "This crash information is useless");break; default: //let's hope nobody will ever see this... ;) usefulnessText = i18nc("backtrace rating description that should never appear", @@ -141,7 +141,7 @@ if( btParser->backtraceUsefulness() != BacktraceParser::ReallyUseful ) { ui.m_extraDetailsLabel->setVisible( true ); - ui.m_extraDetailsLabel->setText( i18n( "The crash information lacks of some important details.
Please read How to create useful crash reports in order to know how to get an useful backtrace.
After you install the needed packages you can click the \"Reload Crash Information\" button ", QLatin1String("http://techbase.kde.org/Development/Tutorials/Debugging/How_to_create_useful_crash_reports") ) ); + ui.m_extraDetailsLabel->setText( i18n( "The crash information lacks some important details.
Please read How to create useful crash reports to learn how to get a useful backtrace.
After you install the needed packages you can click the \"Reload Crash Information\" button ", QLatin1String("http://techbase.kde.org/Development/Tutorials/Debugging/How_to_create_useful_crash_reports") ) ); ui.m_reloadBacktraceButton->setEnabled( true ); #if 0 @@ -169,7 +169,7 @@ ui.m_backtraceEdit->setPlainText( i18n("The crash information could not be generated" ) ); ui.m_extraDetailsLabel->setVisible( true ); - ui.m_extraDetailsLabel->setText( i18n( "You need to install the debug symbols package for this application
Please read How to create useful crash reports in order to know how to get an useful backtrace.
After you install the needed packages you can click the \"Reload Crash Information\" button ", QLatin1String("http://techbase.kde.org/Development/Tutorials/Debugging/How_to_create_useful_crash_reports") ) ); + ui.m_extraDetailsLabel->setText( i18n( "You need to install the debug symbols package for this application
Please read How to create useful crash reports to learn how to get a useful backtrace.
After you install the needed packages you can click the \"Reload Crash Information\" button ", QLatin1String("http://techbase.kde.org/Development/Tutorials/Debugging/How_to_create_useful_crash_reports") ) ); ui.m_reloadBacktraceButton->setEnabled( true ); } else if( crashInfo->getBacktraceState() == CrashInfo::DebuggerFailed ) Index: drkonqidialog.cpp =================================================================== --- drkonqidialog.cpp (revision 939954) +++ drkonqidialog.cpp (working copy) @@ -61,7 +61,7 @@ , m_crashInfo->getCrashConfig()->signalName(), m_crashInfo->getCrashConfig()->signalText() ) ); infoLabel->setWordWrap( true ); - QLabel * whatToDoLabel = new QLabel( i18n( "You can help us to improve the software reporting this bug." ) ); + QLabel * whatToDoLabel = new QLabel( i18n( "You can help us improve the software by reporting this bug." ) ); m_aboutBugReportingButton = new KPushButton( KGuiItem( i18nc("button action", "Learn more about bug reporting") , KIcon("help-hint"), i18nc("help text", "Get help in order to know how to file an useful bug report"), i18nc("help text", "Get help in order to know how to file an useful bug report") ) ); //TODO rewrite text? Index: bugzillalib.cpp =================================================================== --- bugzillalib.cpp (revision 939954) +++ bugzillalib.cpp (working copy) @@ -222,7 +222,7 @@ } else { - emit commitReportError( i18n( "There was some error during the report commit. Response:: %1", response ) ); + emit commitReportError( i18n( "There was an error in submitting the report. Response:: %1", response ) ); //TODO don't show html, show error (requires parsing) } } Index: drkonqiassistantpages_base.cpp =================================================================== --- drkonqiassistantpages_base.cpp (revision 939954) +++ drkonqiassistantpages_base.cpp (working copy) @@ -42,7 +42,7 @@ DrKonqiAssistantPage() { QLabel * mainLabel = new QLabel( - i18n("This assistant will analyse the crash information and guide your through the bug reporting processYou can get help about this bug reporting assistant clicking thw \"Help\" buttonTo start gathering the crash information press the \"Next\" button") + i18n("This assistant will analyse the crash information and guide you through the bug reporting processYou can get help about this bug reporting assistant clicking the \"Help\" buttonTo start gathering the crash information press the \"Next\" button") ); mainLabel->setWordWrap( true ); @@ -101,10 +101,11 @@ QLabel * detailLabel = new QLabel( i18n( - "Including in your bug report what were you doing when the application crashed would help the developers " - "to reproduce the situation and fix the bug. ( Important details are: Actions you were taking on the application and documents you were using )" ) ); + "Including in your bug report what were you doing when the application crashed will help the developers " + "reproduce and fix the bug. ( Important details are: what you were doing in the application and documents you were using )" ) ); - /*"Important details are:
" + /* mention subapplications? sites you were using? + "Important details are:
" "* Actions you were taking on the application and on the whole system
" "* Documents you were using in the application (or a reference to them and their type)" " ( you can attach files in the bug report once it is filed )
" ) ); @@ -112,9 +113,9 @@ detailLabel->setWordWrap( true ); - m_canDetailCheckBox = new QCheckBox( i18n( "I can detail what I was doing when the application crashed" ) ); + m_canDetailCheckBox = new QCheckBox( i18n( "I can give detailed information about what I was doing when the application crashed" ) ); - QGroupBox * canDetailBox = new QGroupBox( i18n( "Can you detail what were you doing when the application crashed ?" ) ); + QGroupBox * canDetailBox = new QGroupBox( i18n( "Can you give detailed information about what were you doing when the application crashed ?" ) ); QVBoxLayout * canDetailLayout = new QVBoxLayout(); canDetailBox->setLayout( canDetailLayout ); canDetailLayout->addWidget( detailLabel ); @@ -123,16 +124,16 @@ //Compromise QLabel * compromiseLabel = new QLabel( - i18n( "Sometimes the developers need more information from the reporter in order to triage the bug." ) + i18n( "Sometimes the developers need more information from the reporter in order to fix the bug." ) ); compromiseLabel->setWordWrap( true ); m_compromiseCheckBox = new QCheckBox( - i18n( "I get compromise to help the developers to triage the bug providing further information" ) + i18n( "I am willing to help the developers by providing further information" ) ); - QGroupBox * getCompromiseBox = new QGroupBox( i18n( "Do you get compromise to help the developers ?" ) ); + QGroupBox * getCompromiseBox = new QGroupBox( i18n( "Are you willing to help the developers?" ) ); QVBoxLayout * getCompromiseLayout = new QVBoxLayout(); getCompromiseBox->setLayout( getCompromiseLayout ); getCompromiseLayout->addWidget( compromiseLabel ); @@ -309,21 +310,23 @@ { needToReport = ( canReproduce || ( canDetails && getCompromise ) ); report = i18n( "* The crash information is completely useless" ) ; - break; + break; } } report.append( QLatin1String( "
" ) ); if( canDetails ) - report += i18n( "* You can detail what were you doing when the application crashed" ); + report += i18n( "* You can explain in detail what were you doing when the application crashed" ); else - report += i18n( "* You can't detail what were you doing when the application crashed" ) ; + report += i18n( "* You aren't sure what were you doing when the application crashed" ) ; + /* report += i18n( "* You can't say what were you doing when the application crashed" ) ; + There's something between "very detailed" and "no clue"... */ report.append( QLatin1String( "
" ) ); if( canReproduce ) report += i18n( "* You can reproduce the crash at will and you can provide steps or a testcase" ); else - report += i18n( "* You can't reproduce the crash at will and you can provide steps or a testcase" ); + report += i18n( "* You can't reproduce the crash at will, but you can provide steps or a testcase" ); // is that possible for newbies? if ( needToReport ) {