3 files changed, 47 insertions, 47 deletions

diff --git a/noncore/net/opieftp/inputDialog.cpp b/noncore/net/opieftp/inputDialog.cpp
index 22205d3..89b345e 100644
--- a/noncore/net/opieftp/inputDialog.cpp
+++ b/noncore/net/opieftp/inputDialog.cpp
@@ -20,13 +20,13 @@
 
 
 InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
-  setName( "InputDialog" );
+        setName( "InputDialog" );
     resize( 234, 50 ); 
     setMaximumSize( QSize( 240, 50 ) );
     setCaption( tr(name ) );
 
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); 
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 814d706..f70011b 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -117,16 +117,16 @@ OpieFtp::OpieFtp( )
     tabLayout = new QGridLayout( tab );
     tabLayout->setSpacing( 2);
     tabLayout->setMargin( 2);
 
     Local_View = new QListView( tab, "Local_View" );
 //    Local_View->setResizePolicy( QListView::AutoOneFit );
-    Local_View->addColumn( "File",120);
-    Local_View->addColumn( "Size",-1);
+    Local_View->addColumn( tr("File"),120);
+    Local_View->addColumn( tr("Size"),-1);
     Local_View->setColumnAlignment(1,QListView::AlignRight);
-    Local_View->addColumn( "Date",-1);
+    Local_View->addColumn( tr("Date"),-1);
     Local_View->setColumnAlignment(2,QListView::AlignRight);
     Local_View->setAllColumnsShowFocus(TRUE);
     QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
     tabLayout->addWidget( Local_View, 0, 0 );
 
@@ -140,16 +140,16 @@ OpieFtp::OpieFtp( )
     tab_2 = new QWidget( TabWidget, "tab_2" );
     tabLayout_2 = new QGridLayout( tab_2 );
     tabLayout_2->setSpacing( 2);
     tabLayout_2->setMargin( 2);
 
     Remote_View = new QListView( tab_2, "Remote_View" );
-    Remote_View->addColumn( "File",120);
-    Remote_View->addColumn( "Size",-1);
+    Remote_View->addColumn( tr("File"),120);
+    Remote_View->addColumn( tr("Size"),-1);
     Remote_View->setColumnAlignment(1,QListView::AlignRight);
-    Remote_View->addColumn( "Date",-1);
+    Remote_View->addColumn( tr("Date"),-1);
     Remote_View->setColumnAlignment(2,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
     QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
     connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
              this,SLOT( remoteListClicked(QListViewItem *)) );
@@ -299,21 +299,21 @@ void OpieFtp::localUpload()
         FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
         FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
         qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1());
 
         if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
             QString msg;
-            msg.sprintf("Unable to upload\n%s",FtpLastResponse(conn));
+            msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
-            QMessageBox::message("Note",msg);
+            QMessageBox::message(tr("Note"),msg);
 //            FtpQuit(conn);
         }
         ProgressBar->reset();
         nullifyCallBack();
     } else {
-        QMessageBox::message("Note","Cannot upload directories");
+        QMessageBox::message(tr("Note"),tr("Cannot upload directories"));
     }
     TabWidget->setCurrentPage(1);
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
@@ -348,15 +348,15 @@ void OpieFtp::remoteDownload()
     FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
     FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
     qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
 
     if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
         QString msg;
-        msg.sprintf("Unable to download \n%s",FtpLastResponse(conn));
+        msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
-        QMessageBox::message("Note",msg);
+        QMessageBox::message(tr("Note"),msg);
 //        FtpQuit(conn);
     }
     ProgressBar->reset();
     nullifyCallBack();
     TabWidget->setCurrentPage(0);
     populateLocalView();
@@ -372,13 +372,13 @@ void OpieFtp::newConnection()
 void OpieFtp::connector()
 {
     QCopEnvelope ( "QPE/System", "busy()" );
      qApp->processEvents();
      currentRemoteDir=remotePath->text();
     if(ServerComboBox->currentText().isEmpty()) {
-        QMessageBox::warning(this,"Ftp","Please set the server info","Ok",0,0);
+        QMessageBox::warning(this,tr("Ftp"),tr("Please set the server info"),tr("Ok"),0,0);
         TabWidget->setCurrentPage(2);
         ServerComboBox->setFocus();
         return;
     }
     FtpInit();
     TabWidget->setCurrentPage(1);
@@ -389,20 +389,20 @@ void OpieFtp::connector()
     port.stripWhiteSpace();
     
     if(ftp_host.find("ftp://",0, TRUE) != -1 )
         ftp_host=ftp_host.right(ftp_host.length()-6);
     ftp_host+=":"+port;
     if (!FtpConnect( ftp_host.latin1(), &conn)) {
-            QMessageBox::message("Note","Unable to connect to\n"+ftp_host);
+            QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host);
             return ;
         }
         if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) {
             QString msg;
-            msg.sprintf("Unable to log in\n%s",FtpLastResponse(conn));
+            msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
-            QMessageBox::message("Note",msg);
+            QMessageBox::message(tr("Note"),msg);
             FtpQuit(conn);
             return ;
         }
         remoteDirList("/") ;
         setCaption(ftp_host);
     QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -424,15 +424,15 @@ bool OpieFtp::remoteDirList(const QString &dir)
     else
         tmp+="._temp";
 //    qDebug("Listing remote dir "+tmp);
     QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
         QString msg;
-        msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) );
+        msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) );
         msg.replace(QRegExp(":"),"\n");
-        QMessageBox::message("Note",msg);
+        QMessageBox::message(tr("Note"),msg);
 //        FtpQuit(conn);
         return false;
     }
     populateRemoteView() ;
     QCopEnvelope ( "QPE/System", "notBusy()" );
     return true;
@@ -440,15 +440,15 @@ bool OpieFtp::remoteDirList(const QString &dir)
 
 bool OpieFtp::remoteChDir(const QString &dir)
 {
     QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpChdir( dir.latin1(), conn )) {
         QString msg;
-        msg.sprintf("Unable to change directories\n"+dir+"\n%s",FtpLastResponse(conn));
+        msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
-        QMessageBox::message("Note",msg);
+        QMessageBox::message(tr("Note"),msg);
             qDebug(msg);
 //        FtpQuit(conn);
         QCopEnvelope ( "QPE/System", "notBusy()" );
         return FALSE;
     }
     QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -558,23 +558,23 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
     QString  oldRemoteCurrentDir =  currentRemoteDir;
     QString strItem=selectedItem->text(0);
     strItem=strItem.simplifyWhiteSpace();
     if(strItem == "../") { // the user wants to go ^
         if( FtpCDUp( conn) == 0) {
             QString msg;
-            msg.sprintf("Unable to cd up\n%s",FtpLastResponse(conn));
+            msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
-            QMessageBox::message("Note",msg);
+            QMessageBox::message(tr("Note"),msg);
             qDebug(msg);
         }
         char path[256];
         if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string
             QString msg;
-            msg.sprintf("Unable to get working dir\n%s",FtpLastResponse(conn));
+            msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
-            QMessageBox::message("Note",msg);
+            QMessageBox::message(tr("Note"),msg);
             qDebug(msg);
         }
         currentRemoteDir=path;
     } else {
         if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers
             strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 );
@@ -728,27 +728,27 @@ void OpieFtp::showLocalMenu(QListViewItem * item)
     m.exec( QCursor::pos() );
 }
 
 void OpieFtp::localMakDir()
 {
     InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,"Make Directory",TRUE, 0);
+    fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();
        currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
     }
     populateLocalView();
 }
 
 void OpieFtp::localDelete()
 {
     QString f = Local_View->currentItem()->text(0);
     if(QDir(f).exists() ) {
-        switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+
-                                      " ?\nIt must be empty","Yes","No",0,0,1) ) {
+        switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+
+                                      tr(" ?\nIt must be empty"),tr("Yes"),tr("No"),0,0,1) ) {
           case 0: {
               f=currentDir.canonicalPath()+"/"+f;
               QString cmd="rmdir "+f;
               system( cmd.latin1());
               populateLocalView();
           }
@@ -756,14 +756,14 @@ void OpieFtp::localDelete()
           case 1: 
                 // exit
               break;
         };
         
     } else {
-        switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f
-                                      +" ?","Yes","No",0,0,1) ) {
+        switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
+                                      +" ?",tr("Yes"),tr("No"),0,0,1) ) {
           case 0: {
               f=currentDir.canonicalPath()+"/"+f;
               QString cmd="rm "+f;
               system( cmd.latin1());
               populateLocalView();
           }
@@ -775,60 +775,60 @@ void OpieFtp::localDelete()
     }
 }
 
 void OpieFtp::remoteMakDir()
 {
     InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,"Make Directory",TRUE, 0);
+    fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();//+".playlist";
        QString tmp=currentRemoteDir+filename;
        QCopEnvelope ( "QPE/System", "busy()" );
        if(FtpMkdir( tmp.latin1(), conn) == 0) {
            QString msg;
-           msg.sprintf("Unable to make directory\n%s",FtpLastResponse(conn));
+           msg.sprintf(tr("Unable to make directory\n")+"%s",FtpLastResponse(conn));
            msg.replace(QRegExp(":"),"\n");
-           QMessageBox::message("Note",msg);
+           QMessageBox::message(tr("Note"),msg);
        }
        QCopEnvelope ( "QPE/System", "notBusy()" );
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     }
 }
 
 void OpieFtp::remoteDelete()
 {
     QString f = Remote_View->currentItem()->text(0);
     QCopEnvelope ( "QPE/System", "busy()" );
     if( f.right(1) =="/") {
         QString path= currentRemoteDir+f;
-        switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?"
-                                      ,"Yes","No",0,0,1) ) {
+        switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?"
+                                      ,tr("Yes"),tr("No"),0,0,1) ) {
           case 0: {
               f=currentDir.canonicalPath()+"/"+f;
               if(FtpRmdir( path.latin1(), conn) ==0) {
                   QString msg;
-                  msg.sprintf("Unable to remove directory\n%s",FtpLastResponse(conn));
+                  msg.sprintf(tr("Unable to remove directory\n")+"%s",FtpLastResponse(conn));
                   msg.replace(QRegExp(":"),"\n");
-                  QMessageBox::message("Note",msg);
+                  QMessageBox::message(tr("Note"),msg);
               }
               remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
               
           }
           break;
         };
     } else {
-        switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?"
-                                      ,"Yes","No",0,0,1) ) {
+        switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?"
+                                      ,tr("Yes"),tr("No"),0,0,1) ) {
           case 0: {
               QString path= currentRemoteDir+f;
               if(FtpDelete( path.latin1(), conn)==0) {
                   QString msg;
-                  msg.sprintf("Unable to delete file\n%s",FtpLastResponse(conn));
+                  msg.sprintf(tr("Unable to delete file\n")+"%s",FtpLastResponse(conn));
                   msg.replace(QRegExp(":"),"\n");
-                  QMessageBox::message("Note",msg);
+                  QMessageBox::message(tr("Note"),msg);
               }
               remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
           }
           break;
         };
     }
@@ -836,42 +836,42 @@ void OpieFtp::remoteDelete()
 }
 
 void OpieFtp::remoteRename()
 {
     QString curFile = Remote_View->currentItem()->text(0);
     InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,"Rename",TRUE, 0);
+    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->inputText = curFile;
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldName = currentRemoteDir +"/"+ curFile;
         QString newName = currentRemoteDir  +"/"+ fileDlg->LineEdit1->text();//+".playlist";
         QCopEnvelope ( "QPE/System", "busy()" );
         if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) {
             QString msg;
-            msg.sprintf("Unable to rename file\n%s",FtpLastResponse(conn));
+            msg.sprintf(tr("Unable to rename file\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
-            QMessageBox::message("Note",msg);
+            QMessageBox::message(tr("Note"),msg);
         }
         QCopEnvelope ( "QPE/System", "notBusy()" );
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     }
 }
 
 void OpieFtp::localRename()
 {
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,"Rename",TRUE, 0);
+    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->inputText = curFile;
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname =  currentDir.canonicalPath() + "/" + curFile;
         QString newName =  currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
-            QMessageBox::message("Note","Could not rename");
+            QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateLocalView();
 }
 
 void OpieFtp::currentPathEditChanged()
 {
@@ -879,13 +879,13 @@ void OpieFtp::currentPathEditChanged()
 //    qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir);
     if (TabWidget->currentPageIndex() == 0) {
         if(QDir( currentPathEdit->text()).exists()) {
             currentDir.setPath( currentPathEdit->text() );
             populateLocalView();
         } else {
-            QMessageBox::message("Note","That directory does not exist");
+            QMessageBox::message(tr("Note"),tr("That directory does not exist"));
         }
     }
     if (TabWidget->currentPageIndex() == 1) {
         currentRemoteDir = currentPathEdit->text();
         if(currentRemoteDir.right(1) !="/") {
             currentRemoteDir = currentRemoteDir +"/";
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index f485cdf..147a8c5 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -6,7 +6,7 @@ TARGET    = opieftp
 REQUIRES=medium-config
 DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 
-TRANSLATIONS = ../../i18n/pt_BR/opieftp.ts
+TRANSLATIONS += ../../i18n/pt_BR/opieftp.ts