summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-30 16:38:09 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-30 16:38:09 +0000
commit53790308bbebda7fbd4d7249abf33e3972a5dfc0 (patch)
tree20f3522f1a7f481099464fa118354794f5918d2a /kioslave
parent5e5763fa9c41017f9d2349226fad24db7c0723f0 (diff)
downloadtdebase-53790308bbebda7fbd4d7249abf33e3972a5dfc0.tar.gz
tdebase-53790308bbebda7fbd4d7249abf33e3972a5dfc0.zip
Enhance kdebase media manager error messages
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1250351 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 74f123c9..f4250f1b 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -1226,7 +1226,7 @@ static TQString mount_priv(const char *udi, const char *mount_point, const char
if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType"))
qerror = i18n("Invalid filesystem type");
else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied"))
- qerror = i18n("Permissions denied");
+ qerror = i18n("Permissions denied<p>Please ensure that:<br>1. You have permission to access this device.<br>2. This device node is not listed in /etc/fstab.</p>");
else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.PermissionDeniedByPolicy"))
qerror = privilegedMount(udi, mount_point, poptions, noptions);
else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted"))
@@ -1410,7 +1410,7 @@ TQString HALBackend::mount(const Medium *medium)
return (data.error) ? data.errorMessage : TQString::null;
} else if (medium->id().startsWith("/org/kde/") )
- return i18n("Permissions denied");
+ return i18n("Permission denied");
TQStringList soptions;
@@ -1643,7 +1643,7 @@ TQString HALBackend::unmount(const TQString &_udi)
thisunmounthasfailed = 2;
} else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) {
// this is faking. The error is that the device wasn't mounted by hal (but by the system)
- reason = i18n("Permissions denied");
+ reason = i18n("Permission denied<p>Please ensure that:<br>1. You have permission to access this device.<br>2. This device was originally mounted using TDE.</p>");
} else {
reason = error.message;
}