diff --git a/languages/bg.lang b/languages/bg.lang
index 67c5c67e..40521797 100644
--- a/languages/bg.lang
+++ b/languages/bg.lang
@@ -23,8 +23,7 @@ $PALANG['pLogin_welcome'] = 'Администратора може да се л
 $PALANG['pLogin_username'] = 'Логин (е-мейл)';
 $PALANG['pLogin_password'] = 'Парола';
 $PALANG['pLogin_button'] = 'Изход';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Вашият логин не е правилен. Проверете дали сте се написали правилно вашият е-мейл адрес!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Вашата парола не е правилна!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Ако сте потребител натиснете тук за логване в потребителската част.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome'] = 'Автоматичен отговор.';
 $PALANG['pUsersVacation_welcome_text'] = 'Вие вече си имате конфигриран автоматичен отговор!';
 $PALANG['pUsersVacation_subject'] = 'Заглавие';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; # XXX
-$PALANG['pUsersVacation_body'] = 'Текст';
+$PALANG['pUsersVacation_body'] = 'Текст'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Няма да бъда на разположение от <date> до <date>.
 При спешност можете да се свържете с <contact person>.
diff --git a/languages/ca.lang b/languages/ca.lang
index ac81313f..b5fbbbf2 100644
--- a/languages/ca.lang
+++ b/languages/ca.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dom
 $PALANG['pLogin_username'] = 'Usuari (e-mail)';
 $PALANG['pLogin_password'] = 'Contrasenya';
 $PALANG['pLogin_button'] = 'Usuari';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">El login no és correcte. Aseguri\'s de que ha fet login amb el seu e-mail.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">La seva contrasenya no es correcta!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Login per anar a la secció d\'usuaris.';
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Resum';
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = 'Resposta automàtica.';
 $PALANG['pUsersVacation_welcome_text'] = 'Ja disposa d\'una resposta automàtica configurada!';
 $PALANG['pUsersVacation_subject'] = 'Assumpte';
 $PALANG['pUsersVacation_subject_text'] = 'Fora de la feina';
-$PALANG['pUsersVacation_body'] = 'Cos';
+$PALANG['pUsersVacation_body'] = 'Cos'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Seré fora des del <date> fins al <date>.
 Per assumptes urgents pot contactar amb mi a <contact person>.
diff --git a/languages/cn.lang b/languages/cn.lang
index 28b8c862..7af007b5 100644
--- a/languages/cn.lang
+++ b/languages/cn.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域
 $PALANG['pLogin_username'] = '帐号 (邮件地址)';
 $PALANG['pLogin_password'] = '密码';
 $PALANG['pLogin_button'] = '登录';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">登录失败, 请确认你是使用你的邮件地址登录!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">密码错误!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = '普通用户点击这里进入用户控制面板.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = '自动回复.';
 $PALANG['pUsersVacation_welcome_text'] = '你已经设置了自动回复!';
 $PALANG['pUsersVacation_subject'] = '主题';
 $PALANG['pUsersVacation_subject_text'] = '我现在无法回信';
-$PALANG['pUsersVacation_body'] = '内容';
+$PALANG['pUsersVacation_body'] = '内容'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
     我在 <date> 到 <date> 这段时间内暂时无法回信.
 如果你有急事请与 <contact person> 联系.
diff --git a/languages/cs.lang b/languages/cs.lang
index 99dacca6..aefc9365 100644
--- a/languages/cs.lang
+++ b/languages/cs.lang
@@ -27,8 +27,7 @@ $PALANG['pLogin_welcome'] = 'Zde se přihlašují emailoví administrátoři pro
 $PALANG['pLogin_username'] = 'Uživatelské jméno (email)';
 $PALANG['pLogin_password'] = 'Heslo';
 $PALANG['pLogin_button'] = 'Přihlásit';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Nesprávné uživatelské jmeno. Přihlašujte se svojí emailovou adresou!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nesprávné heslo!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Vstup do uživatelské sekce.';
 
 $PALANG['pMenu_main'] = 'Hlavní';
@@ -348,7 +347,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automatická odpověď';
 $PALANG['pUsersVacation_welcome_text'] = 'Již máte nastavenou automatickou odpověď!';
 $PALANG['pUsersVacation_subject'] = 'Předmět';
 $PALANG['pUsersVacation_subject_text'] = 'Dovolená';
-$PALANG['pUsersVacation_body'] = 'Obsah';
+$PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Jsem na dovolené od <datum> od <datum>.
 S neodkladnými zprávami prosím kontaktujte <kontaktní osoba>.
diff --git a/languages/da.lang b/languages/da.lang
index 337d5543..ec028f3b 100644
--- a/languages/da.lang
+++ b/languages/da.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine
 $PALANG['pLogin_username'] = 'Brugernavn (email)';
 $PALANG['pLogin_password'] = 'Adgangskode';
 $PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Dit brugernavn er forkert. Kontroller at du bruger din emailadresse som brugernavn!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Din adgangskode er forkert!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
 
 $PALANG['pMenu_main'] = 'Start';
@@ -346,7 +345,7 @@ $PALANG['pUsersVacation_welcome'] = 'Autosvar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar indstillet!';
 $PALANG['pUsersVacation_subject'] = 'Emne';
 $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede';
-$PALANG['pUsersVacation_body'] = 'Meddelelse';
+$PALANG['pUsersVacation_body'] = 'Meddelelse'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Jeg er ikke tilstede i perioden <dato> til <dato>.
 I nødstilfælde kan <kontaktperson> kontaktes.
diff --git a/languages/de.lang b/languages/de.lang
index afd70dbe..b43274db 100644
--- a/languages/de.lang
+++ b/languages/de.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'Mail-Administratoren loggen sich bitte hier ein.';
 $PALANG['pLogin_username'] = 'Login (eMail)';
 $PALANG['pLogin_password'] = 'Passwort';
 $PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ihr Login-Name ist nicht korrekt. Bitte benutzen Sie die komplette eMail-Adresse</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Falsches Passwort!</span>';
+$PALANG['pLogin_failed'] = 'Ihre Mailadresse oder das Passwort sind nicht korrekt.';
 $PALANG['pLogin_login_users'] = 'eMail-Benutzer bitte hier einloggen.';
 
 $PALANG['pMenu_main'] = 'Startseite';
diff --git a/languages/en.lang b/languages/en.lang
index e28b0b44..50914eaf 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -24,7 +24,7 @@ $PALANG['pLogin_welcome'] = 'Mail admins login here to administer your domain.';
 $PALANG['pLogin_username'] = 'Login (email)';
 $PALANG['pLogin_password'] = 'Password';
 $PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_failed'] = '<span class="error_msg">Your email address or password are not correct.</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.';
 $PALANG['pLogin_login_users'] = 'Users click here to login to the user section.';
 
 $PALANG['pMenu_main'] = 'Main';
@@ -346,7 +346,7 @@ $PALANG['pUsersVacation_welcome'] = 'Auto Response.';
 $PALANG['pUsersVacation_welcome_text'] = 'You already have an auto response configured!';
 $PALANG['pUsersVacation_subject'] = 'Subject';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office';
-$PALANG['pUsersVacation_body'] = 'Body';
+$PALANG['pUsersVacation_body'] = 'Message';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 I will be away from <date> until <date>.
 For urgent matters you can contact <contact person>.
diff --git a/languages/es.lang b/languages/es.lang
index 56de1a5b..44c7ffa7 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Login de administrador para administración de domi
 $PALANG['pLogin_username'] = 'Usuario (e-mail)';
 $PALANG['pLogin_password'] = 'Contraseña';
 $PALANG['pLogin_button'] = 'Usuario';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">El login no es correcto. Asegurese de que ha hecho login con su e-mail.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">¡Su contraseña no es correcta!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.';
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Resumen';
@@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome'] = 'Respuesta automática.';
 $PALANG['pUsersVacation_welcome_text'] = '¡Ya dispone de una respuesta automática configurada!';
 $PALANG['pUsersVacation_subject'] = 'Asunto';
 $PALANG['pUsersVacation_subject_text'] = 'Fuera del trabajo';
-$PALANG['pUsersVacation_body'] = 'Cuerpo';
+$PALANG['pUsersVacation_body'] = 'Cuerpo'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Estaré fuera desde <date> hasta <date>.
 Para asuntos urgentes, puede contactar conmigo en <contact person>.
diff --git a/languages/et.lang b/languages/et.lang
index 4af46eb5..32e404ec 100644
--- a/languages/et.lang
+++ b/languages/et.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimis
 $PALANG['pLogin_username'] = 'Kasutajanimi (e-posti aadress)';
 $PALANG['pLogin_password'] = 'Parool';
 $PALANG['pLogin_button'] = 'Logi sisse';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Kasutajanimi pole õige. Veendu, et logid sisse korrektse e-posti aadressiga!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Parool pole õige!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Kasutaja, klõpsa siia logimaks sisse kasutaja sektsiooni.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automaatne vastus.';
 $PALANG['pUsersVacation_welcome_text'] = 'Automaatne vastus on juba seadistatud!';
 $PALANG['pUsersVacation_subject'] = 'Teema';
 $PALANG['pUsersVacation_subject_text'] = 'Kontorist väljas';
-$PALANG['pUsersVacation_body'] = 'Põhitekst';
+$PALANG['pUsersVacation_body'] = 'Põhitekst'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Olen kontorist eemal alates <date> kuni <date>.
 Kiireloomuliste asjade korral palun kontakteeru <kontakt isik>.
diff --git a/languages/eu.lang b/languages/eu.lang
index b76946d2..422f6fac 100644
--- a/languages/eu.lang
+++ b/languages/eu.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
 $PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)';
 $PALANG['pLogin_password'] = 'Pasahitza';
 $PALANG['pLogin_button'] = 'Erabiltzailea';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Logina ez da zuzena. Ziurtatu zaitez logina zeure e-mailarekin egin duzula.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Pasahitz okerra!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Erabiltzaileen gunera joateko logina.';
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Laburpena';
@@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome'] = 'Erantzun automatikoa.';
 $PALANG['pUsersVacation_welcome_text'] = 'Erantzun automatiko bat konfiguratuta duzu!';
 $PALANG['pUsersVacation_subject'] = 'Gaia';
 $PALANG['pUsersVacation_subject_text'] = 'Lanetik kanpo';
-$PALANG['pUsersVacation_body'] = 'Gorputza';
+$PALANG['pUsersVacation_body'] = 'Gorputza'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 <date>-tik <date> arte kanpoan egongo naiz.
 Larrialdiko gaientzat, hemen <contact person> kontakta dezakezu nirekin.
diff --git a/languages/fi.lang b/languages/fi.lang
index 86119e3e..4e21e48b 100644
--- a/languages/fi.lang
+++ b/languages/fi.lang
@@ -23,7 +23,7 @@ $PALANG['pLogin_welcome'] = 'Kirjautuminen';
 $PALANG['pLogin_username'] = 'Tunnus';
 $PALANG['pLogin_password'] = 'Salasana';
 $PALANG['pLogin_button'] = 'Kirjaudu';
-$PALANG['pLogin_failed'] = '<span class="error_msg">Sähköpostiosoite tai salasana väärin!</span>';
+$PALANG['pLogin_failed'] = 'Sähköpostiosoite tai salasana väärin!';
 $PALANG['pLogin_login_users'] = 'Käyttäjien kirjautuminen.';
 
 $PALANG['pMenu_main'] = 'Etusivu';
@@ -338,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automaattivastaus.';
 $PALANG['pUsersVacation_welcome_text'] = 'Sinulla on jo automaattivastaus päällä!';
 $PALANG['pUsersVacation_subject'] = 'Otsikko';
 $PALANG['pUsersVacation_subject_text'] = 'Lomalla';
-$PALANG['pUsersVacation_body'] = 'Viesti';
+$PALANG['pUsersVacation_body'] = 'Viesti'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Olen lomalla <päiväys> <päiväys> välisen ajan.
 Kiireellisissä asioissa voitte ottaa yhteyttä <sähköpostiosoite>.
diff --git a/languages/fo.lang b/languages/fo.lang
index 6be24504..aff791c4 100644
--- a/languages/fo.lang
+++ b/languages/fo.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkar
 $PALANG['pLogin_username'] = 'Login (e-post)';
 $PALANG['pLogin_password'] = 'Loyniorð';
 $PALANG['pLogin_button'] = 'Logga inn';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Títt login er skeivt. Minst til at skriva fulla e-post adressu!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Títt loyniorð er skeivt!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Brúkarar kunnu logga inn her.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = 'Sjálvvirkið svar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Tú hevur longu eini frítíðarboð uppsett!';
 $PALANG['pUsersVacation_subject'] = 'Evni';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office';
-$PALANG['pUsersVacation_body'] = 'Boð';
+$PALANG['pUsersVacation_body'] = 'Boð'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 I will be away from <dagfesting> until <dagfesting>.
 
diff --git a/languages/fr.lang b/languages/fr.lang
index e2650cb8..794f9ca6 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votr
 $PALANG['pLogin_username'] = 'Adresse courriel';
 $PALANG['pLogin_password'] = 'Mot de passe';
 $PALANG['pLogin_button'] = 'Entrer';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Votre adresse courriel est invalide. Assurez-vous de saisir correctement l\'adresse courriel.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Votre mot de passe est invalide !</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre section.';
 $PALANG['pMenu_main'] = 'Menu principal';
 
@@ -341,7 +340,7 @@ $PALANG['pUsersVacation_welcome'] = 'Répondeur Automatique.';
 $PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré!';
 $PALANG['pUsersVacation_subject'] = 'Sujet';
 $PALANG['pUsersVacation_subject_text'] = 'En dehors du bureau';
-$PALANG['pUsersVacation_body'] = ''; # XXX
+$PALANG['pUsersVacation_body'] = 'Message'; # XXX
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Je serai absent(e) de <date> jusqu\'au <date>.
 Pour toute urgence, merci de contacter <contact person>.
diff --git a/languages/hr.lang b/languages/hr.lang
index acd287b8..bd97fab6 100644
--- a/languages/hr.lang
+++ b/languages/hr.lang
@@ -21,8 +21,7 @@ $PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
 $PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pošte)';
 $PALANG['pLogin_password'] = 'Lozinka';
 $PALANG['pLogin_button'] = 'Prijavi';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Korisnicko ime nije točno. Morate se prijaviti sa adresom vaše e-pošte!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Lozinka nije točna!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Korisnici kliknite ovdje za prijavu u korisničku sekciju.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome'] = 'Ovdje možete promijeniti obvijest o odsutn
 $PALANG['pUsersVacation_welcome_text'] = 'Obvijest o odsutnosti je već postavljena!';
 $PALANG['pUsersVacation_subject'] = 'Subjekt';
 $PALANG['pUsersVacation_subject_text'] = 'Odsutnost';
-$PALANG['pUsersVacation_body'] = 'Tekst';
+$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Od <datum> do <datum> sam odsutan.
 Za hitne stvari molim vas da kontaktirate <kontaktna osoba>.
diff --git a/languages/hu.lang b/languages/hu.lang
index 343b023b..1ec3bc0f 100644
--- a/languages/hu.lang
+++ b/languages/hu.lang
@@ -23,8 +23,7 @@ $PALANG['pLogin_welcome'] = 'Mail adminisztrátorok itt jelentkezzenek be, hogy
 $PALANG['pLogin_username'] = 'Bejelentkezés (email)';
 $PALANG['pLogin_password'] = 'Jelszó';
 $PALANG['pLogin_button'] = 'Bejelentkezés';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">A bejelentkezés érvénytelen. Biztos, hogy a saját email címeddel akarsz belépni?!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nem jó a jelszó!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'A felhasználók kattintsanak ide a felhasználói felülethez.';
 
 $PALANG['pMenu_main'] = 'Főmenü';
@@ -345,7 +344,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automatikus válasz.';
 $PALANG['pUsersVacation_welcome_text'] = 'Már van be állítva automatikus válasz !';
 $PALANG['pUsersVacation_subject'] = 'Tárgy';
 $PALANG['pUsersVacation_subject_text'] = 'Sajnálom, de jelenleg nem vagyok email közelben!';
-$PALANG['pUsersVacation_body'] = 'Üzenet';
+$PALANG['pUsersVacation_body'] = 'Üzenet'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Üdvözlöm. Sajnálom de jelenleg nem vagyok email közelben.
 Ettõl - Eddig.
diff --git a/languages/is.lang b/languages/is.lang
index 96329686..1833e825 100644
--- a/languages/is.lang
+++ b/languages/is.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda
 $PALANG['pLogin_username'] = 'Auðkenni(email)';
 $PALANG['pLogin_password'] = 'Lykilorð';
 $PALANG['pLogin_button'] = 'Tengjast';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Auðkenni þitt er rangt, ath hvort þú hafir slegið það rangt inn og prófaðu aftur, ath notaðu fullt email til að tengjas!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Lykilorðið var rangt!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Notendur smellið hér til að opna almennt notendaviðmót.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome'] = 'sjálfvirk skilaboð.';
 $PALANG['pUsersVacation_welcome_text'] = 'Þú hefur nú þegar skilgreint sjálfvirk skilaboð!';
 $PALANG['pUsersVacation_subject'] = 'Meginmál - Subject';
 $PALANG['pUsersVacation_subject_text'] = 'Er ekki við - Out of Office';
-$PALANG['pUsersVacation_body'] = 'Meginmál';
+$PALANG['pUsersVacation_body'] = 'Meginmál'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Ég er ekki við frá <date> og til <date>.  I will be away from <date> until <date>.
 Ef mikið liggur við, geturðu haft samaband við <contact person>. For urgent matters you can contact <contact person>.
diff --git a/languages/it.lang b/languages/it.lang
index 7b50bcd4..99977d2b 100644
--- a/languages/it.lang
+++ b/languages/it.lang
@@ -23,8 +23,7 @@ $PALANG['pLogin_welcome'] = 'GLi amministratori di posta devono effettuare il lo
 $PALANG['pLogin_username'] = 'Nome utente (email)';
 $PALANG['pLogin_password'] = 'Password';
 $PALANG['pLogin_button'] = 'Entra';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Il tuo nome utente non &egrave; corretto. Assicurati di avere inserito il tuo indirizzo email corretto!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">La tua password non &egrave; corretta!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'GLi utenti devono cliccare qui per entrare nella propria sezione.';
 
 $PALANG['pMenu_main'] = 'Principale';
@@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome'] = 'Autoresponditore.';
 $PALANG['pUsersVacation_welcome_text'] = 'Hai gi$agrave; un autoresponditore configurato';
 $PALANG['pUsersVacation_subject'] = 'Soggetto';
 $PALANG['pUsersVacation_subject_text'] = 'Assente dall\'ufficio';
-$PALANG['pUsersVacation_body'] = 'Corpo';
+$PALANG['pUsersVacation_body'] = 'Corpo'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Sar&ograve; assente dal <data> al <data>.
 Per problemi urgenti potete contattare <persona da contattare>.
diff --git a/languages/ja.lang b/languages/ja.lang
index 165623f8..8e08dc75 100644
--- a/languages/ja.lang
+++ b/languages/ja.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'こちらからドメインの管理ができます
 $PALANG['pLogin_username'] = 'ログイン (メールアドレス)';
 $PALANG['pLogin_password'] = 'パスワード';
 $PALANG['pLogin_button'] = 'ログイン';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">ログインが違います。正しいメールアドレスを入力してください。</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">パスワードが違います。</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = '一般ユーザのログインはここをクリックしてください。';
 
 $PALANG['pMenu_main'] = 'メイン';
@@ -345,7 +344,7 @@ $PALANG['pUsersVacation_welcome'] = '自動応答';
 $PALANG['pUsersVacation_welcome_text'] = '既に自動応答を構成してあります。';
 $PALANG['pUsersVacation_subject'] = '件名';
 $PALANG['pUsersVacation_subject_text'] = '不在';
-$PALANG['pUsersVacation_body'] = '本文';
+$PALANG['pUsersVacation_body'] = '本文'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 私は <date> から <date> まで不在です。
 緊急事項は <contact person> まで連絡してください。
diff --git a/languages/language-update.sh b/languages/language-update.sh
index 099cf868..7b48376b 100755
--- a/languages/language-update.sh
+++ b/languages/language-update.sh
@@ -33,7 +33,7 @@ function update_string_list() {
 
 		grep -v 'No newline at end of file' "$file.diff" | while read line ; do
 			greptext="$(echo $line | sed 's/^[+ 	-]//')"
-			grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT*** $line"
+			grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT - $greptext dropped from en.lang? *** $line"
 			grepresult2=$(grep "'$greptext'" $file)  || grepresult2="$grepresult"
 			case "$line" in
 				---*)
@@ -105,6 +105,27 @@ function rename_string() {
 } # end rename_string()
 
 
+function remove_string() {
+	for file in $filelist ; do
+		line="$(grep "PALANG\['$remove_string'\]" "$file")" || {
+			echo "*** $file does not contain \$PALANG['$remove_string'] ***" >&2
+			continue
+		}
+
+		# create patch
+		echo "
+--- $file.old
++++ $file
+@@ -1,1 +1,0 @@
+-$line
+		" > "$file.patch"
+
+		test $patch = 0 && cat $file.patch
+		test $patch = 1 && patch $file < $file.patch
+	done
+} # end remove_string()
+
+
 function addcomment() {
 	for file in $filelist ; do
 		test "$file" = "en.lang" && { echo "*** skipping en.lang ***"; continue ; } >&2
@@ -208,6 +229,11 @@ echo '
     Rename $PALANG['"'"'old_string'"'"'] to $PALANG['"'"'new_string'"'"']
 
 
+'"$0"' --remove string [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
+
+    Remove $PALANG['"'"'string'"'"'] from language files
+
+
 '"$0"' --addcomment string comment [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
 
     Add a comment to $PALANG['"'"'string'"'"']
@@ -251,6 +277,7 @@ patch=0  # do not patch by default
 forcepatch=0  # no forcepatch by default
 nocleanup=0 # don't delete tempfiles
 rename=0 # rename a string
+remove=0 # remove a string
 stats=0  # create translation statistics
 addcomment=0 # add translation comment
 text=''
@@ -282,6 +309,11 @@ while [ -n "$1" ] ; do
 			echo "$rename_new" | grep '^[a-z_-]*\.lang$' && rename_new='' # error out on *.lang - probably a filename
 			test -z "$rename_new" && { echo '--rename needs two parameters' >&2 ; exit 1 ; }
 			;;
+		--remove)
+			remove=1
+			shift ; remove_string="$1"
+			test -z "$remove-string" && { echo '--remove needs a parameter' >&2 ; exit 1 ; }
+			;;
 		--addcomment)
 			addcomment=1
 			shift ; text="$1"
@@ -314,6 +346,7 @@ test "$filelist" = "" && filelist="`ls -1 *.lang`"
 
 test "$addcomment" = 1 && { addcomment ; cleanup ; exit 0 ; }
 test "$rename" = 1 && { rename_string ; cleanup ; exit 0 ; }
+test "$remove" = 1 && { remove_string ; cleanup ; exit 0 ; }
 test "$forcepatch" = 1 && { forcepatch ; cleanup ; exit 0 ; }
 
 test "$stats" = 1 && { statistics ; exit 0 ; }
diff --git a/languages/lt.lang b/languages/lt.lang
index f8949f8d..0299a747 100644
--- a/languages/lt.lang
+++ b/languages/lt.lang
@@ -21,8 +21,7 @@ $PALANG['pLogin_welcome'] = 'Pašto srities administratorius.';
 $PALANG['pLogin_username'] = 'Vartotojas (el.paštas)';
 $PALANG['pLogin_password'] = 'Slaptažodis';
 $PALANG['pLogin_button'] = 'Prisijungti';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Prisijungti nepavyko. Vartotojo lauke įveskite srities pašto administratoriaus el.pašto adresą!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Slaptažodis neteisingas!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Pašto vartotojo nustatymai.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automatinis atsakymas.';
 $PALANG['pUsersVacation_welcome_text'] = 'Auto atsakiklis jau nustatytas!';
 $PALANG['pUsersVacation_subject'] = 'Tema';
 $PALANG['pUsersVacation_subject_text'] = 'Esu išvykęs';
-$PALANG['pUsersVacation_body'] = 'Žinutė';
+$PALANG['pUsersVacation_body'] = 'Žinutė'; # XXX text changed to 'Message'
 ### XXX (see below)
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 I will be away from <date> until <date>.
diff --git a/languages/mk.lang b/languages/mk.lang
index 772c6af4..29d1d27f 100644
--- a/languages/mk.lang
+++ b/languages/mk.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Логин за администрирање на 
 $PALANG['pLogin_username'] = 'Корисничко име (email)';
 $PALANG['pLogin_password'] = 'Лозинка';
 $PALANG['pLogin_button'] = 'Пријава';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Погрешно корисничко име. Логирајте се со вашата e-mail адреса!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Погрешна лозинка!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Логин за обични корисници.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome'] = 'Автоматски одговор.';
 $PALANG['pUsersVacation_welcome_text'] = 'Веќе имате конфигуриран автоматски одговор!';
 $PALANG['pUsersVacation_subject'] = 'Тема';
 $PALANG['pUsersVacation_subject_text'] = 'Отсутен';
-$PALANG['pUsersVacation_body'] = 'Содржина';
+$PALANG['pUsersVacation_body'] = 'Содржина'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Ќе бидам отсутен од <date> до <date>.
 За итни случаи контактирајте со <contact person>.
diff --git a/languages/nb.lang b/languages/nb.lang
index e72c1e3f..ea2ecd1f 100644
--- a/languages/nb.lang
+++ b/languages/nb.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'E-postadministratorer kan logge inn her for å admi
 $PALANG['pLogin_username'] = 'Brukernavn (e-postadresse)';
 $PALANG['pLogin_password'] = 'Passord';
 $PALANG['pLogin_button'] = 'Logg inn';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Påloggingsinformasjonen er ikke korrekt. Husk å bruke e-postadressen som brukernavn.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Feil passord!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Vanlige brukere kan klikke her for å gå til brukerseksjonen.';
 
 $PALANG['pMenu_main'] = 'Hoved';
@@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automatisk svar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar aktivert!';
 $PALANG['pUsersVacation_subject'] = 'Emne';
 $PALANG['pUsersVacation_subject_text'] = 'Fraværsmelding';
-$PALANG['pUsersVacation_body'] = 'Meldingstekst';
+$PALANG['pUsersVacation_body'] = 'Meldingstekst'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Jeg er utilgjengelig fra <date> til <date>.
 Dersom det gjelder noe viktig kan du kontakte <contact person>.
diff --git a/languages/nl.lang b/languages/nl.lang
index a9495f7c..2ef839ed 100644
--- a/languages/nl.lang
+++ b/languages/nl.lang
@@ -23,8 +23,7 @@ $PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beher
 $PALANG['pLogin_username'] = 'Login (e-mail)';
 $PALANG['pLogin_password'] = 'Wachtwoord';
 $PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Foutieve login. U dient in te loggen met uw e-mail adres!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Foutief wachtwoord.!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Gebruikers klik hier om in te loggen.';
 
 $PALANG['pMenu_main'] = 'Start';
diff --git a/languages/nn.lang b/languages/nn.lang
index 313399a6..fa598556 100644
--- a/languages/nn.lang
+++ b/languages/nn.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere
 $PALANG['pLogin_username'] = 'Brukernavn (e-postadressen)';
 $PALANG['pLogin_password'] = 'Passord';
 $PALANG['pLogin_button'] = 'Logg inn';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ditt brukernavn er feil. Logg inn med e-postadressen din som brukernavn!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Passordet er feil!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Brukare, trykk her for å gå til bruker-seksjonen.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -336,7 +335,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automatisk Svar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar!';
 $PALANG['pUsersVacation_subject'] = 'Emne';
 $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede';
-$PALANG['pUsersVacation_body'] = 'Melding';
+$PALANG['pUsersVacation_body'] = 'Melding'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Jeg vil være utilgjengelig fra <date> til <date>.
 For viktige henvendelser kan du kontakte <contact person>.
diff --git a/languages/pl.lang b/languages/pl.lang
index bc966ebf..13272177 100644
--- a/languages/pl.lang
+++ b/languages/pl.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.';
 $PALANG['pLogin_username'] = 'Login (email)';
 $PALANG['pLogin_password'] = 'Hasło';
 $PALANG['pLogin_button'] = 'Zaloguj';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Twój login jest niepoprawny!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Twoje hasło jest niepoprawne!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.';
 
 $PALANG['pMenu_main'] = 'Strona główna';
@@ -343,7 +342,7 @@ $PALANG['pUsersVacation_welcome'] = 'Auto odpowiedź.';
 $PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną auto odpowiedź!';
 $PALANG['pUsersVacation_subject'] = 'Temat';
 $PALANG['pUsersVacation_subject_text'] = 'Poza biurem';
-$PALANG['pUsersVacation_body'] = 'Tekst';
+$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message'
 
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Będę nieobecny od <date> do <date>.
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index e163fb6c..7f12458d 100644
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'Administradores devem se autenticar aqui para geren
 $PALANG['pLogin_username'] = 'Usuário (email)';
 $PALANG['pLogin_password'] = 'Senha';
 $PALANG['pLogin_button'] = 'Entrar';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Usuário inválido. Certifique-se de ter digitado o email corretamente!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Senha inválida!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Usuários devem clicar aqui para acessar a seção de usuários.';
 
 $PALANG['pMenu_main'] = 'Menu Principal';
diff --git a/languages/ru.lang b/languages/ru.lang
index 8e1ef641..0c399177 100644
--- a/languages/ru.lang
+++ b/languages/ru.lang
@@ -25,8 +25,7 @@ $PALANG['pLogin_welcome'] = 'Вход для администрирования
 $PALANG['pLogin_username'] = 'Имя (название ящика)';
 $PALANG['pLogin_password'] = 'Пароль';
 $PALANG['pLogin_button'] = 'Войти';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Неправильное имя. Проверьте, правильно ли вы ввели имя (название ящика)!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Введен неправильный пароль!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Вход для обычных пользователей.';
 
 $PALANG['pMenu_main'] = 'Главная';
@@ -347,7 +346,7 @@ $PALANG['pUsersVacation_welcome'] = 'Автоответчик.';
 $PALANG['pUsersVacation_welcome_text'] = 'У вас уже есть настроенный автоответчик!';
 $PALANG['pUsersVacation_subject'] = 'Тема';
 $PALANG['pUsersVacation_subject_text'] = 'Вне офиса';
-$PALANG['pUsersVacation_body'] = 'Текст';
+$PALANG['pUsersVacation_body'] = 'Текст'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Я буду отсутствовать с <даты> по <дату>.
 По срочным вопросам вы можете обратиться к <контактному лицу>.
diff --git a/languages/sk.lang b/languages/sk.lang
index 9c5bc7fc..a23a41ea 100644
--- a/languages/sk.lang
+++ b/languages/sk.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Tu sa prihlasuj&uacute; emailov&iacute; administr&a
 $PALANG['pLogin_username'] = 'U&#382;&iacute;vate&#318;sk&eacute; meno (email)';
 $PALANG['pLogin_password'] = 'Heslo';
 $PALANG['pLogin_button'] = 'Prihl&aacute;si&#357;';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Nespr&aacute;vne; u&#382;ivate&#318;sk&eacute; meno. Prihlasujte se svojou emailovou adresou!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nespr&aacute;vne heslo!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Vstup do u&#382;&iacute;vate&#318;skej sekcie.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = 'Automatick&aacute; odpove&#271;';
 $PALANG['pUsersVacation_welcome_text'] = 'U&#382; m&aacute;ate nastaven&uacute; automatick&uacute; odpove&#271;!';
 $PALANG['pUsersVacation_subject'] = 'Predmet';
 $PALANG['pUsersVacation_subject_text'] = 'Dovolenka';
-$PALANG['pUsersVacation_body'] = 'Obsah';
+$PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Som na dovolenke od <date> od <date>.
 S neodkladn&yacute;mi zpr&aacute;vami kontaktujte <contact person>.
diff --git a/languages/sl.lang b/languages/sl.lang
index c301dbc8..ec9d2578 100644
--- a/languages/sl.lang
+++ b/languages/sl.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.';
 $PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)';
 $PALANG['pLogin_password'] = 'Geslo';
 $PALANG['pLogin_button'] = 'Prijavi';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Uporabniško ime ni pravilno. Prijaviti se morate z vašim e-poštnim naslovom!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Geslo ni pravilno!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Uporabniki kliknite tukaj, če želite nastaviti odsotnost ali spremeniti geslo.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = 'Tukaj lahko nastavite obvestilo o odsotnost
 $PALANG['pUsersVacation_welcome_text'] = 'Obvestilo o odsotnosti imate že nastavljeno!';
 $PALANG['pUsersVacation_subject'] = 'Zadeva';
 $PALANG['pUsersVacation_subject_text'] = 'Odsotnost';
-$PALANG['pUsersVacation_body'] = 'Besedilo';
+$PALANG['pUsersVacation_body'] = 'Besedilo'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Od <datum> do <datum> sem odsoten.
 Za nujne zadeve prosim kontaktirajte <kontaktna oseba>.
diff --git a/languages/sv.lang b/languages/sv.lang
index 4538ec03..108941b7 100644
--- a/languages/sv.lang
+++ b/languages/sv.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköt
 $PALANG['pLogin_username'] = 'Login (epost)';
 $PALANG['pLogin_password'] = 'Lösenord';
 $PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ditt login är ej korrekt. Logga in med din epostadress!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Du angav fel lösenord!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Användare klickar här för att logga in på användardelen.';
 
 $PALANG['pMenu_main'] = 'Huvudmeny';
@@ -341,7 +340,7 @@ $PALANG['pUsersVacation_welcome'] = 'Autosvar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har redan ett autosvar meddelande definierat!';
 $PALANG['pUsersVacation_subject'] = 'Ärende';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office';
-$PALANG['pUsersVacation_body'] = 'Text';
+$PALANG['pUsersVacation_body'] = 'Text'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Jag är borta från <datum> till <datum>.
 För brådskande ärenden kan ni kontakta <kontakt person>.
diff --git a/languages/tr.lang b/languages/tr.lang
index 6b61c8d8..a684c57a 100644
--- a/languages/tr.lang
+++ b/languages/tr.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = 'Posta Yöneticileri buradan domainlerinizi yönetme
 $PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)';
 $PALANG['pLogin_password'] = 'Þifre';
 $PALANG['pLogin_button'] = 'Giriþ';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Kullanýcý adnýnýz doðru deðil. E-posta adresinizi kontrol ediniz.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Þifreniz doðru deðil!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Kullanýcý iþlemlerine girmek için burayý kullanýnýz.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = 'Otomatik Cevaplama.';
 $PALANG['pUsersVacation_welcome_text'] = 'Zaten bir otomatik cevaplamanýz bulunmakta!';
 $PALANG['pUsersVacation_subject'] = 'konu';
 $PALANG['pUsersVacation_subject_text'] = 'Ofis dýþýnda';
-$PALANG['pUsersVacation_body'] = 'Metin';
+$PALANG['pUsersVacation_body'] = 'Metin'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 <date> tarihinden den <date> ine burada bulunmayacaðým.
 Acil durumlarda lütfen  <contact person> a baþvurunuz.
diff --git a/languages/tw.lang b/languages/tw.lang
index 1107c666..424e1c53 100644
--- a/languages/tw.lang
+++ b/languages/tw.lang
@@ -22,8 +22,7 @@ $PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網
 $PALANG['pLogin_username'] = '帳號 (郵件地址)';
 $PALANG['pLogin_password'] = '密碼';
 $PALANG['pLogin_button'] = '登錄';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">登錄失敗, 請確認你是使用你的郵件地址登錄!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">密碼錯誤!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = '普通用戶點擊這裡進入用戶控制面板.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome'] = '自動回復.';
 $PALANG['pUsersVacation_welcome_text'] = '你已經設置了自動回復!';
 $PALANG['pUsersVacation_subject'] = '主題';
 $PALANG['pUsersVacation_subject_text'] = '我現在無法回信';
-$PALANG['pUsersVacation_body'] = '內容';
+$PALANG['pUsersVacation_body'] = '內容'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
     我在 <date> 到 <date> 這段時間內暫時無法回信.
 如果你有急事請與 <contact person> 聯繫.
diff --git a/login.php b/login.php
index 607f7e66..db6eb277 100644
--- a/login.php
+++ b/login.php
@@ -71,14 +71,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
         if ($result['rows'] != 1)
         {
             $error = 1;
-            $tMessage = $PALANG['pLogin_failed'];
+            $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>';
             $tUsername = $fUsername;
         }
     }
     else
     {
         $error = 1;
-        $tMessage = $PALANG['pLogin_failed'];
+        $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>';
     }
 
     if ($error != 1)