ported to HEAD

1 files changed, 14 insertions, 5 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 2201960..9f21245 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -204,11 +204,15 @@ void AdvancedFm::doDelete()
         f += "/";
       f += myFile;
       if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) //if file is a directory
         {
-        switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete\n") + f +
-                                      "\nand all it's contents ?"
-                                      ,tr("Yes"),tr("No"),0,0,1) )
+        switch ( QMessageBox::warning( this, tr("Delete Directory?"), 
+					tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
+					tr("Yes"),
+					tr("No"),
+					0,
+					0,
+					1) )
           {
         case 0:
         {
           f=f.left(f.length()-1);
@@ -223,10 +227,15 @@ void AdvancedFm::doDelete()
         };
 
       } else {
           if(doMsg) {
-        switch ( QMessageBox::warning(this,tr("Delete"),tr("Really delete\n")+f
-                 +" ?",tr("Yes"),tr("No"),0,0,1) ) {
+        switch ( QMessageBox::warning(this,tr("Delete"),
+					tr("Really delete\n%1?").arg( f ),
+				 tr("Yes"),
+				 tr("No"),
+				 0,
+				 0,
+				 1) ) {
           case 1:
               return;
               break;
         };