Imported localization files from launchpad

136 files changed, 3957 insertions, 4688 deletions

diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 1eb58584b..cff5a4e39 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ar_SA/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Ossama Khayat <okhayat@yahoo.com>                             |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ar_SA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,7 +41,8 @@ $labels['size'] = 'الحجم';
 $labels['priority'] = 'الأولوية';
 $labels['organization'] = 'المنظمة';
 $labels['readstatus'] = 'حالة القراءة';
-$labels['mailboxlist'] = 'المجلدات';
+$labels['mailboxlist'] = 'مجلدات';
+$labels['folders'] = 'مجلدات';
 $labels['messagesfromto'] = 'الرسالة $from إلى $to من مجموع $count';
 $labels['threadsfromto'] = 'جهات الإتصال $from إلى $to من مجموع $count';
 $labels['messagenrof'] = 'الرسالة $nr من $count';
@@ -74,6 +72,7 @@ $labels['feb'] = 'فبراير';
 $labels['mar'] = 'مارس';
 $labels['apr'] = 'أبريل';
 $labels['may'] = 'مايو';
+$labels['longmay'] = 'مايو';
 $labels['jun'] = 'يونيو';
 $labels['jul'] = 'يوليو';
 $labels['aug'] = 'أغسطس';
@@ -85,7 +84,6 @@ $labels['longjan'] = 'يناير';
 $labels['longfeb'] = 'فبراير';
 $labels['longmar'] = 'مارس';
 $labels['longapr'] = 'إبريل';
-$labels['longmay'] = 'مايو';
 $labels['longjun'] = 'يونيو';
 $labels['longjul'] = 'يوليو';
 $labels['longaug'] = 'أغسطس';
@@ -120,7 +118,8 @@ $labels['markunflagged'] = 'كغير موْسومة';
 $labels['moreactions'] = 'إجراءات إضافية...';
 $labels['select'] = 'تحديد';
 $labels['all'] = 'الكل';
-$labels['none'] = 'لا شيء';
+$labels['none'] = 'لاشيء';
+$labels['nonesort'] = 'لاشيء';
 $labels['currpage'] = 'الصفحة الحالية';
 $labels['unread'] = 'غير المقروءة';
 $labels['flagged'] = 'موسوم';
@@ -140,7 +139,6 @@ $labels['expand_only_unread'] = 'فقط مع الرسائل الغير مقرو�
 $labels['fromto'] = 'المرسل/المستلم';
 $labels['flag'] = 'وسم';
 $labels['attachment'] = 'مرفق';
-$labels['nonesort'] = 'لاشيء';
 $labels['sentdate'] = 'تاريخ إرسالها';
 $labels['arrival'] = 'تاريخ وصولها';
 $labels['asc'] = 'تصاعدي';
@@ -230,15 +228,16 @@ $labels['notes'] = 'ملاحظات';
 $labels['male'] = 'ذكر';
 $labels['female'] = 'أنثى';
 $labels['manager'] = 'مدير';
-$labels['assistant'] = 'مساعد';
+$labels['assistant'] = 'المساعد';
+$labels['typeassistant'] = 'المساعد';
 $labels['spouse'] = 'زوجة';
 $labels['allfields'] = 'جميع الحقول';
 $labels['search'] = 'بحث';
 $labels['advsearch'] = 'بحث متقدم';
-$labels['other'] = 'أخرى';
+$labels['other'] = 'آخر';
+$labels['typeother'] = 'آخر';
 $labels['typehome'] = 'المنزل';
 $labels['typework'] = 'العمل';
-$labels['typeother'] = 'آخر';
 $labels['typemobile'] = 'المحمول';
 $labels['typemain'] = 'الرئيسي';
 $labels['typehomefax'] = 'فاكس المنزل';
@@ -246,7 +245,6 @@ $labels['typeworkfax'] = 'فاكس العمل';
 $labels['typecar'] = 'السيارة';
 $labels['typepager'] = 'الرنان';
 $labels['typevideo'] = 'الفيديو';
-$labels['typeassistant'] = 'المساعد';
 $labels['typehomepage'] = 'الرئيسية';
 $labels['typeblog'] = 'المدوّنة';
 $labels['typeprofile'] = 'الملف الشخصي';
@@ -356,7 +354,6 @@ $labels['mainoptions'] = 'الخيارات الأساسية';
 $labels['section'] = 'قسم';
 $labels['maintenance'] = 'الصيانة';
 $labels['newmessage'] = 'رسالة جديدة';
-$labels['listoptions'] = 'خيارات السرد';
 $labels['signatureoptions'] = 'خيارات التوقيع';
 $labels['whenreplying'] = 'عند الرد';
 $labels['replytopposting'] = 'بدء رسالة جديدة ووضع النص أعلى الأصلية';
@@ -383,7 +380,6 @@ $labels['spellcheckignorenums'] = 'تجاهل الكلمات التي تحتوي
 $labels['spellcheckignorecaps'] = 'تجاهل الكلمات التي بها أحرف كبيرة';
 $labels['addtodict'] = 'إضافة إلى القامس';
 $labels['folder'] = 'مجلد';
-$labels['folders'] = 'مجلدات';
 $labels['foldername'] = 'اسم المجلد';
 $labels['subscribed'] = 'مشترك';
 $labels['messagecount'] = 'الرسائل';
@@ -434,4 +430,3 @@ $labels['japanese'] = 'اليابانية';
 $labels['korean'] = 'الكورية';
 $labels['chinese'] = 'الصينية';
 
-?>
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index c95cb1602..d04344a2f 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ar_SA/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Ossama Khayat <okhayat@yahoo.com>                             |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ar_SA/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -74,7 +71,7 @@ $messages['nonamewarning'] = 'الرجاء إدخال اسم';
 $messages['nopagesizewarning'] = 'الرجاء إدخال حجم الصفحة';
 $messages['nosenderwarning'] = 'رجاء اكتب عنوان البريد الالكتروني للمُرسل';
 $messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل واحد على الأقل';
-$messages['nosubjectwarning'] = 'حقل \"الموضوع\" فارغ. هل تريد كتابة موضوع للرسالة؟';
+$messages['nosubjectwarning'] = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوع للرسالة؟';
 $messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
 $messages['notsentwarning'] = 'لم يتم إرسال الرسالة. هل تريد تجاهل الرسالة؟';
 $messages['noldapserver'] = 'الرجاء اختيار خادم ldap للبحث فيه';
@@ -159,4 +156,3 @@ $messages['mispellingsfound'] = 'عُثر على أخطاء إملائية في
 $messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد. ليست لديك الصلاحية.';
 $messages['messagetoobig'] = 'جزء الرسالة أكبر بكثير مما يمكن معالجته.';
 
-?>
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 618cc8a86..fedc40019 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ast/labels.inc                                               |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mikel González <dangerous_piper@softastur.org>                |
-|         http://blogs.altuxa.com/gyg                                   |
-|         http://softastur.org                                          |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization//labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,17 +39,15 @@ $labels['date'] = 'Fecha';
 $labels['size'] = 'Tamañu';
 $labels['priority'] = 'Prioridá';
 $labels['organization'] = 'Organización';
-$labels['reply-to'] = 'Contestar a';
-$labels['mailboxlist'] = 'Carpetes';
+$labels['mailboxlist'] = 'Bandexes';
+$labels['folders'] = 'Bandexes';
 $labels['messagesfromto'] = 'Mensaxes del $from a $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
+$labels['copy'] = 'Copia';
 $labels['moveto'] = 'mover pa...';
 $labels['download'] = 'baxar';
 $labels['filename'] = 'Nome del Ficheru';
 $labels['filesize'] = 'Tamañu del ficheru';
-$labels['preferhtml'] = 'Amosar HTML';
-$labels['htmlmessage'] = 'Mensaxe HTML';
-$labels['prettydate'] = 'Fecha prestosa';
 $labels['addtoaddressbook'] = 'Amestar al llibru de direiciones';
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Llu';
@@ -74,7 +67,8 @@ $labels['jan'] = 'Xin';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Abr';
-$labels['may'] = 'May';
+$labels['may'] = 'Mayu';
+$labels['longmay'] = 'Mayu';
 $labels['jun'] = 'Xun';
 $labels['jul'] = 'Xnt';
 $labels['aug'] = 'Ago';
@@ -86,7 +80,6 @@ $labels['longjan'] = 'Xineru';
 $labels['longfeb'] = 'Febreru';
 $labels['longmar'] = 'Marzu';
 $labels['longapr'] = 'Abril';
-$labels['longmay'] = 'Mayu';
 $labels['longjun'] = 'Xunu';
 $labels['longjul'] = 'Xunetu';
 $labels['longaug'] = 'Agostu';
@@ -104,13 +97,9 @@ $labels['deletemessage'] = 'Desaniciar mensaxe';
 $labels['movemessagetotrash'] = 'Mover mensaxe a la papelera';
 $labels['printmessage'] = 'Imprentar esti mensaxe';
 $labels['previousmessage'] = 'Amosar el mensaxe anterior';
-$labels['previousmessages'] = 'Amosar grupu de mensaxes anterior';
 $labels['firstmessage'] = 'Amosar primer mensaxe';
-$labels['firstmessages'] = 'Amosar primer grupu de mensaxes';
 $labels['nextmessage'] = 'Amosar el mensaxe siguiente';
-$labels['nextmessages'] = 'Amosar grupu de mensaxes que siguientes';
 $labels['lastmessage'] = 'Amosar l\'últimu mensaxe';
-$labels['lastmessages'] = 'Amosar l\'últimu grupu de mensaxes';
 $labels['backtolist'] = 'Tornar a la llista de mensaxes';
 $labels['viewsource'] = 'Amosar el códigu';
 $labels['markmessages'] = 'Marcar mensaxes';
@@ -118,10 +107,10 @@ $labels['markread'] = 'Como lleíu';
 $labels['markunread'] = 'Como non lleíu';
 $labels['markflagged'] = 'Como marcáu';
 $labels['markunflagged'] = 'Como non marcáu';
-$labels['messageactions'] = 'Más aiciones...';
 $labels['select'] = 'Escueye';
 $labels['all'] = 'Toos';
 $labels['none'] = 'Nengún';
+$labels['nonesort'] = 'Nengún';
 $labels['unread'] = 'Ensin lleer';
 $labels['flagged'] = 'Marcáu';
 $labels['unanswered'] = 'Ensin contestar';
@@ -130,7 +119,6 @@ $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtru';
 $labels['compact'] = 'Compautar';
 $labels['empty'] = 'Vaciar';
-$labels['purge'] = 'Desaniciar';
 $labels['quota'] = 'Espaciu en discu';
 $labels['unknown'] = 'desconocíu';
 $labels['unlimited'] = 'ensin llímite';
@@ -212,6 +200,9 @@ $labels['manageidentities'] = 'Remanar identidaes pa esta cuenta';
 $labels['newidentity'] = 'Identidad nueva';
 $labels['newitem'] = 'Nuevu';
 $labels['edititem'] = 'Editar';
+$labels['preferhtml'] = 'Amosar HTML';
+$labels['htmlmessage'] = 'Mensaxe HTML';
+$labels['prettydate'] = 'Fecha prestosa';
 $labels['setdefault'] = 'Escoyer opción preferída';
 $labels['autodetect'] = 'Escoyer automáticamente';
 $labels['language'] = 'Idioma';
@@ -257,9 +248,7 @@ $labels['mainoptions'] = 'Opciones principales';
 $labels['section'] = 'Seición';
 $labels['maintenance'] = 'Mantenimientu';
 $labels['newmessage'] = 'Mensax nuevu';
-$labels['listoptions'] = 'Allistar opciones';
 $labels['folder'] = 'Bandexa';
-$labels['folders'] = 'Bandexes';
 $labels['foldername'] = 'Nome de bandexa';
 $labels['subscribed'] = 'Soscrita';
 $labels['messagecount'] = 'Mensaxes';
@@ -275,4 +264,3 @@ $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
-?>
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index d6ecc4a4b..0c85db898 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -1,27 +1,22 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ast/messages.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2008, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mikel González <dangerous_piper@softastur.org>                |
-|         http://blogs.altuxa.com/gyg                                   |
-|         http://softastur.org                                          |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization//messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
 $messages['loginfailed'] = 'La clave nun val';
-$messages['cookiesdisabled'] = 'El to navegador nun acepta "cookies"';
+$messages['cookiesdisabled'] = 'El to navegador nun acepta "cookies';
 $messages['sessionerror'] = 'La to sesión nun val';
 $messages['imaperror'] = 'Fallu de conexón col sirvidor IMAP';
 $messages['servererror'] = '¡Fallu del sirvidor!';
@@ -66,7 +61,6 @@ $messages['nosubjectwarning'] = 'El campo "Asuntu" ta vacíu. ¿Quiés rellenalu
 $messages['nobodywarning'] = '¿Quies unviar esti mensaxe ensin testu?';
 $messages['notsentwarning'] = 'Nun unvie\'l mensaxe. ¿Quies desanicialu?';
 $messages['noldapserver'] = 'Por favor, escueye un sirvidor LDAP pa buscar';
-$messages['nocontactsreturned'] = 'Nun di con nengún contautu';
 $messages['nosearchname'] = 'Por favor, dame un nome o una direición de corréu';
 $messages['searchsuccessful'] = 'Di con $nr mensaxes';
 $messages['searchnomatch'] = 'Nun di con nengún resultáu';
@@ -104,4 +98,3 @@ $messages['smtptoerror'] = 'Fallu SMTP ($code): Fallu al amestar el destinatariu
 $messages['smtprecipientserror'] = 'Fallu SMTP: Nun soi a amosar la llista de destinatarios';
 $messages['smtperror'] = 'Fallu SMTP: $msg';
 
-?>
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index ce1961165..39f47743f 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -1,18 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/az_AZ/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Orkhan Guliyev, OUR Technology, LLC.<office@ourtechnology.net>|
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/az_AZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -43,6 +42,7 @@ $labels['priority'] = 'Vaciblik';
 $labels['organization'] = 'Təşkilat';
 $labels['readstatus'] = 'Statusu oxu';
 $labels['mailboxlist'] = 'Qovluqlar';
+$labels['folders'] = 'Qovluqlar';
 $labels['messagesfromto'] = '$count mesajdan $from - $to arası mesajlar';
 $labels['threadsfromto'] = 'Müzakirə: $from - $to Toplam: $count';
 $labels['messagenrof'] = 'Məktub: $nr / $count';
@@ -72,6 +72,7 @@ $labels['feb'] = 'Fev';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'May';
+$labels['longmay'] = 'May';
 $labels['jun'] = 'İyn';
 $labels['jul'] = 'İyl';
 $labels['aug'] = 'Avq';
@@ -83,7 +84,6 @@ $labels['longjan'] = 'Yanvar';
 $labels['longfeb'] = 'Fevral';
 $labels['longmar'] = 'Mart';
 $labels['longapr'] = 'Aprel';
-$labels['longmay'] = 'May';
 $labels['longjun'] = 'İyun';
 $labels['longjul'] = 'İyul';
 $labels['longaug'] = 'Avqust';
@@ -113,10 +113,10 @@ $labels['markread'] = 'Oxunmuş';
 $labels['markunread'] = 'Oxunmamış';
 $labels['markflagged'] = 'Qeyd et';
 $labels['markunflagged'] = 'Qeydi çıxar';
-$labels['messageactions'] = 'Əlavə işlər...';
 $labels['select'] = 'Seçin';
 $labels['all'] = 'Hamısını';
-$labels['none'] = 'Heç birini';
+$labels['none'] = 'Yoxdur';
+$labels['nonesort'] = 'Yoxdur';
 $labels['currpage'] = 'Hazırki səhifəni';
 $labels['unread'] = 'Oxunmamışları';
 $labels['flagged'] = 'İşarəliləri';
@@ -136,7 +136,6 @@ $labels['expand_only_unread'] = 'yalnız oxunmamış məktublarla';
 $labels['fromto'] = 'Göndərən/Qəbul edən';
 $labels['flag'] = 'Bayrağ';
 $labels['attachment'] = 'Əlavə';
-$labels['nonesort'] = 'Yoxdur';
 $labels['sentdate'] = 'Göndərilmə tarixi';
 $labels['arrival'] = 'Çatdırılma tarixi';
 $labels['asc'] = 'Çoxalan';
@@ -222,11 +221,13 @@ $labels['notes'] = 'Qeydlər';
 $labels['male'] = 'kişi';
 $labels['female'] = 'qadın';
 $labels['manager'] = 'Menecer';
-$labels['assistant'] = 'Assistent';
+$labels['assistant'] = 'Köməkçi';
+$labels['typeassistant'] = 'Köməkçi';
 $labels['spouse'] = 'Ər-arvad';
+$labels['other'] = 'Başqa';
+$labels['typeother'] = 'Başqa';
 $labels['typehome'] = 'Ev';
 $labels['typework'] = 'İş';
-$labels['typeother'] = 'Başqa';
 $labels['typemobile'] = 'Mobil';
 $labels['typemain'] = 'Əsas';
 $labels['typehomefax'] = 'Ev faksı';
@@ -234,7 +235,6 @@ $labels['typeworkfax'] = 'İş faksı';
 $labels['typecar'] = 'Maşın';
 $labels['typepager'] = 'Peycer';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Köməkçi';
 $labels['addfield'] = 'Sahə əlavə et';
 $labels['addcontact'] = 'Ünvanlara əlavə et';
 $labels['editcontact'] = 'Ünvanı redaktə et';
@@ -256,7 +256,6 @@ $labels['print'] = 'Çap et';
 $labels['export'] = 'İxrac et';
 $labels['exportvcards'] = 'Ünvanları vCards formatında ixrac et';
 $labels['newcontactgroup'] = 'Ünvanlar qrupunu yarat';
-$labels['groupactions'] = 'Ünvanlar qrupu üçün işlər';
 $labels['previouspage'] = 'Əvvəlkini göstər';
 $labels['firstpage'] = 'Birincini göstər';
 $labels['nextpage'] = 'Sonrakını göstər';
@@ -265,7 +264,7 @@ $labels['group'] = 'Qrup';
 $labels['groups'] = 'Qruplar';
 $labels['personaladrbook'] = 'Şəxsi ünvanlar';
 $labels['import'] = 'İdxal';
-$labels['importcontacts'] = 'Ünvanların idxalı ';
+$labels['importcontacts'] = 'Ünvanların idxalı';
 $labels['importfromfile'] = 'Fayldan idxal:';
 $labels['importreplace'] = 'Ünvan kitabçasını dəyiş';
 $labels['importtext'] = 'Siz ünvanları mövcud ünvan kitabçasından yükləyə bilərsiniz. Hal-hazırda ünvanların idxalını <a href="http://az.wikipedia.org/wiki/vCard">vCard</a> formatında dəstəkləyirik.';
@@ -334,7 +333,6 @@ $labels['mainoptions'] = 'Əsas nizamlamalar';
 $labels['section'] = 'Bölmə';
 $labels['maintenance'] = 'Xidmət';
 $labels['newmessage'] = 'Yeni məktub';
-$labels['listoptions'] = 'Nizamlamaların siyahısı';
 $labels['signatureoptions'] = 'İmzanın nizamlamaları';
 $labels['whenreplying'] = 'Cavab zamanı';
 $labels['replytopposting'] = 'orijinaldan əvvəl yeni məktub yaz';
@@ -353,7 +351,6 @@ $labels['reqmdn'] = 'Hər zaman çatdırılma bildirişini istə';
 $labels['reqdsn'] = 'Hər zaman çatıdrılma haqda statusu istə';
 $labels['replysamefolder'] = 'Cavab mesajları üçün saxlanılan yer';
 $labels['folder'] = 'Qovluq';
-$labels['folders'] = 'Qovluqlar';
 $labels['foldername'] = 'Qovluq adı';
 $labels['subscribed'] = 'İmzalanıb';
 $labels['messagecount'] = 'Məktublar';
@@ -398,4 +395,3 @@ $labels['japanese'] = 'Yaponca';
 $labels['korean'] = 'Koreya';
 $labels['chinese'] = 'Çincə';
 
-?>
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index a806086b9..3d0071544 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -1,18 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/az_AZ/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Orkhan Guliyev, OUR Technology, LLC.<office@ourtechnology.net>|
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/az_AZ/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -69,7 +68,6 @@ $messages['nosubjectwarning'] = '"Mövzu" sahəsi boşdur. Mövzu daxil etmək i
 $messages['nobodywarning'] = 'Məktub boş göndərilsin?';
 $messages['notsentwarning'] = 'Məktub göndərilmədi. Göndərilmədən imtina etmək istəyirsiniz?';
 $messages['noldapserver'] = 'Lütfən, axtarış üçün LDAP server seçin';
-$messages['nocontactsreturned'] = 'Ünvanlar tapılmadı';
 $messages['nosearchname'] = 'Lütfən, ad və ya e-poçt əlavə edin';
 $messages['notuploadedwarning'] = 'Əlavələr tam yüklənilməyib. Gözləyin və ya yükləməni ləğv edin.';
 $messages['searchsuccessful'] = 'Tapılan məktublar: $nr';
@@ -97,7 +95,7 @@ $messages['deletingmessage'] = 'Məktub(lar) silinir...';
 $messages['markingmessage'] = 'Məktub(lar) işarələnir...';
 $messages['receiptsent'] = 'Oxunulma haqda bildiriş göndərildi';
 $messages['errorsendingreceipt'] = 'Oxunulma haqda bildiriş göndərilmədi';
-$messages['nodeletelastidentity'] = 'Siz bu kimliyi silə bilməzsiniz. Bu axırıncıdır. ';
+$messages['nodeletelastidentity'] = 'Siz bu kimliyi silə bilməzsiniz. Bu axırıncıdır.';
 $messages['forbiddencharacter'] = 'Qovlu adı qadağan olunmuş simvollar təşkil edir';
 $messages['selectimportfile'] = 'Yüklənilən faylı seçin';
 $messages['addresswriterror'] = 'Seçilmiş ünvan kitabçası yaddaşa yazıla bilməz';
@@ -106,7 +104,7 @@ $messages['contactremovedfromgroup'] = 'Ünvanlar qrupdan silindi';
 $messages['importwait'] = 'İdxal gedir, lütfən gözləyin...';
 $messages['importerror'] = 'İdxal alınmadı! Yüklənilən fayl düzgün vCard fayl deyil.';
 $messages['importconfirm'] = '<b>$inserted ünvanlar müvəffəqiyyətlə idxal edildi, mövcud $skipped buraxılıb</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Buraxılmış $skipped mövcud daxillər</b>	';
+$messages['importconfirmskipped'] = '<b>Buraxılmış $skipped mövcud daxillər</b>';
 $messages['opnotpermitted'] = 'Əməliyyat qadağandır!';
 $messages['nofromaddress'] = 'Seçilmiş kimlikdə e-poçt ünvanları yoxdur';
 $messages['editorwarning'] = 'Adi mətn redaktoruna keçid, bütün mətn formatlarının itkisinə gətirəcək. Davam edilsin?';
@@ -116,7 +114,6 @@ $messages['smtpautherror'] = 'SMTP Error ($code): İdentifikasiya xətası';
 $messages['smtpfromerror'] = 'SMTP Error ($code): Göndərəni səlavə etmək mümkün deyil - "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Error ($code): Qəbul edəni əlavə etmək mümkün deyil - "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Qəbul edənlərin siyahısını emal etmək mümkün deyil';
-$messages['smtpdsnerror'] = 'SMTP xəta: çatdırılma haqda bildiriş dəstəyi yoxdur';
 $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Səhv ünvan: $email';
 $messages['toomanyrecipients'] = 'Qəbul edənlər həddindən artıq çoxdur. Lütfən, $max qədər azaldın.';
@@ -138,4 +135,3 @@ $messages['folderupdated'] = 'Qovluq yeniləndi';
 $messages['foldercreated'] = 'Qovluq yaradıldı';
 $messages['invalidimageformat'] = 'Şəkil formatı düzgün deyil';
 
-?>
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index e0918f167..a487ee610 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/bg_BG/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Todor Dragnev <todor.dragnev@gmail.com>                       |
-|   Nickolay Bunev <just4nick@gmail.com>                                |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/bg_BG/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -46,6 +42,7 @@ $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
 $labels['readstatus'] = 'Статут (прочетено/непрочетено)';
 $labels['mailboxlist'] = 'Папки';
+$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Съобщения $from до $to от $count';
 $labels['threadsfromto'] = 'Съобщения $from до $to от $count';
 $labels['messagenrof'] = 'Съобщение $nr от $count';
@@ -75,6 +72,7 @@ $labels['feb'] = 'Фев';
 $labels['mar'] = 'Мар';
 $labels['apr'] = 'Апр';
 $labels['may'] = 'Май';
+$labels['longmay'] = 'Май';
 $labels['jun'] = 'Юни';
 $labels['jul'] = 'Юли';
 $labels['aug'] = 'Авг';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'Януари';
 $labels['longfeb'] = 'Февруари';
 $labels['longmar'] = 'Март';
 $labels['longapr'] = 'Април';
-$labels['longmay'] = 'Май';
 $labels['longjun'] = 'Юни';
 $labels['longjul'] = 'Юли';
 $labels['longaug'] = 'Август';
@@ -121,7 +118,8 @@ $labels['markunflagged'] = 'Като неотбелязани';
 $labels['moreactions'] = 'Повече действия...';
 $labels['select'] = 'Избери';
 $labels['all'] = 'Всички';
-$labels['none'] = 'Нищо';
+$labels['none'] = 'Никакъв';
+$labels['nonesort'] = 'Никакъв';
 $labels['currpage'] = 'Страница';
 $labels['unread'] = 'Нови';
 $labels['flagged'] = 'Отбелязано';
@@ -141,7 +139,6 @@ $labels['expand_only_unread'] = 'само с непрочетени съобще
 $labels['fromto'] = 'Изпращащ/Получаващ';
 $labels['flag'] = 'Флаг';
 $labels['attachment'] = 'Прикачен файл';
-$labels['nonesort'] = 'Никакъв';
 $labels['sentdate'] = 'Дата на изпращане';
 $labels['arrival'] = 'Дата на пристигане';
 $labels['asc'] = 'възходящ';
@@ -189,7 +186,7 @@ $labels['high'] = 'Висок';
 $labels['highest'] = 'Най-висок';
 $labels['nosubject'] = '(няма заглавие)';
 $labels['showimages'] = 'Показвай изображения';
-$labels['alwaysshow'] = 'Винаги показвай изображения от $ ';
+$labels['alwaysshow'] = 'Винаги показвай изображения от $';
 $labels['isdraft'] = 'Това съобщение е чернова';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'текстов';
@@ -232,14 +229,15 @@ $labels['male'] = 'Мъж';
 $labels['female'] = 'Жена';
 $labels['manager'] = 'Мениджър';
 $labels['assistant'] = 'Асистент';
+$labels['typeassistant'] = 'Асистент';
 $labels['spouse'] = 'Съпруг (а)';
 $labels['allfields'] = 'Всички полета';
 $labels['search'] = 'Търсене';
 $labels['advsearch'] = 'Разширено търсене';
 $labels['other'] = 'Други';
+$labels['typeother'] = 'Други';
 $labels['typehome'] = 'Начало';
 $labels['typework'] = 'Работа';
-$labels['typeother'] = 'Други';
 $labels['typemobile'] = 'Мобилни';
 $labels['typemain'] = 'Главни';
 $labels['typehomefax'] = 'Домашен факс';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Служебен факс';
 $labels['typecar'] = 'Автомобил';
 $labels['typepager'] = 'Пейджър';
 $labels['typevideo'] = 'Видео';
-$labels['typeassistant'] = 'Асистент';
 $labels['typehomepage'] = 'Начална страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профил';
@@ -356,7 +353,6 @@ $labels['mainoptions'] = 'Основни настройки';
 $labels['section'] = 'Раздел';
 $labels['maintenance'] = 'Поддръжка';
 $labels['newmessage'] = 'Ново съобщение';
-$labels['listoptions'] = 'Покажи списък с настройки';
 $labels['signatureoptions'] = 'Настройки на подпис';
 $labels['whenreplying'] = 'При отговор';
 $labels['replytopposting'] = 'започване на ново съобщение преди получения текст';
@@ -383,7 +379,6 @@ $labels['spellcheckignorenums'] = 'Игнорирай думи съдържащ�
 $labels['spellcheckignorecaps'] = 'Игнорирай думи съдържащи единствено главни букви';
 $labels['addtodict'] = 'Добави в речника';
 $labels['folder'] = 'Папка';
-$labels['folders'] = 'Папки';
 $labels['foldername'] = 'Име на папката';
 $labels['subscribed'] = 'Използвай';
 $labels['messagecount'] = 'Писма';
@@ -429,4 +424,3 @@ $labels['japanese'] = 'Японски';
 $labels['korean'] = 'Корейски';
 $labels['chinese'] = 'Китайски';
 
-?>
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index 6b10eaf63..978d00317 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/bg_BG/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Todor Dragnev <todor.dragnev@gmail.com>                       |
-|	  Nickolay Bunev <just4nick@gmail.com>								|
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/bg_BG/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -139,7 +135,7 @@ $messages['contactdeleted'] = 'Контактът беше изтрит';
 $messages['contactrestoreerror'] = 'Неуспешно възстановяване на изтрите контакт(и).';
 $messages['contactrestored'] = 'Контактът(-ите) са възстановени успешно';
 $messages['groupdeleted'] = 'Групата беше  изтрита';
-$messages['grouprenamed'] = 'Групата беше преименувана ';
+$messages['grouprenamed'] = 'Групата беше преименувана';
 $messages['groupcreated'] = 'Групата беше създадена';
 $messages['savedsearchdeleted'] = 'Запазаните търсения са изтрити успешно.';
 $messages['savedsearchdeleteerror'] = 'Изтриването на запазените търсения е неуспешно.';
@@ -159,4 +155,3 @@ $messages['invalidimageformat'] = 'Невалиден формат на изоб
 $messages['mispellingsfound'] = 'В съобщението са намерени правописни грешки.';
 $messages['parentnotwritable'] = 'Създаването/преместването на папка в избраната родителска папка е неуспешно. Няма права за достъп.';
 
-?>
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index 2e217313d..10ad27ffa 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/bn_BD/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008, The Roundcube Dev Team                            |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:                                                               |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/bn_BD/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -39,17 +39,15 @@ $labels['date'] = 'তারিখ';
 $labels['size'] = 'সাইজ';
 $labels['priority'] = 'গুরুত্ব';
 $labels['organization'] = 'কোম্পানি';
-$labels['reply-to'] = 'প্রতি উত্তর';
-$labels['mailboxlist'] = 'মেইল বক্স তালিকা';
-$labels['messagesfromto'] = '$count মেইলের মধ্যে, $from হতে $to দেখানো হচ্ছে ';
+$labels['mailboxlist'] = 'ফোল্ডার/মেইলবক্স';
+$labels['folders'] = 'ফোল্ডার/মেইলবক্স';
+$labels['messagesfromto'] = '$count মেইলের মধ্যে, $from হতে $to দেখানো হচ্ছে';
 $labels['messagenrof'] = '$nr #মেইল/চিঠি , $count এর মধ্যে';
+$labels['copy'] = 'অনুলিপির ঠিকানা';
 $labels['moveto'] = 'সরিয়ে ফেলুন..';
 $labels['download'] = 'ডাউনলোড';
 $labels['filename'] = 'ফাইলের নাম';
 $labels['filesize'] = 'ফাইলের সাইজ';
-$labels['preferhtml'] = 'HTML এ দেখি';
-$labels['htmlmessage'] = 'HTML মেইল/চিঠি';
-$labels['prettydate'] = 'তারিখ ভালো করে দেখা যাবে';
 $labels['addtoaddressbook'] = 'ঠিকানার বইতে ঢুকান';
 $labels['sun'] = 'রবি';
 $labels['mon'] = 'সোম';
@@ -70,6 +68,7 @@ $labels['feb'] = 'ফেব্রুয়ারি';
 $labels['mar'] = 'মার্চ';
 $labels['apr'] = 'এপ্রিল';
 $labels['may'] = 'মে';
+$labels['longmay'] = 'মে';
 $labels['jun'] = 'জুন';
 $labels['jul'] = 'জুলাই';
 $labels['aug'] = 'আগস্ট';
@@ -81,7 +80,6 @@ $labels['longjan'] = 'জানুয়ারি';
 $labels['longfeb'] = 'ফেব্রুয়ারি';
 $labels['longmar'] = 'মার্চ';
 $labels['longapr'] = 'এপ্রিল';
-$labels['longmay'] = 'মে';
 $labels['longjun'] = 'জুন';
 $labels['longjul'] = 'জুলাই';
 $labels['longaug'] = 'আগস্ট';
@@ -90,22 +88,18 @@ $labels['longoct'] = 'অষ্টবার (October)';
 $labels['longnov'] = 'নবেমবার (November)';
 $labels['longdec'] = 'দিশেমবার (December)';
 $labels['today'] = 'আজকে';
-$labels['checkmail'] = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা ';
+$labels['checkmail'] = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
 $labels['writenewmessage'] = 'নতুন মেইল/চিঠি লিখুন';
 $labels['replytomessage'] = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
 $labels['replytoallmessage'] = 'প্রেরক ও এই চিঠির অন্যান্য প্রাপকদের কাছে উত্তর পাঠান';
-$labels['forwardmessage'] = 'মেইল/চিঠি এগিয়ে দিন ';
+$labels['forwardmessage'] = 'মেইল/চিঠি এগিয়ে দিন';
 $labels['deletemessage'] = 'মেইল/চিঠি ছিড়ে ফেলুন';
 $labels['movemessagetotrash'] = 'মেইল/চিঠি ডাস্টবিনে ফেলুন';
 $labels['printmessage'] = 'মেইল/চিঠি প্রিন্ট করুন';
 $labels['previousmessage'] = 'আগের মেইল/চিঠিটি দেখুন';
-$labels['previousmessages'] = 'আগের মেইল/চিঠি গুলো দেখুন';
 $labels['firstmessage'] = 'প্রথম মেইল/চিঠিটি দেখুন';
-$labels['firstmessages'] = 'প্রথম মেইল/চিঠি গুলো দেখুন';
 $labels['nextmessage'] = 'পরের মেইল/চিঠিটি দেখুন';
-$labels['nextmessages'] = 'পরের মেইল/চিঠিগুলি দেখুন';
 $labels['lastmessage'] = 'শেষ মেইল/চিঠিটি দেখুন';
-$labels['lastmessages'] = 'শেষের দিকের মেইল/চিঠিগুলি দেখুন';
 $labels['backtolist'] = 'মেইল/চিঠির তালিকায় ফিরে যান';
 $labels['viewsource'] = 'মূল উৎসদেখুন';
 $labels['markmessages'] = 'মেইল/চিঠি (গুলো)';
@@ -116,13 +110,13 @@ $labels['markunflagged'] = 'দাগহীন (unflagged)';
 $labels['select'] = 'বেছেনিন';
 $labels['all'] = 'সবগুলো';
 $labels['none'] = 'কোনোটাই না';
+$labels['nonesort'] = 'কোনোটাই না';
 $labels['unread'] = 'নাদেখা (unread)';
 $labels['flagged'] = 'দাগানো (flagged)';
 $labels['unanswered'] = 'উত্তর না দেওয়া গুলো';
 $labels['filter'] = 'ছাকনি';
 $labels['compact'] = 'টাইটকরুন';
 $labels['empty'] = 'খালিকরুন';
-$labels['purge'] = 'Purge';
 $labels['quota'] = 'ডিস্ক এ খালি যায়গা';
 $labels['unknown'] = 'অজানা';
 $labels['unlimited'] = 'সীমাহীন';
@@ -200,6 +194,9 @@ $labels['manageidentities'] = 'এই অ্যাকউন্টের "পর�
 $labels['newidentity'] = 'নতুন পরিচিতি';
 $labels['newitem'] = 'নতুন জিনিষ';
 $labels['edititem'] = 'জিনিষ বদলান';
+$labels['preferhtml'] = 'HTML এ দেখি';
+$labels['htmlmessage'] = 'HTML মেইল/চিঠি';
+$labels['prettydate'] = 'তারিখ ভালো করে দেখা যাবে';
 $labels['setdefault'] = 'এইটাই আসল';
 $labels['autodetect'] = 'কম্পুটার নিজেনিজি বেছে নেবে';
 $labels['language'] = 'ভাষা';
@@ -241,7 +238,6 @@ $labels['advancedoptions'] = 'জটিল বিষয়';
 $labels['focusonnewmessage'] = 'নতুন মেইল এলেই তা হাইলাইট হয়ে যাবে';
 $labels['checkallfolders'] = 'সবগুলো মেইলবক্সে নতুন চিঠি খোজা হবে';
 $labels['folder'] = 'ফোল্ডার/মেইলবক্স';
-$labels['folders'] = 'ফোল্ডার/মেইলবক্স';
 $labels['foldername'] = 'ফোল্ডার/মেইলবক্স এর নাম';
 $labels['subscribed'] = 'গ্রহনকারি';
 $labels['messagecount'] = 'মেইল/চিঠি';
@@ -257,4 +253,3 @@ $labels['KB'] = 'কিলোবাইট';
 $labels['MB'] = 'মেগাবাইট';
 $labels['GB'] = 'গিগাবাইট';
 
-?>
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index e7a8b3409..a8313c08c 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/bn_BD/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008, The Roundcube Dev Team                            |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:                                                               |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/bn_BD/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -37,7 +37,7 @@ $messages['encryptedmessage'] = 'এটা একটি গোপন (encrypted)
 $messages['nocontactsfound'] = 'কোনো ঠিকানা পাওয়া গেলনা। দু্ঃখিত।';
 $messages['contactnotfound'] = 'আপনি যে ঠিকানা খুজছেন সেটা পাওয়া গেল না';
 $messages['sendingfailed'] = 'চিঠি পাঠানো গেলনা';
-$messages['senttooquickly'] = 'এই চিঠি পাঠানোর আগে, দয়া করে $sec সেকেন্ড ';
+$messages['senttooquickly'] = 'এই চিঠি পাঠানোর আগে, দয়া করে $sec সেকেন্ড';
 $messages['errorsavingsent'] = 'প্রেরিত চিঠি হিসাবে জমা রাখার সময় একটা ঝামেলা হয়েছে';
 $messages['errorsaving'] = 'জমা করার সময় একটা ঝামেলা হয়েছে';
 $messages['errormoving'] = 'চিঠিটা সরানো গেলো না';
@@ -58,7 +58,6 @@ $messages['nosubjectwarning'] = 'বিষয় হিসাবে কিছু �
 $messages['nobodywarning'] = 'কোনো কিছু না লিখেই এই চিঠি পাঠিয়ে দেবেন?';
 $messages['notsentwarning'] = 'চিঠি পাঠানো হয়নি। চিঠিটা কি বাতিল করে দেবেন?';
 $messages['noldapserver'] = 'দয়া করে একটি এল্ডাপ সারভার বেছে নিন সার্চ করার জন্যে';
-$messages['nocontactsreturned'] = 'কোনো ঠিকানা পাওয়া গেলনা। দু্ঃখিত।';
 $messages['nosearchname'] = 'দয়া করে একজনের নাম অথবা ই-মেইল লিখুন';
 $messages['searchsuccessful'] = '$nr টা চিঠি পাওয়া গেছে';
 $messages['searchnomatch'] = 'খুজে কিছু পাওয়া গেলোনা';
@@ -78,7 +77,7 @@ $messages['errorsavingcontact'] = 'ঠিকানা জমা রাখা গ
 $messages['movingmessage'] = 'চিঠি সরানো হচ্ছে..';
 $messages['receiptsent'] = 'ঠিকঠাক মতো ফিরতি রশিদ পাঠানো হয়েছে';
 $messages['errorsendingreceipt'] = 'রশিদ পাঠানো গেলোনা';
-$messages['nodeletelastidentity'] = 'আপনি এই পরিচিতি ফেলতে পারবেন না কারন এইটায় বর্তমানে আপনার একমাত্র পরিচিতি। ';
+$messages['nodeletelastidentity'] = 'আপনি এই পরিচিতি ফেলতে পারবেন না কারন এইটায় বর্তমানে আপনার একমাত্র পরিচিতি।';
 $messages['forbiddencharacter'] = 'ফোল্ডার এর নামের মধ্যে নিষিদ্ধ অক্ষর আছে';
 $messages['selectimportfile'] = 'একটা ফাইল বেছে নিন তোলার জন্য';
 $messages['addresswriterror'] = 'বেছে নেওয়া ঠিকানার বইটিতে লেখাযায় না';
@@ -89,4 +88,3 @@ $messages['opnotpermitted'] = 'এই কাজটা করার অনুম�
 $messages['nofromaddress'] = 'বেছে নেওয়া যে পরিচিতিটা, তাতে ই-মেইল নেই';
 $messages['editorwarning'] = 'যদি আপনি শুধু লেখার স্টাইলে যান তাহলে বর্তমানের কোনো বিন্যাস হারিয়ে যাবে';
 
-?>
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 31f8cdd97..8080714fe 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/bzg/labels.inc                                                |
+ | localization/br/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2007, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: aldweb <info@aldweb.com>                                      |
- |         Pierre HAEGELI <pierre@haegeli.net>                           |
- |         Mickaël Wolff <rcw@lupusmic.org>                              |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
@@ -44,17 +39,15 @@ $labels['date'] = 'Deiz';
 $labels['size'] = 'Ment';
 $labels['priority'] = 'Kentwir';
 $labels['organization'] = 'Aozadur';
-$labels['reply-to'] = 'Respont ouzh';
 $labels['mailboxlist'] = 'Renkelloù';
+$labels['folders'] = 'Renkelloù';
 $labels['messagesfromto'] = 'Kemennadoù eus $from ouzh $to war $count';
 $labels['messagenrof'] = 'Kemennad $nr war $count';
+$labels['copy'] = 'Cc';
 $labels['moveto'] = 'Dilec\'hiañ ouzh...';
 $labels['download'] = 'Pellgargañ';
 $labels['filename'] = 'Anv ar restr';
 $labels['filesize'] = 'Ment ar restr';
-$labels['preferhtml'] = 'Diskouez en HTML';
-$labels['htmlmessage'] = 'Kemennad en HTML';
-$labels['prettydate'] = 'Diskouez berr deizioù';
 $labels['addtoaddressbook'] = 'Ouzhpennañ er c\'harned chomlec\'hioù';
 $labels['sun'] = 'Sul';
 $labels['mon'] = 'Lun';
@@ -78,31 +71,27 @@ $labels['replytoallmessage'] = 'Respont d\'an holl';
 $labels['forwardmessage'] = 'Treuzkas ar c\'hemennad';
 $labels['deletemessage'] = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
 $labels['printmessage'] = 'Moulañ ar c\'hemennad-se';
-$labels['previousmessage'] = 'Gwelout ar c\"hemennad a-raok';
-$labels['previousmessages'] = 'Gwelout ar c\'hemennadoù a-raok';
+$labels['previousmessage'] = 'Gwelout ar c"hemennad a-raok';
 $labels['firstmessage'] = 'Gwelout ar c\'hemennad kentañ';
-$labels['firstmessages'] = 'Gwelout ar bajenn gentañ kemennadoù';
 $labels['nextmessage'] = 'Gwelout ar c\'hemennad da heul';
-$labels['nextmessages'] = 'Gwelout ar c\'hemennadoù da heul';
 $labels['lastmessage'] = 'Gwelout ar c\'hemennad diwezhañ';
-$labels['lastmessages'] = 'Gwelout ar bajenn diwezhañ kemennadoù';
 $labels['backtolist'] = 'Distreiñ el listenn kemennadoù';
 $labels['viewsource'] = 'Gwelout an tarzh';
 $labels['select'] = 'Diuzañ';
 $labels['all'] = 'An holl';
 $labels['none'] = 'Ebet';
+$labels['nonesort'] = 'Ebet';
 $labels['unread'] = 'Na lennet';
 $labels['compact'] = 'Stummaat';
 $labels['empty'] = 'Skarzhañ';
-$labels['purge'] = 'Spurjañ';
 $labels['quota'] = 'Implijadur pladenn';
 $labels['unknown'] = 'Dianav';
 $labels['unlimited'] = 'didermen';
 $labels['quicksearch'] = 'Klask prim';
 $labels['resetsearch'] = 'Aderaouekaat ar glask';
 $labels['compose'] = 'Skrivañ ur c\'hemennad nevez';
-$labels['sendmessage'] = 'Kas ar c\'hemennad diouzhtu';
 $labels['savemessage'] = 'Gwarediñ ar brouilhed-se';
+$labels['sendmessage'] = 'Kas ar c\'hemennad diouzhtu';
 $labels['addattachment'] = 'Stagañ ur restr';
 $labels['charset'] = 'Engodadur';
 $labels['editortype'] = 'Furmad aozer';
@@ -153,6 +142,9 @@ $labels['manageidentities'] = 'Merañ an identelezhioù evit ar c\'hont-se';
 $labels['newidentity'] = 'Identelezh nevez';
 $labels['newitem'] = 'Elfenn nevez';
 $labels['edititem'] = 'Cheñch an elfenn';
+$labels['preferhtml'] = 'Diskouez en HTML';
+$labels['htmlmessage'] = 'Kemennad en HTML';
+$labels['prettydate'] = 'Diskouez berr deizioù';
 $labels['setdefault'] = 'Arventennoù dre ziouer';
 $labels['language'] = 'Yezh';
 $labels['timezone'] = 'Gwerzhid-eur';
@@ -166,7 +158,6 @@ $labels['autosavedraft'] = 'Gwarediñ emgefre brouilhedoù';
 $labels['everynminutes'] = 'Bep $n munutoù';
 $labels['never'] = 'ebet';
 $labels['folder'] = 'Renkell';
-$labels['folders'] = 'Renkelloù';
 $labels['foldername'] = 'Anv ar renkell';
 $labels['subscribed'] = 'Koumananer';
 $labels['create'] = 'Krouiñ';
@@ -176,4 +167,3 @@ $labels['sortby'] = 'Rummañ dre';
 $labels['sortasc'] = 'Rumm diagentad';
 $labels['sortdesc'] = 'Rumm diskennad';
 
-?>
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 4c73d1636..96cbf32ab 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/bzg/messages.inc                                              |
+ | localization/br/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2007, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: aldweb <info@aldweb.com>                                      |
- |         Pierre HAEGELI <pierre@haegeli.net>                           |
- |         Mickaël Wolff <rcw@lupusmic.org>                              |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
@@ -58,7 +53,6 @@ $messages['nosubjectwarning'] = 'Dileun eo ar maezienn « Sujed » . C\'hoant ho
 $messages['nobodywarning'] = 'Kas ar c\'hemennad hep testenn ?';
 $messages['notsentwarning'] = 'N\'eo ket bet kaset ar c\'hemennad. C\'hoant hoc\'h eus dilezel ar c\'hemennad-se ?';
 $messages['noldapserver'] = 'Dizuit ur servijer LDAP evit ar glask';
-$messages['nocontactsreturned'] = 'Darempred ebet kavet';
 $messages['nosearchname'] = 'Skrivit un anv darempred pe ur postel elektronek';
 $messages['searchsuccessful'] = '$nr kemennad kavet';
 $messages['searchnomatch'] = 'Disoc\'h ebet gant ar glask';
@@ -76,4 +70,3 @@ $messages['copyerror'] = 'Ne c\'hall ket kopiañ chomlec\'hioù';
 $messages['sourceisreadonly'] = 'Lenn hepken eo an tarzh chomlec\'h se';
 $messages['errorsavingcontact'] = 'Ne c\'haller ket gwarediñ chomlec\'h darempred';
 
-?>
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 7081a88da..b524942c1 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/bs_BA/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Begzudin Omerovic <Begzudin.Omerovic@gmail.com>               |
-|       Tanja Dobričić <tanja.dobricic@everymail.info>                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/bs_BA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -46,6 +42,7 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status poruke';
 $labels['mailboxlist'] = 'Fascikle';
+$labels['folders'] = 'Fascikle';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme $from do $to od $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
@@ -75,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Maj';
+$labels['longmay'] = 'Maj';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Avg';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
 $labels['longmar'] = 'Mart';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Maj';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'Avgust';
@@ -116,10 +113,10 @@ $labels['markread'] = 'Kao pročitane';
 $labels['markunread'] = 'Kao nepročitane';
 $labels['markflagged'] = 'Kao markirane';
 $labels['markunflagged'] = 'Kao nemarkirane';
-$labels['messageactions'] = 'Više akcija';
 $labels['select'] = 'Obilježi';
 $labels['all'] = 'Sve';
-$labels['none'] = 'Nijednu';
+$labels['none'] = 'Ništa';
+$labels['nonesort'] = 'Ništa';
 $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Obilježeno';
@@ -138,7 +135,6 @@ $labels['expand_only_unread'] = 'samo sa nepročitanim porukama';
 $labels['fromto'] = 'Pošiljaoc/Primatelj';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Privitak';
-$labels['nonesort'] = 'Ništa';
 $labels['sentdate'] = 'Datum slanja';
 $labels['arrival'] = 'Datum primanja';
 $labels['asc'] = 'rastući';
@@ -225,10 +221,12 @@ $labels['male'] = 'Muško';
 $labels['female'] = 'Žensko';
 $labels['manager'] = 'Menadžer';
 $labels['assistant'] = 'Pomoćnik';
+$labels['typeassistant'] = 'Pomoćnik';
 $labels['spouse'] = 'Muž/Žena';
+$labels['other'] = 'Ostalo';
+$labels['typeother'] = 'Ostalo';
 $labels['typehome'] = 'Kućni broj';
 $labels['typework'] = 'Poslovni broj';
-$labels['typeother'] = 'Ostalo';
 $labels['typemobile'] = 'Mobilni broj';
 $labels['typemain'] = 'Glavni broj';
 $labels['typehomefax'] = 'Fax kuća';
@@ -236,7 +234,6 @@ $labels['typeworkfax'] = 'Fax posao';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Pejdžer';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Pomoćnik';
 $labels['addfield'] = 'Dodati polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Izmijeni kontakt';
@@ -258,7 +255,6 @@ $labels['print'] = 'Štampaj';
 $labels['export'] = 'Izvezi';
 $labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Kreiraj novu kontakt-grupu';
-$labels['groupactions'] = 'Podešavanja za kontakt-grupu';
 $labels['previouspage'] = 'Prikaži predhodnu stranicu';
 $labels['firstpage'] = 'Prikaži prvi skup';
 $labels['nextpage'] = 'Prikaži sljedeću stranicu';
@@ -332,7 +328,6 @@ $labels['mainoptions'] = 'glavne opcije';
 $labels['section'] = 'sekcija';
 $labels['maintenance'] = 'održavanje';
 $labels['newmessage'] = 'nova poruka';
-$labels['listoptions'] = 'opcije liste';
 $labels['signatureoptions'] = 'opcije potpisa';
 $labels['whenreplying'] = 'prilikom odgovora';
 $labels['replytopposting'] = 'započni novu poruku iznad originala';
@@ -351,7 +346,6 @@ $labels['reqmdn'] = 'uvijek zatraži potvrdu o primitku poruke';
 $labels['reqdsn'] = 'uvijek zatraži potvrdu o slanju poruke';
 $labels['replysamefolder'] = 'spremi odgovore u mapu gdje se nalazi poruka';
 $labels['folder'] = 'Fascikla';
-$labels['folders'] = 'Fascikle';
 $labels['foldername'] = 'Ime fascikle';
 $labels['subscribed'] = 'Pretplaćen';
 $labels['messagecount'] = 'poruke';
@@ -396,4 +390,3 @@ $labels['japanese'] = 'japanski';
 $labels['korean'] = 'korejski';
 $labels['chinese'] = 'kineski';
 
-?>
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 5c8fdc2b6..aab3839e1 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/bs_BA/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Begzudin Omerovic <Begzudin.Omerovic@gmail.com>               |
-|	Tanja Dobričić <tanja.dobricic@everymail.info>			|
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/bs_BA/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -72,7 +68,6 @@ $messages['nosubjectwarning'] = 'Polje \'Naslov\' je prazno. Želite li unijeti
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['notsentwarning'] = 'Poruka nije poslata. Želite li odbaciti ovu poruku?';
 $messages['noldapserver'] = 'Unesite LDAP poslužitelj za pretragu';
-$messages['nocontactsreturned'] = 'Nije pronađen niti jedan kontakt';
 $messages['nosearchname'] = 'Unesite ime ili email adresu';
 $messages['notuploadedwarning'] = 'Svi prilozi još nisu presnimljeni na poslužitelj. Molim pričekajte ili zaustavite presnimavanje.';
 $messages['searchsuccessful'] = 'Broj pronađenih poruka: $nr';
@@ -87,7 +82,7 @@ $messages['folderpurged'] = 'Fascikla uspješno ispražnjena';
 $messages['folderexpunged'] = 'Fascikla uspješno zbijena';
 $messages['deletedsuccessfully'] = 'Uspješno obrisano';
 $messages['converting'] = 'Formatiranje poruke';
-$messages['messageopenerror'] = 'Nije moguće ';
+$messages['messageopenerror'] = 'Nije moguće';
 $messages['fileuploaderror'] = 'Prijenos datoteke nije uspio';
 $messages['filesizeerror'] = 'Datoteka je prevelika. Maksimalna veličina je $size';
 $messages['copysuccess'] = 'Uspješno kopirano $n adresa';
@@ -119,7 +114,6 @@ $messages['smtpautherror'] = 'SMTP Greška ($code): Autentikacija nije uspjela';
 $messages['smtpfromerror'] = 'SMTP Greška ($code): Nije uspjelo postavljanje pošiljaoca "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Greška ($code): Nije uspjelo dodavanje primaoca "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Greška: Nije moguće pročitati listu primaoca';
-$messages['smtpdsnerror'] = 'SMTP Greška: Nema podrške za obaviještenje o statusu isporuke';
 $messages['smtperror'] = 'SMTP Greška: $msg';
 $messages['emailformaterror'] = 'Nepravilna email adresa: $email';
 $messages['toomanyrecipients'] = 'Previše primaoca. Smanjite broj primaoca na $max.';
@@ -141,4 +135,3 @@ $messages['folderupdated'] = 'Ažuriranje mape uspješno.';
 $messages['foldercreated'] = 'Kreiranje mape uspješno.';
 $messages['invalidimageformat'] = 'Format slike nije validan.';
 
-?>
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index c91e50944..cc401caf6 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ca_ES/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Miguel Canteras i Cañizares <miguel@canteras.org>             |
-|         Simo <sim6@graciasensefils.net>                               |
-|         Jordi Sanfeliu <jordi@fibranet.cat>                           |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ca_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,6 +42,7 @@ $labels['priority'] = 'Prioritat';
 $labels['organization'] = 'Organització';
 $labels['readstatus'] = 'Estat de lectura';
 $labels['mailboxlist'] = 'Carpetes';
+$labels['folders'] = 'Carpetes';
 $labels['messagesfromto'] = 'Missatges des de $from a $to de $count';
 $labels['threadsfromto'] = 'Fils $from a $to de $count';
 $labels['messagenrof'] = 'Missatge $nr de $count';
@@ -75,7 +71,8 @@ $labels['jan'] = 'gen';
 $labels['feb'] = 'feb';
 $labels['mar'] = 'mar';
 $labels['apr'] = 'abr';
-$labels['may'] = 'mai';
+$labels['may'] = 'maig';
+$labels['longmay'] = 'maig';
 $labels['jun'] = 'jun';
 $labels['jul'] = 'jul';
 $labels['aug'] = 'ago';
@@ -87,7 +84,6 @@ $labels['longjan'] = 'gener';
 $labels['longfeb'] = 'febrer';
 $labels['longmar'] = 'març';
 $labels['longapr'] = 'abril';
-$labels['longmay'] = 'maig';
 $labels['longjun'] = 'juny';
 $labels['longjul'] = 'juliol';
 $labels['longaug'] = 'agost';
@@ -123,6 +119,7 @@ $labels['moreactions'] = 'Més accions...';
 $labels['select'] = 'Selecciona';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
+$labels['nonesort'] = 'Cap';
 $labels['currpage'] = 'Pàgina actual';
 $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
@@ -142,7 +139,6 @@ $labels['expand_only_unread'] = 'només amb missatges no llegits';
 $labels['fromto'] = 'Remitent/Destinatari';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunt';
-$labels['nonesort'] = 'Cap';
 $labels['sentdate'] = 'Data d\'enviament';
 $labels['arrival'] = 'Data d\'arribada';
 $labels['asc'] = 'ascendent';
@@ -191,6 +187,7 @@ $labels['highest'] = 'Molt alta';
 $labels['nosubject'] = '(sense assumpte)';
 $labels['showimages'] = 'Mostra imatges';
 $labels['alwaysshow'] = 'Sempre mostra imatges de $sender';
+$labels['isdraft'] = 'Aquest és un missatge esborrany.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text pla';
 $labels['savesentmessagein'] = 'Desa el missatge enviat a';
@@ -232,14 +229,15 @@ $labels['male'] = 'masculí';
 $labels['female'] = 'femení';
 $labels['manager'] = 'Gerent';
 $labels['assistant'] = 'Assistent';
+$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Cònjuge';
 $labels['allfields'] = 'Tots els camps';
 $labels['search'] = 'Cercar';
 $labels['advsearch'] = 'Cerca Avançada';
 $labels['other'] = 'Altre';
+$labels['typeother'] = 'Altre';
 $labels['typehome'] = 'Casa';
 $labels['typework'] = 'Feina';
-$labels['typeother'] = 'Altre';
 $labels['typemobile'] = 'Mòbil';
 $labels['typemain'] = 'Principal';
 $labels['typehomefax'] = 'Fax de Casa';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Fax de la Feina';
 $labels['typecar'] = 'Cotxe';
 $labels['typepager'] = 'Paginador';
 $labels['typevideo'] = 'Vídeo';
-$labels['typeassistant'] = 'Assistent';
 $labels['typehomepage'] = 'Pàgina Inicial';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
@@ -291,6 +288,7 @@ $labels['importreplace'] = 'Reemplaça la llibreta d\'adreçes sencera';
 $labels['importtext'] = 'Podeu importar contactes des d\'una llibreta d\'adreces existent.<br/>Actualment suportem l\'importació d\'adreces amb el format <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Fet';
 $labels['settingsfor'] = 'Configuració per a';
+$labels['about'] = 'Quant a';
 $labels['preferences'] = 'Preferències';
 $labels['userpreferences'] = 'Preferències d\'usuari';
 $labels['editpreferences'] = 'Edita preferències d\'usuari';
@@ -302,6 +300,8 @@ $labels['edititem'] = 'Edita';
 $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Joc de caracters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
+$labels['dateformat'] = 'Format de la data';
+$labels['timeformat'] = 'Format horari';
 $labels['prettydate'] = 'Dates curtes';
 $labels['setdefault'] = 'Selecciona opció per defecte';
 $labels['autodetect'] = 'Auto';
@@ -350,11 +350,11 @@ $labels['advancedoptions'] = 'Opcions avançades';
 $labels['focusonnewmessage'] = 'Envia el focus al navegador quan hi hagi un nou missatge';
 $labels['checkallfolders'] = 'Comprova totes les carpetes per missatges nous';
 $labels['displaynext'] = 'Mostra el següent missatge després de esborrar-ne o moure\'n un';
+$labels['defaultfont'] = 'Font per defecte al missatge HTML';
 $labels['mainoptions'] = 'Opcions principals';
 $labels['section'] = 'Secció';
 $labels['maintenance'] = 'Manteniment';
 $labels['newmessage'] = 'Missatge nou';
-$labels['listoptions'] = 'Opcions de llista';
 $labels['signatureoptions'] = 'Opcions de signatura';
 $labels['whenreplying'] = 'Quan es respon';
 $labels['replytopposting'] = 'comença un nou missatge per sobre de l\'original';
@@ -373,6 +373,7 @@ $labels['reqmdn'] = 'Demana sempre la confirmació de recepció';
 $labels['reqdsn'] = 'Sempre demanar una notificació d\'estat de lliurament';
 $labels['replysamefolder'] = 'Col·locar respostes a la carpeta del missatge que es respon';
 $labels['defaultaddressbook'] = 'Afegeix contactes nous a la llibreta d\'adreces seleccionada';
+$labels['autocompletesingle'] = 'Salta l\'adreça de correu alternativa a l\'autocompleció';
 $labels['spellcheckbeforesend'] = 'Comprova l\'ortografia abans d\'enviar un missatge';
 $labels['spellcheckoptions'] = 'Opcions del corrector ortogràfic';
 $labels['spellcheckignoresyms'] = 'Ignora paraules amb símbols';
@@ -380,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Ignora paraules amb números';
 $labels['spellcheckignorecaps'] = 'Ignora paraules amb lletres capitalitzades';
 $labels['addtodict'] = 'Afegeix al diccionari';
 $labels['folder'] = 'Carpeta';
-$labels['folders'] = 'Carpetes';
 $labels['foldername'] = 'Nom de carpeta';
 $labels['subscribed'] = 'Subscriure\'s';
 $labels['messagecount'] = 'Missatges';
@@ -403,6 +403,11 @@ $labels['sortby'] = 'Ordena per';
 $labels['sortasc'] = 'Ordena ascendentment';
 $labels['sortdesc'] = 'Ordena descendentment';
 $labels['undo'] = 'Desfés';
+$labels['plugin'] = 'Connector';
+$labels['version'] = 'Versió';
+$labels['source'] = 'Font';
+$labels['license'] = 'Llicència';
+$labels['support'] = 'Obtenir ajuda';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -426,4 +431,3 @@ $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Koreà';
 $labels['chinese'] = 'Xinés';
 
-?>
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index a877d54a6..ebe2f9532 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -1,26 +1,21 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ca_ES/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Miguel Canteras i Cañizares <miguel@canteras.org>             |
-|         Simo <sim6@graciasensefils.net>                               |
-|         Jordi Sanfeliu <jordi@fibranet.cat>                           |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ca_ES/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Emi Bcn <Unknown>                                             |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Contrasenya incorrecta';
+$messages['loginfailed'] = 'L\'accés ha fallat.';
 $messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies';
 $messages['sessionerror'] = 'La vostra sessió no existeix o ha expirat';
 $messages['imaperror'] = 'Error de conexió amb el servidor IMAP';
@@ -35,7 +30,7 @@ $messages['loggedout'] = 'Heu tancat la sessió. Fins aviat!';
 $messages['mailboxempty'] = 'La bústia és buida';
 $messages['loading'] = 'Carregant...';
 $messages['uploading'] = 'Pujant fitxer...';
-$messages['uploadingmany'] = 'Pujant fitxer...';
+$messages['uploadingmany'] = 'Pujant fitxers...';
 $messages['loadingdata'] = 'Carregant dades...';
 $messages['checkingmail'] = 'Cercant nous missatges...';
 $messages['sendingmessage'] = 'Enviant missatge...';
@@ -50,6 +45,7 @@ $messages['blockedimages'] = 'Per a protegir la vostra privacitat, les imatges r
 $messages['encryptedmessage'] = 'Aquest és un missatge xifrat i no pot ser mostrat. Ho sento!';
 $messages['nocontactsfound'] = 'No hi ha contactes';
 $messages['contactnotfound'] = 'No s\'ha trobat el contacte sol·licitat';
+$messages['contactsearchonly'] = 'Introdueix termes de cerca per a trobar contactes';
 $messages['sendingfailed'] = 'Error enviant missatge';
 $messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge';
 $messages['errorsavingsent'] = 'Hi ha hagut un error mentre es desava el missatge enviat';
@@ -63,6 +59,7 @@ $messages['deletegroupconfirm'] = 'De veres voleu eliminar el grup seleccionat?'
 $messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) selecionat(s)?';
 $messages['deletefolderconfirm'] = 'Esteu segurs de voler suprimir aquesta carpeta?';
 $messages['purgefolderconfirm'] = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
+$messages['contactdeleting'] = 'Esborrant contacte(s)...';
 $messages['groupdeleting'] = 'Eliminant el grup...';
 $messages['folderdeleting'] = 'Suprimint la carpeta...';
 $messages['foldermoving'] = 'Movent la carpeta...';
@@ -74,7 +71,7 @@ $messages['nonamewarning'] = 'Introduïu un nom';
 $messages['nopagesizewarning'] = 'Introduïu una mida de pàgina';
 $messages['nosenderwarning'] = 'Si us plau, entreu l\'adreça d\'e-mail del remitent';
 $messages['norecipientwarning'] = 'Introduïu com a mínim un destinatari';
-$messages['nosubjectwarning'] = 'El camp \"Assumpte\" és buit. Voleu introduir-ne un ara?';
+$messages['nosubjectwarning'] = 'El camp "Assumpte" és buit. Voleu introduir-ne un ara?';
 $messages['nobodywarning'] = 'Voleu enviar aquest missatge sense text?';
 $messages['notsentwarning'] = 'El missatge no s\'ha enviat. Voleu descartar el vostre missatge?';
 $messages['noldapserver'] = 'Seleccioneu un servidor LDAP per a cercar';
@@ -128,7 +125,6 @@ $messages['smtpautherror'] = 'Error SMTP ($code): La identificació ha fallat.';
 $messages['smtpfromerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$from" com a remitent ($msg)';
 $messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a destinatari ($msg)';
 $messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la lista de destinataris';
-$messages['smtpdsnerror'] = 'Error SMTP: No es suporten les notificacions d\'estat de lliuraments';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Adreça d\'e-mail incorrecta: $email';
 $messages['toomanyrecipients'] = 'Massa destinataris. Reduïu el nombre de destinataris a $max.';
@@ -150,6 +146,7 @@ $messages['messagemoved'] = 'Missatge(s) mogut(s) satisfactòriament';
 $messages['messagecopied'] = 'Missatge(s) copiat(s) satisfactòriament';
 $messages['messagemarked'] = 'Missatge(s) marcat(s) satisfactòriament';
 $messages['autocompletechars'] = 'Introdueix al menys $min caracters per a l\'autocompleció';
+$messages['autocompletemore'] = 'S¡han trobat més entrades coincidents. Si us plau, introdueix més caràcters.';
 $messages['namecannotbeempty'] = 'El nom no pot estar buit';
 $messages['nametoolong'] = 'El nom és massa llarg';
 $messages['folderupdated'] = 'La carpeta ha estat actualitzada satisfactòriament';
@@ -157,5 +154,5 @@ $messages['foldercreated'] = 'La carpeta ha estat creada satisfactòriament';
 $messages['invalidimageformat'] = 'No és un format d\'imatge vàlid.';
 $messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al misstage.';
 $messages['parentnotwritable'] = 'No ha etsat possible crear/moure la carpeta dins de la carpeta ascendent seleccionada. No hi ha permisos d\'escriptura.';
+$messages['messagetoobig'] = 'La part del missatge és massa gran per a processar-la.';
 
-?>
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index d449bab9f..c169038f3 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -1,24 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Martin Mrajca <martin@moonlake.cz>                            |
-|        joe <joe@humlak.cz>                                            |
-|        Jiri Kaderavek <jiri.kaderavek@webstep.net>                    |
-|        Milan Kozak <hodza@hodza.net>                                  |
-|        Ales Pospichal <ales@pospichalales.info>                       |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: pek <Unknown>                                                 |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -29,25 +22,27 @@ $labels['server'] = 'Server';
 $labels['login'] = 'Přihlásit';
 $labels['logout'] = 'Odhlásit';
 $labels['mail'] = 'E-mail';
-$labels['settings'] = 'Osobní nastavení';
+$labels['settings'] = 'Nastavení';
 $labels['addressbook'] = 'Adresář';
 $labels['inbox'] = 'Příchozí pošta';
 $labels['drafts'] = 'Rozepsané';
 $labels['sent'] = 'Odeslané';
 $labels['trash'] = 'Koš';
-$labels['junk'] = 'Nevyžádaná pošta';
+$labels['junk'] = 'Spam';
 $labels['subject'] = 'Předmět';
 $labels['from'] = 'Odesílatel';
 $labels['to'] = 'Adresát';
 $labels['cc'] = 'Kopie';
 $labels['bcc'] = 'Skrytá kopie';
 $labels['replyto'] = 'Odpověď na';
+$labels['followupto'] = 'Následuje-po';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Velikost';
 $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizace';
 $labels['readstatus'] = 'Přečteno';
 $labels['mailboxlist'] = 'Složky';
+$labels['folders'] = 'Složky';
 $labels['messagesfromto'] = 'Zprávy $from až $to z celkem $count';
 $labels['threadsfromto'] = 'Konverzace $from až $to z celkem $count';
 $labels['messagenrof'] = 'Zpráva $nr z $count';
@@ -76,7 +71,8 @@ $labels['jan'] = 'Led';
 $labels['feb'] = 'Úno';
 $labels['mar'] = 'Bře';
 $labels['apr'] = 'Dub';
-$labels['may'] = 'Kvě';
+$labels['may'] = 'Květen';
+$labels['longmay'] = 'Květen';
 $labels['jun'] = 'Čer';
 $labels['jul'] = 'Čec';
 $labels['aug'] = 'Srp';
@@ -88,7 +84,6 @@ $labels['longjan'] = 'Leden';
 $labels['longfeb'] = 'Únor';
 $labels['longmar'] = 'Březen';
 $labels['longapr'] = 'Duben';
-$labels['longmay'] = 'Květen';
 $labels['longjun'] = 'Červen';
 $labels['longjul'] = 'Červenec';
 $labels['longaug'] = 'Srpen';
@@ -124,6 +119,7 @@ $labels['moreactions'] = 'Další akce...';
 $labels['select'] = 'Vybrat';
 $labels['all'] = 'Vše';
 $labels['none'] = 'Nic';
+$labels['nonesort'] = 'Nic';
 $labels['currpage'] = 'Aktuální stránka';
 $labels['unread'] = 'Nepřečtené';
 $labels['flagged'] = 'Označené';
@@ -143,7 +139,6 @@ $labels['expand_only_unread'] = 'pouze s nepřečtenými zprávami';
 $labels['fromto'] = 'Odesílatel/Příjemce';
 $labels['flag'] = 'Vlajka';
 $labels['attachment'] = 'Příloha';
-$labels['nonesort'] = 'Nic';
 $labels['sentdate'] = 'Datum odeslání';
 $labels['arrival'] = 'Datum přijetí';
 $labels['asc'] = 'vzestupně';
@@ -192,15 +187,16 @@ $labels['highest'] = 'Nejvyšší';
 $labels['nosubject'] = '(bez predmetu)';
 $labels['showimages'] = 'Zobrazit obrázky';
 $labels['alwaysshow'] = 'Vždy ukazovat obrázky od $sender';
+$labels['isdraft'] = 'Toto je šablona zprávy.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Prostý text';
 $labels['savesentmessagein'] = 'Ukládat odeslané zprávy v';
 $labels['dontsave'] = 'neukládat';
 $labels['maxuploadsize'] = 'Maximální povolená velikost souboru je $size';
-$labels['addcc'] = 'Přidat pole "Kopie"';
-$labels['addbcc'] = 'Přidat pole "Skrytá kopie"';
-$labels['addreplyto'] = 'Přidat pole "Odpověď"';
-$labels['addfollowupto'] = 'Přidat pole "Followup-To"';
+$labels['addcc'] = 'Přidat pole "Kopie';
+$labels['addbcc'] = 'Přidat pole "Skrytá kopie';
+$labels['addreplyto'] = 'Přidat pole "Odpověď';
+$labels['addfollowupto'] = 'Přidat pole "Followup-To';
 $labels['mdnrequest'] = 'Odesílatel této zprávy si přeje být upozorněn na to, že jste zprávu obdrželi. Chcete přijetí zprávy potvrdit?';
 $labels['receiptread'] = 'Potvrzení o přijetí zprávy';
 $labels['yourmessage'] = 'Toto je potvrzení o přijetí Vaší zprávy';
@@ -233,14 +229,15 @@ $labels['male'] = 'Muž';
 $labels['female'] = 'Žena';
 $labels['manager'] = 'Manažer';
 $labels['assistant'] = 'Asistent';
+$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Manžel/ka';
 $labels['allfields'] = 'Všechny položky';
 $labels['search'] = 'Hledat';
 $labels['advsearch'] = 'Pokročilé vyhledávání';
-$labels['other'] = 'Jiné';
+$labels['other'] = 'Ostatní';
+$labels['typeother'] = 'Ostatní';
 $labels['typehome'] = 'Domací';
 $labels['typework'] = 'Pracovní';
-$labels['typeother'] = 'Ostatní';
 $labels['typemobile'] = 'Mobil';
 $labels['typemain'] = 'Osobní';
 $labels['typehomefax'] = 'Domácí FAX';
@@ -248,7 +245,6 @@ $labels['typeworkfax'] = 'Pracovní FAX';
 $labels['typecar'] = 'Automobil';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Asistent';
 $labels['typehomepage'] = 'Domácí stránka';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
@@ -292,6 +288,7 @@ $labels['importreplace'] = 'Nahradit celý seznam kontaktů';
 $labels['importtext'] = 'Můžete nahrát kontakty z existujícího seznamu kontaktů. Podporujeme formát vCard.';
 $labels['done'] = 'Hotovo';
 $labels['settingsfor'] = 'Nastavení pro';
+$labels['about'] = 'O programu';
 $labels['preferences'] = 'Vlastnosti';
 $labels['userpreferences'] = 'Vlastnosti uživatele';
 $labels['editpreferences'] = 'Upravit vlastnosti uživatele';
@@ -357,7 +354,6 @@ $labels['mainoptions'] = 'Hlavní nastavení';
 $labels['section'] = 'Sekce';
 $labels['maintenance'] = 'Údržba';
 $labels['newmessage'] = 'Nová zpráva';
-$labels['listoptions'] = 'Nastavení stránkování';
 $labels['signatureoptions'] = 'Nastavení podpisu';
 $labels['whenreplying'] = 'Při odpovídání';
 $labels['replytopposting'] = 'začít novou zprávu nad původní';
@@ -376,6 +372,7 @@ $labels['reqmdn'] = 'Vždy požadovat doručenku';
 $labels['reqdsn'] = 'Vždy požádat o oznámení o stavu doručení';
 $labels['replysamefolder'] = 'Ukládat odpovědi ve stejné složce jako je zodpovězená zpráva';
 $labels['defaultaddressbook'] = 'Přidávat nové kontakty do seznamu kontaktů';
+$labels['autocompletesingle'] = 'Při doplňování adres přeskočit alternativní email.';
 $labels['spellcheckbeforesend'] = 'Před odesláním zkontrolovat pravopis';
 $labels['spellcheckoptions'] = 'Nastavení pravopisu';
 $labels['spellcheckignoresyms'] = 'Ignorovat slova obsahující symboly';
@@ -383,7 +380,6 @@ $labels['spellcheckignorenums'] = 'Ignorovat slova obsahující čísla';
 $labels['spellcheckignorecaps'] = 'Ignorovat slova psaná velkými písmeny';
 $labels['addtodict'] = 'Přidat do slovníku';
 $labels['folder'] = 'Složka';
-$labels['folders'] = 'Složky';
 $labels['foldername'] = 'Jméno složky';
 $labels['subscribed'] = 'Vybráno';
 $labels['messagecount'] = 'Počet zpráv';
@@ -406,6 +402,11 @@ $labels['sortby'] = 'Seřadit podle';
 $labels['sortasc'] = 'Seřadit vzestupně';
 $labels['sortdesc'] = 'Seřadit sestupně';
 $labels['undo'] = 'Vrátit zpět';
+$labels['plugin'] = 'Zásuvný modul';
+$labels['version'] = 'Verze';
+$labels['source'] = 'Zdroj';
+$labels['license'] = 'Licence';
+$labels['support'] = 'Podpora';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -429,4 +430,3 @@ $labels['japanese'] = 'Japonština';
 $labels['korean'] = 'Korejština';
 $labels['chinese'] = 'Čínština';
 
-?>
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index a05ef0a1f..2532f7ace 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/messages.inc                                              |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Martin Mrajca <martin@moonlake.cz>                            |
-|        joe <joe@humlak.cz>                                            |
-|        Jiri Kaderavek <jiri.kaderavek@webstep.net>                    |
-|        Ales Pospichal <ales@pospichalales.info>                       |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -131,7 +125,6 @@ $messages['smtpautherror'] = 'Chyba SMTP ($code): Chyba přihlášení';
 $messages['smtpfromerror'] = 'Chyba SMTP ($code): Nelze nastavit odesílatele "$from" ($msg)';
 $messages['smtptoerror'] = 'Chyba SMTP ($code): Nelze přidat příjemce "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Chyba SMTP: Nelze zpracovat seznam příjemců';
-$messages['smtpdsnerror'] = 'Chyba SMTP: Není podporováno oznamení o stavu doručení (DSN)';
 $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Příliš mnoho příjemců. Změňte počet příjemců na $max.';
@@ -161,5 +154,5 @@ $messages['foldercreated'] = 'Složka byla úspěšně vytvořena';
 $messages['invalidimageformat'] = 'Formát obrázku není podporován';
 $messages['mispellingsfound'] = 'Ve zprávě byly zjištěny pravopisné chyby';
 $messages['parentnotwritable'] = 'Nelze vytvořit/přesunout složku do vybrané rodičovské složky. Nemáte práva.';
+$messages['messagetoobig'] = 'Část zprávy je příliš velká pro zpracování.';
 
-?>
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index f3d521b9b..29e7286ee 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/cy_GB/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Dafydd Tomos <l10n@da.fydd.org>                               |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/cy_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -42,6 +42,7 @@ $labels['priority'] = 'Blaenoriaeth';
 $labels['organization'] = 'Enw\'r Sefydliad';
 $labels['readstatus'] = 'Statws darllen';
 $labels['mailboxlist'] = 'Ffolderi';
+$labels['folders'] = 'Ffolderi';
 $labels['messagesfromto'] = 'Negeseuon $from i $to o $count';
 $labels['threadsfromto'] = 'Edefau $from i $to o $count';
 $labels['messagenrof'] = 'Neges $nr o $count';
@@ -71,6 +72,7 @@ $labels['feb'] = 'Chwe';
 $labels['mar'] = 'Maw';
 $labels['apr'] = 'Ebr';
 $labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'Meh';
 $labels['jul'] = 'Gor';
 $labels['aug'] = 'Aws';
@@ -82,7 +84,6 @@ $labels['longjan'] = 'Ionawr';
 $labels['longfeb'] = 'Chwefror';
 $labels['longmar'] = 'Mawrth';
 $labels['longapr'] = 'Ebrill';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Mehefin';
 $labels['longjul'] = 'Gorffennaf';
 $labels['longaug'] = 'Awst';
@@ -117,7 +118,8 @@ $labels['markunflagged'] = 'Heb eu fflagio';
 $labels['moreactions'] = 'Mwy o weithredoedd...';
 $labels['select'] = 'Dewis';
 $labels['all'] = 'Popeth';
-$labels['none'] = 'Dim byd';
+$labels['none'] = 'Dim';
+$labels['nonesort'] = 'Dim';
 $labels['currpage'] = 'Tudalen gyfredol';
 $labels['unread'] = 'Heb eu darllen';
 $labels['flagged'] = 'Nodwyd';
@@ -137,7 +139,6 @@ $labels['expand_only_unread'] = 'dim ond gyda negeseuon heb eu darllen';
 $labels['fromto'] = 'Danfonwr/Derbynnydd';
 $labels['flag'] = 'Fflag';
 $labels['attachment'] = 'Atodiad';
-$labels['nonesort'] = 'Dim';
 $labels['sentdate'] = 'Dyddiad danfon';
 $labels['arrival'] = 'Dyddiad derbyn';
 $labels['asc'] = 'esgynnol';
@@ -149,7 +150,7 @@ $labels['listmode'] = 'Golwg rhestr';
 $labels['folderactions'] = 'Gweithredoedd ffolder...';
 $labels['compact'] = 'Crynhoi';
 $labels['empty'] = 'Gwagio';
-$labels['quota'] = 'Defnydd ';
+$labels['quota'] = 'Defnydd';
 $labels['unknown'] = 'anhysbys';
 $labels['unlimited'] = 'diderfyn';
 $labels['quicksearch'] = 'Chwiliad cyflym';
@@ -228,14 +229,15 @@ $labels['male'] = 'gwryw';
 $labels['female'] = 'benyw';
 $labels['manager'] = 'Rheolwr';
 $labels['assistant'] = 'Cynorthwyydd';
+$labels['typeassistant'] = 'Cynorthwyydd';
 $labels['spouse'] = 'Cymar';
 $labels['allfields'] = 'Pob maes';
 $labels['search'] = 'Chwilio';
 $labels['advsearch'] = 'Chwilio Uwch';
 $labels['other'] = 'Arall';
+$labels['typeother'] = 'Arall';
 $labels['typehome'] = 'Cartref';
 $labels['typework'] = 'Gwaith';
-$labels['typeother'] = 'Arall';
 $labels['typemobile'] = 'Symudol';
 $labels['typemain'] = 'Prif';
 $labels['typehomefax'] = 'Ffacs Adref';
@@ -243,7 +245,6 @@ $labels['typeworkfax'] = 'Ffacs Gwaith';
 $labels['typecar'] = 'Car';
 $labels['typepager'] = 'Peiriant Galw';
 $labels['typevideo'] = 'Fideo';
-$labels['typeassistant'] = 'Cynorthwyydd';
 $labels['typehomepage'] = 'Gwefan';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Proffil';
@@ -349,11 +350,11 @@ $labels['advancedoptions'] = 'Dewisiadau uwch';
 $labels['focusonnewmessage'] = 'Ffocysu\'r porwr ar y neges newydd';
 $labels['checkallfolders'] = 'Chwilio pob ffolder am negeseuon newydd';
 $labels['displaynext'] = 'Ar ôl dileu/symud neges dangos y neges nesaf';
+$labels['defaultfont'] = 'Ffont arferol ar gyfer negeseuon HTML';
 $labels['mainoptions'] = 'Prif Ddewisiadau';
 $labels['section'] = 'Adran';
 $labels['maintenance'] = 'Gwaith cynnal a chadw';
 $labels['newmessage'] = 'Neges Newydd';
-$labels['listoptions'] = 'Rhestru Dewisiadau';
 $labels['signatureoptions'] = 'Dewisiadau Llofnod';
 $labels['whenreplying'] = 'Wrth ateb';
 $labels['replytopposting'] = 'dechrau\'r neges newydd uwchben y neges wreiddiol';
@@ -380,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Anwybyddu geiriau gyda rhifau';
 $labels['spellcheckignorecaps'] = 'Anwybyddu geiriau sy\'n briflythrennau yn gyfangwbl';
 $labels['addtodict'] = 'Ychwanegu i\'r geiriadur';
 $labels['folder'] = 'Ffolder';
-$labels['folders'] = 'Ffolderi';
 $labels['foldername'] = 'Enw ffolder';
 $labels['subscribed'] = 'Tanysgrifwyd';
 $labels['messagecount'] = 'Negeseuon';
@@ -431,4 +431,3 @@ $labels['japanese'] = 'Japaneaidd';
 $labels['korean'] = 'Corëeg';
 $labels['chinese'] = 'Tsieineaidd';
 
-?>
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 51223011b..f4720d518 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/cy_GB/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Dafydd Tomos <l10n@da.fydd.org>                               |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/cy_GB/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -71,7 +71,7 @@ $messages['nonamewarning'] = 'Rhowch enw';
 $messages['nopagesizewarning'] = 'Rhowch maint tudalen';
 $messages['nosenderwarning'] = 'Rhowch gyfeiriad e-bost y danfonwr';
 $messages['norecipientwarning'] = 'Rhowch o leiaf un derbynnydd';
-$messages['nosubjectwarning'] = 'Mae\'r pennawd \"Pwnc\" yn wag. Hoffech chi roi un fewn nawr?';
+$messages['nosubjectwarning'] = 'Mae\'r pennawd "Pwnc" yn wag. Hoffech chi roi un fewn nawr?';
 $messages['nobodywarning'] = 'Danfon y neges hwn heb destun?';
 $messages['notsentwarning'] = 'Ni ddanfonwyd y neges. Hoffech chi gael gwared a\'r neges?';
 $messages['noldapserver'] = 'Dewiswch weinydd ldap i chwilio';
@@ -109,7 +109,7 @@ $messages['errorsendingreceipt'] = 'Methwyd danfon cadarnhad derbyn';
 $messages['nodeletelastidentity'] = 'Allwch chi ddim dileu\'r personoliaeth yma, hwn yw\'r un olaf.';
 $messages['forbiddencharacter'] = 'Mae enw\'r ffolder yn cynnwys llythyren annerbynniol';
 $messages['selectimportfile'] = 'Dewiswch ffeil i\'w lwytho fyny';
-$messages['addresswriterror'] = 'Nid yw\'n bosib ysgrifennu i\'r llyfr cyfeiriadau ';
+$messages['addresswriterror'] = 'Nid yw\'n bosib ysgrifennu i\'r llyfr cyfeiriadau';
 $messages['contactaddedtogroup'] = 'Ychwanegwyd y cysylltiadau i\'r grŵp yma yn llwyddiannus';
 $messages['contactremovedfromgroup'] = 'Dilëwyd y cysylltiadau o\'r grŵp yma yn llwyddiannus';
 $messages['importwait'] = 'Yn mewnforio, arhoswch os gwelwch yn dda...';
@@ -156,4 +156,3 @@ $messages['mispellingsfound'] = 'Gwelwyd camsillafu yn y neges.';
 $messages['parentnotwritable'] = 'Methwyd creu/symud ffolder i\'r ffolder rhiant ddewiswyd. Dim hawl mynediad.';
 $messages['messagetoobig'] = 'Mae darn y neges yn rhy fawr i\'w brosesu.';
 
-?>
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 11f9157e5..ac3849218 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -1,46 +1,34 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/da_DK/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Martin Moeller <martin@liga.dk>                               |
-|         Jesper R. Meyer <jrm@upthere.dk>                              |
-|         Søren Aggeboe <soren@aggeboe.dk>                              |
-|         John Loft Christiansen <john@nansensvej.dk>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
+ +-----------------------------------------------------------------------+
+ | localization/da_DK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
-
-// login page
 $labels['welcome'] = 'Velkommen til $product';
 $labels['username'] = 'Brugernavn';
 $labels['password'] = 'Adgangskode';
 $labels['server'] = 'Server';
 $labels['login'] = 'Log på';
-
-// Taskbar
 $labels['logout'] = 'Log af';
 $labels['mail'] = 'E-mail';
 $labels['settings'] = 'Personlige indstillinger';
 $labels['addressbook'] = 'Adressebog';
-
-// mailbox names
 $labels['inbox'] = 'Indbakke';
 $labels['drafts'] = 'Kladder';
 $labels['sent'] = 'Sendt post';
 $labels['trash'] = 'Skrald';
 $labels['junk'] = 'Ragelse';
-
-// message listing
 $labels['subject'] = 'Emne';
 $labels['from'] = 'Afsender';
 $labels['to'] = 'Modtager';
@@ -51,25 +39,20 @@ $labels['followupto'] = 'Følg-op til';
 $labels['date'] = 'Dato';
 $labels['size'] = 'Størrelse';
 $labels['priority'] = 'Prioritet';
-$labels['organization'] = 'Organisation';
+$labels['organization'] = 'Firma';
 $labels['readstatus'] = 'Læst status';
-
 $labels['mailboxlist'] = 'Mapper';
+$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Besked $from til $to af $count';
 $labels['threadsfromto'] = 'Tråd $from til $to af $count';
 $labels['messagenrof'] = 'Besked $nr af $count';
-
 $labels['copy'] = 'Kopier';
 $labels['move'] = 'Flyt';
 $labels['moveto'] = 'Flyt til...';
 $labels['download'] = 'Download';
-
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
-
 $labels['addtoaddressbook'] = 'Tilføj til adressebogen';
-
-// weekdays short
 $labels['sun'] = 'Søn';
 $labels['mon'] = 'Man';
 $labels['tue'] = 'Tir';
@@ -77,8 +60,6 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
-
-// weekdays long
 $labels['sunday'] = 'Søndag';
 $labels['monday'] = 'Mandag';
 $labels['tuesday'] = 'Tirsdag';
@@ -86,13 +67,12 @@ $labels['wednesday'] = 'Onsdag';
 $labels['thursday'] = 'Torsdag';
 $labels['friday'] = 'Fredag';
 $labels['saturday'] = 'Lørdag';
-
-// month short
 $labels['jan'] = 'Jan';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Maj';
+$labels['longmay'] = 'Maj';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -100,13 +80,10 @@ $labels['sep'] = 'Sep';
 $labels['oct'] = 'Okt';
 $labels['nov'] = 'Nov';
 $labels['dec'] = 'Dec';
-
-//months long
 $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
 $labels['longmar'] = 'Marts';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Maj';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'August';
@@ -114,17 +91,14 @@ $labels['longsep'] = 'September';
 $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
-
 $labels['today'] = 'I dag';
-
-// toolbar buttons
 $labels['checkmail'] = 'Se efter nye beskeder';
 $labels['writenewmessage'] = 'Skriv en ny besked';
 $labels['replytomessage'] = 'Svar på denne besked';
 $labels['replytoallmessage'] = 'Svar til alle modtagere';
 $labels['replyall'] = 'Svar alle';
 $labels['replylist'] = 'Svar til listen';
-$labels['forwardinline']    = 'Videresend';
+$labels['forwardinline'] = 'Videresend';
 $labels['forwardattachment'] = 'Videresend som vedhæftning';
 $labels['forwardmessage'] = 'Videresend denne besked';
 $labels['deletemessage'] = 'Slet besked';
@@ -142,11 +116,10 @@ $labels['markunread'] = 'Som ulæst';
 $labels['markflagged'] = 'Som markeret';
 $labels['markunflagged'] = 'Som umarkeret';
 $labels['moreactions'] = 'Flere funktioner...';
-$labels['messageactions'] = 'Flere funktioner...';
-
 $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
+$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Aktuel side';
 $labels['unread'] = 'Ulæste';
 $labels['flagged'] = 'Markeret';
@@ -160,14 +133,12 @@ $labels['expand-all'] = 'Udfold alle';
 $labels['expand-unread'] = 'Udfold ulæste';
 $labels['collapse-all'] = 'Fold alle';
 $labels['threaded'] = 'Trådet';
-
 $labels['autoexpand_threads'] = 'Udfold besked tråde';
 $labels['do_expand'] = 'alle tråde';
 $labels['expand_only_unread'] = 'kun dem med ulæste beskeder';
 $labels['fromto'] = 'Afsender/Modtager';
 $labels['flag'] = 'Flag';
 $labels['attachment'] = 'Vedhæftning';
-$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Sendt dato';
 $labels['arrival'] = 'Modtaget dato';
 $labels['asc'] = 'opstigende';
@@ -176,24 +147,18 @@ $labels['listcolumns'] = 'Vist kolonne';
 $labels['listsorting'] = 'Sorterings kolonne';
 $labels['listorder'] = 'Sorter efter';
 $labels['listmode'] = 'Listevisningsmode';
-
 $labels['folderactions'] = 'Mappe handlinger...';
 $labels['compact'] = 'Ryd op';
 $labels['empty'] = 'Tøm';
-
 $labels['quota'] = 'Disk forbrug';
 $labels['unknown'] = 'ukendt';
 $labels['unlimited'] = 'ubegrænset';
-
 $labels['quicksearch'] = 'Hurtigsøgning';
 $labels['resetsearch'] = 'Nulstil søgning';
 $labels['searchmod'] = 'Søgeparametere';
 $labels['msgtext'] = 'Hele beskeden';
-
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
-
-// message compose
 $labels['compose'] = 'Forfat en besked';
 $labels['editasnew'] = 'Redigér som ny';
 $labels['savemessage'] = 'Gem denne kladde';
@@ -205,56 +170,45 @@ $labels['returnreceipt'] = 'Anmod om kvittering';
 $labels['dsn'] = 'Notifikation om leveringstatus';
 $labels['mailreplyintro'] = 'Den $date, $sender skrev:';
 $labels['originalmessage'] = 'Original besked';
-
 $labels['editidents'] = 'Ret identiteter';
 $labels['checkspelling'] = 'Stavekontrol';
 $labels['resumeediting'] = 'Genoptag redigering';
 $labels['revertto'] = 'Vend tilbage til';
-
 $labels['attachments'] = 'Vedhæftninger';
 $labels['upload'] = 'Upload';
 $labels['uploadprogress'] = '$percent ($current af $total)';
 $labels['close'] = 'Luk';
 $labels['messageoptions'] = 'Besked muligheder...';
-
 $labels['low'] = 'Lav';
 $labels['lowest'] = 'Lavest';
 $labels['normal'] = 'Normal';
 $labels['high'] = 'Høj';
 $labels['highest'] = 'Højest';
-
 $labels['nosubject'] = '(intet emne)';
 $labels['showimages'] = 'Vis billeder';
 $labels['alwaysshow'] = 'Vis altid billeder fra $sender';
-$labels['isdraft']    = 'Dette er en kladde.';
-
+$labels['isdraft'] = 'Dette er en kladde.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Almindelig tekst';
 $labels['savesentmessagein'] = 'Gem afsendt besked i';
 $labels['dontsave'] = 'gem ikke';
 $labels['maxuploadsize'] = 'Maksimale tilladte filstørrelse er $size';
-
 $labels['addcc'] = 'Tilføj Cc';
 $labels['addbcc'] = 'Tilføj Bcc';
 $labels['addreplyto'] = 'Tilføj Svar-Til adresse';
 $labels['addfollowupto'] = 'Tilføj følg-op adresse';
-
-// mdn
 $labels['mdnrequest'] = 'Afsenderen af denne besked har bedt om at modtage en bekræftelse når du læser beskeden. Vil du sende kvittering for læsning?';
 $labels['receiptread'] = 'Send kvittering for læsning';
 $labels['yourmessage'] = 'Dette er en kvittering for at din besked er blevet vist';
 $labels['receiptnote'] = 'Bemærk: Denne kvittering bekræfter udelukkende at beskeden blev vist på modtagerens computer. Der er ingen garanti for at modtageren har læst eller forstået beskedens indhold.';
-
-// address book
 $labels['name'] = 'Vist navn';
 $labels['firstname'] = 'Fornavn';
 $labels['surname'] = 'Efternavn';
 $labels['middlename'] = 'Mellemnavn';
-$labels['nameprefix']   = 'Præfiks';
-$labels['namesuffix']   = 'Suffiks';
+$labels['nameprefix'] = 'Præfiks';
+$labels['namesuffix'] = 'Suffiks';
 $labels['nickname'] = 'Alias/Kaldenavn';
 $labels['jobtitle'] = 'Job titel';
-$labels['organization'] = 'Firma';
 $labels['department'] = 'Afdeling';
 $labels['gender'] = 'Køn';
 $labels['maidenname'] = 'Pigenavn';
@@ -275,34 +229,31 @@ $labels['male'] = 'Mand';
 $labels['female'] = 'Kvinde';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistent';
+$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Ægtefælle';
 $labels['allfields'] = 'Alle felter';
 $labels['search'] = 'Søg';
 $labels['advsearch'] = 'Avanceret søg';
 $labels['other'] = 'Andet';
-
-$labels['typehome']   = 'Hjem';
-$labels['typework']   = 'Arbejde';
-$labels['typeother']  = 'Andet';
-$labels['typemobile']  = 'Mobil';
-$labels['typemain']  = 'Fastnet';
-$labels['typehomefax']  = 'Hjemme fax';
-$labels['typeworkfax']  = 'Arbejde Fax';
-$labels['typecar']  = 'Bil';
-$labels['typepager']  = 'Personsøger';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistent';
-$labels['typehomepage']  = 'Hjemmeside';
+$labels['typeother'] = 'Andet';
+$labels['typehome'] = 'Hjem';
+$labels['typework'] = 'Arbejde';
+$labels['typemobile'] = 'Mobil';
+$labels['typemain'] = 'Fastnet';
+$labels['typehomefax'] = 'Hjemme fax';
+$labels['typeworkfax'] = 'Arbejde Fax';
+$labels['typecar'] = 'Bil';
+$labels['typepager'] = 'Personsøger';
+$labels['typevideo'] = 'Video';
+$labels['typehomepage'] = 'Hjemmeside';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
-
 $labels['addfield'] = 'Tilføj felt...';
 $labels['addcontact'] = 'Tilføj en ny kontakt';
 $labels['editcontact'] = 'Redigér kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontakt egenskaber';
 $labels['personalinfo'] = 'Personlig information';
-
 $labels['edit'] = 'Redigér';
 $labels['cancel'] = 'Afbryd';
 $labels['save'] = 'Gem';
@@ -310,7 +261,6 @@ $labels['delete'] = 'Slet';
 $labels['rename'] = 'Omdøb';
 $labels['addphoto'] = 'Tilføj';
 $labels['replacephoto'] = 'Erstat';
-
 $labels['newcontact'] = 'Opret nyt kontaktkort';
 $labels['deletecontact'] = 'Slet valgte kontakter';
 $labels['composeto'] = 'Skriv brev til';
@@ -319,21 +269,17 @@ $labels['print'] = 'Print';
 $labels['export'] = 'Eksport';
 $labels['exportvcards'] = 'Eksportér kontakter i vCard format';
 $labels['newcontactgroup'] = 'Opret ny kontaktgruppe';
-$labels['groupactions'] = 'Funktioner for kontaktgrupper...';
-$labels['groupdelete']    = 'Slet gruppe';
-
+$labels['grouprename'] = 'Omdøb gruppe';
+$labels['groupdelete'] = 'Slet gruppe';
 $labels['previouspage'] = 'Vis forrige sæt';
 $labels['firstpage'] = 'Vis første sæt';
 $labels['nextpage'] = 'Vis næste sæt';
 $labels['lastpage'] = 'Vis sidste sæt';
-
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Personlige Adresser';
-
 $labels['searchsave'] = 'Gem søgning';
 $labels['searchdelete'] = 'Slet søgning';
-
 $labels['import'] = 'Importér';
 $labels['importcontacts'] = 'Importér kontakter';
 $labels['importfromfile'] = 'Importér fra fil:';
@@ -341,21 +287,16 @@ $labels['importtarget'] = 'Tilføj nye kontakter til adressebogen:';
 $labels['importreplace'] = 'Overskriv hele adressebogen';
 $labels['importtext'] = 'Du kan uploade kontakter fra en eksisterende adressebog.Vi understøtter i øjeblikket import af adresser i vCard formatet.';
 $labels['done'] = 'Færdig';
-
-// settings
 $labels['settingsfor'] = 'Indstillinger for';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Præferencer';
 $labels['userpreferences'] = 'Brugerpræferencer';
 $labels['editpreferences'] = 'Redigér brugerpræferencer';
-
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Styr identiteterne for denne konto';
 $labels['newidentity'] = 'Ny identitet';
-
 $labels['newitem'] = 'Nyt punkt';
 $labels['edititem'] = 'Redigér punkt';
-
 $labels['preferhtml'] = 'Foretræk HTML';
 $labels['defaultcharset'] = 'Standard tegnkodning';
 $labels['htmlmessage'] = 'HTML-besked';
@@ -409,11 +350,11 @@ $labels['advancedoptions'] = 'Advancerede muligheder';
 $labels['focusonnewmessage'] = 'Fokusér browservindue når der kommer nye beskeder';
 $labels['checkallfolders'] = 'Tjek alle mapper for nye beskeder';
 $labels['displaynext'] = 'Efter slet/flyt besked, vis næste besked';
+$labels['defaultfont'] = 'Standard font ved HTML besked';
 $labels['mainoptions'] = 'Generelle indstillinger';
 $labels['section'] = 'Sektion';
 $labels['maintenance'] = 'Vedligeholdelse';
 $labels['newmessage'] = 'Ny besked';
-$labels['listoptions'] = 'Liste-indstillinger';
 $labels['signatureoptions'] = 'Signatur-indstillinger';
 $labels['whenreplying'] = 'Når der svares';
 $labels['replytopposting'] = 'start svar over originalen';
@@ -439,9 +380,7 @@ $labels['spellcheckignoresyms'] = 'Ignorer ord med symboler';
 $labels['spellcheckignorenums'] = 'Ignorer ord med tal';
 $labels['spellcheckignorecaps'] = 'Ignorer ord hvor alle bogstaver er versaler';
 $labels['addtodict'] = 'Tilføj til ordbog';
-
 $labels['folder'] = 'Mappe';
-$labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenavn';
 $labels['subscribed'] = 'Abonneret';
 $labels['messagecount'] = 'Beskeder';
@@ -457,28 +396,22 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Klik for at hente mappestørrelse';
 $labels['changesubscription'] = 'Klik for at ændre abonnement';
 $labels['foldertype'] = 'Mappe Type';
-$labels['personalfolder']  = 'Privat mappe';
-$labels['otherfolder']  = 'Anden brugers mappe';
-$labels['sharedfolder']  = 'Offentlig mappe';
-
+$labels['personalfolder'] = 'Privat mappe';
+$labels['otherfolder'] = 'Anden brugers mappe';
+$labels['sharedfolder'] = 'Offentlig mappe';
 $labels['sortby'] = 'Sortér efter';
 $labels['sortasc'] = 'Ældste først';
 $labels['sortdesc'] = 'Nyeste først';
 $labels['undo'] = 'Fortryd';
-
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'Kilde';
 $labels['license'] = 'Licens';
 $labels['support'] = 'Få support';
-
-// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
-
-// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Vestlig europæisk';
@@ -498,4 +431,3 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
-?>
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index d907598d7..d81755150 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/da_DK/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author : Martin Moeller <martin@liga.dk>                              |
-|         Jesper R. Meyer <jesper@upthere.dk>                           |
-|         Søren Aggeboe <soren@aggeboe.dk>                              |
-|         John Loft Christiansen <john@nansensvej.dk>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
+ +-----------------------------------------------------------------------+
+ | localization/da_DK/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: John Loft Christiansen <Unknown>                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -59,7 +55,7 @@ $messages['errorcopying'] = 'Beskeden kunne ikke kopieres';
 $messages['errordeleting'] = 'Beskeden kunne ikke slettes';
 $messages['errormarking'] = 'Beskeden kunne ikke markeres';
 $messages['deletecontactconfirm'] = 'Vil du virkelig slette den/de valgte kontakt(er)?';
-$messages['deletegroupconfirm']  = 'Vil du virkelig slette den/de valgte gruppe(r)?';
+$messages['deletegroupconfirm'] = 'Vil du virkelig slette den/de valgte gruppe(r)?';
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette den/de valgte besked(er)?';
 $messages['deletefolderconfirm'] = 'Vil du virkelig slette den valgte mappe';
 $messages['purgefolderconfirm'] = 'Vil du virkelig slette alle beskeder i denne mappe?';
@@ -79,10 +75,10 @@ $messages['nosubjectwarning'] = '\'Emne\'-feltet er tomt. Kunne du tænke dig at
 $messages['nobodywarning'] = 'Send denne besked uden tekst?';
 $messages['notsentwarning'] = 'Beskeden er ikke blevet sendt. Vil du kassere din besked?';
 $messages['noldapserver'] = 'Vælg venligst hvilken LDAP-server der skal søges i';
-$messages['nocontactsreturned'] = 'Ingen kontakter blev fundet';
 $messages['nosearchname'] = 'Indtast venligst en kontakts navn eller e-mail adresse';
 $messages['notuploadedwarning'] = 'Ikke alle vedhæftede filer er blevet uploadet endnu. Vent venligst eller afbryd upload.';
 $messages['searchsuccessful'] = 'Fandt $nr beskeder';
+$messages['contactsearchsuccessful'] = '$nr afsendere fundet';
 $messages['searchnomatch'] = 'Søgningen fandt ingen beskeder';
 $messages['searching'] = 'Søger...';
 $messages['checking'] = 'Tjekker...';
@@ -158,6 +154,5 @@ $messages['foldercreated'] = 'Mappen er oprettet';
 $messages['invalidimageformat'] = 'Ikke et gyldigt billedformat';
 $messages['mispellingsfound'] = 'Der er fundet stavefejl i beskeden.';
 $messages['parentnotwritable'] = 'Kan ikke oprette/flytte mappe ind i valgt mappe. Ingen adgangsrettigheder.';
-$messages['messagetoobig'] = 'Besked delen er for stor til at behandle.';
+$messages['messagetoobig'] = 'Denne del af beskeden er for stor til at blive behandlet.';
 
-?>
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 457a76a5f..c8a593112 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/de_CH/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:      Thomas Bruederli <roundcube@gmail.com>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -45,6 +42,7 @@ $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
 $labels['mailboxlist'] = 'Ordner';
+$labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
 $labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
 $labels['messagenrof'] = 'Nachricht $nr von $count';
@@ -74,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mär';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -85,7 +84,6 @@ $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
 $labels['longmar'] = 'März';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'August';
@@ -117,10 +115,11 @@ $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
 $labels['markflagged'] = 'Stern hinzufügen';
 $labels['markunflagged'] = 'Stern entfernen';
-$labels['messageactions'] = 'Weitere Aktionen...';
+$labels['moreactions'] = 'Mehr ...';
 $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
+$labels['nonesort'] = 'Keine';
 $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
@@ -140,7 +139,6 @@ $labels['expand_only_unread'] = 'nur ungelesene';
 $labels['fromto'] = 'Sender/Empfänger';
 $labels['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
-$labels['nonesort'] = 'Keine';
 $labels['sentdate'] = 'Sendedatum';
 $labels['arrival'] = 'Empfangsdatum';
 $labels['asc'] = 'aufsteigend';
@@ -171,6 +169,7 @@ $labels['editortype'] = 'Editor-Typ';
 $labels['returnreceipt'] = 'Empfangsbestätigung (MDN)';
 $labels['dsn'] = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
+$labels['originalmessage'] = 'Originalnachricht';
 $labels['editidents'] = 'Absender bearbeiten';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
@@ -188,6 +187,7 @@ $labels['highest'] = 'Höchste';
 $labels['nosubject'] = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
+$labels['isdraft'] = 'Dies ist ein Entwurf';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Klartext';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
@@ -228,15 +228,16 @@ $labels['notes'] = 'Notizen';
 $labels['male'] = 'männlich';
 $labels['female'] = 'weiblich';
 $labels['manager'] = 'Vorgesetzte/r';
-$labels['assistant'] = 'Assistent/in';
+$labels['assistant'] = 'Assistent';
+$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Erweiterte Suche';
 $labels['other'] = 'Andere';
+$labels['typeother'] = 'Andere';
 $labels['typehome'] = 'Zuhause';
 $labels['typework'] = 'Arbeit';
-$labels['typeother'] = 'Andere';
 $labels['typemobile'] = 'Mobiltelefon';
 $labels['typemain'] = 'Hauptnummer';
 $labels['typehomefax'] = 'Fax Zuhause';
@@ -244,8 +245,9 @@ $labels['typeworkfax'] = 'Fax Arbeit';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistent';
 $labels['typehomepage'] = 'Homepage';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Feld hinzufügen...';
 $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
@@ -267,7 +269,6 @@ $labels['print'] = 'Drucken';
 $labels['export'] = 'Exportieren';
 $labels['exportvcards'] = 'Kontakte im vCard-Format exportieren';
 $labels['newcontactgroup'] = 'Neue Adressgruppe erstellen';
-$labels['groupactions'] = 'Aktionen für Kontaktgruppen...';
 $labels['grouprename'] = 'Gruppe umbenennen';
 $labels['groupdelete'] = 'Gruppe löschen';
 $labels['previouspage'] = 'Eine Seite zurück';
@@ -277,6 +278,8 @@ $labels['lastpage'] = 'Letzte Seite';
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppen';
 $labels['personaladrbook'] = 'Persönliches Adressbuch';
+$labels['searchsave'] = 'Suche speichern';
+$labels['searchdelete'] = 'Suche löschen';
 $labels['import'] = 'Importieren';
 $labels['importcontacts'] = 'Adressen importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
@@ -347,11 +350,11 @@ $labels['advancedoptions'] = 'Erweiterte Einstellungen';
 $labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
 $labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prüfen';
 $labels['displaynext'] = 'Zeige nächste Nachricht nach verschieben/löschen';
+$labels['defaultfont'] = 'Standardschrift in HTML-Nachrichten';
 $labels['mainoptions'] = 'Allgemein';
 $labels['section'] = 'Bereich';
 $labels['maintenance'] = 'Wartung';
 $labels['newmessage'] = 'Neue Nachrichten';
-$labels['listoptions'] = 'Listendarstellung';
 $labels['signatureoptions'] = 'Signatur';
 $labels['whenreplying'] = 'Beantworten einer Nachricht';
 $labels['replytopposting'] = 'Antwort über der Originalnachricht';
@@ -370,9 +373,14 @@ $labels['reqmdn'] = 'Empfangsbestätigung (MSN) immer anfordern';
 $labels['reqdsn'] = 'Übermittlungsbestätigung (DSN) immer anfordern';
 $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern';
 $labels['defaultaddressbook'] = 'Neue Kontakte speichern in';
+$labels['autocompletesingle'] = 'Keine alternativen E-Mail-Adressen in Autovervollständigung';
 $labels['spellcheckbeforesend'] = 'Rechtscheibung vor dem Senden prüfen';
+$labels['spellcheckoptions'] = 'Rechtschreibprüfungsoptionen';
+$labels['spellcheckignoresyms'] = 'Wörter mit Symbolen überspringen';
+$labels['spellcheckignorenums'] = 'Wörter mit Ziffern überspringen';
+$labels['spellcheckignorecaps'] = 'Wörter überspringen, die nur aus Grossbuchstaben bestehen';
+$labels['addtodict'] = 'Zum Wörterbuch hinzufügen';
 $labels['folder'] = 'Ordner';
-$labels['folders'] = 'Ordner';
 $labels['foldername'] = 'Ordnername';
 $labels['subscribed'] = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
@@ -423,4 +431,3 @@ $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
 
-?>
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 151fe2593..8d1001651 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/de_CH/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Thomas Bruederli <roundcube@gmail.com>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -62,6 +59,7 @@ $messages['deletegroupconfirm'] = 'Wollen Sie die gewählte Gruppe wirklich lös
 $messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
 $messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
 $messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
+$messages['contactdeleting'] = 'Lösche Kontakt(e)...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
 $messages['folderdeleting'] = 'Lösche Ordner...';
 $messages['foldermoving'] = 'Verschiebe Ordner...';
@@ -77,10 +75,10 @@ $messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt e
 $messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
 $messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
-$messages['nocontactsreturned'] = 'Es wurden keine Kontakte gefunden';
 $messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
 $messages['notuploadedwarning'] = 'Es wurden noch nicht alle Dateien hochgeladen. Bitte warten oder Upload abbrechen.';
 $messages['searchsuccessful'] = '$nr Nachrichten gefunden';
+$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden';
 $messages['searchnomatch'] = 'Die Suche lieferte keine Treffer';
 $messages['searching'] = 'Suche...';
 $messages['checking'] = 'Prüfe...';
@@ -127,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlg
 $messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg)';
 $messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden';
-$messages['smtpdsnerror'] = 'SMTP-Fehler: Übermittlungsbestätigungen werden nicht unterstützt';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger angegeben. Reduzieren Sie die Empfängeradressen auf $max.';
@@ -140,11 +137,16 @@ $messages['contactrestored'] = 'Kontakte erfolgreich wiederhergestellt.';
 $messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht';
 $messages['grouprenamed'] = 'Gruppe erlogreich umbenannt';
 $messages['groupcreated'] = 'Gruppe erlogreich erstellt';
+$messages['savedsearchdeleted'] = 'Suche erfolgreich gelöscht';
+$messages['savedsearchdeleteerror'] = 'Suche konnte nicht gelöscht werden';
+$messages['savedsearchcreated'] = 'Suche erfolgreich gespeichert';
+$messages['savedsearchcreateerror'] = 'Suche konnte nicht gespeichert werden';
 $messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht';
 $messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben';
 $messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert';
 $messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert';
 $messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein';
+$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein';
 $messages['namecannotbeempty'] = 'Der Name darf nicht leer sein';
 $messages['nametoolong'] = 'Der Name ist zu lang';
 $messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert';
@@ -152,5 +154,5 @@ $messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt';
 $messages['invalidimageformat'] = 'Ungültiges Bildformat';
 $messages['mispellingsfound'] = 'Es wurden noch Rechtschreibfehler in der Nachricht gefunden.';
 $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben. Keine Berechtigung.';
+$messages['messagetoobig'] = 'Die Nachricht ist zu gross, um verarbeitet zu werden';
 
-?>
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 97bc77c71..17ac78244 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/de_DE/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:      Thomas Bruederli <roundcube@gmail.com>                   |
-| Author: Marcel Schlesinger <info@marcel-schlesinger.de>               |
-| Author: Roland Liebl <myroundcube@mail4us.net>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Daniel Winzen <d@winzen4.de>                                  |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,13 +42,14 @@ $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
 $labels['mailboxlist'] = 'Ordner';
+$labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
 $labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
 $labels['messagenrof'] = 'Nachricht $nr von $count';
 $labels['copy'] = 'Kopieren';
 $labels['move'] = 'Verschieben';
 $labels['moveto'] = 'Verschieben nach...';
-$labels['download'] = 'Download';
+$labels['download'] = 'Herunterladen';
 $labels['filename'] = 'Dateiname';
 $labels['filesize'] = 'Dateigröße';
 $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
@@ -76,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mär';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -87,7 +84,6 @@ $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
 $labels['longmar'] = 'März';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'August';
@@ -99,7 +95,7 @@ $labels['today'] = 'Heute';
 $labels['checkmail'] = 'Auf neue Nachrichten überprüfen';
 $labels['writenewmessage'] = 'Neue Nachricht schreiben';
 $labels['replytomessage'] = 'Antwort verfassen';
-$labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger verfassen';
+$labels['replytoallmessage'] = 'Antwort an Mailingliste oder an Absender und alle Empfänger verfassen';
 $labels['replyall'] = 'Allen antworten';
 $labels['replylist'] = 'Liste antworten';
 $labels['forwardinline'] = 'innerhalb der Nachricht';
@@ -119,10 +115,11 @@ $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
 $labels['markflagged'] = 'Stern hinzufügen';
 $labels['markunflagged'] = 'Stern entfernen';
-$labels['moreactions'] = 'Mehr ...';
-$labels['select'] = 'Auswählen';
+$labels['moreactions'] = 'Mehr...';
+$labels['select'] = 'Auswahl';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
+$labels['nonesort'] = 'Keine';
 $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
@@ -142,7 +139,6 @@ $labels['expand_only_unread'] = 'nur ungelesene';
 $labels['fromto'] = 'Sender/Empfänger';
 $labels['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
-$labels['nonesort'] = 'Keine';
 $labels['sentdate'] = 'Sendedatum';
 $labels['arrival'] = 'Empfangsdatum';
 $labels['asc'] = 'aufsteigend';
@@ -191,6 +187,7 @@ $labels['highest'] = 'Höchste';
 $labels['nosubject'] = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
+$labels['isdraft'] = 'Dies ist ein Entwurf';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Nur-Text';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
@@ -231,15 +228,16 @@ $labels['notes'] = 'Notizen';
 $labels['male'] = 'männlich';
 $labels['female'] = 'weiblich';
 $labels['manager'] = 'Vorgesetze(r)';
-$labels['assistant'] = 'Assistent';
+$labels['assistant'] = 'Assistenz';
+$labels['typeassistant'] = 'Assistenz';
 $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Detaillierte Suche';
-$labels['other'] = 'Sonstiges';
+$labels['other'] = 'Andere';
+$labels['typeother'] = 'Andere';
 $labels['typehome'] = 'Privat';
 $labels['typework'] = 'Dienstlich';
-$labels['typeother'] = 'Andere';
 $labels['typemobile'] = 'Mobil';
 $labels['typemain'] = 'Hauptnummer';
 $labels['typehomefax'] = 'Fax Privat';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Fax Dienst';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistenz';
 $labels['typehomepage'] = 'Internet';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
@@ -271,7 +268,7 @@ $labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
 $labels['print'] = 'Drucken';
 $labels['export'] = 'Exportieren';
 $labels['exportvcards'] = 'Kontakte im vCard-Format exportieren';
-$labels['newcontactgroup'] = 'Neue Kontaktgruppen erstellen';
+$labels['newcontactgroup'] = 'Neue Kontaktgruppe erstellen';
 $labels['grouprename'] = 'Gruppe umbenennen';
 $labels['groupdelete'] = 'Gruppe löschen';
 $labels['previouspage'] = 'Seite zurück';
@@ -291,6 +288,7 @@ $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
 $labels['importtext'] = 'Sie können Kontakte aus einem bestehenden Adressbuch hochladen. Zur Zeit können Adressbücher im vCard-Format importiert werden.';
 $labels['done'] = 'Fertig';
 $labels['settingsfor'] = 'Einstellungen für';
+$labels['about'] = 'Über';
 $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Benutzereinstellungen bearbeiten';
@@ -344,19 +342,19 @@ $labels['immediately'] = 'sofort';
 $labels['messagesdisplaying'] = 'Nachrichtendarstellung';
 $labels['messagescomposition'] = 'Nachrichtenerstellung';
 $labels['mimeparamfolding'] = 'Namen der Dateianhänge';
-$labels['2231folding'] = 'Vollständig RFC 2231 kompatibel (Thunderbird)';
+$labels['2231folding'] = 'vollständig RFC 2231 kompatibel (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 kompatibel (Microsoft Outlook)';
-$labels['2047folding'] = 'Vollständig RFC 2047 kompatibel (andere)';
+$labels['2047folding'] = 'vollständig RFC 2047 kompatibel (andere)';
 $labels['force7bit'] = 'MIME-Kodierung für 8-bit Zeichen';
 $labels['advancedoptions'] = 'Erweiterte Einstellungen';
 $labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
 $labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prüfen';
 $labels['displaynext'] = 'Zeige nächste Nachricht nach verschieben/löschen';
+$labels['defaultfont'] = 'Standard Schrift von HTML Nachrichten';
 $labels['mainoptions'] = 'Allgemein';
 $labels['section'] = 'Bereich';
 $labels['maintenance'] = 'Wartung';
-$labels['newmessage'] = 'Neue Nachrichten';
-$labels['listoptions'] = 'Listendarstellung';
+$labels['newmessage'] = 'Neue Nachricht';
 $labels['signatureoptions'] = 'Signatur';
 $labels['whenreplying'] = 'Beantworten einer Nachricht';
 $labels['replytopposting'] = 'Antwort über der Originalnachricht';
@@ -375,6 +373,7 @@ $labels['reqmdn'] = 'Empfangsbestätigung (MSN) immer anfordern';
 $labels['reqdsn'] = 'Übermittlungsbestätigung (DSN) immer anfordern';
 $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern';
 $labels['defaultaddressbook'] = 'Neue Kontakte zum ausgewählten Adressbuch hinzufügen';
+$labels['autocompletesingle'] = 'Alternative E-Mailadressen bei der Auto-Vervollständigung nicht berücksichtigen';
 $labels['spellcheckbeforesend'] = 'Rechtschreibprüfung vor dem Absenden der Nachricht';
 $labels['spellcheckoptions'] = 'Rechtschreibprüfungsoptionen';
 $labels['spellcheckignoresyms'] = 'Wörter mit Symbolen überspringen';
@@ -382,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Wörter mit Ziffern überspringen';
 $labels['spellcheckignorecaps'] = 'Wörter überspringen, die nur aus Großbuchstaben bestehen';
 $labels['addtodict'] = 'Zum Wörterbuch hinzufügen';
 $labels['folder'] = 'Ordner';
-$labels['folders'] = 'Ordner';
 $labels['foldername'] = 'Ordnername';
 $labels['subscribed'] = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
@@ -405,6 +403,11 @@ $labels['sortby'] = 'Sortieren nach';
 $labels['sortasc'] = 'Aufsteigend sortieren';
 $labels['sortdesc'] = 'Absteigend sortieren';
 $labels['undo'] = 'Rückgängig machen';
+$labels['plugin'] = 'Erweiterung';
+$labels['version'] = 'Version';
+$labels['source'] = 'Quellcode';
+$labels['license'] = 'Lizenz';
+$labels['support'] = 'Support';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -428,4 +431,3 @@ $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
 
-?>
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 13856856f..1b06e9bec 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -1,39 +1,34 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/de_DE/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Thomas Bruederli <roundcube@gmail.com>                        |
-| Author: Marcel Schlesinger <info@marcel-schlesinger.de>               |
-| Author: Roland Liebl <myroundcube@mail4us.net>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: akn <Unknown>                                                 |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Anmeldung fehlgeschlagen';
-$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
-$messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
-$messages['imaperror'] = 'Keine Verbindung zum IMAP Server';
+$messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
+$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
+$messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
+$messages['imaperror'] = 'Keine Verbindung zum IMAP Server.';
 $messages['servererror'] = 'Serverfehler!';
 $messages['servererrormsg'] = 'Serverfehler: $msg';
 $messages['dberror'] = 'Datenbankfehler!';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
-$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
-$messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
-$messages['mailboxempty'] = 'Ordner ist leer';
-$messages['loading'] = 'Daten werden geladen...';
+$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner.';
+$messages['loggedout'] = 'Sie haben Ihre Sitzung erfolgreich beendet. Auf Wiedersehen!';
+$messages['mailboxempty'] = 'Ordner ist leer.';
+$messages['loading'] = 'Lädt…';
 $messages['uploading'] = 'Datei wird hochgeladen...';
 $messages['uploadingmany'] = 'Dateien werden hochgeladen...';
 $messages['loadingdata'] = 'Daten werden geladen...';
@@ -42,65 +37,66 @@ $messages['sendingmessage'] = 'Nachricht wird gesendet...';
 $messages['messagesent'] = 'Nachricht erfolgreich gesendet';
 $messages['savingmessage'] = 'Nachricht wird gespeichert...';
 $messages['messagesaved'] = 'Nachricht als Entwurf gespeichert';
-$messages['successfullysaved'] = 'Erfolgreich gespeichert';
-$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt';
-$messages['contactexists'] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
+$messages['successfullysaved'] = 'Erfolgreich gespeichert.';
+$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt.';
+$messages['contactexists'] = 'Es existiert bereits ein Kontakt mit dieser E-Mail-Adresse.';
 $messages['contactnameexists'] = 'Ein Kontakt mit demselben Namen existiert bereits.';
 $messages['blockedimages'] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
-$messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden.';
-$messages['nocontactsfound'] = 'Keine Kontakte gefunden';
-$messages['contactnotfound'] = 'Der angeforderte Kontakt wurde nicht gefunden';
-$messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden';
-$messages['sendingfailed'] = 'Versenden der Nachricht fehlgeschlagen';
-$messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht';
-$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten';
-$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
-$messages['errormoving'] = 'Nachricht konnte nicht verschoben werden';
-$messages['errorcopying'] = 'Konnte Nachrichten nicht kopieren';
-$messages['errordeleting'] = 'Nachricht konnte nicht gelöscht werden';
-$messages['errormarking'] = 'Nachricht konnte nicht markiert werden';
+$messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigtwerden.';
+$messages['nocontactsfound'] = 'Keine Kontakte gefunden.';
+$messages['contactnotfound'] = 'Der angeforderte Kontakt wurde nicht gefunden.';
+$messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden.';
+$messages['sendingfailed'] = 'Versenden der Nachricht fehlgeschlagen.';
+$messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht.';
+$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten.';
+$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten.';
+$messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
+$messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
+$messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
+$messages['errormarking'] = 'Nachricht(en) konnte(n) nicht markiert werden.';
 $messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
 $messages['deletegroupconfirm'] = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
 $messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
 $messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
 $messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
+$messages['contactdeleting'] = 'Lösche Kontakt(e)...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
 $messages['folderdeleting'] = 'Lösche Ordner...';
 $messages['foldermoving'] = 'Verschiebe Ordner...';
 $messages['foldersubscribing'] = 'Abonniere Ordner...';
 $messages['folderunsubscribing'] = 'Ordner abbstellen...';
-$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
-$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
-$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein';
-$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an';
-$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an';
-$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an';
+$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt.';
+$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein.';
+$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein.';
+$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an.';
+$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an.';
+$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an.';
 $messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
 $messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
-$messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
-$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
+$messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus.';
+$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein.';
 $messages['notuploadedwarning'] = 'Es wurden noch nicht alle Dateien hochgeladen. Bitte warten oder Upload abbrechen.';
-$messages['searchsuccessful'] = '$nr Nachrichten gefunden';
-$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden';
-$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer';
+$messages['searchsuccessful'] = '$nr Nachrichten gefunden.';
+$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden.';
+$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer.';
 $messages['searching'] = 'Suche...';
 $messages['checking'] = 'Prüfe...';
-$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden';
-$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
-$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert';
-$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt';
-$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht';
-$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt';
-$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht';
+$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden.';
+$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht.';
+$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert.';
+$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt.';
+$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht.';
+$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt.';
+$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht.';
 $messages['converting'] = 'Entferne Formatierungen...';
-$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
-$messages['fileuploaderror'] = 'Hochladen der Datei fehlgeschlagen';
-$messages['filesizeerror'] = 'Die hochzuladende Datei überschreitet die Maximalgröße von $size';
-$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert';
-$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden';
-$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden';
-$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden';
+$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden.';
+$messages['fileuploaderror'] = 'Hochladen der Datei fehlgeschlagen.';
+$messages['filesizeerror'] = 'Die hochzuladende Datei überschreitet die Maximalgröße von $size.';
+$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert.';
+$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden.';
+$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden.';
+$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden.';
 $messages['movingmessage'] = 'Die E-Mail wird verschoben...';
 $messages['copyingmessage'] = 'Kopiere Nachrichten...';
 $messages['copyingcontact'] = 'Kontakte werden kopiert...';
@@ -108,55 +104,55 @@ $messages['deletingmessage'] = 'Lösche Nachricht(en)...';
 $messages['markingmessage'] = 'Markiere Nachricht(en)...';
 $messages['addingmember'] = 'Füge Kontakte der Gruppe hinzu...';
 $messages['removingmember'] = 'Entferne Kontakte von der Gruppe...';
-$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet';
-$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
+$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet.';
+$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden.';
 $messages['nodeletelastidentity'] = 'Diese Identität kann nicht gelöscht werden, da dies die letzte ist.';
-$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen';
-$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus';
-$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden';
-$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt';
-$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt';
+$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen.';
+$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus.';
+$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden.';
+$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.';
+$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
 $messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
-$messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert</b>';
-$messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen</b>';
+$messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert.</b>';
+$messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen.</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
-$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität';
+$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität.';
 $messages['editorwarning'] = 'Beim Wechseln in den Texteditor gehen alle Textformatierungen verloren. Möchten Sie fortfahren?';
 $messages['httpreceivedencrypterror'] = 'Ein fataler Konfigurationsfehler ist aufgetreten. Kontaktieren Sie bitte sofort Ihren Administrator. <b>Ihre Nachricht konnte nicht versendet werden.</b>';
-$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen';
-$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen';
-$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg)';
-$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden';
+$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen.';
+$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen.';
+$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg).';
+$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden.';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger. Reduzieren Sie die Anzahl Empfängeradressen auf $max.';
-$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max';
-$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie den Vorgang erneut.';
-$messages['contactdelerror'] = 'Fehler beim Löschen';
-$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht';
-$messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen';
+$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
+$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen es erneut.';
+$messages['contactdelerror'] = 'Fehler beim Löschen.';
+$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
+$messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen.';
 $messages['contactrestored'] = 'Kontakte erfolgreich wiederhergestellt.';
-$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht';
-$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt';
-$messages['groupcreated'] = 'Gruppe erlogreich erstellt';
-$messages['savedsearchdeleted'] = 'Suchergebnisse erfolgreich gelöscht';
-$messages['savedsearchdeleteerror'] = 'Suchergebnisse konnten nicht gelöscht werden';
-$messages['savedsearchcreated'] = 'Suchergebnisse wurden erfolgreich wiederherstellt';
-$messages['savedsearchcreateerror'] = 'Suchergebnisse konnten nicht wiederhergestellt werden';
-$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht';
-$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben';
-$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert';
-$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert';
-$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein';
-$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein';
-$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein';
-$messages['nametoolong'] = 'Der Name ist zu lang';
-$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert';
-$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt';
-$messages['invalidimageformat'] = 'Kein gültiges Bildformat';
+$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht.';
+$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt.';
+$messages['groupcreated'] = 'Gruppe erlogreich erstellt.';
+$messages['savedsearchdeleted'] = 'Suchergebnisse erfolgreich gelöscht.';
+$messages['savedsearchdeleteerror'] = 'Suchergebnisse konnten nicht gelöscht werden.';
+$messages['savedsearchcreated'] = 'Suchergebnisse wurden erfolgreich wiederherstellt.';
+$messages['savedsearchcreateerror'] = 'Suchergebnisse konnten nicht wiederhergestellt werden.';
+$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht.';
+$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben.';
+$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert.';
+$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert.';
+$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein.';
+$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein.';
+$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein.';
+$messages['nametoolong'] = 'Der Name ist zu lang.';
+$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert.';
+$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt.';
+$messages['invalidimageformat'] = 'Kein gültiges Bildformat.';
 $messages['mispellingsfound'] = 'Es wurden noch Rechtschreibfehler in der Nachricht gefunden.';
 $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben. Keine Berechtigung.';
+$messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
 
-?>
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index b6513fa99..aa1835f2f 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/el/labels.inc                                                |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Jim Deves <jim@cobaltblue.gr>                                 |
-|         John Economou <hsoc@irc.gr>                                   |
-|         Panagiotis Christias <p.christias@noc.ntua.gr>                |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/el_GR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,17 +39,15 @@ $labels['date'] = 'Ημ/νία';
 $labels['size'] = 'Μέγεθος';
 $labels['priority'] = 'Πρoτεραιότητα';
 $labels['organization'] = 'Οργανισμός';
-$labels['reply-to'] = 'Απάντηση σε';
 $labels['mailboxlist'] = 'Φάκελοι';
+$labels['folders'] = 'Φάκελοι';
 $labels['messagesfromto'] = 'Μηνύματα $from από $to έως $count';
 $labels['messagenrof'] = 'Μήνυμα $nr από $count';
+$labels['copy'] = 'Αντίγραφο';
 $labels['moveto'] = 'μετακίνηση σε...';
 $labels['download'] = 'λήψη';
 $labels['filename'] = 'Όνομα αρχείου';
 $labels['filesize'] = 'Μέγεθος αρχείου';
-$labels['preferhtml'] = 'Προτίμηση HTML';
-$labels['htmlmessage'] = 'Μήνυμα HTML';
-$labels['prettydate'] = 'Όμορφη ημ/νία';
 $labels['addtoaddressbook'] = 'Προσθήκη στις Επαφές';
 $labels['sun'] = 'Κυρ';
 $labels['mon'] = 'Δευτ';
@@ -74,7 +67,8 @@ $labels['jan'] = 'Ιαν';
 $labels['feb'] = 'Φεβ';
 $labels['mar'] = 'Μαρ';
 $labels['apr'] = 'Απρ';
-$labels['may'] = 'Μαι';
+$labels['may'] = 'Μάιος';
+$labels['longmay'] = 'Μάιος';
 $labels['jun'] = 'Ιον';
 $labels['jul'] = 'Ιολ';
 $labels['aug'] = 'Αυγ';
@@ -86,7 +80,6 @@ $labels['longjan'] = 'Ιανουάριος';
 $labels['longfeb'] = 'Φεβρουάριος';
 $labels['longmar'] = 'Μάρτιος';
 $labels['longapr'] = 'Απρίλιος';
-$labels['longmay'] = 'Μάιος';
 $labels['longjun'] = 'Ιούνιος';
 $labels['longjul'] = 'Ιούλιος';
 $labels['longaug'] = 'Αύγουστος';
@@ -104,13 +97,9 @@ $labels['deletemessage'] = 'Διαγραφή μηνύματος';
 $labels['movemessagetotrash'] = 'Μετακίνηση μηνύματος στον Κάδο';
 $labels['printmessage'] = 'Εκτύπωση';
 $labels['previousmessage'] = 'Εμφάνιση προηγούμενου μηνύματος';
-$labels['previousmessages'] = 'Εμφάνιση προηγούμενης ομάδας μηνυμάτων';
 $labels['firstmessage'] = 'Εμφάνιση πρώτου μηνύματος';
-$labels['firstmessages'] = 'Εμφάνιση πρώτης ομάδας μηνυμάτων';
 $labels['nextmessage'] = 'Εμφάνιση επόμενου μηνύματος';
-$labels['nextmessages'] = 'Εμφάνιση επόμενης ομάδας μηνυμάτων';
 $labels['lastmessage'] = 'Εμφάνιση τελευταίου μηνύματος';
-$labels['lastmessages'] = 'Εμφάνιση τελευταίας ομάδας μηνυμάτων';
 $labels['backtolist'] = 'Επιστροφή στη λίστα μηνυμάτων';
 $labels['viewsource'] = 'Προβολή πηγαίου κώδικα';
 $labels['markmessages'] = 'Σήμανση μηνυμάτων';
@@ -118,10 +107,10 @@ $labels['markread'] = 'ως αναγνωσμένα';
 $labels['markunread'] = 'ως μη-αναγνωσμένα';
 $labels['markflagged'] = 'Με σήμανση';
 $labels['markunflagged'] = 'Χωρίς σήμανση';
-$labels['messageactions'] = 'Περισσότερες ενέργειες...';
 $labels['select'] = 'Επιλογή';
 $labels['all'] = 'Όλα';
 $labels['none'] = 'Κανένα';
+$labels['nonesort'] = 'Κανένα';
 $labels['unread'] = 'Μη αναγνωσμένα';
 $labels['unanswered'] = 'Αναπάντητο';
 $labels['deleted'] = 'Διεγραμμένο';
@@ -129,7 +118,6 @@ $labels['invert'] = 'Αναστροφή';
 $labels['filter'] = 'Φίλτρο';
 $labels['compact'] = 'Συμπίεση';
 $labels['empty'] = 'Άδειασμα';
-$labels['purge'] = 'Καθάρισμα';
 $labels['quota'] = 'Χρήση δίσκου';
 $labels['unknown'] = 'άγνωστο';
 $labels['unlimited'] = 'απεριόριστο';
@@ -204,6 +192,9 @@ $labels['manageidentities'] = 'Διαχείριση ταυτοτήτων για
 $labels['newidentity'] = 'Νέα ταυτότητα';
 $labels['newitem'] = 'Νέο αντικείμενο';
 $labels['edititem'] = 'Επεξεργασία αντικειμένου';
+$labels['preferhtml'] = 'Προτίμηση HTML';
+$labels['htmlmessage'] = 'Μήνυμα HTML';
+$labels['prettydate'] = 'Όμορφη ημ/νία';
 $labels['setdefault'] = 'Ορισμός ως προεπιλογή';
 $labels['language'] = 'Γλώσσα';
 $labels['timezone'] = 'Περιοχή ώρας';
@@ -233,7 +224,6 @@ $labels['advancedoptions'] = 'Προχωρημένες επιλογές';
 $labels['mainoptions'] = 'Βασικές επιλογές';
 $labels['newmessage'] = 'Νέο Μήνυμα';
 $labels['folder'] = 'Φάκελος';
-$labels['folders'] = 'Φάκελοι';
 $labels['foldername'] = 'Όνομα φακέλου';
 $labels['subscribed'] = 'Εγγραφή';
 $labels['messagecount'] = 'Μηνύματα';
@@ -245,4 +235,3 @@ $labels['sortby'] = 'Ταξινόμηση κατά';
 $labels['sortasc'] = 'Αύξουσα ταξινόμηση';
 $labels['sortdesc'] = 'Φθίνουσα ταξινόμηση';
 
-?>
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 7b8c8d8e5..055cc2781 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -1,20 +1,17 @@
 <?php
-/*
-+-----------------------------------------------------------------------+
-| language/el/messages.inc                                              |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Jim Deves <jim@cobaltblue.gr>                                 |
-|         John Economou <hsoc@irc.gr>                                   |
-|         Panagiotis Christias <p.christias@noc.ntua.gr>                |
-+-----------------------------------------------------------------------+
-
-@version $Id$
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/el_GR/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -65,7 +62,6 @@ $messages['nosubjectwarning'] = 'Το πεδίο "Θέμα" είναι άδει�
 $messages['nobodywarning'] = 'Αποστολή μηνύματος χωρίς κείμενο;';
 $messages['notsentwarning'] = 'Το μήνυμα δεν έχει σταλεί. Θέλετε να το απορρίψετε;';
 $messages['noldapserver'] = 'Παρακαλώ επιλέξτε έναν LDAP διακομιστή για αναζήτηση';
-$messages['nocontactsreturned'] = 'Δε βρέθηκαν επαφές';
 $messages['nosearchname'] = 'Παρακαλώ εισάγεται όνομα επαφής ή διεύθυνση email';
 $messages['notuploadedwarning'] = 'Δεν έχουν φορτωθεί όλα τα συνημμένα. Παρακαλώ περιμένετε ή ακυρώστε το ανέβασμα.';
 $messages['searchsuccessful'] = '$nr μηνύματα βρέθηκαν';
@@ -103,4 +99,3 @@ $messages['smtprecipientserror'] = 'Σφάλμα SMTP: Αδύνατο να πρ�
 $messages['smtperror'] = 'Σφάλμα SMTP: $msg';
 $messages['emailformaterror'] = 'Λανθασμένη διεύθνση email: $email';
 
-?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 6c97ade1e..9a33edaf6 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/en_GB/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Weiran Zhang (weiran@weiran.co.uk)                            |
-|         Phil Weir                                                     |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -43,9 +39,10 @@ $labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Date';
 $labels['size'] = 'Size';
 $labels['priority'] = 'Priority';
-$labels['organization'] = 'Organisation';
+$labels['organization'] = 'Company';
 $labels['readstatus'] = 'Read status';
 $labels['mailboxlist'] = 'Folders';
+$labels['folders'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
@@ -75,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'May';
+$labels['longmay'] = 'May';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'January';
 $labels['longfeb'] = 'February';
 $labels['longmar'] = 'March';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'May';
 $labels['longjun'] = 'June';
 $labels['longjul'] = 'July';
 $labels['longaug'] = 'August';
@@ -105,7 +102,7 @@ $labels['forwardinline'] = 'Forward inline';
 $labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage'] = 'Forward the message';
 $labels['deletemessage'] = 'Delete message';
-$labels['movemessagetotrash'] = 'Move message to "Deleted Items"';
+$labels['movemessagetotrash'] = 'Move message to "Deleted Items';
 $labels['printmessage'] = 'Print this message';
 $labels['previousmessage'] = 'Show the previous message';
 $labels['firstmessage'] = 'Show the first message';
@@ -118,10 +115,11 @@ $labels['markread'] = 'As read';
 $labels['markunread'] = 'As unread';
 $labels['markflagged'] = 'As flagged';
 $labels['markunflagged'] = 'As unflagged';
-$labels['messageactions'] = 'More actions...';
+$labels['moreactions'] = 'More actions...';
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
+$labels['nonesort'] = 'None';
 $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
@@ -141,7 +139,6 @@ $labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'From/To';
 $labels['flag'] = 'Flag';
 $labels['attachment'] = 'Attachment';
-$labels['nonesort'] = 'None';
 $labels['sentdate'] = 'Sent date';
 $labels['arrival'] = 'Arrival date';
 $labels['asc'] = 'ascending';
@@ -190,6 +187,7 @@ $labels['highest'] = 'Highest';
 $labels['nosubject'] = '(no subject)';
 $labels['showimages'] = 'Display images';
 $labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft'] = 'This is a draft message.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
 $labels['savesentmessagein'] = 'Save sent message in';
@@ -211,7 +209,6 @@ $labels['nameprefix'] = 'Title';
 $labels['namesuffix'] = 'Suffix';
 $labels['nickname'] = 'Nickname';
 $labels['jobtitle'] = 'Job Title';
-$labels['organization'] = 'Company';
 $labels['department'] = 'Department';
 $labels['gender'] = 'Gender';
 $labels['maidenname'] = 'Maiden Name';
@@ -232,14 +229,15 @@ $labels['male'] = 'male';
 $labels['female'] = 'female';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistant';
+$labels['typeassistant'] = 'Assistant';
 $labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'All fields';
 $labels['search'] = 'Search';
 $labels['advsearch'] = 'Advanced Search';
 $labels['other'] = 'Other';
+$labels['typeother'] = 'Other';
 $labels['typehome'] = 'Home';
 $labels['typework'] = 'Work';
-$labels['typeother'] = 'Other';
 $labels['typemobile'] = 'Mobile';
 $labels['typemain'] = 'Main';
 $labels['typehomefax'] = 'Home Fax';
@@ -247,8 +245,9 @@ $labels['typeworkfax'] = 'Work Fax';
 $labels['typecar'] = 'Car';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistant';
 $labels['typehomepage'] = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
 $labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
@@ -270,7 +269,6 @@ $labels['print'] = 'Print';
 $labels['export'] = 'Export';
 $labels['exportvcards'] = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Create new contact group';
-$labels['groupactions'] = 'Actions for contact groups...';
 $labels['grouprename'] = 'Rename group';
 $labels['groupdelete'] = 'Delete group';
 $labels['previouspage'] = 'Show previous set';
@@ -280,6 +278,8 @@ $labels['lastpage'] = 'Show last set';
 $labels['group'] = 'Group';
 $labels['groups'] = 'Groups';
 $labels['personaladrbook'] = 'Personal Addresses';
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Import contacts';
 $labels['importfromfile'] = 'Import from file:';
@@ -288,6 +288,7 @@ $labels['importreplace'] = 'Replace the entire address book';
 $labels['importtext'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
 $labels['done'] = 'Done';
 $labels['settingsfor'] = 'Settings for';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'User preferences';
 $labels['editpreferences'] = 'Edit user preferences';
@@ -299,6 +300,8 @@ $labels['edititem'] = 'Edit item';
 $labels['preferhtml'] = 'Display HTML';
 $labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Message';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Pretty dates';
 $labels['setdefault'] = 'Set default';
 $labels['autodetect'] = 'Auto';
@@ -347,11 +350,11 @@ $labels['advancedoptions'] = 'Advanced options';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';
 $labels['checkallfolders'] = 'Check all folders for new messages';
 $labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Main Options';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'New Message';
-$labels['listoptions'] = 'List Options';
 $labels['signatureoptions'] = 'Signature Options';
 $labels['whenreplying'] = 'When replying';
 $labels['replytopposting'] = 'start new message above original';
@@ -370,9 +373,14 @@ $labels['reqmdn'] = 'Always request a return receipt';
 $labels['reqdsn'] = 'Always request a delivery status notification';
 $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
 $labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
 $labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalised';
+$labels['addtodict'] = 'Add to dictionary';
 $labels['folder'] = 'Folder';
-$labels['folders'] = 'Folders';
 $labels['foldername'] = 'Folder name';
 $labels['subscribed'] = 'Subscribed';
 $labels['messagecount'] = 'Messages';
@@ -395,6 +403,11 @@ $labels['sortby'] = 'Sort by';
 $labels['sortasc'] = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';
 $labels['undo'] = 'Undo';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'Licence';
+$labels['support'] = 'Get support';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -418,4 +431,3 @@ $labels['japanese'] = 'Japanese';
 $labels['korean'] = 'Korean';
 $labels['chinese'] = 'Chinese';
 
-?>
\ No newline at end of file
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 6a53d4f41..64d6de117 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/en_GB/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Weiran Zhang (weiran@weiran.co.uk)                            |
-|         Phil Weir                                                     |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -49,6 +45,7 @@ $messages['blockedimages'] = 'To protect your privacy, remote images are blocked
 $messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
 $messages['nocontactsfound'] = 'No contacts found.';
 $messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Failed to send message.';
 $messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
 $messages['errorsavingsent'] = 'An error occurred while saving sent message.';
@@ -62,6 +59,7 @@ $messages['deletegroupconfirm'] = 'Do you really want to delete the selected gro
 $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
 $messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
 $messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
 $messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Deleting folder...';
 $messages['foldermoving'] = 'Moving folder...';
@@ -77,10 +75,10 @@ $messages['nosubjectwarning'] = 'The "Subject" field is empty. Would you like to
 $messages['nobodywarning'] = 'Send this message without any text?';
 $messages['notsentwarning'] = 'Your message has not been sent. Do you want to discard it?';
 $messages['noldapserver'] = 'Please select an LDAP server to search.';
-$messages['nocontactsreturned'] = 'No contacts were found.';
 $messages['nosearchname'] = 'Please enter a contact name or email address.';
 $messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr messages found.';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Search found no matches.';
 $messages['searching'] = 'Searching...';
 $messages['checking'] = 'Checking...';
@@ -127,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
 $messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
 $messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
 $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtpdsnerror'] = 'SMTP Error: Server does not support Delivery Status Notifications.';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Incorrect e-mail address: $email';
 $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
@@ -140,11 +137,16 @@ $messages['contactrestored'] = 'Contact(s) successfully restored.';
 $messages['groupdeleted'] = 'Group deleted successfully.';
 $messages['grouprenamed'] = 'Group renamed successfully.';
 $messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = 'Message(s) deleted successfully.';
 $messages['messagemoved'] = 'Message(s) moved successfully.';
 $messages['messagecopied'] = 'Message(s) copied successfully.';
 $messages['messagemarked'] = 'Message(s) marked successfully.';
 $messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'Name cannot be empty.';
 $messages['nametoolong'] = 'Name is too long.';
 $messages['folderupdated'] = 'Successfully updated folder.';
@@ -152,5 +154,5 @@ $messages['foldercreated'] = 'Successfully created folder.';
 $messages['invalidimageformat'] = 'Not a valid image format.';
 $messages['mispellingsfound'] = 'Spelling errors detected in the message.';
 $messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
+$messages['messagetoobig'] = 'The message part is too big to process it.';
 
-?>
\ No newline at end of file
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index e55eafc7d..0a8f8ef3b 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -1,18 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/eo/labels.inc                                                |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Andreas van Cranenburgh <andreas@unstable.nl>                 |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/eo/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -40,17 +39,15 @@ $labels['date'] = 'Dato';
 $labels['size'] = 'Grando';
 $labels['priority'] = 'Prioritato';
 $labels['organization'] = 'Organizo';
-$labels['reply-to'] = 'Respondu-Al';
 $labels['mailboxlist'] = 'Dosierujoj';
+$labels['folders'] = 'Dosierujoj';
 $labels['messagesfromto'] = 'Mesaĝoj ekde $from ĝis $to de $count';
 $labels['messagenrof'] = 'Mesaĝo $nr-a de $count';
+$labels['copy'] = 'Kopio';
 $labels['moveto'] = 'transloku al...';
 $labels['download'] = 'elŝutu';
 $labels['filename'] = 'Dosiernomo';
 $labels['filesize'] = 'Dosiergrando';
-$labels['preferhtml'] = 'Montru HTML';
-$labels['htmlmessage'] = 'HTML Mesaĝo';
-$labels['prettydate'] = 'Agrablaj Datoj';
 $labels['addtoaddressbook'] = 'Aldonu al adresaro';
 $labels['sun'] = 'Dim';
 $labels['mon'] = 'Lun';
@@ -70,7 +67,8 @@ $labels['jan'] = 'Jan';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
-$labels['may'] = 'Maj';
+$labels['may'] = 'Majo';
+$labels['longmay'] = 'Majo';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aŭg';
@@ -82,7 +80,6 @@ $labels['longjan'] = 'Januaro';
 $labels['longfeb'] = 'Februaro';
 $labels['longmar'] = 'Marĉo';
 $labels['longapr'] = 'Aprilo';
-$labels['longmay'] = 'Majo';
 $labels['longjun'] = 'Junio';
 $labels['longjul'] = 'Julio';
 $labels['longaug'] = 'Aŭgusto';
@@ -100,13 +97,9 @@ $labels['deletemessage'] = 'Forigu mesaĝon';
 $labels['movemessagetotrash'] = 'Transloku mesaĝon al rubujo';
 $labels['printmessage'] = 'Printu ĉi tiun mesaĝon';
 $labels['previousmessage'] = 'Montru antaŭan mesaĝon';
-$labels['previousmessages'] = 'Montru antaŭan aron de mesaĝoj';
 $labels['firstmessage'] = 'Montru unuan mesaĝon';
-$labels['firstmessages'] = 'Montru unuan aron de mesaĝoj';
 $labels['nextmessage'] = 'Montru sekvan mesaĝon';
-$labels['nextmessages'] = 'Montru sekvan aron de mesaĝoj';
 $labels['lastmessage'] = 'Montru lastan mesaĝon';
-$labels['lastmessages'] = 'Montru lastan aron de mesaĝoj';
 $labels['backtolist'] = 'Reen al mesaĝo-listo';
 $labels['viewsource'] = 'Montru fonton';
 $labels['markmessages'] = 'Marku mesaĝojn';
@@ -117,10 +110,10 @@ $labels['markunflagged'] = 'kiel nemarkita';
 $labels['select'] = 'Elektu';
 $labels['all'] = 'Ĉion';
 $labels['none'] = 'Nenion';
+$labels['nonesort'] = 'Nenion';
 $labels['unread'] = 'Nelegitan';
 $labels['compact'] = 'Kompakta';
 $labels['empty'] = 'Malplena';
-$labels['purge'] = 'Senrubigu';
 $labels['quota'] = 'Diskuzo';
 $labels['unknown'] = 'nekonata';
 $labels['unlimited'] = 'senlima';
@@ -187,6 +180,9 @@ $labels['manageidentities'] = 'Administru identojn de ĉi tiu konto';
 $labels['newidentity'] = 'Nova idento';
 $labels['newitem'] = 'Nova ero';
 $labels['edititem'] = 'Redaktu eron';
+$labels['preferhtml'] = 'Montru HTML';
+$labels['htmlmessage'] = 'HTML Mesaĝo';
+$labels['prettydate'] = 'Agrablaj Datoj';
 $labels['setdefault'] = 'Agordu kiel norma';
 $labels['language'] = 'Lingvo';
 $labels['timezone'] = 'Tempzono';
@@ -214,7 +210,6 @@ $labels['never'] = 'neniam';
 $labels['messagesdisplaying'] = 'Mesaĝoj vidigante';
 $labels['messagescomposition'] = 'Mesaĝo-verkado';
 $labels['folder'] = 'Dosierujo';
-$labels['folders'] = 'Dosierujoj';
 $labels['foldername'] = 'Dosierujo-nomo';
 $labels['subscribed'] = 'Abonata';
 $labels['messagecount'] = 'Mesaĝoj';
@@ -225,4 +220,3 @@ $labels['sortby'] = 'Ordigu per';
 $labels['sortasc'] = 'Ordigu kreskante';
 $labels['sortdesc'] = 'Ordigu malkreskante';
 
-?>
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 3c2c32541..776a55e9e 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -1,18 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/eo/messages.inc                                              |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Andreas van Cranenburgh <andreas@unstable.nl                  |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/eo/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -54,7 +53,6 @@ $messages['nosubjectwarning'] = 'La temkampo estas malplena. Ĉu vi volas skribi
 $messages['nobodywarning'] = 'Ĉu sendi ĉi tiun mesaĝon sen teksto?';
 $messages['notsentwarning'] = 'Mesaĝo ne estas sendita. Ĉu vi volas forigi vian mesaĝon?';
 $messages['noldapserver'] = 'Bonvolu elekti ldap-servilon por serĉado';
-$messages['nocontactsreturned'] = 'Trovis neniun kontakton';
 $messages['nosearchname'] = 'Bonvolu enmeti kontakt-nomon aŭ retpoŝt-adreson.';
 $messages['searchsuccessful'] = 'trovis $nr mesaĝojn';
 $messages['searchnomatch'] = 'Serĉo donis nenion';
@@ -77,4 +75,3 @@ $messages['errorsendingreceipt'] = 'Ne povis sendi konfirmon';
 $messages['nodeletelastidentity'] = 'Vi ne povas forigi ĉi tiun identon, ĉar ĝi estas la lasta';
 $messages['forbiddencharacter'] = 'Dosierujo-nomo enhavas malpermesitan karaktron';
 
-?>
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 7c313f41b..9b2f2cb4a 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -1,24 +1,17 @@
 <?php
-/*
-
-+-----------------------------------------------------------------------+
-| language/es_AR/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Javier Smaldone <javier@smaldone.com.ar>                      |
-|         http://www.smaldone.com.ar                                    |
-|         David Grajal Blanco <dgrabla@gmail.com>                       |
-|         http://david.grajal.net                                       |
-|         Pablo Rosciani <pablo@netsud.com>                             |
-|         http://www.netsud.com                                         |
-+-----------------------------------------------------------------------+
-
-@version $Id$
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_AR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -46,8 +39,8 @@ $labels['date'] = 'Fecha';
 $labels['size'] = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
-$labels['reply-to'] = 'Responder a';
 $labels['mailboxlist'] = 'Carpetas';
+$labels['folders'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
 $labels['copy'] = 'Copiar';
@@ -75,7 +68,8 @@ $labels['jan'] = 'Ene';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Abr';
-$labels['may'] = 'May';
+$labels['may'] = 'Mayo';
+$labels['longmay'] = 'Mayo';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Ago';
@@ -87,7 +81,6 @@ $labels['longjan'] = 'Enero';
 $labels['longfeb'] = 'Febrero';
 $labels['longmar'] = 'Marzo';
 $labels['longapr'] = 'Abril';
-$labels['longmay'] = 'Mayo';
 $labels['longjun'] = 'Junio';
 $labels['longjul'] = 'Julio';
 $labels['longaug'] = 'Agosto';
@@ -105,13 +98,9 @@ $labels['deletemessage'] = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
 $labels['printmessage'] = 'Imprimir este mensaje';
 $labels['previousmessage'] = 'Mostrar mensaje anterior';
-$labels['previousmessages'] = 'Mostrar grupo anterior de mensajes';
 $labels['firstmessage'] = 'Mostrar primer mensaje';
-$labels['firstmessages'] = 'Mostrar primer grupo de mensajes';
 $labels['nextmessage'] = 'Mostrar siguente mensaje';
-$labels['nextmessages'] = 'Mostrar siguente grupo de mensajes';
 $labels['lastmessage'] = 'Mostrar último mensaje';
-$labels['lastmessages'] = 'Mostrar último grupo de mensajes';
 $labels['backtolist'] = 'Volver a la lista de mensajes';
 $labels['viewsource'] = 'Mostrar código';
 $labels['markmessages'] = 'Marcar mensajes';
@@ -119,10 +108,10 @@ $labels['markread'] = 'Como leído';
 $labels['markunread'] = 'Como no leído';
 $labels['markflagged'] = 'Como marcado';
 $labels['markunflagged'] = 'Como no marcado';
-$labels['messageactions'] = 'Más acciones...';
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
+$labels['nonesort'] = 'Ninguno';
 $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
@@ -135,14 +124,12 @@ $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
 $labels['attachment'] = 'Adjunto';
-$labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de Enviado';
 $labels['arrival'] = 'Fecha de Recepción';
 $labels['asc'] = 'Ascendente';
 $labels['desc'] = 'Descendente';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
-$labels['purge'] = 'Eliminar';
 $labels['quota'] = 'Uso de disco';
 $labels['unknown'] = 'desconocido';
 $labels['unlimited'] = 'sin límite';
@@ -204,7 +191,6 @@ $labels['print'] = 'Imprimir';
 $labels['export'] = 'Exportar';
 $labels['exportvcards'] = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
-$labels['groupactions'] = 'Acción para Grupos de Contacto';
 $labels['previouspage'] = 'Mostrar grupo anterior';
 $labels['firstpage'] = 'Mostrar primer grupo';
 $labels['nextpage'] = 'Mostrar siguiente grupo';
@@ -279,7 +265,6 @@ $labels['mainoptions'] = 'Opciones Principales';
 $labels['section'] = 'Selección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo Mensaje';
-$labels['listoptions'] = 'Opciones de Listado';
 $labels['signatureoptions'] = 'Opciones de Firma';
 $labels['whenreplying'] = 'Al Responder';
 $labels['replytopposting'] = 'iniciar el nuevo mensaje sobre el original';
@@ -295,7 +280,6 @@ $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread'] = 'Marcar mensajes previsualizados como leidos';
 $labels['afternseconds'] = 'despues de $n segundos';
 $labels['folder'] = 'Carpeta';
-$labels['folders'] = 'Carpetas';
 $labels['foldername'] = 'Nombre de carpeta';
 $labels['subscribed'] = 'Suscripta';
 $labels['messagecount'] = 'Mensajes';
@@ -329,4 +313,3 @@ $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
 
-?>
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 239c7eb64..b09a74800 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -1,23 +1,17 @@
 <?php
-/*
-
-+-----------------------------------------------------------------------+
-| language/es_ES/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Javier Smaldone <javier@smaldone.com.ar>                      |
-|         David Grajal Blanco <dgrabla@gmail.com>                       |
-|         Lito Jornero <jornero@gmail.com>                              |
-|         Pablo Rosciani <pablo@netsud.com>                             |
-|         http://www.netsud.com                                         |
-+-----------------------------------------------------------------------+
-
-@version $Id$
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_AR/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -69,7 +63,6 @@ $messages['nosubjectwarning'] = 'El campo "Asunto" esta vacío. ¿Desea completa
 $messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
 $messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar su mensaje?';
 $messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
-$messages['nocontactsreturned'] = 'No se han encontrado contactos';
 $messages['nosearchname'] = 'Por favor, introduzca un nombre o la dirección de e-mail';
 $messages['notuploadedwarning'] = 'Todavia no se subieron todos los archivos adjuntos. Por favor aguarde o cancele la subida.';
 $messages['searchsuccessful'] = 'Se encontraron $nr mensajes';
@@ -114,4 +107,3 @@ $messages['emailformaterror'] = 'La dirección $email no es válida';
 $messages['toomanyrecipients'] = 'Demasiados destinatarios. Reduzca la cantidad a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max';
 
-?>
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 875f8581d..4f650121f 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/es_ES/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Javier Smaldone <javier@smaldone.com.ar>                      |
-|         David Grajal Blanco <dgrabla@gmail.com>                       |
-|         Ángel Bueno Prieto <info@mediaiberia.com>                     |
-|         José M. Ciordia <ciordia@gmail.com>                           |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David Marzal <Unknown>                                        |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -41,13 +35,14 @@ $labels['to'] = 'Destinatario';
 $labels['cc'] = 'Copia';
 $labels['bcc'] = 'Cco';
 $labels['replyto'] = 'Respuesta a';
-$labels['followupto'] = 'Seguir a';
+$labels['followupto'] = 'Responder-a';
 $labels['date'] = 'Fecha';
 $labels['size'] = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Leer estado';
 $labels['mailboxlist'] = 'Bandejas';
+$labels['folders'] = 'Bandejas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['threadsfromto'] = 'Hilos $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
@@ -76,7 +71,8 @@ $labels['jan'] = 'Ene';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Abr';
-$labels['may'] = 'May';
+$labels['may'] = 'Mayo';
+$labels['longmay'] = 'Mayo';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Ago';
@@ -88,7 +84,6 @@ $labels['longjan'] = 'Enero';
 $labels['longfeb'] = 'Febrero';
 $labels['longmar'] = 'Marzo';
 $labels['longapr'] = 'Abril';
-$labels['longmay'] = 'Mayo';
 $labels['longjun'] = 'Junio';
 $labels['longjul'] = 'Julio';
 $labels['longaug'] = 'Agosto';
@@ -124,6 +119,7 @@ $labels['moreactions'] = 'Más acciones…';
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
+$labels['nonesort'] = 'Ninguno';
 $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Señalado';
@@ -143,7 +139,6 @@ $labels['expand_only_unread'] = 'solo con mensajes no leídos';
 $labels['fromto'] = 'Remitente/Destinatario';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunto';
-$labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de envío';
 $labels['arrival'] = 'Fecha de llegada';
 $labels['asc'] = 'ascendente';
@@ -192,6 +187,7 @@ $labels['highest'] = 'Altísimo';
 $labels['nosubject'] = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Mostrar siempre imágenes de $sender';
+$labels['isdraft'] = 'Este mensaje es un borrador';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Sólo texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
@@ -233,14 +229,15 @@ $labels['male'] = 'Hombre';
 $labels['female'] = 'Mujer';
 $labels['manager'] = 'Director';
 $labels['assistant'] = 'Auxiliar';
+$labels['typeassistant'] = 'Auxiliar';
 $labels['spouse'] = 'Cónyuge';
 $labels['allfields'] = 'Todos los campos';
 $labels['search'] = 'Buscar';
 $labels['advsearch'] = 'Búsqueda avanzada';
 $labels['other'] = 'Otro';
+$labels['typeother'] = 'Otro';
 $labels['typehome'] = 'Casa';
 $labels['typework'] = 'Trabajo';
-$labels['typeother'] = 'Otro';
 $labels['typemobile'] = 'Móvil';
 $labels['typemain'] = 'Principal';
 $labels['typehomefax'] = 'Fax de casa';
@@ -248,7 +245,6 @@ $labels['typeworkfax'] = 'Fax del trabajo';
 $labels['typecar'] = 'Coche';
 $labels['typepager'] = 'Busca';
 $labels['typevideo'] = 'Vídeo';
-$labels['typeassistant'] = 'Auxiliar';
 $labels['typehomepage'] = 'Inicio';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
@@ -292,6 +288,7 @@ $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
 $labels['importtext'] = 'Puede importar contactos desde una lista existente.<br/>Actualmente sólo soportamos el formato <a href="http://es.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Hecho';
 $labels['settingsfor'] = 'Configuración para';
+$labels['about'] = 'Acerca De';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
@@ -353,11 +350,11 @@ $labels['advancedoptions'] = 'Opciones avanzadas';
 $labels['focusonnewmessage'] = 'Activar la ventana del navegador si hay un mensaje nuevo';
 $labels['checkallfolders'] = 'Comprobar en todas las bandejas si hay mensajes nuevos';
 $labels['displaynext'] = 'Después de borrar/mover, mostrar el siguiente mensaje después de borrar/mover un mensaje';
+$labels['defaultfont'] = 'Tipo de letra predeterminada del mensaje HTML';
 $labels['mainoptions'] = 'Opciones principales';
 $labels['section'] = 'Sección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo mensaje';
-$labels['listoptions'] = 'Opciones de listado';
 $labels['signatureoptions'] = 'Opciones de firma';
 $labels['whenreplying'] = 'Al responder';
 $labels['replytopposting'] = 'empezar un mensaje nuevo encima del original';
@@ -376,6 +373,7 @@ $labels['reqmdn'] = 'Solicitar siempre un acuse de recibo';
 $labels['reqdsn'] = 'Solicitar siempre la entrega de notificaciones de estado';
 $labels['replysamefolder'] = 'Coloque las respuestas en la bandeja del mensaje que se responde';
 $labels['defaultaddressbook'] = 'Añadir nuevos contactos a la lista de contactos seleccionada';
+$labels['autocompletesingle'] = 'Omitir direcciones de correo alternativas en autocompletado';
 $labels['spellcheckbeforesend'] = 'Comprobar ortografía antes de enviar un mensaje';
 $labels['spellcheckoptions'] = 'Opciones de ortografía';
 $labels['spellcheckignoresyms'] = 'Ignorar palabras con símbolos';
@@ -383,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Ignorar palabras con números';
 $labels['spellcheckignorecaps'] = 'Ignorar palabras con todo mayúsculas';
 $labels['addtodict'] = 'Añadir al diccionario';
 $labels['folder'] = 'Bandeja';
-$labels['folders'] = 'Bandejas';
 $labels['foldername'] = 'Nombre de bandeja';
 $labels['subscribed'] = 'Suscrita';
 $labels['messagecount'] = 'Mensajes';
@@ -406,6 +403,11 @@ $labels['sortby'] = 'Ordenar por';
 $labels['sortasc'] = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
 $labels['undo'] = 'Deshacer';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Versión';
+$labels['source'] = 'Origen';
+$labels['license'] = 'Licencia';
+$labels['support'] = 'Obtener soporte';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -429,4 +431,3 @@ $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
 
-?>
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index b70cdb8e0..e7de9d877 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+------------------------------------------------------------------------+
-| language/es_ES/messages.inc                                            |
-|                                                                        |
-| Language file of the Roundcube Webmail client                          |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                        |
-| Licensed under the GNU GPL                                             |
-|                                                                        |
-+------------------------------------------------------------------------+
-| Authors: Javier Smaldone <javier@smaldone.com.ar>                      |
-|          David Grajal Blanco <dgrabla@gmail.com>                       |
-|          Lito Jornero <jornero@gmail.com>                              |
-|          Ángel Bueno Prieto <info@mediaiberia.com>                     |
-|          José M. Ciordia <ciordia@gmail.com>                           |
-+------------------------------------------------------------------------+
-
-@version $Id$
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Pablo Rosciani <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -29,28 +23,29 @@ $messages['servererror'] = '¡Error del servidor!';
 $messages['servererrormsg'] = 'Error de servidor: $msg';
 $messages['dberror'] = '¡Error de base de datos!';
 $messages['errorreadonly'] = 'No se ha podido hacer. La bandeja es sólo de lectura';
-$messages['errornoperm'] = 'No se ha podido hacer. Permiso denegado';
+$messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado';
 $messages['invalidrequest'] = '¡Petición no válida! No se han guardado los datos.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
 $messages['loggedout'] = 'Ha cerrado bien la sesión. ¡Hasta pronto!';
 $messages['mailboxempty'] = 'La casilla está vacía';
 $messages['loading'] = 'Cargando...';
-$messages['uploading'] = 'Subiendo fichero...';
+$messages['uploading'] = 'Subiendo archivo...';
 $messages['uploadingmany'] = 'Subiendo archivos…';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'Verificando si hay nuevos mensajes...';
 $messages['sendingmessage'] = 'Enviando mensaje...';
 $messages['messagesent'] = 'Mensaje enviado correctamente';
-$messages['savingmessage'] = 'Guardar mensaje...';
+$messages['savingmessage'] = 'Guardando mensaje...';
 $messages['messagesaved'] = 'Mensaje guardado en borradores';
 $messages['successfullysaved'] = 'Guardado correctamente';
 $messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones';
 $messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
 $messages['contactnameexists'] = 'Ya existe un contacto con el mismo nombre.';
-$messages['blockedimages'] = 'Para proteger su privacidad, las imágenes externas han sido bloqueadas en este mensaje';
+$messages['blockedimages'] = 'Para proteger su privacidad, las imágenes externas de este mensaje han sido bloqueadas.';
 $messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. ¡Lo siento!';
-$messages['nocontactsfound'] = 'No hay contactos';
+$messages['nocontactsfound'] = 'No se encontraron contactos.';
 $messages['contactnotfound'] = 'El contacto solicitado no existe';
+$messages['contactsearchonly'] = 'Ingrese algún criterio para buscar contactos';
 $messages['sendingfailed'] = 'Error al enviar mensaje';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar este mensaje';
 $messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado';
@@ -64,6 +59,7 @@ $messages['deletegroupconfirm'] = '¿De verdad quiere borrar el grupo selecciona
 $messages['deletemessagesconfirm'] = '¿Realmente quiere eliminar los mensajes seleccionados?';
 $messages['deletefolderconfirm'] = '¿Realmente quiere eliminar esta bandeja?';
 $messages['purgefolderconfirm'] = '¿Realmente quiere eliminar todos los mensajes de esta bandeja?';
+$messages['contactdeleting'] = 'Eliminando contacto(s)';
 $messages['groupdeleting'] = 'Borrando grupo…';
 $messages['folderdeleting'] = 'Borrando bandeja...';
 $messages['foldermoving'] = 'Moviendo bandeja...';
@@ -88,8 +84,8 @@ $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Revisando...';
 $messages['nospellerrors'] = 'No se encontraron errores ortográficos';
 $messages['folderdeleted'] = 'Bandeja eliminada correctamente';
-$messages['foldersubscribed'] = 'Suscripción a bandeja anulada correctamente';
-$messages['folderunsubscribed'] = 'Suscrito a bandeja correctamente';
+$messages['foldersubscribed'] = 'Suscrito a bandeja correctamente';
+$messages['folderunsubscribed'] = 'Suscripción a bandeja anulada correctamente';
 $messages['folderpurged'] = 'Bandeja purgada correctamente';
 $messages['folderexpunged'] = 'Bandeja vaciada correctamente';
 $messages['deletedsuccessfully'] = 'Eliminado correctamente';
@@ -129,7 +125,6 @@ $messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación';
 $messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from" ($msg)';
 $messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer remitente "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios';
-$messages['smtpdsnerror'] = 'Error SMTP: No hay soporte para los acuses de recibo';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email';
 $messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduzca el número de destinatarios a $max.';
@@ -151,6 +146,7 @@ $messages['messagemoved'] = 'Mensaje(s) movido(s) correctamente';
 $messages['messagecopied'] = 'Mensaje(s) copiado(s) correctamente';
 $messages['messagemarked'] = 'Mensaje(s) marcado(s) correctamente';
 $messages['autocompletechars'] = 'Introduce al menos $min caracteres para autocompletar';
+$messages['autocompletemore'] = 'Se encontraron mas coincidencias. Favor de ingresar mas caracteres';
 $messages['namecannotbeempty'] = 'Hay que poner el nombre';
 $messages['nametoolong'] = 'El nombre es demasiado largo';
 $messages['folderupdated'] = 'Bandeja actualizada correctamente';
@@ -158,5 +154,5 @@ $messages['foldercreated'] = 'Bandeja creada correctamente';
 $messages['invalidimageformat'] = 'No es un formato de imagen válido';
 $messages['mispellingsfound'] = 'Se han detectado errores ortográficos en el mensaje.';
 $messages['parentnotwritable'] = 'No se puede crear/mover la carpeta a la carpeta superior elegida. No tiene permisos de acceso.';
+$messages['messagetoobig'] = 'Esta parte del mensaje es demasiada grande para procesarla';
 
-?>
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 4e9ddfad8..611f34cb7 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/et_EE/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Üllar Pajus <yllar.pajus@gmail.com>                           |
-|         Raivo Hool <raivo.hool@gmail.com>                             |
-|         Elan Ruusamäe <glen@delfi.ee>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: yllar <Unknown>                                               |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,6 +42,7 @@ $labels['priority'] = 'Tähtsus';
 $labels['organization'] = 'Organisatsioon';
 $labels['readstatus'] = 'Lugemise staatus';
 $labels['mailboxlist'] = 'Kaustad';
+$labels['folders'] = 'Kaustad';
 $labels['messagesfromto'] = 'Kirjed $from kuni $to, kokku $count';
 $labels['threadsfromto'] = 'Lõimed $from kuni $to, kokku $count';
 $labels['messagenrof'] = 'Kiri $nr, kokku $count';
@@ -75,7 +71,8 @@ $labels['jan'] = 'jaan';
 $labels['feb'] = 'veebr';
 $labels['mar'] = 'märts';
 $labels['apr'] = 'apr';
-$labels['may'] = 'mai';
+$labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'juuni';
 $labels['jul'] = 'juuli';
 $labels['aug'] = 'aug';
@@ -87,7 +84,6 @@ $labels['longjan'] = 'Jaanuar';
 $labels['longfeb'] = 'Veebruar';
 $labels['longmar'] = 'Märts';
 $labels['longapr'] = 'Aprill';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Juuni';
 $labels['longjul'] = 'Juuli';
 $labels['longaug'] = 'August';
@@ -119,10 +115,11 @@ $labels['markread'] = 'Loetuks';
 $labels['markunread'] = 'Mitte loetuks';
 $labels['markflagged'] = 'Lisa lipik';
 $labels['markunflagged'] = 'Eemalda lipik';
-$labels['messageactions'] = 'Veel tegevusi...';
+$labels['moreactions'] = 'Muud toimingud...';
 $labels['select'] = 'Vali';
 $labels['all'] = 'kõik';
-$labels['none'] = 'mitte midagi';
+$labels['none'] = 'Puudub';
+$labels['nonesort'] = 'Puudub';
 $labels['currpage'] = 'Praegune leht';
 $labels['unread'] = 'Lugemata';
 $labels['flagged'] = 'Märgistatud';
@@ -142,7 +139,6 @@ $labels['expand_only_unread'] = 'ainult lugemata kirjadega';
 $labels['fromto'] = 'Saatja/saaja';
 $labels['flag'] = 'Märgista';
 $labels['attachment'] = 'Manus';
-$labels['nonesort'] = 'Puudub';
 $labels['sentdate'] = 'Saatmise kuupäev';
 $labels['arrival'] = 'Saamise kuupäev';
 $labels['asc'] = 'kasvavalt';
@@ -172,12 +168,15 @@ $labels['charset'] = 'Märgistik';
 $labels['editortype'] = 'Redaktori tüüp';
 $labels['returnreceipt'] = 'Kättesaamiskinnitus';
 $labels['dsn'] = 'Kohalejõudmise teavitus';
+$labels['mailreplyintro'] = '$date kirjutas $sender:';
+$labels['originalmessage'] = 'Esialgne kiri';
 $labels['editidents'] = 'Muuda Identiteete';
 $labels['checkspelling'] = 'Kontrolli õigekirja';
 $labels['resumeediting'] = 'Jätka muutmist';
 $labels['revertto'] = 'Pööra tagasi';
 $labels['attachments'] = 'Manused';
 $labels['upload'] = 'Kinnita manus';
+$labels['uploadprogress'] = '$percent ($current, kokku $total)';
 $labels['close'] = 'Sulge';
 $labels['messageoptions'] = 'Kirja valikud...';
 $labels['low'] = 'Madal';
@@ -188,6 +187,7 @@ $labels['highest'] = 'Kõrgeim';
 $labels['nosubject'] = '(teema puudub)';
 $labels['showimages'] = 'Näita pilte';
 $labels['alwaysshow'] = 'Näita alati $sender saadetud pilte';
+$labels['isdraft'] = 'See on mustand.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Lihttekst';
 $labels['savesentmessagein'] = 'Salvesta saadetud kirjad kausta';
@@ -229,14 +229,15 @@ $labels['male'] = 'mees';
 $labels['female'] = 'naine';
 $labels['manager'] = 'Juht';
 $labels['assistant'] = 'Assistent';
+$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Abikaasa';
 $labels['allfields'] = 'Kõik väljad';
 $labels['search'] = 'Otsi';
 $labels['advsearch'] = 'Täpsem otsing';
 $labels['other'] = 'Muu';
+$labels['typeother'] = 'Muu';
 $labels['typehome'] = 'Kodu';
 $labels['typework'] = 'Töö';
-$labels['typeother'] = 'Muu';
 $labels['typemobile'] = 'Mobiil';
 $labels['typemain'] = 'Peamine';
 $labels['typehomefax'] = 'Kodune fax';
@@ -244,8 +245,9 @@ $labels['typeworkfax'] = 'Töö fax';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Piipar';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistent';
 $labels['typehomepage'] = 'Veebileht';
+$labels['typeblog'] = 'Ajaveeb';
+$labels['typeprofile'] = 'Profiil';
 $labels['addfield'] = 'Lisa väli...';
 $labels['addcontact'] = 'Uue kontakti lisamine';
 $labels['editcontact'] = 'Muuda kontakti';
@@ -267,7 +269,8 @@ $labels['print'] = 'Trüki';
 $labels['export'] = 'Ekspordi';
 $labels['exportvcards'] = 'Ekspordi kontaktid vCardi formaadis';
 $labels['newcontactgroup'] = 'Loo uus kontaktigrupp';
-$labels['groupactions'] = 'Kontaktigrupi tegevused...';
+$labels['grouprename'] = 'Nimeta grupp ümber';
+$labels['groupdelete'] = 'Kustuta grupp';
 $labels['previouspage'] = 'Näita eelmist lehte';
 $labels['firstpage'] = 'Näita esimest komplekti';
 $labels['nextpage'] = 'Näita järgmist lehte';
@@ -275,13 +278,17 @@ $labels['lastpage'] = 'Näita viimast komplekti';
 $labels['group'] = 'Grupp';
 $labels['groups'] = 'Grupid';
 $labels['personaladrbook'] = 'Isiklikud aadressid';
+$labels['searchsave'] = 'Salvesta otsing';
+$labels['searchdelete'] = 'Kustuta otsing';
 $labels['import'] = 'Impordi';
 $labels['importcontacts'] = 'Impordi kontakte';
 $labels['importfromfile'] = 'Impordi failist:';
+$labels['importtarget'] = 'Lisa uued kontaktid aadressiraamatusse:';
 $labels['importreplace'] = 'Asenda kogu aadressiraamat';
 $labels['importtext'] = 'Sa saad üle kanda kontakte olemasolevast aadressiraamatust. Praegu on toetatud <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formaat.';
 $labels['done'] = 'Valmis';
 $labels['settingsfor'] = 'Kasutajaeelistused kontole';
+$labels['about'] = 'Programmist lähemalt';
 $labels['preferences'] = 'Eelistused';
 $labels['userpreferences'] = 'Kasutaja eelistused';
 $labels['editpreferences'] = 'Muuda kasutaja eelistusi';
@@ -293,6 +300,8 @@ $labels['edititem'] = 'Muuda sissekannet';
 $labels['preferhtml'] = 'Eelista HTMLi';
 $labels['defaultcharset'] = 'Vaikimisi märgistik';
 $labels['htmlmessage'] = 'HTML kirjad';
+$labels['dateformat'] = 'Kuupäeva vorming';
+$labels['timeformat'] = 'Aja vorming';
 $labels['prettydate'] = 'Kenad kuupäevad';
 $labels['setdefault'] = 'Muuda vaikeseadeks';
 $labels['autodetect'] = 'Automaatne';
@@ -302,7 +311,7 @@ $labels['pagesize'] = 'Ridu lehe kohta';
 $labels['signature'] = 'Allkiri';
 $labels['dstactive'] = 'Suveaeg';
 $labels['htmleditor'] = 'Kasuta HTML redaktorit';
-$labels['htmlonreply'] = 'vaid HTML kirja vastamisel';
+$labels['htmlonreply'] = 'vaid HTML-vormingus kirjale vastamisel';
 $labels['htmlsignature'] = 'HTML allkiri';
 $labels['previewpane'] = 'Näita eelvaate akent';
 $labels['skin'] = 'Kliendi välimus';
@@ -311,16 +320,16 @@ $labels['logoutcompact'] = 'Tihenda väljumisel sissetulevate kaust';
 $labels['uisettings'] = 'Kasutajaliides';
 $labels['serversettings'] = 'Serveri seaded';
 $labels['mailboxview'] = 'Postkasti vaade';
-$labels['mdnrequests'] = 'Kättesaamis kinnitus';
+$labels['mdnrequests'] = 'Kättesaamiskinnitus';
 $labels['askuser'] = 'küsi kasutajalt';
 $labels['autosend'] = 'saada automaatselt';
 $labels['autosendknown'] = 'saada automaatselt minu kontaktidele, teised küsi üle';
-$labels['autosendknownignore'] = 'saada automaatselt minu kontaktidele, teised ignoreeri';
+$labels['autosendknownignore'] = 'saada automaatselt minu kontaktidele, teisi ignoreeri';
 $labels['ignore'] = 'ignoreeri';
 $labels['readwhendeleted'] = 'Märgi kiri kustutamisel loetuks';
 $labels['flagfordeletion'] = 'Kustutamise asemel märgi kiri kustutatavaks';
 $labels['skipdeleted'] = 'Ära näita kustutatud kirju';
-$labels['deletealways'] = 'Kui kirja prügikasti liigutamine nurjub siis kustuta need';
+$labels['deletealways'] = 'Kui kirjade prügikasti liigutamine nurjub, siis kustuta need';
 $labels['showremoteimages'] = 'Näita kirjas kaugelt kaasatud pilte';
 $labels['fromknownsenders'] = 'tuntud saatjatelt';
 $labels['always'] = 'alati';
@@ -331,7 +340,7 @@ $labels['keepalive'] = 'Kontrolli uusi kirju';
 $labels['never'] = 'mitte kunagi';
 $labels['immediately'] = 'otsekohe';
 $labels['messagesdisplaying'] = 'Kirjade näitamine';
-$labels['messagescomposition'] = 'Kirja koostamine ';
+$labels['messagescomposition'] = 'Kirja koostamine';
 $labels['mimeparamfolding'] = 'Manuste nimed';
 $labels['2231folding'] = 'Täielik RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
@@ -341,11 +350,11 @@ $labels['advancedoptions'] = 'Lisaseadistused';
 $labels['focusonnewmessage'] = 'Fookusta brauseri aken uue kirja korral';
 $labels['checkallfolders'] = 'Kontrolli uusi kirju kõigist kaustadest';
 $labels['displaynext'] = 'Pärast kirja kustutamist/liigutamist näita järgmist kirja';
+$labels['defaultfont'] = 'HTML kirjade vaikefont';
 $labels['mainoptions'] = 'Peamised valikud';
 $labels['section'] = 'Osa';
 $labels['maintenance'] = 'Hooldus';
 $labels['newmessage'] = 'Uus kiri';
-$labels['listoptions'] = 'Nimekirja valikud';
 $labels['signatureoptions'] = 'Allkirja valikud';
 $labels['whenreplying'] = 'Vastates';
 $labels['replytopposting'] = 'alusta uue kirjaga esialgse kohal';
@@ -360,13 +369,18 @@ $labels['abovequote'] = 'tsiteeritu kohale';
 $labels['insertsignature'] = 'Sisesta allkiri';
 $labels['previewpanemarkread'] = 'Märgi eelvaadatud kirjad loetuks';
 $labels['afternseconds'] = '$n sekundi pärast';
-$labels['reqmdn'] = 'Alati nõua kättesaamise kinnitust';
-$labels['reqdsn'] = 'Alati nõua kohalejõudmise teavitust';
+$labels['reqmdn'] = 'Nõua alati kättesaamiskinnitust';
+$labels['reqdsn'] = 'Nõua alati kohalejõudmisteavitust';
 $labels['replysamefolder'] = 'Paiguta vastused samasse kausta, millele vastatakse';
 $labels['defaultaddressbook'] = 'Lisa kontaktid valitud aadressiraamatusse';
+$labels['autocompletesingle'] = 'Automaatlõpetuses jäta alternatiivne e-posti aadress vahele';
 $labels['spellcheckbeforesend'] = 'Kontrolli õigekirja enne saatmist';
+$labels['spellcheckoptions'] = 'Õigekirjakontrolli valikud';
+$labels['spellcheckignoresyms'] = 'Ignoreeri sõnu, milles on sümbolid';
+$labels['spellcheckignorenums'] = 'Ignoreeri sõnu, milles on numbreid';
+$labels['spellcheckignorecaps'] = 'Ignoreeri suurte tähtedega kirjutatud sõnu';
+$labels['addtodict'] = 'Lisa sõnastikku';
 $labels['folder'] = 'Kaust';
-$labels['folders'] = 'Kaustad';
 $labels['foldername'] = 'Kausta nimi';
 $labels['subscribed'] = 'Näitan';
 $labels['messagecount'] = 'Kirju';
@@ -388,6 +402,12 @@ $labels['sharedfolder'] = 'Avalik kaust';
 $labels['sortby'] = 'Järjesta';
 $labels['sortasc'] = 'Järjesta kasvavalt';
 $labels['sortdesc'] = 'Järjesta kahanevalt';
+$labels['undo'] = 'Võta tagasi';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Versioon';
+$labels['source'] = 'Allikas';
+$labels['license'] = 'Litsents';
+$labels['support'] = 'Küsi abi';
 $labels['B'] = 'B';
 $labels['KB'] = 'KiB';
 $labels['MB'] = 'MiB';
@@ -411,4 +431,3 @@ $labels['japanese'] = 'jaapani';
 $labels['korean'] = 'korea';
 $labels['chinese'] = 'hiina';
 
-?>
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 51632c461..886e82ba7 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/et_EE/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Üllar Pajus <yllar.pajus@gmail.com>                           |
-|         Raivo Hool <raivo.hool@gmail.com>                             |
-|         Elan Ruusamäe <glen@delfi.ee>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -45,10 +40,12 @@ $messages['messagesaved'] = 'Kiri salvestatud mustanditesse';
 $messages['successfullysaved'] = 'Edukalt salvestatud';
 $messages['addedsuccessfully'] = 'Kontakt lisati edukalt aadressiraamatusse';
 $messages['contactexists'] = 'Sellise e-posti aadressiga kontakt on juba olemas';
+$messages['contactnameexists'] = 'Sama nimega kontakt on juba olemas.';
 $messages['blockedimages'] = 'Sinu privaatsuse kaitsmiseks on selles kirjas välised pildid blokeeritud.';
 $messages['encryptedmessage'] = 'See on krüpteeritud kiri ja kahjuks pole seda võimalik näidata. Andestust!';
 $messages['nocontactsfound'] = 'Ei leitud ühtegi kontakti';
 $messages['contactnotfound'] = 'Otsitud kontakti ei leitud';
+$messages['contactsearchonly'] = 'Sisesta otsingusõna kontaktide leidmiseks';
 $messages['sendingfailed'] = 'Kirja saatmine ebaõnnestus';
 $messages['senttooquickly'] = 'Palun oota enne selle kirja saatmist $sec sekundit.';
 $messages['errorsavingsent'] = 'Saadetud kirja salvestamisel ilmnes tõrge';
@@ -58,9 +55,12 @@ $messages['errorcopying'] = 'Kirju ei õnnestunud kopeerida';
 $messages['errordeleting'] = 'Ei suutnud seda kirja kustutada';
 $messages['errormarking'] = 'Kirja märkimine nurjus';
 $messages['deletecontactconfirm'] = 'Soovid valitud kontaktid kustutada?';
+$messages['deletegroupconfirm'] = 'Soovid valitud grupi kustutada?';
 $messages['deletemessagesconfirm'] = 'Soovid valitud kirja(d) kustutada?';
 $messages['deletefolderconfirm'] = 'Soovid selle kataloogi kindlasti kustutada?';
 $messages['purgefolderconfirm'] = 'Soovid sellest kaustast kõik kirjad kustutada?';
+$messages['contactdeleting'] = 'Kontakti(de) kustutamine…';
+$messages['groupdeleting'] = 'Grupi kustutamine…';
 $messages['folderdeleting'] = 'Kustutan kausta...';
 $messages['foldermoving'] = 'Liigutan kausta...';
 $messages['foldersubscribing'] = 'Tellin kausta...';
@@ -75,10 +75,10 @@ $messages['nosubjectwarning'] = 'Väli „Pealkiri“ on tühi. Soovid selle är
 $messages['nobodywarning'] = 'Saadan selle kirja ilma tekstita?';
 $messages['notsentwarning'] = 'Kirja saatmine nurjus. Soovid selle ära visata?';
 $messages['noldapserver'] = 'Palun vali otsinguks LDAPi server';
-$messages['nocontactsreturned'] = 'Ühtegi kontakti ei leitud';
 $messages['nosearchname'] = 'Palun sisesta kontakti nimi või e-posti aadress';
 $messages['notuploadedwarning'] = 'Kõiki manuseid ei ole veel üles laaditud. Palun oota või tühista üleslaadimine.';
 $messages['searchsuccessful'] = 'Leiti $nr kirja';
+$messages['contactsearchsuccessful'] = 'Leiti $nr kontakti.';
 $messages['searchnomatch'] = 'Otsingule vastavaid kirju ei leitud';
 $messages['searching'] = 'Otsin...';
 $messages['checking'] = 'Kontrollin...';
@@ -94,13 +94,16 @@ $messages['messageopenerror'] = 'Kirjade serverist laadimine ebaõnnestus';
 $messages['fileuploaderror'] = 'Faili üleslaadimine ebaõnnestus';
 $messages['filesizeerror'] = 'Üleslaetava faili suurus ületab maksimaalse suuruse $size';
 $messages['copysuccess'] = '$nr aadressi edukalt kopeeritud';
-$messages['copyerror'] = 'Ühegi aadressi kopeerimine ei õnnestunud ';
+$messages['copyerror'] = 'Ühegi aadressi kopeerimine ei õnnestunud';
 $messages['sourceisreadonly'] = 'Aadressi asukohas puuduvad kirjutusõigused';
 $messages['errorsavingcontact'] = 'Kontakti aadressi salvestamine ebaõnnestus';
 $messages['movingmessage'] = 'Liigutan kirja...';
 $messages['copyingmessage'] = 'Kopeerin kirja...';
+$messages['copyingcontact'] = 'Kontakti(de) kopeerimine…';
 $messages['deletingmessage'] = 'Kustutan kirja...';
 $messages['markingmessage'] = 'Märgin kirja...';
+$messages['addingmember'] = 'Kontakti(de) gruppi lisamine…';
+$messages['removingmember'] = 'Kontakti(de) grupist eemaldamine…';
 $messages['receiptsent'] = 'Kättesaamiskinnitus saadetud';
 $messages['errorsendingreceipt'] = 'Ei õnnestunud kättesaamiskinnitust saata';
 $messages['nodeletelastidentity'] = 'See identiteet on viimane ja seda ei saa kustutada.';
@@ -122,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP tõrge ($code): autentimine nurjus';
 $messages['smtpfromerror'] = 'SMTP tõrge ($code): "$from" saatjaks määramine nurjus ($msg)';
 $messages['smtptoerror'] = 'SMTP tõrge ($code): "$to" saajaks määramine nurjus ($msg)';
 $messages['smtprecipientserror'] = 'SMTP tõrge: saajate nimekirja parsimine nurjus';
-$messages['smtpdsnerror'] = 'SMTP tõrge: puudub kohalejõudmise teavituse toetus';
 $messages['smtperror'] = 'SMTP tõrge: $msg';
 $messages['emailformaterror'] = 'Lubamatu e-posti aadress: $email';
 $messages['toomanyrecipients'] = 'Liiga palju adressaate. Vähenda kirja saajate hulka $max-ni.';
@@ -130,19 +132,27 @@ $messages['maxgroupmembersreached'] = 'Grupi liikmete arv ületab suurima lubatu
 $messages['internalerror'] = 'Ilmnes sisemine tõrge. Palun proovi uuesti.';
 $messages['contactdelerror'] = 'Kontaktide kustutamine nurjus';
 $messages['contactdeleted'] = 'Kontaktide kustutamine õnnestus';
+$messages['contactrestoreerror'] = 'Kustutatud kontakti(de) taastamine nurjus.';
+$messages['contactrestored'] = 'Kontakt(id) edukalt taastatud.';
 $messages['groupdeleted'] = 'Grupi kustutamine õnnestus';
 $messages['grouprenamed'] = 'Grupi ümbernimetamine õnnestus';
 $messages['groupcreated'] = 'Grupi loomine õnnestus';
+$messages['savedsearchdeleted'] = 'Salvestatud otsing edukalt kustutatud.';
+$messages['savedsearchdeleteerror'] = 'Salvestatud otsingu kustutamine nurjus.';
+$messages['savedsearchcreated'] = 'Salvestatud otsing edukalt loodud.';
+$messages['savedsearchcreateerror'] = 'Salvestatud otsingu loomine nurjus.';
 $messages['messagedeleted'] = 'Kiri edukalt kustutatud';
 $messages['messagemoved'] = 'Kiri edukalt liigutatud';
 $messages['messagecopied'] = 'Kiri edukalt kopeeritud';
 $messages['messagemarked'] = 'Kiri edukalt märgitud';
 $messages['autocompletechars'] = 'Sisesta vähemalt $min märki autom. lõpetuseks';
+$messages['autocompletemore'] = 'Otsingule on liiga palju vasteid. Palun sisesta veel mõni märk.';
 $messages['namecannotbeempty'] = 'Nimi ei saa olla tühi';
 $messages['nametoolong'] = 'Nimi liiga pikk';
 $messages['folderupdated'] = 'Kaust uuendatud edukalt';
 $messages['foldercreated'] = 'Kaust loodud edukalt';
 $messages['invalidimageformat'] = 'Pole õige pildi formaat';
 $messages['mispellingsfound'] = 'Kiri sisaldab õigekirjavigu';
+$messages['parentnotwritable'] = 'Kasuta loomine/liigutamine valitud kausta nurjus. Pole õigusi.';
+$messages['messagetoobig'] = 'Kiri on töötlemiseks liiga suur.';
 
-?>
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 049c731e9..f95a592c3 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/eu_ES/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Bicyus <bicyus@tenkanet.com>                                  |
-|         Bihar <gaurdabihar@gmail.com>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/eu_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -42,17 +39,15 @@ $labels['date'] = 'Data';
 $labels['size'] = 'Tamaina';
 $labels['priority'] = 'Lehentasuna';
 $labels['organization'] = 'Erakundea';
-$labels['reply-to'] = 'Erantzun-Honi';
 $labels['mailboxlist'] = 'Karpetak';
+$labels['folders'] = 'Karpetak';
 $labels['messagesfromto'] = '$from -tik $to -ra $count mezuetatik';
 $labels['messagenrof'] = '$nr mezua $count -tik';
+$labels['copy'] = 'Kopia';
 $labels['moveto'] = 'mugitu hona...';
 $labels['download'] = 'deskargatu';
 $labels['filename'] = 'Fitxategi Izena';
 $labels['filesize'] = 'Fitxategi Tamaina';
-$labels['preferhtml'] = 'HTML nahiago';
-$labels['htmlmessage'] = 'HTML Mezua';
-$labels['prettydate'] = 'Data politak';
 $labels['addtoaddressbook'] = 'Helbide liburura gehitu';
 $labels['sun'] = 'Iga';
 $labels['mon'] = 'Al';
@@ -72,7 +67,8 @@ $labels['jan'] = 'Urt';
 $labels['feb'] = 'Ots';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Api';
-$labels['may'] = 'Mai';
+$labels['may'] = 'Maiatza';
+$labels['longmay'] = 'Maiatza';
 $labels['jun'] = 'Eka';
 $labels['jul'] = 'Uzt';
 $labels['aug'] = 'Abu';
@@ -84,7 +80,6 @@ $labels['longjan'] = 'Urtarrila';
 $labels['longfeb'] = 'Otsaila';
 $labels['longmar'] = 'Martxoa';
 $labels['longapr'] = 'Apirila';
-$labels['longmay'] = 'Maiatza';
 $labels['longjun'] = 'Ekaina';
 $labels['longjul'] = 'Uztaila';
 $labels['longaug'] = 'Abuztua';
@@ -102,13 +97,9 @@ $labels['deletemessage'] = 'Mezua ezabatu';
 $labels['movemessagetotrash'] = 'Mezua zakarrontzira mugitu';
 $labels['printmessage'] = 'Mezu hau inprimatu';
 $labels['previousmessage'] = 'Aurreko mezua ikusi';
-$labels['previousmessages'] = 'Aurreko mezuak ikusi';
 $labels['firstmessage'] = 'Lehenengo mezua ikusi';
-$labels['firstmessages'] = 'Lehenengo mezu sorta ikusi';
 $labels['nextmessage'] = 'Hurrengo mezua ikusi';
-$labels['nextmessages'] = 'Hurrengo mezu sorta ikusi';
 $labels['lastmessage'] = 'Azken mezua ikusi';
-$labels['lastmessages'] = 'Azken mezu sorta ikusi';
 $labels['backtolist'] = 'Mezu zerrendara itzuli';
 $labels['viewsource'] = 'Jatorria bistarazi';
 $labels['markmessages'] = 'Markatu mezuak';
@@ -119,10 +110,10 @@ $labels['markunflagged'] = 'Ez-markatua bezala';
 $labels['select'] = 'Hautatu';
 $labels['all'] = 'Denak';
 $labels['none'] = 'Batez';
+$labels['nonesort'] = 'Batez';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['compact'] = 'Trinkotu';
 $labels['empty'] = 'Hustu';
-$labels['purge'] = 'Garbitu';
 $labels['quota'] = 'Disko erabilera';
 $labels['unknown'] = 'ezezaguna';
 $labels['unlimited'] = 'mugagabea';
@@ -172,7 +163,7 @@ $labels['save'] = 'Gorde';
 $labels['delete'] = 'Ezabatu';
 $labels['newcontact'] = 'Helbide liburu txartel berria sortu';
 $labels['deletecontact'] = 'Aukeraturiko txartelak ezabatu';
-$labels['composeto'] = 'Bidali mezua honi: ';
+$labels['composeto'] = 'Bidali mezua honi:';
 $labels['contactsfromto'] = '$from -tik $to -ra $count txarteletatik';
 $labels['print'] = 'Inprimatu';
 $labels['export'] = 'Esportatu';
@@ -191,6 +182,9 @@ $labels['manageidentities'] = 'Kontu honetako identitateak kudeatu';
 $labels['newidentity'] = 'Identitate berria';
 $labels['newitem'] = 'Elementu berria';
 $labels['edititem'] = 'Elementua Editatu';
+$labels['preferhtml'] = 'HTML nahiago';
+$labels['htmlmessage'] = 'HTML Mezua';
+$labels['prettydate'] = 'Data politak';
 $labels['setdefault'] = 'Lehenespenak ezarri';
 $labels['language'] = 'Hizkuntza';
 $labels['timezone'] = 'Ordu zonaldea';
@@ -218,7 +212,6 @@ $labels['never'] = 'inoiz ez';
 $labels['messagesdisplaying'] = 'Mezuak ikusi';
 $labels['messagescomposition'] = 'Mezuak sortu';
 $labels['folder'] = 'Karpeta';
-$labels['folders'] = 'Karpetak';
 $labels['foldername'] = 'Karpeta izena';
 $labels['subscribed'] = 'Harpideturik';
 $labels['messagecount'] = 'Mezuak';
@@ -230,4 +223,3 @@ $labels['sortby'] = 'Honela ordenatu';
 $labels['sortasc'] = 'Goraka ordenatu';
 $labels['sortdesc'] = 'Beheraka ordenatu';
 
-?>
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 8476590e2..21ee2745e 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/eu_ES/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: pi <pi@beobide.net>                                           |
-|         Bihar <gaurdabihar@gmail.com>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/eu_ES/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -53,11 +50,10 @@ $messages['noemailwarning'] = 'Mesedez idatzi baliozko eposta helbide bat';
 $messages['nonamewarning'] = 'Mesedez izen bat idatzi';
 $messages['nopagesizewarning'] = 'Mesedez paper tamaina idatzi';
 $messages['norecipientwarning'] = 'Mesedez behintzat hartzaile bat idatzi';
-$messages['nosubjectwarning'] = '\"Gaia\" eremua hutsik dago. Bat idatzi nahi al duzu?';
+$messages['nosubjectwarning'] = '"Gaia" eremua hutsik dago. Bat idatzi nahi al duzu?';
 $messages['nobodywarning'] = 'Testu gabeko mezu hau bidali?';
 $messages['notsentwarning'] = 'Mezua ez da bidali. Mezua ezeztatu nahi al duzu?';
 $messages['noldapserver'] = 'Mesedez hautatu bilaketa egiteko LDAP zerbitzari bat';
-$messages['nocontactsreturned'] = 'Ez da kontakturik aurkitu';
 $messages['nosearchname'] = 'Mesedez idatzi kontaktu izen bat edo eposta helbide bat';
 $messages['searchsuccessful'] = '$nr mezu aurkiturik';
 $messages['searchnomatch'] = 'Bilaketak ez du emaitzarik itzuli';
@@ -80,4 +76,3 @@ $messages['errorsendingreceipt'] = 'Ezin da agiria bidali';
 $messages['nodeletelastidentity'] = 'Ezin da izaera hau ezabatu, zure bakarra da';
 $messages['forbiddencharacter'] = 'Karpeta izenak debekatutako karaktereak ditu';
 
-?>
diff --git a/program/localization/fa/labels.inc b/program/localization/fa/labels.inc
index 1c8c07861..30b670194 100644
--- a/program/localization/fa/labels.inc
+++ b/program/localization/fa/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/fa/labels.inc                                                |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mohammad Ebrahim Mohammadi Panah <mebrahim at gmail.com>      |
-|         Anoosh <anoosher2003 at yahoo.com>                            |
-|         Nader Aghazadeh <Nader.aghazadeh at gmail.com>                |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fa/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -43,17 +39,15 @@ $labels['date'] = 'تاریخ';
 $labels['size'] = 'حجم';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'سازمان‌دهی';
-$labels['reply-to'] = 'پاسخ-به';
 $labels['mailboxlist'] = 'پوشه‌ها';
+$labels['folders'] = 'پوشه‌ها';
 $labels['messagesfromto'] = 'تا $count از $to تا $from پیغام‌های';
 $labels['messagenrof'] = 'تا $count پیغام  از $nr';
+$labels['copy'] = 'رونوشت';
 $labels['moveto'] = '...انتقال به';
 $labels['download'] = 'دانلود';
 $labels['filename'] = 'نام پرونده';
 $labels['filesize'] = 'اندازه‌ی پرونده';
-$labels['preferhtml'] = 'HTML نمایش';
-$labels['htmlmessage'] = 'HTML پیغام';
-$labels['prettydate'] = 'تاریخ‌های زیبا';
 $labels['addtoaddressbook'] = 'افزودن به دفتر نشانی‌ها';
 $labels['sun'] = 'یکشنبه';
 $labels['mon'] = 'دوشنبه';
@@ -74,6 +68,7 @@ $labels['feb'] = 'فوریه';
 $labels['mar'] = 'مارس';
 $labels['apr'] = 'آوریل';
 $labels['may'] = 'می';
+$labels['longmay'] = 'می';
 $labels['jun'] = 'ژوئن';
 $labels['jul'] = 'جولی';
 $labels['aug'] = 'آگوست';
@@ -85,7 +80,6 @@ $labels['longjan'] = 'ژانویه';
 $labels['longfeb'] = 'فوریه';
 $labels['longmar'] = 'مارس';
 $labels['longapr'] = 'آوریل';
-$labels['longmay'] = 'می';
 $labels['longjun'] = 'ژوئن';
 $labels['longjul'] = 'جولی';
 $labels['longaug'] = 'آگوست';
@@ -103,13 +97,9 @@ $labels['deletemessage'] = 'حذف پیغام';
 $labels['movemessagetotrash'] = 'انتقال پیغام به زباله‌دان';
 $labels['printmessage'] = 'چاپ این پیغام';
 $labels['previousmessage'] = 'نمایش پیغام قبلی';
-$labels['previousmessages'] = 'نمایش دسته‌ی قبلی  پیغام‌ها';
 $labels['firstmessage'] = 'نمایش اولین  پیغام';
-$labels['firstmessages'] = 'نمایش اولین دسته‌ی پیغام‌ها';
 $labels['nextmessage'] = 'نمایش پیغام بعدی';
-$labels['nextmessages'] = 'نمایش دسته‌ی بعدی  پیغام‌ها';
 $labels['lastmessage'] = 'نمایش آخرین پیغام';
-$labels['lastmessages'] = 'نمایش آخرین دسته‌ی  پیغام‌ها';
 $labels['backtolist'] = 'بازگشت به فهرست پیغام‌ها';
 $labels['viewsource'] = 'نمایش منبع';
 $labels['markmessages'] = 'علامت‌گذاری پیغام‌ها';
@@ -120,13 +110,13 @@ $labels['markunflagged'] = 'به عنوان علامت گذاری نشده';
 $labels['select'] = 'انتخاب';
 $labels['all'] = 'همه';
 $labels['none'] = 'هیچ';
+$labels['nonesort'] = 'هیچ';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'علامت گذاری شده';
 $labels['unanswered'] = 'پاسخ داده نشده';
 $labels['filter'] = 'فیلتر';
 $labels['compact'] = 'فشرده';
 $labels['empty'] = 'خالی';
-$labels['purge'] = 'خرد کردن';
 $labels['quota'] = 'فضای استفاده شده';
 $labels['unknown'] = 'ناشناخته';
 $labels['unlimited'] = 'نامحدود';
@@ -153,12 +143,12 @@ $labels['high'] = 'زیاد';
 $labels['highest'] = 'بیش‌ترین';
 $labels['nosubject'] = '(بدون موضوع)';
 $labels['showimages'] = 'نمایش عکس‌ها';
-$labels['alwaysshow'] = 'را نمایش بده $sender همیشه عکسهای دریافتی از  ';
+$labels['alwaysshow'] = 'را نمایش بده $sender همیشه عکسهای دریافتی از';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'ذخیره پیغام ارسالی در';
 $labels['dontsave'] = 'ذخیره نکن';
-$labels['maxuploadsize'] = 'مجاز می باشد $size حجم فایل حداکثر تا میزان  ';
+$labels['maxuploadsize'] = 'مجاز می باشد $size حجم فایل حداکثر تا میزان';
 $labels['addcc'] = 'افزودن رونوشت';
 $labels['addbcc'] = 'افزودن رونوشت مخفی';
 $labels['addreplyto'] = 'افزودن پاسخ-به';
@@ -179,7 +169,7 @@ $labels['delete'] = 'حذف';
 $labels['newcontact'] = 'ایجاد کارت تماس جدید';
 $labels['deletecontact'] = 'حذف تماس‌های انتخاب شده';
 $labels['composeto'] = 'نوشتن نامه به';
-$labels['contactsfromto'] = ' تا $count از $to تا $from  تماس‌های';
+$labels['contactsfromto'] = 'تا $count از $to تا $from  تماس‌های';
 $labels['print'] = 'چاپ';
 $labels['export'] = 'صدور';
 $labels['exportvcards'] = 'صدور اطلاعات تماس ها با فرمت Vcard';
@@ -189,9 +179,9 @@ $labels['nextpage'] = 'نمایش دسته‌ی بعدی';
 $labels['lastpage'] = 'نمایش دسته‌ی آخر';
 $labels['groups'] = 'گروه‌ها';
 $labels['personaladrbook'] = 'نشانی‌های شخصی';
-$labels['import'] = 'وارد کردن ';
+$labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'وارد کردن تماسها';
-$labels['importfromfile'] = ':ورود اطلاعات از فایل ';
+$labels['importfromfile'] = ':ورود اطلاعات از فایل';
 $labels['importreplace'] = 'جایگزینی دفترچه آدرس کامل';
 $labels['importtext'] = 'شما میتوانید اطلاعات تماس ها را به دفترچه تلفن موجود منتقل کنید. <br/>  ما در حال حاضر امکان انتقال آدرسها را با فرمت <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> برای شما فراهم نموده ایم.';
 $labels['done'] = 'انجام شد';
@@ -204,6 +194,9 @@ $labels['manageidentities'] = 'مدیریت شناسه‌ها برای این ح
 $labels['newidentity'] = 'شناسه جدید';
 $labels['newitem'] = 'مورد جدید';
 $labels['edititem'] = 'ویرایش مورد';
+$labels['preferhtml'] = 'HTML نمایش';
+$labels['htmlmessage'] = 'HTML پیغام';
+$labels['prettydate'] = 'تاریخ‌های زیبا';
 $labels['setdefault'] = 'پیش‌فرض کن';
 $labels['autodetect'] = 'خودکار';
 $labels['language'] = 'زبان';
@@ -225,7 +218,7 @@ $labels['askuser'] = 'پرسش از کاربر';
 $labels['autosend'] = 'ارسال خود به خود';
 $labels['ignore'] = 'نادیده گیری';
 $labels['readwhendeleted'] = 'در هنگام پاک کردن، پیغام را به عنوان خوانده شده علامت بزن';
-$labels['flagfordeletion'] = 'پیغام را بجای پاک کردن، برای پاک شدن آماده کن ';
+$labels['flagfordeletion'] = 'پیغام را بجای پاک کردن، برای پاک شدن آماده کن';
 $labels['skipdeleted'] = 'پیغام های حذف شده را نمایش نده';
 $labels['showremoteimages'] = 'تصاویر لینک شده را نمایش بده';
 $labels['fromknownsenders'] = 'از سوی فرستنده شناس';
@@ -245,7 +238,6 @@ $labels['advancedoptions'] = 'گزینه های پیشرفته';
 $labels['focusonnewmessage'] = 'مشخص نمودن پیغام جدید';
 $labels['checkallfolders'] = 'همه پوشه ها رو برای مشاهده پیغام های جدید بگردید';
 $labels['folder'] = 'پوشه';
-$labels['folders'] = 'پوشه‌ها';
 $labels['foldername'] = 'نام پوشه';
 $labels['messagecount'] = 'پیغام‌ها';
 $labels['create'] = 'ایجاد';
@@ -260,4 +252,3 @@ $labels['KB'] = 'کیلو بایت';
 $labels['MB'] = 'مگابایت';
 $labels['GB'] = 'گیگا بایت';
 
-?>
diff --git a/program/localization/fa/messages.inc b/program/localization/fa/messages.inc
index a33174f87..2601fd230 100644
--- a/program/localization/fa/messages.inc
+++ b/program/localization/fa/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/fa/messages.inc                                              |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mohammad Ebrahim Mohammadi Panah <mebrahim at gmail.com>      |
-|         Anoosh <anoosher2003 at yahoo.com>                            |
-|         Nader Aghazadeh <Nader.aghazadeh at gmail.com>                |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fa/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -41,7 +37,7 @@ $messages['encryptedmessage'] = '!این یک پیغام رمزنگاری شده
 $messages['nocontactsfound'] = 'هیج تماسی پیدا نشد';
 $messages['contactnotfound'] = 'تماس درخواست شده پیدا نشد';
 $messages['sendingfailed'] = 'ناموفق در فرستادن پیغام';
-$messages['senttooquickly'] = 'دقیقه صبر کنید $sec لطفا قبل از ارسال این پیغام     ';
+$messages['senttooquickly'] = 'دقیقه صبر کنید $sec لطفا قبل از ارسال این پیغام';
 $messages['errorsavingsent'] = 'در لحظه ذخیره پیغام ارسال شده ، مشکل به وجود آمد';
 $messages['errorsaving'] = 'هنگام ذخیره‌سازی، اشکالی پیش آمد';
 $messages['errormoving'] = 'ناتوان در انتقال پیغام';
@@ -50,19 +46,18 @@ $messages['deletecontactconfirm'] = 'آیا واقعاً می‌خواهید ت�
 $messages['deletemessagesconfirm'] = 'آیا واقعاً می‌خواهید پیغام (های) انتخاب شده را حذف کنید؟';
 $messages['deletefolderconfirm'] = 'آیا واقعاً می‌خواهید این پوشه را حذف کنید؟';
 $messages['purgefolderconfirm'] = 'آیا واقعاً می‌خواهید همه‌ی پیغام‌های داخل این پوشه را حذف کنید؟';
-$messages['folderdeleting'] = '...در حال حذف پوشه ';
-$messages['foldermoving'] = '...در حال انتقال پوشه ';
+$messages['folderdeleting'] = '...در حال حذف پوشه';
+$messages['foldermoving'] = '...در حال انتقال پوشه';
 $messages['formincomplete'] = 'فرم کاملاً پر نشده بود';
 $messages['noemailwarning'] = 'لطفاً یک نشانی ایمیل معتبر وارد کنید';
 $messages['nonamewarning'] = 'لطفاً یک نام وارد کنید';
 $messages['nopagesizewarning'] = 'لطفاً یک اندازه برای صفحه وارد کنید';
 $messages['nosenderwarning'] = 'لطفاً آدرس فرستنده ایمیل را وارد کنید';
 $messages['norecipientwarning'] = 'لطفاً حداقل یک گیرنده وارد کنید';
-$messages['nosubjectwarning'] = 'قسمت \"موضوع\" خالی است. آیا می‌خواهید اکنون وارد کنید؟';
+$messages['nosubjectwarning'] = 'قسمت "موضوع" خالی است. آیا می‌خواهید اکنون وارد کنید؟';
 $messages['nobodywarning'] = 'این پیغام بدون متن ارسال شود؟';
 $messages['notsentwarning'] = 'پیغام ارسال نشده است. آیا می‌خواهید پیغام را از بین ببرید؟';
 $messages['noldapserver'] = 'برای جست و جو انتخاب کنید LDAP لطفاً یک سرور';
-$messages['nocontactsreturned'] = 'هیچ تماسی پیدا نشد';
 $messages['nosearchname'] = 'لطفا نام یک تماس و یا یک نشانی ایمیل وارد کنید';
 $messages['searchsuccessful'] = 'پیغام پیدا شد $nr';
 $messages['searchnomatch'] = 'جست و جو هیچ نتیجه‌ای نداشت';
@@ -93,4 +88,3 @@ $messages['opnotpermitted'] = '!عملیات مجاز نیست';
 $messages['nofromaddress'] = 'ایمیل های گم شده در گزینه انتخاب شده';
 $messages['editorwarning'] = 'تغییر ویرایشگر متن باعث ابطال فرمت همه متن ها می شود ، آیا می خواهید با این وجود عملیات را ادامه بدهید ؟';
 
-?>
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 19700a5da..7e5eb4414 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -1,251 +1,210 @@
 <?php
 
-
-
-// login page
-$labels['welcome']   = 'به اين پروژه خوش امديد';
-$labels['username']  = 'نام کاربر  ';
-$labels['password']  = 'شفر';
-$labels['server']    = 'سرور';
-$labels['login']     = 'داخل شدن ';
-
-// taskbar
-$labels['logout']   = 'خروج';
-$labels['mail']     = 'ايميل ';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fa_AF/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
+$labels['welcome'] = 'به اين پروژه خوش امديد';
+$labels['username'] = 'نام کاربر';
+$labels['password'] = 'شفر';
+$labels['server'] = 'سرور';
+$labels['login'] = 'داخل شدن';
+$labels['logout'] = 'خروج';
+$labels['mail'] = 'ايميل';
 $labels['settings'] = 'تنظیمات شخصی';
-$labels['addressbook'] = 'کتاب ادرس ';
-
-// mailbox names
-$labels['inbox']  = 'نامه های ارسالي  ';
+$labels['addressbook'] = 'کتاب ادرس';
+$labels['inbox'] = 'نامه های ارسالي';
 $labels['drafts'] = 'نامه های ناتکمیل';
-$labels['sent']   = 'ارسال شده ';
-$labels['trash']  = 'اشغال دانی';
-$labels['junk']   = 'بیکاره';
-
-// message listing
-$labels['subject'] = 'مضمون ';
-$labels['from']    = 'ارسال کننده ';
-$labels['to']      = 'ګيرينده ';
-$labels['cc']      = 'تکثیر';
-$labels['bcc']     = 'تکثیر پنهان';
+$labels['sent'] = 'ارسال شده';
+$labels['trash'] = 'اشغال دانی';
+$labels['junk'] = 'بیکاره';
+$labels['subject'] = 'مضمون';
+$labels['from'] = 'ارسال کننده';
+$labels['to'] = 'ګيرينده';
+$labels['cc'] = 'تکثیر';
+$labels['bcc'] = 'تکثیر پنهان';
 $labels['replyto'] = 'جواب نامه';
-$labels['date']    = 'تاريخ ';
-$labels['size']    = 'اندازه  ';
+$labels['date'] = 'تاريخ';
+$labels['size'] = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'تنظیمات';
-
 $labels['mailboxlist'] = 'پوشه ها';
-$labels['messagesfromto'] = 'از  مقدار پيغام به مقدار حساب شده ';
-$labels['messagenrof'] = 'از شمار پيغام های حساب شده ';
-
-$labels['moveto']   = 'انتقال بدهید به ...';
-$labels['download'] = 'داونلود کردن ';
-
-$labels['filename'] = ' نام فايل ';
+$labels['folders'] = 'پوشه ها';
+$labels['messagesfromto'] = 'از  مقدار پيغام به مقدار حساب شده';
+$labels['messagenrof'] = 'از شمار پيغام های حساب شده';
+$labels['copy'] = 'تکثیر';
+$labels['moveto'] = 'انتقال بدهید به ...';
+$labels['download'] = 'داونلود کردن';
+$labels['filename'] = 'نام فايل';
 $labels['filesize'] = 'اندازه فايل';
-
-$labels['preferhtml'] = 'نشان دادن ايچ ټي ام ايل ';
-$labels['htmlmessage'] = 'پيغام ايچ ټي‌ام ايل ';
-$labels['prettydate'] = 'تاريخ های مهم ';
-
-$labels['addtoaddressbook'] = 'در کتاب ادرس علاوه نماييد ';
-
-// weekdays short
-$labels['sun'] = 'يکشنپبه ';
-$labels['mon'] = 'دوشنبه  ';
-$labels['tue'] = 'سه شنبه  ';
-$labels['wed'] = 'چهارشنبه ';
-$labels['thu'] = 'پنج شنبه  ';
-$labels['fri'] = 'جمعه ';
-$labels['sat'] = 'شنبه  ';
-
-// weekdays long
-$labels['sunday']    = 'يکشنبه ';
-$labels['monday']    = 'دوشنبه ';
-$labels['tuesday']   = 'سه شنبه ';
-$labels['wednesday'] = 'چهارشنبه  ';
-$labels['thursday']  = 'پنج شنبه  ';
-$labels['friday']    = 'جمعه  ';
-$labels['saturday']  = 'شنبه  ';
-
-// months short
-$labels['jan']	= 'جنوری';
-$labels['feb']	= 'فبروری';
-$labels['mar']	= 'مارچ';
-$labels['apr']	= 'اپریل';
-$labels['may']	= 'می';
-$labels['jun']	= 'جون';
-$labels['jul'] 	= 'جولایی';
-$labels['aug']	= 'آگست';
-$labels['sep']	= 'سپتمبر';
-$labels['oct']	= 'اکتوبر';
-$labels['nov']	= 'نومبر';
-$labels['dec']	= 'دسمبر';
-
-// months long
-$labels['longjan']	= 'جنوری';
-$labels['longfeb']	= 'فبروری';
-$labels['longmar']	= 'مارچ';
-$labels['longapr']	= 'اپریل';
-$labels['longmay']	= 'می';
-$labels['longjun']	= 'جون';
-$labels['longjul']	= 'جولایی';
-$labels['longaug']	= 'آگست';
-$labels['longsep']	= 'سپتمبر';
-$labels['longoct']	= 'اکتوبر';
-$labels['longnov']	= 'نومبر';
-$labels['longdec']	= 'دسمبر';
-
-$labels['today'] = 'امروز ';
-
-// toolbar buttons
-$labels['checkmail']        = 'بررسي کردن پيغام های جديد ';
-$labels['writenewmessage']  = 'ساختن پيغام جديد ';
-$labels['replytomessage']   = 'جواب دادن به پيغام ';
-$labels['replytoallmessage'] = 'به فرستنده و تمام گيرينده ها جواب بدهيد ';
-$labels['forwardmessage']   = 'فرستادن این پیام به دیگران / فارورد';
-$labels['deletemessage']    = 'حذف کردن پيغام ';
-$labels['movemessagetotrash'] = 'پيغام را به اشيآيي حذف شده منتقل نماييد ';
-$labels['printmessage']     = 'اين پيغام را چاپ کنيد ';
-$labels['previousmessage']  = 'پيغام قبلي را نشان دهيد ';
-$labels['previousmessages'] = 'دسته قبلي پيغام ها را نشان دهيد ';
-$labels['firstmessage']     = 'پيغام اولي را نشان دهيد ';
-$labels['firstmessages']    = 'دسته اولي‌پيغام ها را نشان دهيد ';
-$labels['nextmessage']      = 'پيغام بعدي رانشان دهيد ';
-$labels['nextmessages']     = 'بسته بعدی پيغام ها را نشان دهيد ';
-$labels['lastmessage']      = 'پيغام اخير را نشان دهيد ';
-$labels['lastmessages']     = 'بسته آخری پيغام ها را نشان دهيد ';
-$labels['backtolist']       = 'بازگشتن به لست پيغام ';
-$labels['viewsource']       = 'منبع / کود را نشان دهيد  ';
-$labels['markmessages']     = 'پيغام ها را نشاني کنيد ';
-$labels['markread']         = 'مانند خوانده شده ';
-$labels['markunread']       = 'مانند خوانده نشده  ';
-$labels['markflagged']         = 'مانند نشانی شده ';
-$labels['markunflagged']       = 'مانند نشانی ناشده';
-
-$labels['select'] = 'انتخاب کردن ';
-$labels['all'] = 'تمام ';
+$labels['addtoaddressbook'] = 'در کتاب ادرس علاوه نماييد';
+$labels['sun'] = 'يکشنپبه';
+$labels['mon'] = 'دوشنبه';
+$labels['tue'] = 'سه شنبه';
+$labels['wed'] = 'چهارشنبه';
+$labels['thu'] = 'پنج شنبه';
+$labels['fri'] = 'جمعه';
+$labels['sat'] = 'شنبه';
+$labels['sunday'] = 'يکشنبه';
+$labels['monday'] = 'دوشنبه';
+$labels['tuesday'] = 'سه شنبه';
+$labels['wednesday'] = 'چهارشنبه';
+$labels['thursday'] = 'پنج شنبه';
+$labels['friday'] = 'جمعه';
+$labels['saturday'] = 'شنبه';
+$labels['jan'] = 'جنوری';
+$labels['feb'] = 'فبروری';
+$labels['mar'] = 'مارچ';
+$labels['apr'] = 'اپریل';
+$labels['may'] = 'می';
+$labels['longmay'] = 'می';
+$labels['jun'] = 'جون';
+$labels['jul'] = 'جولایی';
+$labels['aug'] = 'آگست';
+$labels['sep'] = 'سپتمبر';
+$labels['oct'] = 'اکتوبر';
+$labels['nov'] = 'نومبر';
+$labels['dec'] = 'دسمبر';
+$labels['longjan'] = 'جنوری';
+$labels['longfeb'] = 'فبروری';
+$labels['longmar'] = 'مارچ';
+$labels['longapr'] = 'اپریل';
+$labels['longjun'] = 'جون';
+$labels['longjul'] = 'جولایی';
+$labels['longaug'] = 'آگست';
+$labels['longsep'] = 'سپتمبر';
+$labels['longoct'] = 'اکتوبر';
+$labels['longnov'] = 'نومبر';
+$labels['longdec'] = 'دسمبر';
+$labels['today'] = 'امروز';
+$labels['checkmail'] = 'بررسي کردن پيغام های جديد';
+$labels['writenewmessage'] = 'ساختن پيغام جديد';
+$labels['replytomessage'] = 'جواب دادن به پيغام';
+$labels['replytoallmessage'] = 'به فرستنده و تمام گيرينده ها جواب بدهيد';
+$labels['forwardmessage'] = 'فرستادن این پیام به دیگران / فارورد';
+$labels['deletemessage'] = 'حذف کردن پيغام';
+$labels['movemessagetotrash'] = 'پيغام را به اشيآيي حذف شده منتقل نماييد';
+$labels['printmessage'] = 'اين پيغام را چاپ کنيد';
+$labels['previousmessage'] = 'پيغام قبلي را نشان دهيد';
+$labels['firstmessage'] = 'پيغام اولي را نشان دهيد';
+$labels['nextmessage'] = 'پيغام بعدي رانشان دهيد';
+$labels['lastmessage'] = 'پيغام اخير را نشان دهيد';
+$labels['backtolist'] = 'بازگشتن به لست پيغام';
+$labels['viewsource'] = 'منبع / کود را نشان دهيد';
+$labels['markmessages'] = 'پيغام ها را نشاني کنيد';
+$labels['markread'] = 'مانند خوانده شده';
+$labels['markunread'] = 'مانند خوانده نشده';
+$labels['markflagged'] = 'مانند نشانی شده';
+$labels['markunflagged'] = 'مانند نشانی ناشده';
+$labels['select'] = 'انتخاب کردن';
+$labels['all'] = 'تمام';
 $labels['none'] = 'هيچ کدام';
-$labels['unread'] = 'ناخوانده ';
-$labels['flagged'] = ' نشانی شده ';
+$labels['nonesort'] = 'هيچ کدام';
+$labels['unread'] = 'ناخوانده';
+$labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
 $labels['filter'] = 'تصفیه کردن';
-
-$labels['compact'] = 'خلاصه ';
-$labels['empty'] = 'خالي ';
-$labels['purge'] = ' پاکسازي ';
-
-$labels['quota'] = '‌طريقه استعمال ديسک ';
-$labels['unknown']  = 'نامعلوم ';
-$labels['unlimited']  = 'نامعين/ نامحدود ';
-
-$labels['quicksearch']  = 'جستجوی سریع';
-$labels['resetsearch']  = 'بازنشاندن جستجو ';
-
+$labels['compact'] = 'خلاصه';
+$labels['empty'] = 'خالي';
+$labels['quota'] = '‌طريقه استعمال ديسک';
+$labels['unknown'] = 'نامعلوم';
+$labels['unlimited'] = 'نامعين/ نامحدود';
+$labels['quicksearch'] = 'جستجوی سریع';
+$labels['resetsearch'] = 'بازنشاندن جستجو';
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
-
-// message compose
-$labels['compose']        = 'نوشتن پیام حدید';
-$labels['savemessage']    = 'این پیش نویس را حفظ نمایید';
-$labels['sendmessage']    = 'پيغام را همين حالا ارسال کنيد ';
-$labels['addattachment']  = 'ضميمه نمودن يک فايل ';
-$labels['charset']        = 'ست کرکتر ها';
-$labels['editortype']     = 'روش تصحیح کننده / نوشتاری';
-$labels['returnreceipt']  = 'رسید برای مراجعت نامه  ';
-
-$labels['checkspelling'] = 'املا را بررسي کنيد ';
+$labels['compose'] = 'نوشتن پیام حدید';
+$labels['savemessage'] = 'این پیش نویس را حفظ نمایید';
+$labels['sendmessage'] = 'پيغام را همين حالا ارسال کنيد';
+$labels['addattachment'] = 'ضميمه نمودن يک فايل';
+$labels['charset'] = 'ست کرکتر ها';
+$labels['editortype'] = 'روش تصحیح کننده / نوشتاری';
+$labels['returnreceipt'] = 'رسید برای مراجعت نامه';
+$labels['checkspelling'] = 'املا را بررسي کنيد';
 $labels['resumeediting'] = 'ادامه / بازگشت به تصحیی کردن / نوشتن';
-$labels['revertto']      = 'رجوع کردن به ';
-
-$labels['attachments'] = 'ضميمه ها ';
-$labels['upload'] = 'اپلود کردن ';
-$labels['close']  = 'بستن ';
-
-$labels['low']     = 'کم ';
-$labels['lowest']  = 'کمترین';
-$labels['normal']  = 'عادی';
-$labels['high']    = 'عالي ';
-$labels['highest'] = 'عاليترين ';
-
-$labels['nosubject']  = 'مضمون ندارد ';
-$labels['showimages'] = 'نمايش دادن تصاوير ';
+$labels['revertto'] = 'رجوع کردن به';
+$labels['attachments'] = 'ضميمه ها';
+$labels['upload'] = 'اپلود کردن';
+$labels['close'] = 'بستن';
+$labels['low'] = 'کم';
+$labels['lowest'] = 'کمترین';
+$labels['normal'] = 'عادی';
+$labels['high'] = 'عالي';
+$labels['highest'] = 'عاليترين';
+$labels['nosubject'] = 'مضمون ندارد';
+$labels['showimages'] = 'نمايش دادن تصاوير';
 $labels['alwaysshow'] = 'همیشه نشان بده تصاویر را از این فرسیتنده﷼';
-
 $labels['htmltoggle'] = 'ایچ تی ام ایل';
-$labels['plaintoggle'] = 'متن ساده ';
+$labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'پیام ارسال شده را ذخیره کن در';
 $labels['dontsave'] = 'ذخیره نکنید';
-$labels['maxuploadsize'] = '$sizeزیاد ترین اندازه اجازه داده شده فایل عبارت است از ';
-
+$labels['maxuploadsize'] = '$sizeزیاد ترین اندازه اجازه داده شده فایل عبارت است از';
 $labels['addcc'] = 'نسخیه دوم  را علاوه کنید';
 $labels['addbcc'] = 'نسخه پنهان را علاوه کنید';
-$labels['addreplyto'] = 'علاوه کردن ';
-
-// mdn
-$labels['mdnrequest'] = 'فرستانده این پیام خواهش نموده زمانیکه شما نامه را خواندید براش آگاهی داده شود آيا شما ميخواهيد که فرستنده را آګاه سازيد ';
+$labels['addreplyto'] = 'علاوه کردن';
+$labels['mdnrequest'] = 'فرستانده این پیام خواهش نموده زمانیکه شما نامه را خواندید براش آگاهی داده شود آيا شما ميخواهيد که فرستنده را آګاه سازيد';
 $labels['receiptread'] = 'بازگشت رسید (خوانده شده)';
-$labels['yourmessage'] = 'برای پيغام شما اين يک رسید بازگشت است ';
+$labels['yourmessage'] = 'برای پيغام شما اين يک رسید بازگشت است';
 $labels['receiptnote'] = 'يادداشت : اين رسيد شما را فقط اګاه ميسازد که پيغام به کامپیوتر گیرنده نمایش داده شده است  هیچ گارنتی وجود ندارد که گیرنده پیام این پیام را خوانده و یا مطالب آن را درک کرده باشد.';
-
-// address boook
-$labels['name']      = 'نشان دادن نام  ';
-$labels['firstname'] = 'اسم/ نام ';
-$labels['surname']   = 'اسم فاميلي / تخلص';
-$labels['email']     = 'ايميل ';
-
-$labels['addcontact'] = 'آدرس جديد را علاوه کنيد ';
+$labels['name'] = 'نشان دادن نام';
+$labels['firstname'] = 'اسم/ نام';
+$labels['surname'] = 'اسم فاميلي / تخلص';
+$labels['email'] = 'ايميل';
+$labels['addcontact'] = 'آدرس جديد را علاوه کنيد';
 $labels['editcontact'] = 'آدرس جدید را تصحیح کنید';
-
-$labels['edit']   = 'تصحيح کردن ';
-$labels['cancel'] = 'لغو کردن/ حذف کردن ';
-$labels['save']   = 'حفظ کردن ';
-$labels['delete'] = 'حذف کردن ';
-
-$labels['newcontact']     = 'کارت تماس جديد را بسازيد ';
-$labels['deletecontact']  = 'آدرس های انتخاب شده را حذف کنيد ';
-$labels['composeto']      = 'ايمیل را نوشته کنيد به ';
-$labels['contactsfromto'] = 'از$count$to به $from آدرس ها از ';
-$labels['print']          = 'چاپ کردن  ';
-$labels['export']         = 'صادر کردن ';
-$labels['exportvcards']   = ' صادر نماییدVcardآدرس ها را به فرمت ';
-
-$labels['previouspage']   = ' بسته قبلي را نشان دهيد ';
-$labels['firstpage']      = 'بسته اولي را نشان دهيد ';
-$labels['nextpage']       = 'بسته بعدي را نشان دهيد ';
-$labels['lastpage']       = 'بسته اخير را نشان دهيد ';
-
-$labels['groups'] = ' گروه ها ';
-$labels['personaladrbook'] = 'ادرس های شخصي ';
-
+$labels['edit'] = 'تصحيح کردن';
+$labels['cancel'] = 'لغو کردن/ حذف کردن';
+$labels['save'] = 'حفظ کردن';
+$labels['delete'] = 'حذف کردن';
+$labels['newcontact'] = 'کارت تماس جديد را بسازيد';
+$labels['deletecontact'] = 'آدرس های انتخاب شده را حذف کنيد';
+$labels['composeto'] = 'ايمیل را نوشته کنيد به';
+$labels['contactsfromto'] = 'از$count$to به $from آدرس ها از';
+$labels['print'] = 'چاپ کردن';
+$labels['export'] = 'صادر کردن';
+$labels['exportvcards'] = 'صادر نماییدVcardآدرس ها را به فرمت';
+$labels['previouspage'] = 'بسته قبلي را نشان دهيد';
+$labels['firstpage'] = 'بسته اولي را نشان دهيد';
+$labels['nextpage'] = 'بسته بعدي را نشان دهيد';
+$labels['lastpage'] = 'بسته اخير را نشان دهيد';
+$labels['groups'] = 'گروه ها';
+$labels['personaladrbook'] = 'ادرس های شخصي';
 $labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'آدرس ها را وارد نمایید';
 $labels['importfromfile'] = 'از یک فایل وارد نمایید';
 $labels['importreplace'] = 'تمام کتاب آدرس ها را عوض نمایید';
-$labels['importtext'] = 'شما میتوانید که آدرس ها را از یاک کتاب آدرس های موجوده وارد نمایید<br/>شما میتوانید که آدرس ها را به فرمت <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>وارد نمایید ';
+$labels['importtext'] = 'شما میتوانید که آدرس ها را از یاک کتاب آدرس های موجوده وارد نمایید<br/>شما میتوانید که آدرس ها را به فرمت <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>وارد نمایید';
 $labels['done'] = 'اجرا شد';
-
-// settings
-$labels['settingsfor']  = 'تنظیمات برای';
-
-$labels['preferences']  = 'ترجيحات ';
-$labels['userpreferences']  = 'ترجيحات کاربر ';
-$labels['editpreferences']  = 'تصحيح کردن ترجيحات  کاربر ';
-
-$labels['identities']  = ' شناخت ها ';
-$labels['manageidentities']  = 'اداره کردن شناسای ها برای اين آدرس ';
-$labels['newidentity']  = 'شناخت جديد ';
-
-$labels['newitem']  = 'فقره جديد  ';
-$labels['edititem']  = 'تصحيح کردن فقره';
-
-$labels['setdefault']  = 'بطور همیشگی انتخاب نمایید';
-$labels['autodetect']  = 'اتومات';
-$labels['language']  = 'لسان';
-$labels['timezone']  = ' ناحيه زمانی ';
-$labels['pagesize']  = 'تعداد سطر ها در صفحه';
-$labels['signature'] = 'امضا ';
-$labels['dstactive']  = 'Daylight saving time';
-$labels['htmleditor'] = 'پيغام ايچ ټي ام ايل رانوشته کنيد ';
+$labels['settingsfor'] = 'تنظیمات برای';
+$labels['preferences'] = 'ترجيحات';
+$labels['userpreferences'] = 'ترجيحات کاربر';
+$labels['editpreferences'] = 'تصحيح کردن ترجيحات  کاربر';
+$labels['identities'] = 'شناخت ها';
+$labels['manageidentities'] = 'اداره کردن شناسای ها برای اين آدرس';
+$labels['newidentity'] = 'شناخت جديد';
+$labels['newitem'] = 'فقره جديد';
+$labels['edititem'] = 'تصحيح کردن فقره';
+$labels['preferhtml'] = 'نشان دادن ايچ ټي ام ايل';
+$labels['htmlmessage'] = 'پيغام ايچ ټي‌ام ايل';
+$labels['prettydate'] = 'تاريخ های مهم';
+$labels['setdefault'] = 'بطور همیشگی انتخاب نمایید';
+$labels['autodetect'] = 'اتومات';
+$labels['language'] = 'لسان';
+$labels['timezone'] = 'ناحيه زمانی';
+$labels['pagesize'] = 'تعداد سطر ها در صفحه';
+$labels['signature'] = 'امضا';
+$labels['dstactive'] = 'Daylight saving time';
+$labels['htmleditor'] = 'پيغام ايچ ټي ام ايل رانوشته کنيد';
 $labels['htmlsignature'] = 'امضای حساب ایمیل بشکل ایچ تی ام ال';
 $labels['previewpane'] = 'چوکات پیشنما را نشان دهید';
 $labels['skin'] = 'تمپلیت محیط کاربری';
@@ -265,11 +224,10 @@ $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'نامه های از آدرس های شناخته شده';
 $labels['always'] = 'همیشه';
 $labels['showinlineimages'] = 'تصاویر ضمیمه شده را در پایین پیام نشان دهید.';
-$labels['autosavedraft']  = 'بصورت خودکار پیش نويس را حفظ کنيد ';
-$labels['everynminutes']  = ' دقیفه$n هر ';
-$labels['keepaliveevery']  = ' دقیفه$n هر ';
-$labels['keepalive']  = 'بررسي کردن پيغام های جديد ';
-$labels['never']  = 'هیچگاه';
+$labels['autosavedraft'] = 'بصورت خودکار پیش نويس را حفظ کنيد';
+$labels['everynminutes'] = 'دقیفه$n هر';
+$labels['keepalive'] = 'بررسي کردن پيغام های جديد';
+$labels['never'] = 'هیچگاه';
 $labels['messagesdisplaying'] = 'نمایش دادن پیام ها';
 $labels['messagescomposition'] = 'ایجاد کردن پیام جدید';
 $labels['mimeparamfolding'] = 'نام های ضمیمه ها';
@@ -279,25 +237,19 @@ $labels['2047folding'] = 'Full RFC 2047 (دیگر ها)';
 $labels['advancedoptions'] = 'انتخاب های پیشرفته';
 $labels['focusonnewmessage'] = 'فوکس دادن پینجره مرورگر به پیام جدید';
 $labels['checkallfolders'] = 'تمام پوشه ها را بخاطر پیام های جدید بررسی کنید';
-
-$labels['folder']  = 'پوشه ';
-$labels['folders']  = 'پوشه ها';
-$labels['foldername']  = 'نام پوشه ';
-$labels['subscribed']  = 'مشترک ';
-$labels['messagecount'] = 'پيغام ها ';
-$labels['create']  = 'ایجاد کردن';
-$labels['createfolder']  = 'ایجاد پوشه جدید';
-$labels['managefolders']  = 'اداره کردن پوشه ها ';
+$labels['folder'] = 'پوشه';
+$labels['foldername'] = 'نام پوشه';
+$labels['subscribed'] = 'مشترک';
+$labels['messagecount'] = 'پيغام ها';
+$labels['create'] = 'ایجاد کردن';
+$labels['createfolder'] = 'ایجاد پوشه جدید';
+$labels['managefolders'] = 'اداره کردن پوشه ها';
 $labels['specialfolders'] = 'پوشه های مخصوص';
-
-$labels['sortby'] = 'فهرست کردن توسط ';
-$labels['sortasc']  = 'فهرست کردن از طرف بالا به پايين ';
-$labels['sortdesc'] = 'فهرست کردن از طرف پايين به بالا ';
-
-// units
+$labels['sortby'] = 'فهرست کردن توسط';
+$labels['sortasc'] = 'فهرست کردن از طرف بالا به پايين';
+$labels['sortdesc'] = 'فهرست کردن از طرف پايين به بالا';
 $labels['B'] = 'بایت';
 $labels['KB'] = 'کیلو بایت';
 $labels['MB'] = 'میگا بایت';
 $labels['GB'] = 'گیگا بایت';
 
-?>
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index f298e0f25..b8c6a61d0 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -1,77 +1,90 @@
 <?php
 
-$messages['loginfailed']  = 'داخل شدن به سيستم موفق نه شد ';
-$messages['cookiesdisabled'] = 'جستجوگر شما  cookies را قبول نميکند ';
-$messages['sessionerror'] = 'جلسه شما وجود ندارد و يا هم از زمان معين آن گذشته است ';
-$messages['imaperror'] = 'وصل شدن به آیمیپ سرور موفق نشد ';
-$messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد ';
-$messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ ';
-$messages['mailboxempty'] = 'صندوق پستي خالي است ';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fa_AF/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$messages = array();
+$messages['loginfailed'] = 'داخل شدن به سيستم موفق نه شد';
+$messages['cookiesdisabled'] = 'جستجوگر شما  cookies را قبول نميکند';
+$messages['sessionerror'] = 'جلسه شما وجود ندارد و يا هم از زمان معين آن گذشته است';
+$messages['imaperror'] = 'وصل شدن به آیمیپ سرور موفق نشد';
+$messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
+$messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ';
+$messages['mailboxempty'] = 'صندوق پستي خالي است';
 $messages['loading'] = 'در حال باز شدن  ...';
 $messages['loadingdata'] = 'در حال بار کردن دیتا';
-$messages['checkingmail'] = 'پيغام های جديد را بررسي ميکند ';
-$messages['sendingmessage'] = 'پيغام ها را ارسال ميکند ';
+$messages['checkingmail'] = 'پيغام های جديد را بررسي ميکند';
+$messages['sendingmessage'] = 'پيغام ها را ارسال ميکند';
 $messages['messagesent'] = 'پیام موفقانه ارسال گردید';
 $messages['savingmessage'] = 'در حال حفظ کردن پیام';
-$messages['messagesaved'] = 'پيغام را به پیش نويس حفظ کرد ';
+$messages['messagesaved'] = 'پيغام را به پیش نويس حفظ کرد';
 $messages['successfullysaved'] = 'حفظ پیام موفقانه صورت گرفت';
-$messages['addedsuccessfully'] = 'آدرس بصورت مکمل در کتاب ادرس علاوه شد ';
-$messages['contactexists'] = 'يک آدرس همرا اين ايميل ادرس قبلاً وجود دارد  ';
-$messages['blockedimages'] = 'برای حفظ استقلال پيغام شما، تصاویر اجنبی این پیام بلاک شده اند ';
-$messages['encryptedmessage'] = 'اين يک پيغام مخفي است و اشکار شده نميتواند   معذرت ميخواهيم ';
-$messages['nocontactsfound'] = 'هيچ آدرسی دريافت نه شد ';
-$messages['contactnotfound'] = 'آدرس خواسته شده دريافت نه شد ';
-$messages['sendingfailed'] = 'فرستادن پيغام موفق نه شد ';
-$messages['senttooquickly'] = ' ثانیه منتظر باشید$secلطفا مدت  قبل از ارسال این پیام';
-$messages['errorsavingsent'] = 'در جريان حفظ کردن پیام ارسال شده يکاشتباه به وجود امد ';
-$messages['errorsaving'] = 'در جريان حفظ کردن يکاشتباه به وجود امد ';
-$messages['errormoving'] = 'پيغام نقل مکان شده نتوانست ';
-$messages['errordeleting'] = 'پيغام حذف شده نتوانست ';
-$messages['deletecontactconfirm']  = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟ ';
-$messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟ ';
-$messages['deletefolderconfirm']  = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟ ';
-$messages['purgefolderconfirm']  = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟ ';
+$messages['addedsuccessfully'] = 'آدرس بصورت مکمل در کتاب ادرس علاوه شد';
+$messages['contactexists'] = 'يک آدرس همرا اين ايميل ادرس قبلاً وجود دارد';
+$messages['blockedimages'] = 'برای حفظ استقلال پيغام شما، تصاویر اجنبی این پیام بلاک شده اند';
+$messages['encryptedmessage'] = 'اين يک پيغام مخفي است و اشکار شده نميتواند   معذرت ميخواهيم';
+$messages['nocontactsfound'] = 'هيچ آدرسی دريافت نه شد';
+$messages['contactnotfound'] = 'آدرس خواسته شده دريافت نه شد';
+$messages['sendingfailed'] = 'فرستادن پيغام موفق نه شد';
+$messages['senttooquickly'] = 'ثانیه منتظر باشید$secلطفا مدت  قبل از ارسال این پیام';
+$messages['errorsavingsent'] = 'در جريان حفظ کردن پیام ارسال شده يکاشتباه به وجود امد';
+$messages['errorsaving'] = 'در جريان حفظ کردن يکاشتباه به وجود امد';
+$messages['errormoving'] = 'پيغام نقل مکان شده نتوانست';
+$messages['errordeleting'] = 'پيغام حذف شده نتوانست';
+$messages['deletecontactconfirm'] = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟';
+$messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟';
+$messages['deletefolderconfirm'] = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟';
+$messages['purgefolderconfirm'] = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟';
 $messages['folderdeleting'] = 'در حال حذف پوشه';
 $messages['foldermoving'] = 'در حال انتقال پوشه';
-$messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است ';
-$messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد ';
-$messages['nonamewarning']  = 'لطفاً يک نام را داخل کنيد ';
-$messages['nopagesizewarning'] = 'لطفاً اندازه يک صفحه را داخل کنيد ';
+$messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است';
+$messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد';
+$messages['nonamewarning'] = 'لطفاً يک نام را داخل کنيد';
+$messages['nopagesizewarning'] = 'لطفاً اندازه يک صفحه را داخل کنيد';
 $messages['nosenderwarning'] = 'لطفاً ایمیل آدرس ارسال کننده را داخل کنید';
-$messages['norecipientwarning'] = 'لطفاً کم از کم يک آدرس گيرينده را نوشته / داخل کنيد ';
-$messages['nosubjectwarning']  = 'بخش مضمون خالي است  آیا میخواهید که حالا یکی آنها را درج نمایید؟.';
-$messages['nobodywarning'] = 'اين پيغام را بدون متن بفرستیم؟ ';
+$messages['norecipientwarning'] = 'لطفاً کم از کم يک آدرس گيرينده را نوشته / داخل کنيد';
+$messages['nosubjectwarning'] = 'بخش مضمون خالي است  آیا میخواهید که حالا یکی آنها را درج نمایید؟.';
+$messages['nobodywarning'] = 'اين پيغام را بدون متن بفرستیم؟';
 $messages['notsentwarning'] = 'پيغام ارسال نه شده است   آیا میخواهید که از این نامه صرف نظر نمایید';
-$messages['noldapserver'] = 'لطفاً يک ايل دپ سرور را بخاطر جستجو انتخاب کنيد ';
-$messages['nocontactsreturned'] = 'موفق به دریافت هیچ آدرس نشدیم';
-$messages['nosearchname'] = 'لطفاً يک نام تماس و يا هم يک ايميل ادرس را داخل کنيد ';
+$messages['noldapserver'] = 'لطفاً يک ايل دپ سرور را بخاطر جستجو انتخاب کنيد';
+$messages['nosearchname'] = 'لطفاً يک نام تماس و يا هم يک ايميل ادرس را داخل کنيد';
 $messages['searchsuccessful'] = '$nr پیام دریافت شد';
 $messages['searchnomatch'] = 'جستجو گر موفق به دریافت هیچ گونه اثری نشد';
 $messages['searching'] = 'در حال جستجو';
 $messages['checking'] = 'در حال بررسی';
-$messages['nospellerrors'] = 'هيچ اشتباه املايي را دريافت نه کرد ';
-$messages['folderdeleted'] = 'پوشه موفقانه از بين رفت/ حذف گرديد ';
-$messages['deletedsuccessfully'] = "موفقانه حذف شد";
+$messages['nospellerrors'] = 'هيچ اشتباه املايي را دريافت نه کرد';
+$messages['folderdeleted'] = 'پوشه موفقانه از بين رفت/ حذف گرديد';
+$messages['deletedsuccessfully'] = 'موفقانه حذف شد';
 $messages['converting'] = 'در حال از بین بردن شکل دهی و ساختار (فرمت)';
-$messages['messageopenerror'] = 'پيغام از سرور جريان کرده نتوانست ';
-$messages['fileuploaderror'] = 'اپلود کردن فايل موفق نه شد. ';
-$messages['filesizeerror'] = 'تثبیت شده میباشد$size حجم فایل آپلود شده بیشتر از حجم کلی ';
-$messages['copysuccess'] = 'آدرس ها کاپی شد. $nrموفقانه بع تعداد ';
-$messages['copyerror'] = 'هيچ يک از تماس ها را کاپي کرده نتوانست ';
+$messages['messageopenerror'] = 'پيغام از سرور جريان کرده نتوانست';
+$messages['fileuploaderror'] = 'اپلود کردن فايل موفق نه شد.';
+$messages['filesizeerror'] = 'تثبیت شده میباشد$size حجم فایل آپلود شده بیشتر از حجم کلی';
+$messages['copysuccess'] = 'آدرس ها کاپی شد. $nrموفقانه بع تعداد';
+$messages['copyerror'] = 'هيچ يک از تماس ها را کاپي کرده نتوانست';
 $messages['sourceisreadonly'] = 'اجازه نمامه کود / منبع این آدرس قفط خواندنی است';
-$messages['errorsavingcontact'] = 'ادرس این پیام را حفظکرده نتوانست ';
+$messages['errorsavingcontact'] = 'ادرس این پیام را حفظکرده نتوانست';
 $messages['movingmessage'] = 'ذر حال انتقال پیام...';
 $messages['receiptsent'] = 'یک رسید برای ارسال کننده این پیام فرستاده شد.';
-$messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست  ';
+$messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست';
 $messages['nodeletelastidentity'] = 'شما این شناخت نامه را حذف کرده نمیتوانید. این آخرین شناخت نامه شما است.';
 $messages['forbiddencharacter'] = 'نام پوشه دارای یک کرکتر ممنوعه است.';
 $messages['selectimportfile'] = 'لطفاً یک فایل را برای آپلود کردن انتخاب نمایید.';
 $messages['addresswriterror'] = 'کتابچه آدرس انتخاب شده دارای اجازه نامه نوشتاری نیست.';
 $messages['importwait'] = 'در حال وارد کردن لطفا صبر کنید.';
-$messages['importerror'] = 'وارد نمودن (آدرس ها / فایل ها) موفق نشد. نیستvCard فایل آپلود شده فایل صحیح ';
+$messages['importerror'] = 'وارد نمودن (آدرس ها / فایل ها) موفق نشد. نیستvCard فایل آپلود شده فایل صحیح';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'اجازه این عملکرد را ندارید';
 $messages['nofromaddress'] = 'بخش ایمیل آدرس در شناخت نامه انتخاب شده مفقود است.';
 $messages['editorwarning'] = 'استفاده از تصحیح کننده متن ساده تمام فرمت و ساختار داده شده را از بین خواهد برد. آیا میخواهید که ادامه بدهید.';
 
-?>
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index b1449f103..def6f21b1 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/fi_FI/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Ville Alatalo <ville@alatalo.org>                             |
-|         Veljo Velling <veve@utu.fi>                                   |
-|         Jorma Tuomainen <jt@wiza.fi>                                  |
-|         Olli <ollinpostit@gmail.com>                                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Grönroos <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,8 +39,8 @@ $labels['date'] = 'Päiväys';
 $labels['size'] = 'Koko';
 $labels['priority'] = 'Tärkeys';
 $labels['organization'] = 'Organisaatio';
-$labels['reply-to'] = 'Vastaus osoitteeseen';
 $labels['mailboxlist'] = 'Kansiot';
+$labels['folders'] = 'Kansiot';
 $labels['messagesfromto'] = 'Viestit $from-$to/$count';
 $labels['threadsfromto'] = 'Viestiketjut $from-$to/$count';
 $labels['messagenrof'] = 'Viesti $nr/$count';
@@ -75,6 +70,7 @@ $labels['feb'] = 'Helmi';
 $labels['mar'] = 'Maalis';
 $labels['apr'] = 'Huhti';
 $labels['may'] = 'Touko';
+$labels['longmay'] = 'Touko';
 $labels['jun'] = 'Kesä';
 $labels['jul'] = 'Heinä';
 $labels['aug'] = 'Elo';
@@ -86,7 +82,6 @@ $labels['longjan'] = 'Tammikuu';
 $labels['longfeb'] = 'Helmikuu';
 $labels['longmar'] = 'Maaliskuu';
 $labels['longapr'] = 'Huhtikuu';
-$labels['longmay'] = 'Toukokuu';
 $labels['longjun'] = 'Kesäkuu';
 $labels['longjul'] = 'Heinäkuu';
 $labels['longaug'] = 'Elokuu';
@@ -99,18 +94,16 @@ $labels['checkmail'] = 'Tarkista saapuneet viestit';
 $labels['writenewmessage'] = 'Kirjoita uusi viesti';
 $labels['replytomessage'] = 'Vastaa viestiin';
 $labels['replytoallmessage'] = 'Vastaa kaikille';
+$labels['replyall'] = 'Vastaa kaikille';
+$labels['forwardattachment'] = 'Välitä viesti liitteenä';
 $labels['forwardmessage'] = 'Välitä viesti';
 $labels['deletemessage'] = 'Poista viesti';
 $labels['movemessagetotrash'] = 'Siirrä viesti roskakoriin';
 $labels['printmessage'] = 'Tulosta viesti';
 $labels['previousmessage'] = 'Näytä edellinen viesti';
-$labels['previousmessages'] = 'Näytä edelliset viestit';
 $labels['firstmessage'] = 'Näytä ensimmäinen viesti';
-$labels['firstmessages'] = 'Näytä ensimmäinen viestiluettelo';
 $labels['nextmessage'] = 'Näytä edellinen viesti';
-$labels['nextmessages'] = 'Näytä seuraavat viestit';
 $labels['lastmessage'] = 'Näytä viimeinen viesti';
-$labels['lastmessages'] = 'Näytä viimeinen viestiluettelo';
 $labels['backtolist'] = 'Takaisin viesteihin';
 $labels['viewsource'] = 'Näytä lähdekoodi';
 $labels['markmessages'] = 'Merkitse viestit';
@@ -118,10 +111,11 @@ $labels['markread'] = 'luetuiksi';
 $labels['markunread'] = 'ei-luetuiksi';
 $labels['markflagged'] = 'korostetuiksi';
 $labels['markunflagged'] = 'ei-korostetuiksi';
-$labels['messageactions'] = 'Lisää toimintoja...';
+$labels['moreactions'] = 'Lisää toimintoja...';
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
-$labels['none'] = 'Ei mitään';
+$labels['none'] = 'Ei mikään';
+$labels['nonesort'] = 'Ei mikään';
 $labels['currpage'] = 'Nykyinen sivu';
 $labels['unread'] = 'Lukemattomat';
 $labels['flagged'] = 'Korostettu';
@@ -139,7 +133,6 @@ $labels['do_expand'] = 'kaikki viestiketjut';
 $labels['expand_only_unread'] = 'vain ne joissa lukemattomia viestejä';
 $labels['fromto'] = 'Lähettäjä/Vastaanottaja';
 $labels['attachment'] = 'Liite';
-$labels['nonesort'] = 'Ei mikään';
 $labels['sentdate'] = 'Lähetysaika';
 $labels['arrival'] = 'Saapumisaika';
 $labels['asc'] = 'nouseva';
@@ -149,13 +142,12 @@ $labels['listsorting'] = 'Lajittelu kenttä';
 $labels['listorder'] = 'Lajittelu järjestys';
 $labels['compact'] = 'Tiivistä';
 $labels['empty'] = 'Tyhjennä';
-$labels['purge'] = 'Puhdista';
 $labels['quota'] = 'Levytila';
 $labels['unknown'] = 'tuntematon';
 $labels['unlimited'] = 'rajoittamaton';
 $labels['quicksearch'] = 'Pikahaku';
 $labels['resetsearch'] = 'Nollaa haku';
-$labels['searchmod'] = 'Haku kriteerit';
+$labels['searchmod'] = 'Hakukriteerit';
 $labels['msgtext'] = 'Koko viesti';
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
@@ -167,6 +159,7 @@ $labels['addattachment'] = 'Liitetiedosto';
 $labels['charset'] = 'Merkistö';
 $labels['editortype'] = 'Editorin tyyppi';
 $labels['returnreceipt'] = 'Perillesaapumisilmoitus';
+$labels['originalmessage'] = 'Alkuperäinen viesti';
 $labels['checkspelling'] = 'Tarkista oikeinkirjoitus';
 $labels['resumeediting'] = 'Jatka muokkausta';
 $labels['revertto'] = 'Muuta takaisin';
@@ -181,6 +174,7 @@ $labels['highest'] = 'Korkein';
 $labels['nosubject'] = '(ei otsikkoa)';
 $labels['showimages'] = 'Näytä kuvat';
 $labels['alwaysshow'] = 'Näytä aina lähettäjältä $sender saapuneet kuvat';
+$labels['isdraft'] = 'Tämä on luonnosviesti.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Tavallinen teksti';
 $labels['savesentmessagein'] = 'Tallenna lähetetty viesti kansioon';
@@ -196,22 +190,69 @@ $labels['receiptnote'] = 'Huom! Kuittaus tarkoittaa vain sitä, että viesti on
 $labels['name'] = 'Näkyvä nimi';
 $labels['firstname'] = 'Etunimi';
 $labels['surname'] = 'Sukunimi';
-$labels['email'] = 'E-Mail';
-$labels['addcontact'] = 'Lisää valittu kontakti osoitekirjaan';
-$labels['editcontact'] = 'Muokkaa kontaktia';
+$labels['middlename'] = 'Toinen nimi';
+$labels['nameprefix'] = 'Etuliite';
+$labels['namesuffix'] = 'Jälkiliite';
+$labels['nickname'] = 'Lempinimi';
+$labels['jobtitle'] = 'Titteli';
+$labels['department'] = 'Osasto';
+$labels['gender'] = 'Sukupuoli';
+$labels['maidenname'] = 'Tyttönimi';
+$labels['email'] = 'Sähköposti';
+$labels['phone'] = 'Puhelin';
+$labels['address'] = 'Osoite';
+$labels['street'] = 'Katu';
+$labels['locality'] = 'Kaupunki';
+$labels['zipcode'] = 'Postinumero';
+$labels['region'] = 'Osavaltio tai lääni';
+$labels['country'] = 'Maa';
+$labels['birthday'] = 'Syntymäpäivä';
+$labels['anniversary'] = 'Vuosipäivä';
+$labels['website'] = 'Verkkosivu';
+$labels['instantmessenger'] = 'Pikaviestin';
+$labels['notes'] = 'Muistiinpanot';
+$labels['male'] = 'mies';
+$labels['female'] = 'nainen';
+$labels['manager'] = 'Päällikkö';
+$labels['assistant'] = 'Avustaja';
+$labels['typeassistant'] = 'Avustaja';
+$labels['spouse'] = 'Puoliso';
+$labels['allfields'] = 'Kaikki kentät';
+$labels['search'] = 'Haku';
+$labels['advsearch'] = 'Tarkennettu haku';
+$labels['typehome'] = 'Koti';
+$labels['typework'] = 'Työ';
+$labels['typemobile'] = 'Matkapuhelin';
+$labels['typehomefax'] = 'Kotifaksi';
+$labels['typeworkfax'] = 'Työfaksi';
+$labels['typecar'] = 'Auto';
+$labels['typepager'] = 'Hakulaite';
+$labels['typehomepage'] = 'Kotisivu';
+$labels['typeblog'] = 'Blogi';
+$labels['typeprofile'] = 'Profiili';
+$labels['addfield'] = 'Lisää kenttä...';
+$labels['addcontact'] = 'Lisää uusi yhteystieto';
+$labels['editcontact'] = 'Muokkaa yhteystietoa';
+$labels['contacts'] = 'Yhteystiedot';
+$labels['contactproperties'] = 'Yhteystiedon ominaisuudet';
+$labels['personalinfo'] = 'Henkilökohtaiset tiedot';
 $labels['edit'] = 'Muokkaa';
 $labels['cancel'] = 'Peruuta';
 $labels['save'] = 'Tallenna';
 $labels['delete'] = 'Poista';
-$labels['newcontact'] = 'Luo uusi kontakti';
-$labels['deletecontact'] = 'Poista valitut kontaktit';
-$labels['composeto'] = 'Kirjoita viesti kontaktille';
-$labels['contactsfromto'] = 'Kontaktit $from-$to/$count';
+$labels['rename'] = 'Nimeä uudelleen';
+$labels['addphoto'] = 'Lisää';
+$labels['replacephoto'] = 'Korvaa';
+$labels['newcontact'] = 'Luo uusi yhteystieto';
+$labels['deletecontact'] = 'Poista valitut yhteystiedot';
+$labels['composeto'] = 'Kirjoita viesti yhteystiedolle';
+$labels['contactsfromto'] = 'Yhteystiedot $from-$to/$count';
 $labels['print'] = 'Tulosta';
 $labels['export'] = 'Vie (export)';
-$labels['exportvcards'] = 'Vie kontaktit vCard-muodossa';
-$labels['newcontactgroup'] = 'Luo uusi kontaktiryhmä';
-$labels['groupactions'] = 'Kontaktiryhmän toiminnot...';
+$labels['exportvcards'] = 'Vie yhteystiedot vCard-muodossa';
+$labels['newcontactgroup'] = 'Luo uusi yhteystietoryhmä';
+$labels['grouprename'] = 'Nimeä ryhmä uudelleen';
+$labels['groupdelete'] = 'Poista ryhmä';
 $labels['previouspage'] = 'Näytä edellinen luettelo';
 $labels['firstpage'] = 'Näytä ensimmäinen luettelo';
 $labels['nextpage'] = 'Näytä seuraava luettelo';
@@ -219,13 +260,17 @@ $labels['lastpage'] = 'Näytä viimeinen luettelo';
 $labels['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
 $labels['personaladrbook'] = 'Henkilökohtaiset osoitteet';
+$labels['searchsave'] = 'Tallenna haku';
+$labels['searchdelete'] = 'Poista haku';
 $labels['import'] = 'Tuo';
 $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
+$labels['importtarget'] = 'Lisää uudet yhteystiedot osoitekirjaan:';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
 $labels['importtext'] = 'Voit lähettää yhteystietoja muista osoitekirjoistna.Kontaktien tuomine on hetkellä mahdollista vCard-muodossa.';
 $labels['done'] = 'Valmis';
 $labels['settingsfor'] = 'Asetukset';
+$labels['about'] = 'Tietoja';
 $labels['preferences'] = 'Asetukset';
 $labels['userpreferences'] = 'Käyttäjän asetukset';
 $labels['editpreferences'] = 'Muokkaa käyttäjän asetuksia';
@@ -237,6 +282,8 @@ $labels['edititem'] = 'Muokkaa';
 $labels['preferhtml'] = 'Käytä HTML:aa';
 $labels['defaultcharset'] = 'Oletusmerkistökoodaus';
 $labels['htmlmessage'] = 'HTML-viesti';
+$labels['dateformat'] = 'Päiväyksen muoto';
+$labels['timeformat'] = 'Ajan muoto';
 $labels['prettydate'] = 'Nätit päiväykset';
 $labels['setdefault'] = 'Aseta vakioksi';
 $labels['autodetect'] = 'Automaattinen';
@@ -249,8 +296,8 @@ $labels['htmleditor'] = 'Kirjoita HTML-muodossa';
 $labels['htmlsignature'] = 'HTML-allekirjoitus';
 $labels['previewpane'] = 'Näytä esikatselulehti';
 $labels['skin'] = 'Käyttöliittymän teema';
-$labels['logoutclear'] = 'Tyhjennä roskakori ulos kirjautuessa';
-$labels['logoutcompact'] = 'Tiivistä kansiot ulos kirjautuessa';
+$labels['logoutclear'] = 'Tyhjennä roskakori kirjautuessa ulos';
+$labels['logoutcompact'] = 'Tiivistä kansiot kirjautuessa ulos';
 $labels['uisettings'] = 'Käyttöliittymä';
 $labels['serversettings'] = 'Palvelinasetukset';
 $labels['mailboxview'] = 'Postilaatikkonäkymä';
@@ -259,7 +306,7 @@ $labels['askuser'] = 'kysy käyttäjältä';
 $labels['autosend'] = 'lähetä automaattisesti';
 $labels['ignore'] = 'jätä huomiotta';
 $labels['readwhendeleted'] = 'Merkitse poistettavat viestit luetuiksi';
-$labels['flagfordeletion'] = 'Poistamisen sijaan, merkitse viestit poistettavaksi';
+$labels['flagfordeletion'] = 'Poistamisen sijaan merkitse viestit poistettavaksi';
 $labels['skipdeleted'] = 'Älä näytä poistettuja viestejä';
 $labels['deletealways'] = 'Poista viestit, joiden siirtäminen roskakoriin epäonnistuu';
 $labels['showremoteimages'] = 'Näytä ulkopuoliset kuvat viestissä';
@@ -274,19 +321,19 @@ $labels['immediately'] = 'välittömästi';
 $labels['messagesdisplaying'] = 'Viestien näyttäminen';
 $labels['messagescomposition'] = 'Viestien kirjoittaminen';
 $labels['mimeparamfolding'] = 'Liitetiedostojen nimet';
-$labels['2231folding'] = 'Täysin RFC 2231 mukainen (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 mukainen (MS Outlook)';
-$labels['2047folding'] = 'Täysin RFC 2047 mukainen (muut)';
+$labels['2231folding'] = 'Täysin RFC 2231:n mukainen (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231:n mukainen (MS Outlook)';
+$labels['2047folding'] = 'Täysin RFC 2047:n mukainen (muut)';
 $labels['force7bit'] = 'Käytä MIME-koodausta 8-bittisille merkeille';
 $labels['advancedoptions'] = 'Lisäasetukset';
 $labels['focusonnewmessage'] = 'Tarkenna selainikkuna uuteen viestiin';
 $labels['checkallfolders'] = 'Tarkista kaikki kansiot uusien viestien varalta';
 $labels['displaynext'] = 'Viestin siirron tai poiston jälkeen, näytä seuraava viesti';
+$labels['defaultfont'] = 'HTML-viestin oletuskirjasin';
 $labels['mainoptions'] = 'Pääasetukset';
 $labels['section'] = 'Kohta';
 $labels['maintenance'] = 'Huolto';
 $labels['newmessage'] = 'Uusi viesti';
-$labels['listoptions'] = 'Lista-asetukset';
 $labels['signatureoptions'] = 'Allekirjoituksen asetukset';
 $labels['whenreplying'] = 'Vastattaessa';
 $labels['replytopposting'] = 'aloita uusi viesti alkuperäisen yläpuolelle';
@@ -301,8 +348,9 @@ $labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
 $labels['previewpanemarkread'] = 'Merkitse esikatsellut viestit luetuiksi';
 $labels['afternseconds'] = '$n sekunnin jälkeen';
+$labels['spellcheckoptions'] = 'Oikuluvun asetukset';
+$labels['addtodict'] = 'Lisää sanakirjaan';
 $labels['folder'] = 'Kansio';
-$labels['folders'] = 'Kansiot';
 $labels['foldername'] = 'Kansion nimi';
 $labels['subscribed'] = 'Näytetään';
 $labels['messagecount'] = 'Viestejä';
@@ -310,9 +358,25 @@ $labels['create'] = 'Luo uusi';
 $labels['createfolder'] = 'Luo uusi kansio';
 $labels['managefolders'] = 'Kansioiden hallinta';
 $labels['specialfolders'] = 'Erikoiskansiot';
+$labels['properties'] = 'Ominaisuudet';
+$labels['folderproperties'] = 'Kansion ominaisuudet';
+$labels['parentfolder'] = 'Yläkansio';
+$labels['location'] = 'Sijanti';
+$labels['info'] = 'Tietoja';
+$labels['getfoldersize'] = 'Napsauta saadaksesi kansion koon';
+$labels['foldertype'] = 'Kansion tyyppi';
+$labels['personalfolder'] = 'Yksityinen kansio';
+$labels['otherfolder'] = 'Toisen käyttäjän kansio';
+$labels['sharedfolder'] = 'Julkinen kansio';
 $labels['sortby'] = 'Järjestä';
 $labels['sortasc'] = 'Järjestä nousevasti (a-ö)';
 $labels['sortdesc'] = 'Järjestä laskevasti (ö-a)';
+$labels['undo'] = 'Kumoa';
+$labels['plugin'] = 'Liitännäinen';
+$labels['version'] = 'Versio';
+$labels['source'] = 'Lähde';
+$labels['license'] = 'Lisenssi';
+$labels['support'] = 'Hanki tukea';
 $labels['B'] = 't';
 $labels['KB'] = 'Kt';
 $labels['MB'] = 'Mt';
@@ -336,4 +400,3 @@ $labels['japanese'] = 'Japanilainen';
 $labels['korean'] = 'Korealainen';
 $labels['chinese'] = 'Kiinalainen';
 
-?>
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index b0aab239f..381167aac 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/fi_FI/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Ville Alatalo <ville@alatalo.org>                             |
-|         Veljo Velling <veve@utu.fi>                                   |
-|         Jorma Tuomainen <jt@wiza.fi>                                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Grönroos <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -23,25 +19,29 @@ $messages['loginfailed'] = 'Sisäänkirjautuminen epäonnistui';
 $messages['cookiesdisabled'] = 'Selaimesi ei hyväksy evästeitä';
 $messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole enää voimassa';
 $messages['imaperror'] = 'Yhteys IMAP-palvelimeen epäonnistui';
-$messages['servererror'] = 'Palvelin virhe!';
-$messages['invalidrequest'] = 'Kelpaamaton pyyntö! Tietoa ei tallennettu.';
+$messages['servererror'] = 'Palvelinvirhe!';
+$messages['servererrormsg'] = 'Palvelinvirhe: $msg';
+$messages['dberror'] = 'Tietokantavirhe!';
+$messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
 $messages['loggedout'] = 'Sinut on kirjattu ulos järjestelmästä.';
 $messages['mailboxempty'] = 'Kansio on tyhjä';
 $messages['loading'] = 'Ladataan...';
 $messages['uploading'] = 'Ladataan tiedostoa palvelimelle...';
+$messages['uploadingmany'] = 'Ladataan tiedostoja...';
 $messages['loadingdata'] = 'Ladataan tietoja...';
 $messages['checkingmail'] = 'Tarkistetaan saapuneita viestejä...';
 $messages['sendingmessage'] = 'Lähetetään viestiä...';
 $messages['messagesent'] = 'Viesti lähetetty';
 $messages['savingmessage'] = 'Tallennetaan viestiä...';
-$messages['messagesaved'] = 'Viesti tallennettu "Luonnokset" -kansioon';
+$messages['messagesaved'] = 'Viesti tallennettu "Luonnokset"-kansioon';
 $messages['successfullysaved'] = 'Tallennus onnistui';
-$messages['addedsuccessfully'] = 'Kontakti lisätty osoitekirjaan';
-$messages['contactexists'] = 'Samalla sähköpostiosoitteella on jo olemassa kontakti';
+$messages['addedsuccessfully'] = 'Yhteystieto lisätty osoitekirjaan';
+$messages['contactexists'] = 'Samalla sähköpostiosoitteella on jo olemassa yhteystieto';
+$messages['contactnameexists'] = 'Yhteystieto samalla nimellä on jo olemassa';
 $messages['blockedimages'] = 'Turvallisuussyistä viestin kuvia ei näytetty.';
 $messages['encryptedmessage'] = 'Viesti on salattu, eikä sitä voida näyttää.';
-$messages['nocontactsfound'] = 'Ei kontakteja';
+$messages['nocontactsfound'] = 'Yhteystietoja ei löytynyt.';
 $messages['contactnotfound'] = 'Pyydettyä yhteystietoa ei löytynyt';
 $messages['sendingfailed'] = 'Viestin lähetys epäonnistui';
 $messages['senttooquickly'] = 'Odota $sec sekunti(a) ennen viestin lähettämistä';
@@ -51,10 +51,12 @@ $messages['errormoving'] = 'Viestiä ei voitu siirtää';
 $messages['errorcopying'] = 'Viestiä ei voitu kopioida';
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
 $messages['errormarking'] = 'Viestiä ei voitu merkiä';
-$messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut kontaktit?';
+$messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut yhteystiedot?';
+$messages['deletegroupconfirm'] = 'Haluatko varmasti poistaa valitun ryhmän?';
 $messages['deletemessagesconfirm'] = 'Haluatko varmasti poistaa valitut viestit?';
 $messages['deletefolderconfirm'] = 'Haluatko varmasti poistaa kansion?';
 $messages['purgefolderconfirm'] = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
+$messages['groupdeleting'] = 'Poistetaan ryhmää...';
 $messages['folderdeleting'] = 'Poistetaan kansiota...';
 $messages['foldermoving'] = 'Siirretään kansiota...';
 $messages['formincomplete'] = 'Lomakkeen tiedot olivat puutteelliset';
@@ -63,14 +65,14 @@ $messages['nonamewarning'] = 'Anna nimi';
 $messages['nopagesizewarning'] = 'Anna sivukoko';
 $messages['nosenderwarning'] = 'Anna lähettäjän sähköpostiosoite';
 $messages['norecipientwarning'] = 'Anna ainakin yksi vastaanottaja';
-$messages['nosubjectwarning'] = '"Otsikko" -kenttä on tyhjä. Haluaisitko kirjoittaa viestillesi otsikon?';
+$messages['nosubjectwarning'] = '"Otsikko"-kenttä on tyhjä. Haluatko kirjoittaa viestillesi otsikon?';
 $messages['nobodywarning'] = 'Lähetetäänkö viesti ilman tekstiä?';
 $messages['notsentwarning'] = 'Viestiä ei lähetetty. Haluatko poistaa viestin?';
-$messages['noldapserver'] = 'Valitse LDAP -palvelin';
-$messages['nocontactsreturned'] = 'Yhtään kontaktia ei löytynyt';
-$messages['nosearchname'] = 'Anna kontaktin nimi tai sähköpostiosoite';
+$messages['noldapserver'] = 'Valitse LDAP-palvelin';
+$messages['nosearchname'] = 'Anna yhteystiedon nimi tai sähköpostiosoite';
 $messages['notuploadedwarning'] = 'Kaikkia liitteitä ei ole vielä ladattu palvelimelle. Odota tai peruuta lataus.';
 $messages['searchsuccessful'] = 'Löydetty $nr viestiä';
+$messages['contactsearchsuccessful'] = 'Löydetty $nr yhteystietoa';
 $messages['searchnomatch'] = 'Haku ei tuottanut tuloksia';
 $messages['searching'] = 'Etsitään...';
 $messages['checking'] = 'Tarkistetaan...';
@@ -93,11 +95,11 @@ $messages['nodeletelastidentity'] = 'Et voi poistaa tätä identiteettiä, koska
 $messages['forbiddencharacter'] = 'Kansion nimessä on kiellettyjä merkkejä';
 $messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
 $messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
-$messages['contactaddedtogroup'] = 'Kontaktit lisätty ryhmään';
-$messages['contactremovedfromgroup'] = 'Kontaktit poistettu ryhmästä';
+$messages['contactaddedtogroup'] = 'Yhteystiedot lisätty ryhmään';
+$messages['contactremovedfromgroup'] = 'Yhteystiedot poistettu ryhmästä';
 $messages['importwait'] = 'Tuodaan, odota...';
-$messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard -muodossa.';
-$messages['importconfirm'] = '<b>$inserted kontaktia tuotu onnistuneesti $inserted kontaktioa, $skipped olemassaolevaa kontaktia hypättiin yli</b>:<p><em>$names</em></p>';
+$messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard-muodossa.';
+$messages['importconfirm'] = '<b>$inserted yhteystietoa tuotu onnistuneesti</b>';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
 $messages['nofromaddress'] = 'Valittu identiteetti ei sisällä sähköpostiosoitetta';
 $messages['editorwarning'] = 'Vaihtaminen tekstieditoriin aiheuttaa viestin muotoilun katoamisen. Haluatko jatkaa?';
@@ -108,8 +110,20 @@ $messages['smtpfromerror'] = 'SMTP-virhe ($code): Lähettäjän "$from" asettami
 $messages['smtptoerror'] = 'SMTP-virhe ($code): Vastaanottajan "$to" lisääminen epäonnistui ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa';
 $messages['smtperror'] = 'SMTP-virhe: $msg';
-$messages['emailformaterror'] = 'Väärä sähköpostiosoite: $email';
+$messages['emailformaterror'] = 'Virheellinen sähköpostiosoite: $email';
 $messages['toomanyrecipients'] = 'Liikaa vastaanottajia. Vähennä vastaanottajien määrä maksimiin $max.';
 $messages['maxgroupmembersreached'] = 'Ryhmän jäsenten määrä ylittää maksimin $max';
+$messages['internalerror'] = 'Ilmeni sisäinen virhe. Yritä uudelleen.';
+$messages['groupdeleted'] = 'Ryhmä poistettu onnistuneesti.';
+$messages['grouprenamed'] = 'Ryhmä nimetty uudelleen onnistuneesti.';
+$messages['groupcreated'] = 'Ryhmä luotu onnistuneesti.';
+$messages['savedsearchdeleted'] = 'Tallennettu haku poistettu onnistuneesti.';
+$messages['savedsearchdeleteerror'] = 'Tallennetun haun poisto epäonnistui.';
+$messages['savedsearchcreated'] = 'Tallennettu haku luotu onnistuneesti.';
+$messages['savedsearchcreateerror'] = 'Tallennetun haun tallennus epäonnistui.';
+$messages['namecannotbeempty'] = 'Nimi ei voi olla tyhjä.';
+$messages['nametoolong'] = 'Nimi on liian pitkä.';
+$messages['folderupdated'] = 'Kansio päivitetty onnistuneesti.';
+$messages['foldercreated'] = 'Kansio luotu onnistuneesti.';
+$messages['mispellingsfound'] = 'Viestissä havaittiin kielioppivirheitä.';
 
-?>
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index f42a4e2d8..26b2e9420 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/fr_FR/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Joel S. <joel.s@spijoprod.com>                                |
-|         Jerome Lipowicz <jerome@yayel.com>                            |
-|         Maximilien Cuony <theglu@theglu.org>                          |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Edouard Moreau <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -24,7 +19,7 @@ $labels['welcome'] = 'Bienvenue sur $product';
 $labels['username'] = 'Utilisateur';
 $labels['password'] = 'Mot de passe';
 $labels['server'] = 'Serveur';
-$labels['login'] = 'Authentification';
+$labels['login'] = 'Connexion';
 $labels['logout'] = 'Quitter';
 $labels['mail'] = 'Courriel';
 $labels['settings'] = 'Préférences';
@@ -47,6 +42,7 @@ $labels['priority'] = 'Priorité';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Statut de lecture';
 $labels['mailboxlist'] = 'Dossiers';
+$labels['folders'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages de $from à $to sur $count';
 $labels['threadsfromto'] = 'Fil de $from à $to sur $count';
 $labels['messagenrof'] = 'Message $nr sur $count';
@@ -76,6 +72,7 @@ $labels['feb'] = 'Fév';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Avr';
 $labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aoû';
@@ -87,7 +84,6 @@ $labels['longjan'] = 'Janvier';
 $labels['longfeb'] = 'Février';
 $labels['longmar'] = 'Mars';
 $labels['longapr'] = 'Avril';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Juin';
 $labels['longjul'] = 'Juillet';
 $labels['longaug'] = 'Août';
@@ -123,6 +119,7 @@ $labels['moreactions'] = 'Plus d\'actions...';
 $labels['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
+$labels['nonesort'] = 'Aucun';
 $labels['currpage'] = 'Page courante';
 $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marqué';
@@ -142,7 +139,6 @@ $labels['expand_only_unread'] = 'uniquement avec des messages non-lus';
 $labels['fromto'] = 'Expéditeur/Destinataire';
 $labels['flag'] = 'Drapeau';
 $labels['attachment'] = 'Pièce jointe';
-$labels['nonesort'] = 'Aucun';
 $labels['sentdate'] = 'Date d\'envoi';
 $labels['arrival'] = 'Date d\'arrivée';
 $labels['asc'] = 'Ascendant';
@@ -232,15 +228,16 @@ $labels['notes'] = 'Notes';
 $labels['male'] = 'Homme';
 $labels['female'] = 'Femme';
 $labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
+$labels['assistant'] = 'Assistante';
+$labels['typeassistant'] = 'Assistante';
 $labels['spouse'] = 'Épouse';
 $labels['allfields'] = 'Tous les champs';
 $labels['search'] = 'Rechercher';
 $labels['advsearch'] = 'Recherche avancée';
 $labels['other'] = 'Autre';
+$labels['typeother'] = 'Autre';
 $labels['typehome'] = 'Domicile';
 $labels['typework'] = 'Travail';
-$labels['typeother'] = 'Autre';
 $labels['typemobile'] = 'Mobile';
 $labels['typemain'] = 'Principale';
 $labels['typehomefax'] = 'Fax personnel';
@@ -248,7 +245,6 @@ $labels['typeworkfax'] = 'Fax professionnel';
 $labels['typecar'] = 'Voiture';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Vidéo';
-$labels['typeassistant'] = 'Assistante';
 $labels['typehomepage'] = 'Accueil';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
@@ -354,11 +350,11 @@ $labels['advancedoptions'] = 'Options avancées';
 $labels['focusonnewmessage'] = 'Placer le focus sur la fenêtre quand un nouveau message arrive';
 $labels['checkallfolders'] = 'Vérifier tous les dossiers pour les nouveaux messages';
 $labels['displaynext'] = 'Après suppression/déplacement du message, afficher le message suivant';
+$labels['defaultfont'] = 'Police par défaut des messages en HTML';
 $labels['mainoptions'] = 'Options principales';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'Nouveau Message';
-$labels['listoptions'] = 'Lister les options';
 $labels['signatureoptions'] = 'Options pour la signature';
 $labels['whenreplying'] = 'En répondant';
 $labels['replytopposting'] = 'commencer le nouveau message au-dessus de l\'original';
@@ -385,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Ignorer les mots avec des nombres';
 $labels['spellcheckignorecaps'] = 'Ignorer les mots entièrement en majuscule';
 $labels['addtodict'] = 'Ajouter au dictionnaire';
 $labels['folder'] = 'Dossier';
-$labels['folders'] = 'Dossiers';
 $labels['foldername'] = 'Nom du dossier';
 $labels['subscribed'] = 'Abonné';
 $labels['messagecount'] = 'Messages';
@@ -436,4 +431,3 @@ $labels['japanese'] = 'Japonais';
 $labels['korean'] = 'Coréen';
 $labels['chinese'] = 'Chinois';
 
-?>
\ No newline at end of file
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 974a56c04..55be0d4c4 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/fr_FR/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Joel S. <joel.s@spijoprod.com>                                |
-|         Jerome Lipowicz <jerome@yayel.com>                            |
-|         Maximilien Cuony <theglu@theglu.org>                          |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -161,4 +156,3 @@ $messages['mispellingsfound'] = 'Des fautes d\'orthographe ont été détectées
 $messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent sélectionné. Aucun droit d\'accès.';
 $messages['messagetoobig'] = 'Le message est trop gros pour être traité.';
 
-?>
\ No newline at end of file
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index bb82dae74..145d4b839 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -2,18 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/ga/labels.inc                                                |
+ | localization/ga_IE/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author:   Noel Bourke  (cros13)                                       |
+ | Author: Stephen Ryan <Unknown>                                        |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
@@ -41,17 +39,16 @@ $labels['date'] = 'Dáta';
 $labels['size'] = 'Méid';
 $labels['priority'] = 'Tosaíocht';
 $labels['organization'] = 'Eagraíocht';
-$labels['reply-to'] = 'Freagair go';
 $labels['mailboxlist'] = 'Fillteán';
+$labels['folders'] = 'Fillteán';
 $labels['messagesfromto'] = 'Teachtaireachta as $from go $to as $count';
 $labels['messagenrof'] = 'Teachtaireacht $nr as $count';
+$labels['copy'] = 'Cóipeáil';
+$labels['move'] = 'Bog';
 $labels['moveto'] = 'bog go...';
 $labels['download'] = 'síos-luchtú';
 $labels['filename'] = 'Comhad';
 $labels['filesize'] = 'Toirt';
-$labels['preferhtml'] = 'Taispeáin an HTML';
-$labels['htmlmessage'] = 'Teachtaireacht HTML';
-$labels['prettydate'] = 'Dátaí Dheas';
 $labels['addtoaddressbook'] = 'Sábháil i mo leabhair seoltaí';
 $labels['sun'] = 'Do';
 $labels['mon'] = 'Lu';
@@ -67,39 +64,58 @@ $labels['wednesday'] = 'An Chéadaoin';
 $labels['thursday'] = 'An Déardaoin';
 $labels['friday'] = 'Aoine';
 $labels['saturday'] = 'An Satharn';
+$labels['jan'] = 'Ean';
+$labels['feb'] = 'Fea';
+$labels['mar'] = 'Már';
+$labels['apr'] = 'Aib';
+$labels['may'] = 'Bea';
+$labels['longmay'] = 'Bea';
+$labels['jun'] = 'Mei';
+$labels['jul'] = 'Iúi';
+$labels['aug'] = 'Lún';
+$labels['nov'] = 'Sam';
+$labels['dec'] = 'Nol';
+$labels['longjan'] = 'Eanáir';
+$labels['longfeb'] = 'Feabhra';
+$labels['longmar'] = 'Márta';
+$labels['longapr'] = 'Aibreán';
+$labels['longjun'] = 'Meitheamh';
+$labels['longjul'] = 'Iúil';
+$labels['longaug'] = 'Lúnasa';
+$labels['longsep'] = 'Meán Fómhair';
+$labels['longoct'] = 'Deireadh Fómhair';
+$labels['longnov'] = 'Samhain';
+$labels['longdec'] = 'Nollag';
 $labels['today'] = 'Inniu';
 $labels['checkmail'] = 'Seiceáil chun teachtaireacht nua';
 $labels['writenewmessage'] = 'Scríobh teachtaireacht nua';
 $labels['replytomessage'] = 'Scríobh freagra chun an seolaí';
 $labels['replytoallmessage'] = 'Scríobh freagra chun an seolaí agus na faighteoir';
+$labels['replyall'] = 'Freagra gach';
 $labels['forwardmessage'] = 'Seol ar aghaidh an teachtaireacht';
 $labels['deletemessage'] = 'Chuir an teachtaireacht i mo bosca bruscair';
 $labels['printmessage'] = 'Priontáil an teachtaireacht seo';
 $labels['previousmessage'] = 'Taispeáin an teachtaireacht roimhe seo';
-$labels['previousmessages'] = 'Taispeáin an foireann roimhe seo';
 $labels['firstmessage'] = 'Taispeáin an cead teachtaireacht';
-$labels['firstmessages'] = 'Taispeáin an cead foireann';
 $labels['nextmessage'] = 'Taispeáin an teachtaireacht ina dhiaidh sin';
-$labels['nextmessages'] = 'Taispeáin an foireann ina dhiaidh sin';
 $labels['lastmessage'] = 'Taispeáin an teachtaireacht deireanach';
-$labels['lastmessages'] = 'Taispeáin an foireann deireanach';
 $labels['backtolist'] = 'Téigh ar ais go dtí an liosta teachtaireachta';
 $labels['viewsource'] = 'Éiriú bunchód';
 $labels['select'] = 'Togh';
 $labels['all'] = 'An uile';
 $labels['none'] = 'Aon cheann';
+$labels['nonesort'] = 'Aon cheann';
 $labels['unread'] = 'Na rudaí nach bhuil corraithe';
 $labels['compact'] = 'Comhbhrúigh';
 $labels['empty'] = 'Folmhaigh';
-$labels['purge'] = 'Purgaigh';
 $labels['quota'] = 'Toilleadh diosca atá athláimhe';
 $labels['unknown'] = 'gan aithne';
 $labels['unlimited'] = 'gan teorainn';
 $labels['quicksearch'] = 'Mearcuardaigh';
 $labels['resetsearch'] = 'Athshocraigh an cuardach';
 $labels['compose'] = 'Scríobh teachtaireacht';
-$labels['sendmessage'] = 'Seol mo teachtaireacht láithreach bonn';
 $labels['savemessage'] = 'Sábháil an dréachta seo';
+$labels['sendmessage'] = 'Seol mo teachtaireacht láithreach bonn';
 $labels['addattachment'] = 'Suimigh Iatán';
 $labels['charset'] = 'Foireann carachtar';
 $labels['editortype'] = 'Sort eagarthóir';
@@ -150,6 +166,9 @@ $labels['manageidentities'] = 'Stiúir céannachtaí i cuntas seo';
 $labels['newidentity'] = 'Céannacht nua';
 $labels['newitem'] = 'Mír nua';
 $labels['edititem'] = 'Athraigh mhír';
+$labels['preferhtml'] = 'Taispeáin an HTML';
+$labels['htmlmessage'] = 'Teachtaireacht HTML';
+$labels['prettydate'] = 'Dátaí Dheas';
 $labels['setdefault'] = 'Socraigh an réamhshocraithe';
 $labels['language'] = 'Teanga';
 $labels['timezone'] = 'Crios ama';
@@ -162,7 +181,6 @@ $labels['previewpane'] = 'Taispeáin an pána réamhamharc';
 $labels['autosavedraft'] = 'Sábháil dréachta go huathoibríoch';
 $labels['never'] = 'riamh';
 $labels['folder'] = 'Fillteán';
-$labels['folders'] = 'Fillteán';
 $labels['foldername'] = 'Ainm fillteán';
 $labels['subscribed'] = 'Síntiú';
 $labels['create'] = 'Cruthaigh';
@@ -172,4 +190,3 @@ $labels['sortby'] = 'Sórtáil trí';
 $labels['sortasc'] = 'Sórtáil in ord méadaitheach';
 $labels['sortdesc'] = 'Sórtáil in ord neartaitheach';
 
-?>
\ No newline at end of file
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 8a4dc59d9..1e833026a 100755
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -2,18 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/ga/messages.inc                                              |
+ | localization/ga_IE/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author:   Noel Bourke  (cros13)                                       |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
@@ -34,7 +32,7 @@ $messages['messagesaved'] = 'Sábháil mé an teachtaireacht i dréachtaí';
 $messages['successfullysaved'] = 'D\'éirigh mé agus sábháil mé';
 $messages['addedsuccessfully'] = 'D\'éirigh mé agus shábháil mé duine nua go dtí an Leabhair Seoltaí';
 $messages['contactexists'] = 'Tá duine i do Leabhair Seoltaí agus tá an seoladh ríomhphost seo aige';
-$messages['blockedimages'] = 'Chun do príobháide a cosain, choiscinn na híomhánna san teachtaireacht seo ';
+$messages['blockedimages'] = 'Chun do príobháide a cosain, choiscinn na híomhánna san teachtaireacht seo';
 $messages['encryptedmessage'] = 'Tá an teachtaireacht seo i criptiúchán, Níl an cumas agam chun é a tionscail';
 $messages['nocontactsfound'] = 'Ní raibh aon buine san Leabhair Seoltaí seo';
 $messages['contactnotfound'] = 'Ní bhfuair mé an duine seo';
@@ -55,7 +53,6 @@ $messages['nosubjectwarning'] = 'Níl aon ábhair ar an teachtaireacht, ba mhait
 $messages['nobodywarning'] = 'Níl aon teacs san teachtaireacht, ba mhaith tú déarfaidh mé teachtaireacht ar bith?';
 $messages['notsentwarning'] = 'Theip an iarraidh chun an teachtaireacht a seo. ba mhaith tú scrios do teachtaireacht?';
 $messages['noldapserver'] = 'Abair liom eolaire LDAP chun é a cuardaigh';
-$messages['nocontactsreturned'] = 'Ní bhfuair mé aon duine as an ceist seo';
 $messages['nosearchname'] = 'Abair liom ainm duine nó seoladh ríomhphost';
 $messages['searchsuccessful'] = 'Fuair mé $n teachtaireacht';
 $messages['searchnomatch'] = 'Ní bhfuair mé aon rud as an ceist seo';
@@ -73,4 +70,3 @@ $messages['copyerror'] = 'Theip mé agus níor dfhag mé aon seolagh';
 $messages['sourceisreadonly'] = 'Tá an foinse seolaigh seo inléite amháin';
 $messages['errorsavingcontact'] = 'Theip mé, Níl an cumas agam an seolagh seo a sábháil';
 
-?>
\ No newline at end of file
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index bdceb7ef0..78f47f214 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/gl_ES/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:    David Garabana Barro <david garabana com>                  |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/gl_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -42,6 +42,7 @@ $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Estado da lectura';
 $labels['mailboxlist'] = 'Cartafoles';
+$labels['folders'] = 'Cartafoles';
 $labels['messagesfromto'] = 'Mensaxes da $from á $to de $count';
 $labels['threadsfromto'] = 'Fíos do $from ao $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
@@ -70,7 +71,8 @@ $labels['jan'] = 'Xan';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Abr';
-$labels['may'] = 'Mai';
+$labels['may'] = 'Maio';
+$labels['longmay'] = 'Maio';
 $labels['jun'] = 'Xuñ';
 $labels['jul'] = 'Xul';
 $labels['aug'] = 'Ago';
@@ -82,7 +84,6 @@ $labels['longjan'] = 'Xaneiro';
 $labels['longfeb'] = 'Febreiro';
 $labels['longmar'] = 'Marzo';
 $labels['longapr'] = 'Abril';
-$labels['longmay'] = 'Maio';
 $labels['longjun'] = 'Xuño';
 $labels['longjul'] = 'Xullo';
 $labels['longaug'] = 'Agosto';
@@ -118,6 +119,7 @@ $labels['moreactions'] = 'Máis accións...';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Ningunha';
+$labels['nonesort'] = 'Ningunha';
 $labels['currpage'] = 'Páxina actual';
 $labels['unread'] = 'Non lidas';
 $labels['flagged'] = 'Marcadas';
@@ -137,7 +139,6 @@ $labels['expand_only_unread'] = 'só con mensaxes non lidas';
 $labels['fromto'] = 'Remitente/Destinatario';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Anexo';
-$labels['nonesort'] = 'Ningunha';
 $labels['sentdate'] = 'Data de envío';
 $labels['arrival'] = 'Data de chegada';
 $labels['asc'] = 'ascendente';
@@ -227,15 +228,16 @@ $labels['notes'] = 'Notes';
 $labels['male'] = 'home';
 $labels['female'] = 'muller';
 $labels['manager'] = 'Xerente';
-$labels['assistant'] = 'Asistente/a';
+$labels['assistant'] = 'Asistente';
+$labels['typeassistant'] = 'Asistente';
 $labels['spouse'] = 'Cónxuxe';
 $labels['allfields'] = 'Tódolos campos';
 $labels['search'] = 'Procurar';
 $labels['advsearch'] = 'Procura avanzada';
 $labels['other'] = 'Outro';
+$labels['typeother'] = 'Outro';
 $labels['typehome'] = 'Casa';
 $labels['typework'] = 'Traballo';
-$labels['typeother'] = 'Outro';
 $labels['typemobile'] = 'Móbil';
 $labels['typemain'] = 'Principal';
 $labels['typehomefax'] = 'Fax da casa';
@@ -243,7 +245,6 @@ $labels['typeworkfax'] = 'Fax do traballo';
 $labels['typecar'] = 'Coche';
 $labels['typepager'] = 'Buscapersonas';
 $labels['typevideo'] = 'Vídeo';
-$labels['typeassistant'] = 'Asistente';
 $labels['typehomepage'] = 'Páxina principal';
 $labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Perfil';
@@ -284,7 +285,7 @@ $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde ficheiro:';
 $labels['importtarget'] = 'Engadir contactos ao caderno de enderezos:';
 $labels['importreplace'] = 'Substituír completamente o caderno de enderezos';
-$labels['importtext'] = 'Pode cargar contactos desde un caderno de enderezos xa existente.<br/>Polo de agora pódense importar enderezos usando o formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  ';
+$labels['importtext'] = 'Pode cargar contactos desde un caderno de enderezos xa existente.<br/>Polo de agora pódense importar enderezos usando o formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>';
 $labels['done'] = 'Rematado';
 $labels['settingsfor'] = 'Axustes de';
 $labels['about'] = 'Acerca de';
@@ -353,7 +354,6 @@ $labels['mainoptions'] = 'Opcións principais';
 $labels['section'] = 'Sección';
 $labels['maintenance'] = 'Mantemento';
 $labels['newmessage'] = 'Mensaxes novas';
-$labels['listoptions'] = 'Opcións de lista';
 $labels['signatureoptions'] = 'Opcións da firma';
 $labels['whenreplying'] = 'Ao respostar';
 $labels['replytopposting'] = 'comezar a nova mensaxe enriba da orixinal';
@@ -362,7 +362,7 @@ $labels['replyremovesignature'] = 'Eliminar a firma do remitente ao respostar';
 $labels['autoaddsignature'] = 'Engadir firma automáticamente';
 $labels['newmessageonly'] = 'só nas mensaxes novas';
 $labels['replyandforwardonly'] = 'só nas respostas e reenvíos';
-$labels['replysignaturepos'] = 'Ao respostar ou reenviar colocar a firma ';
+$labels['replysignaturepos'] = 'Ao respostar ou reenviar colocar a firma';
 $labels['belowquote'] = 'embaixo do texto citado';
 $labels['abovequote'] = 'enriba do texto citado';
 $labels['insertsignature'] = 'Engadir firma';
@@ -380,7 +380,6 @@ $labels['spellcheckignorenums'] = 'Ignorar as palabras con números';
 $labels['spellcheckignorecaps'] = 'Ignorar as palabras escritas en maiúsculas';
 $labels['addtodict'] = 'Engadir ao diccionario';
 $labels['folder'] = 'Cartafol';
-$labels['folders'] = 'Cartafoles';
 $labels['foldername'] = 'Nome do cartafol';
 $labels['subscribed'] = 'Subscrito';
 $labels['messagecount'] = 'Mensaxes';
@@ -431,4 +430,3 @@ $labels['japanese'] = 'Xaponés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinés';
 
-?>
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index c872c8e83..2ee3bdac6 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/gl_ES/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:    David Garabana Barro <david garabana com>                  |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/gl_ES/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -36,7 +36,7 @@ $messages['checkingmail'] = 'Á procura de novas mensaxes...';
 $messages['sendingmessage'] = 'Enviando mensaxe...';
 $messages['messagesent'] = 'A mensaxe enviouse correctamente.';
 $messages['savingmessage'] = 'Gardando mensaxe...';
-$messages['messagesaved'] = 'A mensaxe gardouse en "Borradores"';
+$messages['messagesaved'] = 'A mensaxe gardouse en "Borradores';
 $messages['successfullysaved'] = 'Gardado correctamente.';
 $messages['addedsuccessfully'] = 'O contacto engadiuse correctamente ao caderno de enderezos.';
 $messages['contactexists'] = 'Xa existe un contacto con este enderezo de correo electrónico.';
@@ -125,7 +125,6 @@ $messages['smtpautherror'] = 'Erro SMTP ($code): Fallou a autenticación.';
 $messages['smtpfromerror'] = 'Erro SMTP ($code): Non foi posible establecer o remitente "$from" ($msg).';
 $messages['smtptoerror'] = 'Erro SMTP ($code): Non foi posible engadir o destinatario "$to" ($msg).';
 $messages['smtprecipientserror'] = 'Erro SMTP: Non se pode analizar a lista de destinatarios.';
-$messages['smtpdsnerror'] = 'Erro SMTP: Non hai soporte para notificacións do estado de envío (DSN).';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'O enderezo de correo electrónico é incorrecto: $email.';
 $messages['toomanyrecipients'] = 'Especificou destinatarios de máis. Por favor, redúzaos a un máximo de $max.';
@@ -138,7 +137,7 @@ $messages['contactrestored'] = 'Restauráronse correctamente o(s) contacto(s).';
 $messages['groupdeleted'] = 'Borrouse correctamente o grupo.';
 $messages['grouprenamed'] = 'Mudouse correctamente o nome do grupo.';
 $messages['groupcreated'] = 'Creouse correctamente o grupo.';
-$messages['savedsearchdeleted'] = 'Borrouse correctamente a procura gardada. ';
+$messages['savedsearchdeleted'] = 'Borrouse correctamente a procura gardada.';
 $messages['savedsearchdeleteerror'] = 'Non foi posible borrar a procura gardada.';
 $messages['savedsearchcreated'] = 'Creouse correctamente a procura gardada.';
 $messages['savedsearchcreateerror'] = 'Non foi posible crear a procura gardada.';
@@ -156,4 +155,3 @@ $messages['invalidimageformat'] = 'O formato da imaxe non é válido.';
 $messages['mispellingsfound'] = 'Atopáronse erros ortográficos na mensaxe.';
 $messages['parentnotwritable'] = 'Non foi posible crear/mover o cartafol no cartafol padre escollido porque non ten permisos.';
 
-?>
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 1dd15f45e..1a207a367 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -1,18 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/he_IL/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Moshe Leibovitch  <moish@mln.co.il>                           |
-| Updates: Noor Dawod <noor@comrax.com>                                 |
-| Updates: Moshe Leibovitch  <moish@mln.co.il>  28112011                |
-+-----------------------------------------------------------------------+
+ +-----------------------------------------------------------------------+
+ | localization/he_IL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -43,6 +42,7 @@ $labels['priority'] = 'עדיפות';
 $labels['organization'] = 'ארגון';
 $labels['readstatus'] = 'נקרא';
 $labels['mailboxlist'] = 'תיקים';
+$labels['folders'] = 'תיקים';
 $labels['messagesfromto'] = 'הודעות $from עד $to מתוך $count';
 $labels['threadsfromto'] = 'שרשור $from עד $to מתוך $count';
 $labels['messagenrof'] = 'הודעה $nr מתוך $count';
@@ -72,6 +72,7 @@ $labels['feb'] = 'פבר';
 $labels['mar'] = 'מרץ';
 $labels['apr'] = 'אפר';
 $labels['may'] = 'מאי';
+$labels['longmay'] = 'מאי';
 $labels['jun'] = 'יונ';
 $labels['jul'] = 'יול';
 $labels['aug'] = 'אוג';
@@ -83,7 +84,6 @@ $labels['longjan'] = 'ינואר';
 $labels['longfeb'] = 'פברואר';
 $labels['longmar'] = 'מרץ';
 $labels['longapr'] = 'אפריל';
-$labels['longmay'] = 'מאי';
 $labels['longjun'] = 'יוני';
 $labels['longjul'] = 'יולי';
 $labels['longaug'] = 'אוגוסט';
@@ -119,6 +119,7 @@ $labels['moreactions'] = 'פעולות נוספות...';
 $labels['select'] = 'בחירה';
 $labels['all'] = 'הכל';
 $labels['none'] = 'כלום';
+$labels['nonesort'] = 'כלום';
 $labels['currpage'] = 'דף נוכחי';
 $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
@@ -138,7 +139,6 @@ $labels['expand_only_unread'] = 'רק עם הודעות שטרם נקראו';
 $labels['fromto'] = 'שולח/נמען';
 $labels['flag'] = 'דגל';
 $labels['attachment'] = 'צרופה';
-$labels['nonesort'] = 'כלום';
 $labels['sentdate'] = 'תאריך משלוח';
 $labels['arrival'] = 'תאריך הגעה';
 $labels['asc'] = 'בסדר עולה';
@@ -186,7 +186,7 @@ $labels['high'] = 'גבוה';
 $labels['highest'] = 'גבוה ביותר';
 $labels['nosubject'] = '(ללא נושא)';
 $labels['showimages'] = 'הצגת תמונות';
-$labels['alwaysshow'] = '$sender תמיד להציג תמונות מאת ';
+$labels['alwaysshow'] = '$sender תמיד להציג תמונות מאת';
 $labels['isdraft'] = 'זו טיוטה של הודעה';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ללא עיצוב';
@@ -229,14 +229,15 @@ $labels['male'] = 'זכר';
 $labels['female'] = 'נקבה';
 $labels['manager'] = 'מנהל/ת';
 $labels['assistant'] = 'עוזר/ת';
+$labels['typeassistant'] = 'עוזר/ת';
 $labels['spouse'] = 'בן/בת זוג';
 $labels['allfields'] = 'כל השדות';
 $labels['search'] = 'חיפוש';
 $labels['advsearch'] = 'חיםוש מתקדם';
 $labels['other'] = 'אחר';
+$labels['typeother'] = 'אחר';
 $labels['typehome'] = 'בית';
 $labels['typework'] = 'עבודה';
-$labels['typeother'] = 'אחר';
 $labels['typemobile'] = 'נייד';
 $labels['typemain'] = 'עיקרי';
 $labels['typehomefax'] = 'פקס בית';
@@ -244,7 +245,6 @@ $labels['typeworkfax'] = 'פקס עבודה';
 $labels['typecar'] = 'מכונית';
 $labels['typepager'] = 'זימונית';
 $labels['typevideo'] = 'וידאו';
-$labels['typeassistant'] = 'עוזר/ת';
 $labels['typehomepage'] = 'דף הבית';
 $labels['typeblog'] = 'יומן רשת';
 $labels['typeprofile'] = 'פרופיל';
@@ -267,7 +267,7 @@ $labels['composeto'] = 'יצירת הודעה אל';
 $labels['contactsfromto'] = 'אנשי קשר $from עד $to מתוך $count';
 $labels['print'] = 'הדפסה';
 $labels['export'] = 'ייצוא';
-$labels['exportvcards'] = 'ייצוא אנשי קשר בפורמט  vCard ';
+$labels['exportvcards'] = 'ייצוא אנשי קשר בפורמט  vCard';
 $labels['newcontactgroup'] = 'יצירת קבוצה חדשה של אנשי קשר';
 $labels['grouprename'] = 'שינוי שם קבוצה';
 $labels['groupdelete'] = 'מחיקת קבוצה';
@@ -323,7 +323,7 @@ $labels['mailboxview'] = 'הצגת תיבת ההודעות';
 $labels['mdnrequests'] = 'משלוח אישור מסירה';
 $labels['askuser'] = 'שאל את המשתמש';
 $labels['autosend'] = 'שליחה אוטומטית';
-$labels['autosendknown'] = 'משלוח אישור קבלה רק לאנשי הקשר שלי ';
+$labels['autosendknown'] = 'משלוח אישור קבלה רק לאנשי הקשר שלי';
 $labels['autosendknownignore'] = 'משלוח אישור קבלה לאנשי הקשר שלי בלבד ולהתעלם מאחרים';
 $labels['ignore'] = 'התעלם';
 $labels['readwhendeleted'] = 'סימון הודעה כנקראה לאחר מחיקה';
@@ -350,11 +350,11 @@ $labels['advancedoptions'] = 'הגדרות נוספות';
 $labels['focusonnewmessage'] = 'מיקוד הסמן על החלון עם ההודעה החדשה';
 $labels['checkallfolders'] = 'בדיקת הודעות חדשות בכל התיקים';
 $labels['displaynext'] = 'מעבר להודעה הבאה לאחר מחיקה או תיוק';
+$labels['defaultfont'] = 'גופן ברירת מחדל להודעה בפורמט HTML';
 $labels['mainoptions'] = 'אפשרויות עיקריות';
 $labels['section'] = 'קטע';
 $labels['maintenance'] = 'תחזוקה';
 $labels['newmessage'] = 'הודעה חדשה';
-$labels['listoptions'] = 'אפשרויות רשימה';
 $labels['signatureoptions'] = 'אפשרויות לשיבוץ חתימה';
 $labels['whenreplying'] = 'כאשר עונים';
 $labels['replytopposting'] = 'הודעה חדשה תתחיל מעל ההודעה המקורית';
@@ -381,7 +381,6 @@ $labels['spellcheckignorenums'] = 'התעלמות ממילים המכילות מ
 $labels['spellcheckignorecaps'] = 'התעלמות ממילים עם אותציות ראשיות';
 $labels['addtodict'] = 'הוספה למילון';
 $labels['folder'] = 'תיק';
-$labels['folders'] = 'תיקים';
 $labels['foldername'] = 'שם תיק';
 $labels['subscribed'] = 'מנוי';
 $labels['messagecount'] = 'הודעות';
@@ -432,4 +431,3 @@ $labels['japanese'] = 'יפני';
 $labels['korean'] = 'קוריאני';
 $labels['chinese'] = 'סיני';
 
-?>
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 51de7c79d..6a04c0974 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -1,19 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/he_IL/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Moshe Leibovitch    <moish@mln.co.il>                         |
-| Updates: Noor Dawod <noor@comrax.com>                                 |
-| Updates: Moshe Leibovitch  <moish@mln.co.il>  28112011                |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/he_IL/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -41,7 +39,7 @@ $messages['savingmessage'] = 'שמירת הודעה...';
 $messages['messagesaved'] = 'ההודעה נשמרה כטיוטה';
 $messages['successfullysaved'] = 'נשמרה בהצלחה';
 $messages['addedsuccessfully'] = 'איש הקשר נוסף לפנקס בהצלחה';
-$messages['contactexists'] = 'קיים כבר איש קשר עם כתובת דוא\"ל זו';
+$messages['contactexists'] = 'קיים כבר איש קשר עם כתובת דוא"ל זו';
 $messages['contactnameexists'] = 'קיים כבר איש קשר בעל אותו שם';
 $messages['blockedimages'] = 'תמונות משרת אחר נחסמו כדי לשמור על הפרטיות';
 $messages['encryptedmessage'] = 'זו הודעת מוצפנת ולא ניתן להציגה';
@@ -68,7 +66,7 @@ $messages['foldermoving'] = 'העברת תיקיה...';
 $messages['foldersubscribing'] = 'התיק נרשם...';
 $messages['folderunsubscribing'] = 'רישום התיק בוטל...';
 $messages['formincomplete'] = 'לא הוזנו כל השדות בטופס זה';
-$messages['noemailwarning'] = 'נא להוסיף כתובת דוא\"ל חוקית';
+$messages['noemailwarning'] = 'נא להוסיף כתובת דוא"ל חוקית';
 $messages['nonamewarning'] = 'נא להוסיף שם';
 $messages['nopagesizewarning'] = 'נא להוסיף גודל דף';
 $messages['nosenderwarning'] = 'נא להוסיף כתובת השולח';
@@ -77,7 +75,7 @@ $messages['nosubjectwarning'] = 'שורת הנושא ריקה. האם ברצונ
 $messages['nobodywarning'] = 'האם לשלוח הודעה ללא תוכן?';
 $messages['notsentwarning'] = 'ההודעה לא נשלחה. האם לבטל?';
 $messages['noldapserver'] = 'נא לבחור שרת כתובות לחיפוש';
-$messages['nosearchname'] = 'נא להוסיף איש קשר או כתובת דוא\"ל';
+$messages['nosearchname'] = 'נא להוסיף איש קשר או כתובת דוא"ל';
 $messages['notuploadedwarning'] = 'עדיין לא הועלו כל הקבצים. נא לחכות או לבטל הפעולה.';
 $messages['searchsuccessful'] = 'נמצאו $nr הודעות';
 $messages['contactsearchsuccessful'] = 'נמצאו $nr אנשי קשר';
@@ -121,11 +119,11 @@ $messages['importconfirmskipped'] = '<b>  דילוג של $skipped נתונים
 $messages['opnotpermitted'] = 'פעולה אסורה!';
 $messages['nofromaddress'] = 'לזהות שנבחרה חסרה כתובת דואר';
 $messages['editorwarning'] = 'המעבר לעורך רגיל יגרום לאיבוד את העריכה הקיימת. האם להמשיך?';
-$messages['httpreceivedencrypterror'] = 'ארעה שגיאת תצורה חמורה. נא להודיע מייד למנהל/ת המערכת. <B> הודעתך לא תשלח <B> ';
+$messages['httpreceivedencrypterror'] = 'ארעה שגיאת תצורה חמורה. נא להודיע מייד למנהל/ת המערכת. <B> הודעתך לא תשלח <B>';
 $messages['smtpconnerror'] = 'SMTP ($code): אבד הקשר לשרת';
 $messages['smtpautherror'] = 'SMTP ($code): ההזדהות נכשלה';
-$messages['smtpfromerror'] = ' ($msg) SMTP ($code): "$from" לא נרשמה כתובת השולח';
-$messages['smtptoerror'] = ' ($msg) SMTP ($code): "$to" לא נרשמה כתובת המקבל';
+$messages['smtpfromerror'] = '($msg) SMTP ($code): "$from" לא נרשמה כתובת השולח';
+$messages['smtptoerror'] = '($msg) SMTP ($code): "$to" לא נרשמה כתובת המקבל';
 $messages['smtprecipientserror'] = 'SMTP : לא ניתן לפענח רשימת נמענים';
 $messages['smtperror'] = 'SMTP: $msg';
 $messages['emailformaterror'] = '$email  כתובת דוא"ל שגויה';
@@ -158,4 +156,3 @@ $messages['mispellingsfound'] = 'התגלו שגיאות כתיב בהודעה';
 $messages['parentnotwritable'] = 'לא ניתן ליצור/להעביר תיקיה לתוך תיקית האב שנבחרה. אין הרשאה לגישה.';
 $messages['messagetoobig'] = 'ההודעה גדולה מעבר ליכולת העיבוד של התוכנה';
 
-?>
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 122e01e09..8ef62e210 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -2,74 +2,53 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi/labels.inc                                            |
+ | localization/hi_IN/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aniruddha "Karim" Shankar <karim@sarai.net>                   |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
-
-// login page
-$labels['welcome']   = '$product में स्वागत है';
-$labels['username']  = 'यूसरनाम';
-$labels['password']  = 'पासवर्ड';
-$labels['server']    = 'सर्वर';
-$labels['login']     = 'लॉगिन';
-
-// taskbar
-$labels['logout']   = 'लॉगआऊट';
-$labels['mail']     = 'ई-मेल';
+$labels['welcome'] = '$product में स्वागत है';
+$labels['username'] = 'यूसरनाम';
+$labels['password'] = 'पासवर्ड';
+$labels['server'] = 'सर्वर';
+$labels['login'] = 'लॉगिन';
+$labels['logout'] = 'लॉगआऊट';
+$labels['mail'] = 'ई-मेल';
 $labels['settings'] = 'निजी सैटिंग';
 $labels['addressbook'] = 'पता खाता';
-
-// mailbox names
-$labels['inbox']  = 'इनबॉक्स';
+$labels['inbox'] = 'इनबॉक्स';
 $labels['drafts'] = 'ड्राफ़ट';
-$labels['sent']   = 'भेजा गया';
-$labels['trash']  = 'रद्दी';
-$labels['junk']   = 'स्पैम';
-
-// message listing
+$labels['sent'] = 'भेजा गया';
+$labels['trash'] = 'रद्दी';
+$labels['junk'] = 'स्पैम';
 $labels['subject'] = 'विशय';
-$labels['from']    = 'भेजने वाला';
-$labels['to']      = 'पाने वाला';
-$labels['cc']      = 'कार्बन';
-$labels['bcc']     = 'अंधा कार्बन';
+$labels['from'] = 'भेजने वाला';
+$labels['to'] = 'पाने वाला';
+$labels['cc'] = 'कार्बन';
+$labels['bcc'] = 'अंधा कार्बन';
 $labels['replyto'] = 'जवाब यहाँ';
-$labels['date']    = 'तारीख';
-$labels['size']    = 'माप';
+$labels['date'] = 'तारीख';
+$labels['size'] = 'माप';
 $labels['priority'] = 'मेल की महत्वपूर्णता';
 $labels['organization'] = 'संस्था';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
-$labels['mailboxlist'] = 'फ़ोलडर';
+$labels['mailboxlist'] = 'फ़ोल्डर';
+$labels['folders'] = 'फ़ोल्डर';
 $labels['messagesfromto'] = '$from से ले कर $to, $count मेल में से';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count में से';
-
-$labels['moveto']   = 'खीस्काऐं...';
+$labels['copy'] = 'कार्बन';
+$labels['moveto'] = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
-
 $labels['filename'] = 'फ़ाईल नाम';
 $labels['filesize'] = 'फ़ाईल माप';
-
-$labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) दिखाऐं';
-$labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूप मेल करें';
-$labels['prettydate'] = 'सुनदर तारीखें';
-
 $labels['addtoaddressbook'] = 'पता खाते में जोडें';
-
-// weekdays short
 $labels['sun'] = 'रवि';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंग';
@@ -77,159 +56,111 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनि';
-
-// weekdays long
-$labels['sunday']    = 'रविवार';
-$labels['monday']    = 'सोमवार';
-$labels['tuesday']   = 'मंगलवार';
+$labels['sunday'] = 'रविवार';
+$labels['monday'] = 'सोमवार';
+$labels['tuesday'] = 'मंगलवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday']  = 'गुरुवार';
-$labels['friday']    = 'शुक्रवार';
-$labels['saturday']  = 'शनिवार';
-
+$labels['thursday'] = 'गुरुवार';
+$labels['friday'] = 'शुक्रवार';
+$labels['saturday'] = 'शनिवार';
 $labels['today'] = 'आज';
-
-// toolbar buttons
-$labels['checkmail']        = 'नये मेल लाऐं';
-$labels['writenewmessage']  = 'मेल लिखें';
-$labels['replytomessage']   = 'मेल का जवाब दें';
+$labels['checkmail'] = 'नये मेल लाऐं';
+$labels['writenewmessage'] = 'मेल लिखें';
+$labels['replytomessage'] = 'मेल का जवाब दें';
 $labels['replytoallmessage'] = 'सभी को जवाब लिखें';
-$labels['forwardmessage']   = 'आगे भेजें';
-$labels['deletemessage']    = 'रद्द करें';
-$labels['printmessage']     = 'मेल छापें';
-$labels['previousmessage']	= 'पीछे के मेल दिखाऐं';
-$labels['previousmessages']	= 'पीछे के मेल का बन्डल दिखाऐं';
-$labels['firstmessage']		= 'पहला मेल दिखाऐं';
-$labels['firstmessages']	= 'पहला मेल का बन्डल दिखाऐं';
-$labels['nextmessage']		= 'अगला मेल दिखाऐं';
-$labels['nextmessages']		= 'अगले मेल का बन्डल दिखाऐं';
-$labels['lastmessage']		= 'आखीरी मेल दिखाऐं';
-$labels['lastmessages']		= 'आखिरी मेल का बन्डल दिखाऐं';
-$labels['backtolist']		= 'मेल सूची देखें';
-$labels['viewsource']		= 'सोर्स दिखाऐं';
-
-$labels['select']		= 'चुनें';
-$labels['all']			= 'सभी';
-$labels['none']			= 'कोई नहीं';
-$labels['unread']		= 'अनदेखी';
-
-$labels['compact']		= 'छोटा करें';
-$labels['empty']		= 'मेल रद्दी में डालें';
-$labels['purge']		= 'मिटाऐं';
-
-$labels['quota']		= 'डिस्क उपयोग';
-$labels['unknown']		= 'अज्ञात';
-$labels['unlimited']		= 'असीम';
-
-$labels['quicksearch']		= 'तेज़ खोज';
-$labels['resetsearch']		= 'खोज खाली करें';
-
-
-// message compose
-$labels['compose']		= 'मेल लिखें';
-$labels['sendmessage']		= 'मेल भेजें';
-$labels['savemessage']		= 'ड्राफ़ट सहेजें';
-$labels['addattachment']	= 'फ़ाईल जोडें';
-$labels['charset']		= 'कैरेक्टर सैट';
-$labels['editortype']		= 'सम्पादक प्राकार';
-$labels['returnreceipt']	= 'मेल रसीद';
-
-$labels['checkspelling']	= 'स्पैलिंग जाँचें';
-$labels['resumeediting']	= 'सम्पादन फिर शुरू करें';
-$labels['revertto']		= 'पहले की स्थिती पर जाऐं';
-
-$labels['attachments']		= 'जुडे फाईल';
-$labels['upload']		= 'अपलोड';
-$labels['close']		= 'बंद';
-
-$labels['low']			= 'कम';
-$labels['lowest']		= 'सबसे कम';
-$labels['normal']		= 'साधारण';
-$labels['high']			= 'उच्च';
-$labels['highest']		= 'उच्चतम';
-
-$labels['nosubject']		= '(कोई विशय नहीं)';
-$labels['showimages']		= 'चित्र दिखाऐं';
-
-$labels['htmltoggle']		= 'ऐच-टी-ऐम-एल (HTML)';
-$labels['plaintoggle']		= 'सादा पाठ';
-
-
-// address boook
-$labels['name']			= 'दिखने वाला नाम';
-$labels['firstname']		= 'पहला नाम';
-$labels['surname']		= 'उपनाम';
-$labels['email']		= 'मेल';
-
-$labels['addcontact']		= 'नया पता जोडें';
-$labels['editcontact']		= 'पता सम्पाद';
-
-$labels['edit']			= 'सम्पाद';
-$labels['cancel']		= 'रद्द';
-$labels['save']			= 'सहेज';
-$labels['delete']		= 'मिटा';
-
-$labels['newcontact']		= 'नया पता कार्ड बनाऐं';
-$labels['deletecontact']	= 'चुने पते मिटाऐं';
-$labels['composeto']		= 'को मेल भेजें';
-$labels['contactsfromto']	= '$from से ले कर $to, $count पते में से';
-$labels['print']		= 'छापें';
-$labels['export']		= 'ऐक्स्पोर्ट';
-
-$labels['previouspage']		= 'इससे पहले के बन्डल को दिखाऐं';
-$labels['firstpage']		= 'पहला बन्डल दिखाऐं';
-$labels['nextpage']		= 'अगला बन्डल दिखाऐं';
-$labels['lastpage']		= 'आखिरी बन्डल दिखाऐं';
-
-
-// LDAP search
-$labels['ldapsearch']		= 'ऐलडैप (LDAP) डाईरेक्टरी खोजें';
-
-$labels['ldappublicsearchname']	= 'पता का नाम';
-$labels['ldappublicsearchtype']	= 'सख़त मैच?';
-$labels['ldappublicserverselect']	= 'सर्वर चुनें';
-$labels['ldappublicsearchfield']	= 'यहाँ खोजें';
-$labels['ldappublicsearchform']	= 'पता के लिये खोजें';
-$labels['ldappublicsearch']	= 'खोज';
-
-
-// settings
-$labels['settingsfor']		= 'इनके विन्यास:';
-
-$labels['preferences']		= 'पसंद';
-$labels['userpreferences']	= 'यूसर पसंद';
-$labels['editpreferences']	= 'यूसर पसंद सम्पादें';
-
-$labels['identities']		= 'पहचान';
-$labels['manageidentities']	= 'इस खाते के पहचान व्यवस्थित करें';
-$labels['newidentity']		= 'नया पहचान';
-
-$labels['newitem']		= 'नया चीज़';
-$labels['edititem']		= 'चीज़ सम्पादें';
-
-$labels['setdefault']		= 'तयशुदा चुनें';
-$labels['language']		= 'भाषा';
-$labels['timezone']		= 'समय क्षेत्र';
-$labels['pagesize']		= 'हर पन्ने पर इतने';
-$labels['signature']		= 'दस्तखत';
-$labels['dstactive']		= 'रौशनी बचाव';
-$labels['htmleditor']		= 'मेल ऐच-टी-ऐम-एल (HTML) मे लिखें';
-$labels['htmlsignature']	= 'ऐच-टी-ऐम-एल (HTML) दस्तखत';
-$labels['previewpane']		= 'झलक पट्टी दिखाऐं';
-
-$labels['autosavedraft']	= 'ड्राफ़ट अपने आप सहेजते जाऐं';
-$labels['never']		= 'कभी नहाीं';
-
-$labels['folder']		= 'फ़ोल्डर';
-$labels['folders']		= 'फ़ोल्डर';
-$labels['foldername']		= 'फ़ोल्डर नाम';
-$labels['subscribed']		= 'सबस्क्राईब किया गया';
-$labels['create']		= 'बनाऐं';
-$labels['createfolder']		= 'फ़ोलडर बनाऐं';
-$labels['managefolders']	= 'फ़ोलडर को व्यवस्थित करें';
-
-$labels['sortby']		= 'ऐसे तय करें';
-$labels['sortasc']		= 'पहले से आखीरी तय करें';
-$labels['sortdesc']		= 'आखीरी से पहले तय करें';
+$labels['forwardmessage'] = 'आगे भेजें';
+$labels['deletemessage'] = 'रद्द करें';
+$labels['printmessage'] = 'मेल छापें';
+$labels['previousmessage'] = 'पीछे के मेल दिखाऐं';
+$labels['firstmessage'] = 'पहला मेल दिखाऐं';
+$labels['nextmessage'] = 'अगला मेल दिखाऐं';
+$labels['lastmessage'] = 'आखीरी मेल दिखाऐं';
+$labels['backtolist'] = 'मेल सूची देखें';
+$labels['viewsource'] = 'सोर्स दिखाऐं';
+$labels['select'] = 'चुनें';
+$labels['all'] = 'सभी';
+$labels['none'] = 'कोई नहीं';
+$labels['nonesort'] = 'कोई नहीं';
+$labels['unread'] = 'अनदेखी';
+$labels['compact'] = 'छोटा करें';
+$labels['empty'] = 'मेल रद्दी में डालें';
+$labels['quota'] = 'डिस्क उपयोग';
+$labels['unknown'] = 'अज्ञात';
+$labels['unlimited'] = 'असीम';
+$labels['quicksearch'] = 'तेज़ खोज';
+$labels['resetsearch'] = 'खोज खाली करें';
+$labels['compose'] = 'मेल लिखें';
+$labels['savemessage'] = 'ड्राफ़ट सहेजें';
+$labels['sendmessage'] = 'मेल भेजें';
+$labels['addattachment'] = 'फ़ाईल जोडें';
+$labels['charset'] = 'कैरेक्टर सैट';
+$labels['editortype'] = 'सम्पादक प्राकार';
+$labels['returnreceipt'] = 'मेल रसीद';
+$labels['checkspelling'] = 'स्पैलिंग जाँचें';
+$labels['resumeediting'] = 'सम्पादन फिर शुरू करें';
+$labels['revertto'] = 'पहले की स्थिती पर जाऐं';
+$labels['attachments'] = 'जुडे फाईल';
+$labels['upload'] = 'अपलोड';
+$labels['close'] = 'बंद';
+$labels['low'] = 'कम';
+$labels['lowest'] = 'सबसे कम';
+$labels['normal'] = 'साधारण';
+$labels['high'] = 'उच्च';
+$labels['highest'] = 'उच्चतम';
+$labels['nosubject'] = '(कोई विशय नहीं)';
+$labels['showimages'] = 'चित्र दिखाऐं';
+$labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
+$labels['plaintoggle'] = 'सादा पाठ';
+$labels['name'] = 'दिखने वाला नाम';
+$labels['firstname'] = 'पहला नाम';
+$labels['surname'] = 'उपनाम';
+$labels['email'] = 'मेल';
+$labels['addcontact'] = 'नया पता जोडें';
+$labels['editcontact'] = 'पता सम्पाद';
+$labels['edit'] = 'सम्पाद';
+$labels['cancel'] = 'रद्द';
+$labels['save'] = 'सहेज';
+$labels['delete'] = 'मिटा';
+$labels['newcontact'] = 'नया पता कार्ड बनाऐं';
+$labels['deletecontact'] = 'चुने पते मिटाऐं';
+$labels['composeto'] = 'को मेल भेजें';
+$labels['contactsfromto'] = '$from से ले कर $to, $count पते में से';
+$labels['print'] = 'छापें';
+$labels['export'] = 'ऐक्स्पोर्ट';
+$labels['previouspage'] = 'इससे पहले के बन्डल को दिखाऐं';
+$labels['firstpage'] = 'पहला बन्डल दिखाऐं';
+$labels['nextpage'] = 'अगला बन्डल दिखाऐं';
+$labels['lastpage'] = 'आखिरी बन्डल दिखाऐं';
+$labels['settingsfor'] = 'इनके विन्यास:';
+$labels['preferences'] = 'पसंद';
+$labels['userpreferences'] = 'यूसर पसंद';
+$labels['editpreferences'] = 'यूसर पसंद सम्पादें';
+$labels['identities'] = 'पहचान';
+$labels['manageidentities'] = 'इस खाते के पहचान व्यवस्थित करें';
+$labels['newidentity'] = 'नया पहचान';
+$labels['newitem'] = 'नया चीज़';
+$labels['edititem'] = 'चीज़ सम्पादें';
+$labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) दिखाऐं';
+$labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूप मेल करें';
+$labels['prettydate'] = 'सुनदर तारीखें';
+$labels['setdefault'] = 'तयशुदा चुनें';
+$labels['language'] = 'भाषा';
+$labels['timezone'] = 'समय क्षेत्र';
+$labels['pagesize'] = 'हर पन्ने पर इतने';
+$labels['signature'] = 'दस्तखत';
+$labels['dstactive'] = 'रौशनी बचाव';
+$labels['htmleditor'] = 'मेल ऐच-टी-ऐम-एल (HTML) मे लिखें';
+$labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) दस्तखत';
+$labels['previewpane'] = 'झलक पट्टी दिखाऐं';
+$labels['autosavedraft'] = 'ड्राफ़ट अपने आप सहेजते जाऐं';
+$labels['never'] = 'कभी नहाीं';
+$labels['folder'] = 'फ़ोल्डर';
+$labels['foldername'] = 'फ़ोल्डर नाम';
+$labels['subscribed'] = 'सबस्क्राईब किया गया';
+$labels['create'] = 'बनाऐं';
+$labels['createfolder'] = 'फ़ोलडर बनाऐं';
+$labels['managefolders'] = 'फ़ोलडर को व्यवस्थित करें';
+$labels['sortby'] = 'ऐसे तय करें';
+$labels['sortasc'] = 'पहले से आखीरी तय करें';
+$labels['sortdesc'] = 'आखीरी से पहले तय करें';
 
-?>
\ No newline at end of file
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 9274c4d0b..8056dec5e 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -2,71 +2,66 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi/messages.inc                                          |
+ | localization/hi_IN/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aniruddha "Karim" Shankar <karim@sarai.net>                   |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
+$messages['loginfailed'] = 'लॉगिन नहीं हो पाया';
+$messages['cookiesdisabled'] = 'आपका ब्राऊसर कुकी स्वीकार नहीं कर रहा है';
+$messages['sessionerror'] = 'सत्र समाप्त या अवैद्य';
+$messages['imaperror'] = 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
+$messages['nomessagesfound'] = 'इस मेलबॉक्स में कोई मेल नहीं है';
+$messages['loggedout'] = 'सत्र समाप्त. टा टा!';
+$messages['mailboxempty'] = 'मेलबॉक्स खाली है';
+$messages['loading'] = 'लोड हो रहा है';
+$messages['loadingdata'] = 'डाटा लोड हो रहा है...';
+$messages['checkingmail'] = 'क्या नया मेल है?...';
+$messages['sendingmessage'] = 'मेल भेजा जा रहा है...';
+$messages['messagesent'] = 'मेल भेजा गया है';
+$messages['savingmessage'] = 'मेल सहेजा जा रहा है...';
+$messages['messagesaved'] = 'मेल ड्राफ़्ट फोल्डर में जमा हो रहा है';
+$messages['successfullysaved'] = 'सहेजा गया है';
+$messages['addedsuccessfully'] = 'पता खाते में पता जोडा गया है';
+$messages['contactexists'] = 'इस ई-मेल पता से एक पता पेहले से है';
+$messages['blockedimages'] = 'आप के प्राईवेसी के लिये और स्पैम से बचने के लिये इस मेल में सदूर चित्र नहीं दिखाये गये हैं।';
+$messages['encryptedmessage'] = 'माफ़ कीजिये, यह मेल कूट रूप में है, इस कारण दिखाया नहीं जा सकता।';
+$messages['nocontactsfound'] = 'कोई पता नहीं मिला';
+$messages['sendingfailed'] = 'मेल नहीं भिज पाया';
+$messages['errorsaving'] = 'सहेजते-सहेजते गडबड हो गया';
+$messages['errormoving'] = 'मेल खिस्का नहीं';
+$messages['errordeleting'] = 'मेल मिटा नहीं';
+$messages['deletecontactconfirm'] = 'चुने गये पते को सचमुच मिटाना है ?';
+$messages['deletemessagesconfirm'] = 'चुने गये मेल को सचमुच मिटाना है ?';
+$messages['deletefolderconfirm'] = 'फ़ोल्डर को सचमुच मिटाऐं ?';
+$messages['purgefolderconfirm'] = 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
+$messages['formincomplete'] = 'फ़ॉर्म पूरी तरह से भरा नहीं';
+$messages['noemailwarning'] = 'वैद्य मेल पता भरें';
+$messages['nonamewarning'] = 'नाम भरें';
+$messages['nopagesizewarning'] = 'पन्ना माप भरें';
+$messages['norecipientwarning'] = 'कम-से-कम एक पाने वाले का पता भरें';
+$messages['nosubjectwarning'] = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
+$messages['nobodywarning'] = 'बिना कुछ लिखे मेल भेजें?';
+$messages['notsentwarning'] = 'मेल भिजा नहीं. मेल रद्द करें ?';
+$messages['noldapserver'] = 'खोज के लिये एक ऐलडैप सर्वर चुनें';
+$messages['nosearchname'] = 'पता या पते का नाम भरें';
+$messages['searchsuccessful'] = '$nr मेल मिले';
+$messages['searchnomatch'] = 'खोज असफ़ल';
+$messages['searching'] = 'खोजा रहे हैं...';
+$messages['checking'] = 'चाँचा चा रहा है...';
+$messages['nospellerrors'] = 'कोई स्पैलिंग गलती नहीं मिली';
+$messages['folderdeleted'] = 'फ़ोल्डर मिट गया';
+$messages['deletedsuccessfully'] = 'मिट गया';
+$messages['converting'] = 'मेल से फ़ॉर्मैटिंग निकाला जा रहा है...';
+$messages['messageopenerror'] = 'सर्वर से मेल लोड नहीं हो पाया';
+$messages['fileuploaderror'] = 'फ़ाईल अपलोड नहीं हो पाया';
+$messages['filesizeerror'] = 'अपलोड के लिये फ़ाईल हद $size से बड़ा है';
 
-$messages['loginfailed']	= 'लॉगिन नहीं हो पाया';
-$messages['cookiesdisabled']	= 'आपका ब्राऊसर कुकी स्वीकार नहीं कर रहा है';
-$messages['sessionerror']	= 'सत्र समाप्त या अवैद्य';
-$messages['imaperror']		= 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
-$messages['nomessagesfound']	= 'इस मेलबॉक्स में कोई मेल नहीं है';
-$messages['loggedout']		= 'सत्र समाप्त. टा टा!';
-$messages['mailboxempty']	= 'मेलबॉक्स खाली है';
-$messages['loading']		= 'लोड हो रहा है';
-$messages['loadingdata']	= 'डाटा लोड हो रहा है...';
-$messages['checkingmail']	= 'क्या नया मेल है?...';
-$messages['sendingmessage']	= 'मेल भेजा जा रहा है...';
-$messages['messagesent']	= 'मेल भेजा गया है';
-$messages['savingmessage']	= 'मेल सहेजा जा रहा है...';
-$messages['messagesaved']	= 'मेल ड्राफ़्ट फोल्डर में जमा हो रहा है';
-$messages['successfullysaved']	= 'सहेजा गया है';
-$messages['addedsuccessfully']	= 'पता खाते में पता जोडा गया है';
-$messages['contactexists']	= 'इस ई-मेल पता से एक पता पेहले से है';
-$messages['blockedimages']	= 'आप के प्राईवेसी के लिये और स्पैम से बचने के लिये इस मेल में सदूर चित्र नहीं दिखाये गये हैं।';
-$messages['encryptedmessage']	= 'माफ़ कीजिये, यह मेल कूट रूप में है, इस कारण दिखाया नहीं जा सकता।';
-$messages['nocontactsfound']	= 'कोई पता नहीं मिला';
-$messages['sendingfailed']	= 'मेल नहीं भिज पाया';
-$messages['errorsaving']	= 'सहेजते-सहेजते गडबड हो गया';
-$messages['errormoving']	= 'मेल खिस्का नहीं';
-$messages['errordeleting']	= 'मेल मिटा नहीं';
-$messages['deletecontactconfirm']	= 'चुने गये पते को सचमुच मिटाना है ?';
-$messages['deletemessagesconfirm']	= 'चुने गये मेल को सचमुच मिटाना है ?';
-$messages['deletefolderconfirm']	= 'फ़ोल्डर को सचमुच मिटाऐं ?';
-$messages['purgefolderconfirm']	= 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
-$messages['formincomplete']	= 'फ़ॉर्म पूरी तरह से भरा नहीं';
-$messages['noemailwarning']	= 'वैद्य मेल पता भरें';
-$messages['nonamewarning']	= 'नाम भरें';
-$messages['nopagesizewarning']	= 'पन्ना माप भरें';
-$messages['norecipientwarning']	= 'कम-से-कम एक पाने वाले का पता भरें';
-$messages['nosubjectwarning']	= 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
-$messages['nobodywarning']	= 'बिना कुछ लिखे मेल भेजें?';
-$messages['notsentwarning']	= 'मेल भिजा नहीं. मेल रद्द करें ?';
-$messages['noldapserver']	= 'खोज के लिये एक ऐलडैप सर्वर चुनें';
-$messages['nocontactsreturned']	= 'कोई पते नहीं मिले';
-$messages['nosearchname']	= 'पता या पते का नाम भरें';
-$messages['searchsuccessful']	= '$nr मेल मिले';
-$messages['searchnomatch']	= 'खोज असफ़ल';
-$messages['searching']		= 'खोजा रहे हैं...';
-$messages['checking']		= 'चाँचा चा रहा है...';
-$messages['nospellerrors']	= 'कोई स्पैलिंग गलती नहीं मिली';
-$messages['folderdeleted']	= 'फ़ोल्डर मिट गया';
-$messages['deletedsuccessfully']	= "मिट गया";
-$messages['converting']		= 'मेल से फ़ॉर्मैटिंग निकाला जा रहा है...';
-$messages['messageopenerror']	= 'सर्वर से मेल लोड नहीं हो पाया';
-$messages['fileuploaderror']	= 'फ़ाईल अपलोड नहीं हो पाया';
-$messages['filesizeerror']	= 'अपलोड के लिये फ़ाईल हद $size से बड़ा है';
-
-?>
\ No newline at end of file
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 271cd67a4..ab438f223 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/hr/labels.inc                                                |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Edi Budimilic <edi@gemstudio.hr>                              |
-|       Tanja Dobričić <tanja.dobricic@everymail.info>                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/hr_HR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -46,6 +42,7 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Pročitano';
 $labels['mailboxlist'] = 'Mape';
+$labels['folders'] = 'Mape';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
@@ -74,7 +71,8 @@ $labels['jan'] = 'Sij';
 $labels['feb'] = 'Velj';
 $labels['mar'] = 'Ožu';
 $labels['apr'] = 'Tra';
-$labels['may'] = 'Svi';
+$labels['may'] = 'Svibanj';
+$labels['longmay'] = 'Svibanj';
 $labels['jun'] = 'Lip';
 $labels['jul'] = 'Srp';
 $labels['aug'] = 'Kol';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'Siječanj';
 $labels['longfeb'] = 'Veljača';
 $labels['longmar'] = 'Ožujak';
 $labels['longapr'] = 'Travanj';
-$labels['longmay'] = 'Svibanj';
 $labels['longjun'] = 'Lipanj';
 $labels['longjul'] = 'Srpanj';
 $labels['longaug'] = 'Kolovoz';
@@ -118,10 +115,10 @@ $labels['markread'] = 'Kao pročitano';
 $labels['markunread'] = 'Kao nepročitano';
 $labels['markflagged'] = 'Kao označenu';
 $labels['markunflagged'] = 'Kao neoznačenu';
-$labels['messageactions'] = 'Više akcija';
 $labels['select'] = 'Označi';
 $labels['all'] = 'Sve';
-$labels['none'] = 'Nijednu';
+$labels['none'] = 'Ništa';
+$labels['nonesort'] = 'Ništa';
 $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Označene';
@@ -141,7 +138,6 @@ $labels['expand_only_unread'] = 'samo s nepročitanim porukama';
 $labels['fromto'] = 'Pošiljatelj/Primatelj';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Privitak';
-$labels['nonesort'] = 'Ništa';
 $labels['sentdate'] = 'Datum slanja';
 $labels['arrival'] = 'Datum primanja';
 $labels['asc'] = 'uzlazno';
@@ -152,7 +148,7 @@ $labels['listorder'] = 'Sortirajući redoslijed';
 $labels['listmode'] = 'Model pregleda listi';
 $labels['folderactions'] = 'Akcije mapa';
 $labels['compact'] = 'Kompresiranje';
-$labels['empty'] = 'Isprazni ';
+$labels['empty'] = 'Isprazni';
 $labels['quota'] = 'Kvota';
 $labels['unknown'] = 'nepoznato';
 $labels['unlimited'] = 'beskonačna';
@@ -227,11 +223,13 @@ $labels['notes'] = 'Bilješke';
 $labels['male'] = 'muško';
 $labels['female'] = 'žensko';
 $labels['manager'] = 'Menadžer';
-$labels['assistant'] = 'Pomoćnik';
+$labels['assistant'] = 'Asistent';
+$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Suprug/a';
+$labels['other'] = 'Ostalo';
+$labels['typeother'] = 'Ostalo';
 $labels['typehome'] = 'Kućni broj';
 $labels['typework'] = 'Poslovni broj';
-$labels['typeother'] = 'Ostalo';
 $labels['typemobile'] = 'Mobitel';
 $labels['typemain'] = 'Glavni broj';
 $labels['typehomefax'] = 'Fax kuća';
@@ -239,7 +237,6 @@ $labels['typeworkfax'] = 'Fax posao';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Pejdžer';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Asistent';
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Izmjeni kontakt';
@@ -261,7 +258,6 @@ $labels['print'] = 'Print';
 $labels['export'] = 'Export';
 $labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Napravi novu kontaktnu grupu';
-$labels['groupactions'] = 'Akcije kontaktne grupe';
 $labels['previouspage'] = 'Prethodna strana';
 $labels['firstpage'] = 'Prva strana';
 $labels['nextpage'] = 'Slijedeća strana';
@@ -339,7 +335,6 @@ $labels['mainoptions'] = 'Glavne postavke';
 $labels['section'] = 'Sekcija';
 $labels['maintenance'] = 'Održavanje';
 $labels['newmessage'] = 'Nova poruka';
-$labels['listoptions'] = 'Postavke liste';
 $labels['signatureoptions'] = 'Postavke potpisa';
 $labels['whenreplying'] = 'Prilikom odgovora';
 $labels['replytopposting'] = 'započni novu poruku iznad originala';
@@ -358,7 +353,6 @@ $labels['reqmdn'] = 'Uvijek zatraži potvrdu o primitku poruke';
 $labels['reqdsn'] = 'Uvijek zatraži potvrdu o slanju poruke';
 $labels['replysamefolder'] = 'Spremi odgovore u mapu gdje se nalazi poruka';
 $labels['folder'] = 'Mapa';
-$labels['folders'] = 'Mape';
 $labels['foldername'] = 'Ime mape';
 $labels['subscribed'] = 'Pretplata';
 $labels['messagecount'] = 'Poruke';
@@ -403,4 +397,3 @@ $labels['japanese'] = 'Japanski';
 $labels['korean'] = 'Korejski';
 $labels['chinese'] = 'Kineski';
 
-?>
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index 67f332a2c..32a05dbb8 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/hr/messages.inc                                              |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Edi Budimilic <edi@gemstudio.hr>                              |
-|       Tanja Dobričić <tanja.dobricic@everymail.info>                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/hr_HR/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -74,7 +70,6 @@ $messages['nosubjectwarning'] = 'Polje \'Naslov\' je prazno. Želite li unijeti
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['notsentwarning'] = 'Poruka nije poslana. Želite li odbaciti ovu poruku?';
 $messages['noldapserver'] = 'Unesite LDAP poslužitelj za pretragu';
-$messages['nocontactsreturned'] = 'Nije pronađen niti jedan kontakt';
 $messages['nosearchname'] = 'Unesite ime ili e-mail adresu';
 $messages['notuploadedwarning'] = 'Svi prilozi još nisu presnimljeni na poslužitelj. Molim pričekajte ili zaustavite prsnimavanje.';
 $messages['searchsuccessful'] = 'Broj pronađenih poruka: $nr';
@@ -121,7 +116,6 @@ $messages['smtpautherror'] = 'SMTP Greška ($code): Autentikacija nije uspjela';
 $messages['smtpfromerror'] = 'SMTP Greška ($code): Nije uspjelo postavljanje pošiljatelja "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Greška ($code): Nije uspjelo dodavanje primatelja "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Greška: Nije moguće pročitati listu primatelja';
-$messages['smtpdsnerror'] = 'SMTP Greška: Nema podrške za obaviještenje o statusu isporuke';
 $messages['smtperror'] = 'SMTP Greška: $msg';
 $messages['emailformaterror'] = 'Nepravilna e-mail adresa: $email';
 $messages['toomanyrecipients'] = 'Previše primatelja. Smanjite broj primatelja na $max.';
@@ -143,4 +137,3 @@ $messages['folderupdated'] = 'Ažuriranje mape uspješno.';
 $messages['foldercreated'] = 'Kreiranje mape uspješno.';
 $messages['invalidimageformat'] = 'Format slike nije ispravan.';
 
-?>
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 700eb37e0..ba74fb3ff 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/hu_HU/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Zark Bonfire <ikkhares at gmail dot com>                      |
-|         Peter Szabo <pete at teamlupus dot hu>                        |
-|         Barnabas Bona <bsi at hosember dot hu>                        |
-|         Gabor Veliczky <hosting at jugiter dot net>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/hu_HU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -48,6 +42,7 @@ $labels['priority'] = 'Sürgősség';
 $labels['organization'] = 'Szervezet';
 $labels['readstatus'] = 'Olvasott';
 $labels['mailboxlist'] = 'Mappák';
+$labels['folders'] = 'Mappák';
 $labels['messagesfromto'] = 'Üzenetek: $from - $to / $count';
 $labels['threadsfromto'] = 'Témák ($from - $to, összesen $count)';
 $labels['messagenrof'] = '$nr / $count üzenet';
@@ -76,7 +71,8 @@ $labels['jan'] = 'Jan';
 $labels['feb'] = 'Febr';
 $labels['mar'] = 'Márc';
 $labels['apr'] = 'Ápr';
-$labels['may'] = 'Máj';
+$labels['may'] = 'Május';
+$labels['longmay'] = 'Május';
 $labels['jun'] = 'Jún';
 $labels['jul'] = 'Júl';
 $labels['aug'] = 'Aug';
@@ -88,7 +84,6 @@ $labels['longjan'] = 'Január';
 $labels['longfeb'] = 'Február';
 $labels['longmar'] = 'Március';
 $labels['longapr'] = 'Április';
-$labels['longmay'] = 'Május';
 $labels['longjun'] = 'Június';
 $labels['longjul'] = 'Július';
 $labels['longaug'] = 'Augusztus';
@@ -124,6 +119,7 @@ $labels['moreactions'] = 'További műveletek...';
 $labels['select'] = 'Kijelölés';
 $labels['all'] = 'Összes';
 $labels['none'] = 'Nincs';
+$labels['nonesort'] = 'Nincs';
 $labels['currpage'] = 'Aktuális oldal';
 $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelölt';
@@ -143,7 +139,6 @@ $labels['expand_only_unread'] = 'csak ahol van olvasatlan üzenet';
 $labels['fromto'] = 'Feladó/Címzett';
 $labels['flag'] = 'Megjelölés';
 $labels['attachment'] = 'Csatolmány';
-$labels['nonesort'] = 'Nincs';
 $labels['sentdate'] = 'Feladva';
 $labels['arrival'] = 'Kézbesítve';
 $labels['asc'] = 'Emelkedő';
@@ -233,15 +228,16 @@ $labels['notes'] = 'Megjegyzések';
 $labels['male'] = 'férfi';
 $labels['female'] = 'nő';
 $labels['manager'] = 'Menedzser';
-$labels['assistant'] = 'Titkár';
+$labels['assistant'] = 'Asszisztens';
+$labels['typeassistant'] = 'Asszisztens';
 $labels['spouse'] = 'Házastárs';
 $labels['allfields'] = 'Összes mező';
 $labels['search'] = 'Keresés';
 $labels['advsearch'] = 'Részletes keresés';
 $labels['other'] = 'Egyéb';
+$labels['typeother'] = 'Egyéb';
 $labels['typehome'] = 'Otthon';
 $labels['typework'] = 'Munkahely';
-$labels['typeother'] = 'Egyéb';
 $labels['typemobile'] = 'Mobil';
 $labels['typemain'] = 'Vezetékes';
 $labels['typehomefax'] = 'Otthoni fax';
@@ -249,7 +245,6 @@ $labels['typeworkfax'] = 'Munkahelyi fax';
 $labels['typecar'] = 'Gépkocsi';
 $labels['typepager'] = 'Személyhívó';
 $labels['typevideo'] = 'Videó';
-$labels['typeassistant'] = 'Asszisztens';
 $labels['typehomepage'] = 'Weboldal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
@@ -293,6 +288,7 @@ $labels['importreplace'] = 'A teljes címjegyzék cseréje';
 $labels['importtext'] = 'Feltölthet kapcsolatokat egy már létező címjegyzékből. <br/> Jelenleg a <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  formátumú adatok importálása támogatott.';
 $labels['done'] = 'Kész';
 $labels['settingsfor'] = 'Beállítás';
+$labels['about'] = 'Névjegy';
 $labels['preferences'] = 'Beállítások';
 $labels['userpreferences'] = 'Felhasználói beállítások';
 $labels['editpreferences'] = 'Felhasználói beállítások szerkesztése';
@@ -354,11 +350,11 @@ $labels['advancedoptions'] = 'Haladó beállítások';
 $labels['focusonnewmessage'] = 'Beérkező új üzenet ablakának fókuszba hozása';
 $labels['checkallfolders'] = 'Új üzenetek ellenőrzése minden mappában';
 $labels['displaynext'] = 'Levél törlése/mozgatása után jelenjen meg a következő üzenet';
+$labels['defaultfont'] = 'HTML üzenet alap karakterkészlete';
 $labels['mainoptions'] = 'Általános beállítások';
 $labels['section'] = 'Beállítások';
 $labels['maintenance'] = 'Karbantartás';
 $labels['newmessage'] = 'Új üzenet';
-$labels['listoptions'] = 'Listabeállítások';
 $labels['signatureoptions'] = 'Aláírás beállításai';
 $labels['whenreplying'] = 'Válasznál';
 $labels['replytopposting'] = 'üzenet írása az eredeti felett';
@@ -385,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Számot tartalmazó szavak kihagyása';
 $labels['spellcheckignorecaps'] = 'Csak nagybetűt tartalmazó szavak kihagyása';
 $labels['addtodict'] = 'Hozzáadás a szótárhoz';
 $labels['folder'] = 'Mappa';
-$labels['folders'] = 'Mappák';
 $labels['foldername'] = 'Mappa neve';
 $labels['subscribed'] = 'Feliratkozott';
 $labels['messagecount'] = 'Üzenet';
@@ -408,6 +403,11 @@ $labels['sortby'] = 'Rendezés';
 $labels['sortasc'] = 'növekvő';
 $labels['sortdesc'] = 'csökkenő';
 $labels['undo'] = 'Visszavonás';
+$labels['plugin'] = 'Bővítmény';
+$labels['version'] = 'Verzió';
+$labels['source'] = 'Forrás';
+$labels['license'] = 'Licensz';
+$labels['support'] = 'Támogatás';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -431,4 +431,3 @@ $labels['japanese'] = 'Japán';
 $labels['korean'] = 'Koreai';
 $labels['chinese'] = 'Kínai';
 
-?>
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index 6fc250270..b0b5f49c3 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/hu_HU/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Zark Bonfire <ikkhares at gmail dot com>                      |
-|         Peter Szabo <pete at teamlupus dot hu>                        |
-|         Barnabas Bona <bsi at hosember dot hu>                        |
-|         Gabor Veliczky <hosting at jugiter dot net>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/hu_HU/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -160,5 +154,5 @@ $messages['foldercreated'] = 'Mappa sikeresen létrehozva';
 $messages['invalidimageformat'] = 'Érvénytelen képformátum';
 $messages['mispellingsfound'] = 'Az üzenetben helyesírási hibák találhatók';
 $messages['parentnotwritable'] = 'Nem sikerült a mappa létrehozása/mozgatása a kijelölt mappába. Nincs jogosultsága a művelethez!';
+$messages['messagetoobig'] = 'Az üzenetrész túl nagy a feldolgozáshoz.';
 
-?>
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 49fb61dd4..173daef60 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -1,19 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/hy_AM/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Vahan Yerkanian <vahan@arminco.com>                           |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -41,17 +39,15 @@ $labels['date'] = 'Ամսաթիվ';
 $labels['size'] = 'Չափ';
 $labels['priority'] = 'Առավելություն';
 $labels['organization'] = 'Կազմակերպություն';
-$labels['reply-to'] = 'Reply-To';
 $labels['mailboxlist'] = 'Դարակներ';
+$labels['folders'] = 'Դարակներ';
 $labels['messagesfromto'] = 'Նամակներ $from–ից $to–ը եղած $count–ից';
 $labels['messagenrof'] = 'Նամակ $nr եղած $count–ից';
+$labels['copy'] = 'Cc';
 $labels['moveto'] = 'Տեղափոխել...';
 $labels['download'] = 'Քաշել';
 $labels['filename'] = 'Ֆայլի անուն';
 $labels['filesize'] = 'Ֆայլի չափ';
-$labels['preferhtml'] = 'Գերադասել HTML';
-$labels['htmlmessage'] = 'HTML նամակ';
-$labels['prettydate'] = 'Պարզ ամսաթվեր';
 $labels['addtoaddressbook'] = 'Հիշել հասցեն';
 $labels['sun'] = 'Կիր';
 $labels['mon'] = 'Երկ';
@@ -71,7 +67,8 @@ $labels['jan'] = 'Հնվ';
 $labels['feb'] = 'Փետ';
 $labels['mar'] = 'Մար';
 $labels['apr'] = 'Ապր';
-$labels['may'] = 'Մայ';
+$labels['may'] = 'Մայիս';
+$labels['longmay'] = 'Մայիս';
 $labels['jun'] = 'Հուս';
 $labels['jul'] = 'Հուլ';
 $labels['aug'] = 'Օգս';
@@ -83,7 +80,6 @@ $labels['longjan'] = 'Հունվար';
 $labels['longfeb'] = 'Փետրվար';
 $labels['longmar'] = 'Մարտ';
 $labels['longapr'] = 'Ապրիլ';
-$labels['longmay'] = 'Մայիս';
 $labels['longjun'] = 'Հունիս';
 $labels['longjul'] = 'Հուլիս';
 $labels['longaug'] = 'Օգոստոս';
@@ -101,13 +97,9 @@ $labels['deletemessage'] = 'Ջնջել նամակը';
 $labels['movemessagetotrash'] = 'Գցել աղբարկղը';
 $labels['printmessage'] = 'Տպել';
 $labels['previousmessage'] = 'Ցուցադրել նախորդ նամակը';
-$labels['previousmessages'] = 'Ցուցադրել նախորդ նամակները';
 $labels['firstmessage'] = 'Ցուցադրել առաջին նամակը';
-$labels['firstmessages'] = 'Ցուցադրել առաջին էջը';
 $labels['nextmessage'] = 'Ցուցադրել հաջորդ նամակը';
-$labels['nextmessages'] = 'Ցուցադրել հաջորդ նամակները';
 $labels['lastmessage'] = 'Ցուցադրել վերջին նամակը';
-$labels['lastmessages'] = 'Ցուցադրել վերջին էջը';
 $labels['backtolist'] = 'Վերադառնալ նամակների ցուցակ';
 $labels['viewsource'] = 'Ցուցադրել նամակի կոդը';
 $labels['markmessages'] = 'Նշել նամակները';
@@ -118,13 +110,13 @@ $labels['markunflagged'] = 'որպես չնշված';
 $labels['select'] = 'Նշել';
 $labels['all'] = 'Բոլորը';
 $labels['none'] = 'Չնշել';
+$labels['nonesort'] = 'Չնշել';
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
 $labels['filter'] = 'Զտիչ';
 $labels['compact'] = 'Սեղմել';
 $labels['empty'] = 'Դատարկել';
-$labels['purge'] = 'Մաքրել';
 $labels['quota'] = 'Դիսկային տարածք';
 $labels['unknown'] = 'անհայտ';
 $labels['unlimited'] = 'անսահմանափակ';
@@ -202,6 +194,9 @@ $labels['manageidentities'] = 'Կարգավորել անձանց';
 $labels['newidentity'] = 'Նոր անձ';
 $labels['newitem'] = 'Նոր իր';
 $labels['edititem'] = 'Խմբագրել իրը';
+$labels['preferhtml'] = 'Գերադասել HTML';
+$labels['htmlmessage'] = 'HTML նամակ';
+$labels['prettydate'] = 'Պարզ ամսաթվեր';
 $labels['setdefault'] = 'Հիմնական';
 $labels['autodetect'] = 'Ավտո';
 $labels['language'] = 'Լեզու';
@@ -223,7 +218,7 @@ $labels['askuser'] = 'Հարցնել օգտվողին';
 $labels['autosend'] = 'ուղարկել ավտոմատ';
 $labels['ignore'] = 'անտեսել';
 $labels['readwhendeleted'] = 'Ջնջելուց նշել նամակը որպես կարդացած';
-$labels['flagfordeletion'] = 'Ջնջելու փոխարեն նշել որպես ենթակա ջնջման ';
+$labels['flagfordeletion'] = 'Ջնջելու փոխարեն նշել որպես ենթակա ջնջման';
 $labels['skipdeleted'] = 'Ցույց չ՛տալ ջնջված նամակները';
 $labels['showremoteimages'] = 'Ցույց տալ հեռակա պատկերները';
 $labels['fromknownsenders'] = 'հայտնի հասցեատերերից';
@@ -243,7 +238,6 @@ $labels['advancedoptions'] = 'Հավելյալ կարգավորումներ';
 $labels['focusonnewmessage'] = 'Առաջ բերել պատուհանը նոր նամակ ստանալիս';
 $labels['checkallfolders'] = 'Ստուգել բոլոր դարակները նոր նամակների համար';
 $labels['folder'] = 'Դարակ';
-$labels['folders'] = 'Դարակներ';
 $labels['foldername'] = 'Դարակի անուն';
 $labels['subscribed'] = 'Բաժանորդագրված';
 $labels['messagecount'] = 'Նամակներ';
@@ -259,4 +253,3 @@ $labels['KB'] = 'ԿԲ';
 $labels['MB'] = 'ՄԲ';
 $labels['GB'] = 'ԳԲ';
 
-?>
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index 0042bcdf6..e68f599ab 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -1,19 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/hy_AM/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Vahan Yerkanian <vahan@arminco.com>                           |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -60,7 +58,6 @@ $messages['nosubjectwarning'] = 'Վերնագիր բացակայում է, ցա�
 $messages['nobodywarning'] = 'Ուղարկե՞լ այս նամակը դատարկ';
 $messages['notsentwarning'] = 'Նամակն ուղարկված չէ։ Ջնջե՞լ Ձեր նամակը';
 $messages['noldapserver'] = 'Ընտրեք ldap սերվեր որոնման համար';
-$messages['nocontactsreturned'] = 'Հասցեներ չեն գտնվել';
 $messages['nosearchname'] = 'Մուտքագրեք հասցեատեր կամ էլ. հասցե';
 $messages['searchsuccessful'] = 'Գտնվեց $nr նամակ';
 $messages['searchnomatch'] = 'Համապատասխան նամակներ չգտնվեցին';
@@ -91,4 +88,3 @@ $messages['opnotpermitted'] = 'Գործողությունը անթույլատր
 $messages['nofromaddress'] = 'Նշված անձը հասցե չունի։';
 $messages['editorwarning'] = 'Դեպի պարզ տեքստի խմբագրիչ անցման դեպքում կկորի տեքստի ձևավորումը։ Շարունակե՞լ։';
 
-?>
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 4b3c441e1..34392c0cf 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/id_ID/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Putu Arya Sabda Wijaya <ptaryasw@isi-dps.ac.id>                    |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/id_ID/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,7 +41,8 @@ $labels['size'] = 'Ukuran';
 $labels['priority'] = 'Prioritas';
 $labels['organization'] = 'Organisasi';
 $labels['readstatus'] = 'Status Terbaca';
-$labels['mailboxlist'] = 'Map';
+$labels['mailboxlist'] = 'Semua Folder';
+$labels['folders'] = 'Semua Folder';
 $labels['messagesfromto'] = 'Pesan ke $from sampai $to dari $count';
 $labels['threadsfromto'] = 'Untaian ke $from sampai $to dari $count';
 $labels['messagenrof'] = 'Pesan $nr sebanyak $count';
@@ -74,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mei';
+$labels['longmay'] = 'Mei';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Ags';
@@ -85,7 +84,6 @@ $labels['longjan'] = 'Januari';
 $labels['longfeb'] = 'Februari';
 $labels['longmar'] = 'Maret';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mei';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'Agustus';
@@ -100,6 +98,8 @@ $labels['replytomessage'] = 'Balas pesan';
 $labels['replytoallmessage'] = 'Balas ke pengirim dan yang lain';
 $labels['replyall'] = 'Balas ke semua';
 $labels['replylist'] = 'Balas ke milis';
+$labels['forwardinline'] = 'Teruskan bersama surat';
+$labels['forwardattachment'] = 'Teruskan sebagai sisipan';
 $labels['forwardmessage'] = 'Teruskan pesan';
 $labels['deletemessage'] = 'Hapus pesan';
 $labels['movemessagetotrash'] = 'Pindahkan pesan ke tong sampah';
@@ -115,10 +115,11 @@ $labels['markread'] = 'Terbaca';
 $labels['markunread'] = 'Belum Terbaca';
 $labels['markflagged'] = 'Sudah ditandai';
 $labels['markunflagged'] = 'Belum ditandai';
-$labels['messageactions'] = 'Tindakan lain...';
+$labels['moreactions'] = 'Tindakan lain..';
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
-$labels['none'] = 'Tidak satupun';
+$labels['none'] = 'Tidak ada';
+$labels['nonesort'] = 'Tidak ada';
 $labels['currpage'] = 'Halaman sekarang';
 $labels['unread'] = 'Belum terbaca';
 $labels['flagged'] = 'Ditandai';
@@ -138,7 +139,6 @@ $labels['expand_only_unread'] = 'hanya pesan yang belum terbaca';
 $labels['fromto'] = 'Pengirim/Penerima';
 $labels['flag'] = 'Bendera';
 $labels['attachment'] = 'Lampiran';
-$labels['nonesort'] = 'Tidak ada';
 $labels['sentdate'] = 'Tanggal kirim';
 $labels['arrival'] = 'Tanggal masuk';
 $labels['asc'] = 'menaik';
@@ -168,12 +168,15 @@ $labels['charset'] = 'Set karakter';
 $labels['editortype'] = 'Tipe penyunting';
 $labels['returnreceipt'] = 'Tanda terima kembali';
 $labels['dsn'] = 'Pemberitahuan status terkirim';
+$labels['mailreplyintro'] = 'Pada $date, $sender menulis:';
+$labels['originalmessage'] = 'Pesan Sebenarnya';
 $labels['editidents'] = 'Ubah identitas';
 $labels['checkspelling'] = 'Pemeriksaan ejaan';
 $labels['resumeediting'] = 'Lanjutkan menyunting';
 $labels['revertto'] = 'Balikkan ke';
 $labels['attachments'] = 'Sisipan';
 $labels['upload'] = 'Unggah';
+$labels['uploadprogress'] = '$percent ($current dari $total)';
 $labels['close'] = 'Tutup';
 $labels['messageoptions'] = 'Pilihan pesan...';
 $labels['low'] = 'Rendah';
@@ -184,6 +187,7 @@ $labels['highest'] = 'Paling tinggi';
 $labels['nosubject'] = '(tanpa judul)';
 $labels['showimages'] = 'Tampilkan gambar';
 $labels['alwaysshow'] = 'Selalu tampilkan gambar dari $sender';
+$labels['isdraft'] = 'Ini adalah konsep surat.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Teks murni';
 $labels['savesentmessagein'] = 'Simpan pesan terkirim di';
@@ -225,10 +229,15 @@ $labels['male'] = 'pria';
 $labels['female'] = 'wanita';
 $labels['manager'] = 'Menejer';
 $labels['assistant'] = 'Asisten';
+$labels['typeassistant'] = 'Asisten';
 $labels['spouse'] = 'Suami/Istri';
+$labels['allfields'] = 'Semua isian';
+$labels['search'] = 'Cari';
+$labels['advsearch'] = 'Pencarian Lebih Lanjut';
+$labels['other'] = 'Lainnya';
+$labels['typeother'] = 'Lainnya';
 $labels['typehome'] = 'Rumah';
 $labels['typework'] = 'Kantor';
-$labels['typeother'] = 'Lainnya';
 $labels['typemobile'] = 'HP';
 $labels['typemain'] = 'Utama';
 $labels['typehomefax'] = 'Faks Rumah';
@@ -236,7 +245,9 @@ $labels['typeworkfax'] = 'Faks Kantor';
 $labels['typecar'] = 'Mobil';
 $labels['typepager'] = 'Pejer';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Asisten';
+$labels['typehomepage'] = 'Laman Web';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Tambah kolom isian';
 $labels['addcontact'] = 'Tambah kontak baru';
 $labels['editcontact'] = 'Ubah kontak';
@@ -258,7 +269,8 @@ $labels['print'] = 'Cetak';
 $labels['export'] = 'Ekspor';
 $labels['exportvcards'] = 'Ekspor kontak dalam format vCard';
 $labels['newcontactgroup'] = 'Buat Grup baru';
-$labels['groupactions'] = 'Aksi untuk grup kontak';
+$labels['grouprename'] = 'Ganti nama grup';
+$labels['groupdelete'] = 'Hapus grup';
 $labels['previouspage'] = 'Perlihatkan himpunan sebelumnya';
 $labels['firstpage'] = 'Perlihatkan himpunan pertama';
 $labels['nextpage'] = 'Perlihatkan himpunan selanjutnya';
@@ -266,13 +278,17 @@ $labels['lastpage'] = 'Perlihatkan himpunan terakhir';
 $labels['group'] = 'Kelompok';
 $labels['groups'] = 'Kelompok';
 $labels['personaladrbook'] = 'Alamat pribadi';
+$labels['searchsave'] = 'Simpan pencarian';
+$labels['searchdelete'] = 'Hapus pencarian';
 $labels['import'] = 'Impor';
 $labels['importcontacts'] = 'Impor kontak';
 $labels['importfromfile'] = 'Impor dari berkas:';
+$labels['importtarget'] = 'Tambahkan kontak baru ke buku alamat:';
 $labels['importreplace'] = 'Ganti seluruh buku alamat';
 $labels['importtext'] = 'Anda bisa mengunggah kontak dari buku alamat yang sudah ada.<br/>Kami kebetulan mendukung pengimportan alamat dari format data <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Selesai';
 $labels['settingsfor'] = 'Pengaturan untuk';
+$labels['about'] = 'Informasi program';
 $labels['preferences'] = 'Pilihan';
 $labels['userpreferences'] = 'Pilihan pengguna';
 $labels['editpreferences'] = 'Ubah pilihan pengguna';
@@ -284,6 +300,8 @@ $labels['edititem'] = 'Ubah item';
 $labels['preferhtml'] = 'Lebih suka HTML';
 $labels['defaultcharset'] = 'Default Character';
 $labels['htmlmessage'] = 'Pesan HTML';
+$labels['dateformat'] = 'Format tanggal';
+$labels['timeformat'] = 'Format waktu';
 $labels['prettydate'] = 'Tanggal Cantik';
 $labels['setdefault'] = 'Pengaturan Awal';
 $labels['autodetect'] = 'Otomatis';
@@ -332,11 +350,11 @@ $labels['advancedoptions'] = 'Pilihan canggih';
 $labels['focusonnewmessage'] = 'Pusatkan jendela broswer saat ada pesan baru';
 $labels['checkallfolders'] = 'Periksa semua map untuk pesan baru';
 $labels['displaynext'] = 'Setelah menghapus/memindahkan, tampilkan pesan berikutnya';
+$labels['defaultfont'] = 'Huruf standar untuk pesan HTML';
 $labels['mainoptions'] = 'Pilihan Utama';
 $labels['section'] = 'Bagian';
 $labels['maintenance'] = 'Perbaikan';
 $labels['newmessage'] = 'Pesan baru';
-$labels['listoptions'] = 'Daftar Pilihan';
 $labels['signatureoptions'] = 'Opsi tanda tangan';
 $labels['whenreplying'] = 'Ketika membalas';
 $labels['replytopposting'] = 'Tulis pesan baru diatas pesan asli';
@@ -349,13 +367,20 @@ $labels['replysignaturepos'] = 'ketika membalas atau meneruskan pesan tambahkan
 $labels['belowquote'] = 'Dibawah kutipan';
 $labels['abovequote'] = 'Diatas kutipan';
 $labels['insertsignature'] = 'Isi tanda tangan';
-$labels['previewpanemarkread'] = 'Tandai pesan yang sudah dilihat ';
+$labels['previewpanemarkread'] = 'Tandai pesan yang sudah dilihat';
 $labels['afternseconds'] = 'setelah $n detik';
 $labels['reqmdn'] = 'Selalu meminta tanda terima kembali';
 $labels['reqdsn'] = 'Selalu meminta pemberitahuan status terkirim';
 $labels['replysamefolder'] = 'Taruh balasan di folder yang sama dengan pesan yang dibalas';
+$labels['defaultaddressbook'] = 'Tambahkan kontak baru ke buku alamat terpilih';
+$labels['autocompletesingle'] = 'Lewatkan alamat email alternatif pada pelengkapan otomatis';
+$labels['spellcheckbeforesend'] = 'Periksa ejaan sebelum mengirimkan pesan';
+$labels['spellcheckoptions'] = 'Pilihan Ejaan';
+$labels['spellcheckignoresyms'] = 'Abaikan kata-kata yang bersimbol';
+$labels['spellcheckignorenums'] = 'Abaikan kata-kata yang bernomor';
+$labels['spellcheckignorecaps'] = 'Abaikan kata-kata dengan huruf besar semua';
+$labels['addtodict'] = 'Tambahkan ke kamus';
 $labels['folder'] = 'Folder';
-$labels['folders'] = 'Semua Folder';
 $labels['foldername'] = 'Nama folder';
 $labels['subscribed'] = 'Subscribed';
 $labels['messagecount'] = 'Pesan-pesan';
@@ -377,6 +402,12 @@ $labels['sharedfolder'] = 'Folder publik';
 $labels['sortby'] = 'Urut berdasarkan';
 $labels['sortasc'] = 'Urut menaik';
 $labels['sortdesc'] = 'Urut menurun';
+$labels['undo'] = 'Batalkan';
+$labels['plugin'] = 'Pengaya';
+$labels['version'] = 'Versi';
+$labels['source'] = 'Sumber';
+$labels['license'] = 'Lisensi';
+$labels['support'] = 'Dukungan';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -400,4 +431,3 @@ $labels['japanese'] = 'Jepang';
 $labels['korean'] = 'Korea';
 $labels['chinese'] = 'Cina';
 
-?>
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index b406f5acb..18cf8e39c 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/id_ID/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Putu Arya Sabda Wijaya <ptaryasw@isi-dps.ac.id>                    |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/id_ID/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -43,10 +40,12 @@ $messages['messagesaved'] = 'Menyimpan pesan ke daftar tunggu';
 $messages['successfullysaved'] = 'Berhasil disimpan';
 $messages['addedsuccessfully'] = 'Kontak berhasil ditambahkan ke buku alamat';
 $messages['contactexists'] = 'Kontak dengan alamat e-mail ini sudah ada';
+$messages['contactnameexists'] = 'Kontak dengan nama yang sama sudah ada';
 $messages['blockedimages'] = 'Untuk melindungi privasi Anda, gambar-gambar diluar server diblok pada pesan ini.';
 $messages['encryptedmessage'] = 'Pesan ini terenkripsi dan tidak bisa ditampilkan. Maaf!';
 $messages['nocontactsfound'] = 'Kontak tidak ditemukan';
 $messages['contactnotfound'] = 'Kontak yang diminta tidak ditemukan';
+$messages['contactsearchonly'] = 'Masukkan jenis pencarian untuk mencari kontak';
 $messages['sendingfailed'] = 'Pengiriman pesan gagal';
 $messages['senttooquickly'] = 'Mohon tunggu $sec detik sebelum mengirim pesan ini';
 $messages['errorsavingsent'] = 'Error ketika menyimpan pesan terkirim';
@@ -56,9 +55,12 @@ $messages['errorcopying'] = 'Pesan tidak dapat disalin';
 $messages['errordeleting'] = 'Pesan tidak bisa dihapus';
 $messages['errormarking'] = 'Tidak dapat menandai pesan';
 $messages['deletecontactconfirm'] = 'Apakah anda yakin untuk menghapus kontak terpilih?';
+$messages['deletegroupconfirm'] = 'Yakinkah Anda ingin menhapus grup terpilih?';
 $messages['deletemessagesconfirm'] = 'Yakin menghapus pesan terpilih?';
 $messages['deletefolderconfirm'] = 'Apakah anda benar-benar ingin menghapus map ini?';
 $messages['purgefolderconfirm'] = 'Yakin menghapus semua pesan pada map ini?';
+$messages['contactdeleting'] = 'Menghapus kontak...';
+$messages['groupdeleting'] = 'Menghapus grup...';
 $messages['folderdeleting'] = 'Menghapus map...';
 $messages['foldermoving'] = 'Memindahkan map...';
 $messages['foldersubscribing'] = 'Melanggankan folder';
@@ -73,10 +75,10 @@ $messages['nosubjectwarning'] = '"Judul" kosong. Isi judul sekarang?';
 $messages['nobodywarning'] = 'Kirim pesan ini tanpa teks?';
 $messages['notsentwarning'] = 'Pesan belum terkirim. Buang pesan Anda?';
 $messages['noldapserver'] = 'Tolong pilih server LDAP untuk pencarian';
-$messages['nocontactsreturned'] = 'Kontak kosong';
 $messages['nosearchname'] = 'Tolong masukkan nama kontak atau alamat email';
 $messages['notuploadedwarning'] = 'Proses upload belum selesai. Silahkan tunggu atau batalkan proses upload';
 $messages['searchsuccessful'] = '$nr pesan ditemukan';
+$messages['contactsearchsuccessful'] = 'Ditemukan $nr  kontak';
 $messages['searchnomatch'] = 'Pencarian hasilnya nihil';
 $messages['searching'] = 'Mencari...';
 $messages['checking'] = 'Memeriksa...';
@@ -97,8 +99,11 @@ $messages['sourceisreadonly'] = 'Sumber dari alamat ini hanya dapat dibaca';
 $messages['errorsavingcontact'] = 'Tidak bisa menyimpan alamat kontak';
 $messages['movingmessage'] = 'Memindahkan pesan...';
 $messages['copyingmessage'] = 'Menyalin pesan...';
+$messages['copyingcontact'] = 'Menyalin kontak...';
 $messages['deletingmessage'] = 'Menghapus pesan...';
 $messages['markingmessage'] = 'Menandai Pesan...';
+$messages['addingmember'] = 'Menambahkan kontak ke grup...';
+$messages['removingmember'] = 'Menyingkirkan kontak dari grup...';
 $messages['receiptsent'] = 'Berhasil mengirim pemberitahuan tanda terima telah terbaca';
 $messages['errorsendingreceipt'] = 'Tidak dapat mengirim tanda terima';
 $messages['nodeletelastidentity'] = 'Anda tidak bida mengapus identitas ini, ini identitas yang terakhir';
@@ -120,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP Error ($code): Otentifikasi gagal';
 $messages['smtpfromerror'] = 'SMTP Error ($code): Gagal mengatur pengirim "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Error ($code): Gagal menambah penerima "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Tidak dapat menguraikan daftar penerima';
-$messages['smtpdsnerror'] = 'SMTP Error: Tidak ada dukungan untuk pemberitahuan status terkirim';
 $messages['smtperror'] = 'SMTP Error : $msg';
 $messages['emailformaterror'] = 'Alamat e-mail salah: $email';
 $messages['toomanyrecipients'] = 'Terlalu banyak penerima. Batas maksimal penerima adalah $max';
@@ -128,18 +132,27 @@ $messages['maxgroupmembersreached'] = 'Jumlah grup melebihi jumlah maksimum $max
 $messages['internalerror'] = 'Terjadi kesalahan internal. Silahkan diulang kembali';
 $messages['contactdelerror'] = 'Kontak tidak bisa dihapus';
 $messages['contactdeleted'] = 'Kontak berhasil dihapus';
+$messages['contactrestoreerror'] = 'Tidak bisa mengembalikan kontak yang terhapus.';
+$messages['contactrestored'] = 'Kontak berhasil dikembalikan.';
 $messages['groupdeleted'] = 'Grup berhasil dihapus';
 $messages['grouprenamed'] = 'Grup berhasil dinamai kembali';
 $messages['groupcreated'] = 'Grub berhasil dibuat';
+$messages['savedsearchdeleted'] = 'Pencarian tersimpan berhasil dihapus.';
+$messages['savedsearchdeleteerror'] = 'Tidak bisa menghapus pencarian tersimpan.';
+$messages['savedsearchcreated'] = 'Pencarian tersimpan berhasil dibuat.';
+$messages['savedsearchcreateerror'] = 'Tidak bisa membuat pencarian tersimpan.';
 $messages['messagedeleted'] = 'Pesan berhasil dihapus';
 $messages['messagemoved'] = 'Pesan berhasil dipindahkan';
 $messages['messagecopied'] = 'Pesan berhasil disalin';
 $messages['messagemarked'] = 'Pesan berhasil ditandai';
 $messages['autocompletechars'] = 'Masukkan setidaknya $min karakter untuk swaparipurna';
+$messages['autocompletemore'] = 'Ada banyak entri yang ditemukan. Tolong ketikkan lebih banyak karakter.';
 $messages['namecannotbeempty'] = 'Nama tidak boleh kosong';
 $messages['nametoolong'] = 'Nama terlalu panjang';
 $messages['folderupdated'] = 'Folder berhasil diperbarui';
 $messages['foldercreated'] = 'Folder berhasil dibuat';
 $messages['invalidimageformat'] = 'Bukan format gambar yang valid';
+$messages['mispellingsfound'] = 'Terdapat kesalahan ejaan pada pesan.';
+$messages['parentnotwritable'] = 'Tidak bisa membuat/memindahkan map ke map induk. Tidak memiliki hak akses.';
+$messages['messagetoobig'] = 'Pesan terlalu besar untuk diproses.';
 
-?>
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index 4c6584bad..a7044c6c9 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/is_IS/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2009, The Roundcube Dev Team                            |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Hakon Orri Asgeirsson <hakon at opex.is>                      |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/is_IS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -42,17 +39,15 @@ $labels['date'] = 'Dags';
 $labels['size'] = 'Stærð';
 $labels['priority'] = 'Forgangur';
 $labels['organization'] = 'Stofnun';
-$labels['reply-to'] = 'Reply-To';
 $labels['mailboxlist'] = 'Möppur';
+$labels['folders'] = 'Möppur';
 $labels['messagesfromto'] = 'Skeyti $from til $to af $count';
 $labels['messagenrof'] = 'Skeyti $nr af $count';
+$labels['copy'] = 'Afrit';
 $labels['moveto'] = 'færa í...';
 $labels['download'] = 'sækja';
 $labels['filename'] = 'Skrárnafn';
 $labels['filesize'] = 'Skrárstærð';
-$labels['preferhtml'] = 'Vil HTML';
-$labels['htmlmessage'] = 'HTML skeyti';
-$labels['prettydate'] = 'Fallegar dagsetningar';
 $labels['addtoaddressbook'] = 'Bæta í netfangaskrá';
 $labels['sun'] = 'sun';
 $labels['mon'] = 'mán';
@@ -73,6 +68,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Maí';
+$labels['longmay'] = 'Maí';
 $labels['jun'] = 'Jún';
 $labels['jul'] = 'Júl';
 $labels['aug'] = 'Ágú';
@@ -84,7 +80,6 @@ $labels['longjan'] = 'Janúar';
 $labels['longfeb'] = 'Febrúar';
 $labels['longmar'] = 'Mars';
 $labels['longapr'] = 'Apríl';
-$labels['longmay'] = 'Maí';
 $labels['longjun'] = 'Júní';
 $labels['longjul'] = 'Júlí';
 $labels['longaug'] = 'Ágúst';
@@ -102,13 +97,9 @@ $labels['deletemessage'] = 'Eyða skeyti';
 $labels['movemessagetotrash'] = 'Færa skeyti í rusl';
 $labels['printmessage'] = 'Prenta skeyti';
 $labels['previousmessage'] = 'Sýna fyrra skeyti';
-$labels['previousmessages'] = 'Sýna fyrri skammt af skeytum';
 $labels['firstmessage'] = 'Sýna fyrsta skeyti';
-$labels['firstmessages'] = 'Sýna fyrsta skammtinn af skeytum';
 $labels['nextmessage'] = 'Sýna næsta skeyti';
-$labels['nextmessages'] = 'Sýna næsta skammt af skeytum';
 $labels['lastmessage'] = 'Sýna síðasta skeytið';
-$labels['lastmessages'] = 'Sýna síðasta skammtinn af skeytum';
 $labels['backtolist'] = 'Til baka í skeytalista';
 $labels['viewsource'] = 'Skoða kóða';
 $labels['markmessages'] = 'Merkja skeyti';
@@ -119,13 +110,13 @@ $labels['markunflagged'] = 'Sem óflögguð';
 $labels['select'] = 'Velja';
 $labels['all'] = 'Allt';
 $labels['none'] = 'Ekkert';
+$labels['nonesort'] = 'Ekkert';
 $labels['unread'] = 'Ólesið';
 $labels['flagged'] = 'Flaggað';
 $labels['unanswered'] = 'Ósvarað';
 $labels['filter'] = 'Sía';
 $labels['compact'] = 'Pakka';
 $labels['empty'] = 'Tæma';
-$labels['purge'] = 'Hreinsa';
 $labels['quota'] = 'Gagnamagn';
 $labels['unknown'] = 'óþekkt';
 $labels['unlimited'] = 'ótakmarkað';
@@ -155,7 +146,7 @@ $labels['showimages'] = 'Birta myndir';
 $labels['alwaysshow'] = 'Sýna alltaf myndir frá $sender';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Einfaldur';
-$labels['savesentmessagein'] = 'Vista send skeyti í ';
+$labels['savesentmessagein'] = 'Vista send skeyti í';
 $labels['dontsave'] = 'ekki vista';
 $labels['maxuploadsize'] = 'Leyfileg hámarksstærð skjals er $size';
 $labels['addcc'] = 'Bæta við Cc';
@@ -203,6 +194,9 @@ $labels['manageidentities'] = 'Manage identities for this account';
 $labels['newidentity'] = 'New identity';
 $labels['newitem'] = 'Nýtt';
 $labels['edititem'] = 'Laga';
+$labels['preferhtml'] = 'Vil HTML';
+$labels['htmlmessage'] = 'HTML skeyti';
+$labels['prettydate'] = 'Fallegar dagsetningar';
 $labels['setdefault'] = 'Gera sjálfgilt';
 $labels['autodetect'] = 'Sjálfvirkt';
 $labels['language'] = 'Tungumál';
@@ -244,7 +238,6 @@ $labels['advancedoptions'] = 'Frekari möguleikar';
 $labels['focusonnewmessage'] = 'Láta glugga beinast að nýju skeyti';
 $labels['checkallfolders'] = 'Athuga ný skeyti í öllum möppum';
 $labels['folder'] = 'Mappa';
-$labels['folders'] = 'Möppur';
 $labels['foldername'] = 'Nafn möppu';
 $labels['subscribed'] = 'Valin';
 $labels['messagecount'] = 'Skeyti';
@@ -260,4 +253,3 @@ $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
-?>
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index 8ee376507..ed0af127a 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -1,24 +1,21 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/en_GB/messages.inc                                           |
+ | localization/is_IS/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2007, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Weiran Zhang (weiran@weiran.co.uk)                            |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
-$messages['loginfailed']  = 'Innskráning mistókst';
+$messages['loginfailed'] = 'Innskráning mistókst';
 $messages['cookiesdisabled'] = 'Vafrinn þinn vill ekki taka við kökum (cookies)';
 $messages['sessionerror'] = 'Innskráningin þín ógild eða útrunnin';
 $messages['imaperror'] = 'Tengin við IMAP-miðlara mistókst';
@@ -41,18 +38,17 @@ $messages['sendingfailed'] = 'Sending misheppnaðist';
 $messages['errorsaving'] = 'Villa kom upp þegar var verið að vista';
 $messages['errormoving'] = 'Gat ekki fært skeytið';
 $messages['errordeleting'] = 'Gat ekki eytt skeytinu';
-$messages['deletecontactconfirm']  = 'Ertu viss um að þú viljir eyða völdum netföngum?';
-$messages['deletefolderconfirm']  = 'Ertu viss um að vilja eyða þessari möppu?';
+$messages['deletecontactconfirm'] = 'Ertu viss um að þú viljir eyða völdum netföngum?';
+$messages['deletefolderconfirm'] = 'Ertu viss um að vilja eyða þessari möppu?';
 $messages['formincomplete'] = 'Formið var ekki fyllt út að fullu';
 $messages['noemailwarning'] = 'Sláðu inn gildt netfang';
-$messages['nonamewarning']  = 'Sláðu inn nafn';
+$messages['nonamewarning'] = 'Sláðu inn nafn';
 $messages['nopagesizewarning'] = 'Sláðu inn síðustærð';
 $messages['norecipientwarning'] = 'Í það minnsta einn viðtakandi verður að vera';
-$messages['nosubjectwarning']  = 'Efnislínan er tóm. Viltu slá eitthvað inn í hana?';
+$messages['nosubjectwarning'] = 'Efnislínan er tóm. Viltu slá eitthvað inn í hana?';
 $messages['nobodywarning'] = 'Viltu senda tómt skeyti?';
 $messages['notsentwarning'] = 'Skeytið hefur ekki verið send. Viltu henda skeytinu?';
 $messages['noldapserver'] = 'Please select an ldap server to search';
-$messages['nocontactsreturned'] = 'Engin netföng fundust';
 $messages['nosearchname'] = 'Sláðu inn nafn eða netfang';
 $messages['searchsuccessful'] = '$nr skeyti fundust';
 $messages['searchnomatch'] = 'Leit skilaði engu';
@@ -61,4 +57,3 @@ $messages['checking'] = 'Gái...';
 $messages['nospellerrors'] = 'Engar innsláttarvillur fundust';
 $messages['folderdeleted'] = 'Möppu var eytt';
 
-?>
\ No newline at end of file
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 07d5c60de..b86240d56 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/it_IT/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Andrej Mocilnik <amocilnik@dotcom.ts.it>                      |
-|         Yusef Maali <contact@yusefmaali.net>                          |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/it_IT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: simone <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -46,6 +42,7 @@ $labels['priority'] = 'Priorità';
 $labels['organization'] = 'Società';
 $labels['readstatus'] = 'Visualizza lo stato';
 $labels['mailboxlist'] = 'Cartelle';
+$labels['folders'] = 'Cartelle';
 $labels['messagesfromto'] = 'Messaggi da $from a $to di $count';
 $labels['threadsfromto'] = 'Thread da $from a $to di $count';
 $labels['messagenrof'] = 'Messaggio $nr di $count';
@@ -74,7 +71,8 @@ $labels['jan'] = 'Gen';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
-$labels['may'] = 'Mag';
+$labels['may'] = 'Maggio';
+$labels['longmay'] = 'Maggio';
 $labels['jun'] = 'Giu';
 $labels['jul'] = 'Lug';
 $labels['aug'] = 'Ago';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'Gennaio';
 $labels['longfeb'] = 'Febbraio';
 $labels['longmar'] = 'Marzo';
 $labels['longapr'] = 'Aprile';
-$labels['longmay'] = 'Maggio';
 $labels['longjun'] = 'Giugno';
 $labels['longjul'] = 'Luglio';
 $labels['longaug'] = 'Agosto';
@@ -122,6 +119,7 @@ $labels['moreactions'] = 'Altre operazioni...';
 $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
+$labels['nonesort'] = 'Nessuno';
 $labels['currpage'] = 'Pagina corrente';
 $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnato';
@@ -141,7 +139,6 @@ $labels['expand_only_unread'] = 'solo con messaggi non letti';
 $labels['fromto'] = 'Mittente/Destinatario';
 $labels['flag'] = 'Contrassegnato';
 $labels['attachment'] = 'Allegato';
-$labels['nonesort'] = 'Nessuno';
 $labels['sentdate'] = 'Data d\'invio';
 $labels['arrival'] = 'Data di arrivo';
 $labels['asc'] = 'Ascendente';
@@ -173,7 +170,7 @@ $labels['returnreceipt'] = 'Ricevuta di ritorno';
 $labels['dsn'] = 'Notifica di consegna';
 $labels['mailreplyintro'] = 'Il $date $sender ha scritto:';
 $labels['originalmessage'] = 'Messaggio originale';
-$labels['editidents'] = 'Modifica indentità';
+$labels['editidents'] = 'Modifica identità';
 $labels['checkspelling'] = 'Controlla ortografia';
 $labels['resumeediting'] = 'Torna al messaggio';
 $labels['revertto'] = 'Ripristina';
@@ -232,14 +229,15 @@ $labels['male'] = 'maschio';
 $labels['female'] = 'femmina';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistente';
+$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Coniuge';
 $labels['allfields'] = 'Tutti i campi';
 $labels['search'] = 'Ricerca';
 $labels['advsearch'] = 'Ricerca avanzata';
 $labels['other'] = 'Altro';
+$labels['typeother'] = 'Altro';
 $labels['typehome'] = 'Casa';
 $labels['typework'] = 'Lavoro';
-$labels['typeother'] = 'Altro';
 $labels['typemobile'] = 'Cellulare';
 $labels['typemain'] = 'Principale';
 $labels['typehomefax'] = 'Fax casa';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Fax lavoro';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Teledrin';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistente';
 $labels['typehomepage'] = 'Home page';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profilo';
@@ -290,7 +287,7 @@ $labels['importtarget'] = 'Aggiungi nuovi contattu alla rubrica:';
 $labels['importreplace'] = 'Sostituisci l\'intera rubrica';
 $labels['importtext'] = 'Puoi caricare i contatti da una rubrica esistente. Al momento è supportata l\'importazione dei contatti dal formato vCard.';
 $labels['done'] = 'Fatto';
-$labels['settingsfor'] = 'Impostazioni per ';
+$labels['settingsfor'] = 'Impostazioni per';
 $labels['about'] = 'Informazioni';
 $labels['preferences'] = 'Preferenze';
 $labels['userpreferences'] = 'Preferenze utente';
@@ -353,17 +350,17 @@ $labels['advancedoptions'] = 'Opzioni avanzate';
 $labels['focusonnewmessage'] = 'Attiva la finestra del browser all\'arrivo di un nuovo messaggio';
 $labels['checkallfolders'] = 'Controlla tutte le cartelle per la presenza di nuovi messaggi';
 $labels['displaynext'] = 'Dopo aver cancellato/spostato il messaggio mostra quello successivo';
+$labels['defaultfont'] = 'font standard per messaggi in HTML';
 $labels['mainoptions'] = 'Opzioni principali';
 $labels['section'] = 'Sezione';
 $labels['maintenance'] = 'Manutenzione';
 $labels['newmessage'] = 'Nuovo Messaggio';
-$labels['listoptions'] = 'Mostra Opzioni';
 $labels['signatureoptions'] = 'Opzioni firma';
 $labels['whenreplying'] = 'Quando rispondi';
 $labels['replytopposting'] = 'inizia il nuovo messaggio sopra quello originale';
 $labels['replybottomposting'] = 'inizia il nuovo messaggio sotto quello originale';
 $labels['replyremovesignature'] = 'Quando rispondi, rimuovi la firma dal messaggio originale';
-$labels['autoaddsignature'] = 'Aggiungi automaticamente la firma ';
+$labels['autoaddsignature'] = 'Aggiungi automaticamente la firma';
 $labels['newmessageonly'] = 'solo ai nuovi messaggi';
 $labels['replyandforwardonly'] = 'solo alle risposte e inoltri';
 $labels['replysignaturepos'] = 'In risposta o inoltro, posiziona la firma';
@@ -384,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Ignora le parole contenenti numeri';
 $labels['spellcheckignorecaps'] = 'Ignora le parole con tutte le lettere maiuscole';
 $labels['addtodict'] = 'Aggiungi al dizionario';
 $labels['folder'] = 'Cartella';
-$labels['folders'] = 'Cartelle';
 $labels['foldername'] = 'Nome cartella';
 $labels['subscribed'] = 'Sottoscritta';
 $labels['messagecount'] = 'Messaggi';
@@ -435,4 +431,3 @@ $labels['japanese'] = 'Giapponese';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Cinese';
 
-?>
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 9724d19fa..08cdbcb68 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/it_IT/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Andrej Mocilnik <amocilnik@dotcom.ts.it>                      |
-|         Yusef Maali <contact@yusefmaali.net>                          |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/it_IT/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -160,4 +156,3 @@ $messages['mispellingsfound'] = 'Sono stati riscontrati errori ortografici nel m
 $messages['parentnotwritable'] = 'Impossibile creare o muovere la cartella: accesso negato';
 $messages['messagetoobig'] = 'La parte del messaggio è troppo grande per essere processata.';
 
-?>
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 7ff43670e..9d2313a57 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -1,47 +1,34 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ja_JP/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Tadashi Jokagi <elf2000@users.sourceforge.net>                |
-|         Takashi Takamatsu <taka717@gmail.com>                         |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
-EN-Revision: 5490
-
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
-// login page
 $labels = array();
 $labels['welcome'] = 'ようこそ $product へ';
 $labels['username'] = 'ユーザー名';
 $labels['password'] = 'パスワード';
 $labels['server'] = 'サーバー';
 $labels['login'] = 'ログイン';
-
-// taskbar
 $labels['logout'] = 'ログアウト';
 $labels['mail'] = 'メール';
 $labels['settings'] = '個人設定';
 $labels['addressbook'] = 'アドレス帳';
-
-// mailbox names
 $labels['inbox'] = '受信トレイ';
 $labels['drafts'] = '下書き';
 $labels['sent'] = '送信済みアイテム';
 $labels['trash'] = 'ごみ箱';
 $labels['junk'] = '迷惑メール';
-
-// message listing
 $labels['subject'] = '件名';
 $labels['from'] = '差出人';
 $labels['to'] = '宛先';
@@ -54,23 +41,18 @@ $labels['size'] = '容量';
 $labels['priority'] = '優先度';
 $labels['organization'] = '企業名';
 $labels['readstatus'] = '閲覧の状態';
-
 $labels['mailboxlist'] = 'フォルダー一覧';
+$labels['folders'] = 'フォルダー一覧';
 $labels['messagesfromto'] = '表示中のメール: $from ～ $to (全: $count 件)';
 $labels['threadsfromto'] = '表示中のスレッド: $from ～ $to (全: $count 件)';
 $labels['messagenrof'] = '現在のメール: $nr (全: $count 件)';
-
 $labels['copy'] = 'コピー';
 $labels['move'] = '移動';
 $labels['moveto'] = 'フォルダーの移動';
 $labels['download'] = 'ダウンロード';
-
 $labels['filename'] = 'ファイル名';
 $labels['filesize'] = 'ファイル サイズ';
-
 $labels['addtoaddressbook'] = 'アドレス帳に追加';
-
-// weekdays short
 $labels['sun'] = '日';
 $labels['mon'] = '月';
 $labels['tue'] = '火';
@@ -78,8 +60,6 @@ $labels['wed'] = '水';
 $labels['thu'] = '木';
 $labels['fri'] = '金';
 $labels['sat'] = '土';
-
-// weekdays long
 $labels['sunday'] = '日曜日';
 $labels['monday'] = '月曜日';
 $labels['tuesday'] = '火曜日';
@@ -87,13 +67,12 @@ $labels['wednesday'] = '水曜日';
 $labels['thursday'] = '木曜日';
 $labels['friday'] = '金曜日';
 $labels['saturday'] = '土曜日';
-
-// months short
 $labels['jan'] = '1 月';
 $labels['feb'] = '2 月';
 $labels['mar'] = '3 月';
 $labels['apr'] = '4 月';
 $labels['may'] = '5 月';
+$labels['longmay'] = '5 月';
 $labels['jun'] = '6 月';
 $labels['jul'] = '7 月';
 $labels['aug'] = '8 月';
@@ -101,13 +80,10 @@ $labels['sep'] = '9 月';
 $labels['oct'] = '10 月';
 $labels['nov'] = '11 月';
 $labels['dec'] = '12 月';
-
-// months long
 $labels['longjan'] = '1 月';
 $labels['longfeb'] = '2 月';
 $labels['longmar'] = '3 月';
 $labels['longapr'] = '4 月';
-$labels['longmay'] = '5 月';
 $labels['longjun'] = '6 月';
 $labels['longjul'] = '7 月';
 $labels['longaug'] = '8 月';
@@ -115,17 +91,14 @@ $labels['longsep'] = '9 月';
 $labels['longoct'] = '10 月';
 $labels['longnov'] = '11 月';
 $labels['longdec'] = '12 月';
-
 $labels['today'] = '今日';
-
-// toolbar buttons
 $labels['checkmail'] = '新着の確認';
 $labels['writenewmessage'] = '新規メールの作成';
 $labels['replytomessage'] = '返信';
 $labels['replytoallmessage'] = '差出人とすべての宛先に返信';
 $labels['replyall'] = '全員に返信';
 $labels['replylist'] = 'ML に返信';
-$labels['forwardinline']    = '本文に挿入して転送';
+$labels['forwardinline'] = '本文に挿入して転送';
 $labels['forwardattachment'] = '添付形式で転送';
 $labels['forwardmessage'] = '転送';
 $labels['deletemessage'] = '削除';
@@ -143,10 +116,10 @@ $labels['markunread'] = '未読にする';
 $labels['markflagged'] = 'フラグを付ける';
 $labels['markunflagged'] = 'フラグを外す';
 $labels['moreactions'] = 'その他の操作...';
-
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
+$labels['nonesort'] = 'なし';
 $labels['currpage'] = '現在のページ';
 $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグあり';
@@ -160,14 +133,12 @@ $labels['expand-all'] = 'すべて展開';
 $labels['expand-unread'] = '未開封のメールを展開';
 $labels['collapse-all'] = 'すべて折りたたむ';
 $labels['threaded'] = 'スレッドにする';
-
 $labels['autoexpand_threads'] = 'スレッドの展開';
 $labels['do_expand'] = 'すべてのスレッド';
 $labels['expand_only_unread'] = '未開封のメールのみ';
 $labels['fromto'] = '送信者 / 宛先';
 $labels['flag'] = 'フラグ';
 $labels['attachment'] = '添付ファイル';
-$labels['nonesort'] = 'なし';
 $labels['sentdate'] = '送信日';
 $labels['arrival'] = '受信日';
 $labels['asc'] = '昇順';
@@ -176,24 +147,18 @@ $labels['listcolumns'] = '列の一覧';
 $labels['listsorting'] = '整列基準';
 $labels['listorder'] = '整列順';
 $labels['listmode'] = '一覧表示モード';
-
 $labels['folderactions'] = 'フォルダーの操作...';
 $labels['compact'] = 'コンパクト';
 $labels['empty'] = '空';
-
 $labels['quota'] = 'ディスク使用量';
 $labels['unknown'] = '不明';
 $labels['unlimited'] = '無制限';
-
 $labels['quicksearch'] = '検索';
 $labels['resetsearch'] = '検索解除';
 $labels['searchmod'] = '検索条件';
 $labels['msgtext'] = 'すべてのメール';
-
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'eml 形式で保存する';
-
-// message compose
 $labels['compose'] = 'メールの作成';
 $labels['editasnew'] = '新規として編集';
 $labels['savemessage'] = '下書きに保存';
@@ -205,135 +170,116 @@ $labels['returnreceipt'] = '開封確認';
 $labels['dsn'] = '配送状況の通知';
 $labels['mailreplyintro'] = '$date に $sender が書きました:';
 $labels['originalmessage'] = '元のメッセージ';
-
 $labels['editidents'] = '個人情報の編集';
 $labels['checkspelling'] = 'スペル チェック';
 $labels['resumeediting'] = 'メール作成に戻る';
 $labels['revertto'] = '元に戻す';
-
 $labels['attachments'] = '添付ファイル';
 $labels['upload'] = 'アップロード';
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close'] = '閉じる';
 $labels['messageoptions'] = 'メッセージのオプション...';
-
 $labels['low'] = '低い';
 $labels['lowest'] = '最低';
 $labels['normal'] = '通常';
 $labels['high'] = '高い';
 $labels['highest'] = '最高';
-
 $labels['nosubject'] = '(件名なし)';
 $labels['showimages'] = '画像の表示';
 $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
-$labels['isdraft']    = 'これは下書きのメッセージです。';
-
+$labels['isdraft'] = 'これは下書きのメッセージです。';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'テキスト';
 $labels['savesentmessagein'] = '送信済みメールの保存先';
 $labels['dontsave'] = '保存しない';
 $labels['maxuploadsize'] = '添付可能なファイルのサイズは最大 $size です。';
-
 $labels['addcc'] = 'Cc 追加';
 $labels['addbcc'] = 'Bcc 追加';
 $labels['addreplyto'] = 'Reply-To 追加';
 $labels['addfollowupto'] = 'Followup-To 追加';
-
-// mdn
 $labels['mdnrequest'] = 'メールの差出人は開封確認の送付を求めています。開封確認のメールを送付しますか?';
 $labels['receiptread'] = '開封確認 (表示済み)';
 $labels['yourmessage'] = 'これはあなたが送信したメールに対する開封確認です。';
 $labels['receiptnote'] = '注意: この開封確認はメールが受信者に表示されたことの通知です。受信者がメールを読んだこと、内容を理解したことを保証するものではありません。';
-
-// address boook
-$labels['name']         = '表示名';
-$labels['firstname']    = '名 (ファーストネーム)';
-$labels['surname']      = '姓 (ラストネーム)';
-$labels['middlename']   = 'ミドルネーム';
-$labels['nameprefix']   = '敬称 (名前の前)';
-$labels['namesuffix']   = '敬称 (名前の後)';
-$labels['nickname']     = 'ニックネーム';
-$labels['jobtitle']     = '肩書き';
-$labels['organization'] = '企業名';
-$labels['department']   = '部署名';
-$labels['gender']       = '性別';
-$labels['maidenname']   = '旧姓';
-$labels['email']        = 'メールアドレス';
-$labels['phone']        = '電話番号';
-$labels['address']      = '住所';
-$labels['street']       = '通り';
-$labels['locality']     = '都市';
-$labels['zipcode']      = '郵便番号';
-$labels['region']       = '州';
-$labels['country']      = '国';
-$labels['birthday']     = '誕生日';
-$labels['anniversary']  = '記念日';
-$labels['website']      = 'ウェブサイト';
+$labels['name'] = '表示名';
+$labels['firstname'] = '名 (ファーストネーム)';
+$labels['surname'] = '姓 (ラストネーム)';
+$labels['middlename'] = 'ミドルネーム';
+$labels['nameprefix'] = '敬称 (名前の前)';
+$labels['namesuffix'] = '敬称 (名前の後)';
+$labels['nickname'] = 'ニックネーム';
+$labels['jobtitle'] = '肩書き';
+$labels['department'] = '部署名';
+$labels['gender'] = '性別';
+$labels['maidenname'] = '旧姓';
+$labels['email'] = 'メールアドレス';
+$labels['phone'] = '電話番号';
+$labels['address'] = '住所';
+$labels['street'] = '通り';
+$labels['locality'] = '都市';
+$labels['zipcode'] = '郵便番号';
+$labels['region'] = '州';
+$labels['country'] = '国';
+$labels['birthday'] = '誕生日';
+$labels['anniversary'] = '記念日';
+$labels['website'] = 'ウェブサイト';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'メモ';
-$labels['male']   = '男性';
+$labels['male'] = '男性';
 $labels['female'] = '女性';
 $labels['manager'] = '管理者';
 $labels['assistant'] = 'アシスタント';
+$labels['typeassistant'] = 'アシスタント';
 $labels['spouse'] = '配偶者';
 $labels['allfields'] = '全項目';
 $labels['search'] = '検索';
 $labels['advsearch'] = '高度な検索';
-$labels['other'] = 'その他';
-
-$labels['typehome']   = '自宅';
-$labels['typework']   = '職場';
-$labels['typeother']  = '他';
-$labels['typemobile']  = 'モバイル';
-$labels['typemain']  = '主要回線';
-$labels['typehomefax']  = '自宅 Fax';
-$labels['typeworkfax']  = '職場 Fax';
-$labels['typecar']  = '車';
-$labels['typepager']  = 'ポケベル(ページャー)';
-$labels['typevideo']  = 'ビデオ';
-$labels['typeassistant']  = 'アシスタント';
-$labels['typehomepage']  = 'ホームページ';
+$labels['other'] = '他';
+$labels['typeother'] = '他';
+$labels['typehome'] = '自宅';
+$labels['typework'] = '職場';
+$labels['typemobile'] = 'モバイル';
+$labels['typemain'] = '主要回線';
+$labels['typehomefax'] = '自宅 Fax';
+$labels['typeworkfax'] = '職場 Fax';
+$labels['typecar'] = '車';
+$labels['typepager'] = 'ポケベル(ページャー)';
+$labels['typevideo'] = 'ビデオ';
+$labels['typehomepage'] = 'ホームページ';
 $labels['typeblog'] = 'ブログ';
 $labels['typeprofile'] = 'プロフィール';
-
 $labels['addfield'] = '項目の追加...';
 $labels['addcontact'] = '連絡先の新規追加';
 $labels['editcontact'] = '連絡先の編集';
 $labels['contacts'] = '連絡先';
 $labels['contactproperties'] = '連絡先のプロパティ';
 $labels['personalinfo'] = '個人情報';
-
-$labels['edit']   = '編集';
+$labels['edit'] = '編集';
 $labels['cancel'] = 'キャンセル';
-$labels['save']   = '保存';
+$labels['save'] = '保存';
 $labels['delete'] = '削除';
 $labels['rename'] = '名前の変更';
 $labels['addphoto'] = '追加';
 $labels['replacephoto'] = '置換';
-
-$labels['newcontact']     = '連絡先の新規作成';
-$labels['deletecontact']  = '連絡先の削除';
-$labels['composeto']      = 'この連絡先へメールの送信';
+$labels['newcontact'] = '連絡先の新規作成';
+$labels['deletecontact'] = '連絡先の削除';
+$labels['composeto'] = 'この連絡先へメールの送信';
 $labels['contactsfromto'] = '連絡先: $from ～ $to (全: $count 件)';
-$labels['print']          = '印刷';
-$labels['export']         = 'エクスポート';
-$labels['exportvcards']   = 'vCard 形式でエクスポート';
+$labels['print'] = '印刷';
+$labels['export'] = 'エクスポート';
+$labels['exportvcards'] = 'vCard 形式でエクスポート';
 $labels['newcontactgroup'] = '連絡先グループの新規作成';
-$labels['grouprename']    = 'グループ名の変更';
-$labels['groupdelete']    = 'グループの削除';
-
-$labels['previouspage']   = '前のページへ';
-$labels['firstpage']      = '最初のページへ';
-$labels['nextpage']       = '次のページへ';
-$labels['lastpage']       = '最後のページへ';
-
+$labels['grouprename'] = 'グループ名の変更';
+$labels['groupdelete'] = 'グループの削除';
+$labels['previouspage'] = '前のページへ';
+$labels['firstpage'] = '最初のページへ';
+$labels['nextpage'] = '次のページへ';
+$labels['lastpage'] = '最後のページへ';
 $labels['group'] = 'グループ';
 $labels['groups'] = 'グループ';
 $labels['personaladrbook'] = '個人アドレス';
-
 $labels['searchsave'] = '検索情報の保存';
 $labels['searchdelete'] = '検索情報の削除';
-
 $labels['import'] = 'インポート';
 $labels['importcontacts'] = '連絡先のインポート';
 $labels['importfromfile'] = 'インポートするファイル:';
@@ -341,21 +287,16 @@ $labels['importtarget'] = 'アドレス帳へ新規連絡先の追加:';
 $labels['importreplace'] = '現在のアドレス帳と置き換える';
 $labels['importtext'] = '既存のアドレス帳の連絡先をアップロードできます。現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a> 形式からのインポートに対応しています。';
 $labels['done'] = '完了';
-
-// settings
-$labels['settingsfor']  = '次の設定:';
+$labels['settingsfor'] = '次の設定:';
 $labels['about'] = 'Roundcube Webmail について';
-$labels['preferences']  = '設定';
-$labels['userpreferences']  = 'ユーザー設定';
-$labels['editpreferences']  = 'ユーザー設定の変更';
-
-$labels['identities']  = '個人情報';
-$labels['manageidentities']  = 'アカウントの個人情報管理';
-$labels['newidentity']  = '個人情報の新規作成';
-
-$labels['newitem']  = '新しい項目';
-$labels['edititem']  = '項目の編集';
-
+$labels['preferences'] = '設定';
+$labels['userpreferences'] = 'ユーザー設定';
+$labels['editpreferences'] = 'ユーザー設定の変更';
+$labels['identities'] = '個人情報';
+$labels['manageidentities'] = 'アカウントの個人情報管理';
+$labels['newidentity'] = '個人情報の新規作成';
+$labels['newitem'] = '新しい項目';
+$labels['edititem'] = '項目の編集';
 $labels['preferhtml'] = 'HTML を表示する';
 $labels['defaultcharset'] = '標準の文字セット';
 $labels['htmlmessage'] = 'HTML メール';
@@ -409,11 +350,11 @@ $labels['advancedoptions'] = '高度な設定';
 $labels['focusonnewmessage'] = '新着メールが届いたらブラウザーをアクティブにする';
 $labels['checkallfolders'] = '全フォルダーで新着メールを表示する';
 $labels['displaynext'] = 'メールの削除や移動後に次のメールを表示する';
+$labels['defaultfont'] = 'HTML メッセージの初期フォント';
 $labels['mainoptions'] = '基本設定';
 $labels['section'] = '設定項目';
 $labels['maintenance'] = 'メンテナンス設定';
 $labels['newmessage'] = '新着メール設定';
-$labels['listoptions'] = '一覧設定';
 $labels['signatureoptions'] = '署名の設定';
 $labels['whenreplying'] = '返信時の本文';
 $labels['replytopposting'] = '元のメッセージ引用部の前に本文を作成する';
@@ -439,15 +380,13 @@ $labels['spellcheckignoresyms'] = '記号の単語を無視する';
 $labels['spellcheckignorenums'] = '数字の単語を無視する';
 $labels['spellcheckignorecaps'] = 'すべて大文字の単語を無視する';
 $labels['addtodict'] = '辞書に追加';
-
-$labels['folder']  = 'フォルダー';
-$labels['folders']  = 'フォルダー一覧';
-$labels['foldername']  = 'フォルダー名';
-$labels['subscribed']  = '購読済み';
+$labels['folder'] = 'フォルダー';
+$labels['foldername'] = 'フォルダー名';
+$labels['subscribed'] = '購読済み';
 $labels['messagecount'] = 'メール';
-$labels['create']  = '作成';
-$labels['createfolder']  = 'フォルダーの新規作成';
-$labels['managefolders']  = 'フォルダーの管理';
+$labels['create'] = '作成';
+$labels['createfolder'] = 'フォルダーの新規作成';
+$labels['managefolders'] = 'フォルダーの管理';
 $labels['specialfolders'] = '特殊なフォルダー';
 $labels['properties'] = 'プロパティ';
 $labels['folderproperties'] = 'フォルダーのプロパティ';
@@ -457,28 +396,22 @@ $labels['info'] = '情報';
 $labels['getfoldersize'] = 'クリックでフォルダー サイズの取得';
 $labels['changesubscription'] = 'クリックで購読の変更';
 $labels['foldertype'] = 'フォルダーの種類';
-$labels['personalfolder']  = '個人フォルダー';
-$labels['otherfolder']  = '他のユーザーのフォルダー';
-$labels['sharedfolder']  = '公開フォルダー';     
-
+$labels['personalfolder'] = '個人フォルダー';
+$labels['otherfolder'] = '他のユーザーのフォルダー';
+$labels['sharedfolder'] = '公開フォルダー';
 $labels['sortby'] = '並び替えの基準';
-$labels['sortasc']  = '昇順で並び替え';
+$labels['sortasc'] = '昇順で並び替え';
 $labels['sortdesc'] = '降順で並び替え';
 $labels['undo'] = '取り消し';
-
 $labels['plugin'] = 'プラグイン';
 $labels['version'] = 'バージョン';
 $labels['source'] = 'ソース';
 $labels['license'] = 'ライセンス';
 $labels['support'] = 'ヘルプを受ける';
-
-// units
 $labels['B'] = 'バイト';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
-
-// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = '英語';
 $labels['westerneuropean'] = '西ヨーロッパ言語';
@@ -498,4 +431,3 @@ $labels['japanese'] = '日本語';
 $labels['korean'] = '韓国語';
 $labels['chinese'] = '中国語';
 
-?>
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 7ce3d539a..ae588ff5f 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -1,27 +1,21 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ja_JP/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Tadashi Jokagi <elf2000@users.sourceforge.net>                |
-|         Takashi Takamatsu <taka717@gmail.com>                         |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
-//  EN-Revision: 5490
-
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed']  = 'ログインに失敗しました。';
+$messages['loginfailed'] = 'ログインに失敗しました。';
 $messages['cookiesdisabled'] = 'ブラウザーで Cookie が無効に設定されています。';
 $messages['sessionerror'] = 'セッションが正しくないか期限切れです。';
 $messages['imaperror'] = 'IMAP サーバーへの接続に失敗しました。';
@@ -44,10 +38,6 @@ $messages['messagesent'] = 'メールを送信しました。';
 $messages['savingmessage'] = 'メールを保存しています...';
 $messages['messagesaved'] = 'メールを下書きに保存しました。';
 $messages['successfullysaved'] = '保存しました。';
-$messages['addedsuccessfully'] = 'アドレス帳への連絡先の追加しました。';
-$messages['contactexists'] = 'このメールアドレスを含む連絡先が既に存在します。';
-$messages['messagesaved'] = 'メールを下書きに保存しました。';
-$messages['successfullysaved'] = '保存しました。';
 $messages['addedsuccessfully'] = '連絡先をアドレス帳に追加しました。';
 $messages['contactexists'] = '同じメールアドレスの連絡先がすでに存在します。';
 $messages['contactnameexists'] = '同じ名前の連絡先がすでに存在します。';
@@ -64,8 +54,8 @@ $messages['errormoving'] = 'メールを移動できません。';
 $messages['errorcopying'] = 'メールをコピーできません。';
 $messages['errordeleting'] = 'メールを削除できません。';
 $messages['errormarking'] = 'メールのマークを設定できません。';
-$messages['deletecontactconfirm']  = '選択した連絡先を本当に削除しますか?';
-$messages['deletegroupconfirm']  = 'このグループを本当に削除しますか?';
+$messages['deletecontactconfirm'] = '選択した連絡先を本当に削除しますか?';
+$messages['deletegroupconfirm'] = 'このグループを本当に削除しますか?';
 $messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
 $messages['deletefolderconfirm'] = 'このフォルダーを本当に削除しますか?';
 $messages['purgefolderconfirm'] = 'このフォルダーの全メールを本当に削除しますか?';
@@ -77,7 +67,7 @@ $messages['foldersubscribing'] = 'フォルダーを購読しています...';
 $messages['folderunsubscribing'] = 'フォルダーの購読をやめています...';
 $messages['formincomplete'] = 'フォームの全項目を入力していません。';
 $messages['noemailwarning'] = '正しいメールアドレスを入力してください。';
-$messages['nonamewarning']  = '名前を入力してください。';
+$messages['nonamewarning'] = '名前を入力してください。';
 $messages['nopagesizewarning'] = 'ページのサイズを入力してください。';
 $messages['nosenderwarning'] = '差出人のメールアドレスを入力してください。';
 $messages['norecipientwarning'] = '宛先は少なくともひとり分は入力してください。';
@@ -126,7 +116,6 @@ $messages['importwait'] = 'インポート中です。しばらくお待ちく�
 $messages['importerror'] = 'インポートに失敗しました。アップロードしたファイルは不正な vCard ファイルです。';
 $messages['importconfirm'] = '<b>$inserted 件の連絡先をインポートしました。</b>';
 $messages['importconfirmskipped'] = '<b>$skipped 拳の既存エントリーをスキップしました</b>';
-
 $messages['opnotpermitted'] = '許可されていない操作です。';
 $messages['nofromaddress'] = '選択中の個人情報にメールアドレスが含まれていません。';
 $messages['editorwarning'] = 'テキスト エディターに切り替えるとすべての書式が失われます。よろしいですか?';
@@ -167,4 +156,3 @@ $messages['mispellingsfound'] = 'メッセージにスペル エラーを見つ�
 $messages['parentnotwritable'] = '選択した親フォルダーへの作成、移動に失敗しました。アクセス権限がありません。';
 $messages['messagetoobig'] = 'その処理をするにはメッセージ部分が大きすぎます。';
 
-?>
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index fd3811467..66f4589bd 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -1,19 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| localization/ka_GE/labels.inc                                         |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Zaza Zviadadze, George Machitidze 	                        |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 842 2009-10-03 19:00:00  zaza$
-
+ +-----------------------------------------------------------------------+
+ | localization/ka_GE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -42,6 +40,7 @@ $labels['size'] = 'ზომა';
 $labels['priority'] = 'პრიორიტეტი';
 $labels['organization'] = 'ორგანიზაცია';
 $labels['mailboxlist'] = 'საქაღალდეები';
+$labels['folders'] = 'საქაღალდეები';
 $labels['messagenrof'] = 'შეტყობინება $nr დან $count';
 $labels['copy'] = 'ასლი';
 $labels['move'] = 'გადატანა';
@@ -68,7 +67,8 @@ $labels['jan'] = 'იან';
 $labels['feb'] = 'თებ';
 $labels['mar'] = 'მარ';
 $labels['apr'] = 'აპრ';
-$labels['may'] = 'მაი';
+$labels['may'] = 'მაისი';
+$labels['longmay'] = 'მაისი';
 $labels['jun'] = 'ივნ';
 $labels['jul'] = 'ივლ';
 $labels['aug'] = 'აგვ';
@@ -80,7 +80,6 @@ $labels['longjan'] = 'იანვარი';
 $labels['longfeb'] = 'თებერვალი';
 $labels['longmar'] = 'მარტი';
 $labels['longapr'] = 'აპრილი';
-$labels['longmay'] = 'მაისი';
 $labels['longjun'] = 'ივნისი';
 $labels['longjul'] = 'ივლისი';
 $labels['longaug'] = 'აგვისტო';
@@ -112,6 +111,7 @@ $labels['moreactions'] = 'მეტი მოქმედება...';
 $labels['select'] = 'მონიშვნა';
 $labels['all'] = 'ყველა';
 $labels['none'] = 'არცერთი';
+$labels['nonesort'] = 'არცერთი';
 $labels['currpage'] = 'მიმდინარე გვერდი';
 $labels['unread'] = 'წაუკითხავი';
 $labels['flagged'] = 'მონიშნული';
@@ -197,9 +197,9 @@ $labels['allfields'] = 'ყველა ველი';
 $labels['search'] = 'ძებნა';
 $labels['advsearch'] = 'გაფართოებული ძებნა';
 $labels['other'] = 'სხვა';
+$labels['typeother'] = 'სხვა';
 $labels['typehome'] = 'სახლი';
 $labels['typework'] = 'სამსახური';
-$labels['typeother'] = 'სხვა';
 $labels['typemobile'] = 'მობილური';
 $labels['typemain'] = 'ძირითადი';
 $labels['typehomefax'] = 'სახლის ფაქსი';
@@ -308,7 +308,6 @@ $labels['mainoptions'] = 'ძირითადი პარამეტრე�
 $labels['section'] = 'განყოფილება';
 $labels['maintenance'] = 'მომსახურება';
 $labels['newmessage'] = 'ახალი შეტყობინება';
-$labels['listoptions'] = 'პარამეტრების ჩამონათვალი';
 $labels['signatureoptions'] = 'ხელმოწერის ოფციები';
 $labels['whenreplying'] = 'პასუხის შემთხვევაში';
 $labels['replytopposting'] = 'დაიწყოს ახალი შეტყობინება ორიგინალის ზემოთ';
@@ -324,7 +323,6 @@ $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
 $labels['afternseconds'] = '$n წამის შემდეგ';
 $labels['addtodict'] = 'ლექსიკონში დამატება';
 $labels['folder'] = 'საქაღალდე';
-$labels['folders'] = 'საქაღალდეები';
 $labels['foldername'] = 'საქაღალდის დასახელება';
 $labels['subscribed'] = 'გამოწერილია';
 $labels['messagecount'] = 'შეტყობინებები';
@@ -362,4 +360,3 @@ $labels['japanese'] = 'იაპონური';
 $labels['korean'] = 'კორეული';
 $labels['chinese'] = 'ჩინური';
 
-?>
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 55d3333d8..7c6845f9d 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -1,19 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| localization/ka_GE/messages.inc                                       |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Zaza Zviadadze, George Machitidze                             |
-+-----------------------------------------------------------------------+
-
-@version $Id: messages.inc 842 2009-10-03 19:30:00  zaza$
-
+ +-----------------------------------------------------------------------+
+ | localization/ka_GE/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -121,4 +119,3 @@ $messages['folderupdated'] = 'დასტა წარმატებით გ
 $messages['foldercreated'] = 'დასტა წარმატებით შეიქმნა.';
 $messages['invalidimageformat'] = 'გამოსახულების ფორმატი არასწორია.';
 
-?>
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 70d19edaa..23c21c977 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/kh_KH/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008-2009, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-| Language: Khmer (ភាសាខ្មែរ)                                               |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mr. SENGTHA CHAY - <sengtha@gmail.com>                        |
-| based on some words translated by Mr. KOSAL SOVAN VISAL               |
-|- <sal@sovanvisal.com>                                                 |
-+-----------------------------------------------------------------------+
+ +-----------------------------------------------------------------------+
+ | localization/km_KH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,9 +41,10 @@ $labels['size'] = 'ទំហំ';
 $labels['priority'] = 'អទិភាព';
 $labels['organization'] = 'អង្គភាព';
 $labels['readstatus'] = 'ស្ថានភាពនៃការអាន';
-$labels['mailboxlist'] = 'ថតសំបុត្រ';
-$labels['messagesfromto'] = 'សំបុត្រពី $from ទៅដល់ $to ក្នុងចំណោម $count សំបុត្រ';
-$labels['threadsfromto'] = 'បន្តុំសំបុត្រពី $from ទៅដល់ $to ក្នុងចំណោម $count សំបុត្រ';
+$labels['mailboxlist'] = 'ថតទាំងអស់';
+$labels['folders'] = 'ថតទាំងអស់';
+$labels['messagesfromto'] = 'សំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
+$labels['threadsfromto'] = 'បន្តុំសំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['messagenrof'] = 'សំបុត្រ $nr នៃ $count';
 $labels['copy'] = 'ចំលង';
 $labels['move'] = 'ផ្ទេរ';
@@ -74,6 +72,7 @@ $labels['feb'] = 'កុម្ភះ';
 $labels['mar'] = 'មិនា';
 $labels['apr'] = 'មេសា';
 $labels['may'] = 'ឧសភា';
+$labels['longmay'] = 'ឧសភា';
 $labels['jun'] = 'មិថុនា';
 $labels['jul'] = 'កក្កដា';
 $labels['aug'] = 'សីហា';
@@ -85,7 +84,6 @@ $labels['longjan'] = 'មករា';
 $labels['longfeb'] = 'កុម្ភះ';
 $labels['longmar'] = 'មិនា';
 $labels['longapr'] = 'មេសា';
-$labels['longmay'] = 'ឧសភា';
 $labels['longjun'] = 'មិថុនា';
 $labels['longjul'] = 'កក្កដា';
 $labels['longaug'] = 'សីហា';
@@ -97,7 +95,7 @@ $labels['today'] = 'ថ្ងៃនេះ';
 $labels['checkmail'] = 'ពិនិត្យសំបុត្រថ្មី';
 $labels['writenewmessage'] = 'សរសេរសំបុត្រថ្មី';
 $labels['replytomessage'] = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
-$labels['replytoallmessage'] = 'ឆ្លើយតបទៅ អ្នកទទួលទាំងអស់ និង ក្រុម ឬ អ្នកផ្ញើ';
+$labels['replytoallmessage'] = 'ឆ្លើយតបទៅ អ្នកទទួលទាំងអស់និង ក្រុម ឬ អ្នកផ្ញើ';
 $labels['replyall'] = 'ឆ្លើយតបទៅទាំងអស់គ្នា';
 $labels['replylist'] = 'ឆ្លើយតបទៅក្រុម';
 $labels['forwardmessage'] = 'ផ្ញើសំបុត្របន្តរ';
@@ -105,13 +103,9 @@ $labels['deletemessage'] = 'លុបសំបុត្រចោល';
 $labels['movemessagetotrash'] = 'ផ្ទេរសំបុត្រទៅក្នុងធុងសំរាម';
 $labels['printmessage'] = 'បោះពុម្ភសំបុត្រ';
 $labels['previousmessage'] = 'បង្ហាញសំបុត្រចាស់';
-$labels['previousmessages'] = 'បង្ហាញសំបុត្រចាស់';
 $labels['firstmessage'] = 'បង្ហាញសំបុត្រដំបូង';
-$labels['firstmessages'] = 'បង្ហាញសំបុត្រដំបូង';
 $labels['nextmessage'] = 'បង្ហាញសំបុត្របន្ទាប់';
-$labels['nextmessages'] = 'បង្ហាញសំបុត្របន្ទាប់';
 $labels['lastmessage'] = 'បង្ហាញសំបុត្រចុងក្រោយ';
-$labels['lastmessages'] = 'បង្ហាញសំបុត្រចុងក្រោយ';
 $labels['backtolist'] = 'ត្រលប់ទៅកាន់ក្រុមសំបុត្រ';
 $labels['viewsource'] = 'បង្ហាញ Source របស់សំបុត្រ';
 $labels['markmessages'] = 'កំណត់សំគាល់សំបុត្រ';
@@ -119,10 +113,10 @@ $labels['markread'] = 'កំណត់ថាបានអានរួច';
 $labels['markunread'] = 'កំណត់ថាមិនទាន់បានអាន';
 $labels['markflagged'] = 'កំណត់សំគាល់ដោយផ្កាយ';
 $labels['markunflagged'] = 'លុបកំណត់សំគាល់ដោយផ្កាយ';
-$labels['messageactions'] = 'មុខងារផ្សេងទៀត';
 $labels['select'] = 'ជ្រើសរើស';
 $labels['all'] = 'ទាំងអស់';
-$labels['none'] = 'មិនជ្រើសរើស';
+$labels['none'] = 'មិនតំរៀប';
+$labels['nonesort'] = 'មិនតំរៀប';
 $labels['currpage'] = 'ទំព័រនេះ';
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
@@ -142,7 +136,6 @@ $labels['expand_only_unread'] = 'បង្ហាញតែសំបុត្រ�
 $labels['fromto'] = 'អ្នកផ្ញើ / អ្នកទទួល';
 $labels['flag'] = 'កំណត់សំគាល់ដោយផ្កាយ';
 $labels['attachment'] = 'ឯកសារភ្ជាប់';
-$labels['nonesort'] = 'មិនតំរៀប';
 $labels['sentdate'] = 'កាលបរិច្ឆេតផ្ញើ';
 $labels['arrival'] = 'កាលបរិច្ឆេតទទួល';
 $labels['asc'] = 'តាមលំដាប់ចុះ';
@@ -162,7 +155,7 @@ $labels['resetsearch'] = 'កំណត់លក្ខខ័ណ្ឌស្វែ
 $labels['searchmod'] = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
 $labels['msgtext'] = 'សំបុត្រទាំងមូល';
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
-$labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ (.eml)';
+$labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
 $labels['compose'] = 'សរសេរសំបុត្រថ្មី';
 $labels['editasnew'] = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
 $labels['savemessage'] = 'រក្សាទុកសំបុត្រពង្រៀង';
@@ -187,20 +180,18 @@ $labels['high'] = 'ខ្ពស់';
 $labels['highest'] = 'ខ្ពស់បំផុត';
 $labels['nosubject'] = '(គ្មានចំណងជើង)';
 $labels['showimages'] = 'បង្ហាញរូបភាព';
-$labels['alwaysshow'] = 'បង្ហាញជានិច្ចរាល់រូបភាពបញ្ជូនពី $sender';
+$labels['alwaysshow'] = 'បង្ហាញជានិច្ចរាល់រូបភាពបញ្ជូនពី$sender';
 $labels['htmltoggle'] = 'អត្ថបទ HTML';
 $labels['plaintoggle'] = 'អត្ថបទធម្មតា';
 $labels['savesentmessagein'] = 'រក្សាសំបុត្រដែលបានផ្ញើក្នុង';
 $labels['dontsave'] = 'មិនរក្សាទុក';
-$labels['maxuploadsize'] = 'ទំហំឯកសារធំបំផុតដែលអាចភ្ជាប់បានគឺ $size';
+$labels['maxuploadsize'] = 'ទំហំឯកសារធំបំផុតដែលអាចភ្ជាប់បានគឺ$size';
 $labels['addcc'] = 'បន្ថែម Cc';
 $labels['addbcc'] = 'បន្ថែម Bcc';
 $labels['addreplyto'] = 'បន្ថែម Reply-To';
 $labels['addfollowupto'] = 'បន្ថែម Followup-To';
-$labels['mdnrequest'] = 'ម្ចាស់សំបុត្រស្នើសុំអោយប្រាប់នៅពេលសំបុត្រនេះត្រូវបានគេអាន។ តើអ្នកចង់ប្រាប់ដែរឬទេ?';
 $labels['receiptread'] = 'អត្ថបទផ្ញើត្រលប់ (បានអាន)';
 $labels['yourmessage'] = 'នេះគឺជាអត្ថបទផ្ញើត្រលប់សំរាប់សំបុត្ររបស់លោកអ្នក។';
-$labels['receiptnote'] = 'កំណត់សំគាល់: អត្ថបទផ្ញើត្រលប់នេះគ្រាន់តែបញ្ជាក់ថា សំបុត្ររបស់លោកអ្នកត្រូវបានបង្ហាញនៅឯកុំព្យូទ័ររបស់អ្នកទទួល។ គេមិនអាចធានាថាអ្នកទទួលបានមើលឬយល់សំបុត្ររបស់លោកអ្នកឡើយ។';
 $labels['name'] = 'ឈ្មោះសំរាប់បង្ហាញ';
 $labels['firstname'] = 'នាមត្រកូល';
 $labels['surname'] = 'នាមខ្លួន';
@@ -228,11 +219,13 @@ $labels['notes'] = 'កំណត់ហេតុ';
 $labels['male'] = 'ប្រុស';
 $labels['female'] = 'ស្រី';
 $labels['manager'] = 'នាយក';
-$labels['assistant'] = 'ការិនី';
+$labels['assistant'] = 'ជំនួយការ';
+$labels['typeassistant'] = 'ជំនួយការ';
 $labels['spouse'] = 'គ្រួសារ';
+$labels['other'] = 'ផ្សេងពីនេះ';
+$labels['typeother'] = 'ផ្សេងពីនេះ';
 $labels['typehome'] = 'គេហដ្ឋាន';
 $labels['typework'] = 'កន្លែងធ្វើការ';
-$labels['typeother'] = 'ផ្សេងពីនេះ';
 $labels['typemobile'] = 'ទូរស័ព្ទដៃ';
 $labels['typemain'] = 'ចំបង';
 $labels['typehomefax'] = 'ទូរសារនៅគេហដ្ឋាន';
@@ -240,7 +233,6 @@ $labels['typeworkfax'] = 'ទូរសារនៅកន្លែងធ្វើ
 $labels['typecar'] = 'រថយន្ត';
 $labels['typepager'] = 'ឧបករណ៍ផ្តល់សារ';
 $labels['typevideo'] = 'វីដេអូរ';
-$labels['typeassistant'] = 'ជំនួយការ';
 $labels['addfield'] = 'បន្ថែម';
 $labels['addcontact'] = 'បន្ថែមអាសយដ្ឋានទាក់ទង';
 $labels['editcontact'] = 'កែប្រែអាសយដ្ឋានទាក់ទង';
@@ -257,12 +249,11 @@ $labels['replacephoto'] = 'លុបរូបថត';
 $labels['newcontact'] = 'បង្កើតអាសយដ្ឋានទាក់ទងថ្មី';
 $labels['deletecontact'] = 'លុបអាសយដ្ឋានទាក់ទងដែលបានជ្រើសរើស';
 $labels['composeto'] = 'ផ្ញើសំបុត្រទៅ';
-$labels['contactsfromto'] = 'អាសយដ្ឋានទាក់ទង $from ដល់ $to នៃ $count';
+$labels['contactsfromto'] = 'អាសយដ្ឋានទាក់ទង $from ដល់ $to នៃ$count';
 $labels['print'] = 'បោះពុម្ភ';
 $labels['export'] = 'ទាញនិងរក្សាទុក';
-$labels['exportvcards'] = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទ vCard';
+$labels['exportvcards'] = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទvCard';
 $labels['newcontactgroup'] = 'បង្កើតក្រុមអាសយដ្ឋានថ្មី';
-$labels['groupactions'] = 'មុខងារក្រុមអាសយដ្ឋាន';
 $labels['previouspage'] = 'ទំព័រមុន';
 $labels['firstpage'] = 'ទំព័រដំបូង';
 $labels['nextpage'] = 'ទំព័របន្ទាប់';
@@ -274,7 +265,6 @@ $labels['import'] = 'បញ្ចូល';
 $labels['importcontacts'] = 'បញ្ចូលអាសយដ្ឋាន';
 $labels['importfromfile'] = 'បញ្ចូលពី ឯកសារ';
 $labels['importreplace'] = 'ផ្លាស់ប្តូរអាសយដ្ឋានទាំងអស់';
-$labels['importtext'] = 'អ្នកអាចបញ្ចូលអាសយដ្ឋានទាក់ទងពីទិន្នន័យដែលមានស្រាប់​ ។<br/>បច្ចុប្បន្នលោកអ្នកអាចបញ្ជូលទិន្នន័យអាសយដ្ឋានពី ឯកសារប្រភេទ <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>។';
 $labels['done'] = 'ចប់រួចរាល់';
 $labels['settingsfor'] = 'កំណត់សំរាប់';
 $labels['preferences'] = 'កំណត់តាមការចូលចិត្ត';
@@ -312,10 +302,10 @@ $labels['autosend'] = 'ផ្ញើស្វ័យប្រវត្តិ';
 $labels['autosendknown'] = 'បញ្ជូនអត្ថបទប្រាប់អ្នកផ្ញើទៅកាន់អាសយដ្ឋានទាក់ទងរបស់ខ្ញុំឬក៏សួរខ្ញុំ';
 $labels['autosendknownignore'] = 'បញ្ជូនអត្ថបទប្រាប់អ្នកផ្ញើទៅកាន់អាសយដ្ឋានទាក់ទងរបស់ខ្ញុំឬមិនបាច់ធ្វើអ្វីទាំងអស់';
 $labels['ignore'] = 'ទុកចោល';
-$labels['readwhendeleted'] = 'កំណត់សំបុត្រថាបានអាន នៅពេលលុបសំបុត្រនោះ';
-$labels['flagfordeletion'] = 'កំណត់សញ្ញាផ្កាយអោយសំបុត្រថាបានលុប ដោយមិនចាំបាច់លុបជាក់ស្តែង';
+$labels['readwhendeleted'] = 'កំណត់សំបុត្រថាបានអាននៅពេលលុបសំបុត្រនោះ';
+$labels['flagfordeletion'] = 'កំណត់សញ្ញាផ្កាយអោយសំបុត្រថាបានលុបដោយមិនចាំបាច់លុបជាក់ស្តែង';
 $labels['skipdeleted'] = 'មិនបង្ហាញសំបុត្រដែលបានលុប';
-$labels['deletealways'] = 'លុបសំបុត្រចោល ប្រសិនជាមិនអាចផ្ទេសំបុត្រនោះទៅធុងសំរាមបាន';
+$labels['deletealways'] = 'លុបសំបុត្រចោលប្រសិនជាមិនអាចផ្ទេសំបុត្រនោះទៅធុងសំរាមបាន';
 $labels['showremoteimages'] = 'បង្ហាញរូបភាពដែលគេផ្ញើមក';
 $labels['fromknownsenders'] = 'ពីអ្នកផ្ញើដែលស្គាល់';
 $labels['always'] = 'គ្រប់ពេល';
@@ -333,14 +323,13 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 ពេញ(other)';
 $labels['force7bit'] = 'ប្រើ MIME សំរាប់អក្សរទំហំ 8-bit';
 $labels['advancedoptions'] = 'ការកំណត់ពឹស្តារ';
-$labels['focusonnewmessage'] = 'ផ្តោតលើ វីនដូវដែលកំពុងសរសេរសំបុត្រថ្មី';
+$labels['focusonnewmessage'] = 'ផ្តោតលើវីនដូវដែលកំពុងសរសេរសំបុត្រថ្មី';
 $labels['checkallfolders'] = 'ពិនិត្យសំបុត្រថ្មីនៅគ្រប់ថតទាំងអស់';
-$labels['displaynext'] = 'បន្ទាប់ពីសំបុត្រត្រូវបានលុប​ឬផ្ទេរ បង្ហាញសំបុត្របន្ទាប់';
+$labels['displaynext'] = 'បន្ទាប់ពីសំបុត្រត្រូវបានលុប​ឬផ្ទេរបង្ហាញសំបុត្របន្ទាប់';
 $labels['mainoptions'] = 'ជំរើសដែលជាគោល';
 $labels['section'] = 'ផ្នែក';
 $labels['maintenance'] = 'ការថែរក្សា';
 $labels['newmessage'] = 'សំបុត្រថ្មី';
-$labels['listoptions'] = 'កំណត់តារាង';
 $labels['signatureoptions'] = 'កំណត់ហត្ថលេខា';
 $labels['whenreplying'] = 'នៅពេលកំពុងឆ្លើយតប';
 $labels['replytopposting'] = 'ចាប់ផ្តើម​សរសេរ​ពី​លើ​សំបុត្រ​ដើម';
@@ -349,7 +338,7 @@ $labels['replyremovesignature'] = 'នៅ​ពេល​ឆ្លើយ​តប
 $labels['autoaddsignature'] = 'បញ្ចូលហត្តលេខាដោយស្វ័យប្រវត្តិ';
 $labels['newmessageonly'] = 'សំរាប់សំបុត្រថ្មីតែប៉ុណ្ណោះ';
 $labels['replyandforwardonly'] = 'សំរាប់ឆើ្លយតប​និងផ្ញើបន្តតែ​ប៉ុណ្ណោះ';
-$labels['replysignaturepos'] = 'បញ្ចូលហត្តលេខានៅពេលឆើ្លយតប​និងផ្ញើបន្ត​';
+$labels['replysignaturepos'] = 'បញ្ចូលហត្តលេខានៅពេលឆើ្លយតប​និងផ្ញើបន្ត';
 $labels['belowquote'] = 'ពីក្រោមសម្រង់អត្ថបទ';
 $labels['abovequote'] = 'ពីលើសម្រង់អត្ថបទ';
 $labels['insertsignature'] = 'បញ្ចូលហត្តលេខា';
@@ -359,7 +348,6 @@ $labels['reqmdn'] = 'ក្រោយពី $n វិនាទី';
 $labels['reqdsn'] = 'ក្រោយពី $n វិនាទី';
 $labels['replysamefolder'] = 'ក្រោយពី $n វិនាទី';
 $labels['folder'] = 'ថត';
-$labels['folders'] = 'ថតទាំងអស់';
 $labels['foldername'] = 'ឈ្មោះថត';
 $labels['subscribed'] = 'កំណត់យកមកប្រើ';
 $labels['messagecount'] = 'សំបុត្រ';
@@ -400,4 +388,3 @@ $labels['japanese'] = 'ភាសាជប៉ុន';
 $labels['korean'] = 'ភាសាកូរ៉េ';
 $labels['chinese'] = 'ភាសាចិន';
 
-?>
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index 985bd228c..9b6f2ae7d 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -1,35 +1,31 @@
 <?php
- 
+
 /*
-+-----------------------------------------------------------------------+
-| language/kh_KH/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008-2009, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-| Language: Khmer (ភាសាខ្មែរ)                                               |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mr. SENGTHA CHAY - <sengtha@gmail.com>                        |
-| based on some words translated by Mr. KOSAL SOVAN VISAL               |
-|- <sal@sovanvisal.com>                                                 |
-+-----------------------------------------------------------------------+
- 
+ +-----------------------------------------------------------------------+
+ | localization/km_KH/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
- 
+
 $messages = array();
-$messages['loginfailed'] = 'ការពិនិត្យចូលមិនបានសំរេច ព្រោះមានបញ្ហាកើតឡើង';
-$messages['cookiesdisabled'] = 'កម្មវិធីមើលគេហទំព័រនេះមិនទទួលយក Cookies';
-$messages['sessionerror'] = 'Session មិនត្រឹមត្រូវ ឬ ហួសកំណត់';
-$messages['imaperror'] = 'មិនអាចភ្ជាប់ទៅកាន់ម៉ាស៊ីន IMAP';
+$messages['loginfailed'] = 'ការពិនិត្យចូលមិនបានសំរេចព្រោះមានបញ្ហាកើតឡើង';
+$messages['cookiesdisabled'] = 'កម្មវិធីមើលគេហទំព័រនេះមិនទទួលយកCookies';
+$messages['sessionerror'] = 'Session មិនត្រឹមត្រូវ ឬហួសកំណត់';
+$messages['imaperror'] = 'មិនអាចភ្ជាប់ទៅកាន់ម៉ាស៊ីនIMAP';
 $messages['servererror'] = 'មានបញ្ហានៅម៉ាស៊ីនមេ';
 $messages['servererrormsg'] = 'បញ្ហា: $msg';
 $messages['errorreadonly'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះថតនេះត្រូវបានគេកំណត់សំរាប់តែមើល';
 $messages['errornoperm'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះមិនមានសិទ្ទគ្រប់គ្រាន់';
 $messages['invalidrequest'] = 'មិនអាចរក្សាទុកទិន្នន័យបានពីព្រោះមានបញ្ហានៅពេលបញ្ជូនទិន្នន័យ';
 $messages['nomessagesfound'] = 'ពុំមានសំបុត្រក្នុងប្រអប់សំបុត្រនេះទេ';
-$messages['loggedout'] = 'អ្នកបានពិនិត្យចេញដោយជោគជ័យ ។';
+$messages['loggedout'] = 'អ្នកបានពិនិត្យចេញដោយជោគជ័យ។';
 $messages['mailboxempty'] = 'ប្រអប់សំបុត្រទទេ';
 $messages['loading'] = 'កំពុងដំណើរការ...';
 $messages['uploading'] = 'កំពុងបញ្ជូនឯកសារ...';
@@ -41,13 +37,13 @@ $messages['savingmessage'] = 'កំពុងរក្សាសំបុត្�
 $messages['messagesaved'] = 'សំបុត្រត្រូវបានរក្សាទុកក្នុងថតពង្រៀង';
 $messages['successfullysaved'] = 'រក្សាទុកដោយជោគជ័យ';
 $messages['addedsuccessfully'] = 'អាសយដ្ឋានត្រូវបានរក្សាទុកដោយជោគជ័យ';
-$messages['contactexists'] = 'ព័ត៌មានទាក់ទងដែលមានអ៊ីមែលនេះ មានក្នុងសៀវភៅអាសយដ្ឋានរួចហើយ';
-$messages['blockedimages'] = 'រូបភាពដែលមានក្នុងសំបុត្រនេះត្រូវបានបិទ ដើម្បីរក្សាសុវត្ថភាព';
+$messages['contactexists'] = 'ព័ត៌មានទាក់ទងដែលមានអ៊ីមែលនេះមានក្នុងសៀវភៅអាសយដ្ឋានរួចហើយ';
+$messages['blockedimages'] = 'រូបភាពដែលមានក្នុងសំបុត្រនេះត្រូវបានបិទដើម្បីរក្សាសុវត្ថភាព';
 $messages['encryptedmessage'] = 'លោកអ្នកមិនអាចមើលសំបុត្រនេះបានទេពីព្រោះសំបុត្រនេះជាសំបុត្រសំងាត់';
 $messages['nocontactsfound'] = 'ពុំមានអាសយដ្ឋានទាក់ទងទេ';
-$messages['contactnotfound'] = 'អាសយដ្ឋានទាក់ទងដែលលោកអ្នកចង់រក ពុំមានឡើយ';
+$messages['contactnotfound'] = 'អាសយដ្ឋានទាក់ទងដែលលោកអ្នកចង់រកពុំមានឡើយ';
 $messages['sendingfailed'] = 'មិនអាចផ្ញើសំបុត្របាន';
-$messages['senttooquickly'] = 'សូមរងចាំ $sec វិនាទី មុននឹងផ្ញើសំបុត្រនេះ';
+$messages['senttooquickly'] = 'សូមរងចាំ $sec វិនាទីមុននឹងផ្ញើសំបុត្រនេះ';
 $messages['errorsavingsent'] = 'មានបញ្ហាកើតឡើងនៅពេលកំពុងរក្សាទុកសំបុត្រដែលបានផ្ញើរួច';
 $messages['errorsaving'] = 'មានបញ្ហាកើតឡើងនៅពេលកំពុងរក្សាសំបុត្រទុក';
 $messages['errormoving'] = 'មិនអាចផ្ទេរសំបុត្របាន';
@@ -68,14 +64,12 @@ $messages['nonamewarning'] = 'សូមសរសេរឈ្មោះរបស�
 $messages['nopagesizewarning'] = 'សូមកំណត់ទំហំទំព័រ';
 $messages['nosenderwarning'] = 'សូមសរសេរអ៊ីមែលរបស់អ្នកផ្ញើ';
 $messages['norecipientwarning'] = 'សូមសរសេរអ្នកទទួលយ៉ាងហោចណាស់ម្នាក់';
-$messages['nosubjectwarning'] = 'សំបុត្រគ្មានចំណងជើង តើអ្នកចង់សរសេរចំណងជើងនៅពេលនេះទេ?';
+$messages['nosubjectwarning'] = 'សំបុត្រគ្មានចំណងជើងតើអ្នកចង់សរសេរចំណងជើងនៅពេលនេះទេ?';
 $messages['nobodywarning'] = 'តើលោកអ្នកចង់ផ្ញើសំបុត្រដែលគ្មានតួអត្ថបទសំបុត្រទេ?';
-$messages['notsentwarning'] = 'សំបុត្រនេះមិនទាន់បានផ្ញើទេ ។ តើលោកអ្នកចង់លុបចោលទេ?';
-$messages['noldapserver'] = 'សូមកំណត់ម៉ាស៊ីន LDAP ដើម្បីស្វែងរក';
-$messages['nocontactsreturned'] = 'រកមិនឃើញពត៌មានទំនាក់ទំនងណាមួយទេ';
-$messages['nosearchname'] = 'សូមបំពេញឈ្មោះទំនាក់ទំនង ឬ អាសយដ្ឋានអ៊ីមែល';
-$messages['notuploadedwarning'] = 'ឯកសារទាំងអស់មិនទាន់បញ្ជូនភ្ជាប់រួចរាល់ទេ ។ មេត្តារងចាំបន្តិច ឬបោះបង់ការបញ្ជូននេះ!';
-$messages['searchsuccessful'] = 'រកឃើញសំបុត្រចំនួន $nr ';
+$messages['notsentwarning'] = 'សំបុត្រនេះមិនទាន់បានផ្ញើទេ។ តើលោកអ្នកចង់លុបចោលទេ?';
+$messages['noldapserver'] = 'សូមកំណត់ម៉ាស៊ីន LDAPដើម្បីស្វែងរក';
+$messages['nosearchname'] = 'សូមបំពេញឈ្មោះទំនាក់ទំនង ឬអាសយដ្ឋានអ៊ីមែល';
+$messages['searchsuccessful'] = 'រកឃើញសំបុត្រចំនួន $nr';
 $messages['searchnomatch'] = 'រកមិនឃើញអ្វីទាំងអស់';
 $messages['searching'] = 'កំពុងស្វែងរក...';
 $messages['checking'] = 'កំពុងពិនិត្យរក...';
@@ -89,8 +83,8 @@ $messages['deletedsuccessfully'] = 'លុបបានដោយជោគជ័�
 $messages['converting'] = 'កំពុងលុបការរចនាចោល...';
 $messages['messageopenerror'] = 'មិនអាចទាញយកសំបុត្រពីម៉ាស៊ីនមេបានទេ';
 $messages['fileuploaderror'] = 'មិនអាចបញ្ជូលភ្ជាប់ឯកសារ';
-$messages['filesizeerror'] = 'ទំហំឯកសារត្រូវបញ្ជូនលើសចំណុះ ទំហំធំបំផុតគឺ $size';
-$messages['copysuccess'] = 'បានចំលងអាសយដ្ឋានចំនួន $nr ដោយជោគជ័យ';
+$messages['filesizeerror'] = 'ទំហំឯកសារត្រូវបញ្ជូនលើសចំណុះទំហំធំបំផុតគឺ $size';
+$messages['copysuccess'] = 'បានចំលងអាសយដ្ឋានចំនួន $nrដោយជោគជ័យ';
 $messages['copyerror'] = 'មិនអាចចំលងអាសយដ្ឋានណាមួយឡើយ';
 $messages['sourceisreadonly'] = 'លោកអ្នកមានសិទ្ធត្រឹមតែមើលប្រភពនៃអាសយដ្ឋាននេះ';
 $messages['errorsavingcontact'] = 'មិនអាចរក្សាអាសយដ្ឋានបានទេ';
@@ -98,32 +92,29 @@ $messages['movingmessage'] = 'កំពុកផ្តេរសំបុត្�
 $messages['copyingmessage'] = 'កំពុងចំលងសំបុត្រ...';
 $messages['deletingmessage'] = 'កំពុងលុបសំបុត្រ...';
 $messages['markingmessage'] = 'កំពុងកំណត់សំគាល់សំបុត្រ...';
-$messages['receiptsent'] = 'បានបញ្ជូន អត្ថបទបញ្ជាក់ថាបានអាន បានសំរេច';
-$messages['errorsendingreceipt'] = 'មិនអាចបញ្ជូន អត្ថបទបញ្ជាក់ថាបានអាន ទេ';
-$messages['nodeletelastidentity'] = 'លោកអ្នកមិនអាចលុបអត្តសញ្ញាណនេះទេ ព្រោះវានៅសល់ចុងក្រោយគេ';
+$messages['receiptsent'] = 'បានបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអានបានសំរេច';
+$messages['errorsendingreceipt'] = 'មិនអាចបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអាន ទេ';
+$messages['nodeletelastidentity'] = 'លោកអ្នកមិនអាចលុបអត្តសញ្ញាណនេះទេព្រោះវានៅសល់ចុងក្រោយគេ';
 $messages['forbiddencharacter'] = 'ឈ្មោះថតនេះមានអក្សរដែលត្រូវហាមឃាត់';
 $messages['selectimportfile'] = 'សូមជ្រើសរើសឯកសារដើម្បីបញ្ជូនភ្ជាប់';
 $messages['addresswriterror'] = 'សៀវភៅអាសយដ្ឋាននោះមិនអាចសរសេរចូលបានទេ';
 $messages['contactaddedtogroup'] = 'បានដាក់ពត៌មានទំនាក់ទំនងចូលក្នុងក្រុមនេះដោយជោគជ័យ';
 $messages['contactremovedfromgroup'] = 'បានលុបពត៌មានទំនាក់ទំនងចេញពីក្រុមនេះដោយជោគជ័យ';
-$messages['importwait'] = 'សូមមេត្តារង់ចាំ កំពុងទាញទិន្នន័យចូល ...';
-$messages['importerror'] = 'ការទាញចូលមិនបានសំរេច! ឯកសារដែលជ្រើសរើសនោះមិនមែនជាប្រភេទឯកសារ vCard ទេ ។';
-$messages['importconfirm'] = '<b>ព័ត៌មានទំនាក់ទំនង $inserted បានបញ្ចូលដោយជោគជ័យ, ហើយបានរំលងចោលពត៌មានដែលមានស្រាប់ $skipped </b>:<p><em>$names</em></p>';
+$messages['importwait'] = 'សូមមេត្តារង់ចាំកំពុងទាញទិន្នន័យចូល ...';
+$messages['importerror'] = 'ការទាញចូលមិនបានសំរេច!ឯកសារដែលជ្រើសរើសនោះមិនមែនជាប្រភេទឯកសារvCard ទេ ។';
+$messages['importconfirm'] = '<b>ព័ត៌មានទំនាក់ទំនង $insertedបានបញ្ចូលដោយជោគជ័យ,ហើយបានរំលងចោលពត៌មានដែលមានស្រាប់$skipped </b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'ប្រតិ្តបត្តិការត្រូវបានគេហាមឃាត់!';
 $messages['nofromaddress'] = 'ខ្វះអាសយដ្ឋានអ៊ីមែលក្នុងអត្តសញ្ណាណមួយនេះ';
-$messages['editorwarning'] = 'ប្តូរទៅទំរង់អត្ថបទធម្មតា អាចធ្វើអោយបាត់បង់ការរចនាដែលមាន។ លោកអ្នកចង់ប្តូរទេ?';
-$messages['httpreceivedencrypterror'] = 'ប្រព័ន្ធដំណើរការមិនប្រកតី។ សូមទាក់ទងទៅកាន់អ្នកបច្ចេកទេសជាបន្ទាន់។ <br>សាររបស់អ្នកមិនអាចផ្ញើទេក្នុងពេលនេះ<br>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេ';
-$messages['smtpautherror'] = 'SMTP Error ($code): ព័ត៌មានគនីយមិនត្រឹមត្រូវ';
-$messages['smtpfromerror'] = 'SMTP Error ($code): មិនអាចកំនត់អ្នកផ្ញើ "$from" ($msg)';
-$messages['smtptoerror'] = 'SMTP Error ($code): មិនអាចកំនត់អ្នកទទួល "$to" ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Error: មិនអាចបំលែងបញ្ជីអ្នកទទួល';
-$messages['smtpdsnerror'] = 'SMTP Error: មិនអាចប្រាប់ពីស្ថានភាពនៃការបញ្ជូនសំបុត្រ';
+$messages['smtpconnerror'] = 'SMTP Error ($code):មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេ';
+$messages['smtpautherror'] = 'SMTP Error ($code):ព័ត៌មានគនីយមិនត្រឹមត្រូវ';
+$messages['smtpfromerror'] = 'SMTP Error ($code):មិនអាចកំនត់អ្នកផ្ញើ "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP Error ($code):មិនអាចកំនត់អ្នកទទួល "$to" ($msg)';
+$messages['smtprecipientserror'] = 'SMTP Error:មិនអាចបំលែងបញ្ជីអ្នកទទួល';
 $messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'អាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវទេ: $email';
-$messages['toomanyrecipients'] = 'ចំនួនអ្នកទទួលច្រើនលើសកំនត់! សូមមេត្តាលុបចោលរហូតដល់ $max។';
-$messages['maxgroupmembersreached'] = 'ចំនួនក្រុមលើសកំនត់ហើយ ចំនួនច្រើនបំផុតគឺ $max';
-$messages['internalerror'] = 'មានបញ្ហាខាងម៉ាស៊ីនមេ ។ សូមព្យាយាមម្តងទៀត!';
+$messages['emailformaterror'] = 'អាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវទេ:$email';
+$messages['toomanyrecipients'] = 'ចំនួនអ្នកទទួលច្រើនលើសកំនត់!សូមមេត្តាលុបចោលរហូតដល់ $max។';
+$messages['maxgroupmembersreached'] = 'ចំនួនក្រុមលើសកំនត់ហើយចំនួនច្រើនបំផុតគឺ $max';
+$messages['internalerror'] = 'មានបញ្ហាខាងម៉ាស៊ីនមេ ។សូមព្យាយាមម្តងទៀត!';
 $messages['contactdelerror'] = 'មិនអាចលុបអាសយដ្ឋានទំនាក់ទំនង';
 $messages['contactdeleted'] = 'អាសយដ្ឋានទំនាក់ទំនងត្រូវបានលុបដោយជោគជ័យ';
 $messages['groupdeleted'] = 'លុបក្រុមបានដោយជោគជ័យ';
@@ -133,11 +124,10 @@ $messages['messagedeleted'] = 'លុបសំបុត្របានដោយ�
 $messages['messagemoved'] = 'ផ្ទេរសំបុត្របានដោយជោគជ័យ';
 $messages['messagecopied'] = 'ចំលងសំបុត្របានដោយជោគជ័យ';
 $messages['messagemarked'] = 'កំណត់សំគាល់សំបុត្របានដោយជោគជ័យ';
-$messages['autocompletechars'] = 'សូមសរសេរអក្សរយ៉ាងតិច $min ដើម្បីបង្ហាយដោយស្វ័យប្រវត្តិ';
+$messages['autocompletechars'] = 'សូមសរសេរអក្សរយ៉ាងតិច $minដើម្បីបង្ហាយដោយស្វ័យប្រវត្តិ';
 $messages['namecannotbeempty'] = 'សូមសរសេរឈ្មោះ';
 $messages['nametoolong'] = 'ឈ្មោះវែងពេក';
 $messages['folderupdated'] = 'ផ្លាស់ប្តូរថតបានដោយជោគជ័យ';
 $messages['foldercreated'] = 'បង្កើតថតបានដោយជោគជ័យ';
 $messages['invalidimageformat'] = 'ប្រភេទរូបភាពមិនត្រឹមត្រូវ';
- 
-?>
\ No newline at end of file
+
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index c078dad69..545e07d1a 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -1,23 +1,20 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| localization/kr/labels.inc                                            |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: lordmiss <lordmiss@lordmiss.com>                              |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
-$labels['welcome'] = '$product에 오신 것을 환영합니다';
+$labels = array();
 $labels['welcome'] = '$product에 오신 것을 환영합니다';
 $labels['username'] = '사용자명';
 $labels['password'] = '비밀번호';
@@ -42,17 +39,15 @@ $labels['date'] = '날짜';
 $labels['size'] = '크기';
 $labels['priority'] = '우선순위';
 $labels['organization'] = '기관';
-$labels['reply-to'] = '회신 주소';
 $labels['mailboxlist'] = '폴더';
+$labels['folders'] = '폴더';
 $labels['messagesfromto'] = '$count 개 중 $from 에서 $to 번 메시지';
 $labels['messagenrof'] = '$count 개 중 $nr 번 메시지';
+$labels['copy'] = '참조';
 $labels['moveto'] = '이동...';
 $labels['download'] = '다운로드';
 $labels['filename'] = '파일 이름';
 $labels['filesize'] = '파일 크기';
-$labels['preferhtml'] = 'HTML 보이기';
-$labels['htmlmessage'] = 'HTML 메시지';
-$labels['prettydate'] = '날짜 형식';
 $labels['addtoaddressbook'] = '주소록에 추가';
 $labels['sun'] = '일';
 $labels['mon'] = '월';
@@ -73,6 +68,7 @@ $labels['feb'] = '2월';
 $labels['mar'] = '3월';
 $labels['apr'] = '4월';
 $labels['may'] = '5월';
+$labels['longmay'] = '5월';
 $labels['jun'] = '6월';
 $labels['jul'] = '7월';
 $labels['aug'] = '8월';
@@ -84,7 +80,6 @@ $labels['longjan'] = '1월';
 $labels['longfeb'] = '2월';
 $labels['longmar'] = '3월';
 $labels['longapr'] = '4월';
-$labels['longmay'] = '5월';
 $labels['longjun'] = '6월';
 $labels['longjul'] = '7월';
 $labels['longaug'] = '8월';
@@ -102,13 +97,9 @@ $labels['deletemessage'] = '메일 삭제';
 $labels['movemessagetotrash'] = '메일 휴지통으로 이동';
 $labels['printmessage'] = '메일 인쇄';
 $labels['previousmessage'] = '이전 메일 보기';
-$labels['previousmessages'] = '이전 메일 세트 보기';
 $labels['firstmessage'] = '처음 메일 보기';
-$labels['firstmessages'] = '처음 메일 세트 보기';
 $labels['nextmessage'] = '다음 메일 보기';
-$labels['nextmessages'] = '다음 메일 세트 보기';
 $labels['lastmessage'] = '마지막 메일 보기';
-$labels['lastmessages'] = '마지막 메일 세트 보기';
 $labels['backtolist'] = '메일 목록으로';
 $labels['viewsource'] = '소스 보기';
 $labels['markmessages'] = '메시지 표시';
@@ -119,13 +110,13 @@ $labels['markunflagged'] = '깃발 내리기';
 $labels['select'] = '선택';
 $labels['all'] = '모두';
 $labels['none'] = '없음';
+$labels['nonesort'] = '없음';
 $labels['unread'] = '읽지 않음';
 $labels['flagged'] = '깃발';
 $labels['unanswered'] = '답장하지 않음';
 $labels['filter'] = '필터';
 $labels['compact'] = '간단하게';
 $labels['empty'] = '비우기';
-$labels['purge'] = '삭제';
 $labels['quota'] = '디스크 사용';
 $labels['unknown'] = '알수 없음';
 $labels['unlimited'] = '제한 없음';
@@ -203,6 +194,9 @@ $labels['manageidentities'] = '이 계정의 신원 관리';
 $labels['newidentity'] = '새 신원';
 $labels['newitem'] = '새 아이템';
 $labels['edititem'] = '아이템 편집';
+$labels['preferhtml'] = 'HTML 보이기';
+$labels['htmlmessage'] = 'HTML 메시지';
+$labels['prettydate'] = '날짜 형식';
 $labels['setdefault'] = '기본으로 설정';
 $labels['autodetect'] = '자동';
 $labels['language'] = '언어';
@@ -244,7 +238,6 @@ $labels['advancedoptions'] = '상세 설정';
 $labels['focusonnewmessage'] = '새 메시지가 있으면 브라우저 윈도우로 포커스 이동';
 $labels['checkallfolders'] = '새 메시지를 위해 모든 폴더 체크';
 $labels['folder'] = '폴더';
-$labels['folders'] = '폴더';
 $labels['foldername'] = '폴더 이름';
 $labels['subscribed'] = '가입됨';
 $labels['messagecount'] = '메시지';
@@ -260,4 +253,3 @@ $labels['KB'] = '킬로바이트';
 $labels['MB'] = '메가바이트';
 $labels['GB'] = '기가바이트';
 
-?>
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index a4d0f7d4c..3bddfe4bf 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -1,23 +1,20 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| localization/kr/messages.inc                                            |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: lordmiss <lordmiss@lordmiss.com>                              |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
-$messages['loginfailed'] = '로그인 실패';
+$messages = array();
 $messages['loginfailed'] = '로그인 실패';
 $messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다';
 $messages['sessionerror'] = '세션이 유효하지 않거나 종료되었습니다';
@@ -61,7 +58,6 @@ $messages['nosubjectwarning'] = '"제목"이 없습니다. 제목을 넣으시�
 $messages['nobodywarning'] = '텍스트 없이 메일을 보낼까요?';
 $messages['notsentwarning'] = '메일을 보내지 않았습니다. 메일을 버리시겠습니까?';
 $messages['noldapserver'] = '검색할 LDAP 서버를 선택하세요';
-$messages['nocontactsreturned'] = '연락처가 없습니다';
 $messages['nosearchname'] = '연락처 이름이나 메일 주소를 넣으세요';
 $messages['searchsuccessful'] = '$nr개의 메일 발견';
 $messages['searchnomatch'] = '검색 결과가 없습니다';
@@ -92,4 +88,3 @@ $messages['opnotpermitted'] = '작업이 허가되지 않았습니다!';
 $messages['nofromaddress'] = '선택한 신원에 이메일 주소가 없음';
 $messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 서식이 사라집니다. 계속할까요?';
 
-?>
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 0653407d6..4b207868b 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -2,20 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/ku/labels.inc                                                |
+ | localization/ku/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2006, The Roundcube Dev Team                            |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Amed Çeko Jiyan <amedcj@kurdistan.name>                       |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
+ @version $Id$
 */
 
 $labels = array();
-$labels['welcome'] = 'Bixêr hatî $product \\\'ê';
+$labels['welcome'] = 'Bixêr hatî $product \'ê';
 $labels['username'] = 'Bikarhêner';
 $labels['password'] = 'Nasnav';
 $labels['server'] = 'Pêşkêşkar';
@@ -39,17 +39,15 @@ $labels['date'] = 'Dîrok';
 $labels['size'] = 'Mezinahî';
 $labels['priority'] = 'Girîngî';
 $labels['organization'] = 'Sazî';
-$labels['reply-to'] = 'Navnîşanên Standyar';
 $labels['mailboxlist'] = 'Peldank';
+$labels['folders'] = 'Peldank';
 $labels['messagesfromto'] = 'Peyam $count ên di navbera $from - $to';
 $labels['messagenrof'] = '$nr a peyama $count';
+$labels['copy'] = 'Kopiya Karbon';
 $labels['moveto'] = 'bibe...';
 $labels['download'] = 'daxe';
 $labels['filename'] = 'Navê pelê';
 $labels['filesize'] = 'Mezinahiya pelê';
-$labels['preferhtml'] = 'Wekî HTML nîşan bide';
-$labels['htmlmessage'] = 'Peyama HTML';
-$labels['prettydate'] = 'Kurtenivîsa Dîrokê';
 $labels['addtoaddressbook'] = 'Têxe lênûska navnîşanan';
 $labels['sun'] = 'Yş';
 $labels['mon'] = 'Dş';
@@ -75,13 +73,9 @@ $labels['deletemessage'] = 'Peyamê jê bibe';
 $labels['movemessagetotrash'] = 'Peyamê dake çopê';
 $labels['printmessage'] = 'Vê peyamê çap bike';
 $labels['previousmessage'] = 'Peyama berê nîşan bide';
-$labels['previousmessages'] = 'Peyamên berê nîşan bide';
 $labels['firstmessage'] = 'Peyama yekemîn nîşan bide';
-$labels['firstmessages'] = 'Peyamên yekemîn nîşan bide';
 $labels['nextmessage'] = 'Peyama di rêzê de nîşan bide';
-$labels['nextmessages'] = 'Peyamên di rêzê de nîşan bide';
 $labels['lastmessage'] = 'Peyama dawî nîşan bide';
-$labels['lastmessages'] = 'Peyamên dawî nîşan bide';
 $labels['backtolist'] = 'Vegere lîsteya peyaman';
 $labels['viewsource'] = 'Çavkaniyê nîşan bide';
 $labels['markmessages'] = 'Peyamê nîşan bike';
@@ -90,10 +84,10 @@ $labels['markunread'] = 'Wekî nexwendî';
 $labels['select'] = 'Hilbijêre';
 $labels['all'] = 'Hemû';
 $labels['none'] = 'Ne yek jî';
+$labels['nonesort'] = 'Ne yek jî';
 $labels['unread'] = 'Nexwendî';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Vala Bike';
-$labels['purge'] = 'Jê bibe';
 $labels['quota'] = 'Bikaranîna dîskê';
 $labels['unknown'] = 'nayê zanîn';
 $labels['unlimited'] = 'bêsînor';
@@ -159,6 +153,9 @@ $labels['manageidentities'] = 'Nasnameyên vê hesabê serast bike';
 $labels['newidentity'] = 'Nasnameya nû';
 $labels['newitem'] = 'Parçeya nû';
 $labels['edititem'] = 'Parçeyê serast bike';
+$labels['preferhtml'] = 'Wekî HTML nîşan bide';
+$labels['htmlmessage'] = 'Peyama HTML';
+$labels['prettydate'] = 'Kurtenivîsa Dîrokê';
 $labels['setdefault'] = 'Wekî standard tomar bike';
 $labels['language'] = 'Ziman';
 $labels['timezone'] = 'Herêma demê';
@@ -171,7 +168,6 @@ $labels['previewpane'] = 'Panela berê nîşan bide';
 $labels['autosavedraft'] = 'Xweber hilîne';
 $labels['never'] = 'qet';
 $labels['folder'] = 'Peldank';
-$labels['folders'] = 'Peldank';
 $labels['foldername'] = 'Navê peldankê';
 $labels['subscribed'] = 'Ni şanenav';
 $labels['messagecount'] = 'Peyam';
@@ -182,4 +178,3 @@ $labels['sortby'] = 'Şêweyê rêzkirinê';
 $labels['sortasc'] = 'Wekî zêde dibe';
 $labels['sortdesc'] = 'Wekî kêm dibe';
 
-?>
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index 17423f9c5..7b1b3bde1 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -2,16 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/ku/messages.inc                                              |
+ | localization/ku/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2006, The Roundcube Dev Team                            |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Amed çeko Jiyan <amedcj@kurdistan.name>                       |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
+ @version $Id$
 */
 
 $messages = array();
@@ -53,7 +53,6 @@ $messages['nosubjectwarning'] = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî
 $messages['nobodywarning'] = 'Peyamê bê nivîs bişeyînî?';
 $messages['notsentwarning'] = 'Peyam nehat şandin. Dixwazî peyamê pişTgo bikî?';
 $messages['noldapserver'] = 'Tika ye, ji bo lêgerînê pêşkêşkareke Idap têkevê';
-$messages['nocontactsreturned'] = 'Tu têkilî nehat dîtin';
 $messages['nosearchname'] = 'Tika ye, nav an jî navnîşaneke têkiliyê têkevê';
 $messages['searchsuccessful'] = '$nr peyam hat(in) dîtin';
 $messages['searchnomatch'] = 'Di lêgerînê de tu tişt nehat dîtin';
@@ -75,4 +74,3 @@ $messages['receiptsent'] = 'Rapora şandina serkeftî';
 $messages['errorsendingreceipt'] = 'Rapor nehat şandin';
 $messages['nodeletelastidentity'] = 'Nikarî vê nasnameyê jê bibî. Ew ya dawî ye.';
 
-?>
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 935274d41..240c33e32 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/lt_LT/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Authors: Martynas Bendorius <martynas@evanet.lt>                      |
-|          Rimas Kudelis <rq@akl.lt>                                    |
-+-----------------------------------------------------------------------+'
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/lt_LT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -46,6 +42,7 @@ $labels['priority'] = 'Prioritetas';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Neskaitytas';
 $labels['mailboxlist'] = 'Aplankai';
+$labels['folders'] = 'Aplankai';
 $labels['messagesfromto'] = 'Laiškai nuo $from iki $to iš $count';
 $labels['threadsfromto'] = 'Gijos nuo $from iki $to iš $count';
 $labels['messagenrof'] = 'Laiškas $nr iš $count';
@@ -74,7 +71,8 @@ $labels['jan'] = 'Sau';
 $labels['feb'] = 'Vas';
 $labels['mar'] = 'Kov';
 $labels['apr'] = 'Bal';
-$labels['may'] = 'Geg';
+$labels['may'] = 'Gegužė';
+$labels['longmay'] = 'Gegužė';
 $labels['jun'] = 'Bir';
 $labels['jul'] = 'Lie';
 $labels['aug'] = 'Rgp';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'Sausis';
 $labels['longfeb'] = 'Vasaris';
 $labels['longmar'] = 'Kovas';
 $labels['longapr'] = 'Balandis';
-$labels['longmay'] = 'Gegužė';
 $labels['longjun'] = 'Biržėlis';
 $labels['longjul'] = 'Liepa';
 $labels['longaug'] = 'Rugpjūtis';
@@ -121,7 +118,8 @@ $labels['markunflagged'] = 'Pašalinti gairelę';
 $labels['moreactions'] = 'Kiti veiksmai…';
 $labels['select'] = 'Pažymėti';
 $labels['all'] = 'visus';
-$labels['none'] = 'nieko';
+$labels['none'] = 'Nerūšiuoti';
+$labels['nonesort'] = 'Nerūšiuoti';
 $labels['currpage'] = 'matomus šiame puslapyje';
 $labels['unread'] = 'neskaitytus';
 $labels['flagged'] = 'su gairele';
@@ -141,7 +139,6 @@ $labels['expand_only_unread'] = 'tik turinčias neskaitytų laiškų';
 $labels['fromto'] = 'Siuntėjas/Gavėjas';
 $labels['flag'] = 'Gairelė';
 $labels['attachment'] = 'Priedas';
-$labels['nonesort'] = 'Nerūšiuoti';
 $labels['sentdate'] = 'Išsiuntimo laikas';
 $labels['arrival'] = 'Gavimo laikas';
 $labels['asc'] = 'didėjančiai';
@@ -231,15 +228,16 @@ $labels['notes'] = 'Pastabos';
 $labels['male'] = 'vyras';
 $labels['female'] = 'moteris';
 $labels['manager'] = 'Vadybininkas(-ė)';
-$labels['assistant'] = 'Padėjėjas(-a)';
+$labels['assistant'] = 'Padėjėjo(-os)';
+$labels['typeassistant'] = 'Padėjėjo(-os)';
 $labels['spouse'] = 'Sutuoktinis';
 $labels['allfields'] = 'Visi laukai';
 $labels['search'] = 'Paieška';
 $labels['advsearch'] = 'Išplėstinė paieška';
-$labels['other'] = 'Kita';
+$labels['other'] = 'Kitas';
+$labels['typeother'] = 'Kitas';
 $labels['typehome'] = 'Namų';
 $labels['typework'] = 'Darbo';
-$labels['typeother'] = 'Kitas';
 $labels['typemobile'] = 'Mobilusis';
 $labels['typemain'] = 'Pagrindinis';
 $labels['typehomefax'] = 'Namų faksas';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Darbo faksas';
 $labels['typecar'] = 'Automobilyje';
 $labels['typepager'] = 'Pranešimų gaviklis';
 $labels['typevideo'] = 'Vaizdo';
-$labels['typeassistant'] = 'Padėjėjo(-os)';
 $labels['typehomepage'] = 'Tinklalapis';
 $labels['typeblog'] = 'Tinklaraštis';
 $labels['typeprofile'] = 'Profilis';
@@ -353,11 +350,11 @@ $labels['advancedoptions'] = 'Papildomi nustatymai';
 $labels['focusonnewmessage'] = 'Fokusuoti naršyklės langą gavus naują laišką';
 $labels['checkallfolders'] = 'Naujų laiškų ieškoti visuose aplankuose';
 $labels['displaynext'] = 'Rodyti pranešimą pašalinus/perkėlus laišką';
+$labels['defaultfont'] = 'Numatytasis HTML laiškų šriftas';
 $labels['mainoptions'] = 'Pagrindiniai nustatymai';
 $labels['section'] = 'Sekcija';
 $labels['maintenance'] = 'Priežiūra';
 $labels['newmessage'] = 'Naujas laiškas';
-$labels['listoptions'] = 'Rodyti nustatymus';
 $labels['signatureoptions'] = 'Parašo nustatymai';
 $labels['whenreplying'] = 'Kuriant atsakymą';
 $labels['replytopposting'] = 'rašyti atsakymą virš cituojamo laiško';
@@ -384,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Nepaisyti žodžių su skaitmenimis';
 $labels['spellcheckignorecaps'] = 'Nepaisyti žodžių vien iš didžiųjų raidžių';
 $labels['addtodict'] = 'Įtraukti į žodyną';
 $labels['folder'] = 'Aplankas';
-$labels['folders'] = 'Aplankai';
 $labels['foldername'] = 'Aplanko vardas';
 $labels['subscribed'] = 'Užsakytas';
 $labels['messagecount'] = 'Laiškai';
@@ -435,4 +431,3 @@ $labels['japanese'] = 'Japonų';
 $labels['korean'] = 'Korėjiečių';
 $labels['chinese'] = 'Kinų';
 
-?>
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index fba3fdb36..b42183787 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/lt_LT/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Authors: Martynas Bendorius <martynas@evanet.lt>                      |
-|          Rimas Kudelis <rq@akl.lt>                                    |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/lt_LT/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -160,4 +156,3 @@ $messages['mispellingsfound'] = 'Laiške rasta rašybos klaidų.';
 $messages['parentnotwritable'] = 'Nepavyko sukurti arba perkelti aplanko į parinktą tėvinį aplanką. Trūksta prieigos teisių.';
 $messages['messagetoobig'] = 'Laiško dalis yra per didelė, kad galėtų būti apdorota.';
 
-?>
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index f905cca0f..de19998d6 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/lv/labels.inc                                                |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Rūdolfs Ošiņš <dev.random@gmail.com>                          |
-|         Miķelis Zaļais <mik@prog.lv>                                  |
-|         Lauris Bukšis-Haberkorns <lauris@nix.lv>                      |
-|         Kaspars Tenters <kaspars.tenters@va.lv>                       |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/lv_LV/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -48,6 +42,7 @@ $labels['priority'] = 'Prioritāte';
 $labels['organization'] = 'Uzņēmums';
 $labels['readstatus'] = 'Izlasīšanas statuss';
 $labels['mailboxlist'] = 'Mapes';
+$labels['folders'] = 'Mapes';
 $labels['messagesfromto'] = 'Vēstules $from līdz $to no $count';
 $labels['threadsfromto'] = 'Vijumi $from līdz $to no $count';
 $labels['messagenrof'] = '$nr. vēstule  no $count';
@@ -76,7 +71,8 @@ $labels['jan'] = 'Jan';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
+$labels['may'] = 'Maijs';
+$labels['longmay'] = 'Maijs';
 $labels['jun'] = 'Jūn';
 $labels['jul'] = 'Jūl';
 $labels['aug'] = 'Aug';
@@ -88,7 +84,6 @@ $labels['longjan'] = 'Janvāris';
 $labels['longfeb'] = 'Februāris';
 $labels['longmar'] = 'Marts';
 $labels['longapr'] = 'Aprīlis';
-$labels['longmay'] = 'Maijs';
 $labels['longjun'] = 'Jūnijs';
 $labels['longjul'] = 'Jūlijs';
 $labels['longaug'] = 'Augusts';
@@ -120,10 +115,11 @@ $labels['markread'] = 'lasītas';
 $labels['markunread'] = 'nelasītas';
 $labels['markflagged'] = 'iezīmētas';
 $labels['markunflagged'] = 'neiezīmētas';
-$labels['messageactions'] = 'Citas darbības:';
+$labels['moreactions'] = 'Citas darbības...';
 $labels['select'] = 'Iezīmēt';
 $labels['all'] = 'visas';
-$labels['none'] = 'nav';
+$labels['none'] = 'Neviens';
+$labels['nonesort'] = 'Neviens';
 $labels['currpage'] = 'Pašreizējā lapa';
 $labels['unread'] = 'nelasītās';
 $labels['flagged'] = 'iezīmētās';
@@ -143,7 +139,6 @@ $labels['expand_only_unread'] = 'tikai tad, ja ir neizlasītas vēstules';
 $labels['fromto'] = 'Sūtītājs/Saņēmējs';
 $labels['flag'] = 'Iezīmēts';
 $labels['attachment'] = 'Pielikums';
-$labels['nonesort'] = 'Neviens';
 $labels['sentdate'] = 'Nosūtīšanas datums';
 $labels['arrival'] = 'Pienākšanas datums';
 $labels['asc'] = 'augoša';
@@ -174,6 +169,7 @@ $labels['editortype'] = 'Redaktora tips';
 $labels['returnreceipt'] = 'Saņemšanas apstiprinājums';
 $labels['dsn'] = 'Atskaite par piegādi';
 $labels['mailreplyintro'] = '$sender @ $date rakstīja:';
+$labels['originalmessage'] = 'Sākotnējā vēstule';
 $labels['editidents'] = 'Rediģēt identitātes';
 $labels['checkspelling'] = 'Pārbaudīt pareizrakstību';
 $labels['resumeediting'] = 'Turpināt rediģēšanu';
@@ -191,6 +187,7 @@ $labels['highest'] = 'Augstākā';
 $labels['nosubject'] = '(no subject)';
 $labels['showimages'] = 'Rādīt attēlus';
 $labels['alwaysshow'] = 'Vienmēr rādīt attēlus no $sender';
+$labels['isdraft'] = 'Šis ir melnraksts.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Vienkāršs teksts';
 $labels['savesentmessagein'] = 'Saglabāt nosūtīto vēstuli mapē';
@@ -232,14 +229,15 @@ $labels['male'] = 'vīrietis';
 $labels['female'] = 'sieviete';
 $labels['manager'] = 'Menedžeris';
 $labels['assistant'] = 'Asistents';
+$labels['typeassistant'] = 'Asistents';
 $labels['spouse'] = 'Laulātais draugs';
 $labels['allfields'] = 'Visi lauki';
 $labels['search'] = 'Meklēt';
 $labels['advsearch'] = 'Paplašinātā meklēšana';
 $labels['other'] = 'Cits';
+$labels['typeother'] = 'Cits';
 $labels['typehome'] = 'Mājas';
 $labels['typework'] = 'Darbs';
-$labels['typeother'] = 'Cits';
 $labels['typemobile'] = 'Mobilais tālrunis';
 $labels['typemain'] = 'Galvenais';
 $labels['typehomefax'] = 'Mājas Fax';
@@ -247,8 +245,9 @@ $labels['typeworkfax'] = 'Darba Fax';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Peidžeris';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Asistents';
 $labels['typehomepage'] = 'Web lapa';
+$labels['typeblog'] = 'Blogs';
+$labels['typeprofile'] = 'Profils';
 $labels['addfield'] = 'Pievienot lauku...';
 $labels['addcontact'] = 'Pievienot iezīmēto ierakstu adrešu grāmatai';
 $labels['editcontact'] = 'Rediģēt adrešu grāmatas ierakstu';
@@ -270,7 +269,6 @@ $labels['print'] = 'Drukāt';
 $labels['export'] = 'Eksportēt';
 $labels['exportvcards'] = 'Eksportēt kontaktus vCard formātā';
 $labels['newcontactgroup'] = 'Izveidot jaunu kontaktu grupu';
-$labels['groupactions'] = 'Kontaktu grupu darbības...';
 $labels['grouprename'] = 'Pārdēvēt grupu';
 $labels['groupdelete'] = 'Izdzēst grupu';
 $labels['previouspage'] = 'Parādīt iepriekšējo kopu';
@@ -280,6 +278,8 @@ $labels['lastpage'] = 'Parādīt pēdējo kopu';
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupas';
 $labels['personaladrbook'] = 'Personīgās adreses';
+$labels['searchsave'] = 'Saglabāt meklēšanas pieprasījumu';
+$labels['searchdelete'] = 'Dzēst saglabāto meklēšanas pieprasījumu';
 $labels['import'] = 'Importēt';
 $labels['importcontacts'] = 'Importēt kontaktus';
 $labels['importfromfile'] = 'Importēt no faila:';
@@ -288,6 +288,7 @@ $labels['importreplace'] = 'Aizvietot visu adrešu grāmatu';
 $labels['importtext'] = 'Jūst varat augšupielādēt kontaktus no citas adrešu grāmatas.<br/>Pašlaik ir atbalstīts adrešu imports no <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> datu formāta.';
 $labels['done'] = 'Pabeigts';
 $labels['settingsfor'] = 'Iestatījumi';
+$labels['about'] = 'Par';
 $labels['preferences'] = 'Iestatījumi';
 $labels['userpreferences'] = 'Lietotāja preferences';
 $labels['editpreferences'] = 'Rediģēt lietotāja preferences';
@@ -299,6 +300,8 @@ $labels['edititem'] = 'Rediģēt';
 $labels['preferhtml'] = 'Dot priekšroku HTML formatētām vēstulēm';
 $labels['defaultcharset'] = 'Noklusētā rakstzīmju kopa';
 $labels['htmlmessage'] = 'HTML vēstule';
+$labels['dateformat'] = 'Datuma formāts';
+$labels['timeformat'] = 'Laika formāts';
 $labels['prettydate'] = 'Formatēt datumus';
 $labels['setdefault'] = 'Uzlikt kā noklusēto';
 $labels['autodetect'] = 'Automātiski';
@@ -346,12 +349,12 @@ $labels['force7bit'] = 'Izmantot MIME kodējumu 8-bitu simboliem';
 $labels['advancedoptions'] = 'Paplašināti iestatījumi';
 $labels['focusonnewmessage'] = 'Uztādīt pārlūka fokusu uz jaunu vēstuli';
 $labels['checkallfolders'] = 'Pārbaudīt visas mapes pēc jaunām vēstulēm';
-$labels['displaynext'] = 'Rādīt nākamo vēstuli pēc dzēšanas/pārvietošanas ';
+$labels['displaynext'] = 'Rādīt nākamo vēstuli pēc dzēšanas/pārvietošanas';
+$labels['defaultfont'] = 'Noklusētais fonts vēstulei HTML formātā';
 $labels['mainoptions'] = 'Galvenie iestatījumi';
 $labels['section'] = 'Kategorija';
 $labels['maintenance'] = 'Uzturēšana';
 $labels['newmessage'] = 'Vēstuļu pienākšana';
-$labels['listoptions'] = 'Saraksta iestatījumi';
 $labels['signatureoptions'] = 'Paraksta iestatījumi';
 $labels['whenreplying'] = 'Atbildot';
 $labels['replytopposting'] = 'sākt jaunu vēstuli virs oriģināla';
@@ -370,9 +373,14 @@ $labels['reqmdn'] = 'Vienmēr pieprasīt atskati par vēstules izlasīšanu';
 $labels['reqdsn'] = 'Vienmēr pieprasīt atskati par vēstules piegādāšanu saņēmēja serverim';
 $labels['replysamefolder'] = 'Glabāt atbildes tajā pašā mapē, kurā ir vēstule, uz kuru tika atbildēts';
 $labels['defaultaddressbook'] = 'Pievienot jaunus kontaktus atzīmētajai adrešu grāmatai';
+$labels['autocompletesingle'] = 'Automātiski aizpildot, izlaist alternatīvās e-pasta adreses';
 $labels['spellcheckbeforesend'] = 'Pārbaudīt pareizrakstību pirms vēstules nosūtīšanas';
+$labels['spellcheckoptions'] = 'Pareizrakstības iestatījumi';
+$labels['spellcheckignoresyms'] = 'Ignorēt vārdus, kuri satur simbolus';
+$labels['spellcheckignorenums'] = 'Ignorēt vārdus, kuri satur skaitļus';
+$labels['spellcheckignorecaps'] = 'Ignorēt vārdus, kuri rakstīti ar lielajiem burtiem';
+$labels['addtodict'] = 'Pievienot vārdnīcai';
 $labels['folder'] = 'Mapi';
-$labels['folders'] = 'Mapes';
 $labels['foldername'] = 'Mapes nosaukums';
 $labels['subscribed'] = 'Abonēta';
 $labels['messagecount'] = 'Vēstules';
@@ -395,6 +403,11 @@ $labels['sortby'] = 'Kārtot pēc';
 $labels['sortasc'] = 'Kārtot augošā secībā';
 $labels['sortdesc'] = 'Kārtot dilstošā secībā';
 $labels['undo'] = 'Atsaukt';
+$labels['plugin'] = 'Spraudnis';
+$labels['version'] = 'Versija';
+$labels['source'] = 'Oriģināls';
+$labels['license'] = 'Licence';
+$labels['support'] = 'Atbalsts';
 $labels['B'] = 'B';
 $labels['KB'] = 'kB';
 $labels['MB'] = 'MB';
@@ -418,4 +431,3 @@ $labels['japanese'] = 'Japāņu';
 $labels['korean'] = 'Korejiešu';
 $labels['chinese'] = 'Ķīniešu';
 
-?>
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index b3aeb75fc..0be4a652f 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/lv/messages.inc                                              |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Rūdolfs Ošiņš <dev.random@gmail.com>                          |
-|         Miķelis Zaļais <mik@prog.lv>                                  |
-|         Lauris Bukšis-Haberkorns <lauris@nix.lv>                      |
-|         Kaspars Tenters <kaspars.tenters@va.lv>                       |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/lv_LV/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -27,7 +21,7 @@ $messages['sessionerror'] = 'Jūsu sessija ir beigusies';
 $messages['imaperror'] = 'Neizdevās pieslēgties IMAP serverim';
 $messages['servererror'] = 'Servera kļūme.';
 $messages['servererrormsg'] = 'Servera kļūda: $msg';
-$messages['databaserror'] = 'Datubāzes kļūda!';
+$messages['dberror'] = 'Datubāzes kļūda!';
 $messages['errorreadonly'] = 'Neizdevās veikt darbību: Mape ir tikai lasāma (read only).';
 $messages['errornoperm'] = 'Neizdevās veikt darbību: Piekļuve liegta.';
 $messages['invalidrequest'] = 'Nederīgs pieprasījums. Dati netika saglabāti.';
@@ -51,6 +45,7 @@ $messages['blockedimages'] = 'Drošības nolūkos attēli, kas tiek ielādēti n
 $messages['encryptedmessage'] = 'Šī ir šifrēta vēstule un diemžēl nevar tikt parādīta';
 $messages['nocontactsfound'] = 'Ieraksti netika atrasti';
 $messages['contactnotfound'] = 'Prasītais kontakts nav atrasts';
+$messages['contactsearchonly'] = 'Ievadiet meklēšanas kritērijus, lai atrastu kontaktus';
 $messages['sendingfailed'] = 'Vēstule netika nosūtīta';
 $messages['senttooquickly'] = 'Lūdzu uzgaidiet $sec sekundi(-es) pirms sūtiet šo vēstuli';
 $messages['errorsavingsent'] = 'Notika kļūda saglabājot nosūtīto vēstuli';
@@ -64,6 +59,7 @@ $messages['deletegroupconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto grup
 $messages['deletemessagesconfirm'] = 'Vai tiešām vēlaties dzēst iezīmēto(ās) vēstules?';
 $messages['deletefolderconfirm'] = 'Vai tiešām vēlaties dzēst šo mapi?';
 $messages['purgefolderconfirm'] = 'Vai tiešām vēlaties dzēst visas vēstules, kas atrodas šajā mapē?';
+$messages['contactdeleting'] = 'Kontakts(-i) tiek dzēsti...';
 $messages['groupdeleting'] = 'Dzēš grupu...';
 $messages['folderdeleting'] = 'Dzēš mapi...';
 $messages['foldermoving'] = 'Pārvietoju mapi...';
@@ -79,10 +75,10 @@ $messages['nosubjectwarning'] = 'Lauks "temats" ir tukšs. Vai vēlaties to aizp
 $messages['nobodywarning'] = 'Sūtīt vēstuli bez satura teksta?';
 $messages['notsentwarning'] = 'Vēstule netika nosūtīta. Vai tiešām vēlaties atcelt vēstules rakstīsanu?';
 $messages['noldapserver'] = 'Lūdzu izvēlaties LDAP serveri';
-$messages['nocontactsreturned'] = 'Neviena kontaktpersona netika atrasta';
 $messages['nosearchname'] = 'Lūdzu ievadiet kontaktpersonas vārdu vai e-pasta adresi';
 $messages['notuploadedwarning'] = 'Visi pielikumi vēl nav augšupielādēti. Lūdzu uzgaidiet vai atceļiet augšupielādi!';
 $messages['searchsuccessful'] = 'Atrastas $nr vēstules';
+$messages['contactsearchsuccessful'] = 'Atrasti $nr kontakti.';
 $messages['searchnomatch'] = 'Meklēšanā nekas netika atrasts';
 $messages['searching'] = 'Notiek meklēšana...';
 $messages['checking'] = 'Notiek pārbaude...';
@@ -129,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP kļūme ($code): Neizdevās autentificēties'
 $messages['smtpfromerror'] = 'SMTP kļūme ($code): Neizdevās iestatīt sūtītāju "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP kļūme ($code): Neizdevās pievienot saņēmēju "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP kļūme: Nav iespējams parsēt saņēmēju sarakstu';
-$messages['smtpdsnerror'] = 'SMTP kļūme: Piegādes statusa paziņojumi netiek uzturēti.';
 $messages['smtperror'] = 'SMTP kļūme: $msg';
 $messages['emailformaterror'] = 'Nepareiza e-pasta adrese: $email';
 $messages['toomanyrecipients'] = 'Pārāk daudz saņēmēju. Samaziniet skaitu līdz $max.';
@@ -142,11 +137,16 @@ $messages['contactrestored'] = 'Kontakti veiksmīgi atjaunoti.';
 $messages['groupdeleted'] = 'Grupa veiksmīgi izdzēsta.';
 $messages['grouprenamed'] = 'Grupa veiksmīgi pārdēvēta.';
 $messages['groupcreated'] = 'Grupa veiksmīgi izveidota.';
+$messages['savedsearchdeleted'] = 'Saglabātais meklēšanas pieprasījums veiksmīgi dzēsts.';
+$messages['savedsearchdeleteerror'] = 'Neizdevās nodzēst saglabāto meklēšanas pieprasījumu.';
+$messages['savedsearchcreated'] = 'Saglabātais meklēšanas pieprasījums veiksmīgi saglabāts.';
+$messages['savedsearchcreateerror'] = 'Neizdevās saglabāt meklēšanas pieprasījumu.';
 $messages['messagedeleted'] = 'Vēstule(s) veiksmīgi izdzēsta(s).';
 $messages['messagemoved'] = 'Vēstule(s) veiksmīgi pārvietota(s).';
 $messages['messagecopied'] = 'Vēstule(s) veiksmīgi pārkopēta(s).';
 $messages['messagemarked'] = 'Vēstule(s) veiksmīgi iezīmēta(s).';
 $messages['autocompletechars'] = 'Ievadiet vismaz $min burtus, lai meklētu automātiski.';
+$messages['autocompletemore'] = 'Atrasti vairāki ieraksti. Papildiniet meklēšanas kritēriju.';
 $messages['namecannotbeempty'] = 'Lūdzu ievadiet vārdu.';
 $messages['nametoolong'] = 'Vārds ir par garu.';
 $messages['folderupdated'] = 'Mape vieksmīgi atjaunota.';
@@ -154,5 +154,5 @@ $messages['foldercreated'] = 'Mape veiksmīgi izveidota.';
 $messages['invalidimageformat'] = 'Nederīgs attēla formāts.';
 $messages['mispellingsfound'] = 'Vēstulē atrastas pareizrakstības kļūdas.';
 $messages['parentnotwritable'] = 'Neizdevās izveidot/pārvietot mapi uz atzīmēto virsmapi. Nav piekļuves tiesību.';
+$messages['messagetoobig'] = 'Vēstule ir pārāk liela, lai to varētu apstrādāt.';
 
-?>
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index c14d6d405..8a552aa53 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -1,19 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/mk_MK/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:  Ivan Mishev - mishevivan@gmail.com                           |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/mk_MK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -41,17 +39,15 @@ $labels['date'] = 'Датум';
 $labels['size'] = 'Големина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
-$labels['reply-to'] = 'Препрати на';
 $labels['mailboxlist'] = 'Папки';
+$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Писма од $from до $to од $count';
 $labels['messagenrof'] = 'Писмо $nr од $count';
+$labels['copy'] = 'Копирај';
 $labels['moveto'] = 'Премести во...';
 $labels['download'] = 'Преземи';
 $labels['filename'] = 'Име на податотеката';
 $labels['filesize'] = 'Големина на податотеката';
-$labels['preferhtml'] = 'Прикажи во HTML';
-$labels['htmlmessage'] = 'HTML писмо';
-$labels['prettydate'] = 'Убави датуми';
 $labels['addtoaddressbook'] = 'Додај во именик';
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
@@ -72,6 +68,7 @@ $labels['feb'] = 'Фев';
 $labels['mar'] = 'Мар';
 $labels['apr'] = 'Апр';
 $labels['may'] = 'Мај';
+$labels['longmay'] = 'Мај';
 $labels['jun'] = 'Јун';
 $labels['jul'] = 'Јул';
 $labels['aug'] = 'Авг';
@@ -83,7 +80,6 @@ $labels['longjan'] = 'Јануари';
 $labels['longfeb'] = 'Февруари';
 $labels['longmar'] = 'Март';
 $labels['longapr'] = 'Април';
-$labels['longmay'] = 'Мај';
 $labels['longjun'] = 'Јуни';
 $labels['longjul'] = 'Јули';
 $labels['longaug'] = 'Август';
@@ -101,13 +97,9 @@ $labels['deletemessage'] = 'Избриши писмо';
 $labels['movemessagetotrash'] = 'Премести ги писмата во Корпа';
 $labels['printmessage'] = 'Испечати писмо';
 $labels['previousmessage'] = 'Прикажи го претходното писмо';
-$labels['previousmessages'] = 'Прикажи ги претходните писма';
 $labels['firstmessage'] = 'Прикажи го првото писмо';
-$labels['firstmessages'] = 'Прикажи ги првите писма';
 $labels['nextmessage'] = 'Прикажи го следното писмо';
-$labels['nextmessages'] = 'Прикажи ги следните писма';
 $labels['lastmessage'] = 'Прикажи го последното писмо';
-$labels['lastmessages'] = 'Прикажи ги последните писма';
 $labels['backtolist'] = 'Назад кон листа на писма';
 $labels['viewsource'] = 'Покажи го изворот на писмото';
 $labels['markmessages'] = 'Обележи ги писмата';
@@ -115,10 +107,10 @@ $labels['markread'] = 'Како прочитани';
 $labels['markunread'] = 'Како непрочитани';
 $labels['markflagged'] = 'Како обележано';
 $labels['markunflagged'] = 'Како необележано';
-$labels['messageactions'] = 'Повеќе дејства...';
 $labels['select'] = 'Одбери';
 $labels['all'] = 'Сите';
 $labels['none'] = 'Ниедно';
+$labels['nonesort'] = 'Ниедно';
 $labels['unread'] = 'Непрочитани';
 $labels['flagged'] = 'Обележано';
 $labels['unanswered'] = 'Неодговорено';
@@ -127,7 +119,6 @@ $labels['invert'] = 'Обратно';
 $labels['filter'] = 'Филтер';
 $labels['compact'] = 'Компактно';
 $labels['empty'] = 'Испразни';
-$labels['purge'] = 'Исчисти';
 $labels['quota'] = 'Искористен простор';
 $labels['unknown'] = 'непознато';
 $labels['unlimited'] = 'неограничено';
@@ -144,7 +135,7 @@ $labels['sendmessage'] = 'Испрати сега';
 $labels['addattachment'] = 'Приложи податотека';
 $labels['charset'] = 'Збир од знаци';
 $labels['editortype'] = 'Тип на уредник';
-$labels['returnreceipt'] = 'Врати ';
+$labels['returnreceipt'] = 'Врати';
 $labels['checkspelling'] = 'Провери правопис';
 $labels['resumeediting'] = 'Продолжи со уредување';
 $labels['revertto'] = 'Врати на';
@@ -201,14 +192,17 @@ $labels['importreplace'] = 'Замени го целиот именик';
 $labels['importtext'] = 'Можете да приложите контакти од веќе постоечки именик.<br/>Во моментот поддржуваме увоз на адреси од <a href="http://mk.wikipedia.org/wiki/VCard">vCard</a> форматот.';
 $labels['done'] = 'Завршено';
 $labels['settingsfor'] = 'Нагодувања за';
-$labels['preferences'] = 'Нагодувања ';
-$labels['userpreferences'] = 'Кориснички нагодувања ';
-$labels['editpreferences'] = 'Промени кориснички нагодувања ';
+$labels['preferences'] = 'Нагодувања';
+$labels['userpreferences'] = 'Кориснички нагодувања';
+$labels['editpreferences'] = 'Промени кориснички нагодувања';
 $labels['identities'] = 'Идентитети';
 $labels['manageidentities'] = 'Организирај ги идентитетите за овој корисник';
 $labels['newidentity'] = 'Нов идентитет';
 $labels['newitem'] = 'Нов објект';
 $labels['edititem'] = 'Промени објект';
+$labels['preferhtml'] = 'Прикажи во HTML';
+$labels['htmlmessage'] = 'HTML писмо';
+$labels['prettydate'] = 'Убави датуми';
 $labels['setdefault'] = 'Постави за основно';
 $labels['autodetect'] = 'Автоматски';
 $labels['language'] = 'Јазик';
@@ -254,7 +248,6 @@ $labels['mainoptions'] = 'Главни можности';
 $labels['section'] = 'Заглавие';
 $labels['maintenance'] = 'Одржување';
 $labels['newmessage'] = 'Ново писмо';
-$labels['listoptions'] = 'Можности за листата';
 $labels['signatureoptions'] = 'Можности за потписот';
 $labels['whenreplying'] = 'При одговарање';
 $labels['replytopposting'] = 'новото писмо започни го над оригиналот';
@@ -268,7 +261,6 @@ $labels['belowquote'] = 'под цитираното';
 $labels['abovequote'] = 'над цитираното';
 $labels['insertsignature'] = 'Вметни потпис';
 $labels['folder'] = 'Папка';
-$labels['folders'] = 'Папки';
 $labels['foldername'] = 'Име на папката';
 $labels['subscribed'] = 'Претплатен';
 $labels['messagecount'] = 'Пораки';
@@ -284,4 +276,3 @@ $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
 
-?>
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 6230d5cb2..271e2a27e 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -1,19 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/mk_MK/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:  Ivan Mishev - mishevivan@gmail.com                           |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/mk_MK/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -44,7 +42,7 @@ $messages['contactnotfound'] = 'Бараното име не е пронајде
 $messages['sendingfailed'] = 'Не упеав да го испратам писмото';
 $messages['senttooquickly'] = 'Почекајте $sec секунда/и пред да го испратите писмото';
 $messages['errorsavingsent'] = 'Грешка при зачувувањето на пратеното писмо';
-$messages['errorsaving'] = 'Грешка при зачувувањето ';
+$messages['errorsaving'] = 'Грешка при зачувувањето';
 $messages['errormoving'] = 'Не можев да го преместам писмото';
 $messages['errordeleting'] = 'Не можев да го избришам писмото';
 $messages['errormarking'] = 'Не можев да го обележам писмото';
@@ -64,7 +62,6 @@ $messages['nosubjectwarning'] = 'Немате внесено „Наслов“.
 $messages['nobodywarning'] = 'Писмото нема текст во него. Дали сакате да го испратите?';
 $messages['notsentwarning'] = 'Писмото не е пратено. Дали сакате да го отфрлите?';
 $messages['noldapserver'] = 'Изберете LDAP сервер за пребарување';
-$messages['nocontactsreturned'] = 'Не се најдени имиња';
 $messages['nosearchname'] = 'Внесете име или е-поштенска адреса';
 $messages['notuploadedwarning'] = 'Сè уште нема подигнати прилози. Почекајте или откажете го подигањето';
 $messages['searchsuccessful'] = 'Пронајадени се $nr пораки';
@@ -104,4 +101,3 @@ $messages['smtprecipientserror'] = 'SMTP грешка: Не успеав да ј
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Неправилна поштенска адреса: $email';
 
-?>
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index acf4a6a7f..e30d48542 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -1,317 +1,238 @@
 <?php
 
-
 /*
-+-----------------------------------------------------------------------+
-|
- language/mr_IN/labels.inc                                             |
-|
-                                                                       |
-|
- Language file of the Roundcube Webmail client                         |
-|
- Copyright (C) 2009, The Roundcube Dev Team                            |
-|
- Licensed under the GNU GPL                                            |
-|
-                                                                       |
-+-----------------------------------------------------------------------+
-| 
-Author:Nitin Nimkar <nvncom at yahoo.com>                             |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/mr_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
-
 $labels = array();
 $labels['welcome'] = '$product वरती स्वागत आहे';
-$labels['username'] = 'वापरकर्त्याचे नाव(तुमचे इमेल) ';
-
+$labels['username'] = 'वापरकर्त्याचे नाव(तुमचे इमेल)';
 $labels['password'] = 'परवलीचा शब्द';
 $labels['server'] = 'सर्व्हर';
 $labels['login'] = 'प्रवेश';
 $labels['logout'] = 'बाहेर जा';
 $labels['mail'] = 'इ-मेल';
-
 $labels['settings'] = 'तुमची पसंती';
 $labels['addressbook'] = 'पत्ता नोंदवही';
 $labels['inbox'] = 'आलेले संदेश';
 $labels['drafts'] = 'मसुदा';
-
 $labels['sent'] = 'पाठवलेले';
 $labels['trash'] = 'कचरा पेटी';
 $labels['junk'] = 'नको असलेले कचरा संदेश';
 $labels['subject'] = 'विषय';
-
 $labels['from'] = 'पाठवणार';
 $labels['to'] = 'प्रती';
 $labels['cc'] = 'प्रत';
 $labels['bcc'] = 'गुप्त प्रत';
-$labels['replyto'] = 'उत्तर द्या ';
-
+$labels['replyto'] = 'उत्तर द्या';
 $labels['date'] = 'दिनांक';
 $labels['size'] = 'आकार';
 $labels['priority'] = 'प्राधान्य';
 $labels['organization'] = 'संस्था';
-$labels['reply-to'] = 'उत्तर द्या ';
-
 $labels['mailboxlist'] = 'फोल्डर्स';
+$labels['folders'] = 'फोल्डर्स';
 $labels['messagesfromto'] = 'संदेश $from कडून $to साठी $count वा';
-
 $labels['threadsfromto'] = 'धागे $from कडून $to साठी $count वा';
 $labels['messagenrof'] = 'Message $nr of $count';
-
-$labels['copy'] = 'नक्‍कल ';
+$labels['copy'] = 'नक्‍कल';
 $labels['move'] = 'हलवा';
 $labels['moveto'] = 'या फोल्डरमधे ठेवा';
 $labels['download'] = 'उतरवून घ्या';
-
 $labels['filename'] = 'फाईलचे नाव';
 $labels['filesize'] = 'फाईलचा आकार';
-$labels['addtoaddressbook'] = 'पत्ता नोंदवहीत नोंदवा ';
+$labels['addtoaddressbook'] = 'पत्ता नोंदवहीत नोंदवा';
 $labels['sun'] = 'रवी';
-
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगळ';
 $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनी';
-
 $labels['sunday'] = 'रविवार';
 $labels['monday'] = 'सोमवार';
 $labels['tuesday'] = 'मंगळवार';
 $labels['wednesday'] = 'बुधवार';
-
 $labels['thursday'] = 'गुरुवार';
 $labels['friday'] = 'शुक्रवार';
 $labels['saturday'] = 'शनीवार';
 $labels['jan'] = 'जाने';
 $labels['feb'] = 'फेब्';
-
 $labels['mar'] = 'मार्च';
 $labels['apr'] = 'एप्रिल';
 $labels['may'] = 'मे';
+$labels['longmay'] = 'मे';
 $labels['jun'] = 'जून';
 $labels['jul'] = 'जुलै';
 $labels['aug'] = 'ऑगस्ट';
-
 $labels['sep'] = 'सप्टें';
 $labels['oct'] = 'ऑक्टो';
 $labels['nov'] = 'नोव्हें';
 $labels['dec'] = 'डिसें';
 $labels['longjan'] = 'जानेवारी';
-
 $labels['longfeb'] = 'फेब्रूवारी';
 $labels['longmar'] = 'मार्च';
 $labels['longapr'] = 'एप्रिल';
-$labels['longmay'] = 'मे';
 $labels['longjun'] = 'जून';
-
 $labels['longjul'] = 'जुलै';
 $labels['longaug'] = 'ऑगस्ट';
 $labels['longsep'] = 'सप्टेंबर';
 $labels['longoct'] = 'ऑक्टोबर';
 $labels['longnov'] = 'नोव्हेंबर';
-
 $labels['longdec'] = 'डिसेंबर';
 $labels['today'] = 'आज';
 $labels['checkmail'] = 'नवीन संदेश आले आहेत का पहा';
-
 $labels['writenewmessage'] = 'नवीन संदेश तयार करा';
 $labels['replytomessage'] = 'पाठवणार्‍याला उत्तर द्या';
-
 $labels['replytoallmessage'] = 'पाठवणार्‍याला आणि प्रत केलेल्या सर्वांना संदेश पाठवा';
 $labels['forwardmessage'] = 'हा संदेश पुढे पाठवा';
-
 $labels['deletemessage'] = 'संदेश काढून टाका';
 $labels['movemessagetotrash'] = 'संदेश कचरापेटीत टाका';
 $labels['printmessage'] = 'हा संदेश छापा';
-
 $labels['previousmessage'] = 'आधिचा संदेश दाखवा';
-$labels['previousmessages'] = 'आधिच्या संदेशांचा गट दाखवा';
-
 $labels['firstmessage'] = 'पहिला संदेश दाखवा';
-$labels['firstmessages'] = 'पहिला संदेशांचा संच दाखवा';
 $labels['nextmessage'] = 'नंतरचा संदेश दाखवा';
-
-$labels['nextmessages'] = 'नंतरचा संदेशांचा संच दाखवा';
 $labels['lastmessage'] = 'शेवटचा संदेश दाखवा';
-
-$labels['lastmessages'] = 'शेवटचा संदेशांचा संच दाखवा';
 $labels['backtolist'] = 'संदेशांच्या यादीकडे परत चला';
-
 $labels['viewsource'] = 'मूळ संदेशाचा प्रोग्राम कोड दाखवा';
 $labels['markmessages'] = 'संदेशांना खूण करा';
 $labels['markread'] = 'वाचलेला म्हणून खूण करा';
-
 $labels['markunread'] = 'न वाचलेला म्हणून खूण करा';
 $labels['markflagged'] = 'खूण लावलेला म्हणून खूण करा';
-
 $labels['markunflagged'] = 'खूण काढलेला म्हणून खूण करा';
-$labels['messageactions'] = 'जास्‍त क्रिया...';
 $labels['select'] = 'निवडा';
-
 $labels['all'] = 'सर्व';
 $labels['none'] = 'कोणताही नाही';
+$labels['nonesort'] = 'कोणताही नाही';
 $labels['currpage'] = 'सध्‍याचे पान';
 $labels['unread'] = 'न वाचलेले';
 $labels['flagged'] = 'खूण लावलेले';
 $labels['unanswered'] = 'उत्तर न दिलेले';
 $labels['deleted'] = 'काढून टाकलेला(ले)';
 $labels['invert'] = 'उलट करा';
-
 $labels['filter'] = 'गाळणी';
 $labels['list'] = 'यादी';
 $labels['threads'] = 'धागे';
 $labels['expand-all'] = 'सर्व विस्‍तारीत करा';
-
 $labels['expand-unread'] = 'न वाचलेला विस्‍तारा';
 $labels['collapse-all'] = 'सर्व मिटवा';
 $labels['threaded'] = 'धागा लावलेला';
-
 $labels['autoexpand_threads'] = 'संदेश धागे विस्‍तारा';
 $labels['do_expand'] = 'सर्व धागे';
-$labels['expand_only_unread'] = 'फक्‍त न वाचलेल्‍या संदेशांबददल ';
-
+$labels['expand_only_unread'] = 'फक्‍त न वाचलेल्‍या संदेशांबददल';
 $labels['fromto'] = 'पाठवणारा/प्रती';
 $labels['flag'] = 'खूण';
 $labels['attachment'] = 'जोड';
-$labels['nonesort'] = 'कोणताही नाही';
-
 $labels['sentdate'] = 'पाठवणी दिनांक';
 $labels['arrival'] = 'आगमन दिनांक';
 $labels['asc'] = 'चढत्‍या क्रमाने';
 $labels['desc'] = 'उतरत्‍या क्रमाने';
-
 $labels['listcolumns'] = 'सुची स्‍तंभ';
 $labels['listsorting'] = 'स्‍तंभ वर्गीकरण';
 $labels['listorder'] = 'वर्गीकरण क्रम';
 $labels['listmode'] = 'यादी दर्शक पध्‍दत';
-
 $labels['compact'] = 'छोटा';
 $labels['empty'] = 'रिकामा';
-$labels['purge'] = 'काढून टाका';
 $labels['quota'] = 'डिस्कचा वापर';
 $labels['unknown'] = 'माहित नसलेला';
-
 $labels['unlimited'] = 'अमर्याद';
 $labels['quicksearch'] = 'चटकन शोध';
-$labels['resetsearch'] = 'परत शोध ';
+$labels['resetsearch'] = 'परत शोध';
 $labels['searchmod'] = 'बदलकर्त्‍यांना शोधा';
-
 $labels['msgtext'] = 'संपूर्ण संदेश';
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
 $labels['compose'] = 'नवीन संदेश तयार करा';
-
 $labels['editasnew'] = 'नवीन आहे असा संपादित करा';
 $labels['savemessage'] = 'हा मसूदा साठवून ठेवा';
 $labels['sendmessage'] = 'आत्ता पाठवा';
-
-$labels['addattachment'] = 'फाईल सोबत जोडा';$labels['charset'] = 'कॅरेक्टर सेट';
+$labels['addattachment'] = 'फाईल सोबत जोडा';
+$labels['charset'] = 'कॅरेक्टर सेट';
 $labels['editortype'] = 'संपादकाचा प्रकार';
-
 $labels['returnreceipt'] = 'पोच पावती';
 $labels['checkspelling'] = 'शुध्द लेखन';
 $labels['resumeediting'] = 'परत संदेश संपादित करा';
-
 $labels['revertto'] = 'परत जा';
 $labels['attachments'] = 'जोडलेल्या';
 $labels['upload'] = 'चढवा';
 $labels['close'] = 'बंद';
 $labels['low'] = 'कमी';
-
 $labels['lowest'] = 'कमित कमी';
-
 $labels['normal'] = 'नेहमी प्रमाणे';
 $labels['high'] = 'तातडीचे';
 $labels['highest'] = 'अतिशय तातडीचे';
 $labels['nosubject'] = '(विषय नाही)';
-
 $labels['showimages'] = 'चित्र दाखवा';
 $labels['alwaysshow'] = '$sender कडून आलेल्या संदेशातील चित्रे नेहमी दाखवा';
-
 $labels['htmltoggle'] = 'एच टी एम एल';
 $labels['plaintoggle'] = 'साधे लिखाण';
 $labels['savesentmessagein'] = 'पाठवलेला संदेश या फोल्डरमधे ठेवा';
-
 $labels['dontsave'] = 'संदेश साठवू नका';
 $labels['maxuploadsize'] = 'जास्‍तीत जास्‍त फाइलचा आकार $size असू शकतो';
 $labels['addcc'] = 'प्रत करा';
-
 $labels['addbcc'] = 'गुप्त प्रत करा';
 $labels['addreplyto'] = 'आणखी लोकांना संदेश पाठवा';
 $labels['mdnrequest'] = 'हा संदेश पाठवणार्‍याने हा संदेश तुम्ही वाचल्यावर कळवावयाला सांगितले आहे. तुम्हाला असे कळवणे चालेल ना?';
-
 $labels['receiptread'] = 'पोच पावती (संदेश वाचला)';
-$labels['yourmessage'] = 'ही तुमच्या संदेशाची पोच पावती आहे. ';
-
-$labels['receiptnote'] = 'सूचना: ही पोच पावती तुम्ही ज्यांना  संदेश पाठवला त्यांच्या संगणकावर दिसला एवढेच सांगते. तुम्ही ज्यांना हा संदेश पाठवला, त्यांनी तो वाचला, आणि त्यांना तो नक्की समजला हे मात्र सांगत नाही. ';
-
+$labels['yourmessage'] = 'ही तुमच्या संदेशाची पोच पावती आहे.';
+$labels['receiptnote'] = 'सूचना: ही पोच पावती तुम्ही ज्यांना  संदेश पाठवला त्यांच्या संगणकावर दिसला एवढेच सांगते. तुम्ही ज्यांना हा संदेश पाठवला, त्यांनी तो वाचला, आणि त्यांना तो नक्की समजला हे मात्र सांगत नाही.';
 $labels['name'] = 'टोपणनाव';
 $labels['firstname'] = 'नाव';
 $labels['surname'] = 'आडनाव';
 $labels['email'] = 'इ-मेल्';
-
 $labels['addcontact'] = 'नवीन पत्ता नोंदवहीत ठेवा';
 $labels['editcontact'] = 'नोंदवहीतील पत्ता सुधारा';
 $labels['edit'] = 'संदेश तयार करा';
-
 $labels['cancel'] = 'रद्द करा';
 $labels['save'] = 'ठेवून द्या';
 $labels['delete'] = 'काढून टाका';
 $labels['newcontact'] = 'नोंदवहीत नवीन संपर्क लिहिण्यासाठी';
-
 $labels['deletecontact'] = 'खूण केलेले सर्व संपर्काचे पत्ते काढून टाका';
 $labels['composeto'] = 'साठी नवीन संदेश तयार करा';
 $labels['contactsfromto'] = '$from पासून ते $to पर्यंत $count पैकी';
-
 $labels['print'] = 'छापा';
 $labels['export'] = 'निर्यात करा';
 $labels['exportvcards'] = 'व्ही कार्ड स्वरुपात पत्ते निर्यात करा';
 $labels['newcontactgroup'] = 'नवीन पत्‍त्‍यांचा गट बनवा';
-
-$labels['groupactions'] = 'पत्‍त्‍यांच्‍या गटाबददल क्रिया...';
 $labels['previouspage'] = 'आधिचा संच दाखवा';
 $labels['firstpage'] = 'पहिला संच दाखवा';
-
 $labels['nextpage'] = 'नंतरचा संच दाखवा';
 $labels['lastpage'] = 'शेवटचा संच दाखवा';
 $labels['group'] = 'गट';
 $labels['groups'] = 'अनेक गट';
-
 $labels['personaladrbook'] = 'वैयक्तिक पत्ते';
 $labels['import'] = 'आयात करा';
 $labels['importcontacts'] = 'पत्ते आयात करा';
 $labels['importfromfile'] = 'या फाईल मधून आयात करा';
-
 $labels['importreplace'] = 'संपूर्ण पत्ता नोंदवही बदला';
-$labels['importtext'] = 'तुम्ही तुमच्याकडील पत्ता नोंदवहीतील पत्ते तुम्ही येथे घेऊ शकता.<br/>सध्या आम्ही या <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> प्रकारच्या वेगवेगळ्या नोंदवहीतील पत्ते घेऊ शकतो. ';
-
+$labels['importtext'] = 'तुम्ही तुमच्याकडील पत्ता नोंदवहीतील पत्ते तुम्ही येथे घेऊ शकता.<br/>सध्या आम्ही या <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> प्रकारच्या वेगवेगळ्या नोंदवहीतील पत्ते घेऊ शकतो.';
 $labels['done'] = 'झाले';
 $labels['settingsfor'] = 'साठी सेटिंग्ज';
 $labels['preferences'] = 'तुमची पसंती';
 $labels['userpreferences'] = 'वापरकर्त्याची पसंती';
-
 $labels['editpreferences'] = 'वापरकर्त्याची पसंती सुधारा';
 $labels['identities'] = 'ओळख';
 $labels['manageidentities'] = 'या खात्यासाठी ओळखींचे नियोजन करा';
-
 $labels['newidentity'] = 'नवीन ओळख';
 $labels['newitem'] = 'नवीन प्रकार';
 $labels['edititem'] = 'प्रकार सुधारा';
 $labels['preferhtml'] = 'एच टी एम एल दाखवा';
-
 $labels['defaultcharset'] = 'नेहमीचा अक्षर संच';
 $labels['htmlmessage'] = 'एच टी एम एल संदेश';
 $labels['prettydate'] = 'विशेष दिवस';
-
 $labels['setdefault'] = 'हा नेहमीसाठी वापरा';
 $labels['autodetect'] = 'स्वयंचलित';
 $labels['language'] = 'भाषा';
-$labels['timezone'] = 'वेळ 
-क्षेत्र'; 
+$labels['timezone'] = 'वेळ  क्षेत्र';
 $labels['pagesize'] = 'प्रत्येक पानावरील ओळी';
 $labels['signature'] = 'सही';
 $labels['dstactive'] = 'दिवसाची वेळ';
@@ -343,7 +264,7 @@ $labels['never'] = 'कधीच नाही';
 $labels['immediately'] = 'ताबडतोब';
 $labels['messagesdisplaying'] = 'संदेश दाखवा';
 $labels['messagescomposition'] = 'संदेश तयार करा';
-$labels['mimeparamfolding'] = 'सोबत दिलेल्या फाईल्सची नावे ';
+$labels['mimeparamfolding'] = 'सोबत दिलेल्या फाईल्सची नावे';
 $labels['2231folding'] = 'संपूर्ण आर एफ सी 2231(थंडरबर्ड)';
 $labels['miscfolding'] = 'आर एफ सी  2047/2231 (मायक्रोसॉफ़्ट आऊटलूक)';
 $labels['2047folding'] = 'संपूर्ण आर एफ सी 2047(ईतर)';
@@ -356,7 +277,6 @@ $labels['mainoptions'] = 'मुख्‍य पर्याय';
 $labels['section'] = 'भाग';
 $labels['maintenance'] = 'देखभाल';
 $labels['newmessage'] = 'नवीन संदेश';
-$labels['listoptions'] = 'पर्याय सूची';
 $labels['signatureoptions'] = 'सही पर्याय';
 $labels['whenreplying'] = 'उत्‍तर देताना';
 $labels['replytopposting'] = 'नवीन संदेश मुळ संदेशाच्‍या वर चालू करा';
@@ -369,10 +289,9 @@ $labels['replysignaturepos'] = 'उत्‍तर देताना किं�
 $labels['belowquote'] = 'उतारया खाली';
 $labels['abovequote'] = 'उतारयाच्‍या वर';
 $labels['insertsignature'] = 'सही मध्‍ये टाका';
-$labels['previewpanemarkread'] = 'प्रदर्शित संदेश पाहीले अशी खुण करा ';
+$labels['previewpanemarkread'] = 'प्रदर्शित संदेश पाहीले अशी खुण करा';
 $labels['afternseconds'] = '$n क्षणानंतर';
 $labels['folder'] = 'फोल्डर';
-$labels['folders'] = 'फोल्डर्स';
 $labels['foldername'] = 'फोल्डरचे नाव';
 $labels['subscribed'] = 'वर्गणिदार होणे';
 $labels['messagecount'] = 'संदेश';
@@ -406,4 +325,3 @@ $labels['japanese'] = 'जपानी';
 $labels['korean'] = 'कोरियन';
 $labels['chinese'] = 'चिनी';
 
-?>
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index c1165ac09..3fd712ac6 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/mr_IN/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2009, The Roundcube Dev Team                            |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:Nitin Nimkar <nvncom at yahoo.com>                             |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/mr_IN/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -26,7 +26,7 @@ $messages['loggedout'] = 'तुम्ही यशस्वीरित्य�
 $messages['mailboxempty'] = 'खात्यात कोणताही संदेश नाही';
 $messages['loading'] = 'संदेश आणत आहे';
 $messages['uploading'] = 'फाईल चढवली जात आहे...';
-$messages['loadingdata'] = 'माहिती आणत आहे ';
+$messages['loadingdata'] = 'माहिती आणत आहे';
 $messages['checkingmail'] = 'नवीन संदेश आले आहेत का हे पहात आहे';
 $messages['sendingmessage'] = 'संदेश पाठवत आहे';
 $messages['messagesent'] = 'संदेश यशस्वीरित्या पाठवण्यात आला आहे';
@@ -34,18 +34,18 @@ $messages['savingmessage'] = 'संदेश जतन करुन ठेव�
 $messages['messagesaved'] = 'संदेश मसुदा फोल्डरमधे ठेवत आहे';
 $messages['successfullysaved'] = 'यशस्वीरित्या ठेवला';
 $messages['addedsuccessfully'] = 'नवीन नाव पत्तां नोंदवहीत व्यवस्थित ठेवला';
-$messages['contactexists'] = 'हा इमेल पत्ता नोंदवहीत आधिच आहे. ';
+$messages['contactexists'] = 'हा इमेल पत्ता नोंदवहीत आधिच आहे.';
 $messages['blockedimages'] = 'तुमची गोपनीयता पाळण्यासाठी या संदेशातील दुसर्‍या सर्व्हरवरील चित्रे दिसणे थांबवले आहे.';
-$messages['encryptedmessage'] = 'हा गुप्त व सांकेतिक संदेश आहे. तो तुम्हाला असा दाखवता येणार नाही. ';
+$messages['encryptedmessage'] = 'हा गुप्त व सांकेतिक संदेश आहे. तो तुम्हाला असा दाखवता येणार नाही.';
 $messages['nocontactsfound'] = 'कोणताच पत्ता नोंदवहीत नाही.';
 $messages['contactnotfound'] = 'या नावाचा कोणताच पत्ता नोंदवहीत नाही.';
 $messages['sendingfailed'] = 'संदेश पाठवता आला नाही.';
-$messages['senttooquickly'] = 'कृपया हा संदेश पाठवण्यापूर्वी $sec थांबा ';
-$messages['errorsavingsent'] = 'पाठवलेला संदेश ठेवून देतांना काहीतरी चूक झाली. ';
-$messages['errorsaving'] = 'संदेश ठेवून देतांना काहीतरी चूक झाली. ';
+$messages['senttooquickly'] = 'कृपया हा संदेश पाठवण्यापूर्वी $sec थांबा';
+$messages['errorsavingsent'] = 'पाठवलेला संदेश ठेवून देतांना काहीतरी चूक झाली.';
+$messages['errorsaving'] = 'संदेश ठेवून देतांना काहीतरी चूक झाली.';
 $messages['errormoving'] = 'संदेश तेथे ठेवता आला नाही.';
 $messages['errorcopying'] = 'संदेशांची नक्‍कल करता आली नाही';
-$messages['errordeleting'] = 'संदेश काढून टाकता आला नाही. ';
+$messages['errordeleting'] = 'संदेश काढून टाकता आला नाही.';
 $messages['errormarking'] = 'संदेशांवर खूण करता आली नाही.';
 $messages['deletecontactconfirm'] = 'खूण केलेले सर्व पत्ते खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
 $messages['deletemessagesconfirm'] = 'खूण केलेले सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
@@ -53,37 +53,36 @@ $messages['deletefolderconfirm'] = 'हा फोल्डर खरोखरच
 $messages['purgefolderconfirm'] = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
 $messages['folderdeleting'] = 'फोल्डर काढून टाकत आहे';
 $messages['foldermoving'] = 'फोल्डर हलवत आहे.';
-$messages['formincomplete'] = 'फॉर्म पूर्णपणे भरलेला  नाही. ';
-$messages['noemailwarning'] = 'योग्य, बरोबर, आणि वैध इमेल पत्ता द्या. ';
+$messages['formincomplete'] = 'फॉर्म पूर्णपणे भरलेला  नाही.';
+$messages['noemailwarning'] = 'योग्य, बरोबर, आणि वैध इमेल पत्ता द्या.';
 $messages['nonamewarning'] = 'नाव द्या';
 $messages['nopagesizewarning'] = 'पानाचा आकार द्या';
 $messages['nosenderwarning'] = 'पाठवणार्‍याचा इमेल पत्ता द्या';
-$messages['norecipientwarning'] = 'किमान एकतरी पत्ता द्या ज्यांना तुम्हाला संदेश पाठवावयाचा आहे. ';
+$messages['norecipientwarning'] = 'किमान एकतरी पत्ता द्या ज्यांना तुम्हाला संदेश पाठवावयाचा आहे.';
 $messages['nosubjectwarning'] = 'विषय दिलेला नाही. तुम्हाला विषय द्यायचा आहे का?';
 $messages['nobodywarning'] = 'संदेशामधे कोणताही मजकूर नाही. तुम्हाला तसाच संदेश पाठवावयाचा आहे का?';
 $messages['notsentwarning'] = 'संदेश पाठवला गेला नाही. तुम्हाला हा संदेश रद्द करायचा आहे का?';
 $messages['noldapserver'] = 'शोधण्यासाठी ldap सर्व्हर निवडा';
-$messages['nocontactsreturned'] = 'कोणताही पत्ता नोंदवहीत नाही. ';
-$messages['nosearchname'] = 'कृपया ज्यांना तुम्हाला संदेश पाठवावयाचा आहे त्यांचे नाव किंवा इमेल पत्ता द्या. ';
+$messages['nosearchname'] = 'कृपया ज्यांना तुम्हाला संदेश पाठवावयाचा आहे त्यांचे नाव किंवा इमेल पत्ता द्या.';
 $messages['notuploadedwarning'] = 'सर्व फाईल अजून चढवल्‍या गेलेल्‍या नाहीत. कृपया वाट पहा किंवा मागे फिरा';
 $messages['searchsuccessful'] = '$nr संदेष मिळाले.';
-$messages['searchnomatch'] = 'शोध घेतल्यानंतर एकही संदेश मिळाला नाही ';
+$messages['searchnomatch'] = 'शोध घेतल्यानंतर एकही संदेश मिळाला नाही';
 $messages['searching'] = 'शोधत आहे......';
 $messages['checking'] = 'तपासत आहे.....';
 $messages['nospellerrors'] = 'शुध्दलेखनाची चूक सापडली नाही';
-$messages['folderdeleted'] = 'फोल्डर यशस्वी रित्या काढून टाकण्यात आला आहे. ';
-$messages['deletedsuccessfully'] = 'यशस्वी रित्या काढून टाकण्यात आला आहे. ';
-$messages['converting'] = 'दृष्य स्वरुप काढून टाकण्यात येत आहे. ';
-$messages['messageopenerror'] = 'सर्व्हरवरुन संदेश आणता आला नाही. ';
-$messages['fileuploaderror'] = 'फाईल चढवता आली नाही ';
-$messages['filesizeerror'] = 'तुम्ही चढवलेली फाईल क्षमतेपेक्षा जास्त मोठी आहे. ';
+$messages['folderdeleted'] = 'फोल्डर यशस्वी रित्या काढून टाकण्यात आला आहे.';
+$messages['deletedsuccessfully'] = 'यशस्वी रित्या काढून टाकण्यात आला आहे.';
+$messages['converting'] = 'दृष्य स्वरुप काढून टाकण्यात येत आहे.';
+$messages['messageopenerror'] = 'सर्व्हरवरुन संदेश आणता आला नाही.';
+$messages['fileuploaderror'] = 'फाईल चढवता आली नाही';
+$messages['filesizeerror'] = 'तुम्ही चढवलेली फाईल क्षमतेपेक्षा जास्त मोठी आहे.';
 $messages['copysuccess'] = '$nr पत्त्यांची यशस्वीरित्या प्रत केली.';
 $messages['copyerror'] = 'कोणत्याही पत्त्याची प्रत बनवता आली नाही.';
 $messages['sourceisreadonly'] = 'पत्ता फक्त वाचण्यासाठी आहे.';
-$messages['errorsavingcontact'] = 'पत्ता नोंदवहीत ठेवता आला नाही. ';
+$messages['errorsavingcontact'] = 'पत्ता नोंदवहीत ठेवता आला नाही.';
 $messages['movingmessage'] = 'संदेश हलवत आहे..';
 $messages['copyingmessage'] = 'संदेशाची नक्‍कल करत आहे...';
-$messages['receiptsent'] = 'पोचपावती यशस्वीरित्या पाठवण्यात आली आहे. ';
+$messages['receiptsent'] = 'पोचपावती यशस्वीरित्या पाठवण्यात आली आहे.';
 $messages['errorsendingreceipt'] = 'पोचपावती पाठवता आली नाही.';
 $messages['nodeletelastidentity'] = 'तुम्ही हे खाते काढून टाकू शकत नाही कारण हे तुमचे शेवटचे खाते आहे.';
 $messages['forbiddencharacter'] = 'फोल्डरच्या नावात न चालणारी अक्षरे किंवा खूणा आहेत.';
@@ -94,10 +93,10 @@ $messages['contactremovedfromgroup'] = 'पत्‍ते यशस्‍वी
 $messages['importwait'] = 'आयात करत आहे, कृपया वाट पहा.....';
 $messages['importerror'] = 'आयात झाली नाही. आयात करत असलेली फाईल व्हीकार्ड प्रकाराची नाही';
 $messages['importconfirm'] = '<b>$inserted पत्ते यशस्वीरित्या आयात केल, $skipped आधिच असलेल्या नोंदी केल्या नाहीत</b>:<p><em>$names</em></p>';
-$messages['opnotpermitted'] = 'ही क्रिया करण्यास परवानगी नाही. ';
+$messages['opnotpermitted'] = 'ही क्रिया करण्यास परवानगी नाही.';
 $messages['nofromaddress'] = 'निवडलेल्या खात्यात इमेल पत्ता दिलेला नाही.';
 $messages['editorwarning'] = 'टेक्स्ट संपादन निवडल्यास संदेशाचे दृष्य स्वरुप बदलून जाईल. तुम्हाला असेच करायचे आहे ना?';
-$messages['httpreceivedencrypterror'] = 'हानीकारक चूक झाली. व्‍यवस्‍थापकाशी तात्‍काळ संपर्क साधा. <b> तुमचा संदेश पाठवला नाही </b>    ';
+$messages['httpreceivedencrypterror'] = 'हानीकारक चूक झाली. व्‍यवस्‍थापकाशी तात्‍काळ संपर्क साधा. <b> तुमचा संदेश पाठवला नाही </b>';
 $messages['smtpconnerror'] = 'SMTP चूक ($code): सर्व्‍हरशी संपर्क साधता येत नाही';
 $messages['smtpautherror'] = 'SMTP चूक ($code): ओळख पटवता येत नाही';
 $messages['smtpfromerror'] = 'SMTP चूक ($code): "$from" पाठवणार्‍याचे नाव टाकता आले नाही';
@@ -109,4 +108,3 @@ $messages['toomanyrecipients'] = 'खूप जास्‍त प्राप�
 $messages['maxgroupmembersreached'] = 'गट सभासद संख्‍या $max पेक्षा जास्‍त झाली आहे';
 $messages['internalerror'] = 'अंतर्गत चूक झाली. कृपया परत प्रयत्‍न करा.';
 
-?>
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 42d772d52..cba1b0bea 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ms_MY/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Muhammad Zamri MS <myzamri@gmail.com>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ms_MY/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: abuyop <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -25,7 +22,7 @@ $labels['server'] = 'Pelayan';
 $labels['login'] = 'Log Masuk';
 $labels['logout'] = 'Log Keluar';
 $labels['mail'] = 'E-Mel';
-$labels['settings'] = 'Tetapan Peribadi';
+$labels['settings'] = 'Tetapan';
 $labels['addressbook'] = 'Buku Alamat';
 $labels['inbox'] = 'Masuk';
 $labels['drafts'] = 'Draf';
@@ -42,17 +39,16 @@ $labels['date'] = 'Tarikh';
 $labels['size'] = 'Saiz';
 $labels['priority'] = 'Keutamaan';
 $labels['organization'] = 'Organisasi';
-$labels['reply-to'] = 'Balas kepada';
 $labels['mailboxlist'] = 'Kabinet Fail';
+$labels['folders'] = 'Kabinet Fail';
 $labels['messagesfromto'] = 'Mesej $from ke $to dari $count';
 $labels['messagenrof'] = 'Mesej $nr dari $count';
-$labels['moveto'] = 'pindah ke...';
-$labels['download'] = 'muat turun';
+$labels['copy'] = 'Salin';
+$labels['move'] = 'Alih';
+$labels['moveto'] = 'Alih ke...';
+$labels['download'] = 'Muat Turun';
 $labels['filename'] = 'Nama Fail';
 $labels['filesize'] = 'Saiz Fail';
-$labels['preferhtml'] = 'Papar HTML';
-$labels['htmlmessage'] = 'Mesej HTML';
-$labels['prettydate'] = 'Tarikh-tarikh cantik';
 $labels['addtoaddressbook'] = 'Tambah ke buku alamat';
 $labels['sun'] = 'Aha';
 $labels['mon'] = 'Isn';
@@ -73,6 +69,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mac';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mei';
+$labels['longmay'] = 'Mei';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Ogo';
@@ -84,7 +81,6 @@ $labels['longjan'] = 'Januari';
 $labels['longfeb'] = 'Februari';
 $labels['longmar'] = 'March';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mei';
 $labels['longjun'] = 'Jun';
 $labels['longjul'] = 'Julai';
 $labels['longaug'] = 'Ogos';
@@ -102,13 +98,9 @@ $labels['deletemessage'] = 'Pindah mesej ke sampah';
 $labels['movemessagetotrash'] = 'Pindah mesej ke Tong Sampah';
 $labels['printmessage'] = 'Cetak mesej ini';
 $labels['previousmessage'] = 'Papar mesej sebelumnya';
-$labels['previousmessages'] = 'Papar set mesej sebelumnya';
 $labels['firstmessage'] = 'Papar mesej pertama';
-$labels['firstmessages'] = 'Papar set mesej pertama';
 $labels['nextmessage'] = 'Papat mesej seterusnya';
-$labels['nextmessages'] = 'Papar set mesej seterusnya';
 $labels['lastmessage'] = 'Papat mesej terakhir';
-$labels['lastmessages'] = 'Papar set mesej terakhir';
 $labels['backtolist'] = 'Kembali ke senarai mesej';
 $labels['viewsource'] = 'Papar sumber';
 $labels['markmessages'] = 'Tanda mesej';
@@ -117,12 +109,12 @@ $labels['markunread'] = 'belum/tidak dibaca';
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tiada';
+$labels['nonesort'] = 'Tiada';
 $labels['unread'] = 'Tidak dibaca';
 $labels['compact'] = 'Padat';
 $labels['empty'] = 'Kosong';
-$labels['purge'] = 'Singkir';
 $labels['quota'] = 'Penggunaan cakera';
-$labels['unknown'] = 'tidak dikenali';
+$labels['unknown'] = 'tidak diketahui';
 $labels['unlimited'] = 'tidak terhad';
 $labels['quicksearch'] = 'Carian pantas';
 $labels['resetsearch'] = 'Set semula carian';
@@ -161,10 +153,10 @@ $labels['surname'] = 'Nama akhir';
 $labels['email'] = 'E-Mel';
 $labels['addcontact'] = 'Tambah kontek baru';
 $labels['editcontact'] = 'Ubahsuai Kontek';
-$labels['edit'] = 'Ubahsuai';
+$labels['edit'] = 'Sunting';
 $labels['cancel'] = 'Batal';
 $labels['save'] = 'Simpan';
-$labels['delete'] = 'Hapus';
+$labels['delete'] = 'Padam';
 $labels['newcontact'] = 'Cipta kad kontek baru';
 $labels['deletecontact'] = 'Hapus kontek yang dipilih';
 $labels['composeto'] = 'Karang mel kepada';
@@ -178,14 +170,17 @@ $labels['lastpage'] = 'Papar set akhir';
 $labels['groups'] = 'Kumpulan';
 $labels['personaladrbook'] = 'Alamat-alamat Peribadi';
 $labels['settingsfor'] = 'Tetapan bagi';
-$labels['preferences'] = 'Pilihan';
-$labels['userpreferences'] = 'Pilihan pengguna';
-$labels['editpreferences'] = 'Ubahsuai pilihan pengguna';
+$labels['preferences'] = 'Keutamaan';
+$labels['userpreferences'] = 'Keutamaan pengguna';
+$labels['editpreferences'] = 'Sunting keutamaan pengguna';
 $labels['identities'] = 'Identiti';
 $labels['manageidentities'] = 'Urus identiti bagi akaun ini';
 $labels['newidentity'] = 'Identiti baru';
 $labels['newitem'] = 'Butiran baru';
 $labels['edititem'] = 'Ubahsuai butiran';
+$labels['preferhtml'] = 'Papar HTML';
+$labels['htmlmessage'] = 'Mesej HTML';
+$labels['prettydate'] = 'Tarikh-tarikh cantik';
 $labels['setdefault'] = 'Tetap asal';
 $labels['language'] = 'Bahasa';
 $labels['timezone'] = 'Zon Masa';
@@ -209,7 +204,6 @@ $labels['flagfordeletion'] = 'Tanda mesej untuk pembuangan (tidak delete terus)'
 $labels['autosavedraft'] = 'Simpan draf dengan automatik';
 $labels['never'] = 'tidak pernah';
 $labels['folder'] = 'Kabinet Fail';
-$labels['folders'] = 'Kabinet Fail';
 $labels['foldername'] = 'Nama Kabinet Fail';
 $labels['subscribed'] = 'Dilanggan';
 $labels['messagecount'] = 'Mesej-mesej';
@@ -220,4 +214,3 @@ $labels['sortby'] = 'Susun dengan';
 $labels['sortasc'] = 'Susun menaik';
 $labels['sortdesc'] = 'Susun menurun';
 
-?>
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 6cbf75bf9..c0c3f3649 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ms_MY/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Muhammad Zamri MS <myzamri@gmail.com>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ms_MY/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -52,11 +49,10 @@ $messages['noemailwarning'] = 'Sila masukkan alamat emel yang sah';
 $messages['nonamewarning'] = 'Sila masukkan nama';
 $messages['nopagesizewarning'] = 'Sila masukkan saiz halaman';
 $messages['norecipientwarning'] = 'Sila masukkan sekurang-kurangnya satu penerima';
-$messages['nosubjectwarning'] = 'Ruang \"Subjek\" kosong. Adakah anda ingin masukkannya sekarang?';
+$messages['nosubjectwarning'] = 'Ruang "Subjek" kosong. Adakah anda ingin masukkannya sekarang?';
 $messages['nobodywarning'] = 'Hantar mesej ini tanpa teks?';
 $messages['notsentwarning'] = 'Mesej tidak dihantar. Adakah anda ingin menyingkir mesej anda?';
 $messages['noldapserver'] = 'Sila pilih satu pelayan ldap untuk carian';
-$messages['nocontactsreturned'] = 'Tiada kontek dijumpai';
 $messages['nosearchname'] = 'Sila masukkan nama kontek atau alamat emel';
 $messages['searchsuccessful'] = '$nr mesej dijumpai';
 $messages['searchnomatch'] = 'Carian tiada padanan';
@@ -78,4 +74,3 @@ $messages['receiptsent'] = 'Berjaya menghantar resip bacaan';
 $messages['errorsendingreceipt'] = 'Tidak dapat menghantar resip';
 $messages['nodeletelastidentity'] = 'Anda tidak boleh membuang identiti ini, ia milik anda yang terakhir.';
 
-?>
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index b187a5e00..54b7f5e79 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nb_NO/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
-| Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
-| Author: Axel Sjøstedt <roundcube@sjostedt.no>                         |
-| Author: Odd Henriksen <odd@digicon.no>                                |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nb_NO/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -45,8 +39,8 @@ $labels['date'] = 'Dato';
 $labels['size'] = 'Størrelse';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
-$labels['reply-to'] = 'Svar til';
 $labels['mailboxlist'] = 'Mapper';
+$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Meldinger $from til $to av $count';
 $labels['threadsfromto'] = 'Tråder $from til $to av $count';
 $labels['messagenrof'] = 'Melding $nr av $count';
@@ -76,6 +70,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -87,7 +82,6 @@ $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
 $labels['longmar'] = 'Mars';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'August';
@@ -105,13 +99,9 @@ $labels['deletemessage'] = 'Slett e-posten';
 $labels['movemessagetotrash'] = 'Flytt e-posten til søppel';
 $labels['printmessage'] = 'Skriv ut denne e-posten';
 $labels['previousmessage'] = 'Vis forrige melding';
-$labels['previousmessages'] = 'Vis forrige side';
 $labels['firstmessage'] = 'Vis første melding';
-$labels['firstmessages'] = 'Vis første side med meldinger';
 $labels['nextmessage'] = 'Vis neste melding';
-$labels['nextmessages'] = 'Vis neste side';
 $labels['lastmessage'] = 'Vis siste melding';
-$labels['lastmessages'] = 'Vis siste side med meldinger';
 $labels['backtolist'] = 'Tilbake til e-postlisten';
 $labels['viewsource'] = 'Vis kilde';
 $labels['markmessages'] = 'Merk meldinger';
@@ -119,10 +109,10 @@ $labels['markread'] = 'som lest';
 $labels['markunread'] = 'som ulest';
 $labels['markflagged'] = 'som flagget';
 $labels['markunflagged'] = 'som uflagget';
-$labels['messageactions'] = 'Flere valg...';
 $labels['select'] = 'Velg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
+$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Gjeldende side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
@@ -142,7 +132,6 @@ $labels['expand_only_unread'] = 'kun med uleste meldinger';
 $labels['fromto'] = 'Avsender/Mottaker';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Vedlegg';
-$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Dato sendt';
 $labels['arrival'] = 'Dato mottatt';
 $labels['asc'] = 'stigende';
@@ -153,7 +142,6 @@ $labels['listorder'] = 'Sorteringsrekkefølge';
 $labels['listmode'] = 'Listevisningsmodus';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
-$labels['purge'] = 'Tøm';
 $labels['quota'] = 'Plassforbruk';
 $labels['unknown'] = 'ukjent';
 $labels['unlimited'] = 'ubegrenset';
@@ -215,7 +203,6 @@ $labels['print'] = 'Skriv ut';
 $labels['export'] = 'Eksporter';
 $labels['exportvcards'] = 'Eksporter kontakter i vCard-format';
 $labels['newcontactgroup'] = 'Opprett ny kontaktgruppe';
-$labels['groupactions'] = 'Handlinger for kontaktgrupper...';
 $labels['previouspage'] = 'Vis forrige sett';
 $labels['firstpage'] = 'Vis første sett';
 $labels['nextpage'] = 'Vis neste sett';
@@ -290,7 +277,6 @@ $labels['mainoptions'] = 'Hovedinnstillinger';
 $labels['section'] = 'Kategori';
 $labels['maintenance'] = 'Vedlikehold';
 $labels['newmessage'] = 'Ny melding';
-$labels['listoptions'] = 'Meldingsoversikt';
 $labels['signatureoptions'] = 'Innstillinger for signatur';
 $labels['whenreplying'] = 'Ved svar på e-post';
 $labels['replytopposting'] = 'start den nye meldingen over orginalmeldingen';
@@ -306,7 +292,6 @@ $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread'] = 'Merk forhåndsviste meldinger som lest';
 $labels['afternseconds'] = 'etter $n sekunder';
 $labels['folder'] = 'Mappe';
-$labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenavn';
 $labels['subscribed'] = 'Abonnere';
 $labels['messagecount'] = 'Meldinger';
@@ -340,4 +325,3 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
-?>
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 7117de2a9..b918ad24a 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -1,23 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nb_NO/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
-| Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
-| Author: Axel Sjøstedt <roundcube@sjostedt.no>                         |
-| Author: Odd Henriksen <odd@digicon.no>                                |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nb_NO/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Martin Bore <Unknown>                                         |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -26,21 +20,24 @@ $messages['cookiesdisabled'] = 'Din nettleser aksepterer ikke cookies';
 $messages['sessionerror'] = 'Din nettlesertilkobling er ugyldig eller utløpt';
 $messages['imaperror'] = 'Feil ved tilkobling til IMAP-server';
 $messages['servererror'] = 'Serverfeil!';
+$messages['dberror'] = 'Databasefeil!';
 $messages['invalidrequest'] = 'Ugyldig forespørsel! Ingen data ble lagret.';
 $messages['nomessagesfound'] = 'Det ble ikke funnet noen meldinger i denne mappen';
 $messages['loggedout'] = 'Du er logget av webmail. Ha det bra!';
 $messages['mailboxempty'] = 'Mappen er tom!';
 $messages['loading'] = 'Laster...';
 $messages['uploading'] = 'Laster opp fil...';
+$messages['uploadingmany'] = 'Laster opp filer ...';
 $messages['loadingdata'] = 'Laster data...';
 $messages['checkingmail'] = 'Sjekker for nye meldinger...';
 $messages['sendingmessage'] = 'Sender melding...';
-$messages['messagesent'] = 'Meldingen ble sendt uten feil';
+$messages['messagesent'] = 'Meldingen ble sendt';
 $messages['savingmessage'] = 'Lagrer melding...';
 $messages['messagesaved'] = 'Melding er lagret som kladd';
 $messages['successfullysaved'] = 'Lagret';
 $messages['addedsuccessfully'] = 'Kontakten ble lagt til i adresseboken';
-$messages['contactexists'] = 'Der finnes allerede en kontakt med denne e-postadressen';
+$messages['contactexists'] = 'Det finnes allerede en kontakt med denne e-postadressen';
+$messages['contactnameexists'] = 'Det finnes allerede en kontakt med dette navnet';
 $messages['blockedimages'] = 'Av sikkerhetsgrunner er bilder lagret på eksterne servere blokkert fra denne e-postmeldingen';
 $messages['encryptedmessage'] = 'Dette er en kryptert melding som ikke kan vises. Beklager!';
 $messages['nocontactsfound'] = 'Ingen kontakter ble funnet';
@@ -54,13 +51,17 @@ $messages['errorcopying'] = 'Kunne ikke kopiere meldingen(e)';
 $messages['errordeleting'] = 'Kunne ikke slette meldingen(e)';
 $messages['errormarking'] = 'Kunne ikke markere meldingen(e)';
 $messages['deletecontactconfirm'] = 'Vil du virkelig slette valgte kontakt(er)?';
+$messages['deletegroupconfirm'] = 'Vil du virkelig slette den valgte gruppa?';
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette de(n) valgte meldingen(e)?';
 $messages['deletefolderconfirm'] = 'Vil du virkelig slette denne mappen?';
 $messages['purgefolderconfirm'] = 'Vil du virkelig slette alle meldingene i denne mappen?';
+$messages['contactdeleting'] = 'Sletter kontakt(er) ...';
+$messages['groupdeleting'] = 'Sletter gruppe ...';
 $messages['folderdeleting'] = 'Sletter mappe...';
 $messages['foldermoving'] = 'Flytter mappe...';
+$messages['foldersubscribing'] = 'Abonnerer på mappe ...';
 $messages['formincomplete'] = 'Skjemaet var ikke fullstendig fylt ut';
-$messages['noemailwarning'] = 'Skriv inn en gyldig e-postadresse';
+$messages['noemailwarning'] = 'Vennligst oppgi en gyldig epostadresse.';
 $messages['nonamewarning'] = 'Angi et navn';
 $messages['nopagesizewarning'] = 'Angi sidestørrelsen';
 $messages['nosenderwarning'] = 'Vennligst angi avsenderadresse';
@@ -68,34 +69,34 @@ $messages['norecipientwarning'] = 'Skriv inn minst én mottaker';
 $messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skrive det inn nå?';
 $messages['nobodywarning'] = 'Send denne meldingen uten tekst?';
 $messages['notsentwarning'] = 'E-posten er ikke sendt. Er du sikker på at du vil avbryte skrivingen?';
-$messages['noldapserver'] = 'Venligst velg hvilken LDAP-server det skal søkes i';
-$messages['nocontactsreturned'] = 'Ingen kontakter funnet';
 $messages['nosearchname'] = 'Venligst skriv inn kontaktens navn eller e-postadresse';
 $messages['notuploadedwarning'] = 'Ikke alle vedlegg er ferdig opplastet. Vennligst vent eller avbryt opplastingen.';
 $messages['searchsuccessful'] = '$nr meldinger funnet';
+$messages['contactsearchsuccessful'] = '$nr kontakter funnet.';
 $messages['searchnomatch'] = 'Søket ga ingen resultater';
-$messages['searching'] = 'Søker...';
-$messages['checking'] = 'Sjekker...';
-$messages['nospellerrors'] = 'Ingen skrivefeil funnet';
-$messages['folderdeleted'] = 'Mappe slettet';
+$messages['searching'] = 'Søker …';
+$messages['checking'] = 'Sjekker …';
+$messages['nospellerrors'] = 'Fant ingen skrivefeil.';
+$messages['folderdeleted'] = 'Mappe slettet.';
 $messages['deletedsuccessfully'] = 'Slettet';
-$messages['converting'] = 'Fjerner formatering fra meldingen...';
+$messages['converting'] = 'Fjerner formatering fra meldingen ...';
 $messages['messageopenerror'] = 'Kunne ikke hente meldingen fra server';
-$messages['fileuploaderror'] = 'Feil under opplasting';
+$messages['fileuploaderror'] = 'Feil under opplastning.';
 $messages['filesizeerror'] = 'Filen overstiger maksimum tillatt filstørrelse ($size)';
-$messages['copysuccess'] = '$nr adresser ble kopiert';
-$messages['copyerror'] = 'Kunne ikke kopiere';
+$messages['copysuccess'] = 'Kopierte $nr adresser.';
+$messages['copyerror'] = 'Kunne ikke kopiere adresser.';
 $messages['sourceisreadonly'] = 'Denne adressekilden er skrivebeskyttet';
-$messages['errorsavingcontact'] = 'Kunne ikke lagre adressen';
-$messages['movingmessage'] = 'Flytter e-post...';
+$messages['errorsavingcontact'] = 'Kunne ikke lagre kontaktadressen.';
+$messages['movingmessage'] = 'Flytter e-post ...';
 $messages['copyingmessage'] = 'Kopierer e-post...';
+$messages['copyingcontact'] = 'Kopieerer kontakt(er) ...';
+$messages['deletingmessage'] = 'Sletter melding(er) ...';
+$messages['markingmessage'] = 'Markerer melding(er) ...';
 $messages['receiptsent'] = 'Kvittering er sent';
-$messages['errorsendingreceipt'] = 'Kunne ikke sende kvittering';
-$messages['nodeletelastidentity'] = 'Du kan ikke slette denne identiteten, det er din eneste.';
+$messages['nodeletelastidentity'] = 'Du kan ikke slette den siste identiteten din.';
 $messages['forbiddencharacter'] = 'Mappenavnet inneholder tegn som ikke er tillatt';
 $messages['selectimportfile'] = 'Vennligst velg en fil for opplasting';
 $messages['addresswriterror'] = 'Den valgte adresseboken er ikke skrivbar';
-$messages['contactaddedtogroup'] = 'Kontaktene ble vellykket lagt til i denne gruppen';
 $messages['contactremovedfromgroup'] = 'Kontaktene ble vellykket fjernet fra denne gruppen';
 $messages['importwait'] = 'Importerer, vennligst vent...';
 $messages['importerror'] = 'Feil ved importering! Den opplastede filen er ikke en gyldig vCard-fil.';
@@ -110,8 +111,15 @@ $messages['smtpfromerror'] = 'SMTP-feil ($code): Kunne ikke sette avsender "$fro
 $messages['smtptoerror'] = 'SMTP-feil ($code): Kunne ikke legge til mottaker "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-feil ($code): Kunne ikke lese mottakerliste';
 $messages['smtperror'] = 'SMTP-feil ($code): $msg';
-$messages['emailformaterror'] = 'Feil e-postadresse: $email';
+$messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
 $messages['toomanyrecipients'] = 'For mange mottakere. Reduser antall mottakere til $max.';
 $messages['maxgroupmembersreached'] = 'Antall gruppemedlemmer overskrider maksgrensen på $max';
+$messages['internalerror'] = 'Intern feil, prøv igjen senere.';
+$messages['groupdeleted'] = 'Gruppen er slettet.';
+$messages['namecannotbeempty'] = 'Navn kan ikke være tomt.';
+$messages['nametoolong'] = 'Navnet er for langt.';
+$messages['folderupdated'] = 'Mappen er oppdatert.';
+$messages['foldercreated'] = 'Mappe opprettet.';
+$messages['invalidimageformat'] = 'Ikke et gyldig bildeformat.';
+$messages['mispellingsfound'] = 'Fant stavefeil i meldingen.';
 
-?>
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index f0f56d5fd..a751ef4cb 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -2,17 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ne/labels.inc                                            |
+ | localization/ne_NP/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2007, The Roundcube Dev Team                            |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Nepali Translation by:                                                |
- | Prasanna Singh <prasanna@bhunet.com>, <prasanna@bhunet.com>           |
- | RoundcubeAuthor: Thomas Bruederli <roundcube@gmail.com>               |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -40,17 +39,15 @@ $labels['date'] = 'तारिख';
 $labels['size'] = 'नाप';
 $labels['priority'] = 'मेलको प्राथमिकता';
 $labels['organization'] = 'संस्था';
-$labels['reply-to'] = 'पुन: जवाब';
-$labels['mailboxlist'] = 'फोलडर';
+$labels['mailboxlist'] = 'फोल्डरहरु';
+$labels['folders'] = 'फोल्डरहरु';
 $labels['messagesfromto'] = 'मेलहरु $from बाट $to सम्म, $count मध्यबाट';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count मध्यबाट';
+$labels['copy'] = 'कार्बन कपि';
 $labels['moveto'] = 'सार्नुहोस...';
 $labels['download'] = 'डाऊनलोड';
 $labels['filename'] = 'फाईलको नाम';
 $labels['filesize'] = 'फाईलको नाप';
-$labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) देखाउनुहोस';
-$labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूपका मेल';
-$labels['prettydate'] = 'सुन्दर तारिख';
 $labels['addtoaddressbook'] = 'ठेगाना पुस्तिकामा जोड्नुहोस';
 $labels['sun'] = 'आइत';
 $labels['mon'] = 'सोम';
@@ -75,30 +72,26 @@ $labels['forwardmessage'] = 'मेल अगाडि पठाउनुहो�
 $labels['deletemessage'] = 'रद्दी टोकरीमा सार्नुहोस';
 $labels['printmessage'] = 'मेल छाप्नुहोस';
 $labels['previousmessage'] = 'पछाडिको मेल देखाउनुहोस';
-$labels['previousmessages'] = 'पछाडिको मेलका सेटहरु देखाउनुहोस';
 $labels['firstmessage'] = 'पहलो मेल देखाउनुहोस';
-$labels['firstmessages'] = 'पहलो मेलका सेटहरु देखाउनुहोस';
 $labels['nextmessage'] = 'अगाडिको मेल देखाउनुहोस';
-$labels['nextmessages'] = 'अगाडिको मेलका सेटहरु देखाउनुहोस';
 $labels['lastmessage'] = 'अन्तिम मेल देखाउनुहोस';
-$labels['lastmessages'] = 'अन्तिम मेलका सेटहरु देखाउनुहोस';
 $labels['backtolist'] = 'मेल सूची देखाउनुहोस';
 $labels['viewsource'] = 'श्रोत देखाउनुहोस';
 $labels['select'] = 'चुन्नुहोस';
 $labels['all'] = 'सबै |';
 $labels['none'] = 'हैन';
+$labels['nonesort'] = 'हैन';
 $labels['unread'] = 'नपढिएका |';
 $labels['compact'] = 'छोटो गर्नुहोस';
 $labels['empty'] = 'खाली गर्ने';
-$labels['purge'] = 'नाम निशाना मेटाउनुहोस';
 $labels['quota'] = 'डिस्कको उपभोग';
 $labels['unknown'] = 'अज्ञात';
 $labels['unlimited'] = 'अनगिन्ति';
 $labels['quicksearch'] = 'स्फुर्ति खोज';
 $labels['resetsearch'] = 'पन: खोज';
 $labels['compose'] = 'मेल लखन गर्नुहोस';
-$labels['sendmessage'] = 'तुरुन्तै मेल पठाउनुहोस';
 $labels['savemessage'] = 'ड्राफ्ट जोगाउनुहोस';
+$labels['sendmessage'] = 'तुरुन्तै मेल पठाउनुहोस';
 $labels['addattachment'] = 'फाइल टाँस्नुहोस';
 $labels['charset'] = 'क्यारेक्टर सेट';
 $labels['editortype'] = 'सम्पादकको प्रकार';
@@ -149,6 +142,9 @@ $labels['manageidentities'] = 'यो खाताको पहिचानह�
 $labels['newidentity'] = 'नया पहिचान';
 $labels['newitem'] = 'नया प्रकार';
 $labels['edititem'] = 'प्रकार सम्पादन गर्नुहोस';
+$labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) देखाउनुहोस';
+$labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूपका मेल';
+$labels['prettydate'] = 'सुन्दर तारिख';
 $labels['setdefault'] = 'तय गर्नुहोस';
 $labels['language'] = 'भाषा';
 $labels['timezone'] = 'समय क्षेत्र';
@@ -161,7 +157,6 @@ $labels['previewpane'] = 'पूर्व दृष्य देखाउनु�
 $labels['autosavedraft'] = 'स्वत ड्राफ्ट जोगाउनुहोस';
 $labels['never'] = 'काहिलै नहुने';
 $labels['folder'] = 'फोल्डर';
-$labels['folders'] = 'फोल्डरहरु';
 $labels['foldername'] = 'फोल्डरको नाम';
 $labels['subscribed'] = 'सबस्क्राईब गरियो';
 $labels['create'] = 'बनाउनुहोस';
@@ -171,4 +166,3 @@ $labels['sortby'] = 'यसरी तय गर्नुहोस';
 $labels['sortasc'] = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';
 $labels['sortdesc'] = 'अन्तिम देखि पहिलो सम्म तय गर्नुहोस';
 
-?>
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index 3949351c3..5e7743c89 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -2,17 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ne/messages.inc                                          |
+ | localization/ne_NP/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2007, The Roundcube Dev Team                            |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Nepali Translation by:                                                |
- | Prasanna Singh <prasanna@bhunet.com>, <prasanna@bhunet.com>           |
- | RoundcubeAuthor: Thomas Bruederli <roundcube@gmail.com>               |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -54,7 +53,6 @@ $messages['nosubjectwarning'] = 'मेलको कुनै विषय त�
 $messages['nobodywarning'] = 'बिना केहि लेखि पठाउने?';
 $messages['notsentwarning'] = 'मेल पठएको छैन.. मेल रद्द गर्न चहानुहुन्छ?';
 $messages['noldapserver'] = 'कृपया खोजको निम्ति एउटा ऐलडाप सर्वर छान्नहोस';
-$messages['nocontactsreturned'] = 'कुनै सम्पर्क फेला परेनन्';
 $messages['nosearchname'] = 'कृपया सम्पर्कको नाम या ई-मेल भर्नुहोस';
 $messages['searchsuccessful'] = '$nr मेलहरु पाइयो';
 $messages['searchnomatch'] = 'खोज असफल रहयो';
@@ -72,4 +70,3 @@ $messages['copyerror'] = 'कुनै पनि ठेगानाहरु उ
 $messages['sourceisreadonly'] = 'यो ठेगाना को श्रोत पढ्नको लागि मात्र उपलब्ध छ';
 $messages['errorsavingcontact'] = 'स्मपर्कको ठेगाना जोगाउन सकिएन';
 
-?>
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 9082b982e..2d5b9d823 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nl_BE/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Dennis Heeren <dennis.heeren@gmail.com>                       |
-|         Laurens Vets <laurens@daemon.be>                              |
-|         Simon De Schoenmaeker <sds@simonds.be>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nl_BE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,6 +42,7 @@ $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
 $labels['mailboxlist'] = 'Mappen';
+$labels['folders'] = 'Mappen';
 $labels['messagesfromto'] = 'Berichten $from - $to van $count';
 $labels['threadsfromto'] = 'Conversatie $from - $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
@@ -76,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mrt';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mei';
+$labels['longmay'] = 'Mei';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -87,7 +84,6 @@ $labels['longjan'] = 'Januari';
 $labels['longfeb'] = 'Februari';
 $labels['longmar'] = 'Maart';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mei';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'Augustus';
@@ -107,13 +103,9 @@ $labels['deletemessage'] = 'Dit bericht verwijderen';
 $labels['movemessagetotrash'] = 'Verplaats bericht naar verwijderde items';
 $labels['printmessage'] = 'Afdrukken';
 $labels['previousmessage'] = 'Vorig bericht';
-$labels['previousmessages'] = 'Vorige berichten';
 $labels['firstmessage'] = 'Eerste bericht';
-$labels['firstmessages'] = 'Eerste berichten';
 $labels['nextmessage'] = 'Volgende bericht';
-$labels['nextmessages'] = 'Volgende berichten';
 $labels['lastmessage'] = 'Laatste bericht';
-$labels['lastmessages'] = 'Laatste berichten';
 $labels['backtolist'] = 'Terug naar berichtenlijst';
 $labels['viewsource'] = 'Broncode bericht weergeven';
 $labels['markmessages'] = 'Markeer berichten';
@@ -121,10 +113,10 @@ $labels['markread'] = 'Als gelezen';
 $labels['markunread'] = 'Als ongelezen';
 $labels['markflagged'] = 'Selecteren';
 $labels['markunflagged'] = 'Niet Selecteren';
-$labels['messageactions'] = 'Meer acties...';
 $labels['select'] = 'Selecteren';
 $labels['all'] = 'Alles';
 $labels['none'] = 'Geen';
+$labels['nonesort'] = 'Geen';
 $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
@@ -144,7 +136,6 @@ $labels['expand_only_unread'] = 'alleen met ongelezen berichten';
 $labels['fromto'] = 'Afzender/Ontvanger';
 $labels['flag'] = 'Markeer';
 $labels['attachment'] = 'Bijlage';
-$labels['nonesort'] = 'Geen';
 $labels['sentdate'] = 'Verzenddatum';
 $labels['arrival'] = 'Ontvangstdatum';
 $labels['asc'] = 'oplopend';
@@ -156,7 +147,6 @@ $labels['listmode'] = 'Lijstweergave mode';
 $labels['folderactions'] = 'Acties voor map...';
 $labels['compact'] = 'Comprimeren';
 $labels['empty'] = 'Legen';
-$labels['purge'] = 'Opruimen';
 $labels['quota'] = 'Gebruikte schijfruimte';
 $labels['unknown'] = 'onbekend';
 $labels['unlimited'] = 'ongelimiteerd';
@@ -225,7 +215,6 @@ $labels['print'] = 'Afdrukken';
 $labels['export'] = 'Exporteren';
 $labels['exportvcards'] = 'Exporteer contactpersonen in vCard formaat';
 $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
-$labels['groupactions'] = 'Acties voor contactgroepen...';
 $labels['previouspage'] = 'Toon vorige';
 $labels['firstpage'] = 'Toon eerste';
 $labels['nextpage'] = 'Toon volgende';
@@ -276,7 +265,7 @@ $labels['autosendknown'] = 'stuur ontvangstbevestiging naar mijn contactpersonen
 $labels['autosendknownignore'] = 'stuur ontvangstbevestiging naar mijn contactpersonen, anders negeer';
 $labels['ignore'] = 'negeer';
 $labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
-$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren ';
+$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
 $labels['showremoteimages'] = 'Geef externe toegevoegde berichten weer';
@@ -303,7 +292,6 @@ $labels['mainoptions'] = 'Hoofdopties';
 $labels['section'] = 'Sectie';
 $labels['maintenance'] = 'Onderhoud';
 $labels['newmessage'] = 'Nieuw bericht';
-$labels['listoptions'] = 'Lijstopties';
 $labels['signatureoptions'] = 'Opties voor handtekening';
 $labels['whenreplying'] = 'Bij beantwoorden';
 $labels['replytopposting'] = 'begin bericht boven het origineel';
@@ -322,7 +310,6 @@ $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd een Delivery Status Notification';
 $labels['replysamefolder'] = 'Plaats antwoorden in de map van het beantwoorde bericht';
 $labels['folder'] = 'Map';
-$labels['folders'] = 'Mappen';
 $labels['foldername'] = 'Naam';
 $labels['subscribed'] = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
@@ -363,4 +350,3 @@ $labels['japanese'] = 'Japans';
 $labels['korean'] = 'Koreaans';
 $labels['chinese'] = 'Chinees';
 
-?>
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index 09911c854..45920e67c 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nl_BE/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Dennis Heeren <dennis.heeren@gmail.com>                       |
-|         Simon De Schoenmaeker <sds@simonds.be>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nl_BE/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -25,6 +21,7 @@ $messages['sessionerror'] = 'Sessie is reeds beëindigd of is ongeldig...';
 $messages['imaperror'] = 'Kon geen verbinding maken met de IMAP server...';
 $messages['servererror'] = 'Server fout!';
 $messages['servererrormsg'] = 'Server fout: $msg';
+$messages['dberror'] = 'Database Fout!';
 $messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen';
 $messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
@@ -33,6 +30,7 @@ $messages['loggedout'] = 'U bent nu afgemeld. Tot ziens!';
 $messages['mailboxempty'] = 'Mailbox is leeg...';
 $messages['loading'] = 'Bezig met ophalen gegevens...';
 $messages['uploading'] = 'Bezig met uploaden...';
+$messages['uploadingmany'] = 'Bestanden worden geüpload...';
 $messages['loadingdata'] = 'Bezig met gegevens ophalen...';
 $messages['checkingmail'] = 'Controleer op nieuwe berichten...';
 $messages['sendingmessage'] = 'Bericht wordt verstuurd...';
@@ -42,10 +40,12 @@ $messages['messagesaved'] = 'Bericht bewaard in Concepten';
 $messages['successfullysaved'] = 'Succesvol opgeslagen...';
 $messages['addedsuccessfully'] = 'Contactpersoon is toegevoegd...';
 $messages['contactexists'] = 'Er bestaat reeds een contactpersoon met dit e-mailadres...';
+$messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.';
 $messages['blockedimages'] = 'Om uw privacy te beschermen worden de afbeeldingen in dit bericht niet getoond...';
 $messages['encryptedmessage'] = 'Dit bericht is geëncrypteerd en kan niet worden weergegeven, sorry...';
 $messages['nocontactsfound'] = 'Geen contactpersonen gevonden...';
 $messages['contactnotfound'] = 'De gevraagde contactpersoon was niet gevonden';
+$messages['contactsearchonly'] = 'Voer enkele zoektermen in om de contactpersonen te zoeken.';
 $messages['sendingfailed'] = 'Kon het bericht niet versturen...';
 $messages['senttooquickly'] = 'U moet $sec seconden wachten om het bericht te versturen.';
 $messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht';
@@ -55,11 +55,16 @@ $messages['errorcopying'] = 'Kon de bericht(en) niet kopiëren';
 $messages['errordeleting'] = 'Kon de bericht(en) niet verwijderen...';
 $messages['errormarking'] = 'Kon de bericht(en) niet markeren...';
 $messages['deletecontactconfirm'] = 'Bent u zeker dat u de geselecteerde contactpers(o)on(en) wilt verwijderen?';
+$messages['deletegroupconfirm'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
 $messages['deletemessagesconfirm'] = 'Bent u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
 $messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
 $messages['purgefolderconfirm'] = 'Bent u zeker dat u alle berichten in deze map wilt verwijderen?';
+$messages['contactdeleting'] = 'Bezig met verwijderen één of meer contactpersonen...';
+$messages['groupdeleting'] = 'Groep wordt verwijderd...';
 $messages['folderdeleting'] = 'Map verwijderen...';
 $messages['foldermoving'] = 'Map verplaatsen...';
+$messages['foldersubscribing'] = 'Bezig met abonneren op map...';
+$messages['folderunsubscribing'] = 'Abonnement op map wordt opgezegd...';
 $messages['formincomplete'] = 'Het formulier is niet volledig ingevuld...';
 $messages['noemailwarning'] = 'Geef een geldig e-mailadres op...';
 $messages['nonamewarning'] = 'Geef een naam op...';
@@ -70,15 +75,18 @@ $messages['nosubjectwarning'] = 'Geen onderwerp opgegeven. Wenst u alsnog een on
 $messages['nobodywarning'] = 'Wilt u dit lege bericht versturen?';
 $messages['notsentwarning'] = 'Het bericht is niet verzonden. Wilt u het bericht verwijderen?';
 $messages['noldapserver'] = 'Kies een LDAP server waarop gezocht moet worden...';
-$messages['nocontactsreturned'] = 'Geen contactpersonen gevonden';
 $messages['nosearchname'] = 'Geen een contacpersoon of e-mailadres op...';
 $messages['notuploadedwarning'] = 'Nog niet alle bijlagen zijn geüpload. Wacht even of annuleer de upload.';
 $messages['searchsuccessful'] = '$nr berichten gevonden';
+$messages['contactsearchsuccessful'] = '$nr contactpersonen gevonden.';
 $messages['searchnomatch'] = 'Zoekopdracht leverde geen resultaten';
 $messages['searching'] = 'Bezig met zoeken...';
 $messages['checking'] = 'Bezig met controleren...';
 $messages['nospellerrors'] = 'Geen spelfouten gevonden';
 $messages['folderdeleted'] = 'Map met succes verwijderd';
+$messages['foldersubscribed'] = 'Folder succesvol geabonneerd.';
+$messages['folderunsubscribed'] = 'Folder succesvol uitgeschreven.';
+$messages['folderpurged'] = 'Folder met succes geleegd.';
 $messages['folderexpunged'] = 'Map met succes geleegd';
 $messages['deletedsuccessfully'] = 'Succesvol verwijderd';
 $messages['converting'] = 'Opmaak van het bericht wordt gewist...';
@@ -91,8 +99,11 @@ $messages['sourceisreadonly'] = 'Het adres kan niet worden opgeslagen';
 $messages['errorsavingcontact'] = 'Kon de contactpersoon niet bewaren';
 $messages['movingmessage'] = 'Bericht wordt verplaatst...';
 $messages['copyingmessage'] = 'Bericht wordt gekopieerd...';
+$messages['copyingcontact'] = 'Kopiëren contactpersonen...';
 $messages['deletingmessage'] = 'Bericht wordt verwijderd...';
 $messages['markingmessage'] = 'Bericht wordt gemarkeerd...';
+$messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
+$messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
 $messages['receiptsent'] = 'Ontvangstbevestiging verstuurd';
 $messages['errorsendingreceipt'] = 'Kon de ontvangstbevestigign niet versturen';
 $messages['nodeletelastidentity'] = 'U kunt dit laatste afzendadres niet verwijderen.';
@@ -104,6 +115,7 @@ $messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de
 $messages['importwait'] = 'Importeren, even geduld...';
 $messages['importerror'] = 'Importeren mislukt! Het verstuurde bestand is geen geldig vCard bestand.';
 $messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd, en $skipped bestaande overgeslagen</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
 $messages['opnotpermitted'] = 'Deze actie is niet toegestaan!';
 $messages['nofromaddress'] = 'Er is geen e-mailadres in de geselecteerde identiteit';
 $messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet je zeker dat je verder wil gaan?';
@@ -113,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP Fout ($code): Authenticatie mislukt';
 $messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg)';
 $messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken';
-$messages['smtpdsnerror'] = 'SMTP Fout: Delivery Status Notifications worden niet ondersteund';
 $messages['smtperror'] = 'SMTP Fout: $msg';
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
 $messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max';
@@ -121,17 +132,27 @@ $messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is d
 $messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals';
 $messages['contactdelerror'] = 'Kon contactpersoon niet verwijderen';
 $messages['contactdeleted'] = 'Contactpersoon succesvol verwijderd';
+$messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden';
+$messages['contactrestored'] = 'Contactpersonen succesvol hersteld.';
 $messages['groupdeleted'] = 'Groep succesvol verwijderd';
 $messages['grouprenamed'] = 'Groep succesvol hernoemd';
 $messages['groupcreated'] = 'Groep succesvol aangemaakt';
+$messages['savedsearchdeleted'] = 'Opgeslagen zoekopdracht successvol verwijderd.';
+$messages['savedsearchdeleteerror'] = 'Opgeslagen zoekopdracht kon niet worden verwijderd.';
+$messages['savedsearchcreated'] = 'Zoekopdracht successvol opgeslagen.';
+$messages['savedsearchcreateerror'] = 'Zoekopdracht kon niet worden opgeslagen.';
 $messages['messagedeleted'] = 'Bericht(en) succesvol verwijderd';
 $messages['messagemoved'] = 'Bericht(en) succesvol verplaatst';
 $messages['messagecopied'] = 'Bericht(en) succesvol gekopieerd';
 $messages['messagemarked'] = 'Bericht(en) succesvol gemarkeerd';
 $messages['autocompletechars'] = 'Geef ten minste $min karakters voor auto aanvullen';
+$messages['autocompletemore'] = 'Meerdere resultaten gevonden. Verfijn uw zoekopdracht.';
 $messages['namecannotbeempty'] = 'Naam kan niet leeg zijn';
 $messages['nametoolong'] = 'Naam is te lang';
 $messages['folderupdated'] = 'Map succesvol geüpdatet';
 $messages['foldercreated'] = 'Map succesvol aangemaakt';
+$messages['invalidimageformat'] = 'Geen geldig afbeeldingsformaat';
+$messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht';
+$messages['parentnotwritable'] = 'U heeft niet voldoende rechten een map te maken / verplaatsen in deze map.';
+$messages['messagetoobig'] = 'Dit deel van uw bericht is te groot om het te verwerken.';
 
-?>
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 329ce883c..0ce2d8e2f 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -1,24 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nl_NL/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mark Moses <mark@katmoda.com>                                 |
-|         Lazlo Westerhof <roundcube@lazlo.me>                          |
-|         Laurens Vets <laurens@daemon.be>                              |
-|         Frits Letteboer <f.letteboer@radiotwenterand.nl>              |
-|         Justin van Beusekom <j.v.beusekom@beus-it.nl>                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Geert Wirken <Unknown>                                        |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -28,7 +21,7 @@ $labels['password'] = 'Wachtwoord';
 $labels['server'] = 'Server';
 $labels['login'] = 'Inloggen';
 $labels['logout'] = 'Uitloggen';
-$labels['mail'] = 'E-Mail';
+$labels['mail'] = 'E-mail';
 $labels['settings'] = 'Instellingen';
 $labels['addressbook'] = 'Adresboek';
 $labels['inbox'] = 'Postvak IN';
@@ -49,6 +42,7 @@ $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
 $labels['mailboxlist'] = 'Mappen';
+$labels['folders'] = 'Mappen';
 $labels['messagesfromto'] = 'Bericht $from t/m $to van $count';
 $labels['threadsfromto'] = 'Conversatie $from t/m $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
@@ -78,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mrt';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mei';
+$labels['longmay'] = 'Mei';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -89,7 +84,6 @@ $labels['longjan'] = 'Januari';
 $labels['longfeb'] = 'Februari';
 $labels['longmar'] = 'Maart';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mei';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'Augustus';
@@ -125,6 +119,7 @@ $labels['moreactions'] = 'Meer acties';
 $labels['select'] = 'Selecteer';
 $labels['all'] = 'Allemaal';
 $labels['none'] = 'Geen';
+$labels['nonesort'] = 'Geen';
 $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
@@ -144,7 +139,6 @@ $labels['expand_only_unread'] = 'alleen met ongelezen berichten';
 $labels['fromto'] = 'Afzender/Ontvanger';
 $labels['flag'] = 'Markeer';
 $labels['attachment'] = 'Bijlage';
-$labels['nonesort'] = 'Geen';
 $labels['sentdate'] = 'Verzend datum';
 $labels['arrival'] = 'Aankomst datum';
 $labels['asc'] = 'oplopend';
@@ -152,7 +146,7 @@ $labels['desc'] = 'aflopend';
 $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteerkolom';
 $labels['listorder'] = 'Sorteervolgorde';
-$labels['listmode'] = 'Lijstweergave mode';
+$labels['listmode'] = 'Weergavemodus';
 $labels['folderactions'] = 'Acties voor map...';
 $labels['compact'] = 'Opschonen';
 $labels['empty'] = 'Legen';
@@ -173,14 +167,14 @@ $labels['addattachment'] = 'Voeg een bijlage toe';
 $labels['charset'] = 'Karakterset';
 $labels['editortype'] = 'Opmaak';
 $labels['returnreceipt'] = 'Ontvangstbevestiging';
-$labels['dsn'] = 'Afleverings status notificatie (DSN)';
+$labels['dsn'] = 'Afleveringsbericht (DSN)';
 $labels['mailreplyintro'] = '$sender schreef op $date:';
 $labels['originalmessage'] = 'Originele bericht';
 $labels['editidents'] = 'Bewerk identiteiten';
 $labels['checkspelling'] = 'Controleer spelling';
 $labels['resumeediting'] = 'Doorgaan met opstellen';
 $labels['revertto'] = 'Wijzig terug in';
-$labels['attachments'] = 'Bijlages';
+$labels['attachments'] = 'Bijlagen';
 $labels['upload'] = 'Toevoegen';
 $labels['uploadprogress'] = '$percent ($current van $total)';
 $labels['close'] = 'Sluit';
@@ -218,7 +212,7 @@ $labels['jobtitle'] = 'Functietitel';
 $labels['department'] = 'Afdeling';
 $labels['gender'] = 'Geslacht';
 $labels['maidenname'] = 'Meisjesnaam';
-$labels['email'] = 'E-Mail';
+$labels['email'] = 'E-mail';
 $labels['phone'] = 'Telefoon';
 $labels['address'] = 'Adres';
 $labels['street'] = 'Straat';
@@ -235,14 +229,15 @@ $labels['male'] = 'Man';
 $labels['female'] = 'Vrouw';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistent';
+$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Echtgenoot';
 $labels['allfields'] = 'Alle velden';
 $labels['search'] = 'Zoeken';
 $labels['advsearch'] = 'Geavanceerd zoeken';
 $labels['other'] = 'Anders';
+$labels['typeother'] = 'Anders';
 $labels['typehome'] = 'Thuis';
 $labels['typework'] = 'Werk';
-$labels['typeother'] = 'Anders';
 $labels['typemobile'] = 'Mobiel';
 $labels['typemain'] = 'Belangrijkste';
 $labels['typehomefax'] = 'Fax Thuis';
@@ -250,7 +245,6 @@ $labels['typeworkfax'] = 'Fax Werk';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Pieper';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistent';
 $labels['typehomepage'] = 'Website';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profiel';
@@ -283,7 +277,7 @@ $labels['nextpage'] = 'Volgende pagina';
 $labels['lastpage'] = 'Laatste pagina';
 $labels['group'] = 'Groep';
 $labels['groups'] = 'Groepen';
-$labels['personaladrbook'] = 'Persoonlijk Adresboek';
+$labels['personaladrbook'] = 'Persoonlijk adresboek';
 $labels['searchsave'] = 'Zoekopdracht opslaan';
 $labels['searchdelete'] = 'Zoekopdracht verwijderen';
 $labels['import'] = 'Importeer';
@@ -294,6 +288,7 @@ $labels['importreplace'] = 'Vervang het complete adresboek';
 $labels['importtext'] = 'U kunt hier contactpersonen importeren vanuit een bestaand adresboek.<br />Op dit moment ondersteunen wij het <a href="http://nl.wikipedia.org/wiki/VCard">vCard</a> bestandsformaat.';
 $labels['done'] = 'Klaar';
 $labels['settingsfor'] = 'Instellingen voor';
+$labels['about'] = 'Over';
 $labels['preferences'] = 'Instellingen';
 $labels['userpreferences'] = 'Gebruikersinstellingen';
 $labels['editpreferences'] = 'Wijzig gebruikersinstellingen';
@@ -304,9 +299,9 @@ $labels['newitem'] = 'Nieuw item';
 $labels['edititem'] = 'Wijzig item';
 $labels['preferhtml'] = 'Toon HTML';
 $labels['defaultcharset'] = 'Standaard karakterset';
-$labels['htmlmessage'] = 'HTML-Bericht';
-$labels['dateformat'] = 'Datum formaat';
-$labels['timeformat'] = 'Tijd formaat';
+$labels['htmlmessage'] = 'HTML-bericht';
+$labels['dateformat'] = 'Datumnotatie';
+$labels['timeformat'] = 'Tijdweergave';
 $labels['prettydate'] = 'Gebruiksvriendelijke data';
 $labels['setdefault'] = 'Stel in als standaard';
 $labels['autodetect'] = 'Automatisch';
@@ -315,11 +310,11 @@ $labels['timezone'] = 'Tijdzone';
 $labels['pagesize'] = 'Aantal berichten per pagina';
 $labels['signature'] = 'Ondertekening';
 $labels['dstactive'] = 'Zomertijd';
-$labels['htmleditor'] = 'Maak HTML berichten aan';
-$labels['htmlonreply'] = 'alleen bij het beantwoorden van HTML berichten';
-$labels['htmlsignature'] = 'HTML onderschrift';
+$labels['htmleditor'] = 'Stel berichten op in HTML-opmaak';
+$labels['htmlonreply'] = 'alleen bij beantwoorden van HTML-berichten';
+$labels['htmlsignature'] = 'HTML-ondertekening';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
-$labels['skin'] = 'Opmaakprofiel';
+$labels['skin'] = 'Interfacestijl';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
 $labels['logoutcompact'] = 'Postvak IN opschonen bij uitloggen';
 $labels['uisettings'] = 'Gebruikersinterface';
@@ -332,7 +327,7 @@ $labels['autosendknown'] = 'stuur ontvangstbevestiging alleen naar mijn contactp
 $labels['autosendknownignore'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen,  voor anderen negeren';
 $labels['ignore'] = 'negeer';
 $labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
-$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren ';
+$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
 $labels['showremoteimages'] = 'Geef externe toegevoegde berichten weer';
@@ -344,27 +339,27 @@ $labels['everynminutes'] = 'iedere $n minuten';
 $labels['keepalive'] = 'Controleer op nieuwe berichten';
 $labels['never'] = 'nooit';
 $labels['immediately'] = 'onmiddellijk';
-$labels['messagesdisplaying'] = 'Berichten weergave';
+$labels['messagesdisplaying'] = 'Berichtenweergave';
 $labels['messagescomposition'] = 'Berichten aanmaken';
 $labels['mimeparamfolding'] = 'Namen van bijlagen';
 $labels['2231folding'] = 'Volledig RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Volledig RFC 2047 (andere)';
-$labels['force7bit'] = 'Gebruik MIME codering voor 8-bit karakters';
+$labels['force7bit'] = 'Gebruik MIME-codering voor 8-bit karakters';
 $labels['advancedoptions'] = 'Geavanceerde opties';
 $labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
 $labels['checkallfolders'] = 'Controleer alle mappen op nieuwe berichten';
 $labels['displaynext'] = 'Na verplaatsen/verwijderen het volgende bericht tonen';
+$labels['defaultfont'] = 'Standaardlettertype voor HTML-berichten';
 $labels['mainoptions'] = 'Hoofdopties';
 $labels['section'] = 'Sectie';
 $labels['maintenance'] = 'Onderhoud';
 $labels['newmessage'] = 'Nieuw bericht';
-$labels['listoptions'] = 'Lijstopties';
 $labels['signatureoptions'] = 'Instellingen voor ondertekening';
-$labels['whenreplying'] = 'bij antwoorden';
+$labels['whenreplying'] = 'Bij antwoorden';
 $labels['replytopposting'] = 'begin bericht boven het origineel';
 $labels['replybottomposting'] = 'begin bericht onder het origineel';
-$labels['replyremovesignature'] = 'Verwijder ondertekening uit het origneel bij het antwoorden';
+$labels['replyremovesignature'] = 'Verwijder oorspronkelijke ondertekening van bericht bij beantwoorden';
 $labels['autoaddsignature'] = 'Ondertekening automatisch toevoegen';
 $labels['newmessageonly'] = 'alleen bij nieuwe berichten';
 $labels['replyandforwardonly'] = 'alleen bij antwoorden en doorsturen';
@@ -372,21 +367,20 @@ $labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorstu
 $labels['belowquote'] = 'onder het citaat';
 $labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Ondertekening invoegen';
-$labels['previewpanemarkread'] = 'Markeer voorbeeld bericht als gelezen';
+$labels['previewpanemarkread'] = 'Markeer voorbeeldberichten als gelezen';
 $labels['afternseconds'] = 'Na $n seconden';
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
-$labels['reqdsn'] = 'Vraag altijd een afleverings status notificatie (DSN)';
-$labels['replysamefolder'] = 'Plaats antwoorden in de folder van het beantwoorde bericht';
+$labels['reqdsn'] = 'Vraag altijd om een afleveringsbericht';
+$labels['replysamefolder'] = 'Bewaar reacties in de map van het beantwoorde bericht';
 $labels['defaultaddressbook'] = 'Voeg nieuw contactpersoon toe aan geselecteerd adresboek';
-$labels['autocompletesingle'] = 'Sla alternatieve E-mail adressen over bij automatisch aanvullen';
-$labels['spellcheckbeforesend'] = 'Controleer slepping voordat het bericht wordt verzonden';
+$labels['autocompletesingle'] = 'Sla alternatieve e-mailadressen over bij automatisch aanvullen';
+$labels['spellcheckbeforesend'] = 'Controleer spelling voor het versturen van een bericht';
 $labels['spellcheckoptions'] = 'Instellingen spellingscontrole';
 $labels['spellcheckignoresyms'] = 'Negeer woorden met symbolen';
 $labels['spellcheckignorenums'] = 'Negeer woorden met cijfers';
 $labels['spellcheckignorecaps'] = 'Negeer woorden welke volledig uit hoofdletters bestaan';
 $labels['addtodict'] = 'Voeg toe aan woordenboek';
 $labels['folder'] = 'Map';
-$labels['folders'] = 'Mappen';
 $labels['foldername'] = 'Mapnaam';
 $labels['subscribed'] = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
@@ -396,12 +390,12 @@ $labels['managefolders'] = 'Beheer mappen';
 $labels['specialfolders'] = 'Speciale mappen';
 $labels['properties'] = 'Eigenschappen';
 $labels['folderproperties'] = 'Map eigenschappen';
-$labels['parentfolder'] = 'Hoofd folder';
+$labels['parentfolder'] = 'Bovenliggende map';
 $labels['location'] = 'Locatie';
 $labels['info'] = 'Informatie';
-$labels['getfoldersize'] = 'Klik hier voor de map grootte';
+$labels['getfoldersize'] = 'Klik om de omvang van de map te berekenen';
 $labels['changesubscription'] = 'Klik voor het wijzigen van de inschrijving';
-$labels['foldertype'] = 'Mapgrootte';
+$labels['foldertype'] = 'Maptype';
 $labels['personalfolder'] = 'Privé map';
 $labels['otherfolder'] = 'Map van andere gebruiker';
 $labels['sharedfolder'] = 'Publieke map';
@@ -409,14 +403,19 @@ $labels['sortby'] = 'Sorteer op';
 $labels['sortasc'] = 'Sorteer oplopend';
 $labels['sortdesc'] = 'Sorteer aflopend';
 $labels['undo'] = 'Ongedaan maken';
+$labels['plugin'] = 'Invoegtoepassing';
+$labels['version'] = 'Versie';
+$labels['source'] = 'Broncode';
+$labels['license'] = 'Licentie';
+$labels['support'] = 'Ondersteuning verkrijgen';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engels';
-$labels['westerneuropean'] = 'West-Europeaans';
-$labels['easterneuropean'] = 'Oost-Europeaans';
+$labels['westerneuropean'] = 'West-Europees';
+$labels['easterneuropean'] = 'Oost-Europees';
 $labels['southeasterneuropean'] = 'Zuidoost Europees';
 $labels['baltic'] = 'Baltisch';
 $labels['cyrillic'] = 'Cyrillisch';
@@ -432,4 +431,3 @@ $labels['japanese'] = 'Japans';
 $labels['korean'] = 'Koreaans';
 $labels['chinese'] = 'Chinees';
 
-?>
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 9161bbceb..321a88eef 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -1,33 +1,27 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nl_NL/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mark Moses <mark@katmoda.com>                                 |
-|         Lazlo Westerhof <roundcube@lazlo.me>                          |
-|         Frits Letteboer <f.letteboer@radiotwenterand.nl>              |
-|         Justin van Beusekom <j.v.beusekom@beus-it.nl>                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Justin van Beusekom <Unknown>                                 |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
 $messages['loginfailed'] = 'Inloggen mislukt.';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies.';
 $messages['sessionerror'] = 'Uw sessie is verlopen of ongeldig.';
-$messages['imaperror'] = 'Connectie met IMAP server mislukt.';
-$messages['servererror'] = 'Server Fout!';
-$messages['servererrormsg'] = 'Server Fout: $msg';
-$messages['dberror'] = 'Database Fout!';
+$messages['imaperror'] = 'Verbinding met IMAP-server mislukt.';
+$messages['servererror'] = 'Serverfout!';
+$messages['servererrormsg'] = 'Serverfout: $msg';
+$messages['dberror'] = 'Databasefout!';
 $messages['errorreadonly'] = 'Niet in staat om de bewerking uit te voeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
@@ -37,35 +31,35 @@ $messages['mailboxempty'] = 'Mailbox is leeg.';
 $messages['loading'] = 'Laden...';
 $messages['uploading'] = 'Bestand wordt geüpload...';
 $messages['uploadingmany'] = 'Bestanden worden geüpload...';
-$messages['loadingdata'] = 'Laden van data...';
+$messages['loadingdata'] = 'Gegevens worden geladen...';
 $messages['checkingmail'] = 'Controleren op nieuwe berichten...';
-$messages['sendingmessage'] = 'Bezig met bericht versturen...';
+$messages['sendingmessage'] = 'Bericht versturen...';
 $messages['messagesent'] = 'Bericht succesvol verstuurd.';
-$messages['savingmessage'] = 'Bezig met bericht opslaan...';
-$messages['messagesaved'] = 'Bericht bewaard als concept.';
+$messages['savingmessage'] = 'Bericht wordt opgeslagen...';
+$messages['messagesaved'] = 'Bericht opgeslagen in Concepten.';
 $messages['successfullysaved'] = 'Succesvol opgeslagen.';
 $messages['addedsuccessfully'] = 'Contact is succesvol toegevoegd aan het adresboek.';
 $messages['contactexists'] = 'Er bestaat al een contactpersoon met dit e-mailadres.';
 $messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.';
-$messages['blockedimages'] = 'Uit privacyoverwegingen zijn niet bijgevoegde afbeeldingen geblokkeerd in dit bericht.';
+$messages['blockedimages'] = 'Om uw privacy te beschermen zijn externe afbeeldingen geblokkeerd in dit bericht.';
 $messages['encryptedmessage'] = 'Dit is een gecodeerd bericht en kan niet weergegeven worden. Excuses!';
 $messages['nocontactsfound'] = 'Geen contactpersonen gevonden.';
 $messages['contactnotfound'] = 'Contactpersoon niet gevonden.';
-$messages['contactsearchonly'] = 'Voer enkele zoektermen in om contactpersonen te zoeken.';
+$messages['contactsearchonly'] = 'Voer enkele zoektermen in om contactpersonen te zoeken';
 $messages['sendingfailed'] = 'Verzenden van bericht is mislukt.';
-$messages['senttooquickly'] = 'Je moet $sec seconden wachten om het bericht te versturen.';
+$messages['senttooquickly'] = 'U moet $sec seconde(n) wachten om het bericht te versturen.';
 $messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht.';
 $messages['errorsaving'] = 'Er is een fout opgetreden tijdens het opslaan.';
-$messages['errormoving'] = 'Kan het bericht niet verplaatsen.';
-$messages['errorcopying'] = 'Kan de bericht(en) niet kopiëren.';
-$messages['errordeleting'] = 'Kan het bericht niet verwijderen.';
-$messages['errormarking'] = 'Kon bericht niet markeren.';
-$messages['deletecontactconfirm'] = 'Weet u zeker dat u de geselecteerde contactperso(o)n/en wilt verwijderen?';
+$messages['errormoving'] = 'Kan bericht(en) niet verplaatsen.';
+$messages['errorcopying'] = 'Kan bericht(en) niet kopiëren.';
+$messages['errordeleting'] = 'Kan bericht(en) niet verwijderen.';
+$messages['errormarking'] = 'Kan bericht(en) niet markeren.';
+$messages['deletecontactconfirm'] = 'Weet u zeker dat u de geselecteerde contact(en) wilt verwijderen?';
 $messages['deletegroupconfirm'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
 $messages['deletemessagesconfirm'] = 'Weet u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
 $messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
 $messages['purgefolderconfirm'] = 'Weet u zeker dat u alle berichten in deze map wilt verwijderen?';
-$messages['contactdeleting'] = 'Bezig met verwijderen één of meer contactpersonen...';
+$messages['contactdeleting'] = 'Bezig met verwijderen van contact(en)...';
 $messages['groupdeleting'] = 'Groep wordt verwijderd...';
 $messages['folderdeleting'] = 'Map wordt verwijderd...';
 $messages['foldermoving'] = 'Map wordt verplaatst...';
@@ -80,8 +74,8 @@ $messages['norecipientwarning'] = 'Geef tenminste één ontvanger op.';
 $messages['nosubjectwarning'] = 'Het \'Onderwerp\' veld is leeg. Wilt u nu alsnog een onderwerp opgeven?';
 $messages['nobodywarning'] = 'Dit bericht zonder inhoud versturen?';
 $messages['notsentwarning'] = 'Bericht is niet verstuurd. Weet u zeker dat u het niet wilt bewaren?';
-$messages['noldapserver'] = 'Geef een LDAP adresboek server op om te doorzoeken.';
-$messages['nosearchname'] = 'Geef de naam of e-mail op van de contactpersoon.';
+$messages['noldapserver'] = 'Selecteer een LDAP-server om te zoeken.';
+$messages['nosearchname'] = 'Vul de naam of e-mailadres in van een contactpersoon.';
 $messages['notuploadedwarning'] = 'Nog niet alle bijlagen zijn geüpload. Wacht even of annuleer de upload.';
 $messages['searchsuccessful'] = '$nr berichten gevonden.';
 $messages['contactsearchsuccessful'] = '$nr contactpersonen gevonden.';
@@ -94,7 +88,7 @@ $messages['foldersubscribed'] = 'Folder succesvol geabonneerd.';
 $messages['folderunsubscribed'] = 'Folder succesvol uitgeschreven.';
 $messages['folderpurged'] = 'Folder met succes geleegd.';
 $messages['folderexpunged'] = 'Folder succesvol geleegd.';
-$messages['deletedsuccessfully'] = 'Successvol verwijderd.';
+$messages['deletedsuccessfully'] = 'Met succes verwijderd.';
 $messages['converting'] = 'Opmaak van bericht verwijderen...';
 $messages['messageopenerror'] = 'Kan het bericht niet van de server laden.';
 $messages['fileuploaderror'] = 'Bestand uploaden mislukt.';
@@ -103,11 +97,11 @@ $messages['copysuccess'] = '$nr adressen succesvol gekopieerd.';
 $messages['copyerror'] = 'Kan geen adressen kopiëren.';
 $messages['sourceisreadonly'] = 'Het adres is alleen-lezen.';
 $messages['errorsavingcontact'] = 'Kan het ontvanger-adres niet opslaan.';
-$messages['movingmessage'] = 'Bericht verplaatsen...';
-$messages['copyingmessage'] = 'Kopiëren bericht...';
-$messages['copyingcontact'] = 'Kopiëren contactpersonen...';
-$messages['deletingmessage'] = 'Verwijderen bericht(en)...';
-$messages['markingmessage'] = 'Markeren bericht(en)...';
+$messages['movingmessage'] = 'Bericht(en) verplaatsen...';
+$messages['copyingmessage'] = 'Bericht(en) kopiëren...';
+$messages['copyingcontact'] = 'Contact(en) kopiëren...';
+$messages['deletingmessage'] = 'Bericht(en) verwijderen...';
+$messages['markingmessage'] = 'Bericht(en) markeren...';
 $messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
 $messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
 $messages['receiptsent'] = 'Ontvangstbevestiging is verstuurd.';
@@ -160,5 +154,5 @@ $messages['foldercreated'] = 'Map succesvol aangemaakt';
 $messages['invalidimageformat'] = 'Geen geldig afbeeldings formaat';
 $messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht';
 $messages['parentnotwritable'] = 'U heeft niet voldoende rechten een map te maken / verplaatsen in deze map.';
+$messages['messagetoobig'] = 'Het bericht is te groot om te verwerken.';
 
-?>
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index f487fa733..a6d111cf4 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nn_NO/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Per-Stian Vatne <psv@orsta.org>                               |
-| Update: Odin Omdal Hørthe <odin.omdal@gmail.com>                      |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nn_NO/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,7 +40,8 @@ $labels['date'] = 'Dato';
 $labels['size'] = 'Storleik';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
-$labels['mailboxlist'] = 'Katalogar';
+$labels['mailboxlist'] = 'Mapper';
+$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Meldingar $from til $to av $count';
 $labels['threadsfromto'] = 'Trådar $from til $to ($count stk)';
 $labels['messagenrof'] = 'Melding $nr av $count';
@@ -74,6 +71,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -85,7 +83,6 @@ $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
 $labels['longmar'] = 'Mars';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'August';
@@ -121,6 +118,7 @@ $labels['moreactions'] = 'Fleire handlingar';
 $labels['select'] = 'Vel';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
+$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Gjeldande side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
@@ -140,7 +138,6 @@ $labels['expand_only_unread'] = 'berre med ulesne epostar';
 $labels['fromto'] = 'Sendar/Mottakar';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Vedlegg';
-$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Sendtdato';
 $labels['arrival'] = 'Mottaksdato';
 $labels['asc'] = 'Alfabetisk';
@@ -224,13 +221,14 @@ $labels['notes'] = 'Notatar';
 $labels['male'] = 'Mann';
 $labels['female'] = 'Kvinne';
 $labels['assistant'] = 'Assistent';
+$labels['typeassistant'] = 'Assistent';
 $labels['allfields'] = 'Alle felt';
 $labels['search'] = 'Søk';
 $labels['advsearch'] = 'Avansert søk';
 $labels['other'] = 'Andre';
+$labels['typeother'] = 'Andre';
 $labels['typehome'] = 'Heim';
 $labels['typework'] = 'Jobb';
-$labels['typeother'] = 'Andre';
 $labels['typemobile'] = 'Mobil';
 $labels['typemain'] = 'Hovud';
 $labels['typehomefax'] = 'Heimefax';
@@ -238,7 +236,6 @@ $labels['typeworkfax'] = 'Jobbfax';
 $labels['typecar'] = 'Bil';
 $labels['typepager'] = 'Personsøkjar';
 $labels['typevideo'] = 'VIdeo';
-$labels['typeassistant'] = 'Assistent';
 $labels['typehomepage'] = 'Heimeside';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
@@ -343,7 +340,6 @@ $labels['mainoptions'] = 'Hovudinnstillingar';
 $labels['section'] = 'Seksjon';
 $labels['maintenance'] = 'Vedlikehald';
 $labels['newmessage'] = 'Ny epost';
-$labels['listoptions'] = 'Liste-innstillingar';
 $labels['signatureoptions'] = 'Signatur-innstillingar';
 $labels['whenreplying'] = 'Når du svarar';
 $labels['replytopposting'] = 'start ny epost oppante originalen';
@@ -359,7 +355,6 @@ $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread'] = 'Merk forehandsviste epostar som leste';
 $labels['afternseconds'] = 'etter $n sekund';
 $labels['folder'] = 'Mappe';
-$labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenamn';
 $labels['subscribed'] = 'Abonnert';
 $labels['messagecount'] = 'Meldingar';
@@ -400,4 +395,3 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
-?>
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index a5b3d2d67..140ea4392 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nn_NO/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Per-Stian Vatne <psv@orsta.org>                               |
-| Update: Odin Omdal Hørthe <odin.omdal@gmail.com>                      |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nn_NO/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -67,7 +63,6 @@ $messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skriva inn eitt emne
 $messages['nobodywarning'] = 'Senda melding utan tekst?';
 $messages['notsentwarning'] = 'Meldinga er ikkje sendt. Vil du kasta ho?';
 $messages['noldapserver'] = 'Vel LDAP-tenar å søkja i';
-$messages['nocontactsreturned'] = 'Fann ingen kontaktar';
 $messages['nosearchname'] = 'Skriv inn kontaktnamn eller epostadressa';
 $messages['notuploadedwarning'] = 'Ikkje alle vedlegga er lasta opp. Vent eller avslutt opplastinga.';
 $messages['searchsuccessful'] = 'Fann $nr meldingar';
@@ -112,4 +107,3 @@ $messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
 $messages['toomanyrecipients'] = 'For mange mottakarar. Senk talet til maksimalt $max.';
 $messages['maxgroupmembersreached'] = 'Du kan berre ha $max grupper, du er over grensa søta.';
 
-?>
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 3d9629744..e83a330e2 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -1,25 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/pl_PL/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Tomasz Pajor        <t.pajor@kei.pl>                          |
-|         Sławomir Cichoń     <slawek.cichon@gmail.com>                 |
-|         Janusz Zamecki      <janusz@zamecki.eu>                       |
-|         Mariusz Szulerecki  <nob@force.eu.org>                        |
-|         Wojciech Szczepucha <donkoyote@gmail.com>                     |
-|         Aleksander Machniak <alec@alec.pl>                            |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/pl_PL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -43,12 +35,14 @@ $labels['to'] = 'Do';
 $labels['cc'] = 'Kopia';
 $labels['bcc'] = 'Ukryta kopia';
 $labels['replyto'] = 'Odpowiedź do';
+$labels['followupto'] = 'Kontynuacja do';
 $labels['date'] = 'Data';
 $labels['size'] = 'Rozmiar';
-$labels['readstatus'] = 'Przeczytano';
 $labels['priority'] = 'Priorytet';
 $labels['organization'] = 'Organizacja';
+$labels['readstatus'] = 'Przeczytano';
 $labels['mailboxlist'] = 'Foldery';
+$labels['folders'] = 'Foldery';
 $labels['messagesfromto'] = 'Wiadomości od $from do $to z $count';
 $labels['threadsfromto'] = 'Wątki od $from do $to z $count';
 $labels['messagenrof'] = 'Wiadomość $nr z $count';
@@ -78,6 +72,7 @@ $labels['feb'] = 'lut';
 $labels['mar'] = 'mar';
 $labels['apr'] = 'kwi';
 $labels['may'] = 'maj';
+$labels['longmay'] = 'maj';
 $labels['jun'] = 'cze';
 $labels['jul'] = 'lip';
 $labels['aug'] = 'sie';
@@ -89,7 +84,6 @@ $labels['longjan'] = 'styczeń';
 $labels['longfeb'] = 'luty';
 $labels['longmar'] = 'marzec';
 $labels['longapr'] = 'kwiecień';
-$labels['longmay'] = 'maj';
 $labels['longjun'] = 'czerwiec';
 $labels['longjul'] = 'lipiec';
 $labels['longaug'] = 'sierpień';
@@ -102,6 +96,10 @@ $labels['checkmail'] = 'Sprawdź skrzynkę';
 $labels['writenewmessage'] = 'Utwórz nową wiadomość';
 $labels['replytomessage'] = 'Odpowiedz nadawcy';
 $labels['replytoallmessage'] = 'Odpowiedz wszystkim';
+$labels['replyall'] = 'Odpowiedz wszystkim';
+$labels['replylist'] = 'Odpowiedz na listę';
+$labels['forwardinline'] = 'Prześlij w treści';
+$labels['forwardattachment'] = 'Prześlij jako załącznik';
 $labels['forwardmessage'] = 'Prześlij dalej';
 $labels['deletemessage'] = 'Usuń wiadomości';
 $labels['movemessagetotrash'] = 'Przenieś wiadomości do Kosza';
@@ -117,10 +115,11 @@ $labels['markread'] = 'Jako przeczytane';
 $labels['markunread'] = 'Jako nieprzeczytane';
 $labels['markflagged'] = 'Jako oflagowane';
 $labels['markunflagged'] = 'Jako nieoflagowane';
-$labels['messageactions'] = 'Więcej akcji...';
+$labels['moreactions'] = 'Więcej akcji...';
 $labels['select'] = 'Zaznacz';
 $labels['all'] = 'Wszystkie';
 $labels['none'] = 'Brak';
+$labels['nonesort'] = 'Brak';
 $labels['currpage'] = 'Bieżąca strona';
 $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';
@@ -140,7 +139,6 @@ $labels['expand_only_unread'] = 'tylko nieprzeczytane';
 $labels['fromto'] = 'Od/Do';
 $labels['flag'] = 'Flaga';
 $labels['attachment'] = 'Załącznik';
-$labels['nonesort'] = 'Brak';
 $labels['sentdate'] = 'Data wysyłki';
 $labels['arrival'] = 'Data odbioru';
 $labels['asc'] = 'rosnąco';
@@ -149,6 +147,7 @@ $labels['listcolumns'] = 'Kolumny';
 $labels['listsorting'] = 'Porządek sortowania';
 $labels['listorder'] = 'Kierunek sortowania';
 $labels['listmode'] = 'Typ listy';
+$labels['folderactions'] = 'Działania na folderach...';
 $labels['compact'] = 'Porządkuj';
 $labels['empty'] = 'Opróżnij';
 $labels['quota'] = 'Użyte miejsce';
@@ -168,12 +167,18 @@ $labels['addattachment'] = 'Dołącz plik';
 $labels['charset'] = 'Kodowanie znaków';
 $labels['editortype'] = 'Typ edytora';
 $labels['returnreceipt'] = 'Potwierdzenie odbioru';
+$labels['dsn'] = 'Status dostarczenia (DSN)';
+$labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):';
+$labels['originalmessage'] = 'Wiadomość oryginalna';
+$labels['editidents'] = 'Edytuj tożsamości';
 $labels['checkspelling'] = 'Sprawdź pisownię';
 $labels['resumeediting'] = 'Zakończ sprawdzanie pisowni';
 $labels['revertto'] = 'Powróć do';
 $labels['attachments'] = 'Załączniki';
 $labels['upload'] = 'Wyślij';
+$labels['uploadprogress'] = '$percent ($current z $total)';
 $labels['close'] = 'Zamknij';
+$labels['messageoptions'] = 'Opcje wiadomości...';
 $labels['low'] = 'Bardzo niski';
 $labels['lowest'] = 'Niski';
 $labels['normal'] = 'Normalny';
@@ -182,6 +187,7 @@ $labels['highest'] = 'Bardzo wysoki';
 $labels['nosubject'] = '(brak tematu)';
 $labels['showimages'] = 'Wyświetl obrazki';
 $labels['alwaysshow'] = 'Zawsze wyświetlaj obrazki od $sender';
+$labels['isdraft'] = 'To jest kopia robocza wiadomości.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Zwykły tekst';
 $labels['savesentmessagein'] = 'Zapisz wiadomość w';
@@ -190,6 +196,7 @@ $labels['maxuploadsize'] = 'Maksymalny rozmiar pliku to $size';
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj Reply-To';
+$labels['addfollowupto'] = 'Dodaj Followup-To';
 $labels['mdnrequest'] = 'Nadawca zażądał potwierdzenia przeczytania tej wiadomości. Czy chcesz go powiadomić?';
 $labels['receiptread'] = 'Potwierdzenie otrzymania';
 $labels['yourmessage'] = 'To jest potwierdzenie dostarczenia Twojej wiadomości';
@@ -197,13 +204,63 @@ $labels['receiptnote'] = 'Uwaga: To potwierdzenie dostarczenia wiadomości oznac
 $labels['name'] = 'Nazwa';
 $labels['firstname'] = 'Imię';
 $labels['surname'] = 'Nazwisko';
+$labels['middlename'] = 'Drugie imię';
+$labels['nameprefix'] = 'Prefiks';
+$labels['namesuffix'] = 'Sufiks';
+$labels['nickname'] = 'Pseudonim';
+$labels['jobtitle'] = 'Zawód';
+$labels['department'] = 'Oddział';
+$labels['gender'] = 'Płeć';
+$labels['maidenname'] = 'N. panieńskie';
 $labels['email'] = 'E-Mail';
+$labels['phone'] = 'Telefon';
+$labels['address'] = 'Adres';
+$labels['street'] = 'Ulica';
+$labels['locality'] = 'Miasto';
+$labels['zipcode'] = 'Kod';
+$labels['region'] = 'Region';
+$labels['country'] = 'Kraj';
+$labels['birthday'] = 'Urodziny';
+$labels['anniversary'] = 'Jubileusz';
+$labels['website'] = 'Strona internetowa';
+$labels['instantmessenger'] = 'Komunikator';
+$labels['notes'] = 'Notatki';
+$labels['male'] = 'mężczyzna';
+$labels['female'] = 'kobieta';
+$labels['manager'] = 'Kierownik';
+$labels['assistant'] = 'Asystent';
+$labels['typeassistant'] = 'Asystent';
+$labels['spouse'] = 'Małżonek';
+$labels['allfields'] = 'Wszystkie pola';
+$labels['search'] = 'Szukaj';
+$labels['advsearch'] = 'Wyszukiwanie zaawansowane';
+$labels['other'] = 'Inne';
+$labels['typeother'] = 'Inne';
+$labels['typehome'] = 'Dom';
+$labels['typework'] = 'Praca';
+$labels['typemobile'] = 'Komórkowy';
+$labels['typemain'] = 'Główny';
+$labels['typehomefax'] = 'Fax domowy';
+$labels['typeworkfax'] = 'Fax firmowy';
+$labels['typecar'] = 'Samochód';
+$labels['typepager'] = 'Pager';
+$labels['typevideo'] = 'Wideo';
+$labels['typehomepage'] = 'Strona domowa';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
+$labels['addfield'] = 'Dodaj pole...';
 $labels['addcontact'] = 'Dodaj nowy kontakt do książki adresowej';
 $labels['editcontact'] = 'Edytuj kontakt';
+$labels['contacts'] = 'Kontakty';
+$labels['contactproperties'] = 'Właściwości';
+$labels['personalinfo'] = 'Informacje osobiste';
 $labels['edit'] = 'Edytuj';
 $labels['cancel'] = 'Anuluj';
 $labels['save'] = 'Zapisz';
 $labels['delete'] = 'Usuń';
+$labels['rename'] = 'Zmień nazwę';
+$labels['addphoto'] = 'Dodaj';
+$labels['replacephoto'] = 'Zamień';
 $labels['newcontact'] = 'Dodaj nowy kontakt';
 $labels['deletecontact'] = 'Usuń zaznaczone kontakty';
 $labels['composeto'] = 'Utwórz wiadomość do wybranych kontaktów';
@@ -212,7 +269,8 @@ $labels['print'] = 'Drukuj';
 $labels['export'] = 'Eksportuj';
 $labels['exportvcards'] = 'Eksport kontaktów w formacie vCard';
 $labels['newcontactgroup'] = 'Utwórz nową grupę';
-$labels['groupactions'] = 'Działania na grupach...';
+$labels['grouprename'] = 'Zmień nazwę grupy';
+$labels['groupdelete'] = 'Usuń grupę';
 $labels['previouspage'] = 'Poprzednia strona';
 $labels['firstpage'] = 'Pierwsza strona';
 $labels['nextpage'] = 'Następna strona';
@@ -220,13 +278,17 @@ $labels['lastpage'] = 'Ostatnia strona';
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupy';
 $labels['personaladrbook'] = 'Kontakty osobiste';
+$labels['searchsave'] = 'Zapisz wyszukiwanie';
+$labels['searchdelete'] = 'Usuń wyszukiwanie';
 $labels['import'] = 'Importuj';
 $labels['importcontacts'] = 'Import kontaktów';
 $labels['importfromfile'] = 'Import z pliku:';
+$labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
 $labels['importreplace'] = 'Zastąp całą książkę adresową';
 $labels['importtext'] = 'Możesz dodać kontakty z istniejącej książki adresowej.<br/>Aktualnie możliwy jest import kontaktów w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Wykonane';
 $labels['settingsfor'] = 'Ustawienia dla';
+$labels['about'] = 'O programie';
 $labels['preferences'] = 'Preferencje';
 $labels['userpreferences'] = 'Preferencje użytkownika';
 $labels['editpreferences'] = 'Edytuj preferencje';
@@ -238,6 +300,8 @@ $labels['edititem'] = 'Edytuj';
 $labels['preferhtml'] = 'Domyślny HTML';
 $labels['defaultcharset'] = 'Domyślny zestaw znaków';
 $labels['htmlmessage'] = 'Wiadomość HTML';
+$labels['dateformat'] = 'Format daty';
+$labels['timeformat'] = 'Format czasu';
 $labels['prettydate'] = 'Ładne daty';
 $labels['setdefault'] = 'Domyślna';
 $labels['autodetect'] = '- wybór automatyczny -';
@@ -282,16 +346,15 @@ $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (przestarzałe)';
 $labels['force7bit'] = 'Używaj kodowania MIME dla znaków 8-bitowych';
-$labels['reqmdn'] = 'Zawsze żądaj potwierdzenia odbioru';
 $labels['advancedoptions'] = 'opcje zaawansowane';
 $labels['focusonnewmessage'] = 'Informuj przeglądarkę o nowej wiadomości';
 $labels['checkallfolders'] = 'Sprawdzaj czy nadeszły nowe wiadomości we wszystkich folderach';
 $labels['displaynext'] = 'Po usunięciu/przeniesieniu wiadomości wyświetl następną';
+$labels['defaultfont'] = 'Czcionka wiadomości HTML';
 $labels['mainoptions'] = 'Opcje główne';
 $labels['section'] = 'Sekcja';
 $labels['maintenance'] = 'Konserwacja';
 $labels['newmessage'] = 'Nowa wiadomość';
-$labels['listoptions'] = 'Opcje list';
 $labels['signatureoptions'] = 'Opcje podpisów';
 $labels['whenreplying'] = 'Podczas odpowiadania rozpocznij wiadomość';
 $labels['replytopposting'] = 'powyżej cytowanej treści';
@@ -306,8 +369,18 @@ $labels['abovequote'] = 'ponad cytowaną treścią';
 $labels['insertsignature'] = 'Wstaw podpis';
 $labels['previewpanemarkread'] = 'Oznacz podglądane wiadomości jako przeczytane';
 $labels['afternseconds'] = 'po $n sekundach';
+$labels['reqmdn'] = 'Zawsze żądaj potwierdzenia odbioru';
+$labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
+$labels['replysamefolder'] = 'Umieszczaj odpowiedzi w folderze wiadomości, na którą odpowiadam';
+$labels['defaultaddressbook'] = 'Nowe kontakty dodawaj do wybranej książki adresowej';
+$labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
+$labels['spellcheckbeforesend'] = 'Przed wysłaniem wiadomości sprawdzaj pisownię';
+$labels['spellcheckoptions'] = 'Opcje sprawdzania pisowni';
+$labels['spellcheckignoresyms'] = 'Ignoruj słowa zawierające symbole';
+$labels['spellcheckignorenums'] = 'Ignoruj słowa zawierające cyfry';
+$labels['spellcheckignorecaps'] = 'Ignoruj słowa pisane wielkimi literami';
+$labels['addtodict'] = 'Dodaj do słownika';
 $labels['folder'] = 'Folder';
-$labels['folders'] = 'Foldery';
 $labels['foldername'] = 'Nazwa folderu';
 $labels['subscribed'] = 'Zasubskrybowany';
 $labels['messagecount'] = 'Wiadomości';
@@ -315,9 +388,26 @@ $labels['create'] = 'Utwórz';
 $labels['createfolder'] = 'Utwórz nowy folder';
 $labels['managefolders'] = 'Zarządzaj folderami';
 $labels['specialfolders'] = 'Foldery specjalne';
+$labels['properties'] = 'Właściwości';
+$labels['folderproperties'] = 'Właściwości folderu';
+$labels['parentfolder'] = 'Folder nadrzędny';
+$labels['location'] = 'Położenie';
+$labels['info'] = 'Informacje';
+$labels['getfoldersize'] = 'Kliknij aby pobrać rozmiar folderu';
+$labels['changesubscription'] = 'Kliknij aby zmienić subskrypcję';
+$labels['foldertype'] = 'Typ folderu';
+$labels['personalfolder'] = 'Folder prywatny';
+$labels['otherfolder'] = 'Folder innego użytkownika';
+$labels['sharedfolder'] = 'Folder współdzielony';
 $labels['sortby'] = 'Sortuj wg';
 $labels['sortasc'] = 'Rosnąco';
 $labels['sortdesc'] = 'Malejąco';
+$labels['undo'] = 'Cofnij';
+$labels['plugin'] = 'Wtyczka';
+$labels['version'] = 'Wersja';
+$labels['source'] = 'Źródła';
+$labels['license'] = 'Licencja';
+$labels['support'] = 'Wsparcie techniczne';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -340,106 +430,4 @@ $labels['vietnamese'] = 'wietnamski';
 $labels['japanese'] = 'japoński';
 $labels['korean'] = 'koreański';
 $labels['chinese'] = 'chiński';
-$labels['folderactions'] = 'Działania na folderach...';
-$labels['contacts'] = 'Kontakty';
-$labels['messageoptions'] = 'Opcje wiadomości...';
-$labels['followupto'] = 'Kontynuacja do';
-$labels['replyall'] = 'Odpowiedz wszystkim';
-$labels['replylist'] = 'Odpowiedz na listę';
-$labels['forwardinline'] = 'Prześlij w treści';
-$labels['forwardattachment'] = 'Prześlij jako załącznik';
-$labels['editidents'] = 'Edytuj tożsamości';
-$labels['addfollowupto'] = 'Dodaj Followup-To';
-$labels['dsn'] = 'Status dostarczenia (DSN)';
-$labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
-$labels['replysamefolder'] = 'Umieszczaj odpowiedzi w folderze wiadomości, na którą odpowiadam';
-$labels['contactproperties'] = 'Właściwości kontaktu';
-$labels['properties'] = 'Właściwości';
-$labels['folderproperties'] = 'Właściwości folderu';
-$labels['parentfolder'] = 'Folder nadrzędny';
-$labels['location'] = 'Położenie';
-$labels['info'] = 'Informacje';
-$labels['getfoldersize'] = 'Kliknij aby pobrać rozmiar folderu';
-$labels['changesubscription'] = 'Kliknij aby zmienić subskrypcję';
-$labels['rename'] = 'Zmień nazwę';
-$labels['middlename'] = 'Drugie imię';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Sufiks';
-$labels['nickname'] = 'Pseudonim';
-$labels['jobtitle'] = 'Zawód';
-$labels['department'] = 'Oddział';
-$labels['gender'] = 'Płeć';
-$labels['maidenname'] = 'N. panieńskie';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adres';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Miasto';
-$labels['zipcode'] = 'Kod';
-$labels['region'] = 'Region';
-$labels['country'] = 'Kraj';
-$labels['birthday'] = 'Urodziny';
-$labels['anniversary'] = 'Jubileusz';
-$labels['website'] = 'Strona internetowa';
-$labels['instantmessenger'] = 'Komunikator';
-$labels['notes'] = 'Notatki';
-$labels['male'] = 'mężczyzna';
-$labels['female'] = 'kobieta';
-$labels['manager'] = 'Kierownik';
-$labels['assistant'] = 'Asystent';
-$labels['spouse'] = 'Małżonek';
-$labels['typehome'] = 'Dom';
-$labels['typework'] = 'Praca';
-$labels['typeother'] = 'Inny';
-$labels['typemobile'] = 'Komórkowy';
-$labels['typemain'] = 'Główny';
-$labels['typehomefax'] = 'Fax domowy';
-$labels['typeworkfax'] = 'Fax firmowy';
-$labels['typecar'] = 'Samochód';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Wideo';
-$labels['typeassistant'] = 'Asystent';
-$labels['typehomepage'] = 'Strona domowa';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profil';
-$labels['addfield'] = 'Dodaj pole...';
-$labels['personalinfo'] = 'Informacje osobiste';
-$labels['addphoto'] = 'Dodaj';
-$labels['replacephoto'] = 'Zamień';
-$labels['foldertype'] = 'Typ folderu';
-$labels['personalfolder'] = 'Folder prywatny';
-$labels['otherfolder'] = 'Folder innego użytkownika'; 
-$labels['sharedfolder'] = 'Folder współdzielony';
-$labels['defaultaddressbook'] = 'Nowe kontakty dodawaj do wybranej książki adresowej';
-$labels['spellcheckbeforesend'] = 'Przed wysłaniem wiadomości sprawdzaj pisownię';
-$labels['allfields'] = 'Wszystkie pola';
-$labels['search'] = 'Szukaj';
-$labels['advsearch'] = 'Wyszukiwanie zaawansowane';
-$labels['other'] = 'Inne';
-$labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
-$labels['grouprename'] = 'Zmień nazwę grupy';
-$labels['groupdelete'] = 'Usuń grupę';
-$labels['undo'] = 'Cofnij';
-$labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):';
-$labels['uploadprogress'] = '$percent ($current z $total)';
-$labels['originalmessage'] = 'Wiadomość oryginalna';
-$labels['moreactions'] = 'Więcej akcji...';
-$labels['searchsave'] = 'Zapisz wyszukiwanie';
-$labels['searchdelete'] = 'Usuń wyszukiwanie';
-$labels['spellcheckoptions'] = 'Opcje sprawdzania pisowni';
-$labels['spellcheckignoresyms'] = 'Ignoruj słowa zawierające symbole';
-$labels['spellcheckignorenums'] = 'Ignoruj słowa zawierające cyfry';
-$labels['spellcheckignorecaps'] = 'Ignoruj słowa pisane wielkimi literami';
-$labels['addtodict'] = 'Dodaj do słownika';
-$labels['dateformat'] = 'Format daty';
-$labels['timeformat'] = 'Format czasu';
-$labels['isdraft'] = 'To jest kopia robocza wiadomości.';
-$labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
-$labels['plugin'] = 'Wtyczka';
-$labels['version'] = 'Wersja';
-$labels['source'] = 'Źródła';
-$labels['license'] = 'Licencja';
-$labels['about'] = 'O programie';
-$labels['support'] = 'Wsparcie techniczne';
-$labels['defaultfont'] = 'Czcionka wiadomości HTML';
 
-?>
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 36ef934ee..d84aaccfd 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -1,25 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/pl_PL/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Tomasz Pajor        <t.pajor@kei.pl>                          |
-| Author: Sławomir Cichoń     <slawek.cichon@gmail.com>                 |
-|         Janusz Zamecki      <janusz@zamecki.eu>                       |
-|         Mariusz Szulerecki  <nob@force.eu.org>                        |
-|         Wojciech Szczepucha <donkoyote@gmail.com>                     |
-|         Aleksander Machniak <alec@alec.pl>                            |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/pl_PL/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -29,6 +21,9 @@ $messages['sessionerror'] = 'Błąd sesji bądź sesja wygasła!';
 $messages['imaperror'] = 'Błąd połączenia z serwerem!';
 $messages['servererror'] = 'Błąd serwera!';
 $messages['servererrormsg'] = 'Błąd serwera: $msg';
+$messages['dberror'] = 'Błąd bazy danych!';
+$messages['errorreadonly'] = 'Nie można wykonać operacji. Folder tylko do odczytu.';
+$messages['errornoperm'] = 'Nie można wykonać operacji. Brak uprawnień.';
 $messages['invalidrequest'] = 'Błędne żądanie! Nie zapisano danych.';
 $messages['nomessagesfound'] = 'Brak wiadomości w skrzynce.';
 $messages['loggedout'] = 'Użytkownik wylogował się poprawnie.';
@@ -45,10 +40,12 @@ $messages['messagesaved'] = 'Wiadomość została zapisana w folderze Kopie robo
 $messages['successfullysaved'] = 'Zapisano.';
 $messages['addedsuccessfully'] = 'Kontakt został dodany.';
 $messages['contactexists'] = 'Kontakt o podanym adresie e-mail już istnieje!';
+$messages['contactnameexists'] = 'Kontakt z podaną nazwą już istnieje!';
 $messages['blockedimages'] = 'Ze względów bezpieczeństwa zewnętrzne obrazki zostały zablokowane.';
 $messages['encryptedmessage'] = 'Przepraszamy, nie można wyświetlić zaszyfrowanej wiadomości!';
 $messages['nocontactsfound'] = 'Nie znaleziono kontaktu!';
 $messages['contactnotfound'] = 'Szukany kontakt nie został odnaleziony.';
+$messages['contactsearchonly'] = 'Użyj wyszukiwarki aby wyświetlić kontakty.';
 $messages['sendingfailed'] = 'Nie udało się wysłać wiadomości!';
 $messages['senttooquickly'] = 'Musisz poczekać $sec sek. aby móc wysłać tą wiadomość!';
 $messages['errorsavingsent'] = 'Wystąpił błąd podczas zapisu wysłanej wiadomości!';
@@ -62,9 +59,12 @@ $messages['deletegroupconfirm'] = 'Czy na pewno chcesz usunąć wybraną grupę?
 $messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunąć wybrane wiadomości?';
 $messages['deletefolderconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
 $messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?';
+$messages['contactdeleting'] = 'Usuwanie kontaktów...';
 $messages['groupdeleting'] = 'Usuwanie grupy...';
 $messages['folderdeleting'] = 'Usuwanie folderu...';
 $messages['foldermoving'] = 'Przenoszenie folderu...';
+$messages['foldersubscribing'] = 'Subskrybowanie folderu...';
+$messages['folderunsubscribing'] = 'Odsubskrybowanie folderu...';
 $messages['formincomplete'] = 'Uzupełnij formularz!';
 $messages['noemailwarning'] = 'Podaj poprawny adres e-mail!';
 $messages['nonamewarning'] = 'Podaj nazwę!';
@@ -75,15 +75,19 @@ $messages['nosubjectwarning'] = 'Nie podano tematu wiadomości. Czy chcesz go te
 $messages['nobodywarning'] = 'Ta wiadomość jest pusta, czy mimo to chcesz ją wysłać?';
 $messages['notsentwarning'] = 'Wiadomość nie została wysłana. Czy chcesz usunąć tę wiadomość?';
 $messages['noldapserver'] = 'Wybierz serwer LDAP!';
-$messages['nocontactsreturned'] = 'Nie znaleziono kontaktów!';
 $messages['nosearchname'] = 'Podaj nazwę kontaktu lub jego adres e-mail.';
 $messages['notuploadedwarning'] = 'Nie wszystkie załączniki zostały pobrane. Poczekaj lub anuluj pobieranie.';
 $messages['searchsuccessful'] = 'Liczba znalezionych wiadomości: $nr.';
+$messages['contactsearchsuccessful'] = 'Znaleziono $nr kontaktów.';
 $messages['searchnomatch'] = 'Nic nie znaleziono.';
 $messages['searching'] = 'Wyszukiwanie...';
 $messages['checking'] = 'Sprawdzanie...';
 $messages['nospellerrors'] = 'Nie znaleziono błędów w pisowni.';
 $messages['folderdeleted'] = 'Folder został pomyślnie usunięty.';
+$messages['foldersubscribed'] = 'Folder został pomyślnie zasubskrybowany.';
+$messages['folderunsubscribed'] = 'Folder został pomyślnie odsubskrybowany.';
+$messages['folderpurged'] = 'Folder został pomyślnie opróżniony.';
+$messages['folderexpunged'] = 'Folder został pomyślnie uporządkowany.';
 $messages['deletedsuccessfully'] = 'Usunięto.';
 $messages['converting'] = 'Konwertowanie tekstu...';
 $messages['messageopenerror'] = 'Nie można załadować wiadomości z serwera.';
@@ -95,8 +99,11 @@ $messages['sourceisreadonly'] = 'Źródło adresu jest tylko do odczytu.';
 $messages['errorsavingcontact'] = 'Nie można było zapisać adresu kontaktu.';
 $messages['movingmessage'] = 'Przenoszenie wiadomości...';
 $messages['copyingmessage'] = 'Kopiowanie wiadomości...';
+$messages['copyingcontact'] = 'Kopiowanie kontaktów...';
 $messages['deletingmessage'] = 'Usuwanie wiadomości...';
 $messages['markingmessage'] = 'Oznaczanie wiadomości...';
+$messages['addingmember'] = 'Dodawanie kontaktów do grupy...';
+$messages['removingmember'] = 'Usuwanie kontaktów z grupy...';
 $messages['receiptsent'] = 'Pomyślnie wysłano potwierdzenie dostarczenia.';
 $messages['errorsendingreceipt'] = 'Nie można wysłać potwierdzenia.';
 $messages['nodeletelastidentity'] = 'Nie można skasować tej tożsamości, ponieważ jest ostatnią.';
@@ -108,6 +115,7 @@ $messages['contactremovedfromgroup'] = 'Kontakty zostały pomyślnie usunięte z
 $messages['importwait'] = 'Importowanie, proszę czekać...';
 $messages['importerror'] = 'Błąd! Pobrany plik nie jest poprawnym plikiem vCard.';
 $messages['importconfirm'] = '<b>Pomyślnie dodano $inserted kontaktów, pominięto $skipped istniejących wpisów</b>:<p><em>$names</em></p>.';
+$messages['importconfirmskipped'] = '<b>Pominięto $skipped istniejących wpisów.</b>';
 $messages['opnotpermitted'] = 'Niedozwolona operacja!';
 $messages['nofromaddress'] = 'Brak adresu e-mail w wybranej tożsamości.';
 $messages['editorwarning'] = 'Zmiana edytora spowoduje utratę formatowania tekstu. Czy jesteś pewien, że chcesz to zrobić?';
@@ -124,45 +132,27 @@ $messages['maxgroupmembersreached'] = 'Liczba członków grupy nie może być wi
 $messages['internalerror'] = 'Wystąpił wewnętrzny błąd systemu. Spróbuj jeszcze raz.';
 $messages['contactdelerror'] = 'Usuwanie kontaktów nie powiodło się.';
 $messages['contactdeleted'] = 'Kontakt(y) został(y) usunięte.';
+$messages['contactrestoreerror'] = 'Przywracanie kontaktów nie powiodło się.';
+$messages['contactrestored'] = 'Kontakt(y) zostały przywrócone.';
 $messages['groupdeleted'] = 'Grupa została usunięta.';
 $messages['grouprenamed'] = 'Nazwa grupy została zmieniona.';
 $messages['groupcreated'] = 'Grupa została utworzona.';
+$messages['savedsearchdeleted'] = 'Wyszukiwanie usunięto pomyślnie.';
+$messages['savedsearchdeleteerror'] = 'Nie można usunąć wyszukiwania.';
+$messages['savedsearchcreated'] = 'Wyszukiwanie zapisano pomyślnie.';
+$messages['savedsearchcreateerror'] = 'Nie można zapisać wyszukiwania.';
 $messages['messagedeleted'] = 'Wiadomości zostały usunięte.';
 $messages['messagemoved'] = 'Wiadomości zostały przeniesione.';
 $messages['messagecopied'] = 'Wiadomości zostały skopiowane.';
 $messages['messagemarked'] = 'Wiadomości zostały oznaczone.';
 $messages['autocompletechars'] = 'Wprowadź co najmniej $min znak(ów) aby skorzystać z autouzupełniania.';
-$messages['foldersubscribing'] = 'Subskrybowanie folderu...';
-$messages['folderunsubscribing'] = 'Odsubskrybowanie folderu...';
-$messages['foldersubscribed'] = 'Folder został pomyślnie zasubskrybowany.';
-$messages['folderunsubscribed'] = 'Folder został pomyślnie odsubskrybowany.';
-$messages['folderpurged'] = 'Folder został pomyślnie opróżniony.';
-$messages['folderexpunged'] = 'Folder został pomyślnie uporządkowany.';
+$messages['autocompletemore'] = 'Znaleziono więcej pasujących wpisów. Wprowadź więcej znaków.';
 $messages['namecannotbeempty'] = 'Nazwa nie może być pusta.';
 $messages['nametoolong'] = 'Nazwa jest zbyt długa.';
 $messages['folderupdated'] = 'Folder został pomyślnie zaktualizowany.';
 $messages['foldercreated'] = 'Folder został pomyślnie utworzony.';
-$messages['errorreadonly'] = 'Nie można wykonać operacji. Folder tylko do odczytu.';
-$messages['errornoperm'] = 'Nie można wykonać operacji. Brak uprawnień.';
-$messages['importconfirmskipped'] = '<b>Pominięto $skipped istniejących wpisów.</b>';
 $messages['invalidimageformat'] = 'Niepoprawny format obrazka.';
 $messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości.';
-$messages['contactrestoreerror'] = 'Przywracanie kontaktów nie powiodło się.';
-$messages['contactrestored'] = 'Kontakt(y) zostały przywrócone.';
-$messages['dberror'] = 'Błąd bazy danych!';
-$messages['contactnameexists'] = 'Kontakt z podaną nazwą już istnieje!';
-$messages['copyingcontact'] = 'Kopiowanie kontaktów...';
-$messages['addingmember'] = 'Dodawanie kontaktów do grupy...';
-$messages['removingmember'] = 'Usuwanie kontaktów z grupy...';
 $messages['parentnotwritable'] = 'Nie można utworzyć/przenieść folderu w wybrane miejsce. Brak upranień.';
-$messages['contactsearchsuccessful'] = 'Znaleziono $nr kontaktów.';
-$messages['savedsearchdeleted'] = 'Wyszukiwanie usunięto pomyślnie.';
-$messages['savedsearchdeleteerror'] = 'Nie można usunąć wyszukiwania.';
-$messages['savedsearchcreated'] = 'Wyszukiwanie zapisano pomyślnie.';
-$messages['savedsearchcreateerror'] = 'Nie można zapisać wyszukiwania.';
-$messages['contactsearchonly'] = 'Użyj wyszukiwarki aby wyświetlić kontakty.';
-$messages['contactdeleting'] = 'Usuwanie kontaktów...';
-$messages['autocompletemore'] = 'Znaleziono więcej pasujących wpisów. Wprowadź więcej znaków.';
 $messages['messagetoobig'] = 'Ta część wiadomości jest zbyt duża aby ją przetworzyć.';
 
-?>
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index e7692e7bc..53bed2352 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -1,253 +1,212 @@
 <?php
 
-
-
-// login page
-$labels['welcome']   = '$product ته ښه راغلاست ';
-$labels['username']  = 'کارن نوم';
-$labels['password']  = 'پټنوم';
-$labels['server']    = 'برابرونکی';
-$labels['login']     = 'ننوتون';
-
-// taskbar
-$labels['logout']   = 'وتون';
-$labels['mail']     = 'برېښناليک';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ps/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
+$labels['welcome'] = '$product ته ښه راغلاست';
+$labels['username'] = 'کارن نوم';
+$labels['password'] = 'پټنوم';
+$labels['server'] = 'برابرونکی';
+$labels['login'] = 'ننوتون';
+$labels['logout'] = 'وتون';
+$labels['mail'] = 'برېښناليک';
 $labels['settings'] = 'ځاني برابرونې';
 $labels['addressbook'] = 'پتې کتاب';
-
-// mailbox names
-$labels['inbox']  = 'راغلي ليکونه';
+$labels['inbox'] = 'راغلي ليکونه';
 $labels['drafts'] = 'بارليک';
-$labels['sent']   = 'لېږل شوي ليکونه';
-$labels['trash']  = 'کثافت دانۍ';
-$labels['junk']   = 'جنک';
-
-// message listing
-$labels['subject'] = ' مضمون';
-$labels['from']    = 'استوونکی';
-$labels['to']      = 'ترلاسه کوونکی';
-$labels['cc']      = 'لمېسل';
-$labels['bcc']     = 'پټليکی';
+$labels['sent'] = 'لېږل شوي ليکونه';
+$labels['trash'] = 'کثافت دانۍ';
+$labels['junk'] = 'جنک';
+$labels['subject'] = 'مضمون';
+$labels['from'] = 'استوونکی';
+$labels['to'] = 'ترلاسه کوونکی';
+$labels['cc'] = 'لمېسل';
+$labels['bcc'] = 'پټليکی';
 $labels['replyto'] = 'ځوابول';
-$labels['date']    = 'نېټه';
-$labels['size']    = 'کچه ';
+$labels['date'] = 'نېټه';
+$labels['size'] = 'کچه';
 $labels['priority'] = 'لومړيتوب';
 $labels['organization'] = 'ټولنه';
-
 $labels['mailboxlist'] = 'پوښۍ';
-$labels['messagesfromto'] = 'له ټاکلي استوزو څخه ټاکلي شمېرل شوو استوزو ته ';
+$labels['folders'] = 'پوښۍ';
+$labels['messagesfromto'] = 'له ټاکلي استوزو څخه ټاکلي شمېرل شوو استوزو ته';
 $labels['messagenrof'] = 'له $nr ځخه استوزو $count استوزو ته';
-
-$labels['moveto']   = 'ته خوځوي';
+$labels['copy'] = 'لمېسل';
+$labels['moveto'] = 'ته خوځوي';
 $labels['download'] = 'ښکته کول';
-
-$labels['filename'] = ' فايل نوم';
+$labels['filename'] = 'فايل نوم';
 $labels['filesize'] = 'فايل کچه';
-
-$labels['preferhtml'] = 'ايچ ټي ام ايل ښوون';
-$labels['htmlmessage'] = 'ايچ ټي ام ايل استوزه';
-$labels['prettydate'] = ' په زړه پورې نېټې';
-
 $labels['addtoaddressbook'] = 'د پتو کتاب ته يې ورزيات کړئ';
-
-// weekdays short
-$labels['sun'] = 'يوه نۍ ';
+$labels['sun'] = 'يوه نۍ';
 $labels['mon'] = 'دوه نۍ';
 $labels['tue'] = 'درې نۍ';
 $labels['wed'] = 'څلورنۍ';
 $labels['thu'] = 'پنځنۍ';
 $labels['fri'] = 'جمعه';
 $labels['sat'] = 'نۍ';
-
-// weekdays long
-$labels['sunday']    = 'يوه نۍ';
-$labels['monday']    = 'دوه نۍ';
-$labels['tuesday']   = 'درې نۍ';
+$labels['sunday'] = 'يوه نۍ';
+$labels['monday'] = 'دوه نۍ';
+$labels['tuesday'] = 'درې نۍ';
 $labels['wednesday'] = 'منځنۍ';
-$labels['thursday']  = 'پنځنۍ';
-$labels['friday']    = 'جمعه';
-$labels['saturday']  = 'نۍ';
-
-// months short
-$labels['jan']	= 'حنوري';
-$labels['feb']	= 'فبروري';
-$labels['mar']	= 'مارچ';
-$labels['apr']	= 'اپريل';
-$labels['may']	= 'مئ';
-$labels['jun']	= 'جون';
-$labels['jul'] 	= 'جولاي';
-$labels['aug']	= 'اګست';
-$labels['sep']	= 'سپتمپر';
-$labels['oct']	= 'اکتوبر';
-$labels['nov']	= 'نومبر';
-$labels['dec']	= 'ډسمبر';
-
-// months long
-$labels['longjan']	= 'جنوري';
-$labels['longfeb']	= 'فبروري';
-$labels['longmar']	= 'مارچ';
-$labels['longapr']	= 'اپريل';
-$labels['longmay']	= 'مئ';
-$labels['longjun']	= 'جون';
-$labels['longjul']	= 'جولای';
-$labels['longaug']	= 'اګست';
-$labels['longsep']	= 'سپتمبر';
-$labels['longoct']	= 'اکتوبر';
-$labels['longnov']	= 'نومبر';
-$labels['longdec']	= 'ډسمبر';
-
-$labels['today'] = 'نن ';
-
-// toolbar buttons
-$labels['checkmail']        = 'نوي استوزي وګوره';
-$labels['writenewmessage']  = 'نوي استوزي جوړول ';
-$labels['replytomessage']   = 'استوونکي ته ځواب ورکړئ';
-$labels['replytoallmessage'] = 'استوونکي او ټولو ترلاسه کوونکو ته ځواب لېږل ';
-$labels['forwardmessage']   = 'استوزه بل ته استول ';
-$labels['deletemessage']    = 'استوزه ړنګول ';
+$labels['thursday'] = 'پنځنۍ';
+$labels['friday'] = 'جمعه';
+$labels['saturday'] = 'نۍ';
+$labels['jan'] = 'حنوري';
+$labels['feb'] = 'فبروري';
+$labels['mar'] = 'مارچ';
+$labels['apr'] = 'اپريل';
+$labels['may'] = 'مئ';
+$labels['longmay'] = 'مئ';
+$labels['jun'] = 'جون';
+$labels['jul'] = 'جولاي';
+$labels['aug'] = 'اګست';
+$labels['sep'] = 'سپتمپر';
+$labels['oct'] = 'اکتوبر';
+$labels['nov'] = 'نومبر';
+$labels['dec'] = 'ډسمبر';
+$labels['longjan'] = 'جنوري';
+$labels['longfeb'] = 'فبروري';
+$labels['longmar'] = 'مارچ';
+$labels['longapr'] = 'اپريل';
+$labels['longjun'] = 'جون';
+$labels['longjul'] = 'جولای';
+$labels['longaug'] = 'اګست';
+$labels['longsep'] = 'سپتمبر';
+$labels['longoct'] = 'اکتوبر';
+$labels['longnov'] = 'نومبر';
+$labels['longdec'] = 'ډسمبر';
+$labels['today'] = 'نن';
+$labels['checkmail'] = 'نوي استوزي وګوره';
+$labels['writenewmessage'] = 'نوي استوزي جوړول';
+$labels['replytomessage'] = 'استوونکي ته ځواب ورکړئ';
+$labels['replytoallmessage'] = 'استوونکي او ټولو ترلاسه کوونکو ته ځواب لېږل';
+$labels['forwardmessage'] = 'استوزه بل ته استول';
+$labels['deletemessage'] = 'استوزه ړنګول';
 $labels['movemessagetotrash'] = 'استوزه کثافت داني ته واستوه';
-$labels['printmessage']     = 'دا استوزه چاپ کړه ';
-$labels['previousmessage']  = 'پخوانۍ استوزه وښيه ';
-$labels['previousmessages'] = 'د استوزو پخوانی غونډ وښيه ';
-$labels['firstmessage']     = 'لومړی استوزه وښيه ';
-$labels['firstmessages']    = 'د استوزو لومړی غونډ وښيه ';
-$labels['nextmessage']      = 'ورپسې استوزه وښيه  ';
-$labels['nextmessages']     = 'د استوزو ورپسې غونډ وښيه ';
-$labels['lastmessage']      = 'پای /آخري استوزه وښيه ';
-$labels['lastmessages']     = 'داستوزو پای غونډ وښيه ';
-$labels['backtolist']       = 'بيرته د استوزو لست ته ';
-$labels['viewsource']       = 'سرچينه وښيه ';
-$labels['markmessages']     = 'استوزي په نښه کړئ ';
-$labels['markread']         = 'لوستل شوي په توګه ';
-$labels['markunread']       = 'د نالوستل شوي په توګه ';
-$labels['markflagged']         = 'د بي کاره په توګه';
-$labels['markunflagged']       = 'د کارونې په توګه';
-
-$labels['select'] = 'ټاکل ';
-$labels['all'] = 'ټول ';
-$labels['none'] = 'هېڅ ';
-$labels['unread'] = 'نالوستي ';
+$labels['printmessage'] = 'دا استوزه چاپ کړه';
+$labels['previousmessage'] = 'پخوانۍ استوزه وښيه';
+$labels['firstmessage'] = 'لومړی استوزه وښيه';
+$labels['nextmessage'] = 'ورپسې استوزه وښيه';
+$labels['lastmessage'] = 'پای /آخري استوزه وښيه';
+$labels['backtolist'] = 'بيرته د استوزو لست ته';
+$labels['viewsource'] = 'سرچينه وښيه';
+$labels['markmessages'] = 'استوزي په نښه کړئ';
+$labels['markread'] = 'لوستل شوي په توګه';
+$labels['markunread'] = 'د نالوستل شوي په توګه';
+$labels['markflagged'] = 'د بي کاره په توګه';
+$labels['markunflagged'] = 'د کارونې په توګه';
+$labels['select'] = 'ټاکل';
+$labels['all'] = 'ټول';
+$labels['none'] = 'هېڅ';
+$labels['nonesort'] = 'هېڅ';
+$labels['unread'] = 'نالوستي';
 $labels['flagged'] = 'بې کاره';
 $labels['unanswered'] = 'ناځواب شوي';
 $labels['filter'] = 'چڼول';
-
-$labels['compact'] = 'کېښکلی ';
-$labels['empty'] = 'تش ';
-$labels['purge'] = 'لرول ';
-
-$labels['quota'] = 'ټيکلي لارښود ';
-$labels['unknown']  = 'نامعلوم ';
-$labels['unlimited']  = 'بي کچه ';
-
-$labels['quicksearch']  = 'ژر پلټنه ';
-$labels['resetsearch']  = 'د پلټنې بياسمون ';
-
+$labels['compact'] = 'کېښکلی';
+$labels['empty'] = 'تش';
+$labels['quota'] = 'ټيکلي لارښود';
+$labels['unknown'] = 'نامعلوم';
+$labels['unlimited'] = 'بي کچه';
+$labels['quicksearch'] = 'ژر پلټنه';
+$labels['resetsearch'] = 'د پلټنې بياسمون';
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
-
-// message compose
-$labels['compose']        = 'استوزه وليکه ';
-$labels['savemessage']    = 'دا ګارليک خوندي کړه ';
-$labels['sendmessage']    = 'اوس يې واستوه';
-$labels['addattachment']  = 'يو فايل ونښلوه ';
-$labels['charset']        = 'چيرست';
-$labels['editortype']     = 'د ټايب سمونګر ';
-$labels['returnreceipt']  = 'د رسليک راګرځېدل ';
-
-$labels['checkspelling'] = 'ليکدود کتنه ';
-$labels['resumeediting'] = 'کارمخينې سمونه ';
-$labels['revertto']      = 'ته بېرته اړول ';
-
-$labels['attachments'] = 'نښلني ';
-$labels['upload'] = 'پورته کول ';
-$labels['close']  = 'بندول ';
-
-$labels['low']     = 'ټيټ ';
-$labels['lowest']  = 'خورا ټيټ ';
-$labels['normal']  = 'نورمال ';
-$labels['high']    = 'لوړ ';
-$labels['highest'] = 'خورا لوړ ';
-
-$labels['nosubject']  = 'هېڅ موضوع';
-$labels['showimages'] = 'انځورونه وښيه ';
+$labels['compose'] = 'استوزه وليکه';
+$labels['savemessage'] = 'دا ګارليک خوندي کړه';
+$labels['sendmessage'] = 'اوس يې واستوه';
+$labels['addattachment'] = 'يو فايل ونښلوه';
+$labels['charset'] = 'چيرست';
+$labels['editortype'] = 'د ټايب سمونګر';
+$labels['returnreceipt'] = 'د رسليک راګرځېدل';
+$labels['checkspelling'] = 'ليکدود کتنه';
+$labels['resumeediting'] = 'کارمخينې سمونه';
+$labels['revertto'] = 'ته بېرته اړول';
+$labels['attachments'] = 'نښلني';
+$labels['upload'] = 'پورته کول';
+$labels['close'] = 'بندول';
+$labels['low'] = 'ټيټ';
+$labels['lowest'] = 'خورا ټيټ';
+$labels['normal'] = 'نورمال';
+$labels['high'] = 'لوړ';
+$labels['highest'] = 'خورا لوړ';
+$labels['nosubject'] = 'هېڅ موضوع';
+$labels['showimages'] = 'انځورونه وښيه';
 $labels['alwaysshow'] = 'تل له $استوونکي څخه انځورونه وښيه';
-
 $labels['htmltoggle'] = 'ايچ ټی ايمل ال';
-$labels['plaintoggle'] = 'ساده متن ';
+$labels['plaintoggle'] = 'ساده متن';
 $labels['savesentmessagein'] = 'استول شوي استوزه په خوندي کړه';
 $labels['dontsave'] = 'مه ساته';
 $labels['maxuploadsize'] = 'لږترلږه د اجازه شوي فايل کچه $وي';
-
-$labels['addcc'] = 'څرګندليک ';
-$labels['addbcc'] = 'پټليک ';
-$labels['addreplyto'] = 'ته ورزيات کړه ';
-
-// mdn
-$labels['mdnrequest'] = 'ددې استوزي استوونکی پوښتي چېد استوزي لوستلو سره سم تاسې خبر کړي،.    غواړئ چې استوونکی خبرشي؟ ';
-$labels['receiptread'] = 'رسليک راګرځېدل (لوستل ';
-$labels['yourmessage'] = ' دا رسليک راګرځېدل ستاسې استوزي لپاره دی ';
+$labels['addcc'] = 'څرګندليک';
+$labels['addbcc'] = 'پټليک';
+$labels['addreplyto'] = 'ته ورزيات کړه';
+$labels['mdnrequest'] = 'ددې استوزي استوونکی پوښتي چېد استوزي لوستلو سره سم تاسې خبر کړي،.    غواړئ چې استوونکی خبرشي؟';
+$labels['receiptread'] = 'رسليک راګرځېدل (لوستل';
+$labels['yourmessage'] = 'دا رسليک راګرځېدل ستاسې استوزي لپاره دی';
 $labels['receiptnote'] = 'يادونه: دا رسليک تاسې ته يوازې ددې خبرتيا درکوي چې کله استوزی د ترلاسه کوونکي په کمپيوټر کې څرګند شي،  ددې هيڅ ډاډګيرنه نشته چې ترلاسه کوونکي د  استوزي متن لوستی او يا پرې پوه شوی دی';
-
-// address boook
-$labels['name']      = 'نوم ښوونه';
-$labels['firstname'] = 'نوم  ';
-$labels['surname']   = 'کورنی نوم ';
-$labels['email']     = 'برېښناليک';
-
-$labels['addcontact'] = 'نوی اړيکلوری ورزيات کړه ';
-$labels['editcontact'] = 'اړيکلوري سمون ';
-
-$labels['edit']   = ' سمون ';
-$labels['cancel'] = 'لري کول ';
-$labels['save']   = 'ساتل ';
-$labels['delete'] = 'ړنګول ';
-
-$labels['newcontact']     = ' نوي اړيکلوري کارټ جوړ کړه   ';
-$labels['deletecontact']  = 'ټاکل شوي اړيکلوري ړنګ کړه ';
-$labels['composeto']      = '  ته ليک وليکه ';
+$labels['name'] = 'نوم ښوونه';
+$labels['firstname'] = 'نوم';
+$labels['surname'] = 'کورنی نوم';
+$labels['email'] = 'برېښناليک';
+$labels['addcontact'] = 'نوی اړيکلوری ورزيات کړه';
+$labels['editcontact'] = 'اړيکلوري سمون';
+$labels['edit'] = 'سمون';
+$labels['cancel'] = 'لري کول';
+$labels['save'] = 'ساتل';
+$labels['delete'] = 'ړنګول';
+$labels['newcontact'] = 'نوي اړيکلوري کارټ جوړ کړه';
+$labels['deletecontact'] = 'ټاکل شوي اړيکلوري ړنګ کړه';
+$labels['composeto'] = 'ته ليک وليکه';
 $labels['contactsfromto'] = 'له دومره اړيکلورو څخه دومره شمېرل شوي Contacts $from to $to of $count';
-$labels['print']          = 'چاپ ';
-$labels['export']         = 'بهرول ';
-$labels['exportvcards']   = 'اړيکلوري د ويکارډ په بڼه واستوئ';
-
-$labels['previouspage']   = 'پخوانی غونډ وښيه  ';
-$labels['firstpage']      = 'لومړی غونډ وښيه  ';
-$labels['nextpage']       = 'ورپسې غونډ وښيه ';
-$labels['lastpage']       = ' پای غونډ وښيه ';
-
-$labels['groups'] = 'ډلې ';
-$labels['personaladrbook'] = 'ځاني پتې ';
-
+$labels['print'] = 'چاپ';
+$labels['export'] = 'بهرول';
+$labels['exportvcards'] = 'اړيکلوري د ويکارډ په بڼه واستوئ';
+$labels['previouspage'] = 'پخوانی غونډ وښيه';
+$labels['firstpage'] = 'لومړی غونډ وښيه';
+$labels['nextpage'] = 'ورپسې غونډ وښيه';
+$labels['lastpage'] = 'پای غونډ وښيه';
+$labels['groups'] = 'ډلې';
+$labels['personaladrbook'] = 'ځاني پتې';
 $labels['import'] = 'رانقلول';
 $labels['importcontacts'] = 'اړيکلوري نقل کړئ';
 $labels['importfromfile'] = 'له فايل څخه رانقل کړئ';
 $labels['importreplace'] = 'ټول ادرس کتاب بدل کړئ';
 $labels['importtext'] = 'تاسې کولی شئ‌چې يو اړيکلوری له شته پتې کتاب څخه پورته کړئ<br/>موږ همدا اوس له  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>پتې رانقلوو . د فايلونو بڼې';
 $labels['done'] = 'ترسره شو';
-
-// settings
-$labels['settingsfor']  = 'لپاره برابرونې ';
-
-$labels['preferences']  = 'غورونې ';
-$labels['userpreferences']  = 'کارن غورونې ';
-$labels['editpreferences']  = 'د کارن غورونو سمون ';
-
-$labels['identities']  = 'پېژندنې ';
-$labels['manageidentities']  = 'ددې حساب پېژندنو برابرول ';
-$labels['newidentity']  = 'نوي پېژندنه ';
-
-$labels['newitem']  = 'نوی توک ';
-$labels['edititem']  = 'توک سمون ';
-
-$labels['setdefault']  = 'تلوالي برابرول ';
-$labels['autodetect']  = 'په خپلواکه توګه';
-$labels['language']  = 'ژبه ';
-$labels['timezone']  = 'سيميز وخت ';
-$labels['pagesize']  = 'په هر مخ پرتې کښې ';
-$labels['signature'] = 'لاسليک ';
-$labels['dstactive']  = 'ورځنيو کارونو لنډيز ساتل';
-$labels['htmleditor'] = 'ايچ ټي‌ام ايل استوزي وليکه ';
-$labels['htmlsignature'] = 'ايچ ټي ام ايل لاسليک ';
-$labels['previewpane'] = ' پخوانی چوکاټ وښييه ';
+$labels['settingsfor'] = 'لپاره برابرونې';
+$labels['preferences'] = 'غورونې';
+$labels['userpreferences'] = 'کارن غورونې';
+$labels['editpreferences'] = 'د کارن غورونو سمون';
+$labels['identities'] = 'پېژندنې';
+$labels['manageidentities'] = 'ددې حساب پېژندنو برابرول';
+$labels['newidentity'] = 'نوي پېژندنه';
+$labels['newitem'] = 'نوی توک';
+$labels['edititem'] = 'توک سمون';
+$labels['preferhtml'] = 'ايچ ټي ام ايل ښوون';
+$labels['htmlmessage'] = 'ايچ ټي ام ايل استوزه';
+$labels['prettydate'] = 'په زړه پورې نېټې';
+$labels['setdefault'] = 'تلوالي برابرول';
+$labels['autodetect'] = 'په خپلواکه توګه';
+$labels['language'] = 'ژبه';
+$labels['timezone'] = 'سيميز وخت';
+$labels['pagesize'] = 'په هر مخ پرتې کښې';
+$labels['signature'] = 'لاسليک';
+$labels['dstactive'] = 'ورځنيو کارونو لنډيز ساتل';
+$labels['htmleditor'] = 'ايچ ټي‌ام ايل استوزي وليکه';
+$labels['htmlsignature'] = 'ايچ ټي ام ايل لاسليک';
+$labels['previewpane'] = 'پخوانی چوکاټ وښييه';
 $labels['skin'] = 'انټرفيس بڼه';
 $labels['logoutclear'] = 'کثافت داني د وتنې په وخت کې پاکه کړه';
 $labels['logoutcompact'] = 'د وتنې په وخت کې ليکبکس ونښلوه';
@@ -265,11 +224,10 @@ $labels['showremoteimages'] = 'انځورونه له لري په ليکه کې �
 $labels['fromknownsenders'] = 'له اشنا استوونکو څخه';
 $labels['always'] = 'تل';
 $labels['showinlineimages'] = 'نښلول شوي انځورونه تر استوزې لاندې ښکاره کړه';
-$labels['autosavedraft']  = 'بارليک په خپل سري توګه  خوندي‌کړه ';
-$labels['everynminutes']  = 'هر ه ګڼه په دقيقو کې  ';
-$labels['keepaliveevery']  = 'هر دقيقې $n';
-$labels['keepalive']  = 'نوي استوزي وګوره په';
-$labels['never']  = 'هېڅ ';
+$labels['autosavedraft'] = 'بارليک په خپل سري توګه  خوندي‌کړه';
+$labels['everynminutes'] = 'هر ه ګڼه په دقيقو کې';
+$labels['keepalive'] = 'نوي استوزي وګوره په';
+$labels['never'] = 'هېڅ';
 $labels['messagesdisplaying'] = 'استوزي ښيي';
 $labels['messagescomposition'] = 'استوزي ليکي';
 $labels['mimeparamfolding'] = 'د نښلول شوو نومونه';
@@ -279,25 +237,19 @@ $labels['2047folding'] = 'Full RFC 2047 (نور)';
 $labels['advancedoptions'] = 'پرمختللي لارې';
 $labels['focusonnewmessage'] = 'فوکاس براوسر کړکۍ په نوي استوزي کې';
 $labels['checkallfolders'] = 'په ټولو پوښيو کې نوي استوزي وګورئ';
-
-$labels['folder']  = 'پوښۍ ';
-$labels['folders']  = 'پوښۍ';
-$labels['foldername']  = 'پوښۍ نوم ';
-$labels['subscribed']  = 'ګډ شو ';
-$labels['messagecount'] = 'استوزي ';
-$labels['create']  = 'جوړول، رامنځ ته کول ';
-$labels['createfolder']  = 'نوې پوښۍ جوړ کړه ';
-$labels['managefolders']  = 'پوښيو څارل ';
+$labels['folder'] = 'پوښۍ';
+$labels['foldername'] = 'پوښۍ نوم';
+$labels['subscribed'] = 'ګډ شو';
+$labels['messagecount'] = 'استوزي';
+$labels['create'] = 'جوړول، رامنځ ته کول';
+$labels['createfolder'] = 'نوې پوښۍ جوړ کړه';
+$labels['managefolders'] = 'پوښيو څارل';
 $labels['specialfolders'] = 'ځانګړي پوښۍۍ';
-
-$labels['sortby'] = ' اڼل  ';
-$labels['sortasc']  = 'له پورته نه ښکته خوا ته برابرول ';
+$labels['sortby'] = 'اڼل';
+$labels['sortasc'] = 'له پورته نه ښکته خوا ته برابرول';
 $labels['sortdesc'] = 'له ښکته نه پورته خوا ته برابرول';
-
-// units
 $labels['B'] = 'بي';
 $labels['KB'] = 'کي بي';
 $labels['MB'] = 'ام بي';
 $labels['GB'] = 'جي بي';
 
-?>
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index f29475c6d..a2f22f9ba 100755
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -1,9 +1,24 @@
 <?php
 
-$messages['loginfailed']  = 'ننوتنه په بري سره ترسره نه شوه ';
-$messages['cookiesdisabled'] = 'ستاسو لټوني ککوړي ونه منل ';
-$messages['sessionerror'] = ' ستاسې ناسته ناباوري يا له مينځه تللې ده';
-$messages['imaperror'] = 'له ای ميپ سرور سره پيوستون په بري سره ترسره نه شو ';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ps/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$messages = array();
+$messages['loginfailed'] = 'ننوتنه په بري سره ترسره نه شوه';
+$messages['cookiesdisabled'] = 'ستاسو لټوني ککوړي ونه منل';
+$messages['sessionerror'] = 'ستاسې ناسته ناباوري يا له مينځه تللې ده';
+$messages['imaperror'] = 'له ای ميپ سرور سره پيوستون په بري سره ترسره نه شو';
 $messages['nomessagesfound'] = 'ليکبکس کې هېڅ استوزي ونه مونده';
 $messages['loggedout'] = 'تاسې له ناستې څخه په بشپړه توګه وويستل شوئ الله په امان';
 $messages['mailboxempty'] = 'ليکبکس تش دی';
@@ -17,7 +32,7 @@ $messages['messagesaved'] = 'استوزه په بارليک کې خوندي شو
 $messages['successfullysaved'] = 'په بري‌سره خوندي شوه';
 $messages['addedsuccessfully'] = 'اړيکلوری په بري سره پتې کتاب ته ور زيات شو';
 $messages['contactexists'] = 'يو اړيکلوری له دې برېښناليک پتې سره شتون لري';
-$messages['blockedimages'] = 'ستاسو د پټتيآ خوندي کېدو لپاره ، له لري انځورنه په دې استوزي‌کې بند کړئ ';
+$messages['blockedimages'] = 'ستاسو د پټتيآ خوندي کېدو لپاره ، له لري انځورنه په دې استوزي‌کې بند کړئ';
 $messages['encryptedmessage'] = 'دا يوه پټه استوزه ده او نه څرګندېږي. بښنه غواړو';
 $messages['nocontactsfound'] = 'هېڅ اړيکلوری يې ونه موند';
 $messages['contactnotfound'] = 'وړاندی شوی اړيکلوری ونه مونده';
@@ -27,23 +42,22 @@ $messages['errorsavingsent'] = 'دخوندي کولو او لېږلو پر  مه
 $messages['errorsaving'] = 'دخوندي کولو پر  مهال يوه تيروتنه رامنځ ته شوه';
 $messages['errormoving'] = 'استوزه ونه خوځول شوه';
 $messages['errordeleting'] = 'استوزه ړنګه نه شوه';
-$messages['deletecontactconfirm']  = ' په رښتيا سره غواړئ چې ټاکل شوی اړيکلوری ړنګ کړئ؟ ';
+$messages['deletecontactconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوی اړيکلوری ړنګ کړئ؟';
 $messages['deletemessagesconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوي استوزي‌ړنګ کړئ؟';
-$messages['deletefolderconfirm']  = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
-$messages['purgefolderconfirm']  = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزي‌ړنګ کړئ؟';
+$messages['deletefolderconfirm'] = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
+$messages['purgefolderconfirm'] = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزي‌ړنګ کړئ؟';
 $messages['folderdeleting'] = 'پوښۍ ړنګوي';
 $messages['foldermoving'] = 'پوښۍ خوځوي';
 $messages['formincomplete'] = 'دا پورمه بشپړه ډکه شوې نه ده';
 $messages['noemailwarning'] = 'مهرباني وکړئ د يوه شته برېښناليک پته ورځای کړئ';
-$messages['nonamewarning']  = 'مهرباني‌وکړئ يو نوم وليکئ';
+$messages['nonamewarning'] = 'مهرباني‌وکړئ يو نوم وليکئ';
 $messages['nopagesizewarning'] = 'مهرباني‌وکړئ د پاڼې کچه ورکړئ';
 $messages['nosenderwarning'] = 'مهرباني وکړئ د استول شوي برېښناليک پته وليکئ';
 $messages['norecipientwarning'] = 'مهرباني‌وکړئ لږ تر لږه يو ترلاسه کوونکی وليکئ';
-$messages['nosubjectwarning']  = 'د مضمون ډګر تش دی يا تاسو غواړئ چې همدا اوس يو له هغو څخه وليکئ';
+$messages['nosubjectwarning'] = 'د مضمون ډګر تش دی يا تاسو غواړئ چې همدا اوس يو له هغو څخه وليکئ';
 $messages['nobodywarning'] = 'دا استوزه پرته له متن څخه استوئ؟';
 $messages['notsentwarning'] = 'استوزه نه ده لېږل شوې. غواړئ چې استوزه مو لرې وغورځوئ';
 $messages['noldapserver'] = 'مهرباني وکړئ يو ال ډپ سرور د پلټلو لپاره وټاکئ';
-$messages['nocontactsreturned'] = 'هېڅ يو اړيکلوری يې ونه موند';
 $messages['nosearchname'] = 'مهرباني وکړئ  د يو اړيکلوري‌نوم يا برېښناليک پته وليکئ';
 $messages['searchsuccessful'] = 'استوزي ومونده$';
 $messages['searchnomatch'] = 'د پلټلو بيا راګرځېدل هېڅ سمون ونه خوړه';
@@ -51,7 +65,7 @@ $messages['searching'] = 'پلټي';
 $messages['checking'] = 'ګوري';
 $messages['nospellerrors'] = 'هېڅ ليکدودي‌تيروتنه ونه مونده';
 $messages['folderdeleted'] = 'پوښۍ په بشپړه توګه ړنګه شوه';
-$messages['deletedsuccessfully'] = "په بشپړه توګه ړنګ شول";
+$messages['deletedsuccessfully'] = 'په بشپړه توګه ړنګ شول';
 $messages['converting'] = 'له استوزي څخه بڼې ړنګېږي';
 $messages['messageopenerror'] = 'له سرور څخه استوزي پرمخ نه شي تلی';
 $messages['fileuploaderror'] = 'دفايل پورته کول په بري سره سرته ونه رسيده';
@@ -59,7 +73,7 @@ $messages['filesizeerror'] = 'د پورته شوي فايل کچه بايد لږ
 $messages['copysuccess'] = 'په بشپړه توګه $پتې کاپي شوې';
 $messages['copyerror'] = 'هېڅ يوه پته يې کاپي‌نه شوای کړای';
 $messages['sourceisreadonly'] = 'ددې پتې يوازې سرچينه لوستل کېږي';
-$messages['errorsavingcontact'] = ' د پتې اړيکلوری يې خوندي‌نه شو کړای ';
+$messages['errorsavingcontact'] = 'د پتې اړيکلوری يې خوندي‌نه شو کړای';
 $messages['movingmessage'] = 'استوزه خوځوي';
 $messages['receiptsent'] = 'يو لوستل شوی رسليک په بشپړه توګه واستول شو';
 $messages['errorsendingreceipt'] = 'رسليک يې ونه شوای ليږلی';
@@ -74,4 +88,3 @@ $messages['opnotpermitted'] = 'چار اجازه نه لري';
 $messages['nofromaddress'] = 'په ټاکل شوي پيژندنه کې برېښناليک پتې له لاسه ورکړي';
 $messages['editorwarning'] = 'که د متن بڼو له منځه تللو ګواښ وي نو د متن سمون پرانيزئ. غواړئ چې دوام ورکړئ';
 
-?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 03e96ab5f..855af35ff 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -1,25 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/pt_BR/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Anderson S. Ferreira <anderson@cnpm.embrapa.br>               |
-|         Robson F. Ramaldes <rframaldes@gmail.com>                     |
-|         Alessandro Lenzi <alessandro@mistymountain.com.br>            |
-|         Gervasio Antonio <gdsa32-translations@yahoo.com.br>           |
-|         Victor Benincasa <vbenincasa@gmail.com>                       |
-|         Jarbas Peixoto Junior <jarbas.peixoto@gmail.com>              |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Claudio F Filho <Unknown>                                     |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -38,7 +30,7 @@ $labels['sent'] = 'Enviados';
 $labels['trash'] = 'Lixeira';
 $labels['junk'] = 'Spam';
 $labels['subject'] = 'Assunto';
-$labels['from'] = 'Remetente';
+$labels['from'] = 'De';
 $labels['to'] = 'Para';
 $labels['cc'] = 'Cópia';
 $labels['bcc'] = 'Cópia Oculta (Bcc)';
@@ -50,23 +42,24 @@ $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Status de leitura';
 $labels['mailboxlist'] = 'Pastas';
+$labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens $from - $to de $count';
 $labels['threadsfromto'] = 'Tópicos $from - $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 $labels['copy'] = 'Copiar';
 $labels['move'] = 'Mover';
 $labels['moveto'] = 'Mover para...';
-$labels['download'] = 'Download';
-$labels['filename'] = 'Arquivo';
+$labels['download'] = 'Baixar';
+$labels['filename'] = 'Nome do arquivo';
 $labels['filesize'] = 'Tamanho';
 $labels['addtoaddressbook'] = 'Incluir no catálogo de endereços';
 $labels['sun'] = 'Dom';
-$labels['mon'] = 'Seg';
-$labels['tue'] = 'Ter';
-$labels['wed'] = 'Qua';
-$labels['thu'] = 'Qui';
-$labels['fri'] = 'Sex';
-$labels['sat'] = 'Sáb';
+$labels['mon'] = 'Seg.';
+$labels['tue'] = 'Ter.';
+$labels['wed'] = 'Qua.';
+$labels['thu'] = 'Qui.';
+$labels['fri'] = 'Sex.';
+$labels['sat'] = 'Sáb.';
 $labels['sunday'] = 'Domingo';
 $labels['monday'] = 'Segunda-feira';
 $labels['tuesday'] = 'Terça-feira';
@@ -74,23 +67,23 @@ $labels['wednesday'] = 'Quarta-feira';
 $labels['thursday'] = 'Quinta-feira';
 $labels['friday'] = 'Sexta-feira';
 $labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Fev';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Out';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dez';
+$labels['jan'] = 'Jan.';
+$labels['feb'] = 'Fev.';
+$labels['mar'] = 'Mar.';
+$labels['apr'] = 'Abr.';
+$labels['may'] = 'Mai.';
+$labels['longmay'] = 'Mai.';
+$labels['jun'] = 'Jun.';
+$labels['jul'] = 'Jul.';
+$labels['aug'] = 'Ago.';
+$labels['sep'] = 'Set.';
+$labels['oct'] = 'Out.';
+$labels['nov'] = 'Nov.';
+$labels['dec'] = 'Dez.';
 $labels['longjan'] = 'Janeiro';
 $labels['longfeb'] = 'Fevereiro';
 $labels['longmar'] = 'Março';
 $labels['longapr'] = 'Abril';
-$labels['longmay'] = 'Maio';
 $labels['longjun'] = 'Junho';
 $labels['longjul'] = 'Julho';
 $labels['longaug'] = 'Agosto';
@@ -120,19 +113,20 @@ $labels['viewsource'] = 'Exibir código-fonte';
 $labels['markmessages'] = 'Marcar mensagens';
 $labels['markread'] = 'como lidas';
 $labels['markunread'] = 'como não lidas';
-$labels['markflagged'] = 'como sinalizadas';
-$labels['markunflagged'] = 'como não sinalizadas';
+$labels['markflagged'] = 'Como marcadas';
+$labels['markunflagged'] = 'Como não marcadas';
 $labels['moreactions'] = 'Mais ações...';
 $labels['select'] = 'Selecionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
+$labels['nonesort'] = 'Nenhuma';
 $labels['currpage'] = 'Página atual';
 $labels['unread'] = 'Não lidas';
-$labels['flagged'] = 'Sinalizada';
+$labels['flagged'] = 'Marcada';
 $labels['unanswered'] = 'Não respondida';
 $labels['deleted'] = 'Excluída';
 $labels['invert'] = 'Inverter';
-$labels['filter'] = 'Exibir';
+$labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
 $labels['threads'] = 'Tópicos';
 $labels['expand-all'] = 'Expandir Tudo';
@@ -142,10 +136,9 @@ $labels['threaded'] = 'Agrupado';
 $labels['autoexpand_threads'] = 'Expandir mensagens agrupadas';
 $labels['do_expand'] = 'todos os tópicos';
 $labels['expand_only_unread'] = 'somente com mensagem(s) não lidas';
-$labels['fromto'] = 'Remetente/Destinatário';
-$labels['flag'] = 'Marca';
+$labels['fromto'] = 'De/Para';
+$labels['flag'] = 'Marcador';
 $labels['attachment'] = 'Anexo';
-$labels['nonesort'] = 'Nenhuma';
 $labels['sentdate'] = 'Data de envio';
 $labels['arrival'] = 'Data de recebimento';
 $labels['asc'] = 'crescente';
@@ -153,11 +146,11 @@ $labels['desc'] = 'decrescente';
 $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Coluna para ordenação';
 $labels['listorder'] = 'Ordem da classificação';
-$labels['listmode'] = 'Modo da listagem';
+$labels['listmode'] = 'Visualização em lista';
 $labels['folderactions'] = 'Ações para as pastas...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Esvaziar';
-$labels['quota'] = 'Utilização';
+$labels['quota'] = 'Uso de disco';
 $labels['unknown'] = 'desconhecido';
 $labels['unlimited'] = 'ilimitado';
 $labels['quicksearch'] = 'Pesquisa rápida';
@@ -165,15 +158,15 @@ $labels['resetsearch'] = 'Limpar';
 $labels['searchmod'] = 'Opções da pesquisa';
 $labels['msgtext'] = 'Mensagem inteira';
 $labels['openinextwin'] = 'Abrir em nova janela';
-$labels['emlsave'] = 'Download (.eml)';
+$labels['emlsave'] = 'Baixar (em .eml)';
 $labels['compose'] = 'Escrever mensagem';
 $labels['editasnew'] = 'Editar como novo';
 $labels['savemessage'] = 'Salvar Rascunho';
-$labels['sendmessage'] = 'Enviar';
+$labels['sendmessage'] = 'Enviar agora';
 $labels['addattachment'] = 'Anexar um arquivo';
 $labels['charset'] = 'Codificação';
 $labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Solicitar confirmação de recebimento';
+$labels['returnreceipt'] = 'Confirmação de recebimento';
 $labels['dsn'] = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem original';
@@ -194,6 +187,7 @@ $labels['highest'] = 'Mais alta';
 $labels['nosubject'] = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 $labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
+$labels['isdraft'] = 'Esta mensagem é um rascunho';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto simples';
 $labels['savesentmessagein'] = 'Salvar mensagens enviadas em';
@@ -204,11 +198,11 @@ $labels['addbcc'] = 'Adicionar Cópia Oculta';
 $labels['addreplyto'] = 'Adicionar Responder para';
 $labels['addfollowupto'] = 'Adicionar Encaminhar para';
 $labels['mdnrequest'] = 'O remetente desta mensagem deseja ser notificado quando você ler esta mensagem. Você permite o envio desta notificação?';
-$labels['receiptread'] = 'Confirmação de Leitura (Exibida)';
+$labels['receiptread'] = 'Confirmação de Leitura (exibida)';
 $labels['yourmessage'] = 'Esta é uma confirmação de leitura da sua mensagem';
 $labels['receiptnote'] = 'Nota: Esta confirmação de leitura somente informa que a mensagem foi aberta no computador do destinatário. Não há garantia que o destinatário tenha lido ou compreendido o conteúdo da mensagem.';
-$labels['name'] = 'Nome para exibição';
-$labels['firstname'] = 'Primeiro nome';
+$labels['name'] = 'Nome de exibição';
+$labels['firstname'] = 'Primeiro Nome';
 $labels['surname'] = 'Sobrenome';
 $labels['middlename'] = 'Segundo Nome';
 $labels['nameprefix'] = 'Prefixo';
@@ -226,23 +220,24 @@ $labels['locality'] = 'Cidade';
 $labels['zipcode'] = 'CEP';
 $labels['region'] = 'Estado';
 $labels['country'] = 'País';
-$labels['birthday'] = 'Nascimento';
+$labels['birthday'] = 'Data de nascimento';
 $labels['anniversary'] = 'Aniversário';
-$labels['website'] = 'Website';
+$labels['website'] = 'Página da Web';
 $labels['instantmessenger'] = 'Mensagem instantânea (IM)';
 $labels['notes'] = 'Anotações';
 $labels['male'] = 'masculino';
 $labels['female'] = 'feminino';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
+$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa Avançada';
-$labels['other'] = 'Outros';
+$labels['other'] = 'Outro';
+$labels['typeother'] = 'Outro';
 $labels['typehome'] = 'Residencial';
 $labels['typework'] = 'Trabalho';
-$labels['typeother'] = 'Outro';
 $labels['typemobile'] = 'Celular';
 $labels['typemain'] = 'Principal';
 $labels['typehomefax'] = 'Fax Residencial';
@@ -250,12 +245,11 @@ $labels['typeworkfax'] = 'Fax do Trabalho';
 $labels['typecar'] = 'Carro';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistente';
 $labels['typehomepage'] = 'Página pessoal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Adicionar campo...';
-$labels['addcontact'] = 'Incluir novo contato';
+$labels['addcontact'] = 'Adicionar novo contato';
 $labels['editcontact'] = 'Editar contato';
 $labels['contacts'] = 'Contatos';
 $labels['contactproperties'] = 'Propriedades do contato';
@@ -263,13 +257,13 @@ $labels['personalinfo'] = 'Informações pessoais';
 $labels['edit'] = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save'] = 'Salvar';
-$labels['delete'] = 'Apagar';
+$labels['delete'] = 'Excluir';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
-$labels['replacephoto'] = 'Alterar';
+$labels['replacephoto'] = 'Substituir';
 $labels['newcontact'] = 'Criar novo contato';
-$labels['deletecontact'] = 'Apagar contatos selecionados';
-$labels['composeto'] = 'Enviar mensagem para';
+$labels['deletecontact'] = 'Exclui os contatos selecionados';
+$labels['composeto'] = 'Compor mensagem para';
 $labels['contactsfromto'] = 'Contatos $from - $to de $count';
 $labels['print'] = 'Imprimir';
 $labels['export'] = 'Exportar';
@@ -278,7 +272,7 @@ $labels['newcontactgroup'] = 'Criar novo grupo de contatos';
 $labels['grouprename'] = 'Renomear grupo';
 $labels['groupdelete'] = 'Excluir grupo';
 $labels['previouspage'] = 'Página Anterior';
-$labels['firstpage'] = 'Primeira Página ';
+$labels['firstpage'] = 'Primeira Página';
 $labels['nextpage'] = 'Próxima Página';
 $labels['lastpage'] = 'Última Página';
 $labels['group'] = 'Grupo';
@@ -288,12 +282,13 @@ $labels['searchsave'] = 'Salvar pesquisa';
 $labels['searchdelete'] = 'Excluir pesquisa';
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contatos';
-$labels['importfromfile'] = 'Importar de arquivo:';
+$labels['importfromfile'] = 'Importar do arquivo:';
 $labels['importtarget'] = 'Adicionar novos contatos para o catálogo de endereços:';
 $labels['importreplace'] = 'Substituir o catálogo de endereços atual';
 $labels['importtext'] = 'Você pode enviar contatos de um catálogo de endereços existente.<br/>Os contatos devem ser enviados no formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
-$labels['done'] = 'Finalizado';
+$labels['done'] = 'Concluído';
 $labels['settingsfor'] = 'Configurações para';
+$labels['about'] = 'Sobre';
 $labels['preferences'] = 'Preferências';
 $labels['userpreferences'] = 'Preferências do usuário';
 $labels['editpreferences'] = 'Editar preferências do usuário';
@@ -302,21 +297,21 @@ $labels['manageidentities'] = 'Gerenciar identidades desta conta';
 $labels['newidentity'] = 'Nova identidade';
 $labels['newitem'] = 'Novo item';
 $labels['edititem'] = 'Editar item';
-$labels['preferhtml'] = 'Exibir formatação HTML em mensagens';
+$labels['preferhtml'] = 'Exibir em HTML';
 $labels['defaultcharset'] = 'Conjunto padrão de caracteres';
 $labels['htmlmessage'] = 'Mensagem HTML';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Exibir datas amigáveis';
-$labels['setdefault'] = 'Padrão';
+$labels['setdefault'] = 'Definir como padrão';
 $labels['autodetect'] = 'Automático';
 $labels['language'] = 'Idioma';
 $labels['timezone'] = 'Fuso horário';
 $labels['pagesize'] = 'Mensagens por página';
 $labels['signature'] = 'Assinatura';
 $labels['dstactive'] = 'Horário de verão';
-$labels['htmleditor'] = 'Criar mensagens formatadas em HTML';
-$labels['htmlonreply'] = 'em resposta de mensagens HTML';
+$labels['htmleditor'] = 'Criar mensagens em HTML';
+$labels['htmlonreply'] = 'em resposta à mensagem em HTML somente';
 $labels['htmlsignature'] = 'Assinatura em HTML';
 $labels['previewpane'] = 'Exibir pré-visualização';
 $labels['skin'] = 'Aparência da interface (tema)';
@@ -327,14 +322,14 @@ $labels['serversettings'] = 'Configurações do Servidor';
 $labels['mailboxview'] = 'Exibição da Caixa de Correio';
 $labels['mdnrequests'] = 'Envio de Confirmação de Leitura para o remetente';
 $labels['askuser'] = 'solicite minha confirmação';
-$labels['autosend'] = 'envie automaticamente';
-$labels['autosendknown'] = 'solicite minha confirmação, e envie automat. para os meus contatos';
-$labels['autosendknownignore'] = 'ignore, e envie automaticamente para os meus contatos';
-$labels['ignore'] = 'ignore';
+$labels['autosend'] = 'enviar confirmação';
+$labels['autosendknown'] = 'enviar confirmação para os meus contatos, caso contrário, pergunte-me';
+$labels['autosendknownignore'] = 'enviar confirmação para os meus contatos, caso contrário, ignore';
+$labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar a mensagem como lida ao excluir';
 $labels['flagfordeletion'] = 'Marcar a mensagem para exclusão ao invés de excluir';
 $labels['skipdeleted'] = 'Não exibir mensagens excluídas';
-$labels['deletealways'] = 'Apagar as mensagens se movê-las para a lixeira falhar';
+$labels['deletealways'] = 'Excluir as mensagens se movê-las para a lixeira falhar';
 $labels['showremoteimages'] = 'Exibir imagens externas';
 $labels['fromknownsenders'] = 'de remetentes conhecidos';
 $labels['always'] = 'sempre';
@@ -345,7 +340,7 @@ $labels['keepalive'] = 'Verificar se há novas mensagens';
 $labels['never'] = 'nunca';
 $labels['immediately'] = 'imediatamente';
 $labels['messagesdisplaying'] = 'Exibição de mensagens';
-$labels['messagescomposition'] = 'Envio de mensagens';
+$labels['messagescomposition'] = 'Redigir mensagens';
 $labels['mimeparamfolding'] = 'Nomes de anexos';
 $labels['2231folding'] = 'RFC 2231 Integral (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
@@ -354,12 +349,12 @@ $labels['force7bit'] = 'Usar codificação MIME para caracteres 8-bit';
 $labels['advancedoptions'] = 'Opções avançadas';
 $labels['focusonnewmessage'] = 'Focar janela do navegador ao receber nova mensagem';
 $labels['checkallfolders'] = 'Verificar se há novas mensagens em todas as pastas';
-$labels['displaynext'] = 'Exibir a mensagem seguinte após apagar/mover uma mensagem';
+$labels['displaynext'] = 'Exibir a mensagem seguinte após excluir/mover uma mensagem';
+$labels['defaultfont'] = 'Fonte padrão para mensagens HTML';
 $labels['mainoptions'] = 'Opções Principais';
 $labels['section'] = 'Seção';
 $labels['maintenance'] = 'Manutenção';
-$labels['newmessage'] = 'Novas Mensagens';
-$labels['listoptions'] = 'Opções de Exibição';
+$labels['newmessage'] = 'Nova mensagem';
 $labels['signatureoptions'] = 'Opções de Assinatura';
 $labels['whenreplying'] = 'Quando responder';
 $labels['replytopposting'] = 'iniciar nova mensagem acima da original';
@@ -376,45 +371,50 @@ $labels['previewpanemarkread'] = 'Marcar mensagem pré-visualizada como lida';
 $labels['afternseconds'] = 'depois de $n segundos';
 $labels['reqmdn'] = 'Sempre pedir confirmação de leitura';
 $labels['reqdsn'] = 'Sempre pedir confirmação de entrega';
-$labels['replysamefolder'] = 'Guardar as respostas na mesma pasta da mensagem original';
-$labels['defaultaddressbook'] = 'Adicionar novos contatos para o catálogo de endereços:';
+$labels['replysamefolder'] = 'Colocar as respostas na mesma pasta da mensagem original';
+$labels['defaultaddressbook'] = 'Adicionar novos contatos para o catálogo de endereços selecionado';
+$labels['autocompletesingle'] = 'Ignorar endereços alternativos no autocompletar';
 $labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar uma mensagem';
-$labels['spellcheckoptions'] = 'Opções do Verificador de Ortografia';
+$labels['spellcheckoptions'] = 'Opções do Verificador Ortográfico';
 $labels['spellcheckignoresyms'] = 'Ignorar palavras com símbolos';
 $labels['spellcheckignorenums'] = 'Ignorar palavras com números';
-$labels['spellcheckignorecaps'] = 'Ignorar palavras em maiúsculo';
+$labels['spellcheckignorecaps'] = 'Ignorar palavras toda em maiúsculo';
 $labels['addtodict'] = 'Adicionar ao dicionário';
 $labels['folder'] = 'Pasta';
-$labels['folders'] = 'Pastas';
 $labels['foldername'] = 'Nome da pasta';
-$labels['subscribed'] = 'Ativo';
+$labels['subscribed'] = 'Inscrito';
 $labels['messagecount'] = 'Mensagens';
 $labels['create'] = 'Criar';
 $labels['createfolder'] = 'Criar nova pasta';
 $labels['managefolders'] = 'Gerenciar pastas';
 $labels['specialfolders'] = 'Pastas especiais';
 $labels['properties'] = 'Propriedades';
-$labels['folderproperties'] = 'Opções de pasta';
-$labels['parentfolder'] = 'Pasta origem';
+$labels['folderproperties'] = 'Propriedades da pasta';
+$labels['parentfolder'] = 'Pasta Pai';
 $labels['location'] = 'Localização';
 $labels['info'] = 'Informação';
-$labels['getfoldersize'] = 'Obter tamanho da pasta';
+$labels['getfoldersize'] = 'Clique para obter tamanho da pasta';
 $labels['changesubscription'] = 'Clique para ativar/desativar';
 $labels['foldertype'] = 'Tipo de Pasta';
 $labels['personalfolder'] = 'Pasta Particular';
 $labels['otherfolder'] = 'Pasta de outro Usuário';
 $labels['sharedfolder'] = 'Pasta Pública';
-$labels['sortby'] = 'Ordenado por';
+$labels['sortby'] = 'Ordenar por';
 $labels['sortasc'] = 'Ascendente';
 $labels['sortdesc'] = 'Descendente';
 $labels['undo'] = 'Desfazer';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Versão';
+$labels['source'] = 'Fonte';
+$labels['license'] = 'Licença';
+$labels['support'] = 'Buscar suporte';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglês';
-$labels['westerneuropean'] = 'Europa Ocidental';
+$labels['westerneuropean'] = 'Oeste Europeu';
 $labels['easterneuropean'] = 'Leste Europeu';
 $labels['southeasterneuropean'] = 'Sudeste Europeu';
 $labels['baltic'] = 'Báltico';
@@ -431,4 +431,3 @@ $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
 
-?>
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 007fd0baa..8ef6ca59f 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -1,30 +1,22 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/pt_BR/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Anderson S. Ferreira <anderson@cnpm.embrapa.br>               |
-|         Robson F. Ramaldes <rframaldes@gmail.com>                     |
-|         Alessandro Lenzi <alessandro@mistymountain.com.br>            |
-|         Gervasio Antonio <gdsa32-translations@yahoo.com.br>           |
-|         Victor Benincasa <vbenincasa@gmail.com>                       |
-|         Jarbas Peixoto Junior <jarbas.peixoto@gmail.com>              |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Claudio F Filho <Unknown>                                     |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
 $messages['loginfailed'] = 'Falha no login';
-$messages['cookiesdisabled'] = 'Seu navegador não suporta cookies';
+$messages['cookiesdisabled'] = 'Seu navegador não aceita cookies';
 $messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou';
 $messages['imaperror'] = 'Falha na conexão com o servidor IMAP';
 $messages['servererror'] = 'Erro no Servidor!';
@@ -33,43 +25,43 @@ $messages['dberror'] = 'Erro no banco de dados!';
 $messages['errorreadonly'] = 'Não foi possível realizar a operação. Pasta somente leitura';
 $messages['errornoperm'] = 'Não foi possível realizar a operação. Acesso negado';
 $messages['invalidrequest'] = 'Requisição inválida! Nenhum dado foi salvo.';
-$messages['nomessagesfound'] = 'Nenhuma mensagem foi encontrada';
+$messages['nomessagesfound'] = 'Nenhuma mensagem encontrada nessa caixa de mensagens';
 $messages['loggedout'] = 'Sua sessão foi finalizada com sucesso. Até breve!';
 $messages['mailboxempty'] = 'A caixa de mensagens está vazia';
 $messages['loading'] = 'Carregando...';
-$messages['uploading'] = 'Enviando anexo...';
-$messages['uploadingmany'] = 'Enviando anexos...';
-$messages['loadingdata'] = 'Carregando informações...';
+$messages['uploading'] = 'Carregando arquivo...';
+$messages['uploadingmany'] = 'Carregando arquivos...';
+$messages['loadingdata'] = 'Carregando dados...';
 $messages['checkingmail'] = 'Verificando se há novas mensagens...';
 $messages['sendingmessage'] = 'Enviando mensagem...';
 $messages['messagesent'] = 'Mensagem enviada com sucesso';
 $messages['savingmessage'] = 'Salvando Mensagem...';
-$messages['messagesaved'] = 'Mensagem gravada como rascunho';
-$messages['successfullysaved'] = 'Gravado com sucesso';
+$messages['messagesaved'] = 'Mensagem salva em Rascunhos';
+$messages['successfullysaved'] = 'Salvo com sucesso';
 $messages['addedsuccessfully'] = 'Contato incluído com sucesso.';
 $messages['contactexists'] = 'Já existe um contato com esse mesmo e-mail.';
 $messages['contactnameexists'] = 'Já existe um contato com o mesmo nome.';
-$messages['blockedimages'] = 'Para proteger sua privacidade, as imagens desta mensagem foram bloqueadas.';
-$messages['encryptedmessage'] = 'Esta mensagem está criptografada e não pode ser exibida. Desculpe.';
-$messages['nocontactsfound'] = 'Nenhum contato foi encontrado.';
+$messages['blockedimages'] = 'Para proteger sua privacidade, as imagens remotas desta mensagem foram bloqueadas.';
+$messages['encryptedmessage'] = 'Esta é uma mensagem criptografada e não pode ser exibida. Desculpe.';
+$messages['nocontactsfound'] = 'Nenhum contato encontrado.';
 $messages['contactnotfound'] = 'O contato solicitado não foi encontrado.';
 $messages['contactsearchonly'] = 'Informe os termos de pesquisa para localizar os contatos';
 $messages['sendingfailed'] = 'Falha no envio da mensagem.';
 $messages['senttooquickly'] = 'Aguarde $sec s para enviar a mensagem.';
 $messages['errorsavingsent'] = 'Ocorreu um erro ao salvar a mensagem enviada.';
 $messages['errorsaving'] = 'Ocorreu um erro ao salvar.';
-$messages['errormoving'] = 'Não foi possível mover a mensagem.';
+$messages['errormoving'] = 'Não foi possível mover a(s) mensagem(ns).';
 $messages['errorcopying'] = 'Não foi possível copiar a(s) mensagem(ns).';
-$messages['errordeleting'] = 'Não foi possível apagar a mensagem.';
-$messages['errormarking'] = 'Não foi possível marcar a mensagem.';
+$messages['errordeleting'] = 'Não foi possível apagar a(s) mensagem(ns).';
+$messages['errormarking'] = 'Não foi possível marcar a(s) mensagem(ns).';
 $messages['deletecontactconfirm'] = 'Deseja realmente excluir o(s) contato(s) selecionado(s)?';
 $messages['deletegroupconfirm'] = 'Deseja realmente excluir o grupo selecionado?';
 $messages['deletemessagesconfirm'] = 'Deseja realmente excluir a(s) mensagem(s) selecionada(s)?';
 $messages['deletefolderconfirm'] = 'Deseja realmente excluir esta pasta?';
 $messages['purgefolderconfirm'] = 'Deseja realmente excluir todas mensagens desta pasta?';
-$messages['contactdeleting'] = 'Apagando contato(s)...';
+$messages['contactdeleting'] = 'Excluindo contato(s)...';
 $messages['groupdeleting'] = 'Excluindo grupo...';
-$messages['folderdeleting'] = 'Apagando pasta...';
+$messages['folderdeleting'] = 'Excluindo pasta...';
 $messages['foldermoving'] = 'Movendo pasta...';
 $messages['foldersubscribing'] = 'Ativando pasta...';
 $messages['folderunsubscribing'] = 'Desativando pasta...';
@@ -79,9 +71,9 @@ $messages['nonamewarning'] = 'Por favor, informe o nome';
 $messages['nopagesizewarning'] = 'Por favor, informe o tamanho da página';
 $messages['nosenderwarning'] = 'Por favor, informe o e-mail do remetente';
 $messages['norecipientwarning'] = 'Por favor, informe pelo menos um destinatário';
-$messages['nosubjectwarning'] = 'O campo "Assunto" não foi preenchido. Deseja incluí-lo agora?';
+$messages['nosubjectwarning'] = 'O campo "Assunto" está vazio. Deseja incluí-lo agora?';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
-$messages['notsentwarning'] = 'A mensagem não foi enviada, deseja excluí-la?';
+$messages['notsentwarning'] = 'A mensagem não foi enviada. Deseja descartar sua mensagem?';
 $messages['noldapserver'] = 'Por favor, selecione um servidor LDAP para a pesquisa';
 $messages['nosearchname'] = 'Por favor, informe o nome do contado ou seu endereço de e-mail';
 $messages['notuploadedwarning'] = 'Há anexos ainda não enviados. Aguarde ou cancele o envio.';
@@ -90,7 +82,7 @@ $messages['contactsearchsuccessful'] = '$nr contatos encontrados.';
 $messages['searchnomatch'] = 'A pesquisa não encontrou resultados';
 $messages['searching'] = 'Pesquisando...';
 $messages['checking'] = 'Verificando...';
-$messages['nospellerrors'] = 'Nenhum erro ortográfico foi encontrado';
+$messages['nospellerrors'] = 'Nenhum erro ortográfico encontrado';
 $messages['folderdeleted'] = 'Pasta excluída com sucesso';
 $messages['foldersubscribed'] = 'Pasta ativada com sucesso';
 $messages['folderunsubscribed'] = 'Pasta desativada com sucesso';
@@ -105,16 +97,16 @@ $messages['copysuccess'] = '$nr endereço(s) copiado(s) com sucesso';
 $messages['copyerror'] = 'Não foi possível copiar os endereços';
 $messages['sourceisreadonly'] = 'Esta fonte de endereço é somente leitura';
 $messages['errorsavingcontact'] = 'Não foi possível salvar o endereço de contato';
-$messages['movingmessage'] = 'Movendo mensagem...';
-$messages['copyingmessage'] = 'Copiando mensagem...';
+$messages['movingmessage'] = 'Movendo mensagem(ns)...';
+$messages['copyingmessage'] = 'Copiando mensagem(ns)...';
 $messages['copyingcontact'] = 'Copiando contato(s)...';
-$messages['deletingmessage'] = 'Excluindo mensagem(s)...';
-$messages['markingmessage'] = 'Marcando mensagem(s)...';
+$messages['deletingmessage'] = 'Excluindo mensagem(ns)...';
+$messages['markingmessage'] = 'Marcando mensagem(ns)...';
 $messages['addingmember'] = 'Adicionando contato(s) para o grupo...';
 $messages['removingmember'] = 'Removendo contato(s) do grupo...';
 $messages['receiptsent'] = 'Confirmação de recebimento enviada com sucesso';
 $messages['errorsendingreceipt'] = 'Não foi possível enviar a confirmação de recebimento';
-$messages['nodeletelastidentity'] = 'Você não pode excluir a única identidade';
+$messages['nodeletelastidentity'] = 'Você não pode excluir sua única identidade';
 $messages['forbiddencharacter'] = 'O nome da pasta contém um caractere não permitido';
 $messages['selectimportfile'] = 'Selecione o arquivo para envio';
 $messages['addresswriterror'] = 'O catálogo de endereços selecionado não tem permissão de modificação';
@@ -128,11 +120,11 @@ $messages['opnotpermitted'] = 'Operação não permitida!';
 $messages['nofromaddress'] = 'Falta o endereço de email na identidade selecionada';
 $messages['editorwarning'] = 'Mudar para o editor de texto simples elimina toda a formatação de texto. Deseja continuar?';
 $messages['httpreceivedencrypterror'] = 'Ocorreu um erro de configuração. Informe ao administrador do sistema imediatamente. <b>Sua mensagem não pode ser enviada.</b>';
-$messages['smtpconnerror'] = 'Erro SMTP ($code): Conexão ao servidor falhou';
-$messages['smtpautherror'] = 'Erro SMTP ($code): Falha na autenticação';
-$messages['smtpfromerror'] = 'Erro SMTP ($code): Falha ao definir o remetente "$from" ($msg)';
-$messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinatário "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Erro SMTP: Não é possível processar a lista destinatários';
+$messages['smtpconnerror'] = 'Erro SMTP ($code): Conexão ao servidor falhou.';
+$messages['smtpautherror'] = 'Erro SMTP ($code): Falha na autenticação.';
+$messages['smtpfromerror'] = 'Erro SMTP ($code): Falha ao definir o remetente "$from" ($msg).';
+$messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinatário "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Erro SMTP: Não é possível processar a lista destinatários.';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de e-mail inválido: $email';
 $messages['toomanyrecipients'] = 'Muitos destinatários. Reduza o número de destinatários para $max.';
@@ -143,8 +135,8 @@ $messages['contactdeleted'] = 'Contato(s) excluído(s) com sucesso.';
 $messages['contactrestoreerror'] = 'Não foi possivel recuperar o(s) contato(s) excluído(s).';
 $messages['contactrestored'] = 'Contato(s) recuperado(s) com sucesso.';
 $messages['groupdeleted'] = 'Grupo excluído com sucesso';
-$messages['grouprenamed'] = 'Grupo renomeado com sucesso';
-$messages['groupcreated'] = 'Grupo criado com sucesso';
+$messages['grouprenamed'] = 'Grupo renomeado com sucesso.';
+$messages['groupcreated'] = 'Grupo criado com sucesso.';
 $messages['savedsearchdeleted'] = 'Pesquisa excluída com sucesso.';
 $messages['savedsearchdeleteerror'] = 'Não foi possível excluir a pesquisa.';
 $messages['savedsearchcreated'] = 'Pesquisa criada com sucesso.';
@@ -162,5 +154,5 @@ $messages['foldercreated'] = 'Pasta criada com sucesso';
 $messages['invalidimageformat'] = 'Formato de imagem inválido.';
 $messages['mispellingsfound'] = 'Foram detectados erros de ortografia.';
 $messages['parentnotwritable'] = 'Sem permissão para criar/mover a pasta dentro da pasta selecionada.';
+$messages['messagetoobig'] = 'A parte da mensagem é muito grande para ser processada';
 
-?>
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 8d508df45..4ae27501c 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -1,24 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/pt_PT/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Authors: Sergio Rocha <sergio.rocha@makeitsimple.pt>                  |
-|          João Vale <jpvale@gmail.com>                                |
-|          Fernando Silva <fernando.silva@openquest.pt>                 |
-|          Nuno Costa <nuno@criacaoweb.net>                             |
-|          Teotónio Ricardo <teotonio.ricardo@webtuga.pt>              |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David <Unknown>                                               |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -29,7 +22,7 @@ $labels['server'] = 'Servidor';
 $labels['login'] = 'Entrar';
 $labels['logout'] = 'Sair';
 $labels['mail'] = 'Lista de mensagens';
-$labels['settings'] = 'Configurações pessoais';
+$labels['settings'] = 'Definições pessoais';
 $labels['addressbook'] = 'Lista de contactos';
 $labels['inbox'] = 'A Receber';
 $labels['drafts'] = 'Rascunhos';
@@ -49,6 +42,7 @@ $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Estado de leitura';
 $labels['mailboxlist'] = 'Pastas';
+$labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens de $from a $to de $count';
 $labels['threadsfromto'] = 'Tópicos de $from a $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
@@ -77,7 +71,8 @@ $labels['jan'] = 'Jan';
 $labels['feb'] = 'Fev';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Abr';
-$labels['may'] = 'Mai';
+$labels['may'] = 'Maio';
+$labels['longmay'] = 'Maio';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Ago';
@@ -89,7 +84,6 @@ $labels['longjan'] = 'Janeiro';
 $labels['longfeb'] = 'Fevereiro';
 $labels['longmar'] = 'Março';
 $labels['longapr'] = 'Abril';
-$labels['longmay'] = 'Maio';
 $labels['longjun'] = 'Junho';
 $labels['longjul'] = 'Julho';
 $labels['longaug'] = 'Agosto';
@@ -98,7 +92,7 @@ $labels['longoct'] = 'Outubro';
 $labels['longnov'] = 'Novembro';
 $labels['longdec'] = 'Dezembro';
 $labels['today'] = 'Hoje';
-$labels['checkmail'] = 'Verificar novas mensagens';
+$labels['checkmail'] = 'Verificar existência de novas mensagens';
 $labels['writenewmessage'] = 'Criar nova mensagem';
 $labels['replytomessage'] = 'Responder';
 $labels['replytoallmessage'] = 'Responder a todos';
@@ -117,14 +111,15 @@ $labels['lastmessage'] = 'Última mensagem';
 $labels['backtolist'] = 'Voltar';
 $labels['viewsource'] = 'Mostrar código fonte';
 $labels['markmessages'] = 'Marcar mensagens';
-$labels['markread'] = 'Como lidas';
-$labels['markunread'] = 'Como não lidas';
+$labels['markread'] = 'Como lida(s)';
+$labels['markunread'] = 'Como não lida(s)';
 $labels['markflagged'] = 'Com sinalização';
 $labels['markunflagged'] = 'Sem sinalização';
 $labels['moreactions'] = 'Mais acções...';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
-$labels['none'] = 'Nenhuma';
+$labels['none'] = 'Nenhum';
+$labels['nonesort'] = 'Nenhum';
 $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Sinalizadas';
@@ -144,7 +139,6 @@ $labels['expand_only_unread'] = 'só com mensagens não lidas';
 $labels['fromto'] = 'Remetente/Destinatário';
 $labels['flag'] = 'Sinalizador';
 $labels['attachment'] = 'Anexo';
-$labels['nonesort'] = 'Nenhum';
 $labels['sentdate'] = 'Data de envio';
 $labels['arrival'] = 'Data de recepção';
 $labels['asc'] = 'Ascendente';
@@ -167,7 +161,7 @@ $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
 $labels['compose'] = 'Escrever mensagem';
 $labels['editasnew'] = 'Editar como novo';
-$labels['savemessage'] = 'Guardar rascunho';
+$labels['savemessage'] = 'Guardar como rascunho';
 $labels['sendmessage'] = 'Enviar';
 $labels['addattachment'] = 'Adicionar anexo';
 $labels['charset'] = 'Charset';
@@ -186,10 +180,10 @@ $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close'] = 'Fechar';
 $labels['messageoptions'] = 'Opções de mensagens...';
 $labels['low'] = 'Baixa';
-$labels['lowest'] = 'Mais baixa';
+$labels['lowest'] = 'Muito baixa';
 $labels['normal'] = 'Normal';
 $labels['high'] = 'Alta';
-$labels['highest'] = 'Mais alta';
+$labels['highest'] = 'Muito alta';
 $labels['nosubject'] = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 $labels['alwaysshow'] = 'Mostrar sempre imagens a partir de $sender';
@@ -202,7 +196,7 @@ $labels['maxuploadsize'] = 'Tamanho máximo permitido do ficheiro é $size';
 $labels['addcc'] = 'Adicionar Cc';
 $labels['addbcc'] = 'Adicionar Bcc';
 $labels['addreplyto'] = 'Adicionar Responder para';
-$labels['addfollowupto'] = 'Adicionar Reencaminhar-Para';
+$labels['addfollowupto'] = 'Adicionar Reencaminhar para';
 $labels['mdnrequest'] = 'O remetente desta mensagem pediu para ser notificado quando esta mensagem fosse lida. Deseja enviar uma notificação?';
 $labels['receiptread'] = 'Recibo de leitura';
 $labels['yourmessage'] = 'Isto é um recibo de leitura da sua mensagem';
@@ -235,14 +229,15 @@ $labels['male'] = 'masculino';
 $labels['female'] = 'feminino';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
+$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisa';
 $labels['advsearch'] = 'Pesquisa avançada';
 $labels['other'] = 'Outro';
+$labels['typeother'] = 'Outro';
 $labels['typehome'] = 'Residência';
 $labels['typework'] = 'Empresa';
-$labels['typeother'] = 'Outro';
 $labels['typemobile'] = 'Telemóvel';
 $labels['typemain'] = 'Principal';
 $labels['typehomefax'] = 'Fax da residência';
@@ -250,7 +245,6 @@ $labels['typeworkfax'] = 'Fax da empresa';
 $labels['typecar'] = 'Carro';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Vídeo';
-$labels['typeassistant'] = 'Assistente';
 $labels['typehomepage'] = 'Página Inicial';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
@@ -258,7 +252,7 @@ $labels['addfield'] = 'Adicionar campo...';
 $labels['addcontact'] = 'Criar novo contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
-$labels['contactproperties'] = 'Propriedades dos contactos';
+$labels['contactproperties'] = 'Dados do contacto';
 $labels['personalinfo'] = 'Informação pessoal';
 $labels['edit'] = 'Editar';
 $labels['cancel'] = 'Cancelar';
@@ -303,7 +297,7 @@ $labels['manageidentities'] = 'Gerir identidades para esta conta';
 $labels['newidentity'] = 'Nova identidade';
 $labels['newitem'] = 'Novo item';
 $labels['edititem'] = 'Editar item';
-$labels['preferhtml'] = 'Exibir mensagens em HTML';
+$labels['preferhtml'] = 'Mostrar mensagens em HTML';
 $labels['defaultcharset'] = 'Conjunto de caracteres predefinido';
 $labels['htmlmessage'] = 'Mensagem em HTML';
 $labels['dateformat'] = 'Formato da data';
@@ -342,11 +336,11 @@ $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostrar imagens anexadas abaixo da mensagem';
 $labels['autosavedraft'] = 'Guardar rascunho automaticamente';
 $labels['everynminutes'] = 'a cada $n minuto(s)';
-$labels['keepalive'] = 'Verificar novas mensagens em';
+$labels['keepalive'] = 'Verificar existência de novas mensagens';
 $labels['never'] = 'nunca';
 $labels['immediately'] = 'imediatamente';
 $labels['messagesdisplaying'] = 'Visualização de mensagens';
-$labels['messagescomposition'] = 'Composição de mensagens ';
+$labels['messagescomposition'] = 'Composição de mensagens';
 $labels['mimeparamfolding'] = 'Nome dos anexos';
 $labels['2231folding'] = 'Total RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
@@ -354,30 +348,30 @@ $labels['2047folding'] = 'Total RFC 2047 (outro)';
 $labels['force7bit'] = 'Usar codificação MIME para caracteres de 8 bits';
 $labels['advancedoptions'] = 'Opções avançadas';
 $labels['focusonnewmessage'] = 'Activar a janela do navegador na nova mensagem';
-$labels['checkallfolders'] = 'Verificar todas as pastas para novas mensagens';
+$labels['checkallfolders'] = 'Verificar por novas mensagens em todas as pastas';
 $labels['displaynext'] = 'Depois de mover/eliminar uma mensagem, mostrar a próxima mensagem';
+$labels['defaultfont'] = 'Tipo de letra padrão para mensagens HTML';
 $labels['mainoptions'] = 'Opções';
 $labels['section'] = 'Secção';
 $labels['maintenance'] = 'Manutenção';
 $labels['newmessage'] = 'Nova Mensagem';
-$labels['listoptions'] = 'Listar opções';
 $labels['signatureoptions'] = 'Opções de Assinatura';
 $labels['whenreplying'] = 'Ao responder';
 $labels['replytopposting'] = 'criar nova mensagem acima da original';
 $labels['replybottomposting'] = 'criar nova mensagem abaixo da original';
 $labels['replyremovesignature'] = 'Ao responder, remover a assinatura original da mensagem';
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
-$labels['newmessageonly'] = 'nova mensagem apenas';
-$labels['replyandforwardonly'] = 'respostas e reenvios apenas';
+$labels['newmessageonly'] = 'apenas em novas mensagens';
+$labels['replyandforwardonly'] = 'apenas em respostas e reenvios';
 $labels['replysignaturepos'] = 'Ao responder ou reencaminhar colocar assinatura';
 $labels['belowquote'] = 'depois da citação';
 $labels['abovequote'] = 'antes da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
-$labels['previewpanemarkread'] = 'Marcar mensagem pré-visualizada como lida';
+$labels['previewpanemarkread'] = 'Marcar mensagem como lida';
 $labels['afternseconds'] = 'após $n segundos';
 $labels['reqmdn'] = 'Pedir sempre um recibo de leitura';
 $labels['reqdsn'] = 'Pedir sempre um recibo de entrega';
-$labels['replysamefolder'] = 'Guardar as respostas na mesma pasta da mensagem original';
+$labels['replysamefolder'] = 'Guardar respostas na mesma pasta da mensagem original';
 $labels['defaultaddressbook'] = 'Adicionar novo contacto ao livro de endereços selecionado';
 $labels['autocompletesingle'] = 'Ignorar endereços de email alternativos no preenchimento automático';
 $labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar a mensagem';
@@ -387,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Ignorar palavras com números';
 $labels['spellcheckignorecaps'] = 'Ignorar palavras em maiúsculas';
 $labels['addtodict'] = 'Adicionar ao dicionário';
 $labels['folder'] = 'Pasta';
-$labels['folders'] = 'Pastas';
 $labels['foldername'] = 'Nome da pasta';
 $labels['subscribed'] = 'Subscrita';
 $labels['messagecount'] = 'Mensagens';
@@ -438,4 +431,3 @@ $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
 
-?>
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index 6d640d23d..c80327e7e 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -1,29 +1,23 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/pt_PT/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Authors: Sergio Rocha <sergio.rocha@makeitsimple.pt>                  |
-|          João Vale <jpvale@gmail.com>                                |
-|          Nuno Costa <nuno@criacaoweb.net>                              |
-|          Teotónio Ricardo <teotonio.ricardo@webtuga.pt>               |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David <Unknown>                                               |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = 'O utilizador ou palavra-passe que introduziu está incorrecto.';
+$messages['loginfailed'] = 'O utilizador ou palavra-passe que introduziu não correspondem.';
 $messages['cookiesdisabled'] = 'O seu navegador não suporta cookies';
-$messages['sessionerror'] = 'A sua sessão é inválida ou expirou';
+$messages['sessionerror'] = 'A sua sessão é inválida ou expirou.';
 $messages['imaperror'] = 'A ligação ao servidor IMAP falhou';
 $messages['servererror'] = 'Erro do Servidor!';
 $messages['servererrormsg'] = 'Erro do Servidor: $msg';
@@ -31,38 +25,38 @@ $messages['dberror'] = 'Erro na base de dados!';
 $messages['errorreadonly'] = 'Não foi possível efectuar a operação. A pasta é só de leitura.';
 $messages['errornoperm'] = 'Não tem permissões para efectuar esta operação.';
 $messages['invalidrequest'] = 'Pedido inválido! Não foi guardada nenhuma informação.';
-$messages['nomessagesfound'] = 'Nenhuma mensagem encontrada na caixa de entrada';
-$messages['loggedout'] = 'A sua sessão foi terminada com sucesso. Até breve!';
+$messages['nomessagesfound'] = 'Não existem mensagens nesta pasta.';
+$messages['loggedout'] = 'A sua sessão foi encerrada com sucesso. Até breve!';
 $messages['mailboxempty'] = 'A caixa de entrada está vazia';
 $messages['loading'] = 'A carregar...';
 $messages['uploading'] = 'A enviar ficheiro...';
-$messages['uploadingmany'] = 'A carregar ficheiros...';
-$messages['loadingdata'] = 'A carregar informações...';
-$messages['checkingmail'] = 'A verificar novas mensagens...';
+$messages['uploadingmany'] = 'A enviar ficheiros...';
+$messages['loadingdata'] = 'A carregar dados...';
+$messages['checkingmail'] = 'A verificar existência de novas mensagens...';
 $messages['sendingmessage'] = 'A enviar mensagem...';
 $messages['messagesent'] = 'Mensagem enviada com sucesso';
 $messages['savingmessage'] = 'A guardar mensagem...';
 $messages['messagesaved'] = 'Mensagem guardada como rascunho';
 $messages['successfullysaved'] = 'Guardado com sucesso';
 $messages['addedsuccessfully'] = 'Contacto adicionado com sucesso';
-$messages['contactexists'] = 'Já existe um contacto com esse e-mail';
+$messages['contactexists'] = 'Já existe um contacto com este e-mail';
 $messages['contactnameexists'] = 'Já existe um contacto com este nome.';
 $messages['blockedimages'] = 'Para proteger a sua privacidade, as imagens desta mensagem foram bloqueadas';
-$messages['encryptedmessage'] = 'Esta mensagem está encriptada e não pode ser exibida. Desculpe.';
+$messages['encryptedmessage'] = 'Esta mensagem está encriptada e não pode ser apresentada. Desculpe!';
 $messages['nocontactsfound'] = 'Nenhum contacto encontrado';
 $messages['contactnotfound'] = 'O contacto especificado não foi encontrado';
 $messages['contactsearchonly'] = 'Insira os termos de pesquisa para localizar os contactos';
 $messages['sendingfailed'] = 'Falha no envio da mensagem';
-$messages['senttooquickly'] = 'Por favor espere $sec seg(s). antes de enviar esta mensagem';
+$messages['senttooquickly'] = 'Por favor espere $sec seg(s) antes de enviar esta mensagem';
 $messages['errorsavingsent'] = 'Ocorreu um erro ao guardar a mensagem enviada';
 $messages['errorsaving'] = 'Ocorreu um erro ao guardar';
 $messages['errormoving'] = 'Não foi possível mover a mensagem';
 $messages['errorcopying'] = 'Não foi possível copiar a mensagem';
-$messages['errordeleting'] = 'Não foi possível apagar a mensagem';
+$messages['errordeleting'] = 'Não foi possível eliminar a mensagem';
 $messages['errormarking'] = 'Não foi possível marcar a mensagem.';
-$messages['deletecontactconfirm'] = 'Deseja realmente eliminar o(s) contacto(s) selecionado(s)?';
+$messages['deletecontactconfirm'] = 'Deseja realmente eliminar o(s) contacto(s) seleccionado(s)?';
 $messages['deletegroupconfirm'] = 'Tem a certeza que pretende eliminar o grupo seleccionado?';
-$messages['deletemessagesconfirm'] = 'Deseja realmente eliminar a(s) mensagem(ns) selecionada(s)?';
+$messages['deletemessagesconfirm'] = 'Deseja realmente eliminar a(s) mensagem(ns) seleccionada(s)?';
 $messages['deletefolderconfirm'] = 'Deseja realmente eliminar esta pasta?';
 $messages['purgefolderconfirm'] = 'Deseja realmente eliminar todas mensagens desta pasta?';
 $messages['contactdeleting'] = 'A eliminar contacto(s)...';
@@ -72,16 +66,16 @@ $messages['foldermoving'] = 'A mover pasta...';
 $messages['foldersubscribing'] = 'A subscrever pasta...';
 $messages['folderunsubscribing'] = 'A cancelar subscrição da pasta...';
 $messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
-$messages['noemailwarning'] = 'Por favor escreva um endereço de e-mail válido';
-$messages['nonamewarning'] = 'Por favor escreva o nome';
-$messages['nopagesizewarning'] = 'Por favor escreva o tamanho da página';
-$messages['nosenderwarning'] = 'Por favor insira o endereço de e-mail do remetente';
-$messages['norecipientwarning'] = 'Por favor escreva pelo menos um destinatário';
+$messages['noemailwarning'] = 'Por favor, introduza um endereço de e-mail válido.';
+$messages['nonamewarning'] = 'Por favor, escreva um nome.';
+$messages['nopagesizewarning'] = 'Por favor, escreva o tamanho da página';
+$messages['nosenderwarning'] = 'Por favor, introsuza o endereço de e-mail do remetente';
+$messages['norecipientwarning'] = 'Por favor, insira pelo menos um destinatário';
 $messages['nosubjectwarning'] = 'O campo "Assunto" não foi preenchido. Deseja incluí-lo agora?';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem não foi enviada, deseja apagá-la?';
-$messages['noldapserver'] = 'Seleccione um servidor LDAP para a pesquisa';
-$messages['nosearchname'] = 'Por favor, escreva o nome do contacto ou endereço de e-mail';
+$messages['noldapserver'] = 'Seleccione um servidor LDAP para efectuar a pesquisa';
+$messages['nosearchname'] = 'Por favor, insira o nome do contacto ou endereço de e-mail';
 $messages['notuploadedwarning'] = 'Nem todos os anexos foram ainda enviados. Por favor aguarde ou cancele o envio.';
 $messages['searchsuccessful'] = '$nr mensagens encontradas';
 $messages['contactsearchsuccessful'] = '$nr contactos encontrados.';
@@ -96,70 +90,69 @@ $messages['folderpurged'] = 'Pasta eliminada com sucesso';
 $messages['folderexpunged'] = 'Pasta compactada com sucesso.';
 $messages['deletedsuccessfully'] = 'Eliminado com sucesso';
 $messages['converting'] = 'A remover a formatação...';
-$messages['messageopenerror'] = 'Não foi possível carregar a mensagem';
+$messages['messageopenerror'] = 'Não foi possível carregar a mensagem.';
 $messages['fileuploaderror'] = 'Falha ao carregar o ficheiro';
-$messages['filesizeerror'] = 'O ficheiro excede o tamanho máximo permitido - $size';
+$messages['filesizeerror'] = 'O ficheiro excede o tamanho máximo permitido de $size';
 $messages['copysuccess'] = 'Foram copiados $nr endereços com sucesso';
 $messages['copyerror'] = 'Não foi possível copiar os endereços';
 $messages['sourceisreadonly'] = 'Esta origem de endereços é só de leitura';
 $messages['errorsavingcontact'] = 'Não foi possível guardar o endereço deste contacto';
-$messages['movingmessage'] = 'A mover mensagem...';
-$messages['copyingmessage'] = 'A copiar mensagem...';
+$messages['movingmessage'] = 'A mover mensagem(ns)...';
+$messages['copyingmessage'] = 'A copiar mensagem(ns)...';
 $messages['copyingcontact'] = 'A copiar contacto(s)...';
-$messages['deletingmessage'] = 'A eliminar mensagens...';
-$messages['markingmessage'] = 'A marcar mensagens...';
+$messages['deletingmessage'] = 'A eliminar mensagem(ns)...';
+$messages['markingmessage'] = 'A marcar mensagem(ns)...';
 $messages['addingmember'] = 'A adicionar contacto(s) ao grupo...';
 $messages['removingmember'] = 'A remover contacto(s) do grupo...';
-$messages['receiptsent'] = 'Recibo de leitura enviadocom sucesso';
+$messages['receiptsent'] = 'Recibo de leitura enviado com sucesso';
 $messages['errorsendingreceipt'] = 'Não foi possível enviar o recibo';
-$messages['nodeletelastidentity'] = 'Esta é a última identidade, não é possível eliminá-la.';
+$messages['nodeletelastidentity'] = 'Esta é a sua última identidade, não é possível eliminá-la.';
 $messages['forbiddencharacter'] = 'O nome da pasta contém um caractere inválido';
-$messages['selectimportfile'] = 'Por favor seleccione um ficheiro para carregar';
-$messages['addresswriterror'] = 'Não é possível escrever no livro de endereços seleccionado';
-$messages['contactaddedtogroup'] = 'Contacto adicionado com sucesso a este grupo';
-$messages['contactremovedfromgroup'] = 'Contacto removido com sucesso deste grupo';
+$messages['selectimportfile'] = 'Por favor, seleccione um ficheiro para enviar.';
+$messages['addresswriterror'] = 'Não é possível escrever no livro de endereços seleccionado.';
+$messages['contactaddedtogroup'] = 'Contacto adicionado com sucesso a este grupo.';
+$messages['contactremovedfromgroup'] = 'Contacto removido com sucesso deste grupo.';
 $messages['importwait'] = 'A importar, por favor aguarde...';
 $messages['importerror'] = 'A importação falhou! O ficheiro submetido não é um ficheiro vCard válido.';
-$messages['importconfirm'] = '<b>$inserted contactos importados com sucesso, $skipped contactos já existentes ignorados</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>$inserted contactos importados com sucesso, $skipped contactos já existentes foram ignorados</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = 'Ignoradas $skipped entradas já existentes.';
 $messages['opnotpermitted'] = 'Operação não permitida';
 $messages['nofromaddress'] = 'Falta o endereço de e-mail na identidade seleccionada';
 $messages['editorwarning'] = 'Ao mudar para o editor Plain Text vai perder toda a formação de texto. Deseja continuar?';
 $messages['httpreceivedencrypterror'] = 'Ocorreu um erro fatal de configuração. Contacte o seu Administrador imediatamente. <b>A sua mensagem não pôde ser enviada.</b>';
-$messages['smtpconnerror'] = 'Erro SMTP ($code): A ligação ao servidor falhou';
-$messages['smtpautherror'] = 'Erro SMTP ($code): A autenticação falhou';
-$messages['smtpfromerror'] = 'Erro SMTP ($code): Falha ao definir o remetente "$from" ($msg)';
-$messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinatário: "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Erro SMTP: Impossível analisar a lista de destinatários';
+$messages['smtpconnerror'] = 'Erro SMTP ($code): A ligação ao servidor falhou.';
+$messages['smtpautherror'] = 'Erro SMTP ($code): A autenticação falhou.';
+$messages['smtpfromerror'] = 'Erro SMTP ($code): Falha ao definir o remetente "$from" ($msg).';
+$messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinatário: "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Erro SMTP: Impossível analisar a lista de destinatários.';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de e-mail incorrecto: $email';
 $messages['toomanyrecipients'] = 'Demasiados destinatários. Reduza o numero de destinatários para o máximo de $max.';
 $messages['maxgroupmembersreached'] = 'O número de membros do grupo ultrapassa o máximo permitido de $max.';
-$messages['internalerror'] = 'Ocorreu um erro interno. Por favor, tente de novamente.';
-$messages['contactdelerror'] = 'Não foi possível eliminar os contactos';
-$messages['contactdeleted'] = 'Contactos eliminados com sucesso';
+$messages['internalerror'] = 'Ocorreu um erro interno. Por favor, tente novamente.';
+$messages['contactdelerror'] = 'Não foi possível eliminar o(s) contacto(s).';
+$messages['contactdeleted'] = 'Contacto(s) eliminado(s) com sucesso.';
 $messages['contactrestoreerror'] = 'Não foi possível restaurar o(s) contacto(s) eliminados.';
 $messages['contactrestored'] = 'Contacto(s) restaurado(s) com sucesso.';
-$messages['groupdeleted'] = 'Grupo eliminado com sucesso';
-$messages['grouprenamed'] = 'Grupo renomeado com sucesso';
-$messages['groupcreated'] = 'Grupo criado com sucesso';
-$messages['savedsearchdeleted'] = 'Pesquisa guardada eliminada com sucesso.';
+$messages['groupdeleted'] = 'Grupo eliminado com sucesso.';
+$messages['grouprenamed'] = 'Grupo renomeado com sucesso.';
+$messages['groupcreated'] = 'Grupo criado com sucesso.';
+$messages['savedsearchdeleted'] = 'A pesquisa guardada foi eliminada com sucesso.';
 $messages['savedsearchdeleteerror'] = 'Não foi possível eliminar a pesquisa guardada.';
 $messages['savedsearchcreated'] = 'Pesquisa guardada criada com sucesso.';
 $messages['savedsearchcreateerror'] = 'Não foi possível criar a pesquisa guardada.';
-$messages['messagedeleted'] = 'Mensagens eliminadas com sucesso';
-$messages['messagemoved'] = 'Mensagens movidas com sucesso';
-$messages['messagecopied'] = 'Mensagens copiadas com sucesso';
-$messages['messagemarked'] = 'Mensagens marcadas com sucesso';
-$messages['autocompletechars'] = 'Indique pelo menos $min caracteres para auto completar';
-$messages['autocompletemore'] = 'Muitos registros encontrados. Por favor, insira mais caracteres.';
-$messages['namecannotbeempty'] = 'O nome não pode estar em branco';
-$messages['nametoolong'] = 'O nome é demasiado longo';
-$messages['folderupdated'] = 'Actualização da pasta concluída com sucesso';
-$messages['foldercreated'] = 'Pasta criada com sucesso';
-$messages['invalidimageformat'] = 'Formato de imagem não suportado';
-$messages['mispellingsfound'] = 'Foram detectados erros de ortografia nesta mensagem';
-$messages['parentnotwritable'] = 'Não é possível criar/mover esta pasta para a pasta seleccionada. Acesso negado.';
+$messages['messagedeleted'] = 'Mensagem(ns) eliminada(s) com sucesso.';
+$messages['messagemoved'] = 'Mensagem(ns) movida(s) com sucesso.';
+$messages['messagecopied'] = 'Mensagem(ns) copiada(s) com sucesso.';
+$messages['messagemarked'] = 'Mensage(m)ns marcada(s) com sucesso.';
+$messages['autocompletechars'] = 'Indique pelo menos $min caracteres para o auto preenchimento.';
+$messages['autocompletemore'] = 'Demasiados registos encontrados. Por favor, insira mais caracteres.';
+$messages['namecannotbeempty'] = 'O nome não pode estar em branco.';
+$messages['nametoolong'] = 'O nome é demasiado longo.';
+$messages['folderupdated'] = 'Actualização da pasta concluída com sucesso.';
+$messages['foldercreated'] = 'Pasta criada com sucesso.';
+$messages['invalidimageformat'] = 'O formato da imagem não é suportado.';
+$messages['mispellingsfound'] = 'Foram detectados erros de ortografia nesta mensagem.';
+$messages['parentnotwritable'] = 'Não é possível criar/mover esta pasta para a pasta seleccionada. O acesso foi negado.';
 $messages['messagetoobig'] = 'A mensagem é demasiado grande para ser processada.';
 
-?>
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 640809c60..a9257d5bf 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/ro_RO/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Daniel Anechitoaie - danieLs <daniels@safereaction.ro>        |
-|         Zeno Popovici <zeno.popovici at ulbsibiu.ro>                  |
-|         Cristian Nastase <cristian.nastase@itcaffe.net>               |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ro_RO/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -43,8 +39,8 @@ $labels['date'] = 'Data';
 $labels['size'] = 'Mărime';
 $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organizaţie';
-$labels['reply-to'] = 'Răspunde la';
 $labels['mailboxlist'] = 'Dosare';
+$labels['folders'] = 'Dosare';
 $labels['messagesfromto'] = 'Mesaje de la $from până la $to din $count';
 $labels['threadsfromto'] = 'Grupuri de la $from până la $to din $count';
 $labels['messagenrof'] = '$nr mesaje din $count';
@@ -74,6 +70,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Mai';
+$labels['longmay'] = 'Mai';
 $labels['jun'] = 'Iun';
 $labels['jul'] = 'Iul';
 $labels['aug'] = 'Aug';
@@ -85,7 +82,6 @@ $labels['longjan'] = 'Ianuarie';
 $labels['longfeb'] = 'Februarie';
 $labels['longmar'] = 'Martie';
 $labels['longapr'] = 'Aprilie';
-$labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Iunie';
 $labels['longjul'] = 'Iulie';
 $labels['longaug'] = 'August';
@@ -103,13 +99,9 @@ $labels['deletemessage'] = 'Trimite mesajul la gunoi';
 $labels['movemessagetotrash'] = 'Mută mesajul la gunoi';
 $labels['printmessage'] = 'Listează mesajul';
 $labels['previousmessage'] = 'Afişează mesajul anterior';
-$labels['previousmessages'] = 'Afişează setul anterior de mesaje';
 $labels['firstmessage'] = 'Afişează primul mesaj';
-$labels['firstmessages'] = 'Afişează primul set de mesaje';
 $labels['nextmessage'] = 'Afişează următorul mesaj';
-$labels['nextmessages'] = 'Afişează setul următor de mesaje';
 $labels['lastmessage'] = 'Afişează ultimul mesaj';
-$labels['lastmessages'] = 'Afişează ultimul set de mesaje';
 $labels['backtolist'] = 'Înapoi la lista cu mesaje';
 $labels['viewsource'] = 'Afişează sursa';
 $labels['markmessages'] = 'Marchează mesajele';
@@ -117,10 +109,10 @@ $labels['markread'] = 'Ca citit';
 $labels['markunread'] = 'Ca necitit';
 $labels['markflagged'] = 'Ca marcat';
 $labels['markunflagged'] = 'Ca nemarcat';
-$labels['messageactions'] = 'Mai multe acţiuni...';
 $labels['select'] = 'Selectează';
 $labels['all'] = 'Toate';
-$labels['none'] = 'Nici unul';
+$labels['none'] = 'Fără sortare';
+$labels['nonesort'] = 'Fără sortare';
 $labels['currpage'] = 'Pagina curentă';
 $labels['unread'] = 'Necitite';
 $labels['flagged'] = 'Marcat';
@@ -140,7 +132,6 @@ $labels['expand_only_unread'] = 'doar pe cele cu mesaje necitite';
 $labels['fromto'] = 'Expeditor/Destinatar';
 $labels['flag'] = 'Marcaj';
 $labels['attachment'] = 'Ataşament';
-$labels['nonesort'] = 'Fără sortare';
 $labels['sentdate'] = 'Data trimiterii';
 $labels['arrival'] = 'Data primirii';
 $labels['asc'] = 'ascendent';
@@ -151,7 +142,6 @@ $labels['listorder'] = 'Ordinea de sortare';
 $labels['listmode'] = 'Mod de vizualizare';
 $labels['compact'] = 'Compactează';
 $labels['empty'] = 'Goleşte';
-$labels['purge'] = 'Curăţă';
 $labels['quota'] = 'Spaţiu folosit';
 $labels['unknown'] = 'necunoscut';
 $labels['unlimited'] = 'nelimitat';
@@ -188,7 +178,7 @@ $labels['plaintoggle'] = 'Text simplu';
 $labels['savesentmessagein'] = 'Salvează mesajele în';
 $labels['dontsave'] = 'Nu salva';
 $labels['maxuploadsize'] = 'Mărimea maximă admisă a fişierului este $size';
-$labels['addcc'] = 'Adaugă Cc ';
+$labels['addcc'] = 'Adaugă Cc';
 $labels['addbcc'] = 'Adaugă Bcc';
 $labels['addreplyto'] = 'Adaugă Raspunde-La';
 $labels['mdnrequest'] = 'Expeditorul acestui mesaj a solicitat să fie notificat la cititrea mesajului. Doriţi să notificaţi expeditorul?';
@@ -213,7 +203,6 @@ $labels['print'] = 'Listează';
 $labels['export'] = 'Exportă';
 $labels['exportvcards'] = 'Exportă contactele în format vCard';
 $labels['newcontactgroup'] = 'Creează un nou grup de contacte';
-$labels['groupactions'] = 'Acţiuni pentru grupurile de contacte ...';
 $labels['previouspage'] = 'Pagina anterioară';
 $labels['firstpage'] = 'Arată primul set';
 $labels['nextpage'] = 'Pagina următoare';
@@ -288,7 +277,6 @@ $labels['mainoptions'] = 'Opţiuni principale';
 $labels['section'] = 'Secţiune';
 $labels['maintenance'] = 'Mentenanţă';
 $labels['newmessage'] = 'Mesaj nou';
-$labels['listoptions'] = 'Opţiuni listă';
 $labels['signatureoptions'] = 'Opţiuni semnătură';
 $labels['whenreplying'] = 'Când răspundeţi';
 $labels['replytopposting'] = 'începeţi mesajul nou deasupra originalului';
@@ -304,7 +292,6 @@ $labels['insertsignature'] = 'Introduce o semnătură';
 $labels['previewpanemarkread'] = 'Marchează mesajele previzualizate ca citite';
 $labels['afternseconds'] = 'după $n secunde';
 $labels['folder'] = 'Dosar';
-$labels['folders'] = 'Dosare';
 $labels['foldername'] = 'Nume dosar';
 $labels['subscribed'] = 'Înscris';
 $labels['messagecount'] = 'Mesaje';
@@ -338,4 +325,3 @@ $labels['japanese'] = 'Japonez';
 $labels['korean'] = 'Coreean';
 $labels['chinese'] = 'Chinezesc';
 
-?>
\ No newline at end of file
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 0b2c64ab1..13f76fb07 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/ro_RO/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Daniel Anechitoaie - danieLs <daniels@safereaction.ro>        |
-|         Zeno Popovici <zeno.popovici at ulbsibiu.ro>                  |
-|         Cristian Nastase <cristian.nastase@itcaffe.net>               |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ro_RO/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -67,7 +63,6 @@ $messages['nosubjectwarning'] = 'Mesajul nu are subiect. Vreţi să introduceţi
 $messages['nobodywarning'] = 'Trimiteţi acest mesaj fără text?';
 $messages['notsentwarning'] = 'Mesajul nu a fost trimis. Vreţi să renunţaţi la el?';
 $messages['noldapserver'] = 'Vă rugăm să alegeţi un server ldap pentru căutare';
-$messages['nocontactsreturned'] = 'Nu s-a găsit nici un contact';
 $messages['nosearchname'] = 'Vă rugăm să introduceţi un nume de contact sau adresă de e-mail';
 $messages['notuploadedwarning'] = 'Nu toate fişierele au fost ataşate. Vă rugăm să aşteptaţi sau să anulaţi încărcarea acestora.';
 $messages['searchsuccessful'] = '$nr mesaje găsite';
@@ -112,4 +107,3 @@ $messages['emailformaterror'] = 'Adresă de e-mail incorectă: $email';
 $messages['toomanyrecipients'] = 'Prea mulţi destinatari. Reduceţi numărul de destinatari la $max.';
 $messages['maxgroupmembersreached'] = 'Numărul de membri ai grupului depăşeşte maximul de $max.';
 
-?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 30fa3e06a..60ddba4e1 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ru_RU/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Artur Smolkin <artsmolkin@gmail.com>                          |
-| Updates: Sergey Dukachev <iam@dukess.ru>                              |
-| Support: www.roundcube.ru                                             |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,6 +42,7 @@ $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
 $labels['readstatus'] = 'Статус прочтения';
 $labels['mailboxlist'] = 'Папки';
+$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Сообщения с $from по $to из $count';
 $labels['threadsfromto'] = 'Обсуждения с $from по $to из $count';
 $labels['messagenrof'] = 'Сообщение $nr из $count';
@@ -76,6 +72,7 @@ $labels['feb'] = 'Фев';
 $labels['mar'] = 'Мар';
 $labels['apr'] = 'Апр';
 $labels['may'] = 'Май';
+$labels['longmay'] = 'Май';
 $labels['jun'] = 'Июн';
 $labels['jul'] = 'Июл';
 $labels['aug'] = 'Авг';
@@ -87,7 +84,6 @@ $labels['longjan'] = 'Январь';
 $labels['longfeb'] = 'Февраль';
 $labels['longmar'] = 'Март';
 $labels['longapr'] = 'Апрель';
-$labels['longmay'] = 'Май';
 $labels['longjun'] = 'Июнь';
 $labels['longjul'] = 'Июль';
 $labels['longaug'] = 'Август';
@@ -119,10 +115,11 @@ $labels['markread'] = 'Как прочитанное';
 $labels['markunread'] = 'Как непрочитанное';
 $labels['markflagged'] = 'Установить флаг';
 $labels['markunflagged'] = 'Снять флаг';
-$labels['messageactions'] = 'Еще действия...';
+$labels['moreactions'] = 'Дополнительные действия...';
 $labels['select'] = 'Выбрать';
 $labels['all'] = 'Все';
-$labels['none'] = 'Ничего';
+$labels['none'] = 'Отсутствует';
+$labels['nonesort'] = 'Отсутствует';
 $labels['currpage'] = 'Текущая страница';
 $labels['unread'] = 'Непрочитанные';
 $labels['flagged'] = 'Помеченные';
@@ -142,7 +139,6 @@ $labels['expand_only_unread'] = 'только с непрочитанными с
 $labels['fromto'] = 'Отправитель/Получатель';
 $labels['flag'] = 'Флаг';
 $labels['attachment'] = 'Вложение';
-$labels['nonesort'] = 'Отсутствует';
 $labels['sentdate'] = 'Дата отправки';
 $labels['arrival'] = 'Дата получения';
 $labels['asc'] = 'по возрастанию';
@@ -191,6 +187,7 @@ $labels['highest'] = 'Высоч.';
 $labels['nosubject'] = '(без темы)';
 $labels['showimages'] = 'Показать изображения';
 $labels['alwaysshow'] = 'Всегда показывать изображенияв письмах от $sender';
+$labels['isdraft'] = 'Это черновик.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Текст';
 $labels['savesentmessagein'] = 'Сохранить в';
@@ -232,14 +229,15 @@ $labels['male'] = 'мужской';
 $labels['female'] = 'женский';
 $labels['manager'] = 'Менеджер';
 $labels['assistant'] = 'Помощник';
+$labels['typeassistant'] = 'Помощник';
 $labels['spouse'] = 'Супруг';
 $labels['allfields'] = 'Все поля';
 $labels['search'] = 'Поиск';
 $labels['advsearch'] = 'Расширенный поиск';
-$labels['other'] = 'Прочие';
+$labels['other'] = 'Другое';
+$labels['typeother'] = 'Другое';
 $labels['typehome'] = 'Дом';
 $labels['typework'] = 'Работа';
-$labels['typeother'] = 'Другое';
 $labels['typemobile'] = 'Мобильный';
 $labels['typemain'] = 'Основной';
 $labels['typehomefax'] = 'Домашний факс';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Рабочий факс';
 $labels['typecar'] = 'Автомобиль';
 $labels['typepager'] = 'Пэйджер';
 $labels['typevideo'] = 'Видео';
-$labels['typeassistant'] = 'Помощник';
 $labels['typehomepage'] = 'Домашняя страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профиль';
@@ -272,7 +269,6 @@ $labels['print'] = 'Печать';
 $labels['export'] = 'Экспорт';
 $labels['exportvcards'] = 'Экспортировать контакты в формате vCard';
 $labels['newcontactgroup'] = 'Создать группу контактов';
-$labels['groupactions'] = 'Действия для групп контактов';
 $labels['grouprename'] = 'Переименовать группу';
 $labels['groupdelete'] = 'Удалить группу';
 $labels['previouspage'] = 'Показать предыдущий';
@@ -282,6 +278,8 @@ $labels['lastpage'] = 'Показать последний';
 $labels['group'] = 'Группа';
 $labels['groups'] = 'Группы';
 $labels['personaladrbook'] = 'Персональные адреса';
+$labels['searchsave'] = 'Сохранить запрос';
+$labels['searchdelete'] = 'Удалить запрос';
 $labels['import'] = 'Импортировать';
 $labels['importcontacts'] = 'Импортировать контакты';
 $labels['importfromfile'] = 'Импортировать из файла:';
@@ -290,6 +288,7 @@ $labels['importreplace'] = 'Заменить всю адресную книгу'
 $labels['importtext'] = 'Вы можете загрузить контакты из существующей адресной книги. На данный момент поддерживается загрузка в формате vCard.';
 $labels['done'] = 'Завершено';
 $labels['settingsfor'] = 'Настройки для';
+$labels['about'] = 'О программе';
 $labels['preferences'] = 'Настройки';
 $labels['userpreferences'] = 'Настройки пользователя';
 $labels['editpreferences'] = 'Редактировать настройки пользователя';
@@ -301,6 +300,8 @@ $labels['edititem'] = 'Правка';
 $labels['preferhtml'] = 'Предпочитать HTML';
 $labels['defaultcharset'] = 'Набор символов по-умолчанию';
 $labels['htmlmessage'] = 'Сообщение HTML';
+$labels['dateformat'] = 'Формат даты';
+$labels['timeformat'] = 'Формат времени';
 $labels['prettydate'] = 'Красивые даты';
 $labels['setdefault'] = 'Использовать по умолчанию';
 $labels['autodetect'] = 'Определять автоматически';
@@ -349,11 +350,11 @@ $labels['advancedoptions'] = 'Дополнительные настройки';
 $labels['focusonnewmessage'] = 'Фокусировать окно браузера при новом сообщении';
 $labels['checkallfolders'] = 'Проверять новые сообщения во всех папках';
 $labels['displaynext'] = 'Показать следующее сообщение, после удаления или перемещения данного';
+$labels['defaultfont'] = 'Шрифт по умолчанию HTML сообщения';
 $labels['mainoptions'] = 'Основные настройки';
 $labels['section'] = 'Раздел';
 $labels['maintenance'] = 'Обслуживание';
 $labels['newmessage'] = 'Новое сообщение';
-$labels['listoptions'] = 'Список настроек';
 $labels['signatureoptions'] = 'Опции подписи';
 $labels['whenreplying'] = 'При ответе';
 $labels['replytopposting'] = 'начать новое сообщение перед цитируемым';
@@ -372,9 +373,14 @@ $labels['reqmdn'] = 'Всегда запрашивать уведомление
 $labels['reqdsn'] = 'Всегда запрашивать уведомление о состоянии доставки';
 $labels['replysamefolder'] = 'Помещать ответы в ту же папку, где находится оригинал';
 $labels['defaultaddressbook'] = 'Добавить новые контакты в выбранную адресную книгу';
+$labels['autocompletesingle'] = 'Пропускать дополнительные адреса в автозавершении';
 $labels['spellcheckbeforesend'] = 'Проверять орфографию перед отправкой';
+$labels['spellcheckoptions'] = 'Параметры проверки орфографии';
+$labels['spellcheckignoresyms'] = 'Пропускать слова с символами';
+$labels['spellcheckignorenums'] = 'Пропускать слова с цифрами';
+$labels['spellcheckignorecaps'] = 'Пропускать слова из прописных букв';
+$labels['addtodict'] = 'Добавить в словарь';
 $labels['folder'] = 'Папка';
-$labels['folders'] = 'Папки';
 $labels['foldername'] = 'Имя папки';
 $labels['subscribed'] = 'Подписан';
 $labels['messagecount'] = 'Сообщения';
@@ -397,6 +403,11 @@ $labels['sortby'] = 'Сортировать по';
 $labels['sortasc'] = 'Возрастанию';
 $labels['sortdesc'] = 'Убыванию';
 $labels['undo'] = 'Отмена';
+$labels['plugin'] = 'Модуль';
+$labels['version'] = 'Версия';
+$labels['source'] = 'Источник';
+$labels['license'] = 'Лицензия';
+$labels['support'] = 'Поддержка';
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
@@ -420,4 +431,3 @@ $labels['japanese'] = 'Японский';
 $labels['korean'] = 'Корейский';
 $labels['chinese'] = 'Китайский';
 
-?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 2faf79f45..242993ff1 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/ru_RU/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Artur Smolkin <artsmolkin@ya.ru>                              |
-| Updates: Sergey Dukachev <iam@dukess.ru>                              |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nkolay Parukhin <parukhin@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -49,6 +45,7 @@ $messages['blockedimages'] = 'В целях безопасности загру�
 $messages['encryptedmessage'] = 'Сообщение зашифровано и не может быть показано. Обратитесь к администратору сервера.';
 $messages['nocontactsfound'] = 'Контакты не найдены';
 $messages['contactnotfound'] = 'Требуемый контакт не найден';
+$messages['contactsearchonly'] = 'Введите условия для поиска контактов';
 $messages['sendingfailed'] = 'Не удалось отправить сообщение';
 $messages['senttooquickly'] = 'Вы должны подождать $sec сек. для отправки сообщения';
 $messages['errorsavingsent'] = 'Произошла ошибка при сохранении отправленного сообщения';
@@ -62,6 +59,7 @@ $messages['deletegroupconfirm'] = 'Вы действительно хотите
 $messages['deletemessagesconfirm'] = 'Вы действительно хотите удалить выбранные сообщения?';
 $messages['deletefolderconfirm'] = 'Вы действительно хотите удалить эту папку?';
 $messages['purgefolderconfirm'] = 'Вы действительно хотите удалить все сообщения в этой папке?';
+$messages['contactdeleting'] = 'Удаление контакта(ов)...';
 $messages['groupdeleting'] = 'Удаление группы...';
 $messages['folderdeleting'] = 'Удаление папки...';
 $messages['foldermoving'] = 'Перемещение папки...';
@@ -77,10 +75,10 @@ $messages['nosubjectwarning'] = 'Поле Тема не заполнено. Хо
 $messages['nobodywarning'] = 'Отправить сообщение без текста?';
 $messages['notsentwarning'] = 'Сообщение не было отправлено. Вы хотите отказаться от отправки?';
 $messages['noldapserver'] = 'Пожалуйста, выберите LDAP сервер для поиска';
-$messages['nocontactsreturned'] = 'Контакты не найдены';
 $messages['nosearchname'] = 'Пожалуйста, введите имя или адрес E-Mail';
 $messages['notuploadedwarning'] = 'Вложения загружены не полностью. Подождите или отмените загрузку.';
 $messages['searchsuccessful'] = 'Найденных сообщений - $nr';
+$messages['contactsearchsuccessful'] = '$nr контактов найдено.';
 $messages['searchnomatch'] = 'Сообщений не найдено';
 $messages['searching'] = 'Поиск...';
 $messages['checking'] = 'Проверка...';
@@ -127,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP Error ($code): Ошибка авториза�
 $messages['smtpfromerror'] = 'SMTP Error ($code): Невозможно установить отправителя "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Error ($code): Невозможно добавить получателя "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: Невозможно обработать список получателей';
-$messages['smtpdsnerror'] = 'SMTP Error: Уведомления о состоянии доставки не поддерживаются';
 $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Неверный адрес: $email';
 $messages['toomanyrecipients'] = 'Слишком много получателей, уменьшите их количество до $max.';
@@ -137,14 +134,19 @@ $messages['contactdelerror'] = 'Не могу удалить контакт(ы)'
 $messages['contactdeleted'] = 'Контакт(ы) успешно удален(ы)';
 $messages['contactrestoreerror'] = 'Не удалось восстановить удалённый(е) контакт(ы).';
 $messages['contactrestored'] = 'Контакт(ы) успешно восстановлены.';
-$messages['groupdeleted'] = 'Группа успешно удалена ';
+$messages['groupdeleted'] = 'Группа успешно удалена';
 $messages['grouprenamed'] = 'Группа успешно переименована';
 $messages['groupcreated'] = 'Группа успешно создана';
+$messages['savedsearchdeleted'] = 'Сохранённый запрос успешно удалён.';
+$messages['savedsearchdeleteerror'] = 'Не удалось удалить сохранённый запрос.';
+$messages['savedsearchcreated'] = 'Сохранённый запрос успешно создан.';
+$messages['savedsearchcreateerror'] = 'Не удалось создать сохранённый запрос.';
 $messages['messagedeleted'] = 'Сообщения успешно удалены';
 $messages['messagemoved'] = 'Сообщения успешно перемещены';
 $messages['messagecopied'] = 'Сообщения успешно скопированы';
 $messages['messagemarked'] = 'Сообщения успешно выделены';
 $messages['autocompletechars'] = 'Введите, как минимум, $min символов для автодополнения';
+$messages['autocompletemore'] = 'Поиск возвратил слишком много результатов. Пожалуйста, уточните.';
 $messages['namecannotbeempty'] = 'Имя не может быть пустым';
 $messages['nametoolong'] = 'Слишком длинное имя';
 $messages['folderupdated'] = 'Папка обновлена';
@@ -152,5 +154,5 @@ $messages['foldercreated'] = 'Папка создана';
 $messages['invalidimageformat'] = 'Неверный формат изображения';
 $messages['mispellingsfound'] = 'В сообщении обнаружены орфографические ошибки';
 $messages['parentnotwritable'] = 'Не удается создать/переместить папку в выбранную родительскую папку. Нет прав доступа.';
+$messages['messagetoobig'] = 'Часть сообщения слишком велика для обработки.';
 
-?>
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 163431bb8..f79b764d0 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -2,18 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/si/labels.inc                                                |
+ | localization/si_LK/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Melanga Dissanayake <Melanga.Dissanayake@pabcbank.com>        |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
@@ -41,17 +39,15 @@ $labels['date'] = 'දිනය';
 $labels['size'] = 'ප්රමාණය';
 $labels['priority'] = 'ප්රමුඛතාව';
 $labels['organization'] = 'සංවිධානය';
-$labels['reply-to'] = 'පිළිතුරු සඳහා';
-$labels['mailboxlist'] = 'ෆෝල්ඩරය';
+$labels['mailboxlist'] = 'ෆෝල්ඩර';
+$labels['folders'] = 'ෆෝල්ඩර';
 $labels['messagesfromto'] = '$from ගෙන් $to පනිවුඩ $count';
-$labels['messagenrof'] = 'පනිවුඩය $count න් $nr ';
+$labels['messagenrof'] = 'පනිවුඩය $count න් $nr';
+$labels['copy'] = 'පිටපත් කිරීම්';
 $labels['moveto'] = 'ගෙනයෑම...';
 $labels['download'] = 'බාගතකිරීම';
 $labels['filename'] = 'ගොනුවේ නම';
 $labels['filesize'] = 'ගොනුවේ ප්රමාණය';
-$labels['preferhtml'] = 'HTML විදහා පෙන්වීම';
-$labels['htmlmessage'] = 'HTML පනිවුඩය';
-$labels['prettydate'] = 'සුරුබුහුටි දින';
 $labels['addtoaddressbook'] = 'ලිපින පොතට එකතු කරන්න';
 $labels['sun'] = 'ඉරිදා';
 $labels['mon'] = 'සඳුදා';
@@ -77,13 +73,9 @@ $labels['deletemessage'] = 'පනිවුඩය ලටපට තුලට ග�
 $labels['movemessagetotrash'] = 'පණිවුඩය ලටපට වෙත ගෙන යන්න';
 $labels['printmessage'] = 'පනිවුඩය මුද්රනය කරන්න';
 $labels['previousmessage'] = 'කලින් පනිවුඩය පෙන්නන්න';
-$labels['previousmessages'] = 'කලින් පනිවුඩ කට්ටලය පෙන්නන්න';
 $labels['firstmessage'] = 'පළමුවන පනිවුඩය පෙන්නන්න';
-$labels['firstmessages'] = 'පළමුවන පනිවුඩ කට්ටලය පෙන්නන්න';
 $labels['nextmessage'] = 'මීළඟ පනිවුඩය පෙන්නන්න';
-$labels['nextmessages'] = 'මීළඟ පනිවුඩ කට්ටලය පෙන්නන්න';
 $labels['lastmessage'] = 'අවසාන පනිවුඩය පෙන්නන්න';
-$labels['lastmessages'] = 'අවසාන පනිවුඩ කට්ටලය පෙන්නන්න';
 $labels['backtolist'] = 'නැවතත් පනිවුඩ ලැයිස්තුවට';
 $labels['viewsource'] = 'මූලාශ්රය පෙන්නන්න';
 $labels['markmessages'] = 'පණිවුඩ';
@@ -92,10 +84,10 @@ $labels['markunread'] = 'නොකියවු ලෙස සළකුණු ක�
 $labels['select'] = 'තෝරාගන්න';
 $labels['all'] = 'සියලු';
 $labels['none'] = 'තෝරානොගත්';
+$labels['nonesort'] = 'තෝරානොගත්';
 $labels['unread'] = 'නොකියවූ';
 $labels['compact'] = 'සංයුක්ත';
 $labels['empty'] = 'රික්ත';
-$labels['purge'] = 'විරේචන';
 $labels['quota'] = 'භාවිතය';
 $labels['unknown'] = 'නාඳුනන';
 $labels['unlimited'] = 'අසීමිත';
@@ -161,6 +153,9 @@ $labels['manageidentities'] = 'මෙම ගිණුමෙ අනන්නය�
 $labels['newidentity'] = 'අඵත් අනන්නයතාව';
 $labels['newitem'] = 'අඵත් අයිතම';
 $labels['edititem'] = 'අයිතම වෙනස් කිරීම්';
+$labels['preferhtml'] = 'HTML විදහා පෙන්වීම';
+$labels['htmlmessage'] = 'HTML පනිවුඩය';
+$labels['prettydate'] = 'සුරුබුහුටි දින';
 $labels['setdefault'] = 'පළමු තත්වයට';
 $labels['language'] = 'භාෂාව';
 $labels['timezone'] = 'කාල කලාපය';
@@ -173,7 +168,6 @@ $labels['previewpane'] = 'පූර්වදර්ශන කොටස පෙන�
 $labels['autosavedraft'] = 'ස්වයංක්රීයව කටු සටහනේ තැන්පත් කරන්න';
 $labels['never'] = 'කිසි විටෙකත් නැති';
 $labels['folder'] = 'ෆෝල්ඩරය';
-$labels['folders'] = 'ෆෝල්ඩර';
 $labels['foldername'] = 'ෆෝල්ඩරයේ නම';
 $labels['subscribed'] = 'සාමාජික';
 $labels['messagecount'] = 'පනිවුඩ';
@@ -184,4 +178,3 @@ $labels['sortby'] = 'චිසින් වර්ග කිරීම';
 $labels['sortasc'] = 'ආරෝහණ වර්ග කිරීම';
 $labels['sortdesc'] = 'අවරෝහණ වර්ග කිරීම';
 
-?>
\ No newline at end of file
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index db3858dd4..07ce76b47 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -1,19 +1,17 @@
 <?php
-/*
 
+/*
  +-----------------------------------------------------------------------+
- | language/si/messages.inc                                              |
+ | localization/si_LK/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Melanga Dissanayake <Melanga.Dissanayake@pabcbank.com>        |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
@@ -55,7 +53,6 @@ $messages['nosubjectwarning'] = '"මාතෘකාව" හිස්. මාත
 $messages['nobodywarning'] = 'මෙම හිස් පනිවුඩය යවන්නද?';
 $messages['notsentwarning'] = 'පනිවුඩය යැවීමට නොහැකි විය. ඔබට එය බැහැර කිරීමට වුවමනාද?';
 $messages['noldapserver'] = 'සෙවුම සඳහා කරුණාකර ldap සම්බන්ධතාවයක් තෝරා ගන්න';
-$messages['nocontactsreturned'] = 'ලිපින/ය සොයා ගත නොහැක';
 $messages['nosearchname'] = 'කරුණාකර ලිපිනයෙහි නම හෝ විද්යුත් තැපැල් ලිපිනය ඇතුලත් කරන්න';
 $messages['searchsuccessful'] = '$nr පනිවුඩය හමු විය';
 $messages['searchnomatch'] = 'සෙවුමට අදාල ගැලපීමක් නොමැත';
@@ -77,4 +74,3 @@ $messages['receiptsent'] = 'කියවීම් භාර ගැනීම ස�
 $messages['errorsendingreceipt'] = 'කියවීම් භාර ගැනීම යැවීමට නොහැක';
 $messages['nodeletelastidentity'] = 'අවසාන අනන්‍යතාවය මකා දැමිය නොහැක';
 
-?>
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 4c3ecea9e..65688b89b 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -1,24 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/sk_SK/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Marek Kutnar <marek19@zmail.sk>                               |
-|         Lukas Kraic  <lukas.kraic@truni.sk>                           |
-|         Peter Mann   <peter.mann@tuke.sk>                             |
-|         Ales Pospichal   <ales@pospichalales.info>                    |
-|         Martin Lacina	<martin@whistler.sk>                            |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -48,9 +41,10 @@ $labels['size'] = 'Veľkosť';
 $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizácia';
 $labels['readstatus'] = 'Čítať stav';
-$labels['mailboxlist'] = 'Adresár';
+$labels['mailboxlist'] = 'Priečinky';
+$labels['folders'] = 'Priečinky';
 $labels['messagesfromto'] = 'Správy od $from do $to z $count';
-$labels['threadsfromto'] = 'Konverzácie od $from do $to z $count ';
+$labels['threadsfromto'] = 'Konverzácie od $from do $to z $count';
 $labels['messagenrof'] = 'Správa $nr z $count';
 $labels['copy'] = 'Kopírovať';
 $labels['move'] = 'Presunúť';
@@ -78,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Máj';
+$labels['longmay'] = 'Máj';
 $labels['jun'] = 'Jún';
 $labels['jul'] = 'Júl';
 $labels['aug'] = 'Aug';
@@ -89,7 +84,6 @@ $labels['longjan'] = 'Január';
 $labels['longfeb'] = 'Február';
 $labels['longmar'] = 'Marec';
 $labels['longapr'] = 'Apríl';
-$labels['longmay'] = 'Máj';
 $labels['longjun'] = 'Jún';
 $labels['longjul'] = 'Júl';
 $labels['longaug'] = 'August';
@@ -121,10 +115,11 @@ $labels['markread'] = 'Ako prečítané';
 $labels['markunread'] = 'Ako neprečítané';
 $labels['markflagged'] = 'Ako označené';
 $labels['markunflagged'] = 'Ako neoznačené';
-$labels['messageactions'] = 'Ďalšie akcie...';
+$labels['moreactions'] = 'Ďalšie akcie...';
 $labels['select'] = 'Výber';
 $labels['all'] = 'Všetky';
-$labels['none'] = 'Žiadne';
+$labels['none'] = 'Nič';
+$labels['nonesort'] = 'Nič';
 $labels['currpage'] = 'Aktuálna stránka';
 $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené';
@@ -144,7 +139,6 @@ $labels['expand_only_unread'] = 'len s neprečítanými správami';
 $labels['fromto'] = 'Odosielateľ/Príjemca';
 $labels['flag'] = 'Vlajka';
 $labels['attachment'] = 'Príloha';
-$labels['nonesort'] = 'Nič';
 $labels['sentdate'] = 'Dátum odoslania';
 $labels['arrival'] = 'Dátum prijatia';
 $labels['asc'] = 'vzostupne';
@@ -174,6 +168,8 @@ $labels['charset'] = 'Znaková sada';
 $labels['editortype'] = 'Typ editora';
 $labels['returnreceipt'] = 'Potvrdenie o doručení';
 $labels['dsn'] = 'Doručenie oznámenia o stave';
+$labels['mailreplyintro'] = '$date odosielateľ napísal:';
+$labels['originalmessage'] = 'Pôvodná správa';
 $labels['editidents'] = 'Editovať identity';
 $labels['checkspelling'] = 'Skontrolovať pravopis';
 $labels['resumeediting'] = 'Pokračovať v úpravách';
@@ -191,6 +187,7 @@ $labels['highest'] = 'Najvyššia';
 $labels['nosubject'] = '(bez predmetu)';
 $labels['showimages'] = 'Ukázať obrázky';
 $labels['alwaysshow'] = 'Vždy zobraziť obrázky od $sender';
+$labels['isdraft'] = 'Toto je rozpísaná správa';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Čistý text';
 $labels['savesentmessagein'] = 'Ukladať odoslané správy do';
@@ -232,14 +229,15 @@ $labels['male'] = 'muž';
 $labels['female'] = 'žena';
 $labels['manager'] = 'Manažér';
 $labels['assistant'] = 'Asistent';
+$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Partner';
 $labels['allfields'] = 'Všetky polia';
 $labels['search'] = 'Hľadať';
 $labels['advsearch'] = 'Rozšírené vyhľadávanie';
-$labels['other'] = 'Iné';
+$labels['other'] = 'Ostatné';
+$labels['typeother'] = 'Ostatné';
 $labels['typehome'] = 'Domov';
 $labels['typework'] = 'Práca';
-$labels['typeother'] = 'Ostatné';
 $labels['typemobile'] = 'Mobil';
 $labels['typemain'] = 'Hlavný';
 $labels['typehomefax'] = 'Domáci fax';
@@ -247,8 +245,9 @@ $labels['typeworkfax'] = 'Fax - práca';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Pager';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Asistent';
 $labels['typehomepage'] = 'Domovská stránka';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Pridať položku...';
 $labels['addcontact'] = 'Pridať nový kontakt';
 $labels['editcontact'] = 'Upraviť kontakt';
@@ -270,7 +269,6 @@ $labels['print'] = 'Tlač';
 $labels['export'] = 'Export';
 $labels['exportvcards'] = 'Exportovať kontakty vo formáte vCard';
 $labels['newcontactgroup'] = 'Vytvoriť novú skupinu kontaktov';
-$labels['groupactions'] = 'Akcie pre skupiny kontaktov';
 $labels['grouprename'] = 'Premenovať skupinu';
 $labels['groupdelete'] = 'Zmazať skupinu';
 $labels['previouspage'] = 'Predchádzajúca stránka';
@@ -280,6 +278,8 @@ $labels['lastpage'] = 'Posledná stránka';
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
 $labels['personaladrbook'] = 'Osobné adresy';
+$labels['searchsave'] = 'Uložiť vyhľadávanie';
+$labels['searchdelete'] = 'Zmazať vyhľadávanie';
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Importovať kontakty';
 $labels['importfromfile'] = 'Importovať zo súboru:';
@@ -288,6 +288,7 @@ $labels['importreplace'] = 'Nahradiť celý zoznam kontaktov';
 $labels['importtext'] = 'Môžete nahrať kontakty z existujúcich adresárov. Podporujeme import adries vo formáte vCard.';
 $labels['done'] = 'Hotovo';
 $labels['settingsfor'] = 'Nastavenia pre';
+$labels['about'] = 'O programe';
 $labels['preferences'] = 'Vlastnosti';
 $labels['userpreferences'] = 'Používateľské nastavenia';
 $labels['editpreferences'] = 'Upraviť používateľské nastavenia';
@@ -299,6 +300,8 @@ $labels['edititem'] = 'Upraviť položku';
 $labels['preferhtml'] = 'Uprednostniť HTML zobrazenie';
 $labels['defaultcharset'] = 'Predvolené kódovanie';
 $labels['htmlmessage'] = 'HTML správa';
+$labels['dateformat'] = 'Formát dátumu';
+$labels['timeformat'] = 'Formát času';
 $labels['prettydate'] = 'Krajší dátum';
 $labels['setdefault'] = 'Obnoviť pôvodné';
 $labels['autodetect'] = 'Automaticky';
@@ -323,7 +326,7 @@ $labels['autosend'] = 'poslať potvrdenie automaticky';
 $labels['autosendknown'] = 'poslať potvrdenie iba mojím kontaktom';
 $labels['autosendknownignore'] = 'poslať potvrdenie mojím kontaktom, inak ignorovať';
 $labels['ignore'] = 'ignorovať';
-$labels['readwhendeleted'] = 'Označiť správu ';
+$labels['readwhendeleted'] = 'Označiť správu';
 $labels['flagfordeletion'] = 'Pri odstránení správy iba označiť správu ako odstránenú';
 $labels['skipdeleted'] = 'Nezobrazovať zmazané správy';
 $labels['deletealways'] = 'Odstrániť správy, ak zlyhá ich presun do koša';
@@ -347,11 +350,11 @@ $labels['advancedoptions'] = 'Rozšírené nastavenia';
 $labels['focusonnewmessage'] = 'Aktivovať okno prehliadača pri príchozí správe';
 $labels['checkallfolders'] = 'Kontrolovať nové správy vo všetkých zložkách';
 $labels['displaynext'] = 'Zobraziť ďalšiu správu po zmazanie / prenosu správy';
+$labels['defaultfont'] = 'Prednastavený font HTML správ';
 $labels['mainoptions'] = 'Hlavné nastavenia';
 $labels['section'] = 'Sekcia';
 $labels['maintenance'] = 'Údržba';
 $labels['newmessage'] = 'Nová správa';
-$labels['listoptions'] = 'Nastavenia stránkovanie';
 $labels['signatureoptions'] = 'Nastavenia podpísania';
 $labels['whenreplying'] = 'Pri odpovedaní';
 $labels['replytopposting'] = 'začať novú správu nad pôvodňou';
@@ -370,9 +373,14 @@ $labels['reqmdn'] = 'Vždy požadovať doručenku';
 $labels['reqdsn'] = 'Vždy vyžadovať potvrdenie o doručení správy';
 $labels['replysamefolder'] = 'Umietniť odpoveď do adresára, kde je umiestnená správa, na ktorú sa odpovedalo';
 $labels['defaultaddressbook'] = 'Pridať nové kontakty do zvoleného adresára';
+$labels['autocompletesingle'] = 'Vynechať alternatívnu emailovú adresu pri automatickom dopĺňaní';
 $labels['spellcheckbeforesend'] = 'Skontrolovať pravopis pred odoslaním správy';
+$labels['spellcheckoptions'] = 'Voľby kontroly pravopisu';
+$labels['spellcheckignoresyms'] = 'Ignorovať slová so symbolmi';
+$labels['spellcheckignorenums'] = 'Ignorovať slová s číslami';
+$labels['spellcheckignorecaps'] = 'Ignorovať slová písané veľkými písmenami';
+$labels['addtodict'] = 'Pridať do slovníka';
 $labels['folder'] = 'Priečinok';
-$labels['folders'] = 'Priečinky';
 $labels['foldername'] = 'Názov priečinku';
 $labels['subscribed'] = 'Prihlásený k odberu';
 $labels['messagecount'] = 'Počet správ';
@@ -395,6 +403,11 @@ $labels['sortby'] = 'Triediť podľa';
 $labels['sortasc'] = 'Triediť vzostupne';
 $labels['sortdesc'] = 'Triediť zostupne';
 $labels['undo'] = 'Vrátiť';
+$labels['plugin'] = 'Zásuvný modul';
+$labels['version'] = 'Verzia';
+$labels['source'] = 'Zdroj';
+$labels['license'] = 'Licencia';
+$labels['support'] = 'Získať podporu';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -418,4 +431,3 @@ $labels['japanese'] = 'Japončina';
 $labels['korean'] = 'Korejčina';
 $labels['chinese'] = 'Čínština';
 
-?>
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 460f4ea83..85eae942c 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -1,24 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/sk/messages.inc                                              |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Marek Kutnar <marek19@zmail.sk>                               |
-|         Lukas Kraic  <lukas.kraic@truni.sk>                           |
-|         Peter Mann   <peter.mann@tuke.sk>                             |
-|         Ales Pospichal   <ales@pospichalales.info>                    |
-|         Martin Lacina	<martin@whistler.sk>                            |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -47,10 +40,12 @@ $messages['messagesaved'] = 'Správa bola uložená medzi Rozpísané správy';
 $messages['successfullysaved'] = 'Úspešne uložená';
 $messages['addedsuccessfully'] = 'Kontakt bol pridaný do adresára';
 $messages['contactexists'] = 'Kontakt s touto e-mailovou adresou už existuje';
+$messages['contactnameexists'] = 'Kontakt s rovnakým menom už existuje.';
 $messages['blockedimages'] = 'Z bezpečnostných dôvodov sú v správe zablokované obrázky.';
 $messages['encryptedmessage'] = 'Táto správa je zašifrovaná, a nie je možné ju zobraziť!';
 $messages['nocontactsfound'] = 'Nemáte žiadne kontakty';
 $messages['contactnotfound'] = 'Požadovaný kontakt nebol nájdený';
+$messages['contactsearchonly'] = 'Zadaj nejaký vyhľadávací výraz pre hľadanie kontaktov.';
 $messages['sendingfailed'] = 'Odosielanie správy zlyhalo';
 $messages['senttooquickly'] = 'Počkajte $sec sekúnd pred odoslaním tejto správy';
 $messages['errorsavingsent'] = 'Pri ukladaní odoslanej správy nastala chyba';
@@ -60,9 +55,12 @@ $messages['errorcopying'] = 'Správa sa nedá skopírovať';
 $messages['errordeleting'] = 'Správa sa nedá zmazať';
 $messages['errormarking'] = 'Správa sa nedá označiť';
 $messages['deletecontactconfirm'] = 'Ste si istý, že chcete zmazať zvolený(é) kontakt(y)?';
+$messages['deletegroupconfirm'] = 'Skutočne chceš zmazať vybranú skupinu?';
 $messages['deletemessagesconfirm'] = 'Ste si istý, že chcete zmazať zvolenú(é) správu(y)?';
 $messages['deletefolderconfirm'] = 'Ste si istý, že chcete zmazať tento priečinok?';
 $messages['purgefolderconfirm'] = 'Ste si istý, že chcete zmazať všetky správy v tomto priečinku?';
+$messages['contactdeleting'] = 'Mažem kontakt(y)...';
+$messages['groupdeleting'] = 'Mažem skupinu...';
 $messages['folderdeleting'] = 'Odstraňuje sa priečinok ...';
 $messages['foldermoving'] = 'Prečinok sa presúva ...';
 $messages['foldersubscribing'] = 'Prihlasujem sa k adresáru...';
@@ -77,10 +75,10 @@ $messages['nosubjectwarning'] = 'Predmet správy je prázdny. Chcete ho teraz za
 $messages['nobodywarning'] = 'Chcete odoslať správu bez textu?';
 $messages['notsentwarning'] = 'Správa nebola odoslaná, chcete ju zrušiť?';
 $messages['noldapserver'] = 'Prosím, zvoľte LDAP server na vyhľadávanie';
-$messages['nocontactsreturned'] = 'Neboli nájdené žiadne kontakty';
 $messages['nosearchname'] = 'Prosím vložte meno alebo emailovú adresu';
 $messages['notuploadedwarning'] = 'Ešte neboli nahrané všetky prílohy. Počkajte prosím alebo nahrávanie zrušte.';
 $messages['searchsuccessful'] = 'nájdených $nr správ';
+$messages['contactsearchsuccessful'] = 'Bolo nájdených $nr kontaktov.';
 $messages['searchnomatch'] = 'Hľadaný výraz nebol nájdený';
 $messages['searching'] = 'Vyhľadáva sa...';
 $messages['checking'] = 'Kontroluje sa...';
@@ -101,8 +99,11 @@ $messages['sourceisreadonly'] = 'Tento zdroj adries je len na čítanie';
 $messages['errorsavingcontact'] = 'Nedá sa uložiť adresa kontaktu';
 $messages['movingmessage'] = 'Správa sa presúva...';
 $messages['copyingmessage'] = 'Správa sa kopíruje...';
+$messages['copyingcontact'] = 'Kopírujem kontakt(y)';
 $messages['deletingmessage'] = 'Mažem správu(y)...';
 $messages['markingmessage'] = 'Označujem správu(y)...';
+$messages['addingmember'] = 'Pridávam kontakt(y) do skupiny...';
+$messages['removingmember'] = 'Odoberám kontakt(y) zo skupiny';
 $messages['receiptsent'] = 'Potvrdenie o prijatí správy bolo odoslané';
 $messages['errorsendingreceipt'] = 'Potvrdenie o prijatí správy sa nedalo odoslať';
 $messages['nodeletelastidentity'] = 'Identita sa nedá odstrániť, je posledná a musí zostať.';
@@ -124,7 +125,6 @@ $messages['smtpautherror'] = 'Chyba SMTP: Autorizácie zlyhala';
 $messages['smtpfromerror'] = 'Chyba SMTP: Nemožno nastaviť odosielateľa ($msg)';
 $messages['smtptoerror'] = 'Chyba SMTP: Nemožno pridať príjemca ($msg)';
 $messages['smtprecipientserror'] = 'Chyba SMTP: Nemožno spracovať zoznam príjemcov';
-$messages['smtpdsnerror'] = 'SMTP chyba: Oznámenie o doručení nie je podporované';
 $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Príliš veľa príjemcov. Zmenšite počet príjemcov na $max.';
@@ -137,17 +137,22 @@ $messages['contactrestored'] = 'Kontakty boli úspešne obnovené';
 $messages['groupdeleted'] = 'Skupina bola vymazaná';
 $messages['grouprenamed'] = 'Skupina bola premenovaná';
 $messages['groupcreated'] = 'Skupina bola vytvorená';
+$messages['savedsearchdeleted'] = 'Uložené vyhľadávanie bolo vymazané.';
+$messages['savedsearchdeleteerror'] = 'Nemôžem zmazať uložené vyhľadávanie.';
+$messages['savedsearchcreated'] = 'Uložené vyhľadávanie bolo vytvorené.';
+$messages['savedsearchcreateerror'] = 'Nemôžem vytvoriť uložené vyhľadávanie';
 $messages['messagedeleted'] = 'Správa(y) bola vymazaná';
 $messages['messagemoved'] = 'Správa(y) bola presunutá';
 $messages['messagecopied'] = 'Správa(y) bola skopírovaná';
 $messages['messagemarked'] = 'Správa(y) bola označená';
 $messages['autocompletechars'] = 'Zadajte najmenej $min znamkov pre automatické dopĺňanie';
+$messages['autocompletemore'] = 'Bolo nájdených viac záznamov. Napíšte prosím viac znakov.';
 $messages['namecannotbeempty'] = 'Meno nemôže byť prázdne';
 $messages['nametoolong'] = 'Meno je príliš dlhé';
 $messages['folderupdated'] = 'Adresár bol aktualizovaný';
 $messages['foldercreated'] = 'Adresár bol vytvorený';
 $messages['invalidimageformat'] = 'Zlý formát obrázku';
 $messages['mispellingsfound'] = 'V správe boli nájdené pravopisné chyby';
-$messages['itemsdeleted'] = 'Bolo vymazaných $num položiek.';
+$messages['parentnotwritable'] = 'Nemôžem vytvoriť/presunúť adresár do zvoleného nadradeného adresára. Nemáte oprávnenia na zmenu.';
+$messages['messagetoobig'] = 'Časť správy je príliš veľká na spracovanie.';
 
-?>
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 336d63d76..96acab4f6 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/sl_SI/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Andrej Sossi <asossi@dotcom.ts.it>                            |
-|         Andrej Mocilnik <amocilnik@dotcom.ts.it>                      |
-|         Barbara Krasovec <barbarak@arnes.si>                          |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -46,6 +42,7 @@ $labels['priority'] = 'Prioriteta';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status';
 $labels['mailboxlist'] = 'Mape';
+$labels['folders'] = 'Mape';
 $labels['messagesfromto'] = 'Sporočila $from do $to od $count';
 $labels['threadsfromto'] = 'Nit $from do $to od $count';
 $labels['messagenrof'] = 'Sporočilo $nr od $count';
@@ -75,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Maj';
+$labels['longmay'] = 'Maj';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Avg';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
 $labels['longmar'] = 'Marec';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Maj';
 $labels['longjun'] = 'Junij';
 $labels['longjul'] = 'Julij';
 $labels['longaug'] = 'Avgust';
@@ -121,7 +118,8 @@ $labels['markunflagged'] = 'Kot neoznačeno';
 $labels['moreactions'] = 'Več možnosti...';
 $labels['select'] = 'Izberi';
 $labels['all'] = 'Vse';
-$labels['none'] = 'Ničesar';
+$labels['none'] = 'Brez';
+$labels['nonesort'] = 'Brez';
 $labels['currpage'] = 'Trenutna stran';
 $labels['unread'] = 'Neprebrano';
 $labels['flagged'] = 'Označeno';
@@ -141,7 +139,6 @@ $labels['expand_only_unread'] = 'samo niti z neprebranimi sporočili';
 $labels['fromto'] = 'Pošiljatelj/Prejemnik';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Priponka';
-$labels['nonesort'] = 'Brez';
 $labels['sentdate'] = 'Datum pošiljanja';
 $labels['arrival'] = 'Datum prejema';
 $labels['asc'] = 'naraščajoče';
@@ -231,15 +228,16 @@ $labels['notes'] = 'Opombe';
 $labels['male'] = 'moški';
 $labels['female'] = 'ženska';
 $labels['manager'] = 'Vodja';
-$labels['assistant'] = 'Asistent';
+$labels['assistant'] = 'Pomoč';
+$labels['typeassistant'] = 'Pomoč';
 $labels['spouse'] = 'Zakonec';
 $labels['allfields'] = 'Vsa polja';
 $labels['search'] = 'Iskanje';
 $labels['advsearch'] = 'Napredno iskanje';
 $labels['other'] = 'Ostalo';
+$labels['typeother'] = 'Ostalo';
 $labels['typehome'] = 'Doma';
 $labels['typework'] = 'Služba';
-$labels['typeother'] = 'Ostalo';
 $labels['typemobile'] = 'Mobilni telefon';
 $labels['typemain'] = 'Osnovno';
 $labels['typehomefax'] = 'Domači fax';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Službeni fax';
 $labels['typecar'] = 'Avto';
 $labels['typepager'] = 'Pozivnik';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Pomoč';
 $labels['typehomepage'] = 'Domača stran';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
@@ -357,7 +354,6 @@ $labels['mainoptions'] = 'Osnovne nastavitve';
 $labels['section'] = 'Nastavitve';
 $labels['maintenance'] = 'Vzdrževanje';
 $labels['newmessage'] = 'Novo sporočilo';
-$labels['listoptions'] = 'Prikaži seznam možnosti';
 $labels['signatureoptions'] = 'Nastavitve podpisa';
 $labels['whenreplying'] = 'Pri odgovoru';
 $labels['replytopposting'] = 'začni z novim sporočilom nad izvornim sporočilom';
@@ -384,7 +380,6 @@ $labels['spellcheckignorenums'] = 'Ne upoštevaj besed, ki vsebujejo številke';
 $labels['spellcheckignorecaps'] = 'Ne upoštevaj besed, ki vsebujejo samo velike črke';
 $labels['addtodict'] = 'Dodaj v slovar';
 $labels['folder'] = 'Mapa';
-$labels['folders'] = 'Mape';
 $labels['foldername'] = 'Ime mape';
 $labels['subscribed'] = 'Vpisan';
 $labels['messagecount'] = 'Sporočila';
@@ -435,4 +430,3 @@ $labels['japanese'] = 'Japonsko';
 $labels['korean'] = 'Korejsko';
 $labels['chinese'] = 'Kitajsko';
 
-?>
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 1aa199ce3..73305dbe6 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/sl_SI/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:   Barbara Krasovec -  barbarak@arnes.si                       |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -155,4 +155,3 @@ $messages['invalidimageformat'] = 'Neveljaven format slike';
 $messages['mispellingsfound'] = 'V sporočilu so bile najdene napake v črkovanju';
 $messages['parentnotwritable'] = 'Podmape v tej mapi ni bilo mogoče ustvariti/premakniti. Nimate pravic.';
 
-?>
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index 8c2b2f780..c26652aaf 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/sq_AL/labels.inc                                             |
+ | localization/sq_AL/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dashamir Hoxha <dhoxha@albaniaonline.net>                     |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
@@ -42,17 +39,15 @@ $labels['date'] = 'Data';
 $labels['size'] = 'Madhësia';
 $labels['priority'] = 'Përparësia';
 $labels['organization'] = 'Organizata';
-$labels['reply-to'] = 'Reply-To';
-$labels['mailboxlist'] = 'Dosjet';
+$labels['mailboxlist'] = 'Kutitë';
+$labels['folders'] = 'Kutitë';
 $labels['messagesfromto'] = 'Mesazhet $from në $to nga $count';
 $labels['messagenrof'] = 'Mesazhi $nr nga $count';
+$labels['copy'] = 'Kopje';
 $labels['moveto'] = 'ço te...';
 $labels['download'] = 'shkarko';
 $labels['filename'] = 'Emër skedari';
 $labels['filesize'] = 'Madhësi skedari';
-$labels['preferhtml'] = 'Shfaq HTML';
-$labels['htmlmessage'] = 'Mesazh HTML';
-$labels['prettydate'] = 'Data të këndshme';
 $labels['addtoaddressbook'] = 'Shto në librin e adresave';
 $labels['sun'] = 'Dje';
 $labels['mon'] = 'Hën';
@@ -78,13 +73,9 @@ $labels['deletemessage'] = 'Fshije mesazhin';
 $labels['movemessagetotrash'] = 'Hidhe mesazhin në kosh';
 $labels['printmessage'] = 'Shtype këtë mesazh';
 $labels['previousmessage'] = 'Shfaq mesazhin e mëparshëm';
-$labels['previousmessages'] = 'Shfaq grupin e mëparshëm të mesazheve';
 $labels['firstmessage'] = 'Shfaq mesazhin e parë';
-$labels['firstmessages'] = 'Shfaq grupin e parë të mesazheve';
 $labels['nextmessage'] = 'Shfaq mesazhin pasardhës';
-$labels['nextmessages'] = 'Shfaq grupin tjetër të mesazheve';
 $labels['lastmessage'] = 'Shfaq mesazhin e fundit';
-$labels['lastmessages'] = 'Shfaq grupin e fundit të mesazheve';
 $labels['backtolist'] = 'Kthehu te lista e mesazheve';
 $labels['viewsource'] = 'Shfaq tekstin';
 $labels['markmessages'] = 'Shëno mesazhet';
@@ -93,10 +84,10 @@ $labels['markunread'] = 'Si të palexuara';
 $labels['select'] = 'Zgjidh';
 $labels['all'] = 'Të gjitha';
 $labels['none'] = 'Asnjë';
+$labels['nonesort'] = 'Asnjë';
 $labels['unread'] = 'Palexuar';
 $labels['compact'] = 'Zvogëlo';
 $labels['empty'] = 'Boshatis';
-$labels['purge'] = 'Pastro';
 $labels['quota'] = 'Përdorimi i diskut';
 $labels['unknown'] = 'i panjohur';
 $labels['unlimited'] = 'i pakufizuar';
@@ -162,6 +153,9 @@ $labels['manageidentities'] = 'Manaxho identitetet per këtë llogari';
 $labels['newidentity'] = 'Identitet i ri';
 $labels['newitem'] = 'Element i ri';
 $labels['edititem'] = 'Ndrysho element';
+$labels['preferhtml'] = 'Shfaq HTML';
+$labels['htmlmessage'] = 'Mesazh HTML';
+$labels['prettydate'] = 'Data të këndshme';
 $labels['setdefault'] = 'Bëje identitet kryesor';
 $labels['language'] = 'Gjuha';
 $labels['timezone'] = 'Brezi orar';
@@ -174,7 +168,6 @@ $labels['previewpane'] = 'Shiko si duket';
 $labels['autosavedraft'] = 'Ruaje automatikisht si draft';
 $labels['never'] = 'kurrë';
 $labels['folder'] = 'Kutia';
-$labels['folders'] = 'Kutitë';
 $labels['foldername'] = 'Emër kutie';
 $labels['subscribed'] = 'Regjistruar';
 $labels['messagecount'] = 'Mesazhe';
@@ -185,4 +178,3 @@ $labels['sortby'] = 'Rradhit sipas';
 $labels['sortasc'] = 'Rradhitje rritëse';
 $labels['sortdesc'] = 'Rradhitje zbritëse';
 
-?>
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index 1d57ed4a2..fa13b3705 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/sq_AL/messages.inc                                           |
+ | localization/sq_AL/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dashamir Hoxha <dhoxha@albaniaonline.net>                     |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
@@ -56,7 +53,6 @@ $messages['nosubjectwarning'] = 'Fusha e temës është bosh. Dëshironi të sh�
 $messages['nobodywarning'] = 'Ta dërgoj mesazhin pa tekst?';
 $messages['notsentwarning'] = 'Mesazhi nuk u dërgua. Doni ta hidhni poshtë mesazhin?';
 $messages['noldapserver'] = 'Ju lutem jepni një server ldap për të kërkuar';
-$messages['nocontactsreturned'] = 'Nuk gjeta kontakte';
 $messages['nosearchname'] = 'Ju lutem jepni një adresë email ose një emër kontakti';
 $messages['searchsuccessful'] = 'U gjetën $nr mesazhe';
 $messages['searchnomatch'] = 'Kërkimi nuk gjeti gjë';
@@ -78,4 +74,3 @@ $messages['receiptsent'] = 'U dërgua me sukses një njoftim leximi';
 $messages['errorsendingreceipt'] = 'Nuk mund të dërgohet njoftimi';
 $messages['nodeletelastidentity'] = 'Ju nuk mund ta fshini këtë identitet sepse nuk ju ka mbetur tjetër.';
 
-?>
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index bb743d4c3..0c6a69923 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/sr_cyrillic/labels.inc                                       |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Branko Kokanovic <branko.kokanovic@gmail.com                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,6 +41,7 @@ $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
 $labels['readstatus'] = 'Статус поруке';
 $labels['mailboxlist'] = 'Фасцикле';
+$labels['folders'] = 'Фасцикле';
 $labels['messagesfromto'] = 'Поруке $from до $to од укупно $count';
 $labels['threadsfromto'] = 'Страница $from до $to од $count';
 $labels['messagenrof'] = 'Порука број $nr од $count';
@@ -73,6 +71,7 @@ $labels['feb'] = 'Феб';
 $labels['mar'] = 'Мар';
 $labels['apr'] = 'Апр';
 $labels['may'] = 'Мај';
+$labels['longmay'] = 'Мај';
 $labels['jun'] = 'Јун';
 $labels['jul'] = 'Јул';
 $labels['aug'] = 'Авг';
@@ -84,7 +83,6 @@ $labels['longjan'] = 'Јануар';
 $labels['longfeb'] = 'Фебруар';
 $labels['longmar'] = 'Март';
 $labels['longapr'] = 'Април';
-$labels['longmay'] = 'Мај';
 $labels['longjun'] = 'Јуни';
 $labels['longjul'] = 'Јули';
 $labels['longaug'] = 'Август';
@@ -104,13 +102,9 @@ $labels['deletemessage'] = 'Избриши поруку';
 $labels['movemessagetotrash'] = 'Пребаци поруку у канту';
 $labels['printmessage'] = 'Одштампај поруку';
 $labels['previousmessage'] = 'Прикажи претходну поруку';
-$labels['previousmessages'] = 'Прикажи претходни скуп порука';
 $labels['firstmessage'] = 'Прикажи прву поруку';
-$labels['firstmessages'] = 'Прикажи први скуп порука';
 $labels['nextmessage'] = 'Прикажи следећу поруку';
-$labels['nextmessages'] = 'Прикажи следећи скуп порука';
 $labels['lastmessage'] = 'Прикажи последњу поруку';
-$labels['lastmessages'] = 'Прикажи последњи скуп порука';
 $labels['backtolist'] = 'Повратак на листу порука';
 $labels['viewsource'] = 'Прикажи поруку у изворном облику';
 $labels['markmessages'] = 'Обележи поруке';
@@ -118,10 +112,10 @@ $labels['markread'] = 'Као прочитано';
 $labels['markunread'] = 'Као непрочитано';
 $labels['markflagged'] = 'Као означено';
 $labels['markunflagged'] = 'Као неозначено';
-$labels['messageactions'] = 'Више поставки';
 $labels['select'] = 'Одабери';
 $labels['all'] = 'Све';
-$labels['none'] = 'Ниједну';
+$labels['none'] = 'Ништа';
+$labels['nonesort'] = 'Ништа';
 $labels['currpage'] = 'Тренутна страница';
 $labels['unread'] = 'Непрочитане';
 $labels['flagged'] = 'Означено';
@@ -130,7 +124,6 @@ $labels['deleted'] = 'Обрисано';
 $labels['invert'] = 'Уведи';
 $labels['filter'] = 'Филтер';
 $labels['list'] = 'Листа';
-$labels['nonesort'] = 'Ништа';
 $labels['sentdate'] = 'Датум послато';
 $labels['arrival'] = 'Датум стигло';
 $labels['folderactions'] = 'Поставке фасцикле';
@@ -156,7 +149,7 @@ $labels['editidents'] = 'Модификуј псеудониме';
 $labels['checkspelling'] = 'Провера правописа';
 $labels['resumeediting'] = 'Повратак у режим писања';
 $labels['revertto'] = 'Врати се на';
-$labels['attachments'] = 'Прилози ';
+$labels['attachments'] = 'Прилози';
 $labels['upload'] = 'Додај';
 $labels['close'] = 'Затвори';
 $labels['messageoptions'] = 'Опције поруке';
@@ -203,16 +196,17 @@ $labels['male'] = 'мушко';
 $labels['female'] = 'женско';
 $labels['manager'] = 'Менаџер';
 $labels['assistant'] = 'Асистент';
+$labels['typeassistant'] = 'Асистент';
+$labels['other'] = 'Остало';
+$labels['typeother'] = 'Остало';
 $labels['typehome'] = 'Кућа';
 $labels['typework'] = 'Посао';
-$labels['typeother'] = 'Остало';
 $labels['typemobile'] = 'Мобилни Телефон';
 $labels['typehomefax'] = 'Кућни факс';
 $labels['typeworkfax'] = 'Пословни факс';
 $labels['typecar'] = 'Ауто';
 $labels['typepager'] = 'Пејџер';
 $labels['typevideo'] = 'Видео';
-$labels['typeassistant'] = 'Асистент';
 $labels['addfield'] = 'Додај поље';
 $labels['addcontact'] = 'Додај нови контакт';
 $labels['editcontact'] = 'Измени контакт';
@@ -234,7 +228,6 @@ $labels['print'] = 'Штампај';
 $labels['export'] = 'Извези';
 $labels['exportvcards'] = 'Извези конакте у vCard формату';
 $labels['newcontactgroup'] = 'Креирај нову контакт групу';
-$labels['groupactions'] = 'Радње за контакт групу';
 $labels['previouspage'] = 'Прикажи претходну страну';
 $labels['firstpage'] = 'Прикажи први скуп';
 $labels['nextpage'] = 'Прикажи следећу страну';
@@ -287,7 +280,6 @@ $labels['mimeparamfolding'] = 'имена прилога';
 $labels['mainoptions'] = 'Главне поставке';
 $labels['section'] = 'Секција';
 $labels['newmessage'] = 'Нова порука';
-$labels['listoptions'] = 'Опције листе';
 $labels['signatureoptions'] = 'Опције потписа';
 $labels['whenreplying'] = 'При одговору';
 $labels['replytopposting'] = 'Почни нову поруку преко оригинала';
@@ -306,7 +298,6 @@ $labels['reqmdn'] = 'Увек затражи повратну скрипту';
 $labels['reqdsn'] = 'Увек затражи обавештење о статусу слања поруке';
 $labels['replysamefolder'] = 'Сачувај одговоре у фасциклу поруке на коју се одговара';
 $labels['folder'] = 'Фасцикла';
-$labels['folders'] = 'Фасцикле';
 $labels['foldername'] = 'Име фасцикле';
 $labels['subscribed'] = 'Потписана';
 $labels['messagecount'] = 'Поруке';
@@ -345,4 +336,3 @@ $labels['japanese'] = 'Јапански';
 $labels['korean'] = 'Кореански';
 $labels['chinese'] = 'Кинески';
 
-?>
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 19b91505a..3d8404602 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/sr_cyrillic/messages.inc                                     |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Branko Kokanovic <branko.kokanovic@gmail.com>                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -24,7 +21,7 @@ $messages['sessionerror'] = 'Сесија није валидна или је и
 $messages['imaperror'] = 'Неуспешна конекција на IMAP сервер';
 $messages['servererror'] = 'Грешка на серверу!';
 $messages['servererrormsg'] = 'Грешка на серверу: $msg';
-$messages['errorreadonly'] = 'Операција неуспела. Фасицкло је ';
+$messages['errorreadonly'] = 'Операција неуспела. Фасицкло је';
 $messages['errornoperm'] = 'Извршење операције није могуће. Одбијен захтев за дозволу..';
 $messages['invalidrequest'] = 'Погрешан захтев! Подаци нису сачувани.';
 $messages['nomessagesfound'] = 'Немате порука у сандучету';
@@ -71,7 +68,6 @@ $messages['nosubjectwarning'] = 'Поље \'Наслов\' је празно. Ж
 $messages['nobodywarning'] = 'Да ли желите да пошаљете поруку без текста?';
 $messages['notsentwarning'] = 'Порука није послата. Да ли желите да одбаците ову поруку?';
 $messages['noldapserver'] = 'Унесите LDAP сервер за претрагу';
-$messages['nocontactsreturned'] = 'Није пронађен ниједан контакт';
 $messages['nosearchname'] = 'Унесите име или е-мејл адресу';
 $messages['notuploadedwarning'] = 'Нису сви прилози отпремљени. Молимо сачекајте или откажите отпремање.';
 $messages['searchsuccessful'] = 'Број пронађених порука: $nr';
@@ -102,7 +98,7 @@ $messages['errorsendingreceipt'] = 'Неуспело слање обавеште
 $messages['nodeletelastidentity'] = 'Не можете обрисати овај идентитет, он Вам је последњи.';
 $messages['forbiddencharacter'] = 'Име фасцикле садржи недозвољено слово';
 $messages['selectimportfile'] = 'Молимо Вас да изаберете датотеку за отпремање';
-$messages['addresswriterror'] = 'У изабраном адресару нису дозвољене промене ';
+$messages['addresswriterror'] = 'У изабраном адресару нису дозвољене промене';
 $messages['contactaddedtogroup'] = 'Контакти успешно додати групи';
 $messages['contactremovedfromgroup'] = 'Контакти успешно одстрањени из групе';
 $messages['importwait'] = 'Увоз података, молимо сачекајте...';
@@ -118,7 +114,6 @@ $messages['smtpautherror'] = 'SMTP Error ($code): Аутентификација
 $messages['smtpfromerror'] = 'SMTP Error ($code): Неуспешно додавање пошиљаоца "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Error ($code): Неуспешно додавање примаоца "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Није могуће расчланити листу прималаца';
-$messages['smtpdsnerror'] = 'SMTP Error ($code): Нема подршке за обавештења о статусу испоруке';
 $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Имејл адреса није валидна: $email';
 $messages['toomanyrecipients'] = 'Превише прималаца. Смањите број прималаца на $max.';
@@ -140,4 +135,3 @@ $messages['folderupdated'] = 'фасцикла успешно ажурирана
 $messages['foldercreated'] = 'Фасцикла успешно креирана';
 $messages['invalidimageformat'] = 'Формат слике није валидан';
 
-?>
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index b02c62cd5..c5c28513b 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -1,22 +1,17 @@
-a<?php
+<?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/sv_SE/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Jonas Nasholm <rcm@bitfuse.net>                               |
-|         Fredrik Nygren <f.nygren@gmail.com>                           |
-|         Andreas Henriksson <andreas@fatal.se>                         |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jonas Nasholm <Unknown>                                       |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,6 +42,7 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Lässtatus';
 $labels['mailboxlist'] = 'Kataloger';
+$labels['folders'] = 'Kataloger';
 $labels['messagesfromto'] = 'Meddelande $from till $to av $count';
 $labels['threadsfromto'] = 'Tråd $from till $to av $count';
 $labels['messagenrof'] = 'Meddelande $nr av $count';
@@ -76,6 +72,7 @@ $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Apr';
 $labels['may'] = 'Maj';
+$labels['longmay'] = 'Maj';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Aug';
@@ -87,7 +84,6 @@ $labels['longjan'] = 'Januari';
 $labels['longfeb'] = 'Februari';
 $labels['longmar'] = 'Mars';
 $labels['longapr'] = 'April';
-$labels['longmay'] = 'Maj';
 $labels['longjun'] = 'Juni';
 $labels['longjul'] = 'Juli';
 $labels['longaug'] = 'Augusti';
@@ -123,6 +119,7 @@ $labels['moreactions'] = 'Ytterligare hantering...';
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
+$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Sida';
 $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
@@ -142,7 +139,6 @@ $labels['expand_only_unread'] = 'Trådar med olästa meddelanden';
 $labels['fromto'] = 'Avsändare/Mottagare';
 $labels['flag'] = 'Flagga';
 $labels['attachment'] = 'Bilaga';
-$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Datum skickat';
 $labels['arrival'] = 'Datum mottaget';
 $labels['asc'] = 'Stigande';
@@ -191,6 +187,7 @@ $labels['highest'] = 'Högst';
 $labels['nosubject'] = '(inget ämne)';
 $labels['showimages'] = 'Visa bilder';
 $labels['alwaysshow'] = 'Visa alltid bilder från $sender';
+$labels['isdraft'] = 'Detta meddelande är ett utkast.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text';
 $labels['savesentmessagein'] = 'Spara kopia i';
@@ -232,14 +229,15 @@ $labels['male'] = 'Man';
 $labels['female'] = 'Kvinna';
 $labels['manager'] = 'Chef';
 $labels['assistant'] = 'Assistent';
+$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Make/Maka';
 $labels['allfields'] = 'Alla fält';
 $labels['search'] = 'Sök';
 $labels['advsearch'] = 'Sök avancerat';
-$labels['other'] = 'Annan';
+$labels['other'] = 'Annat';
+$labels['typeother'] = 'Annat';
 $labels['typehome'] = 'Hem';
 $labels['typework'] = 'Arbete';
-$labels['typeother'] = 'Annat';
 $labels['typemobile'] = 'Mobil';
 $labels['typemain'] = 'Huvudsakligt';
 $labels['typehomefax'] = 'Fax hem';
@@ -247,7 +245,6 @@ $labels['typeworkfax'] = 'Fax arbete';
 $labels['typecar'] = 'Bil';
 $labels['typepager'] = 'Personsökare';
 $labels['typevideo'] = 'Video';
-$labels['typeassistant'] = 'Assistent';
 $labels['typehomepage'] = 'Webbsida';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
@@ -291,6 +288,7 @@ $labels['importreplace'] = 'Ersätt samtliga kontakter i adressboken';
 $labels['importtext'] = 'Kontakter kan importeras från en befintlig adressbok.<br/>För närvarande stöds import av adresser i <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>-format.';
 $labels['done'] = 'Klart';
 $labels['settingsfor'] = 'Inställningar för';
+$labels['about'] = 'Om';
 $labels['preferences'] = 'Inställningar';
 $labels['userpreferences'] = 'Användarinställningar';
 $labels['editpreferences'] = 'Ändra användarinställningar';
@@ -352,13 +350,13 @@ $labels['advancedoptions'] = 'Avancerade inställningar';
 $labels['focusonnewmessage'] = 'Fokusera webbläsarens fönster vid nytt meddelande';
 $labels['checkallfolders'] = 'Genomsök samtliga kataloger efter nya meddelanden';
 $labels['displaynext'] = 'Visa nästa meddelande efter borttagning/flyttning av meddelande';
+$labels['defaultfont'] = 'Standardtypsnitt i HTML-meddelande';
 $labels['mainoptions'] = 'Huvudalternativ';
 $labels['section'] = 'Avdelning';
 $labels['maintenance'] = 'Underhåll';
 $labels['newmessage'] = 'Nytt meddelande';
-$labels['listoptions'] = 'Listalternativ';
 $labels['signatureoptions'] = 'Signaturalternativ';
-$labels['whenreplying'] = 'Vid svar';
+$labels['whenreplying'] = 'Vid svar fortsätt skriv';
 $labels['replytopposting'] = 'Ovanför befintligt meddelande';
 $labels['replybottomposting'] = 'Nedanför befintligt meddelande';
 $labels['replyremovesignature'] = 'Ta bort befintlig signatur från meddelandet vid svar';
@@ -375,6 +373,7 @@ $labels['reqmdn'] = 'Begär alltid mottagarkvitto';
 $labels['reqdsn'] = 'Begär alltid leveransstatusmeddelande';
 $labels['replysamefolder'] = 'Placera svar i samma katalog som besvarat meddelande';
 $labels['defaultaddressbook'] = 'Lägg till nya kontakter i vald adressbok';
+$labels['autocompletesingle'] = 'Hoppa över alternativa adresser vid automatisk komplettering';
 $labels['spellcheckbeforesend'] = 'Kontrollera stavning innan meddelanden skickas';
 $labels['spellcheckoptions'] = 'Rättstavningsalternativ';
 $labels['spellcheckignoresyms'] = 'Ignorera ord med symboler';
@@ -382,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Ignorera ord med siffror';
 $labels['spellcheckignorecaps'] = 'Ignorera ord med enbart stora bokstäver';
 $labels['addtodict'] = 'Lägg till i ordlista';
 $labels['folder'] = 'Katalog';
-$labels['folders'] = 'Kataloger';
 $labels['foldername'] = 'Katalognamn';
 $labels['subscribed'] = 'Prenumererad';
 $labels['messagecount'] = 'Meddelanden';
@@ -395,7 +393,7 @@ $labels['folderproperties'] = 'Katalogegenskaper';
 $labels['parentfolder'] = 'Överliggande katalog';
 $labels['location'] = 'Plats';
 $labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Klicka för katalogstorlek';
+$labels['getfoldersize'] = 'Beräkna katalogstorlek';
 $labels['changesubscription'] = 'Klicka för att ändra prenumeration';
 $labels['foldertype'] = 'Katalogtyp';
 $labels['personalfolder'] = 'Privat katalog';
@@ -405,6 +403,11 @@ $labels['sortby'] = 'Sortera på';
 $labels['sortasc'] = 'Sortera stigande';
 $labels['sortdesc'] = 'Sortera fallande';
 $labels['undo'] = 'Ångra';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Källkod';
+$labels['license'] = 'Licens';
+$labels['support'] = 'Få hjälp';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -428,4 +431,3 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
-?>
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 26af773eb..4031c9ab3 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/sv_SE/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Jonas Nasholm <rcm@bitfuse.net>                               |
-|         Fredrik Nygren <f.nygren@gmail.com>                           |
-|         Andreas Henriksson <andreas@fatal.se>                         |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -127,10 +122,9 @@ $messages['editorwarning'] = 'Genom att växla till text-läge går formateringe
 $messages['httpreceivedencrypterror'] = 'Ett irreparabelt fel har uppstått. Kontakta administratören omgående. <b>Meddelandet kan inte skickas.</b>';
 $messages['smtpconnerror'] = 'SMTP-fel ($code): Anslutning till servern misslyckades';
 $messages['smtpautherror'] = 'SMTP-fel ($code): Inloggningen misslyckades';
-$messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte sätta avsändaradress till "$from"';
-$messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradress "$to"';
+$messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte sätta avsändaradress till "$from';
+$messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradress "$to';
 $messages['smtprecipientserror'] = 'SMTP-fel: Felaktigt formaterad lista med mottagaradresser';
-$messages['smtpdsnerror'] = 'SMTP-fel: Inget stöd för leveransstatusmeddelande';
 $messages['smtperror'] = 'SMTP-fel: $msg';
 $messages['emailformaterror'] = 'Felaktig adress: $email';
 $messages['toomanyrecipients'] = 'Förmånga mottagare. Minska antalet till högst $max.';
@@ -160,5 +154,5 @@ $messages['foldercreated'] = 'Katalog skapad';
 $messages['invalidimageformat'] = 'Ogiltigt bildfilsformat';
 $messages['mispellingsfound'] = 'Stavfel hittades i meddelandet';
 $messages['parentnotwritable'] = 'Katalogen kunde inte skapas eller flyttas. Åtkomsträttighet saknas.';
+$messages['messagetoobig'] = 'Denna del av meddelandet är alltför stor för att hantera.';
 
-?>
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index eacd89e9f..979aaf74e 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/_NEW_/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:                                                               |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/ta_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -39,17 +39,15 @@ $labels['date'] = 'தேதி';
 $labels['size'] = 'அளவு';
 $labels['priority'] = 'முக்கியத்துவம்';
 $labels['organization'] = 'நிறுவனம்';
-$labels['reply-to'] = 'பதிலளி';
-$labels['mailboxlist'] = 'அடைவு';
+$labels['mailboxlist'] = 'அடைவுகள்';
+$labels['folders'] = 'அடைவுகள்';
 $labels['messagesfromto'] = 'செய்திகள் $countல் $from லிருந்து $to வரை';
 $labels['messagenrof'] = '$countல் $nr வது செய்தி';
+$labels['copy'] = 'நகல்';
 $labels['moveto'] = 'இதற்கு அனுப்பு...';
 $labels['download'] = 'பதிவிறக்கு';
 $labels['filename'] = 'கோப்பு பெயர்';
 $labels['filesize'] = 'கோப்பு அளவு';
-$labels['preferhtml'] = 'HTML காட்டு';
-$labels['htmlmessage'] = 'HTML செய்தி';
-$labels['prettydate'] = 'நல்ல தேதி';
 $labels['addtoaddressbook'] = 'தொடர்புகளுக்கு சேர்க்கவும்';
 $labels['sun'] = 'ஞாயிறு';
 $labels['mon'] = 'திங்கள்';
@@ -70,6 +68,7 @@ $labels['feb'] = 'பிப்ரவரி';
 $labels['mar'] = 'மார்ச்';
 $labels['apr'] = 'ஏப்ரல்';
 $labels['may'] = 'மே';
+$labels['longmay'] = 'மே';
 $labels['jun'] = 'சூன்';
 $labels['jul'] = 'சூலை';
 $labels['aug'] = 'ஆகஸ்ட்';
@@ -81,7 +80,6 @@ $labels['longjan'] = 'சனவரி';
 $labels['longfeb'] = 'பிப்ரவரி';
 $labels['longmar'] = 'மார்ச்';
 $labels['longapr'] = 'ஏப்ரல்';
-$labels['longmay'] = 'மே';
 $labels['longjun'] = 'சூன்';
 $labels['longjul'] = 'சூலை';
 $labels['longaug'] = 'ஆகஸ்ட்';
@@ -99,13 +97,9 @@ $labels['deletemessage'] = 'செய்தியை நீக்கு';
 $labels['movemessagetotrash'] = 'செய்தியை குப்பைக்கு நகர்த்து';
 $labels['printmessage'] = 'செய்தியை அச்சிடவும்';
 $labels['previousmessage'] = 'முந்திய செய்தியை காட்டவும்';
-$labels['previousmessages'] = 'முந்திய செய்திகள் குழுவை காட்டவும்';
 $labels['firstmessage'] = 'முதல் செய்தியை காட்டவும்';
-$labels['firstmessages'] = 'முதல் செய்திகள் குழுவை காட்டவும்';
 $labels['nextmessage'] = 'அடுத்த செய்தியை காட்டு';
-$labels['nextmessages'] = 'அடுத்த செய்திகள் குழுவை காட்டு';
 $labels['lastmessage'] = 'கடைசி செய்தியை காட்டு';
-$labels['lastmessages'] = 'கடைசி செய்திகள் குழுவை காட்டு';
 $labels['backtolist'] = 'செய்தி பட்டியலுக்கு செல்லவும்';
 $labels['viewsource'] = 'மூலத்தை காட்டு';
 $labels['markmessages'] = 'செய்திகளை குறியிடு';
@@ -113,10 +107,10 @@ $labels['markread'] = 'படித்ததாக குறியிடு';
 $labels['markunread'] = 'படிக்காததாக குறியிடு';
 $labels['markflagged'] = 'நட்சத்திரமிட்டதாக குறியிடு';
 $labels['markunflagged'] = 'நட்சத்திரமிடாததாக குறியிடு';
-$labels['messageactions'] = 'மேலும் செயல்கள்';
 $labels['select'] = 'தேர்ந்தெடு';
 $labels['all'] = 'எல்லாம்';
 $labels['none'] = 'எதுவுமில்லை';
+$labels['nonesort'] = 'எதுவுமில்லை';
 $labels['unread'] = 'படிக்காதது';
 $labels['flagged'] = 'நட்சத்திரமிட்டது';
 $labels['unanswered'] = 'பதிலளிக்காதது';
@@ -125,7 +119,6 @@ $labels['invert'] = 'தலைகீழ்';
 $labels['filter'] = 'வடிப்பான்';
 $labels['compact'] = 'குறுகிய';
 $labels['empty'] = 'காலி';
-$labels['purge'] = 'நீக்கு';
 $labels['quota'] = 'பயன்பாட்டு அளவு';
 $labels['unknown'] = 'தெரியாத';
 $labels['unlimited'] = 'அளவில்லா';
@@ -207,6 +200,9 @@ $labels['manageidentities'] = 'இந்த கணக்கிற்கான �
 $labels['newidentity'] = 'புது அடையாளம்';
 $labels['newitem'] = 'புது உருப்படி';
 $labels['edititem'] = 'உருப்படியை திருத்து';
+$labels['preferhtml'] = 'HTML காட்டு';
+$labels['htmlmessage'] = 'HTML செய்தி';
+$labels['prettydate'] = 'நல்ல தேதி';
 $labels['setdefault'] = 'இயல்பை அமை';
 $labels['autodetect'] = 'தானியங்கி';
 $labels['language'] = 'மொழி';
@@ -252,7 +248,6 @@ $labels['mainoptions'] = 'முக்கிய விருப்பங்க�
 $labels['section'] = 'பிரிவு';
 $labels['maintenance'] = 'பராமரிப்பு';
 $labels['newmessage'] = 'புது செய்தி';
-$labels['listoptions'] = 'விருப்பங்களை பட்டியலிடு';
 $labels['signatureoptions'] = 'கையொப்ப விருப்பங்கள்';
 $labels['whenreplying'] = 'பதிலளிக்கும் போது';
 $labels['replytopposting'] = 'புது செய்தியை அசலின் மேல் துவக்கு';
@@ -266,7 +261,6 @@ $labels['belowquote'] = 'மேற்கோளுக்கு கீழே';
 $labels['abovequote'] = 'மேற்கோளுக்கு மேலே';
 $labels['insertsignature'] = 'கையோப்பமிடு';
 $labels['folder'] = 'அடைவு';
-$labels['folders'] = 'அடைவுகள்';
 $labels['foldername'] = 'அடைவு பெயர்';
 $labels['subscribed'] = 'சந்தா';
 $labels['messagecount'] = 'செய்திகள்';
@@ -282,4 +276,3 @@ $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
-?>
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index 0b92be639..5172c339e 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -1,17 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/_NEW_/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2008-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:                                                               |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/ta_IN/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -62,7 +62,6 @@ $messages['nosubjectwarning'] = 'தலைப்பு காலியாக உ
 $messages['nobodywarning'] = 'உரையில்லாமல் இந்த செய்தியை அனுப்ப வேண்டுமா?';
 $messages['notsentwarning'] = 'செய்தி அனுப்பப்படவில்லை. உங்கள் செய்தியை நிராகரிக்க விரும்புகிறீர்களா?';
 $messages['noldapserver'] = 'தயவு செய்து தேடுவதற்கு Idap சேவையகத்தை தேர்ந்தெடுங்கள்';
-$messages['nocontactsreturned'] = 'எந்த தொடர்புகளும் காணப்படவில்லை';
 $messages['nosearchname'] = 'தயவு செய்து தொடர்பின் பெயரோ மின்னஞ்சல் முகவரியோ எழுதுங்கள்';
 $messages['notuploadedwarning'] = 'எல்லா இணைப்புகளும் ஏற்றப்படவில்லை. தயவு செய்து காத்திருங்கள் அல்லது ஏற்றத்தை ரத்து செய்யுங்கள்.';
 $messages['searchsuccessful'] = '$nr செய்திகள் கண்டுபிடிக்கப்பட்டது';
@@ -100,6 +99,5 @@ $messages['smtpfromerror'] = 'SMTP பிழை ($code): அனுப்பு�
 $messages['smtptoerror'] = 'SMTP பிழை ($code): "$to" பெறுனரை சேர்பதில் தோல்வி';
 $messages['smtprecipientserror'] = 'SMTP பிழை : பெறுனர் பட்டியலை பிரிக்க முடியவில்லை';
 $messages['smtperror'] = 'SMTP பிழை: $msg';
-$messages['emailformaterror'] = 'தவறான மின்னஞ்சல் முகவரி: $email	';
+$messages['emailformaterror'] = 'தவறான மின்னஞ்சல் முகவரி: $email';
 
-?>
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index 45b446f72..0d46b9ed7 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/th_TH/labels.inc                                             |
+ | localization/th_TH/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Wiraphan Treeratphan <webmaster@modoeye.com>                  |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
@@ -32,7 +29,6 @@ $labels['drafts'] = 'กล่องจดหมายร่าง';
 $labels['sent'] = 'กล่องขาออก';
 $labels['trash'] = 'ถังขยะ';
 $labels['junk'] = 'กล่องจดหมายขยะ';
-$labels['spam'] = 'กล่องจดหมายขยะ';
 $labels['subject'] = 'หัวจดหมาย';
 $labels['from'] = 'ผู้ส่ง';
 $labels['to'] = 'ผู้รับ';
@@ -43,17 +39,15 @@ $labels['date'] = 'วันที่';
 $labels['size'] = 'ขนาด';
 $labels['priority'] = 'ระดับความสำคัญ';
 $labels['organization'] = 'องค์กร';
-$labels['reply-to'] = 'ตอบกลับ';
 $labels['mailboxlist'] = 'กล่องจดหมาย';
+$labels['folders'] = 'กล่องจดหมาย';
 $labels['messagesfromto'] = 'จดหมายจาก $from ถึง $to จำนวน $count ฉบับ';
 $labels['messagenrof'] = 'จดหมายฉบับที่ $nr จาก $count ฉบับ';
+$labels['copy'] = 'คัดลอก';
 $labels['moveto'] = 'ย้ายไป...';
 $labels['download'] = 'ดาวน์โหลด';
 $labels['filename'] = 'ชื่อไฟล์';
 $labels['filesize'] = 'ขนาดไฟล์';
-$labels['preferhtml'] = 'อ่านแบบ HTML';
-$labels['htmlmessage'] = 'จดหมาย HTML';
-$labels['prettydate'] = 'แสดงวันที่แบบย่อ';
 $labels['addtoaddressbook'] = 'บันทึกในสมุดรายชื่อ';
 $labels['sun'] = 'อ';
 $labels['mon'] = 'จ';
@@ -78,20 +72,18 @@ $labels['forwardmessage'] = 'ส่งต่อจดหมาย';
 $labels['deletemessage'] = 'ลบจดหมาย';
 $labels['printmessage'] = 'พิมพ์จดหมาย';
 $labels['previousmessage'] = 'แสดงจดหมายฉบับที่แล้ว';
-$labels['previousmessages'] = 'จดหมายฉบับก่อนหน้า';
 $labels['firstmessage'] = 'แสดงจดหมายฉบับแรก';
 $labels['nextmessage'] = 'แสดงจดหมายฉบับต่อไป';
-$labels['nextmessages'] = 'จดหมายฉบับถัดไป';
 $labels['lastmessage'] = 'แสดงจดหมายฉบับล่าสุด';
 $labels['backtolist'] = 'กลับไปยังรายการจดหมาย';
 $labels['viewsource'] = 'แสดง source';
 $labels['select'] = 'เลือก';
 $labels['all'] = 'ทั้งหมด';
 $labels['none'] = 'ไม่เลือก';
+$labels['nonesort'] = 'ไม่เลือก';
 $labels['unread'] = 'จดหมายที่ไม่ได้อ่าน';
 $labels['compact'] = 'แบบย่อ';
 $labels['empty'] = 'ว่างเปล่า';
-$labels['purge'] = 'ลบทั้งหมด';
 $labels['quota'] = 'พื้นที่ใช้งาน';
 $labels['unknown'] = 'ไม่ทราบ';
 $labels['unlimited'] = 'ไม่จำกัด';
@@ -145,6 +137,9 @@ $labels['manageidentities'] = 'จัดการชื่อแสดงตั�
 $labels['newidentity'] = 'ชื่อแสดงตัวใหม่';
 $labels['newitem'] = 'New item';
 $labels['edititem'] = 'Edit item';
+$labels['preferhtml'] = 'อ่านแบบ HTML';
+$labels['htmlmessage'] = 'จดหมาย HTML';
+$labels['prettydate'] = 'แสดงวันที่แบบย่อ';
 $labels['setdefault'] = 'ตั้งเป็นค่าใช้งาน';
 $labels['language'] = 'ภาษา';
 $labels['timezone'] = 'เขตเวลา';
@@ -157,7 +152,6 @@ $labels['previewpane'] = 'แสดงหน้าต่างตัวอย่
 $labels['autosavedraft'] = 'บันทึกเป็นจดหมายร่างอัตโนมัติ';
 $labels['never'] = 'ไม่ใช้';
 $labels['folder'] = 'กล่องจดหมาย';
-$labels['folders'] = 'กล่องจดหมาย';
 $labels['foldername'] = 'ชื่อกล่องจดหมาย';
 $labels['subscribed'] = 'ลงชื่อ';
 $labels['create'] = 'สร้าง';
@@ -167,4 +161,3 @@ $labels['sortby'] = 'เรียงตาม';
 $labels['sortasc'] = 'เรียงจากหน้าไปหลัง';
 $labels['sortdesc'] = 'เรียงจากหลังไปหน้า';
 
-?>
\ No newline at end of file
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 4a1b9d546..7bc8c2924 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -1,24 +1,21 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/th_TH/messages.inc                                           |
+ | localization/th_TH/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Wiraphan Treeratphan <webmaster@modoeye.com>                  |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
-$messages['loginfailed']  = 'ไม่สามารถเข้าสู่ระบบได้';
+$messages['loginfailed'] = 'ไม่สามารถเข้าสู่ระบบได้';
 $messages['cookiesdisabled'] = 'Browser ของคุณไม่ได้เปิดการใช้งาน Cookie ไว้';
 $messages['sessionerror'] = 'Your session is invalid or expired';
 $messages['imaperror'] = 'ไม่สามารถติดต่อ IMAP Server ได้';
@@ -39,25 +36,23 @@ $messages['blockedimages'] = 'เพื่อปกป้องความส�
 $messages['encryptedmessage'] = 'จดหมายถูกเข้ารหัสไม่สามารถแสดงผลได้';
 $messages['nocontactsfound'] = 'ไม่พบรายชื่อที่ค้นหา';
 $messages['contactnotfound'] = 'ไม่พบรายชื่อที่ค้นหา';
-
 $messages['sendingfailed'] = 'การส่งจดหมายล้มเหลว';
 $messages['errorsaving'] = 'เกิดข้อผิดพลาดระหว่างการบันทึก';
 $messages['errormoving'] = 'ไม่สามารถย้ายจดหมายได้';
 $messages['errordeleting'] = 'ไม่สามารถลบจดหมายได้';
-$messages['deletecontactconfirm']  = 'คุณมั่นใจที่ต้องการลบรายชื่อที่เลือกใช่หรือไม่?';
+$messages['deletecontactconfirm'] = 'คุณมั่นใจที่ต้องการลบรายชื่อที่เลือกใช่หรือไม่?';
 $messages['deletemessagesconfirm'] = 'คุณมั่นใจที่ต้องการลบจดหมายที่เลือกใช่หรือไม่?';
-$messages['deletefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบแฟ้มนี้หรือไม่?';
-$messages['purgefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
+$messages['deletefolderconfirm'] = 'คุณมั่นใจที่ต้องการลบแฟ้มนี้หรือไม่?';
+$messages['purgefolderconfirm'] = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
 $messages['formincomplete'] = 'ฟอร์มยังไม่ครบถ้วนสมบูรณ์';
 $messages['noemailwarning'] = 'โปรดใส่อีเมล์ให้ถูกต้อง';
-$messages['nonamewarning']  = 'โปรดใส่ชื่อ';
+$messages['nonamewarning'] = 'โปรดใส่ชื่อ';
 $messages['nopagesizewarning'] = 'โปรดใส่จำนวนหน้า';
 $messages['norecipientwarning'] = 'โปรดใส่ผู้รับอย่างน้อย 1 ชื่อ';
-$messages['nosubjectwarning']  = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
+$messages['nosubjectwarning'] = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
 $messages['nobodywarning'] = 'คุณต้องการส่งจดหมายโดยไม่มีข้อความใช่หรือไม่?';
 $messages['notsentwarning'] = 'จดหมายยังไม่ถูกส่ง คุณต้องการยกเลิกหรือไม่?';
 $messages['noldapserver'] = 'โปรดเลือก LDAP Server เพื่อค้นหา';
-$messages['nocontactsreturned'] = 'ไม่พบรายชื่อ';
 $messages['nosearchname'] = 'โปรดใสชื่อหรืออีเมล์';
 $messages['searchsuccessful'] = 'พบจดหมายจำนวน $nr ฉบับ';
 $messages['searchnomatch'] = 'การค้นหาไม่พบ';
@@ -65,15 +60,13 @@ $messages['searching'] = 'กำลังค้นหา...';
 $messages['checking'] = 'กำลังตรวจสอบ...';
 $messages['nospellerrors'] = 'ไม่พบคำที่สะกดผิด';
 $messages['folderdeleted'] = 'ลบแฟ้มเสร็จสมบูรณ์';
-$messages['deletedsuccessfully'] = "ลบเสร็จสมบูรณ์";
+$messages['deletedsuccessfully'] = 'ลบเสร็จสมบูรณ์';
 $messages['converting'] = 'นำเอาหารจัดรูปแบบในจดหมายออก...';
 $messages['messageopenerror'] = 'ไม่สามารถอ่านจดหมายจาก Server ได้';
 $messages['fileuploaderror'] = 'การอัพโหลดล้มเหลว';
 $messages['filesizeerror'] = 'ไฟล์มีขนาดใหญ่เกิน $size';
-
 $messages['copysuccess'] = 'คัดลอกจดหมายจำนวน $nr ฉบับเรียบร้อย';
 $messages['copyerror'] = 'ไม่สามารถคัดลอกได้';
 $messages['sourceisreadonly'] = 'จดหมายนี้เป็นแบบอ่านอย่างเดียว';
 $messages['errorsavingcontact'] = 'ไม่สามารถบันทึกรายชื่อได้';
 
-?>
\ No newline at end of file
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 1ab13b14b..6f5ec3ee3 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -1,27 +1,23 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/tr_TR/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Hasan Cansız <hasancansiz@yahoo.com>                          |
-| Author: Gökdeniz Karadağ <gokdenizk@gmail.com>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/tr_TR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: ismail yenigul <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
 $labels['welcome'] = '$product, Hoş Geldiniz';
 $labels['username'] = 'Kullanıcı Adı';
-$labels['password'] = 'Şifre';
+$labels['password'] = 'Parola';
 $labels['server'] = 'Sunucu';
 $labels['login'] = 'Oturum Aç';
 $labels['logout'] = 'Oturumu Kapat';
@@ -46,6 +42,7 @@ $labels['priority'] = 'Öncelik';
 $labels['organization'] = 'Kuruluş';
 $labels['readstatus'] = 'Okundu durumu';
 $labels['mailboxlist'] = 'Klasörler';
+$labels['folders'] = 'Klasörler';
 $labels['messagesfromto'] = 'Postalar: $from - $to , Toplam: $count';
 $labels['threadsfromto'] = 'Dizilmler: $from - $to, Toplam $count';
 $labels['messagenrof'] = 'Posta: $nr / $count';
@@ -74,7 +71,8 @@ $labels['jan'] = 'Oca';
 $labels['feb'] = 'Şub';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Nis';
-$labels['may'] = 'May';
+$labels['may'] = 'Mayıs';
+$labels['longmay'] = 'Mayıs';
 $labels['jun'] = 'Haz';
 $labels['jul'] = 'Tem';
 $labels['aug'] = 'Ağu';
@@ -86,7 +84,6 @@ $labels['longjan'] = 'Ocak';
 $labels['longfeb'] = 'Şubat';
 $labels['longmar'] = 'Mart';
 $labels['longapr'] = 'Nisan';
-$labels['longmay'] = 'Mayıs';
 $labels['longjun'] = 'Haziran';
 $labels['longjul'] = 'Temmuz';
 $labels['longaug'] = 'Ağustos';
@@ -118,10 +115,11 @@ $labels['markread'] = 'okunmuş olarak';
 $labels['markunread'] = 'okunmamış olarak';
 $labels['markflagged'] = 'işaretli olarak';
 $labels['markunflagged'] = 'işaretsiz olarak';
-$labels['messageactions'] = 'Diğer eylemler...';
+$labels['moreactions'] = 'Daha fazla eylem...';
 $labels['select'] = 'Seç';
 $labels['all'] = 'Hepsini';
-$labels['none'] = 'Hiçbirini';
+$labels['none'] = 'Yok';
+$labels['nonesort'] = 'Yok';
 $labels['currpage'] = 'Şimdiki sayfa';
 $labels['unread'] = 'Okunmamışları';
 $labels['flagged'] = 'İşaretlenmişleri';
@@ -141,7 +139,6 @@ $labels['expand_only_unread'] = 'sadece okunmamış posta içeren dizilimler';
 $labels['fromto'] = 'Gönderici/Alıcı';
 $labels['flag'] = 'İşaret';
 $labels['attachment'] = 'Eklenti';
-$labels['nonesort'] = 'Yok';
 $labels['sentdate'] = 'Gönderim tarihi';
 $labels['arrival'] = 'Alım tarihi';
 $labels['asc'] = 'artan';
@@ -190,6 +187,7 @@ $labels['highest'] = 'En yüksek';
 $labels['nosubject'] = '(Konu Belirtilmemiş)';
 $labels['showimages'] = 'Resimleri göster';
 $labels['alwaysshow'] = '$sender tarafından gönderilen resimleri her zaman göster';
+$labels['isdraft'] = 'Bu posta taslaktır.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Düz metin';
 $labels['savesentmessagein'] = 'Gönderileni buraya kaydet';
@@ -231,14 +229,15 @@ $labels['male'] = 'erkek';
 $labels['female'] = 'kadın';
 $labels['manager'] = 'Yönetici';
 $labels['assistant'] = 'Asistan';
+$labels['typeassistant'] = 'Asistan';
 $labels['spouse'] = 'Eş';
 $labels['allfields'] = 'Tüm alanlar';
 $labels['search'] = 'Ara';
 $labels['advsearch'] = 'Gelişmiş ara';
 $labels['other'] = 'Diğer';
+$labels['typeother'] = 'Diğer';
 $labels['typehome'] = 'Ev';
 $labels['typework'] = 'İş';
-$labels['typeother'] = 'Diğer';
 $labels['typemobile'] = 'Cep telefonu';
 $labels['typemain'] = 'Ana';
 $labels['typehomefax'] = 'Ev Faks';
@@ -246,7 +245,6 @@ $labels['typeworkfax'] = 'İş Faks';
 $labels['typecar'] = 'Araba';
 $labels['typepager'] = 'Çağrı cihazı';
 $labels['typevideo'] = 'Görüntülü';
-$labels['typeassistant'] = 'Asistan';
 $labels['typehomepage'] = 'Ev sayfası';
 $labels['typeblog'] = 'Günlük';
 $labels['typeprofile'] = 'Profil';
@@ -271,7 +269,6 @@ $labels['print'] = 'Yazdır';
 $labels['export'] = 'Dışa aktar';
 $labels['exportvcards'] = 'vCard olarak dışa aktar';
 $labels['newcontactgroup'] = 'Yeni kişi grubu oluştur';
-$labels['groupactions'] = 'Kişi grupları için eylemler...';
 $labels['grouprename'] = 'Grubu yeniden adlandır';
 $labels['groupdelete'] = 'Grubu sil';
 $labels['previouspage'] = 'Öncekileri göster';
@@ -281,6 +278,8 @@ $labels['lastpage'] = 'Sonuncuyu göster';
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Gruplar';
 $labels['personaladrbook'] = 'Adresler';
+$labels['searchsave'] = 'Aramayı kaydet';
+$labels['searchdelete'] = 'Aramayı sil';
 $labels['import'] = 'İçe aktar';
 $labels['importcontacts'] = 'Kişileri içe aktar';
 $labels['importfromfile'] = 'Dosyadan içe aktar:';
@@ -289,6 +288,7 @@ $labels['importreplace'] = 'Tüm adres defterinin yerine geçsin';
 $labels['importtext'] = 'Mevcut bir adres defterindeki kişileri yükleyebilirsiniz.<br/><a href="http://en.wikipedia.org/wiki/VCard">vCard</a> dosyalarından adresleri içe aktarmayı destekliyoruz.';
 $labels['done'] = 'Tamam';
 $labels['settingsfor'] = 'Ayarlar';
+$labels['about'] = 'Hakkında';
 $labels['preferences'] = 'Tercihler';
 $labels['userpreferences'] = 'Kullanıcı tercihleri';
 $labels['editpreferences'] = 'Kullanıcı tercihlerini düzenle';
@@ -300,6 +300,8 @@ $labels['edititem'] = 'Öğe düzenle';
 $labels['preferhtml'] = 'HTML görüntüle';
 $labels['defaultcharset'] = 'Varsayılan Karakter Kümesi';
 $labels['htmlmessage'] = 'HTML Posta';
+$labels['dateformat'] = 'Tarih biçimi';
+$labels['timeformat'] = 'Zaman biçimi';
 $labels['prettydate'] = 'Tarihi kısaltarak göster';
 $labels['setdefault'] = 'Varsayılan olarak ata';
 $labels['autodetect'] = 'Otomatik';
@@ -348,11 +350,11 @@ $labels['advancedoptions'] = 'Gelişmiş seçenekler';
 $labels['focusonnewmessage'] = 'Yeni posta geldiğinde web tarayıcı penceresine odaklan.';
 $labels['checkallfolders'] = 'Tüm klasörlerdeki yeni postaları denetle';
 $labels['displaynext'] = 'Posta silindikten/taşındıktan sonra sıradaki postayı göster';
+$labels['defaultfont'] = 'HTML postalar için varsayılan yazı tipi';
 $labels['mainoptions'] = 'Ana Seçenekler';
 $labels['section'] = 'Bölüm';
 $labels['maintenance'] = 'Bakım';
 $labels['newmessage'] = 'Yeni Posta';
-$labels['listoptions'] = 'Liste Seçenekleri';
 $labels['signatureoptions'] = 'İmza Seçenekleri';
 $labels['whenreplying'] = 'Yanıtlarken';
 $labels['replytopposting'] = 'yeni postayı alıntı metninin üstünden başlat';
@@ -371,9 +373,14 @@ $labels['reqmdn'] = 'Her zaman alındı onayı iste';
 $labels['reqdsn'] = 'Her zaman teslimat durumu bildirisi iste';
 $labels['replysamefolder'] = 'Yanıtları, yanıtlanan postanın bulunduğu klasöre kaydet';
 $labels['defaultaddressbook'] = 'Yeni kişileri seçili adres defterine ekle';
+$labels['autocompletesingle'] = 'Otomatik tamamlamalarda alternatif e-posta adreslerini atla';
 $labels['spellcheckbeforesend'] = 'Posta göndermeden önce yazım denetimi yap';
+$labels['spellcheckoptions'] = 'Yazım denetimi seçenekleri';
+$labels['spellcheckignoresyms'] = 'İçinde sembol geçen kelimleri göz ardı et';
+$labels['spellcheckignorenums'] = 'İçinde rakam geçen kelimleri göz ardı et';
+$labels['spellcheckignorecaps'] = 'Tümü büyük harf olan kelimleri göz ardı et';
+$labels['addtodict'] = 'Sözlüğe ekle';
 $labels['folder'] = 'Klasör';
-$labels['folders'] = 'Klasörler';
 $labels['foldername'] = 'Klasör ismi';
 $labels['subscribed'] = 'Abonelik';
 $labels['messagecount'] = 'Postalar';
@@ -396,12 +403,17 @@ $labels['sortby'] = 'Sırala';
 $labels['sortasc'] = 'Artarak';
 $labels['sortdesc'] = 'Azalarak';
 $labels['undo'] = 'Geri al';
+$labels['plugin'] = 'Eklenti';
+$labels['version'] = 'Sürüm';
+$labels['source'] = 'Kaynak';
+$labels['license'] = 'Lisans';
+$labels['support'] = 'Destek al';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 $labels['unicode'] = 'Unicode';
-$labels['english'] = 'İngilizce ';
+$labels['english'] = 'İngilizce';
 $labels['westerneuropean'] = 'Batı Avrupa';
 $labels['easterneuropean'] = 'Doğu Avrupa';
 $labels['southeasterneuropean'] = 'Güneydoğu Avrupa';
@@ -419,4 +431,3 @@ $labels['japanese'] = 'Japonca';
 $labels['korean'] = 'Korece';
 $labels['chinese'] = 'Çince';
 
-?>
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index 534e4804a..2291eaa23 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/tr_TR/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Hasan Cansız <hasancansiz@yahoo.com>                          |
-| Author: Gökdeniz Karadağ <gokdenizk@gmail.com>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/tr_TR/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: ismail yenigul <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -26,7 +22,7 @@ $messages['imaperror'] = 'IMAP sunucusuna bağlanılamadı';
 $messages['servererror'] = 'Sunucu Hatası!';
 $messages['servererrormsg'] = 'Sunucu hatası: $msg';
 $messages['dberror'] = 'Veritabanı Hatası!';
-$messages['errorreadonly'] = 'İşlem gerçekleştirilemedi. Klasör sadece okunabilir';
+$messages['errorreadonly'] = 'İşlem gerçekleştirilemedi. Dizin salt okunabilir';
 $messages['errornoperm'] = 'İşlem gerçekleştirilemedi. İzin verilmedi.';
 $messages['invalidrequest'] = 'Geçersiz İstek! Veri kaydedilmedi';
 $messages['nomessagesfound'] = 'Posta kutusunda ileti bulunamadı';
@@ -49,6 +45,7 @@ $messages['blockedimages'] = 'Kişisel gizliliğinizi korumak amacıyla postadak
 $messages['encryptedmessage'] = 'Bu şifrelenmiş bir posta olduğu için gösterilemiyor. Özür dilerim!';
 $messages['nocontactsfound'] = 'Kişi bulunamadı';
 $messages['contactnotfound'] = 'İstenen kişi bulunamadı';
+$messages['contactsearchonly'] = 'Kişi aramak için arama terimleri giriniz';
 $messages['sendingfailed'] = 'Posta gönderilemedi';
 $messages['senttooquickly'] = 'Lütfen bu postayı göndermeden önce $sec saniye bekleyin';
 $messages['errorsavingsent'] = 'Gönderilen postayı kaydederken hata oluştu';
@@ -62,6 +59,7 @@ $messages['deletegroupconfirm'] = 'Seçili grupları silmek istediğinizden emin
 $messages['deletemessagesconfirm'] = 'Seçili postaları silmek istediğinizden emin misiniz?';
 $messages['deletefolderconfirm'] = 'Bu klasörü silmek istediğinizden emin misiniz?';
 $messages['purgefolderconfirm'] = 'Bu klasördeki tüm postaları silmek istediğinizden emin misiniz?';
+$messages['contactdeleting'] = 'Kişi(er) siliniyor...';
 $messages['groupdeleting'] = 'Grup siliniyor...';
 $messages['folderdeleting'] = 'Klasör siliniyor...';
 $messages['foldermoving'] = 'Klasör taşınıyor...';
@@ -77,10 +75,10 @@ $messages['nosubjectwarning'] = '"Konu" kutusu boş bırakılmış. Şimdi bir k
 $messages['nobodywarning'] = 'Postayı boş olarak gönder?';
 $messages['notsentwarning'] = 'Posta gönderilmedi. Postanızı iptal etmek istiyor musunuz?';
 $messages['noldapserver'] = 'Lütfen arama için bir LDAP sunucu seçin';
-$messages['nocontactsreturned'] = 'Kişi bulunamadı';
 $messages['nosearchname'] = 'Lütfen bir kişi ismi veya e-posta adresi girin';
 $messages['notuploadedwarning'] = 'Henüz tüm ekli dosyalar yüklenmedi. Lütfen bekleyin ya da yüklemeyi iptal edin.';
 $messages['searchsuccessful'] = '$nr posta bulundu';
+$messages['contactsearchsuccessful'] = '$nr kişi bulundu';
 $messages['searchnomatch'] = 'Aramanıza uygun hiçbir sonuç bulunamadı';
 $messages['searching'] = 'Aranıyor...';
 $messages['checking'] = 'Denetleniyor...';
@@ -127,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP Hatası ($code): Kimlik doğrulama başarıs�
 $messages['smtpfromerror'] = 'SMTP Hatası ($code): Gönderen adresi "$from" olarak ayarlanamadı ($msg)';
 $messages['smtptoerror'] = 'SMTP Hatası ($code): "$to" alıcısı eklenemedi ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Hatası: Posta alıcılarının listesi ayrıştırılamadı';
-$messages['smtpdsnerror'] = 'SMTP hatası: Teslimat durumu bildirileri desteklenmiyor';
 $messages['smtperror'] = 'SMTP Hatası: $msg';
 $messages['emailformaterror'] = 'Hatalı e-posta adresi: $email';
 $messages['toomanyrecipients'] = 'Çok fazla alıcı. En fazla $max alıcı girebilirsiniz.';
@@ -140,11 +137,16 @@ $messages['contactrestored'] = 'Kişi(ler) başarıyla geri getirildi.';
 $messages['groupdeleted'] = 'Grup silindi';
 $messages['grouprenamed'] = 'Grup ismi değiştirildi';
 $messages['groupcreated'] = 'Grup oluşturuldu';
+$messages['savedsearchdeleted'] = 'Kayıtlı arama silindi.';
+$messages['savedsearchdeleteerror'] = 'Kayıtlı arama silinemedi.';
+$messages['savedsearchcreated'] = 'Kayıtlı arama oluşturuldu.';
+$messages['savedsearchcreateerror'] = 'Kayıtlı arama oluşturulamadı.';
 $messages['messagedeleted'] = 'Posta(lar) silindi';
 $messages['messagemoved'] = 'Posta(lar) taşındı';
 $messages['messagecopied'] = 'Posta(lar) kopyalandı';
 $messages['messagemarked'] = 'Posta(lar) işaretlendi';
 $messages['autocompletechars'] = 'otomatik tamamlama için en az $min karakter girin';
+$messages['autocompletemore'] = 'Fazla sayıda eşleşen öğe bulundu. Lütfen daha fazla karakter yazın.';
 $messages['namecannotbeempty'] = 'İsim alanı boş olamaz';
 $messages['nametoolong'] = 'İsim çok uzun';
 $messages['folderupdated'] = 'Klasör güncellendi';
@@ -152,5 +154,5 @@ $messages['foldercreated'] = 'Klasör oluşturuldu';
 $messages['invalidimageformat'] = 'Geçerli bir resim biçimi değil.';
 $messages['mispellingsfound'] = 'Postada yazım hataları tespit edildi.';
 $messages['parentnotwritable'] = 'Klasör, seçilen üst klasöre taşınamıyor. Erişim izni yok.';
+$messages['messagetoobig'] = 'Bu ileti parçası işlenemeyecek kadar büyük.';
 
-?>
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index 45d0787c3..5941c3ae5 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/uk_UA/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Volodymyr M. Kononenko aka kvm <vmkononenko@gmail.com>        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/uk_UA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -45,6 +42,7 @@ $labels['priority'] = 'Пріоритет';
 $labels['organization'] = 'Організація';
 $labels['readstatus'] = 'Статус прочитання';
 $labels['mailboxlist'] = 'Папки';
+$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Повідомлення з $from по $to із $count';
 $labels['threadsfromto'] = 'Обговорення з $from по $to із $count';
 $labels['messagenrof'] = 'Лист $nr із $count';
@@ -73,7 +71,8 @@ $labels['jan'] = 'січ';
 $labels['feb'] = 'лют';
 $labels['mar'] = 'бер';
 $labels['apr'] = 'квіт';
-$labels['may'] = 'тр';
+$labels['may'] = 'Травень';
+$labels['longmay'] = 'Травень';
 $labels['jun'] = 'чер';
 $labels['jul'] = 'лип';
 $labels['aug'] = 'сер';
@@ -85,7 +84,6 @@ $labels['longjan'] = 'Січень';
 $labels['longfeb'] = 'Лютий';
 $labels['longmar'] = 'Березень';
 $labels['longapr'] = 'Квітень';
-$labels['longmay'] = 'Травень';
 $labels['longjun'] = 'Червень';
 $labels['longjul'] = 'Липень';
 $labels['longaug'] = 'Серпень';
@@ -120,7 +118,8 @@ $labels['markunflagged'] = 'Зняти зірочку';
 $labels['moreactions'] = 'Інші дії...';
 $labels['select'] = 'Вибрати';
 $labels['all'] = 'Всі';
-$labels['none'] = 'Жодного';
+$labels['none'] = 'Не сортувати';
+$labels['nonesort'] = 'Не сортувати';
 $labels['currpage'] = 'Поточна сторінка';
 $labels['unread'] = 'Непрочитані';
 $labels['flagged'] = 'Із зірочкою';
@@ -134,13 +133,12 @@ $labels['expand-all'] = 'Розкрити всі';
 $labels['expand-unread'] = 'Розкрити непрочитані';
 $labels['collapse-all'] = 'Згорнути всі';
 $labels['threaded'] = 'Гілками';
-$labels['autoexpand_threads'] = 'Розкривати гілки ';
+$labels['autoexpand_threads'] = 'Розкривати гілки';
 $labels['do_expand'] = 'усі гілки';
 $labels['expand_only_unread'] = 'тільки з непрочитаними листами';
 $labels['fromto'] = 'Відправник/Одержувач';
 $labels['flag'] = 'Позначка';
 $labels['attachment'] = 'Вкладення';
-$labels['nonesort'] = 'Не сортувати';
 $labels['sentdate'] = 'Дата відправлення';
 $labels['arrival'] = 'Дата оримання';
 $labels['asc'] = 'за зростанням';
@@ -189,6 +187,7 @@ $labels['highest'] = 'Найвищий';
 $labels['nosubject'] = '(без теми)';
 $labels['showimages'] = 'Показувати зображення';
 $labels['alwaysshow'] = 'Завжди показувати зображення від $sender';
+$labels['isdraft'] = 'Це чернетка.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Звичайний текст';
 $labels['savesentmessagein'] = 'зберегти надісланого листа в';
@@ -230,14 +229,15 @@ $labels['male'] = 'чоловічий';
 $labels['female'] = 'жіночий';
 $labels['manager'] = 'Менеждер';
 $labels['assistant'] = 'Помічник';
+$labels['typeassistant'] = 'Помічник';
 $labels['spouse'] = 'Шлюбний партнер';
 $labels['allfields'] = 'Усі поля';
 $labels['search'] = 'Пошук';
 $labels['advsearch'] = 'Розширений пошук';
 $labels['other'] = 'Інше';
+$labels['typeother'] = 'Інше';
 $labels['typehome'] = 'Дім';
 $labels['typework'] = 'Робота';
-$labels['typeother'] = 'Інше';
 $labels['typemobile'] = 'Мобільний';
 $labels['typemain'] = 'Основний';
 $labels['typehomefax'] = 'Домашній факс';
@@ -245,7 +245,6 @@ $labels['typeworkfax'] = 'Робочий факс';
 $labels['typecar'] = 'Автомобіль';
 $labels['typepager'] = 'Пейджер';
 $labels['typevideo'] = 'Відео';
-$labels['typeassistant'] = 'Помічник';
 $labels['typehomepage'] = 'Домашня сторінка';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профіль';
@@ -289,6 +288,7 @@ $labels['importreplace'] = 'Замінити всю адресну книгу';
 $labels['importtext'] = 'Ви можете завантажити контакти з існуючої адресної книги. На даний момент підтримується імпортування контактів з формату vCard';
 $labels['done'] = 'Готово';
 $labels['settingsfor'] = 'Налаштування для';
+$labels['about'] = 'Про програму';
 $labels['preferences'] = 'Параметри';
 $labels['userpreferences'] = 'Налаштування користувача';
 $labels['editpreferences'] = 'Редагувати налаштування користувача';
@@ -350,11 +350,11 @@ $labels['advancedoptions'] = 'Додаткові параметри';
 $labels['focusonnewmessage'] = 'Фокусувати вікно браузера при новому листі';
 $labels['checkallfolders'] = 'Перевіряти нові листи у всіх папках';
 $labels['displaynext'] = 'Після видалення/переміщення листа відображати наступний';
+$labels['defaultfont'] = 'Шрифт за замовчуванням HTML повідомлення';
 $labels['mainoptions'] = 'Основні налаштування';
 $labels['section'] = 'Розділ';
 $labels['maintenance'] = 'Додатково';
 $labels['newmessage'] = 'Новий лист';
-$labels['listoptions'] = 'Список налаштувань';
 $labels['signatureoptions'] = 'Налаштування підпису';
 $labels['whenreplying'] = 'При відповіді';
 $labels['replytopposting'] = 'починати новий лист перед цитованим';
@@ -373,6 +373,7 @@ $labels['reqmdn'] = 'Завжди вимагати повідомлення пр
 $labels['reqdsn'] = 'Завжди вимагати повідомлення про статус доставки';
 $labels['replysamefolder'] = 'Розмістити відповіді у тій же папці, де знаходиться оригінал';
 $labels['defaultaddressbook'] = 'Додати нові контакти до обраної адресної книги';
+$labels['autocompletesingle'] = 'Пропускати додаткові адреси в автозавершенні';
 $labels['spellcheckbeforesend'] = 'Перевірити орфографію перед відправкою повідомлення';
 $labels['spellcheckoptions'] = 'Налаштування перевірки орфографії';
 $labels['spellcheckignoresyms'] = 'Ігнорувати слова із символами';
@@ -380,7 +381,6 @@ $labels['spellcheckignorenums'] = 'Ігнорувати слова із числ
 $labels['spellcheckignorecaps'] = 'Ігнорувати слова із великими буквами';
 $labels['addtodict'] = 'Додати до словника';
 $labels['folder'] = 'Папка';
-$labels['folders'] = 'Папки';
 $labels['foldername'] = 'Назва папки';
 $labels['subscribed'] = 'Підписані';
 $labels['messagecount'] = 'Листи';
@@ -403,6 +403,11 @@ $labels['sortby'] = 'Відсортувати за';
 $labels['sortasc'] = 'Сортувати за зростанням';
 $labels['sortdesc'] = 'Сортувати за спаданням';
 $labels['undo'] = 'Відмінити';
+$labels['plugin'] = 'Доповнення';
+$labels['version'] = 'Версія';
+$labels['source'] = 'Джерело';
+$labels['license'] = 'Ліцензія';
+$labels['support'] = 'Отримати підтримку';
 $labels['B'] = 'б';
 $labels['KB'] = 'Кб';
 $labels['MB'] = 'Мб';
@@ -426,4 +431,3 @@ $labels['japanese'] = 'Японське';
 $labels['korean'] = 'Корейське';
 $labels['chinese'] = 'Китайське';
 
-?>
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 452d4b8f9..a5b0d75eb 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/uk_UA/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Volodymyr M. Kononenko aka kvm <vmkononenko@gmail.com>        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/uk_UA/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -128,7 +125,6 @@ $messages['smtpautherror'] = 'Помилка SMTP-сервера ($code): Нев
 $messages['smtpfromerror'] = 'Помилка SMTP-сервера ($code): Не вдалося вказати відправника "$from" ($msg)';
 $messages['smtptoerror'] = 'Помилка SMTP-сервера ($code): Не вдалося додати отримувача "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Помилка SMTP: Не вдалося обробити список отримувачів';
-$messages['smtpdsnerror'] = 'Помилка SMTP: Не підтримуються повідомлення про статус доставки';
 $messages['smtperror'] = 'Помилка SMTP: $msg';
 $messages['emailformaterror'] = 'Невірна електронна адреса: $email';
 $messages['toomanyrecipients'] = 'Занадто багато отримувачів. Зменшіть їх число до $max.';
@@ -144,7 +140,7 @@ $messages['groupcreated'] = 'Група створена успішно';
 $messages['savedsearchdeleted'] = 'Збережений пошук вдало видалено.';
 $messages['savedsearchdeleteerror'] = 'Неможливо видалити збережений пошук.';
 $messages['savedsearchcreated'] = 'Збережений пошук вдало створено.';
-$messages['savedsearchcreateerror'] = 'Не вдалось створити збережений пошук. ';
+$messages['savedsearchcreateerror'] = 'Не вдалось створити збережений пошук.';
 $messages['messagedeleted'] = 'Лист(и) видалено успішно';
 $messages['messagemoved'] = 'Лист(и) переміщено успішно';
 $messages['messagecopied'] = 'Лист(и) скопійовано успішно';
@@ -158,5 +154,5 @@ $messages['foldercreated'] = 'Папка створена';
 $messages['invalidimageformat'] = 'Невірний формат зображення';
 $messages['mispellingsfound'] = 'Знайдено орфографічні помилки у повідомленні.';
 $messages['parentnotwritable'] = 'Неможливо створити/перемістити папку до обраної батьківської папки. Нема прав доступу.';
+$messages['messagetoobig'] = 'Частина повідомлення занадто велика для опрацювання.';
 
-?>
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index d52e2a79a..a15b68fe2 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -1,76 +1,54 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/vn/labels.inc                                                |
+ | localization/vi_VN/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vinh Bui <bqvinh@buivinh.info>                                |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
-
-// login page
-$labels['welcome']   = 'Xin mời sử dụng $product';
-$labels['username']  = 'Tên người dùng';
-$labels['password']  = 'Mật khẩu';
-$labels['server']    = 'Máy chủ?';
-$labels['login']     = 'Đăng nhập';
-
-// taskbar
-$labels['logout']   = 'Đăng xuất';
-$labels['mail']     = 'E-Mail';
+$labels['welcome'] = 'Xin mời sử dụng $product';
+$labels['username'] = 'Tên người dùng';
+$labels['password'] = 'Mật khẩu';
+$labels['server'] = 'Máy chủ?';
+$labels['login'] = 'Đăng nhập';
+$labels['logout'] = 'Đăng xuất';
+$labels['mail'] = 'E-Mail';
 $labels['settings'] = 'Thiết lập';
 $labels['addressbook'] = 'Sổ địa chỉ';
-
-// mailbox names
-$labels['inbox']  = 'Inbox';
+$labels['inbox'] = 'Inbox';
 $labels['drafts'] = 'Drafts';
-$labels['sent']   = 'Sent';
-$labels['trash']  = 'Trash';
-$labels['junk']   = 'Junk';
-
-// message listing
+$labels['sent'] = 'Sent';
+$labels['trash'] = 'Trash';
+$labels['junk'] = 'Junk';
 $labels['subject'] = 'Tiêu đề';
-$labels['from']    = 'Người gửi';
-$labels['to']      = 'Người nhận';
-$labels['cc']      = 'Đồng nhận';
-$labels['bcc']     = 'Đồng nhận (2)';
+$labels['from'] = 'Người gửi';
+$labels['to'] = 'Người nhận';
+$labels['cc'] = 'Đồng nhận';
+$labels['bcc'] = 'Đồng nhận (2)';
 $labels['replyto'] = 'Trả lời vào';
-$labels['date']    = 'Ngày';
-$labels['size']    = 'D.Lượng';
+$labels['date'] = 'Ngày';
+$labels['size'] = 'D.Lượng';
 $labels['priority'] = 'Ưu tiên';
 $labels['organization'] = 'Cơ quan';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
 $labels['mailboxlist'] = 'Thư mục';
+$labels['folders'] = 'Thư mục';
 $labels['messagesfromto'] = 'Thư $from - $to / $count';
 $labels['messagenrof'] = 'Thư $nr / $count';
-
-$labels['moveto']   = 'chuyển đến...';
+$labels['copy'] = 'Đồng nhận';
+$labels['moveto'] = 'chuyển đến...';
 $labels['download'] = 'tải xuống';
-
 $labels['filename'] = 'Tên file';
 $labels['filesize'] = 'Dung lượng';
-
-$labels['preferhtml'] = 'Dùng HTML';
-$labels['htmlmessage'] = 'Thư kiểu HTML';
-$labels['prettydate'] = 'Hiển thị ngày đầy đủ';
-
 $labels['addtoaddressbook'] = 'Thêm và sổ địa chỉ';
-
-// weekdays short
 $labels['sun'] = 'CN';
 $labels['mon'] = 'T2';
 $labels['tue'] = 'T3';
@@ -78,137 +56,97 @@ $labels['wed'] = 'T4';
 $labels['thu'] = 'T5';
 $labels['fri'] = 'T6';
 $labels['sat'] = 'T7';
-
-// weekdays long
-$labels['sunday']    = 'Chủ nhật';
-$labels['monday']    = 'Thứ hai';
-$labels['tuesday']   = 'Thứ ba';
+$labels['sunday'] = 'Chủ nhật';
+$labels['monday'] = 'Thứ hai';
+$labels['tuesday'] = 'Thứ ba';
 $labels['wednesday'] = 'Thứ tư';
-$labels['thursday']  = 'Thứ năm';
-$labels['friday']    = 'Thứ sáu';
-$labels['saturday']  = 'Thứ bẩy';
-
+$labels['thursday'] = 'Thứ năm';
+$labels['friday'] = 'Thứ sáu';
+$labels['saturday'] = 'Thứ bẩy';
 $labels['today'] = 'Hôm nay';
-
-// toolbar buttons
-$labels['checkmail']        = 'Kiểm tra thư mới';
-$labels['writenewmessage']  = 'Soạn thư mới';
-$labels['replytomessage']   = 'Trả lời thư';
+$labels['checkmail'] = 'Kiểm tra thư mới';
+$labels['writenewmessage'] = 'Soạn thư mới';
+$labels['replytomessage'] = 'Trả lời thư';
 $labels['replytoallmessage'] = 'Trả lời tất cả';
-$labels['forwardmessage']   = 'Chuyển thư';
-$labels['deletemessage']    = 'Xóa thư';
-$labels['printmessage']     = 'In thư';
-$labels['previousmessages'] = 'Hiển thị các thư trước';
-$labels['nextmessages']     = 'Hiển thị các thư sau';
-$labels['backtolist']       = 'Trở về danh sách thư';
-$labels['viewsource']       = 'Hiển thị mã nguồn';
-
+$labels['forwardmessage'] = 'Chuyển thư';
+$labels['deletemessage'] = 'Xóa thư';
+$labels['printmessage'] = 'In thư';
+$labels['backtolist'] = 'Trở về danh sách thư';
+$labels['viewsource'] = 'Hiển thị mã nguồn';
 $labels['select'] = 'Chọn';
 $labels['all'] = 'Toàn bộ';
 $labels['none'] = 'Bỏ chọn';
+$labels['nonesort'] = 'Bỏ chọn';
 $labels['unread'] = 'Chưa đọc';
-
 $labels['compact'] = 'Rút gọn';
 $labels['empty'] = 'Xóa rỗng';
-$labels['purge'] = 'Tối giản';
-
 $labels['quota'] = 'Hạn mức';
-$labels['unknown']  = 'không rõ';
-$labels['unlimited']  = 'không hạn chế';
-
-$labels['quicksearch']  = 'Tìm nhanh';
-$labels['resetsearch']  = 'Xóa bỏ tìm kiếm';
-
-// message compose
-$labels['compose']  = 'Soạn thư';
-$labels['savemessage']  = 'Lưu thư đang soạn';
-$labels['sendmessage']  = 'Gửi thư';
-$labels['addattachment']  = 'Gửi kèm';
-$labels['charset']  = 'Bộ ký tự';
+$labels['unknown'] = 'không rõ';
+$labels['unlimited'] = 'không hạn chế';
+$labels['quicksearch'] = 'Tìm nhanh';
+$labels['resetsearch'] = 'Xóa bỏ tìm kiếm';
+$labels['compose'] = 'Soạn thư';
+$labels['savemessage'] = 'Lưu thư đang soạn';
+$labels['sendmessage'] = 'Gửi thư';
+$labels['addattachment'] = 'Gửi kèm';
+$labels['charset'] = 'Bộ ký tự';
 $labels['returnreceipt'] = 'Báo nhận';
-
 $labels['checkspelling'] = 'Kiểm tra chính tả';
 $labels['resumeediting'] = 'Soạn thảo';
 $labels['revertto'] = 'Chuyển về';
-
 $labels['attachments'] = 'Gửi kèm';
 $labels['upload'] = 'Tải lên';
-$labels['close']  = 'Đóng';
-
-$labels['low']     = 'Thấp';
-$labels['lowest']  = 'Thấp nhất';
-$labels['normal']  = 'Bình thường';
-$labels['high']    = 'Khẩn';
+$labels['close'] = 'Đóng';
+$labels['low'] = 'Thấp';
+$labels['lowest'] = 'Thấp nhất';
+$labels['normal'] = 'Bình thường';
+$labels['high'] = 'Khẩn';
 $labels['highest'] = 'Thượng khẩn';
-
-$labels['nosubject']  = '(no subject)';
+$labels['nosubject'] = '(no subject)';
 $labels['showimages'] = 'Hiển thị ảnh';
-
-// address boook
-$labels['name']      = 'Tên hiển thị';
+$labels['name'] = 'Tên hiển thị';
 $labels['firstname'] = 'Tên';
-$labels['surname']   = 'Họ';
-$labels['email']     = 'E-Mail';
-
+$labels['surname'] = 'Họ';
+$labels['email'] = 'E-Mail';
 $labels['addcontact'] = 'Thêm mới địa chỉ';
 $labels['editcontact'] = 'Sửa địa chỉ cũ';
-
-$labels['edit']   = 'Sửa đổi';
+$labels['edit'] = 'Sửa đổi';
 $labels['cancel'] = 'Ngưng';
-$labels['save']   = 'Lưu';
+$labels['save'] = 'Lưu';
 $labels['delete'] = 'Xóa';
-
-$labels['newcontact']     = 'Thêm mới địa chỉ liên hệ';
-$labels['deletecontact']  = 'Xóa địa chỉ được chọn';
-$labels['composeto']      = 'Soạn thư cho';
+$labels['newcontact'] = 'Thêm mới địa chỉ liên hệ';
+$labels['deletecontact'] = 'Xóa địa chỉ được chọn';
+$labels['composeto'] = 'Soạn thư cho';
 $labels['contactsfromto'] = 'Địa chỉ từ $from - $to / $count';
-$labels['print']          = 'In thư';
-$labels['export']         = 'Export';
-
-$labels['previouspage']   = 'Trang trước';
-$labels['nextpage']       = 'Trang tiếp';
-
-// LDAP search
-$labels['ldapsearch'] = 'LDAP directory search';
-
-$labels['ldappublicsearchname']    = 'Tên địa chỉ';
-$labels['ldappublicsearchtype'] = 'Khớp toàn bộ?';
-$labels['ldappublicserverselect'] = 'Chọn máy chủ';
-$labels['ldappublicsearchfield'] = 'Tìm trên';
-$labels['ldappublicsearchform'] = 'Tìm địa chỉ liên hệ';
-$labels['ldappublicsearch'] = 'Tìm kiếm';
-
-// settings
-$labels['settingsfor']  = 'Thiết lập cho';
-
-$labels['preferences']  = 'Tham số';
-$labels['userpreferences']  = 'Tham số người dùng';
-$labels['editpreferences']  = 'Sửa đổi';
-
-$labels['identities']  = 'Người dùng';
-$labels['manageidentities']  = 'Quản trị người dùng';
-$labels['newidentity']  = 'Người dùng mới';
-
-$labels['newitem']  = 'Thêm mới';
-$labels['edititem']  = 'Sửa đổi';
-
-$labels['setdefault']  = 'Thiết lập mặc định';
-$labels['language']  = 'Ngôn ngữ';
-$labels['timezone']  = 'Múi giờ';
-$labels['pagesize']  = 'Số dòng trên trang';
+$labels['print'] = 'In thư';
+$labels['export'] = 'Export';
+$labels['previouspage'] = 'Trang trước';
+$labels['nextpage'] = 'Trang tiếp';
+$labels['settingsfor'] = 'Thiết lập cho';
+$labels['preferences'] = 'Tham số';
+$labels['userpreferences'] = 'Tham số người dùng';
+$labels['editpreferences'] = 'Sửa đổi';
+$labels['identities'] = 'Người dùng';
+$labels['manageidentities'] = 'Quản trị người dùng';
+$labels['newidentity'] = 'Người dùng mới';
+$labels['newitem'] = 'Thêm mới';
+$labels['edititem'] = 'Sửa đổi';
+$labels['preferhtml'] = 'Dùng HTML';
+$labels['htmlmessage'] = 'Thư kiểu HTML';
+$labels['prettydate'] = 'Hiển thị ngày đầy đủ';
+$labels['setdefault'] = 'Thiết lập mặc định';
+$labels['language'] = 'Ngôn ngữ';
+$labels['timezone'] = 'Múi giờ';
+$labels['pagesize'] = 'Số dòng trên trang';
 $labels['signature'] = 'Chữ ký';
-$labels['dstactive']  = 'Giờ mùa hè';
-
-$labels['folder']  = 'Thư mục';
-$labels['folders']  = 'Thư mục';
-$labels['foldername']  = 'Tên thư mục';
-$labels['subscribed']  = 'Cho sử dụng';
-$labels['create']  = 'Tạo';
-$labels['createfolder']  = 'Tạo thư mục mới';
-$labels['managefolders']  = 'Quản trị thư mục';
-
+$labels['dstactive'] = 'Giờ mùa hè';
+$labels['folder'] = 'Thư mục';
+$labels['foldername'] = 'Tên thư mục';
+$labels['subscribed'] = 'Cho sử dụng';
+$labels['create'] = 'Tạo';
+$labels['createfolder'] = 'Tạo thư mục mới';
+$labels['managefolders'] = 'Quản trị thư mục';
 $labels['sortby'] = 'Sắp xếp';
-$labels['sortasc']  = 'Xếp tăng dần';
+$labels['sortasc'] = 'Xếp tăng dần';
 $labels['sortdesc'] = 'Xếp giảm dần';
 
-?>
\ No newline at end of file
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 3e44e2978..71262b3f8 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -1,24 +1,21 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
- | language/vn/messages.inc                                              |
+ | localization/vi_VN/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vinh Bui <bqvinh@buivinh.info>                                |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
-$messages['loginfailed']  = 'Không đăng nhập được';
+$messages['loginfailed'] = 'Không đăng nhập được';
 $messages['cookiesdisabled'] = 'Trình duyệt không hỗ trợ cookies';
 $messages['sessionerror'] = 'Phiên làm việc không hợp lệ hoặc đã hết hạn';
 $messages['imaperror'] = 'Không kết nối được với máy chủ IMAP';
@@ -42,19 +39,18 @@ $messages['sendingfailed'] = 'Không gửi được thư';
 $messages['errorsaving'] = 'Lỗi khi lưu';
 $messages['errormoving'] = 'Không thể chuyển được thư';
 $messages['errordeleting'] = 'Không thể xóa được thư';
-$messages['deletecontactconfirm']  = 'Xóa bỏ các địa chỉ được chọn?';
-$messages['deletefolderconfirm']  = 'Xóa bỏ thư mục này?';
-$messages['purgefolderconfirm']  = 'Xóa toàn bộ thư trong thư mục nào?';
+$messages['deletecontactconfirm'] = 'Xóa bỏ các địa chỉ được chọn?';
+$messages['deletefolderconfirm'] = 'Xóa bỏ thư mục này?';
+$messages['purgefolderconfirm'] = 'Xóa toàn bộ thư trong thư mục nào?';
 $messages['formincomplete'] = 'Mẫu chưa được điền xong';
 $messages['noemailwarning'] = 'Nhập địa chỉ email';
-$messages['nonamewarning']  = 'Nhập tên';
+$messages['nonamewarning'] = 'Nhập tên';
 $messages['nopagesizewarning'] = 'Nhập kích cỡ của trang';
 $messages['norecipientwarning'] = 'Thư cần có it nhất 1 người nhận';
-$messages['nosubjectwarning']  = 'Mục "Tiêu đề" chưa có. Điền tiêu đề ?';
+$messages['nosubjectwarning'] = 'Mục "Tiêu đề" chưa có. Điền tiêu đề ?';
 $messages['nobodywarning'] = 'Thư không nội dung, vẫn tiếp tục gửi?';
 $messages['notsentwarning'] = 'Thư chưa được gửi. Bỏ qua thư đang soạn?';
 $messages['noldapserver'] = 'Chọn máy chủ ldap server để tìm';
-$messages['nocontactsreturned'] = 'Không tìm thấy địa chỉ';
 $messages['nosearchname'] = 'Nhập địa chỉ hoặc email';
 $messages['searchsuccessful'] = '$nr messages found';
 $messages['searchnomatch'] = 'Không tìm thấy';
@@ -63,4 +59,3 @@ $messages['checking'] = 'Kiểm tra...';
 $messages['nospellerrors'] = 'Không có lỗi chính tả';
 $messages['folderdeleted'] = 'Thư mục đã được xóa';
 
-?>
\ No newline at end of file
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index ce58faff9..7c96ddec6 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -1,47 +1,34 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| localization/zh_CN/labels.inc                                         |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Xue zhong sheng <xue.zhongsheng@gmail.com>                    |
-|         Zhang Huang bin <michaelbibby@gmail.com>                      |
-|         Kelphon Tang <kelphon@kingstor.com>	                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/zh_CN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
-
-// login page
 $labels['welcome'] = '欢迎使用 $product';
 $labels['username'] = '用户名';
 $labels['password'] = '密码';
 $labels['server'] = '服务器';
 $labels['login'] = '登录';
-
-// taskbar
 $labels['logout'] = '注销';
 $labels['mail'] = '邮件';
 $labels['settings'] = '设置';
 $labels['addressbook'] = '通讯录';
-
-// mailbox names
 $labels['inbox'] = '收件箱';
 $labels['drafts'] = '草稿箱';
 $labels['sent'] = '已发送邮件';
 $labels['trash'] = '回收站';
 $labels['junk'] = '垃圾邮件';
-
-// message listing
 $labels['subject'] = '主题';
 $labels['from'] = '发件人';
 $labels['to'] = '收件人';
@@ -52,25 +39,20 @@ $labels['followupto'] = '投递组';
 $labels['date'] = '日期';
 $labels['size'] = '大小';
 $labels['priority'] = '优先级';
-$labels['organization'] = '组织';
-$labels['reply-to'] = '回复至';
-
-$labels['mailboxlist'] = '邮件夹';
+$labels['organization'] = '公司';
+$labels['readstatus'] = '阅读状态';
+$labels['mailboxlist'] = '目录管理';
+$labels['folders'] = '目录管理';
 $labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
 $labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
 $labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
-
 $labels['copy'] = '复制';
 $labels['move'] = '移动';
 $labels['moveto'] = '移动到';
 $labels['download'] = '下载';
-
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
-
 $labels['addtoaddressbook'] = '添加到通讯录';
-
-// weekdays short
 $labels['sun'] = '周日';
 $labels['mon'] = '周一';
 $labels['tue'] = '周二';
@@ -78,8 +60,6 @@ $labels['wed'] = '周三';
 $labels['thu'] = '周四';
 $labels['fri'] = '周五';
 $labels['sat'] = '周六';
-
-// weekdays long
 $labels['sunday'] = '星期日';
 $labels['monday'] = '星期一';
 $labels['tuesday'] = '星期二';
@@ -87,13 +67,12 @@ $labels['wednesday'] = '星期三';
 $labels['thursday'] = '星期四';
 $labels['friday'] = '星期五';
 $labels['saturday'] = '星期六';
-
-// months short
 $labels['jan'] = '一月';
 $labels['feb'] = '二月';
 $labels['mar'] = '三月';
 $labels['apr'] = '四月';
 $labels['may'] = '五月';
+$labels['longmay'] = '五月';
 $labels['jun'] = '六月';
 $labels['jul'] = '七月';
 $labels['aug'] = '八月';
@@ -101,13 +80,10 @@ $labels['sep'] = '九月';
 $labels['oct'] = '十月';
 $labels['nov'] = '十一月';
 $labels['dec'] = '十二月';
-
-// months long
 $labels['longjan'] = '一月';
 $labels['longfeb'] = '二月';
 $labels['longmar'] = '三月';
 $labels['longapr'] = '四月';
-$labels['longmay'] = '五月';
 $labels['longjun'] = '六月';
 $labels['longjul'] = '七月';
 $labels['longaug'] = '八月';
@@ -115,17 +91,14 @@ $labels['longsep'] = '九月';
 $labels['longoct'] = '十月';
 $labels['longnov'] = '十一月';
 $labels['longdec'] = '十二月';
-
 $labels['today'] = '今日';
-
-// toolbar buttons
-$labels['checkmail']        = '收取新邮件';
+$labels['checkmail'] = '收取新邮件';
 $labels['writenewmessage'] = '写新邮件';
 $labels['replytomessage'] = '回复发件人';
 $labels['replytoallmessage'] = '回复所有';
-$labels['replyall']         = '回复全部';
-$labels['replylist']        = '回复列表';
-$labels['forwardinline']    = '直接转发';
+$labels['replyall'] = '回复全部';
+$labels['replylist'] = '回复列表';
+$labels['forwardinline'] = '直接转发';
 $labels['forwardattachment'] = '以附件转发';
 $labels['forwardmessage'] = '转发邮件';
 $labels['deletemessage'] = '删除邮件';
@@ -142,11 +115,11 @@ $labels['markread'] = '已读';
 $labels['markunread'] = '未读';
 $labels['markflagged'] = '已标记';
 $labels['markunflagged'] = '未标记';
-$labels['messageactions'] = '更多操作...';
-
+$labels['moreactions'] = '更多动作...';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
+$labels['nonesort'] = '无';
 $labels['currpage'] = '当前页';
 $labels['unread'] = '未读';
 $labels['flagged'] = '已标记';
@@ -154,21 +127,18 @@ $labels['unanswered'] = '未回复';
 $labels['deleted'] = '删除';
 $labels['invert'] = '反选';
 $labels['filter'] = '过滤';
-
 $labels['list'] = '列表';
 $labels['threads'] = '主题';
 $labels['expand-all'] = '展开全部';
 $labels['expand-unread'] = '展开未读';
 $labels['collapse-all'] = '收合全部';
 $labels['threaded'] = '线索';
-
 $labels['autoexpand_threads'] = '展开消息主题';
 $labels['do_expand'] = '所有主题';
 $labels['expand_only_unread'] = '仅未读消息';
 $labels['fromto'] = '发件人/收件人';
 $labels['flag'] = '标志';
 $labels['attachment'] = '附件';
-$labels['nonesort'] = '无';
 $labels['sentdate'] = '发送日期';
 $labels['arrival'] = '到达日期';
 $labels['asc'] = '升序';
@@ -177,25 +147,19 @@ $labels['listcolumns'] = '列表列';
 $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
-
 $labels['folderactions'] = '目录操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
-
 $labels['quota'] = '邮箱容量';
 $labels['unknown'] = '未知';
 $labels['unlimited'] = '无限制';
-
 $labels['quicksearch'] = '快速查找';
 $labels['resetsearch'] = '清空查找内容';
 $labels['searchmod'] = '搜寻模式';
 $labels['msgtext'] = '整个邮件';
-
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载（.eml）';
-
-// message compose
-$labels['compose']        = '写新邮件';
+$labels['compose'] = '写新邮件';
 $labels['editasnew'] = '编辑为新邮件';
 $labels['savemessage'] = '保存为草稿';
 $labels['sendmessage'] = '立即发送';
@@ -203,105 +167,93 @@ $labels['addattachment'] = '添加附件';
 $labels['charset'] = '字符集';
 $labels['editortype'] = '编辑器类型';
 $labels['returnreceipt'] = '邮件回执';
-$labels['dsn']            = '投递状态提示';
+$labels['dsn'] = '投递状态提示';
 $labels['mailreplyintro'] = '于 $date, $sender 回复:';
-
-$labels['editidents']    = '编辑身份';
+$labels['originalmessage'] = '原始信件';
+$labels['editidents'] = '编辑身份';
 $labels['checkspelling'] = '拼写检查';
 $labels['resumeediting'] = '重新编辑';
 $labels['revertto'] = '恢复至';
-
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close'] = '关闭';
-$labels['messageoptions']  = '邮件选项...';
-
+$labels['messageoptions'] = '邮件选项...';
 $labels['low'] = '低';
 $labels['lowest'] = '最低';
 $labels['normal'] = '普通';
 $labels['high'] = '高';
 $labels['highest'] = '最高';
-
 $labels['nosubject'] = '（无主题）';
 $labels['showimages'] = '显示图片';
 $labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
-
+$labels['isdraft'] = '这是邮件草稿';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '纯文本';
 $labels['savesentmessagein'] = '将已发送邮件保存到';
 $labels['dontsave'] = '不保存';
 $labels['maxuploadsize'] = '允许的最大文件大小是 $size';
-
 $labels['addcc'] = '添加抄送';
 $labels['addbcc'] = '添加密送';
 $labels['addreplyto'] = '添加回复';
 $labels['addfollowupto'] = '添加投递组';
-
-// mdn
 $labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送通知。您是否希望通知发件人？';
 $labels['receiptread'] = '发送回执（已读）';
 $labels['yourmessage'] = '这是您的邮件回执';
 $labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或已理解邮件的内容。';
-
-// address boook
 $labels['name'] = '显示名称';
 $labels['firstname'] = '名字';
 $labels['surname'] = '姓氏';
-$labels['middlename']   = '中名';
-$labels['nameprefix']   = '前缀';
-$labels['namesuffix']   = '后缀';
-$labels['nickname']     = '昵称';
-$labels['jobtitle']     = '职位';
-$labels['organization'] = '公司';
-$labels['department']   = '部门';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = '娘家姓';
-$labels['email']        = 'Email';
-$labels['phone']        = '电话';
-$labels['address']      = '地址';
-$labels['street']       = '街道';
-$labels['locality']     = '城市';
-$labels['zipcode']      = '邮编';
-$labels['region']       = '省份';
-$labels['country']      = '国家';
-$labels['birthday']     = '生日';
-$labels['anniversary']  = '纪念日';
-$labels['website']      = '主页';
+$labels['middlename'] = '中名';
+$labels['nameprefix'] = '前缀';
+$labels['namesuffix'] = '后缀';
+$labels['nickname'] = '昵称';
+$labels['jobtitle'] = '职位';
+$labels['department'] = '部门';
+$labels['gender'] = 'Gender';
+$labels['maidenname'] = '娘家姓';
+$labels['email'] = 'Email';
+$labels['phone'] = '电话';
+$labels['address'] = '地址';
+$labels['street'] = '街道';
+$labels['locality'] = '城市';
+$labels['zipcode'] = '邮编';
+$labels['region'] = '省份';
+$labels['country'] = '国家';
+$labels['birthday'] = '生日';
+$labels['anniversary'] = '纪念日';
+$labels['website'] = '主页';
 $labels['instantmessenger'] = 'QQ';
 $labels['notes'] = '备注';
-$labels['male']   = '男';
+$labels['male'] = '男';
 $labels['female'] = '女';
 $labels['manager'] = '经理';
 $labels['assistant'] = '助理';
+$labels['typeassistant'] = '助理';
 $labels['spouse'] = '配偶';
 $labels['allfields'] = '所有项目';
 $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
 $labels['other'] = '其他';
-
-$labels['typehome']   = '家庭';
-$labels['typework']   = '工作';
-$labels['typeother']  = '其他';
-$labels['typemobile']  = '手机';
-$labels['typemain']  = '主';
-$labels['typehomefax']  = '家庭传真';
-$labels['typeworkfax']  = '工作传真';
-$labels['typecar']  = '车牌';
-$labels['typepager']  = '呼机';
-$labels['typevideo']  = '视频';
-$labels['typeassistant']  = '助理';
-$labels['typehomepage']  = '主页';
+$labels['typeother'] = '其他';
+$labels['typehome'] = '家庭';
+$labels['typework'] = '工作';
+$labels['typemobile'] = '手机';
+$labels['typemain'] = '主';
+$labels['typehomefax'] = '家庭传真';
+$labels['typeworkfax'] = '工作传真';
+$labels['typecar'] = '车牌';
+$labels['typepager'] = '呼机';
+$labels['typevideo'] = '视频';
+$labels['typehomepage'] = '主页';
 $labels['typeblog'] = '博客';
 $labels['typeprofile'] = '资历';
-
 $labels['addfield'] = '增加项..';
 $labels['addcontact'] = '添加联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
 $labels['personalinfo'] = '个人信息';
-
 $labels['edit'] = '编辑';
 $labels['cancel'] = '取消';
 $labels['save'] = '保存';
@@ -309,7 +261,6 @@ $labels['delete'] = '删除';
 $labels['rename'] = '更名';
 $labels['addphoto'] = '上传';
 $labels['replacephoto'] = '覆盖';
-
 $labels['newcontact'] = '新建联系人';
 $labels['deletecontact'] = '删除选中的联系人';
 $labels['composeto'] = '写信给';
@@ -318,19 +269,17 @@ $labels['print'] = '打印';
 $labels['export'] = '导出';
 $labels['exportvcards'] = '以 vCard 格式导出联系人';
 $labels['newcontactgroup'] = '创建新的组';
-$labels['groupactions'] = '组操作...';
-$labels['grouprename']    = '重命名组';
-$labels['groupdelete']    = '删除组';
-
+$labels['grouprename'] = '重命名组';
+$labels['groupdelete'] = '删除组';
 $labels['previouspage'] = '上一页';
 $labels['firstpage'] = '第一页';
 $labels['nextpage'] = '下一页';
 $labels['lastpage'] = '最后一页';
-
 $labels['group'] = '分组';
 $labels['groups'] = '分组';
 $labels['personaladrbook'] = '个人通讯录';
-
+$labels['searchsave'] = '保存搜索';
+$labels['searchdelete'] = '删除搜索';
 $labels['import'] = '导入';
 $labels['importcontacts'] = '导入联系人';
 $labels['importfromfile'] = '从文件导入';
@@ -338,24 +287,21 @@ $labels['importtarget'] = '增加新联系人到通讯录:';
 $labels['importreplace'] = '替换整个地址簿';
 $labels['importtext'] = '你可以从已有的地址簿导入联系人。目前支持从 vCard 数据格式导入地址簿。';
 $labels['done'] = '完成';
-
-// settings
 $labels['settingsfor'] = '设置';
-
+$labels['about'] = '关于';
 $labels['preferences'] = '偏好设置';
 $labels['userpreferences'] = '个人偏好';
 $labels['editpreferences'] = '修改个人偏好';
-
 $labels['identities'] = '发件身份';
 $labels['manageidentities'] = '管理此账号的身份';
 $labels['newidentity'] = '添加身份';
-
 $labels['newitem'] = '添加条目';
 $labels['edititem'] = '编辑条目';
-
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
+$labels['dateformat'] = '日期格式';
+$labels['timeformat'] = '时间格式';
 $labels['prettydate'] = '短日期格式';
 $labels['setdefault'] = '设为默认';
 $labels['autodetect'] = '自动';
@@ -404,11 +350,11 @@ $labels['advancedoptions'] = '高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
 $labels['displaynext'] = '当邮件删掉/移动后显示下一封邮件';
+$labels['defaultfont'] = '默认的HTML格式字体';
 $labels['mainoptions'] = '主要选项';
 $labels['section'] = '项目';
 $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
-$labels['listoptions'] = '列表选项';
 $labels['signatureoptions'] = '签名选项';
 $labels['whenreplying'] = '当回复时';
 $labels['replytopposting'] = '在原文上面开始新邮件';
@@ -427,10 +373,14 @@ $labels['reqmdn'] = '总是要求回执';
 $labels['reqdsn'] = '总是要求投递状态通知';
 $labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
 $labels['defaultaddressbook'] = '增加联系人到所选通讯录';
+$labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
 $labels['spellcheckbeforesend'] = '发邮件前进行拼写检查';
-
+$labels['spellcheckoptions'] = '拼写检查选项';
+$labels['spellcheckignoresyms'] = '忽略带符号的单词';
+$labels['spellcheckignorenums'] = '忽略带数字的单词';
+$labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
+$labels['addtodict'] = '添加到字典中';
 $labels['folder'] = '目录管理';
-$labels['folders'] = '目录管理';
 $labels['foldername'] = '邮件夹名称';
 $labels['subscribed'] = '已订阅';
 $labels['messagecount'] = '邮件数量';
@@ -446,22 +396,22 @@ $labels['info'] = '信息';
 $labels['getfoldersize'] = '获得文件夹容量';
 $labels['changesubscription'] = '更改订阅';
 $labels['foldertype'] = '目录类型';
-$labels['personalfolder']  = '私有目录';
-$labels['otherfolder']  = '他人目录';
-$labels['sharedfolder']  = '共享目录';
-
+$labels['personalfolder'] = '私有目录';
+$labels['otherfolder'] = '他人目录';
+$labels['sharedfolder'] = '共享目录';
 $labels['sortby'] = '排序';
 $labels['sortasc'] = '递增排序';
 $labels['sortdesc'] = '递减排序';
 $labels['undo'] = '撤销';
-
-// units
+$labels['plugin'] = '插件';
+$labels['version'] = '版本';
+$labels['source'] = '源';
+$labels['license'] = '许可协议';
+$labels['support'] = '获取支持';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
-
-// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = '英语';
 $labels['westerneuropean'] = '西欧';
@@ -481,4 +431,3 @@ $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
 $labels['chinese'] = '中文';
 
-?>
\ No newline at end of file
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 994105ebd..decbef596 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| localization/zh_CN/messages.inc                                       |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Xue zhong sheng <xue.zhongsheng@gmail.com>                    |
-|         Zhang Huang bin <michaelbibby@gmail.com>                      |
-|         Kelphon Tang <kelphon@kingstor.com>	                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/zh_CN/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -26,7 +21,7 @@ $messages['sessionerror'] = '会话已过期';
 $messages['imaperror'] = '连接到邮件服务器失败';
 $messages['servererror'] = '服务器错误！';
 $messages['servererrormsg'] = '服务器错误: $msg';
-$messages['databaserror'] = '数据库错误!';
+$messages['dberror'] = '数据库错误！';
 $messages['errorreadonly'] = '不可对只读文件夹进行操作';
 $messages['errornoperm'] = '无权限操作';
 $messages['invalidrequest'] = '无效的请求！数据保存失败。';
@@ -50,6 +45,7 @@ $messages['blockedimages'] = '为保护隐私，此邮件中的远程图片未�
 $messages['encryptedmessage'] = '因此邮件已加密，无法正常显示';
 $messages['nocontactsfound'] = '未找到联系人';
 $messages['contactnotfound'] = '未找到指定的联系人';
+$messages['contactsearchonly'] = '请输入联系人的搜索条件';
 $messages['sendingfailed'] = '发送失败';
 $messages['senttooquickly'] = '您需要等待 $sec 秒才能发送邮件';
 $messages['errorsavingsent'] = '保存已发送邮件时出现错误';
@@ -59,10 +55,11 @@ $messages['errorcopying'] = '无法复制邮件';
 $messages['errordeleting'] = '无法删除邮件';
 $messages['errormarking'] = '无法标记邮件';
 $messages['deletecontactconfirm'] = '确定要删除已选中的联系人？';
-$messages['deletegroupconfirm']  = '确定要删除以选中的组?';
+$messages['deletegroupconfirm'] = '确定要删除以选中的组?';
 $messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
 $messages['deletefolderconfirm'] = '确定要删除已选中的邮件夹？';
 $messages['purgefolderconfirm'] = '是否确认要删除当前邮件夹中的所有邮件？';
+$messages['contactdeleting'] = '正在删除联系人';
 $messages['groupdeleting'] = '正在删除组...';
 $messages['folderdeleting'] = '正在删除邮件夹';
 $messages['foldermoving'] = '正在移动目录...';
@@ -78,10 +75,10 @@ $messages['nosubjectwarning'] = '主题为空。您要输入一个主题吗？';
 $messages['nobodywarning'] = '要发送无正文的邮件吗？';
 $messages['notsentwarning'] = '邮件未发送。您确定要离开并废弃当前邮件吗？';
 $messages['noldapserver'] = '请选择一个LDAP服务器进行查找';
-$messages['nocontactsreturned'] = '未找到联系人';
 $messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址';
 $messages['notuploadedwarning'] = '附件还没有全部上传，请等待或者取消上传。';
 $messages['searchsuccessful'] = '共找到 $nr 封邮件';
+$messages['contactsearchsuccessful'] = '$nr 找到联系人';
 $messages['searchnomatch'] = '未找到任何符合条件的邮件';
 $messages['searching'] = '正在查找...';
 $messages['checking'] = '正在检查...';
@@ -128,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败';
 $messages['smtpfromerror'] = 'SMTP 错误 ($code):添加发件人失败 "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP 错误 ($code): 添加收件人失败 "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP 错误: 无法解析收件人列表';
-$messages['smtpdsnerror'] = 'SMTP 错误: 不支持邮件送达通知';
 $messages['smtperror'] = 'SMTP 错误: $msg';
 $messages['emailformaterror'] = '无效的邮件地址：$email';
 $messages['toomanyrecipients'] = '邮件人太多，请减少收件人数量至 $max.';
@@ -141,11 +137,16 @@ $messages['contactrestored'] = '联系人恢复成功.';
 $messages['groupdeleted'] = '成功删除组';
 $messages['grouprenamed'] = '组改名成功';
 $messages['groupcreated'] = '成功创建组';
+$messages['savedsearchdeleted'] = '成功删除保存的搜索';
+$messages['savedsearchdeleteerror'] = '无法删除保存的搜索';
+$messages['savedsearchcreated'] = '成功建立保存的搜索';
+$messages['savedsearchcreateerror'] = '无法创建保存的搜索';
 $messages['messagedeleted'] = '删除邮件成功';
 $messages['messagemoved'] = '转移邮件成功';
 $messages['messagecopied'] = '复制邮件成功';
 $messages['messagemarked'] = '标记邮件成功';
 $messages['autocompletechars'] = '至少需要输入 $min 个字符';
+$messages['autocompletemore'] = '找到太多的结果。请输入更多字符。';
 $messages['namecannotbeempty'] = '必须输入名字';
 $messages['nametoolong'] = '名字太长';
 $messages['folderupdated'] = '成功更新文件夹';
@@ -153,4 +154,5 @@ $messages['foldercreated'] = '成功创建文件夹';
 $messages['invalidimageformat'] = '非法的图像类型.';
 $messages['mispellingsfound'] = '检查到拼写错误.';
 $messages['parentnotwritable'] = '无法创建和转移到所选的目录,权限不足.';
-?>
+$messages['messagetoobig'] = '对邮件信息太大的部份进行处理';
+
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 1d3a54ddb..3a089bbc3 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| localization/zh_TW/labels.inc                                         |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: WayneSan <waynesan@zerozone.tw>                               |
-|         kourge <kourge@gmail.com>                                     |
-|         Ting-Hung Chiu <earrl@mmlab.cse.yzu.edu.tw>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,6 +42,7 @@ $labels['priority'] = '優先順序';
 $labels['organization'] = '組織';
 $labels['readstatus'] = '讀信狀態';
 $labels['mailboxlist'] = '資料夾';
+$labels['folders'] = '資料夾';
 $labels['messagesfromto'] = '郵件 $from 至 $to，共有 $count 封郵件';
 $labels['threadsfromto'] = '郵件串 $from 至 $to，共有 $count 個';
 $labels['messagenrof'] = '第 $nr 封郵件，共有 $count 封';
@@ -75,7 +71,8 @@ $labels['jan'] = '一';
 $labels['feb'] = '二';
 $labels['mar'] = '三';
 $labels['apr'] = '四';
-$labels['may'] = '五';
+$labels['may'] = '五月';
+$labels['longmay'] = '五月';
 $labels['jun'] = '六';
 $labels['jul'] = '七';
 $labels['aug'] = '八';
@@ -87,7 +84,6 @@ $labels['longjan'] = '一月';
 $labels['longfeb'] = '二月';
 $labels['longmar'] = '三月';
 $labels['longapr'] = '四月';
-$labels['longmay'] = '五月';
 $labels['longjun'] = '六月';
 $labels['longjul'] = '七月';
 $labels['longaug'] = '八月';
@@ -102,6 +98,8 @@ $labels['replytomessage'] = '回覆';
 $labels['replytoallmessage'] = '全部回覆';
 $labels['replyall'] = '全部回覆';
 $labels['replylist'] = '清單回覆';
+$labels['forwardinline'] = '轉寄';
+$labels['forwardattachment'] = '以附件方式轉寄';
 $labels['forwardmessage'] = '轉寄';
 $labels['deletemessage'] = '刪除郵件';
 $labels['movemessagetotrash'] = '移動郵件至垃圾桶';
@@ -117,10 +115,11 @@ $labels['markread'] = '標示為已讀取';
 $labels['markunread'] = '標示為未讀取';
 $labels['markflagged'] = '標上旗標';
 $labels['markunflagged'] = '移除旗標';
-$labels['messageactions'] = '更多動作…';
+$labels['moreactions'] = '資料夾動做...';
 $labels['select'] = '選取';
 $labels['all'] = '全部郵件';
 $labels['none'] = '無';
+$labels['nonesort'] = '無';
 $labels['currpage'] = '目前頁面';
 $labels['unread'] = '未讀取的郵件';
 $labels['flagged'] = '已加標記的郵件';
@@ -140,7 +139,6 @@ $labels['expand_only_unread'] = '只展開未讀訊息';
 $labels['fromto'] = '寄件者/收件者';
 $labels['flag'] = '旗標';
 $labels['attachment'] = '附件';
-$labels['nonesort'] = '無';
 $labels['sentdate'] = '寄送時間';
 $labels['arrival'] = '到達時間';
 $labels['asc'] = '遞增';
@@ -170,6 +168,8 @@ $labels['charset'] = '郵件編碼';
 $labels['editortype'] = '編輯器類型';
 $labels['returnreceipt'] = '要求讀取回條';
 $labels['dsn'] = '傳送狀態通知';
+$labels['mailreplyintro'] = '$sender 於 $data 寫到:';
+$labels['originalmessage'] = '郵件顯示設定';
 $labels['editidents'] = '編輯身份資訊';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
@@ -186,6 +186,7 @@ $labels['highest'] = '最高';
 $labels['nosubject'] = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
+$labels['isdraft'] = '這是一封草稿';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '純文字';
 $labels['savesentmessagein'] = '儲存寄件備份至';
@@ -227,10 +228,15 @@ $labels['male'] = '男';
 $labels['female'] = '女';
 $labels['manager'] = '經理';
 $labels['assistant'] = '助理';
+$labels['typeassistant'] = '助理';
 $labels['spouse'] = '配偶';
+$labels['allfields'] = '所有欄位';
+$labels['search'] = '搜尋';
+$labels['advsearch'] = '進階搜尋';
+$labels['other'] = '其他';
+$labels['typeother'] = '其他';
 $labels['typehome'] = '住家';
 $labels['typework'] = '工作';
-$labels['typeother'] = '其他';
 $labels['typemobile'] = '行動電話';
 $labels['typemain'] = '主要';
 $labels['typehomefax'] = '住家傳真';
@@ -238,7 +244,9 @@ $labels['typeworkfax'] = '工作傳真';
 $labels['typecar'] = '汽車';
 $labels['typepager'] = '傳呼機';
 $labels['typevideo'] = '影片';
-$labels['typeassistant'] = '助理';
+$labels['typehomepage'] = '首頁';
+$labels['typeblog'] = '部落格';
+$labels['typeprofile'] = '設定檔';
 $labels['addfield'] = '新增欄位...';
 $labels['addcontact'] = '新增聯絡人';
 $labels['editcontact'] = '編輯聯絡人';
@@ -260,7 +268,8 @@ $labels['print'] = '列印';
 $labels['export'] = '匯出通訊錄';
 $labels['exportvcards'] = '匯出通訊錄為 vCard 格式';
 $labels['newcontactgroup'] = '新增聯絡人群組';
-$labels['groupactions'] = '聯絡人群組的動作';
+$labels['grouprename'] = '重新命名群組';
+$labels['groupdelete'] = '刪除群組';
 $labels['previouspage'] = '顯示上一頁';
 $labels['firstpage'] = '顯示第一頁';
 $labels['nextpage'] = '顯示下一頁';
@@ -268,13 +277,17 @@ $labels['lastpage'] = '顯示最後一頁';
 $labels['group'] = '群組';
 $labels['groups'] = '群組';
 $labels['personaladrbook'] = '個人住址';
+$labels['searchsave'] = '儲存搜尋結果';
+$labels['searchdelete'] = '刪除搜尋結果';
 $labels['import'] = '匯入通訊錄';
 $labels['importcontacts'] = '由檔案匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
+$labels['importtarget'] = '新增連絡人至通訊錄:';
 $labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
 $labels['importtext'] = '你可以由已存在的通訊錄上傳資料，<br/>目前系統僅支援匯入 <a href="http://zh.wikipedia.org/wiki/VCard" target="_blank">vCard</a> 格式的資料。';
 $labels['done'] = '完成';
 $labels['settingsfor'] = '設定';
+$labels['about'] = '關於';
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = '個人設定';
 $labels['editpreferences'] = '編輯個人設定';
@@ -286,6 +299,8 @@ $labels['edititem'] = '編輯項目';
 $labels['preferhtml'] = '使用 HTML 顯示';
 $labels['defaultcharset'] = '預設編碼';
 $labels['htmlmessage'] = 'HTML 郵件';
+$labels['dateformat'] = '日期格式';
+$labels['timeformat'] = '時間格式';
 $labels['prettydate'] = '簡短日期顯示';
 $labels['setdefault'] = '設成預設i值';
 $labels['autodetect'] = '自動選擇';
@@ -334,11 +349,11 @@ $labels['advancedoptions'] = '顯示進階設定選項';
 $labels['focusonnewmessage'] = '收到新郵件時使瀏覽器獲得焦點';
 $labels['checkallfolders'] = '檢查所有資料夾中的新郵件';
 $labels['displaynext'] = '郵件刪除／移動時顯示下一個郵件';
+$labels['defaultfont'] = 'HTML格式預設字型';
 $labels['mainoptions'] = '主要選項';
 $labels['section'] = '分類';
 $labels['maintenance'] = '管理';
 $labels['newmessage'] = '新郵件';
-$labels['listoptions'] = '排列選項';
 $labels['signatureoptions'] = '簽名檔選項';
 $labels['whenreplying'] = '回覆時';
 $labels['replytopposting'] = '在原來的上方開始新訊息';
@@ -356,8 +371,10 @@ $labels['afternseconds'] = '$n 秒之後';
 $labels['reqmdn'] = '永遠索取讀取回條';
 $labels['reqdsn'] = '總是要求傳送狀態通知';
 $labels['replysamefolder'] = '將回覆與回覆信件放置於相同資料夾';
+$labels['defaultaddressbook'] = '新增連絡人至指定通訊錄';
+$labels['spellcheckbeforesend'] = '寄送前執行拼字檢查';
+$labels['spellcheckoptions'] = '拼字檢查選項';
 $labels['folder'] = '資料夾';
-$labels['folders'] = '資料夾';
 $labels['foldername'] = '資料夾名稱';
 $labels['subscribed'] = '顯示';
 $labels['messagecount'] = '郵件數目';
@@ -379,6 +396,12 @@ $labels['sharedfolder'] = '公用資料夾';
 $labels['sortby'] = '排序';
 $labels['sortasc'] = '遞增排序';
 $labels['sortdesc'] = '遞減排序';
+$labels['undo'] = '復原';
+$labels['plugin'] = '擴充套件';
+$labels['version'] = '版本';
+$labels['source'] = '來源';
+$labels['license'] = '授權許可';
+$labels['support'] = '取得支援';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -402,4 +425,3 @@ $labels['japanese'] = '日本';
 $labels['korean'] = '韓國';
 $labels['chinese'] = '國語';
 
-?>
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 2d902c69a..a6610c436 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| localization/zh_TW/messages.inc                                       |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: WayneSan <waynesan@zerozone.tw>                               |
-|         kourge <kourge@gmail.com>                                     |
-|         Ting-Hung Chiu <earrl@mmlab.cse.yzu.edu.tw>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -26,6 +21,7 @@ $messages['sessionerror'] = '你的工作階段已失效或過期';
 $messages['imaperror'] = '連線到 IMAP 伺服器失敗';
 $messages['servererror'] = '伺服器錯誤！';
 $messages['servererrormsg'] = '伺服器錯誤：$msg';
+$messages['dberror'] = '資料庫錯誤!';
 $messages['errorreadonly'] = '動作無法完成。資料夾唯讀';
 $messages['errornoperm'] = '動作無法完成。權限不符';
 $messages['invalidrequest'] = '要求無效！未儲存任何資料。';
@@ -34,6 +30,7 @@ $messages['loggedout'] = '你已成功地登出並結束工作階段了。再見
 $messages['mailboxempty'] = '郵件匣是空的';
 $messages['loading'] = '載入中...';
 $messages['uploading'] = '上傳檔案中…';
+$messages['uploadingmany'] = '檔案上載中...';
 $messages['loadingdata'] = '載入資料中...';
 $messages['checkingmail'] = '檢查新郵件...';
 $messages['sendingmessage'] = '寄出郵件中...';
@@ -43,10 +40,12 @@ $messages['messagesaved'] = '訊息已經存至';
 $messages['successfullysaved'] = '儲存成功';
 $messages['addedsuccessfully'] = '聯絡人已經成功地新增至通訊錄';
 $messages['contactexists'] = '此聯絡人的電子郵件位址已存在';
+$messages['contactnameexists'] = '已存在相同名稱的連絡人';
 $messages['blockedimages'] = '為了保護你的隱私，此郵件中的遠端圖片已經被阻擋。';
 $messages['encryptedmessage'] = '此郵件經過加密，因此無法顯示。抱歉！';
 $messages['nocontactsfound'] = '沒有找到任何聯絡人';
 $messages['contactnotfound'] = '找不到要求的聯絡人';
+$messages['contactsearchonly'] = '輸入關鍵字找尋連絡人';
 $messages['sendingfailed'] = '郵件寄出失敗';
 $messages['senttooquickly'] = '你寄出的郵件太過於頻繁，請稍候 $sec 秒後再試一次。';
 $messages['errorsavingsent'] = '儲存寄件備份時發生錯誤';
@@ -56,9 +55,12 @@ $messages['errorcopying'] = '無法訊息';
 $messages['errordeleting'] = '無法刪除此郵件';
 $messages['errormarking'] = '無法標上旗標';
 $messages['deletecontactconfirm'] = '你確定要刪除已選擇的聯絡人？';
+$messages['deletegroupconfirm'] = '您確定要刪除選擇的群組嗎?';
 $messages['deletemessagesconfirm'] = '你確定要刪除已選擇的郵件？';
 $messages['deletefolderconfirm'] = '你確定要刪除這個資料夾嗎？';
 $messages['purgefolderconfirm'] = '你確定要刪除這個資料夾裡面所有的郵件嗎？';
+$messages['contactdeleting'] = '刪除連絡人...';
+$messages['groupdeleting'] = '刪除存組...';
 $messages['folderdeleting'] = '刪除資料夾中...';
 $messages['foldermoving'] = '移動資料夾中...';
 $messages['foldersubscribing'] = '訂閱資料夾...';
@@ -73,10 +75,10 @@ $messages['nosubjectwarning'] = '「主旨」欄是空的。你要輸入一個�
 $messages['nobodywarning'] = '要傳送沒有內文的郵件嗎？';
 $messages['notsentwarning'] = '郵件尚未寄出。你確定要離開並且捨棄此郵件？';
 $messages['noldapserver'] = '請選擇一個 LDAP 伺服器進行搜尋';
-$messages['nocontactsreturned'] = '沒有找到任何聯絡人';
 $messages['nosearchname'] = '請輸入一個聯絡人姓名或電子郵件位址';
 $messages['notuploadedwarning'] = '尚有附加檔案未上傳完畢，請等待或取消上傳';
 $messages['searchsuccessful'] = '共找到 $nr 封郵件';
+$messages['contactsearchsuccessful'] = '找到連絡人 $nr';
 $messages['searchnomatch'] = '找不到任何符合的郵件';
 $messages['searching'] = '搜尋中...';
 $messages['checking'] = '檢查中...';
@@ -97,8 +99,11 @@ $messages['sourceisreadonly'] = '此來源位址是唯讀的';
 $messages['errorsavingcontact'] = '無法儲存連絡人的位址';
 $messages['movingmessage'] = '移動郵件中...';
 $messages['copyingmessage'] = '複製訊息...';
+$messages['copyingcontact'] = '複製群組...';
 $messages['deletingmessage'] = '刪除訊息...';
 $messages['markingmessage'] = '標示訊息...';
+$messages['addingmember'] = '新增連絡人至群組';
+$messages['removingmember'] = '從群組刪除連絡人';
 $messages['receiptsent'] = '閱讀回條傳送成功';
 $messages['errorsendingreceipt'] = '無法傳送回條';
 $messages['nodeletelastidentity'] = '你不能刪除此身份，因為只剩一個身份。';
@@ -120,7 +125,6 @@ $messages['smtpautherror'] = 'SMTP 錯誤（$code）：認證失敗';
 $messages['smtpfromerror'] = 'SMTP 錯誤（$code）：無法設寄建者「$from」（$msg）';
 $messages['smtptoerror'] = 'SMTP 錯誤（$code）：無法加收件者「$to」（$msg）';
 $messages['smtprecipientserror'] = 'SMTP 錯誤：無法分析收件者';
-$messages['smtpdsnerror'] = 'SMTP 錯誤：不支援傳送狀態通知';
 $messages['smtperror'] = 'SMTP 錯誤：$msg';
 $messages['emailformaterror'] = '錯誤電子郵件：$email';
 $messages['toomanyrecipients'] = '太多收件人。請減少至 $max 人';
@@ -128,18 +132,25 @@ $messages['maxgroupmembersreached'] = '太多群組成員，超過最大人數 $
 $messages['internalerror'] = '內部發生錯誤。請再次嘗試';
 $messages['contactdelerror'] = '無法刪除聯絡人';
 $messages['contactdeleted'] = '聯絡人成功刪除';
+$messages['contactrestoreerror'] = '無法復原刪除的連絡人';
+$messages['contactrestored'] = '連絡人復原完成';
 $messages['groupdeleted'] = '群組成功刪除';
 $messages['grouprenamed'] = '群組重新命名成功';
 $messages['groupcreated'] = '群組建立成功';
+$messages['savedsearchdeleted'] = '搜尋結果刪除完成';
+$messages['savedsearchdeleteerror'] = '無法刪除搜尋結果';
+$messages['savedsearchcreated'] = '搜尋結果建立完成';
+$messages['savedsearchcreateerror'] = '無法建立搜尋結果';
 $messages['messagedeleted'] = '訊息成功刪除';
 $messages['messagemoved'] = '訊息成功移動';
 $messages['messagecopied'] = '訊息成功複製';
 $messages['messagemarked'] = '訊息成功標示';
 $messages['autocompletechars'] = '輸入至少 $min 字元才能自動完成自動完成';
+$messages['autocompletemore'] = '過多相符資訊，請輸入更多文字';
 $messages['namecannotbeempty'] = '名稱不可空白';
 $messages['nametoolong'] = '名稱太長';
 $messages['folderupdated'] = '資料夾成功更新';
 $messages['foldercreated'] = '資料夾成功建立';
 $messages['invalidimageformat'] = '圖片格式錯誤';
+$messages['parentnotwritable'] = '無法建立/移動資料夾至指定的上層目錄 (No access rights)';
 
-?>