3 files changed, 4 insertions, 8 deletions

diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index 3d127a8..8def0d6 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -39,25 +39,25 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
     ModulesView = new QListView( this );
     int colnum = ModulesView->addColumn( tr( "Module" ) );
     colnum = ModulesView->addColumn( tr( "Size" ) );
     ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
     colnum = ModulesView->addColumn( tr( "Use#" ) );
     ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
-    colnum = ModulesView->addColumn( tr( "Used By" ) );
+    colnum = ModulesView->addColumn( tr( "Used by" ) );
     ModulesView->setAllColumnsShowFocus( TRUE );
     layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 );
     QWhatsThis::add( ModulesView, tr( "This is a list of all the kernel modules currently loaded on this handheld device.\n\nClick and hold on a module to see additional information about the module, or to unload it." ) );
 	
 	// Test if we have /sbin/modinfo, and if so, allow module detail window
 	if ( QFile::exists( "/sbin/modinfo" ) )
 	{
 		QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
     	connect( ModulesView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
 				 this, SLOT( viewModules( QListViewItem * ) ) );
 	}
 
@@ -132,27 +132,25 @@ void ModulesInfo::updateData()
 
         fclose( procfile );
     }
 }
 
 void ModulesInfo::slotSendClicked()
 {
 	if ( !ModulesView->currentItem() )
 	{
 		return;
 	}
 	
-	QString capstr = tr( "You really want to execute\n" );
-	capstr.append( CommandCB->currentText() );
-	capstr.append( "\nfor this module?" );
+	QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() );
 
 	QString modname = ModulesView->currentItem()->text( 0 );
 	
     if ( QMessageBox::warning( this, modname, capstr,
          QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
     {
 		QString command = "/sbin/";
 		command.append( CommandCB->currentText() );
 		command.append( " " );
 		command.append( modname );
 
         FILE* stream = popen( command, "r" );
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index acb51e5..8250174 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,10 +1,10 @@
 Package: opie-sysinfo
 Files: bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
 Section: opie/applications
 Maintainer: Dan Williams <williamsdr@acm.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: System Information dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index 1de1a19..8dec9be 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -155,27 +155,25 @@ void ProcessInfo::updateData()
     delete proclist;
     delete procdir;
 }
 
 void ProcessInfo::slotSendClicked()
 {
 	QListViewItem *currprocess = ProcessView->currentItem();
 	if ( !currprocess )
 	{
 		return;
 	}
 	
-	QString capstr = tr( "You really want to send\n" );
-	capstr.append( SignalCB->currentText() );
-	capstr.append( "\nto this process?" );
+	QString capstr = tr( "You really want to send %1 to this process?" ).arg( SignalCB->currentText() );
 
 	
 	if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
 		 QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
 	{
 		currprocess = ProcessView->currentItem();
 		if ( currprocess )
 		{
 			QString sigstr = SignalCB->currentText();
 			sigstr.truncate(2);
 			int sigid = sigstr.toUInt();
 			kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid );