Index: src/gpm-power.c
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/src/gpm-power.c,v
retrieving revision 1.65
diff -u -u -r1.65 gpm-power.c
--- src/gpm-power.c	7 Aug 2006 17:35:36 -0000	1.65
+++ src/gpm-power.c	8 Aug 2006 21:47:01 -0000
@@ -1224,39 +1224,38 @@
 	/* We always display "Laptop Battery 16 minutes remaining" as we need
 	   to clarify what device we are refering to. For details see :
 	   http://bugzilla.gnome.org/show_bug.cgi?id=329027 */
-	g_string_append_printf (summary, "%s ", type_desc);
 
 	if (gpm_power_battery_is_charged (status)) {
 
-			g_string_append (summary, _("fully charged"));
+			g_string_append_printf (summary, _("%s fully charged (%i%%)\n"),
+						type_desc, status->percentage_charge);
 
 	} else if (status->is_discharging) {
 
 		if (status->remaining_time > 60) {
-			g_string_append_printf (summary, _("%s remaining"),
-						timestring);
+			g_string_append_printf (summary, _("%s %s remaining (%i%%)\n"),
+						type_desc, timestring, status->percentage_charge);
 		} else {
 			/* don't display "Unknown remaining" */
-			g_string_append (summary, _("discharging"));
+			g_string_append_printf (summary, _("%s discharging (%i%%)\n"),
+						type_desc, status->percentage_charge);
 		}
 
 	} else if (status->is_charging || power->priv->on_ac) {
 
 		if (status->remaining_time > 60) {
-			g_string_append_printf (summary, _("%s until charged"),
-						timestring);
+			g_string_append_printf (summary, _("%s %s until charged (%i%%)\n"),
+						type_desc, timestring, status->percentage_charge);
 		} else {
 			/* don't display "Unknown remaining" */
-			g_string_append (summary, _("charging"));
+			g_string_append_printf (summary, _("%s charging (%i%%)\n"),
+						type_desc, status->percentage_charge);
 		}
 
 	} else {
 		gpm_warning ("in an undefined state we are not charging or "
 			     "discharging and the batteries are also not charged");
 	}
-
-	/* append percentage to all devices */
-	g_string_append_printf (summary, " (%i%%)\n", status->percentage_charge);
 
 	g_free (timestring);
 }
