aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Roche <didier.roche@canonical.com>2012-09-13 12:48:31 +0200
committerDidier Roche <didier.roche@canonical.com>2012-09-13 12:48:31 +0200
commit3cffe25c61eba78d8cac5bde796b8193116a3f7e (patch)
treea275e1c067ef469f3a79e8f72c9a4f946ff036c9
parent4a3bccd4693e6244e7bc585e086a6556bdd24936 (diff)
parent52597f6fd10bc5a6674218a2ab620a3f64584a01 (diff)
downloadayatana-indicator-session-3cffe25c61eba78d8cac5bde796b8193116a3f7e.tar.gz
ayatana-indicator-session-3cffe25c61eba78d8cac5bde796b8193116a3f7e.tar.bz2
ayatana-indicator-session-3cffe25c61eba78d8cac5bde796b8193116a3f7e.zip
* Cherry-pick upstream:
- Make "Suspend" translatable
-rw-r--r--debian/changelog7
-rw-r--r--src/session-menu-mgr.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c35b54f..1e354f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-session (12.10.2-0ubuntu3) UNRELEASED; urgency=low
+
+ * Cherry-pick upstream:
+ - Make "Suspend" translatable
+
+ -- Didier Roche <didrocks@ubuntu.com> Thu, 13 Sep 2012 12:48:00 +0200
+
indicator-session (12.10.2-0ubuntu2) quantal; urgency=low
* Change the menu to say 'Shut Down' instead of 'Switch Off' by default,
diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c
index 643abd1..cfb907b 100644
--- a/src/session-menu-mgr.c
+++ b/src/session-menu-mgr.c
@@ -506,7 +506,7 @@ build_session_menuitems (SessionMenuMgr* mgr)
g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK(action_func_spawn_async), CMD_LOGOUT);
- mi = mgr->suspend_mi = mi_new ("Suspend");
+ mi = mgr->suspend_mi = mi_new (_("Suspend"));
dbusmenu_menuitem_child_append (mgr->top_mi, mi);
g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK(action_func_suspend), mgr);