Index: src/gnome-mount.c
===================================================================
--- src/gnome-mount.c	(revision 215)
+++ src/gnome-mount.c	(working copy)
@@ -1591,8 +1591,13 @@
 
 		g_debug ("putting up Flushing Cache notification");
 
-		summary = _("Writing data to device");
-		message = g_strdup_printf (_("There is data that needs to be written to the device %s before it can be removed. Please do not remove the media or disconnect the drive."), unmount_note_drive_name);
+		summary = _("Finishing up...");
+		if (unmount_note_is_eject) {
+		  message = _("To prevent data loss, wait until this has finished before ejecting.");
+		} else {
+		  message = _("To prevent data loss, wait until this has finished before disconnecting.");
+		}
+
 		unmount_note = notify_notification_new (summary,
 							message,
 							unmount_note_icon_name,
@@ -1605,7 +1610,6 @@
 			notify_notification_show (unmount_note, NULL);
 
 		}
-		g_free (message);
 	}
 #endif
 	
