--- kdebase-3.1.3/kioslave/devices/kdedmodule/mountwatcher.cpp--	2003-09-10 11:38:43.000000000 -0400
+++ kdebase-3.1.3/kioslave/devices/kdedmodule/mountwatcher.cpp	2003-09-10 11:45:47.000000000 -0400
@@ -270,12 +270,12 @@ void MountWatcherModule::readDFDone()
                         {
                             if( cdromNb == 1)
                             {
-                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                                mountList<<ent->niceDescription();
                             }
                             else
                             {
                                 QString tmp = ent->niceDescription()+QString::number(cdromNb);
-                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                                mountList<<tmp;
                             }
                             cdromNb++;
                         }
@@ -283,12 +283,12 @@ void MountWatcherModule::readDFDone()
                         {
                             if( cdwriterNb == 1)
                             {
-                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                                mountList<<ent->niceDescription();
                             }
                             else
                             {
                                 QString tmp = ent->niceDescription()+QString::number(cdwriterNb);
-                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                                mountList<<tmp;
                             }
                             cdwriterNb++;
                         }
@@ -296,12 +296,12 @@ void MountWatcherModule::readDFDone()
                         {
                             if( floppyNb == 1)
                             {
-                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                                mountList<<ent->niceDescription();
                             }
                             else
                             {
                                 QString tmp = ent->niceDescription()+QString::number(floppyNb);
-                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                                mountList<<tmp;
                             }
                             floppyNb++;
                         }
@@ -309,18 +309,18 @@ void MountWatcherModule::readDFDone()
                         {
                             if( zipNb == 1)
                             {
-                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                                mountList<<ent->niceDescription();
                             }
                             else
                             {
                                 QString tmp = ent->niceDescription()+QString::number(zipNb);
-                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                                mountList<<tmp;
                             }
                             zipNb++;
                         }
 
                         else
-                            mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                            mountList<<ent->mountPoint();
 
 			mountList<<ent->deviceName();
 //			mountList<<ent->mountPoint();
@@ -333,7 +333,60 @@ void MountWatcherModule::readDFDone()
                	else
 		{
 			mountList<<entryName;
-                 	mountList<<i18n("%1%2 (not mounted)").arg(ent->niceDescription()).arg(filename);
+                        if( ent->discType().contains("cdrom"))
+                        {
+                            if( cdromNb == 1)
+                            {
+                                mountList<<ent->niceDescription();
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(cdromNb);
+                                mountList<<tmp;
+                            }
+                            cdromNb++;
+                        }
+                        else if( ent->discType().contains("cdwriter"))
+                        {
+                            if( cdwriterNb == 1)
+                            {
+                                mountList<<ent->niceDescription();
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(cdwriterNb);
+                                mountList<<tmp;
+                            }
+                            cdwriterNb++;
+                        }
+                        else if( ent->discType().contains("floppy"))
+                        {
+                            if( floppyNb == 1)
+                            {
+                                mountList<<ent->niceDescription();
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(floppyNb);
+                                mountList<<tmp;
+                            }
+                            floppyNb++;
+                        }
+                        else if( ent->discType().contains("zip"))
+                        {
+                            if( zipNb == 1)
+                            {
+                                mountList<<ent->niceDescription();
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(zipNb);
+                                mountList<<tmp;
+                            }
+                            zipNb++;
+                        }
+                        else
+                            mountList<<i18n("%1%2 (not mounted)").arg(ent->niceDescription()).arg(filename);
 			mountList<<ent->deviceName();
 			mountList<<"file:/"+(ent->mountPoint().startsWith("/")?ent->mountPoint().right(ent->mountPoint().length()-1):ent->mountPoint());
 			mountList<< ent->discType()+"_unmounted";