Index: gpm-notify.c
===================================================================
--- gpm-notify.c	(revision 3399)
+++ gpm-notify.c	(working copy)
@@ -325,8 +325,8 @@
 	}
 
 	title = _("Battery may be broken");
-	msg = g_strdup_printf (_("Your battery has a very low capacity (%i%%), "
-				 "which means that it may be old or broken."),
+	msg = g_strdup_printf (_("Battery has very low capacity (%i%%), "
+				 "it may be old or broken."),
 			       capacity);
 
 	gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_LONG,
@@ -394,7 +394,7 @@
 	const gchar *title;
 
 	title = _("Battery Charged");
-	msg = _("Your laptop battery is now fully charged");
+	msg = _("Charging complete.");
 
 	gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_SHORT,
 			   GTK_STOCK_DIALOG_WARNING,
@@ -421,8 +421,8 @@
 	const gchar *msg;
 	const gchar *title;
 
-	title = _("Battery Discharging");
-	msg = _("The AC power has been unplugged. The system is now using battery power.");
+	title = _("Power unplugged");
+	msg = _("Running on battery.");
 
 	gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_SHORT,
 			   GTK_STOCK_DIALOG_WARNING,
@@ -449,8 +449,8 @@
 	const gchar *msg;
 	const gchar *title;
 
-	title = _("UPS Discharging");
-	msg = _("The AC power has been unplugged. The system is now using backup power.");
+	title = _("UPS Unplugged");
+	msg = _("Running on backup power.");
 
 	gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_SHORT,
 			   GTK_STOCK_DIALOG_WARNING,
Index: gpm-devicekit.c
===================================================================
--- gpm-devicekit.c	(revision 3399)
+++ gpm-devicekit.c	(working copy)
@@ -166,13 +166,13 @@
 	if (obj->type == DKP_DEVICE_TYPE_MOUSE ||
 	    obj->type == DKP_DEVICE_TYPE_KEYBOARD ||
 	    obj->type == DKP_DEVICE_TYPE_PDA)
-		return g_strdup_printf ("%s (%.1f%%)", type_desc, obj->percentage);
+		return g_strdup_printf ("%s (%f%%)", type_desc, obj->percentage);
 
 	/* we care if we are on AC */
 	if (obj->type == DKP_DEVICE_TYPE_PHONE) {
 		if (obj->state == DKP_DEVICE_STATE_CHARGING || !obj->state == DKP_DEVICE_STATE_DISCHARGING)
-			return g_strdup_printf ("%s charging (%.1f%%)", type_desc, obj->percentage);
-		return g_strdup_printf ("%s (%.1f%%)", type_desc, obj->percentage);
+			return g_strdup_printf ("%s charging (%f%%)", type_desc, obj->percentage);
+		return g_strdup_printf ("%s (%f%%)", type_desc, obj->percentage);
 	}
 
 	/* precalculate so we don't get Unknown time remaining */
@@ -184,11 +184,11 @@
 
 		if (obj->type == DKP_DEVICE_TYPE_BATTERY && time_to_empty_round > GPM_DKP_TEXT_MIN_TIME) {
 			time_to_empty_str = gpm_get_timestring (time_to_empty_round);
-			description = g_strdup_printf (_("%s fully charged (%.1f%%)\nProvides %s battery runtime"),
+			description = g_strdup_printf (_("%s charged (%f%%)\nPower for %s"),
 							type_desc, obj->percentage, time_to_empty_str);
 			g_free (time_to_empty_str);
 		} else {
-			description = g_strdup_printf (_("%s fully charged (%.1f%%)"),
+			description = g_strdup_printf (_("%s (%f%%)"),
 							type_desc, obj->percentage);
 		}
 
@@ -196,12 +196,12 @@
 
 		if (time_to_empty_round > GPM_DKP_TEXT_MIN_TIME) {
 			time_to_empty_str = gpm_get_timestring (time_to_empty_round);
-			description = g_strdup_printf (_("%s %s remaining (%.1f%%)"),
+			description = g_strdup_printf (_("%s %s (%f%%)"),
 							type_desc, time_to_empty_str, obj->percentage);
 			g_free (time_to_empty_str);
 		} else {
 			/* don't display "Unknown remaining" */
-			description = g_strdup_printf (_("%s discharging (%.1f%%)"),
+			description = g_strdup_printf (_("%s (%f%%)"),
 							type_desc, obj->percentage);
 		}
 
@@ -213,7 +213,7 @@
 			/* display both discharge and charge time */
 			time_to_full_str = gpm_get_timestring (time_to_full_round);
 			time_to_empty_str = gpm_get_timestring (time_to_empty_round);
-			description = g_strdup_printf (_("%s %s until charged (%.1f%%)\nProvides %s battery runtime"),
+			description = g_strdup_printf (_("%s %s until charged (%f%%)\nPower for %s"),
 							type_desc, time_to_full_str, obj->percentage, time_to_empty_str);
 			g_free (time_to_full_str);
 			g_free (time_to_empty_str);
@@ -222,20 +222,20 @@
 
 			/* display only charge time */
 			time_to_full_str = gpm_get_timestring (time_to_full_round);
-			description = g_strdup_printf (_("%s %s until charged (%.1f%%)"),
+			description = g_strdup_printf (_("%s %s until charged (%f%%)"),
 						type_desc, time_to_full_str, obj->percentage);
 			g_free (time_to_full_str);
 		} else {
 
 			/* don't display "Unknown remaining" */
-			description = g_strdup_printf (_("%s charging (%.1f%%)"),
+			description = g_strdup_printf (_("%s charging (%f%%)"),
 						type_desc, obj->percentage);
 		}
 
 	} else {
 		egg_warning ("in an undefined state we are not charging or "
 			     "discharging and the batteries are also not charged");
-		description = g_strdup_printf ("%s (%.1f%%)", type_desc, obj->percentage);
+		description = g_strdup_printf ("%s (%f%%)", type_desc, obj->percentage);
 	}
 	return description;
 }
@@ -264,7 +264,7 @@
 	else if (obj->state == DKP_DEVICE_STATE_DISCHARGING)
 		g_string_append_printf (details, _("<b>Status:</b> %s\n"), _("Discharging"));
 	if (obj->percentage >= 0)
-		g_string_append_printf (details, _("<b>Percentage charge:</b> %.1f%%\n"), obj->percentage);
+		g_string_append_printf (details, _("<b>Percentage charge:</b> %f%%\n"), obj->percentage);
 	if (obj->vendor)
 		g_string_append_printf (details, _("<b>Vendor:</b> %s\n"), obj->vendor);
 	if (obj->technology != DKP_DEVICE_TECHNOLGY_UNKNOWN) {
@@ -297,24 +297,24 @@
 		} else {
 			condition = _("Poor");
 		}
-		/* Translators: %.1f is a percentage and %s the condition (Excellent, Good, ...) */
-		g_string_append_printf (details, _("<b>Capacity:</b> %.1f%% (%s)\n"),
+		/* Translators: %f is a percentage and %s the condition (Excellent, Good, ...) */
+		g_string_append_printf (details, _("<b>Capacity:</b> %f%% (%s)\n"),
 					obj->capacity, condition);
 	}
 	if (obj->type == DKP_DEVICE_TYPE_BATTERY) {
 		if (obj->energy > 0)
-			g_string_append_printf (details, _("<b>Current charge:</b> %.1f Wh\n"),
+			g_string_append_printf (details, _("<b>Current charge:</b> %f Wh\n"),
 						obj->energy);
 		if (obj->energy_full > 0 &&
 		    obj->energy_full_design != obj->energy_full)
-			g_string_append_printf (details, _("<b>Last full charge:</b> %.1f Wh\n"),
+			g_string_append_printf (details, _("<b>Last full charge:</b> %f Wh\n"),
 						obj->energy_full);
 		if (obj->energy_full_design > 0)
 			/* Translators: Design charge is the amount of charge the battery is designed to have when brand new */
-			g_string_append_printf (details, _("<b>Design charge:</b> %.1f Wh\n"),
+			g_string_append_printf (details, _("<b>Design charge:</b> %f Wh\n"),
 						obj->energy_full_design);
 		if (obj->energy_rate > 0)
-			g_string_append_printf (details, _("<b>Charge rate:</b> %.1f W\n"),
+			g_string_append_printf (details, _("<b>Charge rate:</b> %f W\n"),
 						obj->energy_rate);
 	}
 	if (obj->type == DKP_DEVICE_TYPE_MOUSE ||
Index: gpm-manager.c
===================================================================
--- gpm-manager.c	(revision 3399)
+++ gpm-manager.c	(working copy)
@@ -509,7 +509,8 @@
 	/* check if the admin has disabled */
 	allowed = gconf_client_get_bool (manager->priv->conf, GPM_CONF_CAN_SUSPEND, NULL);
 	if (allowed == FALSE) {
-		g_set_error (error, GPM_MANAGER_ERROR, GPM_MANAGER_ERROR_DENIED, "Suspend denied by gconf policy");
+		g_set_error (error, GPM_MANAGER_ERROR, GPM_MANAGER_ERROR_DENIED,
+			"Suspend denied by gconf policy");
 		return FALSE;
 	}
 
@@ -773,7 +774,7 @@
 	if (on_ac) {
 		egg_debug ("Performing AC policy");
 		manager_policy_do (manager, GPM_CONF_BUTTON_LID_AC,
-				   _("The lid has been closed on ac power."));
+				   _("The lid has been closed on AC power."));
 		return;
 	}
 
@@ -1002,7 +1003,7 @@
 static gboolean
 manager_critical_action_do (GpmManager *manager)
 {
-	manager_policy_do (manager, GPM_CONF_ACTIONS_CRITICAL_BATT, _("Battery is critically low."));
+	manager_policy_do (manager, GPM_CONF_ACTIONS_CRITICAL_BATT, _("Battery critically low."));
 	return FALSE;
 }
 
@@ -1253,30 +1254,30 @@
 	gchar *icon;
 
 	if (obj->type == DKP_DEVICE_TYPE_BATTERY) {
-		title = _("Laptop battery low");
+		title = _("Laptop battery");
 		remaining_text = gpm_get_timestring (obj->time_to_empty);
-		message = g_strdup_printf (_("You have approximately <b>%s</b> of remaining battery life (%.1f%%)"),
+		message = g_strdup_printf (_("<b>%s</b> battery remaining (%f%%)"),
 					   remaining_text, obj->percentage);
 	} else if (obj->type == DKP_DEVICE_TYPE_UPS) {
-		title = _("UPS low");
+		title = _("UPS");
 		remaining_text = gpm_get_timestring (obj->time_to_empty);
-		message = g_strdup_printf (_("You have approximately <b>%s</b> of remaining UPS backup power (%.1f%%)"),
+		message = g_strdup_printf (_("<b>%s</b> UPS backup power remaining (%f%%)"),
 					   remaining_text, obj->percentage);
 	} else if (obj->type == DKP_DEVICE_TYPE_MOUSE) {
-		title = _("Mouse battery low");
-		message = g_strdup_printf (_("The wireless mouse attached to this computer is low in power (%.1f%%)"), obj->percentage);
+		title = _("Mouse battery");
+		message = g_strdup_printf (_("Wireless mouse power low (%f%%)"), obj->percentage);
 
 	} else if (obj->type == DKP_DEVICE_TYPE_KEYBOARD) {
-		title = _("Keyboard battery low");
-		message = g_strdup_printf (_("The wireless keyboard attached to this computer is low in power (%.1f%%)"), obj->percentage);
+		title = _("Keyboard battery");
+		message = g_strdup_printf (_("Wireless keyboard power low (%f%%)"), obj->percentage);
 
 	} else if (obj->type == DKP_DEVICE_TYPE_PDA) {
-		title = _("PDA battery low");
-		message = g_strdup_printf (_("The PDA attached to this computer is low in power (%.1f%%)"), obj->percentage);
+		title = _("PDA battery");
+		message = g_strdup_printf (_("PDA power low (%f%%)"), obj->percentage);
 
 	} else if (obj->type == DKP_DEVICE_TYPE_PHONE) {
-		title = _("Cell phone battery low");
-		message = g_strdup_printf (_("The cell phone attached to this computer is low in power (%.1f%%)"), obj->percentage);
+		title = _("Cell phone battery");
+		message = g_strdup_printf (_("Cell phone power low (%f%%)"), obj->percentage);
 	}
 
 	/* get correct icon */
@@ -1325,15 +1326,15 @@
 
 		/* use different text for different actions */
 		if (strcmp (action, ACTION_NOTHING) == 0)
-			action_text = g_strdup (_("Plug in your AC adapter to avoid losing data."));
+			action_text = g_strdup (_("Plug in power adapter to avoid losing work."));
 		else if (strcmp (action, ACTION_SUSPEND) == 0)
-			action_text = g_strdup_printf (_("This computer will suspend in %s if the AC is not connected."), time_text);
+			action_text = g_strdup_printf (_("Suspend in %s if power not connected."), time_text);
 		else if (strcmp (action, ACTION_HIBERNATE) == 0)
-			action_text = g_strdup_printf (_("This computer will hibernate in %s if the AC is not connected."), time_text);
+			action_text = g_strdup_printf (_("Hibernate in %s if power not connected."), time_text);
 		else if (strcmp (action, ACTION_SHUTDOWN) == 0)
-			action_text = g_strdup_printf (_("This computer will shutdown in %s if the AC is not connected."), time_text);
+			action_text = g_strdup_printf (_("Shutdown in %s if power not connected."), time_text);
 
-		message = g_strdup_printf (_("You have approximately <b>%s</b> of remaining battery life (%.1f%%). %s"),
+		message = g_strdup_printf (_("<b>%s</b> remaining battery (%f%%). %s"),
 					   remaining_text, obj->percentage, action_text);
 
 		g_free (action);
@@ -1343,29 +1344,29 @@
 	} else if (obj->type == DKP_DEVICE_TYPE_UPS) {
 		title = _("UPS critically low");
 		remaining_text = gpm_get_timestring (obj->time_to_empty);
-		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."),
+		message = g_strdup_printf (_("<b>%s</b> of remaining UPS power (%f%%). "
+					     "Restore power to avoid losing your work."),
 					   remaining_text, obj->percentage);
 		g_free (remaining_text);
 	} else if (obj->type == DKP_DEVICE_TYPE_MOUSE) {
 		title = _("Mouse battery low");
-		message = g_strdup_printf (_("The wireless mouse attached to this computer is very low in power (%.1f%%). "
-					     "This device will soon stop functioning if not charged."),
+		message = g_strdup_printf (_("Wireless mouse power very low (%f%%). "
+					     "Mouse will stop working if not charged."),
 					   obj->percentage);
 	} else if (obj->type == DKP_DEVICE_TYPE_KEYBOARD) {
 		title = _("Keyboard battery low");
-		message = g_strdup_printf (_("The wireless keyboard attached to this computer is very low in power (%.1f%%). "
-					     "This device will soon stop functioning if not charged."),
+		message = g_strdup_printf (_("Wireless keyboard power very low (%f%%). "
+					     "Keyboard will stop working if not charged."),
 					   obj->percentage);
 	} else if (obj->type == DKP_DEVICE_TYPE_PDA) {
 		title = _("PDA battery low");
-		message = g_strdup_printf (_("The PDA attached to this computer is very low in power (%.1f%%). "
-					     "This device will soon stop functioning if not charged."),
+		message = g_strdup_printf (_("PDA power very low (%f%%). "
+					     "PDA will stop working if not charged."),
 					   obj->percentage);
 	} else if (obj->type == DKP_DEVICE_TYPE_PHONE) {
 		title = _("Cell phone battery low");
-		message = g_strdup_printf (_("Your cell phone is very low in power (%.1f%%). "
-					     "This device will soon stop functioning if not charged."),
+		message = g_strdup_printf (_("Cell phone power very low (%.1f%%). "
+					     "Cell phone will stop working if not charged."),
 					   obj->percentage);
 	}
 
@@ -1396,23 +1397,23 @@
 
 		/* use different text for different actions */
 		if (strcmp (action, ACTION_NOTHING) == 0) {
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer will <b>power-off</b> when the "
-					      "battery becomes completely empty."));
+			message = g_strdup (_("Battery below critical level. "
+					      "Will <b>power-off</b> when the "
+					      "battery is empty."));
 
 		} else if (strcmp (action, ACTION_SUSPEND) == 0) {
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer is about to suspend.<br>"
+			message = g_strdup (_("Battery below critical level. "
+					      "Will now suspend.<br>"
 					      "<b>NOTE:</b> A small amount of power is required "
 					      "to keep your computer in a suspended state."));
 
 		} else if (strcmp (action, ACTION_HIBERNATE) == 0) {
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer is about to hibernate."));
+			message = g_strdup (_("Battery below critical level. "
+					      "Will now hibernate."));
 
 		} else if (strcmp (action, ACTION_SHUTDOWN) == 0) {
-			message = g_strdup (_("The battery is below the critical level and "
-					      "this computer is about to shutdown."));
+			message = g_strdup (_("Battery below critical level. "
+					      "Will now shutdown."));
 		}
 
 		g_free (action);
@@ -1428,17 +1429,17 @@
 
 		/* use different text for different actions */
 		if (strcmp (action, ACTION_NOTHING) == 0) {
-			message = g_strdup (_("The UPS is below the critical level and "
-				              "this computer will <b>power-off</b> when the "
-				              "UPS becomes completely empty."));
+			message = g_strdup (_("UPS below critical level. "
+				              "Will <b>power-off</b> when the "
+				              "UPS is empty."));
 
 		} else if (strcmp (action, ACTION_HIBERNATE) == 0) {
-			message = g_strdup (_("The UPS is below the critical level and "
-				              "this computer is about to hibernate."));
+			message = g_strdup (_("UPS below critical level. "
+				              "Will now hibernate."));
 
 		} else if (strcmp (action, ACTION_SHUTDOWN) == 0) {
-			message = g_strdup (_("The UPS is below the critical level and "
-				              "this computer is about to shutdown."));
+			message = g_strdup (_("UPS below critical level."
+				              "Will now shutdown."));
 		}
 
 		g_free (action);
