author | cniehaus <cniehaus> | 2002-12-27 10:59:15 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-12-27 10:59:15 (UTC) |
commit | 6ca8a429b121dbbdbbfbde453cd2cd1412315aa8 (patch) (unidiff) | |
tree | a3b824d3c9b574fb43a554a43f1d21de3eb7bb83 | |
parent | 3565b57b9346db47693287162c5794a4d4d8b568 (diff) | |
download | opie-6ca8a429b121dbbdbbfbde453cd2cd1412315aa8.zip opie-6ca8a429b121dbbdbbfbde453cd2cd1412315aa8.tar.gz opie-6ca8a429b121dbbdbbfbde453cd2cd1412315aa8.tar.bz2 |
i18n fix
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index a6b59c7..98d024d 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -465,60 +465,58 @@ void AdvancedFm::copy() { | |||
465 | doMsg=false; | 465 | doMsg=false; |
466 | break; | 466 | break; |
467 | case 1: | 467 | case 1: |
468 | return; | 468 | return; |
469 | break; | 469 | break; |
470 | }; | 470 | }; |
471 | } | 471 | } |
472 | 472 | ||
473 | QString curFile, item, destFile; | 473 | QString curFile, item, destFile; |
474 | if (TabWidget->getCurrentTab() == 0) { | 474 | if (TabWidget->getCurrentTab() == 0) { |
475 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 475 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
476 | item=(*it); | 476 | item=(*it); |
477 | if(item.find("->",0,TRUE)) //symlink | 477 | if(item.find("->",0,TRUE)) //symlink |
478 | item = item.left(item.find("->",0,TRUE)); | 478 | item = item.left(item.find("->",0,TRUE)); |
479 | 479 | ||
480 | destFile = currentRemoteDir.canonicalPath()+"/"+ item; | 480 | destFile = currentRemoteDir.canonicalPath()+"/"+ item; |
481 | qDebug("Destination file is "+destFile); | 481 | qDebug("Destination file is "+destFile); |
482 | 482 | ||
483 | curFile = currentDir.canonicalPath()+"/"+ item; | 483 | curFile = currentDir.canonicalPath()+"/"+ item; |
484 | qDebug("CurrentFile file is " + curFile); | 484 | qDebug("CurrentFile file is " + curFile); |
485 | 485 | ||
486 | QFile f(destFile); | 486 | QFile f(destFile); |
487 | if( f.exists()) { | 487 | if( f.exists()) { |
488 | if(doMsg) { | 488 | if(doMsg) { |
489 | switch ( QMessageBox::warning(this,tr("File Exists!"), | 489 | switch ( QMessageBox::warning(this,tr("File Exists!"), tr("%1 exists. Ok to overwrite?").arg( item ), tr("Yes"),tr("No"),0,0,1) ) { |
490 | item+tr("\nexists. Ok to overwrite?"), | ||
491 | tr("Yes"),tr("No"),0,0,1) ) { | ||
492 | case 1: | 490 | case 1: |
493 | return; | 491 | return; |
494 | break; | 492 | break; |
495 | }; | 493 | }; |
496 | } | 494 | } |
497 | f.remove(); | 495 | f.remove(); |
498 | } | 496 | } |
499 | if(!copyFile( curFile, destFile) ) { | 497 | if(!copyFile( curFile, destFile) ) { |
500 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | 498 | QMessageBox::message("AdvancedFm",tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) ); |
501 | return; | 499 | return; |
502 | } | 500 | } |
503 | } | 501 | } |
504 | populateRemoteView(); | 502 | populateRemoteView(); |
505 | TabWidget->setCurrentTab(1); | 503 | TabWidget->setCurrentTab(1); |
506 | 504 | ||
507 | } else { | 505 | } else { |
508 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 506 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
509 | item= (*it); | 507 | item= (*it); |
510 | if(item.find("->",0,TRUE)) //symlink | 508 | if(item.find("->",0,TRUE)) //symlink |
511 | item = item.left(item.find("->",0,TRUE)); | 509 | item = item.left(item.find("->",0,TRUE)); |
512 | 510 | ||
513 | destFile = currentDir.canonicalPath()+"/"+ item; | 511 | destFile = currentDir.canonicalPath()+"/"+ item; |
514 | qDebug("Destination file is "+destFile); | 512 | qDebug("Destination file is "+destFile); |
515 | 513 | ||
516 | curFile = currentRemoteDir.canonicalPath()+"/"+ item;; | 514 | curFile = currentRemoteDir.canonicalPath()+"/"+ item;; |
517 | qDebug("CurrentFile file is " + curFile); | 515 | qDebug("CurrentFile file is " + curFile); |
518 | 516 | ||
519 | QFile f(destFile); | 517 | QFile f(destFile); |
520 | if( f.exists()) { | 518 | if( f.exists()) { |
521 | switch ( QMessageBox::warning(this,tr("File Exists!"), | 519 | switch ( QMessageBox::warning(this,tr("File Exists!"), |
522 | item+tr("\nexists. Ok to overwrite?"), | 520 | item+tr("\nexists. Ok to overwrite?"), |
523 | tr("Yes"),tr("No"),0,0,1) ) { | 521 | tr("Yes"),tr("No"),0,0,1) ) { |
524 | case 1: | 522 | case 1: |