--- src/journal.c.orig	25 Jun 2005 16:19:28 -0000	1.127
+++ src/journal.c	8 Mar 2006 13:18:06 -0000
@@ -1401,6 +1401,16 @@
 	return;
 }
 
+static void
+journal_set_expander(DrivelClient *dc, gboolean state)
+{
+	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
+	if (state)
+		gtk_label_set_text_with_mnemonic(GTK_LABEL(dc->journal_more_options), _("Hide _options"));
+	else
+		gtk_label_set_text_with_mnemonic(GTK_LABEL(dc->journal_more_options), _("Show more _options"));
+}
+
 /* display the default items for a blank journal entry and set the sensitivity
    of the widgets appropriately */
 
@@ -1482,7 +1492,7 @@
 			
 	/* set the expander state */
 	state = gconf_client_get_bool (dc->client, dc->gconf->expander_open, NULL);
-	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
+	journal_set_expander (dc,state);
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (dc->menu_view_options), state);
 	
 	/* enable/disable highlighting */
@@ -1753,7 +1763,7 @@
 	value = gconf_entry_get_value (entry);
 	state = gconf_value_get_bool (value);
 	
-	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
+	journal_set_expander (dc,state);
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (dc->menu_view_options), state);
 	
 	return;
@@ -3399,7 +3409,7 @@
 		{ "Strike", GTK_STOCK_STRIKETHROUGH, NULL, NULL, NULL, G_CALLBACK (strikethrough_cb) },
 		{ "Super", NULL, N_("Supe_rscript"), NULL, NULL, G_CALLBACK (superscript_cb) },
 		{ "Sub", NULL, N_("Subs_cript"), NULL, NULL, G_CALLBACK (subscript_cb) },
-		{ "List", NULL, N_("L_ist"), NULL, NULL, G_CALLBACK (list_cb) },
+		{ "List", NULL, N_("Lis_t"), NULL, NULL, G_CALLBACK (list_cb) },
 		{ "ListItem", NULL, N_("List Ite_m"), NULL, NULL, G_CALLBACK (listitem_cb) },
 		{ "Indent", NULL, N_("I_ndent"), NULL, NULL, G_CALLBACK (blockquote_cb) },
 		{ "InsertLink", "drivel-insert-link", N_("Insert _Link..."), NULL, N_("Create a link to a web page, livejournal user, or a long journal entry"), G_CALLBACK (insert_link_cb) },
@@ -3675,6 +3685,7 @@
 	
 	/* options expander */
 	dc->journal_expander = glade_xml_get_widget (xml, "more_options");
+	dc->journal_more_options = glade_xml_get_widget (xml, "more_options_label");
 
 	/* buttons */
 	help_button = glade_xml_get_widget (xml, "help_button");
--- src/drivel.h.orig	30 Aug 2005 17:46:18 -0000	1.56
+++ src/drivel.h	8 Mar 2006 13:18:06 -0000
@@ -215,6 +215,7 @@
 	GtkWidget *journal_text;
 	GtkWidget *journal_security;
 	GtkWidget *journal_expander;
+	GtkWidget *journal_more_options;
 	GtkWidget *journal_picture;
 	GtkWidget *journal_comment;
 	GtkWidget *journal_autoformat;