diff libpurple/protocols/jabber/buddy.c @ 23182:e0bcb8cfda74

Use "email" and "Email" consistently. This is potentially controversial, but here it is. For reference, Google and Yahoo call it "email" and dropping the hyphen on no-longer-new words is apparently standard practice.

--- a/libpurple/protocols/jabber/buddy.c	Sun May 25 17:39:29 2008 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sun May 25 21:56:36 2008 +0000
@@ -315,7 +315,7 @@
 	{N_("Postal Code"),        NULL, TRUE, TRUE, "PCODE",     "ADR", NULL},
 	{N_("Country"),            NULL, TRUE, TRUE, "CTRY",      "ADR", NULL},
 	{N_("Telephone"),          NULL, TRUE, TRUE, "NUMBER",    "TEL",  NULL},
-	{N_("E-Mail"),             NULL, TRUE, TRUE, "USERID",    "EMAIL",  "<A HREF=\"mailto:%s\">%s</A>"},
+	{N_("Email"),             NULL, TRUE, TRUE, "USERID",    "EMAIL",  "<A HREF=\"mailto:%s\">%s</A>"},
 	{N_("Organization Name"),  NULL, TRUE, TRUE, "ORGNAME",   "ORG", NULL},
 	{N_("Organization Unit"),  NULL, TRUE, TRUE, "ORGUNIT",   "ORG", NULL},
 	{N_("Title"),              NULL, TRUE, TRUE, "TITLE",     NULL,  NULL},
@@ -1360,7 +1360,7 @@
 						escaped = g_markup_escape_text(userid, -1);
 						g_string_append_printf(info_text,
 								"<b>%s:</b> <a href=\"mailto:%s\">%s</a><br/>",
-								_("E-Mail"), escaped, escaped);
+								_("Email"), escaped, escaped);
 						g_free(escaped);
 						g_free(userid);
 					}
@@ -1370,7 +1370,7 @@
 					escaped = g_markup_escape_text(userid, -1);
 					g_string_append_printf(info_text,
 							"<b>%s:</b> <a href=\"mailto:%s\">%s</a><br/>",
-							_("E-Mail"), escaped, escaped);
+							_("Email"), escaped, escaped);
 					g_free(escaped);
 					g_free(userid);
 				}
@@ -2264,7 +2264,7 @@
 		purple_notify_searchresults_column_add(results, column);
 		column = purple_notify_searchresults_column_new(_("Nickname"));
 		purple_notify_searchresults_column_add(results, column);
-		column = purple_notify_searchresults_column_new(_("E-Mail"));
+		column = purple_notify_searchresults_column_new(_("Email"));
 		purple_notify_searchresults_column_add(results, column);
 
 		for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item)) {
@@ -2459,7 +2459,7 @@
 			purple_request_field_group_add_field(group, field);
 		}
 		if(xmlnode_get_child(query, "email")) {
-			field = purple_request_field_string_new("email", _("E-Mail Address"),
+			field = purple_request_field_string_new("email", _("Email Address"),
 					NULL, FALSE);
 			purple_request_field_group_add_field(group, field);
 		}