diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-08-18 16:21:02 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-08-18 16:21:02 +0100 |
| commit | 26289e5bcd2603e81738e88819cfa674e4560c3f (patch) | |
| tree | 765f9b58146349ba26a5a4897a651c9e722eb9bf | |
| parent | 92765fe97bdeb68f7f38cf57e478529db95cc09e (diff) | |
| parent | 5f2c8d9947d60271fd13dc1adbe6f001eae9b6d2 (diff) | |
| download | ayatana-indicator-session-26289e5bcd2603e81738e88819cfa674e4560c3f.tar.gz ayatana-indicator-session-26289e5bcd2603e81738e88819cfa674e4560c3f.tar.bz2 ayatana-indicator-session-26289e5bcd2603e81738e88819cfa674e4560c3f.zip | |
merged the ellipsis strings fixes
| -rw-r--r-- | src/device-menu-mgr.c | 9 | ||||
| -rw-r--r-- | src/gconf-helper.c | 6 | ||||
| -rw-r--r-- | src/user-menu-mgr.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 3223cf5..cbddaa3 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -523,7 +523,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) system_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (system_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("System Settings...")); + _("System Settings…")); g_signal_connect (G_OBJECT(system_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_system_settings_with_context), ""); @@ -534,7 +534,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) display_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (display_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("Displays...")); + _("Displays…")); g_signal_connect (G_OBJECT(display_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_system_settings_with_context), "display"); @@ -544,7 +544,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) bluetooth_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (bluetooth_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("Bluetooth...")); + _("Bluetooth…")); g_signal_connect (G_OBJECT(bluetooth_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_system_settings_with_context), "bluetooth"); @@ -555,7 +555,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) login_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (login_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("Startup Applications...")); + _("Startup Applications…")); g_signal_connect (G_OBJECT(login_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_session_properties), @@ -834,7 +834,6 @@ device_menu_mgr_ensure_gconf_client (DeviceMenuMgr* self) { if (!gconf_client) { gconf_client = gconf_client_get_default (); - gconf_client_add_dir(gconf_client, LOCKDOWN_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); gconf_client_notify_add (gconf_client, LOCKDOWN_DIR, diff --git a/src/gconf-helper.c b/src/gconf-helper.c index 4911dcb..93ae96f 100644 --- a/src/gconf-helper.c +++ b/src/gconf-helper.c @@ -82,9 +82,9 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down")); } else { - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out...")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart...")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down...")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out…")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart…")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down…")); } } } diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c index 72b5802..44c1960 100644 --- a/src/user-menu-mgr.c +++ b/src/user-menu-mgr.c @@ -266,7 +266,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode) DBUSMENU_CLIENT_TYPES_DEFAULT); dbusmenu_menuitem_property_set (online_accounts_item, DBUSMENU_MENUITEM_PROP_LABEL, - _("Online Accounts...")); + _("Online Accounts…")); g_signal_connect (G_OBJECT (online_accounts_item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, |