diff --git a/application/language/ar/lang.php b/application/language/ar/lang.php
index cba1d96..54ccd60 100644
--- a/application/language/ar/lang.php
+++ b/application/language/ar/lang.php
@@ -1172,8 +1172,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/bg_BG/lang.php b/application/language/bg_BG/lang.php
index 738136f..c313b93 100644
--- a/application/language/bg_BG/lang.php
+++ b/application/language/bg_BG/lang.php
@@ -1002,8 +1002,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/cs/lang.php b/application/language/cs/lang.php
index 39e3216..2a7bcb9 100644
--- a/application/language/cs/lang.php
+++ b/application/language/cs/lang.php
@@ -1024,8 +1024,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/da/lang.php b/application/language/da/lang.php
index 59cbd24..1033816 100644
--- a/application/language/da/lang.php
+++ b/application/language/da/lang.php
@@ -980,8 +980,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/de/lang.php b/application/language/de/lang.php
index b3c0036..d99c03c 100644
--- a/application/language/de/lang.php
+++ b/application/language/de/lang.php
@@ -1070,7 +1070,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Das Format der E-Mail-Adresse i
     ." ungültig.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="Der Domainname ist ungültig.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="Der lokale Teil der E-Mail-Adresse"
-    ." (<Lokaler-Teil>@<Domain>.<TLD>) ist"
+    ." (Lokaler-Teil@Domain.TLD) ist"
     ." ungültig.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Für die E-Mail-Adresse gibt es keinen"
     ." gültigen MX-Eintrag.";
diff --git a/application/language/de_CH/lang.php b/application/language/de_CH/lang.php
index 89e9dd2..cb5ff9b 100644
--- a/application/language/de_CH/lang.php
+++ b/application/language/de_CH/lang.php
@@ -1005,8 +1005,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/de_LU/lang.php b/application/language/de_LU/lang.php
index 992df4c..7c03c7d 100644
--- a/application/language/de_LU/lang.php
+++ b/application/language/de_LU/lang.php
@@ -977,8 +977,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/el/lang.php b/application/language/el/lang.php
index f444c6a..f42d25f 100644
--- a/application/language/el/lang.php
+++ b/application/language/el/lang.php
@@ -1439,7 +1439,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="Το όνομα Domain που
     ." δώσατε είναι άκυρο";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="Το τοπικό σημείο της"
     ." διεύθυνσης"
-    ." (<τοπικό-σημείο>@<domain>.<tld>)"
+    ." (τοπικό-σημείο@domain.tld)"
     ." είναι άκυρο.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Δεν υπάρχει ισχύον MX"
     ." record για αυτή τη"
diff --git a/application/language/en/lang.php b/application/language/en/lang.php
index 63a5c7b..a644ef1 100644
--- a/application/language/en/lang.php
+++ b/application/language/en/lang.php
@@ -977,8 +977,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/es/lang.php b/application/language/es/lang.php
index 7499389..e9cf0f5 100644
--- a/application/language/es/lang.php
+++ b/application/language/es/lang.php
@@ -1069,8 +1069,8 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="La dirección de correo electr
     ." es incorrecta.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="El nombre de host no es válido.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="La parte local de la dirección de"
-    ." correo electrónico (<Parte"
-    ." local>@<Dominio>.<TLD>) no es válido.";
+    ." correo electrónico (Parte"
+    ." local@Dominio.TLD) no es válido.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Para este dirección de correo"
     ." electrónico no existe un registro MX"
     ." valida.";
diff --git a/application/language/fa/lang.php b/application/language/fa/lang.php
index 5a58d3c..8a4110c 100644
--- a/application/language/fa/lang.php
+++ b/application/language/fa/lang.php
@@ -1226,7 +1226,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="فرمت آدرس ایمیل"
     ." ناصحیح است";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="نام هاست اشتباه است";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="نمونه ایمیل صحیح :"
-    ." <local-part>@<domain>.<tld>";
+    ." local-part@domain.tld";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="هیچ رکورد صحیحی از"
     ." این آدرس ایمیل به ثبت"
     ." نرسیده است";
diff --git a/application/language/fr/lang.php b/application/language/fr/lang.php
index aa456c8..782de0f 100644
--- a/application/language/fr/lang.php
+++ b/application/language/fr/lang.php
@@ -1097,8 +1097,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Le format de l'adresse email es
     ." invalide.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="Le nom d'hôte est invalide.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/hr/lang.php b/application/language/hr/lang.php
index d998d5c..7656562 100644
--- a/application/language/hr/lang.php
+++ b/application/language/hr/lang.php
@@ -977,8 +977,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/hu_HU/lang.php b/application/language/hu_HU/lang.php
index a88ac24..bc401c7 100644
--- a/application/language/hu_HU/lang.php
+++ b/application/language/hu_HU/lang.php
@@ -1015,8 +1015,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Érvénytelen e-mail cím.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/it/lang.php b/application/language/it/lang.php
index c9ed46d..8acacb2 100644
--- a/application/language/it/lang.php
+++ b/application/language/it/lang.php
@@ -1038,8 +1038,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/nl/lang.php b/application/language/nl/lang.php
index 526da24..f9bb47f 100644
--- a/application/language/nl/lang.php
+++ b/application/language/nl/lang.php
@@ -1005,8 +1005,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Ongeldige type gegeven. String"
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Het e-mailadress formaat is ongeldig.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="De hostnaam is ongeldig.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="Het lokale gedeelte van het"
-    ." e-mailadres"
-    ." (<local-part>@<domain>.<tld>) is"
+    ." e-mailadres (local-part@domain.tld) is"
     ." ongeldig.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Er is geen geldige MX record voor dit"
     ." e-mailadress.";
diff --git a/application/language/pl/lang.php b/application/language/pl/lang.php
index ec71e33..4fd2161 100644
--- a/application/language/pl/lang.php
+++ b/application/language/pl/lang.php
@@ -979,8 +979,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/pt_BR/lang.php b/application/language/pt_BR/lang.php
index d2535d8..4d9fb2e 100644
--- a/application/language/pt_BR/lang.php
+++ b/application/language/pt_BR/lang.php
@@ -1017,8 +1017,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/ro/lang.php b/application/language/ro/lang.php
index 966632c..1f37bc9 100644
--- a/application/language/ro/lang.php
+++ b/application/language/ro/lang.php
@@ -997,8 +997,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/ru/lang.php b/application/language/ru/lang.php
index 409ce36..03f870e 100644
--- a/application/language/ru/lang.php
+++ b/application/language/ru/lang.php
@@ -1108,8 +1108,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/sk/lang.php b/application/language/sk/lang.php
index a3bf15f..ccc6460 100644
--- a/application/language/sk/lang.php
+++ b/application/language/sk/lang.php
@@ -1010,8 +1010,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Formát e-mailová adresa nie j
     ." platná";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="Názov domény nie je platný.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="Táto časť e-mailovej adresy"
-    ." (<local-part>@<domain>.<tld>) je"
-    ." neplatná.";
+    ." (local-part@domain.tld) je neplatná.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Pre e-mailovú adresu nie je platný"
     ." MX záznam.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname ist located in a not"
diff --git a/application/language/sl/lang.php b/application/language/sl/lang.php
index 96f66e1..cb75f93 100644
--- a/application/language/sl/lang.php
+++ b/application/language/sl/lang.php
@@ -995,8 +995,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Podan napačen tip. Pričakovan je"
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Email zapis je napačen.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="Ime gostitelja je napačno.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="Lokalni del email naslova"
-    ." (<local-part>@<domain>.<tld>) je"
-    ." napačen.";
+    ." (local-part@domain.tld) je napačen.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Ni veljavnega MX zapisa za ta email"
     ." naslov.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="Ime gostitelja je najdeno v"
diff --git a/application/language/sv_SE/lang.php b/application/language/sv_SE/lang.php
index 7211668..eb9728d 100644
--- a/application/language/sv_SE/lang.php
+++ b/application/language/sv_SE/lang.php
@@ -989,8 +989,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Ogiltig typ överförd. Förväntar"
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Epostadressens format är ogiltigt.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="Domännamnet är ogiltigt.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="Epostadressens lokala del"
-    ." (<lokal-del>@<domän>.<TLD>) är"
-    ." ogiltig.";
+    ." (lokal-del@domän.TLD) är ogiltig.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Epostadressen har inget giltigt"
     ." MX-register.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="Domänen befinner sig ej inom ett"
diff --git a/application/language/tr/lang.php b/application/language/tr/lang.php
index dbd8e30..35a2516 100644
--- a/application/language/tr/lang.php
+++ b/application/language/tr/lang.php
@@ -998,8 +998,7 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID']="Invalid type given. String expected.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="The email address format is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="The hostname is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="The local part of the email address"
-    ." (<local-part>@<domain>.<tld>) is"
-    ." invalid.";
+    ." (local-part@domain.tld) is invalid.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="There is no valid MX record for this"
     ." email address.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="The hostname is located in a not"
diff --git a/application/language/vi_VN/lang.php b/application/language/vi_VN/lang.php
index a9b6453..975df99 100644
--- a/application/language/vi_VN/lang.php
+++ b/application/language/vi_VN/lang.php
@@ -1092,9 +1092,8 @@ $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_FORMAT']="Định dạng email không h
     ." lệ.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_HOSTNAME']="Tên host không hợp lệ";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_LOCAL_PART']="Thành phần local part của địa"
-    ." chỉ email"
-    ." (<local-part>@<domain>.<tld>) không"
-    ." hợp lệ.";
+    ." chỉ email (local-part@domain.tld)"
+    ." không hợp lệ.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_MX_RECORD']="Không có bản ghi MX hợp lệ cho"
     ." địa chỉ email này.";
 $lang['L_ZEND_ID_EMAIL_ADDRESS_INVALID_SEGMENT']="Tên host này nằm trong một phân"