Index: evolution/mail/em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.40
diff -u -p -r1.40 em-account-editor.c
--- evolution/mail/em-account-editor.c	6 Jan 2006 06:44:14 -0000	1.40
+++ evolution/mail/em-account-editor.c	13 Feb 2006 10:20:50 -0000
@@ -1937,7 +1937,8 @@ emae_option_checkspin(EMAccountEditorSer
 		enable = (on == 'y');
 
 	hbox = gtk_hbox_new(FALSE, 0);
-	check = g_object_new(gtk_check_button_get_type(), "label", pre, "active", enable, NULL);
+	check = g_object_new(gtk_check_button_get_type(), "label", pre, "use_underline", TRUE, "active", enable, NULL);
+
 	spin = gtk_spin_button_new((GtkAdjustment *)gtk_adjustment_new(def, min, max, 1, 1, 1), 1, 0);
 	if (post)
 		label = gtk_label_new(post);
@@ -2068,7 +2069,7 @@ section:
 				emae_account_toggle_widget(emae, (GtkToggleButton *)w, E_ACCOUNT_SOURCE_KEEP_ON_SERVER);
 			break;
 		case CAMEL_PROVIDER_CONF_ENTRY:
-			l = g_object_new(gtk_label_get_type(), "label", entries[i].text, "xalign", 0.0, NULL);
+			l = g_object_new(gtk_label_get_type(), "label", entries[i].text, "xalign", 0.0, "use_underline", TRUE, NULL);
 			gtk_widget_show(l);
 			w = emae_option_entry(service, url, entries[i].name, entries[i].value);
 			gtk_table_attach((GtkTable *)parent, l, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
Index: evolution-exchange/camel/camel-exchange-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/camel/camel-exchange-provider.c,v
retrieving revision 1.28
diff -u -p -r1.28 camel-exchange-provider.c
--- evolution-exchange/camel/camel-exchange-provider.c	13 Feb 2006 10:08:19 -0000	1.28
+++ evolution-exchange/camel/camel-exchange-provider.c	13 Feb 2006 10:21:58 -0000
@@ -50,14 +50,14 @@ CamelProviderConfEntry exchange_conf_ent
 	{ CAMEL_PROVIDER_CONF_ENTRY, "ad_server", NULL,
 	  /* i18n: "Global Catalog" is a Windowsism, but it's a
 	     technical term and may not have translations? */
-	  N_("Global Catalog server name:") },
+	  N_("_Global Catalog server name:") },
 	{ CAMEL_PROVIDER_CONF_CHECKSPIN, "ad_limit", NULL,
-	  N_("Limit number of GAL responses: %s"), "y:1:500:10000" },
+	  N_("_Limit number of GAL responses: %s"), "y:1:500:10000" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "generals", NULL,
 	  N_("Options") },
 	{ CAMEL_PROVIDER_CONF_CHECKSPIN, "passwd_exp_warn_period", NULL,
-	  N_("Password Expiry Warning period: %s"), "y:1:7:90" },
+	  N_("_Password Expiry Warning period: %s"), "y:1:7:90" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "sync_offline", NULL,
 	  N_("Automatically synchroni_ze account locally"), "0" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,
