- i18n fixlet by Carsten

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index f77554a..a6b59c7 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -529,296 +529,296 @@ void AdvancedFm::copy() {
         }
         if(!copyFile( curFile, destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
 
         }
       }
       populateLocalView();
       TabWidget->setCurrentTab(0);
     }
 
   }
 }
 
 void AdvancedFm::copyAs() {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
   QString curFile, item;
   InputDialog *fileDlg;
   if (TabWidget->getCurrentTab() == 0) {
     qDebug("tab 1");
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
       QString destFile;
       item=(*it);
       curFile = currentDir.canonicalPath()+"/"+(*it);
       fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
 
       fileDlg->setInputText((const QString &) destFile );
       fileDlg->exec();
 
       if( fileDlg->result() == 1 ) {
         QString  filename = fileDlg->LineEdit1->text();
         destFile = currentRemoteDir.canonicalPath()+"/"+filename;
 
         QFile f(destFile);
         if( f.exists()) {
           switch (QMessageBox::warning(this,tr("File Exists!"),
                   item+tr("\nexists. Ok to overwrite?"),
                   tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
         if(!copyFile( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
       }
       delete fileDlg;
 
     }
     populateRemoteView();
     TabWidget->setCurrentTab(1);
 
   } else {
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
       item=(*it);
       curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
       fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
 
       QString destFile;
       fileDlg->setInputText((const QString &) destFile);
       fileDlg->exec();
 
       if( fileDlg->result() == 1 ) {
         QString  filename = fileDlg->LineEdit1->text();
         destFile = currentDir.canonicalPath()+"/"+filename;
 
         QFile f( destFile);
         if( f.exists()) {
           switch ( QMessageBox::warning(this,tr("File Exists!"),
                    item+tr("\nexists. Ok to overwrite?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
         if(!copyFile( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
                         
       }
       delete fileDlg;
 
     }
     populateLocalView();
     TabWidget->setCurrentTab(0);
   }
 }
 
 void AdvancedFm::copySameDir() {
   qApp->processEvents();
   QStringList curFileList = getPath();
   QString curFile, item, destFile;
   InputDialog *fileDlg;
 
   if (TabWidget->getCurrentTab() == 0) {
 
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         item=(*it);
       curFile = currentDir.canonicalPath()+"/"+ item;
 
       fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
       fileDlg->setInputText((const QString &) destFile );
       fileDlg->exec();
 
       if( fileDlg->result() == 1 ) {
 
         QString filename = fileDlg->LineEdit1->text();
         destFile = currentDir.canonicalPath()+"/"+filename;
 
         QFile f(destFile);
         if( f.exists()) {
           switch (QMessageBox::warning(this,tr("Delete"),
-                  destFile+tr(" already exists\nDo you really want to delete it?"),
+                  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( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
                     
         qDebug("copy "+curFile+" as "+destFile);
       }
       delete fileDlg;
     }
     populateLocalView();
 
   } else {
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         item=(*it);
       curFile = currentRemoteDir.canonicalPath()+"/"+ item;
 
       fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
       fileDlg->setInputText((const QString &) destFile);
       fileDlg->exec();
       if( fileDlg->result() == 1 ) {
         QString  filename = fileDlg->LineEdit1->text();
 
         destFile = currentRemoteDir.canonicalPath()+"/"+filename;
 
         QFile f(destFile);
         if( f.exists()) {
           switch ( QMessageBox::warning(this,tr("Delete"),
-                   destFile+tr(" already exists\nDo you really want to delete it?"),
+                   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( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
         qDebug("copy "+curFile+" as "+destFile);
       }
       delete fileDlg;
     }
     populateRemoteView();
   }
 }
  
 void AdvancedFm::move() {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
     QString curFile, destFile, item;
 
     if (TabWidget->getCurrentTab() == 0) {
 
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
           item=(*it);
         QString destFile =  currentRemoteDir.canonicalPath();
 
         if(destFile.right(1).find("/",0,TRUE) == -1)
           destFile+="/";
         destFile += item;
         curFile = currentDir.canonicalPath();
 
         qDebug("Destination file is "+destFile);
 
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
 
         curFile+= item;
         qDebug("CurrentFile file is " + curFile);
 
         QFile f( curFile);
         if( f.exists()) {
           if(!copyFile(  curFile,destFile) ) {
             QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
             return;
           } else
             QFile::remove(curFile);
         }
       }
 
       TabWidget->setCurrentTab(1);
 
     } else { //view 2
 
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
           item = (*it);
         QString destFile = currentDir.canonicalPath();
 
         if(destFile.right(1).find("/",0,TRUE) == -1)
           destFile+="/";
 
         destFile += item;
 
         qDebug("Destination file is "+destFile);
 
         curFile = currentRemoteDir.canonicalPath();
 
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
         curFile+= item;
         qDebug("CurrentFile file is " + curFile);
 
         QFile f( curFile);
         if( f.exists()) {
           if(!copyFile( curFile, destFile) ) {
             QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile);
             return;
           } else
             QFile::remove( curFile);
         }
         TabWidget->setCurrentTab(0);
       }
     }
     populateRemoteView();
     populateLocalView();
   }
 }
 
 bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
   char bf[ 50000 ];
   int  bytesRead;
   bool success = TRUE;
   struct stat status;
 
   QFile s( src );
   QFile d( dest );
 
   if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
     while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
       if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
         success = FALSE;
         break;
       }
     }
     if( success && (bytesRead > 0) ){
       d.writeBlock( bf, bytesRead );
     }
   } else {
     success = FALSE;
   }
 
   // Set file permissions
   if( stat( (const char *) src, &status ) == 0 ){
     chmod( (const char *) dest, status.st_mode );
   }
 
   return success;
 }
 
 void AdvancedFm::runCommand() {