1 files changed, 15 insertions, 11 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index f97ae99..d0ccc3f 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1216,25 +1216,25 @@ void AdvancedFm::copy()
                 switch ( QMessageBox::warning(this,tr("Delete"),
                 destFile+tr(" already exists\nDo you really want to delete it?"),
                             tr("Yes"),tr("No"),0,0,1) ) {
                   case 0: 
                 f.remove();
                 break;
                   case 1:
                   return;
                 break;
                 };
             }
             if(!copyFile(destFile, curFile) ) {
-                    QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                    QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
 
                     qWarning("nothin doing");
             }
         }
         populateLocalView();
         TabWidget->setCurrentPage(0);
     }
     }
 }
 
 void AdvancedFm::copyAs()
 {
@@ -1261,25 +1261,25 @@ void AdvancedFm::copyAs()
                         switch (QMessageBox::warning(this,tr("Delete"),
                          destFile+tr(" already exists\nDo you really want to delete it?"),
                           tr("Yes"),tr("No"),0,0,1) ) {
                           case 0: 
                               f.remove();
                               break;
                           case 1:
                               return;
                               break;
                         };
                     }
                     if(!copyFile(destFile, curFile) ) {
-                        QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                        QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                         qWarning("nothin doing");
                     }
                 }
             }
             populateRemoteView();
             TabWidget->setCurrentPage(1);
         } else {
             if (TabWidget->currentPageIndex() == 0) {
                 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                     curFile = currentDir.canonicalPath()+"/"+(*it);
                     QString destFile;
@@ -1294,25 +1294,25 @@ void AdvancedFm::copyAs()
                             switch ( QMessageBox::warning(this,tr("Delete"),
                                  destFile+tr(" already exists\nDo you really want to delete it?"),
                                  tr("Yes"),tr("No"),0,0,1) ) {
                               case 0: 
                                   f.remove();
                                   break;
                               case 1:
                                   return;
                                   break;
                             };
                         }
                         if(!copyFile(destFile, curFile) ) {
-                            QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                             qWarning("nothin doing");
                         }
                         
                     }
                 }
                 populateLocalView();
                 TabWidget->setCurrentPage(0);
             }
         }
     }
 
 }
@@ -1342,25 +1342,25 @@ void AdvancedFm::copySameDir() {
                          destFile+tr(" already exists\nDo you really want to delete it?"),
                           tr("Yes"),tr("No"),0,0,1) ) {
                           case 0:
                               qDebug("");
                               f.remove();
                               break;
                           case 1:
                               return;
                               break;
                         };
                     }
                     if(!copyFile(destFile, curFile) ) {
-                        QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                         qWarning("nothin doing");
                     }
                     
                     qDebug("copy "+curFile+" as "+destFile);
                 }
                 delete fileDlg;
             }
             populateRemoteView();
             TabWidget->setCurrentPage(1);
         } else {
             if (TabWidget->currentPageIndex() == 0) {
                 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
@@ -1379,25 +1379,25 @@ void AdvancedFm::copySameDir() {
                             switch ( QMessageBox::warning(this,tr("Delete"),
                                  destFile+tr(" already exists\nDo you really want to delete it?"),
                                  tr("Yes"),tr("No"),0,0,1) ) {
                               case 0: 
                                   f.remove();
                                   break;
                               case 1:
                                   return;
                                   break;
                             };
                         }
                         if(!copyFile(destFile, curFile) ) {
-                            QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                             qWarning("nothin doing");
                         }
                         qDebug("copy "+curFile+" as "+destFile);
                     }
                     delete fileDlg;
                 }
                 populateLocalView();
                 TabWidget->setCurrentPage(0);
             }
         }
     }
 
@@ -1427,25 +1427,25 @@ void AdvancedFm::move() {
                 if( f.exists()) {
                     switch (QMessageBox::warning(this,tr("Delete"),
                            destFile+tr(" already exists\nDo you really want to delete it?"),
                            tr("Yes"),tr("No"),0,0,1) ) {
                       case 0:
                           f.remove();
                           break;
                       case 1:
                           return;
                           break;
                     };
                     if(!copyFile( destFile, curFile) ) {
-                        QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
+                        QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
                         return;
                     }
                     QFile::remove(curFile);
                 }
             }
             TabWidget->setCurrentPage(1);
         } else {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
                 QString destFile = currentRemoteDir.canonicalPath();
                 if(destFile.right(1).find("/",0,TRUE) == -1)
                     destFile+="/";
                 destFile +=(*it);
@@ -1459,25 +1459,25 @@ void AdvancedFm::move() {
                 if( f.exists()) {
                     switch (QMessageBox::warning(this,tr("Delete"),
                     destFile+tr(" already exists\nDo you really want to delete it?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
                       case 0:
                           f.remove();
                           break;
                       case 1:
                           return;
                           break;
                     };
                     if(!copyFile(destFile, curFile) ) {
-                        QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
+                        QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
                         return;
                     }
                 }
                     QFile::remove(curFile);
                     TabWidget->setCurrentPage(0);
                 }
             }
             populateRemoteView();
             populateLocalView();
         }
 }
 
@@ -1536,25 +1536,25 @@ void AdvancedFm::runCommand() {
         outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
         outDlg->showMaximized();
         outDlg->show();
         qApp->processEvents();
         FILE *fp;
         char line[130];
         sleep(1);
 //         if(command.find("2>",0,TRUE) != -1)
             command +=" 2>&1";
         fp = popen(  (const char *) command, "r");
         if ( !fp ) {
             qDebug("Could not execute '" + command + "'! err=%d", fp);
-            QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
+            QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
             pclose(fp);
             return;
         } else {
             while ( fgets( line, sizeof line, fp)) {
                 QString lineStr = line;
                 lineStr=lineStr.left(lineStr.length()-1);
                 outDlg->OutputEdit->append(lineStr);
                 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
             }
         }
     }
 }
@@ -1592,25 +1592,25 @@ void AdvancedFm::fileStatus() {
 //     int err=0;
     Output *outDlg;
     outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
     outDlg->showMaximized();
     outDlg->show();
     qApp->processEvents();
     FILE *fp;
     char line[130];
     sleep(1);
     fp = popen(  (const char *) command, "r");
     if ( !fp ) {
         qDebug("Could not execute '" + command + "'! err=%d", fp);
-        QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
+        QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
         pclose(fp);
         return;
     } else {
         while ( fgets( line, sizeof line, fp)) {
             outDlg->OutputEdit->append(line);
             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
         }
 
     }
 }
 
@@ -1629,28 +1629,28 @@ void AdvancedFm::rn() {
         remoteRename();
 
 }
 
 void AdvancedFm::del() {
     if (TabWidget->currentPageIndex() == 0)
         localDelete();
     else
         remoteDelete();
 }
 
 void AdvancedFm::doAbout() {
-    QMessageBox::message("AdvancedFm","Advanced FileManager\n"
+    QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                          "is copyright 2002 by\n"
                          "L.J.Potter<llornkcor@handhelds.org>\n"
-                         "and is licensed by the GPL");
+                         "and is licensed by the GPL"));
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
 {
   if( TabWidget->hasFocus()) 
     switch ( e->key() ) {
       case Key_Delete:
           del();
           break;
       case Key_H:
           showHidden();
           break;
@@ -1793,24 +1793,27 @@ QString  AdvancedFm::getFileSystemType(const QString &currentText) {
     for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
         QString temp = (*it);
         QString path = temp.left(temp.find("::",0,TRUE) );
         path = path.right( path.length()-1);
         if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
         if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
             return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
         }
     }
     return baseFs;
 }
 
+QString  AdvancedFm::getDiskSpace( const QString &) {
+
+}
 
 void AdvancedFm::doBeam() {
     Ir ir;
     if(!ir.supported()){
     } else {
 
         QStringList curFileList = getPath();
         if( curFileList.count() > 0) {
 
         if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
@@ -1913,24 +1916,25 @@ void AdvancedFm::showFileMenu() {
 
     m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
     m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
     m->insertSeparator();
 
     if(isLocalView)
       m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
     else
       m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
     m->insertSeparator();
     m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
+
     if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )  //bad hack for Sharp zaurus failings
       m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
     m->setCheckable(TRUE);
     if (!b)
       m->setItemChecked(m->idAt(0),TRUE);
     else
       m->setItemChecked(m->idAt(0),FALSE);
     if(Ir::supported())
       m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
     m->setFocus();
     m->exec( QCursor::pos() );
     sleep(1);