changeset 13538:60de8d24831d

[gaim-migrate @ 15915] Change "Clear formatting" to "Reset formatting". This is more clear (no pun intended), and helps to remove ambiguity with the "Clear scrollback" option in the Conversation menu. I've also noted the mnemonic on this entry in the right-click menu in conversations. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 21 Mar 2006 01:15:50 +0000
parents 207f974ca030
children c69a837e990c
files src/gtkimhtml.c src/gtkimhtmltoolbar.c
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkimhtml.c	Tue Mar 21 01:05:34 2006 +0000
+++ b/src/gtkimhtml.c	Tue Mar 21 01:15:50 2006 +0000
@@ -830,8 +830,7 @@
 	g_signal_connect(G_OBJECT(menuitem), "activate",
 					 G_CALLBACK(paste_unformatted_cb), imhtml);
 
-	/* XXX: make this new with mnemonic, and HIG-happy after string thaw */
-	menuitem = gtk_menu_item_new_with_label(_("Clear formatting"));
+	menuitem = gtk_menu_item_new_with_mnemonic(_("_Reset formatting"));
 	gtk_widget_show(menuitem);
 	gtk_widget_set_sensitive(menuitem, imhtml->editable);
 	/* put it after Delete */
--- a/src/gtkimhtmltoolbar.c	Tue Mar 21 01:05:34 2006 +0000
+++ b/src/gtkimhtmltoolbar.c	Tue Mar 21 01:15:50 2006 +0000
@@ -1022,12 +1022,12 @@
 	sep = gtk_vseparator_new();
 	gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
 
-	/* Clear Formatting */
+	/* Reset Formatting */
 	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_CLEAR);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
-			     _("Clear formatting"), NULL);
+			     _("Reset formatting"), NULL);
 
 	g_signal_connect(G_OBJECT(button), "clicked",
 			 G_CALLBACK(clear_formatting_cb), toolbar);