4 files changed, 8 insertions, 22 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
@@ -15,3 +15,2 @@
 
-#include <qfile.h>
 #include <qfileinfo.h>
@@ -21,5 +20,2 @@
 #include <qlineedit.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
 #include <qmessagebox.h>
@@ -250,3 +246,3 @@ void filePermissions::accept() {
         perror("getpwnam");
-        QMessageBox::warning(this,"Warning","Error- no user");
+        QMessageBox::warning(this,tr("Warning"),tr("Error- no user") );
         return;
@@ -256,3 +252,3 @@ void filePermissions::accept() {
         perror("getgrnam");
-        QMessageBox::warning(this,"Warning","Error- no  group");
+        QMessageBox::warning(this,tr("Warning"),tr("Error- no  group"));
         return;
@@ -261,3 +257,3 @@ void filePermissions::accept() {
         perror("chown");
-        QMessageBox::warning(this,"Warning","Error setting ownership or group");
+        QMessageBox::warning(this,tr("Warning"),tr("Error setting ownership or group") );
         return;
@@ -268,3 +264,3 @@ void filePermissions::accept() {
             perror("chmod");
-            QMessageBox::warning(this,"Warning","Error setting mode");
+            QMessageBox::warning(this,tr("Warning"),tr("Error setting mode") );
             return;
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
@@ -13,6 +13,2 @@
 #include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/config.h>
-#include <qstring.h>
-#include <qstringlist.h>
 
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
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ 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
@@ -9,3 +9,2 @@
 
-#include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
@@ -13,7 +12,3 @@
 
-#include <qmessagebox.h>
-#include <qstringlist.h>
 #include <qfile.h>
-#include <qcstring.h>
-#include <qlineedit.h>
 #include <qmultilineedit.h>
@@ -21,3 +16,2 @@
 #include <qlayout.h>
-#include <qvariant.h>
 
@@ -171,6 +165,6 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 
-         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);
@@ -247,3 +241,3 @@ void Output::processFinished() {
     delete proc;
-    OutputEdit->append( "\nFinished\n");
+    OutputEdit->append( tr("\nFinished\n") );
     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);