=== modified file 'data/gpm-prefs.ui'
--- old/data/gpm-prefs.ui	2010-01-19 01:47:54 +0000
+++ new/data/gpm-prefs.ui	2010-03-03 17:06:47 +0000
@@ -889,7 +889,7 @@
                                   <object class="GtkLabel" id="label_general_suspend">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">When the _suspend button is pressed:</property>
+                                    <property name="label" translatable="yes">When the _sleep button is pressed:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>

=== modified file 'src/gpm-manager.c'
--- old/src/gpm-manager.c	2010-03-01 16:59:38 +0000
+++ new/src/gpm-manager.c	2010-03-03 18:46:32 +0000
@@ -197,7 +197,7 @@
 	} else if (action == GPM_MANAGER_SOUND_SUSPEND_START) {
 		id = "suspend-start";
 		/* TRANSLATORS: this is the sound description */
-		desc = _("Suspend started");
+		desc = _("Going to sleep");
 	} else if (action == GPM_MANAGER_SOUND_SUSPEND_RESUME) {
 		id = "suspend-resume";
 		/* TRANSLATORS: this is the sound description */
@@ -205,7 +205,7 @@
 	} else if (action == GPM_MANAGER_SOUND_SUSPEND_ERROR) {
 		id = "suspend-error";
 		/* TRANSLATORS: this is the sound description */
-		desc = _("Suspend failed");
+		desc = _("Couldn't sleep");
 	}
 
 	/* no match */
@@ -473,13 +473,13 @@
 	string = g_string_new ("");
 	if (is_suspend) {
 		/* TRANSLATORS: message text */
-		g_string_append (string, _("Your computer failed to suspend."));
+		g_string_append (string, _("The computer failed to sleep."));
 		/* TRANSLATORS: title text */
-		title = _("Failed to suspend");
+		title = _("Couldn't sleep");
 		icon = GPM_STOCK_SUSPEND;
 	} else {
 		/* TRANSLATORS: message text */
-		g_string_append (string, _("Your computer failed to hibernate."));
+		g_string_append (string, _("The computer failed to hibernate."));
 		/* TRANSLATORS: title text */
 		title = _("Failed to hibernate");
 		icon = GPM_STOCK_HIBERNATE;
@@ -825,9 +825,9 @@
 	if (g_strcmp0 (type, GPM_BUTTON_POWER) == 0) {
 		gpm_manager_perform_policy (manager, GPM_CONF_BUTTON_POWER, "The power button has been pressed.");
 	} else if (g_strcmp0 (type, GPM_BUTTON_SLEEP) == 0) {
-		gpm_manager_perform_policy (manager, GPM_CONF_BUTTON_SUSPEND, "The suspend button has been pressed.");
+		gpm_manager_perform_policy (manager, GPM_CONF_BUTTON_SUSPEND, "The sleep button has been pressed.");
 	} else if (g_strcmp0 (type, GPM_BUTTON_SUSPEND) == 0) {
-		gpm_manager_perform_policy (manager, GPM_CONF_BUTTON_SUSPEND, "The suspend button has been pressed.");
+		gpm_manager_perform_policy (manager, GPM_CONF_BUTTON_SUSPEND, "The sleep button has been pressed.");
 	} else if (g_strcmp0 (type, GPM_BUTTON_HIBERNATE) == 0) {
 		gpm_manager_perform_policy (manager, GPM_CONF_BUTTON_HIBERNATE, "The hibernate button has been pressed.");
 	} else if (g_strcmp0 (type, GPM_BUTTON_LID_OPEN) == 0) {
@@ -1075,7 +1075,7 @@
 
 	/* TRANSLATORS: the battery may be recalled by it's vendor */
 	title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled"));
-	message = g_strdup_printf (_("The battery in your computer may have been "
+	message = g_strdup_printf (_("The battery in the computer may have been "
 				     "recalled by %s and you may be at risk.\n\n"
 				     "For more information visit the battery recall website."), oem_vendor);
 	dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1394,28 +1394,28 @@
 		title = _("Mouse battery low");
 
 		/* TRANSLATORS: tell user more details */
-		message = g_strdup_printf (_("The wireless mouse attached to this computer is low in power (%.1f%%)"), percentage);
+		message = g_strdup_printf (_("The wireless mouse attached to the computer is low in power (%.1f%%)"), percentage);
 
 	} else if (type == DKP_DEVICE_TYPE_KEYBOARD) {
 		/* TRANSLATORS: keyboard is getting a little low */
 		title = _("Keyboard battery low");
 
 		/* TRANSLATORS: tell user more details */
-		message = g_strdup_printf (_("The wireless keyboard attached to this computer is low in power (%.1f%%)"), percentage);
+		message = g_strdup_printf (_("The wireless keyboard attached to the computer is low in power (%.1f%%)"), percentage);
 
 	} else if (type == DKP_DEVICE_TYPE_PDA) {
 		/* TRANSLATORS: PDA is getting a little low */
 		title = _("PDA battery low");
 
 		/* TRANSLATORS: tell user more details */
-		message = g_strdup_printf (_("The PDA attached to this computer is low in power (%.1f%%)"), percentage);
+		message = g_strdup_printf (_("The PDA attached to the computer is low in power (%.1f%%)"), percentage);
 
 	} else if (type == DKP_DEVICE_TYPE_PHONE) {
 		/* TRANSLATORS: cell phone (mobile) is getting a little low */
 		title = _("Cell phone battery low");
 
 		/* TRANSLATORS: tell user more details */
-		message = g_strdup_printf (_("The cell phone attached to this computer is low in power (%.1f%%)"), percentage);
+		message = g_strdup_printf (_("The cell phone attached to the computer is low in power (%.1f%%)"), percentage);
 	}
 
 	/* get correct icon */
@@ -1481,15 +1481,15 @@
 
 		} else if (policy == GPM_ACTION_POLICY_SUSPEND) {
 			/* TRANSLATORS: give the user a ultimatum */
-			message = g_strdup_printf (_("Computer will suspend very soon unless it is plugged in."));
+			message = g_strdup_printf (_("The computer will sleep very soon unless it is plugged in."));
 
 		} else if (policy == GPM_ACTION_POLICY_HIBERNATE) {
 			/* TRANSLATORS: give the user a ultimatum */
-			message = g_strdup_printf (_("Computer will hibernate very soon unless it is plugged in."));
+			message = g_strdup_printf (_("The computer will hibernate very soon unless it is plugged in."));
 
 		} else if (policy == GPM_ACTION_POLICY_SHUTDOWN) {
 			/* TRANSLATORS: give the user a ultimatum */
-			message = g_strdup_printf (_("Computer will shutdown very soon unless it is plugged in."));
+			message = g_strdup_printf (_("The computer will switch off very soon unless it is plugged in."));
 		}
 
 		g_free (action);
@@ -1502,7 +1502,7 @@
 
 		/* TRANSLATORS: give the user a ultimatum */
 		message = g_strdup_printf (_("You have approximately <b>%s</b> of remaining UPS power (%.1f%%). "
-					     "Restore AC power to your computer to avoid losing data."),
+					     "Restore AC power to the computer to avoid losing data."),
 					   remaining_text, percentage);
 		g_free (remaining_text);
 	} else if (type == DKP_DEVICE_TYPE_MOUSE) {
@@ -1510,7 +1510,7 @@
 		title = _("Mouse battery low");
 
 		/* TRANSLATORS: the device is just going to stop working */
-		message = g_strdup_printf (_("The wireless mouse attached to this computer is very low in power (%.1f%%). "
+		message = g_strdup_printf (_("The wireless mouse attached to the computer is very low in power (%.1f%%). "
 					     "This device will soon stop functioning if not charged."),
 					   percentage);
 	} else if (type == DKP_DEVICE_TYPE_KEYBOARD) {
@@ -1518,7 +1518,7 @@
 		title = _("Keyboard battery low");
 
 		/* TRANSLATORS: the device is just going to stop working */
-		message = g_strdup_printf (_("The wireless keyboard attached to this computer is very low in power (%.1f%%). "
+		message = g_strdup_printf (_("The wireless keyboard attached to the computer is very low in power (%.1f%%). "
 					     "This device will soon stop functioning if not charged."),
 					   percentage);
 	} else if (type == DKP_DEVICE_TYPE_PDA) {
@@ -1527,7 +1527,7 @@
 		title = _("PDA battery low");
 
 		/* TRANSLATORS: the device is just going to stop working */
-		message = g_strdup_printf (_("The PDA attached to this computer is very low in power (%.1f%%). "
+		message = g_strdup_printf (_("The PDA attached to the computer is very low in power (%.1f%%). "
 					     "This device will soon stop functioning if not charged."),
 					   percentage);
 	} else if (type == DKP_DEVICE_TYPE_PHONE) {
@@ -1588,26 +1588,26 @@
 		/* use different text for different actions */
 		if (policy == GPM_ACTION_POLICY_NOTHING) {
 			/* TRANSLATORS: computer will shutdown without saving data */
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer will <b>power-off</b> when the "
+			message = g_strdup (_("The battery is critically low and "
+					      "the computer will <b>switch off</b> when the "
 					      "battery becomes completely empty."));
 
 		} else if (policy == GPM_ACTION_POLICY_SUSPEND) {
 			/* TRANSLATORS: computer will suspend */
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer is about to suspend.<br>"
-					      "<b>NOTE:</b> A small amount of power is required "
-					      "to keep your computer in a suspended state."));
+			message = g_strdup (_("The battery is critically low, so the "
+                                  "computer is going to sleep now. Connect to AC "
+                                  "power to make sure the battery does not run "
+                                  "out while the computer is asleep."));
 
 		} else if (policy == GPM_ACTION_POLICY_HIBERNATE) {
 			/* TRANSLATORS: computer will hibernate */
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer is about to hibernate."));
+			message = g_strdup (_("The battery is critically low and "
+					      "the computer is about to hibernate."));
 
 		} else if (policy == GPM_ACTION_POLICY_SHUTDOWN) {
 			/* TRANSLATORS: computer will just shutdown */
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer is about to shutdown."));
+			message = g_strdup (_("The battery is critically low and "
+					      "the computer is about to switch off."));
 		}
 
 		g_free (action);
@@ -1626,19 +1626,19 @@
 		/* use different text for different actions */
 		if (policy == GPM_ACTION_POLICY_NOTHING) {
 			/* TRANSLATORS: computer will shutdown without saving data */
-			message = g_strdup (_("The UPS is below the critical level and "
-				              "this computer will <b>power-off</b> when the "
+			message = g_strdup (_("The UPS is critically low and "
+				              "the computer will <b>switch off</b> when the "
 				              "UPS becomes completely empty."));
 
 		} else if (policy == GPM_ACTION_POLICY_HIBERNATE) {
 			/* TRANSLATORS: computer will hibernate */
-			message = g_strdup (_("The UPS is below the critical level and "
-				              "this computer is about to hibernate."));
+			message = g_strdup (_("The UPS is critically low and "
+				              "the computer is about to hibernate."));
 
 		} else if (policy == GPM_ACTION_POLICY_SHUTDOWN) {
 			/* TRANSLATORS: computer will just shutdown */
-			message = g_strdup (_("The UPS is below the critical level and "
-				              "this computer is about to shutdown."));
+			message = g_strdup (_("The UPS is critically low and "
+				              "the computer is about to switch off."));
 		}
 
 		g_free (action);

=== modified file 'src/gpm-prefs-core.c'
--- old/src/gpm-prefs-core.c	2010-02-05 13:28:09 +0000
+++ new/src/gpm-prefs-core.c	2010-03-03 16:48:27 +0000
@@ -360,14 +360,14 @@
 		if (policy == GPM_ACTION_POLICY_SHUTDOWN && !prefs->priv->can_shutdown) {
 			egg_debug ("Cannot add option, as cannot shutdown.");
 		} else if (policy == GPM_ACTION_POLICY_SHUTDOWN && prefs->priv->can_shutdown) {
-			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Shutdown"));
+			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Switch Off"));
 			g_ptr_array_add (array, GINT_TO_POINTER (policy));
 		} else if (policy == GPM_ACTION_POLICY_SUSPEND && !prefs->priv->can_suspend) {
 			egg_debug ("Cannot add option, as cannot suspend.");
 		} else if (policy == GPM_ACTION_POLICY_HIBERNATE && !prefs->priv->can_hibernate) {
 			egg_debug ("Cannot add option, as cannot hibernate.");
 		} else if (policy == GPM_ACTION_POLICY_SUSPEND && prefs->priv->can_suspend) {
-			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Suspend"));
+			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Sleep"));
 			g_ptr_array_add (array, GINT_TO_POINTER (policy));
 		} else if (policy == GPM_ACTION_POLICY_HIBERNATE && prefs->priv->can_hibernate) {
 			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Hibernate"));

