Update localization

author: Aleksander Machniak <alec@alec.pl> 2018-01-07 11:30:33 +0300
committer: Aleksander Machniak <alec@alec.pl> 2018-01-07 11:30:33 +0300
commit: 6fb6a0b88503309c55610bd131780ae4215cb63f (patch)
tree: 9ebe95cbe08e624a80efe9430c060c8e62453bf7 /program/localization
parent: f9c590621bf2808a211a50821eb8edff277244b5 (diff)
157 files changed, 1358 insertions, 216 deletions
diff --git a/program/localization/ar/labels.inc b/program/localization/ar/labels.inc
index 400451ad5..497af9fbb 100644
--- a/program/localization/ar/labels.inc
+++ b/program/localization/ar/labels.inc
@@ -31,12 +31,20 @@ $labels['trash']  = 'المهملات';
 $labels['junk']   = 'الرسائل غير المرغوب فيها';
 $labels['subject'] = 'الموضوع';
 $labels['from']    = 'المرسل';
+$labels['to']      = 'المستقبل';
 $labels['cc']      = 'نسخة إلي';
 $labels['bcc']     = 'نسخة مخفية الوجهة';
+$labels['replyto'] = 'الرد إلى';
+$labels['followupto'] = 'Mail-Followup-To';
 $labels['date']    = 'التاريخ';
 $labels['size']    = 'الحجم';
 $labels['priority'] = 'الأولوية';
+$labels['organization'] = 'المنظمة';
+$labels['readstatus'] = 'حالة القراءة';
 $labels['mailboxlist'] = 'مجلدات';
+$labels['messagesfromto'] = 'الرسالة $from إلى $to من مجموع $count';
+$labels['threadsfromto'] = 'جهات الإتصال $from إلى $to من مجموع $count';
+$labels['messagenrof'] = 'الرسالة $nr من $count';
 $labels['copy']     = 'نسخ';
 $labels['move']     = 'نقل';
 $labels['moveto']   = 'نقل إلى...';
@@ -95,6 +103,9 @@ $labels['replytoallmessage'] = 'الرد على قائمة أو إلى المر�
 $labels['replyall']         = 'الرد على الجميع';
 $labels['replylist']        = 'الرد على القائمة';
 $labels['forward']          = 'إعادة توجيه';
+$labels['forwardinline']    = 'تمرير الرسالة ضمنياً';
+$labels['forwardattachment'] = 'تمرير الرسالة كمرفق';
+$labels['forwardmessage']   = 'تمرير الرسالة';
 $labels['deletemessage']    = 'حذف الرسالة';
 $labels['movemessagetotrash'] = 'انقل الرسالة إلى سلة المهملات';
 $labels['printmessage']     = 'أطبع هذه الرسالة';
@@ -105,8 +116,11 @@ $labels['lastmessage']      = 'عرض الرسالة الأخيرة';
 $labels['backtolist']       = 'العودة إلى قائمة الرسائل';
 $labels['viewsource']       = 'إظهار المصدر';
 $labels['mark']             = 'علامة';
+$labels['markmessages']     = 'وسم الرسالة';
 $labels['markread']         = 'مقروءة';
 $labels['markunread']       = 'غير مقروءة';
+$labels['markflagged']      = 'كموْسومة';
+$labels['markunflagged']    = 'كغير موْسومة';
 $labels['moreactions']      = 'إجراءات إضافية...';
 $labels['more']             = 'المزيد';
 $labels['back']             = 'العودة';
@@ -120,4 +134,302 @@ $labels['flagged'] = 'موسوم';
 $labels['unanswered'] = 'بلا رد';
 $labels['deleted'] = 'محذوف';
 $labels['undeleted'] = 'غير محذوفة';
+$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'] = 'تصاعدي';
+$labels['desc'] = 'تنازلي';
+$labels['listcolumns'] = 'أعمدة السرد';
+$labels['listsorting'] = 'أعمدة الترتيب';
+$labels['listorder'] = 'طريقة الترتيب';
+$labels['listmode'] = 'وضع طريقة السرد';
+$labels['layoutlist'] = 'قائمة';
+$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)';
+$labels['editasnew']      = 'تعديل كجديد';
+$labels['send']           = 'ارسل';
+$labels['sendmessage']    = 'إرسال الرسالة الآن';
+$labels['savemessage']    = 'حفظ هذه المسودة';
+$labels['addattachment']  = 'إرفاق ملف';
+$labels['charset']        = 'مجموعة المحارف';
+$labels['editortype']     = 'نوع المُحرّر';
+$labels['returnreceipt']  = 'ايصال استلام';
+$labels['dsn']            = 'تنويه حالة التوصيل';
+$labels['mailreplyintro'] = 'كتب $sender في $date:';
+$labels['originalmessage'] = 'الرسالة الأساسية';
+$labels['editidents']    = 'تعديل الهويات';
+$labels['spellcheck']    = 'التدقيق اﻹملائى';
+$labels['checkspelling'] = 'التدقيق الإملائي';
+$labels['resumeediting'] = 'متابعة التحرير';
+$labels['revertto']      = 'استعادة إلى';
+$labels['attach'] = 'إرفاق';
+$labels['attachments'] = 'مرفقات';
+$labels['upload'] = 'تحميل';
+$labels['close']  = 'إغلاق';
+$labels['messageoptions']  = 'خيارات الرسائل...';
+$labels['low']     = 'منخض';
+$labels['lowest']  = 'الأقل';
+$labels['normal']  = 'عادي';
+$labels['high']    = 'مرتفع';
+$labels['highest'] = 'الأعلى';
+$labels['nosubject']  = '(دون موضوع)';
+$labels['showimages'] = 'إظهار الصور';
+$labels['alwaysshow'] = 'دائماً أظهر الصّور القادمة من $sender';
+$labels['isdraft']    = 'هذه مسودّة رسالة';
+$labels['andnmore']   = '$nr المزيد ...';
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'نص مجرد';
+$labels['savesentmessagein'] = 'احفظ الرسالة المُرسلة في';
+$labels['dontsave'] = 'لا تحفظها';
+$labels['maxuploadsize'] = 'أقصى حجم للملف هو $size';
+$labels['addcc'] = 'أضف CC';
+$labels['addbcc'] = 'أضف BCC';
+$labels['addreplyto'] = 'أضيف Reply-To';
+$labels['addfollowupto'] = 'إضافة Mail-Followup-To';
+$labels['mdnrequest'] = 'طلب المرسل إعلامه عند قراءتك لرسالته. هل تود إعلام المرسل؟';
+$labels['receiptread'] = 'إيصال الاستلام )بالقراءة)';
+$labels['yourmessage'] = 'هذا إيصال بقراءة رسالتك';
+$labels['receiptnote'] = 'ملاحظة: يُعلمك هذا الإيصال بأن رسالتك قد ظهرت على جهاز المستقبِل. ليست هناك أية ضمانات أن المستقبل قد قرأ أو فهم محتويات الرسالة.';
+$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['female'] = 'أنثى';
+$labels['manager'] = 'مدير';
+$labels['assistant'] = 'المساعد';
+$labels['spouse'] = 'زوجة';
+$labels['allfields'] = 'جميع الحقول';
+$labels['search'] = 'بحث';
+$labels['advsearch'] = 'بحث متقدم';
+$labels['advanced'] = 'مُتقدم';
+$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['typeblog'] = 'المدوّنة';
+$labels['typeprofile'] = 'الملف الشخصي';
+$labels['addfield'] = 'إضافة حقل...';
+$labels['editcontact'] = 'تحرير بيانات المراسل';
+$labels['contacts'] = 'المراسلين';
+$labels['contactproperties'] = 'خواص جهة الإتصال';
+$labels['personalinfo'] = 'المعلومات الشخصية';
+$labels['edit']   = 'تحرير';
+$labels['cancel'] = 'إلغاء';
+$labels['save']   = 'حفظ';
+$labels['delete'] = 'حذف';
+$labels['rename'] = 'إعادة التسمية';
+$labels['addphoto'] = 'إضافة';
+$labels['replacephoto'] = 'استبدال';
+$labels['uploadphoto'] = 'ارفع صورة';
+$labels['deletecontact']  = 'حذف المراسلين المحددين';
+$labels['composeto']      = 'إنشاء رسالة إليه';
+$labels['contactsfromto'] = 'المراسلون $from إلى $to من $count';
+$labels['print']          = 'طباعة';
+$labels['export']         = 'تصدير';
+$labels['exportvcards']   = 'صدّر المراسلين بنسق vCard';
+$labels['grouprename']    = 'تغيير اسم المجموعة';
+$labels['groupdelete']    = 'حذف المجموعة';
+$labels['groupremoveselected'] = 'حذف العنوان المختار من المجموعة';
+$labels['previouspage']   = 'عرض المجموعة السابقة';
+$labels['firstpage']      = 'عرض المجموعة الأولى';
+$labels['nextpage']       = 'عرض المجموعة التالية';
+$labels['lastpage']       = 'عرض المجموعة الأخيرة';
+$labels['group'] = 'مجموعة';
+$labels['groups'] = 'المجموعات';
+$labels['personaladrbook'] = 'العناوين الشخصية';
+$labels['searchsave'] = 'حفظ البحث';
+$labels['searchdelete'] = 'حذف البحث';
+$labels['import'] = 'استورد';
+$labels['importcontacts'] = 'استورد المراسلين';
+$labels['importfromfile'] = 'استورد من ملف:';
+$labels['importreplace'] = 'استبدل دفتر العناوين بأكمله';
+$labels['done'] = 'تم';
+$labels['settingsfor'] = 'إعدادات';
+$labels['about'] = 'نبذة';
+$labels['preferences'] = 'التفضيلات';
+$labels['userpreferences'] = 'تفضيلات المستخدم';
+$labels['editpreferences'] = 'تحرير تفضيلات المستخدم';
+$labels['identities'] = 'الهويات';
+$labels['preferhtml'] = 'تفضيل صيغة HTML';
+$labels['defaultcharset'] = 'ترميز المحارف الافتراضي';
+$labels['htmlmessage'] = 'رسالة بنسق HTML';
+$labels['dateformat'] = 'نسق التاريخ';
+$labels['timeformat'] = 'نسق الوقت';
+$labels['prettydate'] = 'تواريخ منمقة';
+$labels['setdefault']  = 'تعيين كإفتراضي';
+$labels['autodetect']  = 'آلي';
+$labels['language']  = 'اللغة';
+$labels['timezone']  = 'المنطقة الزمنية';
+$labels['pagesize']  = 'عدد الرسائل في الصفحة';
+$labels['signature'] = 'التوقيع';
+$labels['dstactive']  = 'التوقيت الصيفي';
+$labels['showinextwin'] = 'فتح الرسالة فى نافذة جديدة';
+$labels['composeextwin'] = 'أرسال عن طريق نافذة جديدة';
+$labels['htmleditor'] = 'إنشاء رسائل بنسق HTML';
+$labels['htmlonreply'] = 'حال الرد على الرسائل بصيغة HTML فقط';
+$labels['htmlsignature'] = 'توقيع HTML';
+$labels['previewpane'] = 'إظهار قسم المعاينة';
+$labels['skin'] = 'شكل الواجهة';
+$labels['logoutclear'] = 'إفراغ سلة المحذوفات عند الخروج';
+$labels['logoutcompact'] = 'ضغط صندوق الوارد عن الخروج';
+$labels['uisettings'] = 'واجهة المستخدم';
+$labels['serversettings'] = 'إعدادات الخادم';
+$labels['mailboxview'] = 'مظهر صندوق البريد';
+$labels['mdnrequests'] = 'عند طلب إشعار استلام';
+$labels['askuser'] = 'اسأل المستخدم';
+$labels['autosend'] = 'أرسلها تلقائياً';
+$labels['autosendknown'] = 'أرسل إشعار استلام إلى جهات اتصالي، وإلااسألني';
+$labels['autosendknownignore'] = 'أرسل إشعار استلام إلى جهات اتصالي، وإلاتجاهل الأمر';
+$labels['readwhendeleted'] = 'تحديد الرسالة كمقروءة عند حذفها';
+$labels['flagfordeletion'] = 'وضع علامة على الرسالة لحذفها بدلاً منحذفها';
+$labels['skipdeleted'] = 'لا تظهر الرسائل المحذوفة';
+$labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلىالمهملات';
+$labels['showremoteimages'] = 'إظهار الصور الخارجية المدمجة';
+$labels['fromknownsenders'] = 'للمرسلين المعلومين';
+$labels['always'] = 'دائماً';
+$labels['showinlineimages'] = 'إظهار الصّور المرفقة أسفل الرسالة';
+$labels['autosavedraft']  = 'حفظ المسودة تلقائياً';
+$labels['everynminutes']  = 'كل $n دقيقة';
+$labels['never']  = 'أبداً';
+$labels['immediately']  = 'حالاً';
+$labels['messagesdisplaying'] = 'إظهار الرسائل';
+$labels['messagescomposition'] = 'إنشاء الرسائل';
+$labels['mimeparamfolding'] = 'أسماء الملفات المرفقة';
+$labels['2231folding'] = 'RFC 2231 بأكملها (ثندربيرد)';
+$labels['miscfolding'] = 'RFC 2047/2231 (ميكروسوفت آوتلوك)';
+$labels['2047folding'] = 'RFC 2047 بأكملها (غيرها)';
+$labels['force7bit'] = 'استخدام ترميز MIME للحروف ذات الثمانيةبتّات';
+$labels['advancedoptions'] = 'خيارات متقدّمة';
+$labels['focusonnewmessage'] = 'التركيز على نافذة المتصفح عند وجود رسالةجديدة';
+$labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميعالمجلدات';
+$labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقلالرسالة الحالية';
+$labels['mainoptions'] = 'الخيارات الأساسية';
+$labels['section'] = 'قسم';
+$labels['maintenance'] = 'الصيانة';
+$labels['newmessage'] = 'رسالة جديدة';
+$labels['signatureoptions'] = 'خيارات التوقيع';
+$labels['whenreplying'] = 'عند الرد';
+$labels['replytopposting'] = 'بدء رسالة جديدة ووضع النص أعلى الأصلية';
+$labels['replybottomposting'] = 'بدء رسالة جديدة ووضع النص أسفل الأصلية';
+$labels['replyremovesignature'] = 'إزالة التوقيع من الرسالة عند الرد';
+$labels['autoaddsignature'] = 'إضافة التوقيع آلياً';
+$labels['newmessageonly'] = 'الرسالة الجديدة فقط';
+$labels['replyandforwardonly'] = 'الردود والتمريرات فقط';
+$labels['insertsignature'] = 'إضافة التوقيع';
+$labels['afternseconds']  = 'بعد $n ثواني';
+$labels['reqmdn'] = 'طلب إشعار استلام دائماً';
+$labels['reqdsn'] = 'طلب تنويه لحالة التوصيل دائماً';
+$labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالةالمردود عليها';
+$labels['autocompletesingle'] = 'تجاهل عنوان البريد الإلكتروني البديل فيالتكملة التلقائية';
+$labels['spellcheckbeforesend'] = 'تحقق من الإملاء قبل إرسال الرسائل';
+$labels['spellcheckoptions'] = 'خيارات التدقيق الإملاءي';
+$labels['spellcheckignoresyms'] = 'تجاهل الكلمات التي تحتوي رموز';
+$labels['spellcheckignorenums'] = 'تجاهل الكلمات التي تحتوي أرقام';
+$labels['spellcheckignorecaps'] = 'تجاهل الكلمات التي بها أحرف كبيرة';
+$labels['addtodict'] = 'إضافة إلى القامس';
+$labels['folder'] = 'مجلد';
+$labels['folders'] = 'مجلدات';
+$labels['foldername'] = 'اسم المجلد';
+$labels['subscribed'] = 'مشترك';
+$labels['messagecount'] = 'الرسائل';
+$labels['create'] = 'أنشئ';
+$labels['createfolder'] = 'أنشئ مجلد جديد';
+$labels['managefolders'] = 'إدارة المجلدات';
+$labels['specialfolders'] = 'المجلّدات المُميّزة';
+$labels['properties'] = 'الخواص';
+$labels['folderproperties'] = 'خواص المجلد';
+$labels['parentfolder'] = 'المجلد الحاوي';
+$labels['location'] = 'الموضع';
+$labels['info'] = 'معلومات';
+$labels['getfoldersize'] = 'اضغط لمعرفة حجم المجلد';
+$labels['changesubscription'] = 'اضغط لتغيير حالة الإشتراك';
+$labels['foldertype'] = 'نوع المجلد';
+$labels['personalfolder'] = 'مجلد خاص';
+$labels['otherfolder'] = 'مجلد مستخدم آخر';
+$labels['sharedfolder'] = 'مجلد عام';
+$labels['sortby'] = 'ترتيب بحسب';
+$labels['sortasc']  = 'ترتيب تصاعدي';
+$labels['sortdesc'] = 'ترتيب تنازلي';
+$labels['undo'] = 'تراجع';
+$labels['plugin'] = 'إضافة';
+$labels['version'] = 'النسخة';
+$labels['source'] = 'المصدر';
+$labels['license'] = 'الترخيص';
+$labels['support'] = 'احصل على الدعم الفني';
+$labels['B'] = 'ب';
+$labels['KB'] = 'ك.ب';
+$labels['MB'] = 'م.ب';
+$labels['GB'] = 'ج.ب';
+$labels['unicode'] = 'يونيكود';
+$labels['english'] = 'الإنجليزية';
+$labels['westerneuropean'] = 'الغرب أوروبية';
+$labels['easterneuropean'] = 'الشرق أوروبية';
+$labels['southeasterneuropean'] = 'الجنوب شرق أوروبية';
+$labels['baltic'] = 'البلطيقية';
+$labels['cyrillic'] = 'الكيريلية';
+$labels['arabic'] = 'العربية';
+$labels['greek'] = 'اليونانية';
+$labels['hebrew'] = 'العبرية';
+$labels['turkish'] = 'التركية';
+$labels['nordic'] = 'النرويجية';
+$labels['thai'] = 'التايلندية';
+$labels['celtic'] = 'الكلتية';
+$labels['vietnamese'] = 'الفيتنامية';
+$labels['japanese'] = 'اليابانية';
+$labels['korean'] = 'الكورية';
+$labels['chinese'] = 'الصينية';
 ?>
diff --git a/program/localization/ar/messages.inc b/program/localization/ar/messages.inc
new file mode 100644
index 000000000..63e4e39d1
--- /dev/null
+++ b/program/localization/ar/messages.inc
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/messages.inc                                      |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
+*/
+$messages['loginfailed']  = 'فشل تسجيل الدخول';
+$messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
+$messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غيرصالحة';
+$messages['storageerror'] = 'فشل الاتصال بخادم IMAP';
+$messages['servererror'] = 'خطأ في الخادم!';
+$messages['servererrormsg'] = 'خطأ خادم: $msg';
+$messages['dberror'] = 'خطأ في قاعدة البيانات!';
+$messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.';
+$messages['errornoperm'] = 'تعذر تنفيذ العملية. ليست لديك الصلاحية.';
+$messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.';
+$messages['nomessagesfound'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
+$messages['loggedout'] = 'قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
+$messages['loading'] = 'جاري العمل...';
+$messages['uploading'] = 'جاري رفع الملف...';
+$messages['uploadingmany'] = 'جاري تحميل الملفات...';
+$messages['loadingdata'] = 'تحميل البيانات...';
+$messages['checkingmail'] = 'التحقق من وجود رسائل جديدة...';
+$messages['sendingmessage'] = 'إرسال الرسالة...';
+$messages['messagesent'] = 'تم إرسال الرسالة بنجاح';
+$messages['savingmessage'] = 'حفظ الرسالة...';
+$messages['messagesaved'] = 'تم حفظ الرسالة في المسودات';
+$messages['successfullysaved'] = 'تم الحفظ بنجاح';
+$messages['addedsuccessfully'] = 'تمت إضافة المراسل إلى دفتر العناوينبنجاح';
+$messages['contactnameexists'] = 'هناك مُرسال له نفس الإسم موجود مسبقاً.';
+$messages['blockedimages'] = 'لحماية خصوصيتك، تم حجب الصور الغير مضمنة(البعيدة) في هذه الرسالة.';
+$messages['encryptedmessage'] = 'هذه الرسالة مشفرة ولا يمكن عرضها. عذراً!';
+$messages['nocontactsfound'] = 'لم يعثر على أي مراسل';
+$messages['contactnotfound'] = 'تعذر العثور على المراسل المطلوب';
+$messages['contactsearchonly'] = 'اكتب بعض كلمات البحث للعثور علىالمُراسلين';
+$messages['sendingfailed'] = 'فشل إرسال الرسالة';
+$messages['senttooquickly'] = 'رجاء انتظر $sec ثوان قبل إرسال هذه الرسالة';
+$messages['errormoving'] = 'تعذر نقل هذه الرسالة';
+$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'] = 'الإشتراك في المجلد...';
+$messages['folderunsubscribing'] = 'إلغاء الإشتراك في المجد...';
+$messages['formincomplete'] = 'لم يتم تعبئة بيانات الاستمارة بالكامل';
+$messages['noemailwarning'] = 'الرجاء إدخال عنوان بريد إلكتروني صالح';
+$messages['nonamewarning']  = 'الرجاء إدخال اسم';
+$messages['nopagesizewarning'] = 'الرجاء إدخال حجم الصفحة';
+$messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل واحد على الأقل';
+$messages['nosubjectwarning']  = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
+$messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
+$messages['nosearchname'] = 'الرجاء إدخال اسم مراسل أو عنوان بريدإلكتروني';
+$messages['notuploadedwarning'] = 'لم يتم رفع جميع المرفقات بعد. رجاءً الانتظار أو إلغاء عملية الرفع.';
+$messages['searchsuccessful'] = 'عثر على $nr رسائل';
+$messages['contactsearchsuccessful'] = 'عُثر على $nr مُراسَل';
+$messages['searchnomatch'] = 'لم يعثر على شيء';
+$messages['searching'] = 'جاري البحث...';
+$messages['checking'] = 'جاري التحقق...';
+$messages['nospellerrors'] = 'لم يعثر على أية أخطاء إملائية';
+$messages['folderdeleted'] = 'تم حذف المجلد بنجاح';
+$messages['foldersubscribed'] = 'تم الإشتراك في المجلد بنجاح';
+$messages['folderunsubscribed'] = 'تم إلغاء الإشتراك في المجلد بنجاح';
+$messages['folderpurged'] = 'تم تفريغ المجلد بنجاح';
+$messages['folderexpunged'] = 'تم إفراغ المجلد بنجاح.';
+$messages['deletedsuccessfully'] = 'تم الحذف بنجاح';
+$messages['converting'] = 'إزالة التنسيق من الرسالة...';
+$messages['messageopenerror'] = 'تعذرت قراءة الرسالة من الخادم';
+$messages['fileuploaderror'] = 'فشل رفع الملف';
+$messages['filesizeerror'] = 'حجم الملف الذي تحاول رفعه أكبر من الحجمالأقصى $size';
+$messages['sourceisreadonly'] = 'لا يمكن تعديل مصدر العنوان هذا';
+$messages['errorsavingcontact'] = 'تعذر حفظ عنوان المراسل';
+$messages['movingmessage'] = 'جاري نقل الرسالة...';
+$messages['copyingmessage'] = 'جاري نسخ الرسالة...';
+$messages['copyingcontact'] = 'جاري نسخ المُراسلين...';
+$messages['deletingmessage'] = 'جاري حذف الرسائل...';
+$messages['markingmessage'] = 'جاري تحديد الرسائل...';
+$messages['addingmember'] = 'جاري إضافة المُراسلين إلى المجموعة...';
+$messages['removingmember'] = 'جاري إزالة المراسلين من المجموعة...';
+$messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
+$messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
+$messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيدالمتبقي.';
+$messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
+$messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
+$messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
+$messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعةبنجاح';
+$messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعةبنجاح';
+$messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
+$messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل$skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>تم تجاهل $skipped عناصر موجودة</b>';
+$messages['opnotpermitted'] = 'العملية ممنوعة!';
+$messages['httpreceivedencrypterror'] = 'حدث خطأ جسيم في التهيئة. رجاءً اتصال بمدير الخادم حالاً. <b>لا يمكن إرسال بريدك.</b>';
+$messages['smtpconnerror'] = 'خطأ SMTP ($code): تعذر الاتصال بالخادم';
+$messages['smtpautherror'] = 'خطأ SMTP ($code): تعذر التحقق من هويتك';
+$messages['smtpfromerror'] = 'خطأ SMTP ($code): تعذر تحديد المرسل "$from" ($msg)';
+$messages['smtptoerror'] = 'خطأ SMTP ($code): تعذرت إضافة المستلم "$to" ($msg)';
+$messages['smtprecipientserror'] = 'خطأ SMTP: تعذرت قراءة قائمة المرسل إليهم';
+$messages['smtperror'] = 'خطأ SMTP: $msg';
+$messages['toomanyrecipients'] = 'عدد المرسل إليهم كبير. قلص العدد إلى $max.';
+$messages['maxgroupmembersreached'] = 'عدد أعضاء المجموعة أكثر من $max';
+$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['mispellingsfound'] = 'عُثر على أخطاء إملائية في الرسالة';
+$messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد.ليست لديك الصلاحية.';
+$messages['messagetoobig'] = 'جزء الرسالة أكبر بكثير مما يمكن معالجته.';
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index a96df149f..96c819a9a 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'كغير مقروءة';
 $labels['markflagged']      = 'كموْسومة';
 $labels['markunflagged']    = 'كغير موْسومة';
 $labels['moreactions']      = 'إجراءات إضافية...';
+$labels['folders-all']      = 'جميع الملفات';
 $labels['more']             = 'المزيد';
 $labels['back']             = 'العودة';
 $labels['options']          = 'خيارات';
@@ -135,6 +136,7 @@ $labels['select'] = 'تحديد';
 $labels['all'] = 'الكل';
 $labels['none'] = 'لاشيء';
 $labels['currpage'] = 'الصفحة الحالية';
+$labels['isread'] = 'قراءة ';
 $labels['unread'] = 'غير المقروءة';
 $labels['flagged'] = 'موسوم';
 $labels['unanswered'] = 'بلا رد';
@@ -164,6 +166,7 @@ $labels['listcolumns'] = 'أعمدة السرد';
 $labels['listsorting'] = 'أعمدة الترتيب';
 $labels['listorder'] = 'طريقة الترتيب';
 $labels['listmode'] = 'وضع طريقة السرد';
+$labels['layoutlist'] = 'قائمة';
 $labels['folderactions'] = 'إجراءات المجلد...';
 $labels['compact'] = 'ضغط';
 $labels['empty'] = 'تفريغ';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index 870637b9e..67c613ce7 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -89,7 +89,6 @@ $messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل �
 $messages['nosubjectwarning']  = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
 $messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
 $messages['restoresavedcomposedata'] = 'يوجد رسالة سابقة ولاكن غير مرسلة.\n\nالموضوع: $subject\nحفظ: $date\n\n هل تريد بالفعل استعادة هذة الرسالة ؟';
-$messages['noldapserver'] = 'الرجاء اختيار خادم ldap للبحث فيه';
 $messages['nosearchname'] = 'الرجاء إدخال اسم مراسل أو عنوان بريدإلكتروني';
 $messages['notuploadedwarning'] = 'لم يتم رفع جميع المرفقات بعد. رجاءً الانتظار أو إلغاء عملية الرفع.';
 $messages['searchsuccessful'] = 'عثر على $nr رسائل';
@@ -179,5 +178,4 @@ $messages['invalidimageformat'] = 'ليست صيغة صورة صحيحة';
 $messages['mispellingsfound'] = 'عُثر على أخطاء إملائية في الرسالة';
 $messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد.ليست لديك الصلاحية.';
 $messages['messagetoobig'] = 'جزء الرسالة أكبر بكثير مما يمكن معالجته.';
-$messages['attachmentvalidationerror'] = 'تحذير! المرفق ادناة مشكوك في امره بسبب ان نوع المرفق لا يتناسب مع نوع المرفق المصرح بة في هذه الرسالة.اذا كنت لا تثق في المرسل, يجب عليك ان لا تفتحة في المتصفح لأنها قد تحتوي على محتويات ضارة.<br/><br/><em>متوقع : $expected; موجود : $detected</em>';
 $messages['noscriptwarning'] = 'تحذير: خادم البريد الالكتروني هذا يتطلب جافاسكربت , يرجى تفعيل الـ جافاسكربت في اعدادت المتصفح الخاص بك لتتمكن من استخدامة.';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 51eac8198..a7d1cc4ff 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Como non lleíu';
 $labels['markflagged']      = 'Como etiquetáu';
 $labels['markunflagged']    = 'Como non etiquetáu';
 $labels['moreactions']      = 'Más aiciones...';
+$labels['folders-all']      = 'Toles carpetes';
 $labels['more']             = 'Más';
 $labels['back']             = 'Tornar';
 $labels['options']          = 'Opciones';
@@ -171,6 +172,7 @@ $labels['listcolumns'] = 'Llistar columnes';
 $labels['listsorting'] = 'Columna de llistáu';
 $labels['listorder'] = 'Orde de llistáu';
 $labels['listmode'] = 'Mou de vista de llista';
+$labels['layoutlist'] = 'Llista';
 $labels['folderactions'] = 'Aiciones de carpeta...';
 $labels['compact'] = 'Compautar';
 $labels['empty'] = 'Vaciar';
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index cf527814e..32c1d7c45 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Por favor, introduz polo menos un destinatari
 $messages['nosubjectwarning']  = 'El campo "Asuntu" ta vacíu. ¿Quies rellenalu agora?';
 $messages['nobodywarning'] = '¿Quies unviar esti mensaxe ensin testu?';
 $messages['restoresavedcomposedata'] = 'Alcontróse un mensaxe redactáu anterior ensin unviar.n\nAsuntu: $subject\nGuardáu: $date\n\n¿Quies restaurar esti mensaxe?';
-$messages['noldapserver'] = 'Por favor, escueyi un sirvidor LDAP pa buscar.';
 $messages['nosearchname'] = 'Por favor, introduz un nome o una direición de corréu-e.';
 $messages['notuploadedwarning'] = 'Entá nun se xubieron tolos axuntos. Por favor, espera o encaboxa la xuba.';
 $messages['searchsuccessful'] = 'Atopáronse $nr mensaxes.';
@@ -170,5 +169,4 @@ $messages['invalidimageformat'] = 'Nun ye un formatu d\'imaxe válidu.';
 $messages['mispellingsfound'] = 'Deteutáronse fallos ortográficos nel mensaxe.';
 $messages['parentnotwritable'] = 'Nun puede crease/movese la carpeta a la carpeta superior elexida. Nun tienes permisos d\'accesu.';
 $messages['messagetoobig'] = 'Esta parte del mensaxe ye enforma grande pa procesala';
-$messages['attachmentvalidationerror'] = '¡ATENCIÓN! Esti axuntu ye sospechosu porque\'l so tipu nun concasa col tipu declaráu nel mensaxe. Si nun confíes nel so remitente, nun tendríes d\'abrilu nel to navegador porque podría tener conteníu maliciosu.<br/<br/> <em>Esperábase: $expected; atopóse: $detected</em>';
 $messages['noscriptwarning'] = 'Avisu: ¡esti serviciu de webmail necesita Javascript! Pa poder usalu, habilita\'l soporte de Javascript nel to navegador, por favor.';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 5b2f36140..b11b6d53b 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Oxunmamış';
 $labels['markflagged']      = 'Qeyd et';
 $labels['markunflagged']    = 'Qeydi çıxar';
 $labels['moreactions']      = 'Daha çox seçim...';
+$labels['folders-all']      = 'Bütün qovluqlar';
 $labels['more']             = 'Daha çox';
 $labels['back']             = 'Geri';
 $labels['options']          = 'Ayarlar';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Sütunlar';
 $labels['listsorting'] = 'Sütunları çeşidlə';
 $labels['listorder'] = 'Çeşidləmə qaydası';
 $labels['listmode'] = 'Görünüş rejimi';
+$labels['layoutlist'] = 'Siyahı';
 $labels['folderactions'] = 'Qovluq işləri...';
 $labels['compact'] = 'Sıx';
 $labels['empty'] = 'Boşalt';
@@ -323,6 +325,7 @@ $labels['editcontact'] = 'Ünvanı redaktə et';
 $labels['contacts'] = 'Əlaqələr';
 $labels['contactproperties'] = 'Kontakt xüsusiyyətləri';
 $labels['personalinfo'] = 'Şəxsi məlumat';
+$labels['personal'] = 'Şəxsi';
 $labels['edit']   = 'Redaktə et';
 $labels['cancel'] = 'Ləğv et';
 $labels['save']   = 'Saxla';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index c5791d873..aaed91484 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -81,7 +81,6 @@ $messages['norecipientwarning'] = 'Lütfən, qəbul edənin ünvanını daxil ed
 $messages['nosubjectwarning']  = '"Mövzu" sahəsi boşdur. Mövzu daxil etmək istəyirsiniz?';
 $messages['nobodywarning'] = 'Məktub boş göndərilsin?';
 $messages['restoresavedcomposedata'] = 'Əvvəlki göndərildi, ancaq göndərilməyən məktub da tapıldı.\n\nSubject: $subject\nSaved: $date\n\nSiz bu məktubu bərpa etmək istəyirsiniz?';
-$messages['noldapserver'] = 'Lütfən, axtarış üçün LDAP server seçin';
 $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';
@@ -166,5 +165,4 @@ $messages['invalidimageformat'] = 'Şəkil formatı düzgün deyil';
 $messages['mispellingsfound'] = 'Məktubda orfoqrafik səhvlər tapılıb';
 $messages['parentnotwritable'] = 'Qovluğu seçilmiş ana qovluğa köçürmək/yaratmaq alınmır. Giriş hüququ yoxdur.';
 $messages['messagetoobig'] = 'Məktubun bir hissəsi emal üçün böyükdür.';
-$messages['attachmentvalidationerror'] = 'DİQQƏT! Bu qoşma şübhəlidir, çünki məktubda deyilən növlə eyni deyil. Əgər siz göndərə güvənmirsinizsə, brauzerdə bunu açmayın. Tərkibi təhlükəli ola bilər.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Xəbərdarlıq: Bu vebmeyl xidməti Javascript tələb edir! Funksiyanı istifadə etmək üçün lütfən, brauzerinizin ayarlarında Javascript-i yandırın.';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index de84da457..d19f3ee1f 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Як непрачытаныя';
 $labels['markflagged']      = 'Паставіць флаг';
 $labels['markunflagged']    = 'Зняць флаг';
 $labels['moreactions']      = 'Больш дзеянняў...';
+$labels['folders-all']      = 'Усе папкі';
 $labels['more']             = 'Больш';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Параметры';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Слупкі';
 $labels['listsorting'] = 'Сартаваць паводле';
 $labels['listorder'] = 'Парадак сартавання';
 $labels['listmode'] = 'Тып спісу';
+$labels['layoutlist'] = 'Спіс';
 $labels['folderactions'] = 'Аперацыі з папкай...';
 $labels['compact'] = 'Сціснуць';
 $labels['empty'] = 'Спаражніць';
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index b0b9d434a..c6a4499d3 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Задайце хаця-б аднаго ат�
 $messages['nosubjectwarning']  = 'Тэма ліста не зададзена. Ці жадаеце задаць яе зараз?';
 $messages['nobodywarning'] = 'Адправіць гэта паведамленне без тэксту?';
 $messages['restoresavedcomposedata'] = 'Было знойдзена ўжо складзенае, але не адпраўленае паведамленне.\n\nТэма: $subject\nЗахавана: $date\n\nЖадаеце аднавіць гэтае паведамленне?';
-$messages['noldapserver'] = 'Задайце ldap-сервер для пошуку.';
 $messages['nosearchname'] = 'Задайце імя кантакта альбо адрас электроннай пошты.';
 $messages['notuploadedwarning'] = 'Не ўсе далучэнні пакуль яшчэ зацягнутыя. Пачакайце альбо скасуйце аперацыю.';
 $messages['searchsuccessful'] = 'Знойдзена $nr паведамленняў.';
@@ -170,5 +169,4 @@ $messages['invalidimageformat'] = 'Няслушны фармат відарыс�
 $messages['mispellingsfound'] = 'У паведамленні выяўлены правапісныя памылкі.';
 $messages['parentnotwritable'] = 'Не ўдалося стварыць/перамясціць папку ў абраным месцы. Няма доступу.';
 $messages['messagetoobig'] = 'Гэтая часць паведамлення завялікая, каб яе апрацаваць.';
-$messages['attachmentvalidationerror'] = 'УВАГА! Гэтае далучэнне ёсць падазроным, бо тып ягоны не супадае з заяўленым тыпам у паведамленні. Калі вы не давяраеце гэтаму адпраўніку, не адчыняйце яго ў браўзеры, таму што яно можа ўтрымліваць шкоднае змесціва.<br/><br/><em>Чаканы: $expected; знойдзены: $detected<em>';
 $messages['noscriptwarning'] = 'Увага: Служба вымагае Javascript’у! Каб карыстацца ёй, трэба ўключыць Javascript у перавагах браўзера.';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 680183135..8fa433e96 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -345,11 +345,13 @@ $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Данни на контакт';
 $labels['contactnameandorg'] = 'Име и организация';
 $labels['personalinfo'] = 'Лична информация';
+$labels['personal'] = 'Лична';
 $labels['contactphoto'] = 'Снимка на контакт';
 $labels['edit']   = 'Редактирай';
 $labels['cancel'] = 'Отказ';
 $labels['save']   = 'Запис';
 $labels['delete'] = 'Изтрий';
+$labels['discard'] = 'Изхвърли';
 $labels['rename'] = 'Преименувай';
 $labels['addphoto'] = 'Добави';
 $labels['replacephoto'] = 'Замени';
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index 8ba1531e5..07f819f56 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -98,7 +98,6 @@ $messages['nosubjectwarning']  = 'Полето "Заглавие" е празн�
 $messages['nosubjecttitle']  = 'Няма Заглавие';
 $messages['nobodywarning'] = 'Изпрати това писмо без текст?';
 $messages['restoresavedcomposedata'] = 'Намерено е неизпратено писмо, което е било в процес на създаване.\n\nОтносно: $subject\nЗапазено на: $date\n\nЖелаете ли да възстановите писмото?';
-$messages['noldapserver'] = 'Изберете LDAP сървър за търсене.';
 $messages['nosearchname'] = 'Моля въведете име на контакта или адрес на ел. поща.';
 $messages['notuploadedwarning'] = 'Все още не са качени всички прикачени файлове. Моля изчакайте или откажете качването.';
 $messages['searchsuccessful'] = '$nr писма намерени.';
@@ -192,7 +191,6 @@ $messages['invalidimageformat'] = 'Невалиден формат на изоб
 $messages['mispellingsfound'] = 'В писмото са намерени правописни грешки.';
 $messages['parentnotwritable'] = 'Неуспешно създаването/преместването на папка в избраната основна папка. Няма права за достъп.';
 $messages['messagetoobig'] = 'Писмото е прекалено голямо, за да бъде обработено.';
-$messages['attachmentvalidationerror'] = 'ВНИМАНИЕ! Прикаченият файл е опасен, защото типът му не съвпада с този, който е деклариран в писмото.<br/><br/><em>Очакван тип: $expected; открит тип: $detected</em>';
 $messages['noscriptwarning'] = 'ВНИМАНИЕ! Тази пощенска услуга изисква JavaScript за да функционира коректно. Моля включете поддръжката на JavaScript в настройките на текущия браузър.';
 $messages['messageissent'] = 'Писмото беше изпратено, но все още не е запазено. Желаете ли да го запазите сега?';
 $messages['errnotfound'] = 'Файлът не е намерен';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index 0cad5355b..a24f3604b 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -128,6 +128,7 @@ $labels['unanswered'] = 'উত্তর না দেওয়া গুলো';
 $labels['filter'] = 'ছাকনি';
 $labels['list'] = 'তালিকা';
 $labels['nonesort'] = 'কোনোটাই না';
+$labels['layoutlist'] = 'তালিকা';
 $labels['compact'] = 'টাইটকরুন';
 $labels['empty'] = 'খালিকরুন';
 $labels['quota'] = 'ডিস্ক এ খালি যায়গা';
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index 84165bb37..f3362a44e 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -51,7 +51,6 @@ $messages['nopagesizewarning'] = 'দয়া করে পৃষ্ঠার স�
 $messages['norecipientwarning'] = 'দয়া করে একজন প্রাপক এর ই-মেইলটা লিখুন';
 $messages['nosubjectwarning']  = 'বিষয় হিসাবে কিছু লেখা হয়নি, আপনি কি কিছু লিখবেন এখন বিষয় হিসাবে?';
 $messages['nobodywarning'] = 'কোনো কিছু না লিখেই এই চিঠি পাঠিয়ে দেবেন?';
-$messages['noldapserver'] = 'দয়া করে একটি এল্ডাপ সারভার বেছে নিন সার্চ করার জন্যে';
 $messages['nosearchname'] = 'দয়া করে একজনের নাম অথবা ই-মেইল লিখুন';
 $messages['searchsuccessful'] = '$nr টা চিঠি পাওয়া গেছে';
 $messages['searchnomatch'] = 'খুজে কিছু পাওয়া গেলোনা';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 9fffb23c8..b3089a2a0 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'E-giz anlennet';
 $labels['markflagged']      = 'spilhennet';
 $labels['markunflagged']    = 'n\'eo ket bet spilhennet';
 $labels['moreactions']      = 'muioc\'h a dibab';
+$labels['folders-all']      = 'Holl teuliadoù';
 $labels['more']             = 'muioc\'h';
 $labels['back']             = 'distro';
 $labels['options']          = 'Dibarzhioù';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Roll bannoù';
 $labels['listsorting'] = 'Bann rummañ';
 $labels['listorder'] = 'Urzh ar rummañ';
 $labels['listmode'] = 'Mod roll';
+$labels['layoutlist'] = 'Listennañ';
 $labels['folderactions'] = 'Gweredoù an teuliad...';
 $labels['compact'] = 'Koazhet';
 $labels['empty'] = 'Goulo';
@@ -335,11 +337,13 @@ $labels['contacts'] = 'darempred';
 $labels['contactproperties'] = 'Perzhioù an darempred';
 $labels['contactnameandorg'] = 'Anv hag aozadur';
 $labels['personalinfo'] = 'Titouroù personel';
+$labels['personal'] = 'Personel';
 $labels['contactphoto'] = 'Skeudenn darempred';
 $labels['edit']   = 'Embann';
 $labels['cancel'] = 'Nullañ';
 $labels['save']   = 'Enrollañ';
 $labels['delete'] = 'Dilemel';
+$labels['discard'] = 'Dilezel';
 $labels['rename'] = 'Adenvel';
 $labels['addphoto'] = 'Ouzhpennañ';
 $labels['replacephoto'] = 'Amsaviñ';
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 66ef1850b..dd4c026c1 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -95,7 +95,6 @@ $messages['norecipientwarning'] = 'Ouzhpennit ur resever da nebeutañ mar plij g
 $messages['nosubjectwarning']  = 'Dileun eo ar maezienn « Sujed » . C\'hoant hoc\'h eus da leuniañ anezhiñ diouzhtu ?';
 $messages['nobodywarning'] = 'Kas ar c\'hemennad hep testenn ?';
 $messages['restoresavedcomposedata'] = 'Kavet ez eus bet ur gemennadenn skrivet ha n\'eo ket bet kaset.\n\nDanvez: $subject\nEnrollet: $date\n\nFellout a ra deoc\'h assav ar gemennadenn-mañ?';
-$messages['noldapserver'] = 'Dizuit ur servijer LDAP evit ar glask';
 $messages['nosearchname'] = 'Skrivit un anv darempred pe ur postel elektronek';
 $messages['notuploadedwarning'] = 'N\'eo ket bet pellgaset an holl genstagadennoù c\'hoazh. Gortozit pe nullit ar pellgas.';
 $messages['searchsuccessful'] = '$nr kemennad kavet';
@@ -187,7 +186,6 @@ $messages['invalidimageformat'] = 'N\'eo ket ur mentrezh skeudenn talvoudek.';
 $messages['mispellingsfound'] = 'Dinoet ez eus bet fazioù reizhskrivañ er gemennadenn.';
 $messages['parentnotwritable'] = 'N\'haller ket krouiñ/dilec\'hiañ an teuliad en teuliad kar dibabet. N\'ho peus ket an aotre haeziñ.';
 $messages['messagetoobig'] = 'Re vras eo al lodenn gemennadenn evit he c\'heweriañ.';
-$messages['attachmentvalidationerror'] = 'DIWALLIT! Disfizius eo ar genstagadenn peogwir e rizh ne glot gant gant an hini diskleriet er gemennadenn. Ma n\'ho peus ket fiziañs er c\'haser eo gwelloc\'h deoc\'h chom hep he digeriñ er merdeer dre ma c\'hall enderc\'hel meziantoù arvarus. <br/><br/><em>Gortozet: $expected; kavet: $detected</em>';
 $messages['noscriptwarning'] = 'Diwallit: Javascript a zo azgoulennet gant ar gwazerezh posteloù-mañ! Evit e arverañ, gweredekait Javascript e arventennoù ho merdeer.';
 $messages['messageissent'] = 'Kaset eo bet ar gemennadenn endeo, met n\'eo ket bet enrollet. Fellout a ra deoc\'h he enrollañ bremañ?';
 $messages['errnotfound'] = 'Restr ebet kavet';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index b22775c50..2942d69e3 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Kao nepročitane';
 $labels['markflagged']      = 'Kao važne';
 $labels['markunflagged']    = 'Kao nevažne';
 $labels['moreactions']      = 'Više akcija...';
+$labels['folders-all']      = 'Svi folder';
 $labels['more']             = 'Više';
 $labels['back']             = 'Nazad';
 $labels['options']          = 'Opcije';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Lista kolona';
 $labels['listsorting'] = 'Sortiranje kolona';
 $labels['listorder'] = 'Raspored sortiranja';
 $labels['listmode'] = 'Način prikaza liste';
+$labels['layoutlist'] = 'Lista';
 $labels['folderactions'] = 'Akcije za foldere...';
 $labels['compact'] = 'Optimiziraj';
 $labels['empty'] = 'Isprazni';
@@ -320,11 +322,13 @@ $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Svojstva kontakta';
 $labels['contactnameandorg'] = 'Ime i organizacija';
 $labels['personalinfo'] = 'Lični podaci';
+$labels['personal'] = 'Lično';
 $labels['contactphoto'] = 'Kontakt fotografija';
 $labels['edit']   = 'Uredi';
 $labels['cancel'] = 'Otkaži';
 $labels['save']   = 'Sačuvaj';
 $labels['delete'] = 'Obriši';
+$labels['discard'] = 'Odbaci';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamijeni';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 6e3dc998a..cfc79ca97 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Molimo vas da upišete barem jednog primaoca.
 $messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['restoresavedcomposedata'] = 'Pronađena je prethodno napisana poruka koja nije poslana..\n\nTema:$subject\nSnimljeno: $date\n\nŽelite li vratiti ovu poruku?';
-$messages['noldapserver'] = 'Molimo vas da odaberete LDAP server za pretragu.';
 $messages['nosearchname'] = 'Molimo vas da upišete ime kontakta ili email adresu.';
 $messages['notuploadedwarning'] = 'Neki od priloga još nisu dodani na server. Molimo vas da sačekate ili da otkažete dodavanje.';
 $messages['searchsuccessful'] = 'Broj pronađenih poruka: $nr';
@@ -170,7 +169,6 @@ $messages['invalidimageformat'] = 'Format slike nije ispravan.';
 $messages['mispellingsfound'] = 'Pronađene su pravopisne greške u ovoj poruci.';
 $messages['parentnotwritable'] = 'Nije moguće kreirati/premjestiti folder u odabrani matični folder. Nemate prava pristupa.';
 $messages['messagetoobig'] = 'Dio poruke je prevelik za procesiranje.';
-$messages['attachmentvalidationerror'] = 'UPOZORENJE! Ovaj prilog je sumnjiv zbog toga što se njegov tip ne poklapa s tipom navedenim u poruci. Ako nemate povjerenja u pošiljaova, ne biste trebali da otvarate ovaj prilog u vašem browseru jer bi on mogao da sadrži zlonamjerni sadržaj.<br/><br/><em>Očekivano: $expected; pronađeno: $detected</em>';
 $messages['noscriptwarning'] = 'Upozorenje! Ovom webmail servisu je potreban Javascript! Da biste ga mogli koristiti, prvo je potrebno da omogućite Javascript u postavkama vašeg browsera.';
 $messages['messageissent'] = 'Poruka je već poslana, ali nije sačuvana. Želite li sada da je sačuvate?';
 $messages['errnotfound'] = 'Fajl nije pronađen';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 0d01be039..7bf1c9738 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -346,11 +346,13 @@ $labels['contacts'] = 'Contactes';
 $labels['contactproperties'] = 'Propietats del contacte';
 $labels['contactnameandorg'] = 'Nom i Organització';
 $labels['personalinfo'] = 'Informació personal';
+$labels['personal'] = 'Personal';
 $labels['contactphoto'] = 'Foto de contacte';
 $labels['edit']   = 'Edita';
 $labels['cancel'] = 'Cancel·la';
 $labels['save']   = 'Desa';
 $labels['delete'] = 'Suprimeix';
+$labels['discard'] = 'Descarta';
 $labels['rename'] = 'Reanomena';
 $labels['addphoto'] = 'Afegeix';
 $labels['replacephoto'] = 'Reemplaça';
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index 13a1e0e24..0f943108d 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -98,7 +98,6 @@ $messages['nosubjecttitle']  = 'Sense assumpte';
 $messages['nobodywarning'] = 'Voleu enviar aquest missatge sense text?';
 $messages['notsentwarning'] = 'El missatge no s\'ha pogut enviar i té canvis no desats. Voleu descartar aquests canvis?';
 $messages['restoresavedcomposedata'] = 'S\'ha trobat un missatge començat però que no ha estat enviat.\n\nAssumpte: $subject\nDesat: $date\n\nVoleu recuperar aquest missatge?';
-$messages['noldapserver'] = 'Si us plau, seleccioneu un servidor LDAP per cercar.';
 $messages['nosearchname'] = 'Si us plau, introduïu un nom de contacte o una adreça de correu.';
 $messages['notuploadedwarning'] = 'Encara no s\'han pujat tots els adjunts. Si us plau, espereu o cancel·leu la pujada.';
 $messages['searchsuccessful'] = '$nr missatges trobats.';
@@ -191,7 +190,6 @@ $messages['invalidimageformat'] = 'No és un format d\'imatge vàlid.';
 $messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al missatge.';
 $messages['parentnotwritable'] = 'No s\'ha pogut 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 processar-la.';
-$messages['attachmentvalidationerror'] = 'ATENCIÓ! Aquest adjunt és sospitós perquè el seu tipus no coincideix amb el tipus declarat al missatge. Si no confieu en l\'emissor, no l\'hauríeu d\'obrir al navegador perquè pot contenir elements maliciosos. <br/><br/><em>S\'esperava: $expected; s\'ha trobat: $detected</em>';
 $messages['noscriptwarning'] = 'Atenció: Aquest client de correu necessita Javascript! Per a poder fer-lo servir heu d\'activar Javascript a les opcions del navegador.';
 $messages['messageissent'] = 'El missatge ja ha estat enviat, però encara no s\'ha desat. Voleu desar-lo ara?';
 $messages['errnotfound'] = 'No s\'ha trobat el fitxer';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 686a69432..aff72685d 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -20,6 +20,7 @@ $labels['username']  = 'Uživatel';
 $labels['password']  = 'Heslo';
 $labels['server']    = 'Server';
 $labels['login']     = 'Přihlásit';
+$labels['menu']     = 'Menu';
 $labels['logout']   = 'Odhlásit';
 $labels['mail']     = 'E-mail';
 $labels['settings'] = 'Nastavení';
@@ -44,6 +45,7 @@ $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizace';
 $labels['readstatus'] = 'Přečteno';
 $labels['listoptions'] = 'Seznam  možností ...';
+$labels['listoptionstitle'] = 'Možnosti seznamu';
 $labels['mailboxlist'] = 'Složky';
 $labels['messagesfromto'] = 'Zprávy $from až $to z celkem $count';
 $labels['threadsfromto'] = 'Konverzace $from až $to z celkem $count';
@@ -112,6 +114,8 @@ $labels['forward']          = 'Přeposlat';
 $labels['forwardinline']    = 'Přeposlat v textu';
 $labels['forwardattachment'] = 'Přeposlat jako přílohu';
 $labels['forwardmessage']   = 'Předat zprávu';
+$labels['bouncemsg']        = 'Přeposlat (bounce)';
+$labels['bounce']           = 'Přeposlat';
 $labels['deletemessage']    = 'Odstranit zprávu';
 $labels['movemessagetotrash'] = 'Přesunout zprávu do koše';
 $labels['printmessage']     = 'Vytisknout zprávu';
@@ -128,9 +132,16 @@ $labels['markunread']       = 'Jako nepřečtené';
 $labels['markflagged']      = 'Jako označené';
 $labels['markunflagged']    = 'Jako neoznačené';
 $labels['moreactions']      = 'Další akce...';
+$labels['markallread']      = 'Označit vše jako přečtené';
+$labels['folders-cur']      = 'Vybrat pouze složku';
+$labels['folders-sub']      = 'Vybrat složku a její podsložky';
+$labels['folders-all']      = 'Všechny složky';
 $labels['more']             = 'Více';
 $labels['back']             = 'Zpět';
 $labels['options']          = 'Možnosti';
+$labels['composeoptions']   = 'Možnosti psaní';
+$labels['optionsandattachments'] = 'Nastavení a přílohy';
+$labels['actions']          = 'Akce';
 $labels['first'] = 'První';
 $labels['last'] = 'Poslední';
 $labels['previous'] = 'Předchozí';
@@ -172,6 +183,14 @@ $labels['listcolumns'] = 'Seznam sloupců';
 $labels['listsorting'] = 'Třídění sloupců';
 $labels['listorder'] = 'Uspořádání';
 $labels['listmode'] = 'Režim zobrazení seznamu';
+$labels['lmode'] = 'Podoba výpisu';
+$labels['layout'] = 'Rozvržení';
+$labels['layoutwidescreen'] = 'Widescreen';
+$labels['layoutdesktop'] = 'Desktop';
+$labels['layoutlist'] = 'Seznam';
+$labels['layoutwidescreendesc'] = 'Widescreen (3 sloupce)';
+$labels['layoutdesktopdesc'] = 'Desktop (seznam + náhled)';
+$labels['layoutlistdesc'] = 'Seznam (bez náhledu)';
 $labels['folderactions'] = 'Akce se složkou...';
 $labels['compact'] = 'Zmenšit';
 $labels['empty'] = 'Vyprázdnit';
@@ -184,7 +203,11 @@ $labels['quotatotal'] = 'Limit';
 $labels['quotaused'] = 'Využito';
 $labels['quotastorage'] = 'Využití schránky';
 $labels['quotamessage'] = 'Počet zpráv';
+$labels['shortheaderdate'] = 'Dne $date';
+$labels['shortheaderto'] = 'Pro $to dne $date';
+$labels['shortheaderfrom'] = 'Od $from dne $date';
 $labels['quicksearch']  = 'Rychlé vyhledávání';
+$labels['searchplaceholder']  = 'Hledat...';
 $labels['resetsearch']  = 'Zrušit vyhledávání';
 $labels['searchmod']  = 'Parametry hledání';
 $labels['msgtext']  = 'Celá zpráva';
@@ -229,7 +252,9 @@ $labels['keyid']          = 'ID Klíče';
 $labels['keylength']      = 'Bitů';
 $labels['keyexpired']     = 'Vypršelý';
 $labels['keyrevoked']     = 'Odvolaný';
-$labels['editidents']    = 'Editovat identity';
+$labels['bccinstead']     = 'Použít skrytou kopii';
+$labels['addheader']      = 'Přidat příjemce (hlavička)';
+$labels['editidents']    = 'Upravit identity';
 $labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Zkontrolovat pravopis';
 $labels['resumeediting'] = 'Pokračovat v úpravách';
@@ -261,9 +286,13 @@ $labels['high']    = 'Vysoká';
 $labels['highest'] = 'Nejvyšší';
 $labels['nosubject']  = '(bez predmetu)';
 $labels['showimages'] = 'Zobrazit obrázky';
+$labels['allow']      = 'Povolit';
 $labels['alwaysshow'] = 'Vždy ukazovat obrázky od $sender';
+$labels['alwaysallow'] = 'Vždy povolit od $sender';
 $labels['isdraft']    = 'Toto je šablona zprávy.';
 $labels['andnmore']   = '$nr dalších...';
+$labels['headers']    = 'Hlavičky';
+$labels['envelope']   = 'Obálka';
 $labels['togglemoreheaders'] = 'Zobrazit více hlaviček zprávy';
 $labels['togglefullheaders'] = 'Přepnout skutečné hlavičky zprávy';
 $labels['htmltoggle'] = 'HTML';
@@ -315,6 +344,7 @@ $labels['advsearch'] = 'Pokročilé vyhledávání';
 $labels['advanced'] = 'Pokročilé';
 $labels['other'] = 'Ostatní';
 $labels['printcontact'] = 'Vytisknout kontakt';
+$labels['qrcode'] = 'QR kód';
 $labels['typehome']   = 'Domací';
 $labels['typework']   = 'Pracovní';
 $labels['typeother']  = 'Ostatní';
@@ -336,11 +366,15 @@ $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Vlastnosti kontaktu';
 $labels['contactnameandorg'] = 'Jméno a Organizace';
 $labels['personalinfo'] = 'Osobní informace';
+$labels['personal'] = 'Osobní';
 $labels['contactphoto'] = 'Fotografie kontaktu';
 $labels['edit']   = 'Upravit';
 $labels['cancel'] = 'Konec';
 $labels['save']   = 'Uložit';
 $labels['delete'] = 'Smazat';
+$labels['discard'] = 'Zahodit';
+$labels['continue'] = 'Pokračovat';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Přejmenovat';
 $labels['addphoto'] = 'Přidat';
 $labels['replacephoto'] = 'Změnit';
@@ -431,6 +465,7 @@ $labels['skipdeleted'] = 'Nezobrazovat smazané zprávy';
 $labels['deletealways'] = 'Odstranit zprávy, pokud selže jejich přesun do koše';
 $labels['deletejunk'] = 'Přímo mazat zprávy ze složky Nevyžádaná pošta';
 $labels['showremoteimages'] = 'Zobrazovat obrázky uložené mimo mail';
+$labels['allowremoteresources'] = 'Povolit vzdálené zdroje (obrázky, styly)';
 $labels['fromknownsenders'] = 'od známých uživatelů';
 $labels['always'] = 'vždy';
 $labels['alwaysbutplain'] = 'vždy, pokud se neodpovídá na zprávu ve formátu plain text';
@@ -463,6 +498,7 @@ $labels['signatureoptions'] = 'Nastavení podpisu';
 $labels['whenreplying'] = 'Při odpovídání';
 $labels['replyempty'] = 'necitovat původní zprávu';
 $labels['replytopposting'] = 'začít novou zprávu nad původní';
+$labels['replytoppostingnoindent'] = 'Začít novou zprávu nad citovanou (bez odsazení)';
 $labels['replybottomposting'] = 'začít novou zprávu pod původní';
 $labels['replyremovesignature'] = 'Při odpovídání odstranit ze zprávy původní podpis';
 $labels['autoaddsignature'] = 'Automaticky přidat podpis';
@@ -471,6 +507,7 @@ $labels['replyandforwardonly'] = 'jen k odpovědi a přeposílané zprávě';
 $labels['insertsignature'] = 'Vložit podpis';
 $labels['sigbelow'] = 'Vkládat podpis pod citovanou zprávu';
 $labels['sigseparator'] = 'Vynutit standardní oddělovač v podpisech';
+$labels['automarkread']  = 'Označit zprávy jako přečtené';
 $labels['afternseconds']  = 'po $n sekundách';
 $labels['reqmdn'] = 'Vždy požadovat doručenku';
 $labels['reqdsn'] = 'Vždy požádat o oznámení o stavu doručení';
@@ -513,9 +550,14 @@ $labels['personalfolder'] = 'Soukromá složka';
 $labels['otherfolder'] = 'Složky ostatních uživatelů';
 $labels['sharedfolder'] = 'Sdílená složka';
 $labels['findfolders'] = 'Hledat složky';
+$labels['findcontacts'] = 'Najít kontakty';
+$labels['findmail'] = 'Najít zprávy';
 $labels['namespace.personal'] = 'Osobní';
 $labels['namespace.other'] = 'Jiných uživatelů';
 $labels['namespace.shared'] = 'Sdílené';
+$labels['dualuselabel'] = 'Může obsahovat pouze';
+$labels['dualusemail'] = 'zprávy';
+$labels['dualusefolder'] = 'složky';
 $labels['sortby'] = 'Seřadit podle';
 $labels['sortasc']  = 'Seřadit vzestupně';
 $labels['sortdesc'] = 'Seřadit sestupně';
@@ -526,6 +568,13 @@ $labels['version'] = 'Verze';
 $labels['source'] = 'Zdroj';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Podpora';
+$labels['savedsearches'] = 'Uložená vyhledávání';
+$labels['dateformatY'] = 'RRRR';
+$labels['dateformaty'] = 'RR';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -580,6 +629,8 @@ $labels['arialabelmarkmessagesas'] = 'Označit vybrané zprávy jako...';
 $labels['arialabelcomposeoptions'] = 'Možnosti kompozice';
 $labels['arialabelresponsesmenu'] = 'Menu pro předpřipravené odpovědi';
 $labels['arialabelattachmentuploadform'] = 'Formulář pro vložení přílohy';
+$labels['arialabelattachmentmenu'] = 'Možnosti přílohy';
+$labels['arialabelmailtomenu'] = 'Možnosti e-mailové adresy';
 $labels['arialabelattachmentpreview'] = 'Náhled přílohy';
 $labels['ariasummarycomposecontacts'] = 'Seznam kontaktů a skupin pro výběr příjemců';
 $labels['arialabelcontactexportoptions'] = 'Možnosti pro export kontaktu';
@@ -588,6 +639,8 @@ $labels['arialabelpreferencesform'] = 'Formulář preferencí';
 $labels['arialabelidentityeditfrom'] = 'Formulář pro úpravu identity';
 $labels['arialabelresonseeditfrom'] = 'Formulář pro úpravu odpovědi';
 $labels['arialabelsearchterms'] = 'Výrazy pro vyhledávání';
+$labels['arialabeldropactionmenu'] = 'Drag-n-Drop akční menu';
+$labels['arialabelheadersmenu'] = 'Menu přidání příjemce (hlavička)';
 $labels['helplistnavigation'] = 'Seznam navigace pomocí klávesnice';
 $labels['helplistkeyboardnavigation'] = "Šipky nahoru/dolu: Posunout výběr/označení řádku.
 Mezerník: Označit vybraný řádek.
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 0b45e8fcb..a87c45c88 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -51,10 +51,12 @@ $messages['messagesaved'] = 'Zpráva uložena do Rozepsané';
 $messages['successfullysaved'] = 'Uloženo';
 $messages['savingresponse'] = 'Ukládám text odpovědi...';
 $messages['deleteresponseconfirm'] = 'Opravdu chcete odstranit tento text odpovědi?';
+$messages['nocontactselected'] = 'Dosud jste nevybrali kontakt.';
 $messages['addedsuccessfully'] = 'Kontakt byl úspěšně přidán do adresáře';
 $messages['contactexists'] = 'Kontakt se zadanou e-mailovou adresou již existuje';
 $messages['contactnameexists'] = 'Kontakt se stejným jménem již existuje';
 $messages['blockedimages'] = 'Z bezpečnostních důvodů byly zablokovány obrázky ve zprávě.';
+$messages['blockedresources'] = 'Z důvodu ochrany soukromí bylo zablokováno načtení vzdálených zdrojů';
 $messages['encryptedmessage'] = 'Tato zpráva je zašifrovaná a nelze ji zobrazit.';
 $messages['externalmessagedecryption'] = 'Toto je šifrovaná zpráva a může být dešifrována pomocí rozšíření ve vašem prohlížeči.';
 $messages['nopubkeyfor'] = 'Nenalezen validní veřejný klíč pro $email';
@@ -75,6 +77,8 @@ $messages['errormoving'] = 'Nemohu přesunout zprávu';
 $messages['errorcopying'] = 'Nemohu zkopírovat zprávu';
 $messages['errordeleting'] = 'Nemohu smazat zprávu';
 $messages['errormarking'] = 'Zprávu nelze označit';
+$messages['alerttitle'] = 'Pozor';
+$messages['confirmationtitle'] = 'Jste si jistý...';
 $messages['deletecontactconfirm']  = 'Opravdu chcete smazat označené kontakty?';
 $messages['deletegroupconfirm']  = 'Opravdu chcete smazat skupinu?';
 $messages['deletemessagesconfirm'] = 'Opravdu chcete smazat označené zprávy?';
@@ -91,11 +95,15 @@ $messages['noemailwarning'] = 'Zadejte, prosím, platnou e-mailovou adresu';
 $messages['nonamewarning']  = 'Zadejte, prosím, jméno';
 $messages['nopagesizewarning'] = 'Zadejte, prosím, velikost stránky';
 $messages['nosenderwarning'] = 'Zadejte e-mailovou adresu odesílatele';
+$messages['recipientsadded'] = 'Příjemci byli přidáni.';
 $messages['norecipientwarning'] = 'Zadejte, prosím, alespoň jednoho příjemce';
+$messages['disclosedrecipwarning'] = 'Všichni příjemci uvidí adresy ostatních příjemců. Pro ochranu soukromí příjemců můžete použít pole Skrytá kopie (Bcc).';
+$messages['disclosedreciptitle'] = 'Příliš mnoho veřejných příjemců';
 $messages['nosubjectwarning']  = 'Předmět nebyl vyplněn. Přejete si jej zadat nyní?';
+$messages['nosubjecttitle']  = 'Žádný předmět';
 $messages['nobodywarning'] = 'Opravdu chtete odeslat prázdnou zprávu?';
+$messages['notsentwarning'] = 'Zpráva nebyla odeslána a obsahuje neuložené změny. Přejete si změny zahodit?';
 $messages['restoresavedcomposedata'] = 'Byla nalezena dříve vytvořená ale neodeslaná zpráva.\n\nPředmět: $subject\nUloženo: $date\n\nPřejete si obnovit tuto zprávu?';
-$messages['noldapserver'] = 'Zvolte, prosím, LDAP server k hledání';
 $messages['nosearchname'] = 'Zadejte, prosím, jméno nebo e-mail kontaktu';
 $messages['notuploadedwarning'] = 'Ještě nebyly nahrány všechny přílohy. Počkejte prosím nebo nahrávání zrušte.';
 $messages['searchsuccessful'] = 'Nalezeno $nr zpráv';
@@ -116,6 +124,8 @@ $messages['messageopenerror'] = 'Nemohu načíst zprávu ze serveru';
 $messages['filelinkerror'] = 'Přikládání souboru selhalo.';
 $messages['fileuploaderror'] = 'Nahrávání souboru selhalo';
 $messages['filesizeerror'] = 'Soubor přesáhl maximální velikost $size';
+$messages['filecounterror'] = 'Můžete nahrát maximálně $count souborů najednou.';
+$messages['msgsizeerror'] = 'Selhalo připojení souboru. Byla překročena maximální velikost zprávy ($size.)';
 $messages['copysuccess'] = 'Úspěšně zkopírováno $nr kontaktů.';
 $messages['movesuccess'] = 'Úspěšně přesunuto $nr kontaktů.';
 $messages['copyerror'] = 'Kontakty nelze kopírovat.';
@@ -155,6 +165,8 @@ $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['smtputf8error'] = 'Chyba SMTP: Server nepodporuje Unicode v e-mailové adrese.';
+$messages['smtpsizeerror'] = 'SMTP chyba: Zpráva překročila limit serveru ($limit)';
 $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.';
@@ -187,7 +199,7 @@ $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í.';
-$messages['attachmentvalidationerror'] = 'Varování: Tato příloha je podezřelá, protože její typ se neshoduje s typem uvedeným ve zprávě. Pokud nedůvěřujete odesílateli, neměli byste přílohu otevírat v prohlížeči, protože může obsahovat škodlivý obsah.<br/><br/><em>Očekáváno: $expected; nalezeno: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Tato příloha je podezřelá, protože její typ se neshoduje s typem uvedeným ve zprávě. Pokud nedůvěřujete odesílateli, neměli byste přílohu otevírat v prohlížeči, protože může obsahovat škodlivý obsah.<br/><br/><em>Očekáváno: $expected; nalezeno: $detected</em>';
 $messages['noscriptwarning'] = 'Upozornění: Tato emailová aplikace vyžaduje Javascript! Prosím, zapněte Javascript v nastavení prohlížeče.';
 $messages['messageissent'] = 'Zpráva již byla odeslána, ovšem ještě nebyla uložena. Přejete si ji uložit nyní?';
 $messages['errnotfound'] = 'Soubor nebyl nalezen';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index fbd3039cf..5f2f33882 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Pob ffolder';
 $labels['more']             = 'Mwy';
 $labels['back']             = 'Yn ôl';
 $labels['options']          = 'Dewisiadau';
+$labels['composeoptions']   = 'Dewisiadau ysgrifennu';
+$labels['optionsandattachments'] = 'Dewisiadau ac atodiadau';
+$labels['actions']          = 'Gweithredoedd';
 $labels['first'] = 'Cyntaf';
 $labels['last'] = 'Olaf';
 $labels['previous'] = 'Blaenorol';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Rhestr colofnau';
 $labels['listsorting'] = 'Colofn trefnu';
 $labels['listorder'] = 'Trefn didoli';
 $labels['listmode'] = 'Golwg rhestr';
+$labels['lmode'] = 'Golwg rhestr';
 $labels['layout'] = 'Cynllun';
 $labels['layoutwidescreen'] = 'Sgrîn lydan';
 $labels['layoutdesktop'] = 'Pen bwrdd';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Cyfyngiad';
 $labels['quotaused'] = 'Defnyddiwyd';
 $labels['quotastorage'] = 'Gofod disg';
 $labels['quotamessage'] = 'Nifer negeseuon';
+$labels['shortheaderdate'] = 'Ar $date';
+$labels['shortheaderto'] = 'I $to ar $date';
+$labels['shortheaderfrom'] = 'O $from i $date';
 $labels['quicksearch']  = 'Chwiliad cyflym';
 $labels['searchplaceholder']  = 'Chwilio...';
 $labels['resetsearch']  = 'Ail-osod chwiliad';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Didiau';
 $labels['keyexpired']     = 'Wedi darfod';
 $labels['keyrevoked']     = 'Wedi dirymu';
 $labels['bccinstead']     = 'Defnyddio Bcc';
+$labels['addheader']      = 'Ychwanegu derbynnydd (pennawd)';
 $labels['editidents']    = 'Golygu personoliaethau';
 $labels['spellcheck']    = 'Sillafu';
 $labels['checkspelling'] = 'Gwirio sillafu';
@@ -278,9 +286,13 @@ $labels['high']    = 'Uchel';
 $labels['highest'] = 'Uchaf';
 $labels['nosubject']  = '(dim pwnc)';
 $labels['showimages'] = 'Dangos lluniau';
+$labels['allow']      = 'Caniatau';
 $labels['alwaysshow'] = 'Dangos lluniau bob amser o $sender';
+$labels['alwaysallow'] = 'Caniatau bob amser o $sender';
 $labels['isdraft']    = 'Mae hwn yn neges ddrafft';
 $labels['andnmore']   = '$nr mwy...';
+$labels['headers']    = 'Penawdau';
+$labels['envelope']   = 'Amlen';
 $labels['togglemoreheaders'] = 'Dangos fwy o benynnau\'r neges';
 $labels['togglefullheaders'] = 'Toglo penawdau llawn y neges';
 $labels['htmltoggle'] = 'HTML';
@@ -354,11 +366,15 @@ $labels['contacts'] = 'Cysylltiadau';
 $labels['contactproperties'] = 'Nodweddion cyswllt';
 $labels['contactnameandorg'] = 'Enw a Corff';
 $labels['personalinfo'] = 'Gwybodaeth bersonol';
+$labels['personal'] = 'Persono';
 $labels['contactphoto'] = 'Llun cyswllt';
 $labels['edit']   = 'Golygu';
 $labels['cancel'] = 'Canslo';
 $labels['save']   = 'Cadw';
 $labels['delete'] = 'Dileu';
+$labels['discard'] = 'Gwaredu';
+$labels['continue'] = 'Parhau';
+$labels['ok'] = 'Iawn';
 $labels['rename'] = 'Ail-enwi';
 $labels['addphoto'] = 'Ychwanegu';
 $labels['replacephoto'] = 'Amnewid';
@@ -449,6 +465,7 @@ $labels['skipdeleted'] = 'Peidio dangos negesuon wedi ei dileu';
 $labels['deletealways'] = 'Pan fod symud negeseuon i\'r Sbwriel yn methu, dileu nhw';
 $labels['deletejunk'] = 'Dileu negeseuon yn uniongyrchol yn Sbwriel';
 $labels['showremoteimages'] = 'Dangos lluniau o wefannau allanol';
+$labels['allowremoteresources'] = 'Caniatau adnoddau pell (delweddau, arddulliau)';
 $labels['fromknownsenders'] = 'o ddanfonwyr hysbys';
 $labels['always'] = 'bob amser';
 $labels['alwaysbutplain'] = 'bob amser, heblaw pan yn ymateb i destun plaen';
@@ -490,6 +507,7 @@ $labels['replyandforwardonly'] = 'atebion a danfon ymlaen yn unig';
 $labels['insertsignature'] = 'Mewnosod llofnod';
 $labels['sigbelow'] = 'Rhowch y llofnod o dan y neges wedi wreiddiol';
 $labels['sigseparator'] = 'Gorfodi gwahanwr safonol yn y llofnodion';
+$labels['automarkread']  = 'Nodi\'r negeseuon fel darllenwyd';
 $labels['afternseconds']  = 'ar ôl $n eiliad';
 $labels['reqmdn'] = 'Bob amser gofyn am dderbynneb danfon';
 $labels['reqdsn'] = 'Gofyn am hysbysiad statws danfon bob amser';
@@ -551,6 +569,12 @@ $labels['source'] = 'Ffynhonnell';
 $labels['license'] = 'Trwydded';
 $labels['support'] = 'Gofyn am gymorth';
 $labels['savedsearches'] = 'Chwiliadau wedi cadw';
+$labels['dateformatY'] = 'BBBB';
+$labels['dateformaty'] = 'BB';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -606,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Dewisiadau ysgrifennu';
 $labels['arialabelresponsesmenu'] = 'Bwydlen ymatebion parod';
 $labels['arialabelattachmentuploadform'] = 'Ffurflen lanlwytho atodiad';
 $labels['arialabelattachmentmenu'] = 'Dewisiadau atodiad';
+$labels['arialabelmailtomenu'] = 'Dewisiadau cyfeiriad ebost';
 $labels['arialabelattachmentpreview'] = 'Rhagolwg atodiad';
 $labels['ariasummarycomposecontacts'] = 'Rhestr o gysylltiadau a grwpiau i ddewis fel derbynwyr';
 $labels['arialabelcontactexportoptions'] = 'Dewisiadau allforio cysylltiadau';
@@ -615,6 +640,7 @@ $labels['arialabelidentityeditfrom'] = 'Ffurflen golygu personoliaeth';
 $labels['arialabelresonseeditfrom'] = 'Ffurflen golygu ymateb';
 $labels['arialabelsearchterms'] = 'Chwilio termau';
 $labels['arialabeldropactionmenu'] = 'Bwydlen Llusgo-a-Gollwng';
+$labels['arialabelheadersmenu'] = 'Bwydlen ychwanegu derbynnydd (pennawd)';
 $labels['helplistnavigation'] = 'Rhestru llywio bysellfwrdd';
 $labels['helplistkeyboardnavigation'] = "Saeth fyny/lawr: Symud dewis/ffocws dan sylw.
 Bwlch: Dewis rhes dan sylw.
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 07ef81325..888a3410a 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -55,6 +55,7 @@ $messages['addedsuccessfully'] = 'Cyswllt wedi ei ychwanegu i\'r llyfr cyfeiriad
 $messages['contactexists'] = 'Mae cyswllt gyda\'r cyfeiriad e-bost yma yn bodoli\'n barod';
 $messages['contactnameexists'] = 'Mae cyswllt gyda\'r un enw yn bodoli yn barod.';
 $messages['blockedimages'] = 'I amddiffyn eich preifatrwydd, fe ataliwyd lluniau allanol yn y neges yma.';
+$messages['blockedresources'] = 'I amddiffyn eich preifatrwydd, mae adnoddau allanol wedi eu atal.';
 $messages['encryptedmessage'] = 'Mae hon yn neges amgryptedig a felly ni ellir ei ddangos. Flin iawn!';
 $messages['externalmessagedecryption'] = 'Mae hon yn neges amgryptedig a gall ei ddadgryptio gyda estyniad eich porwr.';
 $messages['nopubkeyfor'] = 'Ni chafwyd hyd i allwedd cyhoeddus dilys ar gyfer $email';
@@ -75,6 +76,8 @@ $messages['errormoving'] = 'Methwyd symud y neges';
 $messages['errorcopying'] = 'Methwyd copïo\'r neges(euon)';
 $messages['errordeleting'] = 'Methwyd dileu y neges';
 $messages['errormarking'] = 'Methwyd nodi y neges';
+$messages['alerttitle'] = 'Rhybudd';
+$messages['confirmationtitle'] = 'Ydych chi\'n siwr...';
 $messages['deletecontactconfirm']  = 'Ydych chi wir am ddileu y cysylltiadau ddewiswyd?';
 $messages['deletegroupconfirm']  = 'Ydych chi wir am ddileu\'r grŵp dewiswyd?';
 $messages['deletemessagesconfirm'] = 'Ydych chi wir am ddileu y neges(euon) ddewiswyd?';
@@ -91,6 +94,7 @@ $messages['noemailwarning'] = 'Rhowch gyfeiriad e-bost dilys';
 $messages['nonamewarning']  = 'Rhowch enw';
 $messages['nopagesizewarning'] = 'Rhowch maint tudalen';
 $messages['nosenderwarning'] = 'Rhowch gyfeiriad e-bost y danfonwr';
+$messages['recipientsadded'] = 'Ychwanegwyd derbynnydd/wyr yn llwyddiannus.';
 $messages['norecipientwarning'] = 'Rhowch o leiaf un derbynnydd';
 $messages['disclosedrecipwarning'] = 'Fe fydd pob derbynnydd yn gweld cyfeiriadau ebost pawb arall. I atal hyn ac amddiffyn eu preifatrwydd rhaid i chi ddefnyddio\'r maes Bcc.';
 $messages['disclosedreciptitle'] = 'Gormod o dderbynnwyr cyhoeddus';
@@ -99,7 +103,6 @@ $messages['nosubjecttitle']  = 'Dim pwnc';
 $messages['nobodywarning'] = 'Danfon y neges hwn heb destun?';
 $messages['notsentwarning'] = 'Nid yw\'r neges wedi ei ddanfon a mae ganddo newidiadau heb ei gadw. Hoffech chi gael gwared a\'r newidiadau?';
 $messages['restoresavedcomposedata'] = 'Cafwyd hyd i neges wedi ei ysgrifennu o\'r blaen ond heb ei ddanfon.\n\nPwnc: $subject\nCadwyd: $date\n\nYdych chi am adfer y neges?';
-$messages['noldapserver'] = 'Dewiswch weinydd ldap i chwilio';
 $messages['nosearchname'] = 'Rhowch enw cyswllt neu gyfeiriad e-bost';
 $messages['notuploadedwarning'] = 'Nid yw pob atodiad wedi eu llwytho i fyny eto. Triwch eto neu canslo.';
 $messages['searchsuccessful'] = 'Cafwyd hyd i $nr neges';
@@ -161,6 +164,7 @@ $messages['smtpautherror'] = 'Gwall SMTP ($code): Methwyd dilysu\'r cyfrif';
 $messages['smtpfromerror'] = 'Gwall SMTP ($code): Methwyd gosod y danfonwr "$from" ($msg)';
 $messages['smtptoerror'] = 'Gwall SMTP ($code): Methwyd ychwanegu derbynwr "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Gwall SMTP: Nid oedd yn bosib darllen y rhestr o dderbynnwyr';
+$messages['smtpsizeerror'] = 'Gwall SMTP: Mae maint y neges yn fwy na cyfyngiad y gweinydd ($limit)';
 $messages['smtperror'] = 'Gwall SMTP: $msg';
 $messages['emailformaterror'] = 'Cyfeiriad e-bost anghywir: $email';
 $messages['toomanyrecipients'] = 'Gormod o dderbynnwyr. Lleihewch y nifer i $max';
@@ -193,7 +197,7 @@ $messages['invalidimageformat'] = 'Ddim yn fformat llun dilys.';
 $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.';
-$messages['attachmentvalidationerror'] = 'RHYBUDD! Mae\'r atodiad yn amheus oherwydd nid yw ei fath yn gymharu\'r gyda\'r math ddatganwyd yn y neges. Os nad ydych yn ymddiried yn y danfonwr, ni ddylech agor hwn yn y porwr oherwydd fe all gynnwys ffeil maleisus.<br></br><em>Disgwylwyd:$expected;canfuwyd:$detected</em>';
+$messages['attachmentvalidationerror'] = 'Mae\'r atodiad yn amheus am nad yw ei fath yn cyfateb i\'r math a ddatganir yn y neges. Os nad ydych chi\'n ymddiried yn y danfonwr, ni ddylech chi agor hwn yn eich porwr - galla\'i fod cynnwys maleisus ynddo.<br/><br/><em>Disgwylid: $expected; canfuwyd: $detected</em>';
 $messages['noscriptwarning'] = 'Rhybudd: Mae\'r gwasanaeth gwebost angen Javascript i weithio! Er mwyn ei ddefnyddio, galluogwch Javascript yng ngosodiadau eich porwr.';
 $messages['messageissent'] = 'Mae\'r neges wedi ei anfon, ond heb ei gadw eto. Hoffech chi ei gadw nawr?';
 $messages['errnotfound'] = 'Ni Ganfuwyd y Ffeil';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 785ed1607..30267bb34 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -349,11 +349,13 @@ $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaber';
 $labels['contactnameandorg'] = 'Navn og organisation';
 $labels['personalinfo'] = 'Personlig information';
+$labels['personal'] = 'Personlig';
 $labels['contactphoto'] = 'Kontaktfoto';
 $labels['edit']   = 'Redigér';
 $labels['cancel'] = 'Annullér';
 $labels['save']   = 'Gem';
 $labels['delete'] = 'Slet';
+$labels['discard'] = 'Kasser';
 $labels['rename'] = 'Omdøb';
 $labels['addphoto'] = 'Tilføj';
 $labels['replacephoto'] = 'Erstat';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 9d097f13a..aee2397a8 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -90,7 +90,6 @@ $messages['norecipientwarning'] = 'Indtast mindst én modtager.';
 $messages['nosubjectwarning']  = '\'Emne\'-feltet er tomt. Kunne du tænke dig at skrive et nu?';
 $messages['nobodywarning'] = 'Send denne besked uden tekst?';
 $messages['restoresavedcomposedata'] = 'En tidligere skreven men usendt besked blev fundet.\n\nEmne: $subject\nGemt: $date\n\nØnsker du at gendanne denne besked?';
-$messages['noldapserver'] = 'Vælg venligst hvilken LDAP-server der skal søges i.';
 $messages['nosearchname'] = 'Indtast venligst en kontakts navn eller e-mailadresse.';
 $messages['notuploadedwarning'] = 'Ikke alle vedhæftede filer er blevet uploadet endnu. Vent venligst eller afbryd upload.';
 $messages['searchsuccessful'] = 'Fandt $nr beskeder';
@@ -183,7 +182,6 @@ $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'] = 'Denne del af beskeden er for stor til at blive behandlet.';
-$messages['attachmentvalidationerror'] = 'ADVARSEL! Den vedhæftede fil er mistænkelig - Typen stemmer ikke overens med den oplyste type. Hvis du ikke har tillid til afsender, skal du ikke åbne filen da den kan indholde onsindet indhold. <br/><br/><em>Forventet: $expected; Fundet: $detected</em>';
 $messages['noscriptwarning'] = 'Advarsel: Denne webmailclient kræver Javascript! For at kunne bruge den slå venligst Javascripts til i din browserindstillinger.';
 $messages['messageissent'] = 'Beskeden er allerede sendt, men ikke gemt endnu. Vil du gemme den nu?';
 $messages['errnotfound'] = 'Filen blev ikke fundet';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index da6db5430..121b1cdf7 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -354,11 +354,13 @@ $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Kontaktdaten';
 $labels['contactnameandorg'] = 'Name und Organisation';
 $labels['personalinfo'] = 'Persönliche Informationen';
+$labels['personal'] = 'Persönlich';
 $labels['contactphoto'] = 'Kontakt-Bild';
 $labels['edit']   = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save']   = 'Speichern';
 $labels['delete'] = 'Löschen';
+$labels['discard'] = 'Verwerfen';
 $labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Hinzufügen';
 $labels['replacephoto'] = 'Ersetzen';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index b0de1cbe9..d37bef5d0 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Kein Betreff';
 $messages['nobodywarning'] = 'Wollen Sie diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Die Nachricht wurde noch nicht gesendet und hat nicht gespeicherte Änderungen. Möchten Sie die Änderungen verwerfen?';
 $messages['restoresavedcomposedata'] = 'Eine zuvor verfasste aber nicht gesendete Nachricht wurde gefunden.\n\nBetreff: $subject\nGespeichert: $date\n\nWollen Sie diese Nachricht wiederherstellen?';
-$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.';
@@ -193,7 +192,6 @@ $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.';
-$messages['attachmentvalidationerror'] = 'WARNUNG! Dieser Anhang ist verdächtig, da sein Dateityp nicht dem entspricht, was in der Nachricht angegeben wird. Wenn Sie dem Absender nicht vertrauen, sollten Sie diesen Anhang nicht im Browser öffnen, da er Ihrem Computer Schaden zuführen könnte. <br/><br/><em>Erwartet: $expected; gefunden: $detected</em>';
 $messages['noscriptwarning'] = 'Achtung! Dieser Webmail-Service erfordert Javascript. Um ihn zu benutzten aktivieren Sie Javascript in ihren Browser-Einstellungen.';
 $messages['messageissent'] = 'Die Nachricht wurde bereits gesendet, aber noch nicht gespeichert. Jetzt speichern?';
 $messages['errnotfound'] = 'Datei nicht gefunden';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index f754f757d..c8f876eb4 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Alle Ordner';
 $labels['more']             = 'Mehr';
 $labels['back']             = 'Zurück';
 $labels['options']          = 'Optionen';
+$labels['composeoptions']   = 'Optionen für das Schreiben';
+$labels['optionsandattachments'] = 'Optionen und Anhänge';
+$labels['actions']          = 'Aktionen';
 $labels['first'] = 'Erste(r)';
 $labels['last'] = 'Letzte(r)';
 $labels['previous'] = 'Vorherige(r)';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Spalten';
 $labels['listsorting'] = 'Sortierung';
 $labels['listorder'] = 'Ordnung';
 $labels['listmode'] = 'Anzeigemodus';
+$labels['lmode'] = 'Listen-Modus';
 $labels['layout'] = 'Layout';
 $labels['layoutwidescreen'] = 'Breitbildschirm';
 $labels['layoutdesktop'] = 'Desktop';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Limit';
 $labels['quotaused'] = 'Verwendet';
 $labels['quotastorage'] = 'Festplattenspeicher';
 $labels['quotamessage'] = 'Nachrichtenanzahl';
+$labels['shortheaderdate'] = 'Am $date';
+$labels['shortheaderto'] = 'An $to vom $date';
+$labels['shortheaderfrom'] = 'Von $from vom $date';
 $labels['quicksearch']  = 'Schnellsuche';
 $labels['searchplaceholder']  = 'Suchen …';
 $labels['resetsearch']  = 'Suche zurücksetzen';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Bits';
 $labels['keyexpired']     = 'Abgelaufen';
 $labels['keyrevoked']     = 'Widerrufen';
 $labels['bccinstead']     = 'Blindkopie verwenden';
+$labels['addheader']      = 'Empfänger hinzufügen (Kopfzeile)';
 $labels['editidents']    = 'Identitäten bearbeiten';
 $labels['spellcheck']    = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
@@ -283,6 +291,8 @@ $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
 $labels['alwaysallow'] = 'Von $sender immer erlauben';
 $labels['isdraft']    = 'Dies ist ein Entwurf';
 $labels['andnmore']   = '$nr weitere …';
+$labels['headers']    = 'Kopfzeilen';
+$labels['envelope']   = 'Umschlag';
 $labels['togglemoreheaders'] = 'Mehr Kopfzeilen der Nachricht anzeigen';
 $labels['togglefullheaders'] = 'Rohkopfzeilen ein-/ausblenden';
 $labels['htmltoggle'] = 'HTML';
@@ -356,11 +366,15 @@ $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Kontaktdaten';
 $labels['contactnameandorg'] = 'Name und Organisation';
 $labels['personalinfo'] = 'Persönliche Informationen';
+$labels['personal'] = 'Persönlich';
 $labels['contactphoto'] = 'Foto des Kontakts';
 $labels['edit']   = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save']   = 'Speichern';
 $labels['delete'] = 'Löschen';
+$labels['discard'] = 'Verwerfen';
+$labels['continue'] = 'Weiter';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Kontaktbild hinzufügen';
 $labels['replacephoto'] = 'Bild ändern';
@@ -537,9 +551,11 @@ $labels['otherfolder'] = 'Ordner eines anderen Benutzers';
 $labels['sharedfolder'] = 'Öffentlicher Ordner';
 $labels['findfolders'] = 'Suche Ordner';
 $labels['findcontacts'] = 'Kontakte finden';
+$labels['findmail'] = 'Mail-Nachrichten finden';
 $labels['namespace.personal'] = 'Persönlich';
 $labels['namespace.other'] = 'Andere Benutzer';
 $labels['namespace.shared'] = 'Geteilt';
+$labels['dualuselabel'] = 'Kann nur enthalten';
 $labels['dualusemail'] = 'Nachrichten';
 $labels['dualusefolder'] = 'Ordner';
 $labels['sortby'] = 'Sortieren nach';
@@ -553,6 +569,12 @@ $labels['source'] = 'Quellcode';
 $labels['license'] = 'Lizenz';
 $labels['support'] = 'Support';
 $labels['savedsearches'] = 'Gespeicherte Suchvorgänge';
+$labels['dateformatY'] = 'JJJJ';
+$labels['dateformaty'] = 'JJ';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'TT';
+$labels['dateformatj'] = 'T';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -608,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Erstellungsoptionen';
 $labels['arialabelresponsesmenu'] = 'Schnellantworten Menü';
 $labels['arialabelattachmentuploadform'] = 'Anhanghochladeformular';
 $labels['arialabelattachmentmenu'] = 'Anhangsoptionen';
+$labels['arialabelmailtomenu'] = 'Optionen für E-Mail-Adressen';
 $labels['arialabelattachmentpreview'] = 'Anhangvorschau';
 $labels['ariasummarycomposecontacts'] = 'Liste von Kontakten und Gruppen als Empfänger';
 $labels['arialabelcontactexportoptions'] = 'Kontakt-Export-Optionen';
@@ -616,6 +639,8 @@ $labels['arialabelpreferencesform'] = 'Einstellungsformular';
 $labels['arialabelidentityeditfrom'] = 'Identität-Bearbeitungsformular';
 $labels['arialabelresonseeditfrom'] = 'Antwortbearbeitungsformular';
 $labels['arialabelsearchterms'] = 'Suchbegriffe';
+$labels['arialabeldropactionmenu'] = 'Aktionsmenü für das Ziehen und Loslassen';
+$labels['arialabelheadersmenu'] = 'Menü zum Hinzufügen der Empfänger (Kopfzeile) ';
 $labels['helplistnavigation'] = 'Tastaturnavigation auflisten';
 $labels['helplistkeyboardnavigation'] = "Pfeil hoch/runter: Zeilenfokus/Zeilenselektion verschieben
 Leerzeichen: Selektiere ausgewählte Zeile
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index fbe4f18be..461fa037b 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -51,6 +51,7 @@ $messages['messagesaved'] = 'Nachricht als Entwurf gespeichert.';
 $messages['successfullysaved'] = 'Erfolgreich gespeichert.';
 $messages['savingresponse'] = 'Antwortvorlage wird gespeichert …';
 $messages['deleteresponseconfirm'] = 'Möchten Sie diese Vorlage wirklich löschen?';
+$messages['nocontactselected'] = 'Sie haben noch keinen Kontakt ausgewählt.';
 $messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt.';
 $messages['contactexists'] = 'Es existiert bereits ein Kontakt mit dieser E-Mail-Adresse.';
 $messages['contactnameexists'] = 'Ein Kontakt mit dem gleichen Namen existiert bereits.';
@@ -76,6 +77,8 @@ $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['alerttitle'] = 'Achtung';
+$messages['confirmationtitle'] = 'Sind Sie sich sicher...';
 $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?';
@@ -92,6 +95,7 @@ $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['recipientsadded'] = 'Empfänger erfolgreich hinzugefügt.';
 $messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an.';
 $messages['disclosedrecipwarning'] = 'Alle Empfänger sehen die E-Mail Adressen der anderen Empfänger. Um deren Privatsphäre zu schützen, können Sie das BCC-Feld verwenden.';
 $messages['disclosedreciptitle'] = 'Zu viele öffentliche Empfänger';
@@ -100,7 +104,6 @@ $messages['nosubjecttitle']  = 'Kein Betreff';
 $messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Die Nachricht wurde nicht gesendet und hat nicht gespeicherte Änderungen. Möchten Sie Ihre Änderungen verwerfen?';
 $messages['restoresavedcomposedata'] = 'Es wurde ein nicht versandter Entwurf einer Nachricht gefunden.\n\nBetreff: $subject\nGespeichert am: $date\n\nMöchten Sie diese Nachricht wiederherstellen?';
-$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 Hochladen abbrechen.';
 $messages['searchsuccessful'] = '$nr Nachrichten gefunden.';
@@ -162,6 +165,8 @@ $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['smtputf8error'] = 'SMTP-Fehler: Der Server unterstützt Unicode in der E-Mail-Adresse nicht.';
+$messages['smtpsizeerror'] = 'SMTP-Fehler: Nachrichtengröße übersteigt die Servergrenze ($limit)';
 $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.';
@@ -194,7 +199,7 @@ $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.';
-$messages['attachmentvalidationerror'] = 'WARNUNG! Dieser Anhang ist verdächtig, weil sein Typ nicht dem in der Nachricht deklarierten Typ entspricht. Wenn Sie dem Sender nicht trauen, sollten Sie den Anhang nicht öffnen, weil er schadhaften Inhalte beinhalten könnte.<br/><br/><em>Erwartet: $expected; gefunden: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Dieser Anhang ist verdächtig, weil sein Typ nicht mit dem in der Nachricht angegebenen Typ übereinstimmt. Wenn Sie dem Absender nicht vertrauen, sollten Sie ihn nicht im Browser öffnen, da er bösartige Inhalte enthalten kann.<br/><br/><em>Erwartet: $expected; gefunden: $detected</em>';
 $messages['noscriptwarning'] = 'Warnung: Dieser Webmail-Service erfordert Javascript. Um ihn zu benutzten aktivieren Sie Javascript in ihren Browser-Einstellungen.';
 $messages['messageissent'] = 'Die Nachricht wurde bereits gesendet, aber noch nicht gespeichert. Wollen Sie es jetzt speichern?';
 $messages['errnotfound'] = 'Datei nicht gefunden!';
@@ -209,3 +214,4 @@ $messages['clicktoresumesession'] = 'Klicken Sie hier, um Ihre vorherige Sitzung
 $messages['errcomposesession'] = 'Verfasssitzungsfehler';
 $messages['errcomposesessionexplain'] = 'Angeforderte Verfasssitzung nicht gefunden.';
 $messages['clicktocompose'] = 'Klicken Sie hier, um eine neue Nachricht zu verfassen';
+$messages['nosupporterror'] = 'Diese Funktion wird von Ihrem Webbrowser nicht unterstützt.';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index fe0e80cf8..0ac81c22e 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -339,11 +339,13 @@ $labels['contacts'] = 'Επαφές';
 $labels['contactproperties'] = 'Ιδιότητες επαφών';
 $labels['contactnameandorg'] = 'Όνομα και οργανισμός';
 $labels['personalinfo'] = 'Προσωπικές πληροφορίες';
+$labels['personal'] = 'Προσωπικά';
 $labels['contactphoto'] = 'Φωτογραφία επαφής';
 $labels['edit']   = 'Επεξεργασία';
 $labels['cancel'] = 'Ακύρωση';
 $labels['save']   = 'Αποθήκευση';
 $labels['delete'] = 'Διαγραφή';
+$labels['discard'] = 'Διαγραφή';
 $labels['rename'] = 'Μετονομασία';
 $labels['addphoto'] = 'Προσθήκη';
 $labels['replacephoto'] = 'Αντικατάσταση';
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index e737d7f0b..e417ac1b5 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -96,7 +96,6 @@ $messages['nosubjectwarning']  = 'Το πεδίο "Θέμα" είναι άδει
 $messages['nosubjecttitle']  = 'Κανένα θέμα';
 $messages['nobodywarning'] = 'Αποστολή μηνύματος χωρίς κείμενο;';
 $messages['restoresavedcomposedata'] = 'Υπάρχει ένα προηγούμενο πρόχειρο μήνυμα το οποίο δεν έχει σταλεί.\n\nΘέμα: $subject\Αποθηκεύτηκε: $date\n\nΘέλετε να το ανακτήσετε;';
-$messages['noldapserver'] = 'Παρακαλώ επιλέξτε έναν διακομιστή LDAP για αναζήτηση.';
 $messages['nosearchname'] = 'Παρακαλώ εισάγετε όνομα επαφής ή διεύθυνση e-mail.';
 $messages['notuploadedwarning'] = 'Δεν έχουν φορτωθεί ακόμα όλα τα συνημμένα. Παρακαλώ περιμένετε ή ακυρώστε το ανέβασμα.';
 $messages['searchsuccessful'] = 'Βρέθηκαν $nr μηνύματα.';
@@ -188,7 +187,6 @@ $messages['invalidimageformat'] = 'Μη έγκυρη μορφή εικόνας.'
 $messages['mispellingsfound'] = 'Εντοπίστηκαν ορθογραφικά λάθη στο μήνυμα. ';
 $messages['parentnotwritable'] = 'Δεν είναι δυνατή η δημιουργία/μετακινήση φάκελου στον επιλεγμένο φάκελο γονέα. Δεν υπάρχει δικαίωμα πρόσβασης. ';
 $messages['messagetoobig'] = 'Το τμήμα μηνύματος είναι πολύ μεγάλο για επεξεργασία.';
-$messages['attachmentvalidationerror'] = 'ΠΡΟΕΙΔΟΠΟΊΗΣΗ! Αυτό το συνημμένο είναι ύποπτο, επειδή ο τύπος του δεν ταιριάζει με τον τύπο που δηλώνεται στο μήνυμα. Εάν δεν εμπιστεύεστε τον αποστολέα, δεν θα πρέπει να το ανοίξετε στο πρόγραμμα περιήγησης επειδή μπορεί να περιέχει κακόβουλο περιεχόμενο.<br/><br/><em>Αναμενόμενο: $expected, εντοπίστηκε: $detected</em> ';
 $messages['noscriptwarning'] = 'Προσοχή: Αυτή η υπηρεσία webmail απαιτεί Javascript! Για να την χρησιμοποιήσετε ενεργοποιήστε το JavaScript στις ρυθμίσεις του περιηγητή σας. ';
 $messages['messageissent'] = 'Το μήνυμα έχει ήδη αποσταλεί, αλλά δεν έχει ακόμη αποθηκευτεί. Θέλετε να το αποθηκεύσετε τώρα;';
 $messages['errnotfound'] = 'Δεν βρέθηκε το αρχείο';
diff --git a/program/localization/en_CA/labels.inc b/program/localization/en_CA/labels.inc
index b01c962bc..e9c718c31 100644
--- a/program/localization/en_CA/labels.inc
+++ b/program/localization/en_CA/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'As unread';
 $labels['markflagged']      = 'As flagged';
 $labels['markunflagged']    = 'As unflagged';
 $labels['moreactions']      = 'More actions...';
+$labels['folders-all']      = 'All folders';
 $labels['more']             = 'More';
 $labels['back']             = 'Back';
 $labels['options']          = 'Options';
@@ -135,6 +136,7 @@ $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
 $labels['currpage'] = 'Current page';
+$labels['isread'] = 'Read';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
@@ -164,6 +166,7 @@ $labels['listcolumns'] = 'List columns';
 $labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'List view mode';
+$labels['layoutlist'] = 'List';
 $labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
diff --git a/program/localization/en_CA/messages.inc b/program/localization/en_CA/messages.inc
index 7bf01f838..093930edf 100644
--- a/program/localization/en_CA/messages.inc
+++ b/program/localization/en_CA/messages.inc
@@ -82,7 +82,6 @@ $messages['norecipientwarning'] = 'Please enter at least one recipient.';
 $messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
 $messages['nobodywarning'] = 'Send this message without text?';
 $messages['restoresavedcomposedata'] = 'A previously composed but unsent message was found.\n\nSubject: $subject\nSaved: $date\n\nDo you want to restore this message?';
-$messages['noldapserver'] = 'Please select an ldap server to search.';
 $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.';
@@ -168,5 +167,4 @@ $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.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 12391b6f1..4b17376b6 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'All folders';
 $labels['more']             = 'More';
 $labels['back']             = 'Back';
 $labels['options']          = 'Options';
+$labels['composeoptions']   = 'Compose options';
+$labels['optionsandattachments'] = 'Options and attachments';
+$labels['actions']          = 'Actions';
 $labels['first'] = 'First';
 $labels['last'] = 'Last';
 $labels['previous'] = 'Previous';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'List columns';
 $labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'List view mode';
+$labels['lmode'] = 'List mode';
 $labels['layout'] = 'Layout';
 $labels['layoutwidescreen'] = 'Widescreen';
 $labels['layoutdesktop'] = 'Desktop';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Limit';
 $labels['quotaused'] = 'Used';
 $labels['quotastorage'] = 'Disk space';
 $labels['quotamessage'] = 'Messages count';
+$labels['shortheaderdate'] = 'On $date';
+$labels['shortheaderto'] = 'To $to on $date';
+$labels['shortheaderfrom'] = 'From $from on $date';
 $labels['quicksearch']  = 'Quick search';
 $labels['searchplaceholder']  = 'Search...';
 $labels['resetsearch']  = 'Reset search';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Bits';
 $labels['keyexpired']     = 'Expired';
 $labels['keyrevoked']     = 'Revoked';
 $labels['bccinstead']     = 'Use Bcc';
+$labels['addheader']      = 'Add recipient (header)';
 $labels['editidents']    = 'Edit identities';
 $labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
@@ -283,6 +291,8 @@ $labels['alwaysshow'] = 'Always show images from $sender';
 $labels['alwaysallow'] = 'Always allow from $sender';
 $labels['isdraft']    = 'This is a draft message.';
 $labels['andnmore']   = '$nr more...';
+$labels['headers']    = 'Headers';
+$labels['envelope']   = 'Envelope';
 $labels['togglemoreheaders'] = 'Show more message headers';
 $labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
@@ -356,11 +366,15 @@ $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Contact properties';
 $labels['contactnameandorg'] = 'Name and Organization';
 $labels['personalinfo'] = 'Personal information';
+$labels['personal'] = 'Personal';
 $labels['contactphoto'] = 'Contact photo';
 $labels['edit']   = 'Edit';
 $labels['cancel'] = 'Cancel';
 $labels['save']   = 'Save';
 $labels['delete'] = 'Delete';
+$labels['discard'] = 'Discard';
+$labels['continue'] = 'Continue';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Rename';
 $labels['addphoto'] = 'Add';
 $labels['replacephoto'] = 'Replace';
@@ -555,6 +569,12 @@ $labels['source'] = 'Source';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Get support';
 $labels['savedsearches'] = 'Saved searches';
+$labels['dateformatY'] = 'YYYY';
+$labels['dateformaty'] = 'YY';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -610,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Composition options';
 $labels['arialabelresponsesmenu'] = 'Canned responses menu';
 $labels['arialabelattachmentuploadform'] = 'Attachment upload form';
 $labels['arialabelattachmentmenu'] = 'Attachment options';
+$labels['arialabelmailtomenu'] = 'Email address options';
 $labels['arialabelattachmentpreview'] = 'Attachment preview';
 $labels['ariasummarycomposecontacts'] = 'List of contacts and groups to select as recipients';
 $labels['arialabelcontactexportoptions'] = 'Contact export options';
@@ -619,6 +640,7 @@ $labels['arialabelidentityeditfrom'] = 'Identity edit form';
 $labels['arialabelresonseeditfrom'] = 'Response edit form';
 $labels['arialabelsearchterms'] = 'Search terms';
 $labels['arialabeldropactionmenu'] = 'Drag-n-Drop action menu';
+$labels['arialabelheadersmenu'] = 'Recipient (header) adding menu';
 $labels['helplistnavigation'] = 'List keyboard navigation';
 $labels['helplistkeyboardnavigation'] = "Arrows up/down: Move row focus/selection.
 Space: Select focused row.
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index a57009784..d0079dc18 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -76,6 +76,8 @@ $messages['errormoving'] = 'Could not move the message(s).';
 $messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Could not delete the message(s).';
 $messages['errormarking'] = 'Could not mark the message(s).';
+$messages['alerttitle'] = 'Attention';
+$messages['confirmationtitle'] = 'Are you sure...';
 $messages['deletecontactconfirm']  = 'Do you really want to delete the selected contact(s)?';
 $messages['deletegroupconfirm']  = 'Do you really want to delete the selected group?';
 $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
@@ -100,7 +102,6 @@ $messages['nosubjecttitle']  = 'No subject';
 $messages['nobodywarning'] = 'Send this message without any text?';
 $messages['notsentwarning'] = 'The message has not been sent and has unsaved changes. Do you want to discard your changes?';
 $messages['restoresavedcomposedata'] = 'A previously composed but unsent message was found.\n\nSubject: $subject\nSaved: $date\n\nDo you want to restore this message?';
-$messages['noldapserver'] = 'Please select an LDAP server to search.';
 $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.';
@@ -162,6 +163,7 @@ $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['smtpsizeerror'] = 'SMTP Error: Message size exceeds server limit ($limit)';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Invalid email address: $email';
 $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
@@ -194,7 +196,7 @@ $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.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['attachmentvalidationerror'] = 'This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 $messages['messageissent'] = 'The message was already sent, but not yet saved. Do you want to save it now?';
 $messages['errnotfound'] = 'File Not Found';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 69e74969f..987fbf1d5 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -132,6 +132,7 @@ $labels['select'] = 'Elektu';
 $labels['all'] = 'Ĉion';
 $labels['none'] = 'Nenion';
 $labels['currpage'] = 'Nuna paĝo';
+$labels['isread'] = 'Legi';
 $labels['unread'] = 'Nelegitan';
 $labels['flagged'] = 'Markita';
 $labels['unanswered'] = 'Nerespondita';
@@ -160,6 +161,7 @@ $labels['listcolumns'] = 'List-rubrikoj';
 $labels['listsorting'] = 'Ordig-rubriko';
 $labels['listorder'] = 'Ordig-ordo';
 $labels['listmode'] = 'Lista vido';
+$labels['layoutlist'] = 'Listo';
 $labels['folderactions'] = 'Dosierujo-agoj';
 $labels['compact'] = 'Kompakta';
 $labels['empty'] = 'Malplena';
@@ -290,6 +292,7 @@ $labels['lastpage']       = 'Montru lastan';
 $labels['groups'] = 'Grupoj';
 $labels['personaladrbook'] = 'Persona Adresoj';
 $labels['settingsfor'] = 'Preferoj de';
+$labels['about'] = 'Pri';
 $labels['preferences'] = 'Preferoj';
 $labels['userpreferences'] = 'Uzant-preferoj';
 $labels['editpreferences'] = 'Redaktu uzant-preferojn';
@@ -333,4 +336,5 @@ $labels['managefolders'] = 'Administru dosierujon';
 $labels['sortby'] = 'Ordigu per';
 $labels['sortasc']  = 'Ordigu kreskante';
 $labels['sortdesc'] = 'Ordigu malkreskante';
+$labels['license'] = 'Permesilo';
 ?>
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 13955597b..63b685525 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -55,7 +55,6 @@ $messages['nopagesizewarning'] = 'Bonvolu enmeti paĝ-grando';
 $messages['norecipientwarning'] = 'Bonvolu enmeti minumume unu ricevonto';
 $messages['nosubjectwarning']  = 'La temkampo estas malplena. Ĉu vi volas skribi temon nun?';
 $messages['nobodywarning'] = 'Ĉu sendi ĉi tiun mesaĝon sen teksto?';
-$messages['noldapserver'] = 'Bonvolu elekti ldap-servilon por serĉado';
 $messages['nosearchname'] = 'Bonvolu enmeti kontakt-nomon aŭ retpoŝt-adreson.';
 $messages['searchsuccessful'] = 'trovis $nr mesaĝojn';
 $messages['searchnomatch'] = 'Serĉo donis nenion';
diff --git a/program/localization/es_419/labels.inc b/program/localization/es_419/labels.inc
index e0ae894bf..1b8ba111d 100644
--- a/program/localization/es_419/labels.inc
+++ b/program/localization/es_419/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Como no leido';
 $labels['markflagged']      = 'Como marcado';
 $labels['markunflagged']    = 'Como no marcado';
 $labels['moreactions']      = 'Más acciones...';
+$labels['folders-all']      = 'Todas las carpetas';
 $labels['more']             = 'Más';
 $labels['back']             = 'Atrás';
 $labels['options']          = 'Opciones';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Enumerar columnas';
 $labels['listsorting'] = 'Ordenar columnas';
 $labels['listorder'] = 'Ordenado por';
 $labels['listmode'] = 'Modo de visualización de lista';
+$labels['layoutlist'] = 'Enumerar';
 $labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Comprimir';
 $labels['empty'] = 'Vaciar';
@@ -317,11 +319,13 @@ $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
 $labels['contactnameandorg'] = 'Nombre y organización';
 $labels['personalinfo'] = 'Información personal';
+$labels['personal'] = 'Personal';
 $labels['contactphoto'] = 'Foto del contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
+$labels['discard'] = 'Descartar';
 $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Agregar';
 $labels['replacephoto'] = 'Remplazar';
diff --git a/program/localization/es_419/messages.inc b/program/localization/es_419/messages.inc
index 27b7f8dbc..9b6a589c7 100644
--- a/program/localization/es_419/messages.inc
+++ b/program/localization/es_419/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Por favor ingresa al menos un destinatario.';
 $messages['nosubjectwarning']  = 'El campo "Asunto" está vacio. ¿Deseas ingresar uno ahora?';
 $messages['nobodywarning'] = '¿Enviar este mensaje sin texto?';
 $messages['restoresavedcomposedata'] = 'Se ha encontrado un mensaje escrito pero no enviado\n\nAsunto: $subject\nGuardado: $date\n\n¿Desea restaurar este mensaje?';
-$messages['noldapserver'] = 'Por favor ingresa un servidor ldap para buscar.';
 $messages['nosearchname'] = 'Por favor ingresa un nombre de contacto o dirección de correo electrónico.';
 $messages['notuploadedwarning'] = 'Aún no se han subido todos los archivos adjuntos. Por favor espera o cancela la subida.';
 $messages['searchsuccessful'] = '$nr mensajes encontrados.';
@@ -170,5 +169,4 @@ $messages['invalidimageformat'] = 'Formato de imagen no válido.';
 $messages['mispellingsfound'] = 'Errores de gramática detectados en el mensaje.';
 $messages['parentnotwritable'] = 'No se puede mover/crear la carpeta en la carpeta pariente seleccionada. No tiene derechos de acceso.';
 $messages['messagetoobig'] = 'La parte del mensaje es demasiado grande para ser procesada.';
-$messages['attachmentvalidationerror'] = '¡ATENCIÓN! Este archivo adjunto es sospechoso porque su tipo no coincide con el declarado en el mensaje. Si no confia el remitente, no debería abrirlo en su navegador porque podría tener contenido malicioso.<br/><br/><em>Esperado: $expected; encontrado: $detected</em>';
 $messages['noscriptwarning'] = 'Atención: ¡Este servicio de Webmail requiere Javascript! Para usarlo por favor habilite Javascript en las opciones de su navegador.';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index dbc1acb73..7afb6cedf 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Como no leído';
 $labels['markflagged']      = 'Como marcado';
 $labels['markunflagged']    = 'Como no marcado';
 $labels['moreactions']      = 'Mas acciones...';
+$labels['folders-all']      = 'Todas las carpetas';
 $labels['more']             = 'Más';
 $labels['back']             = 'Atrás';
 $labels['options']          = 'Opciones';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Listar columnas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenado por';
 $labels['listmode'] = 'Modo vista en lista';
+$labels['layoutlist'] = 'Lista';
 $labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
@@ -318,11 +320,13 @@ $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
 $labels['contactnameandorg'] = 'Nombre y organización';
 $labels['personalinfo'] = 'Información personal';
+$labels['personal'] = 'Personal';
 $labels['contactphoto'] = 'Foto de contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
+$labels['discard'] = 'Descartar';
 $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Agregar';
 $labels['replacephoto'] = 'Reemplazar';
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index b49dc708c..8c5414a8f 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatari
 $messages['nosubjectwarning']  = 'El campo "Asunto" esta vacío. ¿Desea completarlo en este momento?';
 $messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
 $messages['restoresavedcomposedata'] = 'Se ha encontrado un mensaje redactado anteriormente que no ha sido enviado.\n\nAsunto: $subject\nGuardado: $date\n\nDeseas recuperar este mensaje?';
-$messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
 $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';
@@ -170,5 +169,4 @@ $messages['invalidimageformat'] = 'No es un formato de imágen válido.';
 $messages['mispellingsfound'] = 'Errores de ortografía encontrados en el mensaje.';
 $messages['parentnotwritable'] = 'No se pudo crear/mover la carpeta dentro de la carpeta superior seleccionada. No tiene permiso para acceder a ella.';
 $messages['messagetoobig'] = 'El mensaje es demasiado grande para ser procesado.';
-$messages['attachmentvalidationerror'] = 'Advertencia! Este archivo adjunto es sospechoso porque su tipo no concuerda con el tipo declarado en el mensaje. Si no confias en el remitente, no deberías abrirlo en el navegador porque puede contener código malicioso.<br/><br/><em>Se esperaba: $expected; Se encontró: $detected</em>';
 $messages['noscriptwarning'] = 'Advertencia: Este servicio de webmail requiere Javascript! Para usarlo, por favor, habilite Javascript en las preferencia de tu navegador.';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 6edcf2644..35c960762 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -349,11 +349,13 @@ $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
 $labels['contactnameandorg'] = 'Nombre y organización';
 $labels['personalinfo'] = 'Información personal';
+$labels['personal'] = 'Personal';
 $labels['contactphoto'] = 'Foto del contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
+$labels['discard'] = 'Descartar';
 $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Añadir';
 $labels['replacephoto'] = 'Reemplazar';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 80bfcf3c5..e973774b8 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Sin asunto';
 $messages['nobodywarning'] = '¿Desea enviar este mensaje sin texto?';
 $messages['notsentwarning'] = 'El mensaje no se ha enviado y tiene cambios sin guardar. ¿Quieres descartar los cambios?';
 $messages['restoresavedcomposedata'] = 'Se ha encontrado un mensaje previamente redactado sin enviar.\n\nAsunto: $subject\nGuardado: $date\n\n¿Desea restaurar este mensaje?';
-$messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar.';
 $messages['nosearchname'] = 'Por favor, ingrese un nombre de contacto o dirección de correo electrónico.';
 $messages['notuploadedwarning'] = 'No todos los adjuntos han sido cargados todavía. Por favor, espere o cancele la carga.';
 $messages['searchsuccessful'] = 'Se encontraron $nr mensajes.';
@@ -193,7 +192,6 @@ $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 pudo crear/mover la carpeta a la carpeta superior seleccionada. No tiene permisos de acceso.';
 $messages['messagetoobig'] = 'Esta parte del mensaje es demasiado grande para ser procesado.';
-$messages['attachmentvalidationerror'] = '¡ATENCIÓN! Este adjunto es sospechoso porque su tipo no coincide con el tipo declarado en el mensaje. Si no confía en su remitente, no debería abrirlo en su navegador porque podría tener contenido malicioso.<br/<br/> <em>Esperado: $expected; encontrado: $detected</em>';
 $messages['noscriptwarning'] = 'Advertencia: ¡Este servicio de webmail necesita Javascript! Para poder usarlo habilite el soporte de Javascript en su navegador, por favor.';
 $messages['messageissent'] = 'El mensaje se ha enviado, pero aún no se ha guardado. ¿Quieres guardarlo ahora?';
 $messages['errnotfound'] = 'Archivo no encontrado';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 152090514..a72b71da1 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -345,6 +345,7 @@ $labels['contacts'] = 'Kontaktid';
 $labels['contactproperties'] = 'Kontakti omadused';
 $labels['contactnameandorg'] = 'Nimi ja Organisatsioon';
 $labels['personalinfo'] = 'Isiklik info';
+$labels['personal'] = 'Isiklik';
 $labels['contactphoto'] = 'Kontakti pilt';
 $labels['edit']   = 'Muuda';
 $labels['cancel'] = 'Katkesta';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 23d3ef87a..3f31eeecf 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Palun sisesta vähemalt üks adressaat';
 $messages['nosubjectwarning']  = 'Väli „Pealkiri“ on tühi. Soovid selle ära täita?';
 $messages['nobodywarning'] = 'Saadan selle kirja ilma tekstita?';
 $messages['restoresavedcomposedata'] = 'Eelnevalt loodud aga saatmatta kiri leiti.\n\nTeema: $subject\nSalvestatud: $date\n\nKas sa soovid antud kirja taastada?';
-$messages['noldapserver'] = 'Palun vali otsinguks LDAPi server';
 $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';
@@ -170,5 +169,4 @@ $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.';
-$messages['attachmentvalidationerror'] = 'HOIATUS! See manus on kahtlane, sest selle tüüp ei ole vastavuses kirjas määratuga. Kui sa ei usalda kirja saatjat, siis ei tohiks seda brauseris avada, sest see võib sisaldada pahavara.<br/><br/><em>Oodati: $expected; leiti: $detected</em>';
 $messages['noscriptwarning'] = 'Hoiatus: see veebimaili teenus vajab Javascripti! Teenuse kasutamiseks luba Javascript oma brauseri seadetes.';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index ef292f0a7..30b96461f 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -16,15 +16,15 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 $labels['welcome']   = 'Ongi etorri $product-ra';
-$labels['username']  = 'Erabiltzailea';
+$labels['username']  = 'Erabiltzaile-izena';
 $labels['password']  = 'Pasahitza';
 $labels['server']    = 'Zerbitzaria';
 $labels['login']     = 'Saio hasiera';
 $labels['menu']     = 'Menua';
 $labels['logout']   = 'Irten';
-$labels['mail']     = 'ePosta';
-$labels['settings'] = 'Ezarpen Pertsonalak';
-$labels['addressbook'] = 'Helbide Liburua';
+$labels['mail']     = 'E-posta';
+$labels['settings'] = 'Ezarpenak';
+$labels['addressbook'] = 'Helbide liburua';
 $labels['inbox']  = 'Sarrera ontzia';
 $labels['drafts'] = 'Zirriborroak';
 $labels['sent']   = 'Bidalitakoak';
@@ -103,8 +103,8 @@ $labels['longdec']	= 'Abendua';
 $labels['today'] = 'Gaur';
 $labels['refresh']          = 'Freskatu';
 $labels['checkmail']        = 'Mezu berrien bila arakatu';
-$labels['compose']          = 'Mezu bat sortu';
-$labels['writenewmessage']  = 'Mezu berri bat sortu';
+$labels['compose']          = 'Idatzi mezu bat';
+$labels['writenewmessage']  = 'Sortu mezu berri bat';
 $labels['reply']            = 'Erantzun';
 $labels['replytomessage']   = 'Mezuari erantzun';
 $labels['replytoallmessage'] = 'Bidaltzaile eta hartzaile guztiei erantzun';
@@ -307,7 +307,7 @@ $labels['jobtitle']     = 'Lanpostua ';
 $labels['department']   = 'Departamentoa';
 $labels['gender']       = 'Generoa';
 $labels['maidenname']   = 'Ezkondu aurreko izena';
-$labels['email']        = 'ePosta';
+$labels['email']        = 'E-posta';
 $labels['phone']        = 'Telefonoa';
 $labels['address']      = 'Helbidea';
 $labels['street']       = 'Kalea';
@@ -354,11 +354,13 @@ $labels['contacts'] = 'Kontaktuak';
 $labels['contactproperties'] = 'Kontaktuen ezaugarriak';
 $labels['contactnameandorg'] = 'Izena eta erakundea';
 $labels['personalinfo'] = 'Informazio pertsonala';
+$labels['personal'] = 'Pertsonala';
 $labels['contactphoto'] = 'Kontaktuaren argazkia';
 $labels['edit']   = 'Editatu';
 $labels['cancel'] = 'Utzi';
 $labels['save']   = 'Gorde';
 $labels['delete'] = 'Ezabatu';
+$labels['discard'] = 'Baztertu';
 $labels['rename'] = 'Berrizendatu';
 $labels['addphoto'] = 'Gehitu';
 $labels['replacephoto'] = 'Ordeztu';
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 6db507c83..f2f745786 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -54,7 +54,8 @@ $messages['deleteresponseconfirm'] = 'Seguru zaude erantzun-testu hau  ezabatu n
 $messages['addedsuccessfully'] = 'Kontaktua behar bezala gehitu da helbide-liburura.';
 $messages['contactexists'] = 'Badago kontaktu bat helbide elektroniko horrekin';
 $messages['contactnameexists'] = 'Lehendik badago izen hori duen kontaktua.';
-$messages['blockedimages'] = 'Zure pribazitatea mantentzeko urruneko irudiak blokeatu egin dira.';
+$messages['blockedimages'] = 'Zure pribatutasuna babesteko urrutiko irudiak blokeatu egin dira.';
+$messages['blockedresources'] = 'Zure pribatutasuna babesteko urrutiko baliabideak blokeatu egin dira.';
 $messages['encryptedmessage'] = 'Hau enkriptaturiko mezu bat da eta ezin da bistarazi. Barkatu!';
 $messages['externalmessagedecryption'] = 'Hau zifratutako mezua da eta zure nabigatzaileko gehigarri batekin deszifratu daiteke.';
 $messages['nopubkeyfor'] = 'Ez da baliozko gako publikorik aurkitu $email-(e)rako';
@@ -99,7 +100,6 @@ $messages['nosubjecttitle']  = 'Gairik ez';
 $messages['nobodywarning'] = 'Testu gabeko mezu hau bidali?';
 $messages['notsentwarning'] = 'Mezua ez da bidali eta gorde gabeko aldaketak ditu. Nahi duzu zure aldaketak baztertu?';
 $messages['restoresavedcomposedata'] = 'Lehendik idatzitako baina bidali gabeko mezu bat aurkitu da.\n\nGaia:$subject\nGordeta:$date\n\nBerreskuratu nahi duzu mezu hau?';
-$messages['noldapserver'] = 'Mesedez hautatu bilaketa egiteko LDAP zerbitzari bat';
 $messages['nosearchname'] = 'Idatzi kontaktu izen bat edo helbide elektroniko bat';
 $messages['notuploadedwarning'] = 'Oraindik ez dira kargatu eranskin guztiak. Itxaron edo ezeztatu karga.';
 $messages['searchsuccessful'] = '$nr mezu aurkiturik';
@@ -193,8 +193,7 @@ $messages['invalidimageformat'] = 'Irudi formatua ez da baliozkoa.';
 $messages['mispellingsfound'] = 'Ortografia akatsak detektatu dira mezuan.';
 $messages['parentnotwritable'] = 'Ezin da karpeta sortu/mugi hautatutako goragoko karpetan. Sartzeko baimenik ez.';
 $messages['messagetoobig'] = 'Mezu-zatia handiegia da prozesatzeko.';
-$messages['attachmentvalidationerror'] = 'KONTUZ! Eranskin hau susmagarria da zeren bere izaera ez dator bat mezuan deklaratutakoarekin. Bidaltzailearekin fidatzen ez bazara ez zenuke nabigatzailean ireki behar eduki maltzurra izan dezakeelako.<br/><br/><em>Deklaratua: $expected; erreala: $detected</em>';
-$messages['noscriptwarning'] = 'Kontuz: web-posta zerbitzu honek Javascript behar du! Erabili nahi baduzu gaitu Javascript zure nabigatzailearen hobespenetan.';
+$messages['noscriptwarning'] = 'Kontuz: web-posta zerbitzu honek Javascript behar du! Erabili nahi baduzu gaitu Javascript zure nabigatzailearen ezarpenetan.';
 $messages['messageissent'] = 'Mezua bidali da baina oraindik ez da gorde. Nahi duzu orain gorde?';
 $messages['errnotfound'] = 'Fitxategia ez da aurkitu';
 $messages['errnotfoundexplain'] = 'Eskatutako baliabidea ez da aurkitu';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 599134d60..afd2ee350 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -144,6 +144,7 @@ $labels['sentdate'] = 'تاریخ ارسال';
 $labels['arrival'] = 'تاریخ دریافت';
 $labels['asc'] = 'صعودی';
 $labels['desc'] = 'نزولی';
+$labels['layoutlist'] = 'لیست';
 $labels['compact'] = 'خلاصه';
 $labels['empty'] = 'خالي';
 $labels['quota'] = '‌طريقه استعمال ديسک';
@@ -151,6 +152,7 @@ $labels['unknown']  = 'نامعلوم';
 $labels['unlimited']  = 'نامعين/ نامحدود';
 $labels['quicksearch']  = 'جستجوی سریع';
 $labels['resetsearch']  = 'بازنشاندن جستجو';
+$labels['body']  = 'متن پیام';
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
 $labels['sendmessage']    = 'پيغام را همين حالا ارسال کنيد';
 $labels['savemessage']    = 'این پیش نویس را حفظ نمایید';
@@ -188,11 +190,14 @@ $labels['name']         = 'نشان دادن نام';
 $labels['firstname']    = 'اسم/ نام';
 $labels['surname']      = 'اسم فاميلي / تخلص';
 $labels['email']        = 'ايميل';
+$labels['other'] = 'دیگر';
+$labels['typeother']  = 'دیگر';
 $labels['editcontact'] = 'آدرس جدید را تصحیح کنید';
 $labels['edit']   = 'تصحيح کردن';
 $labels['cancel'] = 'لغو کردن/ حذف کردن';
 $labels['save']   = 'حفظ کردن';
 $labels['delete'] = 'حذف کردن';
+$labels['addphoto'] = 'افزودن';
 $labels['deletecontact']  = 'آدرس های انتخاب شده را حذف کنيد';
 $labels['composeto']      = 'ايمیل را نوشته کنيد به';
 $labels['contactsfromto'] = 'از$count$to به $from آدرس ها از';
@@ -211,6 +216,7 @@ $labels['importfromfile'] = 'از یک فایل وارد نمایید';
 $labels['importreplace'] = 'تمام کتاب آدرس ها را عوض نمایید';
 $labels['done'] = 'اجرا شد';
 $labels['settingsfor'] = 'تنظیمات برای';
+$labels['about'] = 'درباره نرم افزار';
 $labels['preferences'] = 'ترجيحات';
 $labels['userpreferences'] = 'ترجيحات کاربر';
 $labels['editpreferences'] = 'تصحيح کردن ترجيحات  کاربر';
@@ -268,6 +274,7 @@ $labels['specialfolders'] = 'پوشه های مخصوص';
 $labels['sortby'] = 'فهرست کردن توسط';
 $labels['sortasc']  = 'فهرست کردن از طرف بالا به پايين';
 $labels['sortdesc'] = 'فهرست کردن از طرف پايين به بالا';
+$labels['license'] = 'حق نشر';
 $labels['B'] = 'بایت';
 $labels['KB'] = 'کیلو بایت';
 $labels['MB'] = 'میگا بایت';
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index 95a69ae7b..7b860ca34 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -81,7 +81,6 @@ $messages['nopagesizewarning'] = 'لطفاً اندازه يک صفحه را د�
 $messages['norecipientwarning'] = 'لطفاً کم از کم يک آدرس گيرينده را نوشته / داخل کنيد';
 $messages['nosubjectwarning']  = 'بخش مضمون خالي است  آیا میخواهید که حالا یکی آنها را درج نمایید؟.';
 $messages['nobodywarning'] = 'اين پيغام را بدون متن بفرستیم؟';
-$messages['noldapserver'] = 'لطفاً يک ايل دپ سرور را بخاطر جستجو انتخاب کنيد';
 $messages['nosearchname'] = 'لطفاً يک نام تماس و يا هم يک ايميل ادرس را داخل کنيد';
 $messages['searchsuccessful'] = '$nr پیام یافت شد';
 $messages['contactsearchsuccessful'] = '$nr حساب کاربری یافت شد';
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index 725f1592c..97113e625 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -130,6 +130,7 @@ $labels['markunread']       = 'به عنوان خوانده‌نشده';
 $labels['markflagged']      = 'به عنوان پرچم‌دار';
 $labels['markunflagged']    = 'به عنوان بدون پرچم';
 $labels['moreactions']      = 'کارهای دیگر...';
+$labels['folders-all']      = 'همه پوشه‌ها';
 $labels['more']             = 'بيشتر';
 $labels['back']             = 'بازگشت';
 $labels['options']          = 'گزینه‌ها';
@@ -326,11 +327,13 @@ $labels['editcontact'] = 'ویرایش تماس';
 $labels['contacts'] = 'تماس‌ها';
 $labels['contactproperties'] = 'خصوصیات تماس';
 $labels['personalinfo'] = 'اطلاعات شخصی';
+$labels['personal'] = 'شخصی';
 $labels['contactphoto'] = 'تصویر تماس';
 $labels['edit']   = 'ویرایش';
 $labels['cancel'] = 'لغو';
 $labels['save']   = 'ذخیره';
 $labels['delete'] = 'حذف';
+$labels['discard'] = 'دور انداختن';
 $labels['rename'] = 'تغییر نام';
 $labels['addphoto'] = 'افزودن';
 $labels['replacephoto'] = 'جایگزینی';
@@ -531,6 +534,7 @@ $labels['arialabeltopnav'] = 'کنترل پنجره';
 $labels['arialabelactivetask'] = 'وظیفه فعال';
 $labels['arialabelmessagessearchfilter'] = 'پالایه فهرست‌گیری رایانامه';
 $labels['arialabelmailsearchform'] = 'فرم جستجوی پیام رایانامه';
+$labels['arialabelcontactsearchform'] = 'فرم جستجوی تماس‌ها';
 $labels['arialabelmailquicksearchbox'] = 'ورودی جستجوی رایانامه';
 $labels['arialabelquicksearchbox'] = 'وردوی جستجو';
 $labels['arialabelfoldersearchfilter'] = 'پالایه فهرست‌گیری پوشه';
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index dceddc0fa..e6bb2776a 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -88,7 +88,6 @@ $messages['nosubjecttitle']  = 'بدون موضوع';
 $messages['nobodywarning'] = 'این پیام بدون متن ارسال شود؟';
 $messages['restoresavedcomposedata'] = 'نامه قبلا نوشته و نفرستاده یافت شد.\n\nموضوع: $subject\n
 ذخیره شده: $date\n\nآیا می‌خواهید این پیام را بازیابی نمایید؟';
-$messages['noldapserver'] = 'لطفا یک سرور LDAP برای جست‌و‌جو انتخاب کنید.';
 $messages['nosearchname'] = 'لطفا یک نام مخاطب یا نشانی رایانامه وارد نمایید.';
 $messages['notuploadedwarning'] = 'همه پیوست ها هنوز بارگذاری نشده‌اند. لطفا صبر کرده یا بارگذاری را لغو کنید.';
 $messages['searchsuccessful'] = '$nr پیام پیدا شد.';
@@ -175,6 +174,5 @@ $messages['invalidimageformat'] = 'فرمت تصویر نامعتبر است.';
 $messages['mispellingsfound'] = 'خطای املایی در پیام شناسایی شد.';
 $messages['parentnotwritable'] = 'به دلیل نداشتن حق دسترسی، ایجاد/انتقال پوشه به پوشه والد انتخاب شده، انجام نشد.';
 $messages['messagetoobig'] = 'بخش پیام برای پردازش آن خیلی بزرگ است.';
-$messages['attachmentvalidationerror'] = 'هشدار! این پیوست مشکوک است زیرا نوع آن با نوعی که در پیام اشاره شده مطابقت ندارد. اگر شما به فرستنده اطمینان ندارید، نباید آن را در مرورگر باز نمایید زیرا ممکن است که شامل محتوای مخرب باشد.<br><br><em>مورد انتظار: $expected; یافت شده: $detected</em>';
 $messages['noscriptwarning'] = 'هشدار: این برنامه به جاوااسکریپت نیاز دارد! برای استفاده از این برنامه لطفا جاوااسکریپت را در تنظیمات مرورگر خود فعال نمایید.';
 $messages['errnotfound'] = 'پرونده پیدا نشد';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index cc66fee97..5177eb1f7 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -346,11 +346,13 @@ $labels['contacts'] = 'Yhteystiedot';
 $labels['contactproperties'] = 'Yhteystiedon ominaisuudet';
 $labels['contactnameandorg'] = 'Nimi ja organisaatio';
 $labels['personalinfo'] = 'Henkilökohtaiset tiedot';
+$labels['personal'] = 'Henkilökohtainen';
 $labels['contactphoto'] = 'Yhteyshenkilön kuva';
 $labels['edit']   = 'Muokkaa';
 $labels['cancel'] = 'Peruuta';
 $labels['save']   = 'Tallenna';
 $labels['delete'] = 'Poista';
+$labels['discard'] = 'Hylkää';
 $labels['rename'] = 'Nimeä uudelleen';
 $labels['addphoto'] = 'Lisää';
 $labels['replacephoto'] = 'Korvaa';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index 0479572f4..70a0a0ac9 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -95,7 +95,6 @@ $messages['norecipientwarning'] = 'Anna ainakin yksi vastaanottaja';
 $messages['nosubjectwarning']  = '"Aihe"-kenttä on tyhjä. Haluatko kirjoittaa viestillesi aiheen?';
 $messages['nobodywarning'] = 'Lähetetäänkö viesti ilman tekstiä?';
 $messages['restoresavedcomposedata'] = 'Löydettiin aiemmin luotu, mutta lähettämätön viesti.\n\nAihe: $subject\nTallennettu: $date\n\nHaluatko palauttaa tämän viestin?';
-$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ä';
@@ -188,7 +187,6 @@ $messages['invalidimageformat'] = 'Virheellinen kuvamuoto.';
 $messages['mispellingsfound'] = 'Viestissä havaittiin kielioppivirheitä.';
 $messages['parentnotwritable'] = 'Kansiota ei voitu siirtää tai luoda valittuun yläkansioon. Ei käyttöoikeutta.';
 $messages['messagetoobig'] = 'Viestiosa on liian suuri prosessoitavaksi.';
-$messages['attachmentvalidationerror'] = 'Varoitus! Tämä liitetiedosto on epäilyttävä, koska se ei vastaa ilmoitettua tiedostotyyppiä. Jos et luoda lähettäjään, älä avaa liitetiedostoa välttääksesi mahdollista vahingollista aineistoa.<br/><br/><em>Odotettu: $expected; löydetty: $detected</em>';
 $messages['noscriptwarning'] = 'Varoitus: Tämä verkkopohjainen sähköpostipalvelu vaatii Javascriptin toimiakseen. Ota Javascript käyttöön selaimesi asetuksista.';
 $messages['messageissent'] = 'Viesti lähetettiin jo, mutta sitä ei vielä tallennettu. Haluatko tallentaa sen nyt?';
 $messages['errnotfound'] = 'Tiedostoa ei löytynyt';
diff --git a/program/localization/fo_FO/labels.inc b/program/localization/fo_FO/labels.inc
index 51174f47b..86e77f9d8 100644
--- a/program/localization/fo_FO/labels.inc
+++ b/program/localization/fo_FO/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Sum ólisin';
 $labels['markflagged']      = 'Sum viðmerkt';
 $labels['markunflagged']    = 'Sum óviðmerkt';
 $labels['moreactions']      = 'Fleiri gerir...';
+$labels['folders-all']      = 'Allar mappur';
 $labels['more']             = 'Meira';
 $labels['back']             = 'Aftur';
 $labels['options']          = 'Valmøguleikar';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'List teigar';
 $labels['listsorting'] = 'Sorterar teiga';
 $labels['listorder'] = 'Sorterar rekkjufylgju';
 $labels['listmode'] = 'Lista vísing';
+$labels['layoutlist'] = 'Listið';
 $labels['folderactions'] = 'Mappu gerir...';
 $labels['compact'] = 'Trýst saman';
 $labels['empty'] = 'Tøm';
@@ -335,11 +337,13 @@ $labels['contacts'] = 'Persónar';
 $labels['contactproperties'] = 'Persóna eginleikar';
 $labels['contactnameandorg'] = 'Navn og felag';
 $labels['personalinfo'] = 'Persónligar upplýsingar';
+$labels['personal'] = 'Persónlig';
 $labels['contactphoto'] = 'Mynd av persóni';
 $labels['edit']   = 'Broyt';
 $labels['cancel'] = 'Ógilda';
 $labels['save']   = 'Goym';
 $labels['delete'] = 'Strika';
+$labels['discard'] = 'Strika';
 $labels['rename'] = 'Umdoyp';
 $labels['addphoto'] = 'Legg aftrat';
 $labels['replacephoto'] = 'Skift út';
diff --git a/program/localization/fo_FO/messages.inc b/program/localization/fo_FO/messages.inc
index 16989f411..cf576e4ce 100644
--- a/program/localization/fo_FO/messages.inc
+++ b/program/localization/fo_FO/messages.inc
@@ -95,7 +95,6 @@ $messages['norecipientwarning'] = 'Vinarliga skriva minst ein móttakara.';
 $messages['nosubjectwarning']  = 'Evna teigurin er tómur. Vilt tú skriva nakað í hann?';
 $messages['nobodywarning'] = 'Send hesi boð uttan tekst?';
 $messages['restoresavedcomposedata'] = 'Eitt fyrrverandi skriva boð, men ósent, boð var funni.\n\nEvni: $subject\nGoymt: $date\n\nVilt tú endur stovna hetta boð?';
-$messages['noldapserver'] = 'Vinarliga vel ein ldap ambatara fyri at leita.';
 $messages['nosearchname'] = 'Vinarliga skriva eitt persón navn ella teldupost búðstað,';
 $messages['notuploadedwarning'] = 'Ikki allar viðheftingar eru uppsendar enn. Vinarliga bíða ella angra uppsendingina.';
 $messages['searchsuccessful'] = '$nr boð funnin.';
@@ -186,7 +185,6 @@ $messages['invalidimageformat'] = 'Ikki eitt gyldigt mynda slag.';
 $messages['mispellingsfound'] = 'Stavuvillur funnar í tíni boð.';
 $messages['parentnotwritable'] = 'Kann ikki flyta/avrita mappu til valda mappu. Eingin atgongu-rættindi.';
 $messages['messagetoobig'] = 'Boðini eru ov stór til at handfara.';
-$messages['attachmentvalidationerror'] = 'ÁVARING! Hendan viðheftingin er undir illgruna av tí at viðheftingar slagið ikki samsvarar við slagið ið var nevnt í boðunum. Um tú ikki stólar uppá sendaran so burdi tú ikki opna viðheftingina í tínum kaga, tí at tað kann innihalda illviljað tilfar.<br/><br/><em>Væntað: $expected; Fann $detected</em>';
 $messages['noscriptwarning'] = 'Ávaring: Hendan webmail tænastan krevur Javascript! Um tú vilt nýta hana, so vinarliga tendra Javascript í tínum kaga.';
 $messages['messageissent'] = 'Boðini vóru longu send, men ikki goymd enn. Vilt tú goyma tey nú?';
 $messages['errnotfound'] = 'Fílurin var ikki funnin';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 74b0afcf7..cc6a6a93b 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Tous les dossiers';
 $labels['more']             = 'Plus';
 $labels['back']             = 'Retour';
 $labels['options']          = 'Options';
+$labels['composeoptions']   = 'Options de rédaction';
+$labels['optionsandattachments'] = 'Options et pièces jointes';
+$labels['actions']          = 'Actions';
 $labels['first'] = 'Premier';
 $labels['last'] = 'Dernier';
 $labels['previous'] = 'Précédent';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Lister les colonnes';
 $labels['listsorting'] = 'Colonne de tri';
 $labels['listorder'] = 'Ordre de tri';
 $labels['listmode'] = 'Mode d\'affichage en liste';
+$labels['lmode'] = 'Mode de listage';
 $labels['layout'] = 'Disposition';
 $labels['layoutwidescreen'] = 'Écran large';
 $labels['layoutdesktop'] = 'Bureau';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Limite';
 $labels['quotaused'] = 'Utilisé';
 $labels['quotastorage'] = 'Espace disque';
 $labels['quotamessage'] = 'Nombre de courriels';
+$labels['shortheaderdate'] = 'Le $date';
+$labels['shortheaderto'] = 'À $to, le $date';
+$labels['shortheaderfrom'] = 'De $from, le $date';
 $labels['quicksearch']  = 'Recherche rapide';
 $labels['searchplaceholder']  = 'Recherche...';
 $labels['resetsearch']  = 'Réinitialiser la recherche';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'bits';
 $labels['keyexpired']     = 'Expirée';
 $labels['keyrevoked']     = 'Révoquée';
 $labels['bccinstead']     = 'Utiliser la Cci';
+$labels['addheader']      = 'Ajouter un destinataire (en-tête)';
 $labels['editidents']    = 'Éditer les identités';
 $labels['spellcheck']    = 'Orthographe';
 $labels['checkspelling'] = 'Vérification de l\'orthographe';
@@ -283,6 +291,8 @@ $labels['alwaysshow'] = 'Toujours afficher les images de $sender';
 $labels['alwaysallow'] = 'Toujours autoriser de $sender';
 $labels['isdraft']    = 'Ceci est un brouillon.';
 $labels['andnmore']   = '$nr de plus...';
+$labels['headers']    = 'En-têtes';
+$labels['envelope']   = 'Enveloppe';
 $labels['togglemoreheaders'] = 'Afficher plus d\'en-têtes de courriels';
 $labels['togglefullheaders'] = 'Afficher/masquer les en-têtes brutes de courriels';
 $labels['htmltoggle'] = 'HTML';
@@ -356,11 +366,15 @@ $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Propriétés du contact';
 $labels['contactnameandorg'] = 'Nom et organisation';
 $labels['personalinfo'] = 'Informations personnelles';
+$labels['personal'] = 'Personnel';
 $labels['contactphoto'] = 'Photo du contact';
 $labels['edit']   = 'Modifier';
 $labels['cancel'] = 'Annuler';
 $labels['save']   = 'Enregistrer';
 $labels['delete'] = 'Supprimer';
+$labels['discard'] = 'Supprimer';
+$labels['continue'] = 'Continuer';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Renommer';
 $labels['addphoto'] = 'Ajouter';
 $labels['replacephoto'] = 'Remplacer';
@@ -555,6 +569,12 @@ $labels['source'] = 'Source';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Obtenir du soutien';
 $labels['savedsearches'] = 'Recherches enregistrées';
+$labels['dateformatY'] = 'AAAA';
+$labels['dateformaty'] = 'AA';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'JJ';
+$labels['dateformatj'] = 'J';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'o';
 $labels['KB'] = 'ko';
 $labels['MB'] = 'Mo';
@@ -610,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Options de rédaction';
 $labels['arialabelresponsesmenu'] = 'Menu des réponses prédéterminées';
 $labels['arialabelattachmentuploadform'] = 'Formulaire de téléversement de pièce jointe';
 $labels['arialabelattachmentmenu'] = 'Options des pièces jointes';
+$labels['arialabelmailtomenu'] = 'Options d\'adresse courriel';
 $labels['arialabelattachmentpreview'] = 'Prévisualisation des pièces jointes';
 $labels['ariasummarycomposecontacts'] = 'Liste des contacts et des groupes à sélectionner comme destinataires';
 $labels['arialabelcontactexportoptions'] = 'Options d\'exportation des contacts';
@@ -619,6 +640,7 @@ $labels['arialabelidentityeditfrom'] = 'Formulaire de modification de l\'identit
 $labels['arialabelresonseeditfrom'] = 'Formulaire de modification des réponses';
 $labels['arialabelsearchterms'] = 'Termes de recherche';
 $labels['arialabeldropactionmenu'] = 'Menu d\'action coller-déposer';
+$labels['arialabelheadersmenu'] = 'Menu d’ajout de destinataires (en-tête)';
 $labels['helplistnavigation'] = 'Navigation au clavier des listes ';
 $labels['helplistkeyboardnavigation'] = "Flèche haut/bas : déplacer la cible de sélection.
 Espace : sélectionner la rangée ciblée.
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 80f71188b..46696a445 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -76,6 +76,8 @@ $messages['errormoving'] = 'Impossible de déplacer les courriels.';
 $messages['errorcopying'] = 'Impossible de copier les courriels.';
 $messages['errordeleting'] = 'Impossible de supprimer les courriels.';
 $messages['errormarking'] = 'Impossible de marquer les courriels.';
+$messages['alerttitle'] = 'Attention';
+$messages['confirmationtitle'] = 'Êtes-vous sûr…?';
 $messages['deletecontactconfirm']  = 'Voulez-vous vraiment supprimer les contacts sélectionnés ?';
 $messages['deletegroupconfirm']  = 'Voulez-vous vraiment supprimer le groupe sélectionné ?';
 $messages['deletemessagesconfirm'] = 'Voulez-vous vraiment supprimer les courriels sélectionnés ?';
@@ -100,7 +102,6 @@ $messages['nosubjecttitle']  = 'Aucun objet';
 $messages['nobodywarning'] = 'Envoyer ce courriel sans texte ?';
 $messages['notsentwarning'] = 'Le courriel n\'a pas été envoyé et contient des changements non enregistrés. Souhaitez-vous rejeter vos changements ?';
 $messages['restoresavedcomposedata'] = 'Un courriel rédigé précédemment mais non envoyé a été trouvé.\n\nObjet : $subject\nEnregistré le : $date\n\nVoulez-vous restaurer ce courriel ?';
-$messages['noldapserver'] = 'Veuillez choisir un serveur ldap à rechercher.';
 $messages['nosearchname'] = 'Veuillez saisir un nom de contact ou une adresse de courriel.';
 $messages['notuploadedwarning'] = 'Toutes les pièces jointes n\'ont pas encore été téléversées. Veuillez patienter ou annuler le téléversement.';
 $messages['searchsuccessful'] = '$nr courriels trouvés.';
@@ -162,6 +163,7 @@ $messages['smtpautherror'] = 'Erreur SMTP ($code) : échec lors de l\'authentifi
 $messages['smtpfromerror'] = 'Erreur SMTP ($code) : impossible de définir l\'expéditeur « $from » ($msg)';
 $messages['smtptoerror'] = 'Erreur SMTP ($code) : échec lors de l\'ajout du destinataire « $to » ($msg)';
 $messages['smtprecipientserror'] = 'Erreur SMTP : impossible d\'analyser la liste des destinataires.';
+$messages['smtpsizeerror'] = 'Erreur SMTP : la taille du message dépasse la limite du serveur ($limit)';
 $messages['smtperror'] = 'Erreur SMTP : $msg';
 $messages['emailformaterror'] = 'Adresse courriel invalide : $email';
 $messages['toomanyrecipients'] = 'Trop de destinataires. Réduire leur nombre à $max.';
@@ -194,7 +196,7 @@ $messages['invalidimageformat'] = 'N\'est pas un format d\'image valide.';
 $messages['mispellingsfound'] = 'Fautes d\'orthographe détectées dans le courriel.';
 $messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent choisi. Aucun droit d\'accès.';
 $messages['messagetoobig'] = 'La partie message est trop grosse pour être traitée.';
-$messages['attachmentvalidationerror'] = 'AVERTISSEMENT ! Cette pièce jointe est suspecte car son type ne correspond pas au type déclaré dans le courriel. Si vous ne faites pas confiance à l\'expéditeur, vous ne devriez pas l\'ouvrir dans le navigateur car son contenu peut être malveillant.<br/><br/><em>Attendu : $expected ; trouvé : $detected</em>';
+$messages['attachmentvalidationerror'] = 'Cette pièce jointe est suspecte, car son type ne correspond pas au type déclaré dans le courriel. Si vous ne faites pas confiance à l’expéditeur, vous ne devriez pas l’ouvrir dans le navigateur, car son contenu pourrait être malveillant.<br/><br/><em>Attendu : $expected ; trouvé : $detected</em>';
 $messages['noscriptwarning'] = 'Avertissement : Ce service de courriel Web exige Javascript ! Afin de l\'utiliser, veuillez activer Javascript dans les paramètres de votre navigateur.';
 $messages['messageissent'] = 'Le courriel a déjà été envoyé, mais n\'a pas encore été enregistré. Voulez-vous le faire maintenant ?';
 $messages['errnotfound'] = 'Ficher introuvable';
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index 261e893b0..634ebcc71 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -346,6 +346,7 @@ $labels['contacts'] = 'Kontakten';
 $labels['contactproperties'] = 'Kontakt eigenskippen';
 $labels['contactnameandorg'] = 'Namme en Organisaasje';
 $labels['personalinfo'] = 'Persoanlike ynformaasje';
+$labels['personal'] = 'Persoanlik';
 $labels['contactphoto'] = 'Kontakt foto';
 $labels['edit']   = 'Bewurkje';
 $labels['cancel'] = 'Annulearje';
diff --git a/program/localization/fy_NL/messages.inc b/program/localization/fy_NL/messages.inc
index d38a3ea04..e955796bc 100644
--- a/program/localization/fy_NL/messages.inc
+++ b/program/localization/fy_NL/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Gjin ûnderwerp';
 $messages['nobodywarning'] = 'Dit berjocht sûnder tekst ferstjoere?';
 $messages['notsentwarning'] = 'It berjocht is net ferstjoerd en hat net-bewarre feroarings. Wolle jo de feroarings fuort smite?';
 $messages['restoresavedcomposedata'] = 'In earder komponearre mar net-ferstjoerd berjocht waard fûn.\n\nSubject: $subject\nSaved: $date\n\nWolle jo dit berjocht weromsette?';
-$messages['noldapserver'] = 'Selektearje in LDAP-tsjinner om troch te sykjen.';
 $messages['nosearchname'] = 'Fier in kontakt namme of e-post adres yn.';
 $messages['notuploadedwarning'] = 'Noch net alle taheaksels binne opladen. Jo kinne wachtsje of it opladen ôfbrekke.';
 $messages['searchsuccessful'] = '$nr berjochten fûn.';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'Gjin jildich ôfbyldings formaat.';
 $messages['mispellingsfound'] = 'Stavering flaters ûntdutsen yn it berjocht.';
 $messages['parentnotwritable'] = 'Koe map net oanmeitsje/ferhúzje yn selektearre boppelizzende map. Gjin tagong rjochten.';
 $messages['messagetoobig'] = 'It berjocht diel is te grut om te ferwurkjen.';
-$messages['attachmentvalidationerror'] = 'WARSKÔGING! Dit taheaksel wurdt fertocht om\'t it type net oerien komt mei it type ferklearre yn it berjocht. As jo de stjoerder net fertrouwe, moatte jo it net iepenje yn \'e browser om\'t it kweade ynhâld befetsje kin.<br/><br/><Em>Ferwachte: $expected; Fûn: $detected</em>';
 $messages['noscriptwarning'] = 'Warskôging: Dizze webmail tsjinst fereasket Javascript! Om it te brûken moatte jo Javascript ynskeakelje yn jo browser ynstellings.';
 $messages['messageissent'] = 'Dit berjocht wie al ferstjoerd, mar noch net bewarre. Wolle jo it no bewarje?';
 $messages['errnotfound'] = 'Bestân Net Fûn';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 7ed25a8e6..cea42cc27 100644
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -137,6 +137,7 @@ $labels['none'] = 'Dada';
 $labels['currpage'] = 'An leathanach reatha';
 $labels['isread'] = 'Léite';
 $labels['unread'] = 'Neamhléite';
+$labels['flagged'] = 'Bratach curtha leis';
 $labels['unanswered'] = 'Gan fhreagra';
 $labels['withattachment'] = 'Le ceangaltán';
 $labels['deleted'] = 'Scriosta';
@@ -162,6 +163,7 @@ $labels['arrival'] = 'An dáta ar a shroich sé ';
 $labels['asc'] = 'ag dul suas';
 $labels['desc'] = 'ag dul síos';
 $labels['layout'] = 'Leagan amach';
+$labels['layoutlist'] = 'Liosta';
 $labels['folderactions'] = 'Gníomhartha do na fillteáin...';
 $labels['compact'] = 'Comhbhrúigh';
 $labels['empty'] = 'Folmhaigh';
@@ -301,11 +303,13 @@ $labels['editcontact'] = 'Chuir chara in eagar';
 $labels['contacts'] = 'Teagmhálacha';
 $labels['contactnameandorg'] = 'Ainm agus Eagraíocht';
 $labels['personalinfo'] = 'Faisnéis phearsanta';
+$labels['personal'] = 'Pearsanta';
 $labels['contactphoto'] = 'Grianghraf den teagmhálaí';
 $labels['edit']   = 'Athraigh';
 $labels['cancel'] = 'Cealaigh';
 $labels['save']   = 'Sábháil';
 $labels['delete'] = 'Scrios';
+$labels['discard'] = 'Cuileáil';
 $labels['rename'] = 'Athainmnigh';
 $labels['addphoto'] = 'Cuir leis';
 $labels['replacephoto'] = 'Ionadaigh';
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 841550f94..d120bb447 100644
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -51,10 +51,12 @@ $messages['messagesaved'] = 'Cuireadh an teachtaireacht i dtaisce sna Dréachta�
 $messages['successfullysaved'] = 'Cuireadh i dtaisce go rathúil é.';
 $messages['savingresponse'] = 'Ag cur i dtaisce an téacs freagartha...';
 $messages['deleteresponseconfirm'] = 'An bhfuil tú cinnte gur mian leat an téacs freagartha seo a scriosadh?';
+$messages['nocontactselected'] = 'Níl teagmhálaí roghnaithe agat fós.';
 $messages['addedsuccessfully'] = 'Cuireadh an teagmhálaí go rathúil sa leabhar seoltaí.';
 $messages['contactexists'] = 'Tá teagmhálaí leis an seoladh ríomhphoist céanna ann cheana féin.';
 $messages['contactnameexists'] = 'Tá teagmhálaí leis an ainm céanna ann cheana féin.';
 $messages['blockedimages'] = 'Ar mhaithe le do phríobháideachas a chosaint, tá bac ar íomhánna cianda sa teachtaireacht seo.';
+$messages['blockedresources'] = 'Ar mhaithe le do phríobháideachas a chosaint, tá bac ar acmhainní cianda.';
 $messages['encryptedmessage'] = 'Is teachtaireacht chriptithe í seo agus ní féidir í a thaispeáint. Is dona linn sin!';
 $messages['externalmessagedecryption'] = 'Is teachtaireacht chriptithe í seo agus is féidir í a dhíchriptiú le breiseán ar do líonléitheoir.';
 $messages['nopubkeyfor'] = 'Níor aimsíodh eochair phoiblí bhailí i gcomhair $email';
@@ -71,6 +73,8 @@ $messages['errormoving'] = 'Níorbh fhéidir na teachtaireachtaí a bhogadh.';
 $messages['errorcopying'] = 'Níorbh fhéidir na teachtaireachtaí a mhacasamhlú.';
 $messages['errordeleting'] = 'Níorbh fhéidir na teachtaireachtaí a scriosadh.';
 $messages['errormarking'] = 'Níorbh fhéidir rian a chur ar na teachtaireachtaí';
+$messages['alerttitle'] = 'Aire';
+$messages['confirmationtitle'] = 'An bhfuil tú cinnte...';
 $messages['deletecontactconfirm']  = 'An bhfuil tú cinnte gur mian leat an daoine roghnaithe a scriosadh?';
 $messages['deletegroupconfirm']  = 'An bhfuil tú cinnte gur mian leat an bhaicle roghnaithe a scriosadh?';
 $messages['deletemessagesconfirm'] = 'An bhfuil tú cinnte gur mian leat na teachtaireachtaí roghnaithe a scriosadh?';
@@ -87,14 +91,15 @@ $messages['noemailwarning'] = 'Cuir isteach seoladh ríomhphoist bailí le do th
 $messages['nonamewarning']  = 'Cuir isteach ainm le do thoil.';
 $messages['nopagesizewarning'] = 'Cuir isteach méid leathanaigh le do thoil.';
 $messages['nosenderwarning'] = 'Cuir isteach seoladh ríomhphoist an tseoltóra.';
+$messages['recipientsadded'] = 'Cuireadh faighteoir(í) go rathúil leis.';
 $messages['norecipientwarning'] = 'Abair liom faighteoir amhain ar a laghad';
+$messages['disclosedrecipwarning'] = 'Feicfidh gach faighteoir seoltaí ríomhphoist a chéile. Chun sin a sheachaint agus a bpríobháideachas a chosaint, is féidir feidhm a bhaint as an réimse Bcc.';
 $messages['disclosedreciptitle'] = 'An iomarca faighteoirí poiblí';
 $messages['nosubjectwarning']  = 'Níl aon ábhair ar an teachtaireacht, ba mhaith tú déarfaidh mé ábair?';
 $messages['nosubjecttitle']  = 'Gan ábhar';
 $messages['nobodywarning'] = 'Níl aon teacs san teachtaireacht, ba mhaith tú déarfaidh mé teachtaireacht ar bith?';
 $messages['notsentwarning'] = 'Níor seoladh an teachtaireacht seo agus tá athruithe nach cuireadh i dtaisce inti. An mian leat do chuid athruithe a chuileáil?';
 $messages['restoresavedcomposedata'] = 'Aimsíodh teachtaireacht a chumadh ach nár seoladh.\n\nÁbhar: $subject\nTaiscthe: $date\n\nAr mhaith leat an teachtaireacht seo a chur ar ais?';
-$messages['noldapserver'] = 'Abair liom eolaire LDAP chun é a cuardaigh';
 $messages['nosearchname'] = 'Abair liom ainm duine nó seoladh ríomhphost';
 $messages['notuploadedwarning'] = 'Níl gach ceangaltán uasluchtaithe fós. Fan le do thoil nó cealaigh an t-uasluchtú.';
 $messages['searchsuccessful'] = 'Fuair mé $n teachtaireacht';
@@ -139,6 +144,7 @@ $messages['importmessagesuccess'] = 'Tugadh $nr teachtaireacht isteach go rathú
 $messages['importmessageerror'] = 'Theip ar an tabhairt isteach! Ní comhad teachtaireachta nó comhad bosca poist bailí é an comhad uasluchtaithe ';
 $messages['opnotpermitted'] = 'Níl cead sin a dhéanamh!';
 $messages['nofromaddress'] = 'Tá seoladh ríomhphoist ar iarraidh san aitheantas roghnaithe. ';
+$messages['smtpconnerror'] = 'Botún SMTP ($code): Theip ar an nasc leis an bhfreastalaí.';
 $messages['smtpautherror'] = 'Botún SMTP ($code): Theip ar an bhfíordheimhniú.';
 $messages['smtperror'] = 'Botún SMTP: $msg';
 $messages['emailformaterror'] = 'Seoladh ríomhphoist neamhbhailí: $email';
@@ -147,6 +153,7 @@ $messages['internalerror'] = 'Tharla botún inmheánach. Déan iarracht eile ar�
 $messages['contactdelerror'] = 'Níorbh fhéidir na teagmhálaithe a scriosadh.';
 $messages['contactdeleted'] = 'Scriosadh na teagmhálaithe go rathúil.';
 $messages['contactrestoreerror'] = 'Níorbh fhéidir na teagmhálacha a scriosadh a chur ar ais.';
+$messages['contactrestored'] = 'Cuireadh teagmhálaí(ithe) ar ais go rathúil.';
 $messages['groupdeleted'] = 'Scriosadh an bhaicle.';
 $messages['grouprenamed'] = 'Athainmníodh an bhaicle.';
 $messages['groupcreated'] = 'Cruthaíodh an bhaicle.';
@@ -164,6 +171,7 @@ $messages['foldercreated'] = 'Cruthaíodh an fillteán.';
 $messages['invalidimageformat'] = 'Ní formáid íomhá bailí í sin.';
 $messages['mispellingsfound'] = 'Aimsíodh botúin litrithe san teachtaireacht.';
 $messages['messagetoobig'] = 'Tá an teachtaireacht rómhór le gur féidir obair léi.';
+$messages['noscriptwarning'] = 'Rabhadh: Tá Javascript de dhíth ar an gcóras ríomhphoist ghréasáin. Chun feidhm a bhaint as cumasaigh Javascript sna socruithe i líonléitheoir.';
 $messages['messageissent'] = 'Seoladh an teachtaireacht seo cheana, ach níor cuireadh i dtaisce fós í. An mian leat í a chur i dtaisce?';
 $messages['errnotfound'] = 'Níor Aimsíodh an Comhad';
 $messages['errnotfoundexplain'] = 'Níor aimsíodh an acmhainn a lorgadh!';
@@ -172,4 +180,5 @@ $messages['errauthorizationfailed'] = 'Theip ar an bhfíordheimhniú';
 $messages['errunauthorizedexplain'] = 'Níorbh fhéidir a fhíordheimhniú go bhfuil cead agat rochtain a fháil ar an seirbhís seo!';
 $messages['errcontactserveradmin'] = 'Déan teagmháil le riarthóir d\'fhreastalaí.';
 $messages['clicktoresumesession'] = 'Brúigh anseo chun leanúint ar aghaidh le do dhreas roimhe';
+$messages['errcomposesession'] = 'Botún i gcum teachtaireacht';
 $messages['clicktocompose'] = 'Brúigh anseo chun teachtaireacht nua a chumadh';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 1eb606389..e33b3d391 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Como non lidas';
 $labels['markflagged']      = 'Como marcadas';
 $labels['markunflagged']    = 'Como non marcadas';
 $labels['moreactions']      = 'Máis accións...';
+$labels['folders-all']      = 'Tódalas cartafoles';
 $labels['more']             = 'Máis';
 $labels['back']             = 'Atrás';
 $labels['options']          = 'Opcións';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Enumerar columnas';
 $labels['listsorting'] = 'Ordenar en columnas';
 $labels['listorder'] = 'Ordenación';
 $labels['listmode'] = 'Modo de vista da lista';
+$labels['layoutlist'] = 'Lista';
 $labels['folderactions'] = 'Accións cos cartafoles';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Baleirar';
@@ -321,6 +323,7 @@ $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Gardar';
 $labels['delete'] = 'Eliminar';
+$labels['discard'] = 'Descartar';
 $labels['rename'] = 'Mudar o nome';
 $labels['addphoto'] = 'Engadir';
 $labels['replacephoto'] = 'Substituír';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 48e70c018..bd2e052f5 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Por favor, engade polo menos unha persoa dest
 $messages['nosubjectwarning']  = 'O campo "Asunto" está baleiro. Queres completalo?';
 $messages['nobodywarning'] = 'Queres enviar esta mensaxe sen texto?';
 $messages['restoresavedcomposedata'] = 'Foi atopada unha mensaxe que non se enviara.\n\nSubject: $subject\nSaved: $date\n\n¿queres restaurar esta mensaxe?';
-$messages['noldapserver'] = 'Por favor, elixe un servidor LDAP para buscar.';
 $messages['nosearchname'] = 'Por favor, engade un nome ou un enderezo de correo electrónico.';
 $messages['notuploadedwarning'] = 'Aínda non se cargaron tódolos ficheiros. Por favor, agarde ou cancele a carga.';
 $messages['searchsuccessful'] = 'Atopáronse $nr mensaxes.';
@@ -170,5 +169,4 @@ $messages['invalidimageformat'] = 'O formato da imaxe non é válido.';
 $messages['mispellingsfound'] = 'Atopáronse erros ortográficos na mensaxe.';
 $messages['parentnotwritable'] = 'Non foi posíbel crear/mover o cartafol para o cartafol principal que selecionaches porque non tes permisos.';
 $messages['messagetoobig'] = 'A mensaxe é demasiado grande para procesala';
-$messages['attachmentvalidationerror'] = 'ATENCIÓN! Este anexo é sospeitoso porque o seu tipo non coincide co tipo declarado na mensaxe. Se non confías no remite, non deberías abrilo, porque podería conter un virus ou malware.<br/><br/><em>Tipo agardado: $expected; Tipo detectado: $detected</em>';
 $messages['noscriptwarning'] = 'Atención: Este servicio de correo web precisa de Javascript!. Por favor, active javascript nas opción do seu navegador.';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 51726e095..6fcf7b65c 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -354,11 +354,13 @@ $labels['contacts'] = 'אנשי קשר';
 $labels['contactproperties'] = 'מאפייני איש קשר';
 $labels['contactnameandorg'] = 'שם וארגון';
 $labels['personalinfo'] = 'מידע אישי';
+$labels['personal'] = 'אישי';
 $labels['contactphoto'] = 'תצלום איש קשר';
 $labels['edit']   = 'עריכה';
 $labels['cancel'] = 'ביטול';
 $labels['save']   = 'שמירה';
 $labels['delete'] = 'מחיקה';
+$labels['discard'] = 'להפטר';
 $labels['rename'] = 'שינוי שם';
 $labels['addphoto'] = 'הוספה';
 $labels['replacephoto'] = 'החלפה';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 9d04e0182..ab8407eb1 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'אין נושא';
 $messages['nobodywarning'] = 'האם לשלוח הודעה ללא תוכן?';
 $messages['notsentwarning'] = 'ההודעה טרם נשלחה ויש בה שינויים שלא נשמרו. האם לוותר על כל השינויים?';
 $messages['restoresavedcomposedata'] = 'נמצאה הודעה שנערכה אך לא נשלחה. \n\nSubject: $subject\nנשמרה:  $date\n\nהאם לשחזר את ההודעה?';
-$messages['noldapserver'] = 'נא לבחור שרת כתובות לחיפוש';
 $messages['nosearchname'] = 'נא להוסיף איש קשר או כתובת דוא"ל';
 $messages['notuploadedwarning'] = 'עדיין לא הועלו כל הקבצים. נא לחכות או לבטל הפעולה.';
 $messages['searchsuccessful'] = 'נמצאו $nr הודעות';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'פורמט תמונה לא חוקי';
 $messages['mispellingsfound'] = 'התגלו שגיאות כתיב בהודעה';
 $messages['parentnotwritable'] = 'לא ניתן ליצור/להעביר תיקיה לתוך תיקית האב שנבחרה. אין הרשאה לגישה.';
 $messages['messagetoobig'] = 'ההודעה גדולה מעבר ליכולת העיבוד של התוכנה';
-$messages['attachmentvalidationerror'] = 'זהירות ! הצרופה חשודה כי אינה מהסוג שצוין בהודעה. אם לא ניתן לבטוח בשולח אזי להמנע מלפתוח את הקובץ בדפדפן כי הקובץ יכול להכיל קוד זדוני.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'זהירות! תוכנה זו דורשת שימוש בג\'אווהסקריפט! כדי להשתמש בכלי, יש לבחור באפשרות זו בהגדרות הדפדפן.';
 $messages['messageissent'] = 'ההודעה נשלחה אבל לא נשמרה עדיין. האם לשמור אותה כעת?';
 $messages['errnotfound'] = 'הקובץ לא נמצא';
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 24452588a..56a8564d9 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -53,7 +53,6 @@ $messages['nopagesizewarning'] = 'पन्ना माप भरें';
 $messages['norecipientwarning'] = 'कम-से-कम एक पाने वाले का पता भरें';
 $messages['nosubjectwarning']  = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
 $messages['nobodywarning'] = 'बिना कुछ लिखे मेल भेजें?';
-$messages['noldapserver'] = 'खोज के लिये एक ऐलडैप सर्वर चुनें';
 $messages['nosearchname'] = 'पता या पते का नाम भरें';
 $messages['searchsuccessful'] = '$nr मेल मिले';
 $messages['searchnomatch'] = 'खोज असफ़ल';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 7df836627..8eae64204 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Kao nepročitano';
 $labels['markflagged']      = 'Kao označeno';
 $labels['markunflagged']    = 'Kao neoznačeno';
 $labels['moreactions']      = 'Više akcija...';
+$labels['folders-all']      = 'Sve mape';
 $labels['more']             = 'Više';
 $labels['back']             = 'Natrag';
 $labels['options']          = 'Postavke';
@@ -135,6 +136,7 @@ $labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
 $labels['currpage'] = 'Trenutna stranica';
+$labels['isread'] = 'Čitanje';
 $labels['unread'] = 'Nepročitano';
 $labels['flagged'] = 'Označeno';
 $labels['unanswered'] = 'Neodgovoreno';
@@ -164,6 +166,7 @@ $labels['listcolumns'] = 'Stupci';
 $labels['listsorting'] = 'Sortirajući stupac';
 $labels['listorder'] = 'Redoslijed sortiranja';
 $labels['listmode'] = 'Model pregleda listi';
+$labels['layoutlist'] = 'Lista';
 $labels['folderactions'] = 'Akcije mapa...';
 $labels['compact'] = 'Kompresiraj (sažmi)';
 $labels['empty'] = 'Isprazni';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index a49f6ad9a..617a52587 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -82,7 +82,6 @@ $messages['norecipientwarning'] = 'Unesite barem jednog primatelja.';
 $messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['restoresavedcomposedata'] = 'Pronađena je započeta, ali neposlana poruka .\n\nNaslov: $subject\nSnimljeno: $date\n\nŽelite li je prikazati?';
-$messages['noldapserver'] = 'Odaberite LDAP poslužitelj za pretragu.';
 $messages['nosearchname'] = 'Unesite ime ili e-mail adresu.';
 $messages['notuploadedwarning'] = 'Svi privitci još nisu postavljeni na poslužitelj. Molim pričekajte ili zaustavite postavljanje.';
 $messages['searchsuccessful'] = 'Pronađeno $nr poruka.';
@@ -167,5 +166,4 @@ $messages['invalidimageformat'] = 'Format slike nije ispravan.';
 $messages['mispellingsfound'] = 'Poruka sadrži pravopisne greške.';
 $messages['parentnotwritable'] = 'Nije moguće stvoriti/pomaknuti mapu u odabranoj mapi. Nemate pravo pristupa.';
 $messages['messagetoobig'] = 'Dio poruke je prevelik za obradu.';
-$messages['attachmentvalidationerror'] = 'UPOZORENJE! Ovaj privitak je sumnjiv jer vrsta privitka ne odgovara vrsti deklariranoj u poruci. Ako ne vjerujete pošiljatelju, ne biste trebali otvarati privitak u pregledniku jer može isti može sadržavati zloćudni kod.<br/><br/><em>Očekivano: $expected; pronađeno: $detected</em>';
 $messages['noscriptwarning'] = 'UPOZORENJE: Ovaj webmail servis zahtijeva Javascript!  Kako biste ga mogli koristiti, molimo omogućite Javascript u postavkama svog preglednika.';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 44d46008a..c66b6b95b 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -139,6 +139,7 @@ $labels['folders-all']      = 'Összes mappa';
 $labels['more']             = 'Még...';
 $labels['back']             = 'Vissza';
 $labels['options']          = 'Beállítások';
+$labels['actions']          = 'Műveletek';
 $labels['first'] = 'Első';
 $labels['last'] = 'Utolsó';
 $labels['previous'] = 'Elöző';
@@ -199,6 +200,7 @@ $labels['quotatotal'] = 'Limit';
 $labels['quotaused'] = 'Használt';
 $labels['quotastorage'] = 'Lemez méret';
 $labels['quotamessage'] = 'Üzenet darab';
+$labels['shortheaderfrom'] = '$from kűldőtől $date';
 $labels['quicksearch']  = 'Gyorskeresés';
 $labels['searchplaceholder']  = 'Keresés...';
 $labels['resetsearch']  = 'Alapállapot';
@@ -246,6 +248,7 @@ $labels['keylength']      = 'Bitek';
 $labels['keyexpired']     = 'Lejárt';
 $labels['keyrevoked']     = 'Visszvont';
 $labels['bccinstead']     = 'Titkos másolat használata';
+$labels['addheader']      = 'Címzet (fejléc) hozzáadása ';
 $labels['editidents']    = 'Azonosítók szerkesztése';
 $labels['spellcheck']    = 'Helyesírás ellenőrzés';
 $labels['checkspelling'] = 'Helyesírás-ellenőrzés';
@@ -278,9 +281,12 @@ $labels['high']    = 'Magas';
 $labels['highest'] = 'Legmagasabb';
 $labels['nosubject']  = '(nincs tárgy)';
 $labels['showimages'] = 'Képek megjelenítése';
+$labels['allow']      = 'Engedélyezve';
 $labels['alwaysshow'] = 'Képek megjelenítése mindig, ha a feladó $sender';
+$labels['alwaysallow'] = 'Minding engedélyezve ha a feladó $sender ';
 $labels['isdraft']    = 'Ez egy piszkozat.';
 $labels['andnmore']   = 'további $nr...';
+$labels['envelope']   = 'Boriték';
 $labels['togglemoreheaders'] = 'Több üzenet fejrész(header) megjelenítése';
 $labels['togglefullheaders'] = 'Nyers üzenet fejléc megjelenítés- elrejtés';
 $labels['htmltoggle'] = 'HTML';
@@ -354,11 +360,15 @@ $labels['contacts'] = 'Kapcsolatok';
 $labels['contactproperties'] = 'Kapcsolat tulajdonságai';
 $labels['contactnameandorg'] = 'Név és szervezet';
 $labels['personalinfo'] = 'Személyes adatok';
+$labels['personal'] = 'Személyes';
 $labels['contactphoto'] = 'Kapcsolat fotója';
 $labels['edit']   = 'Szerkesztés';
 $labels['cancel'] = 'Mégsem';
 $labels['save']   = 'Mentés';
 $labels['delete'] = 'Törlés';
+$labels['discard'] = 'Érvénytelenít';
+$labels['continue'] = 'Tovább';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Átnevezés';
 $labels['addphoto'] = 'Kép hozzáadása';
 $labels['replacephoto'] = 'Kép cseréje';
@@ -449,6 +459,7 @@ $labels['skipdeleted'] = 'Törölt üzenetek ne legyenek megjelenítve';
 $labels['deletealways'] = 'Üzenet törlése, ha nem sikerül áthelyezni a törölt elemek mappába';
 $labels['deletejunk'] = 'Üzenetek közvetlen törlése a levélszemét mappából';
 $labels['showremoteimages'] = 'Távoli beágyazott képek megjelenítése';
+$labels['allowremoteresources'] = 'Tivoli erőforrások engedélyezve (képek, stílusok)';
 $labels['fromknownsenders'] = 'csak ismert feladóktól';
 $labels['always'] = 'mindig';
 $labels['alwaysbutplain'] = 'mindig, kivéve ha sima szöveg levélre válaszolunk';
@@ -607,6 +618,7 @@ $labels['arialabelcomposeoptions'] = 'Levélírás opciók';
 $labels['arialabelresponsesmenu'] = 'Sablon válaszok menű';
 $labels['arialabelattachmentuploadform'] = 'Csatolmány feltöltő űrlap';
 $labels['arialabelattachmentmenu'] = 'Csatolmány beállítások';
+$labels['arialabelmailtomenu'] = 'Email cím beállítások';
 $labels['arialabelattachmentpreview'] = 'Csatolmány előnézet';
 $labels['ariasummarycomposecontacts'] = 'A kapcsolatoknak és csoportoknak a listája a címzettek kiválasztásához';
 $labels['arialabelcontactexportoptions'] = 'Kapcsolat exportálásának opciói';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index b7e851a99..fdba73a57 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -55,6 +55,7 @@ $messages['addedsuccessfully'] = 'A kapcsolat hozzáadása a címjegyzékhez meg
 $messages['contactexists'] = 'Egy kapcsolat ugyanezzel az email címmel már létezik.';
 $messages['contactnameexists'] = 'Ezzel a névvel már létezik kapcsolat';
 $messages['blockedimages'] = 'Biztonsági okokból a távoli képek letöltése tiltott';
+$messages['blockedresources'] = 'A személyes adatok védelmében a távoli erőforrások blokkolva vannak.';
 $messages['encryptedmessage'] = 'Az üzenet titkosított, ezért nem megjeleníthető';
 $messages['externalmessagedecryption'] = 'Ez egy titkosított üzenet amit vissza tudsz fejteni a böngésződ bővitményével,';
 $messages['nopubkeyfor'] = 'Nem található érvényes publikus kulcs ehez az emailhez: $email';
@@ -75,6 +76,8 @@ $messages['errormoving'] = 'Az üzenet(ek)et nem sikerült áthelyezni';
 $messages['errorcopying'] = 'Az üzenet(ek)et nem sikerült másolni';
 $messages['errordeleting'] = 'Az üzenet(ek)et nem sikerült törölni';
 $messages['errormarking'] = 'Az üzenet(ek)et nem sikerült megjelölni';
+$messages['alerttitle'] = 'Figyelem';
+$messages['confirmationtitle'] = 'Biztosan...';
 $messages['deletecontactconfirm']  = 'Biztos, hogy törölni szeretné a kijelölt kapcsolato(ka)t?';
 $messages['deletegroupconfirm']  = 'Biztos, hogy törölni szeretné a kijelölt csoportot?';
 $messages['deletemessagesconfirm'] = 'Biztos, hogy törölni szeretné a kijelölt üzenete(ke)t?';
@@ -99,7 +102,6 @@ $messages['nosubjecttitle']  = 'Nincs tárgy';
 $messages['nobodywarning'] = 'Elküldi az üzenetet üresen?';
 $messages['notsentwarning'] = 'Az üzenet nem lett még elküldve és vannak benne nem mentett változások. Bizots elveted a módósításaidat?';
 $messages['restoresavedcomposedata'] = 'Egy elkezdett de el nem küldött üzenetet talált a program.\n\Tárgy: $subject\nMentve: $date\n\nSzeretnéd visszaállítani és folytatni ez az üzenetet?';
-$messages['noldapserver'] = 'Adjon meg egy LDAP szervert a kereséshez';
 $messages['nosearchname'] = 'Adja meg a kapcsolat nevét vagy e-mail címét';
 $messages['notuploadedwarning'] = 'Még nem került feltöltésre minden csatolmány. Kérem várjon vagy állítsa le a feltöltést!';
 $messages['searchsuccessful'] = '$nr üzenet található';
@@ -161,6 +163,7 @@ $messages['smtpautherror'] = 'SMTP hiba ($code): Sikertelen bejelentkezés';
 $messages['smtpfromerror'] = 'SMTP hiba ($code): Nem sikerült a feladó beállítása: "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP hiba ($code): Nem sikerült a következő címzett hozzáadása: "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP hiba ($code): A címzettlista feldolgozása sikertelen';
+$messages['smtpsizeerror'] = 'SMTP Hiba: Az üzenet mérete elérte a kiszálgáló által engedélyzett maximális méretet ($limit)';
 $messages['smtperror'] = 'SMTP hiba ($code): $msg';
 $messages['emailformaterror'] = 'Érvénytelen email cím: $email';
 $messages['toomanyrecipients'] = 'Túl sok a címzett. Csökkentse a címzettek számát maximum $max címre!';
@@ -193,7 +196,6 @@ $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/áthelyezése a kijelölt főmappába. Nincs jogosultsága a művelethez!';
 $messages['messagetoobig'] = 'Az üzenetrész túl nagy a feldolgozáshoz.';
-$messages['attachmentvalidationerror'] = 'FIGYELEM! A csatalmány veszélyes lehet, mert a típusa nem egyezik az üzenetben beállított típussal. Amennyiben nem megbizható az üzenet küldője, ne nyissa meg a csatolmányt a böngészőben mert ártalmas lehet a tartalma.<br/><br/><em>Üzenetben beállított tipus: $expected; az érzékelt típus: $detected</em>';
 $messages['noscriptwarning'] = 'FIGYELEM: Ez webmail szolgáltatása igényli a Javascript futtatásának a lehetőségét! Amennyiben használni szeretné, engedélyezze a JavaScript futtatását a böngészőjének a beállatásaiban.';
 $messages['messageissent'] = 'Az üzenet már el lett küldve, de még nincs elmentve. El akarod menteni most?';
 $messages['errnotfound'] = 'File nem található';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 683aacaf9..89cbbd85c 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -133,6 +133,7 @@ $labels['select'] = 'Նշել';
 $labels['all'] = 'Բոլորը';
 $labels['none'] = 'Չնշել';
 $labels['currpage'] = 'Առկա էջ';
+$labels['isread'] = 'Ընթերցված';
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
@@ -162,6 +163,7 @@ $labels['listcolumns'] = 'Ցուցակի սյունյակներ';
 $labels['listsorting'] = 'Տեսակավորման սյունյակ';
 $labels['listorder'] = 'Տեսակավորման կարգը';
 $labels['listmode'] = 'Ցուցակով տեսքի տարբերակը';
+$labels['layoutlist'] = 'Ցուցակ';
 $labels['folderactions'] = 'Պանակի գործողություններ…';
 $labels['compact'] = 'Սեղմել';
 $labels['empty'] = 'Դատարկել';
@@ -193,6 +195,7 @@ $labels['spellcheck']    = 'Տառասխալներ';
 $labels['checkspelling'] = 'Ստուգել ուղագրությունը';
 $labels['resumeediting'] = 'Շարունակել խմբագրումը';
 $labels['revertto']      = 'Վերականգնել';
+$labels['responsename'] = 'Անվանում';
 $labels['attach'] = 'Կցել';
 $labels['attachments'] = 'Կցումներ';
 $labels['upload'] = 'Բեռնել';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index 70a650e06..c4cbe63aa 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -70,7 +70,6 @@ $messages['nopagesizewarning'] = 'Մուտքագրեք էջի չափս';
 $messages['norecipientwarning'] = 'Մուտքագրեք նվազագույնը մեկ հասցեատեր';
 $messages['nosubjectwarning']  = 'Վերնագիր բացակայում է, ցանկանո՞ւմ եք լրացնել';
 $messages['nobodywarning'] = 'Ուղարկե՞լ այս նամակը դատարկ';
-$messages['noldapserver'] = 'Ընտրեք ldap սերվեր որոնման համար';
 $messages['nosearchname'] = 'Մուտքագրեք հասցեատեր կամ էլ. հասցե';
 $messages['notuploadedwarning'] = 'Ոչ բոլոր կցված նյութերն են վերբեռնվել։ Սպասեք կամ ընդհատեք վերբեռնումը։';
 $messages['searchsuccessful'] = 'Գտնվեց $nr նամակ';
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index f95bb1fd9..d199a625a 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -354,11 +354,13 @@ $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Proprietates de contacto';
 $labels['contactnameandorg'] = 'Nomine e organisation';
 $labels['personalinfo'] = 'Information personal';
+$labels['personal'] = 'Personal';
 $labels['contactphoto'] = 'Photo del contacto';
 $labels['edit']   = 'Modificar';
 $labels['cancel'] = 'Cancellar';
 $labels['save']   = 'Salveguardar';
 $labels['delete'] = 'Deler';
+$labels['discard'] = 'Abandonar';
 $labels['rename'] = 'Renominar';
 $labels['addphoto'] = 'Adder';
 $labels['replacephoto'] = 'Reimplaciar';
diff --git a/program/localization/ia/messages.inc b/program/localization/ia/messages.inc
index 6a1056c6b..ccb22ec27 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Sin subjecto';
 $messages['nobodywarning'] = 'Inviar iste message sin texto?';
 $messages['notsentwarning'] = 'Le message non ha essite inviate e ha modificationes non salveguardate. Abandonar le modificationes?';
 $messages['restoresavedcomposedata'] = 'Un message anteriormente componite ma non inviate ha essite trovate.\n\nSubjecto: $subject\nSalveguardate: $date\n\nVole vos restaurar iste message?';
-$messages['noldapserver'] = 'Per favor, selige un servitor LDAP in le qual cercar.';
 $messages['nosearchname'] = 'Per favor, specifica le nomine o adresse de e-mail de un contacto.';
 $messages['notuploadedwarning'] = 'Non tote le attachamentos ha ancora essite incargate. Per favor, attende o cancella le incargamento.';
 $messages['searchsuccessful'] = '$nr messages trovate.';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'Non es un formato de imagine valide.';
 $messages['mispellingsfound'] = 'Errores de orthographia ha essite detegite in le message.';
 $messages['parentnotwritable'] = 'Impossibile crear/displaciar le dossier in le dossier genitor seligite. Nulle permission de accesso.';
 $messages['messagetoobig'] = 'Le parte del message es troppo grande pro tractar lo.';
-$messages['attachmentvalidationerror'] = 'ATTENTION! Iste attachamento es suspecte perque su typo non corresponde al typo declarate in le message. Si vos non ha confidentia in le expeditor, vos non deberea aperir lo in le navigator perque illo pote haber contento nocive.<br/><br/><em>Expectate: $expected; trovate: $detected</em>';
 $messages['noscriptwarning'] = 'Attention: Iste servicio webmail require JavaScript. Pro usar lo, per favor activa JavaScript in le configuration de vostre navigator.';
 $messages['messageissent'] = 'Le message ha jam essite inviate ma non ancora salveguardate. Vole tu salveguardar lo ora?';
 $messages['errnotfound'] = 'File non trovate';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 0681df135..43fb2d3ca 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -135,6 +135,7 @@ $labels['folders-all']      = 'Semua folder';
 $labels['more']             = 'Berikutnya';
 $labels['back']             = 'Kembali';
 $labels['options']          = 'Pilihan';
+$labels['actions']          = 'Tindakan';
 $labels['first'] = 'Pertama';
 $labels['last'] = 'Terakhir';
 $labels['previous'] = 'Sebelumnya';
@@ -346,11 +347,13 @@ $labels['contacts'] = 'Daftar kontak';
 $labels['contactproperties'] = 'Properti kontak';
 $labels['contactnameandorg'] = 'Nama dan Organisasi';
 $labels['personalinfo'] = 'Informasi pribadi';
+$labels['personal'] = 'Pribadi';
 $labels['contactphoto'] = 'Foto kontak';
 $labels['edit']   = 'Ubah';
 $labels['cancel'] = 'Batal';
 $labels['save']   = 'Simpan';
 $labels['delete'] = 'Hapus';
+$labels['discard'] = 'Buang';
 $labels['rename'] = 'Ganti nama';
 $labels['addphoto'] = 'Tambah';
 $labels['replacephoto'] = 'Ganti';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index 1b1044f1c..6de523632 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Tanpa subjek';
 $messages['nobodywarning'] = 'Kirim pesan ini tanpa teks?';
 $messages['notsentwarning'] = 'Pesan belum terkirim dan tersimpan. Apakah kamu ingin membuang pengubahan?';
 $messages['restoresavedcomposedata'] = 'Sebelumnya disimpan tetapi pesan tidak terkirim ditemukan.\n\nJudul: $subject\nDisimpan: $date\n\nAnda yakin mengembalikan pesan ini?';
-$messages['noldapserver'] = 'Tolong pilih server LDAP untuk pencarian';
 $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';
@@ -193,7 +192,6 @@ $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.';
-$messages['attachmentvalidationerror'] = 'PERINGATAN! Lampiran ini mencurigakan karena jenisnya tidak cocok dengan jenis yang dinyatakan di dalam pesan. Jika Anda tidak mempercayai pengirim, Anda tidak perlu membukanya di browser karena mungkin berisi konten berbahaya.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Peringatan: Layanan ini membutuhkan Javascript! Untuk menggunakannya silahkan aktifkan Javascript di pengaturan browser Anda.';
 $messages['messageissent'] = 'Pesan telah terkirim, tapi belum disimpan. Apakah Anda hendak menyimpannya sekarang?';
 $messages['errnotfound'] = 'Berkas Tak Ditemukan';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index f07c6bb2d..8822a000b 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -356,11 +356,13 @@ $labels['contacts'] = 'Tengiliðir';
 $labels['contactproperties'] = 'Eiginleikar tengiliðar';
 $labels['contactnameandorg'] = 'Nafn og fyrirtæki/stofnun';
 $labels['personalinfo'] = 'Persónulegar upplýsingar';
+$labels['personal'] = 'Einka';
 $labels['contactphoto'] = 'Mynd af tengilið';
 $labels['edit']   = 'Breyta';
 $labels['cancel'] = 'Hætta við';
 $labels['save']   = 'Vista';
 $labels['delete'] = 'Eyða';
+$labels['discard'] = 'Henda';
 $labels['rename'] = 'Endurnefna';
 $labels['addphoto'] = 'Bæta við';
 $labels['replacephoto'] = 'Skipta út';
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index 2cc38da56..725ace3a1 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -96,7 +96,6 @@ $messages['nosubjectwarning']  = 'Efnislínan er tóm. Viltu slá eitthvað inn
 $messages['nosubjecttitle']  = 'Án titils';
 $messages['nobodywarning'] = 'Viltu senda tómt skeyti?';
 $messages['notsentwarning'] = 'Þetta skeyti hefur ekki verið sent og er með óvistaðar breytingar. Viltu henda þessum breytingum?';
-$messages['noldapserver'] = 'Please select an ldap server to search';
 $messages['nosearchname'] = 'Sláðu inn nafn eða netfang';
 $messages['searchsuccessful'] = '$nr skeyti fundust';
 $messages['contactsearchsuccessful'] = '$nr tengiliðir fundust.';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index da9a667c6..b9bb82ad9 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -346,11 +346,13 @@ $labels['contacts'] = 'Contatti';
 $labels['contactproperties'] = 'Proprietà contatto';
 $labels['contactnameandorg'] = 'Nome e società';
 $labels['personalinfo'] = 'Informazioni personali';
+$labels['personal'] = 'Personale';
 $labels['contactphoto'] = 'Avatar';
 $labels['edit']   = 'Modifica';
 $labels['cancel'] = 'Annulla';
 $labels['save']   = 'Salva';
 $labels['delete'] = 'Elimina';
+$labels['discard'] = 'Elimina';
 $labels['rename'] = 'Rinomina';
 $labels['addphoto'] = 'Aggiungi';
 $labels['replacephoto'] = 'Sostituisci';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index cc8f17489..d52d22635 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Nessun oggetto';
 $messages['nobodywarning'] = 'Inviare il messaggio senza testo?';
 $messages['notsentwarning'] = 'Il messaggio non è stato inviato e ha delle modifiche non salvate. Vuoi annullare le modifiche?';
 $messages['restoresavedcomposedata'] = 'E\' stato rilevato un precedente messaggio non inviato.\n\nOggetto: $subject\nSalvato: $date\n\nVuoi ripristinare il messaggio?';
-$messages['noldapserver'] = 'Per favore, scegli un server LDAP in cui ricercare';
 $messages['nosearchname'] = 'Per favore, immetti un nome o un indirizzo e-mail';
 $messages['notuploadedwarning'] = 'Non tutti gli allegati sono stati ancora caricati. Prego attendere, oppure cancellare il caricamento.';
 $messages['searchsuccessful'] = '$nr messaggi trovati';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'Formato immagine non valido';
 $messages['mispellingsfound'] = 'Sono stati riscontrati errori ortografici nel messaggio';
 $messages['parentnotwritable'] = 'Impossibile creare o muovere la cartella: accesso negato';
 $messages['messagetoobig'] = 'La parte del messaggio è troppo grande per essere processata.';
-$messages['attachmentvalidationerror'] = 'ATTENZIONE! Questo allegato è sospetto poiché non rispetta il tipo dichiarato nel messaggio. Se non conosci il mittente, non dovresti aprire l\'allegato nel browser in quanto potrebbe contenere malware.<br/><br/><em>Atteso: $expected; rilevato: $detected</em>';
 $messages['noscriptwarning'] = 'Attenzione: questo servizio di webmail richiede Javascript! Per utilizzarlo abilita Javascript nelle impostazioni del tuo browser.';
 $messages['messageissent'] = 'Questo messaggio è stato già inviato, ma non ancora salvato. Vuoi salvarlo adesso?';
 $messages['errnotfound'] = 'File non trovato';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index b557ab6a1..df31137a5 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'すべてのフォルダー';
 $labels['more']             = '続く';
 $labels['back']             = '戻る';
 $labels['options']          = 'オプション';
+$labels['composeoptions']   = '作成のオプション';
+$labels['optionsandattachments'] = 'オプションと添付ファイル';
+$labels['actions']          = '動作';
 $labels['first'] = '最初';
 $labels['last'] = '最後';
 $labels['previous'] = '前';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = '列を一覧';
 $labels['listsorting'] = '並べ替える列';
 $labels['listorder'] = '並べ替える順序';
 $labels['listmode'] = '一覧表示モード';
+$labels['lmode'] = '一覧モード';
 $labels['layout'] = '配置';
 $labels['layoutwidescreen'] = 'ワイド画面';
 $labels['layoutdesktop'] = 'デスクトップ';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = '限度';
 $labels['quotaused'] = '使用';
 $labels['quotastorage'] = 'ディスク容量';
 $labels['quotamessage'] = 'メッセージ数';
+$labels['shortheaderdate'] = '$date';
+$labels['shortheaderto'] = '$date に $to 宛て';
+$labels['shortheaderfrom'] = '$date に $from から';
 $labels['quicksearch']  = '高速検索';
 $labels['searchplaceholder']  = '検索...';
 $labels['resetsearch']  = '検索を解除';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'ビット';
 $labels['keyexpired']     = '期限切れ';
 $labels['keyrevoked']     = '取り消し済み';
 $labels['bccinstead']     = 'Bccを使用';
+$labels['addheader']      = '宛先を追加(ヘッダー)';
 $labels['editidents']    = '識別情報を編集';
 $labels['spellcheck']    = 'スペル';
 $labels['checkspelling'] = 'スペルチェック';
@@ -283,6 +291,8 @@ $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
 $labels['alwaysallow'] = '$senderからは常に許可';
 $labels['isdraft']    = 'これは下書きのメッセージです。';
 $labels['andnmore']   = 'さらに$nr件...';
+$labels['headers']    = 'ヘッダー';
+$labels['envelope']   = 'エンベロープ';
 $labels['togglemoreheaders'] = 'さらにメッセージのヘッダーを表示';
 $labels['togglefullheaders'] = 'メッセージヘッダーの生の表示と切り替え';
 $labels['htmltoggle'] = 'HTML';
@@ -356,11 +366,15 @@ $labels['contacts'] = '連絡先';
 $labels['contactproperties'] = '連絡先の属性';
 $labels['contactnameandorg'] = '名前と組織';
 $labels['personalinfo'] = '個人情報';
+$labels['personal'] = '個人';
 $labels['contactphoto'] = '連絡先の写真';
 $labels['edit']   = '編集';
 $labels['cancel'] = '取り止め';
 $labels['save']   = '保存';
 $labels['delete'] = '削除';
+$labels['discard'] = '破棄';
+$labels['continue'] = '継続';
+$labels['ok'] = 'OK';
 $labels['rename'] = '名前を変更';
 $labels['addphoto'] = '追加';
 $labels['replacephoto'] = '置き換え';
@@ -608,9 +622,10 @@ $labels['arialabelmoremessageactions'] = 'さらにメッセージを操作';
 $labels['arialabelmarkmessagesas'] = '選択したメッセージに次のマーク...';
 $labels['arialabelcomposeoptions'] = '作成のオプション';
 $labels['arialabelresponsesmenu'] = '回答テンプレートメニュー';
-$labels['arialabelattachmentuploadform'] = '添付のアップロードフォーム';
-$labels['arialabelattachmentmenu'] = '添付のオプション';
-$labels['arialabelattachmentpreview'] = '添付のプレビュー';
+$labels['arialabelattachmentuploadform'] = '添付ファイルのアップロードフォーム';
+$labels['arialabelattachmentmenu'] = '添付ファイルのオプション';
+$labels['arialabelmailtomenu'] = '電子メールアドレスのオプション';
+$labels['arialabelattachmentpreview'] = '添付ファイルのプレビュー';
 $labels['ariasummarycomposecontacts'] = '宛先として選択する連絡先とグループの一覧';
 $labels['arialabelcontactexportoptions'] = '連絡先のエクスポートのオプション';
 $labels['arialabelabookgroupoptions'] = 'アドレス帳・グループのオプション';
@@ -619,6 +634,7 @@ $labels['arialabelidentityeditfrom'] = '識別情報のフォーム';
 $labels['arialabelresonseeditfrom'] = '回答のフォーム';
 $labels['arialabelsearchterms'] = '検索語';
 $labels['arialabeldropactionmenu'] = 'ドラッグ・アンド・ドロップの動作メニュー';
+$labels['arialabelheadersmenu'] = '宛先(ヘッダー)を追加するメニュー';
 $labels['helplistnavigation'] = 'キーボードのナビゲーションの一覧';
 $labels['helplistkeyboardnavigation'] = "上矢印・下矢印: 選択する行を移動します。
 スペース: 現在の行を選択します。
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index c6fc0caf7..a51327d50 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -76,6 +76,8 @@ $messages['errormoving'] = 'メッセージを移動できません。';
 $messages['errorcopying'] = 'メッセージをコピーできません。';
 $messages['errordeleting'] = 'メッセージを削除できません。';
 $messages['errormarking'] = 'メッセージにマークを設定できません。';
+$messages['alerttitle'] = '注意';
+$messages['confirmationtitle'] = '本当に...';
 $messages['deletecontactconfirm']  = '選択した連絡先を本当に削除しますか?';
 $messages['deletegroupconfirm']  = 'このグループを本当に削除しますか?';
 $messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
@@ -100,7 +102,6 @@ $messages['nosubjecttitle']  = '件名なし';
 $messages['nobodywarning'] = '本文の無いメッセージを送信しますか?';
 $messages['notsentwarning'] = 'まだメッセージを送信していなくて、保存していない変更もあります。変更した内容を破棄しますか?';
 $messages['restoresavedcomposedata'] = '以前に作成して未送信のメッセージがあります。\n\n件名: $subject\n保存日: $date\n\nこのメッセージを回復しますか?';
-$messages['noldapserver'] = '検索するLDAPサーバーを選択してください。';
 $messages['nosearchname'] = '連絡先の名前か電子メールアドレスを入力してください。';
 $messages['notuploadedwarning'] = 'すべての添付ファイルのアップロードを完了していません。今しばらく待つか、取り消ししてください。';
 $messages['searchsuccessful'] = '$nr通のメッセージが見つかりました。';
@@ -157,11 +158,12 @@ $messages['opnotpermitted'] = '許可されていない操作です。';
 $messages['nofromaddress'] = '選択した識別情報には電子メールアドレスがありません。';
 $messages['editorwarning'] = 'エディターの種類を切り替えるとテキストの書式を失うかもしれません。本当に続けますか?';
 $messages['httpreceivedencrypterror'] = '致命的な設定エラーが発生しました。システム管理者に至急連絡してください。<b>メッセージを送信できません。</b>';
-$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['smtpconnerror'] = 'SMTPエラー ($code): サーバーへの接続に失敗しました。';
+$messages['smtpautherror'] = 'SMTPエラー ($code): 認証に失敗しました。';
+$messages['smtpfromerror'] = 'SMTPエラー ($code): 差出人 "$from" を設定できません ($msg)';
+$messages['smtptoerror'] = 'SMTPエラー ($code): 宛先 "$to" を追加できません ($msg)';
+$messages['smtprecipientserror'] = 'SMTPエラー: 宛先の一覧を解析できません。';
+$messages['smtpsizeerror'] = 'SMTPエラー: メッセージの大きさがサーバーの制限($limit)を超過';
 $messages['smtperror'] = 'SMTP エラー: $msg';
 $messages['emailformaterror'] = '誤った電子メールアドレス: $email';
 $messages['toomanyrecipients'] = '宛先が多すぎます。$max件以内にしてください。';
@@ -194,7 +196,6 @@ $messages['invalidimageformat'] = '画像の形式が正しくありません。
 $messages['mispellingsfound'] = 'メッセージにスペルミスを見つけました。';
 $messages['parentnotwritable'] = '選択した親フォルダーに作成または移動をできませんでした。アクセス権限がありません。';
 $messages['messagetoobig'] = 'その処理をするにはメッセージ部分が大きすぎます。';
-$messages['attachmentvalidationerror'] = '警告!  この添付ファイルはメッセージの宣言と一致しない種類という理由のため疑わしいです。送信者を信頼できないなら、悪意のある内容を含んでいるかもしれないのでブラウザーで開いてはなりません。<br/><br/><em>予測した種類: $expected; 発見した種類: $found</em>';
 $messages['noscriptwarning'] = '警告: このウェブメールサービスにはJavascriptが必要です!  使用するにはJavascriptをブラウザーの設定で有効にしてください。';
 $messages['messageissent'] = '既にメッセージを送信しましたが、まだ保存していません。今すぐ保存しますか?';
 $messages['errnotfound'] = 'ファイルが見つかりません';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 23a9494d7..a510b3a57 100644
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -121,6 +121,7 @@ $labels['markunread']       = 'როგორც წაუკითხავი
 $labels['markflagged']      = 'როგორც მონიშნული';
 $labels['markunflagged']    = 'როგორც მოუნიშნავი';
 $labels['moreactions']      = 'მეტი მოქმედება...';
+$labels['folders-all']      = 'ყველა საქაღალდე';
 $labels['more']             = 'მეტი';
 $labels['back']             = 'უკან';
 $labels['first'] = 'პირველი';
@@ -158,6 +159,7 @@ $labels['desc'] = 'კლებადობით';
 $labels['listcolumns'] = 'სვეტების სია';
 $labels['listsorting'] = 'სვეტების დალაგება';
 $labels['listorder'] = 'დალაგება';
+$labels['layoutlist'] = 'სია';
 $labels['folderactions'] = 'საქაღალდეზე მოქმედება..';
 $labels['compact'] = 'შეკუმშვა';
 $labels['empty'] = 'გაცარიელება';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 82fe979a0..53ede5024 100644
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -80,7 +80,6 @@ $messages['nopagesizewarning'] = 'მიუთითეთ ფურცლის
 $messages['norecipientwarning'] = 'მიუთითეთ მიმღები';
 $messages['nosubjectwarning']  = 'გსურთ თუ არა შეტყობინების გაგზავნა უსათაუროდ?';
 $messages['nobodywarning'] = 'გსურთ თუ არა შეტყობინების გაგზავნა უტექსტოდ?';
-$messages['noldapserver'] = 'მიუთითეთ LDAP სერვერი ძიებისთვის';
 $messages['nosearchname'] = 'მიუთითეთ სახელი ან ელ–ფოსტის მისამართი';
 $messages['notuploadedwarning'] = 'ჯერ არ ატვირთულა ყველა მიმაგრებული ფაილი. დაელოდეთ ან გააუქმეთ ატვირთვა.';
 $messages['searchsuccessful'] = '$nr შეტყობინეა მოიძებნა';
diff --git a/program/localization/kab/labels.inc b/program/localization/kab/labels.inc
new file mode 100644
index 000000000..f27c5262f
--- /dev/null
+++ b/program/localization/kab/labels.inc
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/labels.inc                                        |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
+*/
+$labels['isread'] = 'Ɣeṛ';
+$labels['unknown']  = 'arussin';
+$labels['other'] = 'Ayen-nniḍen';
+$labels['typeother']  = 'Ayen-nniḍen';
+$labels['delete'] = 'Kkes';
+$labels['create'] = 'Rnu';
+?>
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 972eadc0a..042d1c6ce 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -126,6 +126,7 @@ $labels['markunread']       = 'មិនទាន់អាន';
 $labels['markflagged']      = 'ដាក់ទង់';
 $labels['markunflagged']    = 'ដោះទង់';
 $labels['moreactions']      = 'សកម្មភាពច្រើនទៀត...';
+$labels['folders-all']      = 'ថតទាំងអស់';
 $labels['more']             = 'ច្រើនទៀត';
 $labels['back']             = 'ត្រឡប់ក្រោយ';
 $labels['options']          = 'ជម្រើស';
@@ -133,6 +134,7 @@ $labels['select'] = 'ជ្រើសរើស';
 $labels['all'] = 'ទាំងអស់';
 $labels['none'] = 'មិនតំរៀប';
 $labels['currpage'] = 'ទំព័របច្ចុប្បន្ន';
+$labels['isread'] = 'បានអាន';
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
 $labels['unanswered'] = 'មិនទាន់ឆ្លើយតប';
@@ -161,6 +163,7 @@ $labels['listcolumns'] = 'តារាងជួរឈ';
 $labels['listsorting'] = 'តំរៀបជួរឈ';
 $labels['listorder'] = 'លំដាប់នៃការតំរៀប';
 $labels['listmode'] = 'បង្ហាញជាតារាង';
+$labels['layoutlist'] = 'បញ្ជី';
 $labels['folderactions'] = 'មុខងារថត';
 $labels['compact'] = 'បង្រួម';
 $labels['empty'] = 'ទទេរ';
@@ -171,6 +174,7 @@ $labels['quicksearch']  = 'ស្វែងរក';
 $labels['resetsearch']  = 'កំណត់លក្ខខ័ណ្ឌស្វែងរកជាថ្មី';
 $labels['searchmod']  = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
 $labels['msgtext']  = 'សំបុត្រទាំងមូល';
+$labels['body']  = 'តួ';
 $labels['currentfolder'] = 'ថតបច្ចុប្បន្ន';
 $labels['allfolders'] = 'ថតទាំងអស់';
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index dcc92cea5..68671216f 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -72,7 +72,6 @@ $messages['nopagesizewarning'] = 'សូមកំណត់ទំហំទំព�
 $messages['norecipientwarning'] = 'សូមសរសេរអ្នកទទួលយ៉ាងហោចណាស់ម្នាក់';
 $messages['nosubjectwarning']  = 'សំបុត្រគ្មានចំណងជើងតើអ្នកចង់សរសេរចំណងជើងនៅពេលនេះទេ?';
 $messages['nobodywarning'] = 'តើលោកអ្នកចង់ផ្ញើសំបុត្រដែលគ្មានតួអត្ថបទសំបុត្រទេ?';
-$messages['noldapserver'] = 'សូមកំណត់ម៉ាស៊ីន LDAPដើម្បីស្វែងរក';
 $messages['nosearchname'] = 'សូមបំពេញឈ្មោះទំនាក់ទំនង ឬអាសយដ្ឋានអ៊ីមែល';
 $messages['notuploadedwarning'] = 'ឯកសារភ្ជាប់ទាំងអស់មិនត្រូវបានផ្ទុកឡើងនៅឡើយទេ។ សូមរង់ចាំ ឬបោះបង់ការផ្ទុកឡើង។';
 $messages['searchsuccessful'] = 'រកឃើញសំបុត្រចំនួន $nr';
diff --git a/program/localization/kn_IN/labels.inc b/program/localization/kn_IN/labels.inc
index c6663e8c7..be0804970 100644
--- a/program/localization/kn_IN/labels.inc
+++ b/program/localization/kn_IN/labels.inc
@@ -43,6 +43,7 @@ $labels['wednesday'] = 'ಬುಧವಾರ';
 $labels['thursday']  = 'ಗುರುವಾರ';
 $labels['friday']    = 'ಶುಕ್ರವಾರ';
 $labels['saturday']  = 'ಶನಿವಾರ';
+$labels['may']	= 'ಮೇ';
 $labels['longjan']	= 'ಜನವರಿ';
 $labels['longfeb']	= 'ಫೆಬ್ರುವರಿ';
 $labels['longmar']	= 'ಮಾರ್ಚ್';
@@ -99,6 +100,7 @@ $labels['search'] = 'ಹುಡುಕು';
 $labels['typehome']   = 'ಮನೆ';
 $labels['typework']   = 'ಕೆಲಸ';
 $labels['typecar']  = 'ಕಾರು';
+$labels['typeassistant']  = 'ಸಹಾಯಕ';
 $labels['editcontact'] = 'ಸಂಪರ್ಕ ತಿದ್ದು';
 $labels['contacts'] = 'ಸಂಪರ್ಕಗಳು';
 $labels['edit']   = 'ತಿದ್ದು';
@@ -154,6 +156,7 @@ $labels['properties'] = 'ಗುಣಲಕ್ಷಣಗಳು';
 $labels['location'] = 'ಸ್ಥಳ';
 $labels['info'] = 'ಮಾಹಿತಿ';
 $labels['source'] = 'ಮೂಲ';
+$labels['license'] = 'ಪರವಾನಗಿ';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 3816e6818..b1ec85369 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -346,11 +346,13 @@ $labels['contacts'] = '연락처';
 $labels['contactproperties'] = '연락처 속성';
 $labels['contactnameandorg'] = '상호 및 조직';
 $labels['personalinfo'] = '개인 정보';
+$labels['personal'] = '개인';
 $labels['contactphoto'] = '연락처 사진';
 $labels['edit']   = '편집';
 $labels['cancel'] = '취소';
 $labels['save']   = '저장';
 $labels['delete'] = '삭제';
+$labels['discard'] = '폐기';
 $labels['rename'] = '이름 변경';
 $labels['addphoto'] = '추가';
 $labels['replacephoto'] = '변경';
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index de941fda9..106054bea 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = '제목 없음';
 $messages['nobodywarning'] = '내용 없는 메시지를 보내시겠습니까?';
 $messages['notsentwarning'] = '메시지가 발신되지 않았으며 저장되지 않은 변경사항이 있습니다. 변경사항을 폐기하시겠습니까?';
 $messages['restoresavedcomposedata'] = '이전에 작성했으나 보내지 않은 메시지가 발견되었습니다.\n\nSubject: $subject\nSaved: $date\n\n이 메시지를 복구하시겠습니까?';
-$messages['noldapserver'] = '검색할 LDAP 서버를 선택해주십시오.';
 $messages['nosearchname'] = '연락처명이나 이메일 주소를 입력해주십시오.';
 $messages['notuploadedwarning'] = '아직 모든 첨부가 업로드되지 않았습니다. 기다리거나 업로드를 취소해주십시오.';
 $messages['searchsuccessful'] = '$nr개의 메시지를 찾았습니다.';
@@ -194,7 +193,6 @@ $messages['invalidimageformat'] = '올바른 이미지 형식이 아닙니다.';
 $messages['mispellingsfound'] = '메시지에서 맞춤법 오류가 감지되었습니다.';
 $messages['parentnotwritable'] = '선택한 상위 폴더로 폴더를 생성/이동할 수 없습니다. 접근 권한이 없습니다.';
 $messages['messagetoobig'] = '메시지 부분이 처리하기에는 너무 큽니다.';
-$messages['attachmentvalidationerror'] = '경고! 이 첨부파일의 유형이 메시지에서 보고한 유형과 일치하지 않기 때문에 의심됩니다. 발송자를 신뢰할 수 없을 경우, 메시지가 악성 코드를 포함할 수도 있기 때문에 브라우저에서 열지 않는 것이 좋습니다. <br/><br/><em> 예상한 유형: $expected; 발견한 유형: $detected</ em>';
 $messages['noscriptwarning'] = '경고: 이 웹메일 서비스는 자바스크립트가 필요합니다! 이 기능을 사용하려면 브라우저 설정에서 자바스크립트를 활성화해주십시오.';
 $messages['messageissent'] = '메시지를 이미 보냈으나, 아직 저장되지 않았습니다. 지금 저장하시겠습니까?';
 $messages['errnotfound'] = '파일을 찾을 수 없음';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 1b2469999..5e21e03d8 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -124,6 +124,7 @@ $labels['markunread']       = 'Wekî nexwendî';
 $labels['markflagged']      = 'Wek alakirî';
 $labels['markunflagged']    = 'Wek nealakirî';
 $labels['moreactions']      = 'Bêhtir tevger...';
+$labels['folders-all']      = 'Hemû dosye';
 $labels['more']             = 'Bêhtir';
 $labels['back']             = 'Paşve';
 $labels['options']          = 'Vebijêrk';
@@ -160,6 +161,7 @@ $labels['desc'] = 'ber bi jêr ve';
 $labels['listcolumns'] = 'Stûnan lîste bike';
 $labels['listsorting'] = 'Stûna parzûnkirinê';
 $labels['listorder'] = 'Rêza parzûnkirinê';
+$labels['layoutlist'] = 'Lîste';
 $labels['folderactions'] = 'Tevgerên dosyeyê...';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Vala Bike';
@@ -358,4 +360,5 @@ $labels['managefolders'] = 'Rêveberiya peldankan';
 $labels['sortby'] = 'Şêweyê rêzkirinê';
 $labels['sortasc']  = 'Wekî zêde dibe';
 $labels['sortdesc'] = 'Wekî kêm dibe';
+$labels['license'] = 'Lîsans';
 ?>
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index afb53663c..b2e63bd76 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -76,7 +76,6 @@ $messages['nopagesizewarning'] = 'Tika ye, mezinahiyeke pelê têkevê';
 $messages['norecipientwarning'] = 'Tika ye, herî kêm standyarekê têkevê';
 $messages['nosubjectwarning']  = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî lê binivîsî?';
 $messages['nobodywarning'] = 'Peyamê bê nivîs bişeyînî?';
-$messages['noldapserver'] = 'Tika ye, ji bo lêgerînê pêşkêşkareke Idap têkevê';
 $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';
diff --git a/program/localization/ku_IQ/labels.inc b/program/localization/ku_IQ/labels.inc
index 326e93aba..6835ffdbd 100644
--- a/program/localization/ku_IQ/labels.inc
+++ b/program/localization/ku_IQ/labels.inc
@@ -41,6 +41,7 @@ $labels['showattachment'] = 'پیشاندان';
 $labels['filename'] = 'ناوی پەڕگە';
 $labels['filesize'] = 'قەبارەی پەڕگە';
 $labels['reply']            = 'وەڵامدانەوە';
+$labels['folders-all']      = 'هەموو بوخچەکان';
 $labels['options']          = 'هەڵبژاردەکان';
 $labels['first'] = 'یەکەم';
 $labels['last'] = 'کۆتایی';
@@ -56,11 +57,13 @@ $labels['attachment'] = 'هاوپێچ';
 $labels['nonesort'] = 'هیچ';
 $labels['sentdate'] = 'بەرواری ناردن';
 $labels['arrival'] = 'بەرواری گەیشتن';
+$labels['layoutlist'] = 'لیست';
 $labels['empty'] = 'بەتاڵ';
 $labels['unknown']  = 'نەناسراو';
 $labels['unlimited']  = 'بێ سنوور';
 $labels['quotatotal'] = 'سنوور';
 $labels['quotaused'] = 'بەکارهاتوو';
+$labels['namex'] = 'ناو';
 $labels['allfolders'] = 'هەموو بوخچەکان';
 $labels['send']           = 'ناردن';
 $labels['responsename'] = 'ناو';
@@ -92,4 +95,9 @@ $labels['typehome']   = 'ماڵ';
 $labels['typework']   = 'کار';
 $labels['typemobile']  = 'مۆبایل';
 $labels['typemain']  = 'سەرەکی';
+$labels['delete'] = 'سڕینەوە';
+$labels['about'] = 'دەربارە';
+$labels['folders'] = 'بوخچەکان';
+$labels['create'] = 'دروستکردن';
+$labels['license'] = 'مۆڵەت';
 ?>
diff --git a/program/localization/lb_LU/labels.inc b/program/localization/lb_LU/labels.inc
index d54401a13..5c6045a28 100644
--- a/program/localization/lb_LU/labels.inc
+++ b/program/localization/lb_LU/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Als ongelies';
 $labels['markflagged']      = 'Mat Fändel';
 $labels['markunflagged']    = 'Ouni Fändel';
 $labels['moreactions']      = 'Mei Aktiounen...';
+$labels['folders-all']      = 'All d\'Dossieren';
 $labels['more']             = 'Méi';
 $labels['back']             = 'Zréck';
 $labels['options']          = 'Optiounen';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Kolonnen oplëschten';
 $labels['listsorting'] = 'Kolonne sortéieren';
 $labels['listorder'] = 'Sortéier-Reiefolleg';
 $labels['listmode'] = 'Oplëschtungs-Modus';
+$labels['layoutlist'] = 'Lëscht';
 $labels['folderactions'] = 'Dossiers-Aktiounen...';
 $labels['compact'] = 'Kompaktéieren';
 $labels['empty'] = 'Eidel maachen';
diff --git a/program/localization/lb_LU/messages.inc b/program/localization/lb_LU/messages.inc
index be092c79b..606ceda1a 100644
--- a/program/localization/lb_LU/messages.inc
+++ b/program/localization/lb_LU/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Gëff w.e.gl op mannst een Empfänger an.';
 $messages['nosubjectwarning']  = 'D\'Feld "Sujet" ass eidel. Wëlls du elo eent uginn?';
 $messages['nobodywarning'] = 'Soll dëse Message ouni Text verschéckt ginn?';
 $messages['restoresavedcomposedata'] = 'Et gouf e Message fonnt dee scho geschriwwen awer nach net verschéckt ginn ass.\n\nSujet: $subject\nGespäichert: $date\n\nSoll de Message recuperéiert ginn?';
-$messages['noldapserver'] = 'Wiel w.e.gl en LDAP-Server fir d\'Sich aus.';
 $messages['nosearchname'] = 'Gëff w.e.gl en Numm oder eng E-Mail-Adress fir de Kontakt an.';
 $messages['notuploadedwarning'] = 'Net all d\'Unhäng goufen eropgelueden. Waart w.e.gl e Moment oder briech den Upload of.';
 $messages['searchsuccessful'] = '$nr Messagë fonnt.';
@@ -170,5 +169,4 @@ $messages['invalidimageformat'] = 'Kee gëltegt Bild-Format';
 $messages['mispellingsfound'] = 'Et goufe Schreiffeeler am Message fonnt.';
 $messages['parentnotwritable'] = 'Den Dossier konnt net am ausgewielten Dossier erstallt oder an den Dossier erageréckelt ginn. Keng Zougrëffsrechter.';
 $messages['messagetoobig'] = 'Den Messagen-Deel ass ze grouss fir verschafft ze ginn.';
-$messages['attachmentvalidationerror'] = 'WARNUNG! Dësen Unhank ass verdächteg well den tatsächlechen Typ vum Fichier net mam Typ deen am Message deklaréiert ass iwwertenee stëmmt. Falls du dem Ofsender net traus sollts du den Unhank net am Browser opmaache well e béisaartegen Inhalt enthaale kéint.<br/><br/><em>Erwaart: $expected; fonnt: $detected</em>';
 $messages['noscriptwarning'] = 'Warnung: Dëse Webmail brauch JavaScript! Fir de Service benotzen ze kënnen, aktivéier w.e.gl JavaScript an denge Browser-Astellungen.';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index ac24b832b..c0198a96e 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -45,6 +45,7 @@ $labels['priority'] = 'Prioritetas';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Neskaitytas';
 $labels['listoptions'] = 'Sąrašo nuostatos…';
+$labels['listoptionstitle'] = 'Sąrašo nuostatos';
 $labels['mailboxlist'] = 'Aplankai';
 $labels['messagesfromto'] = 'Laiškai nuo $from iki $to iš $count';
 $labels['threadsfromto'] = 'Gijos nuo $from iki $to iš $count';
@@ -113,6 +114,8 @@ $labels['forward']          = 'Persiųsti';
 $labels['forwardinline']    = 'Persiųsti cituojant';
 $labels['forwardattachment'] = 'Persiųsti priedu';
 $labels['forwardmessage']   = 'Persiųsti laišką';
+$labels['bouncemsg']        = 'Siųsti iš naujo (grąžinimas)';
+$labels['bounce']           = 'Siųsti iš naujo';
 $labels['deletemessage']    = 'Pašalinti laišką';
 $labels['movemessagetotrash'] = 'Perkelti laišką į šiukšlinę';
 $labels['printmessage']     = 'Atspausdinti laišką';
@@ -136,6 +139,9 @@ $labels['folders-all']      = 'Visi aplankai';
 $labels['more']             = 'Kita';
 $labels['back']             = 'Grįžti';
 $labels['options']          = 'Nuostatos';
+$labels['composeoptions']   = 'Laiško kūrimo nuostatos';
+$labels['optionsandattachments'] = 'Nuostatos ir priedai';
+$labels['actions']          = 'Veiksmai';
 $labels['first'] = 'Pirmas';
 $labels['last'] = 'Paskutinis';
 $labels['previous'] = 'Ankstesnis';
@@ -177,6 +183,7 @@ $labels['listcolumns'] = 'Stulpelių sąrašas';
 $labels['listsorting'] = 'Stulpelis rikiavimui';
 $labels['listorder'] = 'Rikiavimo tvarka';
 $labels['listmode'] = 'Sąrašo rodymo veiksena';
+$labels['lmode'] = 'Sąrašo veiksena';
 $labels['layout'] = 'Išdėstymas';
 $labels['layoutwidescreen'] = 'Platus ekranas';
 $labels['layoutdesktop'] = 'Darbalaukis';
@@ -196,7 +203,11 @@ $labels['quotatotal'] = 'Limitas';
 $labels['quotaused'] = 'Išnaudota';
 $labels['quotastorage'] = 'Disko talpa';
 $labels['quotamessage'] = 'Laiškų skaičius';
+$labels['shortheaderdate'] = 'Ties $date';
+$labels['shortheaderto'] = 'Skirtas $to ties $date';
+$labels['shortheaderfrom'] = 'Nuo $from ties $date';
 $labels['quicksearch']  = 'Sparčioji paieška';
+$labels['searchplaceholder']  = 'Ieškoti...';
 $labels['resetsearch']  = 'Atšaukti paiešką';
 $labels['searchmod']  = 'Paieškos modifikatoriai';
 $labels['msgtext']  = 'Visas laiškas';
@@ -242,6 +253,7 @@ $labels['keylength']      = 'Bitai';
 $labels['keyexpired']     = 'Nebegalioja';
 $labels['keyrevoked']     = 'Atšauktas';
 $labels['bccinstead']     = 'Naudoti Bcc';
+$labels['addheader']      = 'Pridėti gavėją (antraštė)';
 $labels['editidents']    = 'Tvarkyti tapatybes';
 $labels['spellcheck']    = 'Tikrinti rašybą';
 $labels['checkspelling'] = 'Tikrinti rašybą';
@@ -274,9 +286,13 @@ $labels['high']    = 'Aukštas';
 $labels['highest'] = 'Aukščiausias';
 $labels['nosubject']  = '(tema nenurodyta)';
 $labels['showimages'] = 'Rodyti paveikslėlius';
+$labels['allow']      = 'Leisti';
 $labels['alwaysshow'] = 'Visada rodyti paveikslėlius $sender laiškuose';
+$labels['alwaysallow'] = 'Visada leisti nuo $sender';
 $labels['isdraft']    = 'Tai – laiško juodraštis.';
 $labels['andnmore']   = '$nr daugiau...';
+$labels['headers']    = 'Antraštės';
+$labels['envelope']   = 'Vokas';
 $labels['togglemoreheaders'] = 'Rodyti daugiau antraščių';
 $labels['togglefullheaders'] = 'Įjungti/išjungti neapdorotas laiškų antraštes';
 $labels['htmltoggle'] = 'HTML';
@@ -350,11 +366,15 @@ $labels['contacts'] = 'Adresatai';
 $labels['contactproperties'] = 'Adresato savybės';
 $labels['contactnameandorg'] = 'Vardas ir organizacija';
 $labels['personalinfo'] = 'Asmeniniai duomenys';
+$labels['personal'] = 'Asmeninis';
 $labels['contactphoto'] = 'Adresato nuotrauka';
 $labels['edit']   = 'Redaguoti';
 $labels['cancel'] = 'Atsisakyti';
 $labels['save']   = 'Įrašyti';
 $labels['delete'] = 'Pašalinti';
+$labels['discard'] = 'Panaikinti';
+$labels['continue'] = 'Tęsti';
+$labels['ok'] = 'Gerai';
 $labels['rename'] = 'Pervardinti';
 $labels['addphoto'] = 'Pridėti';
 $labels['replacephoto'] = 'Pakeisti';
@@ -445,6 +465,7 @@ $labels['skipdeleted'] = 'Nerodyti pašalintų laiškų';
 $labels['deletealways'] = 'Pašalinti laiškus, jeigu nepavyksta jų perkelti į Šiukšlinę';
 $labels['deletejunk'] = 'Pašalinti Brukalo aplanke esančius laiškus';
 $labels['showremoteimages'] = 'Įkelti paveikslėlius iš interneto serverių';
+$labels['allowremoteresources'] = 'Leisti nuotolinius išteklius (paveikslėlius, stilius)';
 $labels['fromknownsenders'] = 'tik žinomų siuntėjų laiškuose';
 $labels['always'] = 'visada';
 $labels['alwaysbutplain'] = 'visuomet, išskyrus atsakant į grynojo teksto laiškus';
@@ -486,6 +507,7 @@ $labels['replyandforwardonly'] = 'tik atsakymuose ir persiunčiamuose laiškuose
 $labels['insertsignature'] = 'Pridėti parašą';
 $labels['sigbelow'] = 'Įterpti parašą žemiau kabutėmis išskirto laiško turinio';
 $labels['sigseparator'] = 'Priverstinai naudoti standartinį skyriklį parašuose';
+$labels['automarkread']  = 'Pažymėti laiškus kaip skaitytus';
 $labels['afternseconds']  = 'praėjus $n sek.';
 $labels['reqmdn'] = 'Visuomet prašyti patvirtinimo, jog laiškas perskaitytas';
 $labels['reqdsn'] = 'Visuomet prašyti laiško pristatymo pažymos';
@@ -528,9 +550,14 @@ $labels['personalfolder'] = 'Asmeninis aplankas';
 $labels['otherfolder'] = 'Kito naudotojo aplankas';
 $labels['sharedfolder'] = 'Viešas aplankas';
 $labels['findfolders'] = 'Ieškoti aplankų';
+$labels['findcontacts'] = 'Rasti adresatus';
+$labels['findmail'] = 'Rasti el. laiškus';
 $labels['namespace.personal'] = 'Asmeninis';
 $labels['namespace.other'] = 'Kito naudotojo';
 $labels['namespace.shared'] = 'Bendrinamas';
+$labels['dualuselabel'] = 'Savyje gali turėti tik';
+$labels['dualusemail'] = 'laiškai';
+$labels['dualusefolder'] = 'aplankai';
 $labels['sortby'] = 'Rikiuoti pagal';
 $labels['sortasc']  = 'Rikiuoti didėjančiai';
 $labels['sortdesc'] = 'Rikiuoti mažėjančiai';
@@ -542,6 +569,12 @@ $labels['source'] = 'Šaltinis';
 $labels['license'] = 'Licencija';
 $labels['support'] = 'Gauti pagalbos';
 $labels['savedsearches'] = 'Įrašytos paieškos';
+$labels['dateformatY'] = 'MMMM';
+$labels['dateformaty'] = 'MM';
+$labels['dateformatm'] = 'mm';
+$labels['dateformatd'] = 'dd';
+$labels['dateformatj'] = 'd';
+$labels['dateformatn'] = 'm';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -596,6 +629,8 @@ $labels['arialabelmarkmessagesas'] = 'Pažymėti pasirinktus laiškus kaip...';
 $labels['arialabelcomposeoptions'] = 'Laiško kūrimo nustatymai';
 $labels['arialabelresponsesmenu'] = 'Atsakymų meniu';
 $labels['arialabelattachmentuploadform'] = 'Priedo įkėlimo forma';
+$labels['arialabelattachmentmenu'] = 'Priedo nuostatos';
+$labels['arialabelmailtomenu'] = 'El. pašto adreso nuostatos';
 $labels['arialabelattachmentpreview'] = 'Priedo peržiūra';
 $labels['ariasummarycomposecontacts'] = 'Sąrašas adresatų ir grupių, kuriuos galima pasirinkti kaip gavėją';
 $labels['arialabelcontactexportoptions'] = 'Adresatų eksportavimo nustymai';
@@ -604,6 +639,8 @@ $labels['arialabelpreferencesform'] = 'Nustatymų forma';
 $labels['arialabelidentityeditfrom'] = 'Tapatybės redagavimo forma';
 $labels['arialabelresonseeditfrom'] = 'Atsakymo redagavimo forma';
 $labels['arialabelsearchterms'] = 'Paieškos žodžiai';
+$labels['arialabeldropactionmenu'] = 'Vilkimo veiksmo meniu';
+$labels['arialabelheadersmenu'] = 'Gavėjo (antraštė) pridėjimo meniu';
 $labels['helplistnavigation'] = 'Navigacija klaviatūra sąraše';
 $labels['helplistkeyboardnavigation'] = "Rodyklė aukštyn / žemyn: fokusuoti / pasirinkti kitą eilutę.
 Tarpas: pasirinkti sufokusuoą eilutę.
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index f3ef9917e..fda84b5b7 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -51,10 +51,12 @@ $messages['messagesaved'] = 'Laiškas įrašytas į Juodraščių aplanką.';
 $messages['successfullysaved'] = 'Sėkmingai įrašyta.';
 $messages['savingresponse'] = 'Įrašomas atsakymo tekstas…';
 $messages['deleteresponseconfirm'] = 'Ar tikrai norite pašalinti šį atsakymo tekstą?';
+$messages['nocontactselected'] = 'Kol kas nesate pasirinkę adresato.';
 $messages['addedsuccessfully'] = 'Asmuo įtrauktas į adresų knygą.';
 $messages['contactexists'] = 'Adresatas, turintis šį el. pašto adresą, jau egzistuoja.';
 $messages['contactnameexists'] = 'Adresatas tokiu vardu jau egzistuoja.';
 $messages['blockedimages'] = 'Siekiant apsaugoti Jūsų privatumą, paveikslėliai iš interneto neįkelti.';
+$messages['blockedresources'] = 'Siekiant apsaugoti jūsų privatumą, nuotoliniai ištekliai buvo užblokuoti.';
 $messages['encryptedmessage'] = 'Apgailestaujame, tačiau šis laiškas užšifruotas ir negali būti parodytas.';
 $messages['externalmessagedecryption'] = 'Šis laiškas šifruotas. Jį iššifruoti galima jūsų naršyklės priedo pagalba.';
 $messages['nopubkeyfor'] = 'Adresui $email nerastas galiojantis viešasis raktas. Ar norite šifruoti laišką tiktai gavėjams?';
@@ -75,6 +77,8 @@ $messages['errormoving'] = 'Laiško(-ų) perkelti nepavyko.';
 $messages['errorcopying'] = 'Laiško(-ų) nukopijuoti nepavyko.';
 $messages['errordeleting'] = 'Laiško(-ų) pašalinti nepavyko.';
 $messages['errormarking'] = 'Laiško(-ų) pažymėti nepavyko.';
+$messages['alerttitle'] = 'Dėmėsio';
+$messages['confirmationtitle'] = 'Ar tikrai...';
 $messages['deletecontactconfirm']  = 'Ar tikrai pašalinti pažymėtą(-us) adresatą(-us)?';
 $messages['deletegroupconfirm']  = 'Ar tikrai pašalinti pažymėtą grupę?';
 $messages['deletemessagesconfirm'] = 'Ar tikrai pašalinti pažymėtą(-us) laišką(-us)?';
@@ -91,6 +95,7 @@ $messages['noemailwarning'] = 'Prašom įvesti teisingą el. pašto adresą.';
 $messages['nonamewarning']  = 'Prašom įvesti vardą.';
 $messages['nopagesizewarning'] = 'Prašom įvesti puslapio dydį.';
 $messages['nosenderwarning'] = 'Prašom įvesti siuntėjo el. pašto adresą.';
+$messages['recipientsadded'] = 'Gavėjas(-ai) sėkmingai pridėtas(-i).';
 $messages['norecipientwarning'] = 'Prašom įvesti bent vieną gavėją.';
 $messages['disclosedrecipwarning'] = 'Visi gavėjai matys vieni kitų el. pašto adresus. Tam, kad to neleistumėte ir apsaugotumėte jų privatumą, galite naudoti Bcc lauką.';
 $messages['disclosedreciptitle'] = 'Per daug viešų gavėjų';
@@ -99,7 +104,6 @@ $messages['nosubjecttitle']  = 'Nenurodyta tema';
 $messages['nobodywarning'] = 'Išsiųsti šį laišką be teksto?';
 $messages['notsentwarning'] = 'Laiškas nebuvo išsiųstas ir jame yra neišsaugotų pakeitimų. Ar norite panaikinti savo pakeitimus?';
 $messages['restoresavedcomposedata'] = 'Buvo rastas anksčiau pradėtas rašyti, bet neišsiųstas laiškas.\n\nTema:$subject\nIšsaugotas: $date\n\nAr norite šį laišką atkurti?';
-$messages['noldapserver'] = 'Prašome pasirinkti LDAP serverį paieškai.';
 $messages['nosearchname'] = 'Prašom įvesti vardą arba el. pašto adresą.';
 $messages['notuploadedwarning'] = 'Įkelti dar ne visi priedai. Prašom palaukti arba atšaukti jų įkėlimą.';
 $messages['searchsuccessful'] = 'Rasta laiškų: $nr.';
@@ -161,6 +165,8 @@ $messages['smtpautherror'] = 'SMTP klaida ($code): nepavyko autentikuotis.';
 $messages['smtpfromerror'] = 'SMTP klaida ($code): nepavyko nurodyti siuntėjo „$from“ ($msg).';
 $messages['smtptoerror'] = 'SMTP klaida ($code): nepavyko pridėti gavėjo „$to“ ($msg).';
 $messages['smtprecipientserror'] = 'SMTP klaida: nepavyko apdoroti gavėjų sąrašo.';
+$messages['smtputf8error'] = 'SMTP klaida: Serveris nepalaiko unikodo el. pašto adrese.';
+$messages['smtpsizeerror'] = 'SMTP klaida: Laiško dydis viršija serverio nustatytą ribą ($limit)';
 $messages['smtperror'] = 'SMTP klaida: $msg';
 $messages['emailformaterror'] = 'Netinkamas el. pašto adresas: $email';
 $messages['toomanyrecipients'] = 'Per daug gavėjų. Sumažinkite jų bent iki $max.';
@@ -193,7 +199,7 @@ $messages['invalidimageformat'] = 'Paveikslo formatas netinkamas.';
 $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.';
-$messages['attachmentvalidationerror'] = 'Dėmesio! Šis priedas yra įtartinas, nes jo tipas nesutampa su deklaruotu laiške. Jeigu nepasitikite šiuo siuntėju, šio priedo atverti naršyklėje nepatartina, nes jis gali būti kenksmingas.<br/><br/><em>Tikėtasi: $expected; aptikta: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Šis priedas yra įtartinas, nes jo tipas neatitinka laiške deklaruoto tipo. Jeigu nepasitikite siuntėju, tuomet jūs neturėtumėte naršyklėje atverti šio priedo, nes jame gali būti kenkėjiškas turinys.<br/><br/><em>Tikėtasi: $expected; rasta: $detected</em>';
 $messages['noscriptwarning'] = 'Dėmesio: šiai saityno el. pašto sistemai veikti būtini „JavaScript“ scenarijai! Norėdami ja naudotis, įjunkite „JavaScript“ savo naršyklės nuostatose.';
 $messages['messageissent'] = 'Laiškas jau buvo išsiųstas, bet dar neišsaugotas. Ar norite jį išsaugoti?';
 $messages['errnotfound'] = 'Failas nerastas';
@@ -208,3 +214,4 @@ $messages['clicktoresumesession'] = 'Spauskite čia, tam kad tęstumėte ankstes
 $messages['errcomposesession'] = 'Laiško rašymo sesijos klaida.';
 $messages['errcomposesessionexplain'] = 'Ieškoma pranešimo kūrimo sesija nerasta.';
 $messages['clicktocompose'] = 'Spausk čia, norėdamas pradėti rašyti naują laišką';
+$messages['nosupporterror'] = 'Jūsų saityno naršyklė nepalaiko šios ypatybės.';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index ae90b83ca..0ccb26f8d 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Visas mapes';
 $labels['more']             = 'Vairāk';
 $labels['back']             = 'Atpakaļ';
 $labels['options']          = 'Opcijas';
+$labels['composeoptions']   = 'Rakstīšanas iestatījumi';
+$labels['optionsandattachments'] = 'Opcijas un pielikumi';
+$labels['actions']          = 'Darbību saraksts';
 $labels['first'] = 'Pirmā';
 $labels['last'] = 'Pēdējā';
 $labels['previous'] = 'Iepriekšējā';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Saraksta kolonnas';
 $labels['listsorting'] = 'Kārtošanas kolonnas';
 $labels['listorder'] = 'Kārtošanas secība';
 $labels['listmode'] = 'Attēlošanas veids';
+$labels['lmode'] = 'Attēlošanas veids';
 $labels['layout'] = 'Izklājums';
 $labels['layoutwidescreen'] = 'Platekrāns';
 $labels['layoutdesktop'] = 'Darba virsma';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Limits';
 $labels['quotaused'] = 'Izlietots';
 $labels['quotastorage'] = 'Kvota';
 $labels['quotamessage'] = 'Vēstuļu skaits';
+$labels['shortheaderdate'] = 'Datums $date';
+$labels['shortheaderto'] = 'Adresāts $to datumā $date';
+$labels['shortheaderfrom'] = 'No $from datumā $date';
 $labels['quicksearch']  = 'Ārtā meklēšana';
 $labels['searchplaceholder']  = 'Meklēt...';
 $labels['resetsearch']  = 'Atstatīt meklēšanu';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Biti';
 $labels['keyexpired']     = 'Beidzies termiņš';
 $labels['keyrevoked']     = 'Atsaukta';
 $labels['bccinstead']     = 'Lietot Bcc';
+$labels['addheader']      = 'Pievienot adresātu (galvenē)';
 $labels['editidents']    = 'Rediģēt identitātes';
 $labels['spellcheck']    = 'Izrunāt';
 $labels['checkspelling'] = 'Pārbaudīt pareizrakstību';
@@ -278,9 +286,13 @@ $labels['high']    = 'Augsta';
 $labels['highest'] = 'Augstākā';
 $labels['nosubject']  = '(bez tēmas)';
 $labels['showimages'] = 'Rādīt attēlus';
+$labels['allow']      = 'Atļaut';
 $labels['alwaysshow'] = 'Vienmēr rādīt attēlus vēstulēs, kuras sūtījis $sender';
+$labels['alwaysallow'] = 'Vienmēr atļaut no sūtītāja $sender';
 $labels['isdraft']    = 'Šis ir melnraksts.';
 $labels['andnmore']   = '$nr vairāk...';
+$labels['headers']    = 'Galvene';
+$labels['envelope']   = 'Aploksne';
 $labels['togglemoreheaders'] = 'Rādīt galvenes papildus informāciju';
 $labels['togglefullheaders'] = 'Slēpt galvenes papildus informāciju';
 $labels['htmltoggle'] = 'HTML';
@@ -354,11 +366,15 @@ $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Kontakta īpašības';
 $labels['contactnameandorg'] = 'Vārds un organizācija';
 $labels['personalinfo'] = 'Personīgā informācija';
+$labels['personal'] = 'Personīgās';
 $labels['contactphoto'] = 'Kontakta attēls';
 $labels['edit']   = 'Rediģēt';
 $labels['cancel'] = 'Atcelt';
 $labels['save']   = 'Saglabāt';
 $labels['delete'] = 'Dzēst';
+$labels['discard'] = 'Nesaglabāt';
+$labels['continue'] = 'Turpināt';
+$labels['ok'] = 'LABI';
 $labels['rename'] = 'Pārdēvēt';
 $labels['addphoto'] = 'Pievienot';
 $labels['replacephoto'] = 'Aizvietot';
@@ -449,6 +465,7 @@ $labels['skipdeleted'] = 'Nerādīt dzēstās vēstules';
 $labels['deletealways'] = 'Izdzēst vēstules, ja tās neizdodas pārvietot uz papīrgrozu';
 $labels['deletejunk'] = 'Automātiski dzēst vēstules no mēstuļu mapītes';
 $labels['showremoteimages'] = 'Rādīt vēstulēs attēlus, kuri atrodas uz cita servera';
+$labels['allowremoteresources'] = 'Atļaut ārējus resursus (attēli, stili)';
 $labels['fromknownsenders'] = 'tikai no zināmiem sūtītājiem';
 $labels['always'] = 'vienmēr';
 $labels['alwaysbutplain'] = 'vienmēr, izņemot gadījumus, kad tiek atbildēts "parastā teksta" vēstulēm';
@@ -490,6 +507,7 @@ $labels['replyandforwardonly'] = 'tikai atbildēm un pārsūtījumiem';
 $labels['insertsignature'] = 'Ievietot parakstu';
 $labels['sigbelow'] = 'Parakstu novietot zem sūtītās vēstules oriģinālā';
 $labels['sigseparator'] = 'Parakstam obligāti izmantot standarta dalītāju';
+$labels['automarkread']  = 'Atzīmēt vēstules kā lasītas';
 $labels['afternseconds']  = 'pēc $n sekundēm';
 $labels['reqmdn'] = 'Vienmēr pieprasīt saņemšanas apstiprinājumu';
 $labels['reqdsn'] = 'Vienmēr pieprasīt atskati par piegādi';
@@ -551,6 +569,12 @@ $labels['source'] = 'Oriģināls';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Atbalsts';
 $labels['savedsearches'] = 'Saglabātie mekkējumi';
+$labels['dateformatY'] = 'YYYY';
+$labels['dateformaty'] = 'YY';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'kB';
 $labels['MB'] = 'MB';
@@ -606,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Rakstīšanas iestatījumi';
 $labels['arialabelresponsesmenu'] = 'Gatavo atbilžu izvēlne';
 $labels['arialabelattachmentuploadform'] = 'Pielikuma augšupielādes forma';
 $labels['arialabelattachmentmenu'] = 'Pielikuma parametri';
+$labels['arialabelmailtomenu'] = 'E-pasta adreses opcijas';
 $labels['arialabelattachmentpreview'] = 'Pielikuma priekšskats';
 $labels['ariasummarycomposecontacts'] = 'Kontaktu un grupu saraksts ko norādīt kā saņēmējus';
 $labels['arialabelcontactexportoptions'] = 'Kontaktu eksportēšanas iestatījumi';
@@ -615,6 +640,7 @@ $labels['arialabelidentityeditfrom'] = 'Identitātes rediģēšanas forma';
 $labels['arialabelresonseeditfrom'] = 'Atbildes rediģēšanas forma';
 $labels['arialabelsearchterms'] = 'Meklēšanas termini';
 $labels['arialabeldropactionmenu'] = '"Velc un Noliec" darbības izvēlne';
+$labels['arialabelheadersmenu'] = 'Adresāta (galvenē) pievienošanas izvēlne';
 $labels['helplistnavigation'] = 'Parādīt klaviatūras īsos taustiņus';
 $labels['helplistkeyboardnavigation'] = "Bultiņas augšup/lejup: Mainīt rindas izsgaismošanu/atzīmēšanu.
 Garais taustiņš: Atzīmēt izgaismoto rindu.
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index 0b0363ce3..dba27a2c0 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -51,10 +51,12 @@ $messages['messagesaved'] = 'Vēstule saglabāta Uzmetumos';
 $messages['successfullysaved'] = 'Veiksmīgi saglabāts.';
 $messages['savingresponse'] = 'Tiek saglabāts atbildes teksts ...';
 $messages['deleteresponseconfirm'] = 'Vai Jūs tiešām gribat dzēst šo atbildes tekstu?';
+$messages['nocontactselected'] = 'Jūs vēl neesat norādījuši nevienu kontaktu.';
 $messages['addedsuccessfully'] = 'Kontakts veiksmīgi pievienots adrešu grāmatai';
 $messages['contactexists'] = 'Kontakts ar šādu e-pasta adresi jau eksistē';
 $messages['contactnameexists'] = 'Kontakts ar šādu vārdu jau eksistē.';
 $messages['blockedimages'] = 'Drošības nolūkos attēli, kuri tiek ielādēti no cita servera, šajā vēstulē ir bloķēti';
+$messages['blockedresources'] = 'Lai aizsargātu Jūsu privātumu, attālinātie reursi tika nobloķēti.';
 $messages['encryptedmessage'] = 'Atvainojiet - šī ir šifrēta vēstule un diemžēl nevar tikt parādīta ...';
 $messages['externalmessagedecryption'] = 'Šis e-pasts ir šifrēts un var tikt atšifrēts izmantojot interneta pārlūka paplašinājumu.';
 $messages['nopubkeyfor'] = 'E-pastam $email netika atrasta neviena publiskā atslēga';
@@ -75,6 +77,8 @@ $messages['errormoving'] = 'Vēstule(s) netika pārvietota(s)';
 $messages['errorcopying'] = 'Vēstules pārkopēt neizdevās';
 $messages['errordeleting'] = 'Vēstules izdzēst neizdevās';
 $messages['errormarking'] = 'Iezīmēt vēstules nebija iespējams';
+$messages['alerttitle'] = 'Uzmanību';
+$messages['confirmationtitle'] = 'Vai Jūs esat pārliecināts...';
 $messages['deletecontactconfirm']  = 'Vai tiešām vēlaties dzēst iezīmētās kontaktpersonas?';
 $messages['deletegroupconfirm']  = 'Vai tiešām vēlaties dzēst atzīmēto grupu?';
 $messages['deletemessagesconfirm'] = 'Vai tiešām vēlaties dzēst iezīmētās vēstules?';
@@ -91,6 +95,7 @@ $messages['noemailwarning'] = 'Lūdzu ievadiet korektu e-pasta adresi';
 $messages['nonamewarning']  = 'Lūdzu ievadiet vārdu';
 $messages['nopagesizewarning'] = 'Lūdzu ievadiet lapas izmēru';
 $messages['nosenderwarning'] = 'Lūdzu ievadiet sūtītāja e-pasta adresi';
+$messages['recipientsadded'] = 'Adresāti pievienoti veiksmīgi.';
 $messages['norecipientwarning'] = 'Lūdzu ievadiet vismaz vienu saņēmēju';
 $messages['disclosedrecipwarning'] = 'Katrs adresāts redzēs pārējos adresātus. Lai to novērstu un nodrošinātu adresātu privātumu, lūdzu izmantojiet Bcc lauku.';
 $messages['disclosedreciptitle'] = 'Pārāk daudz publisku adresātu';
@@ -99,7 +104,6 @@ $messages['nosubjecttitle']  = 'Bez tēmas';
 $messages['nobodywarning'] = 'Sūtīt vēstuli bez teksta?';
 $messages['notsentwarning'] = 'Vēstule netika nosūtīta un tā satur nesaglabātas izmaiņas. Vai gribat atcelt šīs izmaiņas?';
 $messages['restoresavedcomposedata'] = 'Ir atrasta pirms kāda laika uzrakstīta, bet nenosūtīta vēstule.\n\nTēma: $subject\nSaglabāta:$date\n\nVai atjaunot šo vēstuli?';
-$messages['noldapserver'] = 'Lai meklētu, lūdzu izvēlaties LDAP serveri';
 $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';
@@ -161,6 +165,8 @@ $messages['smtpautherror'] = 'SMTP kļūda ($code): Neizdevās autorizēties.';
 $messages['smtpfromerror'] = 'SMTP kļūda ($code): Neizdevās iestatīt sūtītāju "$from" ($msg).';
 $messages['smtptoerror'] = 'SMTP kļūda ($code): Neizdevās pievienot saņēmēju "$to" ($msg).';
 $messages['smtprecipientserror'] = 'SMTP kļūda: Nav iespējams aptrādāt saņēmēju sarakstu.';
+$messages['smtputf8error'] = 'SMTP kļūda: Serveris neatbalsta unikodu epasta adresē.';
+$messages['smtpsizeerror'] = 'SMTP kļūda: Vēstules izmērs pārsniedz serverī noteikto limitu ($limit)';
 $messages['smtperror'] = 'SMTP kļūda: $msg';
 $messages['emailformaterror'] = 'Nepareiza e-pasta adrese: $email';
 $messages['toomanyrecipients'] = 'Pārāk daudz saņēmēju. Samaziniet skaitu līdz $max.';
@@ -193,7 +199,7 @@ $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 atzīmētajā virsmapē. Nav piekļuves tiesību.';
 $messages['messagetoobig'] = 'Vēstule daļa ir pārāk liela, lai to varētu apstrādāt.';
-$messages['attachmentvalidationerror'] = 'BRĪDINĀJUMS! Šis pielikums ir aizdomīgs, jo tā tips neatbilst tipam, kurš ir uzrādīts e-pasta ziņojumā. Ja jūs neuzticaties sūtītājam, šo failu Jums vaļā vērt nevajadzētu, jo tas var saturēt ļaunprātīgu saturu. <br/><br/><em>Būtu jābūt: $expected; Bet ir: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Šis e-pasta pielikums ir aizdomīgs, jo tā tips neatbilst tam, kurš norādīts pašā epasta ziņojumā. Ja Jūs neuzticaties sūtītājam, vai tas ir nepazīstams, Jums labāk nevērt vaļā šo e-pasta pielikumu, jo tas var saturēt ļaundabīgu kodu. <br/><br/><em>Norādīts: $expected; Atrasts: $detected3</em>';
 $messages['noscriptwarning'] = 'Uzmanību: lai lasītu e-pastus, Jūsu pārlūkprogrammā jābūt ieslēgtiem JavaScript.';
 $messages['messageissent'] = 'E-pasts jau ir nosūtīts, bet nav saglabāts. Vai Jūs vēlaties to tagad saglabāt?';
 $messages['errnotfound'] = 'Fails netika atrasts';
@@ -208,3 +214,4 @@ $messages['clicktoresumesession'] = 'Lai atjaunotu Jūsu iepriekšējo sessiju,
 $messages['errcomposesession'] = 'Rakstot vēstuli radās autorizācijas sessijas kļūda';
 $messages['errcomposesessionexplain'] = 'Pieprasītā sessija, vēstules rakstīšanai, netika atrasta.';
 $messages['clicktocompose'] = 'Lai rakstītu jaunu vēstuli, spiest šeit';
+$messages['nosupporterror'] = 'Šī iespēja Jūsu interneta pārlūkā nav atbalstīta.';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index c8d78a437..d3a26291e 100644
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -346,11 +346,13 @@ $labels['contacts'] = 'Контакти ';
 $labels['contactproperties'] = 'Својства ан контакти ';
 $labels['contactnameandorg'] = 'Име и организација ';
 $labels['personalinfo'] = 'Лични информаци';
+$labels['personal'] = 'Лично';
 $labels['contactphoto'] = 'Слика на контакт';
 $labels['edit']   = 'Уреди';
 $labels['cancel'] = 'Откажи';
 $labels['save']   = 'Зачувај';
 $labels['delete'] = 'Избриши';
+$labels['discard'] = 'Отфрли';
 $labels['rename'] = 'Преименувај';
 $labels['addphoto'] = 'Додај';
 $labels['replacephoto'] = 'Замени';
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 5831daaab..980620585 100644
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Нема предмет';
 $messages['nobodywarning'] = 'Писмото нема текст во него. Дали сакате да го испратите?';
 $messages['notsentwarning'] = 'Пораката не е пратена и има незачувани промени. Дали сакате да ги отфрлите промените?';
 $messages['restoresavedcomposedata'] = 'Претходно компонирана но не испратена порака е пронајдена.\n\n$предмет\nЗачувано: $дата\n\n Дали сакате да ја вратите оваа порака?';
-$messages['noldapserver'] = 'Изберете LDAP сервер за пребарување';
 $messages['nosearchname'] = 'Внесете име или е-поштенска адреса';
 $messages['notuploadedwarning'] = 'Сè уште нема подигнати прилози. Почекајте или откажете го подигањето';
 $messages['searchsuccessful'] = 'Пронајадени се $nr пораки';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'Невалиден формат на слик
 $messages['mispellingsfound'] = 'Детектирана е правописна грешка во пораката.';
 $messages['parentnotwritable'] = 'Невозможно да се креира/премести папката во селектираната папка родител. Нема права на пристап.';
 $messages['messagetoobig'] = 'Делот со пораката е преголем за да се процесира.';
-$messages['attachmentvalidationerror'] = 'ПРЕДУПРЕДУВАЊЕ! Ова прикачивање е сомнително затоа што неговиот тип не се совпаѓа со типот деклариран во пораката. Ако не му верувате на праќачот, не треба да го отворите во прелистувачот затоа што може да содржи злонамерна содржина. <br/> <br/><em> Очекувано:$expected; пронајдено:$detected</em>';
 $messages['noscriptwarning'] = 'Прдупредување: Овој webmail сервис бара Javascript! За да го користите ве молиме вклучете го Javascript во поставувањата на вашиот пребарувач.';
 $messages['messageissent'] = 'Оваа порака беше пратена, но сеуште не е зачувана. Дали сакате да ја зачувате сега ? ';
 $messages['errnotfound'] = 'Датотеката не е најдена';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 07f26e7d3..7a082981e 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -31,6 +31,7 @@ $labels['trash']  = 'ചവറ്റുകുട്ട';
 $labels['junk']   = 'ആവശ്യമില്ലാത്തവ';
 $labels['subject'] = 'വിഷയം';
 $labels['from']    = 'പ്രേഷിതന്‍';
+$labels['sender']  = 'അയചയാള്‍';
 $labels['to']      = 'സ്വീകര്‍ത്താവ്';
 $labels['date']    = 'തീയതി';
 $labels['size']    = 'വലിപ്പം';
@@ -40,6 +41,7 @@ $labels['mailboxlist'] = 'ഫോള്‍ഡറുകള്‍';
 $labels['copy']     = 'പകര്‍ത്തുക';
 $labels['move']     = 'നീക്കുക';
 $labels['download'] = 'ഡൗണ്‍ലോഡ്';
+$labels['showattachment'] = 'പ്രദർശിപ്പിക്കുക';
 $labels['filename'] = 'ഫയല്‍ നാമം';
 $labels['filesize'] = 'ഫയലിന്റെ വലിപ്പം';
 $labels['addtoaddressbook'] = 'മേല്‍വിലാസങ്ങളില്‍ ചേര്‍ക്കുക.';
@@ -108,6 +110,7 @@ $labels['select'] = 'തെരഞ്ഞെടുക്കുക';
 $labels['all'] = 'എല്ലാം';
 $labels['none'] = 'ഒന്നുമില്ല';
 $labels['currpage'] = 'നിലവിലുളള പേജ്';
+$labels['isread'] = 'വായിച്ചവ';
 $labels['unread'] = 'വായിക്കാത്തത്';
 $labels['flagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['unanswered'] = 'മറുപടി കൊടുക്കാത്ത';
@@ -125,6 +128,7 @@ $labels['arrival'] = 'വന്ന തീയതി';
 $labels['asc'] = 'ആരോഹണം';
 $labels['desc'] = 'അവരോഹണം';
 $labels['listorder'] = 'തരംതിരിക്കണ്ട രീതി';
+$labels['layoutlist'] = 'പട്ടിക';
 $labels['compact'] = 'ചുരുക്കു';
 $labels['empty'] = 'ശൂന്യം';
 $labels['quota'] = 'ഡിസ്ക്ക് ഉപയോഗം';
@@ -132,6 +136,7 @@ $labels['unknown']  = 'അറിയാത്ത';
 $labels['unlimited']  = 'പരിമിതികളില്ലാത്ത';
 $labels['quicksearch']  = 'പെട്ടെന്ന് തെരയു';
 $labels['msgtext']  = 'മുഴുവന്‍ സന്ദേശവും';
+$labels['body']  = 'ഉള്ളടക്കം';
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
 $labels['editasnew']      = 'പുതിയതായി തിരുത്തുക';
 $labels['sendmessage']    = 'സന്ദേശം അയയ്ക്കുക';
@@ -250,6 +255,7 @@ $labels['info'] = 'വിവരം';
 $labels['getfoldersize'] = 'അറയുടെ വലുപ്പം അരിയാന്‍ ക്ലിക്ക് ചെയ്യുക';
 $labels['personalfolder'] = 'സ്വകാര്യ അറ';
 $labels['sharedfolder'] = 'പൊതു - അറ';
+$labels['license'] = 'അനുമതി';
 $labels['support'] = 'സഹായം തേടുക';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/mn_MN/labels.inc b/program/localization/mn_MN/labels.inc
index b36112044..358faeb21 100644
--- a/program/localization/mn_MN/labels.inc
+++ b/program/localization/mn_MN/labels.inc
@@ -45,4 +45,14 @@ $labels['readstatus'] = 'Уншсан төлөв';
 $labels['listoptions'] = 'Жагсаалтын тохиргоо...';
 $labels['mailboxlist'] = 'Хавтас';
 $labels['messagesfromto'] = 'Нийт $count захианы from-с $to';
+$labels['showattachment'] = 'Харах';
+$labels['deletemessage']    = 'Захиа устгах';
+$labels['isread'] = 'Унших';
+$labels['unknown']  = 'мэдэгдэхгүй';
+$labels['other'] = 'Бусад';
+$labels['typeother']  = 'Бусад';
+$labels['delete'] = 'Устгах';
+$labels['about'] = 'Танилцуулга';
+$labels['folders'] = 'Хавтас';
+$labels['license'] = 'Лиценз';
 ?>
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 7aaab1146..3349c6b03 100644
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -31,6 +31,7 @@ $labels['trash']  = 'कचरा पेटी';
 $labels['junk']   = 'नको असलेले कचरा संदेश';
 $labels['subject'] = 'विषय';
 $labels['from']    = 'प्रेषक';
+$labels['sender']  = 'प्रेषक';
 $labels['to']      = 'प्रती';
 $labels['cc']      = 'प्रत';
 $labels['bcc']     = 'गुप्त प्रत';
@@ -150,6 +151,7 @@ $labels['listcolumns'] = 'सुची स्‍तंभ';
 $labels['listsorting'] = 'स्‍तंभ वर्गीकरण';
 $labels['listorder'] = 'वर्गीकरण क्रम';
 $labels['listmode'] = 'यादी दर्शक पध्‍दत';
+$labels['layoutlist'] = 'यादी';
 $labels['folderactions'] = 'फोल्डर कृती..';
 $labels['compact'] = 'छोटा';
 $labels['empty'] = 'रिकामा';
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index d8eba0b04..3c1ce14a7 100644
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -63,7 +63,6 @@ $messages['nopagesizewarning'] = 'पानाचा आकार द्या';
 $messages['norecipientwarning'] = 'किमान एकतरी पत्ता द्या ज्यांना तुम्हाला संदेश पाठवावयाचा आहे.';
 $messages['nosubjectwarning']  = 'विषय दिलेला नाही. तुम्हाला विषय द्यायचा आहे का?';
 $messages['nobodywarning'] = 'संदेशामधे कोणताही मजकूर नाही. तुम्हाला तसाच संदेश पाठवावयाचा आहे का?';
-$messages['noldapserver'] = 'शोधण्यासाठी ldap सर्व्हर निवडा';
 $messages['nosearchname'] = 'कृपया ज्यांना तुम्हाला संदेश पाठवावयाचा आहे त्यांचे नाव किंवा इमेल पत्ता द्या.';
 $messages['notuploadedwarning'] = 'सर्व फाईल अजून चढवल्‍या गेलेल्‍या नाहीत. कृपया वाट पहा किंवा मागे फिरा';
 $messages['searchsuccessful'] = '$nr संदेष मिळाले.';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index fa105fc3a..0869d1e8a 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -156,6 +156,7 @@ $labels['listcolumns'] = 'Senarai ruang';
 $labels['listsorting'] = 'pengisihan ruang';
 $labels['listorder'] = 'Urutan pengisihan';
 $labels['listmode'] = 'Mod senarai paparan';
+$labels['layoutlist'] = 'Senarai';
 $labels['folderactions'] = 'Aksi folder';
 $labels['compact'] = 'Kompak';
 $labels['empty'] = 'Kosong';
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 11d367303..b2f26cf51 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -48,7 +48,6 @@ $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['nobodywarning'] = 'Hantar mesej ini tanpa teks?';
-$messages['noldapserver'] = 'Sila pilih satu pelayan ldap untuk carian';
 $messages['nosearchname'] = 'Sila masukkan nama kontek atau alamat emel';
 $messages['searchsuccessful'] = '$nr mesej dijumpai';
 $messages['searchnomatch'] = 'Carian tiada padanan';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 695145bc2..67342b26f 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'som ulest';
 $labels['markflagged']      = 'som flagget';
 $labels['markunflagged']    = 'som uflagget';
 $labels['moreactions']      = 'Flere handlinger …';
+$labels['folders-all']      = 'Alle mapper';
 $labels['more']             = 'Mer';
 $labels['back']             = 'Tilbake';
 $labels['options']          = 'Alternativer';
@@ -135,6 +136,7 @@ $labels['select'] = 'Velg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
 $labels['currpage'] = 'Gjeldende side';
+$labels['isread'] = 'Lese';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
 $labels['unanswered'] = 'Ubesvarte';
@@ -164,6 +166,7 @@ $labels['listcolumns'] = 'Listekolonner';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorteringsrekkefølge';
 $labels['listmode'] = 'Listevisningsmodus';
+$labels['layoutlist'] = 'Liste';
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index ba6198780..fc41748fa 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -81,7 +81,6 @@ $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['restoresavedcomposedata'] = 'Et tidligere usendt svar ble funnet.\n\nEmne: $subject\nLagret: $date\n\nVil du gjenopprette denne meldingen?';
-$messages['noldapserver'] = 'Velg LDAP-tjener å søke i';
 $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';
@@ -166,5 +165,4 @@ $messages['invalidimageformat'] = 'Ikke et gyldig bildeformat.';
 $messages['mispellingsfound'] = 'Fant stavefeil i meldingen.';
 $messages['parentnotwritable'] = 'Kunne ikke opprette/flytte mappen i valgt overordnet mappe. Ingen tilgangsrettigheter.';
 $messages['messagetoobig'] = 'Meldingsdelen er for stor til at den kan prosesseres.';
-$messages['attachmentvalidationerror'] = 'ADVARSEL! Dette vedlegget er mistenkelig fordi det er av en type som ikke passer med det som er deklarert i meldingen. Hvis du ikke stoler på avsenderen burde du ikke åpne det i nettleseren, fordi det kan ha skadelig innhold.<br/><br/><em>Forventet: $expected; fant: $detected</em>rnrnWARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'NB: Denne webmail-klienten krever Javascript! Skru på Javascript i nettleseren din for å kunne bruke den.';
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index 3932811cb..9255037a8 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -48,7 +48,6 @@ $messages['nopagesizewarning'] = 'कृपया पन्नाको ना�
 $messages['norecipientwarning'] = 'कृपया कम-से-कम एउटा प्रापकको विवरण भर्नुहोस';
 $messages['nosubjectwarning']  = 'मेलको कुनै विषय तोकिएको छैनै। केहि तोक्न चहानुहुन्छ ?';
 $messages['nobodywarning'] = 'बिना केहि लेखि पठाउने?';
-$messages['noldapserver'] = 'कृपया खोजको निम्ति एउटा ऐलडाप सर्वर छान्नहोस';
 $messages['nosearchname'] = 'कृपया सम्पर्कको नाम या ई-मेल भर्नुहोस';
 $messages['searchsuccessful'] = '$nr मेलहरु पाइयो';
 $messages['searchnomatch'] = 'खोज असफल रहयो';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index da7f1de41..813c4a1f9 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -159,6 +159,7 @@ $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteerkolom';
 $labels['listorder'] = 'Sorteervolgorde';
 $labels['listmode'] = 'Lijstweergave mode';
+$labels['layoutlist'] = 'Lijst';
 $labels['folderactions'] = 'Acties voor map...';
 $labels['compact'] = 'Comprimeren';
 $labels['empty'] = 'Legen';
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index f08552122..33570cc8b 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -87,7 +87,6 @@ $messages['nopagesizewarning'] = 'Geef een geldig aantal berichten per pagina op
 $messages['norecipientwarning'] = 'Geef minstens één bestemmeling op.';
 $messages['nosubjectwarning']  = 'Geen onderwerp opgegeven. Wenst u alsnog een onderwerp te geven?';
 $messages['nobodywarning'] = 'Wilt u dit lege bericht versturen?';
-$messages['noldapserver'] = 'Kies een LDAP server waarop gezocht moet worden.';
 $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.';
@@ -175,7 +174,6 @@ $messages['invalidimageformat'] = 'Geen geldig afbeeldingsformaat.';
 $messages['mispellingsfound'] = 'Spellingsfouten 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.';
-$messages['attachmentvalidationerror'] = 'OPGELET! Deze bijlage is verdacht omdat het aangetroffen bestandstype niet overeenkomt met het verwachte type. Indien u de afzender niet vertrouwd open deze bijlage in geen geval in uw browser aangezien deze schadelijk data kan bevatten.<br /><br /><em>Verwacht: $expected; Aangetroffen: $detected</em>';
 $messages['noscriptwarning'] = 'Opgelet: deze webmail service vereist JavaScript! Om deze service te kunnen gebruiken dient u JavaScript toe te staan in de instellingen van uw browser.';
 $messages['messageissent'] = 'Het bericht werd reeds verzonden, maar nog niet  bewaard. Wil je het nu bewaren?';
 $messages['errnotfound'] = 'Bestand niet gevonden';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 9b0189cb7..ef508c29e 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -346,11 +346,13 @@ $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Gegevens van contactpersoon';
 $labels['contactnameandorg'] = 'Naam en organisatie';
 $labels['personalinfo'] = 'Persoonlijke informatie';
+$labels['personal'] = 'Persoonlijk';
 $labels['contactphoto'] = 'Contactfoto';
 $labels['edit']   = 'Wijzig';
 $labels['cancel'] = 'Annuleren';
 $labels['save']   = 'Opslaan';
 $labels['delete'] = 'Verwijder';
+$labels['discard'] = 'Weggooien';
 $labels['rename'] = 'Hernoemen';
 $labels['addphoto'] = 'Toevoegen';
 $labels['replacephoto'] = 'Vervangen';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 21957f9b5..9f7ff8c70 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Geen onderwerp';
 $messages['nobodywarning'] = 'Dit bericht zonder inhoud versturen?';
 $messages['notsentwarning'] = 'Het bericht is niet verzonden of opgeslagen. Wilt u wijzigen verwerpen?';
 $messages['restoresavedcomposedata'] = 'Eerder opgesteld, maar niet-verzonden bericht gevonden.\n\nOnderwerp: $subject\nOpgeslagen: $date\n\nWilt u dit bericht herstellen?';
-$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.';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'Geen geldig afbeeldingsformaat.';
 $messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht.';
 $messages['parentnotwritable'] = 'Niet in staat om map aan te maken of verplaatsen in gekozen bovenliggende map. U heeft geen toegangsrechten.';
 $messages['messagetoobig'] = 'Het bericht is te groot om te verwerken.';
-$messages['attachmentvalidationerror'] = 'WAARSCHUWING! Deze bijlage is verdacht omdat het bestandstype niet overeen komt met het bestandstype dat gespecificeerd is in het bericht. Open deze bijlage niet in uw browser als u de afzender niet vertrouwt, aangezien deze bijlage kwaadaardige inhoud kan bevatten.<br /><br /><em>Verwacht: $expected; gevonden: $detected</em>';
 $messages['noscriptwarning'] = 'Waarschuwing: deze webmailapplicatie vereist Javascript! U dient Javascript in te schakelen in uw browserinstellingen wanneer u gebruik wilt maken van deze applicatie.';
 $messages['messageissent'] = 'Het bericht was al verzonden, maar nog niet opgeslagen. Wilt u het nu opslaan?';
 $messages['errnotfound'] = 'Bestand niet gevonden';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 3870c3763..555dcd9ed 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -132,6 +132,7 @@ $labels['select'] = 'Vel';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
 $labels['currpage'] = 'Gjeldande side';
+$labels['isread'] = 'Lese';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
 $labels['unanswered'] = 'Ikkje svara';
@@ -160,6 +161,7 @@ $labels['listcolumns'] = 'Vis kolonner';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorteringsveg';
 $labels['listmode'] = 'Listevisningmodus';
+$labels['layoutlist'] = 'List opp';
 $labels['folderactions'] = 'Mappehandlingar';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Tom';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index b94b82c4d..ef8c50935 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -72,7 +72,6 @@ $messages['nopagesizewarning'] = 'Oppgje sidestorleik.';
 $messages['norecipientwarning'] = 'Skriv minst ein mottakar.';
 $messages['nosubjectwarning']  = 'Emnefeltet er tomt. Vil du skriva eitt emne no?';
 $messages['nobodywarning'] = 'Senda meldinga utan tekst?';
-$messages['noldapserver'] = 'Vel LDAP-tenar å søkja i.';
 $messages['nosearchname'] = 'Skriv kontaktnamn eller epostadresse.';
 $messages['notuploadedwarning'] = 'Ikkje alle vedlegga er ferdig opplasta enno. Vent litt til, eller avbryt opplastinga.';
 $messages['searchsuccessful'] = 'Fann $nr meldingar.';
@@ -149,5 +148,4 @@ $messages['invalidimageformat'] = 'Ikke et gyldig bileteformat.';
 $messages['mispellingsfound'] = 'Fann stavefeil i meldinga.';
 $messages['parentnotwritable'] = 'Klarte ikkje laga/flytte mappa i vald overordna mappe. Ingen tilgangsrettar.';
 $messages['messagetoobig'] = 'Meldingsdelen er for stor til å prosesserast.';
-$messages['attachmentvalidationerror'] = 'ÅTVARING: Dette vedlegget er mistenkjeleg fordi det er av ein  type som ikkje stemmer med det som er deklarert i meldinga. Viss du ikkje stolar på avsendaren bør du ikkje opna det i nettlesaren. Det kan ha skadeleg innhald.<br/><br/><em>Venta: $expected; fann: $detected</em>';
 $messages['noscriptwarning'] = 'NB: Denne webmail-klienten krev JavaScript. Skru på JavaScript i nettlesaren din for å kunna bruka klienten.';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 96b2b82ed..6dcbec54c 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Wszystkie foldery';
 $labels['more']             = 'Więcej';
 $labels['back']             = 'Wstecz';
 $labels['options']          = 'Ustawienia';
+$labels['composeoptions']   = 'Opcje';
+$labels['optionsandattachments'] = 'Opcje i załączniki';
+$labels['actions']          = 'Akcje';
 $labels['first'] = 'Pierwsza';
 $labels['last'] = 'Ostatnia';
 $labels['previous'] = 'Poprzednia';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Kolumny';
 $labels['listsorting'] = 'Porządek sortowania';
 $labels['listorder'] = 'Kierunek sortowania';
 $labels['listmode'] = 'Typ listy';
+$labels['lmode'] = 'Rodzaj listy';
 $labels['layout'] = 'Układ';
 $labels['layoutwidescreen'] = 'Szeroki ekran';
 $labels['layoutdesktop'] = 'Pulpit';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Ograniczenie';
 $labels['quotaused'] = 'Używany';
 $labels['quotastorage'] = 'Przestrzeń dyskowa';
 $labels['quotamessage'] = 'Ilość wiadomości';
+$labels['shortheaderdate'] = 'W dniu $date';
+$labels['shortheaderto'] = 'Do $to w dniu $date';
+$labels['shortheaderfrom'] = 'Od $from w dniu $date';
 $labels['quicksearch']  = 'Szybkie wyszukiwanie';
 $labels['searchplaceholder']  = 'Szukaj...';
 $labels['resetsearch']  = 'Wyczyść filtr';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Bitów';
 $labels['keyexpired']     = 'Przedawniony';
 $labels['keyrevoked']     = 'Unieważniony';
 $labels['bccinstead']     = 'Użyj Bcc';
+$labels['addheader']      = 'Dodaj odbiorcę (nagłówek)';
 $labels['editidents']    = 'Edytuj tożsamości';
 $labels['spellcheck']    = 'Pisownia';
 $labels['checkspelling'] = 'Sprawdź pisownię';
@@ -278,9 +286,13 @@ $labels['high']    = 'Wysoki';
 $labels['highest'] = 'Bardzo wysoki';
 $labels['nosubject']  = '(brak tematu)';
 $labels['showimages'] = 'Wyświetl obrazki';
+$labels['allow']      = 'Zezwól';
 $labels['alwaysshow'] = 'Zawsze wyświetlaj obrazki od $sender';
+$labels['alwaysallow'] = 'Zawsze zezwalaj od $sender';
 $labels['isdraft']    = 'To jest kopia robocza wiadomości.';
 $labels['andnmore']   = '$nr więcej...';
+$labels['headers']    = 'Nagłówki';
+$labels['envelope']   = 'Koperta';
 $labels['togglemoreheaders'] = 'Pokaż więcej nagłówków wiadomości';
 $labels['togglefullheaders'] = 'Przełącz podgląd nagłówków wiadomości';
 $labels['htmltoggle'] = 'HTML';
@@ -354,11 +366,15 @@ $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Właściwości';
 $labels['contactnameandorg'] = 'Nazwa i organizacja';
 $labels['personalinfo'] = 'Informacje osobiste';
+$labels['personal'] = 'Osobiste';
 $labels['contactphoto'] = 'Zdjęcie kontaktu';
 $labels['edit']   = 'Edytuj';
 $labels['cancel'] = 'Anuluj';
 $labels['save']   = 'Zapisz';
 $labels['delete'] = 'Usuń';
+$labels['discard'] = 'Odrzuć';
+$labels['continue'] = 'Kontynuuj';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Zmień nazwę';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamień';
@@ -449,6 +465,7 @@ $labels['skipdeleted'] = 'Ukryj wiadomości oznaczone do usunięcia';
 $labels['deletealways'] = 'Usuń wiadomości, gdy przenoszenie do Kosza zawiedzie';
 $labels['deletejunk'] = 'Kasuj wiadomości bezpośrednio w folderze Spam';
 $labels['showremoteimages'] = 'Wyświetlaj obrazki w wiadomościach';
+$labels['allowremoteresources'] = 'Zezwól na zdalne zasoby (obrazki, style)';
 $labels['fromknownsenders'] = 'od znanych nadawców';
 $labels['always'] = 'zawsze';
 $labels['alwaysbutplain'] = 'Zawsze, za wyjątkiem odpowiedzi na zwykły tekst.';
@@ -490,6 +507,7 @@ $labels['replyandforwardonly'] = 'tylko dla przekazywania i odpowiedzi';
 $labels['insertsignature'] = 'Wstaw podpis';
 $labels['sigbelow'] = 'Umieść podpis poniżej cytowanej wiadomości';
 $labels['sigseparator'] = 'Wymuś standardowy separator w podpisie';
+$labels['automarkread']  = 'Oznacz wiadomości jako przeczytane';
 $labels['afternseconds']  = 'po $n sekundach';
 $labels['reqmdn'] = 'Zawsze żądaj potwierdzenia odbioru';
 $labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
@@ -606,6 +624,7 @@ $labels['arialabelcomposeoptions'] = 'Opcje kompozycji';
 $labels['arialabelresponsesmenu'] = 'Menu zapisanych odpowiedzi';
 $labels['arialabelattachmentuploadform'] = 'Formularz wysyłania załączników';
 $labels['arialabelattachmentmenu'] = 'Opcje załączników';
+$labels['arialabelmailtomenu'] = 'Opcje adresu email';
 $labels['arialabelattachmentpreview'] = 'Podgląd załącznika';
 $labels['ariasummarycomposecontacts'] = 'Lista wyboru kontaktów/grup jako odbiorców';
 $labels['arialabelcontactexportoptions'] = 'Opcje eksportu kontaktów';
@@ -615,6 +634,7 @@ $labels['arialabelidentityeditfrom'] = 'Formularz edycji tożsamości';
 $labels['arialabelresonseeditfrom'] = 'Formularz edycji odpowiedzi';
 $labels['arialabelsearchterms'] = 'Szukana fraza';
 $labels['arialabeldropactionmenu'] = 'Menu Przeciągnij-i-upuść';
+$labels['arialabelheadersmenu'] = 'Menu dodawania odbiorcy (nagłóweka)';
 $labels['helplistnavigation'] = 'Obsługa listy przy pomocy klawiatury';
 $labels['helplistkeyboardnavigation'] = "Strzałki góra/dół: Oznaczanie/poruszanie się po wierszach.
 Spacja: Wybór bieżącego wiersza.
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index a5edeb01f..f9d6c7eda 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -55,6 +55,7 @@ $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['blockedresources'] = 'W celu ochrony prywatności zablokowano zdalne zasoby.';
 $messages['encryptedmessage'] = 'Przepraszamy, nie można wyświetlić zaszyfrowanej wiadomości!';
 $messages['externalmessagedecryption'] = 'Ta wiadomość jest zaszyfrowana i może zostać odszyfrowana za pomocą rozszerzenia przeglądarki.';
 $messages['nopubkeyfor'] = 'Nie znaleziono klucza publicznego dla $email';
@@ -75,6 +76,8 @@ $messages['errormoving'] = 'Nie można przenieść wiadomości!';
 $messages['errorcopying'] = 'Nie można skopiować wiadomości!';
 $messages['errordeleting'] = 'Nie można usunąć wiadomości!';
 $messages['errormarking'] = 'Nie można oznaczyć wiadomości!';
+$messages['alerttitle'] = 'Uwaga';
+$messages['confirmationtitle'] = 'Czy jesteś pewien...';
 $messages['deletecontactconfirm']  = 'Czy na pewno chcesz usunąć wybrane kontakty?';
 $messages['deletegroupconfirm']  = 'Czy na pewno chcesz usunąć wybraną grupę?';
 $messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunąć wybrane wiadomości?';
@@ -99,7 +102,6 @@ $messages['nosubjecttitle']  = 'Brak tematu';
 $messages['nobodywarning'] = 'Ta wiadomość jest pusta, czy mimo to chcesz ją wysłać?';
 $messages['notsentwarning'] = 'Wiadomość została zmieniona i nie została jeszcze wysłana. Czy chcesz porzucić zmiany?';
 $messages['restoresavedcomposedata'] = 'Wykryto poprzednio tworzoną ale nie wysłaną wiadomość.\n\nTemat: $subject\nZapisano: $date\n\nCzy przywrócić tą wiadomość?';
-$messages['noldapserver'] = 'Wybierz serwer LDAP!';
 $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.';
@@ -161,6 +163,7 @@ $messages['smtpautherror'] = 'Błąd SMTP ($code): Uwierzytelnianie nie powiodł
 $messages['smtpfromerror'] = 'Błąd SMTP ($code): Nie można ustawić nadawcy "$from" ($msg).';
 $messages['smtptoerror'] = 'Błąd SMTP ($code): Nie można dodać odbiorcy "$to" ($msg).';
 $messages['smtprecipientserror'] = 'Błąd SMTP: Parsowanie listy odbiorców nie powiodło się.';
+$messages['smtpsizeerror'] = 'Błąd SMTP: Rozmiar wiadomości przekracza limit ($limit)';
 $messages['smtperror'] = 'Błąd SMTP: $msg';
 $messages['emailformaterror'] = 'Błędny adres e-mail: $email';
 $messages['toomanyrecipients'] = 'Zbyt wielu odbiorców. Zmniejsz ich liczbę do $max.';
@@ -193,7 +196,6 @@ $messages['invalidimageformat'] = 'Niepoprawny format obrazka.';
 $messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości.';
 $messages['parentnotwritable'] = 'Nie można utworzyć/przenieść folderu w wybrane miejsce. Brak upranień.';
 $messages['messagetoobig'] = 'Ta część wiadomości jest zbyt duża aby ją przetworzyć.';
-$messages['attachmentvalidationerror'] = 'UWAGA! Ten załącznik jest podejrzany ponieważ jego typ nie jest zgodny z typem zadeklarownym w wiadomości. Jeśli nie ufasz temu nadawcy nie powinieneś otwierać go w przeglądarce, gdyż może zawierać złośliwe oprogramowanie.<br/><br/><em>Zadeklarowany: $expected; wykryty: $detected</em>';
 $messages['noscriptwarning'] = 'Uwaga: Usługa wymaga Javascriptu! Aby z niej skorzystać proszę włączyć obsługę języka Javascript w ustawieniach przeglądarki.';
 $messages['messageissent'] = 'Wiadomość została już wysłana, jednak nie została zapisana. Czy chcesz ją zapisać teraz?';
 $messages['errnotfound'] = 'Nie znaleziono pliku';
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index c9ca1929f..8353a6bdf 100644
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -51,7 +51,6 @@ $messages['nopagesizewarning'] = 'مهرباني‌وکړئ د پاڼې کچه �
 $messages['norecipientwarning'] = 'مهرباني‌وکړئ لږ تر لږه يو ترلاسه کوونکی وليکئ';
 $messages['nosubjectwarning']  = 'د مضمون ډګر تش دی يا تاسو غواړئ چې همدا اوس يو له هغو څخه وليکئ';
 $messages['nobodywarning'] = 'دا استوزه پرته له متن څخه استوئ؟';
-$messages['noldapserver'] = 'مهرباني وکړئ يو ال ډپ سرور د پلټلو لپاره وټاکئ';
 $messages['nosearchname'] = 'مهرباني وکړئ  د يو اړيکلوري‌نوم يا برېښناليک پته وليکئ';
 $messages['searchsuccessful'] = 'استوزي ومونده$';
 $messages['searchnomatch'] = 'د پلټلو بيا راګرځېدل هېڅ سمون ونه خوړه';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 167faf966..fc5e2ce81 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Todas pastas';
 $labels['more']             = 'Mais';
 $labels['back']             = 'Voltar';
 $labels['options']          = 'Opções';
+$labels['composeoptions']   = 'Opções de composição';
+$labels['optionsandattachments'] = 'Opções e anexos';
+$labels['actions']          = 'Ações';
 $labels['first'] = 'Primeiro';
 $labels['last'] = 'Último';
 $labels['previous'] = 'Anterior';
@@ -180,12 +183,13 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Coluna para ordenação';
 $labels['listorder'] = 'Ordem da classificação';
 $labels['listmode'] = 'Visualização em lista';
-$labels['layout'] = 'Layout';
-$labels['layoutwidescreen'] = 'Widescreen';
+$labels['lmode'] = 'Modo lista';
+$labels['layout'] = 'Leiaute';
+$labels['layoutwidescreen'] = 'Panorâmica';
 $labels['layoutdesktop'] = 'Desktop';
 $labels['layoutlist'] = 'Lista';
-$labels['layoutwidescreendesc'] = 'Tela panorâmica (3 colunas)';
-$labels['layoutdesktopdesc'] = 'Desktop (lista larga e visualização de mensagens abaixo)';
+$labels['layoutwidescreendesc'] = 'Panorâmica (visão de 3 colunas)';
+$labels['layoutdesktopdesc'] = 'Desktop (lista ampla e visualização de mensagens abaixo)';
 $labels['layoutlistdesc'] = 'Lista (sem visualização de mensagens)';
 $labels['folderactions'] = 'Ações para as pastas...';
 $labels['compact'] = 'Compactar';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Limite';
 $labels['quotaused'] = 'Usado';
 $labels['quotastorage'] = 'Espaço em disco';
 $labels['quotamessage'] = 'Quantidade de mensagens';
+$labels['shortheaderdate'] = 'Em $date';
+$labels['shortheaderto'] = 'Para $to em $date';
+$labels['shortheaderfrom'] = 'De $from em $date';
 $labels['quicksearch']  = 'Pesquisa rápida';
 $labels['searchplaceholder']  = 'Pesquisar...';
 $labels['resetsearch']  = 'Limpar pesquisa';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Bits';
 $labels['keyexpired']     = 'Expirado';
 $labels['keyrevoked']     = 'Revogado';
 $labels['bccinstead']     = 'Usar Cco';
+$labels['addheader']      = 'Adicionar destinatário (cabeçalho)';
 $labels['editidents']    = 'Editar identidades';
 $labels['spellcheck']    = 'Revisar';
 $labels['checkspelling'] = 'Verificar ortografia';
@@ -278,9 +286,13 @@ $labels['high']    = 'Alta';
 $labels['highest'] = 'Mais alta';
 $labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
+$labels['allow']      = 'Permitir';
 $labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
+$labels['alwaysallow'] = 'Sempre permitir de $sender';
 $labels['isdraft']    = 'Esta é uma mensagem salva como rascunho.';
 $labels['andnmore']   = '$nr mais...';
+$labels['headers']    = 'Cabeçalhos';
+$labels['envelope']   = 'Envelope';
 $labels['togglemoreheaders'] = 'Exibir informações adicionais da mensagem (cabeçalhos)';
 $labels['togglefullheaders'] = 'Exibir cabeçalho original da mensagem';
 $labels['htmltoggle'] = 'HTML';
@@ -354,11 +366,15 @@ $labels['contacts'] = 'Contatos';
 $labels['contactproperties'] = 'Propriedades do contato';
 $labels['contactnameandorg'] = 'Nome e Organização';
 $labels['personalinfo'] = 'Informações pessoais';
+$labels['personal'] = 'Pessoal';
 $labels['contactphoto'] = 'Foto do contato';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Salvar';
 $labels['delete'] = 'Excluir';
+$labels['discard'] = 'Descartar';
+$labels['continue'] = 'Continuar';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
@@ -449,6 +465,7 @@ $labels['skipdeleted'] = 'Não exibir mensagens excluídas';
 $labels['deletealways'] = 'Excluir as mensagens se movê-las para a lixeira falhar';
 $labels['deletejunk'] = 'Apagar as mensagens da pasta de SPAM sem movê-las para a lixeira';
 $labels['showremoteimages'] = 'Exibir imagens externas';
+$labels['allowremoteresources'] = 'Permitir recursos remotos (imagens, estilos)';
 $labels['fromknownsenders'] = 'de remetentes conhecidos';
 $labels['always'] = 'sempre';
 $labels['alwaysbutplain'] = 'sempre, exceto quando respondendo a mensagem de texto simples';
@@ -481,7 +498,7 @@ $labels['signatureoptions'] = 'Opções de Assinatura';
 $labels['whenreplying'] = 'Quando responder';
 $labels['replyempty'] = 'Não incluir a mensagem original';
 $labels['replytopposting'] = 'iniciar nova mensagem acima da original';
-$labels['replytoppostingnoindent'] = 'Começar uma nova mensagem acima da citação (sem indentação)';
+$labels['replytoppostingnoindent'] = 'Começar nova mensagem acima da citação (sem indentação)';
 $labels['replybottomposting'] = 'iniciar nova mensagem abaixo da original';
 $labels['replyremovesignature'] = 'Remover assinatura original da mensagem ao respondê-la';
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
@@ -552,6 +569,12 @@ $labels['source'] = 'Fonte';
 $labels['license'] = 'Licença';
 $labels['support'] = 'Obter suporte';
 $labels['savedsearches'] = 'Pesquisas salvas';
+$labels['dateformatY'] = 'AAAA';
+$labels['dateformaty'] = 'AA';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -575,8 +598,8 @@ $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
 $labels['arialabeltopnav'] = 'Controle da janela';
-$labels['arialabeltasknav'] = 'Tarefas do sistema';
-$labels['arialabeltoolbar'] = 'Barra de ferramentas do sistema';
+$labels['arialabeltasknav'] = 'Tarefas da aplicação';
+$labels['arialabeltoolbar'] = 'Barra de ferramentas da aplicação';
 $labels['arialabelactivetask'] = 'Tarefa ativa';
 $labels['arialabelmessagessearchfilter'] = 'Filtros da listagem de e-mails';
 $labels['arialabelmailsearchform'] = 'Formulário de pesquisa de e-mails';
@@ -607,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Opções para compor a mensagem';
 $labels['arialabelresponsesmenu'] = 'Menu de respostas pré-configuradas';
 $labels['arialabelattachmentuploadform'] = 'Formulário de upload de anexos';
 $labels['arialabelattachmentmenu'] = 'Opções de anexos';
+$labels['arialabelmailtomenu'] = 'Opções de endereço de e-mail';
 $labels['arialabelattachmentpreview'] = 'Pré-visualização de anexos';
 $labels['ariasummarycomposecontacts'] = 'Lista de contatos e grupos para selecionar como destinatários';
 $labels['arialabelcontactexportoptions'] = 'Opções de exportação dos contatos';
@@ -615,7 +639,8 @@ $labels['arialabelpreferencesform'] = 'Formulário de preferências';
 $labels['arialabelidentityeditfrom'] = 'Formulário de edição de identidade';
 $labels['arialabelresonseeditfrom'] = 'Formulário de edição de resposta';
 $labels['arialabelsearchterms'] = 'Termos de pesquisa';
-$labels['arialabeldropactionmenu'] = 'Drag and Drop Menu';
+$labels['arialabeldropactionmenu'] = 'Menu de ações arrastar-e-largar';
+$labels['arialabelheadersmenu'] = 'Menu para adicionar destinatário (cabeçalho)';
 $labels['helplistnavigation'] = 'Lista de navegação pelo teclado';
 $labels['helplistkeyboardnavigation'] = "Setas para cima/baixo: Move o foco/seleção da linha.
 Espaço: Seleciona a linha em foco.
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index b5e45c227..12a1e1f84 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -55,11 +55,12 @@ $messages['addedsuccessfully'] = 'Contato incluído com sucesso no catálogo de
 $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 remotas desta mensagem foram bloqueadas.';
+$messages['blockedresources'] = 'Para proteger sua privacidade recursos remotos foram bloqueados.';
 $messages['encryptedmessage'] = 'Esta é uma mensagem criptografada e não pode ser exibida. Desculpe.';
 $messages['externalmessagedecryption'] = 'Esta é uma mensagem criptografada e pode ser descriptografado com  extensão do seu navegador.';
 $messages['nopubkeyfor'] = 'Nenhuma chave publica encontrada para $email';
 $messages['nopubkeyforsender'] = 'Nenhuma chave pública válida encontrada para sua identidade. Você quer criptografar a mensagem apenas para os destinatários?';
-$messages['encryptnoattachments'] = 'Anexos já enviados não podem ser criptografados. Por favor adicione-os novamente no editor com criptografia.';
+$messages['encryptnoattachments'] = 'Anexos já carregados não podem ser criptografados. Adicione-os novamente no editor com criptografia.';
 $messages['searchpubkeyservers'] = 'Você deseja procurar as chaves faltantes nos servidores de chaves públicas?';
 $messages['encryptpubkeysfound'] = 'As seguintes chaves públicas foram localizadas:';
 $messages['keyservererror'] = 'Falha em obter a chave do servidor';
@@ -75,6 +76,8 @@ $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(s) mensagem(ns).';
 $messages['errormarking'] = 'Não foi possível marcar a(s) mensagem(ns).';
+$messages['alerttitle'] = 'Atenção';
+$messages['confirmationtitle'] = 'Você está seguro...';
 $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)?';
@@ -99,7 +102,6 @@ $messages['nosubjecttitle']  = 'Sem assunto';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem não foi enviada e tem alterações não salvas. Deseja descartar as alterações?';
 $messages['restoresavedcomposedata'] = 'Uma mensagem criada anteriormente, mas não enviada, foi localizada.\n\nTítulo: $subject\nSalva em: $date\n\nDeseja restaurar esta mensagem?';
-$messages['noldapserver'] = 'Por favor, selecione um servidor LDAP para a pesquisa';
 $messages['nosearchname'] = 'Por favor, informe o nome do contato ou seu endereço de e-mail.';
 $messages['notuploadedwarning'] = 'Há anexos ainda não enviados. Aguarde ou cancele o envio.';
 $messages['searchsuccessful'] = '$nr mensagens encontradas.';
@@ -161,6 +163,7 @@ $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['smtpsizeerror'] = 'Erro de SMTP: Tamanho da mensagem excede o limite do servidor ($limit)';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de e-mail inválido: $email';
 $messages['toomanyrecipients'] = 'Há muitos destinatários. Reduza o número de destinatários para $max.';
@@ -193,7 +196,7 @@ $messages['invalidimageformat'] = 'Formato de imagem inválido.';
 $messages['mispellingsfound'] = 'Foram detectados erros de ortografia na mensagem.';
 $messages['parentnotwritable'] = 'Sem permissão para criar/mover a pasta dentro da pasta selecionada.';
 $messages['messagetoobig'] = 'A mensagem é muito grande para ser processada.';
-$messages['attachmentvalidationerror'] = 'ATENÇÃO! Este anexo é suspeito porque seu tipo não combina com o tipo declarado na mensagem. Se você não confia no remetente, não deveria abri-lo no navegador porque pode conter conteúdo malicioso.<br/><br/><em>Esperado: $expected; encontrado: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Este anexo é suspeito porque seu tipo não combina com o tipo declarado na mensagem. Se você não confia no remetente, não o abra no navegador porque pode conter conteúdo maicioso.<br/><br/><em>Esperado: $expected; encontrado: $detected</em>';
 $messages['noscriptwarning'] = 'Aviso: Este webmail utiliza Javascript, habilite-o nas configurações de seu navegador.';
 $messages['messageissent'] = 'A mensagem já foi enviada, mas ainda não foi salva. Deseja salvar agora?';
 $messages['errnotfound'] = 'Arquivo não encontrado';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 531fab4bb..58ef620e4 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Todas as pastas';
 $labels['more']             = 'Mais';
 $labels['back']             = 'Voltar';
 $labels['options']          = 'Opções';
+$labels['composeoptions']   = 'Opções de composição';
+$labels['optionsandattachments'] = 'Opções de anexos';
+$labels['actions']          = 'Ações';
 $labels['first'] = 'Primeiro';
 $labels['last'] = 'Último';
 $labels['previous'] = 'Anterior';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenação';
 $labels['listmode'] = 'Modo de visualização';
+$labels['lmode'] = 'Modo de lista';
 $labels['layout'] = 'Modelo';
 $labels['layoutwidescreen'] = 'Panorâmico';
 $labels['layoutdesktop'] = 'Área de Trabalho';
@@ -199,6 +203,10 @@ $labels['quotatotal'] = 'Limite';
 $labels['quotaused'] = 'Usado';
 $labels['quotastorage'] = 'Espaço em disco';
 $labels['quotamessage'] = 'Número de mensagens';
+$labels['shortheaderdate'] = 'Em $date';
+$labels['shortheaderto'] = 'Para $to em $date';
+$labels['shortheaderfrom'] = 'De $from em $date
+';
 $labels['quicksearch']  = 'Pesquisa rápida';
 $labels['searchplaceholder']  = 'Pesquisar...';
 $labels['resetsearch']  = 'Limpar pesquisa';
@@ -246,6 +254,7 @@ $labels['keylength']      = 'Bits';
 $labels['keyexpired']     = 'Expirada';
 $labels['keyrevoked']     = 'Revogada';
 $labels['bccinstead']     = 'Usar Bcc';
+$labels['addheader']      = 'Adicionar destinatário (cabeçalho)';
 $labels['editidents']    = 'Editar entidades';
 $labels['spellcheck']    = 'Corretor ortográfico';
 $labels['checkspelling'] = 'Verificar ortografia';
@@ -283,6 +292,8 @@ $labels['alwaysshow'] = 'Mostrar sempre imagens a partir de $sender';
 $labels['alwaysallow'] = 'Permitir sempre de $sender';
 $labels['isdraft']    = 'Esta é uma mensagem de rascunho.';
 $labels['andnmore']   = '$nr mais...';
+$labels['headers']    = 'Cabeçalhos';
+$labels['envelope']   = 'Envelope';
 $labels['togglemoreheaders'] = 'Mostrar cabeçalhos adicionais da mensagem';
 $labels['togglefullheaders'] = 'Mostrar cabeçalho original da mensagem';
 $labels['htmltoggle'] = 'HTML';
@@ -356,11 +367,15 @@ $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Dados do contacto';
 $labels['contactnameandorg'] = 'Nome da Organização';
 $labels['personalinfo'] = 'Informação pessoal';
+$labels['personal'] = 'Pessoal';
 $labels['contactphoto'] = 'Foto do contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
+$labels['discard'] = 'Rejeitar';
+$labels['continue'] = 'Continuar';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
@@ -555,6 +570,12 @@ $labels['source'] = 'Fonte';
 $labels['license'] = 'Licença';
 $labels['support'] = 'Obter suporte';
 $labels['savedsearches'] = 'Pesquisas guardadas';
+$labels['dateformatY'] = 'AAAA';
+$labels['dateformaty'] = 'AA';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -610,6 +631,7 @@ $labels['arialabelcomposeoptions'] = 'Opções de composição';
 $labels['arialabelresponsesmenu'] = 'Menu de respostas tipo';
 $labels['arialabelattachmentuploadform'] = 'Formulário de envio de anexos';
 $labels['arialabelattachmentmenu'] = 'Opções de anexos';
+$labels['arialabelmailtomenu'] = 'Opções de endereço de e-mail';
 $labels['arialabelattachmentpreview'] = 'Pré-visualização de anexos';
 $labels['ariasummarycomposecontacts'] = 'Lista de contactos e grupos para selecionar como destinatários';
 $labels['arialabelcontactexportoptions'] = 'Opções de exportação de contacto';
@@ -619,6 +641,7 @@ $labels['arialabelidentityeditfrom'] = 'Formulário de edição de identidade';
 $labels['arialabelresonseeditfrom'] = 'Formulário de edição de resposta';
 $labels['arialabelsearchterms'] = 'Termos de pesquisa';
 $labels['arialabeldropactionmenu'] = 'Menu de acção Arrastar e Largar';
+$labels['arialabelheadersmenu'] = 'Destinatário (cabeçalho) a adicionar menu';
 $labels['helplistnavigation'] = 'Lista de teclas de navegação';
 $labels['helplistkeyboardnavigation'] = "Setas cima/baixo: Move linha de realce/seleção.
 Espaço: Seleciona linha realçada.
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index a773ec6c9..53038b7ff 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -51,6 +51,7 @@ $messages['messagesaved'] = 'Mensagem guardada como rascunho';
 $messages['successfullysaved'] = 'Guardado com sucesso';
 $messages['savingresponse'] = 'A guardar texto de resposta...';
 $messages['deleteresponseconfirm'] = 'Deseja realmente apagar este texto de resposta?';
+$messages['nocontactselected'] = 'Ainda não seleccionou um contacto.';
 $messages['addedsuccessfully'] = 'Contacto adicionado com sucesso';
 $messages['contactexists'] = 'Já existe um contacto com este e-mail';
 $messages['contactnameexists'] = 'Já existe um contacto com este nome.';
@@ -76,6 +77,8 @@ $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 eliminar a mensagem';
 $messages['errormarking'] = 'Não foi possível marcar a mensagem.';
+$messages['alerttitle'] = 'Atenção';
+$messages['confirmationtitle'] = 'Tem a certeza...';
 $messages['deletecontactconfirm']  = 'Tem a certeza que pretende eliminar o(s) contacto(s) selecionado(s)?';
 $messages['deletegroupconfirm']  = 'Tem a certeza que pretende eliminar o grupo selecionado?';
 $messages['deletemessagesconfirm'] = 'Tem a certeza que pretende eliminar a(s) mensagem(ns) selecionada(s)?';
@@ -92,6 +95,7 @@ $messages['noemailwarning'] = 'Por favor, introduza um endereço de e-mail váli
 $messages['nonamewarning']  = 'Por favor, escreva um nome.';
 $messages['nopagesizewarning'] = 'Por favor, escreva o tamanho da página';
 $messages['nosenderwarning'] = 'Por favor, introduza o endereço de e-mail do remetente';
+$messages['recipientsadded'] = 'Destinatário(s) adicionado(s) com sucesso.';
 $messages['norecipientwarning'] = 'Por favor, insira pelo menos um destinatário';
 $messages['disclosedrecipwarning'] = 'Todos os destinatários verão os endereços de email uns dos outros. Para evitar esta situação e proteger a sua privacidade, pode usar o campo Bcc.';
 $messages['disclosedreciptitle'] = 'Demasiados destinatários públicos';
@@ -100,7 +104,6 @@ $messages['nosubjecttitle']  = 'Sem assunto';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem não foi enviada e tem alterações por guardar. Deseja descartar essas alterações?';
 $messages['restoresavedcomposedata'] = 'Foi encontrada uma mensagem anteriormente composta mas não enviada.\n\nAssunto: $subject\nGuardada: $date\n\nDeseja restaurar esta mensagem?';
-$messages['noldapserver'] = 'Selecione um servidor LDAP para efetuar 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';
@@ -162,6 +165,8 @@ $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['smtputf8error'] = 'Erro SMTP: O servidor não suporta unicode no endereço de e-mail.';
+$messages['smtpsizeerror'] = 'Erro SMTP: O tamanho da mensagem excede o limite do servidor ($limit)';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de e-mail incorreto: $email';
 $messages['toomanyrecipients'] = 'Demasiados destinatários. Reduza o número de destinatários para o máximo de $max.';
@@ -194,7 +199,8 @@ $messages['invalidimageformat'] = 'O formato da imagem não é suportado.';
 $messages['mispellingsfound'] = 'Foram detetados erros de ortografia nesta mensagem.';
 $messages['parentnotwritable'] = 'Não é possível criar/mover esta pasta para a pasta selecionada. O acesso foi negado.';
 $messages['messagetoobig'] = 'A mensagem é demasiado grande para ser processada.';
-$messages['attachmentvalidationerror'] = 'ATENÇÃO! Este anexo é suspeito porque o seu tipo não coincide com o tipo declarado na mensagem. Se não confiar no remetente, não o deve abrir no navegador, pois pode ter conteúdos maliciosos.<br/><br/><em>Esperado: $expected; Encontrado: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Este anexo é suspeito porque o seu tipo não corresponde ao tipo declarado na mensagem. Se não confiar no remetente, não deve abri-lo no navegador, pois pode conter conteúdo malicioso.
+Esperado: $expected; encontrado: $detected';
 $messages['noscriptwarning'] = 'Aviso: Este serviço de webmail utiliza Javascript! Para o poder utilizar, ative o Javascript nas definições do seu navegador.';
 $messages['messageissent'] = 'A mensagem já foi enviada, mas ainda não foi guardada. Deseja guardá-la agora?';
 $messages['errnotfound'] = 'Ficheiro não encontrado';
@@ -209,3 +215,4 @@ $messages['clicktoresumesession'] = 'Clique aqui para retomar a sua sessão ante
 $messages['errcomposesession'] = 'Erro na sessão de composição';
 $messages['errcomposesessionexplain'] = 'A sessão de composição solicitada não foi encontrada.';
 $messages['clicktocompose'] = 'Clique aqui para escrever uma nova mensagem';
+$messages['nosupporterror'] = 'Esta funcionalidade não é suportada pelo seu navegador.';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 7cc904391..e706e57f0 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -349,11 +349,13 @@ $labels['contacts'] = 'Contacte';
 $labels['contactproperties'] = 'Proprietăţile contactului...';
 $labels['contactnameandorg'] = 'Nume și Organizație';
 $labels['personalinfo'] = 'Informații personale';
+$labels['personal'] = 'Personal';
 $labels['contactphoto'] = 'Poză contact';
 $labels['edit']   = 'Editează';
 $labels['cancel'] = 'Renunţă';
 $labels['save']   = 'Salvează';
 $labels['delete'] = 'Şterge';
+$labels['discard'] = 'Renunță';
 $labels['rename'] = 'Redenumeşte';
 $labels['addphoto'] = 'Adaugă';
 $labels['replacephoto'] = 'Înlocuiește';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index b1a09468d..053aa15d9 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Fără subiect';
 $messages['nobodywarning'] = 'Trimiteţi acest mesaj fără text?';
 $messages['notsentwarning'] = 'Mesajul nu a fost trimis și are modificări nesalvate. Doriți să renunțați la modificările dvs.?';
 $messages['restoresavedcomposedata'] = 'Un mesaj compus anterior a fost găsit.\n\nSubiect:$subject\nSalvat: $date\n\nDoriţi restaurarea acestuia ?';
-$messages['noldapserver'] = 'Vă rugăm să alegeţi un server ldap pentru căutare';
 $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';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'Tip invalid de imagine.';
 $messages['mispellingsfound'] = 'Au fost găsite greşeli de ortografie în mesaj.';
 $messages['parentnotwritable'] = 'Nu pot crea/muta dosarul în dosarul părinte selectat. Fără drepturi de acces.';
 $messages['messagetoobig'] = 'Partea de mesaj este prea mare pentru a o procesa.';
-$messages['attachmentvalidationerror'] = 'ATENȚIE! Acest atașament este suspect, fiindcă tipul lui nu coincide cu tipul declarat în mesaj. Dacă nu aveți încredere în expeditor, nu vă recomandăm să deschideți fișierul, fiindcă poate avea conținut malițios. <br/><br/><em>Așteptat: $expected; găsit: $detected</em>';
 $messages['noscriptwarning'] = 'Atenție: Serviciul de webmail necesită Javascript! Pentru a-l utiliza vă rugăm activați Javascript în setările browserului.';
 $messages['messageissent'] = 'Mesajul a fost deja trimis, dar încă nu a fost salvat.
 Vreți să îl salvați acum?';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 57d1f045a..fd7289200 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -114,6 +114,7 @@ $labels['forward']          = 'Переслать';
 $labels['forwardinline']    = 'Переслать в теле письма';
 $labels['forwardattachment'] = 'Переслать как вложение';
 $labels['forwardmessage']   = 'Переслать';
+$labels['bouncemsg']        = 'Повторить отправку (недоставлено)';
 $labels['bounce']           = 'Отправить повторно';
 $labels['deletemessage']    = 'В корзину';
 $labels['movemessagetotrash'] = 'Переместить сообщение в корзину';
@@ -138,6 +139,9 @@ $labels['folders-all']      = 'Все папки';
 $labels['more']             = 'Еще';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Параметры';
+$labels['composeoptions']   = 'Параметры создания';
+$labels['optionsandattachments'] = 'Параметры и вложения';
+$labels['actions']          = 'Действия';
 $labels['first'] = 'Первое';
 $labels['last'] = 'Последнее';
 $labels['previous'] = 'Предыдущее';
@@ -179,11 +183,13 @@ $labels['listcolumns'] = 'Колонки';
 $labels['listsorting'] = 'Сортировать по';
 $labels['listorder'] = 'Порядок сортировки';
 $labels['listmode'] = 'Режим просмотра';
+$labels['lmode'] = 'В виде списка';
 $labels['layout'] = 'Размещение';
 $labels['layoutwidescreen'] = 'Широкоэкранное';
 $labels['layoutdesktop'] = 'Рабочий стол';
 $labels['layoutlist'] = 'Список';
 $labels['layoutwidescreendesc'] = 'Широкоэкранный (три колонки)';
+$labels['layoutdesktopdesc'] = 'Настольный (список сообщений и окно предпросмотра под ним)';
 $labels['layoutlistdesc'] = 'Список (без предпросмотра писем)';
 $labels['folderactions'] = 'Операции над папкой...';
 $labels['compact'] = 'Сжать';
@@ -197,6 +203,9 @@ $labels['quotatotal'] = 'Лимит';
 $labels['quotaused'] = 'Использовано';
 $labels['quotastorage'] = 'Дисковое пространство';
 $labels['quotamessage'] = 'Количество сообщений';
+$labels['shortheaderdate'] = 'За $date';
+$labels['shortheaderto'] = '$to за $date';
+$labels['shortheaderfrom'] = 'От $from за $date';
 $labels['quicksearch']  = 'Быстрый поиск';
 $labels['searchplaceholder']  = 'Поиск...';
 $labels['resetsearch']  = 'Сброс';
@@ -244,6 +253,7 @@ $labels['keylength']      = 'Бит';
 $labels['keyexpired']     = 'С истёкщим сроком';
 $labels['keyrevoked']     = 'Отозван';
 $labels['bccinstead']     = 'Использовать BCC';
+$labels['addheader']      = 'Добавить получателя (заголовок)';
 $labels['editidents']    = 'Изменить данные';
 $labels['spellcheck']    = 'Орфография';
 $labels['checkspelling'] = 'Проверить орфографию';
@@ -276,9 +286,13 @@ $labels['high']    = 'Высокий';
 $labels['highest'] = 'Высоч.';
 $labels['nosubject']  = '(без темы)';
 $labels['showimages'] = 'Показать изображения';
+$labels['allow']      = 'Разрешить';
 $labels['alwaysshow'] = 'Всегда показывать изображенияв письмах от $sender';
+$labels['alwaysallow'] = 'Всегда разрешать от $sender';
 $labels['isdraft']    = 'Это черновик.';
 $labels['andnmore']   = 'ещё $nr...';
+$labels['headers']    = 'Заголовки';
+$labels['envelope']   = 'Конверт';
 $labels['togglemoreheaders'] = 'Загрузить ещё заголовки сообщений';
 $labels['togglefullheaders'] = 'Показать оригинальные заголовки сообщения';
 $labels['htmltoggle'] = 'HTML';
@@ -352,11 +366,15 @@ $labels['contacts'] = 'Контакты';
 $labels['contactproperties'] = 'Свойства контакта';
 $labels['contactnameandorg'] = 'Имя и организация';
 $labels['personalinfo'] = 'Личная информация';
+$labels['personal'] = 'Персональные';
 $labels['contactphoto'] = 'Фото контакта';
 $labels['edit']   = 'Правка';
 $labels['cancel'] = 'Отмена';
 $labels['save']   = 'Сохранить';
 $labels['delete'] = 'Удалить';
+$labels['discard'] = 'Отменить';
+$labels['continue'] = 'Продолжить';
+$labels['ok'] = 'ОК';
 $labels['rename'] = 'Переименовать';
 $labels['addphoto'] = 'Добавить';
 $labels['replacephoto'] = 'Заменить';
@@ -447,6 +465,7 @@ $labels['skipdeleted'] = 'Не показывать удаленные сооб�
 $labels['deletealways'] = 'Удалять сообщения, если не получается поместить их в корзину';
 $labels['deletejunk'] = 'Удалять сообщения из папки СПАМ минуя Корзину';
 $labels['showremoteimages'] = 'Показывать удаленные изображения';
+$labels['allowremoteresources'] = 'Разрешить внешние ресурсы (изображения, стили)';
 $labels['fromknownsenders'] = 'от известных отправителей';
 $labels['always'] = 'всегда';
 $labels['alwaysbutplain'] = 'всегда, кроме тех случаев, когда, ответ составлен обычным текстом';
@@ -605,6 +624,7 @@ $labels['arialabelcomposeoptions'] = 'Параметры создания';
 $labels['arialabelresponsesmenu'] = 'Меню заранее подготовленных ответов';
 $labels['arialabelattachmentuploadform'] = 'Форма выгрузки вложения';
 $labels['arialabelattachmentmenu'] = 'Настройки вложений';
+$labels['arialabelmailtomenu'] = 'Параметры адреса';
 $labels['arialabelattachmentpreview'] = 'Предпросмотр вложений';
 $labels['ariasummarycomposecontacts'] = 'Список контактов и групп для выбора в качестве получателей';
 $labels['arialabelcontactexportoptions'] = 'Параметры экспорта контактов';
@@ -613,6 +633,8 @@ $labels['arialabelpreferencesform'] = 'Форма настроек';
 $labels['arialabelidentityeditfrom'] = 'Форма редактирования личных данных';
 $labels['arialabelresonseeditfrom'] = 'Форма редактирования ответа';
 $labels['arialabelsearchterms'] = 'Поисковый запросы';
+$labels['arialabeldropactionmenu'] = 'Меню действий при перетаскивании';
+$labels['arialabelheadersmenu'] = 'Меню добавления получателя (Заголовок)';
 $labels['helplistnavigation'] = 'Клавиши навигации по списку';
 $labels['helplistkeyboardnavigation'] = "Стрелки вверх/вниз: Перемещает фокус по строкам/выделение.
 Пробел: Выделяет строку на которой находится фокус.
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index d3ae2fafe..cf96b49a9 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -55,6 +55,7 @@ $messages['addedsuccessfully'] = 'Контакт добавлен в адрес�
 $messages['contactexists'] = 'Контакт с этим адресом e-mail уже существует.';
 $messages['contactnameexists'] = 'Контакт с таким именем уже существует.';
 $messages['blockedimages'] = 'В целях безопасности загрузка изображений заблокирована.';
+$messages['blockedresources'] = 'В целях безопасности загрузка внешних ресурсов заблокирована.';
 $messages['encryptedmessage'] = 'Сообщение зашифровано и не может быть показано. Обратитесь к администратору сервера.';
 $messages['externalmessagedecryption'] = 'Это зашифрованное сообщение, оно может быть расшифровано с помощью расширением вашего браузера.';
 $messages['nopubkeyfor'] = 'Не найден действительный открытый ключ для $email';
@@ -75,6 +76,8 @@ $messages['errormoving'] = 'Не удалось переместить сооб�
 $messages['errorcopying'] = 'Не удалось скопировать сообщение(я).';
 $messages['errordeleting'] = 'Не удалось удалить сообщение(я).';
 $messages['errormarking'] = 'Не удалось пометить сообщение(я).';
+$messages['alerttitle'] = 'Внимание';
+$messages['confirmationtitle'] = 'Вы уверены...';
 $messages['deletecontactconfirm']  = 'Вы действительно хотите удалить выделенные контакты?';
 $messages['deletegroupconfirm']  = 'Вы действительно хотите удалить выделенную группу?';
 $messages['deletemessagesconfirm'] = 'Вы действительно хотите удалить выбранные сообщения?';
@@ -99,7 +102,6 @@ $messages['nosubjecttitle']  = 'Без темы';
 $messages['nobodywarning'] = 'Отправить сообщение без текста?';
 $messages['notsentwarning'] = 'Сообщение не отправлено и имеет несохранённые изменения. Вы хотите отменить ваши изменения?';
 $messages['restoresavedcomposedata'] = 'Найдено ранее составленное, но неотправленное сообщение.\n\nТема: $subject\nСохранено: $date\n\nХотите восстановить это сообщение?';
-$messages['noldapserver'] = 'Пожалуйста, выберите LDAP сервер для поиска.';
 $messages['nosearchname'] = 'Пожалуйста, введите имя или адрес E-Mail';
 $messages['notuploadedwarning'] = 'Вложения загружены не полностью. Подождите или отмените загрузку.';
 $messages['searchsuccessful'] = 'Найденных сообщений - $nr';
@@ -161,6 +163,7 @@ $messages['smtpautherror'] = 'SMTP ошибка ($code): Ошибка автор
 $messages['smtpfromerror'] = 'SMTP ошибка ($code): Невозможно установить отправителя "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP ошибка ($code): Невозможно добавить получателя "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP ошибка: Невозможно обработать список получателей.';
+$messages['smtpsizeerror'] = 'Ошибка SMTP: Размер сообщения превышает ограничения сервера ($limit)';
 $messages['smtperror'] = 'SMTP ошибка: $msg';
 $messages['emailformaterror'] = 'Неверный адрес: $email';
 $messages['toomanyrecipients'] = 'Слишком много получателей. Уменьшите их количество до $max.';
@@ -193,7 +196,6 @@ $messages['invalidimageformat'] = 'Неверный формат изображ�
 $messages['mispellingsfound'] = 'В сообщении обнаружены орфографические ошибки.';
 $messages['parentnotwritable'] = 'Не удается создать/переместить папку в выбранную родительскую папку. Нет прав доступа.';
 $messages['messagetoobig'] = 'Часть сообщения слишком велика для обработки.';
-$messages['attachmentvalidationerror'] = 'ВНИМАНИЕ! Это вложение является подозрительным, потому что его тип не совпадает с типом, объявленным в сообщении. Если Вы не доверяете отправителю, не открывайте его в браузере, поскольку оно может  заключать в себе вредоносное содержимое.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Внимание: Данному сервису веб-почты требуется Javascript! Для того, чтобы его использовать необходимо включить поддержку Javascript в настройках вашего браузера.';
 $messages['messageissent'] = 'Сообщение уже отправлено, но еще не сохранено. Вы хотите сохранить его?';
 $messages['errnotfound'] = 'Файл не найден';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 36254213f..d50ca039f 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -31,6 +31,7 @@ $labels['trash']  = 'ඉවතලන බඳුන';
 $labels['junk']   = 'සුන්බුන්';
 $labels['subject'] = 'මාතෘකාව';
 $labels['from']    = 'වෙතින්';
+$labels['sender']  = 'යවන්නා';
 $labels['to']      = 'වෙත';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -117,6 +118,7 @@ $labels['select'] = 'තෝරන්න';
 $labels['all'] = 'සියල්ල';
 $labels['none'] = 'කිසිවක් නැත';
 $labels['currpage'] = 'දැනට ඇති පිටුව';
+$labels['isread'] = 'කියවන්න';
 $labels['unread'] = 'නොකියවූ';
 $labels['deleted'] = 'මකා දැමූ';
 $labels['filter'] = 'පෙරන්න';
@@ -130,6 +132,7 @@ $labels['sentdate'] = 'යැවූ දිනය';
 $labels['arrival'] = 'ලගාවූ දිනය';
 $labels['asc'] = 'ආරෝහණ';
 $labels['desc'] = 'අවරෝහණ';
+$labels['layoutlist'] = 'ලැයිස්තුව';
 $labels['folderactions'] = 'බහාලුම් ක්‍රියා...';
 $labels['compact'] = 'සංයුක්ත';
 $labels['empty'] = 'හිස්';
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index 56f554c1b..05ffb3dd5 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -53,7 +53,6 @@ $messages['nopagesizewarning'] = 'කරුණාකර පිටුවේ ප�
 $messages['norecipientwarning'] = 'කරුණාකර යටත් පිරිසෙයින් එක් ලබන්නෙකු හෝ ඇතුලත් කරන්න';
 $messages['nosubjectwarning']  = '"මාතෘකාව" හිස්. මාතෘකාවක් ඇතුලත් කිරීමට ඔබ කැමතිද?';
 $messages['nobodywarning'] = 'මෙම හිස් පනිවුඩය යවන්නද?';
-$messages['noldapserver'] = 'සෙවුම සඳහා කරුණාකර ldap සම්බන්ධතාවයක් තෝරා ගන්න';
 $messages['nosearchname'] = 'කරුණාකර ලිපිනයෙහි නම හෝ විද්යුත් තැපැල් ලිපිනය ඇතුලත් කරන්න';
 $messages['searchsuccessful'] = '$nr පනිවුඩය හමු විය';
 $messages['searchnomatch'] = 'සෙවුමට අදාල ගැලපීමක් නොමැත.';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 6af87b24f..7ffb39956 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Všetky priečinky';
 $labels['more']             = 'Viac';
 $labels['back']             = 'Dozadu';
 $labels['options']          = 'Možnosti';
+$labels['composeoptions']   = 'Možnosti zostavovania';
+$labels['optionsandattachments'] = 'Možnosti a prílohy';
+$labels['actions']          = 'Akcie';
 $labels['first'] = 'Prvá/prvý';
 $labels['last'] = 'Posledná/-ý';
 $labels['previous'] = 'Predchádzajúca/-i';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Stĺpce';
 $labels['listsorting'] = 'Zoraďovanie';
 $labels['listorder'] = 'Systém zoraďovania';
 $labels['listmode'] = 'Režim zobrazenia zoznamu';
+$labels['lmode'] = 'Režim zoznamu';
 $labels['layout'] = 'Rozloženie';
 $labels['layoutwidescreen'] = 'Na šírku obrazovky';
 $labels['layoutdesktop'] = 'Desktop';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Limit';
 $labels['quotaused'] = 'Použité';
 $labels['quotastorage'] = 'Priestor na disku';
 $labels['quotamessage'] = 'Počet správ';
+$labels['shortheaderdate'] = 'Dňa: $date';
+$labels['shortheaderto'] = 'Komu: $to dňa $date';
+$labels['shortheaderfrom'] = 'Od: $from dňa $date';
 $labels['quicksearch']  = 'Rýchle vyhľadávanie';
 $labels['searchplaceholder']  = 'Vyhľadať...';
 $labels['resetsearch']  = 'Reset vyhľadávania';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Bity';
 $labels['keyexpired']     = 'Expirované';
 $labels['keyrevoked']     = 'Odvolané';
 $labels['bccinstead']     = 'Použiť skrytú kópiu';
+$labels['addheader']      = 'Pridať príjemcu (hlavička)';
 $labels['editidents']    = 'Upraviť identitu odosielateľa';
 $labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Skontrolovať pravopis';
@@ -283,6 +291,8 @@ $labels['alwaysshow'] = 'Vždy zobraziť obrázky od odosielateľa $sender';
 $labels['alwaysallow'] = 'Vždy povoliť od $sender';
 $labels['isdraft']    = 'Toto je koncept';
 $labels['andnmore']   = 'Počet ďalších: $nr...';
+$labels['headers']    = 'Hlavičky';
+$labels['envelope']   = 'Obálka';
 $labels['togglemoreheaders'] = 'Zobraziť viac hlavičiek správ';
 $labels['togglefullheaders'] = 'Prepnúť zobrazenie úplných hlavičiek správ';
 $labels['htmltoggle'] = 'HTML';
@@ -356,11 +366,15 @@ $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Vlastnosti kontaktu';
 $labels['contactnameandorg'] = 'Názov a organizácia';
 $labels['personalinfo'] = 'Osobné informácie';
+$labels['personal'] = 'Osobné';
 $labels['contactphoto'] = 'Fotografia kontaktu';
 $labels['edit']   = 'Upraviť';
 $labels['cancel'] = 'Zrušiť';
 $labels['save']   = 'Uložiť';
 $labels['delete'] = 'Vymazať';
+$labels['discard'] = 'Vyhodiť';
+$labels['continue'] = 'Pokračovať';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Premenovať';
 $labels['addphoto'] = 'Pridať fotografiu';
 $labels['replacephoto'] = 'Nahradiť fotografiu';
@@ -555,6 +569,12 @@ $labels['source'] = 'Zdrojový kód';
 $labels['license'] = 'Licencia';
 $labels['support'] = 'Podpora';
 $labels['savedsearches'] = 'Uložené vyhľadávania';
+$labels['dateformatY'] = 'RRRR';
+$labels['dateformaty'] = 'RR';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -610,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Nastavenia kompozície';
 $labels['arialabelresponsesmenu'] = 'Menu pre preddefinované odpovede';
 $labels['arialabelattachmentuploadform'] = 'Formulár pre odoslanie prílohy';
 $labels['arialabelattachmentmenu'] = 'Nastavenia prílohy';
+$labels['arialabelmailtomenu'] = 'Možnosti pre e-mailovú adresu';
 $labels['arialabelattachmentpreview'] = 'Náhľad prílohy';
 $labels['ariasummarycomposecontacts'] = 'Zoznam kontaktov a skupín pre výber príjemcov';
 $labels['arialabelcontactexportoptions'] = 'Nastavenia exportu kontaktov';
@@ -619,6 +640,7 @@ $labels['arialabelidentityeditfrom'] = 'Formulár pre úpravu identity';
 $labels['arialabelresonseeditfrom'] = 'Formulár pre úpravu odpovede';
 $labels['arialabelsearchterms'] = 'Vyhľadávanie položiek';
 $labels['arialabeldropactionmenu'] = 'Menu akcií typu Ťahaj a pusť';
+$labels['arialabelheadersmenu'] = 'Menu pre pridanie príjemcu (hlavičky)';
 $labels['helplistnavigation'] = 'Zoznam navigovania pomocou klávesnice';
 $labels['helplistkeyboardnavigation'] = "Šípky nahor/nadol: presunúť zvýraznenie/výber.
 Medzerník: vybrať zvýraznený riadok.
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 5fcb21a96..f5b384066 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -76,6 +76,8 @@ $messages['errormoving'] = 'Správu/správy nemožno presunúť.';
 $messages['errorcopying'] = 'Správu/správy nemožno skopírovať,';
 $messages['errordeleting'] = 'Správu/správy nemožno vymazať.';
 $messages['errormarking'] = 'Nemožno označiť správu/správy.';
+$messages['alerttitle'] = 'Pozor';
+$messages['confirmationtitle'] = 'Naozaj...';
 $messages['deletecontactconfirm']  = 'Naozaj chcete vymazať vybrané kontakty?';
 $messages['deletegroupconfirm']  = 'Naozaj chcete vymazať vybranú skupinu?';
 $messages['deletemessagesconfirm'] = 'Naozaj chcete vymazať vybrané správy?';
@@ -100,7 +102,6 @@ $messages['nosubjecttitle']  = 'Bez predmetu';
 $messages['nobodywarning'] = 'Chcete odoslať správu bez textu?';
 $messages['notsentwarning'] = 'Správa nebola odoslaná a obsahuje neuložené zmeny. Chcete vykonané zmeny zrušiť?';
 $messages['restoresavedcomposedata'] = 'Našla sa staršia správa, ktorú ste napísali ale neodoslali.\n\nPredmet: $subject\nUložené: $date\n\nChcete túto správu obnoviť?';
-$messages['noldapserver'] = 'Prosím vyberte server LDAP pre vyhľadávanie.';
 $messages['nosearchname'] = 'Prosím zadajte meno alebo e-mailovú adresu kontaktu.';
 $messages['notuploadedwarning'] = 'Ešte neboli nahrané všetky súbory. Prosím čakajte alebo nahrávanie zrušte.';
 $messages['searchsuccessful'] = 'Nájdené správy: $nr.';
@@ -162,6 +163,7 @@ $messages['smtpautherror'] = 'Chyba SMTP ($code): Neúspešná autentifikácia.'
 $messages['smtpfromerror'] = 'Chyba SMTP ($code): Nemožno nastaviť odosielateľa "$from" ($msg).';
 $messages['smtptoerror'] = 'Chyba SMTP ($code): Nemožno pridať príjemcu "$to" ($msg).';
 $messages['smtprecipientserror'] = 'Chyba SMTP: Nemožno spracovať zoznam príjemcov.';
+$messages['smtpsizeerror'] = 'Chyba SMTP: veľkosť správy presahuje limit servera ($limit)';
 $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Príliš veľa príjemcov. Zredukujte počet príjemcov na $max.';
@@ -194,7 +196,7 @@ $messages['invalidimageformat'] = 'Neplatný formát obrázka';
 $messages['mispellingsfound'] = 'V správe boli nájdené pravopisné chyby.';
 $messages['parentnotwritable'] = 'Nemožno vytvoriť/presunúť priečinok do vybraného rodičovského priečinka. Nemáte prístupové oprávnenia.';
 $messages['messagetoobig'] = 'Časť správy je príliš veľká na spracovanie.';
-$messages['attachmentvalidationerror'] = 'UPOZORNENIE! Táto príloha je podozrivá, pretože jej typ sa nezhoduje s typom uvedeným v správe. Ak odosielateľovi prílohy nedôverujete, nemali by ste prílohu otvárať. Môže totiž obsahovať škodlivý obsah.<br/><br/><em>Očakávaná hodnota: $expected; nájdená hodnota: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Táto príloha je podozrivá, pretože jej typ sa nezhoduje s typom deklarovaným v správe. Ak odosielateľovi nedôverujete, nemali by ste ju otvárať v prehliadači, pretože môže mať škodlivý obsah.<br/><br/><em>Očakávalo sa: $expected; našlo sa: $detected</em>';
 $messages['noscriptwarning'] = 'Upozornenie: Táto webmailová služba vyžaduje Javascript! Ak ju chcete používať, prosím aktivujte Javascript v nastaveniach svojho prehliadača.';
 $messages['messageissent'] = 'Správa už bola odoslaná, ešte však nebola uložená. Chcete ju uložiť teraz?';
 $messages['errnotfound'] = 'Súbor sa nenašiel';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index bb6b279e4..c9bbda29a 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -354,11 +354,13 @@ $labels['contacts'] = 'Stiki';
 $labels['contactproperties'] = 'Lastnosti stika';
 $labels['contactnameandorg'] = 'Ime in Organizacija';
 $labels['personalinfo'] = 'Osebni podatki';
+$labels['personal'] = 'Osebno';
 $labels['contactphoto'] = 'Kontaktna slika';
 $labels['edit']   = 'Uredi';
 $labels['cancel'] = 'Prekliči';
 $labels['save']   = 'Shrani';
 $labels['delete'] = 'Izbriši';
+$labels['discard'] = 'Zavrži';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamenjaj';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index c97918bf3..03aee592c 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Brez naslova';
 $messages['nobodywarning'] = 'Želite poslati sporočilo brez besedila?';
 $messages['notsentwarning'] = 'Sporočilo ni bilo poslano in vsebuje neshranjene spremembe. Želite spremembe zavreči?';
 $messages['restoresavedcomposedata'] = 'Ali želite nadaljevati z urejanjem še neodposlanega osnutka:\n\nZadeva: $subject\nShranjeno dne: $date\n\n ';
-$messages['noldapserver'] = 'Izberite LDAP strežnik, v katerem želite iskati?';
 $messages['nosearchname'] = 'Vnesite ime ali elektronski naslov stika';
 $messages['notuploadedwarning'] = 'Priponke se še nalagajo na strežnik. Počakajte ali prekinite prenos.';
 $messages['searchsuccessful'] = '$nr najdenih sporočil';
@@ -193,7 +192,6 @@ $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.';
 $messages['messagetoobig'] = 'Sporočilo je preveliko za obdelavo.';
-$messages['attachmentvalidationerror'] = 'OPOZORILO! Priponka vsebuje sumljivo vsebino, saj tip priponke ne ustreza tipu, določenemu v sporočilu. Če ne zaupate pošiljatelju, priponke v brskalniku ne odpirajte, saj lahko vsebuje zlonamerno vsebino. <br/><br/><em>Pričakovano: $expected; Najdeno: $detected</em>';
 $messages['noscriptwarning'] = 'Opozorilo: Ta spletna stran zahteva Javascript! Za uporabo ga vključite v nastavitvah vašega brskalnika.';
 $messages['messageissent'] = 'Sporočilo je bilo uspešno poslano, a ni bilo shranjeno. Ga želite shraniti?';
 $messages['errnotfound'] = 'Datoteke ni bilo mogoče najti';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index f6919ac50..f478948e9 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -16,10 +16,11 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 $labels['welcome']   = 'Mirë se erdhët te $product';
-$labels['username']  = 'Emri i përdoruesit';
+$labels['username']  = 'Emër përdoruesi';
 $labels['password']  = 'Fjalëkalimi';
 $labels['server']    = 'Shërbyes';
 $labels['login']     = 'Hyrje';
+$labels['menu']     = 'Menu';
 $labels['logout']   = 'Dalje';
 $labels['mail']     = 'Postë';
 $labels['settings'] = 'Rregullime';
@@ -44,6 +45,7 @@ $labels['priority'] = 'Përparësi';
 $labels['organization'] = 'Ent';
 $labels['readstatus'] = 'Gjendje leximi';
 $labels['listoptions'] = 'Mundësi liste…';
+$labels['listoptionstitle'] = 'Mundësi liste';
 $labels['mailboxlist'] = 'Dosje';
 $labels['messagesfromto'] = 'Mesazhet nga $from deri në $to nga $count gjithsej';
 $labels['threadsfromto'] = 'Rrjedhat nga $from deri në $to nga $count gjithsej';
@@ -57,8 +59,8 @@ $labels['download'] = 'Shkarkoje';
 $labels['open']     = 'Hape';
 $labels['showattachment'] = 'Shfaqe';
 $labels['showanyway'] = 'Shfaqe sido qoftë';
-$labels['filename'] = 'Emër skedari';
-$labels['filesize'] = 'Madhësi skedari';
+$labels['filename'] = 'Emër kartele';
+$labels['filesize'] = 'Madhësi kartele';
 $labels['addtoaddressbook'] = 'Shtoje në librin e adresave';
 $labels['sun'] = 'Die';
 $labels['mon'] = 'Hën';
@@ -112,6 +114,7 @@ $labels['forward']          = 'Përcille';
 $labels['forwardinline']    = 'Përcille brendazi';
 $labels['forwardattachment'] = 'Përcille si bashkëngjitje';
 $labels['forwardmessage']   = 'Përcille mesazhin';
+$labels['bounce']           = 'Ridërgoje';
 $labels['deletemessage']    = 'Fshije mesazhin';
 $labels['movemessagetotrash'] = 'Hidhe mesazhin në kosh';
 $labels['printmessage']     = 'Shtype këtë mesazh';
@@ -135,12 +138,15 @@ $labels['folders-all']      = 'Krejt dosjet';
 $labels['more']             = 'Më tepër';
 $labels['back']             = 'Mbrapsht';
 $labels['options']          = 'Opsione';
+$labels['composeoptions']   = 'Mundësi hartimi';
+$labels['optionsandattachments'] = 'Mundësi dhe bashkëngjitje';
+$labels['actions']          = 'Veprime';
 $labels['first'] = 'I pari';
 $labels['last'] = 'I fundit';
 $labels['previous'] = 'I mëparshmi';
 $labels['next'] = 'Pasuesi';
 $labels['select'] = 'Përzgjidhni';
-$labels['all'] = 'Të gjitha';
+$labels['all'] = 'Krejt';
 $labels['none'] = 'Asnjë';
 $labels['currpage'] = 'Faqja e tanishme';
 $labels['isread'] = 'Të lexuar';
@@ -165,6 +171,7 @@ $labels['autoexpand_threads'] = 'Zgjero rrjedha mesazhesh';
 $labels['do_expand'] = 'krejt rrjedhat';
 $labels['expand_only_unread'] = 'vetëm ato me mesazhe të palexuar';
 $labels['fromto'] = 'Nga/Për';
+$labels['flag'] = 'Shenjë';
 $labels['attachment'] = 'Bashkëngjitje';
 $labels['nonesort'] = 'Asnjë';
 $labels['sentdate'] = 'Datë dërgimi';
@@ -175,9 +182,14 @@ $labels['listcolumns'] = 'Paraqit shtylla';
 $labels['listsorting'] = 'Shtyllë renditjeje';
 $labels['listorder'] = 'Rend renditjeje';
 $labels['listmode'] = 'Mënyra parje si listë';
+$labels['lmode'] = 'Mënyra listë';
 $labels['layout'] = 'Skemë';
 $labels['layoutwidescreen'] = 'Me ekran të gjerë';
 $labels['layoutdesktop'] = 'Desktop';
+$labels['layoutlist'] = 'Listë';
+$labels['layoutwidescreendesc'] = 'Me ekran të gjerë (pamje 3 shtylla)';
+$labels['layoutdesktopdesc'] = 'Desktop (listë e gjerë dhe paraparje nën të )';
+$labels['layoutlistdesc'] = 'Listë (pa paraparje poste)';
 $labels['folderactions'] = 'Veprime mbi dosje…';
 $labels['compact'] = 'Ngjeshe';
 $labels['empty'] = 'Zbraze';
@@ -185,17 +197,23 @@ $labels['importmessages'] = 'Importo mesazhe';
 $labels['quota'] = 'Përdorim disku';
 $labels['unknown']  = 'i panjohur';
 $labels['unlimited']  = 'i pakufizuar';
+$labels['quotatype'] = 'Lloj thonjëzash';
 $labels['quotatotal'] = 'Kufi';
 $labels['quotaused'] = 'E përdorur';
 $labels['quotastorage'] = 'Hapësirë disku';
 $labels['quotamessage'] = 'Numër mesazhesh';
+$labels['shortheaderdate'] = 'Më $date';
+$labels['shortheaderto'] = 'Për $to më $date';
+$labels['shortheaderfrom'] = 'Nga $from më $date';
 $labels['quicksearch']  = 'Kërkim i shpejtë';
+$labels['searchplaceholder']  = 'Kërkoni…';
 $labels['resetsearch']  = 'Kërkim nga e para';
 $labels['searchmod']  = 'Modifikues kërkimi';
 $labels['msgtext']  = 'Krejt mesazhin';
 $labels['body']  = 'Lëndë';
 $labels['type'] = 'Lloj';
 $labels['namex'] = 'Emër';
+$labels['searchscope'] = 'Shtrirje';
 $labels['currentfolder'] = 'Dosja e tanishme';
 $labels['subfolders'] = 'Kjo dhe nëndosjet';
 $labels['allfolders'] = 'Krejt dosjet';
@@ -213,7 +231,7 @@ $labels['editasnew']      = 'Përpunojeni si të ri';
 $labels['send']           = 'Dërgoje';
 $labels['sendmessage']    = 'Dërgoje mesazhin';
 $labels['savemessage']    = 'Ruaje si skicë';
-$labels['addattachment']  = 'Bashkëngjit një skedar';
+$labels['addattachment']  = 'Bashkëngjitni një kartelë';
 $labels['charset']        = 'Bashkësi shkronjash';
 $labels['editortype']     = 'Lloj përpunuesi';
 $labels['returnreceipt']  = 'Dëftesë kthimi';
@@ -234,6 +252,7 @@ $labels['keylength']      = 'Bite';
 $labels['keyexpired']     = 'I skaduar';
 $labels['keyrevoked']     = 'I shfuqizuar';
 $labels['bccinstead']     = 'Përdor Bcc';
+$labels['addheader']      = 'Shtoni marrës (krye)';
 $labels['editidents']    = 'Përpunoni identitete';
 $labels['spellcheck']    = 'Drejtshkrim';
 $labels['checkspelling'] = 'Kontrolloji drejtshkrimin';
@@ -254,39 +273,43 @@ $labels['responsetext'] = 'Tekst Përgjigjeje';
 $labels['attach'] = 'Bashkëngjite';
 $labels['attachments'] = 'Bashkëngjitje';
 $labels['upload'] = 'Ngarko';
-$labels['uploadprogress'] = '$percent ($current nga $total)';
+$labels['uploadprogress'] = '$percent ($current nga $total gjithsej)';
 $labels['close']  = 'Mbylle';
 $labels['messageoptions']  = 'Mundësi mesazhesh…';
 $labels['togglecomposeoptions'] = 'Shfaq/fshih mundësi hartimi';
 $labels['attachmentrename']  = 'Riemërtoni bashkëngjitjet';
 $labels['low']     = 'I ulët';
 $labels['lowest']  = 'Më i ulëti';
-$labels['normal']  = 'Normal';
+$labels['normal']  = 'Normale';
 $labels['high']    = 'I lartë';
 $labels['highest'] = 'Më i larti';
 $labels['nosubject']  = '(pa subjekt)';
 $labels['showimages'] = 'Shfaq figura';
+$labels['allow']      = 'Lejoje';
 $labels['alwaysshow'] = 'Shfaqi përherë figurat nga $sender';
+$labels['alwaysallow'] = 'Lejo përherë nga $sender';
 $labels['isdraft']    = 'Kjo është një skicë mesazhi.';
 $labels['andnmore']   = '$nr të tjerë...';
-$labels['togglemoreheaders'] = 'Shfaq krye mesazhi';
+$labels['headers']    = 'Krye';
+$labels['envelope']   = 'Mbështjellëse';
+$labels['togglemoreheaders'] = 'Shfaq më tepër krye mesazhi';
 $labels['togglefullheaders'] = 'Shfaq/fshih krye të papërpunuar mesazhi';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Tekst i thjeshtë';
 $labels['savesentmessagein'] = 'Ruaje mesazhin e dërguar te';
 $labels['dontsave'] = 'mos e ruaj';
-$labels['maxuploadsize'] = 'Maksimumi i lejuar për madhësi skedarësh është $size';
+$labels['maxuploadsize'] = 'Maksimumi i lejuar për madhësi kartelash është $size';
 $labels['addcc'] = 'Shto Cc';
 $labels['addbcc'] = 'Shto Bcc';
 $labels['addreplyto'] = 'Shtoni Përgjigjuni-Te';
-$labels['addfollowupto'] = 'Shto Followup-To';
-$labels['mdnrequest'] = 'Dërguesi i këtij mesazhi ka kërkuar që të njoftohet kur ju të lexoni këtë mesazh. Dëshironi të njoftohet dërguesi?';
+$labels['addfollowupto'] = 'Shto Vazhdojeni-Te';
+$labels['mdnrequest'] = 'Dërguesi i këtij mesazhi ka kërkuar që të njoftohet kur të lexoni këtë mesazh. Dëshironi të njoftohet dërguesi?';
 $labels['receiptread'] = 'Dëftesë Kthimi (u lexua)';
 $labels['yourmessage'] = 'Kjo është një Dëftesë Kthimi për mesazhin tuaj';
 $labels['receiptnote'] = 'Shënim: Kjo dëftesë dëshmon vetëm se mesazhi u shfaq në kompjuterin e marrësit. Nuk ka garanci se marrësi e ka lexuar ose e ka kuptuar përmbajtjen e mesazhit.';
 $labels['name']         = 'Emër Në Ekran';
-$labels['firstname']    = 'Emri';
-$labels['surname']      = 'Mbiemri';
+$labels['firstname']    = 'Emër';
+$labels['surname']      = 'Mbiemër';
 $labels['middlename']   = 'Emër i Dytë';
 $labels['nameprefix']   = 'Parashtesë';
 $labels['namesuffix']   = 'Prapashtesë';
@@ -294,7 +317,7 @@ $labels['nickname']     = 'Nofkë';
 $labels['jobtitle']     = 'Pozicion';
 $labels['department']   = 'Degë';
 $labels['gender']       = 'Gjini';
-$labels['maidenname']   = 'Emri i Vajzërisë';
+$labels['maidenname']   = 'Emër në Vajzëri';
 $labels['email']        = 'Email';
 $labels['phone']        = 'Telefon';
 $labels['address']      = 'Adresë';
@@ -321,13 +344,13 @@ $labels['advanced'] = 'I thelluar';
 $labels['other'] = 'Tjetër';
 $labels['printcontact'] = 'Shtype kontaktin';
 $labels['qrcode'] = 'Kod QR';
-$labels['typehome']   = 'E shtëpisë';
-$labels['typework']   = 'E punës';
+$labels['typehome']   = 'Shtëpie';
+$labels['typework']   = 'Pune';
 $labels['typeother']  = 'Tjetër';
 $labels['typemobile']  = 'Celular';
 $labels['typemain']  = 'Kryesore';
-$labels['typehomefax']  = 'Faks i shtëpisë';
-$labels['typeworkfax']  = 'Faks i punës';
+$labels['typehomefax']  = 'Faks Shtëpie';
+$labels['typeworkfax']  = 'Faks Pune';
 $labels['typecar']  = 'Automjet';
 $labels['typepager']  = 'Faques';
 $labels['typevideo']  = 'Video';
@@ -342,11 +365,15 @@ $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Veti kontaktesh';
 $labels['contactnameandorg'] = 'Emër dhe Ent';
 $labels['personalinfo'] = 'Të dhëna personale';
+$labels['personal'] = 'Personale';
 $labels['contactphoto'] = 'Foto kontakti';
 $labels['edit']   = 'Përpunoni';
 $labels['cancel'] = 'Anuloje';
 $labels['save']   = 'Ruaje';
 $labels['delete'] = 'Fshije';
+$labels['discard'] = 'Hidhe tej';
+$labels['continue'] = 'Vazhdo';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Riemërtojeni';
 $labels['addphoto'] = 'Shtoni';
 $labels['replacephoto'] = 'Zëvendësoje';
@@ -355,7 +382,7 @@ $labels['newcontact']     = 'Krijoni kontakt të ri';
 $labels['deletecontact']  = 'Fshiji kontaktet e përzgjedhur';
 $labels['composeto']      = 'Hartoni email për';
 $labels['contactsfromto'] = 'Kontaktet nga $from deri në $to nga $count gjithsej';
-$labels['print']          = 'Shtyp';
+$labels['print']          = 'Shtype';
 $labels['export']         = 'Eksporto';
 $labels['exportall']      = 'Eksportoji krejt';
 $labels['exportsel']      = 'Eksporto të përzgjedhurat';
@@ -378,13 +405,13 @@ $labels['searchsave'] = 'Ruaje kërkimin';
 $labels['searchdelete'] = 'Fshije kërkimin';
 $labels['import'] = 'Importo';
 $labels['importcontacts'] = 'Importo kontaktet';
-$labels['importfromfile'] = 'Importo prej skedari:';
+$labels['importfromfile'] = 'Importo prej kartele:';
 $labels['importtarget'] = 'Shtoni kontakte te';
 $labels['importreplace'] = 'Zëvendëso krejt librin e adresave';
 $labels['importgroups'] = 'Importo përshoqërime grupi';
 $labels['importgroupsall'] = 'Krejt (krijo grupe, në u dashtë)';
 $labels['importgroupsexisting'] = 'Vetëm për grupe ekzistues';
-$labels['importdesc'] = 'Mund të ngarkoni kontakte nga një libër ekzistues adresash.<br/>Hëpërhë mbulojmë adresa nga forma të dhënash <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ose CSV (ndarë me presje).';
+$labels['importdesc'] = 'Mund të ngarkoni kontakte nga një libër ekzistues adresash.<br/>Hëpërhë mbulojmë adresa nga format të dhënash <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ose CSV (ndarë me presje).';
 $labels['done'] = 'U bë';
 $labels['settingsfor'] = 'Rregullime për';
 $labels['about'] = 'Rreth';
@@ -406,24 +433,24 @@ $labels['prettydate'] = 'Data të hijshme';
 $labels['setdefault']  = 'Caktoje si parazgjedhje';
 $labels['autodetect']  = 'Auto';
 $labels['language']  = 'Gjuhë';
-$labels['timezone']  = 'Brezi orar';
+$labels['timezone']  = 'Brez orar';
 $labels['pagesize']  = 'Rreshta për faqe';
 $labels['signature'] = 'Nënshkrim';
 $labels['dstactive']  = 'Ndryshim ore';
 $labels['showinextwin'] = 'Hape mesazhin në dritare të re';
-$labels['composeextwin'] = 'Hartoni mesazh në dritare të re';
-$labels['htmleditor'] = 'Hartoni mesazhe HTML';
+$labels['composeextwin'] = 'Për hartim mesazhesh hap dritare të re';
+$labels['htmleditor'] = 'Harto mesazhe HTML';
 $labels['htmlonreply'] = 'kur i përgjigjeni mesazheve HTML';
 $labels['htmlonreplyandforward'] = 'kur i përgjigjeni ose përcillni mesazh HTML';
 $labels['htmlsignature'] = 'Nënshkrimi HTML';
 $labels['showemail'] = 'Adresën email shfaqe me emrin për në ekran';
 $labels['previewpane'] = 'Shfaq panel paraparjeje';
 $labels['skin'] = 'Temë grafike për ndërfaqen';
-$labels['logoutclear'] = 'Gjatë daljes pastroji Hedhurinat';
-$labels['logoutcompact'] = 'Ngjeshi të marrët në dalje e sipër';
-$labels['uisettings'] = 'Ndërfaqe përdoruesi';
+$labels['logoutclear'] = 'Pastroji Hedhurinat gjatë daljes';
+$labels['logoutcompact'] = 'Ngjeshi Të marrët në dalje e sipër';
+$labels['uisettings'] = 'Ndërfaqe Përdoruesi';
 $labels['serversettings'] = 'Rregullime Shërbyesi';
-$labels['mailboxview'] = 'Me Të marrët të Shfaqur';
+$labels['mailboxview'] = 'Shfaqje e Kutisë Postare';
 $labels['mdnrequests'] = 'Kur kërkohet dëftesë kthimi';
 $labels['askuser'] = 'pyetmë';
 $labels['autosend'] = 'dërgo dëftesë';
@@ -436,17 +463,18 @@ $labels['skipdeleted'] = 'Mos shfaq mesazhe të fshirë';
 $labels['deletealways'] = 'Nëse shpënia te Hedhurinat dështon, fshiji';
 $labels['deletejunk'] = 'Mesazhet te Të pavlerat fshiji drejtpërsëdrejti';
 $labels['showremoteimages'] = 'Shfaqi figurat e largëta të trupëzuara në mesazh';
+$labels['allowremoteresources'] = 'Lejo burime të largëta (figura, stile)';
 $labels['fromknownsenders'] = 'prej dërguesish të njohur';
 $labels['always'] = 'përherë';
 $labels['alwaysbutplain'] = 'përherë, hiq rastin kur i përgjigjem teksti të thjeshtë';
 $labels['showinlineimages'] = 'Figurat e bashkëngjitura shfaqi nën mesazh';
 $labels['autosavedraft']  = 'Ruaje automatikisht si skicë';
-$labels['everynminutes']  = 'çdo $n minute(s)';
+$labels['everynminutes']  = 'çdo $n minutë(a)';
 $labels['refreshinterval']  = 'Rifreskoje (kontrollo për mesazhe të rinj, etj)';
 $labels['never']  = 'kurrë';
 $labels['immediately']  = 'menjëherë';
-$labels['messagesdisplaying'] = 'Po shfaqen Mesazhe';
-$labels['messagescomposition'] = 'Po hartohen Mesazhe';
+$labels['messagesdisplaying'] = 'Shfaqje Mesazhesh';
+$labels['messagescomposition'] = 'Hartim Mesazhesh';
 $labels['mimeparamfolding'] = 'Emra bashkëngjitjesh';
 $labels['2231folding'] = 'RFC 2231 i Plotë (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
@@ -466,8 +494,9 @@ $labels['maintenance'] = 'Mirëmbajtje';
 $labels['newmessage'] = 'Mesazh i Ri';
 $labels['signatureoptions'] = 'Mundësi Nënshkrimesh';
 $labels['whenreplying'] = 'Kur përgjigjem';
-$labels['replyempty'] = 'Mos e cito mesazhin origjinal';
+$labels['replyempty'] = 'mos e cito mesazhin origjinal';
 $labels['replytopposting'] = 'filloje mesazhin e ri sipër citimit';
+$labels['replytoppostingnoindent'] = 'nise mesazhin e ri sipër citimit (pa shmangie)';
 $labels['replybottomposting'] = 'filloje mesazhin e ri poshtë citimit';
 $labels['replyremovesignature'] = 'Kur përgjigjem, hiqe prej mesazhit nënshkrimin origjinal';
 $labels['autoaddsignature'] = 'Nënshkrimin shtoje vetvetiu';
@@ -475,7 +504,8 @@ $labels['newmessageonly'] = 'vetëm për mesazh të ri';
 $labels['replyandforwardonly'] = 'vetëm për përgjigje dhe përcjellje';
 $labels['insertsignature'] = 'Fut nënshkrim';
 $labels['sigbelow'] = 'Nënshkrimin vendose nën mesazhin e cituar';
-$labels['sigseparator'] = 'Në nënshkrime përdor detyrimisht ndarës standardë';
+$labels['sigseparator'] = 'Në nënshkrime përdor detyrimisht ndarës standard';
+$labels['automarkread']  = 'Vëru shenjë mesazheve si të lexuar';
 $labels['afternseconds']  = 'pas $n sekondash';
 $labels['reqmdn'] = 'Kërko përherë dëftesë kthimi';
 $labels['reqdsn'] = 'Kërko përherë njoftim mbi gjendje dërgimi';
@@ -487,22 +517,24 @@ $labels['spellcheckbeforesend'] = 'Kontrollo drejtshkrimin para dërgimit të nj
 $labels['spellcheckoptions'] = 'Mundësi Kontrolli Drejtshkrimi';
 $labels['spellcheckignoresyms'] = 'Shpërfilli fjalët me simbole';
 $labels['spellcheckignorenums'] = 'Shpërfilli fjalët me numra';
-$labels['spellcheckignorecaps'] = 'Shpërfilli fjalët me të tëra shkronjat me të madhe';
+$labels['spellcheckignorecaps'] = 'Shpërfilli fjalët me krejt shkronjat me të madhe';
 $labels['addtodict'] = 'Shtoje në fjalor';
+$labels['mailtoprotohandler'] = 'Regjistro trajtues protokolli për lidhje mailto:';
 $labels['standardwindows'] = 'Flluskat trajtoji si dritare standarde';
 $labels['forwardmode'] = 'Përcjellje mesazhesh';
 $labels['inline'] = 'brendazi';
 $labels['asattachment'] = 'si bashkëngjitje';
 $labels['replyallmode'] = 'Veprim parazgjedhje për butonin [Përgjigju krejt]';
-$labels['replyalldefault'] = 'përgjigju krejt';
+$labels['replyalldefault'] = 'përgjigju të tërëve';
 $labels['replyalllist'] = 'përgjigju vetëm te listë postimesh (nëse gjendet e tillë)';
 $labels['folder'] = 'Dosje';
 $labels['folders'] = 'Dosje';
 $labels['foldername'] = 'Emër dosjeje';
+$labels['subscribed'] = 'Regjistruar';
 $labels['messagecount'] = 'Mesazhe';
 $labels['create'] = 'Krijoje';
 $labels['createfolder'] = 'Krijo dosje të re';
-$labels['managefolders'] = 'Sistemo dosje';
+$labels['managefolders'] = 'Administroni dosje';
 $labels['specialfolders'] = 'Dosje Speciale';
 $labels['properties'] = 'Veti';
 $labels['folderproperties'] = 'Veti dosjeje';
@@ -516,9 +548,14 @@ $labels['personalfolder'] = 'Dosje Private';
 $labels['otherfolder'] = 'Dosje Përdoruesi Tjetër';
 $labels['sharedfolder'] = 'Dosje Publike';
 $labels['findfolders'] = 'Gjeni dosje';
+$labels['findcontacts'] = 'Gjej kontakte';
+$labels['findmail'] = 'Gjej mesazhe poste';
 $labels['namespace.personal'] = 'Personale';
 $labels['namespace.other'] = 'Përdorues të tjerë';
 $labels['namespace.shared'] = 'E përbashkët';
+$labels['dualuselabel'] = 'Mund të përmbajë vetëm';
+$labels['dualusemail'] = 'mesazhe';
+$labels['dualusefolder'] = 'dosje';
 $labels['sortby'] = 'Renditi sipas';
 $labels['sortasc']  = 'Në rend rritës';
 $labels['sortdesc'] = 'Në rend zbritës';
@@ -529,6 +566,13 @@ $labels['version'] = 'Version';
 $labels['source'] = 'Burim';
 $labels['license'] = 'Licencë';
 $labels['support'] = 'Merrni asistencë';
+$labels['savedsearches'] = 'Kërkime të ruajtura';
+$labels['dateformatY'] = 'YYYY';
+$labels['dateformaty'] = 'YY';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -545,7 +589,7 @@ $labels['greek'] = 'Greke';
 $labels['hebrew'] = 'Hebraike';
 $labels['turkish'] = 'Turke';
 $labels['nordic'] = 'Nordike';
-$labels['thai'] = 'Tajlandishte';
+$labels['thai'] = 'Tajlandeze';
 $labels['celtic'] = 'Celtike';
 $labels['vietnamese'] = 'Vietnameze';
 $labels['japanese'] = 'Japoneze';
@@ -580,7 +624,9 @@ $labels['arialabelmarkmessagesas'] = 'Mesazheve të përzgjedhur vëru shenjë s
 $labels['arialabelcomposeoptions'] = 'Mundësi hartimi';
 $labels['arialabelresponsesmenu'] = 'Menu përgjigjesh të parapërgatitura';
 $labels['arialabelattachmentuploadform'] = 'Formular ngarkimi bashkëngjitjesh';
-$labels['arialabelattachmentpreview'] = 'Paraparje bashkëngjitjes';
+$labels['arialabelattachmentmenu'] = 'Mundësi bashkëngjitjesh';
+$labels['arialabelmailtomenu'] = 'Mundësi adresash email';
+$labels['arialabelattachmentpreview'] = 'Paraparje bashkëngjitjesh';
 $labels['ariasummarycomposecontacts'] = 'Listë kontaktesh dhe grupesh për t’u përzgjedhur si marrës';
 $labels['arialabelcontactexportoptions'] = 'Mundësi eksportimi kontaktesh';
 $labels['arialabelabookgroupoptions'] = 'Mundësi libri adresash/grupi';
@@ -588,8 +634,10 @@ $labels['arialabelpreferencesform'] = 'Formular parapëlqimesh';
 $labels['arialabelidentityeditfrom'] = 'Formular përpunimi identitetesh';
 $labels['arialabelresonseeditfrom'] = 'Formular përpunimi përgjigjesh';
 $labels['arialabelsearchterms'] = 'Terma kërkimi';
+$labels['arialabeldropactionmenu'] = 'Menu veprimi Merr-dhe-Vër';
+$labels['arialabelheadersmenu'] = 'Menu shtimi marrësi (krye)';
 $labels['helplistnavigation'] = 'Lëvizje me tastierë në lista';
-$labels['helplistkeyboardnavigation'] = "Shigjeta sipër/poshtë: Zhvendosni fokusin/përzgjedhje në rreshta.
+$labels['helplistkeyboardnavigation'] = "Shigjeta sipër/poshtë: Zhvendosni fokusin/përzgjedhjen në rreshta.
 Space: Përzgjidhni rreshtin që ka fokusin.
 Shift + up/down: Përzgjidhni rreshta shtesë sipër/poshtë.
 Ctrl + Space: Shtojeni rreshtin që ka fokusin te përzgjedhja/heqja nga përzgjedhja.";
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index 8636c3dbd..438f63119 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -39,9 +39,9 @@ $messages['mailboxempty'] = 'Kutia postare është e zbrazët';
 $messages['nomessages'] = 'S’ka mesazhe';
 $messages['refreshing'] = 'Po rifreskohet…';
 $messages['loading'] = 'Po ngarkohet...';
-$messages['uploading'] = 'Po ngarkohet skedar…';
-$messages['attaching'] = 'Po bashkëngjitet skedar…';
-$messages['uploadingmany'] = 'Po ngarkohen skedarë…';
+$messages['uploading'] = 'Po ngarkohet kartelë…';
+$messages['attaching'] = 'Po bashkëngjitet kartelë…';
+$messages['uploadingmany'] = 'Po ngarkohen kartela…';
 $messages['loadingdata'] = 'Po ngarkohen të dhëna...';
 $messages['checkingmail'] = 'Po kontrollohet për mesazhe të rinj...';
 $messages['sendingmessage'] = 'Po dërgohet mesazhi...';
@@ -51,10 +51,12 @@ $messages['messagesaved'] = 'Mesazhi u ruajt te Skicat.';
 $messages['successfullysaved'] = 'U ruajt me sukses.';
 $messages['savingresponse'] = 'Po ruhet tekst përgjigjeje…';
 $messages['deleteresponseconfirm'] = 'Doni vërtet të fshihet ky tekst përgjigjeje?';
+$messages['nocontactselected'] = 'S’keni përzgjedhur ende ndonjë kontakt.';
 $messages['addedsuccessfully'] = 'Kontakti u shtua me sukses në librin e adresave.';
 $messages['contactexists'] = 'Ka tashmë një kontakt me të njëjtën adresë email.';
 $messages['contactnameexists'] = 'Ka tashmë një kontakt me të njëjtin emër.';
 $messages['blockedimages'] = 'Që të mbrohet privatësia juaj, figurat e largëta të këtij mesazhi janë bllokuar.';
+$messages['blockedresources'] = 'Për mbrojtjen e privatësisë tuaj janë bllokuar burime të largët.';
 $messages['encryptedmessage'] = 'Ky është një mesazh i fshehtëzuar dhe s’mund të shfaqet. Na ndjeni!';
 $messages['externalmessagedecryption'] = 'Ky është një mesazh i fshehtëzuar dhe mund të shfshehtëzohet me zgjerimin e shfletuesit tuaj.';
 $messages['nopubkeyfor'] = 'S’u gjet kyç i vlefshëm publik për $email';
@@ -75,6 +77,8 @@ $messages['errormoving'] = 'S’u lëviz dot mesazhi(et).';
 $messages['errorcopying'] = 'S’u kopjua dot mesazhi(et).';
 $messages['errordeleting'] = 'S’u fshi dot mesazhi(et).';
 $messages['errormarking'] = 'S’iu vu dot shenjë mesazhit(eve).';
+$messages['alerttitle'] = 'Kujdes';
+$messages['confirmationtitle'] = 'Jeni i sigurt se…';
 $messages['deletecontactconfirm']  = 'Doni vërtet të fshihet kontakti(et) i përzgjedhur?';
 $messages['deletegroupconfirm']  = 'Doni vërtet të fshihet grupi i përzgjedhur?';
 $messages['deletemessagesconfirm'] = 'Doni vërtet të fshihet mesazhi(et) i përzgjedhur?';
@@ -91,6 +95,7 @@ $messages['noemailwarning'] = 'Ju lutemi, jepni një adresë email të vlefshme.
 $messages['nonamewarning']  = 'Ju lutemi, jepni një emër.';
 $messages['nopagesizewarning'] = 'Ju lutemi, jepni një madhësi faqeje.';
 $messages['nosenderwarning'] = 'Ju lutemi, jepni adresë email të dërguesit.';
+$messages['recipientsadded'] = 'Marrësi(at) u shtuan me sukses.';
 $messages['norecipientwarning'] = 'Ju lutemi, jepni të paktën një marrës.';
 $messages['disclosedrecipwarning'] = 'Krejt pjesëmarrësit do të shohin adresat email të njëri-tjetrit.';
 $messages['disclosedreciptitle'] = 'Shumë pjesëmarrës publikë';
@@ -99,7 +104,6 @@ $messages['nosubjecttitle']  = 'S’ka subjekt';
 $messages['nobodywarning'] = 'Të dërgohet mesazhi pa tekst?';
 $messages['notsentwarning'] = 'Mesazhi s’është dërguar dhe ka ndryshime të paruajtura. Doni të hidhen tej ndryshimet tuaja?';
 $messages['restoresavedcomposedata'] = 'U gjet një mesazh i hartuar më parë, por i padërguar.\n\nSubjekt: $subject\nRuajtur më: $date\n\nDoni të rimerret ky mesazh?';
-$messages['noldapserver'] = 'Ju lutemi, jepni një shërbyes ldap ku të kërkohet.';
 $messages['nosearchname'] = 'Ju lutemi, jepni emër kontakti ose adresë email.';
 $messages['notuploadedwarning'] = 'S’janë ngarkuar ende krejt bashkëngjitjet. Ju lutemi, prisni ose anulojeni ngarkimin.';
 $messages['searchsuccessful'] = 'U gjetën $nr mesazhe.';
@@ -117,9 +121,9 @@ $messages['folderexpunged'] = 'Dosja u ngjesh me sukses.';
 $messages['deletedsuccessfully'] = 'U fshi me sukses.';
 $messages['converting'] = 'Po i hiqet formatimi…';
 $messages['messageopenerror'] = 'S’u ngarkuan dot mesazhe që nga shërbyesi.';
-$messages['filelinkerror'] = 'Dështoi bashkëngjitja e skedarit.';
-$messages['fileuploaderror'] = 'Dështoi ngarkimi i skedarit.';
-$messages['filesizeerror'] = 'Skedari i ngarkuar e tejkalon madhësinë maksimum prej $size.';
+$messages['filelinkerror'] = 'Dështoi bashkëngjitja e kartelës.';
+$messages['fileuploaderror'] = 'Dështoi ngarkimi i kartelës.';
+$messages['filesizeerror'] = 'Kartela e ngarkuar e tejkalon madhësinë maksimum prej $size.';
 $messages['filecounterror'] = 'Mund të ngarkoni e shumta $count kartela njëherësh.';
 $messages['msgsizeerror'] = 'Dështoi bashkëngjitja e një kartele. Tejkalohej madhësi maksimum e një mesazhi ($size).';
 $messages['copysuccess'] = 'U kopjuan me sukses $nr kontakte.';
@@ -141,17 +145,17 @@ $messages['errorsendingreceipt'] = 'S’u dërgua dot dëftesa.';
 $messages['deleteidentityconfirm'] = 'Doni vërtet të fshihet ky identitet?';
 $messages['nodeletelastidentity'] = 'Këtë identitet s’mund ta fshini, është i fundit i juaji.';
 $messages['forbiddencharacter'] = 'Emri i dosjes përmban një shenjë të ndaluar.';
-$messages['selectimportfile'] = 'Ju lutemi, përzgjidhni skedar për ngarkim.';
+$messages['selectimportfile'] = 'Ju lutemi, përzgjidhni kartelë për ngarkim.';
 $messages['addresswriterror'] = 'Libri i adresave i përzgjedhur s’është i shkrueshëm.';
 $messages['contactaddedtogroup'] = 'Kontaktet u shtuan me sukses te ky grup.';
 $messages['contactremovedfromgroup'] = 'Kontaktet u hoqën me sukses nga ky grup.';
 $messages['nogroupassignmentschanged'] = 'S’pati ndryshime në përshoqërime grupi.';
 $messages['importwait'] = 'Po importohet, ju lutemi, prisni…';
-$messages['importformaterror'] = 'Importimi dështoi! Skedari i ngarkuar s’është skedar i vlefshëm të dhënash importimi.';
+$messages['importformaterror'] = 'Importimi dështoi! Kartela e ngarkuar s’është kartelë e vlefshme të dhënash importimi.';
 $messages['importconfirm'] = '<b>U importuan me sukses $inserted kontakte</b>';
 $messages['importconfirmskipped'] = '<b>U anashkaluan $skipped zëra ekzistues</b>';
 $messages['importmessagesuccess'] = 'U importuan me sukses $nr mesazhe';
-$messages['importmessageerror'] = 'Importimi dështoi! Skedari i ngarkuar s’është skedar  i vlefshëm mesazhi apo kutie postare';
+$messages['importmessageerror'] = 'Importimi dështoi! Kartela e ngarkuar s’është kartelë e vlefshme mesazhi apo kutie postare';
 $messages['opnotpermitted'] = 'Operacion i palejuar!';
 $messages['nofromaddress'] = 'Në identitetin e përzgjedhur mungon adresë email.';
 $messages['editorwarning'] = 'Këmbimi i llojit të përpunuesit mund të shkaktojë humbjen e formatimit të tekstit. Doni të vazhdohet?';
@@ -161,6 +165,8 @@ $messages['smtpautherror'] = 'Gabim SMTP ($code): Mirëfilltësimi dështoi.';
 $messages['smtpfromerror'] = 'Gabim SMTP ($code): Dështoi rregullimi i dërguesit "$from" ($msg).';
 $messages['smtptoerror'] = 'Gabim SMTP ($code): Dështoi shtimi i marrësit "$to" ($msg).';
 $messages['smtprecipientserror'] = 'Gabim SMTP: S’arrihet të përtypet lista e marrësve.';
+$messages['smtputf8error'] = 'Gabim SMTP: Shërbyesi nuk mbulon kodim unikod në adresa email.';
+$messages['smtpsizeerror'] = 'Gabim SMTP: Madhësia e mesazhit e tejkalon kufirin e shërbyesit ($limit)';
 $messages['smtperror'] = 'Gabim SMTP: $msg';
 $messages['emailformaterror'] = 'Adresë email e pavlefshme: $email';
 $messages['toomanyrecipients'] = 'Shumë marrës. Zvogëloni numrin e marrësve deri në $max.';
@@ -193,10 +199,10 @@ $messages['invalidimageformat'] = 'Format i pavlefshëm figure.';
 $messages['mispellingsfound'] = 'U pikasën gabime drejtshkrimi te mesazhi.';
 $messages['parentnotwritable'] = 'S’arrihet të krijohet/lëvizet dosje te dosja mëmë e përzgjedhur. Pa të drejta hyrjeje.';
 $messages['messagetoobig'] = 'Pjesa e mesazhit është shumë e madhe për ta përpunuar.';
-$messages['attachmentvalidationerror'] = 'KUJDES! Kjo bashkëngjitje është e dyshimtë, ngaqë lloji i saj s’përputhet me llojin e deklaruar në mesazh. Nëse s’i zini besë dërguesit, nuk do të duhej ta hapnit atë që nga shfletuesi, meqë mund të përmbajë lëndë dashakeqe.<br/><br/><em>Pritej: $expected; u gjet: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Kjo bashkëngjite është e dyshimtë, ngaqë nuk përputhet me llojin e deklaruar në mesazh. Nëse nuk e besoni dërguesin, s’duhet ta hapni në shfletues, ngaqë mund të përmbajë lëndë dashakeqe.<br/><br/><em>Pritej: $expected; u gjet: $detected</em>';
 $messages['noscriptwarning'] = 'Kujdes: Ky shërbyes webmail lyp Javascript! Që të mund ta përdorni, ju lutemi, aktivizoni Javascript-in te rregullimet e shfletuesit tuaj.';
 $messages['messageissent'] = 'Mesazhi qe dërguar tashmë, por s’qe ruajtur ende. Doni ta ruani tani?';
-$messages['errnotfound'] = 'Skedar Që S’gjendet';
+$messages['errnotfound'] = 'Kartelë Që S’gjendet';
 $messages['errnotfoundexplain'] = 'Burimi i kërkuar nuk u gjet!';
 $messages['errfailedrequest'] = 'Kërkesë e dështuar';
 $messages['errauthorizationfailed'] = 'Mirëfilltësimi Dështoi';
@@ -208,3 +214,4 @@ $messages['clicktoresumesession'] = 'Klikoni këtu që të të rimerret sesioni
 $messages['errcomposesession'] = 'Gabim sesioni hartimi';
 $messages['errcomposesessionexplain'] = 'S’u gjet sesioni i kërkuar i hartimit.';
 $messages['clicktocompose'] = 'Klikoni këtu që të hartoni një mesazh të ri';
+$messages['nosupporterror'] = 'Kjo veçori nuk mbulohet nga shfletuesi juaj.';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index bc6e63f8e..3bfc50d75 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -340,6 +340,7 @@ $labels['contacts'] = 'Конакти';
 $labels['contactproperties'] = 'Својства контакта';
 $labels['contactnameandorg'] = 'Име и организација';
 $labels['personalinfo'] = 'Лични подаци';
+$labels['personal'] = 'Лично';
 $labels['contactphoto'] = 'Фоографија контакта';
 $labels['edit']   = 'Измени';
 $labels['cancel'] = 'Одустани';
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 9436b300d..22f6d1498 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Нема теме';
 $messages['nobodywarning'] = 'Да ли желите да пошаљете поруку без текста?';
 $messages['notsentwarning'] = 'Порука није послата и има несачуване измене. Желите ли да одбаците измене?';
 $messages['restoresavedcomposedata'] = 'Нађена је порука претходно састављена али није послата.\n\nПредмет: $subject\nСачувана: $date\n\nЖелите ли да вратите ову поруку?';
-$messages['noldapserver'] = 'Унесите ЛДАП сервер за претрагу';
 $messages['nosearchname'] = 'Унесите име контакта или е-адресу.';
 $messages['notuploadedwarning'] = 'Нису сви прилози отпремљени. Сачекајте или откажите отпремање.';
 $messages['searchsuccessful'] = 'Пронађених порука: $nr';
@@ -193,7 +192,6 @@ $messages['invalidimageformat'] = 'Није исправан формат сли
 $messages['mispellingsfound'] = 'Уочене су правописне грешке у поруци.';
 $messages['parentnotwritable'] = 'Не могу да направим/преместим фасциклу у изабрану фасциклу. Нема дозволе приступа.';
 $messages['messagetoobig'] = 'Део са поруком је превелик за обраду.';
-$messages['attachmentvalidationerror'] = 'УПОЗОРЕЊЕ! Овај прилог је сумњив зато што се његов тип не поклапа са типом објављеним у поруци. Уколико немате поверења у пошиљаоца, не отварајте је у прегледачу зато што може садржати злонамерни садржај.<br/><br/><em>Очекивао: $expected; нашао: $detected</em>';
 $messages['noscriptwarning'] = 'Упозорење: ова поштанска услуга захтева Јава скрипт! Да бисте је користили, укључите Јава скрипт у поставкама вашег прегледача.';
 $messages['messageissent'] = 'Порука је већ послата али није још сачувана. Желите ли да је сачувате сада?';
 $messages['errnotfound'] = 'Фајл није нађен';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 8ae23441a..541a454b5 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Alla kataloger';
 $labels['more']             = 'Fler';
 $labels['back']             = 'Tillbaka';
 $labels['options']          = 'Alternativ';
+$labels['composeoptions']   = 'Skapandeinställningar';
+$labels['optionsandattachments'] = 'Alternativ och bilagor';
+$labels['actions']          = 'Funktioner';
 $labels['first'] = 'Första';
 $labels['last'] = 'Sista';
 $labels['previous'] = 'Föregående';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Kolumner';
 $labels['listsorting'] = 'Sortering';
 $labels['listorder'] = 'Ordning';
 $labels['listmode'] = 'Visningsläge';
+$labels['lmode'] = 'Listläge';
 $labels['layout'] = 'Layout';
 $labels['layoutwidescreen'] = 'Bredbild';
 $labels['layoutdesktop'] = 'Skrivbord';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Gräns';
 $labels['quotaused'] = 'Utnyttjad';
 $labels['quotastorage'] = 'Storlek';
 $labels['quotamessage'] = 'Antal meddelanden';
+$labels['shortheaderdate'] = 'På $date';
+$labels['shortheaderto'] = 'Till $to på $date';
+$labels['shortheaderfrom'] = 'Från $from på $date';
 $labels['quicksearch']  = 'Snabbsök';
 $labels['searchplaceholder']  = 'Sök...';
 $labels['resetsearch']  = 'Återställ sökning';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Bitar';
 $labels['keyexpired']     = 'Utgången';
 $labels['keyrevoked']     = 'Upphävd';
 $labels['bccinstead']     = 'Använd Dold kopia';
+$labels['addheader']      = 'Lägg till mottagare (meddelandeinfo)';
 $labels['editidents']    = 'Ändra identiteter';
 $labels['spellcheck']    = 'Rättstava';
 $labels['checkspelling'] = 'Kontrollera stavning';
@@ -283,8 +291,10 @@ $labels['alwaysshow'] = 'Visa alltid bilder från $sender';
 $labels['alwaysallow'] = 'Tillåt alltid från $sender';
 $labels['isdraft']    = 'Detta meddelande är ett utkast.';
 $labels['andnmore']   = '$nr fler...';
-$labels['togglemoreheaders'] = 'Växla ytterligare meddelandeinformation';
-$labels['togglefullheaders'] = 'Växla teknisk meddelandeinformation';
+$labels['headers']    = 'Meddelandeinfo';
+$labels['envelope']   = 'Konvolut';
+$labels['togglemoreheaders'] = 'Växla ytterligare meddelandeinfo';
+$labels['togglefullheaders'] = 'Växla teknisk meddelandeinfo';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text';
 $labels['savesentmessagein'] = 'Spara kopia i';
@@ -356,11 +366,15 @@ $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaper';
 $labels['contactnameandorg'] = 'Namn och organisation';
 $labels['personalinfo'] = 'Personlig information';
+$labels['personal'] = 'Personliga';
 $labels['contactphoto'] = 'Kontaktfoto';
 $labels['edit']   = 'Redigera';
 $labels['cancel'] = 'Avbryt';
 $labels['save']   = 'Spara';
 $labels['delete'] = 'Ta bort';
+$labels['discard'] = 'Förkasta';
+$labels['continue'] = 'Fortsätt';
+$labels['ok'] = 'OK';
 $labels['rename'] = 'Ändra namn';
 $labels['addphoto'] = 'Lägg till';
 $labels['replacephoto'] = 'Ersätt';
@@ -555,6 +569,12 @@ $labels['source'] = 'Källkod';
 $labels['license'] = 'Licens';
 $labels['support'] = 'Hjälp';
 $labels['savedsearches'] = 'Sparade sökningar';
+$labels['dateformatY'] = 'ÅÅÅÅ';
+$labels['dateformaty'] = 'ÅÅ';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -601,7 +621,7 @@ $labels['arialabelmessagebody'] = 'Meddelandeinnehåll';
 $labels['arialabelmessageactions'] = 'Meddelandehantering';
 $labels['arialabelcontactquicksearch'] = 'Sökformulär för kontakter';
 $labels['arialabelcontactsearchbox'] = 'Kontaktsökfält';
-$labels['arialabelmessageheaders'] = 'Meddelandehuvuden';
+$labels['arialabelmessageheaders'] = 'Meddelandeinfo';
 $labels['arialabelforwardingoptions'] = 'Alternativ för vidareskickande';
 $labels['arialabelreplyalloptions'] = 'Alternativ för svara alla';
 $labels['arialabelmoremessageactions'] = 'Ytterligare meddelandehantering';
@@ -610,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'Skapandeinställningar';
 $labels['arialabelresponsesmenu'] = 'Responsmeny';
 $labels['arialabelattachmentuploadform'] = 'Uppladdningsformulär för bilaga';
 $labels['arialabelattachmentmenu'] = 'Alternativ för bilagor';
+$labels['arialabelmailtomenu'] = 'Adressalternativ';
 $labels['arialabelattachmentpreview'] = 'Förhandsvisning av bilaga';
 $labels['ariasummarycomposecontacts'] = 'Lista med kontakter och grupper att använda som mottagare';
 $labels['arialabelcontactexportoptions'] = 'Exportalternativ för kontakter';
@@ -619,6 +640,7 @@ $labels['arialabelidentityeditfrom'] = 'Ändringsformulär för identitet';
 $labels['arialabelresonseeditfrom'] = 'Ändringsformulär för respons';
 $labels['arialabelsearchterms'] = 'Sökord';
 $labels['arialabeldropactionmenu'] = 'Dra-och-släpp-hanteringsmeny';
+$labels['arialabelheadersmenu'] = 'Meny lägg till mottagare (meddelandeinfo)';
 $labels['helplistnavigation'] = 'Listnavigering';
 $labels['helplistkeyboardnavigation'] = "Piltangent upp/ner: Flytta radfokus/radmarkering.
 Mellanslag: Välj fokuserad rad.
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 6b4602c28..4f0a4f7c5 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -51,6 +51,7 @@ $messages['messagesaved'] = 'Meddelandet har sparats i Utkast';
 $messages['successfullysaved'] = 'Sparat.';
 $messages['savingresponse'] = 'Sparar responstext...';
 $messages['deleteresponseconfirm'] = 'Vill du verkligen ta bort denna responstext?';
+$messages['nocontactselected'] = 'Ingen kontakt är vald ännu.';
 $messages['addedsuccessfully'] = 'Kontakten har lagts till i adressboken.';
 $messages['contactexists'] = 'En kontakt med den här adressen finns redan.';
 $messages['contactnameexists'] = 'En kontakt med det här namnet finns redan.';
@@ -76,6 +77,8 @@ $messages['errormoving'] = 'Meddelandet kunde inte flyttas.';
 $messages['errorcopying'] = 'Meddelandet kunde inte kopieras.';
 $messages['errordeleting'] = 'Meddelandet kunde inte tas bort.';
 $messages['errormarking'] = 'Meddelandet kunde inte markeras.';
+$messages['alerttitle'] = 'Uppmärksamhet';
+$messages['confirmationtitle'] = 'Är du säker...';
 $messages['deletecontactconfirm']  = 'Vill du verkligen ta bort valda kontakter?';
 $messages['deletegroupconfirm']  = 'Vill du verkligen ta bort den valda gruppen?';
 $messages['deletemessagesconfirm'] = 'Vill du verkligen ta bort valda meddelanden?';
@@ -92,6 +95,7 @@ $messages['noemailwarning'] = 'Ange en giltig adress.';
 $messages['nonamewarning']  = 'Ange ett namn.';
 $messages['nopagesizewarning'] = 'Ange en sidstorlek.';
 $messages['nosenderwarning'] = 'Ange en avsändaradress.';
+$messages['recipientsadded'] = 'Mottagare tillagda.';
 $messages['norecipientwarning'] = 'Ange minst en mottagare.';
 $messages['disclosedrecipwarning'] = 'Alla mottagare kommer att kunna se varandras adresser. Undvik detta genom att ange adresserna i fältet Dold kopia istället.';
 $messages['disclosedreciptitle'] = 'Alltför många mottagaradresser';
@@ -100,7 +104,6 @@ $messages['nosubjecttitle']  = 'Inget ämne';
 $messages['nobodywarning'] = 'Skicka det här meddelandet utan text?';
 $messages['notsentwarning'] = 'Meddelandet har inte skickats ännu men har ändringar som inte är sparade. Vill du strunta i ändringarna?';
 $messages['restoresavedcomposedata'] = 'Ett tidigare skrivet men inte skickat meddelande upptäcktes.\n\nÄmne: $subject\nSparat: $date\n\nVill du återskapa meddelandet?';
-$messages['noldapserver'] = 'Ange en LDAP-server för att söka.';
 $messages['nosearchname'] = 'Ange ett kontaktnamn eller en adress.';
 $messages['notuploadedwarning'] = 'Alla bilagor har inte överförts ännu. Vänta eller avbryt överföringen.';
 $messages['searchsuccessful'] = '$nr meddelanden hittades.';
@@ -162,6 +165,8 @@ $messages['smtpautherror'] = 'SMTP-fel ($code): Inloggningen misslyckades.';
 $messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte sätta avsändaradress till "$from" ($msg).';
 $messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradress "$to" ($msg).';
 $messages['smtprecipientserror'] = 'SMTP-fel: Felaktigt formaterad lista med mottagaradresser.';
+$messages['smtputf8error'] = 'SMTP-fel: Mottagaradressen kan inte anges i unicode-format.';
+$messages['smtpsizeerror'] = 'SMTP-fel: Meddelandet är för stort ($limit).';
 $messages['smtperror'] = 'SMTP-fel: $msg';
 $messages['emailformaterror'] = 'Ogiltig adress: $email';
 $messages['toomanyrecipients'] = 'Förmånga mottagare. Minska antalet till högst $max.';
@@ -194,7 +199,7 @@ $messages['invalidimageformat'] = 'Ogiltigt bildfilsformat.';
 $messages['mispellingsfound'] = 'Stavfel hittades i meddelandet.';
 $messages['parentnotwritable'] = 'Katalogen kunde inte skapas eller flyttas. Åtkomsträttighet saknas.';
 $messages['messagetoobig'] = 'Meddelandet är alltför stort att behandla.';
-$messages['attachmentvalidationerror'] = 'VARNING! Bilagan misstänks vara av annan typ än vad som anges i meddelandet. Om du inte litar på avsändaren ska du inte öppna bilagan.<br/><br/><em>Angiven typ: $expected; funnen typ: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Den här bilagan är misstänkt eftersom dess typ inte överensstämmer med typen som anges i meddelandet. Om du inte litar på avsändaren ska du inte öppna bilagan i webbläsaren eftersom innehållet kan vara skadligt.<br/><br/><em>Förväntad: $expected; Funnen: $detected</em>';
 $messages['noscriptwarning'] = 'Varning: Denna webbmailtjänst fungerar inte utan Javascript! Aktivera Javascript i webbläsarens inställningar.';
 $messages['messageissent'] = 'Meddelandet är skickat men har inte sparats ännu. Vill du spara meddelandet nu?';
 $messages['errnotfound'] = 'Filen hittades inte';
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index afefe05c1..2039db60e 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -58,7 +58,6 @@ $messages['nopagesizewarning'] = 'தயவு செய்து தாழி�
 $messages['norecipientwarning'] = 'தயவு செய்து ஒரு பெறுனரையாவது எழுதுங்கள்';
 $messages['nosubjectwarning']  = 'தலைப்பு காலியாக உள்ளது. இப்போது எழுத விரும்புகிறீர்களா?';
 $messages['nobodywarning'] = 'உரையில்லாமல் இந்த செய்தியை அனுப்ப வேண்டுமா?';
-$messages['noldapserver'] = 'தயவு செய்து தேடுவதற்கு Idap சேவையகத்தை தேர்ந்தெடுங்கள்';
 $messages['nosearchname'] = 'தயவு செய்து தொடர்பின் பெயரோ மின்னஞ்சல் முகவரியோ எழுதுங்கள்';
 $messages['notuploadedwarning'] = 'எல்லா இணைப்புகளும் ஏற்றப்படவில்லை. தயவு செய்து காத்திருங்கள் அல்லது ஏற்றத்தை ரத்து செய்யுங்கள்.';
 $messages['searchsuccessful'] = '$nr செய்திகள் கண்டுபிடிக்கப்பட்டது';
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 8fbcce3a0..7f42029b8 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -59,7 +59,6 @@ $messages['nopagesizewarning'] = 'โปรดใส่จำนวนหน้�
 $messages['norecipientwarning'] = 'โปรดใส่ผู้รับอย่างน้อย 1 ชื่อ';
 $messages['nosubjectwarning']  = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
 $messages['nobodywarning'] = 'คุณต้องการส่งจดหมายโดยไม่มีข้อความใช่หรือไม่?';
-$messages['noldapserver'] = 'โปรดเลือก LDAP Server เพื่อค้นหา';
 $messages['nosearchname'] = 'โปรดใสชื่อหรืออีเมล์';
 $messages['searchsuccessful'] = 'พบจดหมายจำนวน $nr ฉบับ';
 $messages['searchnomatch'] = 'การค้นหาไม่พบ';
diff --git a/program/localization/ti/labels.inc b/program/localization/ti/labels.inc
index e23d0558b..79e127b5b 100644
--- a/program/localization/ti/labels.inc
+++ b/program/localization/ti/labels.inc
@@ -59,4 +59,12 @@ $labels['wednesday'] = 'ረቡዕ';
 $labels['thursday']  = 'ሓሙስ';
 $labels['friday']    = 'ዓርቢ ';
 $labels['saturday']  = 'ቀዳም';
+$labels['isread'] = 'ከንብብ';
+$labels['other'] = 'ካሊእ';
+$labels['typeother']  = 'ካሊእ';
+$labels['delete'] = 'ይጥፋእ';
+$labels['about'] = 'ብዛዕባ';
+$labels['folders'] = 'ማህዸራት';
+$labels['create'] = 'ይፈጠር';
+$labels['license'] = 'ፍቓድ';
 ?>
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 7b940d7f7..093749758 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -139,6 +139,9 @@ $labels['folders-all']      = 'Tüm Klasörler';
 $labels['more']             = 'Diğer';
 $labels['back']             = 'Geri';
 $labels['options']          = 'Ayarlar';
+$labels['composeoptions']   = 'İleti Oluşturma Ayarları';
+$labels['optionsandattachments'] = 'Ayarlar ve Ek Dosyalar';
+$labels['actions']          = 'İşlemler';
 $labels['first'] = 'İlk';
 $labels['last'] = 'Son';
 $labels['previous'] = 'Önceki';
@@ -180,6 +183,7 @@ $labels['listcolumns'] = 'Sütunları Listele';
 $labels['listsorting'] = 'Sıralama Sütunu';
 $labels['listorder'] = 'Sıralama Düzeni';
 $labels['listmode'] = 'Liste Görünümü';
+$labels['lmode'] = 'Liste Kipi';
 $labels['layout'] = 'Görünüm';
 $labels['layoutwidescreen'] = 'Geniş Ekran';
 $labels['layoutdesktop'] = 'Masaüstü';
@@ -199,6 +203,9 @@ $labels['quotatotal'] = 'Sınır';
 $labels['quotaused'] = 'Kullanılan';
 $labels['quotastorage'] = 'Disk Boyutu';
 $labels['quotamessage'] = 'İleti Sayısı';
+$labels['shortheaderdate'] = '$date tarihinde';
+$labels['shortheaderto'] = '$to alıcısına $date tarihinde';
+$labels['shortheaderfrom'] = '$from göndericisinden $date tarihinde';
 $labels['quicksearch']  = 'Hızlı Arama';
 $labels['searchplaceholder']  = 'Arama...';
 $labels['resetsearch']  = 'Aramayı Sıfırla';
@@ -246,6 +253,7 @@ $labels['keylength']      = 'Bit';
 $labels['keyexpired']     = 'Süre Doldu';
 $labels['keyrevoked']     = 'İptal Edilen';
 $labels['bccinstead']     = 'Gizli Kopya Kullanılsın';
+$labels['addheader']      = 'Alıcı Ekle (üst Bilgi)';
 $labels['editidents']    = 'Kimlikleri Düzenle';
 $labels['spellcheck']    = 'Yazım Denetimi';
 $labels['checkspelling'] = 'Yazımı Denetle';
@@ -283,6 +291,8 @@ $labels['alwaysshow'] = '$sender tarafından gönderilen görseller her zaman g�
 $labels['alwaysallow'] = '$sender tarafından gönderilen iletiler her zaman alınsın';
 $labels['isdraft']    = 'Bu ileti henüz taslak.';
 $labels['andnmore']   = '$nr daha...';
+$labels['headers']    = 'Üst Bilgiler';
+$labels['envelope']   = 'Zarf';
 $labels['togglemoreheaders'] = 'Daha fazla ileti başlığı görüntüle';
 $labels['togglefullheaders'] = 'İleti başlıklarını görüntüle/gizle';
 $labels['htmltoggle'] = 'HTML';
@@ -356,11 +366,15 @@ $labels['contacts'] = 'Kişiler';
 $labels['contactproperties'] = 'Kişi Bilgileri';
 $labels['contactnameandorg'] = 'Ad ve Kuruluş';
 $labels['personalinfo'] = 'Kişisel Bilgiler';
+$labels['personal'] = 'Kişisel';
 $labels['contactphoto'] = 'Fotoğraf';
 $labels['edit']   = 'Düzenle';
 $labels['cancel'] = 'İptal';
 $labels['save']   = 'Kaydet';
 $labels['delete'] = 'Sil';
+$labels['discard'] = 'Yoksay';
+$labels['continue'] = 'Devam et';
+$labels['ok'] = 'Tamam';
 $labels['rename'] = 'Yeniden Adlandır';
 $labels['addphoto'] = 'Ekle';
 $labels['replacephoto'] = 'Değiştir';
@@ -555,6 +569,12 @@ $labels['source'] = 'Kaynak';
 $labels['license'] = 'Lisans';
 $labels['support'] = 'Destek İsteyin';
 $labels['savedsearches'] = 'Kaydedilmiş aramalar';
+$labels['dateformatY'] = 'YYYY';
+$labels['dateformaty'] = 'YY';
+$labels['dateformatm'] = 'AA';
+$labels['dateformatd'] = 'GG';
+$labels['dateformatj'] = 'G';
+$labels['dateformatn'] = 'A';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -610,6 +630,7 @@ $labels['arialabelcomposeoptions'] = 'İleti Oluşturma Ayarları';
 $labels['arialabelresponsesmenu'] = 'Hazır Yanıtlar Menüsü';
 $labels['arialabelattachmentuploadform'] = 'Ek Dosya Yükleme Formu';
 $labels['arialabelattachmentmenu'] = 'Ek dosya ayarları';
+$labels['arialabelmailtomenu'] = 'E-posta Adres Ayarları';
 $labels['arialabelattachmentpreview'] = 'Ek Dosya Önizleme';
 $labels['ariasummarycomposecontacts'] = 'Kişileri ve grupları alıcı olarak seçmek için listeleme';
 $labels['arialabelcontactexportoptions'] = 'Kişi Dışa Aktarma Ayarları';
@@ -619,6 +640,7 @@ $labels['arialabelidentityeditfrom'] = 'Kimlik Düzenleme Formu';
 $labels['arialabelresonseeditfrom'] = 'Hazır Yanıt Düzenleme Formu';
 $labels['arialabelsearchterms'] = 'Arama İfadeleri';
 $labels['arialabeldropactionmenu'] = 'Sürükle Bırak işlem menüsü';
+$labels['arialabelheadersmenu'] = 'Alıcı (Üst Bilgi) Ekleme Menüsü';
 $labels['helplistnavigation'] = 'Tuştakımı ile gezinme listesi';
 $labels['helplistkeyboardnavigation'] = "Yukarı / Aşağı Oklar: Satırı odağa ya da seçime taşır.
 Boşluk: Odaklanılmış satırı seçer.
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index bdd8e3159..b2bc42575 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -51,6 +51,7 @@ $messages['messagesaved'] = 'İleti taslaklara kaydedildi.';
 $messages['successfullysaved'] = 'Kaydedildi';
 $messages['savingresponse'] = 'Yanıt metni kaydediliyor...';
 $messages['deleteresponseconfirm'] = 'Cevabı silmek istiyor musunuz?';
+$messages['nocontactselected'] = 'Henüz bir kişi seçmemişsiniz.';
 $messages['addedsuccessfully'] = 'Kişi adres defterine eklendi';
 $messages['contactexists'] = 'Bu e-posta adresi rehberde var.';
 $messages['contactnameexists'] = 'Rehberde aynı adlı biri zaten var.';
@@ -76,6 +77,8 @@ $messages['errormoving'] = 'İleti taşınamadı.';
 $messages['errorcopying'] = 'İleti kopyalanamadı.';
 $messages['errordeleting'] = 'İleti silinemedi';
 $messages['errormarking'] = 'İleti işaretlenemedi';
+$messages['alerttitle'] = 'Dikkat';
+$messages['confirmationtitle'] = 'Emin misiniz...';
 $messages['deletecontactconfirm']  = 'Seçilmiş kişileri silmek istediğinize emin misiniz?';
 $messages['deletegroupconfirm']  = 'Seçilmiş grupları silmek istediğinize emin misiniz?';
 $messages['deletemessagesconfirm'] = 'Seçilmiş iletileri silmek istediğinize emin misiniz?';
@@ -92,6 +95,7 @@ $messages['noemailwarning'] = 'Lütfen geçerli bir e-posta adresi yazın.';
 $messages['nonamewarning']  = 'Lütfen bir ad yazın.';
 $messages['nopagesizewarning'] = 'Lütfen bir sayfa boyutu yazın.';
 $messages['nosenderwarning'] = 'Göndericinin e-posta adresini yazın.';
+$messages['recipientsadded'] = 'Alıcı(lar) eklendi.';
 $messages['norecipientwarning'] = 'Lütfen en az bir alıcı belirtin';
 $messages['disclosedrecipwarning'] = 'Tüm alıcılar diğer alıcıların e-posta adreslerini görebilir. bu durumu engellemek ve gizliliği korumak için Gizli Kopya alanını kullanabilirsiniz.';
 $messages['disclosedreciptitle'] = 'Herkese açık alıcı sayısı çok fazla';
@@ -100,7 +104,6 @@ $messages['nosubjecttitle']  = 'Konu belirtilmemiş';
 $messages['nobodywarning'] = 'İleti boş olarak gönderilsin mi?';
 $messages['notsentwarning'] = 'İleti gönderilmedi ve yaptığınız değişiklikler kaydedilmedi. Değişiklikler silinsin mi?';
 $messages['restoresavedcomposedata'] = 'Daha önce oluşturulmuş ancak gönderilmemiş bir ileti bulundu.\n\nKonu: $subject\Kaydetme zamanı: $date\n\nBu iletiyi geri yüklemek istiyor musunuz?';
-$messages['noldapserver'] = 'Lütfen aranacak LDAP sunucusunu seçin.';
 $messages['nosearchname'] = 'Lütfen bir kişi adı ya da e-posta adresi yazın.';
 $messages['notuploadedwarning'] = 'Henüz tüm ek dosyaları yüklenmedi. Lütfen bekleyin ya da yüklemeyi iptal edin.';
 $messages['searchsuccessful'] = '$nr ileti bulundu';
@@ -162,6 +165,8 @@ $messages['smtpautherror'] = 'SMTP Sorunu ($code): Kimlik doğrulanamadı.';
 $messages['smtpfromerror'] = 'SMTP Sorunu ($code): Gönderen adresi "$from" olarak ayarlanamadı ($msg)';
 $messages['smtptoerror'] = 'SMTP Sorunu ($code): "$to" alıcısı eklenemedi ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Sorunu: Alıcı listesi ayrıştırılamadı';
+$messages['smtputf8error'] = 'SMTP Sorunu: Sunucu e-posta adreslerinde unikod karakterleri desteklemiyor.';
+$messages['smtpsizeerror'] = 'SMTP Hatası: İleti boyutu sunucu sınırlamasını aşıyor ($limit)';
 $messages['smtperror'] = 'SMTP Sorunu: $msg';
 $messages['emailformaterror'] = 'E-posta adresi geçersiz: $email';
 $messages['toomanyrecipients'] = 'Çok fazla alıcı var. En fazla $max alıcı olabilir.';
@@ -194,7 +199,7 @@ $messages['invalidimageformat'] = 'Geçerli bir görsel biçimi değil.';
 $messages['mispellingsfound'] = 'İletide yazım hataları var.';
 $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.';
-$messages['attachmentvalidationerror'] = 'UYARI! Bu ek dosyası iletide belirtilen dosyadan farklı olduğu için şüpheli bulundu. Göndericiye güvenmiyorsanız eki web tarayıcısında açmayın. Zararlı içerik olabilir.<br/><br/><em>Beklenen: $expected; Bulunan: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Ek dosya türü ileti içinde belirtilen tür ile aynı değil ve bu dosya şüpheli. Bu dosyada zararlı bir içerik bulunuyor olabilir. O nedenle göndereni tanımıyor ya da güvenmiyorsanız bu dosyayı web tarayıcısı içinden açmayın. <br/><br/><em>Beklenen: $expected; Bulunan: $detected</em>';
 $messages['noscriptwarning'] = 'Uyarı: Bu web e-posta hizmetinin kullanılabilmesi için Javascript gereklidir! Hizmeti kullanabilmek için lütfen web tarayıcınızın Javascript ayarlarını etkinleştirin.';
 $messages['messageissent'] = 'İleti zaten gönderilmiş ancak henüz kaydedilmemiş. Şimdi kaydetmek ister misiniz?';
 $messages['errnotfound'] = 'Dosya bulunamadı.';
diff --git a/program/localization/tzl/messages.inc b/program/localization/tzl/messages.inc
new file mode 100644
index 000000000..5a68a19fc
--- /dev/null
+++ b/program/localization/tzl/messages.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/messages.inc                                      |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
+*/
+$messages['grouprenamed'] = 'Rinominarh';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index e57e0a40d..10cd7da0e 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -177,6 +177,7 @@ $labels['listcolumns'] = 'Атрибути для відображення';
 $labels['listsorting'] = 'Сортувати за атрибутом';
 $labels['listorder'] = 'Порядок сортування';
 $labels['listmode'] = 'Режим перегляду списку';
+$labels['layoutlist'] = 'Списком';
 $labels['folderactions'] = 'Операції з текою...';
 $labels['compact'] = 'Стиснути';
 $labels['empty'] = 'Спорожнити';
@@ -341,11 +342,13 @@ $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Властивості контакта';
 $labels['contactnameandorg'] = 'Ім\'я та організація';
 $labels['personalinfo'] = 'Особова інформація';
+$labels['personal'] = 'Особисті';
 $labels['contactphoto'] = 'Фото контакту';
 $labels['edit']   = 'Редагувати';
 $labels['cancel'] = 'Скасувати';
 $labels['save']   = 'Зберегти';
 $labels['delete'] = 'Видалити';
+$labels['discard'] = 'Відкинути';
 $labels['rename'] = 'Перейменувати';
 $labels['addphoto'] = 'Додати';
 $labels['replacephoto'] = 'Замінити';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 71f1306aa..e8434df43 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -95,7 +95,6 @@ $messages['norecipientwarning'] = 'Будь ласка, вкажіть прин�
 $messages['nosubjectwarning']  = 'Не вказано тему листа. Бажаєте вказати її зараз?';
 $messages['nobodywarning'] = 'Відправити листа без тексту?';
 $messages['restoresavedcomposedata'] = 'Знайдено написаного раніше, але не надісланого листа.\n\nТема: $subject\nЗбережено: $date\n\nХочете відновити це повідомлення?';
-$messages['noldapserver'] = 'Будь ласка, виберіть LDAP сервер для пошуку';
 $messages['nosearchname'] = 'Будь ласка, введіть ім\'я чи електронну адресу';
 $messages['notuploadedwarning'] = 'Деякі вкладення не було завантажено. Будь ласка, зачекайте або скасуйте завантаження.';
 $messages['searchsuccessful'] = 'Зайдено $nr листів';
@@ -188,7 +187,6 @@ $messages['invalidimageformat'] = 'Недійсний формат зображ�
 $messages['mispellingsfound'] = 'Знайдено орфографічні помилки у повідомленні.';
 $messages['parentnotwritable'] = 'Неможливо створити/перемістити теку до обраної батьківської теки. Нема прав доступу.';
 $messages['messagetoobig'] = 'Частина повідомлення занадто велика для опрацювання.';
-$messages['attachmentvalidationerror'] = 'УВАГА! Це вкладення є підозрілим, тому що його тип не збігається з типом, оголошеним у повідомленні. Якщо Ви не довіряєте відправнику, Ви не повинні відкривати його в браузері, оскільки його вміст може бути шкідливим.<br/><br/><em>Очікуване: $expected; знайдене: $detected </em>';
 $messages['noscriptwarning'] = 'Увага: Даний клієнт електронної пошти потрібує Javascript! Щоб використовувати його, необхідно включити підтримку Javascript у налаштуваннях Вашого браузера.';
 $messages['messageissent'] = 'Повідомлення уже надіслане, але ще не збережене. Хочете зберегти його зараз?';
 $messages['errnotfound'] = 'Файл не знайдено';
diff --git a/program/localization/ur_PK/labels.inc b/program/localization/ur_PK/labels.inc
index 859d66540..92ee7578a 100644
--- a/program/localization/ur_PK/labels.inc
+++ b/program/localization/ur_PK/labels.inc
@@ -46,4 +46,5 @@ $labels['list'] = 'لِسٹ';
 $labels['expand-all'] = 'تمام کھولیں';
 $labels['attachment'] = 'مُنسلَک شُدہ';
 $labels['nonesort'] = 'کوئی نہیں';
+$labels['layoutlist'] = 'لِسٹ';
 ?>
diff --git a/program/localization/uz/labels.inc b/program/localization/uz/labels.inc
index 5d339f875..ac1552da7 100644
--- a/program/localization/uz/labels.inc
+++ b/program/localization/uz/labels.inc
@@ -354,6 +354,7 @@ $labels['contacts'] = 'Kontaktlar';
 $labels['contactproperties'] = 'Kontakt xossalari';
 $labels['contactnameandorg'] = 'Nom va tashkilot';
 $labels['personalinfo'] = 'Shaxsiy ma`lumot';
+$labels['personal'] = 'Shaxsiy';
 $labels['contactphoto'] = 'Kontakt surati';
 $labels['edit']   = 'Tahrirlash';
 $labels['cancel'] = 'Bekor qilish';
diff --git a/program/localization/uz/messages.inc b/program/localization/uz/messages.inc
index c51128bd0..23c18cf65 100644
--- a/program/localization/uz/messages.inc
+++ b/program/localization/uz/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = 'Mavzusiz';
 $messages['nobodywarning'] = 'Xatni matnsiz jo‘natmoqchimisiz?';
 $messages['notsentwarning'] = 'Xat jo‘natilmadi va saqlanmagan o‘zgartirishlarga ega. Siz bu o‘zgarishlarni bekor qilishni istaysizmi?';
 $messages['restoresavedcomposedata'] = 'Avval $date da yaratilgan biroq, jo‘natilmagan $subject\n mavzudagi xat mavjud.Bu xatni qayta tiklashni istaysizmi?';
-$messages['noldapserver'] = 'Iltimos, qidirish uchun LDAP serverni tanlang.';
 $messages['nosearchname'] = 'Iltimos, Ism yoki elektron pochta manzilini kiriting.';
 $messages['notuploadedwarning'] = 'Barcha ilovalar hali yuklanmadi, Iltimos kuting yoki yuklashni bekor qiling.';
 $messages['searchsuccessful'] = '$nr ta xat topildi.';
@@ -193,8 +192,6 @@ $messages['invalidimageformat'] = 'Rasm formati noto‘g‘ri';
 $messages['mispellingsfound'] = 'Xatda imlo xatolar mavjud.';
 $messages['parentnotwritable'] = 'Tanlangan asos papkada boshqa papka yaratish/ko‘chirishni imkoni yo‘q. Ruxsat berilmaganl';
 $messages['messagetoobig'] = 'Xat qismi qayta ishlash uchun juda katta.';
-$messages['attachmentvalidationerror'] = 'DIQQAT! Mazkur ilova shubhali. 
-Chunki uning turi xatda e’lon qilingani bilan mos emas. Agar jo‘natuvchiga ishonmasangiz, uni brauzerda ochmang, zeroki u zararli axborotlarga ega bo‘lishi mumkin. kutilgan edi: $expected; aniqlandi: $detected</em>';
 $messages['noscriptwarning'] = 'DIQQAT: Veb pochtaning mazkur xizmati javascriptni talab etadi. Uni ishlatish uchun brauzeringizda javascriptni qo‘llalb-quvvatlashni faollashtirishingiz lozim.';
 $messages['messageissent'] = 'Xat jo‘natildi, biroq hali saqlanmadi. Uni hozir saqlashni istaysizmi?';
 $messages['errnotfound'] = 'Fayl topilmadi';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 9f5d79ff3..e9a0a4835 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -128,6 +128,7 @@ $labels['markunread']       = 'Là chưa đọc';
 $labels['markflagged']      = 'Là quan trọng';
 $labels['markunflagged']    = 'Là không quan trọng';
 $labels['moreactions']      = 'Thêm hành động...';
+$labels['folders-all']      = 'Tất cả các thư mục';
 $labels['more']             = 'Thêm';
 $labels['back']             = 'Quay lại';
 $labels['options']          = 'Tuỳ chọn';
@@ -172,6 +173,7 @@ $labels['listcolumns'] = 'Các cột danh sách';
 $labels['listsorting'] = 'Cột sắp xếp';
 $labels['listorder'] = 'Thứ tự sắp xếp';
 $labels['listmode'] = 'Xem dạng danh sách';
+$labels['layoutlist'] = 'Danh sách';
 $labels['folderactions'] = 'Thao tác với thư mục';
 $labels['compact'] = 'Nén';
 $labels['empty'] = 'Trống';
@@ -317,6 +319,7 @@ $labels['contacts'] = 'Danh bạ';
 $labels['contactproperties'] = 'Tính chất của liên hệ';
 $labels['contactnameandorg'] = 'Tên và tổ chức';
 $labels['personalinfo'] = 'Thông tin cá nhân';
+$labels['personal'] = 'Cá nhân';
 $labels['contactphoto'] = 'Ảnh của người liên hệ';
 $labels['edit']   = 'Chỉnh sửa';
 $labels['cancel'] = 'Huỷ';
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 0ea130e29..97708b30f 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -83,7 +83,6 @@ $messages['norecipientwarning'] = 'Xin nhập it nhất 1 người nhận.';
 $messages['nosubjectwarning']  = 'Mục "Tiêu đề" vẫn còn trống. Bạn có muốn nhập tiêu đề bây giờ không?';
 $messages['nobodywarning'] = 'Gửi thư không có nội dung?';
 $messages['restoresavedcomposedata'] = 'Tìm thấy một thư đã được soạn trước nhưng chưa gửi.\n\nTiêu đề: $subject\nLưu ngày: $date\n\nBạn có muốn khôi phục lại thư này?';
-$messages['noldapserver'] = 'Chọn máy chủ ldap server để tìm';
 $messages['nosearchname'] = 'Nhập liên hệ hoặc địa chỉ email.';
 $messages['notuploadedwarning'] = 'Tất cả các đính kèm vẫn chưa được tải lên hết. Xin đợi hoặc hủy việc tải lên.';
 $messages['searchsuccessful'] = '$nr thư đã tìm được.';
@@ -170,5 +169,4 @@ $messages['invalidimageformat'] = 'Không phải là định dạng ảnh hợp
 $messages['mispellingsfound'] = 'Lỗi chính tả được phát hiện trong thư';
 $messages['parentnotwritable'] = 'Không thể tạo/chuyển folder vào folder gốc đã chọn. Không có quyền truy cập.';
 $messages['messagetoobig'] = 'Một phần thư quá lớn để xử lý nó.';
-$messages['attachmentvalidationerror'] = 'Cảnh báo: Tệp tin đính kèm có dấu hiệu nguy hiểm, vì kiểu tệp tin không trùng với kiểu được khai báo sử dụng trong thư. Nếu bạn không biết người gửi, bạn không nên mở thư vì nó có thể có các dữ liệu gây hại. <br/><br/><em>Dự kiến: $expected; được tìm thấy: $detected</em>';
 $messages['noscriptwarning'] = 'Cảnh báo: Dịch vụ webmail này yêu cầu sử dụng Javascript. Để sử dụng, bạn cần kích hoạt hỗ trợ Javascript trong cấu hình trình duyệt Internet đang sử dụng.';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index 872901608..7b19dbea4 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -45,6 +45,7 @@ $labels['priority'] = '优先级';
 $labels['organization'] = '组织';
 $labels['readstatus'] = '阅读状态';
 $labels['listoptions'] = '列表选项';
+$labels['listoptionstitle'] = '列表选项';
 $labels['mailboxlist'] = '邮件夹';
 $labels['messagesfromto'] = '从 $from 到 $to，共计 $count 封邮件';
 $labels['threadsfromto'] = '从 $from 到 $to，共计 $count 个主题';
@@ -113,6 +114,8 @@ $labels['forward']          = '转发';
 $labels['forwardinline']    = '直接转发';
 $labels['forwardattachment'] = '以附件转发';
 $labels['forwardmessage']   = '转发邮件';
+$labels['bouncemsg']        = '重发 (回弹)';
+$labels['bounce']           = '重发';
 $labels['deletemessage']    = '删除邮件';
 $labels['movemessagetotrash'] = '移至已删除邮件';
 $labels['printmessage']     = '打印邮件';
@@ -136,6 +139,9 @@ $labels['folders-all']      = '所有文件夹';
 $labels['more']             = '更多';
 $labels['back']             = '返回';
 $labels['options']          = '个人选项';
+$labels['composeoptions']   = '撰写选项';
+$labels['optionsandattachments'] = '选项和附件';
+$labels['actions']          = '动作';
 $labels['first'] = '首';
 $labels['last'] = '尾';
 $labels['previous'] = '前一';
@@ -177,10 +183,14 @@ $labels['listcolumns'] = '列表列';
 $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
+$labels['lmode'] = '列表模式';
 $labels['layout'] = '布局';
 $labels['layoutwidescreen'] = '宽屏';
 $labels['layoutdesktop'] = '桌面';
 $labels['layoutlist'] = '列表';
+$labels['layoutwidescreendesc'] = '宽屏 (3栏)';
+$labels['layoutdesktopdesc'] = '桌面 (很宽的列表，邮件预览在下方)';
+$labels['layoutlistdesc'] = '纯列表 (无邮件预览)';
 $labels['folderactions'] = '文件夹操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
@@ -193,7 +203,11 @@ $labels['quotatotal'] = '限额';
 $labels['quotaused'] = '已用';
 $labels['quotastorage'] = '存储空间';
 $labels['quotamessage'] = '邮件数统计';
+$labels['shortheaderdate'] = '在 $date';
+$labels['shortheaderto'] = '在 $date 发给 $to';
+$labels['shortheaderfrom'] = '在 $date 来自 $from';
 $labels['quicksearch']  = '快速查找';
+$labels['searchplaceholder']  = '搜索';
 $labels['resetsearch']  = '清空';
 $labels['searchmod']  = '修改搜索';
 $labels['msgtext']  = '整封邮件';
@@ -239,6 +253,7 @@ $labels['keylength']      = '位';
 $labels['keyexpired']     = '已过期';
 $labels['keyrevoked']     = '已废除';
 $labels['bccinstead']     = '使用密送';
+$labels['addheader']      = '添加收件人 (信头)';
 $labels['editidents']    = '编辑身份';
 $labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
@@ -271,9 +286,13 @@ $labels['high']    = '高';
 $labels['highest'] = '最高';
 $labels['nosubject']  = '(无主题)';
 $labels['showimages'] = '显示图片';
+$labels['allow']      = '允许';
 $labels['alwaysshow'] = '总是显示来自 $sender 的图片';
+$labels['alwaysallow'] = '总是允许来自 $sender 的信件';
 $labels['isdraft']    = '这是一封草稿';
 $labels['andnmore']   = '第 $nr 封或更多...';
+$labels['headers']    = '信头';
+$labels['envelope']   = '信封';
 $labels['togglemoreheaders'] = '显示更多消息头';
 $labels['togglefullheaders'] = '切换至原始消息头';
 $labels['htmltoggle'] = 'HTML';
@@ -347,11 +366,15 @@ $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
 $labels['contactnameandorg'] = '姓名和公司';
 $labels['personalinfo'] = '个人信息';
+$labels['personal'] = '个人';
 $labels['contactphoto'] = '联系人照片';
 $labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
 $labels['save']   = '保存';
 $labels['delete'] = '删除';
+$labels['discard'] = '丢弃';
+$labels['continue'] = '继续';
+$labels['ok'] = '确定';
 $labels['rename'] = '重命名';
 $labels['addphoto'] = '上传';
 $labels['replacephoto'] = '替换照片';
@@ -442,6 +465,7 @@ $labels['skipdeleted'] = '不显示标记为已删除的邮件';
 $labels['deletealways'] = '如果移动邮件到回收站失败，则删除';
 $labels['deletejunk'] = '直接删除垃圾邮箱中的邮件';
 $labels['showremoteimages'] = '显示内嵌的图片';
+$labels['allowremoteresources'] = '允许远程资源 (图片和样式表)';
 $labels['fromknownsenders'] = '来自已知发件人';
 $labels['always'] = '总是';
 $labels['alwaysbutplain'] = '始终，除了回复纯文本';
@@ -474,6 +498,7 @@ $labels['signatureoptions'] = '签名选项';
 $labels['whenreplying'] = '当回复时';
 $labels['replyempty'] = '不要引用原始邮件';
 $labels['replytopposting'] = '在原文上面开始新邮件';
+$labels['replytoppostingnoindent'] = '在引用上方开始写新的消息 (不要使用缩进)';
 $labels['replybottomposting'] = '在原文下面开始新邮件';
 $labels['replyremovesignature'] = '当回复时从邮件移除原始签名';
 $labels['autoaddsignature'] = '自动插入签名';
@@ -482,6 +507,7 @@ $labels['replyandforwardonly'] = '仅回复和转发邮件';
 $labels['insertsignature'] = '插入签名';
 $labels['sigbelow'] = '在引文的下方放置签名';
 $labels['sigseparator'] = '强制标准的签名分隔符';
+$labels['automarkread']  = '标记为已读';
 $labels['afternseconds']  = '$n 秒之后';
 $labels['reqmdn'] = '总是要求回执';
 $labels['reqdsn'] = '总是要求投递状态通知';
@@ -524,9 +550,14 @@ $labels['personalfolder'] = '私有文件夹';
 $labels['otherfolder'] = '他人文件夹';
 $labels['sharedfolder'] = '共享文件夹';
 $labels['findfolders'] = '查找文件夹';
+$labels['findcontacts'] = '查找联系人';
+$labels['findmail'] = '查找邮件';
 $labels['namespace.personal'] = '个人';
 $labels['namespace.other'] = '其他用户';
 $labels['namespace.shared'] = '已共享';
+$labels['dualuselabel'] = '只能包含';
+$labels['dualusemail'] = '消息';
+$labels['dualusefolder'] = '文件夹';
 $labels['sortby'] = '排序';
 $labels['sortasc']  = '递增排序';
 $labels['sortdesc'] = '递减排序';
@@ -537,6 +568,13 @@ $labels['version'] = '版本';
 $labels['source'] = '源代码';
 $labels['license'] = '许可协议';
 $labels['support'] = '支持';
+$labels['savedsearches'] = '已保存的搜索';
+$labels['dateformatY'] = 'YYYY';
+$labels['dateformaty'] = 'YY';
+$labels['dateformatm'] = 'MM';
+$labels['dateformatd'] = 'DD';
+$labels['dateformatj'] = 'D';
+$labels['dateformatn'] = 'M';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -591,6 +629,8 @@ $labels['arialabelmarkmessagesas'] = '标记选中邮件为...';
 $labels['arialabelcomposeoptions'] = '布局选项';
 $labels['arialabelresponsesmenu'] = '预设回复菜单';
 $labels['arialabelattachmentuploadform'] = '附件上传表单';
+$labels['arialabelattachmentmenu'] = '附件选项';
+$labels['arialabelmailtomenu'] = '邮件地址选项';
 $labels['arialabelattachmentpreview'] = '附件预览';
 $labels['ariasummarycomposecontacts'] = '选择联系人或组作为收件人';
 $labels['arialabelcontactexportoptions'] = '联系人导出选项';
@@ -599,6 +639,8 @@ $labels['arialabelpreferencesform'] = '偏好设置表单';
 $labels['arialabelidentityeditfrom'] = '标识编辑表单';
 $labels['arialabelresonseeditfrom'] = '回复编辑表单';
 $labels['arialabelsearchterms'] = '搜索关键词';
+$labels['arialabeldropactionmenu'] = '拖拽选项菜单';
+$labels['arialabelheadersmenu'] = '收件人 (信头) 添加菜单';
 $labels['helplistnavigation'] = '列表键盘导航';
 $labels['helplistkeyboardnavigation'] = "方向键上/下：移动选中/焦点所在行。
 空格键：选中焦点所在行。
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 96974cc1b..68e934f7a 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -55,6 +55,7 @@ $messages['addedsuccessfully'] = '联系人已添加。';
 $messages['contactexists'] = '已经具有此电子邮件地址的联系人已经存在。';
 $messages['contactnameexists'] = '已存在同名联系人。';
 $messages['blockedimages'] = '由于保护隐私，此邮件中的远程图片未予显示。';
+$messages['blockedresources'] = '为了保护您的隐私，远程资源已被屏蔽。';
 $messages['encryptedmessage'] = '抱歉！该邮件已被加密，无法显示。';
 $messages['externalmessagedecryption'] = '这是一封已加密的邮件，并且不能用您的浏览器扩展解密。';
 $messages['nopubkeyfor'] = '没有找到 $email 的有效公钥';
@@ -75,6 +76,8 @@ $messages['errormoving'] = '无法移动邮件。';
 $messages['errorcopying'] = '无法复制邮件。';
 $messages['errordeleting'] = '无法删除邮件。';
 $messages['errormarking'] = '无法标记邮件。';
+$messages['alerttitle'] = '注意';
+$messages['confirmationtitle'] = '您确定……';
 $messages['deletecontactconfirm']  = '是否删除选中的联系人？';
 $messages['deletegroupconfirm']  = '是否删除选中的群组?';
 $messages['deletemessagesconfirm'] = '是否删除选中的邮件？';
@@ -92,13 +95,13 @@ $messages['nonamewarning']  = '请输入名称。';
 $messages['nopagesizewarning'] = '请输入每页显示的邮件数量。';
 $messages['nosenderwarning'] = '请输入发件人的电子邮件地址。';
 $messages['norecipientwarning'] = '至少输入一个收件人。';
+$messages['disclosedrecipwarning'] = '所有的收件人都能看到其他收件人的地址。如果您不想这么做并且想保护他人隐私，您可以使用"密送 (Bcc)"一栏。';
 $messages['disclosedreciptitle'] = '太多公共收件人';
 $messages['nosubjectwarning']  = '主题为空。您要输入一个主题吗？';
 $messages['nosubjecttitle']  = '无主题';
 $messages['nobodywarning'] = '要发送没有正文的邮件吗？';
 $messages['notsentwarning'] = '此消息已发送并且有未保存的更改。您是否要放弃您的更改？';
 $messages['restoresavedcomposedata'] = '您有一封邮件尚未发送.\n\nSubject: $subject\nSaved: $date\n\n您是否要恢复这封邮件？';
-$messages['noldapserver'] = '请选择一个用来查找的 LDAP 服务器。';
 $messages['nosearchname'] = '请输入联系人姓名或电子邮件地址。';
 $messages['notuploadedwarning'] = '附件尚未全部上传，请耐心等待或者取消上传。';
 $messages['searchsuccessful'] = '共找到 $nr 封邮件。';
@@ -160,6 +163,7 @@ $messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败。';
 $messages['smtpfromerror'] = 'SMTP 错误 ($code):添加发件人失败 "$from" ($msg)。';
 $messages['smtptoerror'] = 'SMTP 错误 ($code): 添加收件人失败 "$to" ($msg)。';
 $messages['smtprecipientserror'] = 'SMTP 错误: 无法解析收件人列表。';
+$messages['smtpsizeerror'] = 'SMTP 错误：消息长度超过服务器能接受的长度 ($limit)';
 $messages['smtperror'] = 'SMTP 错误: $msg';
 $messages['emailformaterror'] = '无效的电子邮件地址：$email';
 $messages['toomanyrecipients'] = '收件人太多，请减少人数至 $max。';
@@ -192,7 +196,7 @@ $messages['invalidimageformat'] = '非法的图像类型。';
 $messages['mispellingsfound'] = '检查到拼写错误。';
 $messages['parentnotwritable'] = '无法创建/转移文件夹至指定的上级文件夹，没有权限。';
 $messages['messagetoobig'] = '邮件过大无法处理。';
-$messages['attachmentvalidationerror'] = '警告！该附件很可疑，因为其自身的格式与邮件中声明的格式不符。如果您不信任发送人，则不应该在浏览器中打开该附件。<br/><br/><em>声明格式：$expected；实际格式：$detected</em>';
+$messages['attachmentvalidationerror'] = '这个附件很可疑：因为它的真正类型和在消息中声明的类型不一致。如果您不是很信任发件人，请不要打开此附件，因为里面可能包含恶意内容或者病毒。<br/><br/><em>声明类型： $expected ；检测到的类型： $detected</em>';
 $messages['noscriptwarning'] = '警告：本程序需要 Javascript 支持！请在浏览器设置中启用 Javascript。';
 $messages['messageissent'] = '邮件已发送，但尚未保存。是否现在保存？';
 $messages['errnotfound'] = '文件未找到';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 9cb9e005d..2eec27479 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -346,11 +346,13 @@ $labels['contacts'] = '聯絡人';
 $labels['contactproperties'] = '聯絡人資訊';
 $labels['contactnameandorg'] = ' 姓名和組織/公司';
 $labels['personalinfo'] = '個人資訊';
+$labels['personal'] = '個人';
 $labels['contactphoto'] = '聯絡人相片';
 $labels['edit']   = '編輯';
 $labels['cancel'] = '取消';
 $labels['save']   = '儲存';
 $labels['delete'] = '刪除';
+$labels['discard'] = '丟棄';
 $labels['rename'] = '重新命名';
 $labels['addphoto'] = '加入';
 $labels['replacephoto'] = '取代';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 7b9552ec8..8ad747b68 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -99,7 +99,6 @@ $messages['nosubjecttitle']  = '無主旨';
 $messages['nobodywarning'] = '要傳送沒有內文的郵件嗎？';
 $messages['notsentwarning'] = '郵件尚未寄出，並且有未儲存的改動。是否捨棄該改動？';
 $messages['restoresavedcomposedata'] = '發現一封上次編寫但尚未寄出的郵件。\n\n主旨: $subject\n日期: $date\n\n要回復這封郵件嗎？';
-$messages['noldapserver'] = '請選擇 LDAP 伺服器進行搜尋';
 $messages['nosearchname'] = '請輸入聯絡人姓名或電子郵件位址';
 $messages['notuploadedwarning'] = '尚有附件檔案未上傳完畢；請稍候，或取消上傳';
 $messages['searchsuccessful'] = '共找到 $nr 封郵件';
@@ -193,8 +192,6 @@ $messages['invalidimageformat'] = '圖片格式錯誤';
 $messages['mispellingsfound'] = '郵件中偵測到拼字錯誤';
 $messages['parentnotwritable'] = '無法建立/移動資料夾至指定的上層目錄，因為無存取權限';
 $messages['messagetoobig'] = '郵件太大，無法處理';
-$messages['attachmentvalidationerror'] = '警告！這個附件是可疑的，因為其檔案類型與宣稱的不同。如果寄件者不可靠，請不要開啟附件，因為其可能含有惡意的內容。<br /><br />
-<em>預期要收到的是：$expected；實際發現的是：$detected</em>';
 $messages['noscriptwarning'] = '警告：使用 Webmail 要有 Javascript 支援！請確定您瀏覽器已啟用 Javascript';
 $messages['messageissent'] = '此郵件已經寄出，但尚未儲存。是否立即儲存？';
 $messages['errnotfound'] = '找不到檔案';
author	Aleksander Machniak <alec@alec.pl>	2018-01-07 11:30:33 +0300
committer	Aleksander Machniak <alec@alec.pl>	2018-01-07 11:30:33 +0300
commit	6fb6a0b88503309c55610bd131780ae4215cb63f (patch)
tree	9ebe95cbe08e624a80efe9430c060c8e62453bf7 /program/localization
parent	f9c590621bf2808a211a50821eb8edff277244b5 (diff)