Session Menu

Merge lp:~ted/indicator-session/the-great-switch-off into lp:indicator-session/0.1

  1. the-great-switch-off
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/indicator-session/the-great-switch-off
Merge into: lp:indicator-session/0.1
Diff against target: 86 lines (+10/-10)
4 files modified
src/gtk-dialog/gconf-helper.c (+2/-2)
src/gtk-dialog/gtk-logout-helper.c (+1/-1)
src/gtk-dialog/logout-dialog.c (+4/-4)
src/session-service.c (+3/-3)
To merge this branch: bzr merge lp:~ted/indicator-session/the-great-switch-off
Reviewer Review Type Date Requested Status
David Barth Approve
Review via email: mp+20582@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Switching everything to "Switch Off" and "Sleep"

Revision history for this message
David Barth (dbarth) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gtk-dialog/gconf-helper.c'
2--- src/gtk-dialog/gconf-helper.c 2009-09-10 22:05:42 +0000
3+++ src/gtk-dialog/gconf-helper.c 2010-03-03 18:20:29 +0000
4@@ -51,11 +51,11 @@
5 if (gconf_value_get_bool (value)) {
6 dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
7 dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
8- dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown"));
9+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off"));
10 } else {
11 dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));
12 dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart..."));
13- dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown..."));
14+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off..."));
15 }
16 }
17 }
18
19=== modified file 'src/gtk-dialog/gtk-logout-helper.c'
20--- src/gtk-dialog/gtk-logout-helper.c 2010-02-25 22:42:30 +0000
21+++ src/gtk-dialog/gtk-logout-helper.c 2010-03-03 18:20:29 +0000
22@@ -159,7 +159,7 @@
23
24 static GOptionEntry options[] = {
25 {"logout", 'l', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_logout, "Log out of the current session", NULL},
26- {"shutdown", 's', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_shutdown, "Shutdown the entire system", NULL},
27+ {"shutdown", 's', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_shutdown, "Switch off the entire system", NULL},
28 {"restart", 'r', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_restart, "Restart the system", NULL},
29
30 {NULL}
31
32=== modified file 'src/gtk-dialog/logout-dialog.c'
33--- src/gtk-dialog/logout-dialog.c 2010-02-25 16:26:23 +0000
34+++ src/gtk-dialog/logout-dialog.c 2010-03-03 18:20:29 +0000
35@@ -62,13 +62,13 @@
36 static const gchar * title_strings[LOGOUT_DIALOG_ACTION_CNT] = {
37 /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"),
38 /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"),
39- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Shut Down")
40+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off")
41 };
42
43 static const gchar * button_strings[LOGOUT_DIALOG_ACTION_CNT] = {
44 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"),
45 /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"),
46- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Shut Down")
47+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off")
48 };
49
50 static const gchar * restart_auth = N_("Restart...");
51@@ -126,8 +126,8 @@
52 dialog->timeout);
53 break;
54 case LOGOUT_DIALOG_SHUTDOWN:
55- plural_string = ngettext("The computer will be shut down in %d second.",
56- "The computer will be shut down in %d seconds.",
57+ plural_string = ngettext("The computer will switch off in %d second.",
58+ "The computer will switch off in %d seconds.",
59 dialog->timeout);
60 break;
61 default:
62
63=== modified file 'src/session-service.c'
64--- src/session-service.c 2010-02-23 22:55:45 +0000
65+++ src/session-service.c 2010-03-03 18:20:29 +0000
66@@ -521,7 +521,7 @@
67
68 suspend_mi = dbusmenu_menuitem_new();
69 dbusmenu_menuitem_property_set_bool(suspend_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
70- dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Suspend"));
71+ dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sleep"));
72 dbusmenu_menuitem_child_append(root, suspend_mi);
73 g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Suspend");
74
75@@ -542,9 +542,9 @@
76
77 shutdown_mi = dbusmenu_menuitem_new();
78 if (supress_confirmations()) {
79- dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
80+ dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off"));
81 } else {
82- dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
83+ dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off..."));
84 }
85 dbusmenu_menuitem_child_append(root, shutdown_mi);
86 g_signal_connect(G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");

Subscribers

People subscribed via source and target branches