Merge lp:~vish/indicator-session/bug586928 into lp:indicator-session/0.1

[Vish]

Changes "Restart Required..." to "Restart To Complete Update..." to fix Bug #586928

[Cody Russell (bratsche)]

Patch is obviously fine. But before I approve it, was this ever agreed upon or approved by mpt?

[Cody Russell (bratsche)]

Actually, we probably want to use an actual U+2026 ellipsis in this string don't we? Can you try using "\342\200\246" instead of "..." ?

[Cody Russell (bratsche)]

We should probably change this to use U+2026 if we're going to use this patch. But either way, I want to get mpt's feedback before merging.

review: Needs Information

[Vish (vish)]

mpt is subscribed to the bug, but I'll talk to him on monday and ask him to comment on the change..

[Vish (vish)]

> Actually, we probably want to use an actual U+2026 ellipsis in this string
> don't we? Can you try using "\342\200\246" instead of "..." ?

Replace all the other "..." too , with "\342\200\246" or just for this ?

[Cody Russell (bratsche)]

I'm not sure, I didn't look into other places we're using "..." but if mpt agrees that we should use U+2026 then we can open a separate bug to fix it in other places. One way or another we should merge your branch in on Monday, since our benevolent dictator is interested in getting this fixed. ;)

[Cody Russell (bratsche)]

I went ahead and branched off of this branch to make the ellipsis changes, and got that merged into lp:indicator-session this morning.

=== modified file 'src/session-service.c'
--- src/session-service.c	2010-04-06 22:26:41 +0000
+++ src/session-service.c	2010-07-31 13:44:42 +0000
@@ -728,9 +728,9 @@
 
 	if (restart_required) {
 		if (supress_confirmations()) {
-			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required"));
+			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update"));
 		} else {
-			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required..."));
+			dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update..."));
 		}
 		dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel");
 		if (session_dbus != NULL) {