# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1186147703 0
# Node ID 2cb148647f8f869a0db24a420326167ba4fb7024
# Parent  09082badaa46dac910418c4306f032d36dbc2b9e# Parent  4e46e5f6586af3dcb23e586c999572dbe7f2da4a
merge of 'cb0bfe51682f8257f029d2dd61731a5ede123ba7'
     and 'fe54b4edcc5b8faa419ae3abc56e9cc567633893'

diff -r 09082badaa46 -r 2cb148647f8f pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Fri Aug 03 05:58:10 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Fri Aug 03 13:28:23 2007 +0000
@@ -1125,8 +1125,8 @@
 #endif
 		{_("_Smaller"), &toolbar->smaller_size, TRUE},
 		{_("_Font face"), &toolbar->font, TRUE},
-		{_("_Foreground color"), &toolbar->fgcolor, TRUE},
-		{_("_Background color"), &toolbar->bgcolor, TRUE},
+		{_("Foreground _color"), &toolbar->fgcolor, TRUE},
+		{_("Bac_kground color"), &toolbar->bgcolor, TRUE},
 		{_("_Reset formatting"), &toolbar->clear, FALSE},
 		{NULL, NULL, FALSE}
 	};