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

Proposed by Vish on 2010-07-31
Status: Merged
Merged at revision: 123
Proposed branch: lp:~vish/indicator-session/bug586928
Merge into: lp:indicator-session/0.1
Diff against target: 15 lines (+2/-2)
1 file modified
src/session-service.c (+2/-2)
To merge this branch: bzr merge lp:~vish/indicator-session/bug586928
Reviewer Review Type Date Requested Status
Cody Russell (community) 2010-07-31 Needs Information on 2010-07-31
Review via email: mp+31456@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Cody Russell (bratsche) wrote :

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

Cody Russell (bratsche) wrote :

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) wrote :

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) wrote :

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

Vish (vish) wrote :

> 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) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/session-service.c'
2--- src/session-service.c 2010-04-06 22:26:41 +0000
3+++ src/session-service.c 2010-07-31 13:44:42 +0000
4@@ -728,9 +728,9 @@
5
6 if (restart_required) {
7 if (supress_confirmations()) {
8- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required"));
9+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update"));
10 } else {
11- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required..."));
12+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update..."));
13 }
14 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel");
15 if (session_dbus != NULL) {

Subscribers

People subscribed via source and target branches