Merge from BRANCH_1_0

46 files changed, 336 insertions, 367 deletions

diff --git a/noncore/apps/advancedfm/filePermissions.cpp b/noncore/apps/advancedfm/filePermissions.cpp
index c06f14f..4de6d12 100644
--- a/noncore/apps/advancedfm/filePermissions.cpp
+++ b/noncore/apps/advancedfm/filePermissions.cpp
@@ -10,26 +10,22 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "filePermissions.h"
 
-#include <qfile.h>
 #include <qfileinfo.h>
 
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
 #include <qmessagebox.h>
 
 #include <unistd.h>
 #include <sys/stat.h>
-#include <stdlib.h> 
+#include <stdlib.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 
 filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString &fileName )
     : QDialog( parent, name, modal, fl )
@@ -67,68 +63,68 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
 
     CheckBox1_2 = new QCheckBox( this, "CheckBox1_2" );
     CheckBox1_2->setGeometry( QRect( 135, 85, 20, 16 ) );
     connect(CheckBox1_2, SIGNAL(released()),this,SLOT(ownWriteCheck()));
 
     CheckBox1_3 = new QCheckBox( this, "CheckBox1_3" );
-    CheckBox1_3->setGeometry( QRect( 195, 85, 20, 16 ) ); 
+    CheckBox1_3->setGeometry( QRect( 195, 85, 20, 16 ) );
     connect(CheckBox1_3, SIGNAL(released()),this,SLOT(ownExeCheck()));
 
     CheckBox1_4 = new QCheckBox( this, "CheckBox1_4" );
-    CheckBox1_4->setGeometry( QRect( 75, 105, 20, 16 ) ); 
+    CheckBox1_4->setGeometry( QRect( 75, 105, 20, 16 ) );
     connect(CheckBox1_4, SIGNAL(released()),this,SLOT(grpReadCheck()));
 
     CheckBox1_5 = new QCheckBox( this, "CheckBox1_5" );
-    CheckBox1_5->setGeometry( QRect( 135, 105, 20, 16 ) ); 
+    CheckBox1_5->setGeometry( QRect( 135, 105, 20, 16 ) );
     connect(CheckBox1_5, SIGNAL(released()),this,SLOT(grpWriteCheck()));
 
     CheckBox1_6 = new QCheckBox( this, "CheckBox1_6" );
-    CheckBox1_6->setGeometry( QRect( 195, 105, 20, 16 ) ); 
+    CheckBox1_6->setGeometry( QRect( 195, 105, 20, 16 ) );
     connect(CheckBox1_6, SIGNAL(released()),this,SLOT(grpExeCheck()));
 
     CheckBox1_7 = new QCheckBox( this, "CheckBox1_7" );
-    CheckBox1_7->setGeometry( QRect( 75, 125, 16, 16 ) ); 
+    CheckBox1_7->setGeometry( QRect( 75, 125, 16, 16 ) );
     connect(CheckBox1_7, SIGNAL(released()),this,SLOT(wrldReadCheck()));
 
     CheckBox1_8 = new QCheckBox( this, "CheckBox1_8" );
     CheckBox1_8->setGeometry( QRect( 135, 125, 20, 16 ) );
     connect(CheckBox1_8, SIGNAL(released()),this,SLOT(wrldWriteCheck()));
 
     CheckBox1_8_2 = new QCheckBox( this, "CheckBox1_8_2" );
-    CheckBox1_8_2->setGeometry( QRect( 195, 125, 20, 16 ) ); 
+    CheckBox1_8_2->setGeometry( QRect( 195, 125, 20, 16 ) );
     connect(CheckBox1_8_2, SIGNAL(released()),this,SLOT(wrldExeCheck()));
 
     GroupLineEdit = new QLineEdit( this, "GroupLineEdit" );
-    GroupLineEdit->setGeometry( QRect( 125, 155, 106, 22 ) ); 
+    GroupLineEdit->setGeometry( QRect( 125, 155, 106, 22 ) );
 
     OwnerLineEdit = new QLineEdit( this, "OwnerLineEdit" );
-    OwnerLineEdit->setGeometry( QRect( 10, 155, 106, 22 ) ); 
+    OwnerLineEdit->setGeometry( QRect( 10, 155, 106, 22 ) );
 
     TextLabel5 = new QLabel( this, "TextLabel5" );
-    TextLabel5->setGeometry( QRect( 45, 180, 40, 16 ) ); 
+    TextLabel5->setGeometry( QRect( 45, 180, 40, 16 ) );
     TextLabel5->setText( tr( "Owner" ) );
 
     TextLabel5_2 = new QLabel( this, "TextLabel5_2" );
-    TextLabel5_2->setGeometry( QRect( 155, 180, 40, 16 ) ); 
+    TextLabel5_2->setGeometry( QRect( 155, 180, 40, 16 ) );
     TextLabel5_2->setText( tr( "Group" ) );
 
     ModeLine = new QLineEdit( this, "TextLabelMode" );
-    ModeLine->setGeometry( QRect( 10, 60, 40, 15 ) ); 
+    ModeLine->setGeometry( QRect( 10, 60, 40, 15 ) );
 
     TextLabel3_2 = new QLabel( this, "TextLabel3_2" );
-    TextLabel3_2->setGeometry( QRect( 60, 55, 50, 20 ) ); 
+    TextLabel3_2->setGeometry( QRect( 60, 55, 50, 20 ) );
     TextLabel3_2->setText( tr( "read" ) );
     TextLabel3_2->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) );
 
     TextLabel3_2_2 = new QLabel( this, "TextLabel3_2_2" );
-    TextLabel3_2_2->setGeometry( QRect( 120, 55, 50, 20 ) ); 
+    TextLabel3_2_2->setGeometry( QRect( 120, 55, 50, 20 ) );
     TextLabel3_2_2->setText( tr( "write" ) );
     TextLabel3_2_2->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) );
 
     TextLabel3 = new QLabel( this, "TextLabel3" );
-    TextLabel3->setGeometry( QRect( 180, 55, 50, 20 ) ); 
+    TextLabel3->setGeometry( QRect( 180, 55, 50, 20 ) );
     TextLabel3->setText( tr( "execute" ) );
     TextLabel3->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) );
 
     struct stat buf;
     mode_t mode;
     file = fileName;
@@ -146,23 +142,23 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     if( fi.permission( QFileInfo::WriteGroup)) { CheckBox1_5->setChecked(true); }
     if( fi.permission( QFileInfo::ExeGroup)) { CheckBox1_6->setChecked(true); }
 
     if( fi.permission( QFileInfo::ReadOther)) { CheckBox1_7->setChecked(true); }
     if( fi.permission( QFileInfo::WriteOther)) { CheckBox1_8->setChecked(true); }
     if( fi.permission( QFileInfo::ExeOther)) { CheckBox1_8_2->setChecked(true); }
-    
+
     stat(file.latin1(), &buf);
     mode = buf.st_mode;
     modeStr.sprintf("%#o", buf.st_mode & ~(S_IFMT) );
     ModeLine->setText(modeStr);
     bool ok;
     i_mode = modeStr.toInt(&ok,10);
-    
+
 }
 
-/*  
+/*
  *  Destroys the object and frees any allocated resources
  */
 filePermissions::~filePermissions()
 {
 }
 
@@ -245,30 +241,30 @@ void filePermissions::accept() {
     QFileInfo fi(file);
     struct passwd *pwd=0;
     struct group *grp=0;
     pwd = getpwnam(OwnerLineEdit->text().latin1() );
     if(pwd == NULL) {
         perror("getpwnam");
-        QMessageBox::warning(this,"Warning","Error- no user");
+        QMessageBox::warning(this,tr("Warning"),tr("Error- no user") );
         return;
     } else {
         grp = getgrnam(GroupLineEdit->text().latin1());
         if(grp==NULL) {
         perror("getgrnam");
-        QMessageBox::warning(this,"Warning","Error- no  group");
+        QMessageBox::warning(this,tr("Warning"),tr("Error- no  group"));
         return;
         }
         if( chown( file.latin1(),  pwd->pw_uid, grp->gr_gid) <0) {
         perror("chown");
-        QMessageBox::warning(this,"Warning","Error setting ownership or group");
+        QMessageBox::warning(this,tr("Warning"),tr("Error setting ownership or group") );
         return;
         }
         bool ok;
         uint moder = modeStr.toUInt(&ok,8);
         if( chmod( file.latin1(), moder) < 0) {
             perror("chmod");
-            QMessageBox::warning(this,"Warning","Error setting mode");
+            QMessageBox::warning(this,tr("Warning"),tr("Error setting mode") );
             return;
         }
     }
     close();
 }
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index a0401e8..8cacc4a 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -8,16 +8,12 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/config.h>
-#include <qstring.h>
-#include <qstringlist.h>
 
 
 
 #include "advancedfm.h"
 
 int main(int argc, char *argv[])
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index f17c590..1e0f9ec 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -1,10 +1,10 @@
 Package: opie-advancedfm
 Files: bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Advanced File Manager
  The advanced file manager for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index a60cea6..33abdfc 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -4,25 +4,19 @@
 ** Copyright: Fri Apr 12 15:12:58 2002 L.J. Potter <ljp@llornkcor.com>
 ****************************************************************************/
 #include "output.h"
 
 #include <opie/oprocess.h>
 
-#include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 
-#include <qmessagebox.h>
-#include <qstringlist.h>
 #include <qfile.h>
-#include <qcstring.h>
-#include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qvariant.h>
 
 #include <errno.h>
 
 /* XPM */
 static char * filesave_xpm[] = {
 "16 16 78 1",
@@ -124,19 +118,19 @@ static char * filesave_xpm[] = {
 Output::Output( const QStringList commands, QWidget* parent,  const char* name, bool modal, WFlags fl)
     : QDialog( parent, name, modal, fl )
 {
    QStringList cmmds;
 //   cmmds=QStringList::split( " ", commands, false);
    cmmds=commands;
-//   qDebug("count %d", cmmds.count());   
+//   qDebug("count %d", cmmds.count());
    if ( !name )
        setName( tr("Output"));
-    resize( 196, 269 ); 
+    resize( 196, 269 );
     setCaption( name );
 
-    OutputLayout = new QGridLayout( this ); 
+    OutputLayout = new QGridLayout( this );
     OutputLayout->setSpacing( 2);
     OutputLayout->setMargin( 2);
 
     QPushButton *docButton;
      docButton = new QPushButton(  QPixmap(( const char** ) filesave_xpm  ) ,"",this,"saveButton");
      docButton->setFixedSize( QSize( 20, 20 ) );
@@ -158,24 +152,24 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
     connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)),
             this, SLOT(commandStderr(OProcess *, char *, int)));
 
 //     connect( , SIGNAL(received(const QByteArray &)),
 //             this, SLOT(commandStdin(const QByteArray &)));
 
-//    * proc << commands.latin1(); 
+//    * proc << commands.latin1();
       for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
          qDebug( "%s", (*it).latin1() );
          * proc << (*it).latin1();
       }
 
      if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) {
 
-         OutputEdit->append("Process could not start");
+         OutputEdit->append(tr("Process could not start") );
          OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
          perror("Error: ");
-         QString errorMsg="Error\n"+(QString)strerror(errno);
+         QString errorMsg=tr("Error\n")+(QString)strerror(errno);
          OutputEdit->append( errorMsg);
          OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
      }
 }
 
 Output::~Output() {
@@ -184,13 +178,13 @@ Output::~Output() {
 void Output::saveOutput() {
 
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
-      QString  filename = QPEApplication::documentDir(); 
+      QString  filename = QPEApplication::documentDir();
       if(filename.right(1).find('/') == -1)
           filename+="/";
       QString name = fileDlg->LineEdit1->text();
       filename+="text/plain/"+name;
       qDebug(filename);
 
@@ -242,13 +236,13 @@ void Output::commandStderr(OProcess*, char *buffer, int buflen) {
     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 }
 
 void Output::processFinished() {
 
     delete proc;
-    OutputEdit->append( "\nFinished\n");
+    OutputEdit->append( tr("\nFinished\n") );
     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 //    close();
 //     disconnect( layer(), SIGNAL(received(const QByteArray &)),
 //                this, SLOT(commandStdin(const QByteArray &)));
 }
 
@@ -256,13 +250,13 @@ void Output::processFinished() {
 
 InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
         setName( "InputDialog" );
-    resize( 234, 50 ); 
+    resize( 234, 50 );
     setMaximumSize( QSize( 240, 50 ) );
     setCaption( tr(name ) );
 
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) );
     LineEdit1->setFocus();
diff --git a/noncore/apps/checkbook/opie-checkbook.control b/noncore/apps/checkbook/opie-checkbook.control
index c0061e5..78f303c 100644
--- a/noncore/apps/checkbook/opie-checkbook.control
+++ b/noncore/apps/checkbook/opie-checkbook.control
@@ -1,10 +1,10 @@
 Package: opie-checkbook
 Files: bin/checkbook apps/Applications/checkbook.desktop pics/checkbook
 Priority: optional
 Section: applications
 Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: Checkbook keeping program.
  The checkbook accounting program for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index 0bc6588..53b3853 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -72,13 +72,13 @@ void ConfigDialog::slotEdit() {
 
         // Load profile
         p = ((ConfigListItem*)lstView->currentItem())->profile();
 
         ProfileEditorDialog dlg(m_fact, p);
 
-        dlg.setCaption("Edit Connection Profile");
+        dlg.setCaption(tr("Edit Connection Profile"));
         dlg.showMaximized();
         int ret = dlg.exec();
 
         if(ret == QDialog::Accepted)
         {
                 if(lstView->currentItem()) delete lstView->currentItem();
@@ -91,13 +91,13 @@ void ConfigDialog::slotEdit() {
 }
 
 
 void ConfigDialog::slotAdd() {
         ProfileEditorDialog dlg(m_fact);
 
-        dlg.setCaption("New Connection");
+        dlg.setCaption(tr("New Connection"));
         dlg.showMaximized();
         int ret = dlg.exec();
 
         if(ret == QDialog::Accepted)
         {
                 // TODO: Move into general profile save part
diff --git a/noncore/apps/opie-console/consoleconfigwidget.cpp b/noncore/apps/opie-console/consoleconfigwidget.cpp
index 3f2d154..faedc58 100644
--- a/noncore/apps/opie-console/consoleconfigwidget.cpp
+++ b/noncore/apps/opie-console/consoleconfigwidget.cpp
@@ -5,12 +5,16 @@
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qhbox.h>
 #include <qregexp.h>
 #include <stdio.h>
 
+#include <pwd.h>
+#include <sys/types.h>
+
+
 #include "consoleconfigwidget.h"
 
 ConsoleConfigWidget::ConsoleConfigWidget( const QString& name, QWidget* parent,
                                 const char* na )
     : ProfileDialogConnectionWidget( name, parent, na ) {
     m_lay = new QVBoxLayout( this );
@@ -62,17 +66,24 @@ void ConsoleConfigWidget::slotRemove() {
 
 ConsoleConfigWidget::~ConsoleConfigWidget() {
 }
 
 void ConsoleConfigWidget::load( const Profile& prof ) {
     /*
-     * we will use /bin/bash as default
-     * but will fallback in MyPty to /bin/sh
-     * if necessary
+     * default to the users default shell
      */
-    m_cmd->setText(prof.readEntry("Command", "/bin/bash"));
+    struct passwd *ent = 0;
+    char *shell = "/bin/sh";
+
+    while ( (ent = getpwent()) != 0 ) {
+        if (ent->pw_shell != "")  {
+            shell = ent->pw_shell;
+        }
+    }
+
+    m_cmd->setText(prof.readEntry("Command", shell ));
     int envcount = prof.readNumEntry("EnvVars", 0);
     for (int i=0; i<envcount; i++) {
         QString name = prof.readEntry("Env_Name_" + QString::number(i), "");
         QString value = prof.readEntry("Env_Value_" + QString::number(i), "");
         if (!(name.isEmpty() || value.isEmpty())) {
             QListViewItem *item = new QListViewItem(m_env);
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index b17f8e8..228db57 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -26,53 +26,51 @@ public:
     };
     char* m_file;
 };
 
 FixIt::FixIt() {
     /* the new inittab */
-    m_file = "#\n# /etc/inittab
-#
-
-#   0 - halt (Do NOT set initdefault to this)
-#   1 - Single user mode
-#   2 - Multiuser, without NFS (The same as 3, if you do not have networking)
-#   3 - Full multiuser mode
-#   4 - JavaVM(Intent) developer mode
-#   5 - JavaVM(Intent)
-#   6 - reboot (Do NOT set initdefault to this)
-#
-id:5:initdefault:
-
-# Specify things to do when starting
-si::sysinit:/etc/rc.d/rc.sysinit
-
-l0:0:wait:/root/etc/rc.d/rc 0
-l1:1:wait:/etc/rc.d/rc 1
-l2:2:wait:/etc/rc.d/rc 2
-l3:3:wait:/etc/rc.d/rc 3
-l4:4:wait:/etc/rc.d/rc 4
-l5:5:wait:/etc/rc.d/rc 5
-l6:6:wait:/root/etc/rc.d/rc 6
-
-# Specify things to do before rebooting
-um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1
-sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1
-
-# Specify program to run on ttyS0
-s0:24:respawn:/sbin/getty 9600 ttyS0
-#pd:5:respawn:/etc/sync/serialctl
-
-# Specify program to run on tty1
-1:2:respawn:/sbin/getty 9600 tty1
-ln:345:respawn:survive -l 6 /sbin/launch
-#qt:5:respawn:/sbin/qt
-
-# collie sp.
-sy::respawn:/sbin/shsync\n";
-
-
+    m_file = "#\n# /etc/inittab"
+"#"
+""
+"#   0 - halt (Do NOT set initdefault to this)"
+"#   1 - Single user mode"
+"#   2 - Multiuser, without NFS (The same as 3, if you do not have networking)"
+"#   3 - Full multiuser mode"
+"#   4 - JavaVM(Intent) developer mode"
+"#   5 - JavaVM(Intent)"
+"#   6 - reboot (Do NOT set initdefault to this)"
+"#"
+"id:5:initdefault:"
+""
+"# Specify things to do when starting"
+"si::sysinit:/etc/rc.d/rc.sysinit"
+""
+"l0:0:wait:/root/etc/rc.d/rc 0"
+"l1:1:wait:/etc/rc.d/rc 1"
+"l2:2:wait:/etc/rc.d/rc 2"
+"l3:3:wait:/etc/rc.d/rc 3"
+"l4:4:wait:/etc/rc.d/rc 4"
+"l5:5:wait:/etc/rc.d/rc 5"
+"l6:6:wait:/root/etc/rc.d/rc 6"
+""
+"# Specify things to do before rebooting"
+"um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1"
+"sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1"
+""
+"# Specify program to run on ttyS0"
+"s0:24:respawn:/sbin/getty 9600 ttyS0"
+"#pd:5:respawn:/etc/sync/serialctl"
+""
+"# Specify program to run on tty1"
+"1:2:respawn:/sbin/getty 9600 tty1"
+"ln:345:respawn:survive -l 6 /sbin/launch"
+"#qt:5:respawn:/sbin/qt"
+""
+"# collie sp."
+"sy::respawn:/sbin/shsync\n";
 }
 FixIt::~FixIt() {
 }
 /*
  * the retail Zaurus is broken in many ways
  * one is that pppd is listening on our port...
@@ -86,13 +84,12 @@ void FixIt::fixIt() {
     }
     file.close();
     ::kill( SIGHUP, 1 );
 }
 #endif
 
-
 int main(int argc, char **argv) {
 // too bad this gives us trouble the taskbar...    argv[0]="embeddedkonsole";
     QPEApplication app( argc, argv );
 
 #ifdef   FSCKED_DISTRIBUTION
     qWarning("fscked");
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index c48116d..3c9603c 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -81,22 +81,22 @@ void MainWindow::initUI() {
              this, SLOT(slotConfigure() ) );
 
     m_console->insertSeparator();
     /*
      * new Action for new sessions
      */
-    QAction* newCon = new QAction(tr("New Connection"),
+    QAction* newCon = new QAction(tr("New Profile"),
                              Resource::loadPixmap( "new" ),
                              QString::null, 0, this, 0);
     newCon->addTo( m_console );
     connect( newCon, SIGNAL(activated() ),
             this, SLOT(slotNew() ) );
 
     m_console->insertSeparator();
 
-    QAction *saveCon = new QAction(tr("Save Connection"),
+    QAction *saveCon = new QAction( tr("Save Profile" ),
                       Resource::loadPixmap( "save" ), QString::null,
                     0, this, 0 );
     saveCon->addTo( m_console );
     connect( saveCon, SIGNAL(activated() ),
             this, SLOT(slotSaveSession() ) );
     m_console->insertSeparator();
@@ -425,12 +425,13 @@ void MainWindow::slotQuickLaunch()  {
     if ( prof.name() == "default"  )  {
         create( prof );
     } else {
         Profile newProf =  Profile( "default",  "console", "default" ,  0, 3,  0 );
         newProf.setAutoConnect( true );
         create( newProf );
+        slotSaveSession();
     }
 
 }
 
 void MainWindow::slotConfigure() {
     ConfigDialog conf( manager()->all(), factory() );
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 693c72c..852451d 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -2,10 +2,10 @@ Package: opie-console
 Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* 
 Priority: optional
 Section: opie/applications
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
 Version: 0.6-$SUB_VERSION
-Depends: qpe-base, libopie1, lrzsz, opie-keytabs
+Depends: qpe-base, libopie1, opie-console-help-en, lrzsz, opie-keytabs
 License: GPL
 Description: Opie terminal app
  
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 58b29ca..ccf2e08 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -8,13 +8,12 @@ HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
                metafactory.h \
                session.h \
                mainwindow.h \
                profile.h \
                profileconfig.h \
                profilemanager.h  \
-               configwidget.h \
                tabwidget.h \
                configdialog.h \
                keytrans.h \
                transferdialog.h \
                profiledialogwidget.h \
                profileeditordialog.h \
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 6b607df..e2501a6 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -31,19 +31,19 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
         // ... (reset profile name line edit etc.)
 }
 
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
     : QDialog(0, 0, TRUE), m_fact( fact )
 {
-        // Default profile
-        m_prof = Profile("New Profile", "serial", "default", Profile::Black, Profile::White, Profile::VT102);
+    // Default profile
+    m_prof = Profile(tr("New Profile"), "serial", "default", Profile::Black, Profile::White, Profile::VT102);
 
-        initUI();
+    initUI();
 
-        // Apply current profile
-        // plugin_plugin->load(profile);
+    // Apply current profile
+    // plugin_plugin->load(profile);
 }
 
 Profile ProfileEditorDialog::profile() const
 {
           return m_prof;
 }
@@ -120,17 +120,17 @@ void ProfileEditorDialog::initUI()
     for (it =list.begin(); it != list.end(); ++it ) {
         m_termCmb->insertItem( (*it) );
     }
 
     // load profile values
     m_name->setText(m_prof.name());
-    slotConActivated(  m_fact->external(m_prof.ioLayerName()  ) );
-    slotTermActivated( m_fact->external(m_prof.terminalName() ) );
     slotKeyActivated( "Default Keyboard" );
     setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
     setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
+    slotConActivated(  m_fact->external(m_prof.ioLayerName()  ) );
+    slotTermActivated( m_fact->external(m_prof.terminalName() ) );
     m_autoConnect->setChecked(m_prof.autoConnect());
 
 
     // signal and slots
     connect(m_conCmb, SIGNAL(activated(const QString& ) ),
             this, SLOT(slotConActivated(const QString&) ) );
@@ -196,16 +196,19 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
     if ( !m_con ) {
         m_con = new NoOptions( str, m_svCon->viewport(), "name");
     }
 
     // FIXME ugly hack right. Right solution would be to look into the layer and see if it
     // supports auto connect and then set it as prefered
-    //if (  (  )->layer()->supports()[0] == 1 ) {
     if ( m_conCmb ->currentText() == tr("Local Console") ) {
         m_autoConnect->setChecked( true );
+        m_prof.writeEntry("Terminal", Profile::Linux );
+        slotTermActivated( m_fact->external (m_prof.terminalName() ) );
     } else {
+        m_prof.writeEntry("Terminal", Profile::VT102 );
+        slotTermActivated( m_fact->external (m_prof.terminalName() ) );
         m_autoConnect->setChecked( false );
     }
 
     m_con->load( m_prof );
     m_svCon->addChild( m_con );
 }
@@ -217,13 +220,13 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
 void ProfileEditorDialog::slotTermActivated( const QString& str ) {
 
     delete m_term;
 
     m_term = m_fact->newTerminalPlugin( str, m_svTerm->viewport() );
 
-    if (m_term) {
+    if ( m_term ) {
         m_term->load( m_prof );
         m_svTerm->addChild( m_term );
     }
 }
 
 void ProfileEditorDialog::slotKeyActivated(const QString &str) {
diff --git a/noncore/apps/opie-reader/Prefs.cpp b/noncore/apps/opie-reader/Prefs.cpp
index 825608e..e5320d9 100644
--- a/noncore/apps/opie-reader/Prefs.cpp
+++ b/noncore/apps/opie-reader/Prefs.cpp
@@ -28,13 +28,13 @@
 #endif
 
 CLayoutPrefs::CLayoutPrefs( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     QHBoxLayout* hb = new QHBoxLayout(this);
-    QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, "Text", this);
+    QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, tr("Text"), this);
     hb->addWidget(bg);
 
     StripCR = new QCheckBox( bg );
     StripCR->setText( tr( "Strip CR" ) );
 
     Dehyphen = new QCheckBox( bg );
@@ -362,25 +362,25 @@ CMiscPrefs::CMiscPrefs( QWidget* parent,  const char* name, WFlags fl )
 {
 
     QGridLayout* hl = new QGridLayout(this,1,2);
 
     hl->setMargin( 0 );
 
-    QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, "Select Action", this);
+    QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, tr("Select Action"), this);
     hl->addWidget( gb, 0, 0 );
 
     annotation = new QCheckBox( gb );
     annotation->setText( tr( "Annotation" ) );
 
     dictionary = new QCheckBox( gb );
     dictionary->setText( tr( "Dictionary" ) );
 
     clipboard = new QCheckBox( gb );
     clipboard->setText( tr( "Clipboard" ) );
 
-    QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, "Plucker", this);
+    QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, tr("Plucker"), this);
     hl->addWidget( bg, 0 , 1 );
 
     Depluck = new QCheckBox( bg );
     Depluck->setText( tr( "Depluck" ) );
 
     Dejpluck = new QCheckBox( bg );
@@ -481,13 +481,13 @@ CInterPrefs::CInterPrefs( QWidget* parent,  const char* name, WFlags fl )
     {
         encoding->insertItem(iter->mime);
     }
 
     QVBoxLayout* vb = new QVBoxLayout;
 
-    gb = new QGroupBox(1, Qt::Horizontal, "Dictionary", this);
+    gb = new QGroupBox(1, Qt::Horizontal, tr("Dictionary"), this);
 
     TextLabel = new QLabel( gb );
     TextLabel->setText( tr( "Application" ) );
     application = new QLineEdit(gb);
     application->setFixedWidth(80);
 
@@ -497,13 +497,13 @@ CInterPrefs::CInterPrefs( QWidget* parent,  const char* name, WFlags fl )
     message->setFixedWidth(80);
 //    message->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     twotouch = new QCheckBox( gb );
     twotouch->setText( tr( "Two/One\nTouch" ) );
 
     SwapMouse = new QCheckBox( gb );
-    SwapMouse->setText("Swap Tap\nActions");
+    SwapMouse->setText(tr("Swap Tap\nActions") );
 
 
     vb->addWidget(gb);
 
 //    vb->addStretch();
     hb->addLayout(vb);
@@ -520,107 +520,107 @@ CInterPrefs::~CInterPrefs()
 void CButtonPrefs::populate(QComboBox *mb)
 #else
 void CButtonPrefs::populate(MenuButton *mb)
 #endif
 {
     mb->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-    mb->insertItem("<Nothing>");
-    mb->insertItem("Open file");
-    mb->insertItem("Autoscroll");
-    mb->insertItem("Bookmark");
-    mb->insertItem("Annotate");
-    mb->insertItem("Fullscreen");
-
-    mb->insertItem("Zoom in");
-    mb->insertItem("Zoom out");
-    mb->insertItem("Back");
-    mb->insertItem("Forward");
-    mb->insertItem("Home");
-    mb->insertItem("Page up");
-    mb->insertItem("Page down");
-    mb->insertItem("Line up");
-    mb->insertItem("Line down");
-    mb->insertItem("Beginning");
-    mb->insertItem("End");
+    mb->insertItem(tr("<Nothing>") );
+    mb->insertItem(tr("Open file") );
+    mb->insertItem(tr("Autoscroll") );
+    mb->insertItem(tr("Bookmark") );
+    mb->insertItem(tr("Annotate") );
+    mb->insertItem(tr("Fullscreen") );
+
+    mb->insertItem(tr("Zoom in") );
+    mb->insertItem(tr("Zoom out") );
+    mb->insertItem(tr("Back") );
+    mb->insertItem(tr("Forward") );
+    mb->insertItem(tr("Home") );
+    mb->insertItem(tr("Page up") );
+    mb->insertItem(tr("Page down") );
+    mb->insertItem(tr("Line up") );
+    mb->insertItem(tr("Line down") );
+    mb->insertItem(tr("Beginning") );
+    mb->insertItem(tr("End") );
 }
 
 CButtonPrefs::CButtonPrefs( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
 
     QGridLayout* hl = new QGridLayout(this,10,2);
 
     hl->setMargin( 0 );
 
-    QLabel* ql = new QLabel("Escape Button", this);
+    QLabel* ql = new QLabel(tr("Escape Button"), this);
     hl->addWidget(ql, 0, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     escapeAction = new QComboBox( this );
 #else
     escapeAction = new MenuButton( this );
 #endif
     populate(escapeAction);
     hl->addWidget(escapeAction, 1, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Space Button", this);
+    ql = new QLabel(tr("Space Button"), this);
     hl->addWidget(ql, 2, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     spaceAction = new QComboBox( this );
 #else
     spaceAction = new MenuButton( this );
 #endif
     populate(spaceAction);
     hl->addWidget(spaceAction, 3, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Return Button", this);
+    ql = new QLabel(tr("Return Button"), this);
     hl->addWidget(ql, 2, 1, Qt::AlignBottom);
 #ifdef USECOMBO
     returnAction = new QComboBox( this );
 #else
     returnAction = new MenuButton( this );
 #endif
     populate(returnAction);
     hl->addWidget(returnAction, 3, 1, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Left Arrow", this);
+    ql = new QLabel(tr("Left Arrow"), this);
     hl->addWidget(ql, 4, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     leftAction = new QComboBox( this );
 #else
     leftAction = new MenuButton( this );
 #endif
     populate(leftAction);
     hl->addWidget(leftAction, 5, 0, Qt::AlignTop | Qt::AlignLeft);
     leftScroll = new QCheckBox( tr("Scroll Speed"), this );
     hl->addWidget(leftScroll, 6, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Right Arrow", this);
+    ql = new QLabel(tr("Right Arrow"), this);
     hl->addWidget(ql, 4, 1, Qt::AlignBottom);
 #ifdef USECOMBO
     rightAction = new QComboBox( this );
 #else
     rightAction = new MenuButton( this );
 #endif
     populate(rightAction);
     hl->addWidget(rightAction, 5, 1, Qt::AlignTop | Qt::AlignLeft);
     rightScroll = new QCheckBox( tr("Scroll Speed"), this );
     hl->addWidget(rightScroll, 6, 1, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Down Arrow", this);
+    ql = new QLabel(tr("Down Arrow"), this);
     hl->addWidget(ql, 7, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     downAction = new QComboBox( this );
 #else
     downAction = new MenuButton( this );
 #endif
     populate(downAction);
     hl->addWidget(downAction, 8, 0, Qt::AlignTop | Qt::AlignLeft);
     downScroll = new QCheckBox( tr("Scroll Speed"), this );
     hl->addWidget(downScroll, 9, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Up Arrow", this);
+    ql = new QLabel(tr("Up Arrow"), this);
     hl->addWidget(ql, 7, 1, Qt::AlignBottom);
 #ifdef USECOMBO
     upAction = new QComboBox( this );
 #else
     upAction = new MenuButton( this );
 #endif
diff --git a/noncore/apps/opie-reader/Prefs.h b/noncore/apps/opie-reader/Prefs.h
index 37d8c9e..8fef2f5 100644
--- a/noncore/apps/opie-reader/Prefs.h
+++ b/noncore/apps/opie-reader/Prefs.h
@@ -32,13 +32,13 @@ class QGridLayout;
 //class QCheckBox;
 class QLabel;
 //class QSpinBox;
 
 class CLayoutPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CLayoutPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CLayoutPrefs();
@@ -53,13 +53,13 @@ public:
     QCheckBox* Embolden;
     QCheckBox* FullJustify;
 };
 
 class CLayoutPrefs2 : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CLayoutPrefs2( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CLayoutPrefs2();
@@ -96,13 +96,13 @@ protected:
     QGridLayout* Layout4;
 
 };
 */
 class CMiscPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CMiscPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CMiscPrefs();
@@ -110,12 +110,13 @@ public:
     QCheckBox *annotation, *dictionary, *clipboard;
     QCheckBox *Depluck, *Dejpluck, *Continuous;
 };
 
 class CButtonPrefs : public QWidget
 { 
+    Q_OBJECT
 #ifdef USECOMBO
     void populate(QComboBox*);
 #else
     void populate(MenuButton*);
 #endif
 public:
@@ -132,13 +133,13 @@ public:
 #endif
     QCheckBox *leftScroll, *rightScroll, *upScroll, *downScroll;
 };
 
 class CInterPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CInterPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CInterPrefs();
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index af1da27..087ce00 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -2598,13 +2598,13 @@ void QTReaderApp::updateCaption()
 //    if ( !doc )
         //setCaption( tr("QTReader") );
 //    else {
         //QString s = doc->name();
         //if ( s.isEmpty() )
         //    s = tr( "Unnamed" );
-        setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) );
+        setCaption( reader->m_string + " - " + tr("Reader") );
 //    }
 }
 
 void QTReaderApp::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.h b/noncore/apps/opie-reader/ToolbarPrefs.h
index 297d63a..9571c28 100644
--- a/noncore/apps/opie-reader/ToolbarPrefs.h
+++ b/noncore/apps/opie-reader/ToolbarPrefs.h
@@ -168,13 +168,13 @@ class CIndBarPrefs : public QWidget
     bool isChanged() { return m_isChanged; }
 
 };
 
 class CMiscBarPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     CMiscBarPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CMiscBarPrefs();
 
 #ifdef USECOMBO
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control
index 9996297..b7b0e8f 100644
--- a/noncore/apps/opie-reader/opie-reader.control
+++ b/noncore/apps/opie-reader/opie-reader.control
@@ -1,10 +1,10 @@
 Package: opie-reader
 Files: bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
 Section: applications
 Maintainer: Tim Wentford <timwentford@hotmail.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: E-Book reader
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/opie-write/opie-write.control b/noncore/apps/opie-write/opie-write.control
index 52b518a..7b37671 100644
--- a/noncore/apps/opie-write/opie-write.control
+++ b/noncore/apps/opie-write/opie-write.control
@@ -1,10 +1,10 @@
 Package: opie-write
 Files: bin/opie-write apps/Applications/opie-write.desktop pics/opie-write
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Rich Text Editor 
  The rich text editor for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control
index 1eff80b..6d40d1b 100644
--- a/noncore/apps/oxygen/opie-oxygen.control
+++ b/noncore/apps/oxygen/opie-oxygen.control
@@ -1,10 +1,10 @@
 Package: opie-oxygen
 Files: bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/*
 Priority: optional
 Section: applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Periodic System of the Elements 
  The chemistry application for the Opie-environment
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index b5495e1..aba9b8d 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -2,10 +2,10 @@ Package: opie-tableviewer
 Files: bin/tableviewer apps/Applications/tableviewer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: XML database browsers
  A table/database viewer for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
index 38ba55d..22a4917 100644
--- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp
+++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
@@ -118,13 +118,13 @@ KWBuffer::slotLoadFile()
 /**
  * Return the total number of lines in the buffer.
  */
 int
 KWBuffer::count()
 {
-//  qDebug("m_stringList.count %d",m_stringList.count());
+  qDebug("m_stringList.count %d",m_stringList.count());
   return m_lineCount;
         //return m_stringList.count();
 //   return m_totalLines;
 }
 
 
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 844f27d..f90a5f8 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -68,13 +68,13 @@ void SyntaxDocument::setupModeList(bool force)
       config->setGroup(Group);
       syntaxModeListItem *mli=new syntaxModeListItem;
       mli->name = config->readEntry("name","");
       mli->section = config->readEntry("section","");
       mli->mimetype = config->readEntry("mimetype","");
       mli->extension = config->readEntry("extension","");
-      mli->identifier = *it;
+      mli->identifier = path+*it;
       myModeList.append(mli);
     }
     else
     {
         qDebug("Found a description file:"+path+(*it));
         setIdentifier(path+(*it));
@@ -102,12 +102,13 @@ void SyntaxDocument::setupModeList(bool force)
             config->writeEntry("extension",mli->extension);
             myModeList.append(mli);
           }
         }
     }
   }
+  config->write();
 //  config->sync();
 }
 
 SyntaxModeList SyntaxDocument::modeList()
 {
   return myModeList;
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index 5cb0b14..b282059 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -1,10 +1,10 @@
-TEMPLATE  = lib
-CONFIG    = qt warn_on release
-HEADERS   = microkde/kapplication.h \
-      kateconfig.h \
+        TEMPLATE= lib
+        CONFIG  = qt warn_on release
+        HEADERS         = microkde/kapplication.h \
+                  kateconfig.h \
                   microkde/kdebug.h \
                   microkde/kdialog.h \
                   microkde/kdialogbase.h \
                   microkde/kfiledialog.h \
                   microkde/kglobal.h \
                   microkde/kiconloader.h \
@@ -21,66 +21,71 @@ HEADERS   = microkde/kapplication.h \
                   microkde/kfontdialog.h \
                   microkde/krun.h \
                   microkde/knumvalidator.h \
                   microkde/kstaticdeleter.h \
                   microkde/klistview.h \
                   microkde/kglobalsettings.h \
-      microkde/kcolorbtn.h \
-      qt3back/qregexp3.h \
-      microkde/ksharedptr.h \
-      document/katebuffer.h  document/katedialogs.h \
-      document/katetextline.h \
-      document/katecmd.h \
-      document/katehighlight.h \
-      document/katecmds.h    document/katedocument.h  \
-      document/katesyntaxdocument.h \
-      view/kateundohistory.h  \
-      view/kateview.h  \
-      view/kateviewdialog.h \
-      interfaces/view.h \
-      interfaces/document.h \
-      ktexteditor/ktexteditor.h
+                  microkde/kcolorbtn.h \
+                  \
+                  \
+                  qt3back/qregexp3.h \
+                  microkde/ksharedptr.h \
+                  document/katebuffer.h  document/katedialogs.h \
+                  document/katetextline.h \
+                  document/katecmd.h \
+                  document/katehighlight.h \
+                  document/katecmds.h    document/katedocument.h  \
+                  document/katesyntaxdocument.h \
+                  view/kateundohistory.h  \
+                  view/kateview.h  \
+                  view/kateviewdialog.h \
+                  interfaces/view.h \
+                  interfaces/document.h \
+                  ktexteditor/ktexteditor.h
 
-SOURCES   = microkde/kapplication.cpp \
+        SOURCES         = microkde/kapplication.cpp \
                   microkde/kdialogbase.cpp \
-      kateconfig.cpp \
+                  kateconfig.cpp \
                   microkde/klocale.cpp \
                   microkde/kmessagebox.cpp \
                   microkde/kprocess.cpp \
                   microkde/kstandarddirs.cpp \
                   microkde/ktempfile.cpp \
                   microkde/kurlrequester.cpp \
+                  microkde/kcolordialog.cpp \
                   microkde/kfontdialog.cpp \
                   microkde/krun.cpp \
                   microkde/knumvalidator.cpp \
                   microkde/kglobal.cpp \
                   microkde/kglobalsettings.cpp \
-      microkde/kcolorbtn.cpp \
-      qt3back/qregexp3.cpp \
-      ktexteditor/ktexteditor.cpp \
-      document/katebuffer.cpp  document/katedialogs.cpp \
-      document/katehighlight.cpp  \
-      document/katecmd.cpp   \
-      document/katesyntaxdocument.cpp document/katecmds.cpp \
-      document/katedocument.cpp    document/katetextline.cpp \
-      view/kateundohistory.cpp \
-      view/kateview.cpp \
-      view/kateviewdialog.cpp \
-      interfaces/interfaces.cpp
+                  microkde/kcolorbtn.cpp \
+                  \
+                  \
+                  qt3back/qregexp3.cpp \
+                  ktexteditor/ktexteditor.cpp \
+                  document/katebuffer.cpp  document/katedialogs.cpp \
+                  document/katehighlight.cpp  \
+                  document/katecmd.cpp   \
+                  document/katesyntaxdocument.cpp document/katecmds.cpp \
+                  document/katedocument.cpp    document/katetextline.cpp \
+                  view/kateundohistory.cpp \
+                  view/kateview.cpp \
+                  view/kateviewdialog.cpp \
+                  interfaces/interfaces.cpp
 
-INTERFACES  = 
-INCLUDEPATH += $(OPIEDIR)/include \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
-DEPENDPATH  += $(OPIEDIR)/include
+        INTERFACES= 
+        INCLUDEPATH+= $(OPIEDIR)/include \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
-TARGET    = tinykate
+        TARGET  = tinykate
 
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
index 976f1db..5d21f15 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
+++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
@@ -20,26 +20,24 @@
 
 #include <qdialog.h>
 #include <qpainter.h>
 #include <qdrawutil.h>
 #include <qapplication.h>
 #include <kglobalsettings.h>
-//#include "kcolordialog.h"
+#include "kcolordialog.h"
 #include "kcolorbtn.h"
 
-#include <opie/colordialog.h>
-
 KColorButton::KColorButton( QWidget *parent, const char *name )
   : QPushButton( parent, name ), dragFlag(false)
 {
   // 2000-10-15 (putzer): fixes broken keyboard usage
   connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
 }
 
 KColorButton::KColorButton( const QColor &c, QWidget *parent,
-          const char *name )
+                            const char *name )
   : QPushButton( parent, name ), col(c), dragFlag(false)
 {
 
   // 2000-10-15 (putzer): fixes broken keyboard usage
   connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
 }
@@ -72,15 +70,15 @@ void KColorButton::drawButtonLabel( QPainter *painter )
     painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol );
   }
 }
 
 void KColorButton::chooseColor()
 {
-  QColor newCol=OColorDialog::getColor( col);
-  if( newCol != QDialog::Rejected )
+  if( KColorDialog::getColor( col) == QDialog::Rejected )
   {
-  col=newCol;
+    return;
+  }
+
   repaint( false );
   emit changed( col );
-  }
 }
 
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
index 1d5c27e..0f831cd 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
+++ b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
@@ -1,15 +1,13 @@
 #ifndef MINIKDE_KCOLORDIALOG_H
 #define MINIKDE_KCOLORDIALOG_H
 
 #include <qcolor.h>
-#include <opie/colordialog.h>
 
-class KColorDialog : OColorDialog
+class KColorDialog
 {
-    Q_OBJECT
   public:
     enum { Accepted };
   
     static int getColor( const QColor & );
 };
 
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp
index de81d0f..af3b30d 100644
--- a/noncore/apps/tinykate/libkate/view/kateview.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateview.cpp
@@ -2193,19 +2193,21 @@ bool KateView::askReplaceEnd() {
   // ask for continue
   if (!(s.flags & KateView::sfBackward)) {
     // forward search
     str = i18n("%1 replacement(s) made.\n"
                "End of document reached.\n"
                "Continue from the beginning?").arg(replaces);
-    query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop"));
+    query = KMessageBox::questionYesNo(this, str, i18n("Replace"),
+    i18n("Continue"), i18n("Stop"));
   } else {
     // backward search
     str = i18n("%1 replacement(s) made.\n"
                 "Beginning of document reached.\n"
                 "Continue from the end?").arg(replaces);
-    query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop"));
+    query = KMessageBox::questionYesNo(this, str, i18n("Replace"),
+                i18n("Continue"), i18n("Stop"));
   }
   replaces = 0;
   continueSearch(s);
   return (query == KMessageBox::No);
 }
 
@@ -2263,13 +2265,12 @@ void KateView::writeSessionConfig(KateConfig *config)
 }
 
 void KateView::configDialog()
 {
 
 #warning fixme
-        QScrollView *pScroll;
 
 #if 1 
   KDialogBase *kd = new KDialogBase(KDialogBase::IconList,
                                     i18n("Configure Editor"),
                                     KDialogBase::Ok | KDialogBase::Cancel |
                                     KDialogBase::Help ,
@@ -2300,15 +2301,14 @@ void KateView::configDialog()
 
   SelectConfigTab *selectConfig = new SelectConfigTab(page, this);
 
   // edit options
   page=kd->addPage(i18n("Edit"));
   (new QVBoxLayout(page))->setAutoAdd(true);
-  pScroll=new QScrollView(page);
+
   EditConfigTab *editConfig = new EditConfigTab(page, this);
-  pScroll->addChild(editConfig);
 
 
 
   HighlightDialogPage *hlPage;
   HlManager *hlManager;
   HlDataList hlDataList;
@@ -2322,17 +2322,15 @@ void KateView::configDialog()
   hlDataList.setAutoDelete(true);
   //this gets the data from the KateConfig object
   hlManager->getHlDataList(hlDataList);
 
   page=kd->addPage(i18n("Highlighting"));
   (new QVBoxLayout(page))->setAutoAdd(true);
-  pScroll=new QScrollView(page);
-  hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, pScroll->viewport());
-  pScroll->addChild(hlPage);
 
-  kd->showMaximized(); 
+  hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page);
+  kd->showMaximized();
  if (kd->exec()) {
     // color options
     colorConfig->getColors(colors);
     myDoc->setFont (fontConfig->getFont());
 
     applyColors();
diff --git a/noncore/apps/tinykate/main.cpp b/noncore/apps/tinykate/main.cpp
index e92df69..e06668a 100644
--- a/noncore/apps/tinykate/main.cpp
+++ b/noncore/apps/tinykate/main.cpp
@@ -19,11 +19,10 @@
 
 
 int main( int argc, char ** argv )
 {
     QPEApplication a( argc, argv );
 
-    TinyKate *m = new TinyKate();
-    a.setMainWidget( m );
-    m->showMaximized();
+    TinyKate m;
+    a.showMainWidget(&m );
     return a.exec();
 }
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
index 76704c1..dd5e24b 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax-commondev
 Files: share/tinykate/syntax/c.xml share/tinykate/syntax/cpp.xml share/tinykate/syntax/gnuassembler.xml share/tinykate/syntax/kbasic.xml share/tinykate/syntax/pascal.xml share/tinykate/syntax/perl.xml share/tinykate/syntax/php.xml share/tinykate/syntax/python.xml share/tinykate/syntax/ruby.xml share/tinykate/syntax/sql.xml share/tinykate/syntax/tcl.xml share/tinykate/syntax/xml.xml share/tinykate/syntax/xmldebug.xml share/tinykate/syntax/java.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
index 9f60156..c47acc0 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax-documentation
 Files: share/tinykate/syntax/latex.xml share/tinykate/syntax/postscript.xml share/tinykate/syntax/sgml.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for document oriented languages for TinyKate
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
index 4e0f529..0e80518 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax-misc
 Files: share/tinykate/syntax/idconsole.xml share/tinykate/syntax/matlab.xml share/tinykate/syntax/verilog.xml share/tinykate/syntax/vhdl.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for  misc languages for TinyKate
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
index 3c8f61a..3f7ea0d 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax-miscdev
 Files: share/tinykate/syntax/ada.xml share/tinykate/syntax/eiffel.xml share/tinykate/syntax/ferite.xml share/tinykate/syntax/fortran.xml share/tinykate/syntax/haskell.xml share/tinykate/syntax/literate-haskell.xml share/tinykate/syntax/objectivec.xml share/tinykate/syntax/sather.xml share/tinykate/syntax/scheme.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for uncommon programming languages for TinyKate
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
index 36e88b5..ea4e026 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax-unix
 Files: share/tinykate/syntax/cs.xml share/tinykate/syntax/bash.xml share/tinykate/syntax/changelog.xml share/tinykate/syntax/desktop.xml share/tinykate/syntax/diff.xml share/tinykate/syntax/mab.xml share/tinykate/syntax/makefile.xml share/tinykate/syntax/rpmspec.xml share/tinykate/syntax/sml.xml share/tinykate/syntax/winehq.xml 
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for UNIX/Linux specific files for TinyKate
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-web.control b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
index 46fe64a..8f9c71a 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-web.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax-web
 Files: share/tinykate/syntax/css.xml share/tinykate/syntax/html.xml share/tinykate/syntax/javascript.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax.control b/noncore/apps/tinykate/opie-tinykate-syntax.control
index c4156fc..712933c 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-tinykate, opie-tinykate-syntax-commondev, opie-tinykate-syntax-documentation, opie-tinykate-syntax-misc, opie-tinykate-syntax-miscdev, opie-tinykate-syntax-unix, opie-tinykate-syntax-web
 Description: Syntax Highlighting Patterns virtual package, which installs all available syntax patterns.
 Files:
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
index 95dd7e0..731375c 100644
--- a/noncore/apps/tinykate/opie-tinykate.control
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate
 Files: bin/tinykate apps/Applications/tinykate.desktop pics/tinykate $OPIEDIR/lib/libtinykate.so.1.0.0 $OPIEDIR/lib/libtinykate.so.1.0 $OPIEDIR/lib/libtinykate.so.1
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Kate for opie
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index dda8405..f470645 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -5,140 +5,139 @@
     begin                : November 2002
     copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
+ *   This program is free softwaSre; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation.                                         *
  *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
  *                                                                         *
  ***************************************************************************/
 #include <qwidget.h>
 #include <qaction.h>
 #include <qlayout.h>
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qtoolbutton.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 
 #include <opie/ofiledialog.h>
 
-#include "cgotoline.h"
-
 #include "tinykate.h"
 
 #include <katedocument.h>
 #include <katehighlight.h>
 #include <kateview.h>
 #include <kglobal.h>
 
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     QMainWindow( parent, name, f )
-{ 
+{
+  shutDown=false;
   nextUnnamed=0;
   currentView=0;
   viewCount=0;
-  setCaption("TinyKATE       : line 1      col 1");
+  setCaption(tr("TinyKATE"));
   KGlobal::setAppName("TinyKATE");
 
-  curLine=curCol=1;
-  
-  setToolBarsMovable(FALSE);
-
-        QPEToolBar *bar = new QPEToolBar( this );
-        bar->setHorizontalStretchable( TRUE );
-        QPEMenuBar *mb = new QPEMenuBar( bar );
-        mb->setMargin( 0 );
+  QMenuBar *mb = new QMenuBar( this );
+  mb->setMargin( 0 );
 
   tabwidget=new OTabWidget(this);
   setCentralWidget(tabwidget);
   connect(tabwidget,SIGNAL(currentChanged( QWidget *)),this,SLOT(slotCurrentChanged(QWidget *)));
 
 //FILE ACTIONS
         QPopupMenu *popup = new QPopupMenu( this );
 
   // Action for creating a new document
-        QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, CTRL+Key_N, this, 0 );
+        QAction *a = new QAction( tr( "New" ),  Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
         a->addTo( popup );
         connect(a, SIGNAL(activated()), this, SLOT(slotNew()));
 
   // Action for opening an exisiting document
-        a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, CTRL+Key_O, this, 0 );
+        a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotOpen()));
 
 
   // Action for saving  document
-        a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ), QString::null, CTRL+Key_S, this, 0 );
+        a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotSave()));
 
   // Action for saving document to a new name
-        a = new QAction( tr( "Save As" ), Resource::loadPixmap( "save" ), QString::null, 0, this, 0 );
+        a = new QAction( tr( "Save As" ),Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs()));
 
   // Action for closing the currently active document
-        a = new QAction( tr( "Close" ), Resource::loadPixmap( "close" ), QString::null, CTRL+Key_W, this, 0 );
+        a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotClose()));
-  
+
 
   mb->insertItem(tr("File"),popup);
 
 //EDIT ACTIONS
 
   // Action for cutting text
-        editCut = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, CTRL+Key_X, this, 0 );
-        editCut->addTo( bar );
+        editCut = new QToolButton( 0 );
+        editCut->setAutoRaise( true );
+        editCut->setIconSet(  Resource::loadPixmap( "cut" ) );
 
   // Action for Copying text
-        editCopy = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, CTRL+Key_C, this, 0 );
-        editCopy->addTo( bar );
+        editCopy = new QToolButton( 0 );
+        editCopy->setAutoRaise( true );
+        editCopy->setIconSet( Resource::loadPixmap( "copy" ) );
 
   // Action for pasting text
-        editPaste = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, CTRL+Key_V, this, 0 );
-        editPaste->addTo( bar );
-
+        editPaste =  new QToolButton( 0 );
+        editPaste->setAutoRaise( true );
+        editPaste->setIconSet( Resource::loadPixmap( "paste" ) );
 
   // Action for finding / replacing  text
-        editFindReplace = new QAction( tr( "Replace" ), Resource::loadPixmap("find"), QString::null, CTRL+Key_R, this, 0 );
-        editFind = new QAction( tr( "Find" ), Resource::loadPixmap("find"), QString::null, CTRL+Key_F, this, 0 );
-        editFind->addTo( bar );
+        editFindReplace = new QToolButton( 0 );
+        editFindReplace->setAutoRaise( true );
+        editFindReplace->setIconSet( Resource::loadPixmap("find") );
 
-  // Action for undo
-        editUndo = new QAction( tr( "Undo" ), Resource::loadPixmap( "undo" ), QString::null, CTRL+Key_Z, this, 0 );
-        editUndo->addTo( bar );
+   // Action for undo
+        editUndo = new QToolButton( 0 );
+        editUndo->setAutoRaise( true );
+        editUndo->setIconSet( Resource::loadPixmap( "undo" ) );
 
   // Action for redo
-        editRedo = new QAction( tr( "Redo" ), Resource::loadPixmap( "redo" ), QString::null, CTRL+SHIFT+Key_Z, this, 0 );
-        editRedo->addTo( bar );
-
+        editRedo = new QToolButton( 0 );
+        editRedo->setAutoRaise( true );
+        editRedo->setIconSet( Resource::loadPixmap( "redo" ) );
 
 //VIEW ACITONS
         popup = new QPopupMenu( this );
-  
-  a = new QAction( tr( "Goto" ),  QString::null, CTRL+Key_G, this, 0 );
-        a->addTo( popup );
-        connect(a, SIGNAL(activated()), this, SLOT(slotGoTo()));
-  
+
         viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 );
         viewIncFontSizes->addTo( popup );
 
         viewDecFontSizes = new QAction( tr( "Font -" ), QString::null, 0, this, 0 );
         viewDecFontSizes->addTo( popup );
 
-  mb->insertItem(tr("View"),popup);
+        mb->insertItem(tr("View"),popup);
 
+        popup = new QPopupMenu( this );
+        mb->insertItem(tr("Utils"),popup);
 
 
-        popup = new QPopupMenu( this );
-  mb->insertItem(tr("Utils"),popup);
+        mb->insertItem( editCut );
+        mb->insertItem( editCopy );
+        mb->insertItem( editPaste );
+        mb->insertItem( editFindReplace );
+        mb->insertItem( editUndo );
+        mb->insertItem(  editRedo );
+
 
 //Highlight management
   hlmenu=new QPopupMenu(this);
   HlManager *hlm=HlManager::self();
   for (int i=0;i<hlm->highlights();i++)
   {
@@ -147,27 +146,27 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
   popup->insertItem(tr("Highlighting"),hlmenu);
 
 
         utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 );
         utilSettings->addTo( popup);
 
-  popup->insertSeparator();
-  editFind->addTo(popup);
-  editFindReplace->addTo(popup);
-
   if( qApp->argc() > 1) open(qApp->argv()[1]);
   else slotNew();
 
 }
 
 TinyKate::~TinyKate( )
 {
   qWarning("TinyKate destructor\n");
-  printf("~TinyKate()\n");
+
+  shutDown=true;
+  while (currentView!=0) {
+        slotClose();
+  }
+
   if( KGlobal::config() != 0 ) {
-  printf("~TinyKate(): delete configs...\n");
     qWarning("deleting KateConfig object..\n");
     delete KGlobal::config();
   }
 }
 
 void TinyKate::slotOpen( )
@@ -190,50 +189,44 @@ void TinyKate::open(const QString & filename)
 
     kd->setDocName( filenamed);
     kd->open( filename );
     viewCount++;
 }
 
-void TinyKate::setDocument(const QString &doc)
+void TinyKate::setDocument(const QString& fileref)
 {
-  printf("tinykate: setDocument(\"%s\")\n",(const char*)doc);
-  open(doc);
+    open( fileref );
 }
 
 void TinyKate::slotCurrentChanged( QWidget * view)
 {
   if (currentView) {
 
     disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy()));
     disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut()));
     disconnect(editPaste,SIGNAL(activated()),currentView,SLOT(paste()));
     disconnect(editUndo,SIGNAL(activated()),currentView,SLOT(undo()));
     disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo()));
-    disconnect(editFindReplace,SIGNAL(activated()),currentView,SLOT(replace()));
-    disconnect(editFind,SIGNAL(activated()),currentView,SLOT(find()));
-        disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
-        disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
+    disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
+    disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
     disconnect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
     disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
-    disconnect(currentView,SIGNAL(newCurPos()),this,SLOT(slotCursorMoved()));
   }
 
   currentView=(KTextEditor::View*)view;
-  
-  connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy()));
-  connect(editCut,SIGNAL(activated()),currentView,SLOT(cut()));
-  connect(editPaste,SIGNAL(activated()),currentView,SLOT(paste()));
-  connect(editUndo,SIGNAL(activated()),currentView,SLOT(undo()));
-  connect(editRedo,SIGNAL(activated()),currentView,SLOT(redo()));
-  connect(editFindReplace,SIGNAL(activated()),currentView,SLOT(replace()));
-  connect(editFind,SIGNAL(activated()),currentView,SLOT(find()));
+
+  connect(editCopy,SIGNAL(clicked()),currentView,SLOT(copy()));
+  connect(editCut,SIGNAL(clicked()),currentView,SLOT(cut()));
+  connect(editPaste,SIGNAL(clicked()),currentView,SLOT(paste()));
+  connect(editUndo,SIGNAL(clicked()),currentView,SLOT(undo()));
+  connect(editRedo,SIGNAL(clicked()),currentView,SLOT(redo()));
   connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
   connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
   connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
   connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
-  connect(currentView,SIGNAL(newCurPos()),this,SLOT(slotCursorMoved()));
+
 }
 
 void TinyKate::slotNew( )
 {
   KateDocument *kd= new KateDocument(false, false, this,0,this);
   KTextEditor::View *kv;
@@ -248,13 +241,13 @@ void TinyKate::slotClose( )
   if (currentView==0) return;
   KTextEditor::View *dv=currentView;
   currentView=0;
   tabwidget->removePage(dv);
   delete dv->document();
   viewCount--;
-  if (!viewCount) slotNew();
+  if ((!viewCount) && (!shutDown))  slotNew();
 }
 
 void TinyKate::slotSave() {
   // feel free to make this how you want
   if (currentView==0) return;
 
@@ -285,37 +278,6 @@ void TinyKate::slotSaveAs() {
 //   KTextEditor::View *dv = currentView;
 //     tabwidget->changeTab( dv, filenamed);
     // need to change tab label here
   }
 
 }
-
-void TinyKate::slotGoTo()
-{
-  int l,c;
-  if (currentView==0) return;
-  
-  currentView->getCursorPosition(&l,&c);
-
-  CGotoLine g(l);
-  
-  if(g.exec()==QDialog::Accepted)
-  {
-    currentView->setCursorPosition( g.line(), c );
-  }
-}
-
-void TinyKate::slotCursorMoved()
-{
-  char buf[100];
-  int newLine,newCol;
-  currentView->getCursorPosition(&newLine,&newCol);
-  newLine++;
-  newCol++;
-  if((newLine!=curLine)||(newCol!=curCol))
-  {
-    sprintf(buf,"TinyKATE       : line %-6d col %d",newLine,newCol);
-    setCaption(buf);
-    curLine=newLine;
-    curCol=newCol;
-  }
-}
diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h
index 077d5f0..2bf4de6 100644
--- a/noncore/apps/tinykate/tinykate.h
+++ b/noncore/apps/tinykate/tinykate.h
@@ -20,56 +20,45 @@
 
 
 #include <qmainwindow.h>
 #include <opie/otabwidget.h>
 #include <ktexteditor.h>
 
+class QToolButton;
 class QAction;
 class QPopupMenu;
-class CGotoLine;
 
 class TinyKate : public QMainWindow
 {
 Q_OBJECT
 public:
     TinyKate( QWidget *parent=0, const char *name=0, WFlags f = 0);
     ~TinyKate( );
 
 public slots:
     void slotNew();
+ void setDocument(const QString& fileref);
 
 protected slots:
     void slotOpen();
     void slotClose();
     void slotCurrentChanged(QWidget *);
     void slotSave();
     void slotSaveAs();
-    void slotGoTo();
-    void slotCursorMoved();
-    void setDocument(const QString &doc);
-    
 protected:
     void open(const QString&);
 private:
     QString currentFileName;
     OTabWidget *tabwidget;
     KTextEditor::View *currentView;
-  
-    QAction *editCopy;
-    QAction *editCut;
-    QAction *editPaste;
-    QAction *editUndo;
-    QAction *editRedo;
-    QAction *editFind;
-    QAction *editFindReplace;
-    QAction *viewIncFontSizes;
-    QAction *viewDecFontSizes;
-    QAction *utilSettings;
-    
+    bool shutDown;
+
+    QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo,  *editFindReplace;
+    QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings;
+
     QPopupMenu *hlmenu;
     uint nextUnnamed;
     uint viewCount;
-    int curLine,curCol;
 };
 
 
 #endif // __TINYKATE_H__
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro
index f7ff451..632bd49 100644
--- a/noncore/apps/tinykate/tinykate.pro
+++ b/noncore/apps/tinykate/tinykate.pro
@@ -1,22 +1,22 @@
-TEMPLATE  = app
-CONFIG    = qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
-HEADERS   = tinykate.h cgotoline.h 
-SOURCES   = tinykate.cpp main.cpp cgotoline.cpp
-INTERFACES  = cgotobase.ui
-INCLUDEPATH += $(OPIEDIR)/include \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
+        TEMPLATE= app
+        CONFIG  = qt warn_on release
+        DESTDIR         = $(OPIEDIR)/bin
+        HEADERS         = tinykate.h
+        SOURCES         = tinykate.cpp main.cpp
+        INTERFACES= 
+        INCLUDEPATH+= $(OPIEDIR)/include \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate \
+                        $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
 
-DEPENDPATH  += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -ltinykate -lopie
-TARGET    = tinykate
+        TARGET  = tinykate
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 45a6663..42093cf 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1009,12 +1009,17 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
         return newitem;
     }
     else
     {
         InstallData *newitem = new InstallData();
         newitem->option = "D";
+        
+        // If local file, remove using package name, not filename
+        if ( p->isPackageStoredLocally() )
+            name = item->text();
+        
         if ( !p->isPackageStoredLocally() )
             newitem->packageName = p->getInstalledPackageName();
         else
             newitem->packageName = name;
 
         if ( p->getInstalledTo() )
@@ -1038,12 +1043,16 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
             // Error - should handle
         }
         else if ( val == -1 )
         {
             // Version available is older - remove only
             newitem->option = "D";
+           
+            // If local file, remove using package name, not filename
+            if ( p->isPackageStoredLocally() )
+                name = item->text();
         }
         else
         {
             QString caption;
             QString text;
             QString secondButton;
@@ -1077,12 +1086,15 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
                     case 0: // Cancel
                         delete newitem;
                         return 0x0;
                         break;
                     case 1: // Remove
                         newitem->option = "D";
+                        // If local file, remove using package name, not filename
+                        if ( p->isPackageStoredLocally() )
+                            name = item->text();
                         break;
                     case 2: // Reinstall or Upgrade
                         newitem->option = secondOption;
                         break;
                 }
             }
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control
index b8ad1e8..46bffdd 100644
--- a/noncore/settings/aqpkg/opie-aqpkg.control
+++ b/noncore/settings/aqpkg/opie-aqpkg.control
@@ -1,11 +1,11 @@
 Package: opie-aqpkg
 Files: bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop 
 Priority: optional
 Section: Settings
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Replaces: aqpkg
 Architecture: arm
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Description: A Package Manager
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index adda832..5a521d3 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -113,12 +113,13 @@ void Package :: setLocalPackage( Package *p )
             differentVersionAvailable = false;
 }
 
 void Package :: setVersion( const QString &v )
 {
     version = v;
+            differentVersionAvailable = false;
 
     if ( localPackage )
         if ( localPackage->getVersion() < getVersion() && !installed )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
index 9553cd1..499d647 100644
--- a/noncore/settings/aqpkg/packagewin.cpp
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -41,17 +41,18 @@
 PackageWindow::PackageWindow( Package *package, const QString &server )
         : QWidget( 0, 0, 0 )
 {
         QString str;
         if ( package )
         {
+        Package *local = package->getLocalPackage();
                 setCaption( package->getPackageName() );
                 QString destName;
-                if ( package->getLocalPackage() )
+                if ( local )
                 {
-                        if ( package->getLocalPackage()->getInstalledTo() )
+                        if ( local->getInstalledTo() )
                                 destName = package->getLocalPackage()->getInstalledTo()->getDestinationName();
                 }
                 else
                 {
                         if ( package->getInstalledTo() )
                                 destName = package->getInstalledTo()->getDestinationName();
@@ -83,13 +84,13 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
                         str.append( package->getVersion() );
                 }
                 else
                 {
                         str.append( tr( "<p><b>Version Available</b> - " ) );
                         str.append( package->getVersion() );
-                        if ( package->getLocalPackage() )
+                        if ( local )
                         {
                                 if ( package->isInstalled() )
                                 {
                                         str.append( tr( "<p><b>Version Installed</b> - " ) );
                                         str.append( package->getInstalledVersion() );
                                 }
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 4693db1..0282236 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -116,13 +116,13 @@ void Server :: readLocalIpks( Server *local )
     {
         // OK, we have a local IPK file, I think the standard naming conventions
         // for these are packagename_version_arm.ipk
         QString file = (*it)->file();
 
         // Changed to display the filename (excluding the path)
-        QString packageName = Utils::getFilenameFromIpkFilename( file );
+        QString packageName = Utils::getPackageNameFromIpkFilename( file );      
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
         Package *package = new Package( packageName );
         package->setVersion( ver );
         package->setFilename( file );
         package->setPackageStoredLocally( true );
         packageList.append( package );
@@ -241,12 +241,15 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR
 }
 
 void Server :: buildLocalPackages( Server *local )
 {
     Package *curr;
     QListIterator<Package> it( packageList );
+    
+    QList<Package> *locallist = &local->getPackageList();
+    
     for ( ; it.current(); ++it )
     {
         curr = it.current();
         QString name = curr->getPackageName();
 
         // If the package name is an ipk name, then convert the filename to a package name
@@ -256,12 +259,20 @@ void Server :: buildLocalPackages( Server *local )
         if ( local )
         {
             Package *p = local->getPackage( name );
             curr->setLocalPackage( p );
             if ( p )
             {
+                // Replace local version 
+                if ( curr->getVersion() > p->getVersion() )
+                {
+                    int pos = locallist->at();
+                    locallist->remove( p );
+                    locallist->insert( pos, curr );
+                }
+                
                 // Set some default stuff like size and things
                 if ( p->getInstalledVersion() == curr->getVersion() )
                 {
                     p->setPackageSize( curr->getPackageSize() );
                     p->setSection( curr->getSection() );
                     p->setDescription( curr->getDescription() );
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
@@ -45,13 +45,13 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     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" ) )
@@ -138,15 +138,13 @@ 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 )
     {
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
@@ -161,15 +161,13 @@ 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();