ayatana-commits team mailing list archive

[Conor Curran <conor.curran@xxxxxxxxxxxxx>]

Conor Curran has proposed merging lp:~cjcurran/indicator-session/ellipsis-fixes into lp:indicator-session.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~cjcurran/indicator-session/ellipsis-fixes/+merge/72056

Fixes all ellipsis
-- 
https://code.launchpad.net/~cjcurran/indicator-session/ellipsis-fixes/+merge/72056
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/device-menu-mgr.c'
--- src/device-menu-mgr.c	2011-08-10 17:08:46 +0000
+++ src/device-menu-mgr.c	2011-08-18 15:23:25 +0000
@@ -523,7 +523,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
 {
 	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,

=== modified file 'src/gconf-helper.c'
--- src/gconf-helper.c	2010-04-06 22:25:05 +0000
+++ src/gconf-helper.c	2011-08-18 15:23:25 +0000
@@ -82,9 +82,9 @@
 			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…"));
 		}
 	}
 }

=== modified file 'src/user-menu-mgr.c'
--- src/user-menu-mgr.c	2011-08-18 11:45:50 +0000
+++ src/user-menu-mgr.c	2011-08-18 15:23:25 +0000
@@ -266,7 +266,7 @@
                                   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,