From 1c58d1407f9584fedcdae390a04e2b37e5853361 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 16:12:19 +0000
Subject: Merge from BRANCH_1_0

---
(limited to 'noncore/settings/sysinfo')

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
@@ -48,7 +48,7 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     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." ) );
@@ -141,9 +141,7 @@ void ModulesInfo::slotSendClicked()
 		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 );
 	
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
@@ -4,7 +4,7 @@ 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
@@ -164,9 +164,7 @@ void ProcessInfo::slotSendClicked()
 		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,
--
cgit v0.9.0.2