Merge lp:~bratsche/indicator-session/ellipsize into lp:indicator-session/0.1

Proposed by Cody Russell on 2010-08-02
Status: Merged
Merged at revision: 124
Proposed branch: lp:~bratsche/indicator-session/ellipsize
Merge into: lp:indicator-session/0.1
Diff against target: 51 lines (+6/-6)
1 file modified
src/session-service.c (+6/-6)
To merge this branch: bzr merge lp:~bratsche/indicator-session/ellipsize
Reviewer Review Type Date Requested Status
Conor Curran (community) 2010-08-02 Approve on 2010-08-02
Review via email: mp+31540@code.launchpad.net
To post a comment you must log in.
Conor Curran (cjcurran) :
review: Approve

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-08-02 13:53:45 +0000
4@@ -629,7 +629,7 @@
5 if (supress_confirmations()) {
6 dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
7 } else {
8- dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));
9+ dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out\342\200\246"));
10 }
11 dbusmenu_menuitem_property_set_bool(logout_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_logout());
12 dbusmenu_menuitem_child_append(root, logout_mi);
13@@ -654,7 +654,7 @@
14 if (supress_confirmations()) {
15 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
16 } else {
17- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
18+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
19 }
20 dbusmenu_menuitem_property_set_bool(restart_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_restart());
21 dbusmenu_menuitem_child_append(root, restart_mi);
22@@ -664,7 +664,7 @@
23 if (supress_confirmations()) {
24 dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
25 } else {
26- dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
27+ dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down\342\200\246"));
28 }
29 dbusmenu_menuitem_property_set_bool(shutdown_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_shutdown());
30 dbusmenu_menuitem_child_append(root, shutdown_mi);
31@@ -728,9 +728,9 @@
32
33 if (restart_required) {
34 if (supress_confirmations()) {
35- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required"));
36+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update"));
37 } else {
38- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required..."));
39+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update\342\200\246"));
40 }
41 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel");
42 if (session_dbus != NULL) {
43@@ -740,7 +740,7 @@
44 if (supress_confirmations()) {
45 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
46 } else {
47- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
48+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
49 }
50 dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON);
51 if (session_dbus != NULL) {

Subscribers

People subscribed via source and target branches