pidgin: 45401c96: Use "email" and "Email" consistently. T...

rlaager at pidgin.im rlaager at pidgin.im
Sun May 25 18:10:57 EDT 2008


-----------------------------------------------------------------
Revision: 45401c961ca97b6dd3675db39ca8d46f5142dada
Ancestor: ff389b62b9d93369d7d6f96ca3e913c108d21523
Author: rlaager at pidgin.im
Date: 2008-05-25T21:56:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/45401c961ca97b6dd3675db39ca8d46f5142dada

Modified files:
        README.MTN doc/C-HOWTO.dox libpurple/notify.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/silc/ops.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc10/ops.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/silc10/util.c
        libpurple/protocols/toc/toc.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/util.h
        pidgin/gtkimhtml.c pidgin/gtknotify.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/new_person_dialog.c po/af.po
        po/am.po po/ar.po po/az.po po/be at latin.po po/bg.po po/bn.po
        po/bs.po po/ca.po po/ca at valencia.po po/cs.po po/da.po
        po/de.po po/dz.po po/el.po po/en_AU.po po/en_CA.po
        po/en_GB.po po/eo.po po/es.po po/et.po po/eu.po po/fa.po
        po/fi.po po/fr.po po/gl.po po/gu.po po/he.po po/hi.po
        po/hu.po po/id.po po/it.po po/ja.po po/ka.po po/kn.po
        po/ko.po po/lo.po po/lt.po po/mk.po po/my_MM.po po/nb.po
        po/ne.po po/nl.po po/nn.po po/oc.po po/pa.po po/pl.po
        po/ps.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/si.po
        po/sk.po po/sl.po po/sq.po po/sr.po po/sr at latin.po po/sv.po
        po/ta.po po/te.po po/th.po po/tr.po po/uk.po po/ur.po
        po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- README.MTN	d414f0125f1484d2bb577c8375935776b5a29020
+++ README.MTN	4014aad8da9a734c0bc4f40d3e8aaa3d81ff3d61
@@ -26,7 +26,7 @@ If you have questions, please feel free 
 API, and account.h contains documentation for the purple_account_* API.
 
 If you have questions, please feel free to contact the Pidgin, Finch, and
-libpurple developers by e-mail at devel at pidgin.im or on IRC at irc.freenode.net
+libpurple developers by email at devel at pidgin.im or on IRC at irc.freenode.net
 in #pidgin.  Please do as much homework as you can before contacting us; the
 more you know about your question, the faster and more effectively we can help!
 
============================================================
--- doc/C-HOWTO.dox	39d29ddb8386e731dee522b6218470c1ac36d0e8
+++ doc/C-HOWTO.dox	a850e127fc31063fed78e68d219fc10d50b9706d
@@ -176,7 +176,7 @@ static PurplePluginInfo info = {
                                    how much to display).
                                  */
 	NULL,                   /* This is where you can put your name and
-                                   e-mail address.
+                                   email address.
                                  */
 	"http://helloworld.tld",/* This is the website for the plugin.  This
                                    tells users where to find new versions,
============================================================
--- libpurple/notify.h	4d2b614fe372325ed43d83900bbb8bbbe17948c7
+++ libpurple/notify.h	9bb5d27b5f4d4f9223e2e0f387b7aac8c5e3f15e
@@ -48,8 +48,8 @@ typedef enum
 typedef enum
 {
 	PURPLE_NOTIFY_MESSAGE = 0,   /**< Message notification.         */
-	PURPLE_NOTIFY_EMAIL,         /**< Single e-mail notification.   */
-	PURPLE_NOTIFY_EMAILS,        /**< Multiple e-mail notification. */
+	PURPLE_NOTIFY_EMAIL,         /**< Single email notification.   */
+	PURPLE_NOTIFY_EMAILS,        /**< Multiple email notification. */
 	PURPLE_NOTIFY_FORMATTED,     /**< Formatted text.               */
 	PURPLE_NOTIFY_SEARCHRESULTS, /**< Buddy search results.         */
 	PURPLE_NOTIFY_USERINFO,      /**< Formatted userinfo text.      */
@@ -402,10 +402,10 @@ void *purple_notify_message(void *handle
 						  gpointer user_data);
 
 /**
- * Displays a single e-mail notification to the user.
+ * Displays a single email notification to the user.
  *
  * @param handle    The plugin or connection handle.
- * @param subject   The subject of the e-mail.
+ * @param subject   The subject of the email.
  * @param from      The from address.
  * @param to        The destination address.
  * @param url       The URL where the message can be read.
@@ -421,11 +421,11 @@ void *purple_notify_email(void *handle, 
 						gpointer user_data);
 
 /**
- * Displays a notification for multiple e-mails to the user.
+ * Displays a notification for multiple emails to the user.
  *
  * @param handle    The plugin or connection handle.
- * @param count     The number of e-mails.
- * @param detailed  @c TRUE if there is information for each e-mail in the
+ * @param count     The number of emails.
+ * @param detailed  @c TRUE if there is information for each email in the
  *                  arrays.
  * @param subjects  The array of subjects.
  * @param froms     The array of from addresses.
============================================================
--- libpurple/protocols/bonjour/bonjour.c	544f8f7348235ea4ae32bacf41ffaf8e52dfdca0
+++ libpurple/protocols/bonjour/bonjour.c	ffcfd0731fbd5ffad35e41f68dcdc328595c544d
@@ -384,7 +384,7 @@ bonjour_tooltip_text(PurpleBuddy *buddy,
 	}
 
 	if (bb->email != NULL)
-		purple_notify_user_info_add_pair(user_info, _("E-Mail"), bb->email);
+		purple_notify_user_info_add_pair(user_info, _("Email"), bb->email);
 
 	if (bb->AIM != NULL)
 		purple_notify_user_info_add_pair(user_info, _("AIM Account"), bb->AIM);
@@ -719,7 +719,7 @@ init_plugin(PurplePlugin *plugin)
 	option = purple_account_option_string_new(_("Last name"), "last", default_lastname);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_string_new(_("E-mail"), "email", "");
+	option = purple_account_option_string_new(_("Email"), "email", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	option = purple_account_option_string_new(_("AIM Account"), "AIM", "");
============================================================
--- libpurple/protocols/gg/gg.c	68d4677562e5e8ffe30847a35628a781ccbdf21e
+++ libpurple/protocols/gg/gg.c	cc001290051750a2c807801ab8094e43b9b2e241
@@ -475,7 +475,7 @@ static void ggp_register_user_dialog(Pur
 	purple_request_fields_add_group(fields, group);
 
 	field = purple_request_field_string_new("email",
-			_("E-mail"), "", FALSE);
+			_("Email"), "", FALSE);
 	purple_request_field_string_set_masked(field, FALSE);
 	purple_request_field_group_add_field(group, field);
 
@@ -718,7 +718,7 @@ static void ggp_callback_change_passwd_o
 
 	purple_debug_info("gg", "Changing password\n");
 
-	/* XXX: this e-mail should be a pref... */
+	/* XXX: this email should be a pref... */
 	h = gg_change_passwd4(ggp_get_uin(account),
 			      "user at example.net", purple_account_get_password(account),
 			      p1, info->token->id, t, 0);
============================================================
--- libpurple/protocols/jabber/buddy.c	7a16c1e33753497467de2430b1ba47aca1ab711c
+++ libpurple/protocols/jabber/buddy.c	5b626cd893beb2f0a894f32a6b78357d150ee9b5
@@ -315,7 +315,7 @@ struct vcard_template {
 	{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 @@ static void jabber_vcard_parse(JabberStr
 						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 @@ static void jabber_vcard_parse(JabberStr
 					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 @@ static void user_search_result_cb(Jabber
 		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 @@ static void user_search_fields_result_cb
 			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);
 		}
============================================================
--- libpurple/protocols/jabber/jabber.c	aa39cab0d6e490a1326ffd75a8963f5c02683b43
+++ libpurple/protocols/jabber/jabber.c	2cdf7bfc2030cf7f88da320550f46a9cbf1c45bd
@@ -995,7 +995,7 @@ void jabber_register_parse(JabberStream 
 		purple_request_field_group_add_field(group, field);
 	}
 	if(xmlnode_get_child(query, "email")) {
-		field = purple_request_field_string_new("email", _("E-mail"), NULL, FALSE);
+		field = purple_request_field_string_new("email", _("Email"), NULL, FALSE);
 		purple_request_field_group_add_field(group, field);
 	}
 	if(xmlnode_get_child(query, "nick")) {
============================================================
--- libpurple/protocols/msn/error.c	d9e68bb8458e306fa3ef96b05e897888084b2b99
+++ libpurple/protocols/msn/error.c	26d3f1fcef7645a4bcdd4a16b0fb20d366f2a69a
@@ -43,7 +43,7 @@ msn_error_get_text(unsigned int type, gb
 			break;
 		case 201:
 			g_snprintf(msg, sizeof(msg),
-					   _("Invalid e-mail address"));
+					   _("Invalid email address"));
 			break;
 		case 205:
 			g_snprintf(msg, sizeof(msg), _("User does not exist"));
============================================================
--- libpurple/protocols/msn/msn.c	32674ec4d2a2549401071a0b9c489abf5ba01931
+++ libpurple/protocols/msn/msn.c	49ef16fb78cfa935c89fb8615525bf54bc89c668
@@ -147,7 +147,7 @@ msn_get_account_text_table(PurpleAccount
 
 	table = g_hash_table_new(g_str_hash, g_str_equal);
 
-	g_hash_table_insert(table, "login_label", (gpointer)_("E-mail Address..."));
+	g_hash_table_insert(table, "login_label", (gpointer)_("Email Address..."));
 
 	return table;
 }
@@ -1952,7 +1952,7 @@ msn_got_info(PurpleUtilFetchUrlData *url
 	MSN_GOT_INFO_GET_FIELD("Home address", _("Home Address"));
 	MSN_GOT_INFO_GET_FIELD("Personal Mobile", _("Personal Mobile"));
 	MSN_GOT_INFO_GET_FIELD("Home fax", _("Home Fax"));
-	MSN_GOT_INFO_GET_FIELD("Personal e-mail", _("Personal E-Mail"));
+	MSN_GOT_INFO_GET_FIELD("Personal email", _("Personal Email"));
 	MSN_GOT_INFO_GET_FIELD("Personal IM", _("Personal IM"));
 	MSN_GOT_INFO_GET_FIELD("Birthday", _("Birthday"));
 	MSN_GOT_INFO_GET_FIELD("Anniversary", _("Anniversary"));
@@ -1983,7 +1983,7 @@ msn_got_info(PurpleUtilFetchUrlData *url
 	MSN_GOT_INFO_GET_FIELD("Work mobile", _("Work Mobile"));
 	MSN_GOT_INFO_GET_FIELD("Work pager", _("Work Pager"));
 	MSN_GOT_INFO_GET_FIELD("Work fax", _("Work Fax"));
-	MSN_GOT_INFO_GET_FIELD("Work e-mail", _("Work E-Mail"));
+	MSN_GOT_INFO_GET_FIELD("Work email", _("Work Email"));
 	MSN_GOT_INFO_GET_FIELD("Work IM", _("Work IM"));
 	MSN_GOT_INFO_GET_FIELD("Start date", _("Start Date"));
 	MSN_GOT_INFO_GET_FIELD("Notes", _("Notes"));
============================================================
--- libpurple/protocols/msnp9/error.c	d9e68bb8458e306fa3ef96b05e897888084b2b99
+++ libpurple/protocols/msnp9/error.c	26d3f1fcef7645a4bcdd4a16b0fb20d366f2a69a
@@ -43,7 +43,7 @@ msn_error_get_text(unsigned int type, gb
 			break;
 		case 201:
 			g_snprintf(msg, sizeof(msg),
-					   _("Invalid e-mail address"));
+					   _("Invalid email address"));
 			break;
 		case 205:
 			g_snprintf(msg, sizeof(msg), _("User does not exist"));
============================================================
--- libpurple/protocols/msnp9/msn.c	cab3422fbad8816550b077a2507912548723be7b
+++ libpurple/protocols/msnp9/msn.c	346b0998de97a00aa32f9dd69f81e808149eca92
@@ -148,7 +148,7 @@ msn_get_account_text_table(PurpleAccount
 
 	table = g_hash_table_new(g_str_hash, g_str_equal);
 
-	g_hash_table_insert(table, "login_label", (gpointer)_("E-mail Address..."));
+	g_hash_table_insert(table, "login_label", (gpointer)_("Email Address..."));
 
 	return table;
 }
@@ -1793,7 +1793,7 @@ msn_got_info(PurpleUtilFetchUrlData *url
 	MSN_GOT_INFO_GET_FIELD("Home address", _("Home Address"));
 	MSN_GOT_INFO_GET_FIELD("Personal Mobile", _("Personal Mobile"));
 	MSN_GOT_INFO_GET_FIELD("Home fax", _("Home Fax"));
-	MSN_GOT_INFO_GET_FIELD("Personal e-mail", _("Personal E-Mail"));
+	MSN_GOT_INFO_GET_FIELD("Personal email", _("Personal Email"));
 	MSN_GOT_INFO_GET_FIELD("Personal IM", _("Personal IM"));
 	MSN_GOT_INFO_GET_FIELD("Birthday", _("Birthday"));
 	MSN_GOT_INFO_GET_FIELD("Anniversary", _("Anniversary"));
@@ -1824,7 +1824,7 @@ msn_got_info(PurpleUtilFetchUrlData *url
 	MSN_GOT_INFO_GET_FIELD("Work mobile", _("Work Mobile"));
 	MSN_GOT_INFO_GET_FIELD("Work pager", _("Work Pager"));
 	MSN_GOT_INFO_GET_FIELD("Work fax", _("Work Fax"));
-	MSN_GOT_INFO_GET_FIELD("Work e-mail", _("Work E-Mail"));
+	MSN_GOT_INFO_GET_FIELD("Work email", _("Work Email"));
 	MSN_GOT_INFO_GET_FIELD("Work IM", _("Work IM"));
 	MSN_GOT_INFO_GET_FIELD("Start date", _("Start Date"));
 	MSN_GOT_INFO_GET_FIELD("Notes", _("Notes"));
============================================================
--- libpurple/protocols/myspace/myspace.c	b3af1983b6560dc0c8ef621c42205402b141da3d
+++ libpurple/protocols/myspace/myspace.c	05b3dfe7ffa81a5125fa05fdb339288293bc2a56
@@ -2456,7 +2456,7 @@ msim_get_account_text_table(PurpleAccoun
 
 	table = g_hash_table_new(g_str_hash, g_str_equal);
 
-	g_hash_table_insert(table, "login_label", (gpointer)_("E-mail Address..."));
+	g_hash_table_insert(table, "login_label", (gpointer)_("Email Address..."));
 
 	return table;
 }
============================================================
--- libpurple/protocols/novell/novell.c	d6063e2f4e847e79338414c8be2767d44bdf2ccc
+++ libpurple/protocols/novell/novell.c	da346110e69c3d85d19e4f619edb0fd47035d321
@@ -1494,7 +1494,7 @@ _map_property_tag(const char *tag)
 	else if (strcmp(tag, "mailstop") == 0)
 		return _("Mailstop");
 	else if (strcmp(tag, "Internet EMail Address") == 0)
-		return _("E-Mail Address");
+		return _("Email Address");
 	else
 		return tag;
 }
============================================================
--- libpurple/protocols/oscar/oscar.c	44e5fcf1b3c71e2f8957fed1418634484231c6b6
+++ libpurple/protocols/oscar/oscar.c	9431caa88d5deebc51e087f71914179fe66cfda6
@@ -1106,12 +1106,12 @@ flap_connection_established_admin(OscarD
 		od->conf = FALSE;
 	}
 	if (od->reqemail) {
-		purple_debug_info("oscar", "requesting e-mail address\n");
+		purple_debug_info("oscar", "requesting email address\n");
 		aim_admin_getinfo(od, conn, 0x0011);
 		od->reqemail = FALSE;
 	}
 	if (od->setemail) {
-		purple_debug_info("oscar", "setting e-mail address\n");
+		purple_debug_info("oscar", "setting email address\n");
 		aim_admin_setemail(od, conn, od->email);
 		g_free(od->email);
 		od->email = NULL;
@@ -1428,7 +1428,7 @@ purple_parse_auth_resp(OscarData *od, Fl
 	}
 
 	purple_debug_misc("oscar", "Reg status: %hu\n", info->regstatus);
-	purple_debug_misc("oscar", "E-mail: %s\n",
+	purple_debug_misc("oscar", "Email: %s\n",
 					(info->email != NULL) ? info->email : "null");
 	purple_debug_misc("oscar", "BOSIP: %s\n", info->bosip);
 	purple_debug_info("oscar", "Closing auth connection...\n");
@@ -2492,8 +2492,8 @@ incomingim_chan4(OscarData *od, FlapConn
 
 		case 0x0e: { /* Someone has emailed you at your_uin at pager.icq.com */
 			if (i >= 6) {
-				gchar *dialog_msg = g_strdup_printf(_("You have received an ICQ e-mail from %s [%s]\n\nMessage is:\n%s"), msg2[0], msg2[3], msg2[5]);
-				purple_notify_info(gc, NULL, "ICQ E-Mail", dialog_msg);
+				gchar *dialog_msg = g_strdup_printf(_("You have received an ICQ email from %s [%s]\n\nMessage is:\n%s"), msg2[0], msg2[3], msg2[5]);
+				purple_notify_info(gc, NULL, "ICQ Email", dialog_msg);
 				g_free(dialog_msg);
 			}
 		} break;
@@ -3750,7 +3750,7 @@ static int purple_icqinfo(OscarData *od,
 	oscar_user_info_convert_and_add(account, user_info, _("Last Name"), info->last);
 	if (info->email && info->email[0] && (utf8 = oscar_utf8_try_convert(gc->account, info->email))) {
 		buf = g_strdup_printf("<a href=\"mailto:%s\">%s</a>", utf8, utf8);
-		purple_notify_user_info_add_pair(user_info, _("E-Mail Address"), buf);
+		purple_notify_user_info_add_pair(user_info, _("Email Address"), buf);
 		g_free(buf);
 		g_free(utf8);
 	}
@@ -3759,7 +3759,7 @@ static int purple_icqinfo(OscarData *od,
 		for (i = 0; i < info->numaddresses; i++) {
 			if (info->email2[i] && info->email2[i][0] && (utf8 = oscar_utf8_try_convert(gc->account, info->email2[i]))) {
 				buf = g_strdup_printf("<a href=\"mailto:%s\">%s</a>", utf8, utf8);
-				purple_notify_user_info_add_pair(user_info, _("E-Mail Address"), buf);
+				purple_notify_user_info_add_pair(user_info, _("Email Address"), buf);
 				g_free(buf);
 				g_free(utf8);
 			}
@@ -3984,7 +3984,7 @@ static int purple_parse_searcherror(Osca
 	email = va_arg(ap, char *);
 	va_end(ap);
 
-	buf = g_strdup_printf(_("No results found for e-mail address %s"), email);
+	buf = g_strdup_printf(_("No results found for email address %s"), email);
 	purple_notify_error(od->gc, NULL, buf, NULL);
 	g_free(buf);
 
@@ -4003,9 +4003,9 @@ static int purple_account_confirm(OscarD
 
 	purple_debug_info("oscar",
 			   "account confirmation returned status 0x%04x (%s)\n", status,
-			status ? "unknown" : "e-mail sent");
+			status ? "unknown" : "email sent");
 	if (!status) {
-		g_snprintf(msg, sizeof(msg), _("You should receive an e-mail asking to confirm %s."),
+		g_snprintf(msg, sizeof(msg), _("You should receive an email asking to confirm %s."),
 				purple_account_get_username(purple_connection_get_account(gc)));
 		purple_notify_info(gc, NULL, _("Account Confirmation Requested"), msg);
 	}
@@ -4046,11 +4046,11 @@ static int purple_info_change(OscarData 
 		else if (err == 0x00b)
 			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to format username because the requested name is too long."), err);
 		else if (err == 0x001d)
-			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change e-mail address because there is already a request pending for this username."), err);
+			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change email address because there is already a request pending for this username."), err);
 		else if (err == 0x0021)
-			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change e-mail address because the given address has too many usernames associated with it."), err);
+			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change email address because the given address has too many usernames associated with it."), err);
 		else if (err == 0x0023)
-			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change e-mail address because the given address is invalid."), err);
+			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change email address because the given address is invalid."), err);
 		else
 			dialog_msg = g_strdup_printf(_("Error 0x%04x: Unknown error."), err);
 		purple_notify_error(gc, NULL,
@@ -4060,7 +4060,7 @@ static int purple_info_change(OscarData 
 	}
 
 	if (email != NULL) {
-		char *dialog_msg = g_strdup_printf(_("The e-mail address for %s is %s"),
+		char *dialog_msg = g_strdup_printf(_("The email address for %s is %s"),
 						   purple_account_get_username(purple_connection_get_account(gc)), email);
 		purple_notify_info(gc, NULL, _("Account Info"), dialog_msg);
 		g_free(dialog_msg);
@@ -6344,9 +6344,9 @@ static void oscar_show_find_email(Purple
 static void oscar_show_find_email(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input(gc, _("Find Buddy by E-Mail"),
-					   _("Search for a buddy by e-mail address"),
-					   _("Type the e-mail address of the buddy you are "
+	purple_request_input(gc, _("Find Buddy by Email"),
+					   _("Search for a buddy by email address"),
+					   _("Type the email address of the buddy you are "
 						 "searching for."),
 					   NULL, FALSE, FALSE, NULL,
 					   _("_Search"), G_CALLBACK(search_by_email_cb),
@@ -6543,11 +6543,11 @@ oscar_actions(PurplePlugin *plugin, gpoi
 				oscar_confirm_account);
 		menu = g_list_prepend(menu, act);
 
-		act = purple_plugin_action_new(_("Display Currently Registered E-Mail Address"),
+		act = purple_plugin_action_new(_("Display Currently Registered Email Address"),
 				oscar_show_email);
 		menu = g_list_prepend(menu, act);
 
-		act = purple_plugin_action_new(_("Change Currently Registered E-Mail Address..."),
+		act = purple_plugin_action_new(_("Change Currently Registered Email Address..."),
 				oscar_show_change_email);
 		menu = g_list_prepend(menu, act);
 	}
@@ -6560,7 +6560,7 @@ oscar_actions(PurplePlugin *plugin, gpoi
 
 	menu = g_list_prepend(menu, NULL);
 
-	act = purple_plugin_action_new(_("Search for Buddy by E-Mail Address..."),
+	act = purple_plugin_action_new(_("Search for Buddy by Email Address..."),
 			oscar_show_find_email);
 	menu = g_list_prepend(menu, act);
 
============================================================
--- libpurple/protocols/silc/ops.c	d9a4fa0109e743e1cf244a4f0f849e50433876d9
+++ libpurple/protocols/silc/ops.c	87a421e04a54cdb875b13f03ff5c53759e973308
@@ -1052,7 +1052,7 @@ silcpurple_whois_more(SilcClientEntry cl
 			for (i = 0; i < vcard.num_emails; i++) {
 				if (vcard.emails[i].address)
 					g_string_append_printf(s, "%s:\t\t%s\n",
-							       _("E-Mail"),
+							       _("Email"),
 							       vcard.emails[i].address);
 			}
 			if (vcard.note)
============================================================
--- libpurple/protocols/silc/silc.c	405b14d71e81b3528306c985953a00de8ad33e9d
+++ libpurple/protocols/silc/silc.c	8d819ff4ffd518e22d6184f47c40cbbfa4c847e3
@@ -983,7 +983,7 @@ silcpurple_attrs(PurplePluginAction *act
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_bool_new("contact_chat", _("Chat"), cchat);
 	purple_request_field_group_add_field(g, f);
-	f = purple_request_field_bool_new("contact_email", _("E-mail"), cemail);
+	f = purple_request_field_bool_new("contact_email", _("Email"), cemail);
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_bool_new("contact_call", _("Phone"), ccall);
 	purple_request_field_group_add_field(g, f);
@@ -1224,7 +1224,7 @@ silcpurple_create_keypair(PurplePluginAc
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_string_new("rn", _("Real name"), realname ? realname : "", FALSE);
 	purple_request_field_group_add_field(g, f);
-	f = purple_request_field_string_new("e", _("E-mail"), tmp, FALSE);
+	f = purple_request_field_string_new("e", _("Email"), tmp, FALSE);
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_string_new("o", _("Organization"), "", FALSE);
 	purple_request_field_group_add_field(g, f);
============================================================
--- libpurple/protocols/silc/util.c	3ccdc185e76ec192f230a586c4b19b18b05bc0f4
+++ libpurple/protocols/silc/util.c	915112e7c3cca15157692bee02f5156250a61123
@@ -364,7 +364,7 @@ void silcpurple_show_public_key(SilcPurp
 	if (ident->username)
 		g_string_append_printf(s, _("User Name: \t%s\n"), ident->username);
 	if (ident->email)
-		g_string_append_printf(s, _("E-Mail: \t\t%s\n"), ident->email);
+		g_string_append_printf(s, _("Email: \t\t%s\n"), ident->email);
 	if (ident->host)
 		g_string_append_printf(s, _("Host Name: \t%s\n"), ident->host);
 	if (ident->org)
@@ -558,7 +558,7 @@ silcpurple_parse_attrs(SilcDList attrs, 
 		if (contact & SILC_ATTRIBUTE_CONTACT_CHAT)
 			g_string_append_printf(s, "[%s] ", _("Chat"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_EMAIL)
-			g_string_append_printf(s, "[%s] ", _("E-Mail"));
+			g_string_append_printf(s, "[%s] ", _("Email"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_CALL)
 			g_string_append_printf(s, "[%s] ", _("Phone"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_PAGE)
============================================================
--- libpurple/protocols/silc10/ops.c	b78f2b937f35a46d64d787623d8114094d119b95
+++ libpurple/protocols/silc10/ops.c	432877fccc4fe48eef9e929a835e298f1303f3b6
@@ -1072,7 +1072,7 @@ silcpurple_whois_more(SilcClientEntry cl
 			for (i = 0; i < vcard.num_emails; i++) {
 				if (vcard.emails[i].address)
 					g_string_append_printf(s, "%s:\t\t%s\n",
-							       _("E-Mail"),
+							       _("Email"),
 							       vcard.emails[i].address);
 			}
 			if (vcard.note)
============================================================
--- libpurple/protocols/silc10/silc.c	8b8979c84bb85d01cd0951d1c1612ed0a8fb05e7
+++ libpurple/protocols/silc10/silc.c	3f712811b88ffe2ceccf322a01c2376a5044da21
@@ -684,7 +684,7 @@ silcpurple_attrs(PurplePluginAction *act
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_bool_new("contact_chat", _("Chat"), cchat);
 	purple_request_field_group_add_field(g, f);
-	f = purple_request_field_bool_new("contact_email", _("E-mail"), cemail);
+	f = purple_request_field_bool_new("contact_email", _("Email"), cemail);
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_bool_new("contact_call", _("Phone"), ccall);
 	purple_request_field_group_add_field(g, f);
@@ -925,7 +925,7 @@ silcpurple_create_keypair(PurplePluginAc
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_string_new("rn", _("Real name"), realname ? realname : "", FALSE);
 	purple_request_field_group_add_field(g, f);
-	f = purple_request_field_string_new("e", _("E-mail"), tmp, FALSE);
+	f = purple_request_field_string_new("e", _("Email"), tmp, FALSE);
 	purple_request_field_group_add_field(g, f);
 	f = purple_request_field_string_new("o", _("Organization"), "", FALSE);
 	purple_request_field_group_add_field(g, f);
============================================================
--- libpurple/protocols/silc10/util.c	8900079b4371f25fd62216e63a1504588bbc155e
+++ libpurple/protocols/silc10/util.c	a9b932c2521a8c7a922ca9cfdc6eb41cd0815467
@@ -356,7 +356,7 @@ void silcpurple_show_public_key(SilcPurp
 	if (ident->username)
 		g_string_append_printf(s, _("User Name: \t%s\n"), ident->username);
 	if (ident->email)
-		g_string_append_printf(s, _("E-Mail: \t\t%s\n"), ident->email);
+		g_string_append_printf(s, _("Email: \t\t%s\n"), ident->email);
 	if (ident->host)
 		g_string_append_printf(s, _("Host Name: \t%s\n"), ident->host);
 	if (ident->org)
@@ -552,7 +552,7 @@ silcpurple_parse_attrs(SilcDList attrs, 
 		if (contact & SILC_ATTRIBUTE_CONTACT_CHAT)
 			g_string_append_printf(s, "[%s] ", _("Chat"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_EMAIL)
-			g_string_append_printf(s, "[%s] ", _("E-Mail"));
+			g_string_append_printf(s, "[%s] ", _("Email"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_CALL)
 			g_string_append_printf(s, "[%s] ", _("Phone"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_PAGE)
============================================================
--- libpurple/protocols/toc/toc.c	e9f6b1632d6f1225856dc43310f1720b5f18720e
+++ libpurple/protocols/toc/toc.c	d24d45047c8636a0e4629c39a59d15b81d1ae5a1
@@ -527,7 +527,7 @@ static char *show_error_message()
 			g_snprintf(buf, sizeof(buf), _("Dir service temporarily unavailable."));
 			break;
 		case 974:
-			g_snprintf(buf, sizeof(buf), _("E-mail lookup restricted."));
+			g_snprintf(buf, sizeof(buf), _("Email lookup restricted."));
 			break;
 		case 975:
 			g_snprintf(buf, sizeof(buf), _("Keyword ignored."));
============================================================
--- libpurple/protocols/yahoo/yahoo_profile.c	6937058169d592bf9a9e0e10aa4200d1427ca7cc
+++ libpurple/protocols/yahoo/yahoo_profile.c	2a8c196e6f3a8035d4747cd17a4e45c51a43b133
@@ -1060,7 +1060,7 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
 	/* extract their Email address and put it in */
 	found |= purple_markup_extract_info_field(stripped, stripped_len, user_info,
 			strings->my_email_string, (yd->jp ? 4 : 1), " ", 0,
-			strings->private_string, _("E-Mail"), 0, NULL, NULL);
+			strings->private_string, _("Email"), 0, NULL, NULL);
 
 	/* extract the Nickname if it exists */
 	found |= purple_markup_extract_info_field(stripped, stripped_len, user_info,
============================================================
--- libpurple/util.h	fc41b873b546c9d769cdd8341a2b19100f54cb2d
+++ libpurple/util.h	65e82b7d0c4368c900060f5a861f7b69ea0e101f
@@ -229,7 +229,7 @@ guchar *purple_base64_decode(const char 
  * Converts a quoted printable string back to its readable equivalent.
  * What is a quoted printable string, you ask?  It's an encoding used
  * to transmit binary data as ASCII.  It's intended purpose is to send
- * e-mails containing non-ASCII characters.  Wikipedia has a pretty good
+ * emails containing non-ASCII characters.  Wikipedia has a pretty good
  * explanation.  Also see RFC 2045.
  *
  * @param str     The quoted printable ASCII string to convert to raw data.
============================================================
--- pidgin/gtkimhtml.c	731b0418f2c6876b8ec34446b0e84672898cb9d0
+++ pidgin/gtkimhtml.c	ae9ff3cd61ee6dd4fc1b5fc2df32e699bcc8e179
@@ -1753,11 +1753,11 @@ static gboolean tag_event(GtkTextTag *ta
 
 			if (!strncmp(tempdata->url, "mailto:", 7))
 			{
-				/* Copy E-Mail Address */
+				/* Copy Email Address */
 				img = gtk_image_new_from_stock(GTK_STOCK_COPY,
 											   GTK_ICON_SIZE_MENU);
 				item = gtk_image_menu_item_new_with_mnemonic(
-					_("_Copy E-Mail Address"));
+					_("_Copy Email Address"));
 				gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
 				g_signal_connect(G_OBJECT(item), "activate",
 								 G_CALLBACK(url_copy), tempdata->url + 7);
============================================================
--- pidgin/gtknotify.c	93cff41434edbd050bd7cfc0671c38538791a3a5
+++ pidgin/gtknotify.c	ef6034fc72af40acc57b82157ec92068f75837a5
@@ -596,8 +596,8 @@ pidgin_notify_emails(PurpleConnection *g
 	if (!GTK_WIDGET_VISIBLE(dialog)) {
 		GdkPixbuf *pixbuf = gtk_widget_render_icon(dialog, PIDGIN_STOCK_DIALOG_MAIL,
 							   gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), NULL);
-		char *label_text = g_strdup_printf(ngettext("<b>%d new e-mail.</b>",
-							    "<b>%d new e-mails.</b>",
+		char *label_text = g_strdup_printf(ngettext("<b>%d new email.</b>",
+							    "<b>%d new emails.</b>",
 							    mail_dialog->total_count), mail_dialog->total_count);
 		mail_dialog->in_use = TRUE;     /* So that _set_headline doesn't accidentally
 										   remove the notifications when replacing an
============================================================
--- pidgin/plugins/gevolution/gevolution.c	ed2b7e846c231389093ee12d2c6b082131e4fc61
+++ pidgin/plugins/gevolution/gevolution.c	44abc6d49c42a31672b2e5ad9af14bac4d1e43c0
@@ -239,14 +239,14 @@ menu_item_send_mail_activate_cb(PurpleBl
 		}
 		else
 		{
-			purple_notify_error(NULL, NULL, _("Unable to send e-mail"),
+			purple_notify_error(NULL, NULL, _("Unable to send email"),
 							  _("The evolution executable was not found in the PATH."));
 		}
 	}
 	else
 	{
-		purple_notify_error(NULL, NULL, _("Unable to send e-mail"),
-						  _("An e-mail address was not found for this buddy."));
+		purple_notify_error(NULL, NULL, _("Unable to send email"),
+						  _("An email address was not found for this buddy."));
 	}
 }
 
@@ -284,7 +284,7 @@ blist_node_extended_menu_cb(PurpleBlistN
 
 	if (mail != NULL)
 	{
-		act = purple_menu_action_new(_("Send E-Mail"),
+		act = purple_menu_action_new(_("Send Email"),
 			PURPLE_CALLBACK(menu_item_send_mail_activate_cb), NULL, NULL);
 		*menu = g_list_append(*menu, act);
 		g_free(mail);
============================================================
--- pidgin/plugins/gevolution/new_person_dialog.c	b9c1687386256cc6aca62e040360e7e63c5e03a4
+++ pidgin/plugins/gevolution/new_person_dialog.c	3062c701ee99b08ac29b3499997f9b8481edc8bf
@@ -375,9 +375,9 @@ gevo_new_person_dialog_show(EBook *book,
 						 G_CALLBACK(person_info_changed_cb), dialog);
 	}
 
-	/* E-Mail address field */
+	/* Email address field */
 	dialog->email = gtk_entry_new();
-	add_pref_box(sg2, vbox2, _("E-mail:"), dialog->email);
+	add_pref_box(sg2, vbox2, _("Email:"), dialog->email);
 
 	if (contact != NULL)
 	{
============================================================
--- po/af.po	5d6a1beb4ae5d40f07e76249298e21f9aef2e8a9
+++ po/af.po	893bc53ba90a1622ea8102f5fce9f7b59913b337
@@ -2773,7 +2773,7 @@ msgstr "Van"
 msgid "Last name"
 msgstr "Van"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-pos"
 
 msgid "AIM Account"
@@ -2798,9 +2798,6 @@ msgstr "Pers persoon"
 msgid "Purple Person"
 msgstr "Pers persoon"
 
-msgid "E-mail"
-msgstr "E-pos"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3880,7 +3877,7 @@ msgstr "Vul een of meer velde in om te s
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Vul een of meer velde in om te soek vir passende XMPP-gebruikers."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-posadres"
 
 msgid "Search for XMPP users"
@@ -4614,7 +4611,7 @@ msgstr "Sintaksfout (dalk 'n kliëntfout
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksfout (dalk 'n kliëntfout)"
 
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Ongeldige e-posadres"
 
 msgid "User does not exist"
@@ -4971,7 +4968,7 @@ msgstr "Huisfaks"
 msgid "Home Fax"
 msgstr "Huisfaks"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Persoonlike e-pos"
 
 msgid "Personal IM"
@@ -5014,7 +5011,7 @@ msgstr "Werkfaks"
 msgid "Work Fax"
 msgstr "Werkfaks"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Werks-e-pos"
 
 msgid "Work IM"
@@ -6357,7 +6354,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6501,11 +6498,11 @@ msgstr[1] "Die volgende skermname word m
 msgstr[1] "Die volgende skermname word met %s geassosieer"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Geen resultate gekry vir e-posadres %s nie"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "U behoort 'n e-pos te ontvang wat vra dat u %s bevestig."
 
 msgid "Account Confirmation Requested"
@@ -6534,7 +6531,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Fout 0x%04x: Kan nie die e-posadres verander nie omdat daar reeds 'n versoek "
@@ -6542,7 +6539,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres te veel "
@@ -6550,7 +6547,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres ongeldig "
@@ -6564,7 +6561,7 @@ msgstr "Kon nie rekeninginligting verand
 msgstr "Kon nie rekeninginligting verander nie"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Die e-posadres vir %s is %s"
 
 msgid "Account Info"
@@ -6779,13 +6776,13 @@ msgstr ""
 "U kan magtiging van hierdie vriende weer aanvra, deur op hulle te regskliek "
 "en \"Vra weer magtiging aan\" te kies."
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Vind vriend volgens e-pos"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Soek vir 'n vriend volgens e-posadres"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Gee die e-posadres van die vriend waarvoor u soek."
 
 msgid "_Search"
@@ -6808,16 +6805,16 @@ msgstr "Bevestig rekening"
 msgid "Confirm Account"
 msgstr "Bevestig rekening"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Wys e-posadres wat tans geregistreer is"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Verander e-posadres wat tans geregistreer is..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Wys vriende wat op magtiging wag"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Soek vir vriend met e-posadres..."
 
 msgid "Search for Buddy by Information"
@@ -6883,9 +6880,6 @@ msgstr "Kollege"
 msgid "College"
 msgstr "Kollege"
 
-msgid "Email"
-msgstr "E-pos"
-
 msgid "Zipcode"
 msgstr "Poskode"
 
@@ -8645,7 +8639,7 @@ msgstr "Gebruikernaam: \t%s\n"
 msgstr "Gebruikernaam: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-pos: \t\t%s\n"
 
 #, c-format
@@ -8883,7 +8877,7 @@ msgstr "Gidsdiens is tydelik nie beskikb
 msgid "Dir service temporarily unavailable."
 msgstr "Gidsdiens is tydelik nie beskikbaar nie."
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "E-posopsoek ingeperk."
 
 msgid "Keyword ignored."
@@ -11207,7 +11201,7 @@ msgstr "Aktiveer tikkennisgewings"
 msgid "Enable typing notification"
 msgstr "Aktiveer tikkennisgewings"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopieer e-posadres"
 
 msgid "_Open Link in Browser"
@@ -11561,8 +11555,8 @@ msgstr[1] "%s het %d nuwe boodskappe."
 msgstr[1] "%s het %d nuwe boodskappe."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d nuwe e-pos.</b>"
 msgstr[1] "<b>%d nuwe e-posse.</b>"
 
@@ -12597,19 +12591,19 @@ msgstr "_Assosieer vriend"
 msgid "_Associate Buddy"
 msgstr "_Assosieer vriend"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Kan nie e-pos stuur nie"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Die evolution-programlêer is nie in die PATH gevind nie."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Daar is nie 'n e-posadres vir hierdie vriend gevind nie."
 
 msgid "Add to Address Book"
 msgstr "Voeg by adresboek"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Stuur e-pos"
 
 #. Configuration frame
@@ -12655,7 +12649,7 @@ msgstr "Van:"
 msgid "Last name:"
 msgstr "Van:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-pos:"
 
 #. *< type
============================================================
--- po/am.po	6d78a04df7ea8a6862a5b7bc21d1b79e71394554
+++ po/am.po	541b17fbe2b22a36d04125a16914d806b563b3ec
@@ -3553,7 +3553,7 @@ msgstr "የአባት ስም፦"
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 #, fuzzy
-msgid "E-Mail"
+msgid "Email"
 msgstr "ኢሜይል"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3592,17 +3592,6 @@ msgstr "<አዲስ ተጠቃሚ>"
 msgid "Purple Person"
 msgstr "<አዲስ ተጠቃሚ>"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "ኢሜይል"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5297,7 +5286,7 @@ msgstr ""
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
 #, fuzzy
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ኢሜያል አድራሻ"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6387,7 +6376,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #, fuzzy, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "ኢሜያል አድራሻ"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6949,7 +6938,7 @@ msgstr "ድረ-ገጽ፦"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "ድረ-ገጽ፦"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7020,7 +7009,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "ኢሜይል"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8650,7 +8639,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8842,12 +8831,12 @@ msgstr "እስክሪን ስም፦ (_S)"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8881,21 +8870,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8906,7 +8895,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9158,15 +9147,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9197,11 +9186,11 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9210,7 +9199,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "የቢሮ መረጃ፦"
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9298,10 +9287,6 @@ msgstr ""
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "ኢሜይል"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr ""
@@ -12079,7 +12064,7 @@ msgstr "ተጠቃሚ፦ (_U)"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "ኢሜይል"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12427,7 +12412,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15374,7 +15359,7 @@ msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1598
 #, fuzzy
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "ኢሜያል አድራሻ"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15767,8 +15752,8 @@ msgstr[1] ""
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17039,7 +17024,7 @@ msgstr ""
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ተገናኝቷል"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17047,7 +17032,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17056,7 +17041,7 @@ msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ኢሜይል"
 
 #. Configuration frame
@@ -17119,7 +17104,7 @@ msgstr "የአባት ስም፦"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 #, fuzzy
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ኢሜይል"
 
 #. *< type
============================================================
--- po/ar.po	320e475f830f2c5993d9e5a2c9bbff2d941a4106
+++ po/ar.po	751527ae376f5ede16d089474bdac6b9b38f8234
@@ -3808,7 +3808,7 @@ msgstr "اسم العائلة"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
-msgid "E-Mail"
+msgid "Email"
 msgstr "البريد الإلكتروني"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:401
@@ -3840,16 +3840,6 @@ msgstr "شخص أرجواني"
 msgid "Purple Person"
 msgstr "شخص أرجواني"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "البريد الإلكتروني"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "بونجور"
@@ -5531,7 +5521,7 @@ msgstr "املأ واحدة أو أكثØ
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3761
 #: ../libpurple/protocols/oscar/oscar.c:3770
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "عنوان البريد الالكتروني"
 
 #: ../libpurple/protocols/jabber/buddy.c:2470
@@ -6594,7 +6584,7 @@ msgstr "خطأ نحوي (غالبا عل
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "عنوان بريد إلكترونى غير صالح"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7204,7 +7194,7 @@ msgstr "فاكس المنزل"
 
 #: ../libpurple/protocols/msn/msn.c:1826
 #: ../libpurple/protocols/msnp9/msn.c:1667
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "البريد الإلكتروني الشخصي"
 
 #: ../libpurple/protocols/msn/msn.c:1827
@@ -7280,7 +7270,7 @@ msgstr "فاكس العمل"
 
 #: ../libpurple/protocols/msn/msn.c:1857
 #: ../libpurple/protocols/msnp9/msn.c:1698
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "البريد الإلكتروني للعمل"
 
 #: ../libpurple/protocols/msn/msn.c:1858
@@ -9086,7 +9076,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9293,12 +9283,12 @@ msgstr[5] "أسماء المستخدم Ø
 
 #: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "لا توجد نتائج لعنوان البريد الإلكتروني %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "ستتسلم بريدا إلكترونيا يسألك توكيد %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:4018
@@ -9327,14 +9317,14 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4057
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr "خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لوجود طلب سابق لهذا الاسم."
 
 #: ../libpurple/protocols/oscar/oscar.c:4059
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لأن العنوان المعطى توجد أسماء "
@@ -9343,7 +9333,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لأن العنوان المعطى غير صالح."
 
@@ -9358,7 +9348,7 @@ msgstr "عطل في تغيير معلوÙ
 
 #: ../libpurple/protocols/oscar/oscar.c:4071
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "عنوان البريد الإلكتروني لـ %s هو %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4073
@@ -9622,15 +9612,15 @@ msgstr ""
 "اختيار \"أعِد طلب التصريح.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6361
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "ابحث عن صديق بالبريد"
 
 #: ../libpurple/protocols/oscar/oscar.c:6362
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "ابحث عن صديق بواسطة عنوان بريده الإلكتروني"
 
 #: ../libpurple/protocols/oscar/oscar.c:6363
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "أدخل عنوان البريد الإلكتروني للصديق الذي تبحث عنه."
 
 #: ../libpurple/protocols/oscar/oscar.c:6366
@@ -9660,11 +9650,11 @@ msgstr "أكّد الحساب"
 msgstr "أكّد الحساب"
 
 #: ../libpurple/protocols/oscar/oscar.c:6560
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "اعرض عناوين البريد الإلكتروني المسجلة حاليًا"
 
 #: ../libpurple/protocols/oscar/oscar.c:6564
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "غيّر عناوين البريد الإلكتروني المسجلة حاليًا..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6571
@@ -9672,7 +9662,7 @@ msgstr "اعرض الأصدقاء الذ
 msgstr "اعرض الأصدقاء الذين ينتظرون تصريحات"
 
 #: ../libpurple/protocols/oscar/oscar.c:6577
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "ابحث عن صديق بواسطة عنوان البريد الإلكتروني..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6582
@@ -9753,10 +9743,6 @@ msgstr "الكليّة"
 msgid "College"
 msgstr "الكليّة"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "البريد الإلكتروني"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "الرّمز البريديّ"
@@ -12503,7 +12489,7 @@ msgstr "اسم المستخدم: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "البريد الإلكتروني: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:370
@@ -12820,7 +12806,7 @@ msgstr "خدمة الدليل غير Ù…Ø
 msgstr "خدمة الدليل غير متاحة مؤقتا."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "البحث في البريد مقيد."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15875,7 +15861,7 @@ msgstr "لون رسم اسم رسالة 
 msgstr "لون رسم اسم رسالة إجراء."
 
 #: ../pidgin/gtkimhtml.c:1636
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "ا_نسخ عنوان البريد الإلكتروني"
 
 #: ../pidgin/gtkimhtml.c:1648
@@ -16292,8 +16278,8 @@ msgstr[5] "%2$Id رسالة جديدة Ù
 
 #: ../pidgin/gtknotify.c:575
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>لا بريد جديد.</b>"
 msgstr[1] "<b>لديك رسالة بريد واحدة جديدة.</b>"
 msgstr[2] "<b>لديك رسالتي بريد جديدتين.</b>"
@@ -17579,7 +17565,7 @@ msgstr "ا_ربط الصديق"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "تعذّر إرسال بريد إلكتروني"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
@@ -17587,7 +17573,7 @@ msgstr "لم يُعثر على ملف ا
 msgstr "لم يُعثر على ملف التشغيل لبرمجية إفلوشن في المسار (PATH)"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "لم يُعثر على عنوان بريد إلكتروني لهذا الصديق."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
@@ -17595,7 +17581,7 @@ msgstr "أضف إلى دفتر العنØ
 msgstr "أضف إلى دفتر العناوين"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "أرسل بريدا إلكترونيا"
 
 #. Configuration frame
@@ -17653,7 +17639,7 @@ msgstr "الاسم الأخير:"
 msgstr "الاسم الأخير:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
-msgid "E-mail:"
+msgid "Email:"
 msgstr "البريد الإلكتروني:"
 
 #. *< type
============================================================
--- po/az.po	7fdaa48da4ae36a70e454bdbdaf80dc1e4e75c2e
+++ po/az.po	886bdeaa55b61f319ee5d60dff998ae17bbb0b48
@@ -3563,7 +3563,7 @@ msgstr "Soyad:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr ""
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3599,17 +3599,6 @@ msgstr "Yeni Şəxs"
 msgid "Purple Person"
 msgstr "Yeni Şəxs"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "E-poçt:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5292,8 +5281,8 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "E-Poçt Ünvanı"
+msgid "Email Address"
+msgstr "Epoçt Ünvanı"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6350,7 +6339,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6905,7 +6894,7 @@ msgstr "Ev Səhifəsi"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Faylı Göndər"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6971,7 +6960,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Faylı Göndər"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8584,7 +8573,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8768,12 +8757,12 @@ msgstr "_Ləqəb"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8807,21 +8796,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8832,7 +8821,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9081,15 +9070,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9121,11 +9110,11 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9133,7 +9122,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9222,10 +9211,6 @@ msgstr "_Yığcamlaşdır"
 msgid "College"
 msgstr "_Yığcamlaşdır"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Epoçt"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr ""
@@ -11962,8 +11947,8 @@ msgstr ""
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-poçt:"
+msgid "Email: \t\t%s\n"
+msgstr "Epoçt:"
 
 #: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12310,7 +12295,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15245,7 +15230,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15647,8 +15632,8 @@ msgstr[1] "%s hesabınızda %d yeni mək
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -16927,7 +16912,7 @@ msgstr "Ə_laqə Əlaqələndir"
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Soket açıla bilmədi"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16935,7 +16920,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16944,7 +16929,7 @@ msgstr "Ünvan Kitabçasına Əlavə Et"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Faylı Göndər"
 
 #. Configuration frame
@@ -17003,8 +16988,8 @@ msgstr "Soyad:"
 msgstr "Soyad:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-poçt:"
+msgid "Email:"
+msgstr "Epoçt:"
 
 #. *< type
 #. *< ui_requirement
@@ -18138,7 +18123,7 @@ msgstr ""
 #~ msgid "%s (%d new/%d total)"
 #~ msgstr "%s (%d yeni/%d toplam)"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "Poçtu hər X saniyədə bir yoxla.\n"
 
 #~ msgid "Auto-login"
============================================================
--- po/be at latin.po	199eacfb745ca24dd2e1a581e04a4650154fa93c
+++ po/be at latin.po	0592e33ecf7d62f58693509074949efcd1047544
@@ -2766,8 +2766,8 @@ msgstr "Proźvišča"
 msgid "Last name"
 msgstr "Proźvišča"
 
-msgid "E-Mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr "Email"
 
 msgid "AIM Account"
 msgstr "Kont AIM"
@@ -2791,9 +2791,6 @@ msgstr "Asoba Purple"
 msgid "Purple Person"
 msgstr "Asoba Purple"
 
-msgid "E-mail"
-msgstr "E-mail"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3869,8 +3866,8 @@ msgstr ""
 msgstr ""
 "Zapoŭni adno ci niekalki paloŭ, kab šukać adpaviednych karystalnikaŭ XMPP."
 
-msgid "E-Mail Address"
-msgstr "Adras e-mail"
+msgid "Email Address"
+msgstr "Adras email"
 
 msgid "Search for XMPP users"
 msgstr "Å ukaj karystalnikaÅ­ XMPP"
@@ -4599,8 +4596,8 @@ msgstr "Syntaksyčnaja pamyłka (mahčym
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksyčnaja pamyłka (mahčyma, pamyłka klijenta)"
 
-msgid "Invalid e-mail address"
-msgstr "Niapravilny adras e-mail"
+msgid "Invalid email address"
+msgstr "Niapravilny adras email"
 
 msgid "User does not exist"
 msgstr "Karystalnik nie isnuje"
@@ -4957,8 +4954,8 @@ msgstr "Chatni faks"
 msgid "Home Fax"
 msgstr "Chatni faks"
 
-msgid "Personal E-Mail"
-msgstr "Persanalny E-mail"
+msgid "Personal Email"
+msgstr "Persanalny Email"
 
 msgid "Personal IM"
 msgstr "Persanalny kont chutkich paviedamleńniaŭ"
@@ -5000,8 +4997,8 @@ msgstr "PracoÅ­ny faks"
 msgid "Work Fax"
 msgstr "PracoÅ­ny faks"
 
-msgid "Work E-Mail"
-msgstr "PracoÅ­ny E-mail"
+msgid "Work Email"
+msgstr "PracoÅ­ny Email"
 
 msgid "Work IM"
 msgstr "Pracoŭny kont chutkich paviedamleńniaŭ"
@@ -6214,7 +6211,7 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Niemahčyma ŭvajści: niemahčyma ŭvajści jak %s, bo nazva karystalnika "
-"niapravilnaja. Nazvy karystalnikaŭ musiać być pravilnymi adrasami e-mail "
+"niapravilnaja. Nazvy karystalnikaŭ musiać być pravilnymi adrasami email "
 "albo pačynacca ź litary i ŭtrymlivać tolki litary, ličby j prabieły, albo "
 "tolki ličby."
 
@@ -6352,12 +6349,12 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Ty atrymaŭ/atrymała e-mail ICQ ad %s [%s]\n"
+"Ty atrymaŭ/atrymała email ICQ ad %s [%s]\n"
 "\n"
 "Paviedamleńnie:\n"
 "%s"
@@ -6504,11 +6501,11 @@ msgstr[2] "Nastupnyja nazvy karystalnika
 msgstr[2] "Nastupnyja nazvy karystalnikaŭ źviazanyja z %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Ničoha nia znojdziena dla adrasu e-maila %s"
+msgid "No results found for email address %s"
+msgstr "Ničoha nia znojdziena dla adrasu emaila %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Ty pavinny atrymać list z prośbaj paćvierdzić %s."
 
 msgid "Account Confirmation Requested"
@@ -6538,26 +6535,26 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Pamyłka 0x%04x: Niemahčyma źmianić adras e-mail, bo ŭžo adzin zapyt čakaje "
+"Pamyłka 0x%04x: Niemahčyma źmianić adras email, bo ŭžo adzin zapyt čakaje "
 "raźviazańnia dla hetaj nazvy karystalnika."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Pamyłka 0x%04x: Niemahčyma źmianić adras e-mail, bo akreśleny adras maje "
+"Pamyłka 0x%04x: Niemahčyma źmianić adras email, bo akreśleny adras maje "
 "nadta šmat nazvaŭ karystalnikaŭ, źviazanych ź im."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Pamyłka 0x%04x: Niemahčyma źmianić adras e-mail, bo akreśleny adras "
+"Pamyłka 0x%04x: Niemahčyma źmianić adras email, bo akreśleny adras "
 "niapravilny."
 
 #, c-format
@@ -6568,8 +6565,8 @@ msgstr "Pamyłka źmieny źviestak kontu
 msgstr "Pamyłka źmieny źviestak kontu"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Adras e-mail dla %s - %s"
+msgid "The email address for %s is %s"
+msgstr "Adras email dla %s - %s"
 
 msgid "Account Info"
 msgstr "Źviestki kontu"
@@ -6639,7 +6636,7 @@ msgstr ""
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Niemahčyma dadać siabra %s, bo nazva karystalnika niapravilnaja. Hetyja "
-"nazvy pavinny być albo pravilnym adrasam e-mail, albo pačynacca ź litary i "
+"nazvy pavinny być albo pravilnym adrasam email, albo pačynacca ź litary i "
 "ŭtrymlivać tolki litary, ličby j prabieły, albo ŭtrymlivać tolki ličby."
 
 msgid "Unable To Add"
@@ -6793,14 +6790,14 @@ msgstr ""
 "Ty možaš pierazapytać aŭtaryzacyi ŭ hetych siabroŭ, praz pravy klik i "
 "abraÅ­Å¡y \"Pierazapytaj aÅ­taryzacyi\"."
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Šukaj siabra pavodle e-maiłu"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Šukaj siabra pavodle adrasu e-maiłu"
 
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Akreśl adras e-mail siabra, jakoha ty šukaješ."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Akreśl adras email siabra, jakoha ty šukaješ."
 
 msgid "_Search"
 msgstr "Å _ukaj"
@@ -6822,17 +6819,17 @@ msgstr "Paćvierdź kont"
 msgid "Confirm Account"
 msgstr "Paćvierdź kont"
 
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Pakažy dziejna zarehistravany adras e-mail"
+msgid "Display Currently Registered Email Address"
+msgstr "Pakažy dziejna zarehistravany adras email"
 
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Źmiani dziejna zarehistravany adras e-mail..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Źmiani dziejna zarehistravany adras email..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pakažy siabroŭ, što čakajuć aŭtaryzacyi"
 
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Å ukaj siabra pavodle adrasu e-mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Å ukaj siabra pavodle adrasu email..."
 
 msgid "Search for Buddy by Information"
 msgstr "Šukaj siabra pavodle źviestak"
@@ -6896,9 +6893,6 @@ msgstr "Kaledž"
 msgid "College"
 msgstr "Kaledž"
 
-msgid "Email"
-msgstr "E-mail"
-
 msgid "Zipcode"
 msgstr "Zip-kod"
 
@@ -8657,8 +8651,8 @@ msgstr "Nazva karystalnika: %s\n"
 msgstr "Nazva karystalnika: %s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: %s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: %s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -8895,7 +8889,7 @@ msgstr "Servis katalohu časova niedastu
 msgid "Dir service temporarily unavailable."
 msgstr "Servis katalohu časova niedastupny."
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Pošuk pavodle e-maiłu abmiežavany."
 
 msgid "Keyword ignored."
@@ -11234,8 +11228,8 @@ msgstr "Uklučy infarmavańni pra nabor 
 msgid "Enable typing notification"
 msgstr "Uklučy infarmavańni pra nabor tekstu"
 
-msgid "_Copy E-Mail Address"
-msgstr "_Skapijuj adras e-mail"
+msgid "_Copy Email Address"
+msgstr "_Skapijuj adras email"
 
 msgid "_Open Link in Browser"
 msgstr "_Adčyni spasyłku ŭ hartačy"
@@ -11587,8 +11581,8 @@ msgstr[2] "%s maje %d novych paviedamleÅ
 msgstr[2] "%s maje %d novych paviedamleńniaŭ."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d novy list.</b>"
 msgstr[1] "<b>%d novyja listy.</b>"
 msgstr[2] "<b>%d novych listoÅ­.</b>"
@@ -12618,19 +12612,19 @@ msgstr "_Asacyjuj siabra"
 msgid "_Associate Buddy"
 msgstr "_Asacyjuj siabra"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Niemahčyma dasłać list"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Prahrama evolution nia znojdzienaja ŭ ściežcy pošuku prahram PATH."
 
-msgid "An e-mail address was not found for this buddy."
-msgstr "Adras e-mail dla hetaha siabra nia znojdzieny."
+msgid "An email address was not found for this buddy."
+msgstr "Adras email dla hetaha siabra nia znojdzieny."
 
 msgid "Add to Address Book"
 msgstr "Dadaj u adrasnuju knihu"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Dašli list"
 
 #. Configuration frame
@@ -12676,8 +12670,8 @@ msgstr "Proźvišča:"
 msgid "Last name:"
 msgstr "Proźvišča:"
 
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/bg.po	4d26efe78fb0720b31936b1beb13db1ea1342641
+++ po/bg.po	5cf6af3bf00e13598baf83c2a2226de38a7edeb6
@@ -3592,7 +3592,7 @@ msgstr "Фамилия"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Е-поща"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3627,17 +3627,6 @@ msgstr "Нов потребител"
 msgid "Purple Person"
 msgstr "Нов потребител"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "Е-поща:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5308,7 +5297,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Е-поща"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6379,7 +6368,7 @@ msgstr "Синтактична грешÐ
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Неправилен адрес на е-поща"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6936,7 +6925,7 @@ msgstr "Интернет адрес"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Лична страница в Интернет"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7005,7 +6994,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Е-поща"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8646,7 +8635,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8834,12 +8823,12 @@ msgstr "Име (номер):"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Няма резултати за електронен адрес %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 "Трябва да получите електронно съобщение, в което се иска да потвърдите %s."
 
@@ -8877,21 +8866,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Грешка 0x%04x: Електронният адрес не може да бъде сменен, тъй като "
@@ -8904,7 +8893,7 @@ msgstr "Грешка 0x%04x: НепозÐ
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Е-пощата на %s е %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9179,15 +9168,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Търсене потребител по електронен адрес"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Търсене на потребител по електронен адрес"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Задаване електронен адрес на потребителя, когото търсите."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9220,12 +9209,12 @@ msgstr "Потвърждение за а
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Показване на регистрираните до момента адреси"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Промяна на регистрираните до момента адреси..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9234,7 +9223,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Търсене на потребител по електронен адрес..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9329,10 +9318,6 @@ msgstr "_Разгръщане"
 msgid "College"
 msgstr "_Разгръщане"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Е-поща"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12107,7 +12092,7 @@ msgstr "Потребителско имÐ
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Е-поща: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12460,7 +12445,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15407,7 +15392,7 @@ msgstr "Цвят за оцветяван
 msgstr "Цвят за оцветяване на хипер-връзките."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Копиране на адреса на ел. поща"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15820,8 +15805,8 @@ msgstr[1] "%s има %d нови съоÐ
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>Настройки на приставката</b>"
 msgstr[1] "<b>Настройки на приставката</b>"
 
@@ -17100,7 +17085,7 @@ msgstr "Псевдоним за позн
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Писмото не може да бъде изпратено"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17108,7 +17093,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17116,7 +17101,7 @@ msgstr "Добавяне към адре
 msgstr "Добавяне към адресника"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Изпращане на е-поща"
 
 #. Configuration frame
@@ -17176,7 +17161,7 @@ msgstr "Фамилия:"
 msgstr "Фамилия:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Е-поща:"
 
 #. *< type
============================================================
--- po/bn.po	a592ca2d338748e4dcbddb2be76092cc6d0c9d46
+++ po/bn.po	450ebdabe6d577f95e90b44b3b769595b4bc700e
@@ -3557,19 +3557,6 @@ msgstr "পদবী"
 msgid "Last name"
 msgstr "পদবী"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "ইমেইল"
-
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
@@ -3601,16 +3588,6 @@ msgstr "নতুন ব্যক্তà
 msgid "Purple Person"
 msgstr "নতুন ব্যক্তি"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "ই-মেইল"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5278,7 +5255,7 @@ msgstr "জ্যাবার ব্যà
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ইমেইল"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6341,7 +6318,7 @@ msgstr "সিন্ট্যাক্à¦
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "অবৈধ ই‌মেইল ঠিকানা"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6886,7 +6863,7 @@ msgstr "বাসার ফ্যাকà
 msgstr "বাসার ফ্যাক্স"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "ব্যক্তিগত ইমেইল"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6948,7 +6925,7 @@ msgstr "অফিস ফ্যাক্à
 msgstr "অফিস ফ্যাক্স"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "অফিস ইমেইল"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8571,7 +8548,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8752,12 +8729,12 @@ msgstr "স্ক্রিন নাম"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8791,21 +8768,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8816,7 +8793,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9065,15 +9042,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9103,11 +9080,11 @@ msgstr "অ্যাকাউন্ট à
 msgstr "অ্যাকাউন্ট নিশ্চিতকরণ"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9115,7 +9092,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -11875,7 +11852,7 @@ msgstr "ব্যবহারকারà§
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "ইমেইল: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12214,7 +12191,7 @@ msgstr "সাময়িকভাবে à
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15077,7 +15054,7 @@ msgstr "হাইপারলিঙ্à¦
 msgstr "হাইপারলিঙ্কের ওপর মাউস থাকাকালীন রং"
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "ইমেইল ঠিকানা কপি করো (_C)"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15505,8 +15482,8 @@ msgstr[1] "%s-এর জন্য %dটà
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>আপনার %d গুলো নতুন ই-মেইল আছে।</b>"
 msgstr[1] "<b>আপনার %d গুলো নতুন ই-মেইল আছে।</b>"
 
@@ -16752,7 +16729,7 @@ msgstr "বন্ধুকে সমপà
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ইমেইল পাঠাতে ব্যর্থ"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16760,7 +16737,7 @@ msgstr "PATH-এর মধ্যে ইà
 msgstr "PATH-এর মধ্যে ইভোল্যুশনের এক্সেকিউটিবল্‌টি পাওয়া যায়নি। "
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16768,7 +16745,7 @@ msgstr "ঠিকানার বইয়à
 msgstr "ঠিকানার বইয়ে যোগ করুন"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ইমেইল পাঠান"
 
 #. Configuration frame
@@ -16827,7 +16804,7 @@ msgstr "পদবী:"
 msgstr "পদবী:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ইমেইল:"
 
 #. *< type
============================================================
--- po/bs.po	25bb29c0001eb08e48d4f887384fd2d904f75de0
+++ po/bs.po	db6a0d4d131df213a796b2431e02cb2916156c49
@@ -3617,7 +3617,7 @@ msgstr "Prezime:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3653,17 +3653,6 @@ msgstr "Nova osoba"
 msgid "Purple Person"
 msgstr "Nova osoba"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "Email:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5424,7 +5413,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Email adresa"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6509,8 +6498,8 @@ msgstr "Sintaksna greška (vjerovatno Ga
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Pogrešna e-mail adresa"
+msgid "Invalid email address"
+msgstr "Pogrešna email adresa"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -7073,7 +7062,7 @@ msgstr "Homepage"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Titula"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7142,7 +7131,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8828,12 +8817,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Primili ste ICQ e-mail od %s [%s]\n"
+"Primili ste ICQ email od %s [%s]\n"
 "\n"
 "Poruka je:\n"
 "%s"
@@ -9019,13 +9008,13 @@ msgstr "_Nadimak"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Nema pronadenih rezultata za e-mail adresu %s"
+msgid "No results found for email address %s"
+msgstr "Nema pronadenih rezultata za email adresu %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Trebali biste dobiti e-mail da potvrdite %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Trebali biste dobiti email da potvrdite %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -9064,28 +9053,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Greška 0x%04x: Nije moguce promjeniti e-mail adresu, jer vec postoji zahtjev "
+"Greška 0x%04x: Nije moguce promjeniti email adresu, jer vec postoji zahtjev "
 "u toku za ovo ime."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Greška 0x%04x: Nije moguce promjeniti e-mail adresu, jer data adresa ima i "
+"Greška 0x%04x: Nije moguce promjeniti email adresu, jer data adresa ima i "
 "suviše imena asociranih s njom."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Greška 0x%04x: Nije moguce promjeniti e-mail adresu, jer je data adresa "
+"Greška 0x%04x: Nije moguce promjeniti email adresu, jer je data adresa "
 "pogrešna."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
@@ -9095,7 +9084,7 @@ msgstr "Greška 0x%04x: Nepoznata grešk
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Email adresa za %s je %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9378,16 +9367,16 @@ msgstr ""
 "cete na njih desno-kliknuti i izabrati \"Ponovni zahtjev autorizacije.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
-msgstr "Potražite prijatelja preko e-maila"
+msgid "Find Buddy by Email"
+msgstr "Potražite prijatelja preko emaila"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
-msgstr "Pretraga za prijateljem preko e-mail adrese"
+msgid "Search for a buddy by email address"
+msgstr "Pretraga za prijateljem preko email adrese"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Ukucajte e-mail adresu prijatelja, kojeg tražite."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Ukucajte email adresu prijatelja, kojeg tražite."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
@@ -9419,12 +9408,12 @@ msgstr "Potvrdi account"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Prikaži trenutno registrovanu adresu"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Promjeni trenutno registrovanu adresu..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9433,8 +9422,8 @@ msgstr "Prikaži ocekujuce autorizacije 
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Traži prijatelja preko e-maila..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Traži prijatelja preko emaila..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
@@ -9526,10 +9515,6 @@ msgstr "_Collapse"
 msgid "College"
 msgstr "_Collapse"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12373,7 +12358,7 @@ msgstr "Korisnicko ime: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12728,8 +12713,8 @@ msgstr "Dir servis trenutno nedostupan."
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "Pregledanje e-maila zabranjeno."
+msgid "Email lookup restricted."
+msgstr "Pregledanje emaila zabranjeno."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -15750,8 +15735,8 @@ msgstr "Boja za bojenje hiperlinkova."
 msgstr "Boja za bojenje hiperlinkova."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Kopiraj e-mail adresu"
+msgid "_Copy Email Address"
+msgstr "_Kopiraj email adresu"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -16149,8 +16134,8 @@ msgstr[1] "%s ima %d novih poruka."
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17472,7 +17457,7 @@ msgstr "_Asociraj prijatelja"
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Nije moguce poslati poruku."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17480,7 +17465,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17489,7 +17474,7 @@ msgstr "Dodaj u adresar"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Email"
 
 #. Configuration frame
@@ -17549,7 +17534,7 @@ msgstr "Prezime:"
 msgstr "Prezime:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Email:"
 
 #. *< type
@@ -18473,7 +18458,7 @@ msgstr ""
 #~ msgid "%s (%d new/%d total)"
 #~ msgstr "%s (%d novo/%d totalno)"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "Provjeri mail svakih X sekundi.\n"
 
 #~ msgid "Use last matching buddy"
============================================================
--- po/ca.po	11bf742c85e71b13ba3993b011f34f3112386b90
+++ po/ca.po	216d4e1ca8470ff89b6dd1fcdb228658923e3890
@@ -2804,7 +2804,7 @@ msgstr "Cognoms"
 msgid "Last name"
 msgstr "Cognoms"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "Correu electrònic"
 
 msgid "AIM Account"
@@ -2830,9 +2830,6 @@ msgstr "Persona porpra"
 msgid "Purple Person"
 msgstr "Persona porpra"
 
-msgid "E-mail"
-msgstr "Correu electrònic"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3924,7 +3921,7 @@ msgstr ""
 msgstr ""
 "Introduïu un o més camps per cercar usuaris de XMPP que hi coincideixin."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Adreça de correu electrònic"
 
 msgid "Search for XMPP users"
@@ -4662,7 +4659,7 @@ msgstr "Error de sintaxi (probablement e
 msgstr "Error de sintaxi (probablement errada del client)"
 
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "L'adreça de correu no és vàlida"
 
 #, c-format
@@ -5068,7 +5065,7 @@ msgstr "Fax de casa"
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Correu electrònic personal"
 
 msgid "Personal IM"
@@ -5112,7 +5109,7 @@ msgstr "Fax de la feina"
 msgid "Work Fax"
 msgstr "Fax de la feina"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Correu electrònic de la feina"
 
 msgid "Work IM"
@@ -6497,7 +6494,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6640,11 +6637,11 @@ msgstr[1] "Els següents noms d'usuari e
 msgstr[1] "Els següents noms d'usuari estan associats amb %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "No s'han obtingut resultats per a l'adreça de correu %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Hauríeu de rebre un correu demanant-vos confirmar %s."
 
 msgid "Account Confirmation Requested"
@@ -6673,7 +6670,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè ja "
@@ -6681,7 +6678,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè "
@@ -6689,7 +6686,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Error 0x%04x: No s'ha pogut canviar l'adreça de correu perquè l'adreça "
@@ -6703,7 +6700,7 @@ msgstr "S'ha produït un error en canvia
 msgstr "S'ha produït un error en canviar la informació del compte"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "L'adreça de correu per a %s és %s"
 
 msgid "Account Info"
@@ -6918,13 +6915,13 @@ msgstr ""
 "Podeu tornar a demanar l'autorització d'aquests amics fent-hi clic a sobre "
 "amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Troba un amic per l'adreça de correu"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Cerca un amic per l'adreça de correu"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Escriviu l'adreça de correu de l'amic que estigueu cercant."
 
 msgid "_Search"
@@ -6947,16 +6944,16 @@ msgstr "Confirma el compte"
 msgid "Confirm Account"
 msgstr "Confirma el compte"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Mostra l'adreça actualment registrada"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Canvia l'adreça actualment registrada..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra els amics pendents d'autorització"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Cerca un amic per l'adreça de correu..."
 
 msgid "Search for Buddy by Information"
@@ -7024,9 +7021,6 @@ msgstr "Col·legi"
 msgid "College"
 msgstr "Col·legi"
 
-msgid "Email"
-msgstr "Correu electrònic"
-
 msgid "Zipcode"
 msgstr "Codi postal"
 
@@ -8789,7 +8783,7 @@ msgstr "Nom d'usuari: \t%s\n"
 msgstr "Nom d'usuari: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Correu electrònic: \t\t%s\n"
 
 #, c-format
@@ -9048,7 +9042,7 @@ msgstr "Servei de directori no disponibl
 msgstr "Servei de directori no disponible temporalment."
 
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Recerca per adreça de correu electrònic restringida."
 
 #, c-format
@@ -11433,7 +11427,7 @@ msgstr "Habilita les notificacions de qu
 msgid "Enable typing notification"
 msgstr "Habilita les notificacions de que s'està escrivint"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Copia l'adreça de correu"
 
 msgid "_Open Link in Browser"
@@ -11796,8 +11790,8 @@ msgstr[1] "%s té %d missatges nous."
 msgstr[1] "%s té %d missatges nous."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Teniu %d correu electrònic.</b>"
 msgstr[1] "<b>Teniu %d correus electrònics.</b>"
 
@@ -12845,20 +12839,20 @@ msgstr "_Associa l'amic"
 msgid "_Associate Buddy"
 msgstr "_Associa l'amic"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "No s'ha pogut enviar el correu electrònic."
 
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
 "No s'ha trobat l'executable de l'Evolution a la variable d'entorn PATH."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "No s'ha trobat cap adreça de correu electrònic per a aquest amic."
 
 msgid "Add to Address Book"
 msgstr "Afegeix a la llibreta d'adreces"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Envia un correu"
 
 #. Configuration frame
@@ -12906,7 +12900,7 @@ msgstr "Cognoms:"
 msgid "Last name:"
 msgstr "Cognoms:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Correu electrònic:"
 
 #. *< type
@@ -14971,7 +14965,7 @@ msgstr "Aquest connector és útil per a
 #~ msgid "Check Mail"
 #~ msgstr "Comprova el correu"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "Comprova el correu electrònic cada X segons.\n"
 
 #~ msgid "Auto-login"
============================================================
--- po/ca at valencia.po	f1f68c89bfcc958621721b353db43ad6fd99e692
+++ po/ca at valencia.po	57858a0b0e6a2963d0eb9c0e0c85ba05bf617c29
@@ -3586,7 +3586,7 @@ msgstr "Cognoms"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Adreça electrònica"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3618,16 +3618,6 @@ msgstr "Persona Purple"
 msgid "Purple Person"
 msgstr "Persona Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "Adreça electrònica"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5328,7 +5318,7 @@ msgstr "Introduïu un o més camps per c
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Adreça electrònica"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6404,7 +6394,7 @@ msgstr "Error de sintaxi (probablement e
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "L'adreça electrònica no és vàlida"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6946,7 +6936,7 @@ msgstr "Fax de casa"
 msgstr "Fax de casa"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Adreça electrònica personal"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7009,7 +6999,7 @@ msgstr "Fax faena"
 msgstr "Fax faena"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Adreça electrònica faena"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8704,7 +8694,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8892,12 +8882,12 @@ msgstr "Nom d'usuari"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "No s'han obtingut resultats per a l'adreça electrònica %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Hauríeu de rebre un correu demanant-vos confirmar %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8936,7 +8926,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça electrònica perquè ja hi ha una "
@@ -8945,7 +8935,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça electrònica perquè l'adreça "
@@ -8954,7 +8944,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Error 0x%04x: No s'ha pogut canviar l'adreça electrònica perquè l'adreça "
@@ -8967,7 +8957,7 @@ msgstr "Error 0x%04x: error desconegut."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "L'adreça electrònica per a %s és %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9246,15 +9236,15 @@ msgstr ""
 "amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Troba un amic per l'adreça electrònica"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Cerca un amic per l'adreça electrònica"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Escriviu l'adreça electrònica de l'amic que estigueu cercant."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9284,11 +9274,11 @@ msgstr "Confirma el compte"
 msgstr "Confirma el compte"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Mostra l'adreça actualment registrada"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Canvia l'adreça actualment registrada..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9296,7 +9286,7 @@ msgstr "Mostra els amics pendents d'auto
 msgstr "Mostra els amics pendents d'autorització"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Cerca un amic per l'adreça electrònica..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9387,10 +9377,6 @@ msgstr "Col·legi"
 msgid "College"
 msgstr "Col·legi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Adreça electrònica"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Codi postal"
@@ -12153,7 +12139,7 @@ msgstr "Nom d'usuari: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Adreça electrònica: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12498,7 +12484,7 @@ msgstr "Servei de directori no disponibl
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "La consulta d'adreces electròniques està restringida."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15421,7 +15407,7 @@ msgstr ""
 "sobre."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Copia l'adreça electrònica"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15869,8 +15855,8 @@ msgstr[1] "%s té %d missatges nous."
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>Teniu %d correu electrònic nou.</b>"
 msgstr[1] "<b>Teniu %d correus electrònics nous.</b>"
 
@@ -17128,7 +17114,7 @@ msgstr "_Associa amic"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "No s'ha pogut enviar el correu electrònic."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17137,7 +17123,7 @@ msgstr ""
 "No s'ha trobat l'executable de l'Evolution a la variable d'entorn PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "No s'ha trobat cap adreça electrònica per a este amic."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17145,7 +17131,7 @@ msgstr "Afig a la llibreta d'adreces"
 msgstr "Afig a la llibreta d'adreces"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Envia un correu"
 
 #. Configuration frame
@@ -17204,7 +17190,7 @@ msgstr "Cognoms:"
 msgstr "Cognoms:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Adreça electrònica:"
 
 #. *< type
============================================================
--- po/cs.po	8494358a528812c94074d3edfed9a3c4079816c6
+++ po/cs.po	2669d9de22860f9f51f82351df1535523cee3e5f
@@ -819,7 +819,7 @@ msgid "Emails"
 msgstr "Systémový záznam"
 
 msgid "Emails"
-msgstr "E-maily"
+msgstr "Emaily"
 
 msgid "You have mail!"
 msgstr "Přišla vám pošta!"
@@ -838,7 +838,7 @@ msgid "New Mail"
 msgstr[2] "%s (%s) má %d nových zpráv."
 
 msgid "New Mail"
-msgstr "Nový e-mail"
+msgstr "Nový email"
 
 #, c-format
 msgid "Info for %s"
@@ -2744,7 +2744,7 @@ msgstr "Příjmení"
 msgid "Last name"
 msgstr "Příjmení"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "Email"
 
 msgid "AIM Account"
@@ -2769,9 +2769,6 @@ msgstr "Osoba Purple"
 msgid "Purple Person"
 msgstr "Osoba Purple"
 
-msgid "E-mail"
-msgstr "E-mail"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3845,8 +3842,8 @@ msgstr "Hledejte odpovídající uživat
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Hledejte odpovídající uživatele XMPP vyplněním jedno nebo více polí."
 
-msgid "E-Mail Address"
-msgstr "E-mailová adresa"
+msgid "Email Address"
+msgstr "Emailová adresa"
 
 msgid "Search for XMPP users"
 msgstr "Hledat uživatele XMPP"
@@ -4572,8 +4569,8 @@ msgstr "Syntaktická chyba (pravděpodob
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaktická chyba (pravděpodobně chyba v klientovi)"
 
-msgid "Invalid e-mail address"
-msgstr "Neplatná e-mailová adresa"
+msgid "Invalid email address"
+msgstr "Neplatná emailová adresa"
 
 msgid "User does not exist"
 msgstr "Uživatel neexistuje"
@@ -4930,8 +4927,8 @@ msgstr "Osobní fax"
 msgid "Home Fax"
 msgstr "Osobní fax"
 
-msgid "Personal E-Mail"
-msgstr "Osobní e-mail"
+msgid "Personal Email"
+msgstr "Osobní email"
 
 msgid "Personal IM"
 msgstr "Osobní IM"
@@ -4973,8 +4970,8 @@ msgstr "Pracovní fax"
 msgid "Work Fax"
 msgstr "Pracovní fax"
 
-msgid "Work E-Mail"
-msgstr "Pracovní e-mail"
+msgid "Work Email"
+msgstr "Pracovní email"
 
 msgid "Work IM"
 msgstr "Pracovní IM"
@@ -6173,7 +6170,7 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Nemohu se přihlásit: Nemohu se přihlásit jako %s, protože jméno uživatele "
-"není platné. Jméno uživatele musí být platná e-mailová adresa nebo začínat "
+"není platné. Jméno uživatele musí být platná emailová adresa nebo začínat "
 "písmenem a obsahovat jen číslice, písmena a mezery, nebo obsahovat jen "
 "číslice."
 
@@ -6313,12 +6310,12 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Přijali jste e-mail ICQ od %s [%s]\n"
+"Přijali jste email ICQ od %s [%s]\n"
 "\n"
 "Zpráva je:\n"
 "%s"
@@ -6465,12 +6462,12 @@ msgstr[2] "Následující jména uživat
 msgstr[2] "Následující jména uživatele jsou asociována s %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Pro e-mailovou adresu %s nebyly nalezeny žádné výsledky"
+msgid "No results found for email address %s"
+msgstr "Pro emailovou adresu %s nebyly nalezeny žádné výsledky"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Měli byste dostat e-mail žádající o potvrzení %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Měli byste dostat email žádající o potvrzení %s."
 
 msgid "Account Confirmation Requested"
 msgstr "Požadováno potvrzení účtu"
@@ -6498,26 +6495,26 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože pro toto jméno "
+"Chyba 0x%04x: Nemohu změnit emailovou adresu, protože pro toto jméno "
 "uživatele již existuje požadavek."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa má "
+"Chyba 0x%04x: Nemohu změnit emailovou adresu, protože zadaná adresa má "
 "asociováno příliš mnoho jmen uživatelů."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa je "
+"Chyba 0x%04x: Nemohu změnit emailovou adresu, protože zadaná adresa je "
 "neplatná."
 
 #, c-format
@@ -6528,7 +6525,7 @@ msgstr "Chyba při změně informací o 
 msgstr "Chyba při změně informací o účtu"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Emailová adresa pro %s je %s"
 
 msgid "Account Info"
@@ -6595,7 +6592,7 @@ msgstr ""
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Nemohu přidat kamaráda %s, protože jméno uživatele není platné. Jméno "
-"uživatele musí být platná e-mailová adresa, nebo začínat písmenem a "
+"uživatele musí být platná emailová adresa, nebo začínat písmenem a "
 "obsahovat jen číslice, písmena a mezery, nebo obsahovat jen číslice."
 
 msgid "Unable To Add"
@@ -6745,14 +6742,14 @@ msgstr ""
 "Můžete znovu požádat o autorizaci od těchto kamarádů kliknutím na ně pravým "
 "tlačítkem a zvolením \"Znovu požádat o autorizaci.\""
 
-msgid "Find Buddy by E-Mail"
-msgstr "Hledat kamaráda podle e-mailu"
+msgid "Find Buddy by Email"
+msgstr "Hledat kamaráda podle emailu"
 
-msgid "Search for a buddy by e-mail address"
-msgstr "Hledat kamaráda podle e-mailové adresy"
+msgid "Search for a buddy by email address"
+msgstr "Hledat kamaráda podle emailové adresy"
 
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Zadejte e-mailovou adresu kamaráda, kterého hledáte."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Zadejte emailovou adresu kamaráda, kterého hledáte."
 
 msgid "_Search"
 msgstr "_Hledat"
@@ -6774,17 +6771,17 @@ msgstr "Potvrdit účet"
 msgid "Confirm Account"
 msgstr "Potvrdit účet"
 
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Zobrazit momentálně zaregistrovanou e-mailovou adresu"
+msgid "Display Currently Registered Email Address"
+msgstr "Zobrazit momentálně zaregistrovanou emailovou adresu"
 
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Změnit momentálně zaregistrovanou e-mailovou adresu..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Změnit momentálně zaregistrovanou emailovou adresu..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zobrazit kamarády čekající na autorizaci"
 
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Hledat kamaráda podle e-mailové adresy..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Hledat kamaráda podle emailové adresy..."
 
 msgid "Search for Buddy by Information"
 msgstr "Hledat kamaráda podle informací"
@@ -6849,9 +6846,6 @@ msgstr "Vysoká škola"
 msgid "College"
 msgstr "Vysoká škola"
 
-msgid "Email"
-msgstr "E-mail"
-
 msgid "Zipcode"
 msgstr "PSČ"
 
@@ -8601,8 +8595,8 @@ msgstr "Jméno uživatele: \t%s\n"
 msgstr "Jméno uživatele: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -8837,8 +8831,8 @@ msgstr "Adresářová služba momentáln
 msgid "Dir service temporarily unavailable."
 msgstr "Adresářová služba momentálně není k dispozici."
 
-msgid "E-mail lookup restricted."
-msgstr "Vyhledávání podle e-mailu omezeno."
+msgid "Email lookup restricted."
+msgstr "Vyhledávání podle emailu omezeno."
 
 msgid "Keyword ignored."
 msgstr "Klíčové slovo ignorováno."
@@ -11167,8 +11161,8 @@ msgstr "Povolit upozornění na psaní"
 msgid "Enable typing notification"
 msgstr "Povolit upozornění na psaní"
 
-msgid "_Copy E-Mail Address"
-msgstr "_Kopírovat e-mailovou adresu"
+msgid "_Copy Email Address"
+msgstr "_Kopírovat emailovou adresu"
 
 msgid "_Open Link in Browser"
 msgstr "_Otevřít odkaz v prohlížeči"
@@ -11518,11 +11512,11 @@ msgstr[2] "%s má %d nových zpráv."
 msgstr[2] "%s má %d nových zpráv."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d nový e-mail</b>"
-msgstr[1] "<b>%d nové e-maily</b>"
-msgstr[2] "<b>%d nových e-mailů</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d nový email</b>"
+msgstr[1] "<b>%d nové emaily</b>"
+msgstr[2] "<b>%d nových emailů</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12543,20 +12537,20 @@ msgstr "_Přiřadit kamaráda"
 msgid "_Associate Buddy"
 msgstr "_Přiřadit kamaráda"
 
-msgid "Unable to send e-mail"
-msgstr "Nemohu odeslat e-mail"
+msgid "Unable to send email"
+msgstr "Nemohu odeslat email"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Program evolution nebyl nalezen v PATH."
 
-msgid "An e-mail address was not found for this buddy."
-msgstr "Pro tohoto kamaráda nebyla nalezena e-mailová adresa."
+msgid "An email address was not found for this buddy."
+msgstr "Pro tohoto kamaráda nebyla nalezena emailová adresa."
 
 msgid "Add to Address Book"
 msgstr "Přidat do adresáře"
 
-msgid "Send E-Mail"
-msgstr "Odeslat e-mail"
+msgid "Send Email"
+msgstr "Odeslat email"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -12601,8 +12595,8 @@ msgstr "Příjmení:"
 msgid "Last name:"
 msgstr "Příjmení:"
 
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -13875,7 +13869,7 @@ msgstr "Tento zásuvný modul je užiteÄ
 #~ msgstr "<b>Stav</b>: %s"
 
 #~ msgid "EMail"
-#~ msgstr "E-mail"
+#~ msgstr "Email"
 
 #~ msgid "Re-type Passphrase"
 #~ msgstr "Heslo (znovu)"
============================================================
--- po/da.po	f5ecf94ea1d4a36ec7a1a2c1b53a3d173768ae76
+++ po/da.po	bf4e598223063d55f0fe7cd001c087404209213a
@@ -1162,7 +1162,7 @@ msgid "New Mail"
 
 #: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
-msgstr "Ny e-mail"
+msgstr "Ny email"
 
 #: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
@@ -3605,8 +3605,8 @@ msgstr "Efternavn"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3639,16 +3639,6 @@ msgstr "Ny person"
 msgid "Purple Person"
 msgstr "Ny person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5063,7 +5053,7 @@ msgid "Reachability Address"
 #: ../libpurple/protocols/jabber/buddy.c:1025
 #, fuzzy
 msgid "Reachability Address"
-msgstr "E-mail adresse"
+msgstr "Email adresse"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
@@ -5348,8 +5338,8 @@ msgstr "Udfyld et eller flere felter for
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "E-mail adresse"
+msgid "Email Address"
+msgstr "Email adresse"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6431,8 +6421,8 @@ msgstr "Syntaks fejl (sikkert en Gaim fe
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Ugyldig e-mail adresse"
+msgid "Invalid email address"
+msgstr "Ugyldig email adresse"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -6976,8 +6966,8 @@ msgstr "Hjemmefax"
 msgstr "Hjemmefax"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
-msgstr "Personlig e-mail"
+msgid "Personal Email"
+msgstr "Personlig email"
 
 #: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
@@ -7038,8 +7028,8 @@ msgstr "Arbejdsfax"
 msgstr "Arbejdsfax"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
-msgstr "Arbejds e-mail"
+msgid "Work Email"
+msgstr "Arbejds email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -8709,12 +8699,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Du har modtaget en ICQ e-mail fra %s [%s]\n"
+"Du har modtaget en ICQ email fra %s [%s]\n"
 "\n"
 "Beskeden er:\n"
 "%s"
@@ -8899,13 +8889,13 @@ msgstr "Skærmnavn"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Ingen resultater fundet for post-adressen %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Du bør modtage en e-mail for at acceptere %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Du bør modtage en email for at acceptere %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -8942,28 +8932,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Fejl 0x%04x: UDe i stand til at ændre e-mail adresse, fordi der allerede er "
+"Fejl 0x%04x: UDe i stand til at ændre email adresse, fordi der allerede er "
 "en anmodning ventende for dette brugernavn."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Fejl 0x%04x: Ikke i stand til at ændre e-mail adresse, fordi den angivne "
+"Fejl 0x%04x: Ikke i stand til at ændre email adresse, fordi den angivne "
 "adresse har for mange brugernavne tilknyttet til sig."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Fejl 0x%04x: Ikke i stand til at ændre e-mail adresse, fordi den angivne "
+"Fejl 0x%04x: Ikke i stand til at ændre email adresse, fordi den angivne "
 "adresse er ugyldig."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
@@ -8973,7 +8963,7 @@ msgstr "Fejl 0x%04x: Ukendt fejl."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s's post-adresse er %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9252,16 +9242,16 @@ msgstr ""
 "og vælge \"Anmod om ny godkendelse\"."
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
-msgstr "Find ven udfra e-mail adresse"
+msgid "Find Buddy by Email"
+msgstr "Find ven udfra email adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
-msgstr "Søg efter en ven udfra e-mail adresse"
+msgid "Search for a buddy by email address"
+msgstr "Søg efter en ven udfra email adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Indtast e-mail adressen på vennen du søger efter."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Indtast email adressen på vennen du søger efter."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
@@ -9290,11 +9280,11 @@ msgstr "Bekræft Konto"
 msgstr "Bekræft Konto"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Vis nuværende registrede e-post adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Skift nuværende registrede e-post adresse..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9302,7 +9292,7 @@ msgstr "Vis venner der afventer godkende
 msgstr "Vis venner der afventer godkendelse"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Søg efter ven udfra e-post adresse..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9391,10 +9381,6 @@ msgstr "Fold sammen"
 msgid "College"
 msgstr "Fold sammen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-post"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Postnummer"
@@ -12157,8 +12143,8 @@ msgstr "Brugernavn. \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12500,8 +12486,8 @@ msgstr "Søgetjeneste midlertidigt utilg
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "E-mail søgning er begrænset."
+msgid "Email lookup restricted."
+msgstr "Email søgning er begrænset."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -15419,8 +15405,8 @@ msgstr "Farve som hyperlinks skal være 
 msgstr "Farve som hyperlinks skal være når musen er over dem."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Kopier e-mail adresse"
+msgid "_Copy Email Address"
+msgstr "_Kopier email adresse"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -15860,8 +15846,8 @@ msgstr[1] "%s har %d nye beskeder."
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>Du har %d nye meddelelser.</b>"
 msgstr[1] "<b>Du har %d nye meddelelser.</b>"
 
@@ -17117,15 +17103,15 @@ msgstr "_Associér ven"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "Kunne ikke sende e-mail."
+msgid "Unable to send email"
+msgstr "Kunne ikke sende email."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Den ekskvebar Evolution fil blev ikke fundet i PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "En e-post-adresse blev ikke fundet for denne ven."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17133,8 +17119,8 @@ msgstr "Tilføj til adressebog"
 msgstr "Tilføj til adressebog"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "Send e-mail"
+msgid "Send Email"
+msgstr "Send email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -17191,8 +17177,8 @@ msgstr "Efternavn:"
 msgstr "Efternavn:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/de.po	b3ed8d3b8bb91e3eaeb7d11e5248afa470aa6b93
+++ po/de.po	ae77ff6c9217d00f05e70799fe0dd8b45cae83c3
@@ -837,7 +837,7 @@ msgid "Emails"
 msgstr "System-Mitschnitt"
 
 msgid "Emails"
-msgstr "E-Mails"
+msgstr "Emails"
 
 msgid "You have mail!"
 msgstr "Sie haben Post!"
@@ -2784,8 +2784,8 @@ msgstr "Nachname"
 msgid "Last name"
 msgstr "Nachname"
 
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 msgid "AIM Account"
 msgstr "AIM-Konto"
@@ -2809,9 +2809,6 @@ msgstr "Purple-Person"
 msgid "Purple Person"
 msgstr "Purple-Person"
 
-msgid "E-mail"
-msgstr "E-Mail"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3899,8 +3896,8 @@ msgstr ""
 "Füllen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
 "Benutzern zu suchen."
 
-msgid "E-Mail Address"
-msgstr "E-Mail-Adresse"
+msgid "Email Address"
+msgstr "Email-Adresse"
 
 msgid "Search for XMPP users"
 msgstr "Suche nach XMPP-Benutzern"
@@ -4637,8 +4634,8 @@ msgstr "Syntaxfehler (wahrscheinlich ein
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfehler (wahrscheinlich ein Client-Bug)"
 
-msgid "Invalid e-mail address"
-msgstr "Ungültige E-Mail-Adresse"
+msgid "Invalid email address"
+msgstr "Ungültige Email-Adresse"
 
 msgid "User does not exist"
 msgstr "Benutzer existiert nicht"
@@ -4810,8 +4807,8 @@ msgstr "%s anstoßen..."
 msgid "Nudging %s..."
 msgstr "%s anstoßen..."
 
-msgid "E-mail Address..."
-msgstr "E-Mail-Adresse..."
+msgid "Email Address..."
+msgstr "Email-Adresse..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Ihr neuer MSN-Benutzername zu lang."
@@ -4999,8 +4996,8 @@ msgstr "Fax (privat)"
 msgid "Home Fax"
 msgstr "Fax (privat)"
 
-msgid "Personal E-Mail"
-msgstr "E-Mail (privat)"
+msgid "Personal Email"
+msgstr "Email (privat)"
 
 msgid "Personal IM"
 msgstr "IM (privat)"
@@ -5042,8 +5039,8 @@ msgstr "Fax (geschäftlich)"
 msgid "Work Fax"
 msgstr "Fax (geschäftlich)"
 
-msgid "Work E-Mail"
-msgstr "E-Mail (geschäftlich)"
+msgid "Work Email"
+msgstr "Email (geschäftlich)"
 
 msgid "Work IM"
 msgstr "IM (geschäftlich)"
@@ -6278,7 +6275,7 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Anmeldung fehlgeschlagen: Sie konnten nicht als %s angemeldet werden, da der "
-"Benutzername fehlerhaft ist.  Benutzernamen müssen gültige E-Mail-Adressen "
+"Benutzername fehlerhaft ist.  Benutzernamen müssen gültige Email-Adressen "
 "sein oder mit einem Buchstaben beginnen und nur Buchstaben, Ziffern und "
 "Leerzeichen enthalten oder nur aus Ziffern bestehen."
 
@@ -6422,12 +6419,12 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Sie haben eine ICQ-E-Mail empfangen von %s [%s]\n"
+"Sie haben eine ICQ-Email empfangen von %s [%s]\n"
 "\n"
 "Nachricht:\n"
 "%s"
@@ -6577,13 +6574,13 @@ msgstr[1] "Die folgenden Benutzernamen s
 msgstr[1] "Die folgenden Benutzernamen sind verbunden mit %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Keine Ergebnisse für die E-Mail-Adresse %s gefunden"
+msgid "No results found for email address %s"
+msgstr "Keine Ergebnisse für die Email-Adresse %s gefunden"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
-"Sie sollten eine E-Mail erhalten, in der Sie aufgefordert werden, %s zu "
+"Sie sollten eine Email erhalten, in der Sie aufgefordert werden, %s zu "
 "bestätigen."
 
 msgid "Account Confirmation Requested"
@@ -6613,26 +6610,26 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Error 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon eine "
+"Error 0x%04x: Kann die Email-Adresse nicht ändern, weil es schon eine "
 "laufende Anfrage für diesen Benutzernamen gibt."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil zu dieser Adresse "
+"Fehler 0x%04x: Kann die Email-Adresse nicht ändern, weil zu dieser Adresse "
 "schon zu viele Benutzernamen gehören."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil die angegebene "
+"Fehler 0x%04x: Kann die Email-Adresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
 #, c-format
@@ -6643,8 +6640,8 @@ msgstr "Fehler beim Ändern der Konten-I
 msgstr "Fehler beim Ändern der Konten-Information"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Die E-Mail-Adresse für %s ist %s"
+msgid "The email address for %s is %s"
+msgstr "Die Email-Adresse für %s ist %s"
 
 msgid "Account Info"
 msgstr "Konto-Info"
@@ -6708,7 +6705,7 @@ msgstr ""
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Konnte den Buddy %s nicht hinzufügen, da der Benutzername falsch ist.  "
-"Benutzernamen müssen gültige E-Mail-Adressen sein oder mit einem Buchstaben "
+"Benutzernamen müssen gültige Email-Adressen sein oder mit einem Buchstaben "
 "beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten oder nur aus "
 "Ziffern bestehen."
 
@@ -6866,14 +6863,14 @@ msgstr ""
 "den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
 "fragen“ auswählen."
 
-msgid "Find Buddy by E-Mail"
-msgstr "Suche Buddys nach E-Mail-Adresse"
+msgid "Find Buddy by Email"
+msgstr "Suche Buddys nach Email-Adresse"
 
-msgid "Search for a buddy by e-mail address"
-msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
+msgid "Search for a buddy by email address"
+msgstr "Suche nach einem Buddy mit einer bestimmten Email-Adresse"
 
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Geben Sie die E-Mail-Adresse des Buddys ein, nach dem Sie suchen."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Geben Sie die Email-Adresse des Buddys ein, nach dem Sie suchen."
 
 msgid "_Search"
 msgstr "_Suchen"
@@ -6895,17 +6892,17 @@ msgstr "Konto bestätigen"
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
+msgid "Display Currently Registered Email Address"
+msgstr "Zeige die aktuell registrierte Email-Adresse"
 
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Ändere die aktuell registrierte Email-Adresse..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Suche Buddys nach E-Mail-Adresse..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Suche Buddys nach Email-Adresse..."
 
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
@@ -6970,9 +6967,6 @@ msgstr "College"
 msgid "College"
 msgstr "College"
 
-msgid "Email"
-msgstr "E-Mail"
-
 msgid "Zipcode"
 msgstr "PLZ"
 
@@ -8745,8 +8739,8 @@ msgstr "Benutzername: \t%s\n"
 msgstr "Benutzername: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -8993,8 +8987,8 @@ msgstr "Verzeichnis-Dienst ist zur Zeit 
 msgid "Dir service temporarily unavailable."
 msgstr "Verzeichnis-Dienst ist zur Zeit nicht verfügbar."
 
-msgid "E-mail lookup restricted."
-msgstr "E-Mail-Suche eingeschränkt."
+msgid "Email lookup restricted."
+msgstr "Email-Suche eingeschränkt."
 
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
@@ -11393,8 +11387,8 @@ msgstr "Tipp-Benachrichtigung aktivieren
 msgid "Enable typing notification"
 msgstr "Tipp-Benachrichtigung aktivieren"
 
-msgid "_Copy E-Mail Address"
-msgstr "Kopiere _E-Mail-Adresse"
+msgid "_Copy Email Address"
+msgstr "Kopiere _Email-Adresse"
 
 msgid "_Open Link in Browser"
 msgstr "Ö_ffne Link im Browser"
@@ -11763,10 +11757,10 @@ msgstr[1] "%s hat %d neue Nachrichten."
 msgstr[1] "%s hat %d neue Nachrichten."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d neue E-Mail.</b>"
-msgstr[1] "<b>%d neue E-Mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d neue Email.</b>"
+msgstr[1] "<b>%d neue Emails.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12850,20 +12844,20 @@ msgstr "_Assoziiere den Buddy"
 msgid "_Associate Buddy"
 msgstr "_Assoziiere den Buddy"
 
-msgid "Unable to send e-mail"
-msgstr "E-Mail konnte nicht gesendet werden"
+msgid "Unable to send email"
+msgstr "Email konnte nicht gesendet werden"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Die ausführbare Evolution-Datei wurde nicht im Pfad (PATH) gefunden."
 
-msgid "An e-mail address was not found for this buddy."
-msgstr "Für diesen Buddy wurde keine E-Mail-Adresse gefunden."
+msgid "An email address was not found for this buddy."
+msgstr "Für diesen Buddy wurde keine Email-Adresse gefunden."
 
 msgid "Add to Address Book"
 msgstr "Zum Adressbuch hinzufügen"
 
-msgid "Send E-Mail"
-msgstr "E-Mail senden"
+msgid "Send Email"
+msgstr "Email senden"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -12912,8 +12906,8 @@ msgstr "Nachname:"
 msgid "Last name:"
 msgstr "Nachname:"
 
-msgid "E-mail:"
-msgstr "E-Mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -12966,7 +12960,7 @@ msgstr ""
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"Fügt eine kleine Box zur Buddy-Liste hinzu, die zeigt, ob Sie neue E-Mails "
+"Fügt eine kleine Box zur Buddy-Liste hinzu, die zeigt, ob Sie neue Emails "
 "haben."
 
 msgid "Markerline"
============================================================
--- po/dz.po	1dc1c82c287121fd6869ea52b4b6086c33e83ce8
+++ po/dz.po	f9d2f8b339e6651edc80fc02003a580fa079432d
@@ -3608,7 +3608,7 @@ msgstr "མཇུག་མིང་།"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "གློག་འཕྲིན།"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3642,16 +3642,6 @@ msgstr "གང་ཟག་གསརཔà¼
 msgid "Purple Person"
 msgstr "གང་ཟག་གསརཔ།"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "གློག་-འཕྲིན།"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "བཱོན་ཇོར།"
@@ -5357,7 +5347,7 @@ msgstr "མཐུན་པའི་ཇà½
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "གློག་འཕྲིན་ཁ་བྱང་།"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6437,7 +6427,7 @@ msgstr " ཚིག་སྦྱོར་à
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "གློག་-འཕྲིན་ཁ་བྱང་ནུས་མེད།"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6985,7 +6975,7 @@ msgstr "ཁྱིམ་དཔར་འà½
 msgstr "ཁྱིམ་དཔར་འཕྲིན།"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "རང་དོན་གློག་-འཕྲིན།"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7048,7 +7038,7 @@ msgstr "ལཱ་གཡོག་ དཔà
 msgstr "ལཱ་གཡོག་ དཔར་འཕྲིན།"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "གློག་འཕྲིན་ ལཱ་གཡོག"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8723,7 +8713,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8921,12 +8911,12 @@ msgstr "གསལ་གཞི་མིà½
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "གློག་འཕྲིན་ཁ་བྱང་ %s ལུ་ གྲུབ་འབྲས་ཚུ་མ་ཐོབ་པས།"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s ངེས་དཔྱད་ལུ་འདྲི་དཔྱད་འབད་ཟེར་བའི་གློག་-འཕྲིན་གཅིག་ཐོབ་དགོཔ་ཨིན།"
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8964,7 +8954,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "འཛོལ་བ་ 0x%04x: འ་ནི་གསལ་གཞི་ལུ་ཧེ་མ་ལས་རང་ཞུ་བ་གཅིག་བསྣར་ཏེ་ཡོདཔ་ལས་ གློག་-འཕྲིན་ཁ་བྱང་བསྒྱུར་"
@@ -8973,7 +8963,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "འཛོལ་བ་ 0x%04x: གློག་འཕྲིན་ཁ་བྱང་བསྒྱུར་བཅོས་འབད་མི་ཚུགས་པས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ བྱིན་ཏེ་ཡོད་པའི་ཁ་"
@@ -8982,7 +8972,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "འཛོལ་བ་ 0x%04x: བྱིན་ཏེ་ཡོད་པའི་ཁ་བྱང་འདི་ནུས་མེད་གཅིག་ཨིནམ་ལས་ གློག་-འཕྲིན་ཁ་བྱང་བསྒྱུར་བཅོས་འབད་"
@@ -8995,7 +8985,7 @@ msgstr "འཛོལ་བ 0x%04x:ངོ
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s ལུ་གློག་འཕྲིན་ཁ་བྱང་འདི་ %s ཨིན།"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9274,15 +9264,15 @@ msgstr ""
 "ཀྱིས་ཆ་རོགས་ཚུ་ནང་ལས་ དབང་སྤྲོད་སླར་ཞུ་ཚུགས།"
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "གློག་-འཕྲིན་གྱི་ཐོག་ལས་ ཆ་རོགས་འཚོལ།"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "གློག་འཕྲིན་གྱི་ཐོག་ལས་ཆ་རོགས་ཅིག་གི་དོན་ལུ་འཚོལ་ཞིབ་འབད།"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "ཁྱོད་ཀྱིས་འཚོལ་ཞིབ་འབད་བའི་བསྒང་གི་  ཆ་རོགས་ཀྱི་གློག་འཕྲིན་ཁ་བྱང་འདི་ཡིག་དཔར་རྐྱབས།"
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9313,11 +9303,11 @@ msgstr "རྩིས་ཐོ་ངེà½
 msgstr "རྩིས་ཐོ་ངེས་གཏན་བཟོ།"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "ད་ལྟོ་ ཐོ་འགོད་འབད་ཡོད་པའི་གློག་-འཕྲིན་ཁ་བྱང་འདི་ བཀྲམ་སྟོན་འབད།"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "ད་ལྟོ་ ཐོ་འགོད་འབད་ཡོད་པའི་གློག་-འཕྲིན་ཁ་བྱང་འདི་ བསྒྱུར་བཅོས་འབད།..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9325,7 +9315,7 @@ msgstr "དབང་སྤྲོད་à½
 msgstr "དབང་སྤྲོད་བསྒུག་བཞིན་དུའི་ཆ་རོགས་ཚུ་སྟོན།"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "གློག་འཕྲིན་ཁ་བྱང་གིས་ཐོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད།..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9415,10 +9405,6 @@ msgstr "མཐོ་རིམ་སླà½
 msgid "College"
 msgstr "མཐོ་རིམ་སློབ་གྲྭ།"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "གློག་འཕྲིན།"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "གནས་ཨང་།"
@@ -12187,7 +12173,7 @@ msgstr "ལག་ལེན་པའིà¼
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "གློག་-འཕྲིན་: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12534,7 +12520,7 @@ msgstr "Dir ཞབས་ཏོག་འà
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "གློག་འཕྲིན་བལྟ་ནི་བཀག་དམ་འབད་ཡོདཔ།"
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15460,7 +15446,7 @@ msgstr "མཱའུསི་འདིà¼
 msgstr "མཱའུསི་འདི་ ཁོང་རའི་གུ་ལུ་ཡོདཔ་ད་ ཚད་བརྒལ་འབྲེལ་ལམ་ཚུ་འབྲི་ནིའི་ཚོས་གཞི།"
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "གློག་འཕྲིན་འདྲ་བཤུས་རྐྱབས(_C)"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15899,8 +15885,8 @@ msgstr[1] "%s ལུ %d འཕྲིནà
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>པ་ལག་ཨིན་རྒྱས་བཤད་ཚུ།</b>"
 msgstr[1] "<b>པ་ལག་ཨིན་རྒྱས་བཤད་ཚུ།</b>"
 
@@ -17173,7 +17159,7 @@ msgstr "འབྲེལ་བའི་à½
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "གློག་-འཕྲིན་གཏང་མ་ཚུགས།"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17181,7 +17167,7 @@ msgstr "ལག་ལེན་འཐབà¼
 msgstr "ལག་ལེན་འཐབ་བཏུབ་པའི་ཨི་བོ་ལུ་ཤཱན་འདི་ འགྲུལ་ལམ་ནང་བ་ཐོབ་པས།"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17189,7 +17175,7 @@ msgstr "ཁ་བྱང་ཀི་དà½
 msgstr "ཁ་བྱང་ཀི་དེབ་ལུ་ཁ་སྐོང་རྐྱབས།"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "གློག་-འཕྲིན་གཏང་།"
 
 #. Configuration frame
@@ -17247,7 +17233,7 @@ msgstr "མཇུག་མིང་:"
 msgstr "མཇུག་མིང་:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "གློག་འཕྲིན།"
 
 #. *< type
============================================================
--- po/el.po	9b4b006967f7000b3891c3d6bb982e0e6344b0c1
+++ po/el.po	5ac7855f1f8ac87c4177f27d1ea612185d76e183
@@ -3856,8 +3856,8 @@ msgstr "Επώνυμο"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:401
 #: ../libpurple/protocols/bonjour/bonjour.c:707
@@ -3888,16 +3888,6 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:988
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5559,8 +5549,8 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/oscar/oscar.c:3756
-msgid "E-Mail Address"
-msgstr "Διεύθυνση e-mail"
+msgid "Email Address"
+msgstr "Διεύθυνση email"
 
 #: ../libpurple/protocols/jabber/buddy.c:2427
 #: ../libpurple/protocols/jabber/buddy.c:2428
@@ -6606,8 +6596,8 @@ msgstr "Σφάλμα σύνταξης (Ï
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
-msgstr "Μη έγκυρη διεύθυνση e-mail"
+msgid "Invalid email address"
+msgstr "Μη έγκυρη διεύθυνση email"
 
 #: ../libpurple/protocols/msn/error.c:49
 #: ../libpurple/protocols/msnp9/error.c:49
@@ -7218,8 +7208,8 @@ msgstr "Fax οικίας"
 
 #: ../libpurple/protocols/msn/msn.c:1812
 #: ../libpurple/protocols/msnp9/msn.c:1668
-msgid "Personal E-Mail"
-msgstr "Προσωπικό E-Mail"
+msgid "Personal Email"
+msgstr "Προσωπικό Email"
 
 #: ../libpurple/protocols/msn/msn.c:1813
 #: ../libpurple/protocols/msnp9/msn.c:1669
@@ -7294,8 +7284,8 @@ msgstr "Fax εργασίας"
 
 #: ../libpurple/protocols/msn/msn.c:1843
 #: ../libpurple/protocols/msnp9/msn.c:1699
-msgid "Work E-Mail"
-msgstr "E-mail εργασίας"
+msgid "Work Email"
+msgstr "Email εργασίας"
 
 #: ../libpurple/protocols/msn/msn.c:1844
 #: ../libpurple/protocols/msnp9/msn.c:1700
@@ -9125,12 +9115,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Λάβατε ένα ICQ e-mail από %s [%s]\n"
+"Λάβατε ένα ICQ email από %s [%s]\n"
 "\n"
 "Το μήνυμα είναι:\n"
 "%s"
@@ -9310,13 +9300,13 @@ msgstr "Εμφανιζόμενο όνοÎ
 
 #: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Δε βρέθηκαν αποτελέσματα για τη διεύθυνση e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Δε βρέθηκαν αποτελέσματα για τη διεύθυνση email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Πρέπει να λάβετε ένα e-mail επιβεβαίωσης του %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Πρέπει να λάβετε ένα email επιβεβαίωσης του %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Account Confirmation Requested"
@@ -9354,7 +9344,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Σφάλμα 0x%04x: Αδυναμία αλλαγής της ηλ. διεύθυνσης επειδή υπάρχει μία αίτηση "
@@ -9363,7 +9353,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4050
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Σφάλμα 0x%04x: Αδυναμία αλλαγής της ηλ. διεύθυνσης επειδή η διεύθυνση που "
@@ -9372,7 +9362,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Error 0x%04x: Αδυναμία αλλαγής της ηλ. διεύθυνσης επειδή η διεύθυνση που "
@@ -9385,8 +9375,8 @@ msgstr "Error 0x%04x: Άγνωστο σÏ
 
 #: ../libpurple/protocols/oscar/oscar.c:4066
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Η διεύθυνση e-mail του %s είναι %s"
+msgid "The email address for %s is %s"
+msgstr "Η διεύθυνση email του %s είναι %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4068
 msgid "Account Info"
@@ -9662,16 +9652,16 @@ msgstr ""
 "επάνω τους και επιλέγοντας \"Αίτηση έγκρισης (ξανά).\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6334
-msgid "Find Buddy by E-Mail"
-msgstr "Εύρεση φίλου με e-mail"
+msgid "Find Buddy by Email"
+msgstr "Εύρεση φίλου με email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6335
-msgid "Search for a buddy by e-mail address"
-msgstr "Αναζήτηση ενός φίλου με e-mail"
+msgid "Search for a buddy by email address"
+msgstr "Αναζήτηση ενός φίλου με email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6336
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Πληκτρολογείστε το e-mail του φίλου που ψάχνετε."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Πληκτρολογείστε το email του φίλου που ψάχνετε."
 
 #: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "_Search"
@@ -9700,20 +9690,20 @@ msgstr "Επιβεβαίωση λογαÏ
 msgstr "Επιβεβαίωση λογαριασμού"
 
 #: ../libpurple/protocols/oscar/oscar.c:6533
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Εμφάνιση καταχωρημένης διεύθυνσης e-mail"
+msgid "Display Currently Registered Email Address"
+msgstr "Εμφάνιση καταχωρημένης διεύθυνσης email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6537
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Αλλαγή καταχωρημένης διεύθυνσης e-mail..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Αλλαγή καταχωρημένης διεύθυνσης email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Εμφάνιση φίλων που περιμένουν έγκριση"
 
 #: ../libpurple/protocols/oscar/oscar.c:6550
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Αναζήτηση φίλου με e-mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Αναζήτηση φίλου με email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Search for Buddy by Information"
@@ -9794,10 +9784,6 @@ msgstr "Κολέγιο"
 msgid "College"
 msgstr "Κολέγιο"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Ταχ. Κώδικας"
@@ -12521,8 +12507,8 @@ msgstr "Όνομα χρήστη: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12842,8 +12828,8 @@ msgstr "Η υπηρεσία καταλό
 msgstr "Η υπηρεσία καταλόγου είναι προσωρινά μη διαθέσιμη."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
-msgstr "Απαγορεύεται η εύρεση e-mail."
+msgid "Email lookup restricted."
+msgstr "Απαγορεύεται η εύρεση email."
 
 #: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
@@ -15868,8 +15854,8 @@ msgstr "Χρώμα που θα ζωγρÎ
 msgstr "Χρώμα που θα ζωγραφίζεται το όνομα ενός μηνύματος ενέργειας."
 
 #: ../pidgin/gtkimhtml.c:1632
-msgid "_Copy E-Mail Address"
-msgstr "_Αντιγραφή διεύθυνσης e-mail"
+msgid "_Copy Email Address"
+msgstr "_Αντιγραφή διεύθυνσης email"
 
 #: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
@@ -16277,10 +16263,10 @@ msgstr[1] "%s έχει %d νέα μηνÏ
 
 #: ../pidgin/gtknotify.c:575
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>Έχετε %d νέο e-mail.</b>"
-msgstr[1] "<b>Έχετε %d νέα e-mail.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>Έχετε %d νέο email.</b>"
+msgstr[1] "<b>Έχετε %d νέα email.</b>"
 
 #: ../pidgin/gtknotify.c:1008
 #, c-format
@@ -17596,24 +17582,24 @@ msgstr "_Συσχέτιση φίλου"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "Αδυναμία αποστολής e-mail"
+msgid "Unable to send email"
+msgstr "Αδυναμία αποστολής email"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Το εκτελέσιμο evolution δε βρέθηκε στη ΔΙΑΔΡΟΜΉ."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
-msgstr "Δε βρέθηκε διεύθυνση e-mail για αυτόν το φίλο."
+msgid "An email address was not found for this buddy."
+msgstr "Δε βρέθηκε διεύθυνση email για αυτόν το φίλο."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Προσθήκη στο βιβλίο διευθύνσεων"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "Αποστολή e-mail"
+msgid "Send Email"
+msgstr "Αποστολή email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -17674,8 +17660,8 @@ msgstr "Επώνυμο:"
 msgstr "Επώνυμο:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/en_AU.po	22e6472214e47e6373dea9e8c459be4b9d131487
+++ po/en_AU.po	1074bc107f8da5586ec8055ad9dded7431a1ec0b
@@ -1173,7 +1173,7 @@ msgid "New Mail"
 #: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 #, fuzzy
 msgid "New Mail"
-msgstr "E-Mail"
+msgstr "Email"
 
 #: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
@@ -3631,8 +3631,8 @@ msgstr "Last name:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3667,17 +3667,6 @@ msgstr "New Person"
 msgid "Purple Person"
 msgstr "New Person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "E-mail:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5443,14 +5432,14 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "E-Mail Address"
+msgid "Email Address"
+msgstr "Email Address"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
 #, fuzzy
 msgid "Search for XMPP users"
-msgstr "Search for a buddy by e-mail address"
+msgstr "Search for a buddy by email address"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:2412
@@ -6519,8 +6508,8 @@ msgstr "Syntax Error (probably a Gaim bu
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Invalid e-mail address"
+msgid "Invalid email address"
+msgstr "Invalid email address"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -7084,7 +7073,7 @@ msgstr "Home Page"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Personal Title"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7153,8 +7142,8 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-Mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -8849,12 +8838,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9040,13 +9029,13 @@ msgstr "_Screen name"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "No results found for e-mail address %s"
+msgid "No results found for email address %s"
+msgstr "No results found for email address %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "You should receive an email asking to confirm %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -9085,28 +9074,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
@@ -9116,8 +9105,8 @@ msgstr "Error 0x%04x: Unknown error."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
+msgstr "The email address for %s is %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
@@ -9402,16 +9391,16 @@ msgstr ""
 "them and selecting \"Re-request Authorisation.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
-msgstr "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
+msgstr "Find Buddy by Email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
-msgstr "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
+msgstr "Search for a buddy by email address"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Type the email address of the buddy you are searching for."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
@@ -9443,12 +9432,12 @@ msgstr "Confirm Account"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Display Currently Registered Address"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Change Currently Registered Address..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9457,8 +9446,8 @@ msgstr "Show Buddies Awaiting Authorisat
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Search for Buddy by E-Mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Search for Buddy by Email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
@@ -9550,10 +9539,6 @@ msgstr "_Collapse"
 msgid "College"
 msgstr "_Collapse"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12399,7 +12384,7 @@ msgstr "User Name: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "EMail: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12754,8 +12739,8 @@ msgstr "Dir service temporarily unavaila
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "E-mail lookup restricted."
+msgid "Email lookup restricted."
+msgstr "Email lookup restricted."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -15779,8 +15764,8 @@ msgstr "Colour to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Copy E-Mail Address"
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -16186,8 +16171,8 @@ msgstr[1] "%s has %d new message."
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17507,7 +17492,7 @@ msgstr "_Associate Buddy"
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Unable to send message."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17515,7 +17500,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17524,8 +17509,8 @@ msgstr "Add to Address Book"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
-msgstr "E-Mail"
+msgid "Send Email"
+msgstr "Email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -17583,8 +17568,8 @@ msgstr "Last name:"
 msgstr "Last name:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -19165,8 +19150,8 @@ msgstr ""
 #~ msgid "Check Mail"
 #~ msgstr "Check Mail"
 
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "Check email every X seconds.\n"
 
 #~ msgid "Auto-login"
 #~ msgstr "Auto-login"
============================================================
--- po/en_CA.po	27aef48762768c9609d48e72874f709d7b72745b
+++ po/en_CA.po	093c3406e366ef6626c9a02f2432f1e6e05c0985
@@ -1173,7 +1173,7 @@ msgid "New Mail"
 #: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 #, fuzzy
 msgid "New Mail"
-msgstr "E-Mail"
+msgstr "Email"
 
 #: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
@@ -3631,8 +3631,8 @@ msgstr "Last name:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3667,17 +3667,6 @@ msgstr "New Person"
 msgid "Purple Person"
 msgstr "New Person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "E-mail:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5445,14 +5434,14 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "E-Mail Address"
+msgid "Email Address"
+msgstr "Email Address"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
 #, fuzzy
 msgid "Search for XMPP users"
-msgstr "Search for a buddy by e-mail address"
+msgstr "Search for a buddy by email address"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:2412
@@ -6521,8 +6510,8 @@ msgstr "Syntax Error (probably a Gaim bu
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Invalid e-mail address"
+msgid "Invalid email address"
+msgstr "Invalid email address"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -7085,7 +7074,7 @@ msgstr "Home Page"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Personal Title"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7154,8 +7143,8 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-Mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -8839,12 +8828,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9032,13 +9021,13 @@ msgstr "_Screen name"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "No results found for e-mail address %s"
+msgid "No results found for email address %s"
+msgstr "No results found for email address %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "You should receive an email asking to confirm %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -9077,28 +9066,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
@@ -9108,8 +9097,8 @@ msgstr "Error 0x%04x: Unknown error."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
+msgstr "The email address for %s is %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
@@ -9390,16 +9379,16 @@ msgstr ""
 "them and selecting \"Re-request Authorization.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
-msgstr "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
+msgstr "Find Buddy by Email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
-msgstr "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
+msgstr "Search for a buddy by email address"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Type the email address of the buddy you are searching for."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
@@ -9431,12 +9420,12 @@ msgstr "Confirm Account"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Display Currently Registered Address"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Change Currently Registered Address..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9445,8 +9434,8 @@ msgstr "Show Buddies Awaiting Authorizat
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Search for Buddy by E-Mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Search for Buddy by Email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
@@ -9538,10 +9527,6 @@ msgstr "_Collapse"
 msgid "College"
 msgstr "_Collapse"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12387,7 +12372,7 @@ msgstr "User Name: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "EMail: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12742,8 +12727,8 @@ msgstr "Dir service temporarily unavaila
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "E-mail lookup restricted."
+msgid "Email lookup restricted."
+msgstr "Email lookup restricted."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -15767,8 +15752,8 @@ msgstr "Colour to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Copy E-Mail Address"
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -16174,8 +16159,8 @@ msgstr[1] "%s has %d new messages."
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17495,7 +17480,7 @@ msgstr "_Associate Buddy"
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Unable to send message."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17503,7 +17488,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17512,8 +17497,8 @@ msgstr "Add to Address Book"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
-msgstr "E-Mail"
+msgid "Send Email"
+msgstr "Email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -17571,8 +17556,8 @@ msgstr "Last name:"
 msgstr "Last name:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -19147,8 +19132,8 @@ msgstr ""
 #~ msgid "Check Mail"
 #~ msgstr "Check Mail"
 
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "Check email every X seconds.\n"
 
 #~ msgid "Auto-login"
 #~ msgstr "Auto-login"
============================================================
--- po/en_GB.po	be0477f6bbc1cfdde37d5b8241190063c6db58ec
+++ po/en_GB.po	a0e6cdbada496c5dc4033599c710f45b24b8b05a
@@ -818,7 +818,7 @@ msgid "You have mail!"
 msgstr "Emails"
 
 msgid "You have mail!"
-msgstr "You have e-mail!"
+msgstr "You have email!"
 
 msgid "Sender"
 msgstr "Sender"
@@ -2753,8 +2753,8 @@ msgstr "Surname"
 msgid "Last name"
 msgstr "Surname"
 
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 msgid "AIM Account"
 msgstr "AIM Account"
@@ -2778,9 +2778,6 @@ msgstr "Purple Person"
 msgid "Purple Person"
 msgstr "Purple Person"
 
-msgid "E-mail"
-msgstr "E-mail"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3854,8 +3851,8 @@ msgstr "Fill in one or more fields to se
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Fill in one or more fields to search for any matching XMPP users."
 
-msgid "E-Mail Address"
-msgstr "E-Mail Address"
+msgid "Email Address"
+msgstr "Email Address"
 
 msgid "Search for XMPP users"
 msgstr "Search for XMPP users"
@@ -4585,8 +4582,8 @@ msgstr "Syntax Error (probably a client 
 msgstr "Syntax Error (probably a client bug)"
 
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Invalid e-mail address"
+msgid "Invalid email address"
+msgstr "Invalid email address"
 
 #, c-format
 msgid "User does not exist"
@@ -4991,8 +4988,8 @@ msgstr "Home Fax"
 msgid "Home Fax"
 msgstr "Home Fax"
 
-msgid "Personal E-Mail"
-msgstr "Personal E-mail"
+msgid "Personal Email"
+msgstr "Personal Email"
 
 msgid "Personal IM"
 msgstr "Personal IM"
@@ -5034,8 +5031,8 @@ msgstr "Work Fax"
 msgid "Work Fax"
 msgstr "Work Fax"
 
-msgid "Work E-Mail"
-msgstr "Work E-mail"
+msgid "Work Email"
+msgstr "Work Email"
 
 msgid "Work IM"
 msgstr "Work IM"
@@ -6380,12 +6377,12 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6524,12 +6521,12 @@ msgstr[1] "The following usernames are a
 msgstr[1] "The following usernames are associated with %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "No results found for e-mail address %s"
+msgid "No results found for email address %s"
+msgstr "No results found for email address %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "You should receive an email asking to confirm %s."
 
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
@@ -6556,26 +6553,26 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
 #, c-format
@@ -6586,8 +6583,8 @@ msgstr "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
+msgstr "The email address for %s is %s"
 
 msgid "Account Info"
 msgstr "Account Info"
@@ -6799,14 +6796,14 @@ msgstr ""
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-msgid "Find Buddy by E-Mail"
-msgstr "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
+msgstr "Find Buddy by Email"
 
-msgid "Search for a buddy by e-mail address"
-msgstr "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
+msgstr "Search for a buddy by email address"
 
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Type the email address of the buddy you are searching for."
 
 msgid "_Search"
 msgstr "_Search"
@@ -6828,17 +6825,17 @@ msgstr "Confirm Account"
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Display Currently Registered E-mail Address"
+msgid "Display Currently Registered Email Address"
+msgstr "Display Currently Registered Email Address"
 
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Change Currently Registered E-mail Address"
+msgid "Change Currently Registered Email Address..."
+msgstr "Change Currently Registered Email Address"
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Search for Buddy by E-mail Address..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Search for Buddy by Email Address..."
 
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
@@ -6904,9 +6901,6 @@ msgstr "College/University"
 msgid "College"
 msgstr "College/University"
 
-msgid "Email"
-msgstr "Email"
-
 msgid "Zipcode"
 msgstr "Postcode"
 
@@ -8655,8 +8649,8 @@ msgstr "User Name: \t%s\n"
 msgstr "User Name: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -8909,8 +8903,8 @@ msgstr "Dir service temporarily unavaila
 msgstr "Dir service temporarily unavailable."
 
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "E-mail lookup restricted."
+msgid "Email lookup restricted."
+msgstr "Email lookup restricted."
 
 #, c-format
 msgid "Keyword ignored."
@@ -11251,8 +11245,8 @@ msgstr "Enable typing notification"
 msgid "Enable typing notification"
 msgstr "Enable typing notification"
 
-msgid "_Copy E-Mail Address"
-msgstr "_Copy E-Mail Address"
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
 
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
@@ -11605,10 +11599,10 @@ msgstr[1] "%s has %d new messages."
 msgstr[1] "%s has %d new messages."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d new e-mail.</b>"
-msgstr[1] "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d new email.</b>"
+msgstr[1] "<b>%d new emails.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12637,20 +12631,20 @@ msgstr "_Associate Buddy"
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-msgid "Unable to send e-mail"
-msgstr "Unable to send e-mail"
+msgid "Unable to send email"
+msgstr "Unable to send email"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "The evolution executable was not found in the PATH."
 
-msgid "An e-mail address was not found for this buddy."
-msgstr "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
+msgstr "An email address was not found for this buddy."
 
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
-msgid "Send E-Mail"
-msgstr "Send E-Mail"
+msgid "Send Email"
+msgstr "Send Email"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -12695,8 +12689,8 @@ msgstr "Surname"
 msgid "Last name:"
 msgstr "Surname"
 
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/eo.po	a88b6bdc49691ad940cd650ee23294ea9d51dc29
+++ po/eo.po	46d34f6c4a730333128d24ffe343b14f7052141e
@@ -3739,7 +3739,7 @@ msgstr "Familia nomo"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
-msgid "E-Mail"
+msgid "Email"
 msgstr "Retadreso"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:401
@@ -3771,16 +3771,6 @@ msgstr "Purpura Persono"
 msgid "Purple Person"
 msgstr "Purpura Persono"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:995
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "Retadreso"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5389,7 +5379,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3761
 #: ../libpurple/protocols/oscar/oscar.c:3770
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Retadreso"
 
 #: ../libpurple/protocols/jabber/buddy.c:2427
@@ -6418,7 +6408,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Malvalida retadreso"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7026,7 +7016,7 @@ msgstr "Hejmfakso"
 
 #: ../libpurple/protocols/msn/msn.c:1812
 #: ../libpurple/protocols/msnp9/msn.c:1668
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Persona Retadreso"
 
 #: ../libpurple/protocols/msn/msn.c:1813
@@ -7102,7 +7092,7 @@ msgstr "Laborfakso"
 
 #: ../libpurple/protocols/msn/msn.c:1843
 #: ../libpurple/protocols/msnp9/msn.c:1699
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Laboro Retadreso"
 
 #: ../libpurple/protocols/msn/msn.c:1844
@@ -8845,7 +8835,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9022,12 +9012,12 @@ msgstr "Ekrannomo"
 
 #: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4018
@@ -9060,21 +9050,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4064
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4067
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -9085,7 +9075,7 @@ msgstr "Eraro 0x%04x: Nekonata eraro."
 
 #: ../libpurple/protocols/oscar/oscar.c:4080
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "La retadreso de %s estas %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4082
@@ -9333,15 +9323,15 @@ msgstr ""
 "elekti \"Re-petu aÅ­tentigon.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6355
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Trovu kunulon laÅ­ Retadreso"
 
 #: ../libpurple/protocols/oscar/oscar.c:6356
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Serĉu kunulon laŭ retadreso"
 
 #: ../libpurple/protocols/oscar/oscar.c:6357
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Tajpu retadreson de la kunul kiun vi serĉas."
 
 #: ../libpurple/protocols/oscar/oscar.c:6360
@@ -9371,11 +9361,11 @@ msgstr "Konfirmu Konton"
 msgstr "Konfirmu Konton"
 
 #: ../libpurple/protocols/oscar/oscar.c:6554
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Vidigu Aktualajn Aliĝintajn Retadresojn"
 
 #: ../libpurple/protocols/oscar/oscar.c:6558
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Ŝanĝu Aktualajn Aliĝintajn Retadresojn.."
 
 #: ../libpurple/protocols/oscar/oscar.c:6565
@@ -9383,7 +9373,7 @@ msgstr "Montru Kunulojn Atendante Permes
 msgstr "Montru Kunulojn Atendante Permeso"
 
 #: ../libpurple/protocols/oscar/oscar.c:6571
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Serĉu Kunulon laŭ Retadreso..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6576
@@ -9462,10 +9452,6 @@ msgstr "Kolegio"
 msgid "College"
 msgstr "Kolegio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Retadreso"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Poŝtkodo"
@@ -12100,7 +12086,7 @@ msgstr ""
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr ""
 
 #: ../libpurple/protocols/silc/util.c:370
@@ -12414,7 +12400,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15368,7 +15354,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1632
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopiu Retadreson"
 
 #: ../pidgin/gtkimhtml.c:1644
@@ -15764,8 +15750,8 @@ msgstr[1] "%s havas %d novajn mesaĝojn.
 
 #: ../pidgin/gtknotify.c:575
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d nova retmesaĝo.</b>"
 msgstr[1] "<b>%d novaj retmesaĝoj.</b>"
 
@@ -17033,7 +17019,7 @@ msgstr "K_uniĝu Kunulon"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Ne eblas sendi retmesaĝon"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17041,7 +17027,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17049,7 +17035,7 @@ msgstr "Aldonu al adresaro"
 msgstr "Aldonu al adresaro"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Sendu retmesaĝon"
 
 #. Configuration frame
@@ -17107,7 +17093,7 @@ msgstr "Familia nomo:"
 msgstr "Familia nomo:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Retadreso:"
 
 #. *< type
============================================================
--- po/es.po	cc1a8db63703d125bd4b9b617d3d9634820ae4eb
+++ po/es.po	979859e8848bc65217c400fd4c107a660ebda721
@@ -3972,7 +3972,7 @@ msgstr "Apellidos:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
-msgid "E-Mail"
+msgid "Email"
 msgstr "Correo electrónico"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:402
@@ -4004,16 +4004,6 @@ msgstr "Persona morada"
 msgid "Purple Person"
 msgstr "Persona morada"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:705
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:986
-#: ../libpurple/protocols/silc/silc.c:1227
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "Correo electrónico"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5671,7 +5661,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3753
 #: ../libpurple/protocols/oscar/oscar.c:3762
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Dirección de correo electrónico"
 
 #: ../libpurple/protocols/jabber/buddy.c:2471
@@ -6726,7 +6716,7 @@ msgstr "Error de sintaxis (probablemente
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Dirección de correo electrónico inválida"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7342,7 +7332,7 @@ msgstr "Fax personal"
 
 #: ../libpurple/protocols/msn/msn.c:1826
 #: ../libpurple/protocols/msnp9/msn.c:1667
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Correo-e personal"
 
 #: ../libpurple/protocols/msn/msn.c:1827
@@ -7420,7 +7410,7 @@ msgstr "Fax del trabajo"
 
 #: ../libpurple/protocols/msn/msn.c:1857
 #: ../libpurple/protocols/msnp9/msn.c:1698
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Correo-e del trabajo"
 
 #: ../libpurple/protocols/msn/msn.c:1858
@@ -9264,7 +9254,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9449,12 +9439,12 @@ msgstr[1] "Los nombres de usuarios sigui
 
 #: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:4010
@@ -9489,7 +9479,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
@@ -9498,7 +9488,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
@@ -9507,7 +9497,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
@@ -9524,7 +9514,7 @@ msgstr "Error cambiando la información 
 
 #: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "La dirección de correo electrónico para %s es %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4065
@@ -9797,15 +9787,15 @@ msgstr ""
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
 #: ../libpurple/protocols/oscar/oscar.c:6347
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
 #: ../libpurple/protocols/oscar/oscar.c:6348
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
 #: ../libpurple/protocols/oscar/oscar.c:6349
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
@@ -9836,11 +9826,11 @@ msgstr "Confirmar cuenta"
 msgstr "Confirmar cuenta"
 
 #: ../libpurple/protocols/oscar/oscar.c:6546
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
 #: ../libpurple/protocols/oscar/oscar.c:6550
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Cambiar la dirección de correo registrada actualmente..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6557
@@ -9848,7 +9838,7 @@ msgstr "Mostrar amigos pendientes de aut
 msgstr "Mostrar amigos pendientes de autorización"
 
 #: ../libpurple/protocols/oscar/oscar.c:6563
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un amigo por correo electrónico..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6568
@@ -9931,10 +9921,6 @@ msgstr "Universidad"
 msgid "College"
 msgstr "Universidad"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Correo electrónico"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Código postal"
@@ -12684,7 +12670,7 @@ msgstr "Nombre de usuario: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Correo electrónico:     %s\n"
 
 #: ../libpurple/protocols/silc/util.c:369
@@ -13010,7 +12996,7 @@ msgstr "Servicio de directorio temporalm
 msgstr "Servicio de directorio temporalmente no disponible."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Búsqueda de direcciones de correo electrónico restringida."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -16073,7 +16059,7 @@ msgstr "Activar la notificación de tecl
 msgstr "Activar la notificación de tecleo"
 
 #: ../pidgin/gtkimhtml.c:1688
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Copiar dirección de correo electrónico"
 
 #: ../pidgin/gtkimhtml.c:1700
@@ -16504,8 +16490,8 @@ msgstr[1] "%s tiene %d nuevos mensajes."
 
 #: ../pidgin/gtknotify.c:599
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Tiene %d nuevo correo.</b>"
 msgstr[1] "<b>Tiene %d nuevos correos.</b>"
 
@@ -17831,7 +17817,7 @@ msgstr "_Asociar amigo"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "No se pudo enviar el correo electrónico"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
@@ -17839,7 +17825,7 @@ msgstr "No se encontró el ejecutable de
 msgstr "No se encontró el ejecutable de Evolution en la ruta."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "No se ha encontrado una dirección de correo para este amigo."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
@@ -17847,7 +17833,7 @@ msgstr "Añadir a la agenda"
 msgstr "Añadir a la agenda"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Enviar correo electrónico"
 
 #. Configuration frame
@@ -17907,7 +17893,7 @@ msgstr "Apellidos:"
 msgstr "Apellidos:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Correo electrónico:"
 
 #. *< type
============================================================
--- po/et.po	5b4d55d9b77b7c4590e4bb469dc7d631910bbe5c
+++ po/et.po	8fbf22c5dc3fba3f702540e256adc099c4b1d88d
@@ -3832,7 +3832,7 @@ msgstr "Perekonnanimi"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-post"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:401
@@ -3864,16 +3864,6 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:988
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "E-post"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5500,7 +5490,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/oscar/oscar.c:3756
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-posti aadress"
 
 #: ../libpurple/protocols/jabber/buddy.c:2427
@@ -6542,7 +6532,7 @@ msgstr "Süntaksi viga (arvatavasti klie
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Vigane e-posti aadress"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7150,7 +7140,7 @@ msgstr "Kodufaks"
 
 #: ../libpurple/protocols/msn/msn.c:1812
 #: ../libpurple/protocols/msnp9/msn.c:1668
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Isiklik e-post"
 
 #: ../libpurple/protocols/msn/msn.c:1813
@@ -7226,7 +7216,7 @@ msgstr "Tööfaks"
 
 #: ../libpurple/protocols/msn/msn.c:1843
 #: ../libpurple/protocols/msnp9/msn.c:1699
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Töö e-post"
 
 #: ../libpurple/protocols/msn/msn.c:1844
@@ -9005,7 +8995,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9184,12 +9174,12 @@ msgstr "Ekraaninimi"
 
 #: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4004
@@ -9225,7 +9215,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Viga 0x%04x: E-postiaadressi pole võimalik muuta kuna selle ekraaninime alt "
@@ -9234,7 +9224,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4050
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Viga 0x%04x: E-posti aadressi pole võimalik muuta kuna määratud aadressiga "
@@ -9243,7 +9233,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Viga 0x%04x: E-posti aadressi pole võimalik muuta kuna määratud aadress on "
@@ -9256,7 +9246,7 @@ msgstr "Viga 0x%04x: Tundmatu viga."
 
 #: ../libpurple/protocols/oscar/oscar.c:4066
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Kasutaja %s e-posti aadress on %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4068
@@ -9502,15 +9492,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6334
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6335
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Sõbra otsimine e-posti aadressi järgi"
 
 #: ../libpurple/protocols/oscar/oscar.c:6336
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Sisesta otsitava sõbra e-posti aadress."
 
 #: ../libpurple/protocols/oscar/oscar.c:6339
@@ -9540,11 +9530,11 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6533
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6537
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6544
@@ -9552,7 +9542,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6550
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6555
@@ -9631,10 +9621,6 @@ msgstr ""
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-post"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Indeks"
@@ -12302,7 +12288,7 @@ msgstr "Kasutajanimi: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-post: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:370
@@ -12619,7 +12605,7 @@ msgstr "Kataloogiteenus pole ajutiselt s
 msgstr "Kataloogiteenus pole ajutiselt saadaval."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15592,7 +15578,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1632
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopeeri e-posti aadress"
 
 #: ../pidgin/gtkimhtml.c:1644
@@ -15993,8 +15979,8 @@ msgstr[1] "%s sai %d uut sõnumit."
 
 #: ../pidgin/gtknotify.c:575
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d uus e-sõnum.</b>"
 msgstr[1] "<b>%d uut e-sõnumit.</b>"
 
@@ -17268,7 +17254,7 @@ msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "E-kirja pole võimalik saata"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17276,7 +17262,7 @@ msgstr "Evolutioni programmi pole võima
 msgstr "Evolutioni programmi pole võimalik PATH radadel leida."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Selle sõbra e-posti aadressi ei leitud."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17284,7 +17270,7 @@ msgstr "Lisa aadressiraamatusse"
 msgstr "Lisa aadressiraamatusse"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Saada e-kiri"
 
 #. Configuration frame
@@ -17342,7 +17328,7 @@ msgstr "Perekonnanimi:"
 msgstr "Perekonnanimi:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-post:"
 
 #. *< type
============================================================
--- po/eu.po	31eeb83ae6841404e905c2f606f7319be84fcc39
+++ po/eu.po	95faf888b7fa47822627f8bce97bd56fa21bfacf
@@ -1,246 +1,3 @@
-# translation of eu.po to 
-# translation of eu.po to
-# translation of eu.po to
-# translation of eu.po to
-# translation of eu.po to
-# translation of eu.po to
-# translation of eu.po to
-# translation of gaim-2.0_eu.po to
-# translation of gaim-2.0_eu.po to
-# translation of gaim-2.0_eu.po to
-# translation of gaim-2.0_eu.po to
-# translation of gaim-2.0_eu.po to Basque
-# translation of gaim.po to Basque
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
-# tamax, 2006.
 # Hizkuntza Politikarako Sailburuordetza <hizkpol at ej-gv.es>, 2005.
 # Iñaki Larrañaga Murgoitio <dooteo at zundan.com>, 2006.
 # tamax, 2006.
@@ -3887,7 +3644,7 @@ msgstr "Deitura"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Helb. el."
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3922,16 +3679,6 @@ msgstr "Pertsona berria"
 msgid "Purple Person"
 msgstr "Pertsona berria"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "Helbide elektronikoa"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5649,7 +5396,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Helbide elektronikoa"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6734,7 +6481,7 @@ msgstr "Sintaxi-errorea (beharbada Gaim 
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Helbide elektronikoa ez da zuzena"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7282,7 +7029,7 @@ msgstr "Etxeko Fax-a"
 msgstr "Etxeko Fax-a"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Norberaren posta elektronikoa"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7346,7 +7093,7 @@ msgstr "Laneko Fax-a"
 msgstr "Laneko Fax-a"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Laneko helbide elektronikoa"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -9039,7 +8786,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9241,12 +8988,12 @@ msgstr "Pantaila-izena:"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Emaitzarik ez %s helbide elektronikoarentzat "
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s berrestea eskatzeko posta-mezu bat jaso beharko zenuke. "
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -9286,7 +9033,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "0x%04x errorea: ezin da helbide elektronikoa aldatu,  lehendik "
@@ -9295,7 +9042,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbideak "
@@ -9304,7 +9051,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbidea ez "
@@ -9317,7 +9064,7 @@ msgstr "0x%04x errorea: errore ezezaguna
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s erabiltzailearen helbide elektronikoa %s da "
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9602,15 +9349,15 @@ msgstr ""
 "gainean, eta hautatu \"Eskatu baimena berriro.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Bilatu laguna helbide elektronikoaren arabera "
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Bilatu laguna helbide elektronikoaren arabera"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Idatzi aurkitu nahi duzun lagunaren helbide elektronikoa."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9642,12 +9389,12 @@ msgstr "Berretsi kontua"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Bistaratu une honetan erregistratuta dagoen helbidea"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Aldatu une honetan erregistratuta dagoen helbidea..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9656,7 +9403,7 @@ msgstr "Bistaratu baimenaren zain dauden
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Bilatu laguna helbide elektronikoaren arabera... "
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9749,11 +9496,6 @@ msgstr "_Tolestu"
 msgid "College"
 msgstr "_Tolestu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-#, fuzzy
-msgid "Email"
-msgstr "Helbide elektronikoa"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12578,7 +12320,7 @@ msgstr "Erabiltzaile-izena: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Helbide elektronikoa.: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12931,7 +12673,7 @@ msgstr "Dir zerbitzua ez dago erabilgarr
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Helbide elektronikoaren bilaketa murriztu da. "
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15881,7 +15623,7 @@ msgstr "Kolorea hiperestekak marrazteko 
 msgstr "Kolorea hiperestekak marrazteko sagua gainetik pasatzean."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopiatu helbide elektronikoa"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -16308,8 +16050,8 @@ msgstr[1] "%s erabiltzaileak %d mezu ber
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>Plugin ezaugarriak</b>"
 msgstr[1] "<b>Plugin ezaugarriak</b>"
 
@@ -17590,7 +17332,7 @@ msgstr "_Asoziatu laguna"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Ezin da posta-mezua bidali."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17598,7 +17340,7 @@ msgstr "Evolution-en Exukatagarria ez da
 msgstr "Evolution-en Exukatagarria ez da bere helbidean topatu. "
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17606,7 +17348,7 @@ msgstr "Gehitu helbide-liburuan"
 msgstr "Gehitu helbide-liburuan"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Posta bidali"
 
 #. Configuration frame
@@ -17664,7 +17406,7 @@ msgstr "Deitura:"
 msgstr "Deitura:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Helbide elektronikoa:"
 
 #. *< type
============================================================
--- po/fa.po	d58eafc0f05ef249bb8967103de8e47dd046ad90
+++ po/fa.po	71eb8bd31a8a7677da3a63e419e1ef8c17df5aa6
@@ -3537,7 +3537,7 @@ msgstr "نام خانوادگی"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "پست الکترونیکی"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3571,16 +3571,6 @@ msgstr "شخص جدید"
 msgid "Purple Person"
 msgstr "شخص جدید"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "پست الکترونیکی"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5278,7 +5268,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "نشانی پست الکترونیکی"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6355,7 +6345,7 @@ msgstr "خطای نحوی (احتمالØ
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "نشانی پست الکترونیکی نامعتبر"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6898,7 +6888,7 @@ msgstr "نمابر خانه"
 msgstr "نمابر خانه"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "پست الکترونیکی شخصی"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6960,7 +6950,7 @@ msgstr "نمابر محل کار"
 msgstr "نمابر محل کار"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "پست الکترونیکی کاری"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8625,7 +8615,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8802,12 +8792,12 @@ msgstr "نام کاربری"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "نتیجه‌ای برای نشانی پست الکترونیکی %s پیدا نشد"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "شما باید یک نامهٔ الکترونیکی برای تأیید %s دریافت کنید."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8845,7 +8835,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون یک درخواست معلق دیگر "
@@ -8854,7 +8844,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون نشانی داده شده با "
@@ -8863,7 +8853,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون نشانی داده شده نامعتبر "
@@ -8876,7 +8866,7 @@ msgstr "خطای 0x%04x: خطای نام
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "نشانی پست الکترونیکی %s، %s است"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9148,15 +9138,15 @@ msgstr ""
 "اعطای اجازه» را انتخاب کنید."
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "پیدا کردن رفیق از روی پست الکترونیکی"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "جستجو به دنبال رفیق از روی نشانی پست الکترونیکی"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "نشانی پست الکترونیکی رفیقی را که دنبالش می‌گردید وارد کنید."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9186,11 +9176,11 @@ msgstr "تأیید حساب"
 msgstr "تأیید حساب"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "نمایش نشانی پست الکترونیک ثبت شدهٔ فعلی"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "تغییر نشانی پست الکترونیک ثبت شدهٔ فعلی..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9198,7 +9188,7 @@ msgstr "نمایش رفقای در انØ
 msgstr "نمایش رفقای در انتظار اجازه"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "جستجو به دنبال رفیق از روی پست الکترونیکی..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9289,10 +9279,6 @@ msgstr "مدرسه"
 msgid "College"
 msgstr "مدرسه"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "پست الکترونیکی"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "کُد پستی"
@@ -12042,7 +12028,7 @@ msgstr "نام کاربر: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "پست الکترونیکی: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12384,7 +12370,7 @@ msgstr "سرویس دفترچهٔ راه
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "گشتن به دنبال نشانی پست الکترونیکی محدود شده است."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15262,7 +15248,7 @@ msgstr "رنگ پیوندهای اینت
 msgstr "رنگ پیوندهای اینترنتی وقتی موشی روی آنها قرار می‌گیرد."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_نسخه‌برداری از نشانی پست الکترونیکی"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15705,8 +15691,8 @@ msgstr[0] "‏%s ‏%Id پیغام جدÛ
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>جزئیات متصل شونده</b>"
 
 #: ../pidgin/gtknotify.c:989
@@ -16957,7 +16943,7 @@ msgstr "_پیوستن رفیق"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "نمی‌توان نامهٔ الکترونیکی فرستاد"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16965,7 +16951,7 @@ msgstr "اوولوشن قابل اجرا
 msgstr "اوولوشن قابل اجرا در PATH پیدا نشد."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16973,7 +16959,7 @@ msgstr "اضافه کردن به دفتØ
 msgstr "اضافه کردن به دفترچهٔ نشانی"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ارسال نامهٔ الکترونیکی"
 
 #. Configuration frame
@@ -17033,7 +17019,7 @@ msgstr "نام خانوادگی:"
 msgstr "نام خانوادگی:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "پست الکترونیکی:"
 
 #. *< type
============================================================
--- po/fi.po	3ca807d00781acd2efbfec331fb5bf6eb14c8ca0
+++ po/fi.po	47cc0f5f41fb9a1ee8bf1cb675cbf44aa6fefd3b
@@ -3909,7 +3909,7 @@ msgstr "Sukunimi"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
-msgid "E-Mail"
+msgid "Email"
 msgstr "Sähköposti"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:401
@@ -3941,16 +3941,6 @@ msgstr "Purple-henkilö"
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:986
-#: ../libpurple/protocols/silc/silc.c:1227
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "Sähköposti"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5599,7 +5589,7 @@ msgstr "Täytä yksi tai useampia kentis
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/oscar/oscar.c:3760
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:2470
@@ -6650,7 +6640,7 @@ msgstr "Syntaksivirhe (todennäköisesti
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Epäkelpo sähköpostiosoite"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7310,7 +7300,7 @@ msgstr "Kotifaksi"
 
 #: ../libpurple/protocols/msn/msn.c:1826
 #: ../libpurple/protocols/msnp9/msn.c:1667
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Oma sähköposti"
 
 #: ../libpurple/protocols/msn/msn.c:1827
@@ -7386,7 +7376,7 @@ msgstr "Työfaksi"
 
 #: ../libpurple/protocols/msn/msn.c:1857
 #: ../libpurple/protocols/msnp9/msn.c:1698
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Työsähköposti"
 
 #: ../libpurple/protocols/msn/msn.c:1858
@@ -9217,7 +9207,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2493
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9400,12 +9390,12 @@ msgstr[1] "Seuraavat käyttäjänimet on
 
 #: ../libpurple/protocols/oscar/oscar.c:3985
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4006
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
 #: ../libpurple/protocols/oscar/oscar.c:4008
@@ -9440,7 +9430,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska tälle käyttäjänimelle "
@@ -9449,7 +9439,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska annettu osoite on "
@@ -9458,7 +9448,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska annettu osoite on "
@@ -9475,7 +9465,7 @@ msgstr "Virhe muutettaessa käyttäjäti
 
 #: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4063
@@ -9748,15 +9738,15 @@ msgstr ""
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 #: ../libpurple/protocols/oscar/oscar.c:6345
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
 #: ../libpurple/protocols/oscar/oscar.c:6346
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
 #: ../libpurple/protocols/oscar/oscar.c:6347
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
 #: ../libpurple/protocols/oscar/oscar.c:6350
@@ -9786,11 +9776,11 @@ msgstr "Vahvista tili"
 msgstr "Vahvista tili"
 
 #: ../libpurple/protocols/oscar/oscar.c:6544
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
 #: ../libpurple/protocols/oscar/oscar.c:6548
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6555
@@ -9798,7 +9788,7 @@ msgstr "Näytä tuttavat jotka odottavat
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
 #: ../libpurple/protocols/oscar/oscar.c:6561
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6566
@@ -9883,10 +9873,6 @@ msgstr "Yliopisto"
 msgid "College"
 msgstr "Yliopisto"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Sähköposti"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Postinumero"
@@ -12619,7 +12605,7 @@ msgstr "Käyttäjänimi: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Sähköposti: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:369
@@ -12957,7 +12943,7 @@ msgstr "Hakemistopalvelu ei tilapäisest
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -16026,7 +16012,7 @@ msgstr "Ota kirjoittamishuomautus käytt
 msgstr "Ota kirjoittamishuomautus käyttöön"
 
 #: ../pidgin/gtkimhtml.c:1688
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
 #: ../pidgin/gtkimhtml.c:1700
@@ -16447,8 +16433,8 @@ msgstr[1] "%s:lla on %d uutta viestiä."
 
 #: ../pidgin/gtknotify.c:587
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d uusi sähköposti.</b>"
 msgstr[1] "<b>%d uutta sähköpostia.</b>"
 
@@ -17769,7 +17755,7 @@ msgstr "_Yhdistä tuttava"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Sähköpostia ei voi lähettää."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
@@ -17777,7 +17763,7 @@ msgstr "Suoritettava evolution-tiedosto 
 msgstr "Suoritettava evolution-tiedosto ei löytynyt PATH-muuttujasta."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Tälle tuttavalle ei löytynyt sähköpostiosoitetta."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
@@ -17785,7 +17771,7 @@ msgstr "Lisää osoitekirjaan"
 msgstr "Lisää osoitekirjaan"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Lähetä sähköposti"
 
 #. Configuration frame
@@ -17843,7 +17829,7 @@ msgstr "Sukunimi:"
 msgstr "Sukunimi:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Sähköposti:"
 
 #. *< type
@@ -20280,7 +20266,7 @@ msgstr ""
 #~ msgid "Check Mail"
 #~ msgstr "Tarkista posti"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "Tarkista posti x sekunnin välein.\n"
 
 #~ msgid "Auto-login"
============================================================
--- po/fr.po	834398cd3b87168f44b9459959111a4dfb633753
+++ po/fr.po	8c71fadc002a4b7b8af1fe2d9f68cf2eada916e0
@@ -2801,7 +2801,7 @@ msgstr "Nom :"
 msgid "Last name"
 msgstr "Nom :"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "Courriel"
 
 msgid "AIM Account"
@@ -2826,9 +2826,6 @@ msgstr "Personne Purple"
 msgid "Purple Person"
 msgstr "Personne Purple"
 
-msgid "E-mail"
-msgstr "Adresse électronique"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3915,7 +3912,7 @@ msgstr "Saisissez un ou plusieurs critè
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Saisissez un ou plusieurs critères de recherche d'utilisateurs XMPP."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Adresse électronique"
 
 msgid "Search for XMPP users"
@@ -4659,7 +4656,7 @@ msgstr "Erreur de syntaxe (probablement 
 msgstr "Erreur de syntaxe (probablement un bug de l'application)"
 
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Adresse de courrier électronique non valide"
 
 #, c-format
@@ -5067,7 +5064,7 @@ msgstr "Télécopie personnelle"
 msgid "Home Fax"
 msgstr "Télécopie personnelle"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Adresse électronique personnelle"
 
 msgid "Personal IM"
@@ -5110,7 +5107,7 @@ msgstr "Télécopie professionnelle"
 msgid "Work Fax"
 msgstr "Télécopie professionnelle"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Adresse électronique professionnelle"
 
 msgid "Work IM"
@@ -6473,7 +6470,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6618,11 +6615,11 @@ msgstr[1] "Les noms d'utilisateur suivan
 msgstr[1] "Les noms d'utilisateur suivants sont associés à %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier électronique pour confirmer %s"
 
 msgid "Account Confirmation Requested"
@@ -6652,7 +6649,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
@@ -6660,7 +6657,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
@@ -6668,7 +6665,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
@@ -6682,7 +6679,7 @@ msgstr "Erreur en changeant les informat
 msgstr "Erreur en changeant les informations du compte"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
 msgid "Account Info"
@@ -6904,13 +6901,13 @@ msgstr ""
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "« Redemander autorisation » sur un clic droit du contact."
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Chercher un contact par adresse électronique"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Rechercher par adresse électronique"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Saisissez l'adresse électronique du contact que vous cherchez"
 
 msgid "_Search"
@@ -6933,16 +6930,16 @@ msgstr "Confirmer le compte"
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Afficher l'adresse courante enregistrée"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Changer l'adresse courante enregistrée..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Chercher un contact par adresse électronique..."
 
 msgid "Search for Buddy by Information"
@@ -7009,9 +7006,6 @@ msgstr "Éducation"
 msgid "College"
 msgstr "Éducation"
 
-msgid "Email"
-msgstr "Courrier électronique"
-
 msgid "Zipcode"
 msgstr "Code postal"
 
@@ -8776,7 +8770,7 @@ msgstr "Nom d'utilisateur : %s\n"
 msgstr "Nom d'utilisateur : %s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Adresse électronique : %s\n"
 
 #, c-format
@@ -9035,7 +9029,7 @@ msgstr "L'annuaire est temporairement in
 msgstr "L'annuaire est temporairement indisponible."
 
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "La recherche par adresse électronique est restreinte."
 
 #, c-format
@@ -11409,7 +11403,7 @@ msgstr "Activer la notification de saise
 msgid "Enable typing notification"
 msgstr "Activer la notification de saise"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Copier l'adresse électronique"
 
 msgid "_Open Link in Browser"
@@ -11770,8 +11764,8 @@ msgstr[1] "%s a reçu %d nouveaux messag
 msgstr[1] "%s a reçu %d nouveaux messages."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d nouveau courrier.</b>"
 msgstr[1] "<b>%d nouveaux courriers.</b>"
 
@@ -12818,7 +12812,7 @@ msgstr "_Associer un contact"
 msgid "_Associate Buddy"
 msgstr "_Associer un contact"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Impossible d'envoyer un courrier électronique"
 
 msgid "The evolution executable was not found in the PATH."
@@ -12826,13 +12820,13 @@ msgstr ""
 "Le binaire « evolution » n'a pas été trouvé dans les dossiers par défaut du "
 "PATH."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "L'adresse électronique du contact n'a pas été trouvée."
 
 msgid "Add to Address Book"
 msgstr "Ajouter au carnet d'adresses"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Envoyer un courrier"
 
 #. Configuration frame
@@ -12879,7 +12873,7 @@ msgstr "Nom :"
 msgid "Last name:"
 msgstr "Nom :"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Adresse électronique :"
 
 #. *< type
============================================================
--- po/gl.po	26d7e1b285cce6daee4d7c6efd437a632425a489
+++ po/gl.po	2b043bf8a3b436a277ed59b177d84c6f377b7798
@@ -3562,7 +3562,7 @@ msgstr "Apelidos"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Correo electrónico"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3594,16 +3594,6 @@ msgstr "Persoa Purple"
 msgid "Purple Person"
 msgstr "Persoa Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "Correo electrónico"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5306,7 +5296,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Enderezo de correo electrónico"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6381,7 +6371,7 @@ msgstr "Erro de sintaxe (probablemente Ã
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Enderezo de correo electrónico non válido"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6925,7 +6915,7 @@ msgstr "Fax de casa"
 msgstr "Fax de casa"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Correo electrónico persoal"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6987,7 +6977,7 @@ msgstr "Fax do traballo"
 msgstr "Fax do traballo"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Correo electrónico do traballo"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8672,7 +8662,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8859,12 +8849,12 @@ msgstr "Nome de usuario"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Non se atoparon resultados para o enderezo de correo electrónico %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Debería recibir un correo electrónico. solicitando confirmación de %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8903,7 +8893,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa "
@@ -8912,7 +8902,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
@@ -8921,7 +8911,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
@@ -8934,7 +8924,7 @@ msgstr "Erro 0x%04x: Erro descoñecido."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "O enderezo de correo electrónico de %s é %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9216,15 +9206,15 @@ msgstr ""
 "do rato sobre eles e escoller\"Solicitar autorización outra vez.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Buscar un contacto polo correo electrónico"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Buscar un contacto polo enderezo de correo electrónico"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 "Escriba o enderezo de correo electrónico do contacto que está a buscar."
 
@@ -9255,11 +9245,11 @@ msgstr "Confirmar conta"
 msgstr "Confirmar conta"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Mostrar o enderezo rexistrado actualmente"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Cambiar o enderezo de correo actualmente rexistrado..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9267,7 +9257,7 @@ msgstr "Mostrar contactos pendentes de a
 msgstr "Mostrar contactos pendentes de autorización"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un contacto polo enderezo de correo electrónico..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9356,10 +9346,6 @@ msgstr "Escola"
 msgid "College"
 msgstr "Escola"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Correo electrónico"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Código postal"
@@ -12098,7 +12084,7 @@ msgstr "Nome de usuario :\t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Correo electrónico: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12441,7 +12427,7 @@ msgstr "Servizo de directorio non dispoÃ
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Busca de enderezos de correo electrónico restrinxida."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15350,7 +15336,7 @@ msgstr "Cor para debuxar ligazóns cando
 msgstr "Cor para debuxar ligazóns cando o rato estea enriba."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Copiar o enderezo de correo"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15781,8 +15767,8 @@ msgstr[1] "%s ten %d mensaxe nova."
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>Ten %d correo electrónico novo.</b>"
 msgstr[1] "<b>Ten %d correo electrónico novo.</b>"
 
@@ -17036,7 +17022,7 @@ msgstr "_Asociar contacto"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Imposible enviar o correo electrónico"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17044,7 +17030,7 @@ msgstr "O executable de evolution non se
 msgstr "O executable de evolution non se atopou no PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Non se atopou un enderezo de correo electrónico para este amigo."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17052,7 +17038,7 @@ msgstr "Engadir á axenda de enderezos"
 msgstr "Engadir á axenda de enderezos"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Enviar un correo"
 
 #. Configuration frame
@@ -17112,7 +17098,7 @@ msgstr "Apelidos:"
 msgstr "Apelidos:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Correo electrónico:"
 
 #. *< type
============================================================
--- po/gu.po	8120101d455f50b678266881c59afac54dbd939b
+++ po/gu.po	5290f8091642857e9e9d714b345b1eaa74eda1c5
@@ -3625,7 +3625,7 @@ msgstr "છેલ્લું નામ"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "ઇ-મેઇલ"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3660,17 +3660,6 @@ msgstr "નવી વ્યક્તિ"
 msgid "Purple Person"
 msgstr "નવી વ્યક્તિ"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "ઈ-મેઈલ:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "બોનજોર"
@@ -5395,7 +5384,7 @@ msgstr "કોઇપણ મળતાં 
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ઇ-મેઇલ સરનામું"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6474,7 +6463,7 @@ msgstr "વાક્યરચના કà
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "અયોગ્ય ઈ-મેઈલ સરનામું"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7038,7 +7027,7 @@ msgstr "ઘર પાનું"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "ખાનગી શીર્ષક"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7107,7 +7096,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "ઇ-મેઇલ"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8786,7 +8775,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8975,12 +8964,12 @@ msgstr "સ્ક્રીન નામ 
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "ઈ-મેઈલ સરનામા %s માટે કોઈ પરિણામો મળ્યા નથી"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "તમને %s ની ખાતરી કરવા માટે પૂછતો ઈ-મેઈલ મળવો જોઈએ."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -9020,7 +9009,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આ સ્ક્રીન નામ માટેની અરજી પહેલાથી "
@@ -9029,7 +9018,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામાના ઘણા સ્ક્રીન નામો "
@@ -9038,7 +9027,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામું અગોગ્ય છે."
 
@@ -9049,7 +9038,7 @@ msgstr "ક્ષતિ 0x%04x: અજà«
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s માટેનું ઈ-મેઈલ સરનામું %s છે"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9326,15 +9315,15 @@ msgstr ""
 "પુનઃ-અરજી કરો\" પસંદ કરીને."
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "ઈ-મેઈલ દ્વારા વ્યક્તિ શોધો"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "ઈ-મેઈલ સરનામા દ્વારા વ્યક્તિ માટે શોધ"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "તમે જે વ્યક્તિ માટે શોધ કરી રહ્યા હોય તેનું ઈ-મેઈલ સરનામું લખો."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9367,12 +9356,12 @@ msgstr "ખાતાની ખાતરà
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "વર્તમાનમાં રજીસ્ટર થયેલ સરનામાને દર્શાવો"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "વર્તમાનમાં રજીસ્ટર થયેલ સરનામાને બદલો..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9381,7 +9370,7 @@ msgstr "સત્તાધિકરણ à
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "ઈ-મેઈલ દ્વારા વ્યક્તિ માટે શોધ કરો..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9471,10 +9460,6 @@ msgstr "ભેગું કરો (_C)"
 msgid "College"
 msgstr "ભેગું કરો (_C)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "ઈમેઈલ"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12308,7 +12293,7 @@ msgstr "વપરાશકર્તા à
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "ઈમેઈલ: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12659,7 +12644,7 @@ msgstr "ડિરેક્ટરી સà
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "ઈ-મેઈલ જોવાનું પ્રતિબંધિત છે."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15623,7 +15608,7 @@ msgstr "જ્યારે માઉસ 
 msgstr "જ્યારે માઉસ તેના પર લઇ જવાય ત્યારનો હાયપરલીંકો દોરવા માટેનો રંગ."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "ઈ-મેઈલ સરનામાની નકલ કરો (_C)"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -16055,8 +16040,8 @@ msgstr[1] "%s પાસે %d નવા 
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17358,7 +17343,7 @@ msgstr "વ્યક્તિ સાંà
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ઇ-મેલ મોકલવામાં અસમર્થ."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17366,7 +17351,7 @@ msgstr "PATHમાં ઇવોલ્ય
 msgstr "PATHમાં ઇવોલ્યુશન કાર્યક્રમ મળ્યો નહી."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17374,7 +17359,7 @@ msgstr "સરનામા પુસ્à
 msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ઇ-મેઇલ મોકલો"
 
 #. Configuration frame
@@ -17432,7 +17417,7 @@ msgstr "છેલ્લું નામ:
 msgstr "છેલ્લું નામ:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ઈ-મેઈલ:"
 
 #. *< type
@@ -19029,7 +19014,7 @@ msgstr ""
 #~ msgid "Check Mail"
 #~ msgstr "મેઈલ ચકાસો"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "દર X સેકન્ડે ઈ-મેઈલ ચકાસો.\n"
 
 #~ msgid "Auto-login"
============================================================
--- po/he.po	da986b598f853b24f5ffee457fbb0e17c9af2464
+++ po/he.po	c03a59066378306e1f73e8e57cf37e46bf1f8fd0
@@ -2699,7 +2699,7 @@ msgstr "שם משפחה"
 msgid "Last name"
 msgstr "שם משפחה"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "דואר"
 
 msgid "AIM Account"
@@ -2724,9 +2724,6 @@ msgstr "אדם סגול"
 msgid "Purple Person"
 msgstr "אדם סגול"
 
-msgid "E-mail"
-msgstr "דוא\"ל"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3783,7 +3780,7 @@ msgstr "יש להזין אחד או יו
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "יש להזין אחד או יותר מן השדות לביצוע חיפוש של משתמשי XMPP מתאימים."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "כתובת דוא\"ל"
 
 msgid "Search for XMPP users"
@@ -4504,7 +4501,7 @@ msgstr "שגיאת תחביר (כנרא×
 msgid "Syntax Error (probably a client bug)"
 msgstr "שגיאת תחביר (כנראה באג בתוכנה)"
 
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "כתובת דוא\"ל לא תקפה"
 
 msgid "User does not exist"
@@ -4860,7 +4857,7 @@ msgstr "פקס בבית"
 msgid "Home Fax"
 msgstr "פקס בבית"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "דוא\"ל אישי"
 
 msgid "Personal IM"
@@ -4903,7 +4900,7 @@ msgstr "פקס בעבודה"
 msgid "Work Fax"
 msgstr "פקס בעבודה"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "דוא\"ל בעבודה"
 
 msgid "Work IM"
@@ -6217,7 +6214,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6357,11 +6354,11 @@ msgstr[1] "שמות המשתמשים ש×
 msgstr[1] "שמות המשתמשים שלהלן מקושרים עם %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "לא נמצאו תוצאות עבור כתובת הדוא\"ל %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "ישלח דוא\"ל לאשר את %s."
 
 msgid "Account Confirmation Requested"
@@ -6386,7 +6383,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור "
@@ -6394,7 +6391,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת "
@@ -6402,7 +6399,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
@@ -6415,7 +6412,7 @@ msgstr "שגיאה בשינוי המיד
 msgstr "שגיאה בשינוי המידע של החשבון"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "כתובת הדוא\"ל של %s היא %s"
 
 msgid "Account Info"
@@ -6615,13 +6612,13 @@ msgstr ""
 "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
 "ולבחור \"בקש הרשאה שוב\"."
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "מצא איש קשר לפי דוא\"ל"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "חפש איש קשר לפי כתובת בדואר האלרקטרוני שלו"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "הקלד את כתובת הדוא\"ל של איש הקשר אותו אתה מחפש."
 
 msgid "_Search"
@@ -6644,16 +6641,16 @@ msgstr "אשר חשבון"
 msgid "Confirm Account"
 msgstr "אשר חשבון"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "הצג את הכתובת הרשומה כרגע"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "שנה את הכתובת הרשומה כרגע..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "הצג את אנשי הקשר שמחכים לאישור"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 
 msgid "Search for Buddy by Information"
@@ -6719,9 +6716,6 @@ msgstr "מכללה"
 msgid "College"
 msgstr "מכללה"
 
-msgid "Email"
-msgstr "דוא\"ל"
-
 msgid "Zipcode"
 msgstr "מיקוד"
 
@@ -8448,7 +8442,7 @@ msgstr "שם משתמש: \t%s\n"
 msgstr "שם משתמש: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "דוא\"ל: \t\t%s\n"
 
 #, c-format
@@ -8684,7 +8678,7 @@ msgstr "שירות המדריך אינו
 msgid "Dir service temporarily unavailable."
 msgstr "שירות המדריך אינו זמין זמנית."
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "חיפוש הדוא\"ל מוגבל."
 
 msgid "Keyword ignored."
@@ -10969,7 +10963,7 @@ msgstr "הפעל התרעת הקלדה"
 msgid "Enable typing notification"
 msgstr "הפעל התרעת הקלדה"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "העתק _כתובת הדוא\"ל"
 
 msgid "_Open Link in Browser"
@@ -11310,8 +11304,8 @@ msgstr[1] "יש ל-%s %d הודעות ח
 msgstr[1] "יש ל-%s %d הודעות חדשות."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>הודעה %d חדשה.</b>"
 msgstr[1] "<b>%d הודעות חדשות.</b>"
 
@@ -12328,19 +12322,19 @@ msgstr "שייך איש _קשר"
 msgid "_Associate Buddy"
 msgstr "שייך איש _קשר"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "לא ניתן לשלוח הודעת דוא\"ל"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "תוכנת ההרצה של evolution לא נמצאה בנתיבי ה-PATH."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "כתובת דוא\"ל לא נמצאה עבור חבר זה."
 
 msgid "Add to Address Book"
 msgstr "הוסף לפנקס הכתובות"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "שלח דוא\"ל"
 
 #. Configuration frame
@@ -12386,7 +12380,7 @@ msgstr "שם משפחה:"
 msgid "Last name:"
 msgstr "שם משפחה:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "דוא\"ל:"
 
 #. *< type
============================================================
--- po/hi.po	619708c36ebae0a50756400968f5eaa413c13b2c
+++ po/hi.po	8c736cf8b45891b4393ecf202e4a6fc05a66183b
@@ -3754,7 +3754,7 @@ msgstr "अंतिम नाम"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "इमेल"
 
 #  And now for the buttons
@@ -3792,17 +3792,6 @@ msgstr "नया व्यक्ति
 msgid "Purple Person"
 msgstr "नया व्यक्ति"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "इ-मेल:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5588,7 +5577,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "इमेल पता"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6691,7 +6680,7 @@ msgstr "वाक्यविन्यà¤
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "अवैध इमेल पता"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7262,7 +7251,7 @@ msgstr "गृहपृष्ठ"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "निजी उपाधि"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7331,7 +7320,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "इमेल"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -9023,7 +9012,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9214,12 +9203,12 @@ msgstr "स्क्रीन-नाम(
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "%s इमेल पते के लिए कोइ भी नतीजा नहीं मिला"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s को निश्चित करने के लिए एक ईमेल मिलेगा।"
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -9259,7 +9248,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "त्रुटी 0x%04x: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से एक आवेदन है।"
@@ -9267,7 +9256,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "त्रुटी 0x%04x: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से बहुत से स्क्रीन-"
@@ -9276,7 +9265,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "त्रुटी 0x%04x:  ईमेल बदलने में असमर्थ क्योंकि दिया गया ईमेल पता अवैध है।"
 
@@ -9287,7 +9276,7 @@ msgstr "त्रुटी 0x%04x: अà¤
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s के लिए ईमेल पता है %s"
 
 #  And now for the buttons
@@ -9561,15 +9550,15 @@ msgstr ""
 "लिए अनुरोध कर सकतें हैं।"
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "ईमेल के द्वारा बड्डी को ढूंढें"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "बड्डी की खोज ईमेल पता द्वारा करें"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "जिस बड्डी की खोज कर रहें हैं उसका ईमेल पता डालें।"
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9603,12 +9592,12 @@ msgstr "खाते को द्रढ
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "वर्तमान रजिस्टर करा पता दिखायें"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "वर्तमान रजिस्टर करा पता बदलें"
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9617,7 +9606,7 @@ msgstr "प्रमाणिकरन à
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "बड्डी की खोज ईमेल द्वारा करें..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9709,10 +9698,6 @@ msgstr "सिकुड़िये(_C)"
 msgid "College"
 msgstr "सिकुड़िये(_C)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "इमेल"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12589,7 +12574,7 @@ msgstr "उपभोक्ता नाà
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "इमेंल: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12948,7 +12933,7 @@ msgstr "डिर सेवा अस्
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "इमेल का देखना सीमाबद्ध किया गया।"
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -16073,7 +16058,7 @@ msgstr "हाइपरलिंक खà
 msgstr "हाइपरलिंक खींचना का रंग।"
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "इमेल पते की प्रतिलिपि बनायें(_C)"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -16489,8 +16474,8 @@ msgstr[1] "%s के %d लिए नय
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17865,7 +17850,7 @@ msgstr "बड्डी सम्मिà
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "संदेश भेजने में असमर्थ ।"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17873,7 +17858,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17882,7 +17867,7 @@ msgstr "पता  पुस्तक à¤
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "इमेल"
 
 #. Configuration frame
@@ -17941,7 +17926,7 @@ msgstr "अंतिम नाम"
 msgstr "अंतिम नाम"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "इ-मेल:"
 
 #  *< api_version
@@ -19620,7 +19605,7 @@ msgstr ""
 #~ msgid "Check Mail"
 #~ msgstr "डाक देखें"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "हर X सेकण्ड मे डाक देखें.\n"
 
 #~ msgid "Auto-login"
============================================================
--- po/hu.po	956d484d207a101dc31424b233d4a9011eba3718
+++ po/hu.po	ef3b0ea3591092eebe6d0a8fee3f956705beef72
@@ -825,7 +825,7 @@ msgid "Emails"
 msgstr "Rendszernapló"
 
 msgid "Emails"
-msgstr "E-mailek"
+msgstr "Emailek"
 
 msgid "You have mail!"
 msgstr "Levele érkezett!"
@@ -843,7 +843,7 @@ msgid "New Mail"
 msgstr[1] "%s (%s) %d új üzenetet kapott."
 
 msgid "New Mail"
-msgstr "Új e-mail"
+msgstr "Új email"
 
 #, c-format
 msgid "Info for %s"
@@ -2773,8 +2773,8 @@ msgstr "Vezetéknév"
 msgid "Last name"
 msgstr "Vezetéknév"
 
-msgid "E-Mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr "Email"
 
 msgid "AIM Account"
 msgstr "AIM fiók"
@@ -2798,9 +2798,6 @@ msgstr "Purple személy"
 msgid "Purple Person"
 msgstr "Purple személy"
 
-msgid "E-mail"
-msgstr "E-mail"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3891,8 +3888,8 @@ msgstr ""
 msgstr ""
 "Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
 
-msgid "E-Mail Address"
-msgstr "E-mail cím"
+msgid "Email Address"
+msgstr "Email cím"
 
 msgid "Search for XMPP users"
 msgstr "XMPP felhasználók keresése"
@@ -4625,8 +4622,8 @@ msgstr "Szintaktikai hiba (valószínűl
 msgstr "Szintaktikai hiba (valószínűleg klienshiba)"
 
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Érvénytelen e-mail cím"
+msgid "Invalid email address"
+msgstr "Érvénytelen email cím"
 
 #, c-format
 msgid "User does not exist"
@@ -5033,8 +5030,8 @@ msgstr "Otthoni fax"
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-msgid "Personal E-Mail"
-msgstr "Saját e-mail"
+msgid "Personal Email"
+msgstr "Saját email"
 
 msgid "Personal IM"
 msgstr "Saját azonnali üzenő"
@@ -5076,8 +5073,8 @@ msgstr "Munkahelyi fax"
 msgid "Work Fax"
 msgstr "Munkahelyi fax"
 
-msgid "Work E-Mail"
-msgstr "Munkahelyi e-mail"
+msgid "Work Email"
+msgstr "Munkahelyi email"
 
 msgid "Work IM"
 msgstr "Munkahelyi azonnali üzenő"
@@ -6295,7 +6292,7 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév "
-"érvénytelen. A felhasználóneveknek érvényes e-mail címnek kell lennie, vagy "
+"érvénytelen. A felhasználóneveknek érvényes email címnek kell lennie, vagy "
 "betűvel kell kezdődniük és betűket, számokat, szóközöket, vagy csak számokat "
 "tartalmazhatnak."
 
@@ -6437,12 +6434,12 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"ICQ e-mail érkezett a következőtől: %s [%s]\n"
+"ICQ email érkezett a következőtől: %s [%s]\n"
 "\n"
 "Az üzenet:\n"
 "%s"
@@ -6598,11 +6595,11 @@ msgstr[1] "A következő felhasználóne
 msgstr[1] "A következő felhasználónevek a következőhöz vannak rendelve: %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Nem található eredmény a(z) %s e-mail címre"
+msgid "No results found for email address %s"
+msgstr "Nem található eredmény a(z) %s email címre"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Kapnia kell egy %s jóváhagyását kérő levelet."
 
 msgid "Account Confirmation Requested"
@@ -6632,26 +6629,26 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már "
+"Hiba 0x%04x: Nem sikerült megváltoztatni az email címet, mert egy kérés már "
 "függőben van erre a felhasználónévre."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
+"Hiba 0x%04x: Nem sikerült megváltoztatni az email címet, mert a megadott "
 "cím túl sok felhasználónévhez van társítva."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
+"Hiba 0x%04x: Nem sikerült megváltoztatni az email címet, mert a megadott "
 "cím érvénytelen."
 
 #, c-format
@@ -6662,8 +6659,8 @@ msgstr "Hiba a fiókinformációk módos
 msgstr "Hiba a fiókinformációk módosításakor"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "%s e-mail címe a következő: %s"
+msgid "The email address for %s is %s"
+msgstr "%s email címe a következő: %s"
 
 msgid "Account Info"
 msgstr "Fiókinformációk"
@@ -6725,7 +6722,7 @@ msgstr ""
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A "
-"felhasználóneveknek érvényes e-mail címnek kell lenniük, vagy betűvel kell "
+"felhasználóneveknek érvényes email címnek kell lenniük, vagy betűvel kell "
 "kezdődniük, és betűket, számokat és szóközöket, vagy csak számokból "
 "állhatnak."
 
@@ -6879,14 +6876,14 @@ msgstr ""
 "Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
 "kattintva a nevükön, és az „Engedélyezés újra kérése” választásával"
 
-msgid "Find Buddy by E-Mail"
-msgstr "Partnerek keresése e-mail cím szerint"
+msgid "Find Buddy by Email"
+msgstr "Partnerek keresése email cím szerint"
 
-msgid "Search for a buddy by e-mail address"
-msgstr "Partner keresése e-mail cím alapján"
+msgid "Search for a buddy by email address"
+msgstr "Partner keresése email cím alapján"
 
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Adja meg annak a partnernek az e-mail címét, akit keres."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Adja meg annak a partnernek az email címét, akit keres."
 
 msgid "_Search"
 msgstr "_Keresés"
@@ -6908,17 +6905,17 @@ msgstr "Fiók jóváhagyása"
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
 
-msgid "Display Currently Registered E-Mail Address"
-msgstr "A jelenleg regisztrált e-mail cím megjelenítése"
+msgid "Display Currently Registered Email Address"
+msgstr "A jelenleg regisztrált email cím megjelenítése"
 
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "A jelenleg regisztrált e-mail cím módosítása..."
+msgid "Change Currently Registered Email Address..."
+msgstr "A jelenleg regisztrált email cím módosítása..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Engedélyezésre váró partnerek megjelenítése"
 
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Partner keresése e-mail cím szerint..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Partner keresése email cím szerint..."
 
 msgid "Search for Buddy by Information"
 msgstr "Partner keresése információ alapján"
@@ -6985,9 +6982,6 @@ msgstr "FÅ‘iskola"
 msgid "College"
 msgstr "FÅ‘iskola"
 
-msgid "Email"
-msgstr "E-mail"
-
 msgid "Zipcode"
 msgstr "Irányítószám"
 
@@ -8765,8 +8759,8 @@ msgstr "Felhasználónév: \t%s\n"
 msgstr "Felhasználónév: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -9025,8 +9019,8 @@ msgstr "Könyvtárszolgáltatás átmene
 msgstr "Könyvtárszolgáltatás átmenetileg nem érhető el."
 
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "E-mail keresés korlátozva."
+msgid "Email lookup restricted."
+msgstr "Email keresés korlátozva."
 
 #, c-format
 msgid "Keyword ignored."
@@ -11384,8 +11378,8 @@ msgstr "Gépelésértesítés engedélye
 msgid "Enable typing notification"
 msgstr "Gépelésértesítés engedélyezése"
 
-msgid "_Copy E-Mail Address"
-msgstr "E-mail cím _másolása"
+msgid "_Copy Email Address"
+msgstr "Email cím _másolása"
 
 msgid "_Open Link in Browser"
 msgstr "Hivatk_ozás megnyitása böngészőben"
@@ -11736,10 +11730,10 @@ msgstr[1] "%s %d új üzenetet kapott."
 msgstr[1] "%s %d új üzenetet kapott."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d új e-mail.</b>"
-msgstr[1] "<b>%d új e-mail.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d új email.</b>"
+msgstr[1] "<b>%d új email.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12774,22 +12768,22 @@ msgstr "_Partner összerendelése"
 msgid "_Associate Buddy"
 msgstr "_Partner összerendelése"
 
-msgid "Unable to send e-mail"
-msgstr "Nem küldhető e-mail"
+msgid "Unable to send email"
+msgstr "Nem küldhető email"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
 "Az evolution végrehajtható állomány nem található a PATH változóban megadott "
 "útvonalon."
 
-msgid "An e-mail address was not found for this buddy."
-msgstr "Nem található e-mail cím ehhez a partnerhez."
+msgid "An email address was not found for this buddy."
+msgstr "Nem található email cím ehhez a partnerhez."
 
 msgid "Add to Address Book"
 msgstr "Hozzáadás a címjegyzékhez"
 
-msgid "Send E-Mail"
-msgstr "E-mail küldése"
+msgid "Send Email"
+msgstr "Email küldése"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -12836,8 +12830,8 @@ msgstr "Vezetéknév:"
 msgid "Last name:"
 msgstr "Vezetéknév:"
 
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/id.po	7403a855c75c8e41806ef2306b84581e0e7bda32
+++ po/id.po	b2893a7171687501e4237b64e521344b35083f89
@@ -3776,7 +3776,7 @@ msgstr "Nama Belakang"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3808,16 +3808,6 @@ msgstr "Orang Ungu"
 msgid "Purple Person"
 msgstr "Orang Ungu"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5429,7 +5419,7 @@ msgstr "Masukkan satu atau beberapa bagi
 #: ../libpurple/protocols/novell/novell.c:1490
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Alamat Email"
 
 #: ../libpurple/protocols/jabber/buddy.c:2413
@@ -6470,7 +6460,7 @@ msgstr "Kesalahan Syntax (kemungkinan bu
 msgstr "Kesalahan Syntax (kemungkinan bug klien)"
 
 #: ../libpurple/protocols/msn/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Alamat email tidak valid"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6975,8 +6965,8 @@ msgstr "Faksimili Rumah"
 msgstr "Faksimili Rumah"
 
 #: ../libpurple/protocols/msn/msn.c:1766
-msgid "Personal E-Mail"
-msgstr "E-mail Pribadi"
+msgid "Personal Email"
+msgstr "Email Pribadi"
 
 #: ../libpurple/protocols/msn/msn.c:1767
 msgid "Personal IM"
@@ -7037,7 +7027,7 @@ msgstr "Faksimili Kantor"
 msgstr "Faksimili Kantor"
 
 #: ../libpurple/protocols/msn/msn.c:1797
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Email Kantor"
 
 #: ../libpurple/protocols/msn/msn.c:1798
@@ -8627,12 +8617,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Anda menerima e-mail ICQ dari %s [%s]\n"
+"Anda menerima email ICQ dari %s [%s]\n"
 "\n"
 "Pesannya adalah:\n"
 "%s"
@@ -8805,13 +8795,13 @@ msgstr "Nama Layar"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Tidak ditemukan hasil untuk alamat e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Tidak ditemukan hasil untuk alamat email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Anda akan menerima e-mail menanyakan konfirmasi %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Anda akan menerima email menanyakan konfirmasi %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -8838,17 +8828,17 @@ msgstr "Kesalahan 0x%04x: Tidak dapat me
 
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
 msgstr "Kesalahan 0x%04x: Tidak dapat merubah alamat email karena sudah terdapat permohonan tertunda untuk nama layar ini."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
 msgstr "Kesalahan 0x%04x: Tidak dapat merubah alamat email karena alamat yang diberikan memiliki terlalu banyak nama layar yang berasosiasi dengannya."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "Kesalahan 0x%04x: Tidak dapat merubah alamat email karena alamat yang diberikan tidak valid."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
@@ -8858,7 +8848,7 @@ msgstr "Kesalahan 0x%04x: Kesalahan tida
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Alamat email untuk %s adalah %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9080,15 +9070,15 @@ msgstr "Anda dapat mengajukan ulang otor
 msgstr "Anda dapat mengajukan ulang otorisasi dari teman-teman ini dengan klik kanan pada mereka dan memilih \"Re-request Authorisation.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Cari Teman berdasarkan Email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6234
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Cari teman berdasarkan alamat email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6235
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Ketika alamat email dari teman yang sedang anda cari."
 
 #: ../libpurple/protocols/oscar/oscar.c:6238
@@ -9118,11 +9108,11 @@ msgstr "Konfirmasi Akun"
 msgstr "Konfirmasi Akun"
 
 #: ../libpurple/protocols/oscar/oscar.c:6432
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Tampilkan Alamat Email yang Terdaftar Sekarang"
 
 #: ../libpurple/protocols/oscar/oscar.c:6436
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Ganti Alamat Email yang Terdaftar Sekarang"
 
 #: ../libpurple/protocols/oscar/oscar.c:6443
@@ -9130,7 +9120,7 @@ msgstr "Tampilkan Teman yang Menunggu Ot
 msgstr "Tampilkan Teman yang Menunggu Otorisasi"
 
 #: ../libpurple/protocols/oscar/oscar.c:6449
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Cari Teman berdasarkan Alamat Email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6454
@@ -9212,10 +9202,6 @@ msgstr "ST/Universitas"
 msgid "College"
 msgstr "ST/Universitas"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Kode Pos"
@@ -11856,7 +11842,7 @@ msgstr "Nama Pengguna: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12181,7 +12167,7 @@ msgstr "Layanan dir sementara tidak ters
 msgstr "Layanan dir sementara tidak tersedia."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Pencarian Email dibatasi."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15045,8 +15031,8 @@ msgstr "Warna untuk menggambar hyperlink
 msgstr "Warna untuk menggambar hyperlink saat mouse berada di atasnya."
 
 #: ../pidgin/gtkimhtml.c:1583
-msgid "_Copy E-Mail Address"
-msgstr "_Salin Alamat E-Mail"
+msgid "_Copy Email Address"
+msgstr "_Salin Alamat Email"
 
 #: ../pidgin/gtkimhtml.c:1595
 msgid "_Open Link in Browser"
@@ -15452,10 +15438,10 @@ msgstr[1] "%s memiliki %d pesan-pesan ba
 
 #: ../pidgin/gtknotify.c:569
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d e-mail baru.</b>"
-msgstr[1] "<b>%d beberapa e-mails baru.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d email baru.</b>"
+msgstr[1] "<b>%d beberapa emails baru.</b>"
 
 #: ../pidgin/gtknotify.c:997
 #, c-format
@@ -16661,24 +16647,24 @@ msgstr "_Asosiasikan Teman"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "Tidak dapat mengirim e-mail"
+msgid "Unable to send email"
+msgstr "Tidak dapat mengirim email"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Eksekusi Evolution tidak ditemukan dalam PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
-msgstr "Alamat e-mail tidak ditemukan untuk teman ini."
+msgid "An email address was not found for this buddy."
+msgstr "Alamat email tidak ditemukan untuk teman ini."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Tambahkan ke Buku Alamat"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "Kirim E-Mail"
+msgid "Send Email"
+msgstr "Kirim Email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -16735,8 +16721,8 @@ msgstr "Nama belakang"
 msgstr "Nama belakang"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/it.po	2703ed37ab2c1ab489a6b320bde52c426a5c4aed
+++ po/it.po	8a823fb361cca89dc3dc8440cbc666ec1bc254df
@@ -3869,7 +3869,7 @@ msgstr "Cognome"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:378
@@ -3901,16 +3901,6 @@ msgstr "Persona Purple"
 msgid "Purple Person"
 msgstr "Persona Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:680
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:959
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "Email"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5284,7 +5274,7 @@ msgid "Reachability Address"
 #: ../libpurple/protocols/jabber/buddy.c:1025
 #, fuzzy
 msgid "Reachability Address"
-msgstr "Indirizzo e-mail"
+msgstr "Indirizzo email"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
@@ -5564,8 +5554,8 @@ msgstr "Riempi uno o più campi per cerc
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/oscar/oscar.c:3733
-msgid "E-Mail Address"
-msgstr "Indirizzo e-mail"
+msgid "Email Address"
+msgstr "Indirizzo email"
 
 #: ../libpurple/protocols/jabber/buddy.c:2423
 #: ../libpurple/protocols/jabber/buddy.c:2424
@@ -6595,8 +6585,8 @@ msgstr "Errore di sintassi (probabilment
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Indirizzo e-mail non valido"
+msgid "Invalid email address"
+msgstr "Indirizzo email non valido"
 
 #: ../libpurple/protocols/msn/error.c:49
 #: ../libpurple/protocols/msnp9/error.c:49
@@ -7272,7 +7262,7 @@ msgstr "Fax di casa"
 
 #: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/msnp9/msn.c:1657
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Email personale"
 
 #: ../libpurple/protocols/msn/msn.c:1805
@@ -7348,7 +7338,7 @@ msgstr "Fax ufficio"
 
 #: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/msnp9/msn.c:1688
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Email ufficio"
 
 #: ../libpurple/protocols/msn/msn.c:1836
@@ -9073,12 +9063,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Hai ricevuto un'e-mail ICQ da %s [%s]\n"
+"Hai ricevuto un'email ICQ da %s [%s]\n"
 "\n"
 "Il messaggio è:\n"
 "%s"
@@ -9251,13 +9241,13 @@ msgstr "Nome utente"
 
 #: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Nessun risultato trovato per l'indirizzo e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Nessun risultato trovato per l'indirizzo email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Dovresti ricevere un'e-mail con la richiesta di conferma per %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Dovresti ricevere un'email con la richiesta di conferma per %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
@@ -9285,18 +9275,18 @@ msgstr "Errore 0x%04x: Impossibile forma
 
 #: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
-msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poiché c'è già una richiesta in corso per questo nome utente."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché c'è già una richiesta in corso per questo nome utente."
 
 #: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
-msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poiché l'indirizzo fornito ha troppi nomi utente associati."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché l'indirizzo fornito ha troppi nomi utente associati."
 
 #: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
-msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poiché l'indirizzo fornito non è valido."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché l'indirizzo fornito non è valido."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
@@ -9305,8 +9295,8 @@ msgstr "Errore 0x%04x: Errore sconosciut
 
 #: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "L'indirizzo e-mail di %s è %s"
+msgid "The email address for %s is %s"
+msgstr "L'indirizzo email di %s è %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
@@ -9527,16 +9517,16 @@ msgstr "Puoi richiedere nuovamente autor
 msgstr "Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6281
-msgid "Find Buddy by E-Mail"
-msgstr "Cerca un contatto per e-mail"
+msgid "Find Buddy by Email"
+msgstr "Cerca un contatto per email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6282
-msgid "Search for a buddy by e-mail address"
-msgstr "Cerca un contatto attraverso il suo indirizzo e-mail"
+msgid "Search for a buddy by email address"
+msgstr "Cerca un contatto attraverso il suo indirizzo email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6283
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Inserisci l'indirizzo e-mail del contatto che stai cercando."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Inserisci l'indirizzo email del contatto che stai cercando."
 
 #: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
@@ -9565,11 +9555,11 @@ msgstr "Conferma account"
 msgstr "Conferma account"
 
 #: ../libpurple/protocols/oscar/oscar.c:6480
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Mostra gli attuali indirizzi email registrati"
 
 #: ../libpurple/protocols/oscar/oscar.c:6484
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Mostra gli attuali indirizzi email registrati..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6491
@@ -9577,7 +9567,7 @@ msgstr "Mostra i contatti dai quali atte
 msgstr "Mostra i contatti dai quali attendi autorizzazione"
 
 #: ../libpurple/protocols/oscar/oscar.c:6497
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Cerca un contatto per email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6502
@@ -9660,10 +9650,6 @@ msgstr "Scuola superiore"
 msgid "College"
 msgstr "Scuola superiore"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Codice postale"
@@ -12316,7 +12302,7 @@ msgstr "Nome utente: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:370
@@ -12660,8 +12646,8 @@ msgstr "Servizio di directory temporanea
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "Ricerca e-mail limitata."
+msgid "Email lookup restricted."
+msgstr "Ricerca email limitata."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -15572,8 +15558,8 @@ msgstr "Colore per i collegamenti al pas
 msgstr "Colore per i collegamenti al passaggio del mouse."
 
 #: ../pidgin/gtkimhtml.c:1581
-msgid "_Copy E-Mail Address"
-msgstr "_Copia l'indirizzo e-mail"
+msgid "_Copy Email Address"
+msgstr "_Copia l'indirizzo email"
 
 #: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
@@ -15982,8 +15968,8 @@ msgstr[1] "%s ha %d nuovi messaggi"
 
 #: ../pidgin/gtknotify.c:570
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d nuovo messaggio di posta.</b>"
 msgstr[1] "<b>%d nuovi messaggi di posta.</b>"
 
@@ -17253,7 +17239,7 @@ msgstr "_Associa il contatto"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Impossibile inviare l'email"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17261,7 +17247,7 @@ msgstr "L'eseguibile di evolution non è
 msgstr "L'eseguibile di evolution non è stato trovato nel PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Non è stato trovato nessun indirizzo email per questo contatto."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17269,7 +17255,7 @@ msgstr "Aggiungi alla rubrica"
 msgstr "Aggiungi alla rubrica"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Invia email"
 
 #. Configuration frame
@@ -17327,7 +17313,7 @@ msgstr "Cognome:"
 msgstr "Cognome:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Email:"
 
 #. *< type
============================================================
--- po/ja.po	7cb738c0e749d62ab834933a8e591ad3be8f6ede
+++ po/ja.po	9d197c6db6d7a1252e1438f9096891d80c4a0d69
@@ -3557,7 +3557,7 @@ msgstr "姓"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-メール"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3589,16 +3589,6 @@ msgstr "Purple な人物"
 msgid "Purple Person"
 msgstr "Purple な人物"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "E-メール:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5296,7 +5286,7 @@ msgstr "XMPP ユーザを検索するに
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-メール・アドレス"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6375,7 +6365,7 @@ msgstr "文法エラー (おそらくク
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "E-メール・アドレスが間違っています"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6919,7 +6909,7 @@ msgstr "自宅の FAX"
 msgstr "自宅の FAX"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "個人の E-メール"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6981,7 +6971,7 @@ msgstr "勤務先の FAX"
 msgstr "勤務先の FAX"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "勤務先の E-メール"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8648,7 +8638,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8855,12 +8845,12 @@ msgstr "スクリーン名"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "E-メール・アドレス %s に対する結果を得られませんでした"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s さんを確認するための問い合わせメールを受信して下さい"
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8896,7 +8886,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "エラー 0x%04x: このスクリーン名に対して既に要求がきているので E-メール・アド"
@@ -8905,7 +8895,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているので、この E-メー"
@@ -8914,7 +8904,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "エラー 0x%04x: このアドレスが間違っているので、この E-メール・アドレスに変更"
@@ -8927,7 +8917,7 @@ msgstr "エラー 0x%04x: 原因不明ã
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s さんの E-メール・アドレスは %s です"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9195,15 +9185,15 @@ msgstr ""
 "う一度要求できます。"
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "E-メールから仲間を捜す"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "E-メール・アドレスから仲間を検索します"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "検索する仲間の E-メール・アドレスを入力して下さい"
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9233,11 +9223,11 @@ msgstr "アカウントの確認"
 msgstr "アカウントの確認"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "現在登録されている E-メール・アドレスの表示"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "現在登録されている E-メール・アドレスの変更..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9245,7 +9235,7 @@ msgstr "承認を待っている仲間ã‚
 msgstr "承認を待っている仲間を表示"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "E-メールで仲間の検索..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9334,10 +9324,6 @@ msgstr "学歴"
 msgid "College"
 msgstr "学歴"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-メール"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "郵便番号"
@@ -12090,7 +12076,7 @@ msgstr "ユーザ名: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-メール: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12436,7 +12422,7 @@ msgstr "一時的にディレクトリãƒ
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "E-メール検索が拒否されました"
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15342,7 +15328,7 @@ msgstr "ハイパーリンクの上にãƒ
 msgstr "ハイパーリンクの上にマウスをのせた時の色です"
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "E-メール・アドレスのコピー(_C)"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15785,8 +15771,8 @@ msgstr[1] "%s には %d通の新しいãƒ
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>%d通の新しいメールがあります</b>"
 msgstr[1] "<b>%d通の新しいメールがあります</b>"
 
@@ -17033,7 +17019,7 @@ msgstr "仲間との連携(_A)"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "E-メールを送信できません"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17041,7 +17027,7 @@ msgstr "環境変数 PATH の中から E
 msgstr "環境変数 PATH の中から Evolution の実行形式が見つかりませんでした。"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "この仲間の E-メール・アドレスがありません"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17049,7 +17035,7 @@ msgstr "アドレス帳へ追加する"
 msgstr "アドレス帳へ追加する"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "E-メールを送信する"
 
 #. Configuration frame
@@ -17107,7 +17093,7 @@ msgstr "姓:"
 msgstr "姓:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-メール"
 
 #. *< type
============================================================
--- po/ka.po	57578d9bcb6082a214e815558f262feba486b1c0
+++ po/ka.po	753d0e25f4df949cda97119ad1b8d5dba1f4ddc4
@@ -3550,8 +3550,8 @@ msgstr "გვარი"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3585,17 +3585,6 @@ msgstr "ახალი პერსოá
 msgid "Purple Person"
 msgstr "ახალი პერსონა"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "ელ-ფოსტა"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5255,8 +5244,8 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "E-Mail მისამართი"
+msgid "Email Address"
+msgstr "Email მისამართი"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6329,8 +6318,8 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "არასწორი e-mail მისამართი"
+msgid "Invalid email address"
+msgstr "არასწორი email მისამართი"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -6879,8 +6868,8 @@ msgstr "Homepage"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
-msgstr "გააგზავნე E-Mail-ი"
+msgid "Personal Email"
+msgstr "გააგზავნე Email-ი"
 
 #: ../libpurple/protocols/msn/msn.c:1657
 #, fuzzy
@@ -6947,8 +6936,8 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-Mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -8558,7 +8547,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8731,12 +8720,12 @@ msgstr "მომხმარებეáƒ
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "ელ.ფოსტის ძიების შედეგები %s-თვის არაა ნაპოვნი"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8771,21 +8760,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8796,7 +8785,7 @@ msgstr "შეცდომა 0x%04x: áƒ
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "ელ.ფოსტის მისამართი %s-თვის არის  %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9046,15 +9035,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9085,11 +9074,11 @@ msgstr "ანგარიშის დá
 msgstr "ანგარიშის დადასტურება"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9097,7 +9086,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9184,10 +9173,6 @@ msgstr ""
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "ელ.ფოსტა"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -11901,8 +11886,8 @@ msgstr "მომხმარებლáƒ
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-Mail"
+msgid "Email: \t\t%s\n"
+msgstr "Email"
 
 #: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12241,7 +12226,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15106,8 +15091,8 @@ msgstr "ლინკების ფეá
 msgstr "ლინკების ფერი მაუსის შეხებისას."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_E-Mail მისამართის კოპირება"
+msgid "_Copy Email Address"
+msgstr "_Email მისამართის კოპირება"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -15496,8 +15481,8 @@ msgstr[0] "%s-ს აქვს %d ახ
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>პლაგინის დეტალები</b>"
 
 #: ../pidgin/gtknotify.c:989
@@ -16744,7 +16729,7 @@ msgstr "_შეასაბამე მ
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ვერ ვაგზავნი ელ-ფოსტას"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16752,7 +16737,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16760,8 +16745,8 @@ msgstr "მისამართებáƒ
 msgstr "მისამართების წიგნში ჩამატება"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "გააგზავნე E-Mail-ი"
+msgid "Send Email"
+msgstr "გააგზავნე Email-ი"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -16818,7 +16803,7 @@ msgstr "გვარი"
 msgstr "გვარი"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ელ-ფოსტა"
 
 #. *< type
============================================================
--- po/kn.po	62cb91ebd97b0bc9ccc8bccf67400e4e3e703ac1
+++ po/kn.po	91b6b1d3d62d4de0a655d45582bf6cdea4f640d5
@@ -3534,7 +3534,7 @@ msgstr "ಕೊನೆಯ (ಅಡ್ಡ) à
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3568,16 +3568,6 @@ msgstr "ಹೊಸ ವ್ಯಕ್ತಿ"
 msgid "Purple Person"
 msgstr "ಹೊಸ ವ್ಯಕ್ತಿ"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "ವಿ-ಅಂಚೆ"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5223,7 +5213,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6281,7 +6271,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "ತಪ್ಪು ವಿ-ಅಂಚೆ ವಿಳಾಸ"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6823,7 +6813,7 @@ msgstr "ಮನೆ ಫ್ಯಾಕ್ಸ"
 msgstr "ಮನೆ ಫ್ಯಾಕ್ಸ"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "ಖಾಸಗಿ ವಿ-ಅಂಚೆ"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6886,7 +6876,7 @@ msgstr "ಕಛೇರಿ ಫ್ಯಾಕà
 msgstr "ಕಛೇರಿ ಫ್ಯಾಕ್ಸ"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "ಕಛೇರಿ  ವಿ-ಅಂಚೆ ವಿಳಾಸ"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8498,7 +8488,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8677,12 +8667,12 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8716,21 +8706,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8741,7 +8731,7 @@ msgstr "ದೋಷ 0x%04x: ಗೊತ್à²
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr " %s ಇವರ  ವಿ-ಅಂಚೆವಿಳಾಸ - %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -8991,15 +8981,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9030,11 +9020,11 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9042,7 +9032,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9128,10 +9118,6 @@ msgstr "ಕಾಲೇಜು:"
 msgid "College"
 msgstr "ಕಾಲೇಜು:"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "ವಿ-ಅಂಚೆ"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "ಝಿಪ್‍/ಪಿನ್ ಕೋಡ್"
@@ -11821,7 +11807,7 @@ msgstr "ಬಳಕೆದಾರರ ಹೆà
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "ವಿ-ಅಂಚೆ: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12158,7 +12144,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15017,7 +15003,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_ಇ-ಮೇಯ್ಲ್ ವಿಳಾಸವನ್ನು ನಕಲು ಮಾಡಿ"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15411,8 +15397,8 @@ msgstr[1] " %s ರಿಗೆ %d ಹೊಸ
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>ಪ್ಲಗ್ಗಿನ್ ವಿವರಗಳು</b>"
 msgstr[1] "<b>ಪ್ಲಗ್ಗಿನ್ ವಿವರಗಳು</b>"
 
@@ -16637,7 +16623,7 @@ msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ವಿ_ಅಂಚೆಯನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16645,7 +16631,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16653,7 +16639,7 @@ msgstr "ವಿಳಾಸಪುಸ್ತà²
 msgstr "ವಿಳಾಸಪುಸ್ತಕಕ್ಕೆ ಸೇರಿಸಿ"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ವಿ-ಅಂಚೆ ಕಳುಹಿಸಿ"
 
 #. Configuration frame
@@ -16711,7 +16697,7 @@ msgstr "ಕೊನೆಯ (ಅಡ್ಡ)à²
 msgstr "ಕೊನೆಯ (ಅಡ್ಡ)ಹೆಸರು:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ವಿ-ಅಂಚೆ:"
 
 #. *< type
============================================================
--- po/ko.po	017f45ea1cadefa8083e581e7124916a2fa7b023
+++ po/ko.po	82bc118d9b571fa3739143a5fa8939dcf6eafaff
@@ -3207,7 +3207,7 @@ msgstr "하이퍼링크 위에 커서가
 msgstr "하이퍼링크 위에 커서가 놓였을 때의 색상입니다."
 
 #: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "이메일 주소 복사(_C)"
 
 #: ../gtk/gtkimhtml.c:1528
@@ -3602,8 +3602,8 @@ msgstr[1] "%s 에는 %d 개의 새로운
 
 #: ../gtk/gtknotify.c:511
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
 msgstr[1] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
 
@@ -5183,7 +5183,7 @@ msgstr "없음"
 
 #: ../gtk/plugins/gevolution/gevolution.c:239
 #: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "이메일을 보낼 수 없음"
 
 #: ../gtk/plugins/gevolution/gevolution.c:240
@@ -5191,7 +5191,7 @@ msgstr "환경변수 PATH 로부터 Evol
 msgstr "환경변수 PATH 로부터 Evolution의 실행 형식을 찾을 수 없습니다."
 
 #: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "이 친구의 이메일 주소가 없습니다."
 
 #: ../gtk/plugins/gevolution/gevolution.c:272
@@ -5199,7 +5199,7 @@ msgstr "주소록에 추가"
 msgstr "주소록에 추가"
 
 #: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "이메일 전송"
 
 #. Configuration frame
@@ -5257,7 +5257,7 @@ msgstr "성:"
 msgstr "성:"
 
 #: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
+msgid "Email:"
 msgstr "이메일:"
 
 #. *< type
@@ -7249,7 +7249,7 @@ msgstr "성"
 #: ../libgaim/protocols/jabber/jabber.c:797
 #: ../libgaim/protocols/silc/silc.c:695
 #: ../libgaim/protocols/silc/silc.c:935
-msgid "E-mail"
+msgid "Email"
 msgstr "이메일"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:591
@@ -8309,16 +8309,6 @@ msgstr "ì „í™”"
 msgid "Telephone"
 msgstr "ì „í™”"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:898
-#: ../libgaim/protocols/jabber/buddy.c:906
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/silc/ops.c:1075
-#: ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "이메일"
-
 #: ../libgaim/protocols/jabber/buddy.c:284
 #: ../libgaim/protocols/jabber/buddy.c:921
 msgid "Organization Name"
@@ -8493,7 +8483,7 @@ msgstr "Jabber 사용자를 검색하려
 #: ../libgaim/protocols/novell/novell.c:1488
 #: ../libgaim/protocols/oscar/oscar.c:3708
 #: ../libgaim/protocols/oscar/oscar.c:3717
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "이메일 주소"
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
@@ -9181,7 +9171,7 @@ msgstr "문법 오류 (아마 클라이ì
 msgstr "문법 오류 (아마 클라이언트의 버그일 수 있습니다.)"
 
 #: ../libgaim/protocols/msn/error.c:42
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "이메일 주소가 잘못되었습니다."
 
 #: ../libgaim/protocols/msn/error.c:45
@@ -9659,7 +9649,7 @@ msgstr "자택 팩스"
 msgstr "자택 팩스"
 
 #: ../libgaim/protocols/msn/msn.c:1607
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "개인 이메일"
 
 #: ../libgaim/protocols/msn/msn.c:1608
@@ -9720,7 +9710,7 @@ msgstr "회사 팩스"
 msgstr "회사 팩스"
 
 #: ../libgaim/protocols/msn/msn.c:1638
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "회사 이메일"
 
 #: ../libgaim/protocols/msn/msn.c:1639
@@ -10903,7 +10893,7 @@ msgid ""
 #: ../libgaim/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -11101,12 +11091,12 @@ msgstr "아이디"
 
 #: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "이메일 주소 %s 에 대한 결과를 찾을 수 없습니다."
 
 #: ../libgaim/protocols/oscar/oscar.c:3944
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s 님을 확인하기 위해 질의 메일을 수신해 주십시오."
 
 #: ../libgaim/protocols/oscar/oscar.c:3946
@@ -11134,17 +11124,17 @@ msgstr "오류 0x%04x: 요구된 아이ë
 
 #: ../libgaim/protocols/oscar/oscar.c:3989
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
 msgstr "오류 0x%04x: 이 아이디에 대해 이미 요구가 있었기 때문에 이메일 주소를 변경할 수 없습니다."
 
 #: ../libgaim/protocols/oscar/oscar.c:3992
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
 msgstr "오류 0x%04x: 많은 아이디에 할당되어 있기 때문에, 이 이메일 주소로는 변경할 수 없습니다."
 
 #: ../libgaim/protocols/oscar/oscar.c:3995
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "오류 0x%04x: 이 주소가 상이하기 때문에, 이 이메일 주소로는 변경할 수 없습니다."
 
 #: ../libgaim/protocols/oscar/oscar.c:3998
@@ -11168,7 +11158,7 @@ msgstr "계정 정보"
 
 #: ../libgaim/protocols/oscar/oscar.c:4014
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s 님의 이메일 주소는 %s 입니다."
 
 #: ../libgaim/protocols/oscar/oscar.c:4189
@@ -11386,15 +11376,15 @@ msgstr "오른쪽 클릭하여 \"승인 
 msgstr "오른쪽 클릭하여 \"승인 재요청\" 을 선택하면, 이들의 친구로부터 인증을 재요청할 수 있습니다."
 
 #: ../libgaim/protocols/oscar/oscar.c:6187
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "이메일로부터 친구 찾기"
 
 #: ../libgaim/protocols/oscar/oscar.c:6188
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "이메일 주소로부터 친구를 찾습니다."
 
 #: ../libgaim/protocols/oscar/oscar.c:6189
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "검색할 친구의 이메일 주소를 입력해 주십시오."
 
 #: ../libgaim/protocols/oscar/oscar.c:6192
@@ -11428,11 +11418,11 @@ msgstr "계정 확인"
 msgstr "계정 확인"
 
 #: ../libgaim/protocols/oscar/oscar.c:6401
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "현재 등록되어 있는 이메일 주소 표시"
 
 #: ../libgaim/protocols/oscar/oscar.c:6405
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "현재 등록되어 있는 이메일 주소 변경..."
 
 #: ../libgaim/protocols/oscar/oscar.c:6412
@@ -11440,7 +11430,7 @@ msgstr "승인을 기다리는 친구 í‘
 msgstr "승인을 기다리는 친구 표시"
 
 #: ../libgaim/protocols/oscar/oscar.c:6418
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "이메일로 친구 검색..."
 
 #: ../libgaim/protocols/oscar/oscar.c:6423
@@ -11518,10 +11508,6 @@ msgstr "학력"
 msgid "College"
 msgstr "학력"
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "이메일"
-
 #: ../libgaim/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "우편번호"
@@ -13840,7 +13826,7 @@ msgstr "사용자명: \t%s\n"
 
 #: ../libgaim/protocols/silc/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "이메일: \t\t%s\n"
 
 #: ../libgaim/protocols/silc/util.c:361
@@ -14078,7 +14064,7 @@ msgstr "일시적으로 디렉토리 서
 msgstr "일시적으로 디렉토리 서비스를 이용할 수 없습니다."
 
 #: ../libgaim/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "이메일 검색이 거부되었습니다."
 
 #: ../libgaim/protocols/toc/toc.c:533
============================================================
--- po/lo.po	e862d83b10c7781f8f6aebf4a712a5a6349c1ca3
+++ po/lo.po	225e644dad4df7ea89666d4213b8159cf1868d70
@@ -3407,7 +3407,7 @@ msgstr ""
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr ""
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3439,16 +3439,6 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr ""
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5060,7 +5050,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6094,7 +6084,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6634,7 +6624,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6696,7 +6686,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8270,7 +8260,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8449,12 +8439,12 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8488,21 +8478,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8513,7 +8503,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -8759,15 +8749,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -8797,11 +8787,11 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -8809,7 +8799,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -8893,10 +8883,6 @@ msgstr ""
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr ""
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr ""
@@ -11536,7 +11522,7 @@ msgstr ""
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr ""
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -11871,7 +11857,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -14640,7 +14626,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15010,8 +14996,8 @@ msgstr[1] ""
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -16209,7 +16195,7 @@ msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16217,7 +16203,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16225,7 +16211,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr ""
 
 #. Configuration frame
@@ -16283,7 +16269,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr ""
 
 #. *< type
============================================================
--- po/lt.po	58e5c25d600748061f20ee77b8946090fb1ec04c
+++ po/lt.po	4e3c913a8240c6a088018ebf37bbba30ec3c07e6
@@ -2849,7 +2849,7 @@ msgstr "PavardÄ—"
 msgid "Last name"
 msgstr "PavardÄ—"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "El. paštas"
 
 msgid "AIM Account"
@@ -2874,9 +2874,6 @@ msgstr "(nežinomas vardas)"
 msgid "Purple Person"
 msgstr "(nežinomas vardas)"
 
-msgid "E-mail"
-msgstr "El. paštas"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3981,7 +3978,7 @@ msgstr "Užpildykite vieną ar daugiau l
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Užpildykite vieną ar daugiau laukų XMPP vartotojų paieškai."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "El. pašto adresas"
 
 msgid "Search for XMPP users"
@@ -4718,7 +4715,7 @@ msgstr "Sintaksės klaida (greičiausiai
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksės klaida (greičiausiai Gaim riktas)"
 
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Neteisingas el. pašto adresas"
 
 msgid "User does not exist"
@@ -5079,7 +5076,7 @@ msgstr "Namų faksas"
 msgstr "Namų faksas"
 
 # Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Asmeninis el. pašto adresas"
 
 # Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
@@ -5123,7 +5120,7 @@ msgstr "Darbo faksas"
 msgid "Work Fax"
 msgstr "Darbo faksas"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Darbo el. pašto adresas"
 
 msgid "Work IM"
@@ -6495,7 +6492,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6664,11 +6661,11 @@ msgstr[2] "Tolesni naudotojų vardai yra
 msgstr[2] "Tolesni naudotojų vardai yra susieti su %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Pagal el. pašto adresą %s jokių rezultatų nerasta"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Jūs turėtumėte gauti el. laišką, prašantį patvirtinti %s."
 
 msgid "Account Confirmation Requested"
@@ -6698,7 +6695,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi šiuo metu laukia "
@@ -6706,7 +6703,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
@@ -6714,7 +6711,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
@@ -6728,7 +6725,7 @@ msgstr "Abonento informacijos keitimo kl
 msgstr "Abonento informacijos keitimo klaida"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Vartotojo %s el. pašto adresas yra %s"
 
 msgid "Account Info"
@@ -6956,13 +6953,13 @@ msgstr ""
 "spragtelėdamas dešiniuoju klavišu ant jų ir pasirinkdamas „Iš naujo "
 "paprašyti prieigos teisės“."
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Surasti bičiulį pagal el. pašto adresą"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Ieškoti bičiulio pagal el. pašto adresą"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Įveskite bičiulio, kurio ieškote, el. pašto adresą."
 
 msgid "_Search"
@@ -6985,16 +6982,16 @@ msgstr "Patvirtinti abonentÄ…"
 msgid "Confirm Account"
 msgstr "Patvirtinti abonentÄ…"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Parodyti šiuo metu registruotą el. pašto adresą"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Pakeisti šiuo metu registruotą el. pašto adresą..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Parodyti bičiulius, laukiančius prieigos suteikimo"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Ieškoti bičiulio pagal el. pašto adresą..."
 
 msgid "Search for Buddy by Information"
@@ -7060,9 +7057,6 @@ msgstr "Koledžas"
 msgid "College"
 msgstr "Koledžas"
 
-msgid "Email"
-msgstr "El. paštas"
-
 msgid "Zipcode"
 msgstr "Pašto kodas"
 
@@ -8847,7 +8841,7 @@ msgstr "Vartotojo vardas: \t%s\n"
 msgstr "Vartotojo vardas: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "El. paštas: \t\t%s\n"
 
 #, c-format
@@ -9105,7 +9099,7 @@ msgstr "Katalogo tarnyba laikinai neprie
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogo tarnyba laikinai neprieinama."
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "El. pašto adresų paieška apribota."
 
 msgid "Keyword ignored."
@@ -11510,7 +11504,7 @@ msgstr "Rodyti pranešimus apie pašneko
 msgid "Enable typing notification"
 msgstr "Rodyti pranešimus apie pašnekovų renkamas žinutes"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "Kopijuoti _el. pašto adresą"
 
 msgid "_Open Link in Browser"
@@ -11863,8 +11857,8 @@ msgstr[2] "%s turi %d naujų pranešimų
 msgstr[2] "%s turi %d naujų pranešimų."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d naujas laiškas.</b>"
 msgstr[1] "<b>%d nauji laiškai.</b>"
 msgstr[2] "<b>%d naujų laiškų.</b>"
@@ -12942,19 +12936,19 @@ msgstr "_Susieti bičiulį"
 msgid "_Associate Buddy"
 msgstr "_Susieti bičiulį"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Negalima išsiųsti el. laiško"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Vykdomasis Evolution failas nerastas PATH kintamajame."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Nerastas šio bičiulio el. pašto adresas."
 
 msgid "Add to Address Book"
 msgstr "Įtraukti į adresų knygą"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Nusiųsti el. laišką"
 
 #  Configuration frame
@@ -13012,7 +13006,7 @@ msgstr "PavardÄ—:"
 msgid "Last name:"
 msgstr "PavardÄ—:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "El. pašto adresas:"
 
 #  *< api_version
============================================================
--- po/mk.po	a9e56843f59e686f4a0082d5d18023c82cbd3345
+++ po/mk.po	200e1b12271ebaccfd7f18e9bfe3f77e5f15533d
@@ -2769,7 +2769,7 @@ msgstr "Презиме"
 msgid "Last name"
 msgstr "Презиме"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "Е-пошта"
 
 msgid "AIM Account"
@@ -2794,9 +2794,6 @@ msgstr "Лилакова личност"
 msgid "Purple Person"
 msgstr "Лилакова личност"
 
-msgid "E-mail"
-msgstr "E-пошта"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3874,7 +3871,7 @@ msgstr ""
 "Пополнете едно или повеќе полиња за да барате корисници на XMPP кои се "
 "совпаѓаат."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Адреса за е-пошта"
 
 msgid "Search for XMPP users"
@@ -4607,7 +4604,7 @@ msgstr "Синтаксна грешка 
 msgid "Syntax Error (probably a client bug)"
 msgstr "Синтаксна грешка (најверојатно грешка во клиентот)"
 
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Невалидна адреса за е-пошта"
 
 msgid "User does not exist"
@@ -4965,7 +4962,7 @@ msgstr "Домашен факс"
 msgid "Home Fax"
 msgstr "Домашен факс"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Лична е-пошта"
 
 msgid "Personal IM"
@@ -5008,7 +5005,7 @@ msgstr "Факс на работа"
 msgid "Work Fax"
 msgstr "Факс на работа"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Е-пошта на работа"
 
 msgid "Work IM"
@@ -6351,7 +6348,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6507,12 +6504,12 @@ msgstr[2] "Следниве имиња Ð
 msgstr[2] "Следниве имиња од екранот се поврзани со %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Не се пронајдени резултати за адресата за е-пошта %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Ќе добиете e-mail за потврда на %s"
+msgid "You should receive an email asking to confirm %s."
+msgstr "Ќе добиете email за потврда на %s"
 
 msgid "Account Confirmation Requested"
 msgstr "Побарана е потврда за сметката"
@@ -6541,7 +6538,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Грешка 0x%04x: Не можам да ја променам адресата за е-пошта, бидејќи за ова "
@@ -6549,7 +6546,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Грешка 0x%04x: Не можам да ја променам адресата за е-пошта, бидејќи дадената "
@@ -6557,7 +6554,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Грешка 0x%04x: Не можам да ја променам адресата за е-пошта, бидејќи дадената "
@@ -6571,7 +6568,7 @@ msgstr "Грешка при менува
 msgstr "Грешка при менување на информации за сметката"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Адресата за е-пошта за %s е %s"
 
 msgid "Account Info"
@@ -6799,13 +6796,13 @@ msgstr ""
 "Можете одново да побарате авторизација од овие пријатели со десен клик врз "
 "нив и одбирање на \"Повторно побарај авторизација\""
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Барај пријател по е-поштата"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Барај пријател преку адресата за е-пошта"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Внесете ја адресата за е-пошта за пријателот кој го барате."
 
 msgid "_Search"
@@ -6828,16 +6825,16 @@ msgstr "Потврди ја сметка
 msgid "Confirm Account"
 msgstr "Потврди ја сметката"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Прикажи ги тековно регистрираните адреси"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Промени ги тековно регистрираните адреси..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Прикажи ги пријателите кои чекаат авторизација"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Барај пријател преку е-пошта..."
 
 msgid "Search for Buddy by Information"
@@ -6903,9 +6900,6 @@ msgstr "Колеџ"
 msgid "College"
 msgstr "Колеџ"
 
-msgid "Email"
-msgstr "Е-пошта"
-
 msgid "Zipcode"
 msgstr "Поштенски код"
 
@@ -8667,7 +8661,7 @@ msgstr "Корисничко име: \t%
 msgstr "Корисничко име: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Е-пошта: \t\t%s\n"
 
 #, c-format
@@ -8907,7 +8901,7 @@ msgstr "Сервисот за дирек
 msgid "Dir service temporarily unavailable."
 msgstr "Сервисот за директориуми е привремено недостапен."
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Барањето на е-пошта е ограничено."
 
 msgid "Keyword ignored."
@@ -11253,7 +11247,7 @@ msgstr "Вклучи известуваÑ
 msgid "Enable typing notification"
 msgstr "Вклучи известување при куцање"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Копирај е-пошта"
 
 msgid "_Open Link in Browser"
@@ -11607,8 +11601,8 @@ msgstr[2] "%s има %d нови порÐ
 msgstr[2] "%s има %d нови пораки."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d нова порака.</b>"
 msgstr[1] "<b>%d нови пораки.</b>"
 msgstr[2] "<b>%d нови пораки.</b>"
@@ -12647,19 +12641,19 @@ msgstr "_Асоцирај пријате
 msgid "_Associate Buddy"
 msgstr "_Асоцирај пријател"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Не успеав да испратам е-пошта"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Извршливата датотека за Evolution не беше пронајдена на патеката."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Не беше пронајдена адреса за е-пошта за овој пријател."
 
 msgid "Add to Address Book"
 msgstr "Додај во адресар"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Испрати е-пошта"
 
 #. Configuration frame
@@ -12705,7 +12699,7 @@ msgstr "Презиме:"
 msgid "Last name:"
 msgstr "Презиме:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-пошта:"
 
 #. *< type
============================================================
--- po/my_MM.po	c1a14f1903a7677c9bc251d0f79291cd1e6bc3e7
+++ po/my_MM.po	ca2801c6645fe7e91c2c89aa678d1084099b13b5
@@ -1173,7 +1173,7 @@ msgid "New Mail"
 #: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 #, fuzzy
 msgid "New Mail"
-msgstr "E-Mail"
+msgstr "Email"
 
 #: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
@@ -3631,8 +3631,8 @@ msgstr "Last name:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3667,17 +3667,6 @@ msgstr "လူသစ္‌"
 msgid "Purple Person"
 msgstr "လူသစ္‌"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "E-mail:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5447,8 +5436,8 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "E-Mail Address"
+msgid "Email Address"
+msgstr "Email Address"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6529,8 +6518,8 @@ msgstr "Syntax Error (probably a Gaim bu
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Invalid e-mail address"
+msgid "Invalid email address"
+msgstr "Invalid email address"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -7094,7 +7083,7 @@ msgstr "Home Page"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Personal Title"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7163,8 +7152,8 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-Mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -8854,12 +8843,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9047,13 +9036,13 @@ msgstr "_Screen name"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "No results found for e-mail address %s"
+msgid "No results found for email address %s"
+msgstr "No results found for email address %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "You should receive an email asking to confirm %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -9092,28 +9081,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
@@ -9123,8 +9112,8 @@ msgstr "Error 0x%04x: Unknown error."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
+msgstr "The email address for %s is %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
@@ -9405,16 +9394,16 @@ msgstr ""
 "them and selecting \"Re-request Authorisation.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
-msgstr "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
+msgstr "Find Buddy by Email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
-msgstr "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
+msgstr "Search for a buddy by email address"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Type the email address of the buddy you are searching for."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
@@ -9446,12 +9435,12 @@ msgstr "Confirm Account"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Display Currently Registered Address"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Change Currently Registered Address"
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9460,8 +9449,8 @@ msgstr "Show Buddies Awaiting Authorisat
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Search for Buddy by E-Mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Search for Buddy by Email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
@@ -9553,10 +9542,6 @@ msgstr "(_C) ပ္ရန္‌စုလ
 msgid "College"
 msgstr "(_C) ပ္ရန္‌စုလိုက္‌မယ္‌"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12402,8 +12387,8 @@ msgstr "User Name: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12757,8 +12742,8 @@ msgstr "Dir service temporarily unavaila
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "E-mail lookup restricted."
+msgid "Email lookup restricted."
+msgstr "Email lookup restricted."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -15779,8 +15764,8 @@ msgstr "Colour to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Copy E-Mail Address"
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -16186,8 +16171,8 @@ msgstr[1] "%s has %d new messages."
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17507,7 +17492,7 @@ msgstr "_Associate Buddy"
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Message ပို့လို့ မရပာ။"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17515,7 +17500,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17524,8 +17509,8 @@ msgstr "Address Book ထဲ ထည့္
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
-msgstr "E-Mail"
+msgid "Send Email"
+msgstr "Email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -17583,8 +17568,8 @@ msgstr "Last name:"
 msgstr "Last name:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -18852,7 +18837,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Search for Jabber users"
-#~ msgstr "Search for a buddy by e-mail address"
+#~ msgstr "Search for a buddy by email address"
 
 #~ msgid "Invalid Jabber ID"
 #~ msgstr "Invalid Jabber ID"
@@ -19045,7 +19030,7 @@ msgstr ""
 #~ msgstr "Active"
 
 #~ msgid "EMail"
-#~ msgstr "E-Mail"
+#~ msgstr "Email"
 
 #~ msgid "Instant Messages"
 #~ msgstr "Instant Messages"
@@ -19170,8 +19155,8 @@ msgstr ""
 #~ msgid "Check Mail"
 #~ msgstr "Mail စစ္‌မယ္‌"
 
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "X စက္ကန့္တိုင္း e-mail စစ္‌မယ္‌\n"
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "X စက္ကန့္တိုင္း email စစ္‌မယ္‌\n"
 
 #~ msgid "Auto-login"
 #~ msgstr "Auto-login"
============================================================
--- po/nb.po	75897f47611913de58780124ab8e4818efb6a9c0
+++ po/nb.po	1bca97d7348322e9052781b304e8170d9a760021
@@ -3913,7 +3913,7 @@ msgstr "Etternavn"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-post"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:401
@@ -3947,16 +3947,6 @@ msgstr "Ny Person"
 msgid "Purple Person"
 msgstr "Ny Person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:703
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:982
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "E-post"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5626,7 +5616,7 @@ msgstr "Fyll inn ett eller flere felt fo
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3695
 #: ../libpurple/protocols/oscar/oscar.c:3704
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-postadresse"
 
 #
@@ -6688,7 +6678,7 @@ msgstr "Syntaksfeil (sannsynligvis en Pi
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Ugyldig epostadresse"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7326,7 +7316,7 @@ msgstr "Fax"
 
 #: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/msnp9/msn.c:1657
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "E-post"
 
 #: ../libpurple/protocols/msn/msn.c:1805
@@ -7406,7 +7396,7 @@ msgstr "Fax Jobb"
 
 #: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/msnp9/msn.c:1688
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "E-post Arbeid"
 
 #: ../libpurple/protocols/msn/msn.c:1836
@@ -9144,7 +9134,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2444
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9322,12 +9312,12 @@ msgstr "Skjermnavn"
 
 #: ../libpurple/protocols/oscar/oscar.c:3929
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Ingen resultater funnet for e-postadresse %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Du vil motta en e-post hvor du blir bedt om å bekrefte %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3952
@@ -9355,17 +9345,17 @@ msgstr "Feil 0x%04x: Kunne ikke formater
 
 #: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
 msgstr "Feil 0x%04x: Kunne ikke endre e-postadressen fordi det finnes en utestående forespørsel for dette skjermnavnet."
 
 #: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
 msgstr "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen har for mange skjermnavn assosiert ved seg."
 
 #: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen er ugyldig."
 
 #: ../libpurple/protocols/oscar/oscar.c:4004
@@ -9375,7 +9365,7 @@ msgstr "Feil 0x%04x: Ukjent feil."
 
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "E-postadressen for %s er %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4016
@@ -9596,15 +9586,15 @@ msgstr "Du kan spørre om godkjenning pÃ
 msgstr "Du kan spørre om godkjenning på nytt hos disse kontaktene ved å høyreklikke på dem og velge «Spør på nytt om godkjenning»."
 
 #: ../libpurple/protocols/oscar/oscar.c:6256
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Finn kontakt utifra e-post"
 
 #: ../libpurple/protocols/oscar/oscar.c:6257
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Søk etter en kontakt ved hjelp av e-postadresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:6258
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Skriv inn e-postadressen til den du søker etter."
 
 #: ../libpurple/protocols/oscar/oscar.c:6261
@@ -9635,11 +9625,11 @@ msgstr "Bekrefte konto"
 
 #: ../libpurple/protocols/oscar/oscar.c:6455
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Vis nåværende registrert adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:6459
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Endre Nåværende Registrert e-post Adresse..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6466
@@ -9647,7 +9637,7 @@ msgstr "Vis kontakter som venter på god
 msgstr "Vis kontakter som venter på godkjenning"
 
 #: ../libpurple/protocols/oscar/oscar.c:6472
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Søk etter kontakter ved hjelp av e-postadresser..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6477
@@ -9732,10 +9722,6 @@ msgstr "Universitet"
 msgid "College"
 msgstr "Universitet"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-post"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Postnummer"
@@ -12479,7 +12465,7 @@ msgstr "Brukernavn: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-post: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:370
@@ -12816,7 +12802,7 @@ msgstr "Katalogtjenesten er midlertidig 
 msgstr "Katalogtjenesten er midlertidig utilgjengelig."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "E-postoppslag er begrenset."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15780,7 +15766,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1631
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
 #: ../pidgin/gtkimhtml.c:1643
@@ -16198,8 +16184,8 @@ msgstr[1] "%s har %d nye beskjeder."
 
 #: ../pidgin/gtknotify.c:570
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d ny e-post.</b>"
 msgstr[1] "<b>%d nye e-poster.</b>"
 
@@ -17486,7 +17472,7 @@ msgstr "_Assosier kompis"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Klarte ikke å sende e-post"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17494,7 +17480,7 @@ msgstr "Den kjørbare filen til Evolutio
 msgstr "Den kjørbare filen til Evolution ble ikke funnet i banen."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "En e-post adresse ble ikke funnet for denne kontakten."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17502,7 +17488,7 @@ msgstr "Legg til i adresseboka"
 msgstr "Legg til i adresseboka"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Send E-post"
 
 #. Configuration frame
@@ -17561,7 +17547,7 @@ msgstr "Etternavn:"
 msgstr "Etternavn:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-post:"
 
 #. *< type
============================================================
--- po/ne.po	8afa56c84216c92f085f4d52fb6f01cce791d4c9
+++ po/ne.po	0bebe25f69366fffa1f36bcba140500e47651cb3
@@ -3614,7 +3614,7 @@ msgstr "अन्तिम नाम:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "इमेल"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3650,17 +3650,6 @@ msgstr "नयाँ व्यक्तà
 msgid "Purple Person"
 msgstr "नयाँ व्यक्ति"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "इ-मेल:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5425,7 +5414,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "इमेल ठेगाना"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6510,7 +6499,7 @@ msgstr "वाक्या संरचà
 
 #: ../libpurple/protocols/msn/error.c:46
 #, fuzzy, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "अवैध इमेल ठेगाना"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7074,7 +7063,7 @@ msgstr "गृह पृष्ठ"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "व्यक्तिगत शीर्षकहरू"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7143,7 +7132,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "इमेल"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8824,7 +8813,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, fuzzy, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9015,12 +9004,12 @@ msgstr "पर्दा नाम"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, fuzzy, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "इमेल ठेगानाका लागि परिणाम फेला परेन %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, fuzzy, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "तपाईँले %s यकिन गर्न सोधेर एउटा इमेल प्राप्त गर्नुपर्दछ।"
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -9060,7 +9049,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, fuzzy, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "त्रुटि 0x%04x: इमेल ठेगाना परिवर्तन गर्न अक्षम भयो किनभने त्यहाँ पहिल्यै यो पर्दा नामका "
@@ -9069,7 +9058,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, fuzzy, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "त्रुटि 0x%04x: इमेल ठेगाना परिवर्तन गर्न अक्षम भयो किनभने दिएको ठेगानामा यो सँग  "
@@ -9078,7 +9067,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, fuzzy, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "त्रुटि 0x%04x: इमेल ठेगाना परिवर्तन गर्न अक्षम भयो किनभने दिएको ठेगाना अवैध छ ।"
 
@@ -9089,7 +9078,7 @@ msgstr "त्रुटि 0x%04x: अà¤
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, fuzzy, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s का लागि इमेल ठेगाना %s हो"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9367,15 +9356,15 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
 #, fuzzy
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "इमेल द्वारा साथी फेला पार्नुहोस्"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "इमेल ठेगाना द्वारा एउटा साथी खोजी गर्नुहोस्"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "तपाईँले खोजी रहनु भएको साथिको इमेल ठेगाना टाइप गर्नुहोस् ।"
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9408,12 +9397,12 @@ msgstr "खाता यकिन गर
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "हालै दर्ता गरेको ठेगाना प्रदर्शन गर्नुहोस्"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "हालै दर्ता गरेको ठेगाना परिवर्तन गर्नुहोस्..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9422,7 +9411,7 @@ msgstr "प्रमाणीकरण à
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "इमेल द्वारा साथीको खोजी गर्नुहोस्..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9514,10 +9503,6 @@ msgstr "नष्ट गर्नुहà
 msgid "College"
 msgstr "नष्ट गर्नुहोस्"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "इमेल"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12360,7 +12345,7 @@ msgstr "प्रयोगकर्तà¤
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "इमेल: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12715,7 +12700,7 @@ msgstr "डाइरेक्टरी à
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, fuzzy, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "इमेल खोजी प्रतिबन्धित भयो ।"
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15727,7 +15712,7 @@ msgstr "हाइपरलिङ्कà¤
 msgstr "हाइपरलिङ्कहरू कोर्न रङ्"
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "इ-मेल ठेगाना प्रतिलिपि गर्नुहोस्"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -16143,8 +16128,8 @@ msgstr[1] "%s सँग  %d वटा à¤
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17464,7 +17449,7 @@ msgstr "संगठित साथी"
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "सन्देश पठाउन अक्षम भयो ।"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17472,7 +17457,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17481,7 +17466,7 @@ msgstr "ठेगाना पुस्à
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "इमेल"
 
 #. Configuration frame
@@ -17540,7 +17525,7 @@ msgstr "अन्तिम नाम:"
 msgstr "अन्तिम नाम:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "इ-मेल:"
 
 #. *< type
============================================================
--- po/nl.po	8c5378eb73e19c9eed05b5e3b21d711e66235f3d
+++ po/nl.po	f28ef134859bea31fdb82df1382beae586c0f400
@@ -91,7 +91,7 @@ msgid "New mail notifications"
 
 #: ../finch/gntaccount.c:437
 msgid "New mail notifications"
-msgstr "Nieuwe e-mail meldingen"
+msgstr "Nieuwe email meldingen"
 
 #: ../finch/gntaccount.c:447
 msgid "Remember password"
@@ -1345,11 +1345,11 @@ msgid "Emails"
 
 #: ../finch/gntnotify.c:165
 msgid "Emails"
-msgstr "E-mails"
+msgstr "Emails"
 
 #: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
-msgstr "Er is e-mail!"
+msgstr "Er is email!"
 
 #: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:537
 msgid "Sender"
@@ -1368,7 +1368,7 @@ msgid "New Mail"
 
 #: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
-msgstr "Nieuwe e-mail"
+msgstr "Nieuwe email"
 
 #: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:984
 #, c-format
@@ -3950,8 +3950,8 @@ msgstr "Achternaam"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
-msgid "E-Mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:402
 #: ../libpurple/protocols/bonjour/bonjour.c:708
@@ -3982,16 +3982,6 @@ msgstr "Purple mens"
 msgid "Purple Person"
 msgstr "Purple mens"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:705
-#: ../libpurple/protocols/gg/gg.c:487
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:986
-#: ../libpurple/protocols/silc/silc.c:1227
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5656,8 +5646,8 @@ msgstr "Vul een of meer velden in om naa
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3753
 #: ../libpurple/protocols/oscar/oscar.c:3762
-msgid "E-Mail Address"
-msgstr "E-mailadres"
+msgid "Email Address"
+msgstr "Emailadres"
 
 #: ../libpurple/protocols/jabber/buddy.c:2471
 #: ../libpurple/protocols/jabber/buddy.c:2472
@@ -6710,8 +6700,8 @@ msgstr "Syntaxfout (waarschijnlijk een c
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
-msgstr "Ongeldig e-mail adres"
+msgid "Invalid email address"
+msgstr "Ongeldig email adres"
 
 #: ../libpurple/protocols/msn/error.c:49
 #: ../libpurple/protocols/msnp9/error.c:49
@@ -7320,8 +7310,8 @@ msgstr "Fax thuis"
 
 #: ../libpurple/protocols/msn/msn.c:1826
 #: ../libpurple/protocols/msnp9/msn.c:1667
-msgid "Personal E-Mail"
-msgstr "Persoonlijke e-mail"
+msgid "Personal Email"
+msgstr "Persoonlijke email"
 
 #: ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/msnp9/msn.c:1668
@@ -7396,8 +7386,8 @@ msgstr "Fax werk"
 
 #: ../libpurple/protocols/msn/msn.c:1857
 #: ../libpurple/protocols/msnp9/msn.c:1698
-msgid "Work E-Mail"
-msgstr "E-mail werk"
+msgid "Work Email"
+msgstr "Email werk"
 
 #: ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/msnp9/msn.c:1699
@@ -7890,7 +7880,7 @@ msgid "New mail messages"
 #. Can't write _()'d strings in array initializers. Workaround.
 #: ../libpurple/protocols/myspace/myspace.c:1374
 msgid "New mail messages"
-msgstr "Nieuwe e-mailberichten"
+msgstr "Nieuwe emailberichten"
 
 #: ../libpurple/protocols/myspace/myspace.c:1375
 msgid "New blog comments"
@@ -9058,7 +9048,7 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Kan niet aanmelden: Kan niet aanmelden als %s omdat de gebruikersnaam "
-"ongeldig is. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen "
+"ongeldig is. Gebruikersnamen moeten een geldig emailadres zijn, of beginnen "
 "met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
 "nummers bevatten."
 
@@ -9245,12 +9235,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"U heeft een ICQ e-mail ontvangen van %s [%s]\n"
+"U heeft een ICQ email ontvangen van %s [%s]\n"
 "\n"
 "Bericht:\n"
 "%s"
@@ -9436,13 +9426,13 @@ msgstr[1] "De volgende namen worden geas
 
 #: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Niets gevonden voor e-mailadres %s"
+msgid "No results found for email address %s"
+msgstr "Niets gevonden voor emailadres %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "U zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
+msgid "You should receive an email asking to confirm %s."
+msgstr "U zou een email moeten ontvangen met de vraag om %s te bevestigen."
 
 #: ../libpurple/protocols/oscar/oscar.c:4010
 msgid "Account Confirmation Requested"
@@ -9475,28 +9465,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Fout 0x%04x: Kan e-mail adres niet veranderen omdat er al een aanvraag in "
+"Fout 0x%04x: Kan email adres niet veranderen omdat er al een aanvraag in "
 "behandeling is."
 
 #: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres reeds te veel "
+"Fout 0x%04x: Kan email adres niet veranderen omdat het adres reeds te veel "
 "gebruikersnamen toegewezen heeft gekregen."
 
 #: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres ongeldig is."
+"Fout 0x%04x: Kan email adres niet veranderen omdat het adres ongeldig is."
 
 #: ../libpurple/protocols/oscar/oscar.c:4055
 #, c-format
@@ -9509,8 +9499,8 @@ msgstr "Fout bij aanpassen van accountge
 
 #: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Het e-mail adres voor %s is %s"
+msgid "The email address for %s is %s"
+msgstr "Het email adres voor %s is %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4065
 msgid "Account Info"
@@ -9583,7 +9573,7 @@ msgstr ""
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
-"Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een "
+"Gebruikersnamen moeten een geldig emailadres zijn, of beginnen met een "
 "letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
 
 #: ../libpurple/protocols/oscar/oscar.c:4666
@@ -9786,16 +9776,16 @@ msgstr ""
 "contacten te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
 
 #: ../libpurple/protocols/oscar/oscar.c:6347
-msgid "Find Buddy by E-Mail"
-msgstr "Contact zoeken op e-mail adres"
+msgid "Find Buddy by Email"
+msgstr "Contact zoeken op email adres"
 
 #: ../libpurple/protocols/oscar/oscar.c:6348
-msgid "Search for a buddy by e-mail address"
-msgstr "Contact zoeken op e-mail adres"
+msgid "Search for a buddy by email address"
+msgstr "Contact zoeken op email adres"
 
 #: ../libpurple/protocols/oscar/oscar.c:6349
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Geef het e-mail adres van de persoon waarnaar u zoekt."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Geef het email adres van de persoon waarnaar u zoekt."
 
 #: ../libpurple/protocols/oscar/oscar.c:6352
 msgid "_Search"
@@ -9825,20 +9815,20 @@ msgstr "Account bevestigen"
 msgstr "Account bevestigen"
 
 #: ../libpurple/protocols/oscar/oscar.c:6546
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Huidige geregistreerde e-mailadres weergeven"
+msgid "Display Currently Registered Email Address"
+msgstr "Huidige geregistreerde emailadres weergeven"
 
 #: ../libpurple/protocols/oscar/oscar.c:6550
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Huidige geregistreerde e-mailadres veranderen..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Huidige geregistreerde emailadres veranderen..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6557
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Contacten weergeven die op toestemming wachten"
 
 #: ../libpurple/protocols/oscar/oscar.c:6563
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Contact zoeken door middel van e-mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Contact zoeken door middel van email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6568
 msgid "Search for Buddy by Information"
@@ -9920,10 +9910,6 @@ msgstr "College"
 msgid "College"
 msgstr "College"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Postcode"
@@ -12672,8 +12658,8 @@ msgstr "Gebruiker: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:369
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12999,7 +12985,7 @@ msgstr "Profielen service is momenteel n
 msgstr "Profielen service is momenteel niet toegankelijk."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Email zoekfunctie beperkt."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -16074,8 +16060,8 @@ msgstr "Schakel typmelding in"
 msgstr "Schakel typmelding in"
 
 #: ../pidgin/gtkimhtml.c:1688
-msgid "_Copy E-Mail Address"
-msgstr "E-mail adres _kopiëren"
+msgid "_Copy Email Address"
+msgstr "Email adres _kopiëren"
 
 #: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
@@ -16480,7 +16466,7 @@ msgid "<span weight=\"bold\" size=\"larg
 
 #: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">U heeft e-mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">U heeft email!</span>"
 
 #: ../pidgin/gtknotify.c:570
 #, c-format
@@ -16491,10 +16477,10 @@ msgstr[1] "%s heeft %d nieuwe berichten.
 
 #: ../pidgin/gtknotify.c:599
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d nieuwe e-mail.</b>"
-msgstr[1] "<b>%d nieuwe e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d nieuwe email.</b>"
+msgstr[1] "<b>%d nieuwe emails.</b>"
 
 #: ../pidgin/gtknotify.c:1033
 #, c-format
@@ -17482,7 +17468,7 @@ msgid "_Open Mail"
 
 #: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
-msgstr "E-mail _openen"
+msgstr "Email _openen"
 
 #: ../pidgin/pidginstock.c:95
 msgid "_Pause"
@@ -17831,24 +17817,24 @@ msgstr "Contact _associëren"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
-msgid "Unable to send e-mail"
-msgstr "Kan geen e-mail verzenden"
+msgid "Unable to send email"
+msgstr "Kan geen email verzenden"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "Kan evolution niet vinden."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
-msgid "An e-mail address was not found for this buddy."
-msgstr "Er is geen e-mailadres gevonden van dit contact"
+msgid "An email address was not found for this buddy."
+msgstr "Er is geen emailadres gevonden van dit contact"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Toevoegen aan adresboek"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
-msgid "Send E-Mail"
-msgstr "E-mail sturen"
+msgid "Send Email"
+msgstr "Email sturen"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:432
@@ -17908,8 +17894,8 @@ msgstr "Achternaam:"
 msgstr "Achternaam:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -17964,11 +17950,11 @@ msgid "Mail Checker"
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr "E-mailcontrole"
+msgstr "Emailcontrole"
 
 #: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "Controleert op lokale e-mail."
+msgstr "Controleert op lokale email."
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
@@ -19062,7 +19048,7 @@ msgstr "Deze plugin is handig voor het d
 #~ "\n"
 #~ "%s"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">U heeft e-mail!</span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">U heeft email!</span>\n"
 #~ "\n"
 #~ "%s"
 
@@ -19581,16 +19567,16 @@ msgstr "Deze plugin is handig voor het d
 #~ msgstr "Wanneer je offline wordt geschopt, herstelt dit de verbinding."
 
 #~ msgid "Mail Server"
-#~ msgstr "E-mailserver"
+#~ msgstr "Emailserver"
 
 #~ msgid "%s (%d new/%d total)"
 #~ msgstr "%s (%d nieuw/%d totaal)"
 
 #~ msgid "Check Mail"
-#~ msgstr "E-mail controleren"
+#~ msgstr "Email controleren"
 
 #~ msgid "Check email every X seconds.\n"
-#~ msgstr "E-mail iedere X seconden controleren.\n"
+#~ msgstr "Email iedere X seconden controleren.\n"
 
 #~ msgid "Buddy is offline:"
 #~ msgstr "Contact is off-line:"
@@ -20209,7 +20195,7 @@ msgstr "Deze plugin is handig voor het d
 #~ "\n"
 #~ "%s%s%s%s"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">U heeft e-mail!</span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">U heeft email!</span>\n"
 #~ "\n"
 #~ "%s%s%s%s"
 
@@ -20624,9 +20610,6 @@ msgstr "Deze plugin is handig voor het d
 #~ msgid "Miscellaneous error"
 #~ msgstr "Onebeknde fout"
 
-#~ msgid "Invalid email address"
-#~ msgstr "Ongeldig e-mail adres"
-
 #~ msgid "Tried to add a contact to a group that doesn't exist"
 #~ msgstr "Probeerde een contact aan een niet bestaande groep toe te voegen"
 
@@ -20733,17 +20716,6 @@ msgstr "Deze plugin is handig voor het d
 #~ "%s"
 
 #~ msgid ""
-#~ "You have received an ICQ email from %s [%s]\n"
-#~ "\n"
-#~ "Message is:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "U heeft een ICQ e-mail ontvangen van %s [%s]\n"
-#~ "\n"
-#~ "Bericht:\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "You have been disconnected because you have signed on with this screen "
 #~ "name at another location."
 #~ msgstr ""
@@ -20756,12 +20728,6 @@ msgstr "Deze plugin is handig voor het d
 #~ msgid "The following screen names are associated with %s"
 #~ msgstr "De volgende gebruikersnamen zijn geassocieerd met %s"
 
-#~ msgid "No results found for email address %s"
-#~ msgstr "Niets gevonden voor e-mail adres %s"
-
-#~ msgid "You should receive an email asking to confirm %s."
-#~ msgstr "U zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
-
 #~ msgid ""
 #~ "Error 0x%04x: Unable to format screen name because the requested screen "
 #~ "name ends in a space."
@@ -20773,25 +20739,16 @@ msgstr "Deze plugin is handig voor het d
 #~ "Error 0x%04x: Unable to change email address because there is already a "
 #~ "request pending for this screen name."
 #~ msgstr ""
-#~ "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres al is "
+#~ "Fout 0x%04x: Kan email adres niet veranderen omdat het adres al is "
 #~ "aangevraagd door een ander."
 
 #~ msgid ""
 #~ "Error 0x%04x: Unable to change email address because the given address "
 #~ "has too many screen names associated with it."
 #~ msgstr ""
-#~ "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres reeds te "
+#~ "Fout 0x%04x: Kan email adres niet veranderen omdat het adres reeds te "
 #~ "veel gebruikersnamen toegewezen heeft gekregen."
 
-#~ msgid ""
-#~ "Error 0x%04x: Unable to change email address because the given address is "
-#~ "invalid."
-#~ msgstr ""
-#~ "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres ongeldig is."
-
-#~ msgid "The email address for %s is %s"
-#~ msgstr "Het e-mail adres vor %s is %s"
-
 #~ msgid "Unable to set AIM away message."
 #~ msgstr "Kan geen AIM afwezigheidsbericht instellen."
 
@@ -20813,9 +20770,6 @@ msgstr "Deze plugin is handig voor het d
 #~ "volgende reden:\n"
 #~ "%s"
 
-#~ msgid "Find Buddy by E-mail"
-#~ msgstr "Contact zoeken op e-mail adres"
-
 #~ msgid "Display Currently Registered Address"
 #~ msgstr "Huidige geregistreerde adres weergeven"
 
@@ -20823,7 +20777,7 @@ msgstr "Deze plugin is handig voor het d
 #~ msgstr "Huidige geregistreerde adres veranderen..."
 
 #~ msgid "Search for Buddy by Email..."
-#~ msgstr "Contact zoeken door middel van e-mail..."
+#~ msgstr "Contact zoeken door middel van email..."
 
 #~ msgid "Auth host"
 #~ msgstr "Host authoriseren"
@@ -20831,9 +20785,6 @@ msgstr "Deze plugin is handig voor het d
 #~ msgid "Auth port"
 #~ msgstr "Auth-poort"
 
-#~ msgid "EMail"
-#~ msgstr "E-mail"
-
 #~ msgid "More..."
 #~ msgstr "Meer..."
 
@@ -20870,11 +20821,8 @@ msgstr "Deze plugin is handig voor het d
 #~ msgstr "SILC Privésleutel"
 
 #~ msgid "EMail: \t\t%s\n"
-#~ msgstr "E-mail: \t\t%s\n"
+#~ msgstr "Email: \t\t%s\n"
 
-#~ msgid "Email lookup restricted."
-#~ msgstr "Email zoekfunctie beperkt."
-
 #~ msgid "TOC host"
 #~ msgstr "TOC host"
 
============================================================
--- po/nn.po	3565380f7ddabbea592b7e723518231da5e5e31e
+++ po/nn.po	ad9626c2dd594a91610041313b394806a1d083db
@@ -2746,7 +2746,7 @@ msgstr "Etternamn"
 msgid "Last name"
 msgstr "Etternamn"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-post"
 
 msgid "AIM Account"
@@ -2771,9 +2771,6 @@ msgstr "Purple-person"
 msgid "Purple Person"
 msgstr "Purple-person"
 
-msgid "E-mail"
-msgstr "E-post"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3849,7 +3846,7 @@ msgstr ""
 msgstr ""
 "Fyll ut eitt eller fleire felt for å søkja etter samsvarande XMPP-brukarar."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-postadresse"
 
 msgid "Search for XMPP users"
@@ -4577,7 +4574,7 @@ msgstr "Syntaksfeil (truleg feil i klien
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksfeil (truleg feil i klienten)"
 
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Ugyldig e-postadresse"
 
 msgid "User does not exist"
@@ -4933,7 +4930,7 @@ msgstr "Heimefaks"
 msgid "Home Fax"
 msgstr "Heimefaks"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Personleg e-postadresse"
 
 msgid "Personal IM"
@@ -4976,7 +4973,7 @@ msgstr "Telefaks arbeid"
 msgid "Work Fax"
 msgstr "Telefaks arbeid"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "E-postadresse jobb"
 
 msgid "Work IM"
@@ -6304,7 +6301,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6446,11 +6443,11 @@ msgstr[1] "Desse brukarnamna er knytte t
 msgstr[1] "Desse brukarnamna er knytte til %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Ingen resultat funnen for e-postadressa %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Du vil få ei e-postmelding der du blir spurt om å stadfesta %s."
 
 msgid "Account Confirmation Requested"
@@ -6478,7 +6475,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Feil 0x%04x: kan ikkje endra e-postadressa sia det allereie finst ein "
@@ -6486,7 +6483,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa har for "
@@ -6494,7 +6491,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa er "
@@ -6508,7 +6505,7 @@ msgstr "Feil ved endring av kontoinforma
 msgstr "Feil ved endring av kontoinformasjon"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "E-postadressa til %s er %s"
 
 msgid "Account Info"
@@ -6725,13 +6722,13 @@ msgstr ""
 "Du kan be om godkjenning frå desse vennane igjen ved å høgreklikka dei og "
 "velja \"Spør om ny godkjenning.\""
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Finn venn utfrå e-postadessa"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Bruk e-postadressa til å søkja etter ein venn"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Skriv inn e-postadressa til vennen du leiter etter."
 
 msgid "_Search"
@@ -6754,16 +6751,16 @@ msgstr "Stadfest konto"
 msgid "Confirm Account"
 msgstr "Stadfest konto"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Vis noverande registrerte e-postadresse"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Endra noverande registrerte e-postadresse…"
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis vennar som ventar på godkjenning"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Bruk e-postadressa til å søkja etter ein venn…"
 
 msgid "Search for Buddy by Information"
@@ -6829,9 +6826,6 @@ msgstr "Universitet"
 msgid "College"
 msgstr "Universitet"
 
-msgid "Email"
-msgstr "E-post"
-
 msgid "Zipcode"
 msgstr "Postnummer"
 
@@ -8585,7 +8579,7 @@ msgstr "Brukarnamn: \t%s\n"
 msgstr "Brukarnamn: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-post: \t\t%s\n"
 
 #, c-format
@@ -8829,7 +8823,7 @@ msgstr "Katalogtenesta er mellombels uti
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtenesta er mellombels utilgjengeleg."
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "E-postoppslag er avgrensa."
 
 msgid "Keyword ignored."
@@ -11154,7 +11148,7 @@ msgstr "Slå på skrivevarsel"
 msgid "Enable typing notification"
 msgstr "Slå på skrivevarsel"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
 msgid "_Open Link in Browser"
@@ -11508,8 +11502,8 @@ msgstr[1] "%s har %d nye meldingar."
 msgstr[1] "%s har %d nye meldingar."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d ny e-postmelding.</b>"
 msgstr[1] "<b>%d nye e-postmeldingar.</b>"
 
@@ -12538,19 +12532,19 @@ msgstr "_Knyt til venn"
 msgid "_Associate Buddy"
 msgstr "_Knyt til venn"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Klarte ikkje å senda e-postmeldinga"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Evolution si programfil blei ikkje funnen i filbana (PATH)."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Fann inga e-postadresse for denne vennen."
 
 msgid "Add to Address Book"
 msgstr "Legg til i adresseboka"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Send e-post"
 
 #. Configuration frame
@@ -12596,7 +12590,7 @@ msgstr "Etternamn:"
 msgid "Last name:"
 msgstr "Etternamn:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-post:"
 
 #. *< type
============================================================
--- po/oc.po	221427de1a6912c429d96ec4d3cb8105cdd1656d
+++ po/oc.po	87cf35813d76ca9a8f1c38d883d97b0af9419c36
@@ -2610,7 +2610,7 @@ msgstr ""
 msgid "Last name"
 msgstr ""
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "Corrièl"
 
 msgid "AIM Account"
@@ -2635,9 +2635,6 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
-msgid "E-mail"
-msgstr "Corrièl"
-
 msgid "Bonjour"
 msgstr ""
 
@@ -3661,7 +3658,7 @@ msgstr ""
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Adreça electronica"
 
 msgid "Search for XMPP users"
@@ -4372,7 +4369,7 @@ msgstr ""
 msgid "Syntax Error (probably a client bug)"
 msgstr ""
 
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr ""
 
 msgid "User does not exist"
@@ -4727,7 +4724,7 @@ msgstr "Fax personal"
 msgid "Home Fax"
 msgstr "Fax personal"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr ""
 
 msgid "Personal IM"
@@ -4770,7 +4767,7 @@ msgstr ""
 msgid "Work Fax"
 msgstr ""
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr ""
 
 msgid "Work IM"
@@ -6029,7 +6026,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6163,11 +6160,11 @@ msgstr[1] ""
 msgstr[1] ""
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 msgid "Account Confirmation Requested"
@@ -6191,19 +6188,19 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -6215,7 +6212,7 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr ""
 
 msgid "Account Info"
@@ -6400,13 +6397,13 @@ msgstr ""
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 msgid "_Search"
@@ -6429,16 +6426,16 @@ msgstr ""
 msgid "Confirm Account"
 msgstr ""
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 msgid "Search for Buddy by Information"
@@ -6498,9 +6495,6 @@ msgstr ""
 msgid "College"
 msgstr ""
 
-msgid "Email"
-msgstr "Adreça electronica"
-
 msgid "Zipcode"
 msgstr ""
 
@@ -8161,7 +8155,7 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr ""
 
 #, c-format
@@ -8392,7 +8386,7 @@ msgstr ""
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 msgid "Keyword ignored."
@@ -10610,7 +10604,7 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr ""
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr ""
 
 msgid "_Open Link in Browser"
@@ -10901,8 +10895,8 @@ msgstr[1] ""
 msgstr[1] ""
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -11891,19 +11885,19 @@ msgstr ""
 msgid "_Associate Buddy"
 msgstr ""
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr ""
 
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 msgid "Add to Address Book"
 msgstr ""
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr ""
 
 #. Configuration frame
@@ -11949,7 +11943,7 @@ msgstr "Nom :"
 msgid "Last name:"
 msgstr "Nom :"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr ""
 
 #. *< type
============================================================
--- po/pa.po	f6c3f830bac9fb110c4ff1f792fa6e51797e61dd
+++ po/pa.po	f34a2a647850b6b48ba73b85784c6241ef292135
@@ -3564,7 +3564,7 @@ msgstr "ਆਖਰੀ ਨਾਂ"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "ਈਮੇਲ"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:374
@@ -3596,16 +3596,6 @@ msgstr "ਪਰਪਲ ਵਿਅਕਤੀ"
 msgid "Purple Person"
 msgstr "ਪਰਪਲ ਵਿਅਕਤੀ"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:676
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:901
-#: ../libpurple/protocols/silc/silc.c:1142
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "ਈਮੇਲ"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "ਬੋਨਜੁਉਰ"
@@ -5258,7 +5248,7 @@ msgstr "ਕਿਸੇ ਮਿਲਦੇ XMP
 #: ../libpurple/protocols/novell/novell.c:1490
 #: ../libpurple/protocols/oscar/oscar.c:3729
 #: ../libpurple/protocols/oscar/oscar.c:3738
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
 
 #: ../libpurple/protocols/jabber/buddy.c:2423
@@ -6309,7 +6299,7 @@ msgstr "ਸੰਟੈਕਸ ਗਤੀ (à¨
 msgstr "ਸੰਟੈਕਸ ਗਤੀ (ਇੱਕ ਕਲਾਇਟ ਬੱਗ ਹੈ)"
 
 #: ../libpurple/protocols/msn/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "ਗਲਤ ਈਮੇਲ ਐਡਰੈੱਸ"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6804,7 +6794,7 @@ msgstr "ਘਰ ਫੈਕਸ"
 msgstr "ਘਰ ਫੈਕਸ"
 
 #: ../libpurple/protocols/msn/msn.c:1781
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "ਨਿੱਜੀ ਈਮੇਲ"
 
 #: ../libpurple/protocols/msn/msn.c:1782
@@ -6866,7 +6856,7 @@ msgstr "ਕੰਮ ਫੈਕਸ"
 msgstr "ਕੰਮ ਫੈਕਸ"
 
 #: ../libpurple/protocols/msn/msn.c:1812
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "ਕੰਮ ਈਮੇਲ"
 
 #: ../libpurple/protocols/msn/msn.c:1813
@@ -8541,7 +8531,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8724,12 +8714,12 @@ msgstr "ਸਕਰੀਨ ਨਾਂ"
 
 #: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ %s ਲਈ ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ ਮਿਲਿਆ ਹੈ"
 
 #: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "ਤੁਸੀਂ %s ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਇੱਕ ਈਮੇਲ ਛੇਤੀ ਹੀ ਪ੍ਰਾਪਤ ਕਰੋਗੇ।"
 
 #: ../libpurple/protocols/oscar/oscar.c:3986
@@ -8762,7 +8752,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "ਗਲਤੀ 0x%04x: ਈਮੇਲ ਐਡਰੈੱਸ ਤਬਦੀਲ ਕਰਨ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤਾ ਸਿਰਨਾਵੇਂ ਲਈ ਪਹਿਲਾਂ "
@@ -8771,7 +8761,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "ਗਲਤੀ 0x%04x: ਈਮੇਲ ਐਡਰੈੱਸ ਤਬਦੀਲ ਕਰਨ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤੇ ਐਡਰੈੱਸ ਨਾਲ ਬਹੁਤ "
@@ -8780,7 +8770,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "ਗਲਤੀ 0x%04x: ਈਮੇਲ ਐਡਰੈੱਸ ਤਬਦੀਲ ਕਰਨ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤਾ ਐਡਰੈੱਸ ਗਲਤ ਹੈ।"
 
@@ -8791,7 +8781,7 @@ msgstr "ਗਲਤੀ 0x%04x: ਅਣਜà¨
 
 #: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s ਦਾ ਈਮੇਲ ਐਡਰੈੱਸ %s ਹੈ"
 
 #: ../libpurple/protocols/oscar/oscar.c:4050
@@ -9052,15 +9042,15 @@ msgstr ""
 "ਬੇਨਤੀ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: ../libpurple/protocols/oscar/oscar.c:6286
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "ਈਮੇਲ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"
 
 #: ../libpurple/protocols/oscar/oscar.c:6287
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"
 
 #: ../libpurple/protocols/oscar/oscar.c:6288
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "ਬੱਡੀ ਖੋਜਣ ਲਈ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ।"
 
 #: ../libpurple/protocols/oscar/oscar.c:6291
@@ -9090,11 +9080,11 @@ msgstr "ਅਕਾਊਂਟ ਪੁਸ਼à
 msgstr "ਅਕਾਊਂਟ ਪੁਸ਼ਟੀ"
 
 #: ../libpurple/protocols/oscar/oscar.c:6485
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "ਮੌਜੂਦਾ ਰਜਿਸਟਰ ਹੋਇਆ ਈਮੇਲ ਐਡਰੈੱਸ ਵੇਖੋ"
 
 #: ../libpurple/protocols/oscar/oscar.c:6489
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "ਮੌਜੂਦਾ ਰਜਿਸਟਰ ਹੋਇਆ ਈਮੇਲ ਐਡਰੈੱਸ ਬਦਲੋ..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6496
@@ -9102,7 +9092,7 @@ msgstr "ਪ੍ਰਮਾਣਿਕਤਾ à
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਦੀ ਉਡੀਕ ਵਿੱਚ ਬੱਡੀ ਵੇਖੋ"
 
 #: ../libpurple/protocols/oscar/oscar.c:6502
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "ਈ-ਮੇਲ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6507
@@ -9189,10 +9179,6 @@ msgstr "ਕਾਲਜ"
 msgid "College"
 msgstr "ਕਾਲਜ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "ਈਮੇਲ"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "ਜ਼ਿਪ ਕੋਡ"
@@ -11883,7 +11869,7 @@ msgstr "ਯੂਜ਼ਰ ਨਾਂ: \t%s\
 #: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "ਈਮੇਲ: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:368
@@ -12207,7 +12193,7 @@ msgstr "ਡਾਈ ਸਰਵਿਸ ਆਰ
 msgstr "ਡਾਈ ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "ਈਮੇਲ ਖੋਜ ਪਾਬੰਦੀ ਹੈ।"
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15079,7 +15065,7 @@ msgstr "ਹਾਇਪਰਲਿੰਕ ਲà
 msgstr "ਹਾਇਪਰਲਿੰਕ ਲਈ ਰੰਗ, ਜਦੋਂ ਮਾਊਂਸ ਉਨ੍ਹਾਂ ਉੱਤੇ ਹੋਵੇ।"
 
 #: ../pidgin/gtkimhtml.c:1581
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_C)"
 
 #: ../pidgin/gtkimhtml.c:1593
@@ -15491,8 +15477,8 @@ msgstr[1] "%s ਨੂੰ %d ਨਵੇਂ 
 
 #: ../pidgin/gtknotify.c:569
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d ਨਵੀਂ ਮੇਲ ਆਈ ਹੈ।</b>"
 msgstr[1] "<b>%d ਨਵੀਂ ਮੇਲਾਂ ਆਈਆਂ ਹਨ।</b>"
 
@@ -16756,7 +16742,7 @@ msgstr "ਸਬੰਧਤ ਬੱਡੀ(_A)
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ਈ-ਮੇਲ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16764,7 +16750,7 @@ msgstr "ਮਾਰਗ 'ਚ ਈਵੇਲà©
 msgstr "ਮਾਰਗ 'ਚ ਈਵੇਲੂਸ਼ਨ ਚੱਲਣਯੋਗ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "ਇਹ ਬੱਡੀ ਲਈ ਇੱਕ ਈਮੇਲ ਐਡਰੈੱਸ ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16772,7 +16758,7 @@ msgstr "ਐਡਰੈੱਸ ਕਿਤਾà
 msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ਈ-ਮੇਲ ਭੇਜੋ"
 
 #. Configuration frame
@@ -16830,7 +16816,7 @@ msgstr "ਆਖਰੀ ਨਾਂ:"
 msgstr "ਆਖਰੀ ਨਾਂ:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ਈਮੇਲ:"
 
 #. *< type
============================================================
--- po/pl.po	665fe37b2bfc5ee2bb129ba8d64a8a0b2f6d3f97
+++ po/pl.po	64998c8da52a6811a76ca19cbf5e454aacf04f81
@@ -1072,7 +1072,7 @@ msgid "New Mail"
 
 #: ../finch/gntnotify.c:1 ../pidgin/gtknotify.c:1
 msgid "New Mail"
-msgstr "Nowa wiadomość e-mail"
+msgstr "Nowa wiadomość email"
 
 #: ../finch/gntnotify.c:1 ../pidgin/gtknotify.c:1
 #, c-format
@@ -3471,8 +3471,8 @@ msgstr "Nazwisko"
 #: ../libpurple/protocols/silc/util.c:1 ../libpurple/protocols/silc10/ops.c:1
 #: ../libpurple/protocols/silc10/util.c:1
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1
-msgid "E-Mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:1
 msgid "AIM Account"
@@ -3501,12 +3501,6 @@ msgstr "Nowa osoba"
 msgid "Purple Person"
 msgstr "Nowa osoba"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:1 ../libpurple/protocols/gg/gg.c:1
-#: ../libpurple/protocols/jabber/jabber.c:1
-#: ../libpurple/protocols/silc/silc.c:1 ../libpurple/protocols/silc10/silc.c:1
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:1
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -4791,7 +4785,7 @@ msgid "Reachability Address"
 #: ../libpurple/protocols/jabber/buddy.c:1
 #, fuzzy
 msgid "Reachability Address"
-msgstr "Adres e-mail"
+msgstr "Adres email"
 
 #: ../libpurple/protocols/jabber/buddy.c:1
 #, fuzzy
@@ -5037,8 +5031,8 @@ msgstr "Wypełnij jedno lub więcej pól
 #: ../libpurple/protocols/jabber/buddy.c:1
 #: ../libpurple/protocols/novell/novell.c:1
 #: ../libpurple/protocols/oscar/oscar.c:1
-msgid "E-Mail Address"
-msgstr "Adres e-mail"
+msgid "Email Address"
+msgstr "Adres email"
 
 #: ../libpurple/protocols/jabber/buddy.c:1
 msgid "Search for XMPP users"
@@ -6049,8 +6043,8 @@ msgstr "Błąd składni (prawdopodobnie 
 
 #: ../libpurple/protocols/msn/error.c:1 ../libpurple/protocols/msnp9/error.c:1
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Niepoprawny adres e-mail"
+msgid "Invalid email address"
+msgstr "Niepoprawny adres email"
 
 #: ../libpurple/protocols/msn/error.c:1 ../libpurple/protocols/msnp9/error.c:1
 #, c-format
@@ -6586,8 +6580,8 @@ msgstr "Strona domowa"
 msgstr "Strona domowa"
 
 #: ../libpurple/protocols/msn/msn.c:1 ../libpurple/protocols/msnp9/msn.c:1
-msgid "Personal E-Mail"
-msgstr "E-mail osobisty"
+msgid "Personal Email"
+msgstr "Email osobisty"
 
 #: ../libpurple/protocols/msn/msn.c:1 ../libpurple/protocols/msnp9/msn.c:1
 #, fuzzy
@@ -6651,8 +6645,8 @@ msgstr "Fax w pracy"
 
 #: ../libpurple/protocols/msn/msn.c:1 ../libpurple/protocols/msnp9/msn.c:1
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1 ../libpurple/protocols/msnp9/msn.c:1
 #, fuzzy
@@ -8399,12 +8393,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:1
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Otrzymano e-mail ICQ od %s [%s]\n"
+"Otrzymano email ICQ od %s [%s]\n"
 "\n"
 "Treść wiadomości:\n"
 "%s"
@@ -8593,13 +8587,13 @@ msgstr "Identyfikator"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Nie znaleziono żadnych wyników dla adresu e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Nie znaleziono żadnych wyników dla adresu email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Powinnaś/powinieneś otrzymać e-mail proszący o potwierdzenie %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Powinnaś/powinieneś otrzymać email proszący o potwierdzenie %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 msgid "Account Confirmation Requested"
@@ -8638,28 +8632,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:1
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Błąd 0x%04x: Nie można zmienić adresu e-mail, ponieważ w kolejce czeka inna "
+"Błąd 0x%04x: Nie można zmienić adresu email, ponieważ w kolejce czeka inna "
 "prośba dla tego samego identyfikatora."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Błąd 0x%04x: Nie można zmienić adresu e-mail, ponieważ podany adres jest "
+"Błąd 0x%04x: Nie można zmienić adresu email, ponieważ podany adres jest "
 "skojarzony ze zbyt wieloma identyfikatorami."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Błąd 0x%04x: Nie można zmienić adresu e-mail, ponieważ podany adres jest "
+"Błąd 0x%04x: Nie można zmienić adresu email, ponieważ podany adres jest "
 "nieprawidłowy."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
@@ -8669,8 +8663,8 @@ msgstr "Błąd 0x%04x: Nieznany błąd."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Adres e-mail dla %s to %s"
+msgid "The email address for %s is %s"
+msgstr "Adres email dla %s to %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 msgid "Account Info"
@@ -8938,16 +8932,16 @@ msgstr ""
 "przyciskiem i wybierajÄ…c \"Ponownie poproÅ› o autoryzacjÄ™\"."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
-msgid "Find Buddy by E-Mail"
-msgstr "Wyszukiwanie użytkownika wg adresu e-mail"
+msgid "Find Buddy by Email"
+msgstr "Wyszukiwanie użytkownika wg adresu email"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
-msgid "Search for a buddy by e-mail address"
-msgstr "Szukaj znajomych według adresu e-mail"
+msgid "Search for a buddy by email address"
+msgstr "Szukaj znajomych według adresu email"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Podaj adres e-mail znajomego, którego chcesz znaleźć."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Podaj adres email znajomego, którego chcesz znaleźć."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 msgid "_Search"
@@ -8976,20 +8970,20 @@ msgstr "Potwierdzenie konta"
 msgstr "Potwierdzenie konta"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Wyświetl aktualnie zarejestrowany adres e-mail"
+msgid "Display Currently Registered Email Address"
+msgstr "Wyświetl aktualnie zarejestrowany adres email"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Zmień aktualnie zarejestrowany adres e-mail..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Zmień aktualnie zarejestrowany adres email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokazuj użytkowników oczekujących na autoryzację"
 
 #: ../libpurple/protocols/oscar/oscar.c:1
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Szukaj znajomych według adresu e-mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Szukaj znajomych według adresu email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:1
 msgid "Search for Buddy by Information"
@@ -9085,10 +9079,6 @@ msgstr "_Zwiń"
 msgstr "_Zwiń"
 
 #: ../libpurple/protocols/qq/buddy_info.c:1
-msgid "Email"
-msgstr "E-mail"
-
-#: ../libpurple/protocols/qq/buddy_info.c:1
 msgid "Zipcode"
 msgstr "Kod pocztowy"
 
@@ -11516,8 +11506,8 @@ msgstr "Nazwa użytkownika: \t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:1 ../libpurple/protocols/silc10/util.c:1
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:1 ../libpurple/protocols/silc10/util.c:1
 #, c-format
@@ -11844,8 +11834,8 @@ msgstr "Usługa katalogu tymczasowo nied
 
 #: ../libpurple/protocols/toc/toc.c:1
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "Zastrzeżone wyszukiwanie e-mail."
+msgid "Email lookup restricted."
+msgstr "Zastrzeżone wyszukiwanie email."
 
 #: ../libpurple/protocols/toc/toc.c:1
 #, c-format
@@ -14753,8 +14743,8 @@ msgstr "Kolor odnośników pod kursorem 
 msgstr "Kolor odnośników pod kursorem myszki."
 
 #: ../pidgin/gtkimhtml.c:1
-msgid "_Copy E-Mail Address"
-msgstr "Skopiuj a_dres e-mail"
+msgid "_Copy Email Address"
+msgstr "Skopiuj a_dres email"
 
 #: ../pidgin/gtkimhtml.c:1
 msgid "_Open Link in Browser"
@@ -15146,7 +15136,7 @@ msgid "<span weight=\"bold\" size=\"larg
 
 #: ../pidgin/gtknotify.c:1
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość e-mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość email!</span>"
 
 #: ../pidgin/gtknotify.c:1
 #, c-format
@@ -15158,11 +15148,11 @@ msgstr[2] "%s ma %d nowych wiadomości."
 
 #: ../pidgin/gtknotify.c:1
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>Masz %d nowy e-mail.</b>"
-msgstr[1] "<b>Masz %d nowe e-maile.</b>"
-msgstr[2] "<b>Masz %d nowych e-maili.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>Masz %d nowy email.</b>"
+msgstr[1] "<b>Masz %d nowe emaile.</b>"
+msgstr[2] "<b>Masz %d nowych emaili.</b>"
 
 #: ../pidgin/gtknotify.c:1
 #, c-format
@@ -16468,24 +16458,24 @@ msgstr "_Skojarzenie kontaktu"
 msgstr "_Skojarzenie kontaktu"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:1
-msgid "Unable to send e-mail"
-msgstr "Wysłanie wiadomości e-mail nie powiodło się."
+msgid "Unable to send email"
+msgstr "Wysłanie wiadomości email nie powiodło się."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:1
 msgid "The evolution executable was not found in the PATH."
 msgstr "Plik wykonywalny programu evolution nie znajduje siÄ™ w zmiennej PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:1
-msgid "An e-mail address was not found for this buddy."
-msgstr "Nie znaleziono adresu e-mail dla tego znajomego."
+msgid "An email address was not found for this buddy."
+msgstr "Nie znaleziono adresu email dla tego znajomego."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:1
 msgid "Add to Address Book"
 msgstr "Dodaj do książki adresowej"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:1
-msgid "Send E-Mail"
-msgstr "Wyślij E-mail"
+msgid "Send Email"
+msgstr "Wyślij Email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:1
@@ -16542,8 +16532,8 @@ msgstr "Nazwisko:"
 msgstr "Nazwisko:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:1
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/ps.po	163090269c37e2be87b75233f717fd8f6d4e4a3c
+++ po/ps.po	08efab4aaf02c405853d989dd4b7c2bb002d19d5
@@ -3465,7 +3465,7 @@ msgstr "اخری نوم"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "برېښنالیک"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3499,16 +3499,6 @@ msgstr "نوی کاس"
 msgid "Purple Person"
 msgstr "نوی کاس"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "برېښنالیک"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "بانجوړ"
@@ -5145,7 +5135,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "برېښنالیک پته"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6203,7 +6193,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6743,7 +6733,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "شخصي برېښنالیک پته"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6805,7 +6795,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "د کارځای برېښنالیک پته"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8410,7 +8400,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8589,12 +8579,12 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8628,21 +8618,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8653,7 +8643,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "د %s برېښنالیک پته د %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -8899,15 +8889,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -8937,11 +8927,11 @@ msgstr "شمېرل ثابت که"
 msgstr "شمېرل ثابت که"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "اوسنی ثبت شوی د برېښنالیک پته ښکاره که"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "اوسنی ثبت شوی د برېښنالیک پته بدله که..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -8949,7 +8939,7 @@ msgstr "هغه ملګری ښکاره Ú©Ù
 msgstr "هغه ملګری ښکاره که چه د ته اجازه په انتظار کښی دي"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "د برېشنالیک په توګه د ملګری لټون..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9033,10 +9023,6 @@ msgstr "پوهنځی"
 msgid "College"
 msgstr "پوهنځی"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "برېښنالیک پته"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "زپ رمز"
@@ -11691,7 +11677,7 @@ msgstr "کاروونکی نوم: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "برېښنالیک پته: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12027,7 +12013,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -14845,7 +14831,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15230,8 +15216,8 @@ msgstr[1] "‫(%s) ته %d نوی پېغ
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>تا ته %d نوی برېښناليک راغلي دی.</b>"
 msgstr[1] "<b>تا ته %d نوی برېښناليک راغلي دی.</b>"
 
@@ -16436,7 +16422,7 @@ msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16444,7 +16430,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16452,7 +16438,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "برېښنالیک استول"
 
 #. Configuration frame
@@ -16510,7 +16496,7 @@ msgstr "اخری نوم:"
 msgstr "اخری نوم:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "برېښنالیک"
 
 #. *< type
============================================================
--- po/pt.po	2dbc1df957d1ee27e16f5c138d44a17cbb20e6c6
+++ po/pt.po	ab6f122bb7b088a2f29a7264893dc35e6b34e8f9
@@ -86,7 +86,7 @@ msgid "New mail notifications"
 
 #: ../finch/gntaccount.c:437
 msgid "New mail notifications"
-msgstr "Novas notificações de e-mail"
+msgstr "Novas notificações de email"
 
 #: ../finch/gntaccount.c:447
 msgid "Remember password"
@@ -3635,8 +3635,8 @@ msgstr "Último nome"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3670,17 +3670,6 @@ msgstr "Nova Pessoa"
 msgid "Purple Person"
 msgstr "Nova Pessoa"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "E-mail:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5110,7 +5099,7 @@ msgid "Reachability Address"
 #: ../libpurple/protocols/jabber/buddy.c:1025
 #, fuzzy
 msgid "Reachability Address"
-msgstr "Endereço de e-mail"
+msgstr "Endereço de email"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
@@ -5397,8 +5386,8 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "Endereço de e-mail"
+msgid "Email Address"
+msgstr "Endereço de email"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6482,8 +6471,8 @@ msgstr "Erro de sintaxe (provavelmente u
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Morada de e-mail inválida"
+msgid "Invalid email address"
+msgstr "Morada de email inválida"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -7038,7 +7027,7 @@ msgstr "Página Inicial"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Título Pessoal"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7107,8 +7096,8 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-Mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -8802,12 +8791,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Recebeu um e-mail do ICQ de %s [%s]\n"
+"Recebeu um email do ICQ de %s [%s]\n"
 "\n"
 "A mensagem é: \n"
 "%s"
@@ -8992,13 +8981,13 @@ msgstr "Nome de utilizador:"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Nenhum resultado encontrado para o endereço de email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Deve receber um e-mail pedindo para confirmar %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Deve receber um email pedindo para confirmar %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -9035,28 +9024,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Erro 0x%04x: Impossível mudar endereço de e-mail porque já existe um pedido "
+"Erro 0x%04x: Impossível mudar endereço de email porque já existe um pedido "
 "pendente para esse nome de utilizador."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Erro 0x%04x: Impossível mudar o endereço de e-mail porque este já possui "
+"Erro 0x%04x: Impossível mudar o endereço de email porque este já possui "
 "muitos nomes de utilizador associados a ele."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Erro 0x%04x: Impossível mudar o endereço de e-mail porque este é inválido."
+"Erro 0x%04x: Impossível mudar o endereço de email porque este é inválido."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
@@ -9065,8 +9054,8 @@ msgstr "Erro 0x%04x: Erro desconhecido."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "O endereço de e-mail de %s é %s"
+msgid "The email address for %s is %s"
+msgstr "O endereço de email de %s é %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
@@ -9351,16 +9340,16 @@ msgstr ""
 "neles e seleccionando \"Re-requisitar autorização.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
-msgstr "Encontrar Contacto por E-mail"
+msgid "Find Buddy by Email"
+msgstr "Encontrar Contacto por Email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
-msgstr "Pesquisar Contactos por morada de e-mail"
+msgid "Search for a buddy by email address"
+msgstr "Pesquisar Contactos por morada de email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Digite a morada de e-mail do contacto que pesquisa."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Digite a morada de email do contacto que pesquisa."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
@@ -9391,12 +9380,12 @@ msgstr "Confirmar Conta"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Mostrar o Endereço Registado Actualmente"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Mudar o Endereço Registado Actualmente..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9405,7 +9394,7 @@ msgstr "Mostrar contactos esperando auto
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Procurar Contacto por Email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9498,10 +9487,6 @@ msgstr "Co_lapsar"
 msgid "College"
 msgstr "Co_lapsar"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12317,7 +12302,7 @@ msgstr "Nome de Utilizador: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "EMail: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12664,8 +12649,8 @@ msgstr "Serviço de diretorio temporaria
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "Pesquisa por e-mail restrita."
+msgid "Email lookup restricted."
+msgstr "Pesquisa por email restrita."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -13801,7 +13786,7 @@ msgid "New _mail notifications"
 #: ../pidgin/gtkaccount.c:604
 #, fuzzy
 msgid "New _mail notifications"
-msgstr "Novas notificações de e-mail"
+msgstr "Novas notificações de email"
 
 #. Buddy icon
 #: ../pidgin/gtkaccount.c:609
@@ -15614,8 +15599,8 @@ msgstr "Cor para desenhar elos quando o 
 msgstr "Cor para desenhar elos quando o rato está sobre eles."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Copiar Endereço de E-Mail"
+msgid "_Copy Email Address"
+msgstr "_Copiar Endereço de Email"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -16054,8 +16039,8 @@ msgstr[1] "%s tem %d novas mensagens."
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>Detalhes do Plugin</b>"
 msgstr[1] "<b>Detalhes do Plugin</b>"
 
@@ -16992,7 +16977,7 @@ msgid "_Open Mail"
 
 #: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
-msgstr "_Abrir e-mail"
+msgstr "_Abrir email"
 
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
@@ -17343,15 +17328,15 @@ msgstr "_Associar Contacto"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "Impossível enviar e-mail"
+msgid "Unable to send email"
+msgstr "Impossível enviar email"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "O programa evolution não foi encontrado no PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17359,8 +17344,8 @@ msgstr "Adicionar ao Livro de Endereços
 msgstr "Adicionar ao Livro de Endereços"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "Enviar E-Mail"
+msgid "Send Email"
+msgstr "Enviar Email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -17421,8 +17406,8 @@ msgstr "Último nome:"
 msgstr "Último nome:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -17477,11 +17462,11 @@ msgid "Mail Checker"
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr "Verificador de e-mail"
+msgstr "Verificador de email"
 
 #: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "Verifica novos e-mails locais."
+msgstr "Verifica novos emails locais."
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
============================================================
--- po/pt_BR.po	c623833c84880c7f6f4db85b4b62318689b82481
+++ po/pt_BR.po	0c610a1e9c24df04860fa579ecaa629e538fc130
@@ -1369,7 +1369,7 @@ msgid "New Mail"
 
 #: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
-msgstr "Novo e-mail"
+msgstr "Novo email"
 
 #: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:972
 #, c-format
@@ -3925,7 +3925,7 @@ msgstr "Sobrenome"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
-msgid "E-Mail"
+msgid "Email"
 msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:401
@@ -3957,16 +3957,6 @@ msgstr "Pessoa púrpura"
 msgid "Purple Person"
 msgstr "Pessoa púrpura"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:986
-#: ../libpurple/protocols/silc/silc.c:1227
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5624,8 +5614,8 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/oscar/oscar.c:3760
-msgid "E-Mail Address"
-msgstr "Endereço de e-mail"
+msgid "Email Address"
+msgstr "Endereço de email"
 
 #: ../libpurple/protocols/jabber/buddy.c:2470
 #: ../libpurple/protocols/jabber/buddy.c:2471
@@ -6684,8 +6674,8 @@ msgstr "Erro de sintaxe (provavelmente u
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
-msgstr "Endereço de e-mail inválido"
+msgid "Invalid email address"
+msgstr "Endereço de email inválido"
 
 #: ../libpurple/protocols/msn/error.c:49
 #: ../libpurple/protocols/msnp9/error.c:49
@@ -7296,8 +7286,8 @@ msgstr "Fax doméstico"
 
 #: ../libpurple/protocols/msn/msn.c:1826
 #: ../libpurple/protocols/msnp9/msn.c:1667
-msgid "Personal E-Mail"
-msgstr "E-Mail pessoal"
+msgid "Personal Email"
+msgstr "Email pessoal"
 
 #: ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/msnp9/msn.c:1668
@@ -7372,8 +7362,8 @@ msgstr "Fax de trabalho"
 
 #: ../libpurple/protocols/msn/msn.c:1857
 #: ../libpurple/protocols/msnp9/msn.c:1698
-msgid "Work E-Mail"
-msgstr "E-Mail de trabalho"
+msgid "Work Email"
+msgstr "Email de trabalho"
 
 #: ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/msnp9/msn.c:1699
@@ -9213,12 +9203,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2493
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Você recebeu um e-mail do ICQ de %s [%s]\n"
+"Você recebeu um email do ICQ de %s [%s]\n"
 "\n"
 "A mensagem é: \n"
 "%s"
@@ -9398,13 +9388,13 @@ msgstr[1] "Os seguintes nomes de usuári
 
 #: ../libpurple/protocols/oscar/oscar.c:3985
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Nenhum resultado encontrado para o endereço de email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4006
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Você deve receber um e-mail pedindo para confirmar %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Você deve receber um email pedindo para confirmar %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:4008
 msgid "Account Confirmation Requested"
@@ -9437,28 +9427,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Erro 0x%04x: Não foi possível mudar endereço de e-mail porque já existe um "
+"Erro 0x%04x: Não foi possível mudar endereço de email porque já existe um "
 "pedido pendente para esse nome de usuário."
 
 #: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este já "
+"Erro 0x%04x: Não foi possível mudar o endereço de email porque este já "
 "possui muitos nomes de usuário associados a ele."
 
 #: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este é "
+"Erro 0x%04x: Não foi possível mudar o endereço de email porque este é "
 "inválido."
 
 #: ../libpurple/protocols/oscar/oscar.c:4053
@@ -9472,8 +9462,8 @@ msgstr "Erro ao mudar informações da c
 
 #: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "O endereço de e-mail de %s é %s"
+msgid "The email address for %s is %s"
+msgstr "O endereço de email de %s é %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4063
 msgid "Account Info"
@@ -9749,16 +9739,16 @@ msgstr ""
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6345
-msgid "Find Buddy by E-Mail"
-msgstr "Encontrar amigo por e-mail"
+msgid "Find Buddy by Email"
+msgstr "Encontrar amigo por email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6346
-msgid "Search for a buddy by e-mail address"
-msgstr "Pesquisar por um amigo pelo endereço de e-mail"
+msgid "Search for a buddy by email address"
+msgstr "Pesquisar por um amigo pelo endereço de email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6347
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Digite o endereço de e-mail do amigo que você está procurando."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Digite o endereço de email do amigo que você está procurando."
 
 #: ../libpurple/protocols/oscar/oscar.c:6350
 msgid "_Search"
@@ -9787,20 +9777,20 @@ msgstr "Confirmar conta"
 msgstr "Confirmar conta"
 
 #: ../libpurple/protocols/oscar/oscar.c:6544
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Mostrar o endereço de E-Mail registrado atualmente"
+msgid "Display Currently Registered Email Address"
+msgstr "Mostrar o endereço de Email registrado atualmente"
 
 #: ../libpurple/protocols/oscar/oscar.c:6548
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Mudar o endereço de E-Mail registrado atualmente..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Mudar o endereço de Email registrado atualmente..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
 #: ../libpurple/protocols/oscar/oscar.c:6561
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Procurar por amigos pelo endereço de E-Mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Procurar por amigos pelo endereço de Email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6566
 msgid "Search for Buddy by Information"
@@ -9881,10 +9871,6 @@ msgstr "Universidade"
 msgid "College"
 msgstr "Universidade"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Código Postal (CEP)"
@@ -12625,8 +12611,8 @@ msgstr "Nome do usuário: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:369
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12951,8 +12937,8 @@ msgstr "Serviço de diretório temporari
 msgstr "Serviço de diretório temporariamente indisponível."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
-msgstr "Pesquisa por e-mail restrita."
+msgid "Email lookup restricted."
+msgstr "Pesquisa por email restrita."
 
 #: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
@@ -16024,8 +16010,8 @@ msgstr "Habilitar notificação de digit
 msgstr "Habilitar notificação de digitação"
 
 #: ../pidgin/gtkimhtml.c:1688
-msgid "_Copy E-Mail Address"
-msgstr "_Copiar endereço de e-mail"
+msgid "_Copy Email Address"
+msgstr "_Copiar endereço de email"
 
 #: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
@@ -16436,7 +16422,7 @@ msgid "<span weight=\"bold\" size=\"larg
 
 #: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Você tem e-mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Você tem email!</span>"
 
 #: ../pidgin/gtknotify.c:563
 #, c-format
@@ -16447,10 +16433,10 @@ msgstr[1] "%s tem %d novas mensagens."
 
 #: ../pidgin/gtknotify.c:587
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d novo e-mail.</b>"
-msgstr[1] "<b>%d novos e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d novo email.</b>"
+msgstr[1] "<b>%d novos emails.</b>"
 
 #: ../pidgin/gtknotify.c:1021
 #, c-format
@@ -17436,7 +17422,7 @@ msgid "_Open Mail"
 
 #: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
-msgstr "_Abrir e-mail"
+msgstr "_Abrir email"
 
 #: ../pidgin/pidgintooltip.c:100
 msgid "Pidgin Tooltip"
@@ -17776,24 +17762,24 @@ msgstr "_Associar amigo"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
-msgid "Unable to send e-mail"
-msgstr "Não foi possível enviar e-mail."
+msgid "Unable to send email"
+msgstr "Não foi possível enviar email."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "O executável do evolution não foi encontrado no PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
-msgid "An e-mail address was not found for this buddy."
-msgstr "Não foi encontrado um endereço de E-Mail para este amigo."
+msgid "An email address was not found for this buddy."
+msgstr "Não foi encontrado um endereço de Email para este amigo."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Adicionar ao catálogo de endereços"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
-msgid "Send E-Mail"
-msgstr "Enviar e-mail"
+msgid "Send Email"
+msgstr "Enviar email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:414
@@ -17851,8 +17837,8 @@ msgstr "Sobrenome:"
 msgstr "Sobrenome:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -17908,11 +17894,11 @@ msgid "Mail Checker"
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr "Verificador de e-mail"
+msgstr "Verificador de email"
 
 #: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "Verifica novos e-mails locais."
+msgstr "Verifica novos emails locais."
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
============================================================
--- po/ro.po	b3704fe6ac93c14cf25647962848c9f6733a58af
+++ po/ro.po	b0e50d63f251a6407650c49a34c813bde75dd665
@@ -3916,7 +3916,7 @@ msgstr "Nume de familie"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
-msgid "E-Mail"
+msgid "Email"
 msgstr "Mail"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:402
@@ -3948,16 +3948,6 @@ msgstr "Persoană Purple"
 msgid "Purple Person"
 msgstr "Persoană Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:705
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:986
-#: ../libpurple/protocols/silc/silc.c:1227
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "Mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5626,7 +5616,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3753
 #: ../libpurple/protocols/oscar/oscar.c:3762
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Adresă de mail"
 
 #: ../libpurple/protocols/jabber/buddy.c:2471
@@ -6680,7 +6670,7 @@ msgstr "Eroare de sintaxă (probabil o e
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Adresă de mail invalidă"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7291,7 +7281,7 @@ msgstr "Fax acasă"
 
 #: ../libpurple/protocols/msn/msn.c:1826
 #: ../libpurple/protocols/msnp9/msn.c:1667
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Mail privat"
 
 #: ../libpurple/protocols/msn/msn.c:1827
@@ -7367,7 +7357,7 @@ msgstr "Fax serviciu"
 
 #: ../libpurple/protocols/msn/msn.c:1857
 #: ../libpurple/protocols/msnp9/msn.c:1698
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Mail serviciu"
 
 #: ../libpurple/protocols/msn/msn.c:1858
@@ -9229,7 +9219,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9424,12 +9414,12 @@ msgstr[2] "Următoarele nume de utilizat
 
 #: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Nu s-a găsit nici un rezultat pentru adresa de mail %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Ar trebui să primiţi un mail care să vă ceară confirmarea %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:4010
@@ -9464,7 +9454,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că există deja o "
@@ -9473,7 +9463,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
@@ -9482,7 +9472,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
@@ -9499,7 +9489,7 @@ msgstr "Eroare la schimbarea detaliilor 
 
 #: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Adresa de mail pentru %s este %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4065
@@ -9781,15 +9771,15 @@ msgstr ""
 "din nou autorizare” după un click dreapta pe nume în lista contactelor."
 
 #: ../libpurple/protocols/oscar/oscar.c:6347
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Căutare contact după adresa de mail"
 
 #: ../libpurple/protocols/oscar/oscar.c:6348
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Căutare contact după adresa de mail"
 
 #: ../libpurple/protocols/oscar/oscar.c:6349
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Introduceţi adresa de mail a contactului căutat:"
 
 #: ../libpurple/protocols/oscar/oscar.c:6352
@@ -9819,11 +9809,11 @@ msgstr "Confirmare cont"
 msgstr "Confirmare cont"
 
 #: ../libpurple/protocols/oscar/oscar.c:6546
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Afişare adresă de mail înregistrată curent"
 
 #: ../libpurple/protocols/oscar/oscar.c:6550
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Schimbare adresă de mail înregistrată curent..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6557
@@ -9831,7 +9821,7 @@ msgstr "Afişare contacte ce aşteaptă 
 msgstr "Afişare contacte ce aşteaptă autorizarea"
 
 #: ../libpurple/protocols/oscar/oscar.c:6563
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Căutare contact după adresa de mail..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6568
@@ -9913,10 +9903,6 @@ msgstr "Colegiu"
 msgid "College"
 msgstr "Colegiu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Mail"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Cod poÅŸtal"
@@ -12656,7 +12642,7 @@ msgstr "Nume utilizator: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Adresă de mail: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:369
@@ -12981,7 +12967,7 @@ msgstr "Serviciul „Dir” este tempora
 msgstr "Serviciul „Dir” este temporar indisponibil."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Căutarea după adresa de mail este restricţionată."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -16069,7 +16055,7 @@ msgstr "Activează mesajele de notificar
 msgstr "Activează mesajele de notificare"
 
 #: ../pidgin/gtkimhtml.c:1688
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "C_opiază adresa de mail"
 
 #: ../pidgin/gtkimhtml.c:1700
@@ -16493,8 +16479,8 @@ msgstr[2] "%s are %d de mesaje noi."
 
 #: ../pidgin/gtknotify.c:599
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>un mail nou.</b>"
 msgstr[1] "<b>%d mailuri noi.</b>"
 msgstr[2] "<b>%d de mailuri noi.</b>"
@@ -17814,7 +17800,7 @@ msgstr "_Asociere contact"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Trimiterea mailului a eÅŸuat."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
@@ -17822,7 +17808,7 @@ msgstr "Executabilul „evolution” nu 
 msgstr "Executabilul „evolution” nu a fost găsit în PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Nu s-a găsit o adresă de mail pentru acest contact."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
@@ -17830,7 +17816,7 @@ msgstr "Adaugă în agendă"
 msgstr "Adaugă în agendă"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Trimite mail"
 
 #. Configuration frame
@@ -17889,7 +17875,7 @@ msgstr "Nume de familie:"
 msgstr "Nume de familie:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Mail:"
 
 #. *< type
============================================================
--- po/ru.po	3ac951e4e74a1bb98df123b06d782399e702dad5
+++ po/ru.po	7ff20e0d398e28c20383f443fdd08a0c24171e9b
@@ -1331,7 +1331,7 @@ msgid "Emails"
 
 #: ../finch/gntnotify.c:165
 msgid "Emails"
-msgstr "Адреса e-mail"
+msgstr "Адреса email"
 
 #: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
@@ -3852,8 +3852,8 @@ msgstr "Фамилия"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
-msgid "E-Mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:402
 #: ../libpurple/protocols/bonjour/bonjour.c:708
@@ -3884,16 +3884,6 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:705
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:986
-#: ../libpurple/protocols/silc/silc.c:1227
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5543,8 +5533,8 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3753
 #: ../libpurple/protocols/oscar/oscar.c:3762
-msgid "E-Mail Address"
-msgstr "Адрес e-mail"
+msgid "Email Address"
+msgstr "Адрес email"
 
 #: ../libpurple/protocols/jabber/buddy.c:2471
 #: ../libpurple/protocols/jabber/buddy.c:2472
@@ -6591,8 +6581,8 @@ msgstr "Синтаксическая оÑ
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Неверный адрес e-mail"
+msgid "Invalid email address"
+msgstr "Неверный адрес email"
 
 #: ../libpurple/protocols/msn/error.c:49
 #: ../libpurple/protocols/msnp9/error.c:49
@@ -7250,8 +7240,8 @@ msgstr "Домашний факс"
 
 #: ../libpurple/protocols/msn/msn.c:1826
 #: ../libpurple/protocols/msnp9/msn.c:1667
-msgid "Personal E-Mail"
-msgstr "Персональный e-mail"
+msgid "Personal Email"
+msgstr "Персональный email"
 
 #: ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/msnp9/msn.c:1668
@@ -7326,8 +7316,8 @@ msgstr "Рабочий факс"
 
 #: ../libpurple/protocols/msn/msn.c:1857
 #: ../libpurple/protocols/msnp9/msn.c:1698
-msgid "Work E-Mail"
-msgstr "Рабочий e-mail"
+msgid "Work Email"
+msgstr "Рабочий email"
 
 #: ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/msnp9/msn.c:1699
@@ -9137,12 +9127,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Вы получили ICQ e-mail от %s [%s]\n"
+"Вы получили ICQ email от %s [%s]\n"
 "\n"
 "Сообщение:\n"
 "%s"
@@ -9339,13 +9329,13 @@ msgstr[2] "Следующие имена
 
 #: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Ничего не найдено для адреса e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Ничего не найдено для адреса email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Вы должны получить email с просьбой подтвердить %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:4010
 msgid "Account Confirmation Requested"
@@ -9379,28 +9369,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как для этого имени "
+"Ошибка 0x%04x: Не удаётся изменить адрес email, так как для этого имени "
 "пользователя уже есть ожидающий запрос."
 
 #: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
+"Ошибка 0x%04x: Не удаётся изменить адрес email, так как с заданным адресом "
 "соотнесено слишком много имён пользователей."
 
 #: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
+"Ошибка 0x%04x: Не удаётся изменить адрес email, так как заданный адрес "
 "неверен."
 
 #: ../libpurple/protocols/oscar/oscar.c:4055
@@ -9414,8 +9404,8 @@ msgstr "Ошибка изменения 
 
 #: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Адрес e-mail для %s: %s"
+msgid "The email address for %s is %s"
+msgstr "Адрес email для %s: %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4065
 msgid "Account Info"
@@ -9690,16 +9680,16 @@ msgstr ""
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
 #: ../libpurple/protocols/oscar/oscar.c:6347
-msgid "Find Buddy by E-Mail"
-msgstr "Найти собеседника по e-mail"
+msgid "Find Buddy by Email"
+msgstr "Найти собеседника по email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6348
-msgid "Search for a buddy by e-mail address"
-msgstr "Искать собеседника по адресу e-mail"
+msgid "Search for a buddy by email address"
+msgstr "Искать собеседника по адресу email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6349
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Введите адрес e-mail собеседника, которого вы ищете."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Введите адрес email собеседника, которого вы ищете."
 
 #: ../libpurple/protocols/oscar/oscar.c:6352
 msgid "_Search"
@@ -9728,20 +9718,20 @@ msgstr "Подтвердить учётÐ
 msgstr "Подтвердить учётную запись"
 
 #: ../libpurple/protocols/oscar/oscar.c:6546
-msgid "Display Currently Registered E-Mail Address"
-msgstr "Показать текущий зарегистрированный адрес e-mail"
+msgid "Display Currently Registered Email Address"
+msgstr "Показать текущий зарегистрированный адрес email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6550
-msgid "Change Currently Registered E-Mail Address..."
-msgstr "Изменить текущий зарегистрированный адрес e-mail..."
+msgid "Change Currently Registered Email Address..."
+msgstr "Изменить текущий зарегистрированный адрес email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6557
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показать собеседников без авторизации"
 
 #: ../libpurple/protocols/oscar/oscar.c:6563
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Искать собеседника по адресу e-mail..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Искать собеседника по адресу email..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6568
 msgid "Search for Buddy by Information"
@@ -9820,10 +9810,6 @@ msgstr ""
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Индекс"
@@ -12516,8 +12502,8 @@ msgstr "Имя пользователя:
 #: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:369
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12847,8 +12833,8 @@ msgstr "Служба каталогов 
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "Поиск e-mail запрещён."
+msgid "Email lookup restricted."
+msgstr "Поиск email запрещён."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -15896,8 +15882,8 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1688
-msgid "_Copy E-Mail Address"
-msgstr "_Скопировать адрес e-mail"
+msgid "_Copy Email Address"
+msgstr "_Скопировать адрес email"
 
 #: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
@@ -16303,8 +16289,8 @@ msgstr[2] "%s имеет %d новых Ñ
 
 #: ../pidgin/gtknotify.c:599
 #, fuzzy, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Подробности о модуле</b>"
 msgstr[1] "<b>Подробности о модуле</b>"
 msgstr[2] "<b>Подробности о модуле</b>"
@@ -17608,15 +17594,15 @@ msgstr "Соотнести собесеÐ
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
-msgid "Unable to send e-mail"
-msgstr "Не удаётся отправить e-mail"
+msgid "Unable to send email"
+msgstr "Не удаётся отправить email"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "Исполняемый файл evolution не был найден в PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
@@ -17624,8 +17610,8 @@ msgstr "Добавить в адресн
 msgstr "Добавить в адресную книгу"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
-msgid "Send E-Mail"
-msgstr "Отправить e-mail"
+msgid "Send Email"
+msgstr "Отправить email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:414
@@ -17684,8 +17670,8 @@ msgstr "Фамилия:"
 msgstr "Фамилия:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/si.po	9ebd2beea0c325bd17b28bb8d337a5279de74743
+++ po/si.po	bf37c04960ca5b61551e9f02793e872e2cc9df19
@@ -3496,7 +3496,7 @@ msgstr "අවසන් නම"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "විද්‍යුත් තැපැල:"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:385
@@ -3528,16 +3528,6 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:687
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:961
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "විද්‍යුත් තැපෑල"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5155,7 +5145,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/oscar/oscar.c:3733
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "විද්‍යුත් තැපැල් ලිපිනය"
 
 #: ../libpurple/protocols/jabber/buddy.c:2423
@@ -6176,7 +6166,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6765,7 +6755,7 @@ msgstr "ගෘහස්ථ ෆැක්à
 
 #: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/msnp9/msn.c:1657
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1805
@@ -6841,7 +6831,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/msnp9/msn.c:1688
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1836
@@ -8544,7 +8534,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8721,12 +8711,12 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3981
@@ -8759,21 +8749,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8784,7 +8774,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4045
@@ -9029,15 +9019,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6281
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6282
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6283
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6286
@@ -9067,11 +9057,11 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6480
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6484
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6491
@@ -9079,7 +9069,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6497
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6502
@@ -9162,10 +9152,6 @@ msgstr ""
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "විද්‍යුත් තැපෑල"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr ""
@@ -11793,7 +11779,7 @@ msgstr ""
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr ""
 
 #: ../libpurple/protocols/silc/util.c:370
@@ -12111,7 +12097,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -14935,7 +14921,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1581
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1593
@@ -15304,8 +15290,8 @@ msgstr[1] ""
 
 #: ../pidgin/gtknotify.c:570
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -16550,7 +16536,7 @@ msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16558,7 +16544,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16566,7 +16552,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr ""
 
 #. Configuration frame
@@ -16624,7 +16610,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr ""
 
 #. *< type
============================================================
--- po/sk.po	11bfc631e55fe9d18c35fd496529ce8fbdd568c5
+++ po/sk.po	f7f2f9046ea5d0086bdcb46579f858a51d33b197
@@ -823,7 +823,7 @@ msgid "Emails"
 msgstr "Systémový záznam"
 
 msgid "Emails"
-msgstr "E-maily"
+msgstr "Emaily"
 
 msgid "You have mail!"
 msgstr "Máte poštu!"
@@ -2750,8 +2750,8 @@ msgstr "Priezvisko"
 msgid "Last name"
 msgstr "Priezvisko"
 
-msgid "E-Mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr "Email"
 
 msgid "AIM Account"
 msgstr "AIM účet"
@@ -2775,9 +2775,6 @@ msgstr "Fialová osoba"
 msgid "Purple Person"
 msgstr "Fialová osoba"
 
-msgid "E-mail"
-msgstr "E-mail"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3854,8 +3851,8 @@ msgstr ""
 msgstr ""
 "Vyplňte jedno alebo viac políčok na hľadanie vyhovujúcich XMPP používateľov."
 
-msgid "E-Mail Address"
-msgstr "E-mailová adresa"
+msgid "Email Address"
+msgstr "Emailová adresa"
 
 msgid "Search for XMPP users"
 msgstr "Vyhľadávanie používateľov XMPP"
@@ -4588,8 +4585,8 @@ msgstr "Chyba syntaxe (pravdepodobne chy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Chyba syntaxe (pravdepodobne chyba v klientovi)"
 
-msgid "Invalid e-mail address"
-msgstr "Chybná e-mailová adresa"
+msgid "Invalid email address"
+msgstr "Chybná emailová adresa"
 
 msgid "User does not exist"
 msgstr "Používateľ neexistuje"
@@ -4946,8 +4943,8 @@ msgstr "Fax domov"
 msgid "Home Fax"
 msgstr "Fax domov"
 
-msgid "Personal E-Mail"
-msgstr "Osobný e-mail"
+msgid "Personal Email"
+msgstr "Osobný email"
 
 msgid "Personal IM"
 msgstr "Osobné IM"
@@ -4989,8 +4986,8 @@ msgstr "Služobný fax"
 msgid "Work Fax"
 msgstr "Služobný fax"
 
-msgid "Work E-Mail"
-msgstr "Pracovný e-mail"
+msgid "Work Email"
+msgstr "Pracovný email"
 
 msgid "Work IM"
 msgstr "Pracovné IM"
@@ -6337,12 +6334,12 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Prišiel vám e-mail od používateľa %s [%s]\n"
+"Prišiel vám email od používateľa %s [%s]\n"
 "\n"
 "Správa je:\n"
 "%s"
@@ -6492,12 +6489,12 @@ msgstr[2] "Nasledujúce používateľskÃ
 msgstr[2] "Nasledujúce používateľské mená sú asociované s %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Pre e-mailovú %s adresu neboli nájdené žiadne výsledky"
+msgid "No results found for email address %s"
+msgstr "Pre emailovú %s adresu neboli nájdené žiadne výsledky"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Mali by ste prijať e-mail so žiadosťou o potvrdenie %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Mali by ste prijať email so žiadosťou o potvrdenie %s."
 
 msgid "Account Confirmation Requested"
 msgstr "Bolo vyžiadané podvrdenie účtu"
@@ -6525,26 +6522,26 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Chyba 0x%04x: Nepodarilo sa zmeniť e-mailovú adresu, pretože o toto "
+"Chyba 0x%04x: Nepodarilo sa zmeniť emailovú adresu, pretože o toto "
 "používateľské meno je daná žiadosť."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Chyba 0x%04x: E-mailová adresa sa nedá zmeniť, pretože táto adresa má so "
+"Chyba 0x%04x: Emailová adresa sa nedá zmeniť, pretože táto adresa má so "
 "sebou asociovaných veľmi veľa používateľských mien."
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Chyba 0x%04x: Nepodarilo sa zmeniť e-mailovú adresu, pretože zadaná adresa "
+"Chyba 0x%04x: Nepodarilo sa zmeniť emailovú adresu, pretože zadaná adresa "
 "je chybná."
 
 #, c-format
@@ -6555,8 +6552,8 @@ msgstr "Chyba pri zmene podrobností úÄ
 msgstr "Chyba pri zmene podrobností účtu"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "E-mailová adresa používateľa %s je %s"
+msgid "The email address for %s is %s"
+msgstr "Emailová adresa používateľa %s je %s"
 
 msgid "Account Info"
 msgstr "Podrobnosti o účte"
@@ -6626,7 +6623,7 @@ msgstr ""
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Nepodarilo sa pridať priateľa %s, pretože používateľské meno je chybné.  "
-"Používateľské mená musia byť v tvare e-mailovej adresy, čísla, alebo musí "
+"Používateľské mená musia byť v tvare emailovej adresy, čísla, alebo musí "
 "byť prvý znak písmeno a ostatné znaky sú písmená, čísla a medzery."
 
 msgid "Unable To Add"
@@ -6778,14 +6775,14 @@ msgstr ""
 "Týchto priateľov môžete znovu požiadať o autorizáciu, keď na nich kliknete "
 "pravým tlačidlom a vyberiete možnosť „Znovu požiadať o autorizáciu“."
 
-msgid "Find Buddy by E-Mail"
-msgstr "Nájsť priateľa podľa E-mailu"
+msgid "Find Buddy by Email"
+msgstr "Nájsť priateľa podľa Emailu"
 
-msgid "Search for a buddy by e-mail address"
-msgstr "Vyhľadávať priateľov podľa e-mailovej adresy"
+msgid "Search for a buddy by email address"
+msgstr "Vyhľadávať priateľov podľa emailovej adresy"
 
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Zadajte e-mailovú adresu priateľa, ktorého hľadáte."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Zadajte emailovú adresu priateľa, ktorého hľadáte."
 
 msgid "_Search"
 msgstr "_Hľadať"
@@ -6807,16 +6804,16 @@ msgstr "Potvrdiť účet"
 msgid "Confirm Account"
 msgstr "Potvrdiť účet"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Zobraziť momentálne registrovanú e-maiovú adresu"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Zmeniť momentálne registrovanú e-maiovú adresu..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zobraziť priateľov, ktorí čakajú na autorizáciu"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Hľadať priateľa podľa e-maiovej adresy..."
 
 msgid "Search for Buddy by Information"
@@ -6881,9 +6878,6 @@ msgstr "Å kola"
 msgid "College"
 msgstr "Å kola"
 
-msgid "Email"
-msgstr "E-mail"
-
 msgid "Zipcode"
 msgstr "PSČ"
 
@@ -8637,8 +8631,8 @@ msgstr "Prihlasovacie meno: \t%s\n"
 msgstr "Prihlasovacie meno: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -8876,8 +8870,8 @@ msgstr "Služba dir je dočasne nedostup
 msgid "Dir service temporarily unavailable."
 msgstr "Služba dir je dočasne nedostupná"
 
-msgid "E-mail lookup restricted."
-msgstr "Vyhľadávanie e-mailu obmedzené."
+msgid "Email lookup restricted."
+msgstr "Vyhľadávanie emailu obmedzené."
 
 msgid "Keyword ignored."
 msgstr "Kľúčové slovo bolo ignorované."
@@ -11230,8 +11224,8 @@ msgstr "Povoliť informáciu o písaní"
 msgid "Enable typing notification"
 msgstr "Povoliť informáciu o písaní"
 
-msgid "_Copy E-Mail Address"
-msgstr "_Kopírovať e-mailovu adresu"
+msgid "_Copy Email Address"
+msgstr "_Kopírovať emailovu adresu"
 
 msgid "_Open Link in Browser"
 msgstr "_Otvoriť odkaz v prehliadači"
@@ -11578,11 +11572,11 @@ msgstr[2] "Používateľ %s má %d nové
 msgstr[2] "Používateľ %s má %d nové správy."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d nových e-mailov.</b>"
-msgstr[1] "<b>%d nový e-mail.</b>"
-msgstr[2] "<b>%d nové e-maily.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d nových emailov.</b>"
+msgstr[1] "<b>%d nový email.</b>"
+msgstr[2] "<b>%d nové emaily.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12611,20 +12605,20 @@ msgstr "_Priradiť priateľa"
 msgid "_Associate Buddy"
 msgstr "_Priradiť priateľa"
 
-msgid "Unable to send e-mail"
-msgstr "Nepodarilo sa odoslať e-mail"
+msgid "Unable to send email"
+msgstr "Nepodarilo sa odoslať email"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Spúšťač programu evolution nebol nájdený v premennej PATH."
 
-msgid "An e-mail address was not found for this buddy."
-msgstr "Nebola nájdená e-mailová adresa tohoto priateľa."
+msgid "An email address was not found for this buddy."
+msgstr "Nebola nájdená emailová adresa tohoto priateľa."
 
 msgid "Add to Address Book"
 msgstr "Pridať do adresára"
 
-msgid "Send E-Mail"
-msgstr "Odoslať E-mail"
+msgid "Send Email"
+msgstr "Odoslať Email"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -12669,8 +12663,8 @@ msgstr "Priezvisko:"
 msgid "Last name:"
 msgstr "Priezvisko:"
 
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/sl.po	5a4fd9d2f42e6e0cd430a22dea2e13006cefceaa
+++ po/sl.po	e0c37c7d29bcc348477c9b334549c5eed225c853
@@ -2787,7 +2787,7 @@ msgstr "Priimek"
 msgid "Last name"
 msgstr "Priimek"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-pošta"
 
 msgid "AIM Account"
@@ -2812,9 +2812,6 @@ msgstr "Vijolična oseba"
 msgid "Purple Person"
 msgstr "Vijolična oseba"
 
-msgid "E-mail"
-msgstr "E-pošta"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3889,7 +3886,7 @@ msgstr "Izpolnite eno ali več polj za i
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov XMPP."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-naslov"
 
 msgid "Search for XMPP users"
@@ -4621,7 +4618,7 @@ msgstr "Skladenjska napaka (verjetno hro
 msgid "Syntax Error (probably a client bug)"
 msgstr "Skladenjska napaka (verjetno hrošč v odjemalcu)"
 
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Neveljaven naslov e-pošte"
 
 msgid "User does not exist"
@@ -4978,7 +4975,7 @@ msgstr "Domači faks"
 msgid "Home Fax"
 msgstr "Domači faks"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Osebni e-naslov"
 
 msgid "Personal IM"
@@ -5021,7 +5018,7 @@ msgstr "Službeni faks"
 msgid "Work Fax"
 msgstr "Službeni faks"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Službeni e-naslov"
 
 msgid "Work IM"
@@ -6378,7 +6375,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6536,11 +6533,11 @@ msgstr[3] "Naslednja uporabniška imena 
 msgstr[3] "Naslednja uporabniška imena so povezana z %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Za dani elektronski naslov %s ni zadetkov."
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Prejeti bi morali e-pošto, da potrdite %s. "
 
 msgid "Account Confirmation Requested"
@@ -6570,7 +6567,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to "
@@ -6578,7 +6575,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že "
@@ -6586,7 +6583,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je podani naslov "
@@ -6600,7 +6597,7 @@ msgstr "Napaka pri spreminjanju podatkov
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
 msgid "Account Info"
@@ -6827,13 +6824,13 @@ msgstr ""
 "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da "
 "desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Najdi prijatelja po e-pošti"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
 msgid "_Search"
@@ -6856,16 +6853,16 @@ msgstr "Potrdi račun"
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
 msgid "Search for Buddy by Information"
@@ -6931,9 +6928,6 @@ msgstr "Srednja Å¡ola"
 msgid "College"
 msgstr "Srednja Å¡ola"
 
-msgid "Email"
-msgstr "E-naslov"
-
 msgid "Zipcode"
 msgstr "Poštna številka"
 
@@ -8681,7 +8675,7 @@ msgstr "Uporabniško ime: \t%s\n"
 msgstr "Uporabniško ime: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-pošta: \t\t%s\n"
 
 #, c-format
@@ -8918,7 +8912,7 @@ msgstr "Imeniška storitev je trenutno n
 msgid "Dir service temporarily unavailable."
 msgstr "Imeniška storitev je trenutno nedosegljiva."
 
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Poizvedba po e-poštnem naslovu je omejena."
 
 msgid "Keyword ignored."
@@ -11274,7 +11268,7 @@ msgstr "Omogoči obveščanje o tipkanju
 msgid "Enable typing notification"
 msgstr "Omogoči obveščanje o tipkanju"
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopiraj naslov e-pošte"
 
 msgid "_Open Link in Browser"
@@ -11626,8 +11620,8 @@ msgstr[3] "%s ima %d nova sporočila."
 msgstr[3] "%s ima %d nova sporočila."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Imate %d novih e-sporočil.</b>"
 msgstr[1] "<b>Imate %d novo e-sporočilo.</b>"
 msgstr[2] "<b>Imate %d novi e-sporočili.</b>"
@@ -12662,19 +12656,19 @@ msgstr "Pridruži prijatelj_a"
 msgid "_Associate Buddy"
 msgstr "Pridruži prijatelj_a"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "E-sporočila ni mogoče poslati."
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Izvršilne datoteke Evolution ni v POTI."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Za tega prijatelja e-naslova ni mogoče najti."
 
 msgid "Add to Address Book"
 msgstr "Dodaj v adresar"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Pošlji e-sporočilo"
 
 #. Configuration frame
@@ -12720,7 +12714,7 @@ msgstr "Priimek:"
 msgid "Last name:"
 msgstr "Priimek:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-pošta:"
 
 #. *< type
============================================================
--- po/sq.po	175e8065f1149ced69bf320a3a43e72c912ab3e0
+++ po/sq.po	013d300f08da448deca021a8d1a3280a4fd80ffc
@@ -1189,7 +1189,7 @@ msgid "New Mail"
 #: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 #, fuzzy
 msgid "New Mail"
-msgstr "E-Mail"
+msgstr "Email"
 
 #: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
@@ -3796,8 +3796,8 @@ msgstr "Mbiemër"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3842,17 +3842,6 @@ msgstr "Person i Ri"
 msgid "Purple Person"
 msgstr "Person i Ri"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "E-mail:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5635,13 +5624,13 @@ msgstr ""
 "Plotësoni një ose më tepër fusha për kërkim të cilitdo përdorues Jabber që "
 "ka përputhje."
 
-#  E-Mail Address
+#  Email Address
 #: ../libpurple/protocols/jabber/buddy.c:2401
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "Vendndodhje E-Mail"
+msgid "Email Address"
+msgstr "Vendndodhje Email"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6746,8 +6735,8 @@ msgstr "Gabim Sintakse (mundet një e me
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "Vendndodhje e-mail e pavlefshme"
+msgid "Invalid email address"
+msgstr "Vendndodhje email e pavlefshme"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -7312,7 +7301,7 @@ msgstr "Faqe Hyrëse"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Titullin Vetjak"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7381,8 +7370,8 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-Mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -9131,12 +9120,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Keni marrë një e-mail ICQ prej %s [%s]\n"
+"Keni marrë një email ICQ prej %s [%s]\n"
 "\n"
 "Mesazhi thotë:\n"
 "%s"
@@ -9326,13 +9315,13 @@ msgstr "Emër në ekran:"
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Nuk u gjetën përfundime për vendndodhje e-mail %s"
+msgid "No results found for email address %s"
+msgstr "Nuk u gjetën përfundime për vendndodhje email %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Duht t'ju vijë një e-mail me kërkesën për ripohim të %s."
+msgid "You should receive an email asking to confirm %s."
+msgstr "Duht t'ju vijë një email me kërkesën për ripohim të %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
@@ -9370,28 +9359,28 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse për këtë emër "
+"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse për këtë emër "
 "ekrani ka tashmë një kërkesë në pritje."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e "
+"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse vendndodhja e "
 "dhënë ka shumë emra ekrani shoqëruar asaj."
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e "
+"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse vendndodhja e "
 "dhënë është e pavlefshme."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
@@ -9401,8 +9390,8 @@ msgstr "Gabim 0x%04x: Gabim i panjohur."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Vendndodhja e-mail për %s është %s"
+msgid "The email address for %s is %s"
+msgstr "Vendndodhja email për %s është %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
@@ -9687,16 +9676,16 @@ msgstr ""
 "dhe përzgjedhur \"Rikërko Autorizim.\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
-msgstr "Gjej Shok nga E-mail-i"
+msgid "Find Buddy by Email"
+msgstr "Gjej Shok nga Email-i"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
-msgstr "Kërko një shok me vendndodhje e-mail"
+msgid "Search for a buddy by email address"
+msgstr "Kërko një shok me vendndodhje email"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Shtypni vendndodhjen e-mail të shokut që po kërkoni."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Shtypni vendndodhjen email të shokut që po kërkoni."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
@@ -9728,12 +9717,12 @@ msgstr "Ripohoni Llogari"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Shfaq Vendndodhje të Regjistruar për Çastin"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Ndrysho Vendndodhje të Regjistruar për Çastin..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9742,8 +9731,8 @@ msgstr "Shfaq Shokë që Presin Autorizi
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Kërko për Shokë sipas E-mail-i..."
+msgid "Search for Buddy by Email Address..."
+msgstr "Kërko për Shokë sipas Email-i..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
@@ -9834,10 +9823,6 @@ msgstr "_Tkurr"
 msgid "College"
 msgstr "_Tkurr"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Email"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12715,7 +12700,7 @@ msgstr "Emër Përdoruesi: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "EMail: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -13088,8 +13073,8 @@ msgstr "Shërbim drejtorish përkohësis
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
-msgstr "Kërkim e-mail-i i ndaluar."
+msgid "Email lookup restricted."
+msgstr "Kërkim email-i i ndaluar."
 
 #: ../libpurple/protocols/toc/toc.c:533
 #, c-format
@@ -16128,8 +16113,8 @@ msgstr "Ngjyrë për vizatim tejlidhjesh
 msgstr "Ngjyrë për vizatim tejlidhjesh kur mbi to kalon miu."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Kopjo Vendndodhje E-Mail"
+msgid "_Copy Email Address"
+msgstr "_Kopjo Vendndodhje Email"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -16568,8 +16553,8 @@ msgstr[1] "%s ka %d mesazhe të rinj."
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -17913,15 +17898,15 @@ msgstr "_Shoqëro Shok"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "I pazoti të dërgoj e-mail."
+msgid "Unable to send email"
+msgstr "I pazoti të dërgoj email."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "I ekzekutueshmi për Evolution nuk u gjet në PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17929,8 +17914,8 @@ msgstr "Shto te Libër Vendndodhjesh"
 msgstr "Shto te Libër Vendndodhjesh"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "Dërgo E-Mail"
+msgid "Send Email"
+msgstr "Dërgo Email"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -17999,8 +17984,8 @@ msgstr "Mbiemër:"
 msgstr "Mbiemër:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #  *< api_version
 #  *< type
============================================================
--- po/sr.po	cfba9361d1d40e8970db5c640ea78e63fb3a883f
+++ po/sr.po	fd719fefdfc9c0c599cdeb9192185a6a9c124475
@@ -3533,7 +3533,7 @@ msgstr "Презиме"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Е-пошта"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3565,16 +3565,6 @@ msgstr "Особа"
 msgid "Purple Person"
 msgstr "Особа"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "Е-пошта"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Бонжур"
@@ -5244,7 +5234,7 @@ msgstr "Попуните једно ил
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3707
 #: ../libpurple/protocols/oscar/oscar.c:3716
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Адреса е-поште"
 
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6294,7 +6284,7 @@ msgstr "Синтаксна грешка 
 msgstr "Синтаксна грешка (вероватно грешка у програму)"
 
 #: ../libpurple/protocols/msn/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Неисправна ел. адреса"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6789,7 +6779,7 @@ msgstr "Факс"
 msgstr "Факс"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Е-пошта"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6851,7 +6841,7 @@ msgstr "Факс на послу"
 msgstr "Факс на послу"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Е-пошта на послу"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8499,7 +8489,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8692,12 +8682,12 @@ msgstr "Корисничко име:"
 
 #: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Није пронађено нити једно поклапање за адресу е-поште %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Требате да примите е-пошту ради потврђивања %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3964
@@ -8734,7 +8724,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је већ послат "
@@ -8743,7 +8733,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је превише "
@@ -8752,7 +8742,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је унета адреса "
@@ -8765,7 +8755,7 @@ msgstr "Грешка 0x%04x: НепозÐ
 
 #: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Адреса е-поште за %s је %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4028
@@ -9049,15 +9039,15 @@ msgstr ""
 "избором „Понови захтев за овлашћење“."
 
 #: ../libpurple/protocols/oscar/oscar.c:6215
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Пронађи другара помоћу адресе е-поште"
 
 #: ../libpurple/protocols/oscar/oscar.c:6216
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Пронађи другара помоћу адресе е-поште"
 
 #: ../libpurple/protocols/oscar/oscar.c:6217
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Укуцајте е-поштанску адресу другара кога тражите."
 
 #: ../libpurple/protocols/oscar/oscar.c:6220
@@ -9087,11 +9077,11 @@ msgstr "Потврдите налог"
 msgstr "Потврдите налог"
 
 #: ../libpurple/protocols/oscar/oscar.c:6414
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Прикажи тренутно регистровану адресу е-поште"
 
 #: ../libpurple/protocols/oscar/oscar.c:6418
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Измени тренутно регистровану адресу е-поште..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6425
@@ -9099,7 +9089,7 @@ msgstr "Прикажи другаре з
 msgstr "Прикажи другаре за које се чека овлашћење"
 
 #: ../libpurple/protocols/oscar/oscar.c:6431
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Пронађи другара према адреси е-поште..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6436
@@ -9187,10 +9177,6 @@ msgstr "Факултет"
 msgid "College"
 msgstr "Факултет"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Е-пошта"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Поштански број"
@@ -11920,7 +11906,7 @@ msgstr "Корисничко име: \t%
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Е-пошта: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12247,7 +12233,7 @@ msgstr "Услуге именика тр
 msgstr "Услуге именика тренутно нису доступне."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Ограничена претрага према адреси е-поште."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15149,7 +15135,7 @@ msgstr "Боја за исцртавањ
 msgstr "Боја за исцртавање над-веза кад је миш изнад њих."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Копирај адресу е-поште"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15572,8 +15558,8 @@ msgstr[2] "%s је примио %d ноÐ
 
 #: ../pidgin/gtknotify.c:533
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -16817,7 +16803,7 @@ msgstr "Придружи другара"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Не могу да пошаљем е-поруку."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16825,7 +16811,7 @@ msgstr "Програм ЕволуцијÐ
 msgstr "Програм Еволуција није нађен на стази."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Адреса е-поште није нађена за овог другара."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16833,7 +16819,7 @@ msgstr "Додај у адресар"
 msgstr "Додај у адресар"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Пошаљи е-поруку"
 
 #. Configuration frame
@@ -16891,7 +16877,7 @@ msgstr "Презиме:"
 msgstr "Презиме:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Е-пошта"
 
 #. *< type
============================================================
--- po/sr at latin.po	151e86226888507746db7fbf771eff3f555f3baf
+++ po/sr at latin.po	4c6b725e92c0268dc4cb00af6e0c558a26162d9b
@@ -3533,7 +3533,7 @@ msgstr "Prezime"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-pošta"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3565,16 +3565,6 @@ msgstr "Osoba"
 msgid "Purple Person"
 msgstr "Osoba"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "E-pošta"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonžur"
@@ -5244,7 +5234,7 @@ msgstr "Popunite jedno ili više polja d
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3707
 #: ../libpurple/protocols/oscar/oscar.c:3716
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Adresa e-pošte"
 
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6294,7 +6284,7 @@ msgstr "Sintaksna greška (verovatno gre
 msgstr "Sintaksna greška (verovatno greška u programu)"
 
 #: ../libpurple/protocols/msn/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Neispravna el. adresa"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6789,7 +6779,7 @@ msgstr "Faks"
 msgstr "Faks"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "E-pošta"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6851,7 +6841,7 @@ msgstr "Faks na poslu"
 msgstr "Faks na poslu"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "E-pošta na poslu"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8499,7 +8489,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8692,12 +8682,12 @@ msgstr "Korisničko ime:"
 
 #: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Nije pronađeno niti jedno poklapanje za adresu e-pošte %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Trebate da primite e-poštu radi potvrđivanja %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3964
@@ -8734,7 +8724,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je već poslat "
@@ -8743,7 +8733,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je previše "
@@ -8752,7 +8742,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je uneta adresa "
@@ -8765,7 +8755,7 @@ msgstr "Greška 0x%04x: Nepoznata grešk
 
 #: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Adresa e-pošte za %s je %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4028
@@ -9049,15 +9039,15 @@ msgstr ""
 "izborom „Ponovi zahtev za ovlašćenje“."
 
 #: ../libpurple/protocols/oscar/oscar.c:6215
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Pronađi drugara pomoću adrese e-pošte"
 
 #: ../libpurple/protocols/oscar/oscar.c:6216
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Pronađi drugara pomoću adrese e-pošte"
 
 #: ../libpurple/protocols/oscar/oscar.c:6217
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Ukucajte e-poštansku adresu drugara koga tražite."
 
 #: ../libpurple/protocols/oscar/oscar.c:6220
@@ -9087,11 +9077,11 @@ msgstr "Potvrdite nalog"
 msgstr "Potvrdite nalog"
 
 #: ../libpurple/protocols/oscar/oscar.c:6414
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Prikaži trenutno registrovanu adresu e-pošte"
 
 #: ../libpurple/protocols/oscar/oscar.c:6418
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Izmeni trenutno registrovanu adresu e-pošte..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6425
@@ -9099,7 +9089,7 @@ msgstr "Prikaži drugare za koje se ček
 msgstr "Prikaži drugare za koje se čeka ovlašćenje"
 
 #: ../libpurple/protocols/oscar/oscar.c:6431
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Pronađi drugara prema adresi e-pošte..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6436
@@ -9187,10 +9177,6 @@ msgstr "Fakultet"
 msgid "College"
 msgstr "Fakultet"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-pošta"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Poštanski broj"
@@ -11920,7 +11906,7 @@ msgstr "Korisničko ime: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-pošta: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12247,7 +12233,7 @@ msgstr "Usluge imenika trenutno nisu dos
 msgstr "Usluge imenika trenutno nisu dostupne."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Ograničena pretraga prema adresi e-pošte."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15149,7 +15135,7 @@ msgstr "Boja za iscrtavanje nad-veza kad
 msgstr "Boja za iscrtavanje nad-veza kad je miš iznad njih."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopiraj adresu e-pošte"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15572,8 +15558,8 @@ msgstr[2] "%s je primio %d novih poruka.
 
 #: ../pidgin/gtknotify.c:533
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -16817,7 +16803,7 @@ msgstr "Pridruži drugara"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Ne mogu da pošaljem e-poruku."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16825,7 +16811,7 @@ msgstr "Program Evolucija nije nađen na
 msgstr "Program Evolucija nije nađen na stazi."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Adresa e-pošte nije nađena za ovog drugara."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16833,7 +16819,7 @@ msgstr "Dodaj u adresar"
 msgstr "Dodaj u adresar"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Pošalji e-poruku"
 
 #. Configuration frame
@@ -16891,7 +16877,7 @@ msgstr "Prezime:"
 msgstr "Prezime:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-pošta"
 
 #. *< type
============================================================
--- po/sv.po	6b1e48fdf1d2ae880f1da1e09041585c7e92c445
+++ po/sv.po	879a0ecb3791a13bd433dda6a0e2f087cd060169
@@ -2754,7 +2754,7 @@ msgstr "Efternamn"
 msgid "Last name"
 msgstr "Efternamn"
 
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-post"
 
 msgid "AIM Account"
@@ -2779,9 +2779,6 @@ msgstr "Purple person"
 msgid "Purple Person"
 msgstr "Purple person"
 
-msgid "E-mail"
-msgstr "E-post"
-
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3885,7 +3882,7 @@ msgstr ""
 msgstr ""
 "Fyll i ett eller flera fält för att söka efter matchande XMPPanvändare."
 
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-postadress"
 
 msgid "Search for XMPP users"
@@ -4619,7 +4616,7 @@ msgstr "Syntaxfel (antagligen ett klient
 msgstr "Syntaxfel (antagligen ett klient bug)"
 
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Ogiltig e-postadress"
 
 #, c-format
@@ -5030,7 +5027,7 @@ msgstr "Hemfax"
 msgid "Home Fax"
 msgstr "Hemfax"
 
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Personlig E-Post"
 
 msgid "Personal IM"
@@ -5073,7 +5070,7 @@ msgstr "Arbete Fax"
 msgid "Work Fax"
 msgstr "Arbete Fax"
 
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Arbete E-post"
 
 msgid "Work IM"
@@ -6425,7 +6422,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -6571,11 +6568,11 @@ msgstr[1] "Följande användarnamn är a
 msgstr[1] "Följande användarnamn är associerat med %s"
 
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Inget resultat funnet för e-postadress %s"
 
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Du borde få ett e-postmeddelande som ber dig bekräfta %s."
 
 msgid "Account Confirmation Requested"
@@ -6604,7 +6601,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 "Fel 0x%04x: Kan inte ändra e-postadressen eftersom det redan finns en "
@@ -6612,7 +6609,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen har "
@@ -6620,7 +6617,7 @@ msgid ""
 
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen inte "
@@ -6634,7 +6631,7 @@ msgstr "Fel vid ändring av kontoinforma
 msgstr "Fel vid ändring av kontoinformation"
 
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "E-postaderssen för %s är %s"
 
 msgid "Account Info"
@@ -6856,13 +6853,13 @@ msgstr ""
 "Du kan begära auktorisering igen från dessa kompisar genom att högerkilcka "
 "på dem och välja \"Begär auktorisering igen.\""
 
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Hitta kompis på e-postadress"
 
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Sök efter en kompis på dess e-postadress"
 
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Skriv in e-postadressen för den kompis du söker efter."
 
 msgid "_Search"
@@ -6885,16 +6882,16 @@ msgstr "Bekräfta konto"
 msgid "Confirm Account"
 msgstr "Bekräfta konto"
 
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Visa för tillfället registrerad epost-adress"
 
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Ändra för tillfället registrerad epost-adress..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Visa kompisar som väntar på auktorisering"
 
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Sök efter kompis på e-postadress..."
 
 msgid "Search for Buddy by Information"
@@ -6961,9 +6958,6 @@ msgstr "Universitet"
 msgid "College"
 msgstr "Universitet"
 
-msgid "Email"
-msgstr "E-post"
-
 msgid "Zipcode"
 msgstr "Postnummer"
 
@@ -8722,7 +8716,7 @@ msgstr "Användarnamn: \t%s\n"
 msgstr "Användarnamn: \t%s\n"
 
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-Post: \t\t%s\n"
 
 #, c-format
@@ -8978,7 +8972,7 @@ msgstr "Katalogtjänsten är tillfällig
 msgstr "Katalogtjänsten är tillfälligt onåbar."
 
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "E-postuppslagning är begränsad."
 
 #, c-format
@@ -11329,7 +11323,7 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr ""
 
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Kopiera e-postadress"
 
 msgid "_Open Link in Browser"
@@ -11686,8 +11680,8 @@ msgstr[1] "%s har %d nya meddelanden."
 msgstr[1] "%s har %d nya meddelanden."
 
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Du har %d nytt epost.</b>"
 msgstr[1] "<b>Du har %d nya epost.</b>"
 
@@ -12718,19 +12712,19 @@ msgstr "_Associera kompis"
 msgid "_Associate Buddy"
 msgstr "_Associera kompis"
 
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Kunde inte skicka e-post"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Evolutions körfil hittades inte i sökvägarna."
 
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Ingen epostadress hittades för denna kompisen."
 
 msgid "Add to Address Book"
 msgstr "Lägg till i adressboken"
 
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Skicka e-post"
 
 #. Configuration frame
@@ -12776,7 +12770,7 @@ msgstr "Efternamn:"
 msgid "Last name:"
 msgstr "Efternamn:"
 
-msgid "E-mail:"
+msgid "Email:"
 msgstr "E-postadress:"
 
 #. *< type
============================================================
--- po/ta.po	3d142a213f21cd4592b7d74722fe735013173a1c
+++ po/ta.po	53cd723f0004db9eaa7ef51b330d4973a8513867
@@ -3635,7 +3635,7 @@ msgstr "கடைசிப்பெயà®
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "மின்னஞ்சல்"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3670,16 +3670,6 @@ msgstr "புதிய நபர்"
 msgid "Purple Person"
 msgstr "புதிய நபர்"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "மின் அஞ்சல்"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "போன்ஜு"
@@ -5387,7 +5377,7 @@ msgstr "ஜாப்பர் பயனà
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "மின்னஞ்சல்"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6459,7 +6449,7 @@ msgstr "இலக்கணப்பிà®
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "செல்லாத மின்னஞ்சல் முகவரி"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7006,7 +6996,7 @@ msgstr "வீட்டு தொலைà
 msgstr "வீட்டு தொலைநகலி"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "சொந்த மின்னஞ்சல்"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7069,7 +7059,7 @@ msgstr "அலுவலக தொலைà
 msgstr "அலுவலக தொலைநகலி"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "அலுவலக மின்னஞ்சல்"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8748,7 +8738,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8936,12 +8926,12 @@ msgstr "திரைப்பெயரà¯
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "மின்னஞ்சல் %s க்கு எந்த முடிவும் இல்லை"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s ஐ உறுதி செய்யக்கோரி உங்களுக்கு மின்அஞ்சல் வரும்."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8979,7 +8969,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "பிழை 0x%04x: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் இந்த திரைப்பயருக்கு ஏற்கனவே ஒரு "
@@ -8988,7 +8978,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "பிழை 0x%04x: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் இந்த மின்னஞ்சலுக்கு நிறைய "
@@ -8997,7 +8987,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "பிழை 0x%04x: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் அந்த முகவரி செல்லாதது."
 
@@ -9008,7 +8998,7 @@ msgstr "பிழை0x%04x:  தெரà®
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s யின் மின்அஞ்சல் முகவரி %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9288,15 +9278,15 @@ msgstr ""
 "மீண்டும் கோருக.\" ஐ தேர்வு செய்யவும்."
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "தோழரை மின்னஞ்சல் கொண்டு தேடு"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "மின்னஞ்சல் முகவரி மூலம் தோழரை தேடு"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "நீங்கள் தேடும் நண்பரின் மின்னஞ்சல் முகவரியை கொடுக்கவும்.."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9328,12 +9318,12 @@ msgstr "கணக்கை உறுதà
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "தற்போதைய பதிவுசெய்த முகவரிகளை காட்டு"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "தற்போது பதியப்பட்ட முகவரிகளை மாற்று..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9342,7 +9332,7 @@ msgstr "உறுதியாக்கà®
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "தோழரை மின்னஞ்சல் மூலம் தேடுக..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9435,11 +9425,6 @@ msgstr "_ச சுருக்கு"
 msgid "College"
 msgstr "_ச சுருக்கு"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-#, fuzzy
-msgid "Email"
-msgstr "மின் அஞ்சல்"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12241,7 +12226,7 @@ msgstr "பயனாளர் பெயà
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "மின்னஞ்சல்: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12585,7 +12570,7 @@ msgstr "அடைவு சேவை த
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "மின்னஞ்சலை பார்ப்பது தடைசெய்யப்பட்டது."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15508,7 +15493,7 @@ msgstr "சுட்டி மீத்à
 msgstr "சுட்டி மீத்தொடர்பின் மீது இருக்கும்பொழுது மீத்தொடர்பை வரைவதற்கான நிறம்"
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "மின்னஞ்சல் முகவரியை _நகலெடு"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15948,8 +15933,8 @@ msgstr[1] "%s க்கு %d புதà
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>சொருகுபொருள் விவரம்</b>"
 msgstr[1] "<b>சொருகுபொருள் விவரம்</b>"
 
@@ -17223,7 +17208,7 @@ msgstr "_சக நண்பரை சà¯
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "மின்னஞ்சல் அனுப்ப இயலவில்லை"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17231,7 +17216,7 @@ msgstr "எவல்யூஷன் சà
 msgstr "எவல்யூஷன் செயலி பாதையில் இல்லை."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17239,7 +17224,7 @@ msgstr "முகவரி புத்à
 msgstr "முகவரி புத்தகத்தில் சேர்க்கவும்"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "மின்னஞ்சல் அனுப்புக"
 
 #. Configuration frame
@@ -17297,7 +17282,7 @@ msgstr "கடைசிப்பெயà®
 msgstr "கடைசிப்பெயர்:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "மின்னஞ்சல்:"
 
 #. *< type
============================================================
--- po/te.po	dc4cb8ef46a6667b533aa279143c27fa6ef9853d
+++ po/te.po	c85481b6e3248f0dfac5e749f5193e14f7d194ad
@@ -4092,7 +4092,7 @@ msgstr "పేరులోని à°šà°¿à
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "ఇ-మెయిల్ "
 
 # And now for the buttons
@@ -4127,17 +4127,6 @@ msgstr "Purple పర్సన్"
 msgid "Purple Person"
 msgstr "Purple పర్సన్"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:681
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:959
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "ఇ-మెయిల్:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5838,7 +5827,7 @@ msgstr "సరిపోలే జాబà
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/oscar/oscar.c:3733
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ఇ-మెయిల్ అడ్రస్ "
 
 #: ../libpurple/protocols/jabber/buddy.c:2423
@@ -6910,7 +6899,7 @@ msgstr "వాక్యవిన్యà°
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "చెల్లని ఇ-మెయిల్ అడ్రస్ "
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7548,7 +7537,7 @@ msgstr "ఇంటిలోని ఫ్à
 
 #: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/msnp9/msn.c:1657
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "వ్యక్తిగత ఇ-మెయిల్"
 
 #: ../libpurple/protocols/msn/msn.c:1805
@@ -7624,7 +7613,7 @@ msgstr "పనిచేసేదగ్à°
 
 #: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/msnp9/msn.c:1688
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "పనిచేసేదగ్గరి ఇ-మెయిల్"
 
 #: ../libpurple/protocols/msn/msn.c:1836
@@ -9446,7 +9435,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9632,12 +9621,12 @@ msgstr "_స్క్రీన్ పే
 
 #: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "%s ఇ-మెయిల్ అడ్రస్‌కు ఫలితాలు కనిపించలేదు. "
 
 #: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s నిర్ధారించమని కోరుతూ మీరు ఒక ఇ-మెయిల్‌ను స్వీకరించాలి. "
 
 #: ../libpurple/protocols/oscar/oscar.c:3981
@@ -9665,17 +9654,17 @@ msgstr "పొరపాటు 0x%04x: à°
 
 #: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
 msgstr "పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇదే స్క్రీన్‌పేరును మరొకరు మీకంటే ముందే కోరినారు. అది పెండింగ్‌లో ఉంది. "
 
 #: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
 msgstr "పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇచ్చిన అడ్రసుకు చాలా స్క్రీన్‌పేరులు అనుబంధమై ఉన్నాయి. "
 
 #: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "పొరపాటు 0x%04x:  ఈ-మెయిల్ అడ్రసును మార్చలేము, ఎందుకంటే ఇచ్చిన అడ్రసుకు విలువ లేదు."
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
@@ -9685,7 +9674,7 @@ msgstr "పొరపాటు 0x%04x: à°
 
 #: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s ఇ-మెయిల్ అడ్రస్ %s"
 
 # And now for the buttons
@@ -9911,15 +9900,15 @@ msgstr "ఈ క్రింది మి
 msgstr "ఈ క్రింది మిత్రులనుండి ఆథరైజేషన్ కొసం మీరు మరల మనవి చేయవచ్చును. వారిపేరుపై రైట్‌క్లిక్ చేసి \"ఆథరైజేషన్ కోసం మరోసారి మనవి.\" ని సెలక్ట్ చేయండి. "
 
 #: ../libpurple/protocols/oscar/oscar.c:6281
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "ఇ-మెయిల్ ద్వారా మిత్రుని కనుగొనండి. "
 
 #: ../libpurple/protocols/oscar/oscar.c:6282
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "ఇ-మెయిల్ అడ్రస్‌తో మిత్రుని కనుగొనండి. "
 
 #: ../libpurple/protocols/oscar/oscar.c:6283
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "మీరు అన్వేషిస్తున్న మిత్రుని ఇ-మెయిల్ అడ్రసును టైప్ చేయండి."
 
 # "Search"
@@ -9952,11 +9941,11 @@ msgstr "అకౌంట్‌ను à°¨à
 msgstr "అకౌంట్‌ను నిర్ధారించండి. "
 
 #: ../libpurple/protocols/oscar/oscar.c:6480
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "ప్రస్తుతం నమోదైన ఇ -మెయిల్ అడ్రసును చూపండి"
 
 #: ../libpurple/protocols/oscar/oscar.c:6484
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "ప్రస్తుతం నమోదైన ఇ - మెయిల్   అడ్రసును మార్చండి..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6491
@@ -9964,7 +9953,7 @@ msgstr "ఆథరైజేషన్‌ à
 msgstr "ఆథరైజేషన్‌ కోసం ఎదురుచూస్తూ మిత్రులను ప్రదర్శించుము."
 
 #: ../libpurple/protocols/oscar/oscar.c:6497
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "ఇ-మెయిల్ అడ్రసు ద్వారా మిత్రాన్వేషణ ..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6502
@@ -10047,10 +10036,6 @@ msgstr "కళాశాల"
 msgid "College"
 msgstr "కళాశాల"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "ఇ-మెయిల్ "
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12772,7 +12757,7 @@ msgstr "వినియోగదారà±
 #: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "ఇ-మెయిల్: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:370
@@ -13095,7 +13080,7 @@ msgstr "డైరెక్టరీ à°¸à
 msgstr "డైరెక్టరీ సేవ తాత్కాలికంగా అందుబాటులో లేదు."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "ఇ-మెయిల్‌ను చూడటంపై ఆంక్షలు."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -16214,7 +16199,7 @@ msgstr "మౌస్ హైపర్ ల
 msgstr "మౌస్ హైపర్ లింక్ లపై ఉన్నప్పుడు వాటిని చిత్రించడానికి రంగు."
 
 #: ../pidgin/gtkimhtml.c:1581
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_ఇ-మెయిల్ అడ్రసును కాపీ చేయండి. "
 
 #: ../pidgin/gtkimhtml.c:1593
@@ -16657,8 +16642,8 @@ msgstr[1] "%s के %d लिए नय
 
 #: ../pidgin/gtknotify.c:570
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>ప్లగ్ ఇన్ వివరాలు</b>"
 msgstr[1] "<b>ప్లగ్ ఇన్ వివరాలు</b>"
 
@@ -18030,7 +18015,7 @@ msgstr "_సహచర మిత్రు
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ఇ-మెయిల్ పంపలేక పోతోంది"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -18038,7 +18023,7 @@ msgstr "PATH లో ఎవల్యూà°
 msgstr "PATH లో ఎవల్యూషన్ ఎగ్జిక్యూటేబుల్ కనబడలేదు."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "ఈ మిత్రుడికి సంబంధించి ఇ-మెయిల్ అడ్రస్ కనబడలేదు. "
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -18046,7 +18031,7 @@ msgstr "అడ్రస్ బుక్â
 msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ఇ-మెయిల్ పంపించు"
 
 # Configuration frame
@@ -18113,7 +18098,7 @@ msgstr "చివరి పేరు:"
 msgstr "చివరి పేరు:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ఇ-మెయిల్:"
 
 # *< api_version
============================================================
--- po/th.po	ed780b73ae5a8993313473993bdc8c499919a248
+++ po/th.po	c547dfe9ee0f88132f7ca7048cc1e8c604339454
@@ -3538,7 +3538,7 @@ msgstr "นามสกุล"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "อีเมล"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3572,16 +3572,6 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "อีเมล"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5220,7 +5210,7 @@ msgstr "กรอกข้อมูลà¹
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ที่อยู่อีเมล"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6274,7 +6264,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "อีเมลไม่ถูกต้อง"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6816,7 +6806,7 @@ msgstr "แฟกซ์ที่บ้à¸
 msgstr "แฟกซ์ที่บ้าน"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "อีเมลส่วนตัว"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -6879,7 +6869,7 @@ msgstr "แฟกซ์ที่ทำà¸
 msgstr "แฟกซ์ที่ทำงาน"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "อีเมลที่ทำงาน"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8477,7 +8467,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8657,12 +8647,12 @@ msgstr "ชื่อล็อกอิà¸
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8696,21 +8686,21 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8721,7 +8711,7 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -8970,15 +8960,15 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9009,11 +8999,11 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9021,7 +9011,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9110,11 +9100,6 @@ msgstr "_ย่อ"
 msgid "College"
 msgstr "_ย่อ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-#, fuzzy
-msgid "Email"
-msgstr "อีเมล"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr ""
@@ -11807,7 +11792,7 @@ msgstr ""
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr ""
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12146,7 +12131,7 @@ msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -14991,7 +14976,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "คัดลอก_อีเมล"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15384,8 +15369,8 @@ msgstr[1] "%s มีเมลใหมà¹
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>รายละเอียดของปลั๊กอิน</b>"
 msgstr[1] "<b>รายละเอียดของปลั๊กอิน</b>"
 
@@ -16618,7 +16603,7 @@ msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ไม่สามารถส่งอีเมลได้"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16626,7 +16611,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16634,7 +16619,7 @@ msgstr "เพิ่มชื่อใà¸
 msgstr "เพิ่มชื่อในสมุดที่อยู่"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "ส่งอีเมล"
 
 #. Configuration frame
@@ -16692,7 +16677,7 @@ msgstr "นามสกุล:"
 msgstr "นามสกุล:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "อีเมล:"
 
 #. *< type
============================================================
--- po/tr.po	cf918087330b3752814f51e5957cd200641f636f
+++ po/tr.po	0d8700dee7de9eb69467082921978ca4ea63692c
@@ -3558,7 +3558,7 @@ msgstr "Soyad"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "E-Posta"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:374
@@ -3590,16 +3590,6 @@ msgstr "Mor KiÅŸi"
 msgid "Purple Person"
 msgstr "Mor KiÅŸi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:676
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:901
-#: ../libpurple/protocols/silc/silc.c:1142
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "E-posta"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5250,7 +5240,7 @@ msgstr "EÅŸleÅŸen bir XMPP kullanıcısÄ
 #: ../libpurple/protocols/novell/novell.c:1490
 #: ../libpurple/protocols/oscar/oscar.c:3729
 #: ../libpurple/protocols/oscar/oscar.c:3738
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "E-Posta Adresi"
 
 #: ../libpurple/protocols/jabber/buddy.c:2423
@@ -6305,7 +6295,7 @@ msgstr "Sözdizimi hatası (muhtemelen b
 msgstr "Sözdizimi hatası (muhtemelen bir istemci hatası)"
 
 #: ../libpurple/protocols/msn/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Geçersiz e-posta adresi"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6798,7 +6788,7 @@ msgstr "Ev Faksı"
 msgstr "Ev Faksı"
 
 #: ../libpurple/protocols/msn/msn.c:1781
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "KiÅŸisel E-posta"
 
 #: ../libpurple/protocols/msn/msn.c:1782
@@ -6860,7 +6850,7 @@ msgstr "İş Faksı"
 msgstr "İş Faksı"
 
 #: ../libpurple/protocols/msn/msn.c:1812
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "İş E-Postası"
 
 #: ../libpurple/protocols/msn/msn.c:1813
@@ -8528,7 +8518,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8706,12 +8696,12 @@ msgstr "Kayıtlı isim"
 
 #: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "%s e-posta adresi için sonuç bulunamadı"
 
 #: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "%s onayı soracak bir e-posta almalısınız."
 
 #: ../libpurple/protocols/oscar/oscar.c:3986
@@ -8746,7 +8736,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü zaten bir görüntü adı "
@@ -8755,7 +8745,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü birden fazla görüntü "
@@ -8764,7 +8754,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü geçersiz."
 
@@ -8775,7 +8765,7 @@ msgstr "Hata 0x%04x: Bilinöeyen hata"
 
 #: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "%s için e-posta adresi %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4050
@@ -9036,15 +9026,15 @@ msgstr ""
 "kullanıcıdan izin isteyebilirsiniz."
 
 #: ../libpurple/protocols/oscar/oscar.c:6286
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "E-Posta ile ArkadaÅŸ Bul"
 
 #: ../libpurple/protocols/oscar/oscar.c:6287
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "E-Posta adresiyle bir arkadaÅŸ ara"
 
 #: ../libpurple/protocols/oscar/oscar.c:6288
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr "Aradığınız arkadaşın e-posta adresini yazın."
 
 #: ../libpurple/protocols/oscar/oscar.c:6291
@@ -9074,11 +9064,11 @@ msgstr "Hesabı Doğrula"
 msgstr "Hesabı Doğrula"
 
 #: ../libpurple/protocols/oscar/oscar.c:6485
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Halen Kayıtlı Olan E-posta Adreslerini Göster"
 
 #: ../libpurple/protocols/oscar/oscar.c:6489
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Şimdiki Katıtlı Olunan E-posta Adresini Değiştir..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6496
@@ -9086,7 +9076,7 @@ msgstr "İzin Bekleyen Kişileri Göster
 msgstr "İzin Bekleyen Kişileri Göster"
 
 #: ../libpurple/protocols/oscar/oscar.c:6502
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "E-Posta Adresine Göre Kişi Ara..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6507
@@ -9174,10 +9164,6 @@ msgstr "Kolej"
 msgid "College"
 msgstr "Kolej"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "E-Posta"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Posta Kodu"
@@ -11854,7 +11840,7 @@ msgstr "Kullanıcı Adı: \t%s\n"
 #: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "E-posta: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:368
@@ -12178,7 +12164,7 @@ msgstr "Bu servis geçici olarak hizmet 
 msgstr "Bu servis geçici olarak hizmet dışıdır."
 
 #: ../libpurple/protocols/toc/toc.c:530
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "E-posta araması yasaklandı."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15064,7 +15050,7 @@ msgstr "Bağlantıları fare üzerine ge
 msgstr "Bağlantıları fare üzerine geldiğinde renklendir."
 
 #: ../pidgin/gtkimhtml.c:1581
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "E-Posta Adresini _Kopyala"
 
 #: ../pidgin/gtkimhtml.c:1593
@@ -15467,8 +15453,8 @@ msgstr[0] "%s, %d yeni ileti."
 
 #: ../pidgin/gtknotify.c:569
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d yeni e-posta.</b>"
 
 #: ../pidgin/gtknotify.c:997
@@ -16733,7 +16719,7 @@ msgstr "Kişi Seçin"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "E-Posta gönderilemedi."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16741,7 +16727,7 @@ msgstr "Evolution çalıştırılabilir 
 msgstr "Evolution çalıştırılabilir dosyası PATH içerisinde bulunamadı."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr "Bu kişi için bir e-posta adresi bulunamadı."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16749,7 +16735,7 @@ msgstr "Adres Defterine Ekle"
 msgstr "Adres Defterine Ekle"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "E-Posta Yolla"
 
 #. Configuration frame
@@ -16807,8 +16793,8 @@ msgstr "Soyad:"
 msgstr "Soyad:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Email:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
============================================================
--- po/uk.po	2d8317e17f15b6a22222398ab6d92fbc7e2f2b89
+++ po/uk.po	400d9e91791345d1e80f62da53121fd04295f360
@@ -3635,7 +3635,7 @@ msgstr "Прізвище:"
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Ел.пошта"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3671,17 +3671,6 @@ msgstr "Нова особа"
 msgid "Purple Person"
 msgstr "Нова особа"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "Ел.пошта:"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5453,7 +5442,7 @@ msgstr ""
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Адреса ел.пошти"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6540,7 +6529,7 @@ msgstr "Синтаксична помиÐ
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "Неправильна електронна адреса"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7105,7 +7094,7 @@ msgstr "Домашня сторінка"
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Особиста веб-сторінка"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7174,7 +7163,7 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Ел.пошта"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8872,7 +8861,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9081,12 +9070,12 @@ msgstr "_Ідентифікатор ко
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "Нічого не знайдено для ел.адреси %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "Ви повинні отримати ел. пошту із проханням підтвердити %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -9126,7 +9115,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Помилка 0x%04x: Не вдається змінити адресу ел. пошти, тому що вже є "
@@ -9135,7 +9124,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Помилка 0x%04x: Не вдається змінити адресу ел. пошти, тому що надана адреса "
@@ -9144,7 +9133,7 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Помилка 0x%04x: Не вдається змінити адресу ел. пошти назви облікового "
@@ -9157,7 +9146,7 @@ msgstr "Помилка 0x%04x: ПомиÐ
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "Адресою ел.пошти для %s є %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9440,16 +9429,16 @@ msgstr ""
 "них правою кнопкою миші та вибравши \"Повторний запит авторизації\"."
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Знайти користувача за ел. поштою"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Шукати користувача за адресою ел.пошти"
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Введіть адресу e-mail адресу, якого ви шукаєте."
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Введіть адресу email адресу, якого ви шукаєте."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
@@ -9481,12 +9470,12 @@ msgstr "Підтвердити обліÐ
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Відобразити поточну зареєстровану адресу"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Змінити поточну зареєстровану адресу..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9495,7 +9484,7 @@ msgstr "Показати контактÐ
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Шукати користувача за адресою ел.пошти..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9588,10 +9577,6 @@ msgstr "_Згорнути"
 msgid "College"
 msgstr "_Згорнути"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Ел.пошта"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -12448,7 +12433,7 @@ msgstr "Ім'я користувача: 
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Ел.пошта: \t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12804,7 +12789,7 @@ msgstr "Службі каталогів 
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "Пошук ел.пошти обмежений."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15841,7 +15826,7 @@ msgstr "Колір для відобра
 msgstr "Колір для відображення гіперпосилань"
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Копіювати адресу ел.пошти"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -16257,8 +16242,8 @@ msgstr[2] "%s має %d нових поÐ
 
 #: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -17578,7 +17563,7 @@ msgstr "_Асоціювати корис
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 #, fuzzy
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "Не вдається відправити повідомлення."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17586,7 +17571,7 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17595,7 +17580,7 @@ msgstr "Додати до адресно
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
 #, fuzzy
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Ел.пошта"
 
 #. Configuration frame
@@ -17655,7 +17640,7 @@ msgstr "Прізвище:"
 msgstr "Прізвище:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Ел.пошта:"
 
 #. *< type
@@ -19250,7 +19235,7 @@ msgstr ""
 #~ msgid "Check Mail"
 #~ msgstr "Перевірити пошту"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "Перевіряти пошту кожні Х секунд.\n"
 
 #~ msgid "Auto-login"
============================================================
--- po/ur.po	2271044c746c9a9fd395e5b0da94abc0942ecde8
+++ po/ur.po	9b36b2b45592e1b5e8611113b2556dab1fa163b9
@@ -3921,7 +3921,7 @@ msgstr "  آخری نام "
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "ای- میل"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:379
@@ -3955,16 +3955,6 @@ msgstr "نیا فرد"
 msgid "Purple Person"
 msgstr "نیا فرد"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:681
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:959
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "E-mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5620,7 +5610,7 @@ msgstr "کوئی بھی متماثل بÚ
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/oscar/oscar.c:3733
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "ای میل ایڈریس"
 
 #: ../libpurple/protocols/jabber/buddy.c:2423
@@ -6660,7 +6650,7 @@ msgstr "سیٹیکس خامی (شاید 
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "غیرمعتبرe-maiپتہ"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -7290,8 +7280,8 @@ msgstr "ہوم فیكس"
 
 #: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/msnp9/msn.c:1657
-msgid "Personal E-Mail"
-msgstr "ذاتیE-Mail"
+msgid "Personal Email"
+msgstr "ذاتیEmail"
 
 #: ../libpurple/protocols/msn/msn.c:1805
 #: ../libpurple/protocols/msnp9/msn.c:1658
@@ -7366,8 +7356,8 @@ msgstr "ورك فیكس"
 
 #: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/msnp9/msn.c:1688
-msgid "Work E-Mail"
-msgstr "ورك E-Mail"
+msgid "Work Email"
+msgstr "ورك Email"
 
 #: ../libpurple/protocols/msn/msn.c:1836
 #: ../libpurple/protocols/msnp9/msn.c:1689
@@ -9101,12 +9091,12 @@ msgid ""
 #: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"آپ نے ICQ e-mailموصول كیاہےسے %s [%s]\n"
+"آپ نے ICQ emailموصول كیاہےسے %s [%s]\n"
 "\n"
 "پیام ہے:\n"
 "%s"
@@ -9280,12 +9270,12 @@ msgstr "اسكرین كا نام"
 
 #: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
-msgid "No results found for e-mail address %s"
-msgstr " e-mail address %sكےلیےكوئی نتائج نہیں ملے"
+msgid "No results found for email address %s"
+msgstr " email address %sكےلیےكوئی نتائج نہیں ملے"
 
 #: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr "آپ كو%sكی تصدیق كےلیے ای۔میل حاصل كرناچاہیے۔"
 
 #: ../libpurple/protocols/oscar/oscar.c:3981
@@ -9313,17 +9303,17 @@ msgstr "خامی 0x%04x:اسکرین Ù†Ø
 
 #: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
 msgstr "Error 0x%04x:ای۔میل ایڈریس تبدیل نہیں كرسكتا كیونكہ اس اسكرین نام كے لیے پہلے ہی سےدرخواست پڑی ہوئی ہے۔"
 
 #: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
 msgstr "Error 0x%04x:ای۔میل ایڈریس تبدیل نہیں كرسكتا كیونكہ دیئےگئے ایڈریسیس كے ساتھ بہت سے اسكرین نام متصل ہے۔"
 
 #: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "Error 0x%04x:ای۔میل ایڈریس تبدیل نہیں كرسكتا كیونكہ دیئےگئےایڈریسیس غیرمعتبرہے۔"
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
@@ -9333,7 +9323,7 @@ msgstr "خامی 0x%04x: نا معلوم
 
 #: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr " %s is %sكے لیےای۔میل ایڈریسیس"
 
 #: ../libpurple/protocols/oscar/oscar.c:4045
@@ -9558,15 +9548,15 @@ msgstr "آپ ان بڈیز سے اتھو
 msgstr "آپ ان بڈیز سے اتھورائزیشن کو دوبارہ - درخواست کر سکتے ہیں ان رائٹ- کلیک کرکےاور منتخب کرکے/\"دوبارہ- درخواست اتھورائزیشن۔/\""
 
 #: ../libpurple/protocols/oscar/oscar.c:6281
-msgid "Find Buddy by E-Mail"
-msgstr "E-Mailكے ذریعے دوست كا نام ت&#