/jds/bin/diff -uprN gnome-panel-2.26.3.old/gnome-panel/panel-menu-items.c gnome-panel-2.26.3/gnome-panel/panel-menu-items.c

--- gnome-panel-2.26.3.old/gnome-panel/panel-menu-items.c 2009-07-01 20:43:32.816700000 +0100

+++ gnome-panel-2.26.3/gnome-panel/panel-menu-items.c 2009-07-01 20:45:37.780403000 +0100

@@ -604,7 +604,8 @@ panel_menu_item_append_drive (GtkWidget

title);

g_object_unref (icon);

- tooltip = g_strdup_printf (_("Rescan %s"), title);

+ /* SUN_BRANDING tooltip */

+ tooltip = g_strdup_printf (_("Open %s"), title);

panel_util_set_tooltip_text (item, tooltip);

g_free (tooltip);

@@ -704,7 +705,8 @@ panel_menu_item_append_volume (GtkWidget

title);

g_object_unref (icon);

- tooltip = g_strdup_printf (_("Mount %s"), title);

+ /* SUN_BRANDING tooltip */

+ tooltip = g_strdup_printf (_("Open %s"), title);

panel_util_set_tooltip_text (item, tooltip);

g_free (tooltip);

@@ -729,6 +731,7 @@ panel_menu_item_append_mount (GtkWidget

GIcon *icon;

char *display_name;

char *activation_uri;

+ char *tooltip;

icon = g_mount_get_icon (mount);

display_name = g_mount_get_name (mount);

@@ -737,12 +740,15 @@ panel_menu_item_append_mount (GtkWidget

activation_uri = g_file_get_uri (root);

g_object_unref (root);

+ /* SUN_BRANDING tooltip */

+ tooltip = g_strdup_printf (_("Open %s"), display_name);

panel_menu_items_append_place_item (NULL, icon,

display_name,

- display_name, //FIXME tooltip

+ tooltip,

menu,

G_CALLBACK (activate_uri),

activation_uri);

+ g_free (tooltip);

g_object_unref (icon);

g_free (display_name);

@@ -1566,9 +1572,10 @@ panel_menu_items_append_lock_logout (Gtk

g_get_user_name ());

/* Translators: this string is used ONLY if you translated

* "1" (msgctxt: "panel:showusername") to "1" */

- tooltip = g_strdup_printf (_("Log out %s of this session to "

- "log in as a different user"),

- user_name);

+ /* SUN_BRANDING tooltip */

+ tooltip = g_strdup_printf (_("Log out %s from this session and "

+ "return to log in screen"),

+ g_get_user_name ());

} else {

label = NULL;

tooltip = NULL;