diff -u indicator-session-0.2.4/debian/changelog indicator-session-0.2.4/debian/changelog
--- indicator-session-0.2.4/debian/changelog
+++ indicator-session-0.2.4/debian/changelog
@@ -1,3 +1,11 @@
+indicator-session (0.2.4-0ubuntu3) lucid; urgency=low
+
+  * src/gtk-dialog/logout-dialog.c
+    + Amend button labels to "<action> Now"
+    + Prefix dialogue text with "Unless you cancel"(LP:#495127)
+
+ -- Steve Holmes <bouncysteve@googlemail.com>  Wed, 03 Mar 2010 18:26:06 +0000
+
 indicator-session (0.2.4-0ubuntu2) lucid; urgency=low
 
   * Backport upstream change to fix decoration rendering issues
diff -u indicator-session-0.2.4/src/gtk-dialog/logout-dialog.c indicator-session-0.2.4/src/gtk-dialog/logout-dialog.c
--- indicator-session-0.2.4/src/gtk-dialog/logout-dialog.c
+++ indicator-session-0.2.4/src/gtk-dialog/logout-dialog.c
@@ -66,9 +66,9 @@
 };
 
 static const gchar * button_strings[LOGOUT_DIALOG_ACTION_CNT] = {
-	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button", "Log Out"),
-	/* LOGOUT_DIALOG_RESTART, */	NC_("button", "Restart"),
-	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button", "Shut Down")
+	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button", "Log Out Now"),
+	/* LOGOUT_DIALOG_RESTART, */	NC_("button", "Restart Now"),
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button", "Shut Down Now")
 };
 
 static const gchar * restart_auth = N_("Restart...");
@@ -116,18 +116,19 @@
   switch (dialog->action)
     {
     case LOGOUT_DIALOG_LOGOUT:
-      plural_string = ngettext("You will be logged out in %d second.",
-			       "You will be logged out in %d seconds.", 
-			       dialog->timeout);
-      break;
+      plural_string = ngettext("Unless you cancel, you will be logged out in %d second.",
+			       "Unless you cancel, you will be logged out in %d seconds.", 
+ 			       dialog->timeout);
+       break;
+
     case LOGOUT_DIALOG_RESTART:
-      plural_string = ngettext("The computer will restart in %d second.",
-			       "The computer will restart in %d seconds.", 
+      plural_string = ngettext("Unless you cancel, the computer will restart in %d second.",
+			       "Unless you cancel, the computer will restart in %d seconds.", 
 			       dialog->timeout);
       break;
     case LOGOUT_DIALOG_SHUTDOWN:
-      plural_string = ngettext("The computer will be shut down in %d second.",
-			       "The computer will be shut down in %d seconds.",
+      plural_string = ngettext("Unless you cancel, the computer will be shut down in %d second.",
+			       "Unless you cancel, the computer will be shut down in %d seconds.",
 			       dialog->timeout);
       break;
 	default: