Merge lp:~alexlauni/ubuntu/lucid/gnome-power-manager/gpm-fix-530751 into lp:ubuntu/lucid/gnome-power-manager

[Alex Launi]

Updates the g-p-m notification for unplugging an AC power adapter to conform to the text specified in https://wiki.ubuntu.com/NotifyOSD#gnome-power-manager

[James Westby (james-w)]

review: Abstain

[Andrea Corbellini (andrea.corbellini)]

Hello. Here:

- message = g_strdup_printf (_("%s discharging (%.1f%%)"),
+ message = g_strdup_printf (_("%.1f%% of %s remaining"),

You have inverted the order of the two parameters (%s and %.1f), but forgot to invert the arguments of the function call (type_desc and percentage).

[Michael Terry (mterry)]

In addition, the recommended wording from https://wiki.ubuntu.com/NotifyOSD is "Running on battery" not "AC power disconnected".

The same change should be made to the UPS notifications right below that block of code too.

review: Needs Fixing (ubuntu-sponsor)

[James Westby (james-w)]

Hi,

I'm assuming that we don't want to fix this is the released lucid now.
If it's still relevant then please re-propose, or propose for precise as
appropriate.

Thanks,

James

Unmerged revisions

165. By Alex Launi on 2010-03-08

* debian/patches/19_ac_power_notify_osd_spec.patch
  - Update AC unplugged notification to conform to notify OSD
    specification. (LP: #530751).

164. By Alex Launi on 2010-03-08

Update AC unplugged notification to conform to Notify OSD g-p-m specification

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-05 18:44:26 +0000
+++ debian/changelog	2010-03-08 18:46:22 +0000
@@ -1,3 +1,11 @@
+gnome-power-manager (2.29.91-0ubuntu6) lucid; urgency=low
+
+  * debian/patches/19_ac_power_notify_osd_spec.patch
+    - Update AC unplugged notification to conform to notify OSD
+      specification. (LP: #530751).
+
+ -- Alex Launi <[e-mail]>  Mon, 08 Mar 2010 13:24:58 -0500
+
 gnome-power-manager (2.29.91-0ubuntu5) lucid; urgency=low
 
   * debian/patches/18-fix-idletime-reset-race.patch:

=== added file 'debian/patches/19_ac_power_notify_osd_spec.patch'
--- debian/patches/19_ac_power_notify_osd_spec.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/19_ac_power_notify_osd_spec.patch	2010-03-08 18:46:22 +0000
@@ -0,0 +1,21 @@
+Index: gnome-power-manager/src/gpm-manager.c
+===================================================================
+--- gnome-power-manager.orig/src/gpm-manager.c	2010-03-08 13:02:41.506956447 -0500
++++ gnome-power-manager/src/gpm-manager.c	2010-03-08 13:03:58.000000000 -0500
+@@ -1270,14 +1270,14 @@
+ 
+ 	if (type == DKP_DEVICE_TYPE_BATTERY) {
+ 		/* TRANSLATORS: laptop battery is now discharging */
+-		title = _("Battery Discharging");
++		title = _("AC power disconnected");
+ 
+ 		if (remaining_text != NULL) {
+ 			/* TRANSLATORS: tell the user how much time they have got */
+ 			message = g_strdup_printf (_("%s of battery power remaining (%.1f%%)"), remaining_text, percentage);
+ 		} else {
+ 			/* TRANSLATORS: the device is discharging, but we only have a percentage */
+-			message = g_strdup_printf (_("%s discharging (%.1f%%)"),
++			message = g_strdup_printf (_("%.1f%% of %s remaining"),
+ 						   type_desc, percentage);
+ 		}
+ 	} else if (type == DKP_DEVICE_TYPE_UPS) {

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-05 18:44:26 +0000
+++ debian/patches/series	2010-03-08 18:46:22 +0000
@@ -1,3 +1,4 @@
+19_ac_power_notify_osd_spec.patch
 02-notify-osd-support.patch
 06-bugreport-debian.patch
 08-desktop-bugreport-path.patch