[evolution] Use email instead of e-mail spelling, like anywhere else

[Andre Klapper <aklapper src gnome org>]

commit b6bbbb1c61b749e42aea971a717cf2afd63bacec
Author: Andre Klapper <a9016009 gmx de>
Date:   Thu Jul 28 12:35:11 2011 +0200

    Use email instead of e-mail spelling, like anywhere else

 plugins/caldav/caldav-browse-server.c |    2 +-
 plugins/caldav/caldav-source.c        |    2 +-
 smime/gui/certificate-manager.c       |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index 72985f4..3ebd0aa 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -1331,7 +1331,7 @@ init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, GtkWidget **new_userm
 	hbox = gtk_hbox_new (FALSE, 2);
 	gtk_box_pack_start (content_area, hbox, FALSE, FALSE, 0);
 
-	label = gtk_label_new_with_mnemonic (_("User e-_mail:"));
+	label = gtk_label_new_with_mnemonic (_("User e_mail:"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), *new_usermail_combo);
 
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 41cebef..b93429d 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -253,7 +253,7 @@ oge_caldav  (EPlugin                    *epl,
 	g_free (uri);
 	g_free (username);
 
-	mail = e_plugin_util_add_entry (parent, _("User e-_mail:"), source, "usermail");
+	mail = e_plugin_util_add_entry (parent, _("User e_mail:"), source, "usermail");
 	autoschedule = e_plugin_util_add_check (
 		parent, _("Server _handles meeting invitations"),
 		source, "autoschedule", "1", "0");
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index faa8218..81644bc 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -90,7 +90,7 @@ static const gchar* yourcerts_mime_types[] = { "application/x-x509-user-cert", "
 static CertTreeColumn contactcerts_columns[] = {
 
 	{ G_TYPE_STRING, N_("Certificate Name"),		e_cert_get_cn,			TRUE },
-	{ G_TYPE_STRING, N_("E-Mail Address"),			e_cert_get_email,		TRUE },
+	{ G_TYPE_STRING, N_("Email Address"),			e_cert_get_email,		TRUE },
 	{ G_TYPE_STRING, N_("Issued To Organization"),		e_cert_get_org,			FALSE },
 	{ G_TYPE_STRING, N_("Issued To Organizational Unit"),	e_cert_get_org_unit,		FALSE },
 	{ G_TYPE_STRING, N_("Serial Number"),			e_cert_get_serial_number,	TRUE },
@@ -110,7 +110,7 @@ static const gchar* contactcerts_mime_types[] = { "application/x-x509-email-cert
 static CertTreeColumn authoritycerts_columns[] = {
 
 	{ G_TYPE_STRING, N_("Certificate Name"),		e_cert_get_cn,			TRUE },
-	{ G_TYPE_STRING, N_("E-Mail Address"),			e_cert_get_email,		TRUE },
+	{ G_TYPE_STRING, N_("Email Address"),			e_cert_get_email,		TRUE },
 	{ G_TYPE_STRING, N_("Serial Number"),			e_cert_get_serial_number,	TRUE },
 	{ G_TYPE_STRING, N_("Purposes"),			e_cert_get_usage,		TRUE },
 	{ G_TYPE_STRING, N_("Issued By"),			e_cert_get_issuer_cn,		FALSE },