Import all translations from Transifex

143 files changed, 26418 insertions, 12814 deletions

diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 0fe7214d6..da2e80672 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -2,56 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fifawe <hany.samir@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'مرحباً بكم في $product';
-$labels['username'] = 'اسم المستخدم';
-$labels['password'] = 'كلمة المرور';
-$labels['server'] = 'الخادم';
-$labels['login'] = 'تسجيل الدخول';
-$labels['logout'] = 'تسجيل الخروج';
-$labels['mail'] = 'البريد';
+
+// login page
+$labels['welcome']   = 'مرحباً بكم في $product';
+$labels['username']  = 'اسم المستخدم';
+$labels['password']  = 'كلمة المرور';
+$labels['server']    = 'الخادم';
+$labels['login']     = 'تسجيل الدخول';
+
+// taskbar
+$labels['logout']   = 'تسجيل الخروج';
+$labels['mail']     = 'البريد';
 $labels['settings'] = 'الإعدادات الشخصية';
 $labels['addressbook'] = 'دفتر العناوين';
-$labels['inbox'] = 'الوارد';
+
+// mailbox names
+$labels['inbox']  = 'الوارد';
 $labels['drafts'] = 'المسودات';
-$labels['sent'] = 'المرسل';
-$labels['trash'] = 'المهملات';
-$labels['junk'] = 'غير المرغوب';
+$labels['sent']   = 'المرسل';
+$labels['trash']  = 'المهملات';
+$labels['junk']   = 'غير المرغوب';
+
+// message listing
 $labels['subject'] = 'الموضوع';
-$labels['from'] = 'المرسل';
-$labels['to'] = 'المستقبل';
-$labels['cc'] = 'نسخة';
-$labels['bcc'] = 'نسخة مخفية';
+$labels['from']    = 'المرسل';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'المستقبل';
+$labels['cc']      = 'نسخة';
+$labels['bcc']     = 'نسخة مخفية';
 $labels['replyto'] = 'الرد إلى';
 $labels['followupto'] = 'Mail-Followup-To';
-$labels['date'] = 'التاريخ';
-$labels['size'] = 'الحجم';
+$labels['date']    = 'التاريخ';
+$labels['size']    = 'الحجم';
 $labels['priority'] = 'الأولوية';
 $labels['organization'] = 'المنظمة';
 $labels['readstatus'] = 'حالة القراءة';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'مجلدات';
-$labels['folders'] = 'مجلدات';
 $labels['messagesfromto'] = 'الرسالة $from إلى $to من مجموع $count';
 $labels['threadsfromto'] = 'جهات الإتصال $from إلى $to من مجموع $count';
 $labels['messagenrof'] = 'الرسالة $nr من $count';
-$labels['copy'] = 'نسخ';
-$labels['move'] = 'نقل';
-$labels['moveto'] = 'نقل إلى...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'نسخ';
+$labels['move']     = 'نقل';
+$labels['moveto']   = 'نقل إلى...';
 $labels['download'] = 'تنزيل';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'اسم الملف';
 $labels['filesize'] = 'حجم الملف';
+
 $labels['addtoaddressbook'] = 'إضافة إلى دفتر العناوين';
+
+// weekdays short
 $labels['sun'] = 'أحد';
 $labels['mon'] = 'إثنين';
 $labels['tue'] = 'ثلاثاء';
@@ -59,74 +80,83 @@ $labels['wed'] = 'أربعاء';
 $labels['thu'] = 'خميس';
 $labels['fri'] = 'جمعة';
 $labels['sat'] = 'سبت';
-$labels['sunday'] = 'الأحد';
-$labels['monday'] = 'الإثنين';
-$labels['tuesday'] = 'الثلاثاء';
+
+// weekdays long
+$labels['sunday']    = 'الأحد';
+$labels['monday']    = 'الإثنين';
+$labels['tuesday']   = 'الثلاثاء';
 $labels['wednesday'] = 'الأربعاء';
-$labels['thursday'] = 'الخميس';
-$labels['friday'] = 'الجمعة';
-$labels['saturday'] = 'السبت';
-$labels['jan'] = 'يناير';
-$labels['feb'] = 'فبراير';
-$labels['mar'] = 'مارس';
-$labels['apr'] = 'أبريل';
-$labels['may'] = 'مايو';
-$labels['longmay'] = 'مايو';
-$labels['jun'] = 'يونيو';
-$labels['jul'] = 'يوليو';
-$labels['aug'] = 'أغسطس';
-$labels['sep'] = 'سبتمبر';
-$labels['oct'] = 'أكتوبر';
-$labels['nov'] = 'نوفمبر';
-$labels['dec'] = 'ديسمبر';
-$labels['longjan'] = 'يناير';
-$labels['longfeb'] = 'فبراير';
-$labels['longmar'] = 'مارس';
-$labels['longapr'] = 'إبريل';
-$labels['longjun'] = 'يونيو';
-$labels['longjul'] = 'يوليو';
-$labels['longaug'] = 'أغسطس';
-$labels['longsep'] = 'سبتمبر';
-$labels['longoct'] = 'أكتوبر';
-$labels['longnov'] = 'نوفمبر';
-$labels['longdec'] = 'ديسمبر';
+$labels['thursday']  = 'الخميس';
+$labels['friday']    = 'الجمعة';
+$labels['saturday']  = 'السبت';
+
+// months short
+$labels['jan']	= 'يناير';
+$labels['feb']	= 'فبراير';
+$labels['mar']	= 'مارس';
+$labels['apr']	= 'أبريل';
+$labels['may']	= 'مايو';
+$labels['jun']	= 'يونيو';
+$labels['jul'] 	= 'يوليو';
+$labels['aug']	= 'أغسطس';
+$labels['sep']	= 'سبتمبر';
+$labels['oct']	= 'أكتوبر';
+$labels['nov']	= 'نوفمبر';
+$labels['dec']	= 'ديسمبر';
+
+// months long
+$labels['longjan']	= 'يناير';
+$labels['longfeb']	= 'فبراير';
+$labels['longmar']	= 'مارس';
+$labels['longapr']	= 'إبريل';
+$labels['longmay']	= 'مايو';
+$labels['longjun']	= 'يونيو';
+$labels['longjul']	= 'يوليو';
+$labels['longaug']	= 'أغسطس';
+$labels['longsep']	= 'سبتمبر';
+$labels['longoct']	= 'أكتوبر';
+$labels['longnov']	= 'نوفمبر';
+$labels['longdec']	= 'ديسمبر';
+
 $labels['today'] = 'اليوم';
-$labels['refresh'] = 'تحديث';
-$labels['checkmail'] = 'التحقق من وجود رسائل جديدة';
-$labels['compose'] = 'إنشاء رسالة';
-$labels['writenewmessage'] = 'إنشاء رسالة جديدة';
-$labels['reply'] = 'رد';
-$labels['replytomessage'] = 'الرد على الرسالة';
+
+// toolbar buttons
+$labels['refresh']          = 'تحديث';
+$labels['checkmail']        = 'التحقق من وجود رسائل جديدة';
+$labels['compose']          = 'إنشاء رسالة';
+$labels['writenewmessage']  = 'إنشاء رسالة جديدة';
+$labels['reply']            = 'رد';
+$labels['replytomessage']   = 'الرد على الرسالة';
 $labels['replytoallmessage'] = 'الرد على المرسل وجميع مستقبلي الرسالة';
-$labels['replyall'] = 'الرد على الجميع';
-$labels['replylist'] = 'الرد على القائمة';
-$labels['forward'] = 'إعادة توجيه';
-$labels['forwardinline'] = 'تمرير الرسالة ضمنياً';
+$labels['replyall']         = 'الرد على الجميع';
+$labels['replylist']        = 'الرد على القائمة';
+$labels['forward']          = 'إعادة توجيه';
+$labels['forwardinline']    = 'تمرير الرسالة ضمنياً';
 $labels['forwardattachment'] = 'تمرير الرسالة كمرفق';
-$labels['forwardmessage'] = 'تمرير الرسالة';
-$labels['deletemessage'] = 'حذف الرسالة إلى المهملات';
+$labels['forwardmessage']   = 'تمرير الرسالة';
+$labels['deletemessage']    = 'حذف الرسالة إلى المهملات';
 $labels['movemessagetotrash'] = 'انقل الرسالة إلى سلة المهملات';
-$labels['printmessage'] = 'طباعة هذه الرسالة';
-$labels['previousmessage'] = 'عرض الرسالة السابقة';
-$labels['firstmessage'] = 'عرض الرسالة الأولى';
-$labels['nextmessage'] = 'عرض الرسالة التالية';
-$labels['lastmessage'] = 'عرض الرسالة الأخيرة';
-$labels['backtolist'] = 'العودة إلى لائحة الرسائل';
-$labels['viewsource'] = 'إظهار المصدر';
-$labels['mark'] = 'علامة';
-$labels['markmessages'] = 'وسم الرسالة';
-$labels['markread'] = 'كمقروءة';
-$labels['markunread'] = 'كغير مقروءة';
-$labels['markflagged'] = 'كموْسومة';
-$labels['markunflagged'] = 'كغير موْسومة';
-$labels['moreactions'] = 'إجراءات إضافية...';
-$labels['more'] = 'المزيد';
-$labels['back'] = 'العودة';
-$labels['options'] = 'خيارات';
+$labels['printmessage']     = 'طباعة هذه الرسالة';
+$labels['previousmessage']  = 'عرض الرسالة السابقة';
+$labels['firstmessage']     = 'عرض الرسالة الأولى';
+$labels['nextmessage']      = 'عرض الرسالة التالية';
+$labels['lastmessage']      = 'عرض الرسالة الأخيرة';
+$labels['backtolist']       = 'العودة إلى لائحة الرسائل';
+$labels['viewsource']       = 'إظهار المصدر';
+$labels['mark']             = 'علامة';
+$labels['markmessages']     = 'وسم الرسالة';
+$labels['markread']         = 'كمقروءة';
+$labels['markunread']       = 'كغير مقروءة';
+$labels['markflagged']      = 'كموْسومة';
+$labels['markunflagged']    = 'كغير موْسومة';
+$labels['moreactions']      = 'إجراءات إضافية...';
+$labels['more']             = 'المزيد';
+$labels['back']             = 'العودة';
+$labels['options']          = 'خيارات';
+
 $labels['select'] = 'تحديد';
 $labels['all'] = 'الكل';
 $labels['none'] = 'لاشيء';
-$labels['nonesort'] = 'لاشيء';
 $labels['currpage'] = 'الصفحة الحالية';
 $labels['unread'] = 'غير المقروءة';
 $labels['flagged'] = 'موسوم';
@@ -141,12 +171,14 @@ $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'] = 'تصاعدي';
@@ -155,178 +187,216 @@ $labels['listcolumns'] = 'أعمدة السرد';
 $labels['listsorting'] = 'أعمدة الترتيب';
 $labels['listorder'] = 'طريقة الترتيب';
 $labels['listmode'] = 'وضع طريقة السرد';
+
 $labels['folderactions'] = 'إجراءات المجلد...';
 $labels['compact'] = 'ضغط';
 $labels['empty'] = 'تفريغ';
+
 $labels['quota'] = 'المساحة المستخدمة';
-$labels['unknown'] = 'مجهول';
-$labels['unlimited'] = 'غير محدود';
-$labels['quicksearch'] = 'البحث السريع';
-$labels['resetsearch'] = 'استعادة البحث للافتراضي';
-$labels['searchmod'] = 'أماكن البحث';
-$labels['msgtext'] = 'كامل الرسالة';
+$labels['unknown']  = 'مجهول';
+$labels['unlimited']  = 'غير محدود';
+
+$labels['quicksearch']  = 'البحث السريع';
+$labels['resetsearch']  = 'استعادة البحث للافتراضي';
+$labels['searchmod']  = 'أماكن البحث';
+$labels['msgtext']  = 'كامل الرسالة';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
-$labels['editasnew'] = 'تعديل كجديد';
-$labels['send'] = 'ارسل';
-$labels['sendmessage'] = 'إرسال الرسالة الآن';
-$labels['savemessage'] = 'حفظ هذه المسودة';
-$labels['addattachment'] = 'إرفاق ملف';
-$labels['charset'] = 'مجموعة المحارف';
-$labels['editortype'] = 'نوع المُحرّر';
-$labels['returnreceipt'] = 'ايصال استلام';
-$labels['dsn'] = 'تنويه حالة التوصيل';
+
+// message compose
+$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['editidents']    = 'تعديل الهويات';
+$labels['spellcheck']    = 'التدقيق اﻹملائى';
 $labels['checkspelling'] = 'التدقيق الإملائي';
 $labels['resumeediting'] = 'متابعة التحرير';
-$labels['revertto'] = 'استعادة إلى';
+$labels['revertto']      = 'استعادة إلى';
+
 $labels['attach'] = 'إرفاق';
 $labels['attachments'] = 'مرفقات';
 $labels['upload'] = 'تحميل';
 $labels['uploadprogress'] = '$percent ($current من $total)';
-$labels['close'] = 'إغلاق';
-$labels['messageoptions'] = 'خيارات الرسائل...';
-$labels['low'] = 'منخض';
-$labels['lowest'] = 'الأقل';
-$labels['normal'] = 'عادي';
-$labels['high'] = 'مرتفع';
+$labels['close']  = 'إغلاق';
+$labels['messageoptions']  = 'خيارات الرسائل...';
+
+$labels['low']     = 'منخض';
+$labels['lowest']  = 'الأقل';
+$labels['normal']  = 'عادي';
+$labels['high']    = 'مرتفع';
 $labels['highest'] = 'الأعلى';
-$labels['nosubject'] = '(دون موضوع)';
+
+$labels['nosubject']  = '(دون موضوع)';
 $labels['showimages'] = 'إظهار الصور';
 $labels['alwaysshow'] = 'دائماً أظهر الصّور القادمة من $sender';
-$labels['isdraft'] = 'هذه مسودّة رسالة';
-$labels['andnmore'] = '$nr المزيد ...';
+$labels['isdraft']    = 'هذه مسودّة رسالة';
+$labels['andnmore']   = '$nr المزيد ...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $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';
+
+// mdn
 $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'] = 'الموقع';
+
+// address boook
+$labels['name']         = 'اسم العرض';
+$labels['firstname']    = 'الإسم الأول';
+$labels['surname']      = 'الإسم الأخير';
+$labels['middlename']   = 'الاسم الثاني';
+$labels['nameprefix']   = 'السابقة';
+$labels['namesuffix']   = 'اللاحقة';
+$labels['nickname']     = 'اللقب';
+$labels['jobtitle']     = 'المسمى الوظيفي';
+$labels['department']   = 'الإدارة';
+$labels['gender']       = 'الجنس';
+$labels['maidenname']   = 'إسم الزواج';
+$labels['email']        = 'البريد الإلكتروني';
+$labels['phone']        = 'الهاتف';
+$labels['address']      = 'العنوان';
+$labels['street']       = 'الشارع';
+$labels['locality']     = 'المدينة';
+$labels['zipcode']      = 'الرمز البريدي';
+$labels['region']       = 'المنطقة';
+$labels['country']      = 'الدولة';
+$labels['birthday']     = 'تاريخ الميلاد';
+$labels['anniversary']  = 'المناسبة السنوية';
+$labels['website']      = 'الموقع';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'ملاحظات';
-$labels['male'] = 'ذكر';
+$labels['male']   = 'ذكر';
 $labels['female'] = 'أنثى';
 $labels['manager'] = 'مدير';
 $labels['assistant'] = 'المساعد';
-$labels['typeassistant'] = 'المساعد';
 $labels['spouse'] = 'زوجة';
 $labels['allfields'] = 'جميع الحقول';
 $labels['search'] = 'بحث';
 $labels['advsearch'] = 'بحث متقدم';
 $labels['advanced'] = 'مُتقدم';
 $labels['other'] = 'آخر';
-$labels['typeother'] = 'آخر';
-$labels['typehome'] = 'المنزل';
-$labels['typework'] = 'العمل';
-$labels['typemobile'] = 'المحمول';
-$labels['typemain'] = 'الرئيسي';
-$labels['typehomefax'] = 'فاكس المنزل';
-$labels['typeworkfax'] = 'فاكس العمل';
-$labels['typecar'] = 'السيارة';
-$labels['typepager'] = 'الرنان';
-$labels['typevideo'] = 'الفيديو';
-$labels['typehomepage'] = 'الرئيسية';
+
+$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['addcontact'] = 'إضافة المراسل المحدد إلى دفتر عناويني';
 $labels['editcontact'] = 'تحرير بيانات المراسل';
 $labels['contacts'] = 'المراسلين';
 $labels['contactproperties'] = 'خواص جهة الإتصال';
 $labels['personalinfo'] = 'المعلومات الشخصية';
-$labels['edit'] = 'تحرير';
+
+$labels['edit']   = 'تحرير';
 $labels['cancel'] = 'إلغاء';
-$labels['save'] = 'حفظ';
+$labels['save']   = 'حفظ';
 $labels['delete'] = 'حذف';
 $labels['rename'] = 'إعادة التسمية';
 $labels['addphoto'] = 'إضافة';
 $labels['replacephoto'] = 'استبدال';
 $labels['uploadphoto'] = 'ارفع صورة';
-$labels['newcontact'] = 'إنشاء بطاقة مراسل جديدة';
-$labels['deletecontact'] = 'حذف المراسلين المحددين';
-$labels['composeto'] = 'إنشاء رسالة إليه';
+
+$labels['newcontact']     = 'إنشاء بطاقة مراسل جديدة';
+$labels['deletecontact']  = 'حذف المراسلين المحددين';
+$labels['composeto']      = 'إنشاء رسالة إليه';
 $labels['contactsfromto'] = 'المراسلون $from إلى $to من $count';
-$labels['print'] = 'طباعة';
-$labels['export'] = 'تصدير';
-$labels['exportvcards'] = 'صدّر المراسلين بنسق vCard';
+$labels['print']          = 'طباعة';
+$labels['export']         = 'تصدير';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'صدّر المراسلين بنسق vCard';
 $labels['newcontactgroup'] = 'إنشاء مجموعة مراسلين جديدة';
-$labels['grouprename'] = 'تغيير اسم المجموعة';
-$labels['groupdelete'] = 'حذف المجموعة';
+$labels['grouprename']    = 'تغيير اسم المجموعة';
+$labels['groupdelete']    = 'حذف المجموعة';
 $labels['groupremoveselected'] = 'حذف العنوان المختار من المجموعة';
-$labels['previouspage'] = 'عرض المجموعة السابقة';
-$labels['firstpage'] = 'عرض المجموعة الأولى';
-$labels['nextpage'] = 'عرض المجموعة التالية';
-$labels['lastpage'] = 'عرض المجموعة الأخيرة';
+
+$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['importtarget'] = 'أضف المراسلين الجدد إلى دفتر العناوين:';
 $labels['importreplace'] = 'استبدل دفتر العناوين بأكمله';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'تم';
+
+// settings
 $labels['settingsfor'] = 'إعدادات';
 $labels['about'] = 'نبذة';
 $labels['preferences'] = 'التفضيلات';
 $labels['userpreferences'] = 'تفضيلات المستخدم';
 $labels['editpreferences'] = 'تحرير تفضيلات المستخدم';
+
 $labels['identities'] = 'الهويات';
 $labels['manageidentities'] = 'إدارة هويات هذا الحساب';
 $labels['newidentity'] = 'هوية جديدة';
+
 $labels['newitem'] = 'عنصر جديد';
 $labels['edititem'] = 'تحرير عنصر';
+
 $labels['preferhtml'] = 'تفضيل صيغة HTML';
 $labels['defaultcharset'] = 'ترميز المحارف الافتراضي';
 $labels['htmlmessage'] = 'رسالة بنسق HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'نسق التاريخ';
 $labels['timeformat'] = 'نسق الوقت';
 $labels['prettydate'] = 'تواريخ منمقة';
-$labels['setdefault'] = 'تعيين كإفتراضي';
-$labels['autodetect'] = 'آلي';
-$labels['language'] = 'اللغة';
-$labels['timezone'] = 'المنطقة الزمنية';
-$labels['pagesize'] = 'عدد الرسائل في الصفحة';
+$labels['setdefault']  = 'تعيين كإفتراضي';
+$labels['autodetect']  = 'آلي';
+$labels['language']  = 'اللغة';
+$labels['timezone']  = 'المنطقة الزمنية';
+$labels['pagesize']  = 'عدد الرسائل في الصفحة';
 $labels['signature'] = 'التوقيع';
-$labels['dstactive'] = 'التوقيت الصيفي';
+$labels['dstactive']  = 'التوقيت الصيفي';
 $labels['showinextwin'] = 'فتح الرسالة فى نافذة جديدة';
 $labels['composeextwin'] = 'أرسال عن طريق نافذة جديدة';
 $labels['htmleditor'] = 'إنشاء رسائل بنسق HTML';
 $labels['htmlonreply'] = 'حال الرد على الرسائل بصيغة HTML فقط';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'توقيع HTML';
 $labels['previewpane'] = 'إظهار قسم المعاينة';
 $labels['skin'] = 'شكل الواجهة';
@@ -345,14 +415,16 @@ $labels['readwhendeleted'] = 'تحديد الرسالة كمقروءة عند ح
 $labels['flagfordeletion'] = 'وضع علامة على الرسالة لحذفها بدلاً منحذفها';
 $labels['skipdeleted'] = 'لا تظهر الرسائل المحذوفة';
 $labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلىالمهملات';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'إظهار الصور الخارجية المدمجة';
 $labels['fromknownsenders'] = 'للمرسلين المعلومين';
 $labels['always'] = 'دائماً';
 $labels['showinlineimages'] = 'إظهار الصّور المرفقة أسفل الرسالة';
-$labels['autosavedraft'] = 'حفظ المسودة تلقائياً';
-$labels['everynminutes'] = 'كل $n دقيقة';
-$labels['never'] = 'أبداً';
-$labels['immediately'] = 'حالاً';
+$labels['autosavedraft']  = 'حفظ المسودة تلقائياً';
+$labels['everynminutes']  = 'كل $n دقيقة';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'أبداً';
+$labels['immediately']  = 'حالاً';
 $labels['messagesdisplaying'] = 'إظهار الرسائل';
 $labels['messagescomposition'] = 'إنشاء الرسائل';
 $labels['mimeparamfolding'] = 'أسماء الملفات المرفقة';
@@ -364,12 +436,15 @@ $labels['advancedoptions'] = 'خيارات متقدّمة';
 $labels['focusonnewmessage'] = 'التركيز على نافذة المتصفح عند وجود رسالةجديدة';
 $labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميعالمجلدات';
 $labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقلالرسالة الحالية';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'الخيارات الأساسية';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'قسم';
 $labels['maintenance'] = 'الصيانة';
 $labels['newmessage'] = 'رسالة جديدة';
 $labels['signatureoptions'] = 'خيارات التوقيع';
 $labels['whenreplying'] = 'عند الرد';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'بدء رسالة جديدة ووضع النص أعلى الأصلية';
 $labels['replybottomposting'] = 'بدء رسالة جديدة ووضع النص أسفل الأصلية';
 $labels['replyremovesignature'] = 'إزالة التوقيع من الرسالة عند الرد';
@@ -380,26 +455,33 @@ $labels['replysignaturepos'] = 'إضافة التوقيع عند الرد أو �
 $labels['belowquote'] = 'بعد الاقتباس';
 $labels['abovequote'] = 'قبل الاقتباس';
 $labels['insertsignature'] = 'إضافة التوقيع';
-$labels['previewpanemarkread'] = 'تحديد الرسائل المُعاينة كمقروءة';
-$labels['afternseconds'] = 'بعد $n ثواني';
+$labels['previewpanemarkread']  = 'تحديد الرسائل المُعاينة كمقروءة';
+$labels['afternseconds']  = 'بعد $n ثواني';
 $labels['reqmdn'] = 'طلب إشعار استلام دائماً';
 $labels['reqdsn'] = 'طلب تنويه لحالة التوصيل دائماً';
 $labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالةالمردود عليها';
-$labels['defaultaddressbook'] = 'أضف المراسلين الجديد إلى دفتر العناوينالمحدد';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'تجاهل عنوان البريد الإلكتروني البديل فيالتكملة التلقائية';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'تحقق من الإملاء قبل إرسال الرسائل';
 $labels['spellcheckoptions'] = 'خيارات التدقيق الإملاءي';
 $labels['spellcheckignoresyms'] = 'تجاهل الكلمات التي تحتوي رموز';
 $labels['spellcheckignorenums'] = 'تجاهل الكلمات التي تحتوي أرقام';
 $labels['spellcheckignorecaps'] = 'تجاهل الكلمات التي بها أحرف كبيرة';
 $labels['addtodict'] = 'إضافة إلى القامس';
-$labels['folder'] = 'مجلد';
-$labels['foldername'] = 'اسم المجلد';
-$labels['subscribed'] = 'مشترك';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'مجلد';
+$labels['folders']  = 'مجلدات';
+$labels['foldername']  = 'اسم المجلد';
+$labels['subscribed']  = 'مشترك';
 $labels['messagecount'] = 'الرسائل';
-$labels['create'] = 'أنشئ';
-$labels['createfolder'] = 'أنشئ مجلد جديد';
-$labels['managefolders'] = 'إدارة المجلدات';
+$labels['create']  = 'أنشئ';
+$labels['createfolder']  = 'أنشئ مجلد جديد';
+$labels['managefolders']  = 'إدارة المجلدات';
 $labels['specialfolders'] = 'المجلّدات المُميّزة';
 $labels['properties'] = 'الخواص';
 $labels['folderproperties'] = 'خواص المجلد';
@@ -409,22 +491,29 @@ $labels['info'] = 'معلومات';
 $labels['getfoldersize'] = 'اضغط لمعرفة حجم المجلد';
 $labels['changesubscription'] = 'اضغط لتغيير حالة الإشتراك';
 $labels['foldertype'] = 'نوع المجلد';
-$labels['personalfolder'] = 'مجلد خاص';
-$labels['otherfolder'] = 'مجلد مستخدم آخر';
-$labels['sharedfolder'] = 'مجلد عام';
+$labels['personalfolder']  = 'مجلد خاص';
+$labels['otherfolder']  = 'مجلد مستخدم آخر';
+$labels['sharedfolder']  = 'مجلد عام';
+
 $labels['sortby'] = 'ترتيب بحسب';
-$labels['sortasc'] = 'ترتيب تصاعدي';
+$labels['sortasc']  = 'ترتيب تصاعدي';
 $labels['sortdesc'] = 'ترتيب تنازلي';
 $labels['undo'] = 'تراجع';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'إضافة';
 $labels['version'] = 'النسخة';
 $labels['source'] = 'المصدر';
 $labels['license'] = 'الترخيص';
 $labels['support'] = 'احصل على الدعم الفني';
+
+// units
 $labels['B'] = 'ب';
 $labels['KB'] = 'ك.ب';
 $labels['MB'] = 'م.ب';
 $labels['GB'] = 'ج.ب';
+
+// character sets
 $labels['unicode'] = 'يونيكود';
 $labels['english'] = 'الإنجليزية';
 $labels['westerneuropean'] = 'الغرب أوروبية';
@@ -444,3 +533,4 @@ $labels['japanese'] = 'اليابانية';
 $labels['korean'] = 'الكورية';
 $labels['chinese'] = 'الصينية';
 
+?>
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index b1e25b88d..e10c83228 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -2,31 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'فشل تسجيل الدخول';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'فشل تسجيل الدخول';
 $messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
 $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غيرصالحة';
 $messages['storageerror'] = 'فشل الاتصال بخادم IMAP';
 $messages['servererror'] = 'خطأ في الخادم!';
 $messages['servererrormsg'] = 'خطأ خادم: $msg';
 $messages['dberror'] = 'خطأ في قاعدة البيانات!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.';
 $messages['errornoperm'] = 'تعذر تنفيذ العملية. ليست لديك الصلاحية.';
 $messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
 $messages['loggedout'] = 'قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
 $messages['mailboxempty'] = 'صندوق البريد فارغ';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'جاري العمل...';
 $messages['uploading'] = 'جاري رفع الملف...';
 $messages['uploadingmany'] = 'جاري تحميل الملفات...';
@@ -53,11 +60,11 @@ $messages['errormoving'] = 'تعذر نقل هذه الرسالة';
 $messages['errorcopying'] = 'تعذر نسخ الرسائل';
 $messages['errordeleting'] = 'تعذر حذف هذه الرسالة';
 $messages['errormarking'] = 'تعذر تحديد الرسائل';
-$messages['deletecontactconfirm'] = 'هل تريد حقاً حذف المراسلـ(ين) المحدد(ين)؟';
-$messages['deletegroupconfirm'] = 'هل تريد فعلاً حذف المجموعة المحددة؟';
+$messages['deletecontactconfirm']  = 'هل تريد حقاً حذف المراسلـ(ين) المحدد(ين)؟';
+$messages['deletegroupconfirm']  = 'هل تريد فعلاً حذف المجموعة المحددة؟';
 $messages['deletemessagesconfirm'] = 'هل تريد حذف الرسائل المحددة؟';
-$messages['deletefolderconfirm'] = 'هل تريد حقاً حذف هذا المجلد؟';
-$messages['purgefolderconfirm'] = 'هل تريد حقاً حذف جميع الرسائل في هذاالمجلد؟';
+$messages['deletefolderconfirm']  = 'هل تريد حقاً حذف هذا المجلد؟';
+$messages['purgefolderconfirm']  = 'هل تريد حقاً حذف جميع الرسائل في هذاالمجلد؟';
 $messages['contactdeleting'] = 'جاري حذف المُراسلين...';
 $messages['groupdeleting'] = 'جاري حذف المجموعة...';
 $messages['folderdeleting'] = 'جاري حذف المجلد...';
@@ -66,11 +73,11 @@ $messages['foldersubscribing'] = 'الإشتراك في المجلد...';
 $messages['folderunsubscribing'] = 'إلغاء الإشتراك في المجد...';
 $messages['formincomplete'] = 'لم يتم تعبئة بيانات الاستمارة بالكامل';
 $messages['noemailwarning'] = 'الرجاء إدخال عنوان بريد إلكتروني صالح';
-$messages['nonamewarning'] = 'الرجاء إدخال اسم';
+$messages['nonamewarning']  = 'الرجاء إدخال اسم';
 $messages['nopagesizewarning'] = 'الرجاء إدخال حجم الصفحة';
 $messages['nosenderwarning'] = 'رجاء اكتب عنوان البريد الالكترونيللمُرسل';
 $messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل واحد على الأقل';
-$messages['nosubjectwarning'] = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
+$messages['nosubjectwarning']  = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
 $messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
 $messages['notsentwarning'] = 'لم يتم إرسال الرسالة. هل تريد تجاهلالرسالة؟';
 $messages['noldapserver'] = 'الرجاء اختيار خادم ldap للبحث فيه';
@@ -105,13 +112,16 @@ $messages['addingmember'] = 'جاري إضافة المُراسلين إلى ا�
 $messages['removingmember'] = 'جاري إزالة المراسلين من المجموعة...';
 $messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
 $messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيدالمتبقي.';
 $messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
 $messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
 $messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
 $messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعةبنجاح';
 $messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعةبنجاح';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل$skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>تم تجاهل $skipped عناصر موجودة</b>';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
@@ -153,4 +163,7 @@ $messages['invalidimageformat'] = 'ليست صيغة صورة صحيحة';
 $messages['mispellingsfound'] = 'عُثر على أخطاء إملائية في الرسالة';
 $messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد.ليست لديك الصلاحية.';
 $messages['messagetoobig'] = 'جزء الرسالة أكبر بكثير مما يمكن معالجته.';
+$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/ast/labels.inc b/program/localization/ast/labels.inc
index fedc40019..075097e42 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -2,53 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization//labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienllegáu a $product';
-$labels['username'] = 'Usuariu';
-$labels['password'] = 'Clave';
-$labels['server'] = 'Sirvidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Zarrar';
-$labels['mail'] = 'Corréu';
+
+// login page
+$labels['welcome']   = 'Bienllegáu a $product';
+$labels['username']  = 'Usuariu';
+$labels['password']  = 'Clave';
+$labels['server']    = 'Sirvidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Zarrar';
+$labels['mail']     = 'Corréu';
 $labels['settings'] = 'Preferencies personales';
 $labels['addressbook'] = 'Llibru de direiciones';
-$labels['inbox'] = 'Entrantes';
+
+// mailbox names
+$labels['inbox']  = 'Entrantes';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Unviaos';
-$labels['trash'] = 'Papelera';
-$labels['junk'] = 'Puxarra';
+$labels['sent']   = 'Unviaos';
+$labels['trash']  = 'Papelera';
+$labels['junk']   = 'Puxarra';
+
+// message listing
 $labels['subject'] = 'Asuntu';
-$labels['from'] = 'De';
-$labels['to'] = 'Pa';
-$labels['cc'] = 'Copia';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'De';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Pa';
+$labels['cc']      = 'Copia';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Contestar a';
-$labels['date'] = 'Fecha';
-$labels['size'] = 'Tamañu';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Fecha';
+$labels['size']    = 'Tamañu';
 $labels['priority'] = 'Prioridá';
 $labels['organization'] = 'Organización';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Bandexes';
-$labels['folders'] = 'Bandexes';
 $labels['messagesfromto'] = 'Mensaxes del $from a $to de $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
-$labels['copy'] = 'Copia';
-$labels['moveto'] = 'mover pa...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Copia';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'mover pa...';
 $labels['download'] = 'baxar';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nome del Ficheru';
 $labels['filesize'] = 'Tamañu del ficheru';
+
 $labels['addtoaddressbook'] = 'Amestar al llibru de direiciones';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Llu';
 $labels['tue'] = 'Mar';
@@ -56,161 +80,323 @@ $labels['wed'] = 'Mie';
 $labels['thu'] = 'Xue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Domingu';
-$labels['monday'] = 'Llunes';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingu';
+$labels['monday']    = 'Llunes';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Miércoles';
-$labels['thursday'] = 'Xueves';
-$labels['friday'] = 'Vienres';
-$labels['saturday'] = 'Sábadu';
-$labels['jan'] = 'Xin';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Mayu';
-$labels['longmay'] = 'Mayu';
-$labels['jun'] = 'Xun';
-$labels['jul'] = 'Xnt';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Och';
-$labels['nov'] = 'Pay';
-$labels['dec'] = 'Avi';
-$labels['longjan'] = 'Xineru';
-$labels['longfeb'] = 'Febreru';
-$labels['longmar'] = 'Marzu';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Xunu';
-$labels['longjul'] = 'Xunetu';
-$labels['longaug'] = 'Agostu';
-$labels['longsep'] = 'Setiembre';
-$labels['longoct'] = 'Ochobre';
-$labels['longnov'] = 'Payares';
-$labels['longdec'] = 'Avientu';
+$labels['thursday']  = 'Xueves';
+$labels['friday']    = 'Vienres';
+$labels['saturday']  = 'Sábadu';
+
+// months short
+$labels['jan']	= 'Xin';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Mayu';
+$labels['jun']	= 'Xun';
+$labels['jul'] 	= 'Xnt';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Och';
+$labels['nov']	= 'Pay';
+$labels['dec']	= 'Avi';
+
+// months long
+$labels['longjan']	= 'Xineru';
+$labels['longfeb']	= 'Febreru';
+$labels['longmar']	= 'Marzu';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Mayu';
+$labels['longjun']	= 'Xunu';
+$labels['longjul']	= 'Xunetu';
+$labels['longaug']	= 'Agostu';
+$labels['longsep']	= 'Setiembre';
+$labels['longoct']	= 'Ochobre';
+$labels['longnov']	= 'Payares';
+$labels['longdec']	= 'Avientu';
+
 $labels['today'] = 'Güei';
-$labels['checkmail'] = 'Buscar mensaxes nuevos';
-$labels['writenewmessage'] = 'Facer un mensaxe nuevu';
-$labels['replytomessage'] = 'Contestar al mensaxe';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Buscar mensaxes nuevos';
+$labels['compose']          = 'Escribir un mensaxe';
+$labels['writenewmessage']  = 'Facer un mensaxe nuevu';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Contestar al mensaxe';
 $labels['replytoallmessage'] = 'Contestar a toos';
-$labels['forwardmessage'] = 'Reunviar mensaxe';
-$labels['deletemessage'] = 'Desaniciar mensaxe';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Reunviar mensaxe';
+$labels['deletemessage']    = 'Desaniciar mensaxe';
 $labels['movemessagetotrash'] = 'Mover mensaxe a la papelera';
-$labels['printmessage'] = 'Imprentar esti mensaxe';
-$labels['previousmessage'] = 'Amosar el mensaxe anterior';
-$labels['firstmessage'] = 'Amosar primer mensaxe';
-$labels['nextmessage'] = 'Amosar el mensaxe siguiente';
-$labels['lastmessage'] = 'Amosar l\'últimu mensaxe';
-$labels['backtolist'] = 'Tornar a la llista de mensaxes';
-$labels['viewsource'] = 'Amosar el códigu';
-$labels['markmessages'] = 'Marcar mensaxes';
-$labels['markread'] = 'Como lleíu';
-$labels['markunread'] = 'Como non lleíu';
-$labels['markflagged'] = 'Como marcáu';
-$labels['markunflagged'] = 'Como non marcáu';
+$labels['printmessage']     = 'Imprentar esti mensaxe';
+$labels['previousmessage']  = 'Amosar el mensaxe anterior';
+$labels['firstmessage']     = 'Amosar primer mensaxe';
+$labels['nextmessage']      = 'Amosar el mensaxe siguiente';
+$labels['lastmessage']      = 'Amosar l\'últimu mensaxe';
+$labels['backtolist']       = 'Tornar a la llista de mensaxes';
+$labels['viewsource']       = 'Amosar el códigu';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Marcar mensaxes';
+$labels['markread']         = 'Como lleíu';
+$labels['markunread']       = 'Como non lleíu';
+$labels['markflagged']      = 'Como marcáu';
+$labels['markunflagged']    = 'Como non marcáu';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Escueye';
 $labels['all'] = 'Toos';
 $labels['none'] = 'Nengún';
-$labels['nonesort'] = 'Nengún';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Ensin lleer';
 $labels['flagged'] = 'Marcáu';
 $labels['unanswered'] = 'Ensin contestar';
 $labels['deleted'] = 'Desaniciáu';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtru';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Nengún';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compautar';
 $labels['empty'] = 'Vaciar';
+
 $labels['quota'] = 'Espaciu en discu';
-$labels['unknown'] = 'desconocíu';
-$labels['unlimited'] = 'ensin llímite';
-$labels['quicksearch'] = 'Búsqueda rápida';
-$labels['resetsearch'] = 'Anovar la búsqueda';
-$labels['searchmod'] = 'Guetar modificadores';
-$labels['msgtext'] = 'Mensax completu';
+$labels['unknown']  = 'desconocíu';
+$labels['unlimited']  = 'ensin llímite';
+
+$labels['quicksearch']  = 'Búsqueda rápida';
+$labels['resetsearch']  = 'Anovar la búsqueda';
+$labels['searchmod']  = 'Guetar modificadores';
+$labels['msgtext']  = 'Mensax completu';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Abrir en una ventana nueva';
 $labels['emlsave'] = 'Baxar (.eml)';
-$labels['compose'] = 'Escribir un mensaxe';
-$labels['editasnew'] = 'Editar como nuevu';
-$labels['savemessage'] = 'Guardar como borrador';
-$labels['sendmessage'] = 'Unviar el mensaxe yá';
-$labels['addattachment'] = 'Amestar un archivu';
-$labels['charset'] = 'Codificación';
-$labels['editortype'] = 'Tipo d\'editor';
-$labels['returnreceipt'] = 'Avisu de recibu';
+
+// message compose
+$labels['editasnew']      = 'Editar como nuevu';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Unviar el mensaxe yá';
+$labels['savemessage']    = 'Guardar como borrador';
+$labels['addattachment']  = 'Amestar un archivu';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo d\'editor';
+$labels['returnreceipt']  = 'Avisu de recibu';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Siguir cola edición';
-$labels['revertto'] = 'Desfacer a';
+$labels['revertto']      = 'Desfacer a';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Axuntos';
 $labels['upload'] = 'Xubir';
-$labels['close'] = 'Zarrar';
-$labels['low'] = 'Baxu';
-$labels['lowest'] = 'Mui baxu';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Altu';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Zarrar';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Baxu';
+$labels['lowest']  = 'Mui baxu';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Altu';
 $labels['highest'] = 'Mui altu';
-$labels['nosubject'] = '(ensin asuntu)';
+
+$labels['nosubject']  = '(ensin asuntu)';
 $labels['showimages'] = 'Amosar imáxenes';
 $labels['alwaysshow'] = 'Amosar siempre les imáxenes de $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testu';
 $labels['savesentmessagein'] = 'Guardar mensaxe unviau en';
 $labels['dontsave'] = 'Desanicialu';
 $labels['maxuploadsize'] = 'El tamañu másimu pa un ficheru ye $size';
+
 $labels['addcc'] = 'Amestar Cc';
 $labels['addbcc'] = 'Amestar Bcc';
 $labels['addreplyto'] = 'Amestar Rempuesta pa';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'El qu\'unvia esti mensaxe quier que lo avises cuando lleas el corréu. ¿Quies avisalo?';
 $labels['receiptread'] = 'Avisu de llectura';
 $labels['yourmessage'] = 'Esto ye un avisu de llectura del to mensaxe';
 $labels['receiptnote'] = 'Nota: Esti avisu namás quier dicir que\'l to mensaxe amosośe nel equipu del receptor. Nun hai forma de garantizate que lo lleera o que pescanciara\'l to mensaxe.';
-$labels['name'] = 'Nome completu';
-$labels['firstname'] = 'Nome';
-$labels['surname'] = 'Apellíu';
-$labels['email'] = 'Corréu';
+
+// address boook
+$labels['name']         = 'Nome completu';
+$labels['firstname']    = 'Nome';
+$labels['surname']      = 'Apellíu';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Corréu';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Amestar contautu nuevu';
 $labels['editcontact'] = 'Editar contautu';
-$labels['edit'] = 'Editar';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Encaboxar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Desaniciar';
-$labels['newcontact'] = 'Facer un contautu nuevu';
-$labels['deletecontact'] = 'Desaniciar los contautos marcaos';
-$labels['composeto'] = 'Unviar mensaxe a';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Facer un contautu nuevu';
+$labels['deletecontact']  = 'Desaniciar los contautos marcaos';
+$labels['composeto']      = 'Unviar mensaxe a';
 $labels['contactsfromto'] = 'Contautos $from a $to de $count';
-$labels['print'] = 'Imprentar';
-$labels['export'] = 'Esportar';
-$labels['exportvcards'] = 'Esportar contautos en formatu vCard';
-$labels['previouspage'] = 'Amosar grupu anterior';
-$labels['firstpage'] = 'Amosar primer grupu';
-$labels['nextpage'] = 'Amosar siguiente grupu';
-$labels['lastpage'] = 'Amosar l\'últimu grupu';
+$labels['print']          = 'Imprentar';
+$labels['export']         = 'Esportar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Esportar contautos en formatu vCard';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Amosar grupu anterior';
+$labels['firstpage']      = 'Amosar primer grupu';
+$labels['nextpage']       = 'Amosar siguiente grupu';
+$labels['lastpage']       = 'Amosar l\'últimu grupu';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direiciones personales';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contautos';
 $labels['importfromfile'] = 'Importar dende un ficheru:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Trocar el llibru de direiciones enteru';
-$labels['importtext'] = 'Puedes xubir direcione d\'un llibr que yá tengas.<br/>Anguaño puedes importar direiciones en formatu <a href="http://ast.wikipedia.org/wiki/VCard">vCard</a>.';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Fecho';
+
+// settings
 $labels['settingsfor'] = 'Configuración pa';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferencies';
 $labels['userpreferences'] = 'Preferencies d\'usuariu';
 $labels['editpreferences'] = 'Editar preferencies d\'usuariu';
+
 $labels['identities'] = 'Identidaes';
 $labels['manageidentities'] = 'Remanar identidaes pa esta cuenta';
 $labels['newidentity'] = 'Identidad nueva';
+
 $labels['newitem'] = 'Nuevu';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Amosar HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mensaxe HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Fecha prestosa';
-$labels['setdefault'] = 'Escoyer opción preferída';
-$labels['autodetect'] = 'Escoyer automáticamente';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Franxa horaria';
-$labels['pagesize'] = 'Fileres per páxina';
+$labels['setdefault']  = 'Escoyer opción preferída';
+$labels['autodetect']  = 'Escoyer automáticamente';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Franxa horaria';
+$labels['pagesize']  = 'Fileres per páxina';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Cambéu horariu';
+$labels['dstactive']  = 'Cambéu horariu';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Facer el mensaxe n\'HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Firma HTML';
 $labels['previewpane'] = 'Entever';
 $labels['skin'] = 'Estilu';
@@ -222,45 +408,129 @@ $labels['mailboxview'] = 'Vista del buzón';
 $labels['mdnrequests'] = 'Avisos d\'unvios';
 $labels['askuser'] = 'preguntar al usuariu';
 $labels['autosend'] = 'unviar de secute';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignoralos';
 $labels['readwhendeleted'] = 'Marcar el mensaxe como lleíu al desanicialu';
 $labels['flagfordeletion'] = 'Marcar el mensaxe pa desaniciase en cuenta de desanicialu dafechu';
 $labels['skipdeleted'] = 'Nun amosar los mensaxes desaniciaos';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Amosar imáxenes remotes';
 $labels['fromknownsenders'] = 'de contautos conocíos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Amosar imáxenes axuntes embaxu\'l mensaxe';
-$labels['autosavedraft'] = 'Guardar borrador de secute';
-$labels['everynminutes'] = 'cada $n minutu/os';
-$labels['keepalive'] = 'Guetar mensaxes nuevos cada';
-$labels['never'] = 'nunca';
+$labels['autosavedraft']  = 'Guardar borrador de secute';
+$labels['everynminutes']  = 'cada $n minutu/os';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Vista de mensaxes';
 $labels['messagescomposition'] = 'Edición de mensaxes';
 $labels['mimeparamfolding'] = 'Nomes d\'axuntos';
 $labels['2231folding'] = 'Too RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Too RFC 2047 (otros)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Opciones avanzaes';
 $labels['focusonnewmessage'] = 'Poner el focu nos mensaxes nuevos';
 $labels['checkallfolders'] = 'Guetar mensaxes nuevos en toles bandexes';
 $labels['displaynext'] = 'Depués de mover/desaniciar amosar el mensaxe que sigue darréu';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Opciones principales';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Seición';
 $labels['maintenance'] = 'Mantenimientu';
 $labels['newmessage'] = 'Mensax nuevu';
-$labels['folder'] = 'Bandexa';
-$labels['foldername'] = 'Nome de bandexa';
-$labels['subscribed'] = 'Soscrita';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Bandexa';
+$labels['folders']  = 'Bandexes';
+$labels['foldername']  = 'Nome de bandexa';
+$labels['subscribed']  = 'Soscrita';
 $labels['messagecount'] = 'Mensaxes';
-$labels['create'] = 'Facer';
-$labels['createfolder'] = 'Facer una bandexa nueva';
-$labels['managefolders'] = 'Alministrar bandexes';
+$labels['create']  = 'Facer';
+$labels['createfolder']  = 'Facer una bandexa nueva';
+$labels['managefolders']  = 'Alministrar bandexes';
 $labels['specialfolders'] = 'Bandexes especiales';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orden ascendente';
+$labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 19bbfed8b..135f70b73 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -2,29 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization//messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'La clave nun val';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'La clave nun val';
 $messages['cookiesdisabled'] = 'El to navegador nun acepta "cookies';
 $messages['sessionerror'] = 'La to sesión nun val';
 $messages['storageerror'] = 'Fallu de conexón col sirvidor IMAP';
 $messages['servererror'] = '¡Fallu del sirvidor!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
 $messages['invalidrequest'] = 'Fallu de la solicitú. Nun se guardaron datos.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nun doi con mensaxes';
 $messages['loggedout'] = 'Zarraste la sesión.';
 $messages['mailboxempty'] = 'La to cuenta nun tien mensaxes';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Cargando...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'A la gueta de mensaxes nuevos...';
 $messages['sendingmessage'] = 'Unviando mensaxe...';
@@ -34,40 +46,54 @@ $messages['messagesaved'] = 'El mensaxe guardóse en borradores';
 $messages['successfullysaved'] = 'Guardose correchamente';
 $messages['addedsuccessfully'] = 'El contautu amestose correchamente a la llibreta de direiciones';
 $messages['contactexists'] = 'Yá hai un contuaut con es direición de corréu';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Pa protexer la to privacidá, torgáronse les imáxenes esternes n\'esti mensaxe';
 $messages['encryptedmessage'] = 'Esti ye un mensaxe cifráu y nun soi a amosalu.';
 $messages['nocontactsfound'] = 'Nun doi con nengún contautu';
 $messages['contactnotfound'] = 'Nun doi col contautu que pides';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Falló l\'unvio del mensaxe';
 $messages['senttooquickly'] = 'Por favor espera $sec segundu/os enantes d\'unviar esti mensaxe.';
 $messages['errorsavingsent'] = 'Di con un fallu al guardar el mensaxe';
 $messages['errorsaving'] = 'Falló al guardase';
 $messages['errormoving'] = 'Nun fui a mover el mensaxe';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Nun fui a desaniciar el mensaxe';
 $messages['errormarking'] = 'Nun se puede marcar el mensaxe';
-$messages['deletecontactconfirm'] = '¿Tas seguru de desaniciar los contautos que marcaste?';
+$messages['deletecontactconfirm']  = '¿Tas seguru de desaniciar los contautos que marcaste?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = '¿Tas seguru de desaniciar los mensaxes que marcaste?';
-$messages['deletefolderconfirm'] = '¿Tas seguru de desaniciar esta bandexa?';
-$messages['purgefolderconfirm'] = '¿Tas seguru de desaniciar tolos mensaxes d\'esta bandexa?';
+$messages['deletefolderconfirm']  = '¿Tas seguru de desaniciar esta bandexa?';
+$messages['purgefolderconfirm']  = '¿Tas seguru de desaniciar tolos mensaxes d\'esta bandexa?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Desaniciando la bandexa...';
 $messages['foldermoving'] = 'Moviendo la bandexa...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Tienes de rellenar tolos campos del formulariu';
 $messages['noemailwarning'] = 'Por favor, dame un corréu válidu';
-$messages['nonamewarning'] = 'Por favor, dame\'l to nome';
+$messages['nonamewarning']  = 'Por favor, dame\'l to nome';
 $messages['nopagesizewarning'] = 'Por favor, dame un tamañu de páxina';
 $messages['nosenderwarning'] = 'Por favor dame un corréu dende donde unviar mesaxes';
 $messages['norecipientwarning'] = 'Por favor, dame polo menos un destinatariu';
-$messages['nosubjectwarning'] = 'El campo "Asuntu" ta vacíu. ¿Quiés rellenalu anguaño?';
+$messages['nosubjectwarning']  = 'El campo "Asuntu" ta vacíu. ¿Quiés rellenalu anguaño?';
 $messages['nobodywarning'] = '¿Quies unviar esti mensaxe ensin testu?';
 $messages['notsentwarning'] = 'Nun unvie\'l mensaxe. ¿Quies desanicialu?';
 $messages['noldapserver'] = 'Por favor, escueye un sirvidor LDAP pa buscar';
 $messages['nosearchname'] = 'Por favor, dame un nome o una direición de corréu';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'Di con $nr mensaxes';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Nun di con nengún resultáu';
 $messages['searching'] = 'A la gueta...';
 $messages['checking'] = 'Comprobando...';
 $messages['nospellerrors'] = 'Nun di con errores ortográficos';
 $messages['folderdeleted'] = 'Desaniciose la bandexa correchamente';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Desaniciose correchamente';
 $messages['converting'] = 'Desaniciando\'l formatu del mensaxe...';
 $messages['messageopenerror'] = 'Nun soi a baxer el mensaxe del sirvidor';
@@ -78,15 +104,26 @@ $messages['copyerror'] = 'Nun fui a copiar nenguna direición';
 $messages['sourceisreadonly'] = 'Esta direición ye de namái-llectura';
 $messages['errorsavingcontact'] = 'Nun fui a guardar la direición del contautu';
 $messages['movingmessage'] = 'Moviendo\'l mensaxe...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Unviose correchamente l\'avisu de llectura.';
 $messages['errorsendingreceipt'] = 'Nun fui a unviar l\'avisu de llectura.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Nun puedo desaniciar esa identidá porque ye la última.';
 $messages['forbiddencharacter'] = 'El nome de la bandexa tien un caráuter que nun val';
 $messages['selectimportfile'] = 'Por favor escueye el ficheru que quies xubir';
 $messages['addresswriterror'] = 'Nun puedo escribir nel llibru de direiciones qu\'escoyisti';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Importando, dame un minutín...';
-$messages['importerror'] = 'Nun fui a importar. El ficheru qu\'escoyiste nun ye un ficheru vCard válidu.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Importaronse correchamente $inserted contautos, saltáronse $skipped entrase que yá esistíen</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Nun tienes permisu pa facelo.';
 $messages['nofromaddress'] = 'Perdiose la direición de corréu de la identidá qu\'escoyisti';
 $messages['editorwarning'] = 'Si pases a editor en modu testu vas perder tol estilu aplicáu al mensaxe. ¿Tas seguru de que quies facelo?';
@@ -97,4 +134,36 @@ $messages['smtpfromerror'] = 'Fallu SMTP ($code): Fallu al aficar el remitente "
 $messages['smtptoerror'] = 'Fallu SMTP ($code): Fallu al amestar el destinatariu "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Fallu SMTP: Nun soi a amosar la llista de destinatarios';
 $messages['smtperror'] = 'Fallu SMTP: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 67450be9b..1b7994f8d 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product-a xoş gəldiniz!';
-$labels['username'] = 'İstifadəçi adı';
-$labels['password'] = 'Şifrə';
-$labels['server'] = 'Server';
-$labels['login'] = 'Giriş';
-$labels['logout'] = 'Çıx';
-$labels['mail'] = 'Poçt';
+
+// login page
+$labels['welcome']   = '$product-a xoş gəldiniz!';
+$labels['username']  = 'İstifadəçi adı';
+$labels['password']  = 'Şifrə';
+$labels['server']    = 'Server';
+$labels['login']     = 'Giriş';
+
+// taskbar
+$labels['logout']   = 'Çıx';
+$labels['mail']     = 'Poçt';
 $labels['settings'] = 'Nizamlamalar';
 $labels['addressbook'] = 'Ünvanlar';
-$labels['inbox'] = 'Gələnlər';
+
+// mailbox names
+$labels['inbox']  = 'Gələnlər';
 $labels['drafts'] = 'Qaralamalar';
-$labels['sent'] = 'Göndərilənlər';
-$labels['trash'] = 'Səbət';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Göndərilənlər';
+$labels['trash']  = 'Səbət';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Mövzu';
-$labels['from'] = 'Kimdən';
-$labels['to'] = 'Kimə';
-$labels['cc'] = 'Nüsxə';
-$labels['bcc'] = 'Gizli';
+$labels['from']    = 'Kimdən';
+$labels['sender']  = 'Göndərən';
+$labels['to']      = 'Kimə';
+$labels['cc']      = 'Nüsxə';
+$labels['bcc']     = 'Gizli';
 $labels['replyto'] = 'Cavabla';
 $labels['followupto'] = 'İzlə';
-$labels['date'] = 'Tarix';
-$labels['size'] = 'Ölçü';
+$labels['date']    = 'Tarix';
+$labels['size']    = 'Ölçü';
 $labels['priority'] = 'Vaciblik';
 $labels['organization'] = 'Təşkilat';
 $labels['readstatus'] = 'Statusu oxu';
 $labels['listoptions'] = 'Siyahı ayarları...';
+
 $labels['mailboxlist'] = 'Qovluqlar';
-$labels['folders'] = 'Qovluqlar';
 $labels['messagesfromto'] = '$count mesajdan $from - $to arası mesajlar';
 $labels['threadsfromto'] = 'Müzakirə: $from - $to Toplam: $count';
 $labels['messagenrof'] = 'Məktub: $nr / $count';
 $labels['fromtoshort'] = '$from – $to-dan $count';
-$labels['copy'] = 'Kopyala';
-$labels['move'] = 'Köçür';
-$labels['moveto'] = 'Burada köçür...';
+
+$labels['copy']     = 'Kopyala';
+$labels['move']     = 'Köçür';
+$labels['moveto']   = 'Burada köçür...';
 $labels['download'] = 'Endir';
 $labels['showattachment'] = 'Göstər';
 $labels['showanyway'] = 'İstənilən halda göstər';
+
 $labels['filename'] = 'Faylın adı';
 $labels['filesize'] = 'Faylın ölçüsü';
+
 $labels['addtoaddressbook'] = 'Ünvanlara əlavə et';
+
+// weekdays short
 $labels['sun'] = 'B';
 $labels['mon'] = 'Be';
 $labels['tue'] = 'Ç';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Ça';
 $labels['thu'] = 'C';
 $labels['fri'] = 'Ca';
 $labels['sat'] = 'Ş';
-$labels['sunday'] = 'Bazar';
-$labels['monday'] = 'Bazar ertəsi';
-$labels['tuesday'] = 'Çərçənbə';
+
+// weekdays long
+$labels['sunday']    = 'Bazar';
+$labels['monday']    = 'Bazar ertəsi';
+$labels['tuesday']   = 'Çərçənbə';
 $labels['wednesday'] = 'Çərşənbə axşamı';
-$labels['thursday'] = 'Cümə';
-$labels['friday'] = 'Cümə axşamı';
-$labels['saturday'] = 'Şənbə';
-$labels['jan'] = 'Yan';
-$labels['feb'] = 'Fev';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'İyn';
-$labels['jul'] = 'İyl';
-$labels['aug'] = 'Avq';
-$labels['sep'] = 'Sen';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Noy';
-$labels['dec'] = 'Dek';
-$labels['longjan'] = 'Yanvar';
-$labels['longfeb'] = 'Fevral';
-$labels['longmar'] = 'Mart';
-$labels['longapr'] = 'Aprel';
-$labels['longjun'] = 'İyun';
-$labels['longjul'] = 'İyul';
-$labels['longaug'] = 'Avqust';
-$labels['longsep'] = 'Sentyabr';
-$labels['longoct'] = 'Oktyabr';
-$labels['longnov'] = 'Noyabr';
-$labels['longdec'] = 'Dekabr';
+$labels['thursday']  = 'Cümə';
+$labels['friday']    = 'Cümə axşamı';
+$labels['saturday']  = 'Şənbə';
+
+// months short
+$labels['jan']	= 'Yan';
+$labels['feb']	= 'Fev';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'İyn';
+$labels['jul'] 	= 'İyl';
+$labels['aug']	= 'Avq';
+$labels['sep']	= 'Sen';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Noy';
+$labels['dec']	= 'Dek';
+
+// months long
+$labels['longjan']	= 'Yanvar';
+$labels['longfeb']	= 'Fevral';
+$labels['longmar']	= 'Mart';
+$labels['longapr']	= 'Aprel';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'İyun';
+$labels['longjul']	= 'İyul';
+$labels['longaug']	= 'Avqust';
+$labels['longsep']	= 'Sentyabr';
+$labels['longoct']	= 'Oktyabr';
+$labels['longnov']	= 'Noyabr';
+$labels['longdec']	= 'Dekabr';
+
 $labels['today'] = 'Bu gün';
-$labels['refresh'] = 'Yenilə';
-$labels['checkmail'] = 'Gələnləri yoxla';
-$labels['compose'] = 'Məktub yaz';
-$labels['writenewmessage'] = 'Yeni məktub';
-$labels['reply'] = 'Cavabla';
-$labels['replytomessage'] = 'Göndərənə cavabla';
+
+// toolbar buttons
+$labels['refresh']          = 'Yenilə';
+$labels['checkmail']        = 'Gələnləri yoxla';
+$labels['compose']          = 'Məktub yaz';
+$labels['writenewmessage']  = 'Yeni məktub';
+$labels['reply']            = 'Cavabla';
+$labels['replytomessage']   = 'Göndərənə cavabla';
 $labels['replytoallmessage'] = 'Hamıya cavabla';
-$labels['replyall'] = 'Hamıya cavab';
-$labels['replylist'] = 'Cavab siyahısı';
-$labels['forward'] = 'Ötür';
-$labels['forwardinline'] = 'Məktubda ötür';
+$labels['replyall']         = 'Hamıya cavab';
+$labels['replylist']        = 'Cavab siyahısı';
+$labels['forward']          = 'Ötür';
+$labels['forwardinline']    = 'Məktubda ötür';
 $labels['forwardattachment'] = 'Əlavə kimi ötür';
-$labels['forwardmessage'] = 'Yönəlt';
-$labels['deletemessage'] = 'Sil';
+$labels['forwardmessage']   = 'Yönəlt';
+$labels['deletemessage']    = 'Sil';
 $labels['movemessagetotrash'] = 'Məktubu səbətə köçür';
-$labels['printmessage'] = 'Çap et';
-$labels['previousmessage'] = 'Əvvəlki məktubu göstər';
-$labels['firstmessage'] = 'Birinci məktubu göstər';
-$labels['nextmessage'] = 'Sonrakı məktubu göstər';
-$labels['lastmessage'] = 'Sonuncu məktubu göstər';
-$labels['backtolist'] = 'Məktublar siyahısına qayıt';
-$labels['viewsource'] = 'Mənbəni göstər';
-$labels['mark'] = 'İşarələ';
-$labels['markmessages'] = 'Məktubları işarələ';
-$labels['markread'] = 'Oxunmuş';
-$labels['markunread'] = 'Oxunmamış';
-$labels['markflagged'] = 'Qeyd et';
-$labels['markunflagged'] = 'Qeydi çıxar';
-$labels['moreactions'] = 'Daha çox seçim...';
-$labels['more'] = 'Daha çox';
-$labels['back'] = 'Geri';
-$labels['options'] = 'Ayarlar';
+$labels['printmessage']     = 'Çap et';
+$labels['previousmessage']  = 'Əvvəlki məktubu göstər';
+$labels['firstmessage']     = 'Birinci məktubu göstər';
+$labels['nextmessage']      = 'Sonrakı məktubu göstər';
+$labels['lastmessage']      = 'Sonuncu məktubu göstər';
+$labels['backtolist']       = 'Məktublar siyahısına qayıt';
+$labels['viewsource']       = 'Mənbəni göstər';
+$labels['mark']             = 'İşarələ';
+$labels['markmessages']     = 'Məktubları işarələ';
+$labels['markread']         = 'Oxunmuş';
+$labels['markunread']       = 'Oxunmamış';
+$labels['markflagged']      = 'Qeyd et';
+$labels['markunflagged']    = 'Qeydi çıxar';
+$labels['moreactions']      = 'Daha çox seçim...';
+$labels['more']             = 'Daha çox';
+$labels['back']             = 'Geri';
+$labels['options']          = 'Ayarlar';
+
 $labels['select'] = 'Seçin';
 $labels['all'] = 'Hamısı';
 $labels['none'] = 'Heç biri';
-$labels['nonesort'] = 'Heç biri';
 $labels['currpage'] = 'Hazırki səhifəni';
 $labels['unread'] = 'Oxunmamışları';
 $labels['flagged'] = 'İşarəliləri';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Hamısını aç';
 $labels['expand-unread'] = 'Oxunmamışları aç';
 $labels['collapse-all'] = 'Hamısını bük';
 $labels['threaded'] = 'Müzakirə';
+
 $labels['autoexpand_threads'] = 'Müzakirəni aç';
 $labels['do_expand'] = 'bütün müzakirələr';
 $labels['expand_only_unread'] = 'yalnız oxunmamış məktublarla';
 $labels['fromto'] = 'Göndərən/Qəbul edən';
 $labels['flag'] = 'Bayrağ';
 $labels['attachment'] = 'Əlavə';
+$labels['nonesort'] = 'Heç biri';
 $labels['sentdate'] = 'Göndərilmə tarixi';
 $labels['arrival'] = 'Çatdırılma tarixi';
 $labels['asc'] = 'Çoxalan';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Sütunlar';
 $labels['listsorting'] = 'Sütunları çeşidlə';
 $labels['listorder'] = 'Çeşidləmə qaydası';
 $labels['listmode'] = 'Görünüş rejimi';
+
 $labels['folderactions'] = 'Qovluq işləri...';
 $labels['compact'] = 'Sıx';
 $labels['empty'] = 'Boşalt';
+
 $labels['quota'] = 'Disk istifadəsi';
-$labels['unknown'] = 'naməlum';
-$labels['unlimited'] = 'limitsiz';
-$labels['quicksearch'] = 'Sürətli axtarış';
-$labels['resetsearch'] = 'Axtarışı yenilə';
-$labels['searchmod'] = 'Axtarış variantları';
-$labels['msgtext'] = 'Bütün məktub';
+$labels['unknown']  = 'naməlum';
+$labels['unlimited']  = 'limitsiz';
+
+$labels['quicksearch']  = 'Sürətli axtarış';
+$labels['resetsearch']  = 'Axtarışı yenilə';
+$labels['searchmod']  = 'Axtarış variantları';
+$labels['msgtext']  = 'Bütün məktub';
+$labels['body']  = 'Mətn';
+
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
-$labels['editasnew'] = 'Yeni kimi redaktə et';
-$labels['send'] = 'Göndər';
-$labels['sendmessage'] = 'İndi göndər';
-$labels['savemessage'] = 'Qaralama saxla';
-$labels['addattachment'] = 'Fayl əlavə et';
-$labels['charset'] = 'Kodlaşdırma';
-$labels['editortype'] = 'Redaktor';
-$labels['returnreceipt'] = 'Cavab sorğusu';
-$labels['dsn'] = 'Çatdırılma statusu haqda bildiriş';
+
+// message compose
+$labels['editasnew']      = 'Yeni kimi redaktə et';
+$labels['send']           = 'Göndər';
+$labels['sendmessage']    = 'İndi göndər';
+$labels['savemessage']    = 'Qaralama saxla';
+$labels['addattachment']  = 'Fayl əlavə et';
+$labels['charset']        = 'Kodlaşdırma';
+$labels['editortype']     = 'Redaktor';
+$labels['returnreceipt']  = 'Cavab sorğusu';
+$labels['dsn']            = 'Çatdırılma statusu haqda bildiriş';
 $labels['mailreplyintro'] = '$date tarixdə, $sender yazıb:';
 $labels['originalmessage'] = 'Orijinal məktub';
-$labels['editidents'] = 'İdentifikasiyanı dəyiş';
-$labels['spellcheck'] = 'Orfoqrafiya';
+
+$labels['editidents']    = 'İdentifikasiyanı dəyiş';
+$labels['spellcheck']    = 'Orfoqrafiya';
 $labels['checkspelling'] = 'Orfoqrafiyanı yoxla';
 $labels['resumeediting'] = 'Redaktəni davam et';
-$labels['revertto'] = 'Dəyişiklikləri ləğv et';
+$labels['revertto']      = 'Dəyişiklikləri ləğv et';
+
 $labels['attach'] = 'Fayl əlavə et';
 $labels['attachments'] = 'Bərkidilmiş Fayllar';
 $labels['upload'] = 'Yüklə';
 $labels['uploadprogress'] = '$percent ($current cəmi: $total)';
-$labels['close'] = 'Bağla';
-$labels['messageoptions'] = 'Məktub xüsusiyyətləri...';
-$labels['low'] = 'Alçaq';
-$labels['lowest'] = 'Çox alçaq';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Yüksək';
+$labels['close']  = 'Bağla';
+$labels['messageoptions']  = 'Məktub xüsusiyyətləri...';
+
+$labels['low']     = 'Alçaq';
+$labels['lowest']  = 'Çox alçaq';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Yüksək';
 $labels['highest'] = 'Çox yüksək';
-$labels['nosubject'] = '(mövzu yoxdur)';
+
+$labels['nosubject']  = '(mövzu yoxdur)';
 $labels['showimages'] = 'Şəkilləri göstər';
 $labels['alwaysshow'] = '$sender-dən olan məktublarda həmişə şəkilləri göstər';
-$labels['isdraft'] = 'Bu qaralama məktubudur.';
-$labels['andnmore'] = 'Daha çox $nr more...';
+$labels['isdraft']    = 'Bu qaralama məktubudur.';
+$labels['andnmore']   = 'Daha çox $nr more...';
 $labels['togglemoreheaders'] = 'Daha çox məktub';
 $labels['togglefullheaders'] = 'Məktubun çiy başlıqlarını keçir';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Mətn';
 $labels['savesentmessagein'] = 'Məktubu saxla...';
 $labels['dontsave'] = 'saxlama';
 $labels['maxuploadsize'] = 'Faylın maksimal ölçüsü: $size';
+
 $labels['addcc'] = 'Kopya əlavə et';
 $labels['addbcc'] = 'Gizli kopya əlavə et';
 $labels['addreplyto'] = 'Yönəltmə əlavə et';
 $labels['addfollowupto'] = '"İzlə" əlavə et';
+
+// mdn
 $labels['mdnrequest'] = 'Məktubu göndərən onu oxuduğunuz haqda sorğu almaq istəyir. Göndərilsin?';
 $labels['receiptread'] = 'Oxunulma haqda soğru';
 $labels['yourmessage'] = 'Bu məktubunuzun oxunulduğu haqda sorğudur';
 $labels['receiptnote'] = 'Bu sorğu yalnız qəbul edilən tərəfindən məktubun açıldığına göstərir. Onun oxunulduğuna zəmanət vermir.';
-$labels['name'] = 'Göstərilən ad';
-$labels['firstname'] = 'Adı';
-$labels['surname'] = 'Soyadı';
-$labels['middlename'] = 'Orta adı';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Ləqəb';
-$labels['jobtitle'] = 'Vəzifə';
-$labels['department'] = 'Departament';
-$labels['gender'] = 'Cins';
-$labels['maidenname'] = 'Qız adı';
-$labels['email'] = 'E-Poçt';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Ünvan';
-$labels['street'] = 'Küçə';
-$labels['locality'] = 'Şəhər';
-$labels['zipcode'] = 'ZIP kod';
-$labels['region'] = 'Region';
-$labels['country'] = 'Ölkə';
-$labels['birthday'] = 'Ad günü';
-$labels['anniversary'] = 'İldönümü';
-$labels['website'] = 'Vebsayt';
+
+// address boook
+$labels['name']         = 'Göstərilən ad';
+$labels['firstname']    = 'Adı';
+$labels['surname']      = 'Soyadı';
+$labels['middlename']   = 'Orta adı';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Ləqəb';
+$labels['jobtitle']     = 'Vəzifə';
+$labels['department']   = 'Departament';
+$labels['gender']       = 'Cins';
+$labels['maidenname']   = 'Qız adı';
+$labels['email']        = 'E-Poçt';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Ünvan';
+$labels['street']       = 'Küçə';
+$labels['locality']     = 'Şəhər';
+$labels['zipcode']      = 'ZIP kod';
+$labels['region']       = 'Region';
+$labels['country']      = 'Ölkə';
+$labels['birthday']     = 'Ad günü';
+$labels['anniversary']  = 'İldönümü';
+$labels['website']      = 'Vebsayt';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Qeydlər';
-$labels['male'] = 'kişi';
+$labels['male']   = 'kişi';
 $labels['female'] = 'qadın';
 $labels['manager'] = 'Menecer';
 $labels['assistant'] = 'Köməkçi';
-$labels['typeassistant'] = 'Köməkçi';
 $labels['spouse'] = 'Ər-arvad';
 $labels['allfields'] = 'Bütün sahələr';
 $labels['search'] = 'Axtar';
 $labels['advsearch'] = 'Ətraflı axtarış';
 $labels['advanced'] = 'Əlavə';
 $labels['other'] = 'Başqa';
-$labels['typeother'] = 'Başqa';
-$labels['typehome'] = 'Ev';
-$labels['typework'] = 'İş';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Əsas';
-$labels['typehomefax'] = 'Ev faksı';
-$labels['typeworkfax'] = 'İş faksı';
-$labels['typecar'] = 'Maşın';
-$labels['typepager'] = 'Peycer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Ana səhifə';
+
+$labels['typehome']   = 'Ev';
+$labels['typework']   = 'İş';
+$labels['typeother']  = 'Başqa';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Əsas';
+$labels['typehomefax']  = 'Ev faksı';
+$labels['typeworkfax']  = 'İş faksı';
+$labels['typecar']  = 'Maşın';
+$labels['typepager']  = 'Peycer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Köməkçi';
+$labels['typehomepage']  = 'Ana səhifə';
 $labels['typeblog'] = 'Bloq';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Sahə əlavə et';
 $labels['addcontact'] = 'Ünvanlara əlavə et';
 $labels['editcontact'] = 'Ünvanı redaktə et';
 $labels['contacts'] = 'Əlaqələr';
 $labels['contactproperties'] = 'Kontakt xüsusiyyətləri';
 $labels['personalinfo'] = 'Şəxsi məlumat';
-$labels['edit'] = 'Redaktə et';
+
+$labels['edit']   = 'Redaktə et';
 $labels['cancel'] = 'Ləğv et';
-$labels['save'] = 'Saxla';
+$labels['save']   = 'Saxla';
 $labels['delete'] = 'Sil';
 $labels['rename'] = 'Adlandır';
 $labels['addphoto'] = 'Əlavə et';
 $labels['replacephoto'] = 'Adı dəyiş';
 $labels['uploadphoto'] = 'Şəkil yüklə';
-$labels['newcontact'] = 'Yeni ünvan kartı əlavə et';
-$labels['deletecontact'] = 'Seçilmiş ünvanları sil';
-$labels['composeto'] = 'Seçilmiş ünvanlara məktub yaz';
+
+$labels['newcontact']     = 'Yeni ünvan kartı əlavə et';
+$labels['deletecontact']  = 'Seçilmiş ünvanları sil';
+$labels['composeto']      = 'Seçilmiş ünvanlara məktub yaz';
 $labels['contactsfromto'] = '$count ünvanının $from - $to arası';
-$labels['print'] = 'Çap et';
-$labels['export'] = 'İxrac et';
-$labels['exportvcards'] = 'Ünvanları vCards formatında ixrac et';
+$labels['print']          = 'Çap et';
+$labels['export']         = 'İxrac et';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Ünvanları vCards formatında ixrac et';
 $labels['newcontactgroup'] = 'Ünvanlar qrupunu yarat';
-$labels['grouprename'] = 'Qruğun adını dəyişdir';
-$labels['groupdelete'] = 'Qrupu sil';
+$labels['grouprename']    = 'Qruğun adını dəyişdir';
+$labels['groupdelete']    = 'Qrupu sil';
 $labels['groupremoveselected'] = 'Qrupdan seçilmiş kontaktları sil';
-$labels['previouspage'] = 'Əvvəlkini göstər';
-$labels['firstpage'] = 'Birincini göstər';
-$labels['nextpage'] = 'Sonrakını göstər';
-$labels['lastpage'] = 'Sonuncunu göstər';
+
+$labels['previouspage']   = 'Əvvəlkini göstər';
+$labels['firstpage']      = 'Birincini göstər';
+$labels['nextpage']       = 'Sonrakını göstər';
+$labels['lastpage']       = 'Sonuncunu göstər';
+
 $labels['group'] = 'Qrup';
 $labels['groups'] = 'Qruplar';
 $labels['personaladrbook'] = 'Şəxsi ünvanlar';
+
 $labels['searchsave'] = 'Sorğunu saxla';
 $labels['searchdelete'] = 'Sorğunu sil';
+
 $labels['import'] = 'İdxal';
 $labels['importcontacts'] = 'Ünvanların idxalı';
 $labels['importfromfile'] = 'Fayldan idxal:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Əlaqə kitabçasına yeni kontaktları əlavə et';
 $labels['importreplace'] = 'Ünvan kitabçasını dəyiş';
 $labels['importdesc'] = 'Siz kontaktları mövcud ünvan kitabçasından yükləyə bilərsiniz. <br/> Hal-hazırda biz ünvanların idxalını <a href="http://az.wikipedia.org/wiki/VCard">vCard</a> və ya CSV (vergüllə bölünmüş) formatında olan vizit kartları dəstəkləyirik.';
 $labels['done'] = 'Bitdi';
+
+// settings
 $labels['settingsfor'] = 'Nizamlamaları';
 $labels['about'] = 'Haqqında';
 $labels['preferences'] = 'Nizamlamalar';
 $labels['userpreferences'] = 'İstifadəçi nizamlamaları';
 $labels['editpreferences'] = 'İstifadəçi nizamlamalarını redaktə et';
+
 $labels['identities'] = 'Kimliklər';
 $labels['manageidentities'] = 'Bu hesab üçün kimlikləri idarə et';
 $labels['newidentity'] = 'Yeni kimlik';
+
 $labels['newitem'] = 'Yeni maddə';
 $labels['edititem'] = 'Maddəni redaktə et';
+
 $labels['preferhtml'] = 'HTML-də göstər';
 $labels['defaultcharset'] = 'İlkin vəziyyətdəki kodlaşdırma';
 $labels['htmlmessage'] = 'HTML məktub';
+$labels['messagepart'] = 'Hissə';
+$labels['digitalsig'] = 'Rəqəmsal imza';
 $labels['dateformat'] = 'Tarix formatı';
 $labels['timeformat'] = 'Vaxt formatı';
 $labels['prettydate'] = 'Qəşəng tarixlər';
-$labels['setdefault'] = 'İlkin vəziyyətə qaytar';
-$labels['autodetect'] = 'Avto';
-$labels['language'] = 'Dil';
-$labels['timezone'] = 'Saat qurşağı';
-$labels['pagesize'] = 'Səhifədə sətrlər';
+$labels['setdefault']  = 'İlkin vəziyyətə qaytar';
+$labels['autodetect']  = 'Avto';
+$labels['language']  = 'Dil';
+$labels['timezone']  = 'Saat qurşağı';
+$labels['pagesize']  = 'Səhifədə sətrlər';
 $labels['signature'] = 'İmza';
-$labels['dstactive'] = 'Yay vaxtı';
+$labels['dstactive']  = 'Yay vaxtı';
 $labels['showinextwin'] = 'Məktubu yeni pəncərədə aç';
 $labels['composeextwin'] = 'Yeni pəncərədə yarat';
 $labels['htmleditor'] = 'HTML-də mesaj yaz';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Silinmiç şəkilləri göstər';
 $labels['fromknownsenders'] = 'məlum göndərənlərdən';
 $labels['always'] = 'hər zaman';
 $labels['showinlineimages'] = 'Əlavə olunmuş şəkili məktubun aşağısında göstər';
-$labels['autosavedraft'] = 'Qaralamanı avtomatik saxla';
-$labels['everynminutes'] = 'hər $n dəqiqə(lər)';
-$labels['refreshinterval'] = 'Yenilə (yeni məktubları yoxla v.s.)';
-$labels['never'] = 'heç vaxt';
-$labels['immediately'] = 'dərhal';
+$labels['autosavedraft']  = 'Qaralamanı avtomatik saxla';
+$labels['everynminutes']  = 'hər $n dəqiqə(lər)';
+$labels['refreshinterval']  = 'Yenilə (yeni məktubları yoxla v.s.)';
+$labels['never']  = 'heç vaxt';
+$labels['immediately']  = 'dərhal';
 $labels['messagesdisplaying'] = 'Məktubların göstərilməsi';
 $labels['messagescomposition'] = 'Məktubların yazılması';
 $labels['mimeparamfolding'] = 'Bərkidilənlərin adları';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Cavab və yönəltmə zamanı imzanı bərkid';
 $labels['belowquote'] = 'sitatdan sonra';
 $labels['abovequote'] = 'sitatdan əvvəl';
 $labels['insertsignature'] = 'İmza əlavə et';
-$labels['previewpanemarkread'] = 'Baxılmış şəkilləri oxunmuş kimi qeyd et';
-$labels['afternseconds'] = '$n saniyədən sonra';
+$labels['previewpanemarkread']  = 'Baxılmış şəkilləri oxunmuş kimi qeyd et';
+$labels['afternseconds']  = '$n saniyədən sonra';
 $labels['reqmdn'] = 'Hər zaman çatdırılma bildirişini istə';
 $labels['reqdsn'] = 'Hər zaman çatıdrılma haqda statusu istə';
 $labels['replysamefolder'] = 'Cavab mesajları üçün saxlanılan yer';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'mailto: keçid üçün protokol qeyd et';
 $labels['forwardmode'] = 'Məktubların yönəldilməsi';
 $labels['inline'] = 'mətndə';
 $labels['asattachment'] = 'fayl kimi';
-$labels['folder'] = 'Qovluq';
-$labels['foldername'] = 'Qovluq adı';
-$labels['subscribed'] = 'İmzalanıb';
+
+$labels['folder']  = 'Qovluq';
+$labels['folders']  = 'Qovluqlar';
+$labels['foldername']  = 'Qovluq adı';
+$labels['subscribed']  = 'İmzalanıb';
 $labels['messagecount'] = 'Məktublar';
-$labels['create'] = 'Yarad';
-$labels['createfolder'] = 'Yeni qovluq yarad';
-$labels['managefolders'] = 'Qovluqlarla iş';
+$labels['create']  = 'Yarad';
+$labels['createfolder']  = 'Yeni qovluq yarad';
+$labels['managefolders']  = 'Qovluqlarla iş';
 $labels['specialfolders'] = 'Xüsusi qovluqlar';
 $labels['properties'] = 'Xüsusiyyətlər';
 $labels['folderproperties'] = 'Qovluq xüsusiyyətləri';
@@ -427,23 +491,29 @@ $labels['info'] = 'Məlumat';
 $labels['getfoldersize'] = 'Qovluq ölçüsünü öyrənmək üçün vur';
 $labels['changesubscription'] = 'Abunəni dəyişmək üçün vurun';
 $labels['foldertype'] = 'Qovluq növü';
-$labels['personalfolder'] = 'Gizli qovluq';
-$labels['otherfolder'] = 'Başqa istifadəçilərin qovluğu';
-$labels['sharedfolder'] = 'İctimai qovluq';
+$labels['personalfolder']  = 'Gizli qovluq';
+$labels['otherfolder']  = 'Başqa istifadəçilərin qovluğu';
+$labels['sharedfolder']  = 'İctimai qovluq';
+
 $labels['sortby'] = 'Çeşidlə';
-$labels['sortasc'] = 'Azdan çoxa';
+$labels['sortasc']  = 'Azdan çoxa';
 $labels['sortdesc'] = 'Çoxdan aza';
 $labels['undo'] = 'Ləğv et';
+
 $labels['installedplugins'] = 'Yazılmış qoşmalar';
 $labels['plugin'] = 'Qoşma';
 $labels['version'] = 'Versiya';
 $labels['source'] = 'Mənbə';
 $labels['license'] = 'Lisenziya';
 $labels['support'] = 'Dəstək';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'İngilis dili';
 $labels['westerneuropean'] = 'Qərbi Avropa';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Yaponca';
 $labels['korean'] = 'Koreya';
 $labels['chinese'] = 'Çincə';
 
+?>
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index b56297695..939827247 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Xəta baş verib!';
-$messages['loginfailed'] = 'Giriş uğursuz oldu';
+$messages['errortitle']  = 'Xəta baş verib!';
+$messages['loginfailed']  = 'Giriş uğursuz oldu';
 $messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir';
 $messages['sessionerror'] = 'Sizin sessiya köhnəlib';
 $messages['storageerror'] = 'IMAP serverlə bağlantı alınmadı';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Məktubu (məktubları) köçürmək alnmadı';
 $messages['errorcopying'] = 'Məktubu (məktubları) kopyalamaq alınmadı';
 $messages['errordeleting'] = 'Məktubu (məktubları) silmək alınmadı';
 $messages['errormarking'] = 'Məktubu (məktubları) işarələmək mümkün deyil';
-$messages['deletecontactconfirm'] = 'Seçilən ünvanı (ünvanları) silməyə əminsiniz?';
-$messages['deletegroupconfirm'] = 'Qrupu silməkdə əminsiniz?';
+$messages['deletecontactconfirm']  = 'Seçilən ünvanı (ünvanları) silməyə əminsiniz?';
+$messages['deletegroupconfirm']  = 'Qrupu silməkdə əminsiniz?';
 $messages['deletemessagesconfirm'] = 'Seçilən məktubu (məktubları) silməyə əminsiniz?';
-$messages['deletefolderconfirm'] = 'Bu qovluğu silməyə əminsiniz?';
-$messages['purgefolderconfirm'] = 'Bu qovluqdakı bütün məktubları silməyə əminsiniz?';
+$messages['deletefolderconfirm']  = 'Bu qovluğu silməyə əminsiniz?';
+$messages['purgefolderconfirm']  = 'Bu qovluqdakı bütün məktubları silməyə əminsiniz?';
 $messages['contactdeleting'] = 'Kontak(lar)ın silinməsi...';
 $messages['groupdeleting'] = 'Qrupun silinməsi...';
 $messages['folderdeleting'] = 'Qovluğ silinir...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Qovluğa abunə...';
 $messages['folderunsubscribing'] = 'Qovluğa abunədən çıx...';
 $messages['formincomplete'] = 'Bütün sətrlər doldurulmayıb';
 $messages['noemailwarning'] = 'Lütfən, düzgün e-poçt ünvanı daxil edin';
-$messages['nonamewarning'] = 'Lütfən, ad daxil edin';
+$messages['nonamewarning']  = 'Lütfən, ad daxil edin';
 $messages['nopagesizewarning'] = 'Lütfən, səhifənin ölçüsünü daxil edin';
 $messages['nosenderwarning'] = 'Lütfən, göndərənin elektron poçt ünvanını daxil edin';
 $messages['norecipientwarning'] = 'Lütfən, qəbul edənin ünvanını daxil edin';
-$messages['nosubjectwarning'] = '"Mövzu" sahəsi boşdur. Mövzu daxil etmək istəyirsiniz?';
+$messages['nosubjectwarning']  = '"Mövzu" sahəsi boşdur. Mövzu daxil etmək istəyirsiniz?';
 $messages['nobodywarning'] = 'Məktub boş göndərilsin?';
 $messages['notsentwarning'] = 'Məktub göndərilmədi. Göndərilmədən imtina etmək istəyirsiniz?';
 $messages['noldapserver'] = 'Lütfən, axtarış üçün LDAP server seçin';
@@ -163,3 +166,4 @@ $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 76a79bf78..5bafc78f1 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -2,43 +2,535 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Вітаем у $product';
-$labels['username'] = 'Карыстальнік';
-$labels['password'] = 'Пароль';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Уваход';
-$labels['logout'] = 'Выхад';
-$labels['mail'] = 'Пошта';
+
+// login page
+$labels['welcome']   = 'Вітаем у $product';
+$labels['username']  = 'Карыстальнік';
+$labels['password']  = 'Пароль';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Уваход';
+
+// taskbar
+$labels['logout']   = 'Выхад';
+$labels['mail']     = 'Пошта';
 $labels['settings'] = 'Настаўленні';
 $labels['addressbook'] = 'Адрасная кніга';
-$labels['inbox'] = 'Атрыманыя';
+
+// mailbox names
+$labels['inbox']  = 'Атрыманыя';
 $labels['drafts'] = 'Чарнавікі';
-$labels['sent'] = 'Дасланыя';
-$labels['trash'] = 'Сметніца';
-$labels['junk'] = 'Спам';
+$labels['sent']   = 'Дасланыя';
+$labels['trash']  = 'Сметніца';
+$labels['junk']   = 'Спам';
+
+// message listing
 $labels['subject'] = 'Тэма';
-$labels['from'] = 'Ад каго';
-$labels['to'] = 'Каму';
-$labels['cc'] = 'Копія (СС)';
-$labels['bcc'] = 'Сх.копія (ВСС)';
+$labels['from']    = 'Ад каго';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Каму';
+$labels['cc']      = 'Копія (СС)';
+$labels['bcc']     = 'Сх.копія (ВСС)';
 $labels['replyto'] = 'Адказаць на';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Памер';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Памер';
 $labels['priority'] = 'Прыярытэт';
+$labels['organization'] = 'Organization';
 $labels['readstatus'] = 'Не прачытанае';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Тэчкі';
-$labels['folders'] = 'Тэчкі';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr of $count';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Copy';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'Move to...';
+$labels['download'] = 'Download';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
+$labels['filename'] = 'File name';
+$labels['filesize'] = 'File size';
+
+$labels['addtoaddressbook'] = 'Add to address book';
+
+// weekdays short
+$labels['sun'] = 'Sun';
+$labels['mon'] = 'Mon';
+$labels['tue'] = 'Tue';
+$labels['wed'] = 'Wed';
+$labels['thu'] = 'Thu';
+$labels['fri'] = 'Fri';
+$labels['sat'] = 'Sat';
+
+// weekdays long
+$labels['sunday']    = 'Sunday';
+$labels['monday']    = 'Monday';
+$labels['tuesday']   = 'Tuesday';
+$labels['wednesday'] = 'Wednesday';
+$labels['thursday']  = 'Thursday';
+$labels['friday']    = 'Friday';
+$labels['saturday']  = 'Saturday';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
+$labels['today'] = 'Today';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Check for new messages';
+$labels['compose']          = 'Compose';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Delete message';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Print this message';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
+$labels['select'] = 'Select';
+$labels['all'] = 'All';
+$labels['none'] = 'None';
+$labels['currpage'] = 'Current page';
+$labels['unread'] = 'Unread';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'None';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
+$labels['compact'] = 'Compact';
+$labels['empty'] = 'Empty';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'unknown';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send message';
+$labels['savemessage']    = 'Save as draft';
+$labels['addattachment']  = 'Attach a file';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
+$labels['checkspelling'] = 'Check spelling';
+$labels['resumeediting'] = 'Resume editing';
+$labels['revertto']      = 'Revert to';
+
+$labels['attach'] = 'Attach';
+$labels['attachments'] = 'Attachments';
+$labels['upload'] = 'Upload';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Close';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
+$labels['highest'] = 'Highest';
+
+$labels['nosubject']  = '(no subject)';
+$labels['showimages'] = 'Display images';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Plain text';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'First Name';
+$labels['surname']      = 'Last Name';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Email';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
+$labels['addcontact'] = 'Add new contact';
+$labels['editcontact'] = 'Edit contact';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Edit';
+$labels['cancel'] = 'Cancel';
+$labels['save']   = 'Save';
+$labels['delete'] = 'Delete';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
+$labels['settingsfor'] = 'Settings for';
+$labels['about'] = 'About';
+$labels['preferences'] = 'Preferences';
+$labels['userpreferences'] = 'User preferences';
+$labels['editpreferences'] = 'Edit user preferences';
+
+$labels['identities'] = 'Identities';
+$labels['manageidentities'] = 'Manage identities for this account';
+$labels['newidentity'] = 'New identity';
+
+$labels['newitem'] = 'New item';
+$labels['edititem'] = 'Edit item';
+
+$labels['preferhtml'] = 'Display HTML';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Language';
+$labels['timezone']  = 'Time zone';
+$labels['pagesize']  = 'Rows per page';
+$labels['signature'] = 'Signature';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
+$labels['htmleditor'] = 'Compose HTML messages';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlsignature'] = 'HTML signature';
+$labels['previewpane'] = 'Show preview pane';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'never';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Тэчкі';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index 2c743af1f..0aaa4d4d7 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -2,26 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Збой уваходу.';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Збой уваходу.';
 $messages['cookiesdisabled'] = 'Ваш азіральнік не падтрымлівае кукіс.';
 $messages['sessionerror'] = 'Ваша сесія не дзейсная ці састарэла.';
+$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'Памылка сервера!';
 $messages['servererrormsg'] = 'Памылка сервера: $msg';
 $messages['dberror'] = 'Памылка базы даных!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Немагчыма выканаць аперацыю. Тэчка даступна толькі для чытання.';
 $messages['errornoperm'] = 'Немагчыма выканаць аперацыю. Адмоўлена ў доступе.';
 $messages['invalidrequest'] = 'Не дзейсны запыт! Даныя не захаваныя.';
+$messages['invalidhost'] = 'Invalid server name.';
+$messages['nomessagesfound'] = 'No messages found in this mailbox.';
+$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
+$messages['mailboxempty'] = 'Mailbox is empty.';
+$messages['refreshing'] = 'Refreshing...';
+$messages['loading'] = 'Loading...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
+$messages['loadingdata'] = 'Loading data...';
+$messages['checkingmail'] = 'Checking for new messages...';
+$messages['sendingmessage'] = 'Sending message...';
+$messages['messagesent'] = 'Message sent successfully.';
+$messages['savingmessage'] = 'Saving message...';
+$messages['messagesaved'] = 'Message saved to Drafts.';
+$messages['successfullysaved'] = 'Successfully saved.';
+$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
+$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
+$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
+$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
+$messages['nocontactsfound'] = 'No contacts found.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
+$messages['sendingfailed'] = 'Failed to send message.';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
+$messages['errorsaving'] = 'An error occured while saving.';
+$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['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
+$messages['formincomplete'] = 'The form was not completely filled out.';
+$messages['noemailwarning'] = 'Please enter a valid email address.';
+$messages['nonamewarning']  = 'Please enter a name.';
+$messages['nopagesizewarning'] = 'Please enter a page size.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
+$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['notsentwarning'] = 'Message has not been sent. Do you want to discard your 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.';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
+$messages['searchnomatch'] = 'Search returned no matches.';
+$messages['searching'] = 'Searching...';
+$messages['checking'] = 'Checking...';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Folder successfully deleted.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
+$messages['fileuploaderror'] = 'File upload failed.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 70413f925..0a5334263 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Blagovest Petrov <blagovest@petrovs.info>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добре дошли в $product';
-$labels['username'] = 'Потребител';
-$labels['password'] = 'Парола';
-$labels['server'] = 'Сървър';
-$labels['login'] = 'Вход';
-$labels['logout'] = 'Изход';
-$labels['mail'] = 'Кутия';
+
+// login page
+$labels['welcome']   = 'Добре дошли в $product';
+$labels['username']  = 'Потребител';
+$labels['password']  = 'Парола';
+$labels['server']    = 'Сървър';
+$labels['login']     = 'Вход';
+
+// taskbar
+$labels['logout']   = 'Изход';
+$labels['mail']     = 'Кутия';
 $labels['settings'] = 'Настройки';
-$labels['addressbook'] = 'Книга с адреси';
-$labels['inbox'] = 'Входящи';
+$labels['addressbook'] = 'Адресна книга';
+
+// mailbox names
+$labels['inbox']  = 'Входящи';
 $labels['drafts'] = 'Чернови';
-$labels['sent'] = 'Изпратени';
-$labels['trash'] = 'Кошче';
-$labels['junk'] = 'Спам';
+$labels['sent']   = 'Изпратени';
+$labels['trash']  = 'Кошче';
+$labels['junk']   = 'Спам';
+
+// message listing
 $labels['subject'] = 'Заглавие';
-$labels['from'] = 'От';
-$labels['to'] = 'Получател';
-$labels['cc'] = 'Копие до';
-$labels['bcc'] = 'Скрито копие до';
+$labels['from']    = 'От';
+$labels['sender']  = 'Подател';
+$labels['to']      = 'Получател';
+$labels['cc']      = 'Копие до';
+$labels['bcc']     = 'Скрито копие до';
 $labels['replyto'] = 'Отговор до';
 $labels['followupto'] = 'Препращане към';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Размер';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Размер';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
-$labels['readstatus'] = 'Статут (прочетено/непрочетено)';
+$labels['readstatus'] = 'Статут (прочетено/ново)';
 $labels['listoptions'] = 'Показване на възможни опции';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Съобщения $from до $to от $count';
 $labels['threadsfromto'] = 'Съобщения $from до $to от $count';
 $labels['messagenrof'] = 'Съобщение $nr от $count';
 $labels['fromtoshort'] = '$from – $to от $count';
-$labels['copy'] = 'Копиране';
-$labels['move'] = 'Преместване';
-$labels['moveto'] = 'Премести в...';
+
+$labels['copy']     = 'Копиране';
+$labels['move']     = 'Преместване';
+$labels['moveto']   = 'Премести в...';
 $labels['download'] = 'Изтегли';
 $labels['showattachment'] = 'Показване';
 $labels['showanyway'] = 'Показване въпреки това';
+
 $labels['filename'] = 'Име на файла';
 $labels['filesize'] = 'Размер на файла';
+
 $labels['addtoaddressbook'] = 'Добави в адресната книга';
+
+// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Вто';
@@ -63,78 +80,87 @@ $labels['wed'] = 'Сря';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Съб';
-$labels['sunday'] = 'Неделя';
-$labels['monday'] = 'Понеделник';
-$labels['tuesday'] = 'Вторник';
+
+// weekdays long
+$labels['sunday']    = 'Неделя';
+$labels['monday']    = 'Понеделник';
+$labels['tuesday']   = 'Вторник';
 $labels['wednesday'] = 'Сряда';
-$labels['thursday'] = 'Четвъртък';
-$labels['friday'] = 'Петък';
-$labels['saturday'] = 'Събота';
-$labels['jan'] = 'Яну';
-$labels['feb'] = 'Фев';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Май';
-$labels['longmay'] = 'Май';
-$labels['jun'] = 'Юни';
-$labels['jul'] = 'Юли';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сеп';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Ное';
-$labels['dec'] = 'Дек';
-$labels['longjan'] = 'Януари';
-$labels['longfeb'] = 'Февруари';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Април';
-$labels['longjun'] = 'Юни';
-$labels['longjul'] = 'Юли';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Септември';
-$labels['longoct'] = 'Октомври';
-$labels['longnov'] = 'Ноември';
-$labels['longdec'] = 'Декември';
+$labels['thursday']  = 'Четвъртък';
+$labels['friday']    = 'Петък';
+$labels['saturday']  = 'Събота';
+
+// months short
+$labels['jan']	= 'Яну';
+$labels['feb']	= 'Фев';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Май';
+$labels['jun']	= 'Юни';
+$labels['jul'] 	= 'Юли';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сеп';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Ное';
+$labels['dec']	= 'Дек';
+
+// months long
+$labels['longjan']	= 'Януари';
+$labels['longfeb']	= 'Февруари';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Април';
+$labels['longmay']	= 'Май';
+$labels['longjun']	= 'Юни';
+$labels['longjul']	= 'Юли';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Септември';
+$labels['longoct']	= 'Октомври';
+$labels['longnov']	= 'Ноември';
+$labels['longdec']	= 'Декември';
+
 $labels['today'] = 'Днес';
-$labels['refresh'] = 'Опресняване';
-$labels['checkmail'] = 'Провери за нови писма';
-$labels['compose'] = 'Ново писмо';
-$labels['writenewmessage'] = 'Създай ново писмо';
-$labels['reply'] = 'Отговор';
-$labels['replytomessage'] = 'Отговори на писмото';
-$labels['replytoallmessage'] = 'Отговор до изпращача и всички получатели';
-$labels['replyall'] = 'Отговор на всички';
-$labels['replylist'] = 'Списък за отговор';
-$labels['forward'] = 'Препращане';
-$labels['forwardinline'] = 'Препрати като част от съобщението';
+
+// toolbar buttons
+$labels['refresh']          = 'Опресняване';
+$labels['checkmail']        = 'Провери за нови писма';
+$labels['compose']          = 'Ново писмо';
+$labels['writenewmessage']  = 'Създай ново писмо';
+$labels['reply']            = 'Отговор';
+$labels['replytomessage']   = 'Отговори на писмото';
+$labels['replytoallmessage'] = 'Отговор до подателя и всички получатели';
+$labels['replyall']         = 'Отговор на всички';
+$labels['replylist']        = 'Списък за отговор';
+$labels['forward']          = 'Препращане';
+$labels['forwardinline']    = 'Препрати като част от съобщението';
 $labels['forwardattachment'] = 'Препрати като прикачен файл';
-$labels['forwardmessage'] = 'Препрати писмото';
-$labels['deletemessage'] = 'Изтрий писмото';
+$labels['forwardmessage']   = 'Препрати писмото';
+$labels['deletemessage']    = 'Изтрий писмото';
 $labels['movemessagetotrash'] = 'Премести писмото в кошчето';
-$labels['printmessage'] = 'Разпечатай писмото';
-$labels['previousmessage'] = 'Предишно писмо';
-$labels['firstmessage'] = 'Първо писмо';
-$labels['nextmessage'] = 'Следващо писмо';
-$labels['lastmessage'] = 'Последно писмо';
-$labels['backtolist'] = 'Обратно към списъка';
-$labels['viewsource'] = 'Виж като код';
-$labels['mark'] = 'Маркирарне';
-$labels['markmessages'] = 'Маркирай писмата';
-$labels['markread'] = 'Като прочетени';
-$labels['markunread'] = 'Като нови';
-$labels['markflagged'] = 'Като отбелязани';
-$labels['markunflagged'] = 'Като неотбелязани';
-$labels['moreactions'] = 'Повече действия...';
-$labels['more'] = 'Повече';
-$labels['back'] = 'Назад';
-$labels['options'] = 'Опции';
+$labels['printmessage']     = 'Разпечатай писмото';
+$labels['previousmessage']  = 'Предишно писмо';
+$labels['firstmessage']     = 'Първо писмо';
+$labels['nextmessage']      = 'Следващо писмо';
+$labels['lastmessage']      = 'Последно писмо';
+$labels['backtolist']       = 'Обратно към списъка';
+$labels['viewsource']       = 'Виж като код';
+$labels['mark']             = 'Маркирарне';
+$labels['markmessages']     = 'Маркирай писмата';
+$labels['markread']         = 'Като прочетени';
+$labels['markunread']       = 'Като нови';
+$labels['markflagged']      = 'Като отбелязани';
+$labels['markunflagged']    = 'Като неотбелязани';
+$labels['moreactions']      = 'Повече действия...';
+$labels['more']             = 'Повече';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Опции';
+
 $labels['select'] = 'Избери';
 $labels['all'] = 'Всички';
-$labels['none'] = 'Никакъв';
-$labels['nonesort'] = 'Никакъв';
+$labels['none'] = 'Няма';
 $labels['currpage'] = 'Страница';
 $labels['unread'] = 'Нови';
 $labels['flagged'] = 'Отбелязано';
-$labels['unanswered'] = 'Неотговорено';
+$labels['unanswered'] = 'Без отговор';
 $labels['deleted'] = 'Изтрито';
 $labels['undeleted'] = 'Не е изтрит';
 $labels['invert'] = 'Инвертирай';
@@ -145,12 +171,14 @@ $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'] = 'възходящ';
@@ -159,144 +187,174 @@ $labels['listcolumns'] = 'Колони за списък';
 $labels['listsorting'] = 'Колона за сортиране';
 $labels['listorder'] = 'Режим на сортиране';
 $labels['listmode'] = 'Кратък списък';
+
 $labels['folderactions'] = 'Действия за папки...';
-$labels['compact'] = 'Свий';
+$labels['compact'] = 'Свиване';
 $labels['empty'] = 'Изпразни';
+
 $labels['quota'] = 'Използвано място';
-$labels['unknown'] = 'няма информация';
-$labels['unlimited'] = 'няма ограничение';
-$labels['quicksearch'] = 'Бързо търсене';
-$labels['resetsearch'] = 'Изчисти търсенето и покажи всички писма';
-$labels['searchmod'] = 'Търсене във';
-$labels['msgtext'] = 'Цялото съобщение';
+$labels['unknown']  = 'няма информация';
+$labels['unlimited']  = 'няма ограничение';
+
+$labels['quicksearch']  = 'Бързо търсене';
+$labels['resetsearch']  = 'Изчисти търсенето и покажи всички писма';
+$labels['searchmod']  = 'Търсене във';
+$labels['msgtext']  = 'Цялото съобщение';
+$labels['body']  = 'Основен текст';
+
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
-$labels['editasnew'] = 'Редактирай като ново';
-$labels['send'] = 'Изпращане';
-$labels['sendmessage'] = 'Изпрати писмото';
-$labels['savemessage'] = 'Запиши в Чернови';
-$labels['addattachment'] = 'Прикачи файл';
-$labels['charset'] = 'Кодировка';
-$labels['editortype'] = 'Вид редактор';
-$labels['returnreceipt'] = 'Обратна разписка';
-$labels['dsn'] = 'Информиране при доставка';
+
+// message compose
+$labels['editasnew']      = 'Промени като ново';
+$labels['send']           = 'Изпращане';
+$labels['sendmessage']    = 'Изпрати писмото';
+$labels['savemessage']    = 'Запиши в Чернови';
+$labels['addattachment']  = 'Прикачи файл';
+$labels['charset']        = 'Кодировка';
+$labels['editortype']     = 'Вид редактор';
+$labels['returnreceipt']  = 'Обратна разписка';
+$labels['dsn']            = 'Информиране при доставка';
 $labels['mailreplyintro'] = 'На $date, $sender написа:';
 $labels['originalmessage'] = 'Първоначалното съобщение';
-$labels['editidents'] = 'Редактиране на самоличности';
+
+$labels['editidents']    = 'Редактиране на самоличности';
+$labels['spellcheck']    = 'Спелуване';
 $labels['checkspelling'] = 'Провери правописа';
 $labels['resumeediting'] = 'Продължи черновата';
-$labels['revertto'] = 'Върни се към';
+$labels['revertto']      = 'Върни се към';
+
 $labels['attach'] = 'Прикачване';
 $labels['attachments'] = 'Прикачени файлове';
 $labels['upload'] = 'Качи';
 $labels['uploadprogress'] = '$percent ($current от $total)';
-$labels['close'] = 'Затвори';
-$labels['messageoptions'] = 'Настройки на съобщения...';
-$labels['low'] = 'Нисък';
-$labels['lowest'] = 'Най-нисък';
-$labels['normal'] = 'Нормален';
-$labels['high'] = 'Висок';
+$labels['close']  = 'Затвори';
+$labels['messageoptions']  = 'Настройки на съобщения...';
+
+$labels['low']     = 'Нисък';
+$labels['lowest']  = 'Най-нисък';
+$labels['normal']  = 'Нормален';
+$labels['high']    = 'Висок';
 $labels['highest'] = 'Най-висок';
-$labels['nosubject'] = '(няма заглавие)';
+
+$labels['nosubject']  = '(няма заглавие)';
 $labels['showimages'] = 'Показвай изображения';
 $labels['alwaysshow'] = 'Винаги показвай изображения от $';
-$labels['isdraft'] = 'Това съобщение е чернова';
-$labels['andnmore'] = '$nr повече...';
+$labels['isdraft']    = 'Това съобщение е чернова';
+$labels['andnmore']   = '$nr повече...';
+$labels['togglemoreheaders'] = 'Показва още съобщения';
+$labels['togglefullheaders'] = 'Само новите съобщения';
+
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'текстов';
+$labels['plaintoggle'] = 'Текстово';
 $labels['savesentmessagein'] = 'Запази съобщението в';
 $labels['dontsave'] = 'Не съхранявай';
 $labels['maxuploadsize'] = 'Максимално позволен размер $size';
+
 $labels['addcc'] = 'Копие до';
 $labels['addbcc'] = 'Скрито копие до';
 $labels['addreplyto'] = 'Отговор на';
 $labels['addfollowupto'] = 'Добавяне на препращане към';
+
+// mdn
 $labels['mdnrequest'] = 'Подателят на писмото е пожелал да бъде уведомен, че сте го прочели. Желаете ли да изпратите обратна разписка?';
 $labels['receiptread'] = 'Обратна разписка (прочетено)';
 $labels['yourmessage'] = 'Това е обратна разписка за писмото Ви';
 $labels['receiptnote'] = 'Забележка: Тази разписка потвърждава само, че писмото е било показано на компютъра на получателят. Няма никаква гаранция, че получателят е прочел и/или разбрал съдържанието на писмото.';
-$labels['name'] = 'Кратко име';
-$labels['firstname'] = 'Име';
-$labels['surname'] = 'Фамилия';
-$labels['middlename'] = 'Презиме';
-$labels['nameprefix'] = 'Представка (Титла)';
-$labels['namesuffix'] = 'Наставка (Титла)';
-$labels['nickname'] = 'Прякор';
-$labels['jobtitle'] = 'Длъжност';
-$labels['department'] = 'Отдел';
-$labels['gender'] = 'Пол';
-$labels['maidenname'] = 'Бащино име';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Телефон';
-$labels['address'] = 'Адрес';
-$labels['street'] = 'Улица';
-$labels['locality'] = 'Град';
-$labels['zipcode'] = 'Пощенски код';
-$labels['region'] = 'Област';
-$labels['country'] = 'Държава';
-$labels['birthday'] = 'Рожден ден';
-$labels['anniversary'] = 'Годишнина';
-$labels['website'] = 'Уебсайт';
+
+// address boook
+$labels['name']         = 'Екранно име';
+$labels['firstname']    = 'Име';
+$labels['surname']      = 'Фамилия';
+$labels['middlename']   = 'Презиме';
+$labels['nameprefix']   = 'Представка (Титла)';
+$labels['namesuffix']   = 'Наставка (Титла)';
+$labels['nickname']     = 'Псевдоним';
+$labels['jobtitle']     = 'Длъжност';
+$labels['department']   = 'Отдел';
+$labels['gender']       = 'Пол';
+$labels['maidenname']   = 'Бащино фамилия';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Телефон';
+$labels['address']      = 'Адрес';
+$labels['street']       = 'Улица';
+$labels['locality']     = 'Град';
+$labels['zipcode']      = 'Пощенски код';
+$labels['region']       = 'Област';
+$labels['country']      = 'Държава';
+$labels['birthday']     = 'Рожден ден';
+$labels['anniversary']  = 'Годишнина';
+$labels['website']      = 'Сайт';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Бележки';
-$labels['male'] = 'Мъж';
+$labels['male']   = 'Мъж';
 $labels['female'] = 'Жена';
 $labels['manager'] = 'Мениджър';
 $labels['assistant'] = 'Асистент';
-$labels['typeassistant'] = 'Асистент';
-$labels['spouse'] = 'Съпруг (а)';
+$labels['spouse'] = 'Съпруг(а)';
 $labels['allfields'] = 'Всички полета';
 $labels['search'] = 'Търсене';
 $labels['advsearch'] = 'Разширено търсене';
 $labels['advanced'] = 'Разширени';
 $labels['other'] = 'Други';
-$labels['typeother'] = 'Други';
-$labels['typehome'] = 'Начало';
-$labels['typework'] = 'Работа';
-$labels['typemobile'] = 'Мобилни';
-$labels['typemain'] = 'Главни';
-$labels['typehomefax'] = 'Домашен факс';
-$labels['typeworkfax'] = 'Служебен факс';
-$labels['typecar'] = 'Автомобил';
-$labels['typepager'] = 'Пейджър';
-$labels['typevideo'] = 'Видео';
-$labels['typehomepage'] = 'Начална страница';
+
+$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['addcontact'] = 'Добави';
-$labels['editcontact'] = 'Редактирай';
+$labels['addcontact'] = 'Добавяне';
+$labels['editcontact'] = 'Промяна';
 $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Свойства на контакт';
 $labels['personalinfo'] = 'Лична информация';
-$labels['edit'] = 'Редактирай';
+
+$labels['edit']   = 'Редактирай';
 $labels['cancel'] = 'Отказ';
-$labels['save'] = 'Запиши';
+$labels['save']   = 'Запиши';
 $labels['delete'] = 'Изтрий';
 $labels['rename'] = 'Преименувай';
 $labels['addphoto'] = 'Добави';
 $labels['replacephoto'] = 'Замени';
 $labels['uploadphoto'] = 'Качване на снимка';
-$labels['newcontact'] = 'Нов контакт';
-$labels['deletecontact'] = 'Изтрий маркираните контакти';
-$labels['composeto'] = 'Напиши писмо до';
+
+$labels['newcontact']     = 'Нов контакт';
+$labels['deletecontact']  = 'Изтрий маркираните контакти';
+$labels['composeto']      = 'Напиши писмо до';
 $labels['contactsfromto'] = 'Контакти $from до $to от $count';
-$labels['print'] = 'Разпечатай';
-$labels['export'] = 'Изнасяне';
-$labels['exportvcards'] = 'Изнасяне във vCard формат';
+$labels['print']          = 'Разпечатай';
+$labels['export']         = 'Изнасяне';
+$labels['exportall']      = 'Експортиране';
+$labels['exportsel']      = 'Експортиране на избраното';
+$labels['exportvcards']   = 'Изнасяне във vCard формат';
 $labels['newcontactgroup'] = 'Създаване на нова група';
-$labels['grouprename'] = 'Преименувай група';
-$labels['groupdelete'] = 'Изтриване на група';
+$labels['grouprename']    = 'Преименувай група';
+$labels['groupdelete']    = 'Изтриване на група';
 $labels['groupremoveselected'] = 'Премахване на избраните контакти от група';
-$labels['previouspage'] = 'Предна страница';
-$labels['firstpage'] = 'Първа страница';
-$labels['nextpage'] = 'Следваща страница';
-$labels['lastpage'] = 'Последна страница';
+
+$labels['previouspage']   = 'Предна страница';
+$labels['firstpage']      = 'Първа страница';
+$labels['nextpage']       = 'Следваща страница';
+$labels['lastpage']       = 'Последна страница';
+
 $labels['group'] = 'Група';
 $labels['groups'] = 'Групи';
 $labels['personaladrbook'] = 'Лични адреси';
+
 $labels['searchsave'] = 'Запази търсенето';
 $labels['searchdelete'] = 'Изтрий търсенето';
+
 $labels['import'] = 'Внасяне';
 $labels['importcontacts'] = 'Внасяне';
 $labels['importfromfile'] = 'Внасяне от файл';
@@ -304,32 +362,41 @@ $labels['importtarget'] = 'Добави нови контакти в книга�
 $labels['importreplace'] = 'Замени цялата книга с адреси';
 $labels['importdesc'] = 'Можете да качвате контакти от съществуваща адресна книга.<br/>В момента поддържаме внасяне на адреси от файловите формати <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> или CSV (comma-separated).';
 $labels['done'] = 'Извършено';
+
+// settings
 $labels['settingsfor'] = 'Настройки за';
 $labels['about'] = 'Относно';
 $labels['preferences'] = 'Настройки';
 $labels['userpreferences'] = 'Потребителски настройки';
 $labels['editpreferences'] = 'Редактирай потребителските настройки';
+
 $labels['identities'] = 'Самоличност';
 $labels['manageidentities'] = 'Промяна на самоличностите за този акаунт';
 $labels['newidentity'] = 'Нова самоличност';
+
 $labels['newitem'] = 'Нова самоличност';
 $labels['edititem'] = 'Редактиране на самоличност';
+
 $labels['preferhtml'] = 'Показвай първо HTML версия';
 $labels['defaultcharset'] = 'Подразбиращо се кодиране';
 $labels['htmlmessage'] = 'HTML съобщение';
+$labels['messagepart'] = 'Част';
+$labels['digitalsig'] = 'Показва подпис';
 $labels['dateformat'] = 'Формат на датата';
 $labels['timeformat'] = 'Формат на времето';
 $labels['prettydate'] = 'Кратки дати';
-$labels['setdefault'] = 'По подразбиране';
-$labels['autodetect'] = 'Автоматично';
-$labels['language'] = 'Език';
-$labels['timezone'] = 'Часова зона';
-$labels['pagesize'] = 'Редове на страница';
+$labels['setdefault']  = 'По подразбиране';
+$labels['autodetect']  = 'Автоматично';
+$labels['language']  = 'Език';
+$labels['timezone']  = 'Часова зона';
+$labels['pagesize']  = 'Редове на страница';
 $labels['signature'] = 'Подпис';
-$labels['dstactive'] = 'Маркирай при лятно време';
+$labels['dstactive']  = 'Маркирай при лятно време';
 $labels['showinextwin'] = 'Отваряне на съобщението в нов прозорец';
+$labels['composeextwin'] = 'Ново писмо в прозорец';
 $labels['htmleditor'] = 'Писане на съобщениe като HTML';
 $labels['htmlonreply'] = 'само при отговор на HTML събощения';
+$labels['htmlonreplyandforward'] = 'само при препращане или отговор на HTML съобщение';
 $labels['htmlsignature'] = 'HTML подпис';
 $labels['previewpane'] = 'Панел за преглед';
 $labels['skin'] = 'Смяна изгледа на интерфейса';
@@ -338,25 +405,26 @@ $labels['logoutcompact'] = 'Упллътни Входящи при изход';
 $labels['uisettings'] = 'Потребителски интерфейс';
 $labels['serversettings'] = 'Настройки на сървъра';
 $labels['mailboxview'] = 'Преглед на Кутия';
-$labels['mdnrequests'] = 'Уведомление на изпращача';
-$labels['askuser'] = 'Питай';
+$labels['mdnrequests'] = 'Уведомление на подателя';
+$labels['askuser'] = 'Задай въпрос';
 $labels['autosend'] = 'Изпрати автоматично';
-$labels['autosendknown'] = 'да се изпрати обратна разписка на моите контакти и да се при външни контакти';
+$labels['autosendknown'] = 'да се изпрати обратна разписка на моите контакти и да се пита при външни контакти';
 $labels['autosendknownignore'] = 'да се изпрати обратна разписка на моите контакти, а на външни не';
 $labels['ignore'] = 'Отхвърли';
 $labels['readwhendeleted'] = 'Отбележи като прочетено при изтриване';
 $labels['flagfordeletion'] = 'Отбележи съобщението за изтриване';
 $labels['skipdeleted'] = 'Не показвай изтритите съобщения';
 $labels['deletealways'] = 'При неуспешно преместване на съобщение в Кошчето, да се изтрие';
+$labels['deletejunk'] = 'Местене на изтритите съобщения в кошчето';
 $labels['showremoteimages'] = 'Покажи блокираните изображения';
-$labels['fromknownsenders'] = 'Oт познати изпращачи';
+$labels['fromknownsenders'] = 'Oт познати податели';
 $labels['always'] = 'Винаги';
 $labels['showinlineimages'] = 'Покажи прикачените изображения след съобщението';
-$labels['autosavedraft'] = 'Автоматично записвай чернова';
-$labels['everynminutes'] = 'всеки $n минути';
-$labels['refreshinterval'] = 'Опресняване (проверка за нови съобщения и т.н.)';
-$labels['never'] = 'никога';
-$labels['immediately'] = 'веднага';
+$labels['autosavedraft']  = 'Автоматично записвай чернова';
+$labels['everynminutes']  = 'всеки $n минути';
+$labels['refreshinterval']  = 'Опресняване (проверка за нови съобщения и т.н.)';
+$labels['never']  = 'никога';
+$labels['immediately']  = 'Веднага';
 $labels['messagesdisplaying'] = 'Показване на събщенията';
 $labels['messagescomposition'] = 'Писане на съобщения';
 $labels['mimeparamfolding'] = 'Добавяне име на прикрепените файлове';
@@ -368,9 +436,10 @@ $labels['advancedoptions'] = 'Настройки за напреднали';
 $labels['focusonnewmessage'] = 'Премигване на прозореца при ново писмо';
 $labels['checkallfolders'] = 'Провери всички папки за нови писма';
 $labels['displaynext'] = 'След изтриване / премини към следващото писмо';
+$labels['defaultfont'] = 'Шрифт по подразбиране за HTML съобщенията';
 $labels['mainoptions'] = 'Основни настройки';
 $labels['browseroptions'] = 'Настройки на четеца';
-$labels['section'] = 'Раздел';
+$labels['section'] = 'Секция';
 $labels['maintenance'] = 'Поддръжка';
 $labels['newmessage'] = 'Ново съобщение';
 $labels['signatureoptions'] = 'Настройки на подпис';
@@ -386,8 +455,8 @@ $labels['replysignaturepos'] = 'Поставяне на подпис при от
 $labels['belowquote'] = 'над цитатът';
 $labels['abovequote'] = 'под цитатът';
 $labels['insertsignature'] = 'Вмъкване на подпис';
-$labels['previewpanemarkread'] = 'Маркиране на прегледаните съобщения като прочетени';
-$labels['afternseconds'] = 'след $n секунди';
+$labels['previewpanemarkread']  = 'Маркиране на прегледаните съобщения като прочетени';
+$labels['afternseconds']  = 'след $n секунди';
 $labels['reqmdn'] = 'Винаги връщай обратна разписка';
 $labels['reqdsn'] = 'Винаги изисквай отговор при доставка на съобщение';
 $labels['replysamefolder'] = 'Постави отговора в папката на съобщението, на което се отговаря';
@@ -400,15 +469,19 @@ $labels['spellcheckignoresyms'] = 'Игнорирай думи съдържащ�
 $labels['spellcheckignorenums'] = 'Игнорирай думи съдържащи числа';
 $labels['spellcheckignorecaps'] = 'Игнорирай думи съдържащи единствено главни букви';
 $labels['addtodict'] = 'Добави в речника';
+$labels['mailtoprotohandler'] = 'Регистриран протокол за mailto: връзките';
 $labels['forwardmode'] = 'Препращане на съобщения';
+$labels['inline'] = 'вградено';
 $labels['asattachment'] = 'като прикачен файл';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Име на папката';
-$labels['subscribed'] = 'Използвай';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Име на папката';
+$labels['subscribed']  = 'Използвай';
 $labels['messagecount'] = 'Писма';
-$labels['create'] = 'Създай';
-$labels['createfolder'] = 'Направи нова папка';
-$labels['managefolders'] = 'Настройки на папките';
+$labels['create']  = 'Създай';
+$labels['createfolder']  = 'Направи нова папка';
+$labels['managefolders']  = 'Настройки на папките';
 $labels['specialfolders'] = 'Служебни папки';
 $labels['properties'] = 'Свойства';
 $labels['folderproperties'] = 'Свойства на папката';
@@ -418,20 +491,29 @@ $labels['info'] = 'Информация';
 $labels['getfoldersize'] = 'Щракни за големина на папката';
 $labels['changesubscription'] = 'Щракни за промяна на абонамент';
 $labels['foldertype'] = 'Вид на папката';
-$labels['personalfolder'] = 'Лична папка';
-$labels['otherfolder'] = 'Папка на друг потребител';
-$labels['sharedfolder'] = 'Публична папка';
+$labels['personalfolder']  = 'Лична папка';
+$labels['otherfolder']  = 'Папка на друг потребител';
+$labels['sharedfolder']  = 'Публична папка';
+
 $labels['sortby'] = 'Сортирай по';
-$labels['sortasc'] = 'Сортирай възходящо';
+$labels['sortasc']  = 'Сортирай възходящо';
 $labels['sortdesc'] = 'Сортирай низходящо';
 $labels['undo'] = 'Отмени';
+
 $labels['installedplugins'] = 'Инсталирани добавки';
 $labels['plugin'] = 'Добавки';
 $labels['version'] = 'Версия';
+$labels['source'] = 'Източник';
+$labels['license'] = 'Лиценз';
+$labels['support'] = 'Поддръжка';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+
+// character sets
 $labels['unicode'] = 'Уникод';
 $labels['english'] = 'Английски';
 $labels['westerneuropean'] = 'Западна Европа';
@@ -451,3 +533,4 @@ $labels['japanese'] = 'Японски';
 $labels['korean'] = 'Корейски';
 $labels['chinese'] = 'Китайски';
 
+?>
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index 757e2842d..ead68921c 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -2,35 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Вход неуспешен';
+$messages['errortitle']  = 'Възникна грешка!';
+$messages['loginfailed']  = 'Неуспешен вход';
 $messages['cookiesdisabled'] = 'Вашият браузър не приема cookies';
 $messages['sessionerror'] = 'Невалидна или изтекла сесия';
 $messages['storageerror'] = 'Неуспешно свързване към IMAP сървъра';
 $messages['servererror'] = 'Грешка!';
 $messages['servererrormsg'] = 'Сървърна грешка: $msg';
 $messages['dberror'] = 'Грешка с базата данни!';
+$messages['requesttimedout'] = 'Заявката е с изтекло време';
 $messages['errorreadonly'] = 'Операцията не може да бъде изпълнена. Папката е с права само за четене';
 $messages['errornoperm'] = 'Операцията не може да бъде изпълнена. Отказани права за достъп';
 $messages['invalidrequest'] = 'Невалидна заявка! Данните не са съхранени.';
+$messages['invalidhost'] = 'Невалидно име на сървър';
 $messages['nomessagesfound'] = 'Няма съобщения';
 $messages['loggedout'] = 'Довиждане!';
 $messages['mailboxempty'] = 'Кутията е празна';
+$messages['refreshing'] = 'Опресняване...';
 $messages['loading'] = 'Зареждане...';
 $messages['uploading'] = 'Качване на файла...';
-$messages['uploadingmany'] = 'Качване на файлове...';
+$messages['uploadingmany'] = 'Качване на файловете...';
 $messages['loadingdata'] = 'Зареждане на данни...';
 $messages['checkingmail'] = 'Проверка за нови писма...';
 $messages['sendingmessage'] = 'Изпращане на писмото...';
@@ -54,11 +60,11 @@ $messages['errormoving'] = 'Писмото не може да бъде прем�
 $messages['errorcopying'] = 'Съобщенията не могат да бъдат копирани';
 $messages['errordeleting'] = 'Писмото не може да бъде изтрито';
 $messages['errormarking'] = 'Съобщението не може да бъде маркирано';
-$messages['deletecontactconfirm'] = 'Искате ли да изтриете маркираните контакти?';
-$messages['deletegroupconfirm'] = 'Искате ли да изтриете избраната група?';
+$messages['deletecontactconfirm']  = 'Искате ли да изтриете маркираните контакти?';
+$messages['deletegroupconfirm']  = 'Искате ли да изтриете избраната група?';
 $messages['deletemessagesconfirm'] = 'Искате ли да изтриете маркираните съобщения?';
-$messages['deletefolderconfirm'] = 'Искате ли да изтриете тази папка?';
-$messages['purgefolderconfirm'] = 'Искате ли да изтриете всички писма в тази папка?';
+$messages['deletefolderconfirm']  = 'Искате ли да изтриете тази папка?';
+$messages['purgefolderconfirm']  = 'Искате ли да изтриете всички писма в тази папка?';
 $messages['contactdeleting'] = 'Изтриване на контакт(и)...';
 $messages['groupdeleting'] = 'Изтриване на група...';
 $messages['folderdeleting'] = 'Изтриване на папка...';
@@ -67,11 +73,11 @@ $messages['foldersubscribing'] = 'Абониране...';
 $messages['folderunsubscribing'] = 'Отписване на папка...';
 $messages['formincomplete'] = 'Не сте попълнили всички полета';
 $messages['noemailwarning'] = 'Моля, въведете валиден e-mail адрес';
-$messages['nonamewarning'] = 'Моля, въведете име';
+$messages['nonamewarning']  = 'Моля, въведете име';
 $messages['nopagesizewarning'] = 'Въведете брой редове на страница';
-$messages['nosenderwarning'] = 'Моля въведете валиден e-mail адрес на изпращача';
+$messages['nosenderwarning'] = 'Моля въведете валиден e-mail адрес на подателя';
 $messages['norecipientwarning'] = 'Въведете поне един получател';
-$messages['nosubjectwarning'] = 'Полето "Заглавие" е празно. Искате ли да въведете заглавие?';
+$messages['nosubjectwarning']  = 'Полето "Заглавие" е празно. Искате ли да въведете заглавие?';
 $messages['nobodywarning'] = 'Изпрати това писмо без текст?';
 $messages['notsentwarning'] = 'Писмото не е изпратено. Искате ли да бъде унищожено?';
 $messages['noldapserver'] = 'Изберете LDAP сървър за търсене';
@@ -106,15 +112,17 @@ $messages['addingmember'] = 'Добавяне на контакт(и) в гру�
 $messages['removingmember'] = 'Премахване на контакт(и) от групата...';
 $messages['receiptsent'] = 'Обратната разписка е изпратена.';
 $messages['errorsendingreceipt'] = 'Грешка при изпращането на обратна разписка.';
+$messages['deleteidentityconfirm'] = 'Наистина ли желаете да изтриете тази самоличност?';
 $messages['nodeletelastidentity'] = 'Не можете да изтриете тази самоличност, трябва да имате поне една.';
 $messages['forbiddencharacter'] = 'Името на папката съдържа непозволени символи';
 $messages['selectimportfile'] = 'Моля изберете файл за качване';
 $messages['addresswriterror'] = 'Избраната адресна книга не може да бъде записвана';
 $messages['contactaddedtogroup'] = 'Контактите бяха успешно добавени към групата';
 $messages['contactremovedfromgroup'] = 'Контактите бяха успешно премахнати от групата';
-$messages['importwait'] = 'Внасяне, моля изчакайте...';
-$messages['importerror'] = 'Внасянето неуспешно! Каченият файл не е във валиден vCard формат.';
-$messages['importconfirm'] = '<b>Успешно са внесени $inserted контакта, вече съществуващите $skipped контакта са пропуснати</b>:<p><em>$names</em></p>';
+$messages['nogroupassignmentschanged'] = 'Няма променени групи.';
+$messages['importwait'] = 'Импорт, моля изчакайте...';
+$messages['importformaterror'] = 'Импорта пропадна! Каченият файл не е с валидни данни.';
+$messages['importconfirm'] = '<b>Успешно са импортирани $inserted контакта, вече съществуващите $skipped контакта са пропуснати</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = 'b>Съществуващите записи $skipped са пропуснати</b>';
 $messages['opnotpermitted'] = 'Операцията не е позволена!';
 $messages['nofromaddress'] = 'Липсва e-mail адрес за избраната самоличност';
@@ -154,4 +162,8 @@ $messages['foldercreated'] = 'Папката е създадена';
 $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/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index c4fdb3c85..f1ad34bc0 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bn_BD/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'স্বাগতম';
-$labels['username'] = 'গ্রাহক নাম (username)';
-$labels['password'] = 'গোপোন শব্দ (password)';
-$labels['server'] = 'সারভার';
-$labels['login'] = 'প্রবেশ';
-$labels['logout'] = 'প্রস্থান';
-$labels['mail'] = 'ই-মেইল';
+
+// login page
+$labels['welcome']   = 'স্বাগতম';
+$labels['username']  = 'গ্রাহক নাম (username)';
+$labels['password']  = 'গোপোন শব্দ (password)';
+$labels['server']    = 'সারভার';
+$labels['login']     = 'প্রবেশ';
+
+// taskbar
+$labels['logout']   = 'প্রস্থান';
+$labels['mail']     = 'ই-মেইল';
 $labels['settings'] = 'ব্যাক্তিগত খুটিনাটি';
 $labels['addressbook'] = 'ঠিকানার বই';
-$labels['inbox'] = 'প্রধান বাক্স';
+
+// mailbox names
+$labels['inbox']  = 'প্রধান বাক্স';
 $labels['drafts'] = 'খসড়া';
-$labels['sent'] = 'প্রেরিত(পাঠানো মেইল)';
-$labels['trash'] = 'ডাস্টবিন';
-$labels['junk'] = 'আজেবাজে মেইল';
+$labels['sent']   = 'প্রেরিত(পাঠানো মেইল)';
+$labels['trash']  = 'ডাস্টবিন';
+$labels['junk']   = 'আজেবাজে মেইল';
+
+// message listing
 $labels['subject'] = 'বিষয়';
-$labels['from'] = 'প্রেরক';
-$labels['to'] = 'প্রাপক';
-$labels['cc'] = 'অনুলিপির ঠিকানা';
-$labels['bcc'] = 'নাজানিয়ে অনুলিপির ঠিকানা';
+$labels['from']    = 'প্রেরক';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'প্রাপক';
+$labels['cc']      = 'অনুলিপির ঠিকানা';
+$labels['bcc']     = 'নাজানিয়ে অনুলিপির ঠিকানা';
 $labels['replyto'] = 'উত্তর পাঠানোর ঠিকানা';
-$labels['date'] = 'তারিখ';
-$labels['size'] = 'সাইজ';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'তারিখ';
+$labels['size']    = 'সাইজ';
 $labels['priority'] = 'গুরুত্ব';
 $labels['organization'] = 'কোম্পানি';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'ফোল্ডার/মেইলবক্স';
-$labels['folders'] = 'ফোল্ডার/মেইলবক্স';
 $labels['messagesfromto'] = '$count মেইলের মধ্যে, $from হতে $to দেখানো হচ্ছে';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr #মেইল/চিঠি , $count এর মধ্যে';
-$labels['copy'] = 'অনুলিপির ঠিকানা';
-$labels['moveto'] = 'সরিয়ে ফেলুন..';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'অনুলিপির ঠিকানা';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'সরিয়ে ফেলুন..';
 $labels['download'] = 'ডাউনলোড';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ফাইলের নাম';
 $labels['filesize'] = 'ফাইলের সাইজ';
+
 $labels['addtoaddressbook'] = 'ঠিকানার বইতে ঢুকান';
+
+// weekdays short
 $labels['sun'] = 'রবি';
 $labels['mon'] = 'সোম';
 $labels['tue'] = 'মঙ্গল';
@@ -55,154 +80,323 @@ $labels['wed'] = 'বুধ';
 $labels['thu'] = 'বৃহ:';
 $labels['fri'] = 'শুক্র';
 $labels['sat'] = 'শনি';
-$labels['sunday'] = 'রবিবার';
-$labels['monday'] = 'সোমবার';
-$labels['tuesday'] = 'মঙ্গলবার';
+
+// weekdays long
+$labels['sunday']    = 'রবিবার';
+$labels['monday']    = 'সোমবার';
+$labels['tuesday']   = 'মঙ্গলবার';
 $labels['wednesday'] = 'বুধবার';
-$labels['thursday'] = 'বৃহস্পতিবার';
-$labels['friday'] = 'শুক্রবার';
-$labels['saturday'] = 'শনিবার';
-$labels['jan'] = 'জানুয়ারি';
-$labels['feb'] = 'ফেব্রুয়ারি';
-$labels['mar'] = 'মার্চ';
-$labels['apr'] = 'এপ্রিল';
-$labels['may'] = 'মে';
-$labels['longmay'] = 'মে';
-$labels['jun'] = 'জুন';
-$labels['jul'] = 'জুলাই';
-$labels['aug'] = 'আগস্ট';
-$labels['sep'] = 'সেপ্তেমবার';
-$labels['oct'] = 'অষ্টবার';
-$labels['nov'] = 'নবেমবার';
-$labels['dec'] = 'দিশেমবার';
-$labels['longjan'] = 'জানুয়ারি';
-$labels['longfeb'] = 'ফেব্রুয়ারি';
-$labels['longmar'] = 'মার্চ';
-$labels['longapr'] = 'এপ্রিল';
-$labels['longjun'] = 'জুন';
-$labels['longjul'] = 'জুলাই';
-$labels['longaug'] = 'আগস্ট';
-$labels['longsep'] = 'সেপ্তেমবার (September)';
-$labels['longoct'] = 'অষ্টবার (October)';
-$labels['longnov'] = 'নবেমবার (November)';
-$labels['longdec'] = 'দিশেমবার (December)';
+$labels['thursday']  = 'বৃহস্পতিবার';
+$labels['friday']    = 'শুক্রবার';
+$labels['saturday']  = 'শনিবার';
+
+// months short
+$labels['jan']	= 'জানুয়ারি';
+$labels['feb']	= 'ফেব্রুয়ারি';
+$labels['mar']	= 'মার্চ';
+$labels['apr']	= 'এপ্রিল';
+$labels['may']	= 'মে';
+$labels['jun']	= 'জুন';
+$labels['jul'] 	= 'জুলাই';
+$labels['aug']	= 'আগস্ট';
+$labels['sep']	= 'সেপ্তেমবার';
+$labels['oct']	= 'অষ্টবার';
+$labels['nov']	= 'নবেমবার';
+$labels['dec']	= 'দিশেমবার';
+
+// months long
+$labels['longjan']	= 'জানুয়ারি';
+$labels['longfeb']	= 'ফেব্রুয়ারি';
+$labels['longmar']	= 'মার্চ';
+$labels['longapr']	= 'এপ্রিল';
+$labels['longmay']	= 'মে';
+$labels['longjun']	= 'জুন';
+$labels['longjul']	= 'জুলাই';
+$labels['longaug']	= 'আগস্ট';
+$labels['longsep']	= 'সেপ্তেমবার (September)';
+$labels['longoct']	= 'অষ্টবার (October)';
+$labels['longnov']	= 'নবেমবার (November)';
+$labels['longdec']	= 'দিশেমবার (December)';
+
 $labels['today'] = 'আজকে';
-$labels['checkmail'] = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
-$labels['compose'] = 'নতুন মেইল/চিঠি লিখুন';
-$labels['writenewmessage'] = 'নতুন মেইল/চিঠি লিখুন';
-$labels['replytomessage'] = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
+$labels['compose']          = 'নতুন মেইল/চিঠি লিখুন';
+$labels['writenewmessage']  = 'নতুন মেইল/চিঠি লিখুন';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
 $labels['replytoallmessage'] = 'প্রেরক ও এই চিঠির অন্যান্য প্রাপকদের কাছে উত্তর পাঠান';
-$labels['forwardmessage'] = 'মেইল/চিঠি এগিয়ে দিন';
-$labels['deletemessage'] = 'মেইল/চিঠি ছিড়ে ফেলুন';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'মেইল/চিঠি এগিয়ে দিন';
+$labels['deletemessage']    = 'মেইল/চিঠি ছিড়ে ফেলুন';
 $labels['movemessagetotrash'] = 'মেইল/চিঠি ডাস্টবিনে ফেলুন';
-$labels['printmessage'] = 'মেইল/চিঠি প্রিন্ট করুন';
-$labels['previousmessage'] = 'আগের মেইল/চিঠিটি দেখুন';
-$labels['firstmessage'] = 'প্রথম মেইল/চিঠিটি দেখুন';
-$labels['nextmessage'] = 'পরের মেইল/চিঠিটি দেখুন';
-$labels['lastmessage'] = 'শেষ মেইল/চিঠিটি দেখুন';
-$labels['backtolist'] = 'মেইল/চিঠির তালিকায় ফিরে যান';
-$labels['viewsource'] = 'মূল উৎসদেখুন';
-$labels['markmessages'] = 'মেইল/চিঠি (গুলো)';
-$labels['markread'] = 'পড়া শেষ (read)';
-$labels['markunread'] = 'নাদেখা (unread)';
-$labels['markflagged'] = 'দাগানো (flagged)';
-$labels['markunflagged'] = 'দাগহীন (unflagged)';
+$labels['printmessage']     = 'মেইল/চিঠি প্রিন্ট করুন';
+$labels['previousmessage']  = 'আগের মেইল/চিঠিটি দেখুন';
+$labels['firstmessage']     = 'প্রথম মেইল/চিঠিটি দেখুন';
+$labels['nextmessage']      = 'পরের মেইল/চিঠিটি দেখুন';
+$labels['lastmessage']      = 'শেষ মেইল/চিঠিটি দেখুন';
+$labels['backtolist']       = 'মেইল/চিঠির তালিকায় ফিরে যান';
+$labels['viewsource']       = 'মূল উৎসদেখুন';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'মেইল/চিঠি (গুলো)';
+$labels['markread']         = 'পড়া শেষ (read)';
+$labels['markunread']       = 'নাদেখা (unread)';
+$labels['markflagged']      = 'দাগানো (flagged)';
+$labels['markunflagged']    = 'দাগহীন (unflagged)';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'বেছেনিন';
 $labels['all'] = 'সবগুলো';
 $labels['none'] = 'কোনোটাই না';
-$labels['nonesort'] = 'কোনোটাই না';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'নাদেখা (unread)';
 $labels['flagged'] = 'দাগানো (flagged)';
 $labels['unanswered'] = 'উত্তর না দেওয়া গুলো';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
 $labels['filter'] = 'ছাকনি';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'কোনোটাই না';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'টাইটকরুন';
 $labels['empty'] = 'খালিকরুন';
+
 $labels['quota'] = 'ডিস্ক এ খালি যায়গা';
-$labels['unknown'] = 'অজানা';
-$labels['unlimited'] = 'সীমাহীন';
-$labels['quicksearch'] = 'ঝটকরে খোজা';
-$labels['resetsearch'] = 'নতুনকরে খুজুন';
+$labels['unknown']  = 'অজানা';
+$labels['unlimited']  = 'সীমাহীন';
+
+$labels['quicksearch']  = 'ঝটকরে খোজা';
+$labels['resetsearch']  = 'নতুনকরে খুজুন';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
-$labels['sendmessage'] = 'এখুনি মেইল / চিঠিটি পাঠান';
-$labels['savemessage'] = 'খসড়া হিসাবে জমা করে রাখুন';
-$labels['addattachment'] = 'একটা ফাইল জুড়ে দিন চিঠির সাথে';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Editor type';
-$labels['returnreceipt'] = 'ফিরতি রসিদ';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'এখুনি মেইল / চিঠিটি পাঠান';
+$labels['savemessage']    = 'খসড়া হিসাবে জমা করে রাখুন';
+$labels['addattachment']  = 'একটা ফাইল জুড়ে দিন চিঠির সাথে';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'ফিরতি রসিদ';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
-$labels['revertto'] = 'Revert to';
+$labels['revertto']      = 'Revert to';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'জুড়ে দেওয়া ফাইল (Attachments)';
 $labels['upload'] = 'উঠায় দেন';
-$labels['close'] = 'বন্ধ করুন';
-$labels['low'] = 'Low';
-$labels['lowest'] = 'Lowest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'High';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'বন্ধ করুন';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
 $labels['highest'] = 'Highest';
-$labels['nosubject'] = '(বিষয়হীন)';
+
+$labels['nosubject']  = '(বিষয়হীন)';
 $labels['showimages'] = 'ছবি দেখান';
 $labels['alwaysshow'] = 'সবসময় $sender এর কাছে থেকে পাওয়া ছবিগুলো দেখানো হোক';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'খালি লেখা দেখুন';
 $labels['savesentmessagein'] = 'পাঠানো চিঠি/মেইল জমা করুন >>';
 $labels['dontsave'] = 'জমিয়ে রাখা লাগবে না';
 $labels['maxuploadsize'] = 'ফাইল উঠানোর সর্বোচ্চ সাইজ $size';
+
 $labels['addcc'] = 'অনুলিপির ঠিকানা ঢুকান';
 $labels['addbcc'] = 'নাজানিয়ে অনুলিপির ঠিকানা ঢুকান';
 $labels['addreplyto'] = 'উত্তর পাঠানোর ঠিকানা ঢুকান';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'প্রাপক আপনার কাছে মেইল/চিঠিটা যে পেয়েছেন তার ফিরতি রসিদ চেয়েছেন। আপনি কি ফিরতি রসিদ টা পাঠাবেন?';
 $labels['receiptread'] = 'মেইল/চিঠি যে পেয়েছেন তার ফিরতি রসিদ';
 $labels['yourmessage'] = 'নিচে রয়েছে আপনার চিঠিটা যে প্রাপক পেয়েছেন তার রসিদ';
 $labels['receiptnote'] = 'এই রসিদ খালি এতটুকু প্রমান করে যে প্রাপক চিঠিটি পেয়েছেন। কিন্তু তিনি ঠিকমতো পড়তে পেরেছেন কিনা অথবা তিনি পড়ে বুঝতে পেরেছেন কিনা তার কোনো প্রমান নেই।';
-$labels['name'] = 'নাম';
-$labels['firstname'] = 'নামের প্রথমাংশ';
-$labels['surname'] = 'নামের শেষাংশ';
-$labels['email'] = 'ই-মেইল/চিঠি';
+
+// address boook
+$labels['name']         = 'নাম';
+$labels['firstname']    = 'নামের প্রথমাংশ';
+$labels['surname']      = 'নামের শেষাংশ';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'ই-মেইল/চিঠি';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'নতুন ঠিকানা ঢুকান';
 $labels['editcontact'] = 'একটা ঠিকানা বদলান';
-$labels['edit'] = 'বদলান';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'বদলান';
 $labels['cancel'] = 'বাতিল';
-$labels['save'] = 'জমা দিন';
+$labels['save']   = 'জমা দিন';
 $labels['delete'] = 'ফেলে দিন';
-$labels['newcontact'] = 'একটা নতুন ঠিকানার কার্ড বানান';
-$labels['deletecontact'] = 'বেছে নেওয়া ঠিকানা গুলো ফেলে দিন';
-$labels['composeto'] = 'চিঠি পাঠাবেন কার কাছে?';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'একটা নতুন ঠিকানার কার্ড বানান';
+$labels['deletecontact']  = 'বেছে নেওয়া ঠিকানা গুলো ফেলে দিন';
+$labels['composeto']      = 'চিঠি পাঠাবেন কার কাছে?';
 $labels['contactsfromto'] = '$count ঠিকানার মধ্যে $from থেকে $to টা';
-$labels['print'] = 'প্রিন্ট করুন';
-$labels['export'] = 'রপ্তানি করুন';
-$labels['exportvcards'] = 'রপ্তানি করুন vCard আকারে';
-$labels['previouspage'] = 'আগের গুলো দেখান';
-$labels['firstpage'] = 'প্রথম গুলো দেখান';
-$labels['nextpage'] = 'পরের গুলো দেখান';
-$labels['lastpage'] = 'শেষের গুলো দেখান';
+$labels['print']          = 'প্রিন্ট করুন';
+$labels['export']         = 'রপ্তানি করুন';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'রপ্তানি করুন vCard আকারে';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'আগের গুলো দেখান';
+$labels['firstpage']      = 'প্রথম গুলো দেখান';
+$labels['nextpage']       = 'পরের গুলো দেখান';
+$labels['lastpage']       = 'শেষের গুলো দেখান';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'গ্রুপ';
 $labels['personaladrbook'] = 'নিজের ঠিকানা';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'আমদানি করুন';
 $labels['importcontacts'] = 'ঠিকানা আমদানি করুন';
 $labels['importfromfile'] = 'ফাইলের থেকে ঠিকানা আমদানি করুন';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'পুরো ঠিকানার বইটি খালি করে নতুন ঠিকানা গুলো ভরুন';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'শেষ';
+
+// settings
 $labels['settingsfor'] = 'খুটিনাটি';
+$labels['about'] = 'About';
 $labels['preferences'] = 'পছন্দ';
 $labels['userpreferences'] = 'গ্রাহক পছন্দ';
 $labels['editpreferences'] = 'গ্রাহক পছন্দ বদলান';
+
 $labels['identities'] = 'পরিচিতি';
 $labels['manageidentities'] = 'এই অ্যাকউন্টের "পরচিতি" বদলান';
 $labels['newidentity'] = 'নতুন পরিচিতি';
+
 $labels['newitem'] = 'নতুন জিনিষ';
 $labels['edititem'] = 'জিনিষ বদলান';
+
 $labels['preferhtml'] = 'HTML এ দেখি';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML মেইল/চিঠি';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'তারিখ ভালো করে দেখা যাবে';
-$labels['setdefault'] = 'এইটাই আসল';
-$labels['autodetect'] = 'কম্পুটার নিজেনিজি বেছে নেবে';
-$labels['language'] = 'ভাষা';
-$labels['timezone'] = 'সময়ভিত্তিক এলাকা';
-$labels['pagesize'] = 'প্রতি পৃষ্ঠায় লাইন সংখ্যা';
+$labels['setdefault']  = 'এইটাই আসল';
+$labels['autodetect']  = 'কম্পুটার নিজেনিজি বেছে নেবে';
+$labels['language']  = 'ভাষা';
+$labels['timezone']  = 'সময়ভিত্তিক এলাকা';
+$labels['pagesize']  = 'প্রতি পৃষ্ঠায় লাইন সংখ্যা';
 $labels['signature'] = 'স্বাক্ষর';
-$labels['dstactive'] = 'Daylight saving time';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML এ মেইল/চিঠি লিখুন';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML এ স্বাক্ষর';
 $labels['previewpane'] = 'ছোটোকরে দেখার জায়গা';
 $labels['skin'] = 'মেইলবক্স এর পুরোটার চেহারা';
@@ -214,39 +408,129 @@ $labels['mailboxview'] = 'মেইলবক্স দেখার কায়দ�
 $labels['mdnrequests'] = 'প্রেরক নোটিশ পাঠালে কি করা হবে?';
 $labels['askuser'] = 'আমি গ্রাহক, আমাকে জিজ্ঞাসা করুন';
 $labels['autosend'] = 'কম্পুটার নিজেনিজি ফিরতি নোটিশ পাঠায় দেবে';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'পাত্তা দেওয়া হবেনা';
 $labels['readwhendeleted'] = 'ফেলে দেবার সময় মেইল/চিঠি পড়া হয়ে গেছে হিসাবে ধরে নেওয়া হবে';
 $labels['flagfordeletion'] = 'একেবারেই ফেলে না দিয়ে মেইল/চিঠি গুলোকে দাগিয়ে রাখুন ফেলে দেবার জন্যে';
 $labels['skipdeleted'] = 'ফেলে দেওয়া মেইল/চিঠি দেখানোর দরকার নেই';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'মেইলে অন্য ওয়েবসাইট থেকে আসা ছবি থাকলে তা দেখা যাবে';
 $labels['fromknownsenders'] = 'পরিচিত প্রেরক এর ক্ষেত্রে';
 $labels['always'] = 'সবসময়';
 $labels['showinlineimages'] = 'মেইলের সাথে জোড়া লাগানো ছবি, মেইলের নিচে দেখা যাবে';
-$labels['autosavedraft'] = 'নিজেনিজি খসড়া জমা হয়ে যাবে';
-$labels['everynminutes'] = 'প্রতি $n মিনিটে';
-$labels['never'] = 'কখোনোই না';
+$labels['autosavedraft']  = 'নিজেনিজি খসড়া জমা হয়ে যাবে';
+$labels['everynminutes']  = 'প্রতি $n মিনিটে';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'কখোনোই না';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'মেইল/চিঠি দেখা যাচ্ছে';
 $labels['messagescomposition'] = 'মেইল/চিঠি লেখা হচ্ছে';
 $labels['mimeparamfolding'] = 'জুড়ে দেওয়া জিনিষের নাম';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'জটিল বিষয়';
 $labels['focusonnewmessage'] = 'নতুন মেইল এলেই তা হাইলাইট হয়ে যাবে';
 $labels['checkallfolders'] = 'সবগুলো মেইলবক্সে নতুন চিঠি খোজা হবে';
-$labels['folder'] = 'ফোল্ডার/মেইলবক্স';
-$labels['foldername'] = 'ফোল্ডার/মেইলবক্স এর নাম';
-$labels['subscribed'] = 'গ্রহনকারি';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'ফোল্ডার/মেইলবক্স';
+$labels['folders']  = 'ফোল্ডার/মেইলবক্স';
+$labels['foldername']  = 'ফোল্ডার/মেইলবক্স এর নাম';
+$labels['subscribed']  = 'গ্রহনকারি';
 $labels['messagecount'] = 'মেইল/চিঠি';
-$labels['create'] = 'প্রস্তুত করুন';
-$labels['createfolder'] = 'নতুন ফোল্ডার / মেইলবক্স প্রস্তুত করুন';
-$labels['managefolders'] = 'ফোল্ডার/মেইলবক্স গুলো কে গুছান';
+$labels['create']  = 'প্রস্তুত করুন';
+$labels['createfolder']  = 'নতুন ফোল্ডার / মেইলবক্স প্রস্তুত করুন';
+$labels['managefolders']  = 'ফোল্ডার/মেইলবক্স গুলো কে গুছান';
 $labels['specialfolders'] = 'বিশেষ ফোল্ডার/মেইলবক্স';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'সাজান';
-$labels['sortasc'] = 'কম থেকে বেশি হিসাবে সাজান';
+$labels['sortasc']  = 'কম থেকে বেশি হিসাবে সাজান';
 $labels['sortdesc'] = 'বেশি থেকে কম হিসাবে সাজান';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'বাইট';
 $labels['KB'] = 'কিলোবাইট';
 $labels['MB'] = 'মেগাবাইট';
 $labels['GB'] = 'গিগাবাইট';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index 3b0c65c9f..eaa4024b1 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bn_BD/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ঢোকা গেল না';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'ঢোকা গেল না';
 $messages['cookiesdisabled'] = 'আপনার ব্রাউজার, কুকি গ্রহন করে না';
 $messages['sessionerror'] = 'আপনার সেশন শেষ';
 $messages['storageerror'] = 'মেইল সারভার এর সাথে যোগাযোগ করা গেল না';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'এই মেইলবক্সে কোনো চিঠি নাই';
 $messages['loggedout'] = 'আপনের সেশন ঠিকঠাক মতো শেষ হইছে। শুভবিদায়।';
 $messages['mailboxempty'] = 'মেইলবক্স খালি';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'কম্পুটার কাজ করতেছে . .';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'কম্পুটার তথ্য আনছে আপনার জন্য..';
 $messages['checkingmail'] = 'নতুন চিঠি আসছে কিনা তা দেখা হচ্ছে';
 $messages['sendingmessage'] = 'চিঠি পাঠায় দেওয়া হচ্ছে';
@@ -32,39 +46,54 @@ $messages['messagesaved'] = 'চিঠি খসড়া হিসাবে জম
 $messages['successfullysaved'] = 'ঠিকঠাকমতো জমা হয়ে গিয়েছে';
 $messages['addedsuccessfully'] = 'নতুন ঠিকানা ঠিকঠাক মতো ঢোকানো হয়ে গেছে';
 $messages['contactexists'] = 'একই ই-মেইল এ আরেকটা নাম ঠিকানা তালিকায় আছে';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'আপনার গোপনীয়তা রক্ষার জন্য আমরা ছবি গুলো সরিয়ে রেখেছি';
 $messages['encryptedmessage'] = 'এটা একটি গোপন (encrypted) চিঠি। এটা আপনাকে দেখানো যাবে না। দু্ঃখিত।';
 $messages['nocontactsfound'] = 'কোনো ঠিকানা পাওয়া গেলনা। দু্ঃখিত।';
 $messages['contactnotfound'] = 'আপনি যে ঠিকানা খুজছেন সেটা পাওয়া গেল না';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'চিঠি পাঠানো গেলনা';
 $messages['senttooquickly'] = 'এই চিঠি পাঠানোর আগে, দয়া করে $sec সেকেন্ড';
 $messages['errorsavingsent'] = 'প্রেরিত চিঠি হিসাবে জমা রাখার সময় একটা ঝামেলা হয়েছে';
 $messages['errorsaving'] = 'জমা করার সময় একটা ঝামেলা হয়েছে';
 $messages['errormoving'] = 'চিঠিটা সরানো গেলো না';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'চিঠিটা ফেলানো গেলো না';
-$messages['deletecontactconfirm'] = 'আপনি কি আসলেই এই ঠিকানা(গুলো) ফেলো দিতে চান?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'আপনি কি আসলেই এই ঠিকানা(গুলো) ফেলো দিতে চান?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'আপনি কি আসলেই এই চিঠি(গুলো) ফেলো দিতে চান?';
-$messages['deletefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স ফেলো দিতে চান?';
-$messages['purgefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স এর সব চিঠি ফেলো দিতে চান?';
+$messages['deletefolderconfirm']  = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স ফেলো দিতে চান?';
+$messages['purgefolderconfirm']  = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স এর সব চিঠি ফেলো দিতে চান?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'ফোল্ডার/মেইলবক্স ফেলে দেওয়া হচ্ছে';
 $messages['foldermoving'] = 'ফোল্ডার/মেইলবক্স সরানো হচ্ছে';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'আপনি সবগুলো জিনিষ লেখেননি';
 $messages['noemailwarning'] = 'একটি সঠিক ই-মেইল লিখুন';
-$messages['nonamewarning'] = 'দয়া করে নামটি লিখুন';
+$messages['nonamewarning']  = 'দয়া করে নামটি লিখুন';
 $messages['nopagesizewarning'] = 'দয়া করে পৃষ্ঠার সাইজটি লিখুন';
 $messages['nosenderwarning'] = 'দয়া করে ফিরতি ই-মেইলটা লিখুন';
 $messages['norecipientwarning'] = 'দয়া করে একজন প্রাপক এর ই-মেইলটা লিখুন';
-$messages['nosubjectwarning'] = 'বিষয় হিসাবে কিছু লেখা হয়নি, আপনি কি কিছু লিখবেন এখন বিষয় হিসাবে?';
+$messages['nosubjectwarning']  = 'বিষয় হিসাবে কিছু লেখা হয়নি, আপনি কি কিছু লিখবেন এখন বিষয় হিসাবে?';
 $messages['nobodywarning'] = 'কোনো কিছু না লিখেই এই চিঠি পাঠিয়ে দেবেন?';
 $messages['notsentwarning'] = 'চিঠি পাঠানো হয়নি। চিঠিটা কি বাতিল করে দেবেন?';
 $messages['noldapserver'] = 'দয়া করে একটি এল্ডাপ সারভার বেছে নিন সার্চ করার জন্যে';
 $messages['nosearchname'] = 'দয়া করে একজনের নাম অথবা ই-মেইল লিখুন';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr টা চিঠি পাওয়া গেছে';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'খুজে কিছু পাওয়া গেলোনা';
 $messages['searching'] = 'খুজছি ....';
 $messages['checking'] = 'দেখছি ...';
 $messages['nospellerrors'] = 'No spelling errors found';
 $messages['folderdeleted'] = 'ফোল্ডার/মেইলবক্স ঠিকঠাকমতো ফেলানো হয়ে গেছে';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'ঠিকঠাকমতো ফেলানো হয়ে গেছে';
 $messages['converting'] = 'বিন্যাস (formatting) সরানো হচ্ছে ..';
 $messages['messageopenerror'] = 'সারভার থেকে চিঠি আনা গেলোনা';
@@ -75,16 +104,66 @@ $messages['copyerror'] = 'কোনো ঠিকানা তোলা গেল
 $messages['sourceisreadonly'] = 'এইঠিকানাটা খালি পড়ার জন্যে';
 $messages['errorsavingcontact'] = 'ঠিকানা জমা রাখা গেলোনা';
 $messages['movingmessage'] = 'চিঠি সরানো হচ্ছে..';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'ঠিকঠাক মতো ফিরতি রশিদ পাঠানো হয়েছে';
 $messages['errorsendingreceipt'] = 'রশিদ পাঠানো গেলোনা';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'আপনি এই পরিচিতি ফেলতে পারবেন না কারন এইটায় বর্তমানে আপনার একমাত্র পরিচিতি।';
 $messages['forbiddencharacter'] = 'ফোল্ডার এর নামের মধ্যে নিষিদ্ধ অক্ষর আছে';
 $messages['selectimportfile'] = 'একটা ফাইল বেছে নিন তোলার জন্য';
 $messages['addresswriterror'] = 'বেছে নেওয়া ঠিকানার বইটিতে লেখাযায় না';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'আমদানি করা হচ্ছে। একটু অপেক্ষা করুন...';
-$messages['importerror'] = 'আমদানি করা গেলোনা। আপনি যে ফাইলটা তুলেছেন সেটা সঠিক vCard ফাইল নয়।';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>ঠিকমতো $inserted ঠিকানা আমদানি করা গেছে, $skipped ঠিকানা আগের থেকেই ছিলো বলে তাদের টা যা ছিলো তাই রাখা হয়েছে</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'এই কাজটা করার অনুমতি নাই আপনার';
 $messages['nofromaddress'] = 'বেছে নেওয়া যে পরিচিতিটা, তাতে ই-মেইল নেই';
 $messages['editorwarning'] = 'যদি আপনি শুধু লেখার স্টাইলে যান তাহলে বর্তমানের কোনো বিন্যাস হারিয়ে যাবে';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/br/labels.inc b/program/localization/br/labels.inc
index 7e882a670..4cc9e6f89 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -2,59 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Degemer mat war $product';
-$labels['username'] = 'Anv an arveriad';
-$labels['password'] = 'Ger-Tremen';
-$labels['server'] = 'Dafariad';
-$labels['login'] = 'Kennaskañ';
-$labels['logout'] = 'Digennaskañ';
-$labels['mail'] = 'Postel elektronek';
+
+// login page
+$labels['welcome']   = 'Degemer mat war $product';
+$labels['username']  = 'Anv an arveriad';
+$labels['password']  = 'Ger-Tremen';
+$labels['server']    = 'Dafariad';
+$labels['login']     = 'Kennaskañ';
+
+// taskbar
+$labels['logout']   = 'Digennaskañ';
+$labels['mail']     = 'Postel elektronek';
 $labels['settings'] = 'Arventennoù';
 $labels['addressbook'] = 'Karned chomlec\'hioù';
-$labels['inbox'] = 'Boest degemer';
+
+// mailbox names
+$labels['inbox']  = 'Boest degemer';
 $labels['drafts'] = 'Brouilhedoù';
-$labels['sent'] = 'Kaset';
-$labels['trash'] = 'Pod-lastez';
-$labels['junk'] = 'Stroboù';
+$labels['sent']   = 'Kaset';
+$labels['trash']  = 'Pod-lastez';
+$labels['junk']   = 'Stroboù';
+
+// message listing
 $labels['subject'] = 'Sujed';
-$labels['from'] = 'Eus';
-$labels['to'] = 'Da';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Cci';
+$labels['from']    = 'Eus';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Da';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Cci';
 $labels['replyto'] = 'Respont-da';
-$labels['date'] = 'Deiz';
-$labels['size'] = 'Ment';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Deiz';
+$labels['size']    = 'Ment';
 $labels['priority'] = 'Kentwir';
 $labels['organization'] = 'Aozadur';
 $labels['readstatus'] = 'Stad al lenn';
 $labels['listoptions'] = 'Dibarzhioù ar roll...';
+
 $labels['mailboxlist'] = 'Teuliadoù';
-$labels['folders'] = 'Teuliadoù';
 $labels['messagesfromto'] = 'Kemennadoù eus $from da $to war $count';
 $labels['threadsfromto'] = 'Sujedoù $from da $to war $count';
 $labels['messagenrof'] = 'Kemennad $nr war $count';
 $labels['fromtoshort'] = '$from - $to war $count';
-$labels['copy'] = 'Eilañ';
-$labels['move'] = 'Dilec\'hiañ';
-$labels['moveto'] = 'Dilec\'hiañ da...';
+
+$labels['copy']     = 'Eilañ';
+$labels['move']     = 'Dilec\'hiañ';
+$labels['moveto']   = 'Dilec\'hiañ da...';
 $labels['download'] = 'Pellgargañ';
 $labels['showattachment'] = 'Diskouez';
 $labels['showanyway'] = 'Diskouez anezhañ memestra';
+
 $labels['filename'] = 'Anv ar restr';
 $labels['filesize'] = 'Ment ar restr';
+
 $labels['addtoaddressbook'] = 'Ouzhpennañ er c\'harned chomlec\'hioù';
+
+// weekdays short
 $labels['sun'] = 'Sul';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Meu';
@@ -62,142 +80,457 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Yao';
 $labels['fri'] = 'Gwe';
 $labels['sat'] = 'Sad';
-$labels['sunday'] = 'Sul';
-$labels['monday'] = 'Lun';
-$labels['tuesday'] = 'Meurzh';
+
+// weekdays long
+$labels['sunday']    = 'Sul';
+$labels['monday']    = 'Lun';
+$labels['tuesday']   = 'Meurzh';
 $labels['wednesday'] = 'Merc\'her';
-$labels['thursday'] = 'Yaou';
-$labels['friday'] = 'Gwener';
-$labels['saturday'] = 'Sadorn';
-$labels['jan'] = 'Gen';
-$labels['feb'] = 'C\'hwe';
-$labels['mar'] = 'Meu';
-$labels['apr'] = 'Ebr';
-$labels['may'] = 'Mae';
-$labels['longmay'] = 'Mae';
-$labels['jun'] = 'Mez';
-$labels['jul'] = 'Gou';
-$labels['aug'] = 'Eos';
-$labels['sep'] = 'Gwe';
-$labels['oct'] = 'Her';
-$labels['nov'] = 'Du';
-$labels['dec'] = 'Ker';
-$labels['longjan'] = 'Genver';
-$labels['longfeb'] = 'C\'hwevrer';
-$labels['longmar'] = 'Meurzh';
-$labels['longapr'] = 'Ebrel';
-$labels['longjun'] = 'Mezheven';
-$labels['longjul'] = 'Gouere';
-$labels['longaug'] = 'Eost';
-$labels['longsep'] = 'Gwengolo';
-$labels['longoct'] = 'Here';
-$labels['longnov'] = 'Du';
-$labels['longdec'] = 'Kerzu';
+$labels['thursday']  = 'Yaou';
+$labels['friday']    = 'Gwener';
+$labels['saturday']  = 'Sadorn';
+
+// months short
+$labels['jan']	= 'Gen';
+$labels['feb']	= 'C\'hwe';
+$labels['mar']	= 'Meu';
+$labels['apr']	= 'Ebr';
+$labels['may']	= 'Mae';
+$labels['jun']	= 'Mez';
+$labels['jul'] 	= 'Gou';
+$labels['aug']	= 'Eos';
+$labels['sep']	= 'Gwe';
+$labels['oct']	= 'Her';
+$labels['nov']	= 'Du';
+$labels['dec']	= 'Ker';
+
+// months long
+$labels['longjan']	= 'Genver';
+$labels['longfeb']	= 'C\'hwevrer';
+$labels['longmar']	= 'Meurzh';
+$labels['longapr']	= 'Ebrel';
+$labels['longmay']	= 'Mae';
+$labels['longjun']	= 'Mezheven';
+$labels['longjul']	= 'Gouere';
+$labels['longaug']	= 'Eost';
+$labels['longsep']	= 'Gwengolo';
+$labels['longoct']	= 'Here';
+$labels['longnov']	= 'Du';
+$labels['longdec']	= 'Kerzu';
+
 $labels['today'] = 'Hiziv';
-$labels['refresh'] = 'Azgrenaat';
-$labels['checkmail'] = 'Gwiriañ kemennadoù nevez';
-$labels['compose'] = 'Skrivañ ur c\'hemennad nevez';
-$labels['writenewmessage'] = 'Skrivañ ur c\'hemennad nevez';
-$labels['reply'] = 'Respont';
-$labels['replytomessage'] = 'Respont d\'ar kaser';
+
+// toolbar buttons
+$labels['refresh']          = 'Azgrenaat';
+$labels['checkmail']        = 'Gwiriañ kemennadoù nevez';
+$labels['compose']          = 'Skrivañ ur c\'hemennad nevez';
+$labels['writenewmessage']  = 'Skrivañ ur c\'hemennad nevez';
+$labels['reply']            = 'Respont';
+$labels['replytomessage']   = 'Respont d\'ar kaser';
 $labels['replytoallmessage'] = 'Respont d\'an holl';
-$labels['replyall'] = 'Respont d\'an holl';
-$labels['replylist'] = 'Respont d\'ar roll';
-$labels['forwardmessage'] = 'Treuzkas ar c\'hemennad';
-$labels['deletemessage'] = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
-$labels['printmessage'] = 'Moulañ ar c\'hemennad-se';
-$labels['previousmessage'] = 'Gwelout ar c"hemennad a-raok';
-$labels['firstmessage'] = 'Gwelout ar c\'hemennad kentañ';
-$labels['nextmessage'] = 'Gwelout ar c\'hemennad da heul';
-$labels['lastmessage'] = 'Gwelout ar c\'hemennad diwezhañ';
-$labels['backtolist'] = 'Distreiñ el listenn kemennadoù';
-$labels['viewsource'] = 'Gwelout an tarzh';
+$labels['replyall']         = 'Respont d\'an holl';
+$labels['replylist']        = 'Respont d\'ar roll';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Treuzkas ar c\'hemennad';
+$labels['deletemessage']    = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Moulañ ar c\'hemennad-se';
+$labels['previousmessage']  = 'Gwelout ar c"hemennad a-raok';
+$labels['firstmessage']     = 'Gwelout ar c\'hemennad kentañ';
+$labels['nextmessage']      = 'Gwelout ar c\'hemennad da heul';
+$labels['lastmessage']      = 'Gwelout ar c\'hemennad diwezhañ';
+$labels['backtolist']       = 'Distreiñ el listenn kemennadoù';
+$labels['viewsource']       = 'Gwelout an tarzh';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Diuzañ';
 $labels['all'] = 'An holl';
 $labels['none'] = 'Ebet';
-$labels['nonesort'] = 'Ebet';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na lennet';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Ebet';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Stummaat';
 $labels['empty'] = 'Skarzhañ';
+
 $labels['quota'] = 'Implijadur pladenn';
-$labels['unknown'] = 'Dianav';
-$labels['unlimited'] = 'didermen';
-$labels['quicksearch'] = 'Klask prim';
-$labels['resetsearch'] = 'Aderaouekaat ar glask';
-$labels['sendmessage'] = 'Kas ar c\'hemennad diouzhtu';
-$labels['savemessage'] = 'Gwarediñ ar brouilhed-se';
-$labels['addattachment'] = 'Stagañ ur restr';
-$labels['charset'] = 'Engodadur';
-$labels['editortype'] = 'Furmad aozer';
-$labels['returnreceipt'] = 'Testeni degemer';
+$labels['unknown']  = 'Dianav';
+$labels['unlimited']  = 'didermen';
+
+$labels['quicksearch']  = 'Klask prim';
+$labels['resetsearch']  = 'Aderaouekaat ar glask';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Kas ar c\'hemennad diouzhtu';
+$labels['savemessage']    = 'Gwarediñ ar brouilhed-se';
+$labels['addattachment']  = 'Stagañ ur restr';
+$labels['charset']        = 'Engodadur';
+$labels['editortype']     = 'Furmad aozer';
+$labels['returnreceipt']  = 'Testeni degemer';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Gwiriañ ar reizhskrivadur';
 $labels['resumeediting'] = 'Distreiñ en aozer';
-$labels['revertto'] = 'Distreiñ en/r';
+$labels['revertto']      = 'Distreiñ en/r';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Restroù staget';
 $labels['upload'] = 'Stagañ';
-$labels['close'] = 'Serriñ';
-$labels['low'] = 'Izel';
-$labels['lowest'] = 'An izelañ';
-$labels['normal'] = 'Reizh';
-$labels['high'] = 'Uhel';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Serriñ';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Izel';
+$labels['lowest']  = 'An izelañ';
+$labels['normal']  = 'Reizh';
+$labels['high']    = 'Uhel';
 $labels['highest'] = 'An uhelañ';
-$labels['nosubject'] = '(n\'eus ket sujed)';
+
+$labels['nosubject']  = '(n\'eus ket sujed)';
 $labels['showimages'] = 'Diskouez ar skeudennoù';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'testenn kriz';
-$labels['name'] = 'Anv da ziskouez';
-$labels['firstname'] = 'Raganv';
-$labels['surname'] = 'Anv';
-$labels['email'] = 'Postel elektronek';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Anv da ziskouez';
+$labels['firstname']    = 'Raganv';
+$labels['surname']      = 'Anv';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Postel elektronek';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Ouzhpennañ an darempred diuzet en hor c\'harned chomlec\'hioù';
 $labels['editcontact'] = 'Cheñch an darempred';
-$labels['edit'] = 'Cheñch';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Cheñch';
 $labels['cancel'] = 'Nullañ';
-$labels['save'] = 'Gwarediñ';
+$labels['save']   = 'Gwarediñ';
 $labels['delete'] = 'Dilemel';
-$labels['newcontact'] = 'Krouiñ un darempred nevez';
-$labels['deletecontact'] = 'Dilemel an darempredoù diuzet';
-$labels['composeto'] = 'Skrivañ ur c\'hemennad ouzh';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Krouiñ un darempred nevez';
+$labels['deletecontact']  = 'Dilemel an darempredoù diuzet';
+$labels['composeto']      = 'Skrivañ ur c\'hemennad ouzh';
 $labels['contactsfromto'] = 'Darempredoù eus $from ouzh $to war $count';
-$labels['print'] = 'Moulañ';
-$labels['export'] = 'Ezporzhiañ';
-$labels['previouspage'] = 'Diskouez pajenn a-raok';
-$labels['firstpage'] = 'Gwelout ar bajenn gentañ';
-$labels['nextpage'] = 'Diskouez pajenn da heul';
-$labels['lastpage'] = 'Gwelout ar bajenn diwezhañ';
+$labels['print']          = 'Moulañ';
+$labels['export']         = 'Ezporzhiañ';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Diskouez pajenn a-raok';
+$labels['firstpage']      = 'Gwelout ar bajenn gentañ';
+$labels['nextpage']       = 'Diskouez pajenn da heul';
+$labels['lastpage']       = 'Gwelout ar bajenn diwezhañ';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Strolladoù';
 $labels['personaladrbook'] = 'Chomlec\'h personel';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Arventennoù evit';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Dibarzhioù';
 $labels['userpreferences'] = 'Dibarzhioù implijer';
 $labels['editpreferences'] = 'Cheñch dibarzhioù implijer';
+
 $labels['identities'] = 'Identelezhioù';
 $labels['manageidentities'] = 'Merañ an identelezhioù evit ar c\'hont-se';
 $labels['newidentity'] = 'Identelezh nevez';
+
 $labels['newitem'] = 'Elfenn nevez';
 $labels['edititem'] = 'Cheñch an elfenn';
+
 $labels['preferhtml'] = 'Diskouez en HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Kemennad en HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Diskouez berr deizioù';
-$labels['setdefault'] = 'Arventennoù dre ziouer';
-$labels['language'] = 'Yezh';
-$labels['timezone'] = 'Gwerzhid-eur';
-$labels['pagesize'] = 'Niver a linenn dre bajenn';
+$labels['setdefault']  = 'Arventennoù dre ziouer';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Yezh';
+$labels['timezone']  = 'Gwerzhid-eur';
+$labels['pagesize']  = 'Niver a linenn dre bajenn';
 $labels['signature'] = 'Sinadur';
-$labels['dstactive'] = 'Eur an hañv';
+$labels['dstactive']  = 'Eur an hañv';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Sevel ur c\'hemennad er furmad HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Sinadur HTML';
 $labels['previewpane'] = 'Diskouez panel alberz';
-$labels['autosavedraft'] = 'Gwarediñ emgefre brouilhedoù';
-$labels['everynminutes'] = 'Bep $n munutoù';
-$labels['never'] = 'ebet';
-$labels['folder'] = 'Renkell';
-$labels['foldername'] = 'Anv ar renkell';
-$labels['subscribed'] = 'Koumananer';
-$labels['create'] = 'Krouiñ';
-$labels['createfolder'] = 'Krouiñ ur renkell nevez';
-$labels['managefolders'] = 'Aozañ ar renkelloù';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Gwarediñ emgefre brouilhedoù';
+$labels['everynminutes']  = 'Bep $n munutoù';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'ebet';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Renkell';
+$labels['folders']  = 'Teuliadoù';
+$labels['foldername']  = 'Anv ar renkell';
+$labels['subscribed']  = 'Koumananer';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Krouiñ';
+$labels['createfolder']  = 'Krouiñ ur renkell nevez';
+$labels['managefolders']  = 'Aozañ ar renkelloù';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Rummañ dre';
-$labels['sortasc'] = 'Rumm diagentad';
+$labels['sortasc']  = 'Rumm diagentad';
 $labels['sortdesc'] = 'Rumm diskennad';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 1eff8a84c..425dad996 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -2,30 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Degouezhet ez eus bet ur fazi !';
-$messages['loginfailed'] = 'C\'hwitadenn war kennaskañ';
+$messages['errortitle']  = 'Degouezhet ez eus bet ur fazi !';
+$messages['loginfailed']  = 'C\'hwitadenn war kennaskañ';
 $messages['cookiesdisabled'] = 'N\'eus ket c\'hoant toupinoù Hor merder';
 $messages['sessionerror'] = 'Didalvoudek pe echuet eo hoc\'h estez.';
 $messages['storageerror'] = 'C\'hwitadenn war kennaskañ ouzh an dafariad mirout';
 $messages['servererror'] = 'Fazi dafariad !';
 $messages['servererrormsg'] = 'Fazi dafariad : $msg';
 $messages['dberror'] = 'Fazi stlennvon !';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Kemennadoù ebet er voest lizhiri';
 $messages['loggedout'] = 'Digevreet hoc\'h eus mat. Kenavo !';
 $messages['mailboxempty'] = 'Boest lizhiri dileun';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'O kargañ...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'O kargañ roadennoù...';
 $messages['checkingmail'] = 'O Gwiriañ kemennadoù nevez...';
 $messages['sendingmessage'] = 'O kas ar c\'hemennad...';
@@ -35,34 +46,54 @@ $messages['messagesaved'] = 'Kemennad gwaredet dindan Brouilhedoù';
 $messages['successfullysaved'] = 'Gwarediñ graet';
 $messages['addedsuccessfully'] = 'Darempred ouzhpennet er c\'harned chomlec\'hioù';
 $messages['contactexists'] = 'Bout a ra un darempred gant memes postel elektronek';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Evit gwarantiñ hoc\'h buhez prevez, stanket eo bet skeudennoù pell er c\'hemennad-se.';
 $messages['encryptedmessage'] = 'Rineget eo ar c\'hemennad, ha ne c\'hall ket bezañ diskouez. Ma Digarezit !';
 $messages['nocontactsfound'] = 'N\'eo ket bet kavet darempred ebet';
 $messages['contactnotfound'] = 'N\'eo ket bet kavet an darempred goulennet';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'N\'eo ket bet kaset ar c\'hemennad';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Fazi en deus graet reuz en hoc\'h gwarediñ';
 $messages['errormoving'] = 'N\'eus ket tu da zilec\'hiañ ar c\'hemennad';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'N\'eus ket tu da zilemel ar c\'hemennad';
-$messages['deletecontactconfirm'] = 'C\'hoant hoc\'h eus da zilemel an darempred(où) diuzet ?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'C\'hoant hoc\'h eus da zilemel an darempred(où) diuzet ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'C\'hoant hoc\'h eus da zilemel ar c\'hemennad(où) diuzet ?';
-$messages['deletefolderconfirm'] = 'C\'hoant hoc\'h eus da skarzhañ ar renkell-se ?';
-$messages['purgefolderconfirm'] = 'C\'hoant hoc\'h eus da skarzhañ an holl kemennad eus ar renkell-se ?';
+$messages['deletefolderconfirm']  = 'C\'hoant hoc\'h eus da skarzhañ ar renkell-se ?';
+$messages['purgefolderconfirm']  = 'C\'hoant hoc\'h eus da skarzhañ an holl kemennad eus ar renkell-se ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'N\'eo ket leuniet ar furmskrid penn-da-benn';
 $messages['noemailwarning'] = 'Termenit ur postel elektronek mat mar plij ganeoc\'h';
-$messages['nonamewarning'] = 'Termenit un anv mar plij ganeoc\'h';
+$messages['nonamewarning']  = 'Termenit un anv mar plij ganeoc\'h';
 $messages['nopagesizewarning'] = 'Termenit ur ment pajenn mar plij ganeoc\'h';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Ouzhpennit ur resever da nebeutañ mar plij ganeoc\'h';
-$messages['nosubjectwarning'] = 'Dileun eo ar maezienn « Sujed » . C\'hoant hoc\'h eus da leuniañ anezhiñ diouzhtu ?';
+$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['notsentwarning'] = 'N\'eo ket bet kaset ar c\'hemennad. C\'hoant hoc\'h eus dilezel ar c\'hemennad-se ?';
 $messages['noldapserver'] = 'Dizuit ur servijer LDAP evit ar glask';
 $messages['nosearchname'] = 'Skrivit un anv darempred pe ur postel elektronek';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr kemennad kavet';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Disoc\'h ebet gant ar glask';
 $messages['searching'] = 'O klask...';
 $messages['checking'] = 'O gwiriañ...';
 $messages['nospellerrors'] = 'Fazi ebet kavet';
 $messages['folderdeleted'] = 'Renkell skarzhet';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Dilemet mat';
 $messages['converting'] = 'O tilemel furmaozañ...';
 $messages['messageopenerror'] = 'N\'us ket tu da gargañ ar c\'hemennad adalek ar servijer';
@@ -72,4 +103,67 @@ $messages['copysuccess'] = 'Kopiañ mat $nr chomlec\'h';
 $messages['copyerror'] = 'Ne c\'hall ket kopiañ chomlec\'hioù';
 $messages['sourceisreadonly'] = 'Lenn hepken eo an tarzh chomlec\'h se';
 $messages['errorsavingcontact'] = 'Ne c\'haller ket gwarediñ chomlec\'h darempred';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 72bc3b0a0..37b1abebb 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Dobrodošli u $product';
-$labels['username'] = 'Korisnik';
-$labels['password'] = 'Šifra';
-$labels['server'] = 'Server';
-$labels['login'] = 'Prijava';
-$labels['logout'] = 'Odjava';
-$labels['mail'] = 'Email';
+
+// login page
+$labels['welcome']   = 'Dobrodošli u $product';
+$labels['username']  = 'Korisnik';
+$labels['password']  = 'Šifra';
+$labels['server']    = 'Server';
+$labels['login']     = 'Prijava';
+
+// taskbar
+$labels['logout']   = 'Odjava';
+$labels['mail']     = 'Email';
 $labels['settings'] = 'Podešavanja';
 $labels['addressbook'] = 'Adresar';
-$labels['inbox'] = 'Sanduče';
+
+// mailbox names
+$labels['inbox']  = 'Sanduče';
 $labels['drafts'] = 'Skice';
-$labels['sent'] = 'Poslano';
-$labels['trash'] = 'Smeće';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Poslano';
+$labels['trash']  = 'Smeće';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Naslov';
-$labels['from'] = 'Od';
-$labels['to'] = 'Za';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Od';
+$labels['sender']  = 'Pošiljalac';
+$labels['to']      = 'Za';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To adresa';
 $labels['followupto'] = 'Prati';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Veličina';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status poruke';
 $labels['listoptions'] = 'Izlistaj opcije...';
+
 $labels['mailboxlist'] = 'Folderi';
-$labels['folders'] = 'Folderi';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
 $labels['fromtoshort'] = '$from – $to od ukupno $count';
-$labels['copy'] = 'Kopiraj';
-$labels['move'] = 'Premjesti';
-$labels['moveto'] = 'Premjesti u...';
+
+$labels['copy']     = 'Kopiraj';
+$labels['move']     = 'Premjesti';
+$labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi';
 $labels['showattachment'] = 'Prikaži';
 $labels['showanyway'] = 'Ipak prikaži';
+
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Veličina datoteke';
+
 $labels['addtoaddressbook'] = 'Dodaj u adresar';
+
+// weekdays short
 $labels['sun'] = 'Ned';
 $labels['mon'] = 'Pon';
 $labels['tue'] = 'Uto';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Sri';
 $labels['thu'] = 'Čet';
 $labels['fri'] = 'Pet';
 $labels['sat'] = 'Sub';
-$labels['sunday'] = 'Nedjelja';
-$labels['monday'] = 'Ponedjeljak';
-$labels['tuesday'] = 'Utorak';
+
+// weekdays long
+$labels['sunday']    = 'Nedjelja';
+$labels['monday']    = 'Ponedjeljak';
+$labels['tuesday']   = 'Utorak';
 $labels['wednesday'] = 'Srijeda';
-$labels['thursday'] = 'Četvrtak';
-$labels['friday'] = 'Petak';
-$labels['saturday'] = 'Subota';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Avg';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Mart';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Avgust';
-$labels['longsep'] = 'Septembar';
-$labels['longoct'] = 'Oktobar';
-$labels['longnov'] = 'Novembar';
-$labels['longdec'] = 'Decembar';
+$labels['thursday']  = 'Četvrtak';
+$labels['friday']    = 'Petak';
+$labels['saturday']  = 'Subota';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maj';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Avg';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Mart';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Maj';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'Avgust';
+$labels['longsep']	= 'Septembar';
+$labels['longoct']	= 'Oktobar';
+$labels['longnov']	= 'Novembar';
+$labels['longdec']	= 'Decembar';
+
 $labels['today'] = 'Danas';
-$labels['refresh'] = 'Osvježi';
-$labels['checkmail'] = 'Provjeri ima li novih poruka';
-$labels['compose'] = 'Nova poruka';
-$labels['writenewmessage'] = 'Kreiraj novu poruku';
-$labels['reply'] = 'Odgovori';
-$labels['replytomessage'] = 'Odgovori pošiljaocu';
+
+// toolbar buttons
+$labels['refresh']          = 'Osvježi';
+$labels['checkmail']        = 'Provjeri ima li novih poruka';
+$labels['compose']          = 'Nova poruka';
+$labels['writenewmessage']  = 'Kreiraj novu poruku';
+$labels['reply']            = 'Odgovori';
+$labels['replytomessage']   = 'Odgovori pošiljaocu';
 $labels['replytoallmessage'] = 'Odgovori listi osoba ili pošiljaocu i svim primaocima';
-$labels['replyall'] = 'Odgovori svima';
-$labels['replylist'] = 'Odgovori listi';
-$labels['forward'] = 'Proslijedi';
-$labels['forwardinline'] = 'Proslijedi odmah';
+$labels['replyall']         = 'Odgovori svima';
+$labels['replylist']        = 'Odgovori listi';
+$labels['forward']          = 'Proslijedi';
+$labels['forwardinline']    = 'Proslijedi odmah';
 $labels['forwardattachment'] = 'Proslijedi kao prilog';
-$labels['forwardmessage'] = 'Proslijedi poruku';
-$labels['deletemessage'] = 'Obriši poruku';
+$labels['forwardmessage']   = 'Proslijedi poruku';
+$labels['deletemessage']    = 'Obriši poruku';
 $labels['movemessagetotrash'] = 'Prebaci poruku u smeće';
-$labels['printmessage'] = 'Odštampaj poruku';
-$labels['previousmessage'] = 'Prikaži prethodnu poruku';
-$labels['firstmessage'] = 'Prikaži prvu poruku';
-$labels['nextmessage'] = 'Prikaži sljedeću poruku';
-$labels['lastmessage'] = 'Prikaži zadnju poruku';
-$labels['backtolist'] = 'Nazad na listu poruka';
-$labels['viewsource'] = 'Prikaži izvornu poruku';
-$labels['mark'] = 'Označi';
-$labels['markmessages'] = 'Označi poruke';
-$labels['markread'] = 'Kao pročitane';
-$labels['markunread'] = 'Kao nepročitane';
-$labels['markflagged'] = 'Kao važne';
-$labels['markunflagged'] = 'Kao nevažne';
-$labels['moreactions'] = 'Više akcija...';
-$labels['more'] = 'Više';
-$labels['back'] = 'Nazad';
-$labels['options'] = 'Opcije';
+$labels['printmessage']     = 'Odštampaj poruku';
+$labels['previousmessage']  = 'Prikaži prethodnu poruku';
+$labels['firstmessage']     = 'Prikaži prvu poruku';
+$labels['nextmessage']      = 'Prikaži sljedeću poruku';
+$labels['lastmessage']      = 'Prikaži zadnju poruku';
+$labels['backtolist']       = 'Nazad na listu poruka';
+$labels['viewsource']       = 'Prikaži izvornu poruku';
+$labels['mark']             = 'Označi';
+$labels['markmessages']     = 'Označi poruke';
+$labels['markread']         = 'Kao pročitane';
+$labels['markunread']       = 'Kao nepročitane';
+$labels['markflagged']      = 'Kao važne';
+$labels['markunflagged']    = 'Kao nevažne';
+$labels['moreactions']      = 'Više akcija...';
+$labels['more']             = 'Više';
+$labels['back']             = 'Nazad';
+$labels['options']          = 'Opcije';
+
 $labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
-$labels['nonesort'] = 'Ništa';
 $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitano';
 $labels['flagged'] = 'Važno';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Proširi sve';
 $labels['expand-unread'] = 'Proširi nepročitane';
 $labels['collapse-all'] = 'Zatvori sve';
 $labels['threaded'] = 'Teme';
+
 $labels['autoexpand_threads'] = 'Proširi teme poruka';
 $labels['do_expand'] = 'sve teme';
 $labels['expand_only_unread'] = 'samo sa nepročitanim porukama';
 $labels['fromto'] = 'Od/Za';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Prilog';
+$labels['nonesort'] = 'Ništa';
 $labels['sentdate'] = 'Datum slanja';
 $labels['arrival'] = 'Datum primanja';
 $labels['asc'] = 'rastući';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Lista kolona';
 $labels['listsorting'] = 'Sortiranje kolona';
 $labels['listorder'] = 'Raspored sortiranja';
 $labels['listmode'] = 'Način prikaza liste';
+
 $labels['folderactions'] = 'Akcije za foldere...';
 $labels['compact'] = 'Optimiziraj';
 $labels['empty'] = 'Isprazni';
+
 $labels['quota'] = 'Zauzeće diska';
-$labels['unknown'] = 'nepoznato';
-$labels['unlimited'] = 'neograničeno';
-$labels['quicksearch'] = 'Brza pretraga';
-$labels['resetsearch'] = 'Resetuj pretragu';
-$labels['searchmod'] = 'Modifikacija pretrage';
-$labels['msgtext'] = 'Cijela poruka';
+$labels['unknown']  = 'nepoznato';
+$labels['unlimited']  = 'neograničeno';
+
+$labels['quicksearch']  = 'Brza pretraga';
+$labels['resetsearch']  = 'Resetuj pretragu';
+$labels['searchmod']  = 'Modifikacija pretrage';
+$labels['msgtext']  = 'Cijela poruka';
+$labels['body']  = 'Tijelo';
+
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
-$labels['editasnew'] = 'Uredi kao novo';
-$labels['send'] = 'Pošalji';
-$labels['sendmessage'] = 'Pošalji poruku';
-$labels['savemessage'] = 'Sačuvaj skicu';
-$labels['addattachment'] = 'Priloži datoteku';
-$labels['charset'] = 'Skup znakova';
-$labels['editortype'] = 'Vrsta urednika';
-$labels['returnreceipt'] = 'Potvrda o prispijeću poruke';
-$labels['dsn'] = 'Obavještenje o statusu dostave';
+
+// message compose
+$labels['editasnew']      = 'Uredi kao novo';
+$labels['send']           = 'Pošalji';
+$labels['sendmessage']    = 'Pošalji poruku';
+$labels['savemessage']    = 'Sačuvaj skicu';
+$labels['addattachment']  = 'Priloži datoteku';
+$labels['charset']        = 'Skup znakova';
+$labels['editortype']     = 'Vrsta urednika';
+$labels['returnreceipt']  = 'Potvrda o prispijeću poruke';
+$labels['dsn']            = 'Obavještenje o statusu dostave';
 $labels['mailreplyintro'] = '$date, $sender je napisao/la:';
 $labels['originalmessage'] = 'Originalna poruka';
-$labels['editidents'] = 'Uredi identitete';
-$labels['spellcheck'] = 'Spelovanje';
+
+$labels['editidents']    = 'Uredi identitete';
+$labels['spellcheck']    = 'Spelovanje';
 $labels['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Nastavi uređivanje';
-$labels['revertto'] = 'Vrati na';
+$labels['revertto']      = 'Vrati na';
+
 $labels['attach'] = 'Priloži';
 $labels['attachments'] = 'Prilozi';
 $labels['upload'] = 'Dodaj';
 $labels['uploadprogress'] = '$percent ($current od $total)';
-$labels['close'] = 'Zatvori';
-$labels['messageoptions'] = 'Opcije poruke...';
-$labels['low'] = 'Nizak';
-$labels['lowest'] = 'Najniži';
-$labels['normal'] = 'Normalan';
-$labels['high'] = 'Visok';
+$labels['close']  = 'Zatvori';
+$labels['messageoptions']  = 'Opcije poruke...';
+
+$labels['low']     = 'Nizak';
+$labels['lowest']  = 'Najniži';
+$labels['normal']  = 'Normalan';
+$labels['high']    = 'Visok';
 $labels['highest'] = 'Najveći';
-$labels['nosubject'] = '(bez naslova)';
+
+$labels['nosubject']  = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
-$labels['isdraft'] = 'Ovo je skica.';
-$labels['andnmore'] = 'još $nr...';
+$labels['isdraft']    = 'Ovo je skica.';
+$labels['andnmore']   = 'još $nr...';
 $labels['togglemoreheaders'] = 'Prikaži još zaglavlja poruka';
 $labels['togglefullheaders'] = 'Aktiviranje izvornih zaglavlja poruka';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Obični tekst';
 $labels['savesentmessagein'] = 'Sačuvaj poslane poruke u';
 $labels['dontsave'] = 'ne snimaj';
 $labels['maxuploadsize'] = 'Maksimalna dozvoljena veličina datoteke je $size';
+
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj odgovor na';
 $labels['addfollowupto'] = 'Dodaj praćenje za';
+
+// mdn
 $labels['mdnrequest'] = 'Pošiljaoc ove poruke je tražio da bude obaviješten kada pročitate ovu poruku. Želite li obavijestiti pošiljaoca?';
 $labels['receiptread'] = 'Povratnica (pročitano)';
 $labels['yourmessage'] = 'Ovo je povratnica vaše poruke';
 $labels['receiptnote'] = 'Napomena: Ova povratnica samo potvrđuje da je poruka bila prikazana na računaru primaoca. Nema garancija da je primaoc pročitao ili razumio sadržaj poruke.';
-$labels['name'] = 'Ime za prikaz';
-$labels['firstname'] = 'Ime';
-$labels['surname'] = 'Prezime';
-$labels['middlename'] = 'Srednje ime';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Sufiks';
-$labels['nickname'] = 'Nadimak';
-$labels['jobtitle'] = 'Titula';
-$labels['department'] = 'Odjel';
-$labels['gender'] = 'Spol';
-$labels['maidenname'] = 'Djevojačko ime';
-$labels['email'] = 'Email';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Grad';
-$labels['zipcode'] = 'Poštanski broj';
-$labels['region'] = 'Oblast';
-$labels['country'] = 'Zemlja';
-$labels['birthday'] = 'Rođendan';
-$labels['anniversary'] = 'Godišnjica';
-$labels['website'] = 'Web stranica';
+
+// address boook
+$labels['name']         = 'Ime za prikaz';
+$labels['firstname']    = 'Ime';
+$labels['surname']      = 'Prezime';
+$labels['middlename']   = 'Srednje ime';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Sufiks';
+$labels['nickname']     = 'Nadimak';
+$labels['jobtitle']     = 'Titula';
+$labels['department']   = 'Odjel';
+$labels['gender']       = 'Spol';
+$labels['maidenname']   = 'Djevojačko ime';
+$labels['email']        = 'Email';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Grad';
+$labels['zipcode']      = 'Poštanski broj';
+$labels['region']       = 'Oblast';
+$labels['country']      = 'Zemlja';
+$labels['birthday']     = 'Rođendan';
+$labels['anniversary']  = 'Godišnjica';
+$labels['website']      = 'Web stranica';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Napomene';
-$labels['male'] = 'Muško';
+$labels['male']   = 'Muško';
 $labels['female'] = 'Žensko';
 $labels['manager'] = 'Menadžer';
 $labels['assistant'] = 'Pomoćnik';
-$labels['typeassistant'] = 'Pomoćnik';
 $labels['spouse'] = 'Supružnik';
 $labels['allfields'] = 'Sva polja';
 $labels['search'] = 'Pretraga';
 $labels['advsearch'] = 'Napredna pretraga';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-$labels['typeother'] = 'Ostalo';
-$labels['typehome'] = 'Kućni broj';
-$labels['typework'] = 'Poslovni broj';
-$labels['typemobile'] = 'Mobilni broj';
-$labels['typemain'] = 'Glavni broj';
-$labels['typehomefax'] = 'Fax kuća';
-$labels['typeworkfax'] = 'Fax posao';
-$labels['typecar'] = 'Automobil';
-$labels['typepager'] = 'Pejdžer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Početna stranica';
+
+$labels['typehome']   = 'Kućni broj';
+$labels['typework']   = 'Poslovni broj';
+$labels['typeother']  = 'Ostalo';
+$labels['typemobile']  = 'Mobilni broj';
+$labels['typemain']  = 'Glavni broj';
+$labels['typehomefax']  = 'Fax kuća';
+$labels['typeworkfax']  = 'Fax posao';
+$labels['typecar']  = 'Automobil';
+$labels['typepager']  = 'Pejdžer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Pomoćnik';
+$labels['typehomepage']  = 'Početna stranica';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Uredi kontakt';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Svojstva kontakta';
 $labels['personalinfo'] = 'Lični podaci';
-$labels['edit'] = 'Uredi';
+
+$labels['edit']   = 'Uredi';
 $labels['cancel'] = 'Otkaži';
-$labels['save'] = 'Sačuvaj';
+$labels['save']   = 'Sačuvaj';
 $labels['delete'] = 'Obriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamijeni';
 $labels['uploadphoto'] = 'Dodaj fotografiju';
-$labels['newcontact'] = 'Dodaj novi kontakt';
-$labels['deletecontact'] = 'Obriši odabrane kontakte';
-$labels['composeto'] = 'Napiši email za';
+
+$labels['newcontact']     = 'Dodaj novi kontakt';
+$labels['deletecontact']  = 'Obriši odabrane kontakte';
+$labels['composeto']      = 'Napiši email za';
 $labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
-$labels['print'] = 'Štampaj';
-$labels['export'] = 'Izvoz';
-$labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
+$labels['print']          = 'Štampaj';
+$labels['export']         = 'Izvoz';
+$labels['exportall']      = 'Izvezi sve';
+$labels['exportsel']      = 'Izvezi označeno';
+$labels['exportvcards']   = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Kreiraj novu grupu kontakata';
-$labels['grouprename'] = 'Preimenuj grupu';
-$labels['groupdelete'] = 'Obriši grupu';
+$labels['grouprename']    = 'Preimenuj grupu';
+$labels['groupdelete']    = 'Obriši grupu';
 $labels['groupremoveselected'] = 'Ukloni odabrane kontakte iz grupe';
-$labels['previouspage'] = 'Prikaži prethodnu stranicu';
-$labels['firstpage'] = 'Prikaži prvu stranicu';
-$labels['nextpage'] = 'Prikaži sljedeću stranicu';
-$labels['lastpage'] = 'Prikaži zadnju stranicu';
+
+$labels['previouspage']   = 'Prikaži prethodnu stranicu';
+$labels['firstpage']      = 'Prikaži prvu stranicu';
+$labels['nextpage']       = 'Prikaži sljedeću stranicu';
+$labels['lastpage']       = 'Prikaži zadnju stranicu';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['personaladrbook'] = 'Lične adrese';
+
 $labels['searchsave'] = 'Sačuvaj pretragu';
 $labels['searchdelete'] = 'Obriši pretragu';
+
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakata';
 $labels['importfromfile'] = 'Uvoz iz datoteke:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Dodaj novi kontakt u adresar:';
 $labels['importreplace'] = 'Zamijeni cijeli adresar';
 $labels['importdesc'] = 'Kontakte možete dodati iz postojećeg adresara.<br/>Trenutno podržavamo uvoz adresara u formatima <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ili CSV (comma-separated).';
 $labels['done'] = 'Završeno';
+
+// settings
 $labels['settingsfor'] = 'Podešavanja za';
 $labels['about'] = 'Informacije';
 $labels['preferences'] = 'Podešavanja';
 $labels['userpreferences'] = 'Korisničke opcije';
 $labels['editpreferences'] = 'Uredi korisničke opcije';
+
 $labels['identities'] = 'Identiteti';
 $labels['manageidentities'] = 'Podesi identitete za ovaj račun';
 $labels['newidentity'] = 'Dodaj identitet';
+
 $labels['newitem'] = 'Nova stavka';
 $labels['edititem'] = 'Uredi stavku';
+
 $labels['preferhtml'] = 'Prikaži HTML';
 $labels['defaultcharset'] = 'Glavni skup znakova';
 $labels['htmlmessage'] = 'HTML poruke';
+$labels['messagepart'] = 'Dio';
+$labels['digitalsig'] = 'Digitalni potpis';
 $labels['dateformat'] = 'Format datuma';
 $labels['timeformat'] = 'Format vremena';
 $labels['prettydate'] = 'Formatirani datum';
-$labels['setdefault'] = 'Postavi kao glavno';
-$labels['autodetect'] = 'Automatski';
-$labels['language'] = 'Jezik';
-$labels['timezone'] = 'Vremenska zona';
-$labels['pagesize'] = 'Redova po stranici';
+$labels['setdefault']  = 'Postavi kao glavno';
+$labels['autodetect']  = 'Automatski';
+$labels['language']  = 'Jezik';
+$labels['timezone']  = 'Vremenska zona';
+$labels['pagesize']  = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
-$labels['dstactive'] = 'Ljetno računanje vremena';
+$labels['dstactive']  = 'Ljetno računanje vremena';
 $labels['showinextwin'] = 'Otvori poruku u novom prozoru';
 $labels['composeextwin'] = 'Napiši u novom prozor';
 $labels['htmleditor'] = 'Piši HTML poruke';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Prikaži vanjske slike u porukama';
 $labels['fromknownsenders'] = 'od poznatih pošiljatelja';
 $labels['always'] = 'uvijek';
 $labels['showinlineimages'] = 'Prikaži priložene slike ispod poruke';
-$labels['autosavedraft'] = 'Automatski sačuvaj skicu';
-$labels['everynminutes'] = 'svakih $n minuta';
-$labels['refreshinterval'] = 'Osvježi (provjeri ima li novih poruka itd.)';
-$labels['never'] = 'nikad';
-$labels['immediately'] = 'odmah';
+$labels['autosavedraft']  = 'Automatski sačuvaj skicu';
+$labels['everynminutes']  = 'svakih $n minuta';
+$labels['refreshinterval']  = 'Osvježi (provjeri ima li novih poruka itd.)';
+$labels['never']  = 'nikad';
+$labels['immediately']  = 'odmah';
 $labels['messagesdisplaying'] = 'Prikaz poruka';
 $labels['messagescomposition'] = 'Pisanje poruka';
 $labels['mimeparamfolding'] = 'Nazivi priloga';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Prilikom odgovaranja ili prosljeđivanja potpis
 $labels['belowquote'] = 'ispod citata';
 $labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
-$labels['previewpanemarkread'] = 'Obilježi prikazane poruke kao pročitane';
-$labels['afternseconds'] = 'nakon $n sekundi';
+$labels['previewpanemarkread']  = 'Obilježi prikazane poruke kao pročitane';
+$labels['afternseconds']  = 'nakon $n sekundi';
 $labels['reqmdn'] = 'Uvijek zahtjevaj povratnicu';
 $labels['reqdsn'] = 'Uvijek zahtjevaj obavijest o statusu dostave';
 $labels['replysamefolder'] = 'Sačuvaj odgovore u folder poruke na osnovu koje se piše odgovor';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Registruj upravljač protokola za mailto: linko
 $labels['forwardmode'] = 'Prosljeđivanje poruka';
 $labels['inline'] = 'u istom redu';
 $labels['asattachment'] = 'kao prilog';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Naziv foldera';
-$labels['subscribed'] = 'Pretplaćen';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Folderi';
+$labels['foldername']  = 'Naziv foldera';
+$labels['subscribed']  = 'Pretplaćen';
 $labels['messagecount'] = 'Poruke';
-$labels['create'] = 'Kreiraj';
-$labels['createfolder'] = 'Kreiraj novi folder';
-$labels['managefolders'] = 'Upravljanje folderima';
+$labels['create']  = 'Kreiraj';
+$labels['createfolder']  = 'Kreiraj novi folder';
+$labels['managefolders']  = 'Upravljanje folderima';
 $labels['specialfolders'] = 'Specijalni folder';
 $labels['properties'] = 'Svojstva';
 $labels['folderproperties'] = 'Svojstva foldera';
@@ -427,23 +491,29 @@ $labels['info'] = 'Informacije';
 $labels['getfoldersize'] = 'Kliknite da biste dobili informaciju o veličini foldera';
 $labels['changesubscription'] = 'Kliknite da promijenite pretplatu';
 $labels['foldertype'] = 'Vrsta foldera';
-$labels['personalfolder'] = 'Privatni folder';
-$labels['otherfolder'] = 'Folder drugog korisnika';
-$labels['sharedfolder'] = 'Javni folder';
+$labels['personalfolder']  = 'Privatni folder';
+$labels['otherfolder']  = 'Folder drugog korisnika';
+$labels['sharedfolder']  = 'Javni folder';
+
 $labels['sortby'] = 'Sortiraj po';
-$labels['sortasc'] = 'Sortiraj uzlazno';
+$labels['sortasc']  = 'Sortiraj uzlazno';
 $labels['sortdesc'] = 'Sortiraj silazno';
 $labels['undo'] = 'Nazad';
+
 $labels['installedplugins'] = 'Instalirani plugini';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Verzija';
 $labels['source'] = 'Izvorni kod';
 $labels['license'] = 'Licenca';
 $labels['support'] = 'Podrška';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unikod';
 $labels['english'] = 'engleski';
 $labels['westerneuropean'] = 'Zapadna Evropa';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'japanski';
 $labels['korean'] = 'korejski';
 $labels['chinese'] = 'kineski';
 
+?>
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index b8dceb9c7..3949a42a6 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Desila se greška!';
-$messages['loginfailed'] = 'Prijava nije uspjela.';
+$messages['errortitle']  = 'Desila se greška!';
+$messages['loginfailed']  = 'Prijava nije uspjela.';
 $messages['cookiesdisabled'] = 'Vaš preglednik ne prihvata kolačiće.';
 $messages['sessionerror'] = 'Vaša sesija je neispravna ili je istekla.';
 $messages['storageerror'] = 'Neuspješna konekcija na IMAP server';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Nije moguće premjestiti poruke.';
 $messages['errorcopying'] = 'Nije moguće kopirati poruke.';
 $messages['errordeleting'] = 'Nije moguće obrisati poruke.';
 $messages['errormarking'] = 'Nije moguće označiti poruke.';
-$messages['deletecontactconfirm'] = 'Da li zaista želite obrisati označene kontakte?';
-$messages['deletegroupconfirm'] = 'Da li zaista želite obrisati označenu grupu?';
+$messages['deletecontactconfirm']  = 'Da li zaista želite obrisati označene kontakte?';
+$messages['deletegroupconfirm']  = 'Da li zaista želite obrisati označenu grupu?';
 $messages['deletemessagesconfirm'] = 'Da li zaista želite obrisati označene poruke?';
-$messages['deletefolderconfirm'] = 'Da li zaista želite obrisati ovaj folder?';
-$messages['purgefolderconfirm'] = 'Da li zaista želite obrisati sve poruke u ovom folderu?';
+$messages['deletefolderconfirm']  = 'Da li zaista želite obrisati ovaj folder?';
+$messages['purgefolderconfirm']  = 'Da li zaista želite obrisati sve poruke u ovom folderu?';
 $messages['contactdeleting'] = 'Brišem kontakte...';
 $messages['groupdeleting'] = 'Brišem grupu...';
 $messages['folderdeleting'] = 'Brišem folder...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Pretplaćujem se na folder...';
 $messages['folderunsubscribing'] = 'Uklanjam pretplatu za folder...';
 $messages['formincomplete'] = 'Obrazac nije popunjen u cjelosti.';
 $messages['noemailwarning'] = 'Molimo vas da upišete ispravnu email adresu.';
-$messages['nonamewarning'] = 'Molimo vas da upišete ime.';
+$messages['nonamewarning']  = 'Molimo vas da upišete ime.';
 $messages['nopagesizewarning'] = 'Molimo vas da upišete veličinu stranice.';
 $messages['nosenderwarning'] = 'Molimo vas da upišete email adresu pošiljaoca';
 $messages['norecipientwarning'] = 'Molimo vas da upišete barem jednog primaoca.';
-$messages['nosubjectwarning'] = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
+$messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['notsentwarning'] = 'Poruka nije poslana. Želite li odbaciti ovu poruku?';
 $messages['noldapserver'] = 'Molimo vas da odaberete LDAP server za pretragu.';
@@ -163,3 +166,4 @@ $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.';
 
+?>
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 8ba29c5ba..3d5df27b4 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Pau Argelaguet <pau@paelladebits.cat>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvingut a $product';
-$labels['username'] = 'Nom d\'usuari';
-$labels['password'] = 'Contrasenya';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entra';
-$labels['logout'] = 'Tanca sessió';
-$labels['mail'] = 'Correu';
+
+// login page
+$labels['welcome']   = 'Benvingut a $product';
+$labels['username']  = 'Nom d\'usuari';
+$labels['password']  = 'Contrasenya';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entra';
+
+// taskbar
+$labels['logout']   = 'Tanca sessió';
+$labels['mail']     = 'Correu';
 $labels['settings'] = 'Configuració';
 $labels['addressbook'] = 'Contactes';
-$labels['inbox'] = 'Safata d\'entrada';
+
+// mailbox names
+$labels['inbox']  = 'Safata d\'entrada';
 $labels['drafts'] = 'Esborranys';
-$labels['sent'] = 'Enviats';
-$labels['trash'] = 'Paperera';
-$labels['junk'] = 'Correu brossa';
+$labels['sent']   = 'Enviats';
+$labels['trash']  = 'Paperera';
+$labels['junk']   = 'Correu brossa';
+
+// message listing
 $labels['subject'] = 'Assumpte';
-$labels['from'] = 'Remitent';
-$labels['to'] = 'Destinatari';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Remitent';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Destinatari';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Respon a';
 $labels['followupto'] = 'Seguiment-a';
-$labels['date'] = 'Data';
-$labels['size'] = 'Mida';
+$labels['date']    = 'Data';
+$labels['size']    = 'Mida';
 $labels['priority'] = 'Prioritat';
 $labels['organization'] = 'Organització';
 $labels['readstatus'] = 'Estat de lectura';
 $labels['listoptions'] = 'Llista d\'opcions...';
+
 $labels['mailboxlist'] = 'Carpetes';
-$labels['folders'] = 'Carpetes';
 $labels['messagesfromto'] = 'Missatges des de $from a $to de $count';
 $labels['threadsfromto'] = 'Fils $from a $to de $count';
 $labels['messagenrof'] = 'Missatge $nr de $count';
 $labels['fromtoshort'] = '$from - $to de $count';
-$labels['copy'] = 'Copia';
-$labels['move'] = 'Mou';
-$labels['moveto'] = 'Mou a...';
+
+$labels['copy']     = 'Copia';
+$labels['move']     = 'Mou';
+$labels['moveto']   = 'Mou a...';
 $labels['download'] = 'Descarrega';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostra-ho de totes maneres';
+
 $labels['filename'] = 'Nom del fitxer';
 $labels['filesize'] = 'Mida del fitxer';
+
 $labels['addtoaddressbook'] = 'Afegeix a contactes';
+
+// weekdays short
 $labels['sun'] = 'Diu';
 $labels['mon'] = 'Dll';
 $labels['tue'] = 'Dmt';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Dmc';
 $labels['thu'] = 'Dij';
 $labels['fri'] = 'Div';
 $labels['sat'] = 'Dis';
-$labels['sunday'] = 'Diumenge';
-$labels['monday'] = 'Dilluns';
-$labels['tuesday'] = 'Dimarts';
+
+// weekdays long
+$labels['sunday']    = 'Diumenge';
+$labels['monday']    = 'Dilluns';
+$labels['tuesday']   = 'Dimarts';
 $labels['wednesday'] = 'Dimecres';
-$labels['thursday'] = 'Dijous';
-$labels['friday'] = 'Divendres';
-$labels['saturday'] = 'Dissabte';
-$labels['jan'] = 'gen';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'abr';
-$labels['may'] = 'mai';
-$labels['longmay'] = 'mai';
-$labels['jun'] = 'jun';
-$labels['jul'] = 'jul';
-$labels['aug'] = 'ago';
-$labels['sep'] = 'set';
-$labels['oct'] = 'oct';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'des';
-$labels['longjan'] = 'gener';
-$labels['longfeb'] = 'febrer';
-$labels['longmar'] = 'març';
-$labels['longapr'] = 'abril';
-$labels['longjun'] = 'juny';
-$labels['longjul'] = 'juliol';
-$labels['longaug'] = 'agost';
-$labels['longsep'] = 'setembre';
-$labels['longoct'] = 'octubre';
-$labels['longnov'] = 'novembre';
-$labels['longdec'] = 'desembre';
+$labels['thursday']  = 'Dijous';
+$labels['friday']    = 'Divendres';
+$labels['saturday']  = 'Dissabte';
+
+// months short
+$labels['jan']	= 'gen';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'abr';
+$labels['may']	= 'mai';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'ago';
+$labels['sep']	= 'set';
+$labels['oct']	= 'oct';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'des';
+
+// months long
+$labels['longjan']	= 'gener';
+$labels['longfeb']	= 'febrer';
+$labels['longmar']	= 'març';
+$labels['longapr']	= 'abril';
+$labels['longmay']	= 'mai';
+$labels['longjun']	= 'juny';
+$labels['longjul']	= 'juliol';
+$labels['longaug']	= 'agost';
+$labels['longsep']	= 'setembre';
+$labels['longoct']	= 'octubre';
+$labels['longnov']	= 'novembre';
+$labels['longdec']	= 'desembre';
+
 $labels['today'] = 'Avui';
-$labels['refresh'] = 'Actualitza';
-$labels['checkmail'] = 'Recupera missatges nous';
-$labels['compose'] = 'Escriu un missatge';
-$labels['writenewmessage'] = 'Crea un nou missatge';
-$labels['reply'] = 'Respon';
-$labels['replytomessage'] = 'Respon al remitent';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualitza';
+$labels['checkmail']        = 'Recupera missatges nous';
+$labels['compose']          = 'Escriu un missatge';
+$labels['writenewmessage']  = 'Crea un nou missatge';
+$labels['reply']            = 'Respon';
+$labels['replytomessage']   = 'Respon al remitent';
 $labels['replytoallmessage'] = 'Respon al remitent i a tots els destinataris';
-$labels['replyall'] = 'Respon a tots';
-$labels['replylist'] = 'Llista de resposta';
-$labels['forward'] = 'Reenvia';
-$labels['forwardinline'] = 'Reenvia com en línia';
+$labels['replyall']         = 'Respon a tots';
+$labels['replylist']        = 'Llista de resposta';
+$labels['forward']          = 'Reenvia';
+$labels['forwardinline']    = 'Reenvia com en línia';
 $labels['forwardattachment'] = 'Reenvia com a adjunt';
-$labels['forwardmessage'] = 'Reenvia el missatge';
-$labels['deletemessage'] = 'Suprimeix el missatge';
+$labels['forwardmessage']   = 'Reenvia el missatge';
+$labels['deletemessage']    = 'Suprimeix el missatge';
 $labels['movemessagetotrash'] = 'Mou el missatge a la paperera';
-$labels['printmessage'] = 'Imprimeix aquest missatge';
-$labels['previousmessage'] = 'Mostra el missatge anterior';
-$labels['firstmessage'] = 'Mostra el primer missatge';
-$labels['nextmessage'] = 'Mostra el missatge següent';
-$labels['lastmessage'] = 'Mostra l\'últim missatge';
-$labels['backtolist'] = 'Torna a la llista de missatges';
-$labels['viewsource'] = 'Mostra el codi font';
-$labels['mark'] = 'Marca';
-$labels['markmessages'] = 'Marca missatges';
-$labels['markread'] = 'Com a llegits';
-$labels['markunread'] = 'Com a no llegits';
-$labels['markflagged'] = 'Com a marcat';
-$labels['markunflagged'] = 'Com a no marcat';
-$labels['moreactions'] = 'Més accions...';
-$labels['more'] = 'Més';
-$labels['back'] = 'Torna';
-$labels['options'] = 'Opcions';
+$labels['printmessage']     = 'Imprimeix aquest missatge';
+$labels['previousmessage']  = 'Mostra el missatge anterior';
+$labels['firstmessage']     = 'Mostra el primer missatge';
+$labels['nextmessage']      = 'Mostra el missatge següent';
+$labels['lastmessage']      = 'Mostra l\'últim missatge';
+$labels['backtolist']       = 'Torna a la llista de missatges';
+$labels['viewsource']       = 'Mostra el codi font';
+$labels['mark']             = 'Marca';
+$labels['markmessages']     = 'Marca missatges';
+$labels['markread']         = 'Com a llegits';
+$labels['markunread']       = 'Com a no llegits';
+$labels['markflagged']      = 'Com a marcat';
+$labels['markunflagged']    = 'Com a no marcat';
+$labels['moreactions']      = 'Més accions...';
+$labels['more']             = 'Més';
+$labels['back']             = 'Torna';
+$labels['options']          = 'Opcions';
+
 $labels['select'] = 'Selecciona';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
-$labels['nonesort'] = 'Cap';
 $labels['currpage'] = 'Pàgina actual';
 $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Expandeix tots';
 $labels['expand-unread'] = 'Expandeix No llegits';
 $labels['collapse-all'] = 'Redueix tots';
 $labels['threaded'] = 'Encadenat';
+
 $labels['autoexpand_threads'] = 'Expandeix els missatges encadenats';
 $labels['do_expand'] = 'tots els fils de discusió';
 $labels['expand_only_unread'] = 'només amb missatges no llegits';
 $labels['fromto'] = 'Remitent/Destinatari';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunció';
+$labels['nonesort'] = 'Cap';
 $labels['sentdate'] = 'Data d\'enviament';
 $labels['arrival'] = 'Data d\'arribada';
 $labels['asc'] = 'ascendent';
@@ -159,179 +187,216 @@ $labels['listcolumns'] = 'Llista les columnes';
 $labels['listsorting'] = 'Columna d\'ordenació';
 $labels['listorder'] = 'Ordre d\'ordenació';
 $labels['listmode'] = 'Mode de vista de llista';
+
 $labels['folderactions'] = 'Accions de carpeta';
 $labels['compact'] = 'Compacta';
 $labels['empty'] = 'Buida';
+
 $labels['quota'] = 'Ús del disc';
-$labels['unknown'] = 'desconegut';
-$labels['unlimited'] = 'il·limitat';
-$labels['quicksearch'] = 'Cerca ràpida';
-$labels['resetsearch'] = 'Neteja cerca';
-$labels['searchmod'] = 'Cerca modificadors';
-$labels['msgtext'] = 'Missatge sencer';
+$labels['unknown']  = 'desconegut';
+$labels['unlimited']  = 'il·limitat';
+
+$labels['quicksearch']  = 'Cerca ràpida';
+$labels['resetsearch']  = 'Neteja cerca';
+$labels['searchmod']  = 'Cerca modificadors';
+$labels['msgtext']  = 'Missatge sencer';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
-$labels['editasnew'] = 'Edita com a nou';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Envia el missatge';
-$labels['savemessage'] = 'Desa aquest esborrany';
-$labels['addattachment'] = 'Adjunta un fitxer';
-$labels['charset'] = 'Codificació de caràcters';
-$labels['editortype'] = 'Tipus d\'editor';
-$labels['returnreceipt'] = 'Confirmació de recepció';
-$labels['dsn'] = 'Notificació d\'estat de lliurament';
+
+// message compose
+$labels['editasnew']      = 'Edita com a nou';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Envia el missatge';
+$labels['savemessage']    = 'Desa aquest esborrany';
+$labels['addattachment']  = 'Adjunta un fitxer';
+$labels['charset']        = 'Codificació de caràcters';
+$labels['editortype']     = 'Tipus d\'editor';
+$labels['returnreceipt']  = 'Confirmació de recepció';
+$labels['dsn']            = 'Notificació d\'estat de lliurament';
 $labels['mailreplyintro'] = 'A $date, $sender escrigué:';
 $labels['originalmessage'] = 'Missatge Original';
-$labels['editidents'] = 'Edita identitats';
-$labels['spellcheck'] = 'Ortografia';
+
+$labels['editidents']    = 'Edita identitats';
+$labels['spellcheck']    = 'Ortografia';
 $labels['checkspelling'] = 'Comprova l\'ortografia';
 $labels['resumeediting'] = 'Reprèn l\'edició';
-$labels['revertto'] = 'Torna a';
+$labels['revertto']      = 'Torna a';
+
 $labels['attach'] = 'Adjunta';
 $labels['attachments'] = 'Adjuncions';
 $labels['upload'] = 'Afegeix';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Tanca';
-$labels['messageoptions'] = 'Opcions de missatge...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'La més baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Tanca';
+$labels['messageoptions']  = 'Opcions de missatge...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'La més baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'La més alta';
-$labels['nosubject'] = '(sense assumpte)';
+
+$labels['nosubject']  = '(sense assumpte)';
 $labels['showimages'] = 'Mostra les imatges';
 $labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
-$labels['isdraft'] = 'Aquest és un missatge esborrany.';
-$labels['andnmore'] = '$nr més...';
+$labels['isdraft']    = 'Aquest és un missatge esborrany.';
+$labels['andnmore']   = '$nr més...';
 $labels['togglemoreheaders'] = 'Mostra més capçaleres del missatge';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text net';
 $labels['savesentmessagein'] = 'Desa el missatge enviat a';
 $labels['dontsave'] = 'no ho desis';
 $labels['maxuploadsize'] = 'El mida màxima del fitxer és $size';
+
 $labels['addcc'] = 'Afegeix Cc';
 $labels['addbcc'] = 'Afegeix Bcc';
 $labels['addreplyto'] = 'Afegeix Respon-A';
 $labels['addfollowupto'] = 'Afegir Seguiment-A';
+
+// mdn
 $labels['mdnrequest'] = 'El remitent d\'aquest missatge ha demanat ser notificat quan llegiu aquest missatge. Voleu notificar al remitent?';
 $labels['receiptread'] = 'Confirmació de recepció';
 $labels['yourmessage'] = 'Això és una confirmació de recepció per al vostre missatge';
 $labels['receiptnote'] = 'Nota: Aquesta confirmació només indica que el missatge ha estat mostrat a l\'ordinador del destinatari. No hi ha garantia que el destinatari hagi llegit o entès el contingut del missatge.';
-$labels['name'] = 'Nom a mostrar';
-$labels['firstname'] = 'Nom';
-$labels['surname'] = 'Cognom';
-$labels['middlename'] = 'Segon Nom';
-$labels['nameprefix'] = 'Prefix';
-$labels['namesuffix'] = 'Sufix';
-$labels['nickname'] = 'Àlies';
-$labels['jobtitle'] = 'Càrrec';
-$labels['department'] = 'Departament';
-$labels['gender'] = 'Sexe';
-$labels['maidenname'] = 'Cognom de Solter/a';
-$labels['email'] = 'Correu electrònic';
-$labels['phone'] = 'Telèfon';
-$labels['address'] = 'Adreça';
-$labels['street'] = 'Carrer';
-$labels['locality'] = 'Ciutat';
-$labels['zipcode'] = 'Codi postal';
-$labels['region'] = 'Estat/Província';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Data de naixement';
-$labels['anniversary'] = 'Aniversari';
-$labels['website'] = 'Pàgina web';
+
+// address boook
+$labels['name']         = 'Nom a mostrar';
+$labels['firstname']    = 'Nom';
+$labels['surname']      = 'Cognom';
+$labels['middlename']   = 'Segon Nom';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Sufix';
+$labels['nickname']     = 'Àlies';
+$labels['jobtitle']     = 'Càrrec';
+$labels['department']   = 'Departament';
+$labels['gender']       = 'Sexe';
+$labels['maidenname']   = 'Cognom de Solter/a';
+$labels['email']        = 'Correu electrònic';
+$labels['phone']        = 'Telèfon';
+$labels['address']      = 'Adreça';
+$labels['street']       = 'Carrer';
+$labels['locality']     = 'Ciutat';
+$labels['zipcode']      = 'Codi postal';
+$labels['region']       = 'Estat/Província';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Data de naixement';
+$labels['anniversary']  = 'Aniversari';
+$labels['website']      = 'Pàgina web';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'home';
+$labels['male']   = 'home';
 $labels['female'] = 'dona';
 $labels['manager'] = 'Gerent';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Cònjuge';
 $labels['allfields'] = 'Tots els camps';
 $labels['search'] = 'Cerca';
 $labels['advsearch'] = 'Cerca Avançada';
 $labels['advanced'] = 'Paràmetres avançats';
 $labels['other'] = 'Un altre';
-$labels['typeother'] = 'Un altre';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Feina';
-$labels['typemobile'] = 'Mòbil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax particular';
-$labels['typeworkfax'] = 'Fax de la feina';
-$labels['typecar'] = 'Cotxe';
-$labels['typepager'] = 'Cercapersones';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Pàgina Inicial';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Feina';
+$labels['typeother']  = 'Un altre';
+$labels['typemobile']  = 'Mòbil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax particular';
+$labels['typeworkfax']  = 'Fax de la feina';
+$labels['typecar']  = 'Cotxe';
+$labels['typepager']  = 'Cercapersones';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Pàgina Inicial';
 $labels['typeblog'] = 'Bloc';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Afegeix camp...';
 $labels['addcontact'] = 'Afegeix un nou contacte';
 $labels['editcontact'] = 'Edita el contacte';
 $labels['contacts'] = 'Contactes';
 $labels['contactproperties'] = 'Propietats del contacte';
 $labels['personalinfo'] = 'Informació personal';
-$labels['edit'] = 'Edita';
+
+$labels['edit']   = 'Edita';
 $labels['cancel'] = 'Cancel·la';
-$labels['save'] = 'Desa';
+$labels['save']   = 'Desa';
 $labels['delete'] = 'Suprimeix';
 $labels['rename'] = 'Reanomena';
 $labels['addphoto'] = 'Afegeix';
 $labels['replacephoto'] = 'Reemplaça';
 $labels['uploadphoto'] = 'Puja una fotografia';
-$labels['newcontact'] = 'Crea un nou contacte';
-$labels['deletecontact'] = 'Suprimeix els contactes seleccionats';
-$labels['composeto'] = 'Redacta correu per a';
+
+$labels['newcontact']     = 'Crea un nou contacte';
+$labels['deletecontact']  = 'Suprimeix els contactes seleccionats';
+$labels['composeto']      = 'Redacta correu per a';
 $labels['contactsfromto'] = 'Contactes $from a $to de $count';
-$labels['print'] = 'Imprimeix';
-$labels['export'] = 'Exporta';
-$labels['exportvcards'] = 'Exporta contactes en format vCard';
+$labels['print']          = 'Imprimeix';
+$labels['export']         = 'Exporta';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exporta contactes en format vCard';
 $labels['newcontactgroup'] = 'Crea un nou grup de contactes';
-$labels['grouprename'] = 'Reanomena el grup';
-$labels['groupdelete'] = 'Suprimeix el grup';
+$labels['grouprename']    = 'Reanomena el grup';
+$labels['groupdelete']    = 'Suprimeix el grup';
 $labels['groupremoveselected'] = 'Suprimeix els contactes seleccionats del grup';
-$labels['previouspage'] = 'Mostra la pàgina anterior';
-$labels['firstpage'] = 'Mostra la primera pàgina';
-$labels['nextpage'] = 'Mostra la pàgina següent';
-$labels['lastpage'] = 'Mostra la darrera pàgina';
+
+$labels['previouspage']   = 'Mostra la pàgina anterior';
+$labels['firstpage']      = 'Mostra la primera pàgina';
+$labels['nextpage']       = 'Mostra la pàgina següent';
+$labels['lastpage']       = 'Mostra la darrera pàgina';
+
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grups';
 $labels['personaladrbook'] = 'Llibreta d\'adreces';
+
 $labels['searchsave'] = 'Desa la cerca';
 $labels['searchdelete'] = 'Suprimeix la cerca';
+
 $labels['import'] = 'Importa';
 $labels['importcontacts'] = 'Importa contactes';
 $labels['importfromfile'] = 'Importa des d\'un fitxer:';
 $labels['importtarget'] = 'Afegeix contactes nous a la llibreta d\'adreces:';
 $labels['importreplace'] = 'Reemplaça la llibreta d\'adreçes sencera';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Fet';
+
+// settings
 $labels['settingsfor'] = 'Configuració per a';
 $labels['about'] = 'Quant a';
 $labels['preferences'] = 'Preferències';
 $labels['userpreferences'] = 'Preferències de l\'usuari';
 $labels['editpreferences'] = 'Edita les preferències de l\'usuari';
+
 $labels['identities'] = 'Identitats';
 $labels['manageidentities'] = 'Gestiona les identitats per a aquest compte';
 $labels['newidentity'] = 'Nova identitat';
+
 $labels['newitem'] = 'Nou element';
 $labels['edititem'] = 'Edita l\'element';
+
 $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Joc de caràcters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Format de la data';
 $labels['timeformat'] = 'Format horari';
 $labels['prettydate'] = 'Dates curtes';
-$labels['setdefault'] = 'Posa-ho per defecte';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Fus horari';
-$labels['pagesize'] = 'Files per pàgina';
+$labels['setdefault']  = 'Posa-ho per defecte';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Fus horari';
+$labels['pagesize']  = 'Files per pàgina';
 $labels['signature'] = 'Signatura';
-$labels['dstactive'] = 'Horari d\'estiu';
+$labels['dstactive']  = 'Horari d\'estiu';
 $labels['showinextwin'] = 'Obrir el missatge en una nova finestra';
 $labels['composeextwin'] = 'Redactar en una nova finestra';
 $labels['htmleditor'] = 'Escriu missatges en HTML';
 $labels['htmlonreply'] = 'només en resposta a missatges en HTML';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Signatura en HTML';
 $labels['previewpane'] = 'Mostra el panell de previsualització';
 $labels['skin'] = 'Aparença d\'interfície';
@@ -355,11 +420,11 @@ $labels['showremoteimages'] = 'Mostra les imatges remotes del missatge';
 $labels['fromknownsenders'] = 'de remitent conegut';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra les imatges adjuntes sota el missatge';
-$labels['autosavedraft'] = 'Desa l\'esborrany automàticament';
-$labels['everynminutes'] = 'cada $n minut(s)';
-$labels['refreshinterval'] = 'Resfrescar (comprovar nous missatges, etc.)';
-$labels['never'] = 'mai';
-$labels['immediately'] = 'immediatament';
+$labels['autosavedraft']  = 'Desa l\'esborrany automàticament';
+$labels['everynminutes']  = 'cada $n minut(s)';
+$labels['refreshinterval']  = 'Resfrescar (comprovar nous missatges, etc.)';
+$labels['never']  = 'mai';
+$labels['immediately']  = 'immediatament';
 $labels['messagesdisplaying'] = 'Vista de missatges';
 $labels['messagescomposition'] = 'Composició de missatges';
 $labels['mimeparamfolding'] = 'Noms dels adjunts';
@@ -390,8 +455,8 @@ $labels['replysignaturepos'] = 'Quan es contesti o reenviï, posa-hi la signatur
 $labels['belowquote'] = 'sota les cometes';
 $labels['abovequote'] = 'sobre les cometes';
 $labels['insertsignature'] = 'Inserta la signatura';
-$labels['previewpanemarkread'] = 'Marca els missatges previsualitzats com a llegits';
-$labels['afternseconds'] = 'després de $n segons';
+$labels['previewpanemarkread']  = 'Marca els missatges previsualitzats com a llegits';
+$labels['afternseconds']  = 'després de $n segons';
 $labels['reqmdn'] = 'Demana sempre la confirmació de recepció';
 $labels['reqdsn'] = 'Demana sempre una notificació d\'estat de lliurament';
 $labels['replysamefolder'] = 'Posa les respostes a la carpeta del missatge que es respon';
@@ -405,15 +470,18 @@ $labels['spellcheckignorenums'] = 'Ignora paraules amb números';
 $labels['spellcheckignorecaps'] = 'Ignora paraules amb lletres capitalitzades';
 $labels['addtodict'] = 'Afegeix al diccionari';
 $labels['mailtoprotohandler'] = 'Registra controlador de protocol pels enllaços mailto:';
+$labels['forwardmode'] = 'Messages forwarding';
 $labels['inline'] = 'en línia';
 $labels['asattachment'] = 'com adjunt';
-$labels['folder'] = 'Carpeta';
-$labels['foldername'] = 'Nom de la carpeta';
-$labels['subscribed'] = 'Subscrit';
+
+$labels['folder']  = 'Carpeta';
+$labels['folders']  = 'Carpetes';
+$labels['foldername']  = 'Nom de la carpeta';
+$labels['subscribed']  = 'Subscrit';
 $labels['messagecount'] = 'Missatges';
-$labels['create'] = 'Crea';
-$labels['createfolder'] = 'Crea una carpeta nova';
-$labels['managefolders'] = 'Gestiona carpetes';
+$labels['create']  = 'Crea';
+$labels['createfolder']  = 'Crea una carpeta nova';
+$labels['managefolders']  = 'Gestiona carpetes';
 $labels['specialfolders'] = 'Carpetes especials';
 $labels['properties'] = 'Propietats';
 $labels['folderproperties'] = 'Propietats de la carpeta';
@@ -423,23 +491,29 @@ $labels['info'] = 'Informació';
 $labels['getfoldersize'] = 'Feu clic per veure la mida de la carpeta';
 $labels['changesubscription'] = 'Feu clic per canviar la subscripció';
 $labels['foldertype'] = 'Tipus de Carpeta';
-$labels['personalfolder'] = 'Carpeta privada';
-$labels['otherfolder'] = 'Carpeta d\'un altre usuari';
-$labels['sharedfolder'] = 'Carpeta pública';
+$labels['personalfolder']  = 'Carpeta privada';
+$labels['otherfolder']  = 'Carpeta d\'un altre usuari';
+$labels['sharedfolder']  = 'Carpeta pública';
+
 $labels['sortby'] = 'Ordena per';
-$labels['sortasc'] = 'Ordena ascendentment';
+$labels['sortasc']  = 'Ordena ascendentment';
 $labels['sortdesc'] = 'Ordena descendentment';
 $labels['undo'] = 'Desfés';
+
 $labels['installedplugins'] = 'Connectors Instal·lats';
 $labels['plugin'] = 'Complement';
 $labels['version'] = 'Versió';
 $labels['source'] = 'Font';
 $labels['license'] = 'Llicència';
 $labels['support'] = 'Obtingueu ajuda';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglès';
 $labels['westerneuropean'] = 'Europeu occidental';
@@ -459,3 +533,4 @@ $labels['japanese'] = 'Japonès';
 $labels['korean'] = 'Coreà';
 $labels['chinese'] = 'Xinès';
 
+?>
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index b4a5741b1..5f0e1d609 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Pau Argelaguet <pau@paelladebits.cat>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Hi ha hagut un error!';
-$messages['loginfailed'] = 'L\'accés ha fallat.';
+$messages['errortitle']  = 'Hi ha hagut un error!';
+$messages['loginfailed']  = 'L\'accés ha fallat.';
 $messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies';
 $messages['sessionerror'] = 'La vostra sessió no existeix o ha expirat';
 $messages['storageerror'] = 'Error de conexió amb el servidor IMAP';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'No s\'ha pogut moure el(s) missatge(s).';
 $messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s).';
 $messages['errordeleting'] = 'No s\'ha pogut suprimir el missatge.';
 $messages['errormarking'] = 'No s\'ha pogut marcar el(s) missatge(s).';
-$messages['deletecontactconfirm'] = 'Esteu segurs de voler suprimir el(s) contacte(s) selecionat(s)?';
-$messages['deletegroupconfirm'] = 'Esteu segurs de voler suprimirr el grup seleccionat?';
+$messages['deletecontactconfirm']  = 'Esteu segurs de voler suprimir el(s) contacte(s) selecionat(s)?';
+$messages['deletegroupconfirm']  = 'Esteu segurs de voler suprimirr el grup seleccionat?';
 $messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) selecionat(s)?';
-$messages['deletefolderconfirm'] = 'Esteu segurs de voler suprimir aquesta carpeta?';
-$messages['purgefolderconfirm'] = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
+$messages['deletefolderconfirm']  = 'Esteu segurs de voler suprimir aquesta carpeta?';
+$messages['purgefolderconfirm']  = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
 $messages['contactdeleting'] = 'S\'està suprimint els contacte(s)...';
 $messages['groupdeleting'] = 'S\'està suprimint el grup...';
 $messages['folderdeleting'] = 'S\'està suprimint la carpeta...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'S\'està subscribint la carpeta...';
 $messages['folderunsubscribing'] = 'S\'està cancelant la subscripció de la carpeta...';
 $messages['formincomplete'] = 'El formulari no ha estat emplenat totalment.';
 $messages['noemailwarning'] = 'Si us plau, introduïu una adreça de correu electrònic vàlida.';
-$messages['nonamewarning'] = 'Si us plau, introduïu un nom.';
+$messages['nonamewarning']  = 'Si us plau, introduïu un nom.';
 $messages['nopagesizewarning'] = 'Si us plau, introduïu una mida de pàgina.';
 $messages['nosenderwarning'] = 'Si us plau, entreu l\'adreça de correu del remitent.';
 $messages['norecipientwarning'] = 'Si us plau, introduïu com a mínim un destinatari.';
-$messages['nosubjectwarning'] = 'El camp "Assumpte" és buit. Voleu introduir-ne un ara?';
+$messages['nosubjectwarning']  = 'El camp "Assumpte" és buit. Voleu introduir-ne un ara?';
 $messages['nobodywarning'] = 'Voleu enviar aquest missatge sense text?';
 $messages['notsentwarning'] = 'El missatge no s\'ha enviat. Voleu descartar el vostre missatge?';
 $messages['noldapserver'] = 'Si us plau, seleccioneu un servidor LDAP per cercar.';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'La part del missatge és massa gran per processar-
 $messages['attachmentvalidationerror'] = 'ATENCIÓ! Aquest adjunt és sospitós perquè el seu tipus no coincideix amb el tipus declarat al missatge. Si no confies en l\'emissor, no l\'hauries d\'obrir al navegador perquè pot contenir elements maliciosos. <br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Atenció: Aquest client de correu necessita Javascript! Per a poder fer-lo servir, has d\'activar Javascript a les opcions del navegador.';
 
+?>
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index a30867a9b..9f8dc1870 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jan Žárský <jan.zarsky@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Vítejte v $product';
-$labels['username'] = 'Uživatel';
-$labels['password'] = 'Heslo';
-$labels['server'] = 'Server';
-$labels['login'] = 'Přihlásit';
-$labels['logout'] = 'Odhlásit';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Vítejte v $product';
+$labels['username']  = 'Uživatel';
+$labels['password']  = 'Heslo';
+$labels['server']    = 'Server';
+$labels['login']     = 'Přihlásit';
+
+// taskbar
+$labels['logout']   = 'Odhlásit';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Nastavení';
 $labels['addressbook'] = 'Adresář';
-$labels['inbox'] = 'Příchozí pošta';
+
+// mailbox names
+$labels['inbox']  = 'Příchozí pošta';
 $labels['drafts'] = 'Rozepsané';
-$labels['sent'] = 'Odeslané';
-$labels['trash'] = 'Koš';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Odeslané';
+$labels['trash']  = 'Koš';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Předmět';
-$labels['from'] = 'Odesílatel';
-$labels['to'] = 'Adresát';
-$labels['cc'] = 'Kopie';
-$labels['bcc'] = 'Skrytá kopie';
+$labels['from']    = 'Odesílatel';
+$labels['sender']  = 'Odesílatel';
+$labels['to']      = 'Adresát';
+$labels['cc']      = 'Kopie';
+$labels['bcc']     = 'Skrytá kopie';
 $labels['replyto'] = 'Odpověď na';
 $labels['followupto'] = 'Následuje-po';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Velikost';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Velikost';
 $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizace';
 $labels['readstatus'] = 'Přečteno';
 $labels['listoptions'] = 'Seznam  možností ...';
+
 $labels['mailboxlist'] = 'Složky';
-$labels['folders'] = 'Složky';
 $labels['messagesfromto'] = 'Zprávy $from až $to z celkem $count';
 $labels['threadsfromto'] = 'Konverzace $from až $to z celkem $count';
 $labels['messagenrof'] = 'Zpráva $nr z $count';
 $labels['fromtoshort'] = '$from - $to z $count';
-$labels['copy'] = 'Kopírovat';
-$labels['move'] = 'Přesunout';
-$labels['moveto'] = 'přesunout do...';
+
+$labels['copy']     = 'Kopírovat';
+$labels['move']     = 'Přesunout';
+$labels['moveto']   = 'přesunout do...';
 $labels['download'] = 'stáhnout';
+$labels['showattachment'] = 'Zobrazit';
+$labels['showanyway'] = 'Přesto zobrazit';
+
 $labels['filename'] = 'Jméno přílohy';
 $labels['filesize'] = 'Velikost přílohy';
+
 $labels['addtoaddressbook'] = 'Přidat do adresáře';
+
+// weekdays short
 $labels['sun'] = 'Ne';
 $labels['mon'] = 'Po';
 $labels['tue'] = 'Út';
@@ -61,74 +80,83 @@ $labels['wed'] = 'St';
 $labels['thu'] = 'Čt';
 $labels['fri'] = 'Pá';
 $labels['sat'] = 'So';
-$labels['sunday'] = 'Neděle';
-$labels['monday'] = 'Pondělí';
-$labels['tuesday'] = 'Úterý';
+
+// weekdays long
+$labels['sunday']    = 'Neděle';
+$labels['monday']    = 'Pondělí';
+$labels['tuesday']   = 'Úterý';
 $labels['wednesday'] = 'Středa';
-$labels['thursday'] = 'Čtvrtek';
-$labels['friday'] = 'Pátek';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'Led';
-$labels['feb'] = 'Úno';
-$labels['mar'] = 'Bře';
-$labels['apr'] = 'Dub';
-$labels['may'] = 'Květen';
-$labels['longmay'] = 'Květen';
-$labels['jun'] = 'Čer';
-$labels['jul'] = 'Čec';
-$labels['aug'] = 'Srp';
-$labels['sep'] = 'Zář';
-$labels['oct'] = 'Říj';
-$labels['nov'] = 'Lis';
-$labels['dec'] = 'Pro';
-$labels['longjan'] = 'Leden';
-$labels['longfeb'] = 'Únor';
-$labels['longmar'] = 'Březen';
-$labels['longapr'] = 'Duben';
-$labels['longjun'] = 'Červen';
-$labels['longjul'] = 'Červenec';
-$labels['longaug'] = 'Srpen';
-$labels['longsep'] = 'Září';
-$labels['longoct'] = 'Říjen';
-$labels['longnov'] = 'Listopad';
-$labels['longdec'] = 'Prosinec';
+$labels['thursday']  = 'Čtvrtek';
+$labels['friday']    = 'Pátek';
+$labels['saturday']  = 'Sobota';
+
+// months short
+$labels['jan']	= 'Led';
+$labels['feb']	= 'Úno';
+$labels['mar']	= 'Bře';
+$labels['apr']	= 'Dub';
+$labels['may']	= 'Květen';
+$labels['jun']	= 'Čer';
+$labels['jul'] 	= 'Čec';
+$labels['aug']	= 'Srp';
+$labels['sep']	= 'Zář';
+$labels['oct']	= 'Říj';
+$labels['nov']	= 'Lis';
+$labels['dec']	= 'Pro';
+
+// months long
+$labels['longjan']	= 'Leden';
+$labels['longfeb']	= 'Únor';
+$labels['longmar']	= 'Březen';
+$labels['longapr']	= 'Duben';
+$labels['longmay']	= 'Květen';
+$labels['longjun']	= 'Červen';
+$labels['longjul']	= 'Červenec';
+$labels['longaug']	= 'Srpen';
+$labels['longsep']	= 'Září';
+$labels['longoct']	= 'Říjen';
+$labels['longnov']	= 'Listopad';
+$labels['longdec']	= 'Prosinec';
+
 $labels['today'] = 'Dnes';
-$labels['refresh'] = 'Obnovit';
-$labels['checkmail'] = 'Zkontrolovat nové zprávy';
-$labels['compose'] = 'Napsat zprávu';
-$labels['writenewmessage'] = 'Vytvořit novou zprávu';
-$labels['reply'] = 'Odpovědět';
-$labels['replytomessage'] = 'Odpovědět odesílateli';
+
+// toolbar buttons
+$labels['refresh']          = 'Obnovit';
+$labels['checkmail']        = 'Zkontrolovat nové zprávy';
+$labels['compose']          = 'Napsat zprávu';
+$labels['writenewmessage']  = 'Vytvořit novou zprávu';
+$labels['reply']            = 'Odpovědět';
+$labels['replytomessage']   = 'Odpovědět odesílateli';
 $labels['replytoallmessage'] = 'Odpovědět všem';
-$labels['replyall'] = 'Odpovědět všem';
-$labels['replylist'] = 'Odpovědět do e-mailové konference';
-$labels['forward'] = 'Přeposlat';
-$labels['forwardinline'] = 'Přeposlat v textu';
+$labels['replyall']         = 'Odpovědět všem';
+$labels['replylist']        = 'Odpovědět do e-mailové konference';
+$labels['forward']          = 'Přeposlat';
+$labels['forwardinline']    = 'Přeposlat v textu';
 $labels['forwardattachment'] = 'Přeposlat jako přílohu';
-$labels['forwardmessage'] = 'Předat zprávu';
-$labels['deletemessage'] = 'Odstranit zprávu';
+$labels['forwardmessage']   = 'Předat zprávu';
+$labels['deletemessage']    = 'Odstranit zprávu';
 $labels['movemessagetotrash'] = 'Přesunout zprávu do koše';
-$labels['printmessage'] = 'Vytisknout zprávu';
-$labels['previousmessage'] = 'Zobrazit předchozí zprávu';
-$labels['firstmessage'] = 'Zobrazit první zprávu';
-$labels['nextmessage'] = 'Zobrazit další zprávu';
-$labels['lastmessage'] = 'Zobrazit poslední zprávu';
-$labels['backtolist'] = 'Zpět do seznamu zpráv';
-$labels['viewsource'] = 'Zobrazit zdroj';
-$labels['mark'] = 'Označit';
-$labels['markmessages'] = 'Označ zprávy';
-$labels['markread'] = 'Jako přečtené';
-$labels['markunread'] = 'Jako nepřečtené';
-$labels['markflagged'] = 'Jako označené';
-$labels['markunflagged'] = 'Jako neoznačené';
-$labels['moreactions'] = 'Další akce...';
-$labels['more'] = 'Více';
-$labels['back'] = 'Zpět';
-$labels['options'] = 'Možnosti';
+$labels['printmessage']     = 'Vytisknout zprávu';
+$labels['previousmessage']  = 'Zobrazit předchozí zprávu';
+$labels['firstmessage']     = 'Zobrazit první zprávu';
+$labels['nextmessage']      = 'Zobrazit další zprávu';
+$labels['lastmessage']      = 'Zobrazit poslední zprávu';
+$labels['backtolist']       = 'Zpět do seznamu zpráv';
+$labels['viewsource']       = 'Zobrazit zdroj';
+$labels['mark']             = 'Označit';
+$labels['markmessages']     = 'Označ zprávy';
+$labels['markread']         = 'Jako přečtené';
+$labels['markunread']       = 'Jako nepřečtené';
+$labels['markflagged']      = 'Jako označené';
+$labels['markunflagged']    = 'Jako neoznačené';
+$labels['moreactions']      = 'Další akce...';
+$labels['more']             = 'Více';
+$labels['back']             = 'Zpět';
+$labels['options']          = 'Možnosti';
+
 $labels['select'] = 'Vybrat';
 $labels['all'] = 'Vše';
 $labels['none'] = 'Nic';
-$labels['nonesort'] = 'Nic';
 $labels['currpage'] = 'Aktuální stránka';
 $labels['unread'] = 'Nepřečtené';
 $labels['flagged'] = 'Označené';
@@ -143,12 +171,14 @@ $labels['expand-all'] = 'Rozbalit všechny';
 $labels['expand-unread'] = 'Rozbalit nepřečtené';
 $labels['collapse-all'] = 'Sbalit všechny';
 $labels['threaded'] = 'Spojovat do konverzací';
+
 $labels['autoexpand_threads'] = 'Rozbalit konverzace';
 $labels['do_expand'] = 'všechny konverzace';
 $labels['expand_only_unread'] = 'pouze s nepřečtenými zprávami';
 $labels['fromto'] = 'Odesílatel/Příjemce';
 $labels['flag'] = 'Vlajka';
 $labels['attachment'] = 'Příloha';
+$labels['nonesort'] = 'Nic';
 $labels['sentdate'] = 'Datum odeslání';
 $labels['arrival'] = 'Datum přijetí';
 $labels['asc'] = 'vzestupně';
@@ -157,177 +187,213 @@ $labels['listcolumns'] = 'Seznam sloupců';
 $labels['listsorting'] = 'Třídění sloupců';
 $labels['listorder'] = 'Uspořádání';
 $labels['listmode'] = 'Režim zobrazení seznamu';
+
 $labels['folderactions'] = 'Akce se složkou...';
 $labels['compact'] = 'Zmenšit';
 $labels['empty'] = 'Vymazat';
+
 $labels['quota'] = 'Využití schránky';
-$labels['unknown'] = 'neznámý';
-$labels['unlimited'] = 'neomezený';
-$labels['quicksearch'] = 'Rychlé vyhledávání';
-$labels['resetsearch'] = 'Zrušit vyhledávání';
-$labels['searchmod'] = 'Parametry hledání';
-$labels['msgtext'] = 'Celá zpráva';
+$labels['unknown']  = 'neznámý';
+$labels['unlimited']  = 'neomezený';
+
+$labels['quicksearch']  = 'Rychlé vyhledávání';
+$labels['resetsearch']  = 'Zrušit vyhledávání';
+$labels['searchmod']  = 'Parametry hledání';
+$labels['msgtext']  = 'Celá zpráva';
+$labels['body']  = 'Tělo';
+
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
-$labels['editasnew'] = 'Upravit jako novou';
-$labels['send'] = 'Odeslat';
-$labels['sendmessage'] = 'Odeslat zprávu nyní';
-$labels['savemessage'] = 'Uložit do rozepsaných';
-$labels['addattachment'] = 'Přidat přílohu';
-$labels['charset'] = 'Znaková sada';
-$labels['editortype'] = 'Typ editoru zpráv';
-$labels['returnreceipt'] = 'Doručenka';
-$labels['dsn'] = 'Stav doručení';
+
+// message compose
+$labels['editasnew']      = 'Upravit jako novou';
+$labels['send']           = 'Odeslat';
+$labels['sendmessage']    = 'Odeslat zprávu nyní';
+$labels['savemessage']    = 'Uložit do rozepsaných';
+$labels['addattachment']  = 'Přidat přílohu';
+$labels['charset']        = 'Znaková sada';
+$labels['editortype']     = 'Typ editoru zpráv';
+$labels['returnreceipt']  = 'Doručenka';
+$labels['dsn']            = 'Stav doručení';
 $labels['mailreplyintro'] = 'Dne $date, $sender napsal:';
 $labels['originalmessage'] = 'Původní zpráva';
-$labels['editidents'] = 'Editovat identity';
-$labels['spellcheck'] = 'Pravopis';
+
+$labels['editidents']    = 'Editovat identity';
+$labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Zkontrolovat pravopis';
 $labels['resumeediting'] = 'Pokračovat v úpravách';
-$labels['revertto'] = 'Přejít na';
+$labels['revertto']      = 'Přejít na';
+
 $labels['attach'] = 'Přiložit';
 $labels['attachments'] = 'Přílohy';
 $labels['upload'] = 'Nahrát';
 $labels['uploadprogress'] = '$percent ($current z $total)';
-$labels['close'] = 'Zavřít';
-$labels['messageoptions'] = 'Nastavení zprávy...';
-$labels['low'] = 'Nízká';
-$labels['lowest'] = 'Nejnižší';
-$labels['normal'] = 'Normální';
-$labels['high'] = 'Vysoká';
+$labels['close']  = 'Zavřít';
+$labels['messageoptions']  = 'Nastavení zprávy...';
+
+$labels['low']     = 'Nízká';
+$labels['lowest']  = 'Nejnižší';
+$labels['normal']  = 'Normální';
+$labels['high']    = 'Vysoká';
 $labels['highest'] = 'Nejvyšší';
-$labels['nosubject'] = '(bez predmetu)';
+
+$labels['nosubject']  = '(bez predmetu)';
 $labels['showimages'] = 'Zobrazit obrázky';
 $labels['alwaysshow'] = 'Vždy ukazovat obrázky od $sender';
-$labels['isdraft'] = 'Toto je šablona zprávy.';
-$labels['andnmore'] = '$nr dalších...';
+$labels['isdraft']    = 'Toto je šablona zprávy.';
+$labels['andnmore']   = '$nr dalších...';
 $labels['togglemoreheaders'] = 'Zobrazit více hlaviček zprávy';
 $labels['togglefullheaders'] = 'Přepnout skutečné hlavičky zprávy';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Prostý text';
 $labels['savesentmessagein'] = 'Ukládat odeslané zprávy v';
 $labels['dontsave'] = 'neukládat';
 $labels['maxuploadsize'] = 'Maximální povolená velikost souboru je $size';
+
 $labels['addcc'] = 'Přidat pole "Kopie';
 $labels['addbcc'] = 'Přidat pole "Skrytá kopie';
 $labels['addreplyto'] = 'Přidat pole "Odpověď';
 $labels['addfollowupto'] = 'Přidat pole "Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Odesílatel této zprávy si přeje být upozorněn na to, že jste zprávu obdrželi. Chcete přijetí zprávy potvrdit?';
 $labels['receiptread'] = 'Potvrzení o přijetí zprávy';
 $labels['yourmessage'] = 'Toto je potvrzení o přijetí Vaší zprávy';
 $labels['receiptnote'] = 'Poznámka: Toto potvrzení negarantuje, že zpráva byla příjemce přečtena a že porozuměl jejímu obsahu.';
-$labels['name'] = 'Zobrazit jméno';
-$labels['firstname'] = 'Jméno';
-$labels['surname'] = 'Příjmení';
-$labels['middlename'] = 'Rodné příjmení';
-$labels['nameprefix'] = 'Titul před';
-$labels['namesuffix'] = 'Titul za';
-$labels['nickname'] = 'Přezdívka';
-$labels['jobtitle'] = 'Pracovní pozice';
-$labels['department'] = 'Oddělení';
-$labels['gender'] = 'Pohlaví';
-$labels['maidenname'] = 'Rodné příjmení';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulice';
-$labels['locality'] = 'Město';
-$labels['zipcode'] = 'PSČ';
-$labels['region'] = 'Kraj';
-$labels['country'] = 'Země';
-$labels['birthday'] = 'Datum narození';
-$labels['anniversary'] = 'Výročí';
-$labels['website'] = 'WWW';
+
+// address boook
+$labels['name']         = 'Zobrazit jméno';
+$labels['firstname']    = 'Jméno';
+$labels['surname']      = 'Příjmení';
+$labels['middlename']   = 'Rodné příjmení';
+$labels['nameprefix']   = 'Titul před';
+$labels['namesuffix']   = 'Titul za';
+$labels['nickname']     = 'Přezdívka';
+$labels['jobtitle']     = 'Pracovní pozice';
+$labels['department']   = 'Oddělení';
+$labels['gender']       = 'Pohlaví';
+$labels['maidenname']   = 'Rodné příjmení';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulice';
+$labels['locality']     = 'Město';
+$labels['zipcode']      = 'PSČ';
+$labels['region']       = 'Kraj';
+$labels['country']      = 'Země';
+$labels['birthday']     = 'Datum narození';
+$labels['anniversary']  = 'Výročí';
+$labels['website']      = 'WWW';
 $labels['instantmessenger'] = 'Komunikace (ICQ, messenger...)';
 $labels['notes'] = 'Poznámky';
-$labels['male'] = 'Muž';
+$labels['male']   = 'Muž';
 $labels['female'] = 'Žena';
 $labels['manager'] = 'Manažer';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Manžel/ka';
 $labels['allfields'] = 'Všechny položky';
 $labels['search'] = 'Hledat';
 $labels['advsearch'] = 'Pokročilé vyhledávání';
 $labels['advanced'] = 'Pokročilé';
 $labels['other'] = 'Ostatní';
-$labels['typeother'] = 'Ostatní';
-$labels['typehome'] = 'Domací';
-$labels['typework'] = 'Pracovní';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Osobní';
-$labels['typehomefax'] = 'Domácí FAX';
-$labels['typeworkfax'] = 'Pracovní FAX';
-$labels['typecar'] = 'Automobil';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Domácí stránka';
+
+$labels['typehome']   = 'Domací';
+$labels['typework']   = 'Pracovní';
+$labels['typeother']  = 'Ostatní';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Osobní';
+$labels['typehomefax']  = 'Domácí FAX';
+$labels['typeworkfax']  = 'Pracovní FAX';
+$labels['typecar']  = 'Automobil';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Domácí stránka';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Přidat položku';
 $labels['addcontact'] = 'Přidat kontakt';
 $labels['editcontact'] = 'Upravit kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Vlastnosti kontaktu';
 $labels['personalinfo'] = 'Osobní informace';
-$labels['edit'] = 'Upravit';
+
+$labels['edit']   = 'Upravit';
 $labels['cancel'] = 'Konec';
-$labels['save'] = 'Uložit';
+$labels['save']   = 'Uložit';
 $labels['delete'] = 'Smazat';
 $labels['rename'] = 'Přejmenovat';
 $labels['addphoto'] = 'Přidat';
 $labels['replacephoto'] = 'Změnit';
 $labels['uploadphoto'] = 'Nahrát fotku';
-$labels['newcontact'] = 'Vytvořit nový kontakt';
-$labels['deletecontact'] = 'Smazat vybrané kontakty';
-$labels['composeto'] = 'Poslat e-mail';
+
+$labels['newcontact']     = 'Vytvořit nový kontakt';
+$labels['deletecontact']  = 'Smazat vybrané kontakty';
+$labels['composeto']      = 'Poslat e-mail';
 $labels['contactsfromto'] = 'Kontakty $from až $to z celkem $count';
-$labels['print'] = 'Tisk';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Exportovat kontakty ve formátu vCard';
+$labels['print']          = 'Tisk';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exportovat kontakty ve formátu vCard';
 $labels['newcontactgroup'] = 'Vytvořit novou skupinu kontaktů';
-$labels['grouprename'] = 'Přejmenovat skupinu';
-$labels['groupdelete'] = 'Smazat skupinu';
+$labels['grouprename']    = 'Přejmenovat skupinu';
+$labels['groupdelete']    = 'Smazat skupinu';
 $labels['groupremoveselected'] = 'Odstranit označené kontakty ze skupiny';
-$labels['previouspage'] = 'Předchozí';
-$labels['firstpage'] = 'Zobrazit první zprávy';
-$labels['nextpage'] = 'Další';
-$labels['lastpage'] = 'Zobrazit poslední zprávy';
+
+$labels['previouspage']   = 'Předchozí';
+$labels['firstpage']      = 'Zobrazit první zprávy';
+$labels['nextpage']       = 'Další';
+$labels['lastpage']       = 'Zobrazit poslední zprávy';
+
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
 $labels['personaladrbook'] = 'Osobní kontakty';
+
 $labels['searchsave'] = 'Uložit hledání';
 $labels['searchdelete'] = 'Smazat hledání';
+
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Importovat kontakty';
 $labels['importfromfile'] = 'Importovat ze souboru';
 $labels['importtarget'] = 'Přidat nové kontakty do seznamu kontaktů:';
 $labels['importreplace'] = 'Nahradit celý seznam kontaktů';
+$labels['importdesc'] = 'Můžete nahrát kontakty z existujícího adresáře kontaktů.<br/>Momentálně podporujeme kontakty ve formátu <a href="http://cs.wikipedia.org/wiki/VCard">vCard</a> nebo CSV (comma-separated).';
 $labels['done'] = 'Hotovo';
+
+// settings
 $labels['settingsfor'] = 'Nastavení pro';
 $labels['about'] = 'O programu';
 $labels['preferences'] = 'Vlastnosti';
 $labels['userpreferences'] = 'Vlastnosti uživatele';
 $labels['editpreferences'] = 'Upravit vlastnosti uživatele';
+
 $labels['identities'] = 'Profily';
 $labels['manageidentities'] = 'Spravovat profily u tohoto účtu';
 $labels['newidentity'] = 'Nový profil';
+
 $labels['newitem'] = 'Nová položka';
 $labels['edititem'] = 'Upravit položku';
+
 $labels['preferhtml'] = 'Upřednostňovat HTML zobrazení';
 $labels['defaultcharset'] = 'Výchozí kódování';
 $labels['htmlmessage'] = 'HTML zpráva';
+$labels['messagepart'] = 'Část';
+$labels['digitalsig'] = 'Digitální podpis';
 $labels['dateformat'] = 'Formát data';
 $labels['timeformat'] = 'Formát času';
 $labels['prettydate'] = 'Hezčí datum';
-$labels['setdefault'] = 'Nastavit výchozí';
-$labels['autodetect'] = 'Automaticky';
-$labels['language'] = 'Jazyk';
-$labels['timezone'] = 'Časová zóna';
-$labels['pagesize'] = 'Řádků na stránku';
+$labels['setdefault']  = 'Nastavit výchozí';
+$labels['autodetect']  = 'Automaticky';
+$labels['language']  = 'Jazyk';
+$labels['timezone']  = 'Časová zóna';
+$labels['pagesize']  = 'Řádků na stránku';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Letní čas';
+$labels['dstactive']  = 'Letní čas';
 $labels['showinextwin'] = 'Otevřít zprávu v novém okně';
+$labels['composeextwin'] = 'Vytvořit v novém okně';
 $labels['htmleditor'] = 'Vytvářet HTML zprávy';
 $labels['htmlonreply'] = 'jen při odpovědi na HTML zprávy';
 $labels['htmlonreplyandforward'] = 'při přeposlání nebo odpovědi na HTML zprávu';
@@ -354,10 +420,11 @@ $labels['showremoteimages'] = 'Zobrazovat obrázky uložené mimo mail';
 $labels['fromknownsenders'] = 'od známých uživatelů';
 $labels['always'] = 'vždy';
 $labels['showinlineimages'] = 'Zobrazovat připojené obrázky pod textem';
-$labels['autosavedraft'] = 'Automaticky uložit rozepsané zprávy';
-$labels['everynminutes'] = 'každých $n minut';
-$labels['never'] = 'nikdy';
-$labels['immediately'] = 'ihned';
+$labels['autosavedraft']  = 'Automaticky uložit rozepsané zprávy';
+$labels['everynminutes']  = 'každých $n minut';
+$labels['refreshinterval']  = 'Obnovit (zkontroluj nové zprávy, atd)';
+$labels['never']  = 'nikdy';
+$labels['immediately']  = 'ihned';
 $labels['messagesdisplaying'] = 'Zobrazování zpráv';
 $labels['messagescomposition'] = 'Psaní zpráv';
 $labels['mimeparamfolding'] = 'Jména příloh';
@@ -388,12 +455,12 @@ $labels['replysignaturepos'] = 'Při odpovídání nebo přeposílání zprávy
 $labels['belowquote'] = 'pod citaci';
 $labels['abovequote'] = 'nad citaci';
 $labels['insertsignature'] = 'Vložit podpis';
-$labels['previewpanemarkread'] = 'Označit zobrazené zprávy jako přečtené';
-$labels['afternseconds'] = 'po $n sekundách';
+$labels['previewpanemarkread']  = 'Označit zobrazené 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í';
 $labels['replysamefolder'] = 'Ukládat odpovědi ve stejné složce jako je zodpovězená zpráva';
-$labels['defaultaddressbook'] = 'Přidávat nové kontakty do seznamu kontaktů';
+$labels['defaultabook'] = 'Výchozí adresář kontaktů';
 $labels['autocompletesingle'] = 'Při doplňování adres přeskočit alternativní email.';
 $labels['listnamedisplay'] = 'Vypsat kontakty jako';
 $labels['spellcheckbeforesend'] = 'Před odesláním zkontrolovat pravopis';
@@ -406,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Zaregistrovat handler pro odkazy „mailto:“'
 $labels['forwardmode'] = 'Přeposlat zprávu';
 $labels['inline'] = 'vloženě';
 $labels['asattachment'] = 'jako přílohu';
-$labels['folder'] = 'Složka';
-$labels['foldername'] = 'Jméno složky';
-$labels['subscribed'] = 'Vybráno';
+
+$labels['folder']  = 'Složka';
+$labels['folders']  = 'Složky';
+$labels['foldername']  = 'Jméno složky';
+$labels['subscribed']  = 'Vybráno';
 $labels['messagecount'] = 'Počet zpráv';
-$labels['create'] = 'Vytvořit';
-$labels['createfolder'] = 'Vytvořit novou složku';
-$labels['managefolders'] = 'Spravovat složky';
+$labels['create']  = 'Vytvořit';
+$labels['createfolder']  = 'Vytvořit novou složku';
+$labels['managefolders']  = 'Spravovat složky';
 $labels['specialfolders'] = 'Speciální složky';
 $labels['properties'] = 'Vlastnosti';
 $labels['folderproperties'] = 'Vlastnosti složky';
@@ -422,22 +491,29 @@ $labels['info'] = 'Informace';
 $labels['getfoldersize'] = 'Kliknutím zjistíte velikost složky';
 $labels['changesubscription'] = 'Kliknutím změníte přednastavení';
 $labels['foldertype'] = 'Typ složky';
-$labels['personalfolder'] = 'Soukromá složka';
-$labels['otherfolder'] = 'Složky ostatních uživatelů';
-$labels['sharedfolder'] = 'Sdílená složka';
+$labels['personalfolder']  = 'Soukromá složka';
+$labels['otherfolder']  = 'Složky ostatních uživatelů';
+$labels['sharedfolder']  = 'Sdílená složka';
+
 $labels['sortby'] = 'Seřadit podle';
-$labels['sortasc'] = 'Seřadit vzestupně';
+$labels['sortasc']  = 'Seřadit vzestupně';
 $labels['sortdesc'] = 'Seřadit sestupně';
 $labels['undo'] = 'Vrátit zpět';
+
+$labels['installedplugins'] = 'Nainstalované pluginy';
 $labels['plugin'] = 'Zásuvný modul';
 $labels['version'] = 'Verze';
 $labels['source'] = 'Zdroj';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Podpora';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angličtina';
 $labels['westerneuropean'] = 'Západní Evropa';
@@ -457,3 +533,4 @@ $labels['japanese'] = 'Japonština';
 $labels['korean'] = 'Korejština';
 $labels['chinese'] = 'Čínština';
 
+?>
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 4a2e6f8c8..cee1bd09a 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Zbynek Vanzura <heptau@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Došlo k chybě!';
-$messages['loginfailed'] = 'Přihlášení selhalo';
+$messages['errortitle']  = 'Došlo k chybě!';
+$messages['loginfailed']  = 'Přihlášení selhalo';
 $messages['cookiesdisabled'] = 'Váš prohlížeč nepodporuje cookies, které jsou pro přihlášení nezbytné';
 $messages['sessionerror'] = 'Vaše přihlášení je neplatné nebo vypršelo';
 $messages['storageerror'] = 'Připojení na IMAP server selhalo';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Špatné jméno serveru.';
 $messages['nomessagesfound'] = 'Ve schránce nebyla nalezena žádná zpráva';
 $messages['loggedout'] = 'Byli jste úspěšně odhlášeni. Nashledanou!';
 $messages['mailboxempty'] = 'Schránka je prázdná';
+$messages['refreshing'] = 'Obnovuji...';
 $messages['loading'] = 'Načítám...';
 $messages['uploading'] = 'Nahrávám soubor...';
 $messages['uploadingmany'] = 'Nahrávám soubory...';
@@ -56,11 +60,11 @@ $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['deletecontactconfirm'] = 'Opravdu chcete smazat označené kontakty?';
-$messages['deletegroupconfirm'] = 'Opravdu chcete smazat skupinu?';
+$messages['deletecontactconfirm']  = 'Opravdu chcete smazat označené kontakty?';
+$messages['deletegroupconfirm']  = 'Opravdu chcete smazat skupinu?';
 $messages['deletemessagesconfirm'] = 'Opravdu chcete smazat označené zprávy?';
-$messages['deletefolderconfirm'] = 'Chcete opravdu smazat tento adresář?';
-$messages['purgefolderconfirm'] = 'Opravdu chcete smazat všechny zprávy v této složce?';
+$messages['deletefolderconfirm']  = 'Chcete opravdu smazat tento adresář?';
+$messages['purgefolderconfirm']  = 'Opravdu chcete smazat všechny zprávy v této složce?';
 $messages['contactdeleting'] = 'Mažu kontakty...';
 $messages['groupdeleting'] = 'Mažu skupinu...';
 $messages['folderdeleting'] = 'Odstraňuji složku...';
@@ -69,11 +73,11 @@ $messages['foldersubscribing'] = 'Připojuji složku...';
 $messages['folderunsubscribing'] = 'Odpojuji složku...';
 $messages['formincomplete'] = 'Formulář nebyl korektně vyplněn';
 $messages['noemailwarning'] = 'Zadejte, prosím, platnou e-mailovou adresu';
-$messages['nonamewarning'] = 'Zadejte, prosím, jméno';
+$messages['nonamewarning']  = 'Zadejte, prosím, jméno';
 $messages['nopagesizewarning'] = 'Zadejte, prosím, velikost stránky';
 $messages['nosenderwarning'] = 'Zadejte e-mailovou adresu odesílatele';
 $messages['norecipientwarning'] = 'Zadejte, prosím, alespoň jednoho příjemce';
-$messages['nosubjectwarning'] = 'Předmět nebyl vyplňen. Přejete si jej zadat nyní?';
+$messages['nosubjectwarning']  = 'Předmět nebyl vyplňen. Přejete si jej zadat nyní?';
 $messages['nobodywarning'] = 'Opravdu chtete odeslat prázdnou zprávu?';
 $messages['notsentwarning'] = 'Zpráva nebyla odeslána. Přejete si zprávu zahodit?';
 $messages['noldapserver'] = 'Zvolte, prosím, LDAP server k hledání';
@@ -115,7 +119,9 @@ $messages['selectimportfile'] = 'Prosím vyberte soubor k nahrání';
 $messages['addresswriterror'] = 'Vybraný seznam kontaktů není zapisovatelný';
 $messages['contactaddedtogroup'] = 'Kontakty byly úspěšně přidány do této skupiny';
 $messages['contactremovedfromgroup'] = 'Kontakty byly odstraněny z této skupiny';
+$messages['nogroupassignmentschanged'] = 'Nebylo změněno přiřazení do skupin.';
 $messages['importwait'] = 'Importuji, prosím čekejte...';
+$messages['importformaterror'] = 'Import se nezdařil! Typ souboru není podporován.';
 $messages['importconfirm'] = 'Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno: $names';
 $messages['importconfirmskipped'] = '<b>Přeskočeno $skipped existujících položek</b>';
 $messages['opnotpermitted'] = 'Operace není povolena!';
@@ -157,4 +163,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['noscriptwarning'] = 'Upozornění: Tato emailová aplikace vyžaduje Javascript! Prosím, zapněte Javascript v nastavení prohlížeče.';
 
+?>
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index cde7f6f46..c6cf2344a 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Croeso i $product';
-$labels['username'] = 'Enw defnyddiwr';
-$labels['password'] = 'Cyfrinair';
-$labels['server'] = 'Gweinydd';
-$labels['login'] = 'Mewngofnodi';
-$labels['logout'] = 'Allgofnodi';
-$labels['mail'] = 'E-bost';
+
+// login page
+$labels['welcome']   = 'Croeso i $product';
+$labels['username']  = 'Enw defnyddiwr';
+$labels['password']  = 'Cyfrinair';
+$labels['server']    = 'Gweinydd';
+$labels['login']     = 'Mewngofnodi';
+
+// taskbar
+$labels['logout']   = 'Allgofnodi';
+$labels['mail']     = 'E-bost';
 $labels['settings'] = 'Gosodiadau Personol';
 $labels['addressbook'] = 'Llyfr Cyfeiriadau';
-$labels['inbox'] = 'Mewnflwch';
+
+// mailbox names
+$labels['inbox']  = 'Mewnflwch';
 $labels['drafts'] = 'Drafftiau';
-$labels['sent'] = 'Danfonwyd';
-$labels['trash'] = 'Sbwriel';
-$labels['junk'] = 'Sothach';
+$labels['sent']   = 'Danfonwyd';
+$labels['trash']  = 'Sbwriel';
+$labels['junk']   = 'Sothach';
+
+// message listing
 $labels['subject'] = 'Pwnc';
-$labels['from'] = 'Anfonwr';
-$labels['to'] = 'Derbyniwr';
-$labels['cc'] = 'Copi';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Anfonwr';
+$labels['sender']  = 'Anfonwr';
+$labels['to']      = 'Derbyniwr';
+$labels['cc']      = 'Copi';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Ateb-I';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Dyddiad';
-$labels['size'] = 'Maint';
+$labels['date']    = 'Dyddiad';
+$labels['size']    = 'Maint';
 $labels['priority'] = 'Blaenoriaeth';
 $labels['organization'] = 'Enw\'r Sefydliad';
 $labels['readstatus'] = 'Statws darllen';
 $labels['listoptions'] = 'Dewisiadau rhestr...';
+
 $labels['mailboxlist'] = 'Ffolderi';
-$labels['folders'] = 'Ffolderi';
 $labels['messagesfromto'] = 'Negeseuon $from i $to o $count';
 $labels['threadsfromto'] = 'Edefau $from i $to o $count';
 $labels['messagenrof'] = 'Neges $nr o $count';
 $labels['fromtoshort'] = '$from - $to o $count';
-$labels['copy'] = 'Copio';
-$labels['move'] = 'Symud';
-$labels['moveto'] = 'Symud i...';
+
+$labels['copy']     = 'Copio';
+$labels['move']     = 'Symud';
+$labels['moveto']   = 'Symud i...';
 $labels['download'] = 'Llwytho lawr';
 $labels['showattachment'] = 'Dangos';
 $labels['showanyway'] = 'Dangos beth bynnag';
+
 $labels['filename'] = 'Enw ffeil';
 $labels['filesize'] = 'Maint ffeil';
+
 $labels['addtoaddressbook'] = 'Ychwanegu i\'r llyfr cyfeiriadau';
+
+// weekdays short
 $labels['sun'] = 'Sul';
 $labels['mon'] = 'Llun';
 $labels['tue'] = 'Maw';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Iau';
 $labels['fri'] = 'Gwe';
 $labels['sat'] = 'Sad';
-$labels['sunday'] = 'Dydd Sul';
-$labels['monday'] = 'Dydd Llun';
-$labels['tuesday'] = 'Dydd Mawrth';
+
+// weekdays long
+$labels['sunday']    = 'Dydd Sul';
+$labels['monday']    = 'Dydd Llun';
+$labels['tuesday']   = 'Dydd Mawrth';
 $labels['wednesday'] = 'Dydd Mercher';
-$labels['thursday'] = 'Dydd Iau';
-$labels['friday'] = 'Dydd Gwener';
-$labels['saturday'] = 'Dydd Sadwrn';
-$labels['jan'] = 'Ion';
-$labels['feb'] = 'Chwe';
-$labels['mar'] = 'Maw';
-$labels['apr'] = 'Ebr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Meh';
-$labels['jul'] = 'Gor';
-$labels['aug'] = 'Aws';
-$labels['sep'] = 'Med';
-$labels['oct'] = 'Hyd';
-$labels['nov'] = 'Tach';
-$labels['dec'] = 'Rhag';
-$labels['longjan'] = 'Ionawr';
-$labels['longfeb'] = 'Chwefror';
-$labels['longmar'] = 'Mawrth';
-$labels['longapr'] = 'Ebrill';
-$labels['longjun'] = 'Mehefin';
-$labels['longjul'] = 'Gorffennaf';
-$labels['longaug'] = 'Awst';
-$labels['longsep'] = 'Medi';
-$labels['longoct'] = 'Hydref';
-$labels['longnov'] = 'Tachwedd';
-$labels['longdec'] = 'Rhagfyr';
+$labels['thursday']  = 'Dydd Iau';
+$labels['friday']    = 'Dydd Gwener';
+$labels['saturday']  = 'Dydd Sadwrn';
+
+// months short
+$labels['jan']	= 'Ion';
+$labels['feb']	= 'Chwe';
+$labels['mar']	= 'Maw';
+$labels['apr']	= 'Ebr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Meh';
+$labels['jul'] 	= 'Gor';
+$labels['aug']	= 'Aws';
+$labels['sep']	= 'Med';
+$labels['oct']	= 'Hyd';
+$labels['nov']	= 'Tach';
+$labels['dec']	= 'Rhag';
+
+// months long
+$labels['longjan']	= 'Ionawr';
+$labels['longfeb']	= 'Chwefror';
+$labels['longmar']	= 'Mawrth';
+$labels['longapr']	= 'Ebrill';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Mehefin';
+$labels['longjul']	= 'Gorffennaf';
+$labels['longaug']	= 'Awst';
+$labels['longsep']	= 'Medi';
+$labels['longoct']	= 'Hydref';
+$labels['longnov']	= 'Tachwedd';
+$labels['longdec']	= 'Rhagfyr';
+
 $labels['today'] = 'Heddiw';
-$labels['refresh'] = 'Ail-ofyn';
-$labels['checkmail'] = 'Edrych am negeseuon newydd';
-$labels['compose'] = 'Ysgrifennu neges';
-$labels['writenewmessage'] = 'Creu neges newydd';
-$labels['reply'] = 'Ymateb';
-$labels['replytomessage'] = 'Ymateb i\'r anfonwr';
+
+// toolbar buttons
+$labels['refresh']          = 'Ail-ofyn';
+$labels['checkmail']        = 'Edrych am negeseuon newydd';
+$labels['compose']          = 'Ysgrifennu neges';
+$labels['writenewmessage']  = 'Creu neges newydd';
+$labels['reply']            = 'Ymateb';
+$labels['replytomessage']   = 'Ymateb i\'r anfonwr';
 $labels['replytoallmessage'] = 'Ymateb i\'r anfonwr a phob derbyniwr';
-$labels['replyall'] = 'Ymateb i bawb';
-$labels['replylist'] = 'Ymateb i\'r rhestr';
-$labels['forward'] = 'Anfon ymlaen';
-$labels['forwardinline'] = 'Anfon ymlaen o fewn y neges';
+$labels['replyall']         = 'Ymateb i bawb';
+$labels['replylist']        = 'Ymateb i\'r rhestr';
+$labels['forward']          = 'Anfon ymlaen';
+$labels['forwardinline']    = 'Anfon ymlaen o fewn y neges';
 $labels['forwardattachment'] = 'Anfon ymlaen fel atodiad';
-$labels['forwardmessage'] = 'Danfon y neges ymlaen';
-$labels['deletemessage'] = 'Dileu\'r neges';
+$labels['forwardmessage']   = 'Danfon y neges ymlaen';
+$labels['deletemessage']    = 'Dileu\'r neges';
 $labels['movemessagetotrash'] = 'Symud y neges i\'r sbwriel';
-$labels['printmessage'] = 'Argraffu\'r neges';
-$labels['previousmessage'] = 'Dangos y neges flaenorol';
-$labels['firstmessage'] = 'Dangos y neges gyntaf';
-$labels['nextmessage'] = 'Dangos y neges nesaf';
-$labels['lastmessage'] = 'Dangos y neges olaf';
-$labels['backtolist'] = 'Nôl i\'r rhestr o negeseuon';
-$labels['viewsource'] = 'Edrych ar y ffynhonnell';
-$labels['mark'] = 'Nodi';
-$labels['markmessages'] = 'Nodi\'r negeseuon';
-$labels['markread'] = 'Wedi eu darllen';
-$labels['markunread'] = 'Heb eu darllen';
-$labels['markflagged'] = 'Wedi eu fflagio';
-$labels['markunflagged'] = 'Heb eu fflagio';
-$labels['moreactions'] = 'Mwy o weithredoedd...';
-$labels['more'] = 'Mwy';
-$labels['back'] = 'Yn ôl';
-$labels['options'] = 'Dewisiadau';
+$labels['printmessage']     = 'Argraffu\'r neges';
+$labels['previousmessage']  = 'Dangos y neges flaenorol';
+$labels['firstmessage']     = 'Dangos y neges gyntaf';
+$labels['nextmessage']      = 'Dangos y neges nesaf';
+$labels['lastmessage']      = 'Dangos y neges olaf';
+$labels['backtolist']       = 'Nôl i\'r rhestr o negeseuon';
+$labels['viewsource']       = 'Edrych ar y ffynhonnell';
+$labels['mark']             = 'Nodi';
+$labels['markmessages']     = 'Nodi\'r negeseuon';
+$labels['markread']         = 'Wedi eu darllen';
+$labels['markunread']       = 'Heb eu darllen';
+$labels['markflagged']      = 'Wedi eu fflagio';
+$labels['markunflagged']    = 'Heb eu fflagio';
+$labels['moreactions']      = 'Mwy o weithredoedd...';
+$labels['more']             = 'Mwy';
+$labels['back']             = 'Yn ôl';
+$labels['options']          = 'Dewisiadau';
+
 $labels['select'] = 'Dewis';
 $labels['all'] = 'Popeth';
 $labels['none'] = 'Dim';
-$labels['nonesort'] = 'Dim';
 $labels['currpage'] = 'Tudalen gyfredol';
 $labels['unread'] = 'Heb eu darllen';
 $labels['flagged'] = 'Nodwyd';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Ehangu Popeth';
 $labels['expand-unread'] = 'Ehangu Negeseuon Heb eu darllen';
 $labels['collapse-all'] = 'Crebachu Popeth';
 $labels['threaded'] = 'Edafedd';
+
 $labels['autoexpand_threads'] = 'Ehangu edefau neges';
 $labels['do_expand'] = 'pob edefyn';
 $labels['expand_only_unread'] = 'dim ond gyda negeseuon heb eu darllen';
 $labels['fromto'] = 'Danfonwr/Derbynnydd';
 $labels['flag'] = 'Fflag';
 $labels['attachment'] = 'Atodiad';
+$labels['nonesort'] = 'Dim';
 $labels['sentdate'] = 'Dyddiad danfon';
 $labels['arrival'] = 'Dyddiad derbyn';
 $labels['asc'] = 'esgynnol';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Rhestr colofnau';
 $labels['listsorting'] = 'Colofn trefnu';
 $labels['listorder'] = 'Trefn didoli';
 $labels['listmode'] = 'Golwg rhestr';
+
 $labels['folderactions'] = 'Gweithredoedd ffolder...';
 $labels['compact'] = 'Crynhoi';
 $labels['empty'] = 'Gwagio';
+
 $labels['quota'] = 'Defnydd';
-$labels['unknown'] = 'anhysbys';
-$labels['unlimited'] = 'diderfyn';
-$labels['quicksearch'] = 'Chwiliad cyflym';
-$labels['resetsearch'] = 'Ail-osod chwiliad';
-$labels['searchmod'] = 'Addasyddion chwilio';
-$labels['msgtext'] = 'Y neges yn llawn';
+$labels['unknown']  = 'anhysbys';
+$labels['unlimited']  = 'diderfyn';
+
+$labels['quicksearch']  = 'Chwiliad cyflym';
+$labels['resetsearch']  = 'Ail-osod chwiliad';
+$labels['searchmod']  = 'Addasyddion chwilio';
+$labels['msgtext']  = 'Y neges yn llawn';
+$labels['body']  = 'Corff';
+
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
-$labels['editasnew'] = 'Golygu fel neges newydd';
-$labels['send'] = 'Anfon';
-$labels['sendmessage'] = 'Danfon nawr';
-$labels['savemessage'] = 'Cadw\'r drafft hwn';
-$labels['addattachment'] = 'Atodi ffeil';
-$labels['charset'] = 'Set nodiau';
-$labels['editortype'] = 'Math golygydd';
-$labels['returnreceipt'] = 'Cadarnhau derbyn';
-$labels['dsn'] = 'Hysbysiad statws danfon';
+
+// message compose
+$labels['editasnew']      = 'Golygu fel neges newydd';
+$labels['send']           = 'Anfon';
+$labels['sendmessage']    = 'Danfon nawr';
+$labels['savemessage']    = 'Cadw\'r drafft hwn';
+$labels['addattachment']  = 'Atodi ffeil';
+$labels['charset']        = 'Set nodiau';
+$labels['editortype']     = 'Math golygydd';
+$labels['returnreceipt']  = 'Cadarnhau derbyn';
+$labels['dsn']            = 'Hysbysiad statws danfon';
 $labels['mailreplyintro'] = 'Ar $date, ysgrifennodd $sender:';
 $labels['originalmessage'] = 'Neges Wreiddiol';
-$labels['editidents'] = 'Golygu personoliaethau';
-$labels['spellcheck'] = 'Sillafu';
+
+$labels['editidents']    = 'Golygu personoliaethau';
+$labels['spellcheck']    = 'Sillafu';
 $labels['checkspelling'] = 'Gwirio sillafu';
 $labels['resumeediting'] = 'Ail-ddechrau golygu';
-$labels['revertto'] = 'Dychwelyd i';
+$labels['revertto']      = 'Dychwelyd i';
+
 $labels['attach'] = 'Atodi';
 $labels['attachments'] = 'Atodiadau';
 $labels['upload'] = 'Llwytho fyny';
 $labels['uploadprogress'] = '$percent ($current o $total)';
-$labels['close'] = 'Cau';
-$labels['messageoptions'] = 'Dewisiadau neges...';
-$labels['low'] = 'Isel';
-$labels['lowest'] = 'Isaf';
-$labels['normal'] = 'Cyffredin';
-$labels['high'] = 'Uchel';
+$labels['close']  = 'Cau';
+$labels['messageoptions']  = 'Dewisiadau neges...';
+
+$labels['low']     = 'Isel';
+$labels['lowest']  = 'Isaf';
+$labels['normal']  = 'Cyffredin';
+$labels['high']    = 'Uchel';
 $labels['highest'] = 'Uchaf';
-$labels['nosubject'] = '(dim pwnc)';
+
+$labels['nosubject']  = '(dim pwnc)';
 $labels['showimages'] = 'Dangos lluniau';
 $labels['alwaysshow'] = 'Dangos lluniau bob amser o $sender';
-$labels['isdraft'] = 'Mae hwn yn neges ddrafft';
-$labels['andnmore'] = '$nr mwy...';
+$labels['isdraft']    = 'Mae hwn yn neges ddrafft';
+$labels['andnmore']   = '$nr mwy...';
 $labels['togglemoreheaders'] = 'Dangos fwy o benynnau\'r neges';
 $labels['togglefullheaders'] = 'Toglo penawdau llawn y neges';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testun plaen';
 $labels['savesentmessagein'] = 'Cadw negeseuon a ddanfonir yn';
 $labels['dontsave'] = 'peidio cadw';
 $labels['maxuploadsize'] = 'Y maint ffeil uchaf a ganiateir yw $size';
+
 $labels['addcc'] = 'Ychwanegu Cc';
 $labels['addbcc'] = 'Ychwanegu Bcc';
 $labels['addreplyto'] = 'Ychwanegu Ateb-I';
 $labels['addfollowupto'] = 'Ychwanegu Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Mae anfonwr y neges hwn wedi gofyn am hysbysiad eich bod wedi darllen y neges. Hoffech chi hysbysu\'r anfonwr?';
 $labels['receiptread'] = 'Cadarnhad Derbyn (darllenwyd)';
 $labels['yourmessage'] = 'Mae hwn yn gadarnhad o dderbyn eich neges';
 $labels['receiptnote'] = 'Nodyn: Mae\'r cadarnhad hwn yn cydnabod fod y neges wedi ei ddangos ar gyfrifiadur y derbynnydd. \'Does dim sicrwydd fod y derbynydd wedi darllen neu ddeall cynnwys y neges.';
-$labels['name'] = 'Enw ddangosir';
-$labels['firstname'] = 'Enw cyntaf';
-$labels['surname'] = 'Enw olaf';
-$labels['middlename'] = 'Enw Canol';
-$labels['nameprefix'] = 'Rhagddodiad';
-$labels['namesuffix'] = 'Olddodiad';
-$labels['nickname'] = 'Llysenw';
-$labels['jobtitle'] = 'Teitl Swydd';
-$labels['department'] = 'Adran';
-$labels['gender'] = 'Rhyw';
-$labels['maidenname'] = 'Enw cyn priodi';
-$labels['email'] = 'E-bost';
-$labels['phone'] = 'Ffôn';
-$labels['address'] = 'Cyfeiriad';
-$labels['street'] = 'Stryd';
-$labels['locality'] = 'Tref/Dinas';
-$labels['zipcode'] = 'Côd Post/ZIP';
-$labels['region'] = 'Sîr/Talaith';
-$labels['country'] = 'Gwlad';
-$labels['birthday'] = 'Penblwydd';
-$labels['anniversary'] = 'Cylchwyl';
-$labels['website'] = 'Gwefan';
+
+// address boook
+$labels['name']         = 'Enw ddangosir';
+$labels['firstname']    = 'Enw cyntaf';
+$labels['surname']      = 'Enw olaf';
+$labels['middlename']   = 'Enw Canol';
+$labels['nameprefix']   = 'Rhagddodiad';
+$labels['namesuffix']   = 'Olddodiad';
+$labels['nickname']     = 'Llysenw';
+$labels['jobtitle']     = 'Teitl Swydd';
+$labels['department']   = 'Adran';
+$labels['gender']       = 'Rhyw';
+$labels['maidenname']   = 'Enw cyn priodi';
+$labels['email']        = 'E-bost';
+$labels['phone']        = 'Ffôn';
+$labels['address']      = 'Cyfeiriad';
+$labels['street']       = 'Stryd';
+$labels['locality']     = 'Tref/Dinas';
+$labels['zipcode']      = 'Côd Post/ZIP';
+$labels['region']       = 'Sîr/Talaith';
+$labels['country']      = 'Gwlad';
+$labels['birthday']     = 'Penblwydd';
+$labels['anniversary']  = 'Cylchwyl';
+$labels['website']      = 'Gwefan';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Nodiadau';
-$labels['male'] = 'gwryw';
+$labels['male']   = 'gwryw';
 $labels['female'] = 'benyw';
 $labels['manager'] = 'Rheolwr';
 $labels['assistant'] = 'Cynorthwyydd';
-$labels['typeassistant'] = 'Cynorthwyydd';
 $labels['spouse'] = 'Cymar';
 $labels['allfields'] = 'Pob maes';
 $labels['search'] = 'Chwilio';
 $labels['advsearch'] = 'Chwilio Uwch';
 $labels['advanced'] = 'Uwch';
 $labels['other'] = 'Arall';
-$labels['typeother'] = 'Arall';
-$labels['typehome'] = 'Cartref';
-$labels['typework'] = 'Gwaith';
-$labels['typemobile'] = 'Symudol';
-$labels['typemain'] = 'Prif';
-$labels['typehomefax'] = 'Ffacs Adref';
-$labels['typeworkfax'] = 'Ffacs Gwaith';
-$labels['typecar'] = 'Car';
-$labels['typepager'] = 'Peiriant Galw';
-$labels['typevideo'] = 'Fideo';
-$labels['typehomepage'] = 'Gwefan';
+
+$labels['typehome']   = 'Cartref';
+$labels['typework']   = 'Gwaith';
+$labels['typeother']  = 'Arall';
+$labels['typemobile']  = 'Symudol';
+$labels['typemain']  = 'Prif';
+$labels['typehomefax']  = 'Ffacs Adref';
+$labels['typeworkfax']  = 'Ffacs Gwaith';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Peiriant Galw';
+$labels['typevideo']  = 'Fideo';
+$labels['typeassistant']  = 'Cynorthwyydd';
+$labels['typehomepage']  = 'Gwefan';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Proffil';
+
 $labels['addfield'] = 'Ychwanegu maes...';
 $labels['addcontact'] = 'Ychwanegu cyswllt newydd';
 $labels['editcontact'] = 'Golygu cyswllt';
 $labels['contacts'] = 'Cysylltiadau';
 $labels['contactproperties'] = 'Nodweddion cyswllt';
 $labels['personalinfo'] = 'Gwybodaeth bersonol';
-$labels['edit'] = 'Golygu';
+
+$labels['edit']   = 'Golygu';
 $labels['cancel'] = 'Canslo';
-$labels['save'] = 'Cadw';
+$labels['save']   = 'Cadw';
 $labels['delete'] = 'Dileu';
 $labels['rename'] = 'Ail-enwi';
 $labels['addphoto'] = 'Ychwanegu';
 $labels['replacephoto'] = 'Amnewid';
 $labels['uploadphoto'] = 'Llwytho fyny llun';
-$labels['newcontact'] = 'Creu cerdyn cyswllt newydd';
-$labels['deletecontact'] = 'Dileu y cysylltiadau a ddewiswyd';
-$labels['composeto'] = 'Ysgrifennu neges at';
+
+$labels['newcontact']     = 'Creu cerdyn cyswllt newydd';
+$labels['deletecontact']  = 'Dileu y cysylltiadau a ddewiswyd';
+$labels['composeto']      = 'Ysgrifennu neges at';
 $labels['contactsfromto'] = 'Cysylltiadau $from i $to o $count';
-$labels['print'] = 'Argraffu';
-$labels['export'] = 'Allforio';
-$labels['exportvcards'] = 'Allforio cysylltiadau mewn fformat vCard';
+$labels['print']          = 'Argraffu';
+$labels['export']         = 'Allforio';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Allforio cysylltiadau mewn fformat vCard';
 $labels['newcontactgroup'] = 'Creu grŵp cysylltiadau newydd';
-$labels['grouprename'] = 'Ail-enwi grŵp';
-$labels['groupdelete'] = 'Dileu grŵp';
+$labels['grouprename']    = 'Ail-enwi grŵp';
+$labels['groupdelete']    = 'Dileu grŵp';
 $labels['groupremoveselected'] = 'Dileu y cysylltiadau dewiswyd o\'r grŵp';
-$labels['previouspage'] = 'Dangos y set flaenorol';
-$labels['firstpage'] = 'Dangos y set gyntaf';
-$labels['nextpage'] = 'Dangos y set nesaf';
-$labels['lastpage'] = 'Dangos y set olaf';
+
+$labels['previouspage']   = 'Dangos y set flaenorol';
+$labels['firstpage']      = 'Dangos y set gyntaf';
+$labels['nextpage']       = 'Dangos y set nesaf';
+$labels['lastpage']       = 'Dangos y set olaf';
+
 $labels['group'] = 'Grŵp';
 $labels['groups'] = 'Grwpiau';
 $labels['personaladrbook'] = 'Cyfeiriadau Personol';
+
 $labels['searchsave'] = 'Cadw chwiliad';
 $labels['searchdelete'] = 'Dileu chwiliad';
+
 $labels['import'] = 'Mewnforio';
 $labels['importcontacts'] = 'Mewnforio cysylltiadau';
 $labels['importfromfile'] = 'Mewnforio o ffeil:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Ychwanegu cysylltiadau newydd i\'r llyfr cyfeiriad:';
 $labels['importreplace'] = 'Dileu y llyfr cyfeiriadau cyfan wrth lwytho';
 $labels['importdesc'] = 'Fe allwch chi lwytho fyny cysylltiadau o lyfr cyfeiriadau presennol.<br/>Ar hyn o bryd, rydym yn cefnogi mewnforio cyfeiriadau o\'r fformatau <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> neu CSV.';
 $labels['done'] = 'Wedi gorffen';
+
+// settings
 $labels['settingsfor'] = 'Gosodiadau ar gyfer';
 $labels['about'] = 'Amdan';
 $labels['preferences'] = 'Dewisiadau';
 $labels['userpreferences'] = 'Dewisiadau\'r defnyddiwr';
 $labels['editpreferences'] = 'Golygu dewisiadau\'r defnyddiwr';
+
 $labels['identities'] = 'Personoliaethau';
 $labels['manageidentities'] = 'Rheoli personoliaethau ar gyfer y cyfri hwn';
 $labels['newidentity'] = 'Personoliaeth newydd';
+
 $labels['newitem'] = 'Eitem newydd';
 $labels['edititem'] = 'Golygu eitem';
+
 $labels['preferhtml'] = 'Dangos HTML';
 $labels['defaultcharset'] = 'Set Nodau Diofyn';
 $labels['htmlmessage'] = 'Neges HTML';
+$labels['messagepart'] = 'Rhan';
+$labels['digitalsig'] = 'Llofnod Digidol';
 $labels['dateformat'] = 'Fformat dyddiad';
 $labels['timeformat'] = 'Fformat amser';
 $labels['prettydate'] = 'Dyddiadau pert';
-$labels['setdefault'] = 'Rhagosod';
-$labels['autodetect'] = 'Awto';
-$labels['language'] = 'Iaith';
-$labels['timezone'] = 'Parth amser';
-$labels['pagesize'] = 'Rhesi ar bob tudalen';
+$labels['setdefault']  = 'Rhagosod';
+$labels['autodetect']  = 'Awto';
+$labels['language']  = 'Iaith';
+$labels['timezone']  = 'Parth amser';
+$labels['pagesize']  = 'Rhesi ar bob tudalen';
 $labels['signature'] = 'Llofnod';
-$labels['dstactive'] = 'Amser arbed golau ddydd';
+$labels['dstactive']  = 'Amser arbed golau ddydd';
 $labels['showinextwin'] = 'Agor neges mewn ffenest newydd';
 $labels['composeextwin'] = 'Ysgrifennu mewn ffenest newydd';
 $labels['htmleditor'] = 'Ysgrifennu negeseuon HTML';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Dangos lluniau o wefannau allanol';
 $labels['fromknownsenders'] = 'o ddanfonwyr hysbys';
 $labels['always'] = 'bob amser';
 $labels['showinlineimages'] = 'Dangos lluniau atodol islaw\'r neges';
-$labels['autosavedraft'] = 'Cadw drafft yn awtomatig';
-$labels['everynminutes'] = 'bob $n munud';
-$labels['refreshinterval'] = 'Ail-lwytho (edrych am negeseuon newydd ayyb)';
-$labels['never'] = 'byth';
-$labels['immediately'] = 'ar unwaith';
+$labels['autosavedraft']  = 'Cadw drafft yn awtomatig';
+$labels['everynminutes']  = 'bob $n munud';
+$labels['refreshinterval']  = 'Ail-lwytho (edrych am negeseuon newydd ayyb)';
+$labels['never']  = 'byth';
+$labels['immediately']  = 'ar unwaith';
 $labels['messagesdisplaying'] = 'Dangos Negeseuon';
 $labels['messagescomposition'] = 'Ysgrifennu Negeseuon';
 $labels['mimeparamfolding'] = 'Enw atodiadau';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Wrth ateb neu ddanfon ymlaen, rhoi\'r llofnod';
 $labels['belowquote'] = 'o dan y dyfynniad';
 $labels['abovequote'] = 'uwchben y dyfynniad';
 $labels['insertsignature'] = 'Mewnosod llofnod';
-$labels['previewpanemarkread'] = 'Nodi negeseuon rhagolwg fel darllenwyd';
-$labels['afternseconds'] = 'ar ôl $n eiliad';
+$labels['previewpanemarkread']  = 'Nodi negeseuon rhagolwg 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';
 $labels['replysamefolder'] = 'Rhoi atebion yn yr un ffolder i\'r neges sy\'n cael ei ateb';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Cofrestru trafodwr protocol ar gyfer dolenni ma
 $labels['forwardmode'] = 'Danfon neges ymlaen';
 $labels['inline'] = 'mewnlin';
 $labels['asattachment'] = 'fel atodiad';
-$labels['folder'] = 'Ffolder';
-$labels['foldername'] = 'Enw ffolder';
-$labels['subscribed'] = 'Tanysgrifwyd';
+
+$labels['folder']  = 'Ffolder';
+$labels['folders']  = 'Ffolderi';
+$labels['foldername']  = 'Enw ffolder';
+$labels['subscribed']  = 'Tanysgrifwyd';
 $labels['messagecount'] = 'Negeseuon';
-$labels['create'] = 'Creu';
-$labels['createfolder'] = 'Creu ffolder newydd';
-$labels['managefolders'] = 'Rheoli ffolderi';
+$labels['create']  = 'Creu';
+$labels['createfolder']  = 'Creu ffolder newydd';
+$labels['managefolders']  = 'Rheoli ffolderi';
 $labels['specialfolders'] = 'Ffolderi arbennig';
 $labels['properties'] = 'Nodweddion';
 $labels['folderproperties'] = 'Ffolder nodweddion';
@@ -427,23 +491,29 @@ $labels['info'] = 'Gwybodaeth';
 $labels['getfoldersize'] = 'Cliciwch i gael maint ffolder';
 $labels['changesubscription'] = 'Cliciwch i newid y tanysgrifiad';
 $labels['foldertype'] = 'Math Ffolder';
-$labels['personalfolder'] = 'Ffolder Preifat';
-$labels['otherfolder'] = 'Ffolder Defnyddiwr Arall';
-$labels['sharedfolder'] = 'Ffolder Cyhoeddus';
+$labels['personalfolder']  = 'Ffolder Preifat';
+$labels['otherfolder']  = 'Ffolder Defnyddiwr Arall';
+$labels['sharedfolder']  = 'Ffolder Cyhoeddus';
+
 $labels['sortby'] = 'Trefnu yn ôl';
-$labels['sortasc'] = 'Trefn esgynnol';
+$labels['sortasc']  = 'Trefn esgynnol';
 $labels['sortdesc'] = 'Trefn ddisgynnol';
 $labels['undo'] = 'Dad-wneud';
+
 $labels['installedplugins'] = 'Ategynnau wedi eu gosod';
 $labels['plugin'] = 'Ategyn';
 $labels['version'] = 'Fersiwn';
 $labels['source'] = 'Ffynhonnell';
 $labels['license'] = 'Trwydded';
 $labels['support'] = 'Gofyn am gymorth';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Saesneg';
 $labels['westerneuropean'] = 'Gorllewin Ewropeaidd';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japaneaidd';
 $labels['korean'] = 'Corëeg';
 $labels['chinese'] = 'Tsieineaidd';
 
+?>
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 508feef6b..553422948 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Fe gafwyd gwall!';
-$messages['loginfailed'] = 'Methwyd a\'ch mewngofnodi';
+$messages['errortitle']  = 'Fe gafwyd gwall!';
+$messages['loginfailed']  = 'Methwyd a\'ch mewngofnodi';
 $messages['cookiesdisabled'] = 'Nid yw eich porwr yn derbyn cwcis';
 $messages['sessionerror'] = 'Mae\'r sesiwn yn anghywir neu wedi dod i ben';
 $messages['storageerror'] = 'Methwyd cysylltu a\'r gweinydd IMAP';
@@ -57,11 +60,11 @@ $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['deletecontactconfirm'] = 'Ydych chi wir am ddileu y cysylltiadau ddewiswyd?';
-$messages['deletegroupconfirm'] = 'Ydych chi wir am ddileu\'r grŵp dewiswyd?';
+$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?';
-$messages['deletefolderconfirm'] = 'Ydych chi wir am ddileu y ffolder yma?';
-$messages['purgefolderconfirm'] = 'Ydych chi wir am ddileu yr holl negeseuon yn y ffolder yma?';
+$messages['deletefolderconfirm']  = 'Ydych chi wir am ddileu y ffolder yma?';
+$messages['purgefolderconfirm']  = 'Ydych chi wir am ddileu yr holl negeseuon yn y ffolder yma?';
 $messages['contactdeleting'] = 'Dileu cyswllt/cysylltiadau...';
 $messages['groupdeleting'] = 'Yn dileu grŵp...';
 $messages['folderdeleting'] = 'Yn dileu ffolder...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Yn tanysgrifio i\'r ffolder...';
 $messages['folderunsubscribing'] = 'Yn dad-danysgrifio i\'r ffolder...';
 $messages['formincomplete'] = 'Nid oedd y ffurflen wedi ei gwblhau yn llawn';
 $messages['noemailwarning'] = 'Rhowch gyfeiriad e-bost dilys';
-$messages['nonamewarning'] = 'Rhowch enw';
+$messages['nonamewarning']  = 'Rhowch enw';
 $messages['nopagesizewarning'] = 'Rhowch maint tudalen';
 $messages['nosenderwarning'] = 'Rhowch gyfeiriad e-bost y danfonwr';
 $messages['norecipientwarning'] = 'Rhowch o leiaf un derbynnydd';
-$messages['nosubjectwarning'] = 'Mae\'r pennawd "Pwnc" yn wag. Hoffech chi roi un fewn nawr?';
+$messages['nosubjectwarning']  = 'Mae\'r pennawd "Pwnc" yn wag. Hoffech chi roi un fewn nawr?';
 $messages['nobodywarning'] = 'Danfon y neges hwn heb destun?';
 $messages['notsentwarning'] = 'Ni ddanfonwyd y neges. Hoffech chi gael gwared a\'r neges?';
 $messages['noldapserver'] = 'Dewiswch weinydd ldap i chwilio';
@@ -163,3 +166,4 @@ $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['noscriptwarning'] = 'Rhybudd: Mae\'r gwasanaeth gwebost angen Javascript i weithio! Er mwyn ei ddefnyddio, galluogwch Javascript yng ngosodiadau eich porwr.';
 
+?>
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 0e1dc0063..93209b869 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkommen til $product';
-$labels['username'] = 'Brugernavn';
-$labels['password'] = 'Adgangskode';
-$labels['server'] = 'Server';
-$labels['login'] = 'Log på';
-$labels['logout'] = 'Log af';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Velkommen til $product';
+$labels['username']  = 'Brugernavn';
+$labels['password']  = 'Adgangskode';
+$labels['server']    = 'Server';
+$labels['login']     = 'Log på';
+
+// taskbar
+$labels['logout']   = 'Log af';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Indstillinger';
 $labels['addressbook'] = 'Adressebog';
-$labels['inbox'] = 'Indbakke';
+
+// mailbox names
+$labels['inbox']  = 'Indbakke';
 $labels['drafts'] = 'Kladder';
-$labels['sent'] = 'Sendt post';
-$labels['trash'] = 'Papirkurv';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Sendt post';
+$labels['trash']  = 'Papirkurv';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Emne';
-$labels['from'] = 'Afsender';
-$labels['to'] = 'Modtager';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Afsender';
+$labels['sender']  = 'Afsender';
+$labels['to']      = 'Modtager';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Opfølgning til';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Størrelse';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Størrelse';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Firma';
 $labels['readstatus'] = 'Læst status';
 $labels['listoptions'] = 'Listeindstillinger';
+
 $labels['mailboxlist'] = 'Mapper';
-$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Besked $from til $to af $count';
 $labels['threadsfromto'] = 'Tråd $from til $to af $count';
 $labels['messagenrof'] = 'Besked $nr af $count';
 $labels['fromtoshort'] = '$from – $to af $count';
-$labels['copy'] = 'Kopiér';
-$labels['move'] = 'Flyt';
-$labels['moveto'] = 'Flyt til...';
+
+$labels['copy']     = 'Kopiér';
+$labels['move']     = 'Flyt';
+$labels['moveto']   = 'Flyt til...';
 $labels['download'] = 'Download';
+$labels['showattachment'] = 'Vis';
+$labels['showanyway'] = 'Vis alligevel';
+
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
+
 $labels['addtoaddressbook'] = 'Tilføj til adressebog';
+
+// weekdays short
 $labels['sun'] = 'Søn';
 $labels['mon'] = 'Man';
 $labels['tue'] = 'Tir';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
-$labels['sunday'] = 'Søndag';
-$labels['monday'] = 'Mandag';
-$labels['tuesday'] = 'Tirsdag';
+
+// weekdays long
+$labels['sunday']    = 'Søndag';
+$labels['monday']    = 'Mandag';
+$labels['tuesday']   = 'Tirsdag';
 $labels['wednesday'] = 'Onsdag';
-$labels['thursday'] = 'Torsdag';
-$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'Lørdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Marts';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Torsdag';
+$labels['friday']    = 'Fredag';
+$labels['saturday']  = 'Lørdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maj';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Marts';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Maj';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'I dag';
-$labels['refresh'] = 'Opdatér';
-$labels['checkmail'] = 'Se efter nye beskeder';
-$labels['compose'] = 'Ny besked';
-$labels['writenewmessage'] = 'Skriv en ny besked';
-$labels['reply'] = 'Svar';
-$labels['replytomessage'] = 'Svar på denne besked';
+
+// toolbar buttons
+$labels['refresh']          = 'Opdatér';
+$labels['checkmail']        = 'Se efter nye beskeder';
+$labels['compose']          = 'Ny besked';
+$labels['writenewmessage']  = 'Skriv en ny besked';
+$labels['reply']            = 'Svar';
+$labels['replytomessage']   = 'Svar på denne besked';
 $labels['replytoallmessage'] = 'Svar til alle modtagere';
-$labels['replyall'] = 'Svar alle';
-$labels['replylist'] = 'Svar til listen';
-$labels['forward'] = 'Videresend';
-$labels['forwardinline'] = 'Videresend';
+$labels['replyall']         = 'Svar alle';
+$labels['replylist']        = 'Svar til listen';
+$labels['forward']          = 'Videresend';
+$labels['forwardinline']    = 'Videresend';
 $labels['forwardattachment'] = 'Videresend som vedhæftning';
-$labels['forwardmessage'] = 'Videresend denne besked';
-$labels['deletemessage'] = 'Slet besked';
+$labels['forwardmessage']   = 'Videresend denne besked';
+$labels['deletemessage']    = 'Slet besked';
 $labels['movemessagetotrash'] = 'Flyt besked til skrald';
-$labels['printmessage'] = 'Udskriv denne besked';
-$labels['previousmessage'] = 'Vis forrige besked';
-$labels['firstmessage'] = 'Vis første besked';
-$labels['nextmessage'] = 'Vis næste besked';
-$labels['lastmessage'] = 'Vis sidste besked';
-$labels['backtolist'] = 'Tilbage til oversigten';
-$labels['viewsource'] = 'Vis kilde';
-$labels['mark'] = 'Markér';
-$labels['markmessages'] = 'Markér beskeder';
-$labels['markread'] = 'Som læst';
-$labels['markunread'] = 'Som ulæst';
-$labels['markflagged'] = 'Som markeret';
-$labels['markunflagged'] = 'Som umarkeret';
-$labels['moreactions'] = 'Flere funktioner...';
-$labels['more'] = 'Mere';
-$labels['back'] = 'Tilbage';
-$labels['options'] = 'Indstillinger';
+$labels['printmessage']     = 'Udskriv denne besked';
+$labels['previousmessage']  = 'Vis forrige besked';
+$labels['firstmessage']     = 'Vis første besked';
+$labels['nextmessage']      = 'Vis næste besked';
+$labels['lastmessage']      = 'Vis sidste besked';
+$labels['backtolist']       = 'Tilbage til oversigten';
+$labels['viewsource']       = 'Vis kilde';
+$labels['mark']             = 'Markér';
+$labels['markmessages']     = 'Markér beskeder';
+$labels['markread']         = 'Som læst';
+$labels['markunread']       = 'Som ulæst';
+$labels['markflagged']      = 'Som markeret';
+$labels['markunflagged']    = 'Som umarkeret';
+$labels['moreactions']      = 'Flere funktioner...';
+$labels['more']             = 'Mere';
+$labels['back']             = 'Tilbage';
+$labels['options']          = 'Indstillinger';
+
 $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Aktuel side';
 $labels['unread'] = 'Ulæste';
 $labels['flagged'] = 'Markeret';
 $labels['unanswered'] = 'Ubesvaret';
 $labels['deleted'] = 'Slettede';
+$labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Invertér';
 $labels['filter'] = 'Filtrer';
 $labels['list'] = 'Liste';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'Udfold alle';
 $labels['expand-unread'] = 'Udfold ulæste';
 $labels['collapse-all'] = 'Fold alle';
 $labels['threaded'] = 'Trådet';
+
 $labels['autoexpand_threads'] = 'Udfold besked tråde';
 $labels['do_expand'] = 'alle tråde';
 $labels['expand_only_unread'] = 'kun dem med ulæste beskeder';
 $labels['fromto'] = 'Afsender/Modtager';
 $labels['flag'] = 'Flag';
 $labels['attachment'] = 'Vedhæftning';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Sendt dato';
 $labels['arrival'] = 'Modtaget dato';
 $labels['asc'] = 'stigende';
@@ -156,174 +187,216 @@ $labels['listcolumns'] = 'Vist kolonne';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorter efter';
 $labels['listmode'] = 'Listevisningsmode';
+
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Ryd op';
 $labels['empty'] = 'Tøm';
+
 $labels['quota'] = 'Diskforbrug';
-$labels['unknown'] = 'ukendt';
-$labels['unlimited'] = 'ubegrænset';
-$labels['quicksearch'] = 'Hurtigsøg';
-$labels['resetsearch'] = 'Nulstil søgning';
-$labels['searchmod'] = 'Søgeparametre';
-$labels['msgtext'] = 'Hele beskeden';
+$labels['unknown']  = 'ukendt';
+$labels['unlimited']  = 'ubegrænset';
+
+$labels['quicksearch']  = 'Hurtigsøg';
+$labels['resetsearch']  = 'Nulstil søgning';
+$labels['searchmod']  = 'Søgeparametre';
+$labels['msgtext']  = 'Hele beskeden';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['editasnew'] = 'Redigér som ny';
-$labels['sendmessage'] = 'Send besked';
-$labels['savemessage'] = 'Gem som kladde';
-$labels['addattachment'] = 'Vedhæft en fil';
-$labels['charset'] = 'Tegnsæt';
-$labels['editortype'] = 'Tekstbehandler';
-$labels['returnreceipt'] = 'Anmod om kvittering ved læst';
-$labels['dsn'] = 'Anmod om leveringsstatus';
+
+// message compose
+$labels['editasnew']      = 'Redigér som ny';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send besked';
+$labels['savemessage']    = 'Gem som kladde';
+$labels['addattachment']  = 'Vedhæft en fil';
+$labels['charset']        = 'Tegnsæt';
+$labels['editortype']     = 'Tekstbehandler';
+$labels['returnreceipt']  = 'Anmod om kvittering ved læst';
+$labels['dsn']            = 'Anmod om leveringsstatus';
 $labels['mailreplyintro'] = '$sender skrev den $date:';
 $labels['originalmessage'] = 'Original besked';
-$labels['editidents'] = 'Ret identiteter';
-$labels['spellcheck'] = 'Stav';
+
+$labels['editidents']    = 'Ret identiteter';
+$labels['spellcheck']    = 'Stav';
 $labels['checkspelling'] = 'Stavekontrol';
 $labels['resumeediting'] = 'Genoptag redigering';
-$labels['revertto'] = 'Vend tilbage til';
+$labels['revertto']      = 'Vend tilbage til';
+
 $labels['attach'] = 'Vedhæft';
 $labels['attachments'] = 'Vedhæftninger';
 $labels['upload'] = 'Overfør';
 $labels['uploadprogress'] = '$percent ($current af $total)';
-$labels['close'] = 'Luk';
-$labels['messageoptions'] = 'Beskedmuligheder...';
-$labels['low'] = 'Lav';
-$labels['lowest'] = 'Lavest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Høj';
+$labels['close']  = 'Luk';
+$labels['messageoptions']  = 'Beskedmuligheder...';
+
+$labels['low']     = 'Lav';
+$labels['lowest']  = 'Lavest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Høj';
 $labels['highest'] = 'Højest';
-$labels['nosubject'] = '(intet emne)';
+
+$labels['nosubject']  = '(intet emne)';
 $labels['showimages'] = 'Vis billeder';
 $labels['alwaysshow'] = 'Vis altid billeder fra $sender';
-$labels['isdraft'] = 'Dette er en kladde.';
+$labels['isdraft']    = 'Dette er en kladde.';
+$labels['andnmore']   = '$nr yderligere...';
+$labels['togglemoreheaders'] = 'Vis yderligere headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Almindelig tekst';
 $labels['savesentmessagein'] = 'Gem afsendt besked i';
 $labels['dontsave'] = 'gem ikke';
 $labels['maxuploadsize'] = 'Maksimale tilladte filstørrelse er $size';
+
 $labels['addcc'] = 'Tilføj Cc';
 $labels['addbcc'] = 'Tilføj Bcc';
 $labels['addreplyto'] = 'Tilføj Svar-Til adresse';
 $labels['addfollowupto'] = 'Tilføj følg-op adresse';
+
+// mdn
 $labels['mdnrequest'] = 'Afsenderen af denne besked har bedt om at modtage en bekræftelse når du læser beskeden. Vil du sende kvittering for læsning?';
 $labels['receiptread'] = 'Send kvittering for læsning';
 $labels['yourmessage'] = 'Dette er en kvittering for at din besked er blevet vist';
 $labels['receiptnote'] = 'Bemærk: Denne kvittering bekræfter udelukkende at beskeden blev vist på modtagerens computer. Der er ingen garanti for at modtageren har læst eller forstået beskedens indhold.';
-$labels['name'] = 'Vist navn';
-$labels['firstname'] = 'Fornavn';
-$labels['surname'] = 'Efternavn';
-$labels['middlename'] = 'Mellemnavn';
-$labels['nameprefix'] = 'Præfiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Alias/Kaldenavn';
-$labels['jobtitle'] = 'Jobtitel';
-$labels['department'] = 'Afdeling';
-$labels['gender'] = 'Køn';
-$labels['maidenname'] = 'Pigenavn';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Vej';
-$labels['locality'] = 'By';
-$labels['zipcode'] = 'Postnr.';
-$labels['region'] = 'Område/region';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Fødselsdag';
-$labels['anniversary'] = 'Årsdag';
-$labels['website'] = 'Hjemmeside';
+
+// address boook
+$labels['name']         = 'Vist navn';
+$labels['firstname']    = 'Fornavn';
+$labels['surname']      = 'Efternavn';
+$labels['middlename']   = 'Mellemnavn';
+$labels['nameprefix']   = 'Præfiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Alias/Kaldenavn';
+$labels['jobtitle']     = 'Jobtitel';
+$labels['department']   = 'Afdeling';
+$labels['gender']       = 'Køn';
+$labels['maidenname']   = 'Pigenavn';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Vej';
+$labels['locality']     = 'By';
+$labels['zipcode']      = 'Postnr.';
+$labels['region']       = 'Område/region';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Fødselsdag';
+$labels['anniversary']  = 'Årsdag';
+$labels['website']      = 'Hjemmeside';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Noter';
-$labels['male'] = 'Mand';
+$labels['male']   = 'Mand';
 $labels['female'] = 'Kvinde';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Ægtefælle/partner';
 $labels['allfields'] = 'Alle felter';
 $labels['search'] = 'Søg';
 $labels['advsearch'] = 'Avanceret søg';
 $labels['advanced'] = 'Avanceret';
 $labels['other'] = 'Andet';
-$labels['typeother'] = 'Andet';
-$labels['typehome'] = 'Hjem';
-$labels['typework'] = 'Arbejde';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hovednr.';
-$labels['typehomefax'] = 'Hjemme - fax';
-$labels['typeworkfax'] = 'Arbejde - fax';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsøger';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Hjemmeside';
+
+$labels['typehome']   = 'Hjem';
+$labels['typework']   = 'Arbejde';
+$labels['typeother']  = 'Andet';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hovednr.';
+$labels['typehomefax']  = 'Hjemme - fax';
+$labels['typeworkfax']  = 'Arbejde - fax';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsøger';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Hjemmeside';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Tilføj felt...';
 $labels['addcontact'] = 'Tilføj ny kontakt';
 $labels['editcontact'] = 'Redigér kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaber';
 $labels['personalinfo'] = 'Personlig information';
-$labels['edit'] = 'Redigér';
+
+$labels['edit']   = 'Redigér';
 $labels['cancel'] = 'Annullér';
-$labels['save'] = 'Gem';
+$labels['save']   = 'Gem';
 $labels['delete'] = 'Slet';
 $labels['rename'] = 'Omdøb';
 $labels['addphoto'] = 'Tilføj';
 $labels['replacephoto'] = 'Erstat';
 $labels['uploadphoto'] = 'Overfør billede';
-$labels['newcontact'] = 'Opret nyt kontaktkort';
-$labels['deletecontact'] = 'Slet valgte kontakter';
-$labels['composeto'] = 'Skriv besked til';
+
+$labels['newcontact']     = 'Opret nyt kontaktkort';
+$labels['deletecontact']  = 'Slet valgte kontakter';
+$labels['composeto']      = 'Skriv besked til';
 $labels['contactsfromto'] = 'Kontakter $from til $to af $count';
-$labels['print'] = 'Udskriv';
-$labels['export'] = 'Eksportér';
-$labels['exportvcards'] = 'Eksportér kontakter i vCard format';
+$labels['print']          = 'Udskriv';
+$labels['export']         = 'Eksportér';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Eksportér kontakter i vCard format';
 $labels['newcontactgroup'] = 'Opret ny kontaktgruppe';
-$labels['grouprename'] = 'Omdøb gruppe';
-$labels['groupdelete'] = 'Slet gruppe';
+$labels['grouprename']    = 'Omdøb gruppe';
+$labels['groupdelete']    = 'Slet gruppe';
 $labels['groupremoveselected'] = 'Fjern markerede kontakter fra gruppen';
-$labels['previouspage'] = 'Vis den forrige side';
-$labels['firstpage'] = 'Vis første side';
-$labels['nextpage'] = 'Vis næste side';
-$labels['lastpage'] = 'Vis sidste side';
+
+$labels['previouspage']   = 'Vis den forrige side';
+$labels['firstpage']      = 'Vis første side';
+$labels['nextpage']       = 'Vis næste side';
+$labels['lastpage']       = 'Vis sidste side';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Personlige adresser';
+
 $labels['searchsave'] = 'Gem søgning';
 $labels['searchdelete'] = 'Slet søgning';
+
 $labels['import'] = 'Importér';
 $labels['importcontacts'] = 'Importér kontakter';
 $labels['importfromfile'] = 'Importér fra fil:';
 $labels['importtarget'] = 'Tilføj nye kontakter til adressebogen:';
 $labels['importreplace'] = 'Overskriv hele adressebogen';
+$labels['importdesc'] = 'Du kan uploade kontakter fra en eksisterende adressebog. <br/>I øjeblikket supportere vi import af adresser fra <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> og CSV (komma-separeret) data format.';
 $labels['done'] = 'Færdig';
+
+// settings
 $labels['settingsfor'] = 'Indstillinger for';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Indstillinger';
 $labels['userpreferences'] = 'Brugerindstillinger';
 $labels['editpreferences'] = 'Redigér brugerindstillinger';
+
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Styr identiteterne for denne konto';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Nyt punkt';
 $labels['edititem'] = 'Redigér punkt';
+
 $labels['preferhtml'] = 'Vis HTML';
 $labels['defaultcharset'] = 'Standard tegnkodning';
 $labels['htmlmessage'] = 'HTML-besked';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datoformat';
 $labels['timeformat'] = 'Tidsformat';
 $labels['prettydate'] = 'Pæn datovisning';
-$labels['setdefault'] = 'Sæt standard';
-$labels['autodetect'] = 'Automatisk';
-$labels['language'] = 'Sprog';
-$labels['timezone'] = 'Tidszone';
-$labels['pagesize'] = 'Rækker pr. side';
+$labels['setdefault']  = 'Sæt standard';
+$labels['autodetect']  = 'Automatisk';
+$labels['language']  = 'Sprog';
+$labels['timezone']  = 'Tidszone';
+$labels['pagesize']  = 'Rækker pr. side';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommertid';
+$labels['dstactive']  = 'Sommertid';
+$labels['showinextwin'] = 'Åben besked i et nyt vindue';
+$labels['composeextwin'] = 'Opret besked i et nyt vindue';
 $labels['htmleditor'] = 'Skriv HTML-besked';
 $labels['htmlonreply'] = 'kun når jeg besvarer HTML-beskeder';
+$labels['htmlonreplyandforward'] = 'ved videresendelse eller besvarelse af HTML beskeder';
 $labels['htmlsignature'] = 'HTML-signatur';
 $labels['previewpane'] = 'Forhåndsvisning';
 $labels['skin'] = 'Brugerflade';
@@ -347,10 +420,11 @@ $labels['showremoteimages'] = 'Vis eksterne indlejrede billeder';
 $labels['fromknownsenders'] = 'fra kendte afsendere';
 $labels['always'] = 'altid';
 $labels['showinlineimages'] = 'Vis vedhæftede billeder under beskeden';
-$labels['autosavedraft'] = 'Gem kladde automatisk';
-$labels['everynminutes'] = 'hver $n. minut';
-$labels['never'] = 'aldrig';
-$labels['immediately'] = 'straks';
+$labels['autosavedraft']  = 'Gem kladde automatisk';
+$labels['everynminutes']  = 'hver $n. minut';
+$labels['refreshinterval']  = 'Opdater (tjek for nye beskeder m.v.)';
+$labels['never']  = 'aldrig';
+$labels['immediately']  = 'straks';
 $labels['messagesdisplaying'] = 'Viser beskeder';
 $labels['messagescomposition'] = 'Skriver nye beskeder';
 $labels['mimeparamfolding'] = 'Navne på vedhæftninger';
@@ -370,6 +444,7 @@ $labels['maintenance'] = 'Vedligeholdelse';
 $labels['newmessage'] = 'Ny besked';
 $labels['signatureoptions'] = 'Signatur-indstillinger';
 $labels['whenreplying'] = 'Når der svares';
+$labels['replyempty'] = 'Citer ikke den originale besked';
 $labels['replytopposting'] = 'begynd svar over originalen';
 $labels['replybottomposting'] = 'begynd svar under originalen';
 $labels['replyremovesignature'] = 'Fjern original signatur fra besked, når der svares';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = 'Når beskeder besvares eller videresendes; inds�
 $labels['belowquote'] = 'under det citerede';
 $labels['abovequote'] = 'over det citerede';
 $labels['insertsignature'] = 'Indsæt signatur';
-$labels['previewpanemarkread'] = 'Markér forhåndsviste beskeder som læst';
-$labels['afternseconds'] = 'efter $n sekunder';
+$labels['previewpanemarkread']  = 'Markér forhåndsviste beskeder som læst';
+$labels['afternseconds']  = 'efter $n sekunder';
 $labels['reqmdn'] = 'Anmod altid om kvittering for læsning';
 $labels['reqdsn'] = 'Anmod altid om at leveringsstatus';
 $labels['replysamefolder'] = 'Placer svar til en besked i samme mappe som beskeden der besvares';
-$labels['defaultaddressbook'] = 'Tilføj nye kontakter til den valgte adressebog';
+$labels['defaultabook'] = 'Standard adressebog';
 $labels['autocompletesingle'] = 'Undgå alternative emailadresser under autofuldførelse';
 $labels['listnamedisplay'] = 'Vis kontakter som';
 $labels['spellcheckbeforesend'] = 'Tjek stavning inden beskeden sendes';
@@ -395,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Ignorer ord med tal';
 $labels['spellcheckignorecaps'] = 'Ignorer ord hvor alle bogstaver er versaler';
 $labels['addtodict'] = 'Tilføj til ordbog';
 $labels['mailtoprotohandler'] = 'Registrer håndtering af \'mailto:\' links';
-$labels['folder'] = 'Mappe';
-$labels['foldername'] = 'Mappenavn';
-$labels['subscribed'] = 'Abonneret';
+$labels['forwardmode'] = 'Videresendelse af besked';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'som vedhæftning';
+
+$labels['folder']  = 'Mappe';
+$labels['folders']  = 'Mapper';
+$labels['foldername']  = 'Mappenavn';
+$labels['subscribed']  = 'Abonneret';
 $labels['messagecount'] = 'Beskeder';
-$labels['create'] = 'Opret';
-$labels['createfolder'] = 'Opret ny mappe';
-$labels['managefolders'] = 'Administrér mapper';
+$labels['create']  = 'Opret';
+$labels['createfolder']  = 'Opret ny mappe';
+$labels['managefolders']  = 'Administrér mapper';
 $labels['specialfolders'] = 'Specielle mapper';
 $labels['properties'] = 'Egenskaber';
 $labels['folderproperties'] = 'Mappeegenskaber';
@@ -411,22 +491,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Klik for at tjekke mappestørrelse';
 $labels['changesubscription'] = 'Klik for at ændre abonnement';
 $labels['foldertype'] = 'Mappetype';
-$labels['personalfolder'] = 'Privat mappe';
-$labels['otherfolder'] = 'Anden brugers mappe';
-$labels['sharedfolder'] = 'Offentlig mappe';
+$labels['personalfolder']  = 'Privat mappe';
+$labels['otherfolder']  = 'Anden brugers mappe';
+$labels['sharedfolder']  = 'Offentlig mappe';
+
 $labels['sortby'] = 'Sortér efter';
-$labels['sortasc'] = 'Ældste først';
+$labels['sortasc']  = 'Ældste først';
 $labels['sortdesc'] = 'Nyeste først';
 $labels['undo'] = 'Fortryd';
+
+$labels['installedplugins'] = 'Installerede udvidelser';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'Kilde';
 $labels['license'] = 'Licens';
 $labels['support'] = 'Få support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'kB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Vesteuropæisk';
@@ -446,3 +533,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index bb9038fe6..6b8ce1928 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Der opstod en fejl!';
-$messages['loginfailed'] = 'Det lykkedes ikke at logge på.';
+$messages['errortitle']  = 'Der opstod en fejl!';
+$messages['loginfailed']  = 'Det lykkedes ikke at logge på.';
 $messages['cookiesdisabled'] = 'Din browser accepterer ikke cookies.';
 $messages['sessionerror'] = 'Din session er ugyldig eller udløbet.';
 $messages['storageerror'] = 'Forbindelse til e-mailserveren fejlede.';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = 'Forespørgselstiden udløb';
 $messages['errorreadonly'] = 'Kunne ikke udføre den ønskede handling. Mappen er skrivebeskyttet.';
 $messages['errornoperm'] = 'Kunne ikke udføre den ønskede handling. Adgang nægtet.';
 $messages['invalidrequest'] = 'Ugyldig forespørgsel! Ingen data blev gemt.';
+$messages['invalidhost'] = 'Ugyldigt servernavn.';
 $messages['nomessagesfound'] = 'Der blev ikke fundet nogen beskeder i denne postkasse.';
 $messages['loggedout'] = 'Du er nu logget af webmail. Farvel så længe!';
 $messages['mailboxempty'] = 'Postkassen er tom.';
+$messages['refreshing'] = 'Opdaterer...';
 $messages['loading'] = 'Indlæser...';
 $messages['uploading'] = 'Uploader fil...';
 $messages['uploadingmany'] = 'Uploader filer...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = 'Beskeden kunne ikke flyttes.';
 $messages['errorcopying'] = 'Beskeden kunne ikke kopieres.';
 $messages['errordeleting'] = 'Beskeden kunne ikke slettes.';
 $messages['errormarking'] = 'Beskeden kunne ikke markeres.';
-$messages['deletecontactconfirm'] = 'Vil du virkelig slette den/de valgte kontakt(er)?';
-$messages['deletegroupconfirm'] = 'Vil du virkelig slette den/de valgte gruppe(r)?';
+$messages['deletecontactconfirm']  = 'Vil du virkelig slette den/de valgte kontakt(er)?';
+$messages['deletegroupconfirm']  = 'Vil du virkelig slette den/de valgte gruppe(r)?';
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette den/de valgte besked(er)?';
-$messages['deletefolderconfirm'] = 'Vil du virkelig slette den valgte mappe?';
-$messages['purgefolderconfirm'] = 'Vil du virkelig slette alle beskeder i denne mappe?';
+$messages['deletefolderconfirm']  = 'Vil du virkelig slette den valgte mappe?';
+$messages['purgefolderconfirm']  = 'Vil du virkelig slette alle beskeder i denne mappe?';
 $messages['contactdeleting'] = 'Sletter kontakt(er)...';
 $messages['groupdeleting'] = 'Sletter gruppe...';
 $messages['folderdeleting'] = 'Sletter mappen...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Abonnere på mappen...';
 $messages['folderunsubscribing'] = 'Fjerner abonnement på mappen...';
 $messages['formincomplete'] = 'Formularen var ikke fuldstændig fyldt ud.';
 $messages['noemailwarning'] = 'Indtast venligst en gyldig e-mailadresse.';
-$messages['nonamewarning'] = 'Angiv venligst et navn.';
+$messages['nonamewarning']  = 'Angiv venligst et navn.';
 $messages['nopagesizewarning'] = 'Angiv sidestørrelsen.';
 $messages['nosenderwarning'] = 'Indtast venligst afsenders e-mailadresse.';
 $messages['norecipientwarning'] = 'Indtast mindst én modtager.';
-$messages['nosubjectwarning'] = '\'Emne\'-feltet er tomt. Kunne du tænke dig at skrive et nu?';
+$messages['nosubjectwarning']  = '\'Emne\'-feltet er tomt. Kunne du tænke dig at skrive et nu?';
 $messages['nobodywarning'] = 'Send denne besked uden tekst?';
 $messages['notsentwarning'] = 'Beskeden er ikke sendt. Vil du kassere din besked?';
 $messages['noldapserver'] = 'Vælg venligst hvilken LDAP-server der skal søges i.';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = 'Vælg venligst den fil der skal overføres.';
 $messages['addresswriterror'] = 'Der kan ikke skrives i den valgte adressebog.';
 $messages['contactaddedtogroup'] = 'Succesfuldt tilføjet kontakten til denne gruppe';
 $messages['contactremovedfromgroup'] = 'Kontakten fjernet fra denne gruppe';
+$messages['nogroupassignmentschanged'] = 'Ingen gruppetildelinger ændret.';
 $messages['importwait'] = 'Importerer, vent venligst...';
-$messages['importerror'] = 'Fejl i importen! Den uploadede fil er ikke en gyldig vCard fil.';
+$messages['importformaterror'] = 'Importering mislykkedes! Den uploadede fil indeholder ikke gyldige data til importering.';
 $messages['importconfirm'] = '<b>Importerede $inserted kontakter</b>';
 $messages['importconfirmskipped'] = '<b>Sprang over $skipped eksisterende kontakter</b>';
 $messages['opnotpermitted'] = 'Handlingen er ikke tilladt!';
@@ -157,4 +163,7 @@ $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'] = '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'] = 'Advarsel: Denne webmailclient kræver Javascript! For at kunne bruge den slå venligst Javascripts til i din browserindstillinger.';
 
+?>
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 443ae81f4..31444b6c1 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/labels.inc                                        |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -335,6 +335,8 @@ $labels['composeto']      = 'Nachricht verfassen';
 $labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
 $labels['print']          = 'Drucken';
 $labels['export']         = 'Exportieren';
+$labels['exportall']      = 'Alle exportieren';
+$labels['exportsel']      = 'Ausgewählte exportieren';
 $labels['exportvcards']   = 'Kontakte im vCard-Format exportieren';
 $labels['newcontactgroup'] = 'Neue Adressgruppe erstellen';
 $labels['grouprename']    = 'Gruppe umbenennen';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index f9253bc08..027e2ee06 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 689392bab..6ce679caa 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Arnd <bla@espenfeld.de>                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Willkommen bei $product';
-$labels['username'] = 'Benutzername';
-$labels['password'] = 'Passwort';
-$labels['server'] = 'Server';
-$labels['login'] = 'Anmelden';
-$labels['logout'] = 'Abmelden';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Willkommen bei $product';
+$labels['username']  = 'Benutzername';
+$labels['password']  = 'Passwort';
+$labels['server']    = 'Server';
+$labels['login']     = 'Anmelden';
+
+// taskbar
+$labels['logout']   = 'Abmelden';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Einstellungen';
 $labels['addressbook'] = 'Adressbuch';
-$labels['inbox'] = 'Posteingang';
+
+// mailbox names
+$labels['inbox']  = 'Posteingang';
 $labels['drafts'] = 'Entwürfe';
-$labels['sent'] = 'Gesendet';
-$labels['trash'] = 'Gelöscht';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Gesendet';
+$labels['trash']  = 'Gelöscht';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Betreff';
-$labels['from'] = 'Absender';
-$labels['to'] = 'Empfänger';
-$labels['cc'] = 'Kopie';
-$labels['bcc'] = 'Blindkopie';
+$labels['from']    = 'Absender';
+$labels['sender']  = 'Absender';
+$labels['to']      = 'Empfänger';
+$labels['cc']      = 'Kopie';
+$labels['bcc']     = 'Blindkopie';
 $labels['replyto'] = 'Antwort an';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Größe';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Größe';
 $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
 $labels['listoptions'] = 'Listenoptionen...';
+
 $labels['mailboxlist'] = 'Ordner';
-$labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
 $labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
 $labels['messagenrof'] = 'Nachricht $nr von $count';
 $labels['fromtoshort'] = '$from – $to von $count';
-$labels['copy'] = 'Kopieren';
-$labels['move'] = 'Verschieben';
-$labels['moveto'] = 'Verschieben nach...';
+
+$labels['copy']     = 'Kopieren';
+$labels['move']     = 'Verschieben';
+$labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Herunterladen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
+
 $labels['filename'] = 'Dateiname';
 $labels['filesize'] = 'Dateigröße';
+
 $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
+
+// weekdays short
 $labels['sun'] = 'So';
 $labels['mon'] = 'Mo';
 $labels['tue'] = 'Di';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Mi';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Fr';
 $labels['sat'] = 'Sa';
-$labels['sunday'] = 'Sonntag';
-$labels['monday'] = 'Montag';
-$labels['tuesday'] = 'Dienstag';
+
+// weekdays long
+$labels['sunday']    = 'Sonntag';
+$labels['monday']    = 'Montag';
+$labels['tuesday']   = 'Dienstag';
 $labels['wednesday'] = 'Mittwoch';
-$labels['thursday'] = 'Donnerstag';
-$labels['friday'] = 'Freitag';
-$labels['saturday'] = 'Samstag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mär';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dez';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'März';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Dezember';
+$labels['thursday']  = 'Donnerstag';
+$labels['friday']    = 'Freitag';
+$labels['saturday']  = 'Samstag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mär';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dez';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'März';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Dezember';
+
 $labels['today'] = 'Heute';
-$labels['refresh'] = 'Aktualisieren';
-$labels['checkmail'] = 'Auf neue Nachrichten überprüfen';
-$labels['compose'] = 'Schreiben';
-$labels['writenewmessage'] = 'Neue Nachricht schreiben';
-$labels['reply'] = 'Antworten';
-$labels['replytomessage'] = 'Antwort verfassen';
+
+// toolbar buttons
+$labels['refresh']          = 'Aktualisieren';
+$labels['checkmail']        = 'Auf neue Nachrichten überprüfen';
+$labels['compose']          = 'Schreiben';
+$labels['writenewmessage']  = 'Neue Nachricht schreiben';
+$labels['reply']            = 'Antworten';
+$labels['replytomessage']   = 'Antwort verfassen';
 $labels['replytoallmessage'] = 'Antwort an Mailingliste oder an Absender und alle Empfänger verfassen';
-$labels['replyall'] = 'Allen antworten';
-$labels['replylist'] = 'Liste antworten';
-$labels['forward'] = 'Weiterleiten';
-$labels['forwardinline'] = 'innerhalb der Nachricht';
+$labels['replyall']         = 'Allen antworten';
+$labels['replylist']        = 'Liste antworten';
+$labels['forward']          = 'Weiterleiten';
+$labels['forwardinline']    = 'innerhalb der Nachricht';
 $labels['forwardattachment'] = 'als Dateianhang';
-$labels['forwardmessage'] = 'Nachricht weiterleiten';
-$labels['deletemessage'] = 'Nachricht löschen';
+$labels['forwardmessage']   = 'Nachricht weiterleiten';
+$labels['deletemessage']    = 'Nachricht löschen';
 $labels['movemessagetotrash'] = 'Nachricht in den Papierkorb verschieben';
-$labels['printmessage'] = 'Nachricht drucken';
-$labels['previousmessage'] = 'Vorherige Nachricht anzeigen';
-$labels['firstmessage'] = 'Die erste Nachricht anzeigen';
-$labels['nextmessage'] = 'Nächste Nachricht anzeigen';
-$labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
-$labels['backtolist'] = 'Zurück zur Liste';
-$labels['viewsource'] = 'Quelltext anzeigen';
-$labels['mark'] = 'Markieren';
-$labels['markmessages'] = 'Nachrichten markieren';
-$labels['markread'] = 'Als gelesen';
-$labels['markunread'] = 'Als ungelesen';
-$labels['markflagged'] = 'Markierung hinzufügen';
-$labels['markunflagged'] = 'Markierung entfernen';
-$labels['moreactions'] = 'Mehr...';
-$labels['more'] = 'Mehr';
-$labels['back'] = 'Zurück';
-$labels['options'] = 'Optionen';
+$labels['printmessage']     = 'Nachricht drucken';
+$labels['previousmessage']  = 'Vorherige Nachricht anzeigen';
+$labels['firstmessage']     = 'Die erste Nachricht anzeigen';
+$labels['nextmessage']      = 'Nächste Nachricht anzeigen';
+$labels['lastmessage']      = 'Die letzte Nachricht anzeigen';
+$labels['backtolist']       = 'Zurück zur Liste';
+$labels['viewsource']       = 'Quelltext anzeigen';
+$labels['mark']             = 'Markieren';
+$labels['markmessages']     = 'Nachrichten markieren';
+$labels['markread']         = 'Als gelesen';
+$labels['markunread']       = 'Als ungelesen';
+$labels['markflagged']      = 'Markierung hinzufügen';
+$labels['markunflagged']    = 'Markierung entfernen';
+$labels['moreactions']      = 'Mehr...';
+$labels['more']             = 'Mehr';
+$labels['back']             = 'Zurück';
+$labels['options']          = 'Optionen';
+
 $labels['select'] = 'Auswahl';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
-$labels['nonesort'] = 'Keine';
 $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Alle aufklappen';
 $labels['expand-unread'] = 'Ungelesene aufklappen';
 $labels['collapse-all'] = 'Alle zuklappen';
 $labels['threaded'] = 'Gruppiert';
+
 $labels['autoexpand_threads'] = 'Konversationen aufklappen';
 $labels['do_expand'] = 'alle';
 $labels['expand_only_unread'] = 'nur ungelesene';
 $labels['fromto'] = 'Sender/Empfänger';
 $labels['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
+$labels['nonesort'] = 'Keine';
 $labels['sentdate'] = 'Sendedatum';
 $labels['arrival'] = 'Empfangsdatum';
 $labels['asc'] = 'aufsteigend';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Spalten';
 $labels['listsorting'] = 'Sortierung';
 $labels['listorder'] = 'Ordnung';
 $labels['listmode'] = 'Anzeigemodus';
+
 $labels['folderactions'] = 'Ordneraktionen...';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
+
 $labels['quota'] = 'Speicherplatz';
-$labels['unknown'] = 'unbekannt';
-$labels['unlimited'] = 'unbegrenzt';
-$labels['quicksearch'] = 'Schnellsuche';
-$labels['resetsearch'] = 'Suche zurücksetzen';
-$labels['searchmod'] = 'Suchkriterien ändern';
-$labels['msgtext'] = 'Nachricht';
+$labels['unknown']  = 'unbekannt';
+$labels['unlimited']  = 'unbegrenzt';
+
+$labels['quicksearch']  = 'Schnellsuche';
+$labels['resetsearch']  = 'Suche zurücksetzen';
+$labels['searchmod']  = 'Suchkriterien ändern';
+$labels['msgtext']  = 'Nachricht';
+$labels['body']  = 'Inhalt';
+
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
-$labels['editasnew'] = 'Als neue Nachricht öffnen';
-$labels['send'] = 'Senden';
-$labels['sendmessage'] = 'Nachricht jetzt senden';
-$labels['savemessage'] = 'Nachricht speichern';
-$labels['addattachment'] = 'Datei anfügen';
-$labels['charset'] = 'Zeichensatz';
-$labels['editortype'] = 'Editor Typ';
-$labels['returnreceipt'] = 'Empfangsbestätigung (MDN)';
-$labels['dsn'] = 'Übermittlungsbestätigung (DSN)';
+
+// message compose
+$labels['editasnew']      = 'Als neue Nachricht öffnen';
+$labels['send']           = 'Senden';
+$labels['sendmessage']    = 'Nachricht jetzt senden';
+$labels['savemessage']    = 'Nachricht speichern';
+$labels['addattachment']  = 'Datei anfügen';
+$labels['charset']        = 'Zeichensatz';
+$labels['editortype']     = 'Editor Typ';
+$labels['returnreceipt']  = 'Empfangsbestätigung (MDN)';
+$labels['dsn']            = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
 $labels['originalmessage'] = 'Originalnachricht';
-$labels['editidents'] = 'Absender ändern';
-$labels['spellcheck'] = 'Rechtschreibung';
+
+$labels['editidents']    = 'Absender ändern';
+$labels['spellcheck']    = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
-$labels['revertto'] = 'Zurück zu';
+$labels['revertto']      = 'Zurück zu';
+
 $labels['attach'] = 'Anhängen';
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
-$labels['close'] = 'Schließen';
-$labels['messageoptions'] = 'Optionen...';
-$labels['low'] = 'Niedrig';
-$labels['lowest'] = 'Niedrigste';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Hoch';
+$labels['close']  = 'Schließen';
+$labels['messageoptions']  = 'Optionen...';
+
+$labels['low']     = 'Niedrig';
+$labels['lowest']  = 'Niedrigste';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Hoch';
 $labels['highest'] = 'Höchste';
-$labels['nosubject'] = '(kein Betreff)';
+
+$labels['nosubject']  = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
-$labels['isdraft'] = 'Dies ist ein Entwurf';
-$labels['andnmore'] = '$nr weitere';
+$labels['isdraft']    = 'Dies ist ein Entwurf';
+$labels['andnmore']   = '$nr weitere';
 $labels['togglemoreheaders'] = 'Zeige weitere Nachrichten-Header';
 $labels['togglefullheaders'] = 'Original-Kopfzeilen ein-/ausblenden';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Nur-Text';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
 $labels['dontsave'] = 'nicht speichern';
 $labels['maxuploadsize'] = 'Maximal erlaubte Dateigröße ist $size';
+
 $labels['addcc'] = 'Cc hinzufügen';
 $labels['addbcc'] = 'Bcc hinzufügen';
 $labels['addreplyto'] = 'Antwortadresse hinzufügen';
 $labels['addfollowupto'] = 'Followup-To hinzufügen';
+
+// mdn
 $labels['mdnrequest'] = 'Der Sender dieser Nachricht möchte gerne eine Lesebestätigung. Wollen Sie dieses bestätigen?';
 $labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
 $labels['yourmessage'] = 'Dies ist eine Empfangsbestätigung für Ihre Nachricht';
 $labels['receiptnote'] = 'Hinweis: Der Empfänger hat den Empfang der Nachricht bestätigt. Dies ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
-$labels['name'] = 'Angezeigter Name';
-$labels['firstname'] = 'Vorname';
-$labels['surname'] = 'Nachname';
-$labels['middlename'] = 'zweiter  Vorname';
-$labels['nameprefix'] = 'Anrede';
-$labels['namesuffix'] = 'Namenszusatz';
-$labels['nickname'] = 'Spitzname';
-$labels['jobtitle'] = 'Berufsbezeichnung';
-$labels['department'] = 'Firma';
-$labels['gender'] = 'Geschlecht';
-$labels['maidenname'] = 'Mädchenname';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Straße';
-$labels['locality'] = 'Ort';
-$labels['zipcode'] = 'PLZ';
-$labels['region'] = 'Region';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Geburtstag';
-$labels['anniversary'] = 'Jahrestag';
-$labels['website'] = 'Webseite';
+
+// address boook
+$labels['name']         = 'Angezeigter Name';
+$labels['firstname']    = 'Vorname';
+$labels['surname']      = 'Nachname';
+$labels['middlename']   = 'zweiter  Vorname';
+$labels['nameprefix']   = 'Anrede';
+$labels['namesuffix']   = 'Namenszusatz';
+$labels['nickname']     = 'Spitzname';
+$labels['jobtitle']     = 'Berufsbezeichnung';
+$labels['department']   = 'Firma';
+$labels['gender']       = 'Geschlecht';
+$labels['maidenname']   = 'Mädchenname';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Straße';
+$labels['locality']     = 'Ort';
+$labels['zipcode']      = 'PLZ';
+$labels['region']       = 'Region';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Geburtstag';
+$labels['anniversary']  = 'Jahrestag';
+$labels['website']      = 'Webseite';
 $labels['instantmessenger'] = 'IM-Adresse';
 $labels['notes'] = 'Notizen';
-$labels['male'] = 'männlich';
+$labels['male']   = 'männlich';
 $labels['female'] = 'weiblich';
 $labels['manager'] = 'Vorgesetze(r)';
 $labels['assistant'] = 'Assistenz';
-$labels['typeassistant'] = 'Assistenz';
 $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Detaillierte Suche';
 $labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
-$labels['typeother'] = 'Andere';
-$labels['typehome'] = 'Privat';
-$labels['typework'] = 'Dienstlich';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hauptnummer';
-$labels['typehomefax'] = 'Fax Privat';
-$labels['typeworkfax'] = 'Fax Dienst';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Internet';
+
+$labels['typehome']   = 'Privat';
+$labels['typework']   = 'Dienstlich';
+$labels['typeother']  = 'Andere';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hauptnummer';
+$labels['typehomefax']  = 'Fax Privat';
+$labels['typeworkfax']  = 'Fax Dienst';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistenz';
+$labels['typehomepage']  = 'Internet';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Feld hinzufügen...';
 $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Kontaktdaten';
 $labels['personalinfo'] = 'Persönliche Informationen';
-$labels['edit'] = 'Bearbeiten';
+
+$labels['edit']   = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
-$labels['save'] = 'Speichern';
+$labels['save']   = 'Speichern';
 $labels['delete'] = 'Löschen';
 $labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Kontaktbild hinzufügen';
 $labels['replacephoto'] = 'Bild ändern';
 $labels['uploadphoto'] = 'Bild hochladen';
-$labels['newcontact'] = 'Neuen Kontakt erstellen';
-$labels['deletecontact'] = 'Gewählte Kontakte löschen';
-$labels['composeto'] = 'Nachricht verfassen';
+
+$labels['newcontact']     = 'Neuen Kontakt erstellen';
+$labels['deletecontact']  = 'Gewählte Kontakte löschen';
+$labels['composeto']      = 'Nachricht verfassen';
 $labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
-$labels['print'] = 'Drucken';
-$labels['export'] = 'Exportieren';
-$labels['exportvcards'] = 'Kontakte im vCard-Format exportieren';
+$labels['print']          = 'Drucken';
+$labels['export']         = 'Exportieren';
+$labels['exportall']      = 'Alles exportieren';
+$labels['exportsel']      = 'Auswahl exportieren';
+$labels['exportvcards']   = 'Kontakte im vCard-Format exportieren';
 $labels['newcontactgroup'] = 'Neue Kontaktgruppe erstellen';
-$labels['grouprename'] = 'Gruppe umbenennen';
-$labels['groupdelete'] = 'Gruppe löschen';
+$labels['grouprename']    = 'Gruppe umbenennen';
+$labels['groupdelete']    = 'Gruppe löschen';
 $labels['groupremoveselected'] = 'Gewählte Kontakte aus Gruppe entfernen';
-$labels['previouspage'] = 'Seite zurück';
-$labels['firstpage'] = 'Erste Seite';
-$labels['nextpage'] = 'Nächste Seite';
-$labels['lastpage'] = 'Letzte Seite';
+
+$labels['previouspage']   = 'Seite zurück';
+$labels['firstpage']      = 'Erste Seite';
+$labels['nextpage']       = 'Nächste Seite';
+$labels['lastpage']       = 'Letzte Seite';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppen';
 $labels['personaladrbook'] = 'Persönliches Adressbuch';
+
 $labels['searchsave'] = 'Suchergebnisse speichern';
 $labels['searchdelete'] = 'Suchergebnisse löschen';
+
 $labels['import'] = 'Importieren';
 $labels['importcontacts'] = 'Kontakte importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Einen neuen Kontakt hinzufügen:';
 $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
 $labels['importdesc'] = 'Sie können Kontakte von einem vorhandenen Adressbuch hochladen.<br/>Zur Zeit wird der Import von Adressen im <a href="http://de.wikipedia.org/wiki/VCard">vCard</a> oder <a href="http://de.wikipedia.org/wiki/CSV_(Dateiformat)">CSV</a>Format unterstützt.';
 $labels['done'] = 'Fertig';
+
+// settings
 $labels['settingsfor'] = 'Einstellungen für';
 $labels['about'] = 'Über';
 $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Benutzereinstellungen bearbeiten';
+
 $labels['identities'] = 'Identitäten';
 $labels['manageidentities'] = 'Absender für dieses Konto verwalten';
 $labels['newidentity'] = 'Neuer Absender';
+
 $labels['newitem'] = 'Neuer Eintrag';
 $labels['edititem'] = 'Eintrag bearbeiten';
+
 $labels['preferhtml'] = 'HTML anzeigen';
 $labels['defaultcharset'] = 'Standard Zeichensatz';
 $labels['htmlmessage'] = 'HTML-Nachricht';
+$labels['messagepart'] = 'Teilstück';
+$labels['digitalsig'] = 'Digitale Signatur';
 $labels['dateformat'] = 'Datumsformatierung';
 $labels['timeformat'] = 'Zeitformatierung';
 $labels['prettydate'] = 'Kurze Datumsanzeige';
-$labels['setdefault'] = 'Als Standard';
-$labels['autodetect'] = 'Automatisch';
-$labels['language'] = 'Sprache';
-$labels['timezone'] = 'Zeitzone';
-$labels['pagesize'] = 'Einträge pro Seite';
+$labels['setdefault']  = 'Als Standard';
+$labels['autodetect']  = 'Automatisch';
+$labels['language']  = 'Sprache';
+$labels['timezone']  = 'Zeitzone';
+$labels['pagesize']  = 'Einträge pro Seite';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommerzeit';
+$labels['dstactive']  = 'Sommerzeit';
 $labels['showinextwin'] = 'Nachrichten in neuem Fenster öffnen';
 $labels['composeextwin'] = 'Nachrichten in neuem Fenster verfassen';
 $labels['htmleditor'] = 'HTML-Nachrichten verfassen';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Eingebettete Bilder vom Internet laden';
 $labels['fromknownsenders'] = 'bei bekannten Absendern';
 $labels['always'] = 'immer';
 $labels['showinlineimages'] = 'Angehängte Bilder unter der Nachricht anzeigen';
-$labels['autosavedraft'] = 'Entwurf automatisch speichern';
-$labels['everynminutes'] = '$n Minute(n)';
-$labels['refreshinterval'] = 'Aktualisieren (auf neue Nachrichten prüfen, etc.)';
-$labels['never'] = 'nie';
-$labels['immediately'] = 'sofort';
+$labels['autosavedraft']  = 'Entwurf automatisch speichern';
+$labels['everynminutes']  = '$n Minute(n)';
+$labels['refreshinterval']  = 'Aktualisieren (auf neue Nachrichten prüfen, etc.)';
+$labels['never']  = 'nie';
+$labels['immediately']  = 'sofort';
 $labels['messagesdisplaying'] = 'Nachrichtendarstellung';
 $labels['messagescomposition'] = 'Nachrichtenerstellung';
 $labels['mimeparamfolding'] = 'Namen der Dateianhänge';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Beim Antworten die Signatur';
 $labels['belowquote'] = 'unter der Originalnachricht einfügen';
 $labels['abovequote'] = 'über der Originalnachricht einfügen';
 $labels['insertsignature'] = 'Signatur einfügen';
-$labels['previewpanemarkread'] = 'Nachricht in Vorschau als gelesen markieren';
-$labels['afternseconds'] = 'nach $n Sekunden';
+$labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
+$labels['afternseconds']  = 'nach $n Sekunden';
 $labels['reqmdn'] = 'Empfangsbestätigung (MDN) immer anfordern';
 $labels['reqdsn'] = 'Übermittlungsbestätigung (DSN) immer anfordern';
 $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Als Empfänger für mailto: Links einrichten';
 $labels['forwardmode'] = 'Nachrichtenweiterleitung';
 $labels['inline'] = 'eingebettet';
 $labels['asattachment'] = 'als Anhang';
-$labels['folder'] = 'Ordner';
-$labels['foldername'] = 'Ordnername';
-$labels['subscribed'] = 'Abonniert';
+
+$labels['folder']  = 'Ordner';
+$labels['folders']  = 'Ordner';
+$labels['foldername']  = 'Ordnername';
+$labels['subscribed']  = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
-$labels['create'] = 'Erstellen';
-$labels['createfolder'] = 'Neuen Ordner erstellen';
-$labels['managefolders'] = 'Ordner verwalten';
+$labels['create']  = 'Erstellen';
+$labels['createfolder']  = 'Neuen Ordner erstellen';
+$labels['managefolders']  = 'Ordner verwalten';
 $labels['specialfolders'] = 'Spezialordner';
 $labels['properties'] = 'Eigenschaften';
 $labels['folderproperties'] = 'Ordnereigenschaften';
@@ -427,23 +491,29 @@ $labels['info'] = 'Informationen';
 $labels['getfoldersize'] = 'Ordnergröße anzeigen';
 $labels['changesubscription'] = 'Abonnieren';
 $labels['foldertype'] = 'Ordnertyp';
-$labels['personalfolder'] = 'Privater Ordner';
-$labels['otherfolder'] = 'Ordner eines anderen Benutzers';
-$labels['sharedfolder'] = 'Öffentlicher Ordner';
+$labels['personalfolder']  = 'Privater Ordner';
+$labels['otherfolder']  = 'Ordner eines anderen Benutzers';
+$labels['sharedfolder']  = 'Öffentlicher Ordner';
+
 $labels['sortby'] = 'Sortieren nach';
-$labels['sortasc'] = 'Aufsteigend sortieren';
+$labels['sortasc']  = 'Aufsteigend sortieren';
 $labels['sortdesc'] = 'Absteigend sortieren';
 $labels['undo'] = 'Rückgängig machen';
+
 $labels['installedplugins'] = 'Installierte Plugins';
 $labels['plugin'] = 'Erweiterung';
 $labels['version'] = 'Version';
 $labels['source'] = 'Quellcode';
 $labels['license'] = 'Lizenz';
 $labels['support'] = 'Support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Englisch';
 $labels['westerneuropean'] = 'West Europäisch';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
 
+?>
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 9374c4b0c..eeaba7db2 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Arnd <bla@espenfeld.de>                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ein Fehler ist aufgetreten!';
-$messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
+$messages['errortitle']  = 'Ein Fehler ist aufgetreten!';
+$messages['loginfailed']  = 'Die Anmeldung ist fehlgeschlagen.';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
 $messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
 $messages['storageerror'] = 'Verbindung zum Speicherserver fehlgeschlagen.';
@@ -30,8 +33,8 @@ $messages['invalidhost'] = 'Ungültiger Server Name';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner.';
 $messages['loggedout'] = 'Sie haben Ihre Sitzung erfolgreich beendet. Auf Wiedersehen!';
 $messages['mailboxempty'] = 'Mailbox ist leer.';
-$messages['refreshing'] = 'Aktualisieren …';
-$messages['loading'] = 'Wird geladen ...';
+$messages['refreshing'] = 'Aktualisieren…';
+$messages['loading'] = 'Wird geladen...';
 $messages['uploading'] = 'Datei wird hochgeladen...';
 $messages['uploadingmany'] = 'Dateien werden hochgeladen...';
 $messages['loadingdata'] = 'Daten werden geladen...';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
 $messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
 $messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
 $messages['errormarking'] = 'Nachricht(en) konnte(n) nicht markiert werden.';
-$messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
-$messages['deletegroupconfirm'] = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
+$messages['deletecontactconfirm']  = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
+$messages['deletegroupconfirm']  = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
 $messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
-$messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
-$messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
+$messages['deletefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich löschen?';
+$messages['purgefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich leeren?';
 $messages['contactdeleting'] = 'Lösche Kontakt(e)...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
 $messages['folderdeleting'] = 'Lösche Ordner...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Abonniere Ordner...';
 $messages['folderunsubscribing'] = 'Ordner abbstellen...';
 $messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt.';
 $messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein.';
-$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein.';
+$messages['nonamewarning']  = 'Bitte geben Sie einen Namen ein.';
 $messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an.';
 $messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an.';
 $messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an.';
-$messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
+$messages['nosubjectwarning']  = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
 $messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
 $messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus.';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbei
 $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['noscriptwarning'] = 'Warnung: Dieser Webmail-Service erfordert Javascript. Um ihn zu benutzten aktivieren Sie Javascript in ihren Browser-Einstellungen.';
 
+?>
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 2f0ca0bf5..283f7e680 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Καλώς ήρθατε στο $product';
-$labels['username'] = 'Όνομα Χρήστη';
-$labels['password'] = 'Κωδικός Πρόσβασης';
-$labels['server'] = 'Διακομιστής';
-$labels['login'] = 'Σύνδεση';
-$labels['logout'] = 'Αποσύνδεση';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Καλώς ήρθατε στο $product';
+$labels['username']  = 'Όνομα Χρήστη';
+$labels['password']  = 'Κωδικός Πρόσβασης';
+$labels['server']    = 'Διακομιστής';
+$labels['login']     = 'Σύνδεση';
+
+// taskbar
+$labels['logout']   = 'Αποσύνδεση';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Ρυθμίσεις';
 $labels['addressbook'] = 'Επαφές';
-$labels['inbox'] = 'Εισερχόμενα';
+
+// mailbox names
+$labels['inbox']  = 'Εισερχόμενα';
 $labels['drafts'] = 'Πρόχειρα';
-$labels['sent'] = 'Απεσταλμένα';
-$labels['trash'] = 'Κάδος Απορριμάτων';
-$labels['junk'] = 'Ανεπιθύμητα';
+$labels['sent']   = 'Απεσταλμένα';
+$labels['trash']  = 'Κάδος Απορριμάτων';
+$labels['junk']   = 'Ανεπιθύμητα';
+
+// message listing
 $labels['subject'] = 'Θέμα';
-$labels['from'] = 'Αποστολέας';
-$labels['to'] = 'Παραλήπτης';
-$labels['cc'] = 'Κοινοποίηση';
-$labels['bcc'] = 'Κρυφή κοινοποίηση';
+$labels['from']    = 'Αποστολέας';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Παραλήπτης';
+$labels['cc']      = 'Κοινοποίηση';
+$labels['bcc']     = 'Κρυφή κοινοποίηση';
 $labels['replyto'] = 'Απάντηση στο';
 $labels['followupto'] = 'Σε συνέχεια';
-$labels['date'] = 'Ημερομηνία';
-$labels['size'] = 'Μέγεθος';
+$labels['date']    = 'Ημερομηνία';
+$labels['size']    = 'Μέγεθος';
 $labels['priority'] = 'Πρoτεραιότητα';
 $labels['organization'] = 'Οργανισμός';
 $labels['readstatus'] = 'Κατάσταση ανάγνωσης';
 $labels['listoptions'] = 'Κατάλογος επιλογών';
+
 $labels['mailboxlist'] = 'Φάκελοι';
-$labels['folders'] = 'Φάκελοι';
 $labels['messagesfromto'] = 'Μηνύματα $from από $to έως $count';
 $labels['threadsfromto'] = 'Θέματα $from έως $to από $count';
 $labels['messagenrof'] = 'Μήνυμα $nr από $count';
 $labels['fromtoshort'] = '$from – $to από $count';
-$labels['copy'] = 'Αντίγραφο';
-$labels['move'] = 'Μετακίνηση';
-$labels['moveto'] = 'Μετακίνηση σε...';
+
+$labels['copy']     = 'Αντίγραφο';
+$labels['move']     = 'Μετακίνηση';
+$labels['moveto']   = 'Μετακίνηση σε...';
 $labels['download'] = 'Λήψη';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Όνομα αρχείου';
 $labels['filesize'] = 'Μέγεθος αρχείου';
+
 $labels['addtoaddressbook'] = 'Προσθήκη στο βιβλίο διευθύνσεων';
+
+// weekdays short
 $labels['sun'] = 'Κυρ';
 $labels['mon'] = 'Δευτ';
 $labels['tue'] = 'Τρι';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Τετ';
 $labels['thu'] = 'Πεμπ';
 $labels['fri'] = 'Παρ';
 $labels['sat'] = 'Σαβ';
-$labels['sunday'] = 'Κυριακή';
-$labels['monday'] = 'Δευτέρα';
-$labels['tuesday'] = 'Τρίτη';
+
+// weekdays long
+$labels['sunday']    = 'Κυριακή';
+$labels['monday']    = 'Δευτέρα';
+$labels['tuesday']   = 'Τρίτη';
 $labels['wednesday'] = 'Τετάρτη';
-$labels['thursday'] = 'Πέμπτη';
-$labels['friday'] = 'Παρασκευή';
-$labels['saturday'] = 'Σάββατο';
-$labels['jan'] = 'Ιαν';
-$labels['feb'] = 'Φεβ';
-$labels['mar'] = 'Μαρ';
-$labels['apr'] = 'Απρ';
-$labels['may'] = 'Μαι';
-$labels['longmay'] = 'Μαι';
-$labels['jun'] = 'Ιουν';
-$labels['jul'] = 'Ιουλ';
-$labels['aug'] = 'Αυγ';
-$labels['sep'] = 'Σεπ';
-$labels['oct'] = 'Οκτ';
-$labels['nov'] = 'Νοε';
-$labels['dec'] = 'Δεκ';
-$labels['longjan'] = 'Ιανουάριος';
-$labels['longfeb'] = 'Φεβρουάριος';
-$labels['longmar'] = 'Μάρτιος';
-$labels['longapr'] = 'Απρίλιος';
-$labels['longjun'] = 'Ιούνιος';
-$labels['longjul'] = 'Ιούλιος';
-$labels['longaug'] = 'Αύγουστος';
-$labels['longsep'] = 'Σεπτέμβριος';
-$labels['longoct'] = 'Οκτώβριος';
-$labels['longnov'] = 'Νοέμβριος';
-$labels['longdec'] = 'Δεκέμβριος';
+$labels['thursday']  = 'Πέμπτη';
+$labels['friday']    = 'Παρασκευή';
+$labels['saturday']  = 'Σάββατο';
+
+// months short
+$labels['jan']	= 'Ιαν';
+$labels['feb']	= 'Φεβ';
+$labels['mar']	= 'Μαρ';
+$labels['apr']	= 'Απρ';
+$labels['may']	= 'Μαι';
+$labels['jun']	= 'Ιουν';
+$labels['jul'] 	= 'Ιουλ';
+$labels['aug']	= 'Αυγ';
+$labels['sep']	= 'Σεπ';
+$labels['oct']	= 'Οκτ';
+$labels['nov']	= 'Νοε';
+$labels['dec']	= 'Δεκ';
+
+// months long
+$labels['longjan']	= 'Ιανουάριος';
+$labels['longfeb']	= 'Φεβρουάριος';
+$labels['longmar']	= 'Μάρτιος';
+$labels['longapr']	= 'Απρίλιος';
+$labels['longmay']	= 'Μαι';
+$labels['longjun']	= 'Ιούνιος';
+$labels['longjul']	= 'Ιούλιος';
+$labels['longaug']	= 'Αύγουστος';
+$labels['longsep']	= 'Σεπτέμβριος';
+$labels['longoct']	= 'Οκτώβριος';
+$labels['longnov']	= 'Νοέμβριος';
+$labels['longdec']	= 'Δεκέμβριος';
+
 $labels['today'] = 'Σήμερα';
-$labels['refresh'] = 'Ανανέωση';
-$labels['checkmail'] = 'Έλεγχος για νέα μηνύματα';
-$labels['compose'] = 'Δημιουργία μηνύματος';
-$labels['writenewmessage'] = 'Δημιουργία νέου μηνύματος';
-$labels['reply'] = 'Απάντηση';
-$labels['replytomessage'] = 'Απάντηση στον αποστολέα';
+
+// toolbar buttons
+$labels['refresh']          = 'Ανανέωση';
+$labels['checkmail']        = 'Έλεγχος για νέα μηνύματα';
+$labels['compose']          = 'Δημιουργία μηνύματος';
+$labels['writenewmessage']  = 'Δημιουργία νέου μηνύματος';
+$labels['reply']            = 'Απάντηση';
+$labels['replytomessage']   = 'Απάντηση στον αποστολέα';
 $labels['replytoallmessage'] = 'Απάντηση στη λίστα ή στον αποστολέα και όλους τους παραλήπτες';
-$labels['replyall'] = 'Απάντηση όλων';
-$labels['replylist'] = 'Λίστα παραληπτών απάντησης';
-$labels['forward'] = 'Προώθηση';
-$labels['forwardinline'] = 'Forward inline';
+$labels['replyall']         = 'Απάντηση όλων';
+$labels['replylist']        = 'Λίστα παραληπτών απάντησης';
+$labels['forward']          = 'Προώθηση';
+$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Προώθηση σαν συνημμένο';
-$labels['forwardmessage'] = 'Προώθηση μηνύματος';
-$labels['deletemessage'] = 'Διαγραφή μηνύματος';
+$labels['forwardmessage']   = 'Προώθηση μηνύματος';
+$labels['deletemessage']    = 'Διαγραφή μηνύματος';
 $labels['movemessagetotrash'] = 'Διαγραφή του μηνύματος';
-$labels['printmessage'] = 'Εκτύπωση του μηνύματος';
-$labels['previousmessage'] = 'Εμφάνιση του προηγούμενου μηνύματος';
-$labels['firstmessage'] = 'Εμφάνιση του πρώτου μηνύματος';
-$labels['nextmessage'] = 'Εμφάνιση του επόμενου μηνύματος';
-$labels['lastmessage'] = 'Εμφάνιση του τελευταίου μηνύματος';
-$labels['backtolist'] = 'Επιστροφή στη λίστα μηνυμάτων';
-$labels['viewsource'] = 'Προβολή πηγαίου κώδικα';
-$labels['mark'] = 'Μαρκάρισμα';
-$labels['markmessages'] = 'Μαρκάρισμα μηνυμάτων';
-$labels['markread'] = 'ως αναγνωσμένα';
-$labels['markunread'] = 'ως μη-αναγνωσμένα';
-$labels['markflagged'] = 'ως με σήμανση';
-$labels['markunflagged'] = 'ως Χωρίς σήμανση';
-$labels['moreactions'] = 'Περισσότερες ενέργειες...';
-$labels['more'] = 'Περισσότερα';
-$labels['back'] = 'Επιστροφή';
-$labels['options'] = 'Επιλογές';
+$labels['printmessage']     = 'Εκτύπωση του μηνύματος';
+$labels['previousmessage']  = 'Εμφάνιση του προηγούμενου μηνύματος';
+$labels['firstmessage']     = 'Εμφάνιση του πρώτου μηνύματος';
+$labels['nextmessage']      = 'Εμφάνιση του επόμενου μηνύματος';
+$labels['lastmessage']      = 'Εμφάνιση του τελευταίου μηνύματος';
+$labels['backtolist']       = 'Επιστροφή στη λίστα μηνυμάτων';
+$labels['viewsource']       = 'Προβολή πηγαίου κώδικα';
+$labels['mark']             = 'Μαρκάρισμα';
+$labels['markmessages']     = 'Μαρκάρισμα μηνυμάτων';
+$labels['markread']         = 'ως αναγνωσμένα';
+$labels['markunread']       = 'ως μη-αναγνωσμένα';
+$labels['markflagged']      = 'ως με σήμανση';
+$labels['markunflagged']    = 'ως Χωρίς σήμανση';
+$labels['moreactions']      = 'Περισσότερες ενέργειες...';
+$labels['more']             = 'Περισσότερα';
+$labels['back']             = 'Επιστροφή';
+$labels['options']          = 'Επιλογές';
+
 $labels['select'] = 'Επιλέξτε';
 $labels['all'] = 'Όλα';
 $labels['none'] = 'Κανένα';
-$labels['nonesort'] = 'Κανένα';
 $labels['currpage'] = 'Τρέχουσα σελίδα';
 $labels['unread'] = 'Μη αναγνωσμένο';
 $labels['flagged'] = 'Σημειωμένο';
 $labels['unanswered'] = 'Αναπάντητο';
 $labels['deleted'] = 'Διεγραμμένο';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Αναστροφή';
 $labels['filter'] = 'Φίλτρο';
 $labels['list'] = 'Λίστα';
@@ -142,12 +171,14 @@ $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'] = 'αύξουσα';
@@ -156,173 +187,216 @@ $labels['listcolumns'] = 'Στήλες';
 $labels['listsorting'] = 'Ταξινόμηση στηλών';
 $labels['listorder'] = 'Σειρά ταξινόμησης';
 $labels['listmode'] = 'Προβολή σε λίστα';
+
 $labels['folderactions'] = 'Ενέργειες στους φακέλους';
 $labels['compact'] = 'Συμπίεση';
 $labels['empty'] = 'Άδειασμα';
+
 $labels['quota'] = 'Χρήση δίσκου';
-$labels['unknown'] = 'άγνωστο';
-$labels['unlimited'] = 'απεριόριστο';
-$labels['quicksearch'] = 'Γρήγορη Αναζήτηση';
-$labels['resetsearch'] = 'Επαναφορά Αναζήτησης';
-$labels['searchmod'] = 'Search modifiers';
-$labels['msgtext'] = 'Σε όλο το μήνυμα';
+$labels['unknown']  = 'άγνωστο';
+$labels['unlimited']  = 'απεριόριστο';
+
+$labels['quicksearch']  = 'Γρήγορη Αναζήτηση';
+$labels['resetsearch']  = 'Επαναφορά Αναζήτησης';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Σε όλο το μήνυμα';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
-$labels['editasnew'] = 'Επεξεργασία σαν νέο';
-$labels['sendmessage'] = 'Αποστολή μηνύματος';
-$labels['savemessage'] = 'Αποθήκευση ως πρόχειρο';
-$labels['addattachment'] = 'Επισύναψη αρχείου';
-$labels['charset'] = 'Κωδικοποίηση χαρακτήρων';
-$labels['editortype'] = 'Είδος επεξεργαστή κειμένου';
-$labels['returnreceipt'] = 'Αναφορά Παράδοσης';
-$labels['dsn'] = 'Κατάσταση αναφοράς παράδοσης';
+
+// message compose
+$labels['editasnew']      = 'Επεξεργασία σαν νέο';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Αποστολή μηνύματος';
+$labels['savemessage']    = 'Αποθήκευση ως πρόχειρο';
+$labels['addattachment']  = 'Επισύναψη αρχείου';
+$labels['charset']        = 'Κωδικοποίηση χαρακτήρων';
+$labels['editortype']     = 'Είδος επεξεργαστή κειμένου';
+$labels['returnreceipt']  = 'Αναφορά Παράδοσης';
+$labels['dsn']            = 'Κατάσταση αναφοράς παράδοσης';
 $labels['mailreplyintro'] = 'Στις $date, $sender έγραψε:';
 $labels['originalmessage'] = 'Αρχικό μήνυμα';
-$labels['editidents'] = 'Επεξεργασία ταυτοτήτων';
-$labels['spellcheck'] = 'Συλλαβισμός';
+
+$labels['editidents']    = 'Επεξεργασία ταυτοτήτων';
+$labels['spellcheck']    = 'Συλλαβισμός';
 $labels['checkspelling'] = 'Έλεγχος ορθογραφίας';
 $labels['resumeediting'] = 'Συνέχεια επεξεργασίας';
-$labels['revertto'] = 'Επαναφορά στο';
+$labels['revertto']      = 'Επαναφορά στο';
+
 $labels['attach'] = 'Επισύναψη';
 $labels['attachments'] = 'Συνημμένα';
 $labels['upload'] = 'Αποστολή';
 $labels['uploadprogress'] = '$percent ($current από $total)';
-$labels['close'] = 'Κλείσιμο';
-$labels['messageoptions'] = 'Επιλογές μηνύματος';
-$labels['low'] = 'Χαμηλή';
-$labels['lowest'] = 'Χαμηλότερη';
-$labels['normal'] = 'Κανονική';
-$labels['high'] = 'Υψηλή';
+$labels['close']  = 'Κλείσιμο';
+$labels['messageoptions']  = 'Επιλογές μηνύματος';
+
+$labels['low']     = 'Χαμηλή';
+$labels['lowest']  = 'Χαμηλότερη';
+$labels['normal']  = 'Κανονική';
+$labels['high']    = 'Υψηλή';
 $labels['highest'] = 'Μέγιστη δυνατή';
-$labels['nosubject'] = '(χωρίς θέμα)';
+
+$labels['nosubject']  = '(χωρίς θέμα)';
 $labels['showimages'] = 'Προβολή εικόνων';
 $labels['alwaysshow'] = 'Να προβάλλονται πάντα οι εικόνες που αποστέλλονται από τον $sender';
-$labels['isdraft'] = 'Αυτό το μήνυμα έχει σημανθεί σαν πρόχειρο';
+$labels['isdraft']    = 'Αυτό το μήνυμα έχει σημανθεί σαν πρόχειρο';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Απλό κείμενο';
 $labels['savesentmessagein'] = 'Αποθήκευση απεσταλμένου στο φάκελο';
 $labels['dontsave'] = 'να μην αποθηκευθεί';
 $labels['maxuploadsize'] = 'Το μέγιστο επιτρεπόμενο μέγεθος αρχείου είναι $size';
+
 $labels['addcc'] = 'Προσθήκη Παραλήπτη Κοινοποίησης';
 $labels['addbcc'] = 'Προσθήκη Παραλήπτη Κρυφής Κοινοποίησης';
 $labels['addreplyto'] = 'Προσθήκη Απάντησης-Στο';
 $labels['addfollowupto'] = 'Προσθήκη Σε συνέχεια του';
+
+// mdn
 $labels['mdnrequest'] = 'Ο αποστολέας αυτού του μηνύματος, έχει ζητήσει να ειδοποιηθεί όταν θα το διαβάσετε. Θέλετε να επιτρέψετε την ενημέρωσή του;';
 $labels['receiptread'] = 'Αναφορά παράδοσης (διαβάστε την)';
 $labels['yourmessage'] = 'Αυτό είναι μια αναφορά παράδοσης για το μήνυμά σας';
 $labels['receiptnote'] = 'Σημείωση: Αυτή η αναφορά επιβεβαιώνει μόνο ότι το μήνυμά σας εμφανίστηκε στον υπολογιστή του παραλήπτη. Δεν επιβεβαιώνει ότι ο παραλήπτης έχει διαβάσει ή έχει κατανοήσει το περιεχόμενό του.';
-$labels['name'] = 'Εμφανιζόμενο όνομα';
-$labels['firstname'] = 'Όνομα';
-$labels['surname'] = 'Επώνυμο';
-$labels['middlename'] = 'Πατρώνυμο';
-$labels['nameprefix'] = 'Πρόθεμα';
-$labels['namesuffix'] = 'Κατάληξη';
-$labels['nickname'] = 'Ψευδώνυμο';
-$labels['jobtitle'] = 'Τίτλος εργασίας';
-$labels['department'] = 'Τμήμα';
-$labels['gender'] = 'Φύλο';
-$labels['maidenname'] = 'Πατρώνυμο';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Τηλέφωνο';
-$labels['address'] = 'Διεύθυνση';
-$labels['street'] = 'Οδός';
-$labels['locality'] = 'Πόλη';
-$labels['zipcode'] = 'ΤΚ';
-$labels['region'] = 'Νομός';
-$labels['country'] = 'Χώρα';
-$labels['birthday'] = 'Ημερ/νία Γέννησης';
-$labels['anniversary'] = 'Επέτειος';
-$labels['website'] = 'Ιστοσελίδα';
+
+// address boook
+$labels['name']         = 'Εμφανιζόμενο όνομα';
+$labels['firstname']    = 'Όνομα';
+$labels['surname']      = 'Επώνυμο';
+$labels['middlename']   = 'Πατρώνυμο';
+$labels['nameprefix']   = 'Πρόθεμα';
+$labels['namesuffix']   = 'Κατάληξη';
+$labels['nickname']     = 'Ψευδώνυμο';
+$labels['jobtitle']     = 'Τίτλος εργασίας';
+$labels['department']   = 'Τμήμα';
+$labels['gender']       = 'Φύλο';
+$labels['maidenname']   = 'Πατρώνυμο';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Τηλέφωνο';
+$labels['address']      = 'Διεύθυνση';
+$labels['street']       = 'Οδός';
+$labels['locality']     = 'Πόλη';
+$labels['zipcode']      = 'ΤΚ';
+$labels['region']       = 'Νομός';
+$labels['country']      = 'Χώρα';
+$labels['birthday']     = 'Ημερ/νία Γέννησης';
+$labels['anniversary']  = 'Επέτειος';
+$labels['website']      = 'Ιστοσελίδα';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Σημειώσεις';
-$labels['male'] = 'άνδρας';
+$labels['male']   = 'άνδρας';
 $labels['female'] = 'γυναίκα';
 $labels['manager'] = 'Υπεύθυνος';
 $labels['assistant'] = 'Υπάλληλος';
-$labels['typeassistant'] = 'Υπάλληλος';
 $labels['spouse'] = 'Σύζυγος';
 $labels['allfields'] = 'Όλα τα πεδία';
 $labels['search'] = 'Αναζήτηση';
 $labels['advsearch'] = 'Προηγμένη Αναζήτηση';
 $labels['advanced'] = 'Προχωρημένες ρυθμίσεις';
 $labels['other'] = 'Άλλα';
-$labels['typeother'] = 'Άλλα';
-$labels['typehome'] = 'Οικία';
-$labels['typework'] = 'Εργασία';
-$labels['typemobile'] = 'Κινητό';
-$labels['typemain'] = 'Κύρια';
-$labels['typehomefax'] = 'Φαξ οικίας';
-$labels['typeworkfax'] = 'Φαξ εργασίας';
-$labels['typecar'] = 'Αυτοκίνητο';
-$labels['typepager'] = 'Βομβητής';
-$labels['typevideo'] = 'Βίντεο';
-$labels['typehomepage'] = 'Αρχική Σελίδα';
+
+$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['addcontact'] = 'Προσθήκη νέας επαφής';
 $labels['editcontact'] = 'Επεξεργασία επαφής';
 $labels['contacts'] = 'Επαφές';
 $labels['contactproperties'] = 'Ιδιότητες επαφών';
 $labels['personalinfo'] = 'Προσωπικές πληροφορίες';
-$labels['edit'] = 'Επεξεργασία';
+
+$labels['edit']   = 'Επεξεργασία';
 $labels['cancel'] = 'Ακύρωση';
-$labels['save'] = 'Αποθήκευση';
+$labels['save']   = 'Αποθήκευση';
 $labels['delete'] = 'Διαγραφή';
 $labels['rename'] = 'Μετονομασία';
 $labels['addphoto'] = 'Προσθήκη';
 $labels['replacephoto'] = 'Αντικατάσταση';
 $labels['uploadphoto'] = 'Φόρτωση εικόνας';
-$labels['newcontact'] = 'Δημιουργία νέας κάρτας επαφής';
-$labels['deletecontact'] = 'Διαγραφή επιλεγμένων επαφών';
-$labels['composeto'] = 'Σύνθεση μηνύματος προς';
+
+$labels['newcontact']     = 'Δημιουργία νέας κάρτας επαφής';
+$labels['deletecontact']  = 'Διαγραφή επιλεγμένων επαφών';
+$labels['composeto']      = 'Σύνθεση μηνύματος προς';
 $labels['contactsfromto'] = 'Επαφή $from από $to έως $count';
-$labels['print'] = 'Εκτύπωση';
-$labels['export'] = 'Εξαγωγή';
-$labels['exportvcards'] = 'Εξαγωγή επαφών σε vCard';
+$labels['print']          = 'Εκτύπωση';
+$labels['export']         = 'Εξαγωγή';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Εξαγωγή επαφών σε vCard';
 $labels['newcontactgroup'] = 'Δημιουργία νέας Ομάδας επαφών';
-$labels['grouprename'] = 'Μετονομασία ομάδας';
-$labels['groupdelete'] = 'Διαγραφή ομάδας';
-$labels['previouspage'] = 'Εμφάνιση προηγούμενης σελίδας';
-$labels['firstpage'] = 'Εμφάνιση της πρώτης σελίδας';
-$labels['nextpage'] = 'Εμφάνιση επόμενης σελίδας';
-$labels['lastpage'] = 'Εμφάνιση της τελευταίας σελίδας';
+$labels['grouprename']    = 'Μετονομασία ομάδας';
+$labels['groupdelete']    = 'Διαγραφή ομάδας';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$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['importtarget'] = 'Προσθήκη νέων επαφών στο βιβλίο διευθύνσεων:';
 $labels['importreplace'] = 'Αντικατάσταση όλου του βιβλίου διευθύνσεων';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Ολοκληρώθηκε';
+
+// settings
 $labels['settingsfor'] = 'Ρυθμίσεις για';
 $labels['about'] = 'Σχετικά';
 $labels['preferences'] = 'Προτιμήσεις';
 $labels['userpreferences'] = 'Προτιμήσεις χρήστη';
 $labels['editpreferences'] = 'Επεξεργασία προτιμήσεων χρήστη';
+
 $labels['identities'] = 'Ταυτότητες';
 $labels['manageidentities'] = 'Διαχείριση ταυτοτήτων για αυτόν το λογαριασμό';
 $labels['newidentity'] = 'Νέα ταυτότητα';
+
 $labels['newitem'] = 'Νέο αντικείμενο';
 $labels['edititem'] = 'Επεξεργασία αντικειμένου';
+
 $labels['preferhtml'] = 'Προβολή σε HTML';
 $labels['defaultcharset'] = 'Προεπιλεγμένη κωδικοποίηση χαρακτήρων';
 $labels['htmlmessage'] = 'Μήνυμα σε μορφή HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Μορφή ημερομηνίας';
 $labels['timeformat'] = 'Μορφή ώρας';
 $labels['prettydate'] = 'Κομψή ημερ/νία';
-$labels['setdefault'] = 'Ορισμός ως προεπιλογή';
-$labels['autodetect'] = 'Αυτόματα';
-$labels['language'] = 'Γλώσσα';
-$labels['timezone'] = 'Ζώνη Ώρας';
-$labels['pagesize'] = 'Γραμμές ανά σελίδα';
+$labels['setdefault']  = 'Ορισμός ως προεπιλογή';
+$labels['autodetect']  = 'Αυτόματα';
+$labels['language']  = 'Γλώσσα';
+$labels['timezone']  = 'Ζώνη Ώρας';
+$labels['pagesize']  = 'Γραμμές ανά σελίδα';
 $labels['signature'] = 'Υπογραφή';
-$labels['dstactive'] = 'Θερινή ώρα';
+$labels['dstactive']  = 'Θερινή ώρα';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Δημιουργία μηνύματος σε μορφή HTML';
 $labels['htmlonreply'] = 'μόνο σε απάντηση μηνύματος μορφής HTML';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Υπογραφή HTML';
 $labels['previewpane'] = 'Εμφάνιση προεπισκόπησης';
 $labels['skin'] = 'Θέμα εμφάνισης';
@@ -341,14 +415,16 @@ $labels['readwhendeleted'] = 'Κατά τη διαγραφή του μηνύμα
 $labels['flagfordeletion'] = 'Αντί να το διαγράψεις, απλά και μόνο σημείωσέ το';
 $labels['skipdeleted'] = 'Να μην εμφανίζονται τα διαγραμμένα μηνύματα';
 $labels['deletealways'] = 'αν η μετακίνηση στον κάδο αποτύχει, διέγραψέ τα';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Να εμφανίζονται οι εικόνες που έχουν αποσταλεί σε συνδέσμους';
 $labels['fromknownsenders'] = 'από γνωστούς αποστολείς';
 $labels['always'] = 'πάντα';
 $labels['showinlineimages'] = 'Οι συνημμένες εικόνες να προβάλλονται στο τέλος του μηνήματος';
-$labels['autosavedraft'] = 'Να γίνεται αυτόματη αποθήκευση σαν πρόχειρο';
-$labels['everynminutes'] = 'κάθε $n λεπτό/α';
-$labels['never'] = 'ποτέ';
-$labels['immediately'] = 'άμεσα';
+$labels['autosavedraft']  = 'Να γίνεται αυτόματη αποθήκευση σαν πρόχειρο';
+$labels['everynminutes']  = 'κάθε $n λεπτό/α';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'ποτέ';
+$labels['immediately']  = 'άμεσα';
 $labels['messagesdisplaying'] = 'Προβολή Μηνυμάτων';
 $labels['messagescomposition'] = 'Δημιουργία Μηνυμάτων';
 $labels['mimeparamfolding'] = 'Ονόματα συνημμένων αρχείων';
@@ -368,6 +444,7 @@ $labels['maintenance'] = 'Συντήρηση';
 $labels['newmessage'] = 'Νέο Μήνυμα';
 $labels['signatureoptions'] = 'Επιλογές υπογραφής';
 $labels['whenreplying'] = 'Στις απαντήσεις';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'το νέο μήνυμα να είναι πάνω από το αρχικό';
 $labels['replybottomposting'] = 'το νέο μήνυμα να είναι κάτω από το αρχικό';
 $labels['replyremovesignature'] = 'Όταν το μήνυμα είναι απάντηση, να αφαιρείται η υπογραφή του αρχικού μηνύματος';
@@ -378,12 +455,12 @@ $labels['replysignaturepos'] = 'Όταν γίνεται απάντηση ή πρ
 $labels['belowquote'] = 'πάνω από την παράθεση';
 $labels['abovequote'] = 'κάτω από την παράθεση';
 $labels['insertsignature'] = 'Προσθήκη υπογραφής';
-$labels['previewpanemarkread'] = 'Στα μηνύματα που έγινε προεπισκόπηση να μαρκάρονται σαν αναγνωσμένα';
-$labels['afternseconds'] = 'μετά από $n δευτερόλεπτα';
+$labels['previewpanemarkread']  = 'Στα μηνύματα που έγινε προεπισκόπηση να μαρκάρονται σαν αναγνωσμένα';
+$labels['afternseconds']  = 'μετά από $n δευτερόλεπτα';
 $labels['reqmdn'] = 'Να γίνεται πάντα αίτηση για αναφορά απάντησης';
 $labels['reqdsn'] = 'Να γίνεται πάντα αίτηση για αναφορά παράδοσης';
 $labels['replysamefolder'] = 'Τα μηνύματα που είναι απαντήσεις να τοποθετούνται σε ξεχωριστό φάκελο';
-$labels['defaultaddressbook'] = 'Οι νέες επαφές να αποθηκεύονται στο επιλεγμένο βιβλίο διευθύνσεων';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Να μην χρησιμοποιούνται οι εναλλακτικές διευθύνσεις κατά την αυτόματη συμπλήρωση';
 $labels['listnamedisplay'] = 'Εμφάνιση επαφών ως';
 $labels['spellcheckbeforesend'] = 'Να γίνεται πάντα έλεγχος ορθογραφίας πριν την αποστολή του μηνύματος';
@@ -393,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Οι λέξεις που περιέχουν �
 $labels['spellcheckignorecaps'] = 'Οι λέξεις γραμμένες με ΚΕΦΑΛΑΙΑ να αγνοούνται';
 $labels['addtodict'] = 'Προσθήκη στο λεξικό';
 $labels['mailtoprotohandler'] = 'Καταχώρηση διαχείρισης πρωτοκόλλου δεσμών mailto:';
-$labels['folder'] = 'Φάκελος';
-$labels['foldername'] = 'Όνομα φακέλου';
-$labels['subscribed'] = 'Εγγεγραμμένος';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Φάκελος';
+$labels['folders']  = 'Φάκελοι';
+$labels['foldername']  = 'Όνομα φακέλου';
+$labels['subscribed']  = 'Εγγεγραμμένος';
 $labels['messagecount'] = 'Μηνύματα';
-$labels['create'] = 'Δημιουργία';
-$labels['createfolder'] = 'Δημιουργία νέου φακέλου';
-$labels['managefolders'] = 'Διαχείριση φακέλων';
+$labels['create']  = 'Δημιουργία';
+$labels['createfolder']  = 'Δημιουργία νέου φακέλου';
+$labels['managefolders']  = 'Διαχείριση φακέλων';
 $labels['specialfolders'] = 'Ειδικοί Φάκελοι';
 $labels['properties'] = 'Ιδιότητες';
 $labels['folderproperties'] = 'Ιδιότητες φακέλου';
@@ -409,22 +491,29 @@ $labels['info'] = 'Πληροφορίες';
 $labels['getfoldersize'] = 'Κάντε κλικ εδώ για να δείτε το μέγεθος του φακέλου';
 $labels['changesubscription'] = 'Κάντε κλικ εδώ για να αλλάξετε τη συνδρομή σας';
 $labels['foldertype'] = 'Τύπος φακέλου';
-$labels['personalfolder'] = 'Προσωπικός φάκελος';
-$labels['otherfolder'] = 'Φάκελοι άλλων χρηστών';
-$labels['sharedfolder'] = 'Κοινόχρηστος φάκελος';
+$labels['personalfolder']  = 'Προσωπικός φάκελος';
+$labels['otherfolder']  = 'Φάκελοι άλλων χρηστών';
+$labels['sharedfolder']  = 'Κοινόχρηστος φάκελος';
+
 $labels['sortby'] = 'Ταξινόμηση κατά';
-$labels['sortasc'] = 'Αύξουσα ταξινόμηση';
+$labels['sortasc']  = 'Αύξουσα ταξινόμηση';
 $labels['sortdesc'] = 'Φθίνουσα ταξινόμηση';
 $labels['undo'] = 'Αναίρεση';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Πρόσθετο';
 $labels['version'] = 'Έκδοση';
 $labels['source'] = 'Προέλευση';
 $labels['license'] = 'Άδεια χρήσης';
 $labels['support'] = 'Υποστήριξη';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Αγγλικά';
 $labels['westerneuropean'] = 'Δυτικής Ευρώπης';
@@ -444,3 +533,4 @@ $labels['japanese'] = 'Ιαπωνικά';
 $labels['korean'] = 'Κορεατικά';
 $labels['chinese'] = 'Κινεζικά';
 
+?>
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index de447af53..5be33f24a 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -2,33 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikos Keramidis <info@torus.gr>                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Έχει προκύψει κάποιο σφάλμα!';
-$messages['loginfailed'] = 'Είσοδος απέτυχε';
+$messages['errortitle']  = 'Έχει προκύψει κάποιο σφάλμα!';
+$messages['loginfailed']  = 'Είσοδος απέτυχε';
 $messages['cookiesdisabled'] = 'Ο περιηγητής σας (browser) δεν αποδέχεται cookies';
 $messages['sessionerror'] = 'Η συνεδρία σας είναι άκυρη ή έχει λήξει';
 $messages['storageerror'] = 'Η σύνδεση με το διακομιστή IMAP απέτυχε';
 $messages['servererror'] = 'Σφάλμα του εξυπηρετητή!';
 $messages['servererrormsg'] = 'Σφάλμα εξυπηρετητή: $msg';
 $messages['dberror'] = 'Σφάλμα βάσης δεδομένων!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Ο φάκελος είναι μόνο για ανάγνωση.';
 $messages['errornoperm'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Άρνηση άδειας';
 $messages['invalidrequest'] = 'Λανθασμένο αίτημα! Δεν αποθηκεύτηκαν δεδομένα.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Δε βρέθηκαν μηνύματα σε αυτή τη θυρίδα';
 $messages['loggedout'] = 'Έχετε τερματίσει επιτυχώς τη συνεδρία. Αντίο!';
 $messages['mailboxempty'] = 'Η θυρίδα είναι άδεια';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Φόρτωση...';
 $messages['uploading'] = 'Το αρχείο φορτώνεται...';
 $messages['uploadingmany'] = 'Φόρτωση αρχείων...';
@@ -55,22 +60,24 @@ $messages['errormoving'] = 'Το μήνυμα δε μπορούσε να μετ�
 $messages['errorcopying'] = 'Δεν είναι δυνατή η αντιγραφή του μηνύματος/των';
 $messages['errordeleting'] = 'Το μήνυμα δε μπορούσε να διαγραφεί';
 $messages['errormarking'] = 'Δεν έγινε επισήμανση στο μύνημα';
-$messages['deletecontactconfirm'] = 'Θέλετε να διαγράψετε τη συγκεκριμένη επαφή/ές;';
-$messages['deletegroupconfirm'] = 'Είστε βέβαιοι πως θέλετε να διαγράψετε την επιλεγμένη ομάδα;';
+$messages['deletecontactconfirm']  = 'Θέλετε να διαγράψετε τη συγκεκριμένη επαφή/ές;';
+$messages['deletegroupconfirm']  = 'Είστε βέβαιοι πως θέλετε να διαγράψετε την επιλεγμένη ομάδα;';
 $messages['deletemessagesconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο μήνυμα/τα;';
-$messages['deletefolderconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο φάκελο;';
-$messages['purgefolderconfirm'] = 'Θέλετε να διαγράψετε όλα τα μηνύματα στο συγκεκριμένο φάκελο;';
+$messages['deletefolderconfirm']  = 'Θέλετε να διαγράψετε το συγκεκριμένο φάκελο;';
+$messages['purgefolderconfirm']  = 'Θέλετε να διαγράψετε όλα τα μηνύματα στο συγκεκριμένο φάκελο;';
 $messages['contactdeleting'] = 'Διαγραφή επαφών...';
 $messages['groupdeleting'] = 'Διαγραφή ομάδας...';
 $messages['folderdeleting'] = 'Διαγραφή φακέλου';
 $messages['foldermoving'] = 'Μεταφορά φακέλου';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Η φόρμα δεν έχει συμπληρωθεί πλήρως';
 $messages['noemailwarning'] = 'Παρακαλώ εισάγετε έγκυρη διεύθυνση email';
-$messages['nonamewarning'] = 'Παρακαλώ εισάγετε όνομα';
+$messages['nonamewarning']  = 'Παρακαλώ εισάγετε όνομα';
 $messages['nopagesizewarning'] = 'Παρακαλώ εισάγετε μέγεθος σελίδας';
 $messages['nosenderwarning'] = 'Παρακαλώ εισάγετε την email διεύθυνση αποστολέα';
 $messages['norecipientwarning'] = 'Παρακαλώ εισάγεται τουλάχιστον έναν παραλήπτη';
-$messages['nosubjectwarning'] = 'Το πεδίο "Θέμα" είναι άδειο. Θέλετε να εισάγεται ένα τώρα;';
+$messages['nosubjectwarning']  = 'Το πεδίο "Θέμα" είναι άδειο. Θέλετε να εισάγεται ένα τώρα;';
 $messages['nobodywarning'] = 'Αποστολή μηνύματος χωρίς κείμενο;';
 $messages['notsentwarning'] = 'Το μήνυμα δεν έχει σταλεί. Θέλετε να το απορρίψετε;';
 $messages['noldapserver'] = 'Παρακαλώ επιλέξτε έναν LDAP διακομιστή για αναζήτηση';
@@ -83,6 +90,8 @@ $messages['searching'] = 'Αναζήτηση...';
 $messages['checking'] = 'Έλεγχος...';
 $messages['nospellerrors'] = 'Δε βρέθηκαν ορθογραφικά λάθη';
 $messages['folderdeleted'] = 'Ο φάκελος διαγράφηκε επιτυχώς';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
 $messages['folderpurged'] = 'Ο φάκελος καθαρίστηκε με επιτυχία.';
 $messages['folderexpunged'] = 'Ο φάκελος συμπιέστηκε με επιτυχία.';
 $messages['deletedsuccessfully'] = 'Διαγραφή Επιτυχώς';
@@ -110,8 +119,9 @@ $messages['selectimportfile'] = 'Επιλέξτε αρχείο για ανέβα
 $messages['addresswriterror'] = 'Η επιλεγμένη ατζέντα διευθύνσεων δεν είνα εγγράψιμη';
 $messages['contactaddedtogroup'] = 'Οι επαφές προστέθηκαν στην ομάδα με επιτυχία.';
 $messages['contactremovedfromgroup'] = 'Οι επαφές αφαιρέθηκαν από την ομάδα με επιτυχία.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Εισαγωγή, παρακαλώ περιμένετε...';
-$messages['importerror'] = 'Η εισαγωγή απέτυχε! Το αρχείο δεν είναι έγκυρο vcard αρχείο.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Εισήχθησαν $inserted επαφές με επιτυχία</b>';
 $messages['importconfirmskipped'] = '<b>Παραλήφθηκαν $skipped υπάρχοντα αντικείμενα</b>';
 $messages['opnotpermitted'] = 'Η λειτουργία δεν επιτρέπεται!';
@@ -130,4 +140,30 @@ $messages['maxgroupmembersreached'] = 'Ο αριθμός των μελών τη�
 $messages['internalerror'] = 'Προέκυψε ένα εσωτερικό σφάλμα. Παρακαλώ δοκιμάστε πάλι.';
 $messages['contactdelerror'] = 'Δεν είναι δυνατή η διαγραφή της επαφής/ων';
 $messages['contactdeleted'] = 'Η επαφή/ές διαγράφηκαν με επιτυχία.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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 50b4769ae..fb9ebe383 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Welcome to $product';
-$labels['username'] = 'Username';
-$labels['password'] = 'Password';
-$labels['server'] = 'Server';
-$labels['login'] = 'Login';
-$labels['logout'] = 'Logout';
-$labels['mail'] = 'Mail';
+
+// login page
+$labels['welcome']   = 'Welcome to $product';
+$labels['username']  = 'Username';
+$labels['password']  = 'Password';
+$labels['server']    = 'Server';
+$labels['login']     = 'Login';
+
+// taskbar
+$labels['logout']   = 'Logout';
+$labels['mail']     = 'Mail';
 $labels['settings'] = 'Settings';
 $labels['addressbook'] = 'Address Book';
-$labels['inbox'] = 'Inbox';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'Drafts';
-$labels['sent'] = 'Sent';
-$labels['trash'] = 'Deleted Items';
-$labels['junk'] = 'Junk';
+$labels['sent']   = 'Sent';
+$labels['trash']  = 'Deleted Items';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Subject';
-$labels['from'] = 'From';
-$labels['to'] = 'To';
-$labels['cc'] = 'Copy';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'From';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'To';
+$labels['cc']      = 'Copy';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Date';
-$labels['size'] = 'Size';
+$labels['date']    = 'Date';
+$labels['size']    = 'Size';
 $labels['priority'] = 'Priority';
 $labels['organization'] = 'Company';
 $labels['readstatus'] = 'Read status';
 $labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Folders';
-$labels['folders'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 $labels['fromtoshort'] = '$from – $to of $count';
-$labels['copy'] = 'Copy';
-$labels['move'] = 'Move';
-$labels['moveto'] = 'Move to...';
+
+$labels['copy']     = 'Copy';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
+
 $labels['addtoaddressbook'] = 'Add to address book';
+
+// weekdays short
 $labels['sun'] = 'Sun';
 $labels['mon'] = 'Mon';
 $labels['tue'] = 'Tue';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Wed';
 $labels['thu'] = 'Thu';
 $labels['fri'] = 'Fri';
 $labels['sat'] = 'Sat';
-$labels['sunday'] = 'Sunday';
-$labels['monday'] = 'Monday';
-$labels['tuesday'] = 'Tuesday';
+
+// weekdays long
+$labels['sunday']    = 'Sunday';
+$labels['monday']    = 'Monday';
+$labels['tuesday']   = 'Tuesday';
 $labels['wednesday'] = 'Wednesday';
-$labels['thursday'] = 'Thursday';
-$labels['friday'] = 'Friday';
-$labels['saturday'] = 'Saturday';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'January';
-$labels['longfeb'] = 'February';
-$labels['longmar'] = 'March';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'June';
-$labels['longjul'] = 'July';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'October';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Thursday';
+$labels['friday']    = 'Friday';
+$labels['saturday']  = 'Saturday';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Today';
-$labels['refresh'] = 'Refresh';
-$labels['checkmail'] = 'Check for new messages';
-$labels['compose'] = 'Compose';
-$labels['writenewmessage'] = 'Create a new message';
-$labels['reply'] = 'Reply';
-$labels['replytomessage'] = 'Reply to sender';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Check for new messages';
+$labels['compose']          = 'Compose';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Reply to sender';
 $labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
-$labels['replyall'] = 'Reply all';
-$labels['replylist'] = 'Reply list';
-$labels['forward'] = 'Forward';
-$labels['forwardinline'] = 'Forward inline';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Forward as attachment';
-$labels['forwardmessage'] = 'Forward the message';
-$labels['deletemessage'] = 'Delete message';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Delete message';
 $labels['movemessagetotrash'] = 'Move message to "Deleted Items';
-$labels['printmessage'] = 'Print this message';
-$labels['previousmessage'] = 'Show the previous message';
-$labels['firstmessage'] = 'Show the first message';
-$labels['nextmessage'] = 'Show the next message';
-$labels['lastmessage'] = 'Show the last message';
-$labels['backtolist'] = 'Back to message list';
-$labels['viewsource'] = 'Show source';
-$labels['mark'] = 'Mark';
-$labels['markmessages'] = 'Mark messages';
-$labels['markread'] = 'As read';
-$labels['markunread'] = 'As unread';
-$labels['markflagged'] = 'As flagged';
-$labels['markunflagged'] = 'As unflagged';
-$labels['moreactions'] = 'More actions...';
-$labels['more'] = 'More';
-$labels['back'] = 'Back';
-$labels['options'] = 'Options';
+$labels['printmessage']     = 'Print this message';
+$labels['previousmessage']  = 'Show the previous message';
+$labels['firstmessage']     = 'Show the first message';
+$labels['nextmessage']      = 'Show the next message';
+$labels['lastmessage']      = 'Show the last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
-$labels['nonesort'] = 'None';
 $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Expand All';
 $labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'Collapse All';
 $labels['threaded'] = 'Threaded';
+
 $labels['autoexpand_threads'] = 'Expand message threads';
 $labels['do_expand'] = 'all threads';
 $labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'From/To';
 $labels['flag'] = 'Flag';
 $labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'None';
 $labels['sentdate'] = 'Sent date';
 $labels['arrival'] = 'Arrival date';
 $labels['asc'] = 'ascending';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'List columns';
 $labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
+
 $labels['quota'] = 'Disk usage';
-$labels['unknown'] = 'unknown';
-$labels['unlimited'] = 'unlimited';
-$labels['quicksearch'] = 'Quick search';
-$labels['resetsearch'] = 'Reset search';
-$labels['searchmod'] = 'Search modifiers';
-$labels['msgtext'] = 'Entire message';
+$labels['unknown']  = 'unknown';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['editasnew'] = 'Edit as new';
-$labels['send'] = 'Send';
-$labels['sendmessage'] = 'Send now';
-$labels['savemessage'] = 'Save this draft';
-$labels['addattachment'] = 'Attach a file';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Editor type';
-$labels['returnreceipt'] = 'Return receipt';
-$labels['dsn'] = 'Delivery status notification';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send now';
+$labels['savemessage']    = 'Save this draft';
+$labels['addattachment']  = 'Attach a file';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
 $labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Original Message';
-$labels['editidents'] = 'Edit identities';
-$labels['spellcheck'] = 'Spell';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
-$labels['revertto'] = 'Revert to';
+$labels['revertto']      = 'Revert to';
+
 $labels['attach'] = 'Attach';
 $labels['attachments'] = 'Attachments';
 $labels['upload'] = 'Upload';
 $labels['uploadprogress'] = '$percent ($current from $total)';
-$labels['close'] = 'Close';
-$labels['messageoptions'] = 'Message options...';
-$labels['low'] = 'Low';
-$labels['lowest'] = 'Lowest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'High';
+$labels['close']  = 'Close';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
 $labels['highest'] = 'Highest';
-$labels['nosubject'] = '(no subject)';
+
+$labels['nosubject']  = '(no subject)';
 $labels['showimages'] = 'Display images';
 $labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft'] = 'This is a draft message.';
-$labels['andnmore'] = '$nr more...';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
 $labels['togglemoreheaders'] = 'Show more message headers';
 $labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
 $labels['savesentmessagein'] = 'Save sent message in';
 $labels['dontsave'] = 'don\'t save';
 $labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Add Cc';
 $labels['addbcc'] = 'Add Bcc';
 $labels['addreplyto'] = 'Add Reply-To';
 $labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
 $labels['receiptread'] = 'Return Receipt (read)';
 $labels['yourmessage'] = 'This is a Return Receipt for your message';
 $labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
-$labels['name'] = 'Display Name';
-$labels['firstname'] = 'First Name';
-$labels['surname'] = 'Last Name';
-$labels['middlename'] = 'Middle Name';
-$labels['nameprefix'] = 'Title';
-$labels['namesuffix'] = 'Suffix';
-$labels['nickname'] = 'Nickname';
-$labels['jobtitle'] = 'Job Title';
-$labels['department'] = 'Department';
-$labels['gender'] = 'Gender';
-$labels['maidenname'] = 'Maiden Name';
-$labels['email'] = 'Email';
-$labels['phone'] = 'Phone';
-$labels['address'] = 'Address';
-$labels['street'] = 'Street';
-$labels['locality'] = 'City';
-$labels['zipcode'] = 'Post Code';
-$labels['region'] = 'State/Province';
-$labels['country'] = 'Country';
-$labels['birthday'] = 'Birthday';
-$labels['anniversary'] = 'Anniversary';
-$labels['website'] = 'Website';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'First Name';
+$labels['surname']      = 'Last Name';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Title';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Email';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'Post Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'male';
+$labels['male']   = 'male';
 $labels['female'] = 'female';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistant';
-$labels['typeassistant'] = 'Assistant';
 $labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'All fields';
 $labels['search'] = 'Search';
 $labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'Advanced';
 $labels['other'] = 'Other';
-$labels['typeother'] = 'Other';
-$labels['typehome'] = 'Home';
-$labels['typework'] = 'Work';
-$labels['typemobile'] = 'Mobile';
-$labels['typemain'] = 'Main';
-$labels['typehomefax'] = 'Home Fax';
-$labels['typeworkfax'] = 'Work Fax';
-$labels['typecar'] = 'Car';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Home Page';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profile';
+
 $labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'Personal information';
-$labels['edit'] = 'Edit';
+
+$labels['edit']   = 'Edit';
 $labels['cancel'] = 'Cancel';
-$labels['save'] = 'Save';
+$labels['save']   = 'Save';
 $labels['delete'] = 'Delete';
 $labels['rename'] = 'Rename';
 $labels['addphoto'] = 'Add';
 $labels['replacephoto'] = 'Replace';
 $labels['uploadphoto'] = 'Upload photo';
-$labels['newcontact'] = 'Create new contact card';
-$labels['deletecontact'] = 'Delete selected contacts';
-$labels['composeto'] = 'Compose mail to';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
 $labels['contactsfromto'] = 'Contacts $from to $to of $count';
-$labels['print'] = 'Print';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Export contacts in vCard format';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename'] = 'Rename group';
-$labels['groupdelete'] = 'Delete group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
 $labels['groupremoveselected'] = 'Remove selected contacts from group';
-$labels['previouspage'] = 'Show previous set';
-$labels['firstpage'] = 'Show first set';
-$labels['nextpage'] = 'Show next set';
-$labels['lastpage'] = 'Show last set';
+
+$labels['previouspage']   = 'Show previous set';
+$labels['firstpage']      = 'Show first set';
+$labels['nextpage']       = 'Show next set';
+$labels['lastpage']       = 'Show last set';
+
 $labels['group'] = 'Group';
 $labels['groups'] = 'Groups';
 $labels['personaladrbook'] = 'Personal Addresses';
+
 $labels['searchsave'] = 'Save search';
 $labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Import contacts';
 $labels['importfromfile'] = 'Import from file:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Replace the entire address book';
 $labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Settings for';
 $labels['about'] = 'About';
 $labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'User preferences';
 $labels['editpreferences'] = 'Edit user preferences';
+
 $labels['identities'] = 'Identities';
 $labels['manageidentities'] = 'Manage identities for this account';
 $labels['newidentity'] = 'New identity';
+
 $labels['newitem'] = 'New item';
 $labels['edititem'] = 'Edit item';
+
 $labels['preferhtml'] = 'Display HTML';
 $labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Date format';
 $labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Pretty dates';
-$labels['setdefault'] = 'Set default';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Language';
-$labels['timezone'] = 'Time zone';
-$labels['pagesize'] = 'Rows per page';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Language';
+$labels['timezone']  = 'Time zone';
+$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'Signature';
-$labels['dstactive'] = 'Summer time';
+$labels['dstactive']  = 'Summer time';
 $labels['showinextwin'] = 'Open message in a new window';
 $labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Compose HTML messages';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'always';
 $labels['showinlineimages'] = 'Display attached images below the message';
-$labels['autosavedraft'] = 'Automatically save draft';
-$labels['everynminutes'] = 'every $n minute(s)';
-$labels['refreshinterval'] = 'Refresh (check for new messages, etc.)';
-$labels['never'] = 'never';
-$labels['immediately'] = 'immediately';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'never';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Displaying Messages';
 $labels['messagescomposition'] = 'Composing Messages';
 $labels['mimeparamfolding'] = 'Attachment names';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'When replying or forwarding place signature';
 $labels['belowquote'] = 'below the quote';
 $labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread'] = 'Mark previewed messages as read';
-$labels['afternseconds'] = 'after $n seconds';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
 $labels['reqmdn'] = 'Always request a return receipt';
 $labels['reqdsn'] = 'Always request a delivery status notification';
 $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
 $labels['forwardmode'] = 'Messages forwarding';
 $labels['inline'] = 'inline';
 $labels['asattachment'] = 'as attachment';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Folder name';
-$labels['subscribed'] = 'Subscribed';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Folders';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Messages';
-$labels['create'] = 'Create';
-$labels['createfolder'] = 'Create new folder';
-$labels['managefolders'] = 'Manage folders';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
 $labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'Properties';
 $labels['folderproperties'] = 'Folder properties';
@@ -427,23 +491,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Click to get folder size';
 $labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'Folder Type';
-$labels['personalfolder'] = 'Private Folder';
-$labels['otherfolder'] = 'Other User\'s Folder';
-$labels['sharedfolder'] = 'Public Folder';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Sort by';
-$labels['sortasc'] = 'Sort ascending';
+$labels['sortasc']  = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';
 $labels['undo'] = 'Undo';
+
 $labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'Source';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'English';
 $labels['westerneuropean'] = 'Western European';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japanese';
 $labels['korean'] = 'Korean';
 $labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index fd7720748..f819147b0 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'An error occured.';
-$messages['loginfailed'] = 'Login failed.';
+$messages['errortitle']  = 'An error occured.';
+$messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
 $messages['sessionerror'] = 'Your session is invalid or has expired.';
 $messages['storageerror'] = 'Connection to IMAP server failed.';
@@ -57,11 +60,11 @@ $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['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?';
-$messages['deletegroupconfirm'] = 'Do you really want to delete the selected group?';
+$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)?';
-$messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
-$messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
 $messages['contactdeleting'] = 'Deleting contact(s)...';
 $messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Deleting folder...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Subscribing to folder...';
 $messages['folderunsubscribing'] = 'Unsubscribing from folder...';
 $messages['formincomplete'] = 'The form was not completely filled out.';
 $messages['noemailwarning'] = 'Please enter a valid email address.';
-$messages['nonamewarning'] = 'Please enter a name.';
+$messages['nonamewarning']  = 'Please enter a name.';
 $messages['nopagesizewarning'] = 'Please enter a page size.';
 $messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Please enter at least one recipient.';
-$messages['nosubjectwarning'] = 'The "Subject" field is empty. Would you like to enter one now?';
+$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
 $messages['nobodywarning'] = 'Send this message without any text?';
 $messages['notsentwarning'] = 'Your message has not been sent. Do you want to discard it?';
 $messages['noldapserver'] = 'Please select an LDAP server to search.';
@@ -163,3 +166,4 @@ $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/eo/labels.inc b/program/localization/eo/labels.inc
index 001021263..57d7c2e42 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Eliovir                                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bonvenon al $product';
-$labels['username'] = 'Uzantnomo';
-$labels['password'] = 'Pasvorto';
-$labels['server'] = 'Servilo';
-$labels['login'] = 'Ensaluti';
-$labels['logout'] = 'Elsaluti';
-$labels['mail'] = 'Retpoŝto';
+
+// login page
+$labels['welcome']   = 'Bonvenon al $product';
+$labels['username']  = 'Uzantnomo';
+$labels['password']  = 'Pasvorto';
+$labels['server']    = 'Servilo';
+$labels['login']     = 'Ensaluti';
+
+// taskbar
+$labels['logout']   = 'Elsaluti';
+$labels['mail']     = 'Retpoŝto';
 $labels['settings'] = 'Agordoj';
 $labels['addressbook'] = 'Adresaro';
-$labels['inbox'] = 'Ricevitujo';
+
+// mailbox names
+$labels['inbox']  = 'Ricevitujo';
 $labels['drafts'] = 'Malnetujo';
-$labels['sent'] = 'Senditujo';
-$labels['trash'] = 'Rubujo';
-$labels['junk'] = 'Spamujo';
+$labels['sent']   = 'Senditujo';
+$labels['trash']  = 'Rubujo';
+$labels['junk']   = 'Spamujo';
+
+// message listing
 $labels['subject'] = 'Temo';
-$labels['from'] = 'Sendanto';
-$labels['to'] = 'Ricevanto';
-$labels['cc'] = 'Kopio';
-$labels['bcc'] = 'Blindkopio';
+$labels['from']    = 'Sendanto';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Ricevanto';
+$labels['cc']      = 'Kopio';
+$labels['bcc']     = 'Blindkopio';
 $labels['replyto'] = 'Respondu-Al';
 $labels['followupto'] = 'Respondo-Al';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Grando';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Grando';
 $labels['priority'] = 'Prioritato';
 $labels['organization'] = 'Organizo';
 $labels['readstatus'] = 'Legis statuson';
 $labels['listoptions'] = 'List-agordoj...';
+
 $labels['mailboxlist'] = 'Dosierujoj';
-$labels['folders'] = 'Dosierujoj';
 $labels['messagesfromto'] = 'Mesaĝoj ekde $from ĝis $to de $count';
 $labels['threadsfromto'] = 'Fadenoj $from al $to de $count';
 $labels['messagenrof'] = 'Mesaĝo $nr-a de $count';
 $labels['fromtoshort'] = '$from - $to de $count';
-$labels['copy'] = 'Kopii';
-$labels['move'] = 'Movi';
-$labels['moveto'] = 'transloku al...';
+
+$labels['copy']     = 'Kopii';
+$labels['move']     = 'Movi';
+$labels['moveto']   = 'transloku al...';
 $labels['download'] = 'elŝutu';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Dosiernomo';
 $labels['filesize'] = 'Dosiergrando';
+
 $labels['addtoaddressbook'] = 'Aldonu al adresaro';
+
+// weekdays short
 $labels['sun'] = 'Dim';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Ĵaŭ';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Dimanĉo';
-$labels['monday'] = 'Lundo';
-$labels['tuesday'] = 'Mardo';
+
+// weekdays long
+$labels['sunday']    = 'Dimanĉo';
+$labels['monday']    = 'Lundo';
+$labels['tuesday']   = 'Mardo';
 $labels['wednesday'] = 'Merkredo';
-$labels['thursday'] = 'Ĵaŭdo';
-$labels['friday'] = 'Vendredo';
-$labels['saturday'] = 'Sabato';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Majo';
-$labels['longmay'] = 'Majo';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aŭg';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januaro';
-$labels['longfeb'] = 'Februaro';
-$labels['longmar'] = 'Marto';
-$labels['longapr'] = 'Aprilo';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Aŭgusto';
-$labels['longsep'] = 'Septembro';
-$labels['longoct'] = 'Oktobro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Decembro';
+$labels['thursday']  = 'Ĵaŭdo';
+$labels['friday']    = 'Vendredo';
+$labels['saturday']  = 'Sabato';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Majo';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aŭg';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januaro';
+$labels['longfeb']	= 'Februaro';
+$labels['longmar']	= 'Marto';
+$labels['longapr']	= 'Aprilo';
+$labels['longmay']	= 'Majo';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Aŭgusto';
+$labels['longsep']	= 'Septembro';
+$labels['longoct']	= 'Oktobro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Decembro';
+
 $labels['today'] = 'Hodiaŭ';
-$labels['refresh'] = 'Aktualigi';
-$labels['checkmail'] = 'Kontroli por novaj mesaĝoj';
-$labels['compose'] = 'Verki';
-$labels['writenewmessage'] = 'Verki novan mesaĝon';
-$labels['reply'] = 'Respondi';
-$labels['replytomessage'] = 'Respondi al sendanto';
+
+// toolbar buttons
+$labels['refresh']          = 'Aktualigi';
+$labels['checkmail']        = 'Kontroli por novaj mesaĝoj';
+$labels['compose']          = 'Verki';
+$labels['writenewmessage']  = 'Verki novan mesaĝon';
+$labels['reply']            = 'Respondi';
+$labels['replytomessage']   = 'Respondi al sendanto';
 $labels['replytoallmessage'] = 'Respondi al listo aŭ al sendanto kaj al ĉiuj ricevintoj';
-$labels['replyall'] = 'Respondi al ĉiuj';
-$labels['replylist'] = 'Respondi al listo';
-$labels['forward'] = 'Plusendi';
-$labels['forwardinline'] = 'Plusendu enmesaĝe';
+$labels['replyall']         = 'Respondi al ĉiuj';
+$labels['replylist']        = 'Respondi al listo';
+$labels['forward']          = 'Plusendi';
+$labels['forwardinline']    = 'Plusendu enmesaĝe';
 $labels['forwardattachment'] = 'Plusendu alfikse';
-$labels['forwardmessage'] = 'Plusendu mesaĝon';
-$labels['deletemessage'] = 'Forigu mesaĝon';
+$labels['forwardmessage']   = 'Plusendu mesaĝon';
+$labels['deletemessage']    = 'Forigu mesaĝon';
 $labels['movemessagetotrash'] = 'Transloku mesaĝon al rubujo';
-$labels['printmessage'] = 'Printu ĉi tiun mesaĝon';
-$labels['previousmessage'] = 'Montru antaŭan mesaĝon';
-$labels['firstmessage'] = 'Montru unuan mesaĝon';
-$labels['nextmessage'] = 'Montru sekvan mesaĝon';
-$labels['lastmessage'] = 'Montru lastan mesaĝon';
-$labels['backtolist'] = 'Reen al mesaĝo-listo';
-$labels['viewsource'] = 'Montri fonton';
-$labels['mark'] = 'Marki';
-$labels['markmessages'] = 'Marki mesaĝojn';
-$labels['markread'] = 'Kiel legita';
-$labels['markunread'] = 'Kiel nelegita';
-$labels['markflagged'] = 'kiel markita';
-$labels['markunflagged'] = 'kiel nemarkita';
-$labels['moreactions'] = 'Pliaj agoj';
-$labels['more'] = 'Pli';
-$labels['back'] = 'Malantaŭen';
-$labels['options'] = 'Agordoj';
+$labels['printmessage']     = 'Printu ĉi tiun mesaĝon';
+$labels['previousmessage']  = 'Montru antaŭan mesaĝon';
+$labels['firstmessage']     = 'Montru unuan mesaĝon';
+$labels['nextmessage']      = 'Montru sekvan mesaĝon';
+$labels['lastmessage']      = 'Montru lastan mesaĝon';
+$labels['backtolist']       = 'Reen al mesaĝo-listo';
+$labels['viewsource']       = 'Montri fonton';
+$labels['mark']             = 'Marki';
+$labels['markmessages']     = 'Marki mesaĝojn';
+$labels['markread']         = 'Kiel legita';
+$labels['markunread']       = 'Kiel nelegita';
+$labels['markflagged']      = 'kiel markita';
+$labels['markunflagged']    = 'kiel nemarkita';
+$labels['moreactions']      = 'Pliaj agoj';
+$labels['more']             = 'Pli';
+$labels['back']             = 'Malantaŭen';
+$labels['options']          = 'Agordoj';
+
 $labels['select'] = 'Elektu';
 $labels['all'] = 'Ĉion';
 $labels['none'] = 'Nenion';
-$labels['nonesort'] = 'Nenion';
 $labels['currpage'] = 'Nuna paĝo';
 $labels['unread'] = 'Nelegitan';
 $labels['flagged'] = 'Markita';
 $labels['unanswered'] = 'Nerespondita';
 $labels['deleted'] = 'Forigita';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inversigu';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listo';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'Malfaldi ĉion';
 $labels['expand-unread'] = 'Malfaldi Nelegitajn';
 $labels['collapse-all'] = 'Faldi ĉion';
 $labels['threaded'] = 'Fadenita';
+
 $labels['autoexpand_threads'] = 'Malfaldi mesaĝ-fadenojn';
 $labels['do_expand'] = 'Ĉiuj fadenoj';
 $labels['expand_only_unread'] = 'Nur kun nelegitaj mesaĝoj';
 $labels['fromto'] = 'De/Al';
 $labels['flag'] = 'Marko';
 $labels['attachment'] = 'Aldonaĵo';
+$labels['nonesort'] = 'Nenion';
 $labels['sentdate'] = 'Send-dato';
 $labels['arrival'] = 'Ricev-dato';
 $labels['asc'] = 'kreskante';
@@ -155,152 +186,217 @@ $labels['desc'] = 'malkreskante';
 $labels['listcolumns'] = 'List-rubrikoj';
 $labels['listsorting'] = 'Ordig-rubriko';
 $labels['listorder'] = 'Ordig-ordo';
+$labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'Dosierujo-agoj';
 $labels['compact'] = 'Kompakta';
 $labels['empty'] = 'Malplena';
+
 $labels['quota'] = 'Diskuzo';
-$labels['unknown'] = 'nekonata';
-$labels['unlimited'] = 'senlima';
-$labels['quicksearch'] = 'Rapida serĉo';
-$labels['resetsearch'] = 'Vakigu serĉon';
-$labels['searchmod'] = 'Serĉ-opcioj';
-$labels['msgtext'] = 'Tuta mesaĝo';
+$labels['unknown']  = 'nekonata';
+$labels['unlimited']  = 'senlima';
+
+$labels['quicksearch']  = 'Rapida serĉo';
+$labels['resetsearch']  = 'Vakigu serĉon';
+$labels['searchmod']  = 'Serĉ-opcioj';
+$labels['msgtext']  = 'Tuta mesaĝo';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elŝutu (.eml)';
-$labels['editasnew'] = 'Redaktu kiel nova';
-$labels['sendmessage'] = 'Sendu mesaĝon';
-$labels['savemessage'] = 'Savu ĉi tiun malneton';
-$labels['addattachment'] = 'Alfiksu dosieron';
-$labels['charset'] = 'Karaktraro';
-$labels['editortype'] = 'Speco de redaktilo';
-$labels['returnreceipt'] = 'Return receipt';
-$labels['dsn'] = 'Ricev-status-konfirmo';
+
+// message compose
+$labels['editasnew']      = 'Redaktu kiel nova';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Sendu mesaĝon';
+$labels['savemessage']    = 'Savu ĉi tiun malneton';
+$labels['addattachment']  = 'Alfiksu dosieron';
+$labels['charset']        = 'Karaktraro';
+$labels['editortype']     = 'Speco de redaktilo';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Ricev-status-konfirmo';
 $labels['mailreplyintro'] = 'Je $date, $sender skribis:';
 $labels['originalmessage'] = 'Originala mesaĝo';
-$labels['editidents'] = 'Redaktu identojn';
-$labels['spellcheck'] = 'Literumu';
+
+$labels['editidents']    = 'Redaktu identojn';
+$labels['spellcheck']    = 'Literumu';
 $labels['checkspelling'] = 'Kontrolu literumadon';
 $labels['resumeediting'] = 'Rekomencu redaktadon';
-$labels['revertto'] = 'Reiru al';
+$labels['revertto']      = 'Reiru al';
+
 $labels['attach'] = 'Alfiksu';
 $labels['attachments'] = 'Alfiksaĵoj';
 $labels['upload'] = 'Alŝutu';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Fermi';
-$labels['messageoptions'] = 'Mesaĝ-agordoj...';
-$labels['low'] = 'Malalta';
-$labels['lowest'] = 'Plej malalta';
-$labels['normal'] = 'Normala';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Fermi';
+$labels['messageoptions']  = 'Mesaĝ-agordoj...';
+
+$labels['low']     = 'Malalta';
+$labels['lowest']  = 'Plej malalta';
+$labels['normal']  = 'Normala';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Plej alta';
-$labels['nosubject'] = '(sen temo)';
+
+$labels['nosubject']  = '(sen temo)';
 $labels['showimages'] = 'Montru bildojn';
 $labels['alwaysshow'] = 'Ĉiam montru bildojn de $sender';
-$labels['isdraft'] = 'Ĉi-mesaĝo estas malneto';
+$labels['isdraft']    = 'Ĉi-mesaĝo estas malneto';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plata teksto';
 $labels['savesentmessagein'] = 'Konservu senditan mesaĝon en';
 $labels['dontsave'] = 'Ne konservu';
 $labels['maxuploadsize'] = 'Maksimuma permesata dosier-grando estas $size';
+
 $labels['addcc'] = 'Aldonu kopi-ricevanton';
 $labels['addbcc'] = 'Aldonu blindan kopi-ricevanton';
 $labels['addreplyto'] = 'Aldonu Respondu-Al';
 $labels['addfollowupto'] = 'Aldonu Respondu-Al';
+
+// mdn
 $labels['mdnrequest'] = 'La sendinto de ĉi tiu mesaĝo petis sciigon de kiam vi legas ĝin. Ĉu volas sciigi la sendinton?';
 $labels['receiptread'] = 'Legokonfirmo';
 $labels['yourmessage'] = 'Jen estas legokonfirmo de via mesaĝo';
 $labels['receiptnote'] = 'Notu: Ĉi tiu konfirmo nur asertas ke la mesaĝo estis malfermita je la komputilo de la ricevinto. Ne estas garantio ke la ricevinto legis aŭ komprenis la enhavon.';
-$labels['name'] = 'Nomo';
-$labels['firstname'] = 'Antaŭnomo';
-$labels['surname'] = 'Familia nomo';
-$labels['middlename'] = 'Meza Nomo';
-$labels['nameprefix'] = 'Prefikso';
-$labels['namesuffix'] = 'Sufikso';
-$labels['nickname'] = 'Kromnomo';
-$labels['jobtitle'] = 'Postena titolo';
-$labels['department'] = 'Departemento';
-$labels['gender'] = 'Sekso';
-$labels['email'] = 'Retpoŝto';
-$labels['phone'] = 'Telefono';
-$labels['address'] = 'Adreso';
-$labels['street'] = 'Strato';
-$labels['locality'] = 'Urbo';
-$labels['zipcode'] = 'Poŝt-kodo';
-$labels['region'] = 'Ŝtato/Provinco';
-$labels['country'] = 'Lando';
-$labels['birthday'] = 'Naskiĝdato';
-$labels['anniversary'] = 'Datreveno';
-$labels['website'] = 'Retejo';
+
+// address boook
+$labels['name']         = 'Nomo';
+$labels['firstname']    = 'Antaŭnomo';
+$labels['surname']      = 'Familia nomo';
+$labels['middlename']   = 'Meza Nomo';
+$labels['nameprefix']   = 'Prefikso';
+$labels['namesuffix']   = 'Sufikso';
+$labels['nickname']     = 'Kromnomo';
+$labels['jobtitle']     = 'Postena titolo';
+$labels['department']   = 'Departemento';
+$labels['gender']       = 'Sekso';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Retpoŝto';
+$labels['phone']        = 'Telefono';
+$labels['address']      = 'Adreso';
+$labels['street']       = 'Strato';
+$labels['locality']     = 'Urbo';
+$labels['zipcode']      = 'Poŝt-kodo';
+$labels['region']       = 'Ŝtato/Provinco';
+$labels['country']      = 'Lando';
+$labels['birthday']     = 'Naskiĝdato';
+$labels['anniversary']  = 'Datreveno';
+$labels['website']      = 'Retejo';
 $labels['instantmessenger'] = 'TM';
 $labels['notes'] = 'Notoj';
-$labels['male'] = 'viro';
+$labels['male']   = 'viro';
 $labels['female'] = 'virino';
 $labels['manager'] = 'Estro';
 $labels['assistant'] = 'Asistanto';
-$labels['typeassistant'] = 'Asistanto';
 $labels['spouse'] = 'Edz(in)o';
 $labels['allfields'] = 'Ĉiuj kampoj';
 $labels['search'] = 'Serĉu';
 $labels['advsearch'] = 'Detala sercô';
 $labels['advanced'] = 'Altnivela';
 $labels['other'] = 'Alia';
-$labels['typeother'] = 'Alia';
-$labels['typehome'] = 'Hejmo';
-$labels['typework'] = 'Laboro';
-$labels['typemobile'] = 'Poŝtelefono';
-$labels['typemain'] = 'Ĉefa';
-$labels['typehomefax'] = 'Hejma faksilo';
-$labels['typeworkfax'] = 'Laboreja faksilo';
-$labels['typecar'] = 'Aŭtomobilo';
-$labels['typepager'] = 'Televokilo';
-$labels['typehomepage'] = 'Hejmpaĝo';
+
+$labels['typehome']   = 'Hejmo';
+$labels['typework']   = 'Laboro';
+$labels['typeother']  = 'Alia';
+$labels['typemobile']  = 'Poŝtelefono';
+$labels['typemain']  = 'Ĉefa';
+$labels['typehomefax']  = 'Hejma faksilo';
+$labels['typeworkfax']  = 'Laboreja faksilo';
+$labels['typecar']  = 'Aŭtomobilo';
+$labels['typepager']  = 'Televokilo';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistanto';
+$labels['typehomepage']  = 'Hejmpaĝo';
 $labels['typeblog'] = 'Blogo';
 $labels['typeprofile'] = 'Profilo';
+
 $labels['addfield'] = 'Aldonu kampon...';
 $labels['addcontact'] = 'Aldonu kontakton';
 $labels['editcontact'] = 'Redaktu kontakton';
 $labels['contacts'] = 'Kontaktoj';
 $labels['contactproperties'] = 'Kontakt-informoj';
 $labels['personalinfo'] = 'Personaj informoj';
-$labels['edit'] = 'Redaktu';
+
+$labels['edit']   = 'Redaktu';
 $labels['cancel'] = 'Nuligi';
-$labels['save'] = 'Konservi';
+$labels['save']   = 'Konservi';
 $labels['delete'] = 'Forigi';
 $labels['rename'] = 'Alinomu';
 $labels['addphoto'] = 'Aldonu';
 $labels['replacephoto'] = 'Anstataŭu';
 $labels['uploadphoto'] = 'Alŝutu bildon';
-$labels['newcontact'] = 'Kreu novan kontakton';
-$labels['deletecontact'] = 'Forigu elektatajn kontaktojn';
-$labels['composeto'] = 'Verku mesaĝon al';
+
+$labels['newcontact']     = 'Kreu novan kontakton';
+$labels['deletecontact']  = 'Forigu elektatajn kontaktojn';
+$labels['composeto']      = 'Verku mesaĝon al';
 $labels['contactsfromto'] = 'Kontaktoj ekde $from ĝis $to de $count';
-$labels['print'] = 'Presi';
-$labels['export'] = 'Elporti';
-$labels['previouspage'] = 'Montru auntaŭan';
-$labels['firstpage'] = 'Montru unuan';
-$labels['nextpage'] = 'Montru sekvan';
-$labels['lastpage'] = 'Montru lastan';
+$labels['print']          = 'Presi';
+$labels['export']         = 'Elporti';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Montru auntaŭan';
+$labels['firstpage']      = 'Montru unuan';
+$labels['nextpage']       = 'Montru sekvan';
+$labels['lastpage']       = 'Montru lastan';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grupoj';
 $labels['personaladrbook'] = 'Persona Adresoj';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Preferoj de';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferoj';
 $labels['userpreferences'] = 'Uzant-preferoj';
 $labels['editpreferences'] = 'Redaktu uzant-preferojn';
+
 $labels['identities'] = 'Identoj';
 $labels['manageidentities'] = 'Administru identojn de ĉi tiu konto';
 $labels['newidentity'] = 'Nova idento';
+
 $labels['newitem'] = 'Nova ero';
 $labels['edititem'] = 'Redaktu eron';
+
 $labels['preferhtml'] = 'Montru HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Mesaĝo';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Agrablaj Datoj';
-$labels['setdefault'] = 'Agordu kiel norma';
-$labels['language'] = 'Lingvo';
-$labels['timezone'] = 'Tempzono';
-$labels['pagesize'] = 'Mesaĝoj po paĝo';
+$labels['setdefault']  = 'Agordu kiel norma';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Lingvo';
+$labels['timezone']  = 'Tempzono';
+$labels['pagesize']  = 'Mesaĝoj po paĝo';
 $labels['signature'] = 'Subskribo';
-$labels['dstactive'] = 'Taglumsavado';
+$labels['dstactive']  = 'Taglumsavado';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Uzado de HTML-redaktilo';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML subskribo';
 $labels['previewpane'] = 'Montru antaŭrigardejon';
 $labels['skin'] = 'Interfaco-etoso';
@@ -312,22 +408,129 @@ $labels['mailboxview'] = 'Ricevitujo vido';
 $labels['mdnrequests'] = 'Sendanto-sciigoj';
 $labels['askuser'] = 'demandu';
 $labels['autosend'] = 'sendu aŭtomate';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'malatentu';
 $labels['readwhendeleted'] = 'Marku mesaĝon kiel legita kiam forigata';
 $labels['flagfordeletion'] = 'Marku mesaĝon kiel forigita anstataŭ forigi';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
 $labels['showinlineimages'] = 'Montru alfiksitajn bildojn sub la mesaĝo';
-$labels['autosavedraft'] = 'Aŭtomate savu malneton';
-$labels['never'] = 'neniam';
+$labels['autosavedraft']  = 'Aŭtomate savu malneton';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'neniam';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Mesaĝoj vidigante';
 $labels['messagescomposition'] = 'Mesaĝo-verkado';
-$labels['folder'] = 'Dosierujo';
-$labels['foldername'] = 'Dosierujo-nomo';
-$labels['subscribed'] = 'Abonata';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Dosierujo';
+$labels['folders']  = 'Dosierujoj';
+$labels['foldername']  = 'Dosierujo-nomo';
+$labels['subscribed']  = 'Abonata';
 $labels['messagecount'] = 'Mesaĝoj';
-$labels['create'] = 'Krei';
-$labels['createfolder'] = 'Kreu novan dosierujon';
-$labels['managefolders'] = 'Administru dosierujon';
+$labels['create']  = 'Krei';
+$labels['createfolder']  = 'Kreu novan dosierujon';
+$labels['managefolders']  = 'Administru dosierujon';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Ordigu per';
-$labels['sortasc'] = 'Ordigu kreskante';
+$labels['sortasc']  = 'Ordigu kreskante';
 $labels['sortdesc'] = 'Ordigu malkreskante';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 038249fb0..32771733d 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -2,33 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andreas van Cranenburgh <andreas@unstable.nl>                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Eraro okazis!';
-$messages['loginfailed'] = 'Malsukcesis ensaluti';
+$messages['errortitle']  = 'Eraro okazis!';
+$messages['loginfailed']  = 'Malsukcesis ensaluti';
 $messages['cookiesdisabled'] = 'Via foliumilo ne akceptas kuketojn';
 $messages['sessionerror'] = 'Via seanco estas nevalida aŭ finita';
 $messages['storageerror'] = 'Konekto kun IMAP-servilo malsukcesis';
 $messages['servererror'] = 'Servil-eraro!';
 $messages['servererrormsg'] = 'Servil-eraro: $msg';
 $messages['dberror'] = 'Datumbaz-eraro!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Ne povis fari agon. Dosierujo estas nurlega';
 $messages['errornoperm'] = 'Ne povis fari agon. Ne havas permeson.';
 $messages['invalidrequest'] = 'Nevalida peto';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Neniu mesaĝo en ĉi tiu dosierujo';
 $messages['loggedout'] = 'Vi sukcese finis la seancon. Ĝis!';
 $messages['mailboxempty'] = 'Dosierujo estas malplena';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Ŝarganta...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ŝarganta datumojn...';
 $messages['checkingmail'] = 'Kontrolanta, ĉu  novaj mesaĝoj...';
 $messages['sendingmessage'] = 'Sedanta mesaĝon...';
@@ -38,34 +46,54 @@ $messages['messagesaved'] = 'Mesaĝo savita en Malnetujo';
 $messages['successfullysaved'] = 'Sukcese savis';
 $messages['addedsuccessfully'] = 'Sukcese aldonis kontakton al adresaro';
 $messages['contactexists'] = 'Kontakto kun ĉi tiu adreso jam ekzistas';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Por protekti vian privatecon, foraj bildoj estas blokitaj en ĉi tiu mesaĝo.';
 $messages['encryptedmessage'] = 'Ĉi tiu mesaĝo estas ĉifrata kaj ne estas montrebla. Pardonu!';
 $messages['nocontactsfound'] = 'Trovis neniun kontakton';
 $messages['contactnotfound'] = 'La petita kontakto ne trovis';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Ne sukcesis sendi mesaĝon';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Okazis eraro dum savo de mesaĝo';
 $messages['errormoving'] = 'Ne povis transloki mesaĝon';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Ne povis forigi mesaĝon';
-$messages['deletecontactconfirm'] = 'Ĉu vi vere volas forigi la elektata(j)n kontakto(j)n?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ĉu vi vere volas forigi la elektata(j)n kontakto(j)n?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ĉu vi vere volas forigi la elektata(j)n mesaĝo(j)n?';
-$messages['deletefolderconfirm'] = 'Ĉu vi vere volas forigi la elektatan dosierujon?';
-$messages['purgefolderconfirm'] = 'Ĉu vi vere volas forigi ĉiun mesaĝon el ĉi tiu dosierujo?';
+$messages['deletefolderconfirm']  = 'Ĉu vi vere volas forigi la elektatan dosierujon?';
+$messages['purgefolderconfirm']  = 'Ĉu vi vere volas forigi ĉiun mesaĝon el ĉi tiu dosierujo?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'La formularo ne estis kompletigita';
 $messages['noemailwarning'] = 'Bonvolu enmeti validan retpoŝt-adreson';
-$messages['nonamewarning'] = 'Bonvulu enmeti nomon';
+$messages['nonamewarning']  = 'Bonvulu enmeti nomon';
 $messages['nopagesizewarning'] = 'Bonvolu enmeti paĝ-grando';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Bonvolu enmeti minumume unu ricevonto';
-$messages['nosubjectwarning'] = 'La temkampo estas malplena. Ĉu vi volas skribi temon nun?';
+$messages['nosubjectwarning']  = 'La temkampo estas malplena. Ĉu vi volas skribi temon nun?';
 $messages['nobodywarning'] = 'Ĉu sendi ĉi tiun mesaĝon sen teksto?';
 $messages['notsentwarning'] = 'Mesaĝo ne estas sendita. Ĉu vi volas forigi vian mesaĝon?';
 $messages['noldapserver'] = 'Bonvolu elekti ldap-servilon por serĉado';
 $messages['nosearchname'] = 'Bonvolu enmeti kontakt-nomon aŭ retpoŝt-adreson.';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'trovis $nr mesaĝojn';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Serĉo donis nenion';
 $messages['searching'] = 'Serĉanta...';
 $messages['checking'] = 'Kontrolanta...';
 $messages['nospellerrors'] = 'Neniujn literumada eraro trovita';
 $messages['folderdeleted'] = 'Forigis dosierujon sukcese';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Sukcese forigis';
 $messages['converting'] = 'Foriganta formatan de mesaĝo...';
 $messages['messageopenerror'] = 'Ne povis ŝargi mesaĝon de servilo';
@@ -76,8 +104,66 @@ $messages['copyerror'] = 'Ne povis kopii ajn adreson';
 $messages['sourceisreadonly'] = 'Ĉi tiu adres-fonto estas nurlegebla';
 $messages['errorsavingcontact'] = 'Ne povis savi la kontakt-adreson';
 $messages['movingmessage'] = 'Translokanta mesaĝon...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Sukcese sendis konfirmon';
 $messages['errorsendingreceipt'] = 'Ne povis sendi konfirmon';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Vi ne povas forigi ĉi tiun identon, ĉar ĝi estas la lasta';
 $messages['forbiddencharacter'] = 'Dosierujo-nomo enhavas malpermesitan karaktron';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 1f8324954..d6760ac97 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -2,53 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienvenido a $product';
-$labels['username'] = 'Nombre de usuario';
-$labels['password'] = 'Contraseña';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Cerrar sesión';
-$labels['mail'] = 'Correo';
+
+// login page
+$labels['welcome']   = 'Bienvenido a $product';
+$labels['username']  = 'Nombre de usuario';
+$labels['password']  = 'Contraseña';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Cerrar sesión';
+$labels['mail']     = 'Correo';
 $labels['settings'] = 'Configuración';
 $labels['addressbook'] = 'Contactos';
-$labels['inbox'] = 'Entrada';
+
+// mailbox names
+$labels['inbox']  = 'Entrada';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Papelera';
-$labels['junk'] = 'Basura';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Papelera';
+$labels['junk']   = 'Basura';
+
+// message listing
 $labels['subject'] = 'Asunto';
-$labels['from'] = 'Remitente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Copia';
-$labels['bcc'] = 'Cco';
+$labels['from']    = 'Remitente';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Copia';
+$labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
-$labels['date'] = 'Fecha';
-$labels['size'] = 'Tamaño';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Fecha';
+$labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Carpetas';
-$labels['folders'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
+
 $labels['addtoaddressbook'] = 'Añadir a contactos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -56,173 +80,323 @@ $labels['wed'] = 'Mié';
 $labels['thu'] = 'Jue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Lunes';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Lunes';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Miércoles';
-$labels['thursday'] = 'Jueves';
-$labels['friday'] = 'Viernes';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Ene';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Mayo';
-$labels['longmay'] = 'Mayo';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dic';
-$labels['longjan'] = 'Enero';
-$labels['longfeb'] = 'Febrero';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Septiembre';
-$labels['longoct'] = 'Octubre';
-$labels['longnov'] = 'Noviembre';
-$labels['longdec'] = 'Diciembre';
+$labels['thursday']  = 'Jueves';
+$labels['friday']    = 'Viernes';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Ene';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Mayo';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dic';
+
+// months long
+$labels['longjan']	= 'Enero';
+$labels['longfeb']	= 'Febrero';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Mayo';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Septiembre';
+$labels['longoct']	= 'Octubre';
+$labels['longnov']	= 'Noviembre';
+$labels['longdec']	= 'Diciembre';
+
 $labels['today'] = 'Hoy';
-$labels['checkmail'] = 'Revisar si hay nuevos mensajes';
-$labels['compose'] = 'Escribir un mensaje';
-$labels['writenewmessage'] = 'Crear nuevo mensaje';
-$labels['replytomessage'] = 'Responder mensaje';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Revisar si hay nuevos mensajes';
+$labels['compose']          = 'Escribir un mensaje';
+$labels['writenewmessage']  = 'Crear nuevo mensaje';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['forwardmessage'] = 'Reenviar mensaje';
-$labels['deletemessage'] = 'Eliminar mensaje';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Reenviar mensaje';
+$labels['deletemessage']    = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
-$labels['printmessage'] = 'Imprimir este mensaje';
-$labels['previousmessage'] = 'Mostrar mensaje anterior';
-$labels['firstmessage'] = 'Mostrar primer mensaje';
-$labels['nextmessage'] = 'Mostrar siguente mensaje';
-$labels['lastmessage'] = 'Mostrar último mensaje';
-$labels['backtolist'] = 'Volver a la lista de mensajes';
-$labels['viewsource'] = 'Mostrar código';
-$labels['markmessages'] = 'Marcar mensajes';
-$labels['markread'] = 'Como leído';
-$labels['markunread'] = 'Como no leído';
-$labels['markflagged'] = 'Como marcado';
-$labels['markunflagged'] = 'Como no marcado';
+$labels['printmessage']     = 'Imprimir este mensaje';
+$labels['previousmessage']  = 'Mostrar mensaje anterior';
+$labels['firstmessage']     = 'Mostrar primer mensaje';
+$labels['nextmessage']      = 'Mostrar siguente mensaje';
+$labels['lastmessage']      = 'Mostrar último mensaje';
+$labels['backtolist']       = 'Volver a la lista de mensajes';
+$labels['viewsource']       = 'Mostrar código';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Marcar mensajes';
+$labels['markread']         = 'Como leído';
+$labels['markunread']       = 'Como no leído';
+$labels['markflagged']      = 'Como marcado';
+$labels['markunflagged']    = 'Como no marcado';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
-$labels['nonesort'] = 'Ninguno';
 $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
 $labels['unanswered'] = 'Sin respuesta';
 $labels['deleted'] = 'Eliminado';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'Expandir Todos';
 $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
 $labels['attachment'] = 'Adjunto';
+$labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de Enviado';
 $labels['arrival'] = 'Fecha de Recepción';
 $labels['asc'] = 'Ascendente';
 $labels['desc'] = 'Descendente';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'desconocido';
-$labels['unlimited'] = 'sin límite';
-$labels['quicksearch'] = 'Búsqueda rápida';
-$labels['resetsearch'] = 'Reajustar la búsqueda';
-$labels['searchmod'] = 'Opciones de búsqueda';
-$labels['msgtext'] = 'Mensaje completo';
+$labels['unknown']  = 'desconocido';
+$labels['unlimited']  = 'sin límite';
+
+$labels['quicksearch']  = 'Búsqueda rápida';
+$labels['resetsearch']  = 'Reajustar la búsqueda';
+$labels['searchmod']  = 'Opciones de búsqueda';
+$labels['msgtext']  = 'Mensaje completo';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
-$labels['editasnew'] = 'Editar como nuevo';
-$labels['sendmessage'] = 'Enviar ahora el mensaje';
-$labels['savemessage'] = 'Guardar como borrador';
-$labels['addattachment'] = 'Añadir un archivo';
-$labels['charset'] = 'Codificación';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Acuse de recibo';
+
+// message compose
+$labels['editasnew']      = 'Editar como nuevo';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Enviar ahora el mensaje';
+$labels['savemessage']    = 'Guardar como borrador';
+$labels['addattachment']  = 'Añadir un archivo';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Acuse de recibo';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
-$labels['revertto'] = 'Revertir a';
+$labels['revertto']      = 'Revertir a';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Agregar';
-$labels['close'] = 'Cerrar';
-$labels['low'] = 'Bajo';
-$labels['lowest'] = 'Bajísimo';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alto';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Cerrar';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Bajo';
+$labels['lowest']  = 'Bajísimo';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alto';
 $labels['highest'] = 'Altísimo';
-$labels['nosubject'] = '(sin asunto)';
+
+$labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Siempre mostrar imágenes de $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
 $labels['dontsave'] = 'no guardar';
 $labels['maxuploadsize'] = 'El tamaño maximo permitido por archivo es $size';
+
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Respuesta a';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esta es una notificación de lectura de su mensaje';
 $labels['receiptnote'] = 'Nota: Esta notificación sólo significa que su mensaje fue mostrado en la computadora del receptor. No hay garantía de que el receptor haya leído o entendido el contenido del mensaje.';
-$labels['name'] = 'Nombre completo';
-$labels['firstname'] = 'Nombre';
-$labels['surname'] = 'Apellido';
-$labels['email'] = 'Correo';
+
+// address boook
+$labels['name']         = 'Nombre completo';
+$labels['firstname']    = 'Nombre';
+$labels['surname']      = 'Apellido';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Correo';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
-$labels['edit'] = 'Editar';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
-$labels['newcontact'] = 'Añadir nuevo contacto';
-$labels['deletecontact'] = 'Eliminar contactos seleccionados';
-$labels['composeto'] = 'Enviar mensaje a';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Añadir nuevo contacto';
+$labels['deletecontact']  = 'Eliminar contactos seleccionados';
+$labels['composeto']      = 'Enviar mensaje a';
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar contactos en format vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
-$labels['previouspage'] = 'Mostrar grupo anterior';
-$labels['firstpage'] = 'Mostrar primer grupo';
-$labels['nextpage'] = 'Mostrar siguiente grupo';
-$labels['lastpage'] = 'Mostrar último grupo';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Mostrar grupo anterior';
+$labels['firstpage']      = 'Mostrar primer grupo';
+$labels['nextpage']       = 'Mostrar siguiente grupo';
+$labels['lastpage']       = 'Mostrar último grupo';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Hecho';
+
+// settings
 $labels['settingsfor'] = 'Configuración para';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
 $labels['newidentity'] = 'Nueva identidad';
+
 $labels['newitem'] = 'Nuevo';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Prefiero HTML';
 $labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
 $labels['htmlmessage'] = 'Mensaje HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Fecha detallada';
-$labels['setdefault'] = 'Seleccionar opción por defecto';
-$labels['autodetect'] = 'Automático';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Zona horaria';
-$labels['pagesize'] = 'Filas por página';
+$labels['setdefault']  = 'Seleccionar opción por defecto';
+$labels['autodetect']  = 'Automático';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Zona horaria';
+$labels['pagesize']  = 'Filas por página';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Cambio de horario';
+$labels['dstactive']  = 'Cambio de horario';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Firma HTML';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
@@ -234,19 +408,23 @@ $labels['mailboxview'] = 'Vista de buzón';
 $labels['mdnrequests'] = 'Notificaciones de envío';
 $labels['askuser'] = 'preguntar al usuario';
 $labels['autosend'] = 'enviar automáticamente';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar el mensage como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensage para borrarse en vez de borrarlo';
 $labels['skipdeleted'] = 'No mostrar mensajes eliminados';
 $labels['deletealways'] = 'Cuando no se pueda mover un mensaje a la papelera, eliminarlo';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Mostrar imágenes remotas';
 $labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Mostrar imágenes adjuntas debajo del mensaje';
-$labels['autosavedraft'] = 'Guardar borrador automáticamente';
-$labels['everynminutes'] = 'cada $n minuto(s)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'inmediatamente';
+$labels['autosavedraft']  = 'Guardar borrador automáticamente';
+$labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
 $labels['messagescomposition'] = 'Composición de mensajes';
 $labels['mimeparamfolding'] = 'Nombre de adjuntos';
@@ -258,12 +436,15 @@ $labels['advancedoptions'] = 'Opciones Avanzadas';
 $labels['focusonnewmessage'] = 'Traer al frente la ventana del navegador cuando haya nuevos mensajes';
 $labels['checkallfolders'] = 'Verificar todas las carpetas por nuevos mensajes';
 $labels['displaynext'] = 'Luedo de eliminar/mover, mostrar el próximo mensaje';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Opciones Principales';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Selección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo Mensaje';
 $labels['signatureoptions'] = 'Opciones de Firma';
 $labels['whenreplying'] = 'Al Responder';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'iniciar el nuevo mensaje sobre el original';
 $labels['replybottomposting'] = 'iniciar el nuevo mensaje debajo del original';
 $labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje original';
@@ -274,23 +455,65 @@ $labels['replysignaturepos'] = 'Agregar firma al responder o reenviar';
 $labels['belowquote'] = 'debajo de la cita';
 $labels['abovequote'] = 'sobre la cita';
 $labels['insertsignature'] = 'Insertar firma';
-$labels['previewpanemarkread'] = 'Marcar mensajes previsualizados como leidos';
-$labels['afternseconds'] = 'despues de $n segundos';
-$labels['folder'] = 'Carpeta';
-$labels['foldername'] = 'Nombre de carpeta';
-$labels['subscribed'] = 'Suscripta';
+$labels['previewpanemarkread']  = 'Marcar mensajes previsualizados como leidos';
+$labels['afternseconds']  = 'despues de $n segundos';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Carpeta';
+$labels['folders']  = 'Carpetas';
+$labels['foldername']  = 'Nombre de carpeta';
+$labels['subscribed']  = 'Suscripta';
 $labels['messagecount'] = 'Mensajes';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear nueva carpeta';
-$labels['managefolders'] = 'Administrar carpetas';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear nueva carpeta';
+$labels['managefolders']  = 'Administrar carpetas';
 $labels['specialfolders'] = 'Carpetas Especiales';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orden ascendente';
+$labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Ingles';
 $labels['westerneuropean'] = 'Europa Occidental';
@@ -310,3 +533,4 @@ $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
 
+?>
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 76697fd61..167fbe290 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -2,30 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Contraseña o nombre de usuario incorrecto';
+$messages['errortitle']  = 'Ha ocurrido un error!';
+$messages['loginfailed']  = 'Contraseña o nombre de usuario incorrecto';
 $messages['cookiesdisabled'] = 'Su navegador no acepta cookies';
 $messages['sessionerror'] = 'Su sesión no existe o ha expirado';
 $messages['storageerror'] = 'Error de conexión con el servidor IMAP';
 $messages['servererror'] = '¡Error en el servidor!';
+$messages['servererrormsg'] = 'Error en servidor: $msg';
+$messages['dberror'] = 'Error en base de datos!';
+$messages['requesttimedout'] = 'Tiempo de espera agotado';
+$messages['errorreadonly'] = 'No se pudo realizar la operación. La carpeta es de sólo lectura.';
+$messages['errornoperm'] = 'No se pudo realizar la operación. Permiso denegado.';
 $messages['invalidrequest'] = 'Peteción invalida! No se guardó nada.';
+$messages['invalidhost'] = 'Nombre de servidor inválido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
 $messages['loggedout'] = 'Ha cerrado la sesión. ¡Hasta pronto!';
 $messages['mailboxempty'] = 'La casilla está vacía';
+$messages['refreshing'] = 'Actualizando...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Subiendo archivo...';
+$messages['uploadingmany'] = 'Subiendo archivos...';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'Verificando si hay nuevos mensajes...';
 $messages['sendingmessage'] = 'Enviando mensaje...';
@@ -35,10 +46,12 @@ $messages['messagesaved'] = 'Mensaje guardado en borradores';
 $messages['successfullysaved'] = 'Guardado correctamente';
 $messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones';
 $messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
+$messages['contactnameexists'] = 'Ya existe un contacto con el mismo nombre.';
 $messages['blockedimages'] = 'Para proteger su privacidad, las imágenes externas han sido bloqueadas en este mensaje';
 $messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. ¡Lo siento!';
 $messages['nocontactsfound'] = 'No hay contactos';
 $messages['contactnotfound'] = 'El contacto solicitado no existe';
+$messages['contactsearchonly'] = 'Ingresá algún término de búsqueda para encontrar contactos';
 $messages['sendingfailed'] = 'Error al enviar mensaje';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de enviar este mensaje';
 $messages['errorsavingsent'] = 'Ocurrió un error al guardar el mensaje enviado';
@@ -47,30 +60,40 @@ $messages['errormoving'] = 'No se pudo mover el mensaje';
 $messages['errorcopying'] = 'No se pudo copiar el mensaje';
 $messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
 $messages['errormarking'] = 'No se puede marcar el mensaje.';
-$messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos seleccionados?';
+$messages['deletecontactconfirm']  = '¿Realmente quiere eliminar los contactos seleccionados?';
+$messages['deletegroupconfirm']  = 'Realmente deseas eliminar el grupo seleccionado?';
 $messages['deletemessagesconfirm'] = '¿Realmente quiere eliminar los mensajes seleccionados?';
-$messages['deletefolderconfirm'] = '¿Realmente quiere eliminar esta carpeta?';
-$messages['purgefolderconfirm'] = '¿Realmente quiere eliminar todos los mensajes de esta carpeta?';
+$messages['deletefolderconfirm']  = '¿Realmente quiere eliminar esta carpeta?';
+$messages['purgefolderconfirm']  = '¿Realmente quiere eliminar todos los mensajes de esta carpeta?';
+$messages['contactdeleting'] = 'Eliminando contacto(s)...';
+$messages['groupdeleting'] = 'Eliminando grupo...';
 $messages['folderdeleting'] = 'Eliminando carpeta...';
 $messages['foldermoving'] = 'Moviendo carpeta...';
+$messages['foldersubscribing'] = 'Suscribiendo a carpeta...';
+$messages['folderunsubscribing'] = 'Quitando suscripción a carpeta...';
 $messages['formincomplete'] = 'No se han llenado todos los campos del formulario';
 $messages['noemailwarning'] = 'Por favor, introduzca un e-mail válido';
-$messages['nonamewarning'] = 'Por favor, introduzca su nombre';
+$messages['nonamewarning']  = 'Por favor, introduzca su nombre';
 $messages['nopagesizewarning'] = 'Por favor, introduzca un tamaño de página';
 $messages['nosenderwarning'] = 'Por favor, introduzca el e-mail del emisor';
 $messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatario';
-$messages['nosubjectwarning'] = 'El campo "Asunto" esta vacío. ¿Desea completarlo en este momento?';
+$messages['nosubjectwarning']  = 'El campo "Asunto" esta vacío. ¿Desea completarlo en este momento?';
 $messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
 $messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar su mensaje?';
 $messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
 $messages['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';
+$messages['contactsearchsuccessful'] = '$nr contactos encontrados.';
 $messages['searchnomatch'] = 'La búsqueda no obtuvo resultados';
 $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Revisando...';
 $messages['nospellerrors'] = 'No se encontraron errores ortográficos';
 $messages['folderdeleted'] = 'Carpeta eliminada exitosamente';
+$messages['foldersubscribed'] = 'Suscripción a carpeta exitosa.';
+$messages['folderunsubscribed'] = 'Suscripción a carpeta exitosamente eliminada.';
+$messages['folderpurged'] = 'La carpeta se vació correctamente.';
+$messages['folderexpunged'] = 'La carpeta se compactó correctamente.';
 $messages['deletedsuccessfully'] = 'Eliminado exitosamente';
 $messages['converting'] = 'Removiendo el formato del mensaje...';
 $messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor';
@@ -82,17 +105,25 @@ $messages['sourceisreadonly'] = 'Esta dirección es de sólo-lectura';
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
 $messages['movingmessage'] = 'Moviendo mensaje...';
 $messages['copyingmessage'] = 'Copiando mensaje...';
+$messages['copyingcontact'] = 'Copiando contacto(s)...';
+$messages['deletingmessage'] = 'Eliminando contacto(s)...';
+$messages['markingmessage'] = 'Marcando mensaje(s)...';
+$messages['addingmember'] = 'Agregando contacto(s) al grupo...';
+$messages['removingmember'] = 'Quitando contacto(s) del grupo...';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado con éxito.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
+$messages['deleteidentityconfirm'] = 'Realmente querés eliminar esta identidad?';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
 $messages['forbiddencharacter'] = 'El nombre de la carpeta contiene un carácter prohibido';
 $messages['selectimportfile'] = 'Por favor, seleccione el archivo a subir';
 $messages['addresswriterror'] = 'La libreta de direcciones seleccionada es de solo-lectura';
 $messages['contactaddedtogroup'] = 'Contactos agregados al grupo correctamente';
 $messages['contactremovedfromgroup'] = 'Contactos eliminados del grupo correctamente';
+$messages['nogroupassignmentschanged'] = 'Ninguna asiganción de grupo fue modificada.';
 $messages['importwait'] = 'Importando, aguarde por favor...';
-$messages['importerror'] = 'Falló la importación! El archivo seleccionado parece no ser un archivo del tipo vCard válido.';
+$messages['importformaterror'] = 'Importación fallida! El archivo subido no es un archivo de importación de datos válido.';
 $messages['importconfirm'] = '<b>Se importaron $inserted contactos correctamente. $skipped ya existentes fueron ignorados</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Se ignoraron $skipped entradas ya existentes</b>';
 $messages['opnotpermitted'] = 'Operación no permitida!';
 $messages['nofromaddress'] = 'El contacto seleccionado no tiene dirección de e-mail';
 $messages['editorwarning'] = 'Si cambia a texto plano se perderán todas las opciones de formato. ¿Desea continuar?';
@@ -106,4 +137,33 @@ $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'La dirección $email no es válida';
 $messages['toomanyrecipients'] = 'Demasiados destinatarios. Reduzca la cantidad a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max';
+$messages['internalerror'] = 'Ocurrió un error interno. Por favor, intentá de nuevo.';
+$messages['contactdelerror'] = 'No se pudo eliminar el/los contactos(s).';
+$messages['contactdeleted'] = 'Contacto(s) eliminado/s exitosamente.';
+$messages['contactrestoreerror'] = 'No se pudo recuperar el/los contacto/s eliminado(s).';
+$messages['contactrestored'] = 'Contacto(s) recuperado/s satisfactoriamente.';
+$messages['groupdeleted'] = 'Grupo eliminado correctamente.';
+$messages['grouprenamed'] = 'Grupo renombrado satisfactoriamente.';
+$messages['groupcreated'] = 'Grupo creado satisfactoriamente.';
+$messages['savedsearchdeleted'] = 'Búsqueda guardada se eliminó satisfactoriamente.';
+$messages['savedsearchdeleteerror'] = 'No se pudo eliminar la búsqueda guardada.';
+$messages['savedsearchcreated'] = 'Búsqueda guardada exitosamente.';
+$messages['savedsearchcreateerror'] = 'No se pudo guardar la búsqueda.';
+$messages['messagedeleted'] = 'Mensaje(s) eliminado/s satisfactoriamente.';
+$messages['messagemoved'] = 'Mensaje(s) movidos correctamente.';
+$messages['messagecopied'] = 'Mensaje(s) copiados correctamente.';
+$messages['messagemarked'] = 'Mensaje(s) marcados satisfactoriamente.';
+$messages['autocompletechars'] = 'Ingresá por lo menos $min caracteres para autocompletar.';
+$messages['autocompletemore'] = 'Se encontraron mas coincidencias. Por favor, escribí mas caracteres.';
+$messages['namecannotbeempty'] = 'El nombre no puede estar vacio.';
+$messages['nametoolong'] = 'El nombre es demasiado largo.';
+$messages['folderupdated'] = 'Carpeta actualizada correctamente.';
+$messages['foldercreated'] = 'Carpeta creada satisfactoriamente.';
+$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 8133dada6..eca1d1e93 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Adolfo Jayme Barrientos <fitoschido@gmail.com>                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienvenido a $product';
-$labels['username'] = 'Nombre de usuario';
-$labels['password'] = 'Contraseña';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Iniciar sesión';
-$labels['logout'] = 'Cerrar sesión';
-$labels['mail'] = 'Correo';
+
+// login page
+$labels['welcome']   = 'Bienvenido a $product';
+$labels['username']  = 'Nombre de usuario';
+$labels['password']  = 'Contraseña';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Iniciar sesión';
+
+// taskbar
+$labels['logout']   = 'Cerrar sesión';
+$labels['mail']     = 'Correo';
 $labels['settings'] = 'Configuración';
 $labels['addressbook'] = 'Contactos';
-$labels['inbox'] = 'Entrada';
+
+// mailbox names
+$labels['inbox']  = 'Entrada';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Papelera';
-$labels['junk'] = 'Basura';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Papelera';
+$labels['junk']   = 'SPAM';
+
+// message listing
 $labels['subject'] = 'Asunto';
-$labels['from'] = 'Remitente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Cco';
+$labels['from']    = 'Remitente';
+$labels['sender']  = 'Remitente';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
 $labels['followupto'] = 'Responder-a';
-$labels['date'] = 'Fecha';
-$labels['size'] = 'Tamaño';
+$labels['date']    = 'Fecha';
+$labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Leer estado';
 $labels['listoptions'] = 'Lista de opciones...';
+
 $labels['mailboxlist'] = 'Carpetas';
-$labels['folders'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['threadsfromto'] = 'Hilos $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a…';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a…';
 $labels['download'] = 'Descargar';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrarlo de todos modos';
+
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
+
 $labels['addtoaddressbook'] = 'Añadir a contactos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Mié';
 $labels['thu'] = 'Jue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Lunes';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Lunes';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Miércoles';
-$labels['thursday'] = 'Jueves';
-$labels['friday'] = 'Viernes';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Ene';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dic';
-$labels['longjan'] = 'Enero';
-$labels['longfeb'] = 'Febrero';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Septiembre';
-$labels['longoct'] = 'Octubre';
-$labels['longnov'] = 'Noviembre';
-$labels['longdec'] = 'Diciembre';
+$labels['thursday']  = 'Jueves';
+$labels['friday']    = 'Viernes';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Ene';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dic';
+
+// months long
+$labels['longjan']	= 'Enero';
+$labels['longfeb']	= 'Febrero';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Mayo';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Septiembre';
+$labels['longoct']	= 'Octubre';
+$labels['longnov']	= 'Noviembre';
+$labels['longdec']	= 'Diciembre';
+
 $labels['today'] = 'Hoy';
-$labels['refresh'] = 'Actualizar';
-$labels['checkmail'] = 'Revisar si hay mensajes nuevos';
-$labels['compose'] = 'Redactar';
-$labels['writenewmessage'] = 'Crear un mensaje nuevo';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Responder mensaje';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizar';
+$labels['checkmail']        = 'Revisar si hay mensajes nuevos';
+$labels['compose']          = 'Redactar';
+$labels['writenewmessage']  = 'Crear un mensaje nuevo';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['replyall'] = 'Responder a todos';
-$labels['replylist'] = 'Responder a la lista';
-$labels['forward'] = 'Reenviar';
-$labels['forwardinline'] = 'Reenviar directamente';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Responder a la lista';
+$labels['forward']          = 'Reenviar';
+$labels['forwardinline']    = 'Reenviar directamente';
 $labels['forwardattachment'] = 'Reenviar como adjunto';
-$labels['forwardmessage'] = 'Reenviar mensaje';
-$labels['deletemessage'] = 'Eliminar mensaje';
+$labels['forwardmessage']   = 'Reenviar mensaje';
+$labels['deletemessage']    = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
-$labels['printmessage'] = 'Imprimir este mensaje';
-$labels['previousmessage'] = 'Mostrar mensaje anterior';
-$labels['firstmessage'] = 'Mostrar primer mensaje';
-$labels['nextmessage'] = 'Mostrar el siguiente mensaje';
-$labels['lastmessage'] = 'Mostrar el último mensaje';
-$labels['backtolist'] = 'Volver a la lista de mensajes';
-$labels['viewsource'] = 'Mostrar código';
-$labels['mark'] = 'Marcar';
-$labels['markmessages'] = 'Marcar mensajes';
-$labels['markread'] = 'Como leído';
-$labels['markunread'] = 'Como no leído';
-$labels['markflagged'] = 'Como marcado';
-$labels['markunflagged'] = 'Como no marcado';
-$labels['moreactions'] = 'Más acciones…';
-$labels['more'] = 'Más';
-$labels['back'] = 'Volver';
-$labels['options'] = 'Opciones';
+$labels['printmessage']     = 'Imprimir este mensaje';
+$labels['previousmessage']  = 'Mostrar mensaje anterior';
+$labels['firstmessage']     = 'Mostrar primer mensaje';
+$labels['nextmessage']      = 'Mostrar el siguiente mensaje';
+$labels['lastmessage']      = 'Mostrar el último mensaje';
+$labels['backtolist']       = 'Volver a la lista de mensajes';
+$labels['viewsource']       = 'Mostrar código';
+$labels['mark']             = 'Marcar';
+$labels['markmessages']     = 'Marcar mensajes';
+$labels['markread']         = 'Como leído';
+$labels['markunread']       = 'Como no leído';
+$labels['markflagged']      = 'Como marcado';
+$labels['markunflagged']    = 'Como no marcado';
+$labels['moreactions']      = 'Más acciones…';
+$labels['more']             = 'Más';
+$labels['back']             = 'Volver';
+$labels['options']          = 'Opciones';
+
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
-$labels['nonesort'] = 'Ninguno';
 $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Señalado';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Expandir todos';
 $labels['expand-unread'] = 'Expandir no leídos';
 $labels['collapse-all'] = 'Colapsar todos';
 $labels['threaded'] = 'Encadenados';
+
 $labels['autoexpand_threads'] = 'Expandir hilos de mensajes';
 $labels['do_expand'] = 'todos los hilos';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
 $labels['fromto'] = 'Remitente/Destinatario';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunto';
+$labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de envío';
 $labels['arrival'] = 'Fecha de llegada';
 $labels['asc'] = 'ascendente';
@@ -159,177 +187,211 @@ $labels['listcolumns'] = 'Listar columnas';
 $labels['listsorting'] = 'Columna de listado';
 $labels['listorder'] = 'Orden de listado';
 $labels['listmode'] = 'Modo de vista de lista';
+
 $labels['folderactions'] = 'Acciones de bandeja...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'desconocido';
-$labels['unlimited'] = 'sin límite';
-$labels['quicksearch'] = 'Búsqueda rápida';
-$labels['resetsearch'] = 'Reiniciar la búsqueda';
-$labels['searchmod'] = 'Opciones de búsqueda';
-$labels['msgtext'] = 'Mensaje completo';
+$labels['unknown']  = 'desconocido';
+$labels['unlimited']  = 'sin límite';
+
+$labels['quicksearch']  = 'Búsqueda rápida';
+$labels['resetsearch']  = 'Reiniciar la búsqueda';
+$labels['searchmod']  = 'Opciones de búsqueda';
+$labels['msgtext']  = 'Mensaje completo';
+$labels['body']  = 'Cuerpo';
+
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
-$labels['editasnew'] = 'Editar como nuevo';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Enviar ahora el mensaje';
-$labels['savemessage'] = 'Guardar como borrador';
-$labels['addattachment'] = 'Adjuntar un archivo';
-$labels['charset'] = 'Codificación';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Acuse de recibo';
-$labels['dsn'] = 'Entrega de notificaciones de estado';
+
+// message compose
+$labels['editasnew']      = 'Editar como nuevo';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Enviar ahora el mensaje';
+$labels['savemessage']    = 'Guardar como borrador';
+$labels['addattachment']  = 'Adjuntar un archivo';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Acuse de recibo';
+$labels['dsn']            = 'Entrega de notificaciones de estado';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaje original';
-$labels['editidents'] = 'Editar identidades';
-$labels['spellcheck'] = 'Corrector ortográfico';
+
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Corrector ortográfico';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
-$labels['revertto'] = 'Revertir a';
+$labels['revertto']      = 'Revertir a';
+
 $labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Subir';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Cerrar';
-$labels['messageoptions'] = 'Opciones de mensaje...';
-$labels['low'] = 'Bajo';
-$labels['lowest'] = 'Bajísimo';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alto';
+$labels['close']  = 'Cerrar';
+$labels['messageoptions']  = 'Opciones de mensaje...';
+
+$labels['low']     = 'Bajo';
+$labels['lowest']  = 'Bajísimo';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alto';
 $labels['highest'] = 'Altísimo';
-$labels['nosubject'] = '(sin asunto)';
+
+$labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Mostrar siempre imágenes de $sender';
-$labels['isdraft'] = 'Este mensaje es un borrador';
-$labels['andnmore'] = '$nr más…';
+$labels['isdraft']    = 'Este mensaje es un borrador';
+$labels['andnmore']   = '$nr más…';
 $labels['togglemoreheaders'] = 'Mostrar más encabezados del mensaje';
 $labels['togglefullheaders'] = 'Mostrar u ocultar encabezados de mensajes';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Sólo texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
 $labels['dontsave'] = 'No guardar';
 $labels['maxuploadsize'] = 'Tamaño de archivo máximo permitido: $size';
+
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Responder a';
 $labels['addfollowupto'] = 'Añadir Seguir a';
+
+// mdn
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esto es un acuse de recibo de su mensaje';
 $labels['receiptnote'] = 'Nota: Esta notificación sólo significa que su mensaje fue abierto en el ordenador del destinatario. Eso no garantiza que el destinatario haya leído o entendido el contenido del mensaje.';
-$labels['name'] = 'Nombre para mostrar';
-$labels['firstname'] = 'Nombre';
-$labels['surname'] = 'Apellido';
-$labels['middlename'] = 'Segundo nombre';
-$labels['nameprefix'] = 'Prefijo';
-$labels['namesuffix'] = 'Sufijo';
-$labels['nickname'] = 'Alias';
-$labels['jobtitle'] = 'Tratamiento';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Sexo';
-$labels['maidenname'] = 'Apellido de soltera';
-$labels['email'] = 'Correo';
-$labels['phone'] = 'Teléfono';
-$labels['address'] = 'Dirección';
-$labels['street'] = 'Calle';
-$labels['locality'] = 'Ciudad';
-$labels['zipcode'] = 'Código postal';
-$labels['region'] = 'Provincia';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Cumpleaños';
-$labels['anniversary'] = 'Santo';
-$labels['website'] = 'Página web';
+
+// address boook
+$labels['name']         = 'Nombre para mostrar';
+$labels['firstname']    = 'Nombre';
+$labels['surname']      = 'Apellido';
+$labels['middlename']   = 'Segundo nombre';
+$labels['nameprefix']   = 'Prefijo';
+$labels['namesuffix']   = 'Sufijo';
+$labels['nickname']     = 'Alias';
+$labels['jobtitle']     = 'Tratamiento';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
+$labels['maidenname']   = 'Apellido de soltera';
+$labels['email']        = 'Correo';
+$labels['phone']        = 'Teléfono';
+$labels['address']      = 'Dirección';
+$labels['street']       = 'Calle';
+$labels['locality']     = 'Ciudad';
+$labels['zipcode']      = 'Código postal';
+$labels['region']       = 'Provincia';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Cumpleaños';
+$labels['anniversary']  = 'Santo';
+$labels['website']      = 'Página web';
 $labels['instantmessenger'] = 'Mensajería instantánea';
 $labels['notes'] = 'Notas';
-$labels['male'] = 'Hombre';
+$labels['male']   = 'Hombre';
 $labels['female'] = 'Mujer';
 $labels['manager'] = 'Director';
 $labels['assistant'] = 'Auxiliar';
-$labels['typeassistant'] = 'Auxiliar';
 $labels['spouse'] = 'Cónyuge';
 $labels['allfields'] = 'Todos los campos';
 $labels['search'] = 'Buscar';
 $labels['advsearch'] = 'Búsqueda avanzada';
 $labels['advanced'] = 'Avanzadas';
 $labels['other'] = 'Otro';
-$labels['typeother'] = 'Otro';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Trabajo';
-$labels['typemobile'] = 'Móvil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax de casa';
-$labels['typeworkfax'] = 'Fax del trabajo';
-$labels['typecar'] = 'Coche';
-$labels['typepager'] = 'Busca';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Inicio';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Trabajo';
+$labels['typeother']  = 'Otro';
+$labels['typemobile']  = 'Móvil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax de casa';
+$labels['typeworkfax']  = 'Fax del trabajo';
+$labels['typecar']  = 'Coche';
+$labels['typepager']  = 'Busca';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Auxiliar';
+$labels['typehomepage']  = 'Inicio';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Añadir campo...';
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
 $labels['personalinfo'] = 'Información personal';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
 $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Añadir';
 $labels['replacephoto'] = 'Reemplazar';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact'] = 'Crear nueva tarjeta de contacto';
-$labels['deletecontact'] = 'Eliminar contactos seleccionados';
-$labels['composeto'] = 'Escribir mensaje a';
+
+$labels['newcontact']     = 'Crear nueva tarjeta de contacto';
+$labels['deletecontact']  = 'Eliminar contactos seleccionados';
+$labels['composeto']      = 'Escribir mensaje a';
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar contactos en formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Exportar todo';
+$labels['exportsel']      = 'Exportar lo seleccionado';
+$labels['exportvcards']   = 'Exportar contactos en formato vCard';
 $labels['newcontactgroup'] = 'Crear un nuevo grupo de contactos';
-$labels['grouprename'] = 'Renombrar grupo';
-$labels['groupdelete'] = 'Borrar grupo';
+$labels['grouprename']    = 'Renombrar grupo';
+$labels['groupdelete']    = 'Borrar grupo';
 $labels['groupremoveselected'] = 'Eliminar los contactos seleccionados del grupo';
-$labels['previouspage'] = 'Mostrar grupo anterior';
-$labels['firstpage'] = 'Mostrar primer grupo';
-$labels['nextpage'] = 'Mostrar grupo siguiente';
-$labels['lastpage'] = 'Mostrar último grupo';
+
+$labels['previouspage']   = 'Mostrar grupo anterior';
+$labels['firstpage']      = 'Mostrar primer grupo';
+$labels['nextpage']       = 'Mostrar grupo siguiente';
+$labels['lastpage']       = 'Mostrar último grupo';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
+
 $labels['searchsave'] = 'Guardar búsqueda';
 $labels['searchdelete'] = 'Borrar búsqueda';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde archivo:';
 $labels['importtarget'] = 'Añadir un nuevo contacto a la los contactos:';
 $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
-$labels['importdesc'] = 'Puede subir contactos desde una libreta de direcciones existente.<br/>Actualmente permitimos la importación desde los formatos de datos <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (separados por comas).';
+$labels['importdesc'] = 'Puede subir contactos desde una libreta de direcciones existente.<br/>Actualmente permitimos la importación desde los formatos de datos <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> o CSV (separados por comas).';
 $labels['done'] = 'Hecho';
+
+// settings
 $labels['settingsfor'] = 'Configuración para';
 $labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
 $labels['newidentity'] = 'Nueva identidad';
+
 $labels['newitem'] = 'Nuevo';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Prefiero HTML';
-$labels['defaultcharset'] = 'Juego de caracteres por defecto';
+$labels['defaultcharset'] = 'Juego de caracteres predeterminado';
 $labels['htmlmessage'] = 'Mensaje HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Firma digital';
 $labels['dateformat'] = 'Formato de fecha';
 $labels['timeformat'] = 'Formato de hora';
 $labels['prettydate'] = 'Fecha detallada';
-$labels['setdefault'] = 'Seleccionar opción por defecto';
-$labels['autodetect'] = 'Automático';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Zona horaria';
-$labels['pagesize'] = 'Filas por página';
+$labels['setdefault']  = 'Seleccionar opción predeterminada';
+$labels['autodetect']  = 'Automático';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Zona horaria';
+$labels['pagesize']  = 'Filas por página';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Cambio de horario';
+$labels['dstactive']  = 'Cambio de horario';
 $labels['showinextwin'] = 'Abrir mensaje en una ventana nueva';
 $labels['composeextwin'] = 'Redactar en una ventana nueva';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
@@ -353,16 +415,16 @@ $labels['readwhendeleted'] = 'Marcar el mensaje como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensaje para borrarse en vez de borrarlo';
 $labels['skipdeleted'] = 'No mostrar mensajes borrados';
 $labels['deletealways'] = 'Cuando falle trasladar los mensajes a la papelera, borrarlos';
-$labels['deletejunk'] = 'Directamente eliminar mensajes de Correo no Deseado';
+$labels['deletejunk'] = 'Directamente eliminar mensajes en SPAM';
 $labels['showremoteimages'] = 'Mostrar las imágenes externas';
 $labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Mostrar imágenes adjuntas debajo del mensaje';
-$labels['autosavedraft'] = 'Guardar borrador automáticamente';
-$labels['everynminutes'] = 'cada $n minuto(s)';
-$labels['refreshinterval'] = 'Actualizar (comprobar mensajes nuevos, etc.)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'inmediatamente';
+$labels['autosavedraft']  = 'Guardar borrador automáticamente';
+$labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Actualizar (comprobar mensajes nuevos, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
 $labels['messagescomposition'] = 'Composición de mensajes';
 $labels['mimeparamfolding'] = 'Nombres de archivos adjuntos';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Colocar firma al responder o reenviar';
 $labels['belowquote'] = 'abajo del texto seleccionado';
 $labels['abovequote'] = 'arriba del texto seleccionado';
 $labels['insertsignature'] = 'Insertar firma';
-$labels['previewpanemarkread'] = 'Marcar mensaje previsualizado como leído';
-$labels['afternseconds'] = 'después de $n segundos';
+$labels['previewpanemarkread']  = 'Marcar mensaje previsualizado como leído';
+$labels['afternseconds']  = 'después de $n segundos';
 $labels['reqmdn'] = 'Solicitar siempre un acuse de recibo';
 $labels['reqdsn'] = 'Solicitar siempre la entrega de notificaciones de estado';
 $labels['replysamefolder'] = 'Coloque las respuestas en la bandeja del mensaje que se responde';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Registrar controlador de protocolo para enlaces
 $labels['forwardmode'] = 'Reenvío de mensajes';
 $labels['inline'] = 'en línea';
 $labels['asattachment'] = 'como adjunto';
-$labels['folder'] = 'Bandeja';
-$labels['foldername'] = 'Nombre de bandeja';
-$labels['subscribed'] = 'Suscrita';
+
+$labels['folder']  = 'Bandeja';
+$labels['folders']  = 'Carpetas';
+$labels['foldername']  = 'Nombre de bandeja';
+$labels['subscribed']  = 'Suscrita';
 $labels['messagecount'] = 'Mensajes';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear nueva bandeja';
-$labels['managefolders'] = 'Administrar bandejas';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear nueva bandeja';
+$labels['managefolders']  = 'Administrar bandejas';
 $labels['specialfolders'] = 'Bandejas especiales';
 $labels['properties'] = 'Propiedades';
 $labels['folderproperties'] = 'Propiedades de bandeja';
@@ -427,23 +491,29 @@ $labels['info'] = 'Información';
 $labels['getfoldersize'] = 'Clic para saber el tamaño de la bandeja';
 $labels['changesubscription'] = 'Clic para cambiar suscripción';
 $labels['foldertype'] = 'Tipo de bandeja';
-$labels['personalfolder'] = 'Bandeja privada';
-$labels['otherfolder'] = 'Bandeja de otro usuario';
-$labels['sharedfolder'] = 'Bandeja pública';
+$labels['personalfolder']  = 'Bandeja privada';
+$labels['otherfolder']  = 'Bandeja de otro usuario';
+$labels['sharedfolder']  = 'Bandeja pública';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orden ascendente';
+$labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
 $labels['undo'] = 'Deshacer';
+
 $labels['installedplugins'] = 'Complementos instalados';
-$labels['plugin'] = 'Plugin';
+$labels['plugin'] = 'Complemento';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Origen';
 $labels['license'] = 'Licencia';
 $labels['support'] = 'Obtener soporte';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglés';
 $labels['westerneuropean'] = 'Europeo occidental';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
 
+?>
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 15269a18a..45552200c 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -2,34 +2,37 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Adolfo Jayme Barrientos <fitoschido@gmail.com>                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '¡Ha ocurrido un error!';
-$messages['loginfailed'] = 'Contraseña o nombre de usuario incorrecto';
-$messages['cookiesdisabled'] = 'Su navegador no acepta cookies';
-$messages['sessionerror'] = 'Su sesión no es válida o ha expirado';
-$messages['storageerror'] = 'Error de conexión con el servidor IMAP';
+$messages['errortitle']  = '¡Ha ocurrido un error!';
+$messages['loginfailed']  = 'Contraseña o nombre de usuario incorrecto.';
+$messages['cookiesdisabled'] = 'Su navegador no acepta cookies.';
+$messages['sessionerror'] = 'Su sesión no es válida o ha expirado.';
+$messages['storageerror'] = 'Error de conexión con el servidor IMAP.';
 $messages['servererror'] = '¡Error del servidor!';
 $messages['servererrormsg'] = 'Error de servidor: $msg';
 $messages['dberror'] = '¡Error de base de datos!';
 $messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
-$messages['errorreadonly'] = 'No se ha podido hacer. La bandeja es sólo de lectura';
-$messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado';
+$messages['errorreadonly'] = 'Imposible realizar la operación. La bandeja es sólo de lectura.';
+$messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado.';
 $messages['invalidrequest'] = '¡Petición no válida! No se han guardado los datos.';
-$messages['invalidhost'] = 'Nombre de servidor inválido';
-$messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
+$messages['invalidhost'] = 'Nombre de servidor inválido.';
+$messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla.';
 $messages['loggedout'] = 'Ha cerrado bien la sesión. ¡Hasta pronto!';
-$messages['mailboxempty'] = 'La casilla está vacía';
+$messages['mailboxempty'] = 'La casilla está vacía.';
 $messages['refreshing'] = 'Actualizando…';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Subiendo archivo...';
@@ -37,71 +40,71 @@ $messages['uploadingmany'] = 'Subiendo archivos…';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'Verificando si hay nuevos mensajes...';
 $messages['sendingmessage'] = 'Enviando mensaje...';
-$messages['messagesent'] = 'Mensaje enviado correctamente';
+$messages['messagesent'] = 'Mensaje enviado correctamente.';
 $messages['savingmessage'] = 'Guardando mensaje...';
-$messages['messagesaved'] = 'Mensaje guardado en borradores';
-$messages['successfullysaved'] = 'Guardado correctamente';
-$messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones';
-$messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
+$messages['messagesaved'] = 'Mensaje guardado en borradores.';
+$messages['successfullysaved'] = 'Guardado correctamente.';
+$messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones.';
+$messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo.';
 $messages['contactnameexists'] = 'Ya existe un contacto con el mismo nombre.';
 $messages['blockedimages'] = 'Para proteger su privacidad, las imágenes externas de este mensaje han sido bloqueadas.';
 $messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. ¡Lo siento!';
 $messages['nocontactsfound'] = 'No se encontraron contactos.';
-$messages['contactnotfound'] = 'El contacto solicitado no existe';
+$messages['contactnotfound'] = 'El contacto solicitado no existe.';
 $messages['contactsearchonly'] = 'Ingrese algún criterio para buscar contactos';
-$messages['sendingfailed'] = 'Error al enviar mensaje';
-$messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar este mensaje';
-$messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado';
-$messages['errorsaving'] = 'Ocurrió un error mientras se guardaba';
-$messages['errormoving'] = 'No se ha podido mover el mensaje';
-$messages['errorcopying'] = 'No se ha podido copiar el/los mensaje(s)';
-$messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
-$messages['errormarking'] = 'No se ha podido marcar el mensaje';
-$messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos seleccionados?';
-$messages['deletegroupconfirm'] = '¿De verdad quiere borrar el grupo seleccionado?';
+$messages['sendingfailed'] = 'Error al enviar mensaje.';
+$messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar este mensaje.';
+$messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado.';
+$messages['errorsaving'] = 'Ocurrió un error mientras se guardaba.';
+$messages['errormoving'] = 'No se ha podido mover el/los mensaje(s).';
+$messages['errorcopying'] = 'No se ha podido copiar el/los mensaje(s).';
+$messages['errordeleting'] = 'No se ha podido eliminar el/los mensaje(s).';
+$messages['errormarking'] = 'No se ha podido marcar el/los mensaje(s).';
+$messages['deletecontactconfirm']  = '¿Realmente quiere eliminar los contactos seleccionados?';
+$messages['deletegroupconfirm']  = '¿De verdad quiere borrar el grupo seleccionado?';
 $messages['deletemessagesconfirm'] = '¿Realmente quiere eliminar los mensajes seleccionados?';
-$messages['deletefolderconfirm'] = '¿Realmente quiere eliminar esta bandeja?';
-$messages['purgefolderconfirm'] = '¿Realmente quiere eliminar todos los mensajes de esta bandeja?';
-$messages['contactdeleting'] = 'Eliminando contacto(s)';
+$messages['deletefolderconfirm']  = '¿Realmente quiere eliminar esta bandeja?';
+$messages['purgefolderconfirm']  = '¿Realmente quiere eliminar todos los mensajes de esta bandeja?';
+$messages['contactdeleting'] = 'Eliminando contacto(s)...';
 $messages['groupdeleting'] = 'Borrando grupo…';
 $messages['folderdeleting'] = 'Borrando bandeja...';
 $messages['foldermoving'] = 'Moviendo bandeja...';
 $messages['foldersubscribing'] = 'Suscribiendo bandeja...';
 $messages['folderunsubscribing'] = 'Anulando suscripción a bandeja...';
-$messages['formincomplete'] = 'No ha rellenado todos los campos del formulario';
-$messages['noemailwarning'] = 'Por favor, introduzca un email válido';
-$messages['nonamewarning'] = 'Por favor, introduzca su nombre';
-$messages['nopagesizewarning'] = 'Por favor, introduzca un tamaño de página';
-$messages['nosenderwarning'] = 'Por favor, introduzca el email del emisor';
-$messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatario';
-$messages['nosubjectwarning'] = 'El campo "Asunto" está vacío. ¿Desea completarlo en este momento?';
+$messages['formincomplete'] = 'No ha rellenado todos los campos del formulario.';
+$messages['noemailwarning'] = 'Por favor, introduzca un email válido.';
+$messages['nonamewarning']  = 'Por favor, introduzca un nombre.';
+$messages['nopagesizewarning'] = 'Por favor, introduzca un tamaño de página.';
+$messages['nosenderwarning'] = 'Por favor, introduzca el email del emisor.';
+$messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatario.';
+$messages['nosubjectwarning']  = 'El campo "Asunto" está vacío. ¿Desea completarlo en este momento?';
 $messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
 $messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar su mensaje?';
-$messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
-$messages['nosearchname'] = 'Por favor, introduzca un nombre o la dirección de e-mail';
+$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'] = 'No se han subido aún todos los adjuntos. Por favor espere o cancele la subida.';
-$messages['searchsuccessful'] = 'Se encontraron $nr mensajes';
+$messages['searchsuccessful'] = 'Se encontraron $nr mensajes.';
 $messages['contactsearchsuccessful'] = 'Encontrados $nr contactos.';
-$messages['searchnomatch'] = 'No se obtuvieron resultados';
+$messages['searchnomatch'] = 'No se obtuvieron resultados.';
 $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Revisando...';
-$messages['nospellerrors'] = 'No se encontraron errores ortográficos';
-$messages['folderdeleted'] = 'Bandeja eliminada correctamente';
-$messages['foldersubscribed'] = 'Suscrito a bandeja correctamente';
-$messages['folderunsubscribed'] = 'Suscripción a bandeja anulada correctamente';
-$messages['folderpurged'] = 'Bandeja purgada correctamente';
-$messages['folderexpunged'] = 'Bandeja vaciada correctamente';
-$messages['deletedsuccessfully'] = 'Eliminado correctamente';
+$messages['nospellerrors'] = 'No se encontraron errores ortográficos.';
+$messages['folderdeleted'] = 'Bandeja eliminada correctamente.';
+$messages['foldersubscribed'] = 'Suscrito a bandeja correctamente.';
+$messages['folderunsubscribed'] = 'Suscripción a bandeja anulada correctamente.';
+$messages['folderpurged'] = 'Bandeja purgada correctamente.';
+$messages['folderexpunged'] = 'Bandeja compatada correctamente.';
+$messages['deletedsuccessfully'] = 'Eliminado correctamente.';
 $messages['converting'] = 'Quitando el formato del mensaje...';
-$messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor';
-$messages['fileuploaderror'] = 'Error al subir archivos';
-$messages['filesizeerror'] = 'El archivo excede el tamaño máximo ($size)';
-$messages['copysuccess'] = '$nr direcciones copiadas correctamente';
-$messages['copyerror'] = 'No se pudo copiar ninguna dirección';
-$messages['sourceisreadonly'] = 'Esta dirección es de sólo lectura';
-$messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
-$messages['movingmessage'] = 'Moviendo mensaje...';
-$messages['copyingmessage'] = 'Copiando mensaje...';
+$messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor.';
+$messages['fileuploaderror'] = 'Error al subir archivos.';
+$messages['filesizeerror'] = 'El archivo excede el tamaño máximo ($size).';
+$messages['copysuccess'] = '$nr direcciones copiadas correctamente.';
+$messages['copyerror'] = 'No se pudo copiar ninguna dirección.';
+$messages['sourceisreadonly'] = 'Esta dirección es de sólo lectura.';
+$messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto.';
+$messages['movingmessage'] = 'Moviendo mensaje(s)...';
+$messages['copyingmessage'] = 'Copiando mensaje(s)...';
 $messages['copyingcontact'] = 'Copiando contacto(s)…';
 $messages['deletingmessage'] = 'Eliminando mensaje(s)...';
 $messages['markingmessage'] = 'Marcando mensaje(s)...';
@@ -109,54 +112,58 @@ $messages['addingmember'] = 'Añadiendo contacto(s) al grupo…';
 $messages['removingmember'] = 'Quitando contacto(s) del grupo…';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado correctamente.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
-$messages['deleteidentityconfirm'] = 'Realmente desea eliminar esta identidad?';
+$messages['deleteidentityconfirm'] = '¿Realmente desea eliminar esta identidad?';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
-$messages['forbiddencharacter'] = 'El nombre de la bandeja contiene un carácter prohibido';
-$messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir';
-$messages['addresswriterror'] = 'No se puede escribir la dirección de contacto seleccionada';
+$messages['forbiddencharacter'] = 'El nombre de la bandeja contiene un carácter prohibido.';
+$messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir.';
+$messages['addresswriterror'] = 'No se puede escribir en la libreta de direciones seleccionada.';
 $messages['contactaddedtogroup'] = 'Se han añadido correctamente los contactos a este grupo.';
 $messages['contactremovedfromgroup'] = 'Se han borrado correctamente los contactos de este grupo.';
-$messages['nogroupassignmentschanged'] = 'No hay cambios en la asgnación de grupos';
+$messages['nogroupassignmentschanged'] = 'No hay cambios en la asignación de grupos.';
 $messages['importwait'] = 'Importando, espere...';
-$messages['importconfirm'] = '<b>Se han insertado: $inserted contactos, y se han omitido: $skipped porque ya existían</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = 'Ignorar $skipped entradas existentes';
+$messages['importformaterror'] = '¡La importación falló! El fichero enviado no es un fichero válido de importación de datos';
+$messages['importconfirm'] = '<b>Se han importado $inserted contactos correctamente</b>';
+$messages['importconfirmskipped'] = '<b>Ignoradas $skipped entradas existentes</b>';
 $messages['opnotpermitted'] = '¡Operación no permitida!';
 $messages['nofromaddress'] = 'El contacto seleccionado no tiene dirección de e-mail';
 $messages['editorwarning'] = 'Cambiando a texto plano perderá el formato del mensaje. ¿Desea continuar?';
 $messages['httpreceivedencrypterror'] = 'Ha ocurrido un error fatal de configuración. Contacte inmediatamente a su administrador. <b>Su mensaje no ha sido enviado.</b>';
-$messages['smtpconnerror'] = 'Error SMTP ($code): Ha fallado la conexión al servidor';
-$messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación';
-$messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from" ($msg)';
-$messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer remitente "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios';
+$messages['smtpconnerror'] = 'Error SMTP ($code): Ha fallado la conexión al servidor.';
+$messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación.';
+$messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from" ($msg).';
+$messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer destinatario "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios.';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email';
 $messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduzca el número de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.';
-$messages['internalerror'] = 'Ocurrió un error interno. Por favor, inténtalo de nuevo';
-$messages['contactdelerror'] = 'No se ha podido eliminar el contacto(s)';
-$messages['contactdeleted'] = 'Contacto(s) eliminado(s) correctamente';
+$messages['internalerror'] = 'Ocurrió un error interno. Por favor, inténtelo de nuevo.';
+$messages['contactdelerror'] = 'No se ha podido eliminar el/los contacto(s).';
+$messages['contactdeleted'] = 'Contacto(s) eliminado(s) correctamente.';
 $messages['contactrestoreerror'] = 'No se han podido restaurar los contactos borrados.';
 $messages['contactrestored'] = 'Los contactos se han restaurado con éxito.';
-$messages['groupdeleted'] = 'Grupo eliminado correctamente';
-$messages['grouprenamed'] = 'Grupo renombrado correctamente';
-$messages['groupcreated'] = 'Grupo creado correctamente';
+$messages['groupdeleted'] = 'Grupo eliminado correctamente.';
+$messages['grouprenamed'] = 'Grupo renombrado correctamente.';
+$messages['groupcreated'] = 'Grupo creado correctamente.';
 $messages['savedsearchdeleted'] = 'La búsqueda guardada se ha borrado con éxito.';
 $messages['savedsearchdeleteerror'] = 'No se ha podido borrar la búsqueda guardada.';
 $messages['savedsearchcreated'] = 'Se ha guardado correctamente la búsqueda.';
 $messages['savedsearchcreateerror'] = 'No se ha podido guardar la búsqueda.';
-$messages['messagedeleted'] = 'Mensaje(s) eliminado(s) correctamente';
-$messages['messagemoved'] = 'Mensaje(s) movido(s) correctamente';
-$messages['messagecopied'] = 'Mensaje(s) copiado(s) correctamente';
-$messages['messagemarked'] = 'Mensaje(s) marcado(s) correctamente';
-$messages['autocompletechars'] = 'Introduce al menos $min caracteres para autocompletar';
-$messages['autocompletemore'] = 'Se encontraron mas coincidencias. Favor de ingresar mas caracteres';
-$messages['namecannotbeempty'] = 'Hay que poner el nombre';
-$messages['nametoolong'] = 'El nombre es demasiado largo';
-$messages['folderupdated'] = 'Bandeja actualizada correctamente';
-$messages['foldercreated'] = 'Bandeja creada correctamente';
-$messages['invalidimageformat'] = 'No es un formato de imagen válido';
+$messages['messagedeleted'] = 'Mensaje(s) eliminado(s) correctamente.';
+$messages['messagemoved'] = 'Mensaje(s) movido(s) correctamente.';
+$messages['messagecopied'] = 'Mensaje(s) copiado(s) correctamente.';
+$messages['messagemarked'] = 'Mensaje(s) marcado(s) correctamente.';
+$messages['autocompletechars'] = 'Introduce al menos $min caracteres para autocompletar.';
+$messages['autocompletemore'] = 'Se encontraron mas coincidencias. Favor de ingresar mas caracteres.';
+$messages['namecannotbeempty'] = 'Hay que poner el nombre.';
+$messages['nametoolong'] = 'El nombre es demasiado largo.';
+$messages['folderupdated'] = 'Bandeja actualizada correctamente.';
+$messages['foldercreated'] = '.';
+$messages['invalidimageformat'] = 'No es un formato de imagen válido.';
 $messages['mispellingsfound'] = 'Se han detectado errores ortográficos en el mensaje.';
 $messages['parentnotwritable'] = 'No se puede crear/mover la carpeta a la carpeta superior elegida. No tiene permisos de acceso.';
-$messages['messagetoobig'] = 'Esta parte del mensaje es demasiada grande para procesarla';
+$messages['messagetoobig'] = 'Esta parte del mensaje es demasiada grande para procesarla.';
+$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.';
 
+?>
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 9215c3d70..01c372308 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Tere tulemast! See on $product.';
-$labels['username'] = 'Kasutajanimi';
-$labels['password'] = 'Parool';
-$labels['server'] = 'Server';
-$labels['login'] = 'Logi sisse';
-$labels['logout'] = 'Logi välja';
-$labels['mail'] = 'Postkast';
+
+// login page
+$labels['welcome']   = 'Tere tulemast! See on $product.';
+$labels['username']  = 'Kasutajanimi';
+$labels['password']  = 'Parool';
+$labels['server']    = 'Server';
+$labels['login']     = 'Logi sisse';
+
+// taskbar
+$labels['logout']   = 'Logi välja';
+$labels['mail']     = 'Postkast';
 $labels['settings'] = 'Seaded';
 $labels['addressbook'] = 'Aadressiraamat';
-$labels['inbox'] = 'Saabuvad';
+
+// mailbox names
+$labels['inbox']  = 'Saabuvad';
 $labels['drafts'] = 'Mustandid';
-$labels['sent'] = 'Saadetud';
-$labels['trash'] = 'Prügikast';
-$labels['junk'] = 'Rämps';
+$labels['sent']   = 'Saadetud';
+$labels['trash']  = 'Prügikast';
+$labels['junk']   = 'Rämps';
+
+// message listing
 $labels['subject'] = 'Pealkiri';
-$labels['from'] = 'Saatja';
-$labels['to'] = 'Saaja';
-$labels['cc'] = 'Koopia';
-$labels['bcc'] = 'Pimekoopia';
+$labels['from']    = 'Saatja';
+$labels['sender']  = 'Saatja';
+$labels['to']      = 'Saaja';
+$labels['cc']      = 'Koopia';
+$labels['bcc']     = 'Pimekoopia';
 $labels['replyto'] = 'Vastus aadressile';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Kuupäev';
-$labels['size'] = 'Suurus';
+$labels['date']    = 'Kuupäev';
+$labels['size']    = 'Suurus';
 $labels['priority'] = 'Tähtsus';
 $labels['organization'] = 'Organisatsioon';
 $labels['readstatus'] = 'Lugemise staatus';
 $labels['listoptions'] = 'Nimekirja valikud…';
+
 $labels['mailboxlist'] = 'Kaustad';
-$labels['folders'] = 'Kaustad';
 $labels['messagesfromto'] = 'Kirjed $from kuni $to, kokku $count';
 $labels['threadsfromto'] = 'Lõimed $from kuni $to, kokku $count';
 $labels['messagenrof'] = 'Kiri $nr, kokku $count';
 $labels['fromtoshort'] = '$from – $to kokku $count';
-$labels['copy'] = 'Kopeeri';
-$labels['move'] = 'Liiguta';
-$labels['moveto'] = 'liiguta kausta...';
+
+$labels['copy']     = 'Kopeeri';
+$labels['move']     = 'Liiguta';
+$labels['moveto']   = 'liiguta kausta...';
 $labels['download'] = 'laadi arvutisse';
+$labels['showattachment'] = 'Näita';
+$labels['showanyway'] = 'Näita ikka';
+
 $labels['filename'] = 'Faili nimi';
 $labels['filesize'] = 'Faili suurus';
+
 $labels['addtoaddressbook'] = 'Lisa aadressiraamatusse';
+
+// weekdays short
 $labels['sun'] = 'P';
 $labels['mon'] = 'E';
 $labels['tue'] = 'T';
@@ -61,74 +80,83 @@ $labels['wed'] = 'K';
 $labels['thu'] = 'N';
 $labels['fri'] = 'R';
 $labels['sat'] = 'L';
-$labels['sunday'] = 'Pühapäev';
-$labels['monday'] = 'Esmaspäev';
-$labels['tuesday'] = 'Teisipäev';
+
+// weekdays long
+$labels['sunday']    = 'Pühapäev';
+$labels['monday']    = 'Esmaspäev';
+$labels['tuesday']   = 'Teisipäev';
 $labels['wednesday'] = 'Kolmapäev';
-$labels['thursday'] = 'Neljapäev';
-$labels['friday'] = 'Reede';
-$labels['saturday'] = 'Laupäev';
-$labels['jan'] = 'jaan';
-$labels['feb'] = 'veebr';
-$labels['mar'] = 'märts';
-$labels['apr'] = 'apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'juuni';
-$labels['jul'] = 'juuli';
-$labels['aug'] = 'aug';
-$labels['sep'] = 'sept';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'dets';
-$labels['longjan'] = 'Jaanuar';
-$labels['longfeb'] = 'Veebruar';
-$labels['longmar'] = 'Märts';
-$labels['longapr'] = 'Aprill';
-$labels['longjun'] = 'Juuni';
-$labels['longjul'] = 'Juuli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktoober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Detsember';
+$labels['thursday']  = 'Neljapäev';
+$labels['friday']    = 'Reede';
+$labels['saturday']  = 'Laupäev';
+
+// months short
+$labels['jan']	= 'jaan';
+$labels['feb']	= 'veebr';
+$labels['mar']	= 'märts';
+$labels['apr']	= 'apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'juuni';
+$labels['jul'] 	= 'juuli';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sept';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dets';
+
+// months long
+$labels['longjan']	= 'Jaanuar';
+$labels['longfeb']	= 'Veebruar';
+$labels['longmar']	= 'Märts';
+$labels['longapr']	= 'Aprill';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juuni';
+$labels['longjul']	= 'Juuli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktoober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Detsember';
+
 $labels['today'] = 'Täna';
-$labels['refresh'] = 'Värskenda';
-$labels['checkmail'] = 'Kontrolli uusi kirju';
-$labels['compose'] = 'Koosta kiri';
-$labels['writenewmessage'] = 'Kirjuta uus kiri';
-$labels['reply'] = 'Vasta';
-$labels['replytomessage'] = 'Vasta kirjale';
+
+// toolbar buttons
+$labels['refresh']          = 'Värskenda';
+$labels['checkmail']        = 'Kontrolli uusi kirju';
+$labels['compose']          = 'Koosta kiri';
+$labels['writenewmessage']  = 'Kirjuta uus kiri';
+$labels['reply']            = 'Vasta';
+$labels['replytomessage']   = 'Vasta kirjale';
 $labels['replytoallmessage'] = 'Vasta saatjale ja teistele kirja saanutele';
-$labels['replyall'] = 'Vasta kõigile';
-$labels['replylist'] = 'Vasta meilinglisti';
-$labels['forward'] = 'Edasta';
-$labels['forwardinline'] = 'Edasta kirja sees';
+$labels['replyall']         = 'Vasta kõigile';
+$labels['replylist']        = 'Vasta meilinglisti';
+$labels['forward']          = 'Edasta';
+$labels['forwardinline']    = 'Edasta kirja sees';
 $labels['forwardattachment'] = 'Edasta manusena';
-$labels['forwardmessage'] = 'Edasta see kiri';
-$labels['deletemessage'] = 'Kustuta kiri';
+$labels['forwardmessage']   = 'Edasta see kiri';
+$labels['deletemessage']    = 'Kustuta kiri';
 $labels['movemessagetotrash'] = 'Liiguta kiri prügikasti';
-$labels['printmessage'] = 'Trüki kiri';
-$labels['previousmessage'] = 'Näita eelmist kirja';
-$labels['firstmessage'] = 'Näita esimest kirja';
-$labels['nextmessage'] = 'Näita järgmist kirja';
-$labels['lastmessage'] = 'Näita viimast kirja';
-$labels['backtolist'] = 'Tagasi kirjade nimekirja';
-$labels['viewsource'] = 'Näita lähtekoodi';
-$labels['mark'] = 'Märgista';
-$labels['markmessages'] = 'Märgi kirjad';
-$labels['markread'] = 'Loetuks';
-$labels['markunread'] = 'Mitte loetuks';
-$labels['markflagged'] = 'Lisa lipik';
-$labels['markunflagged'] = 'Eemalda lipik';
-$labels['moreactions'] = 'Muud toimingud...';
-$labels['more'] = 'Rohkem';
-$labels['back'] = 'Tagasi';
-$labels['options'] = 'Valikud';
+$labels['printmessage']     = 'Trüki kiri';
+$labels['previousmessage']  = 'Näita eelmist kirja';
+$labels['firstmessage']     = 'Näita esimest kirja';
+$labels['nextmessage']      = 'Näita järgmist kirja';
+$labels['lastmessage']      = 'Näita viimast kirja';
+$labels['backtolist']       = 'Tagasi kirjade nimekirja';
+$labels['viewsource']       = 'Näita lähtekoodi';
+$labels['mark']             = 'Märgista';
+$labels['markmessages']     = 'Märgi kirjad';
+$labels['markread']         = 'Loetuks';
+$labels['markunread']       = 'Mitte loetuks';
+$labels['markflagged']      = 'Lisa lipik';
+$labels['markunflagged']    = 'Eemalda lipik';
+$labels['moreactions']      = 'Muud toimingud...';
+$labels['more']             = 'Rohkem';
+$labels['back']             = 'Tagasi';
+$labels['options']          = 'Valikud';
+
 $labels['select'] = 'Vali';
 $labels['all'] = 'kõik';
 $labels['none'] = 'Puudub';
-$labels['nonesort'] = 'Puudub';
 $labels['currpage'] = 'Praegune leht';
 $labels['unread'] = 'Lugemata';
 $labels['flagged'] = 'Märgistatud';
@@ -143,12 +171,14 @@ $labels['expand-all'] = 'Laienda kõik';
 $labels['expand-unread'] = 'Laienda lugemata';
 $labels['collapse-all'] = 'Pane kõik kokku';
 $labels['threaded'] = 'Lõimedena';
+
 $labels['autoexpand_threads'] = 'Laienda kirjade lõimed';
 $labels['do_expand'] = 'kõik lõimed';
 $labels['expand_only_unread'] = 'ainult lugemata kirjadega';
 $labels['fromto'] = 'Saatja/saaja';
 $labels['flag'] = 'Märgista';
 $labels['attachment'] = 'Manus';
+$labels['nonesort'] = 'Puudub';
 $labels['sentdate'] = 'Saatmise kuupäev';
 $labels['arrival'] = 'Saamise kuupäev';
 $labels['asc'] = 'kasvavalt';
@@ -157,176 +187,211 @@ $labels['listcolumns'] = 'Näita veerge';
 $labels['listsorting'] = 'Järjestus veerg';
 $labels['listorder'] = 'Järjestus suund';
 $labels['listmode'] = 'Nimekirja vaatamise režiim';
+
 $labels['folderactions'] = 'Kausta tegevused...';
 $labels['compact'] = 'Tihenda';
 $labels['empty'] = 'Tühjenda';
+
 $labels['quota'] = 'Kettakasutus';
-$labels['unknown'] = 'teadmata';
-$labels['unlimited'] = 'piiramatu';
-$labels['quicksearch'] = 'Kiirotsing';
-$labels['resetsearch'] = 'Lähtesta otsing';
-$labels['searchmod'] = 'Otsingu laiendid';
-$labels['msgtext'] = 'Kogu kirjast';
+$labels['unknown']  = 'teadmata';
+$labels['unlimited']  = 'piiramatu';
+
+$labels['quicksearch']  = 'Kiirotsing';
+$labels['resetsearch']  = 'Lähtesta otsing';
+$labels['searchmod']  = 'Otsingu laiendid';
+$labels['msgtext']  = 'Kogu kirjast';
+$labels['body']  = 'Keha';
+
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
-$labels['editasnew'] = 'Kasuta uue kirja põhjana';
-$labels['send'] = 'Saada';
-$labels['sendmessage'] = 'Saada kiri kohe';
-$labels['savemessage'] = 'Salvesta mustand';
-$labels['addattachment'] = 'Lisa fail';
-$labels['charset'] = 'Märgistik';
-$labels['editortype'] = 'Redaktori tüüp';
-$labels['returnreceipt'] = 'Kättesaamiskinnitus';
-$labels['dsn'] = 'Kohalejõudmise teavitus';
+
+// message compose
+$labels['editasnew']      = 'Kasuta uue kirja põhjana';
+$labels['send']           = 'Saada';
+$labels['sendmessage']    = 'Saada kiri kohe';
+$labels['savemessage']    = 'Salvesta mustand';
+$labels['addattachment']  = 'Lisa fail';
+$labels['charset']        = 'Märgistik';
+$labels['editortype']     = 'Redaktori tüüp';
+$labels['returnreceipt']  = 'Kättesaamiskinnitus';
+$labels['dsn']            = 'Kohalejõudmise teavitus';
 $labels['mailreplyintro'] = '$date kirjutas $sender:';
 $labels['originalmessage'] = 'Esialgne kiri';
-$labels['editidents'] = 'Muuda Identiteete';
-$labels['spellcheck'] = 'Õigekiri';
+
+$labels['editidents']    = 'Muuda Identiteete';
+$labels['spellcheck']    = 'Õigekiri';
 $labels['checkspelling'] = 'Kontrolli õigekirja';
 $labels['resumeediting'] = 'Jätka muutmist';
-$labels['revertto'] = 'Pööra tagasi';
+$labels['revertto']      = 'Pööra tagasi';
+
 $labels['attach'] = 'Manusta';
 $labels['attachments'] = 'Manused';
 $labels['upload'] = 'Kinnita manus';
 $labels['uploadprogress'] = '$percent ($current, kokku $total)';
-$labels['close'] = 'Sulge';
-$labels['messageoptions'] = 'Kirja valikud...';
-$labels['low'] = 'Madal';
-$labels['lowest'] = 'Madalaim';
-$labels['normal'] = 'Tavaline';
-$labels['high'] = 'Kõrge';
+$labels['close']  = 'Sulge';
+$labels['messageoptions']  = 'Kirja valikud...';
+
+$labels['low']     = 'Madal';
+$labels['lowest']  = 'Madalaim';
+$labels['normal']  = 'Tavaline';
+$labels['high']    = 'Kõrge';
 $labels['highest'] = 'Kõrgeim';
-$labels['nosubject'] = '(teema puudub)';
+
+$labels['nosubject']  = '(teema puudub)';
 $labels['showimages'] = 'Näita pilte';
 $labels['alwaysshow'] = 'Näita alati $sender saadetud pilte';
-$labels['isdraft'] = 'See on mustand.';
-$labels['andnmore'] = '$nr veel…';
+$labels['isdraft']    = 'See on mustand.';
+$labels['andnmore']   = '$nr veel…';
 $labels['togglemoreheaders'] = 'Näita rohkem kirja päiseid';
 $labels['togglefullheaders'] = 'Näita/peida algseid päiseid';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Lihttekst';
 $labels['savesentmessagein'] = 'Salvesta saadetud kirjad kausta';
 $labels['dontsave'] = 'ära salvesta';
 $labels['maxuploadsize'] = 'Faili maksimaalne lubatud suurus on $size';
+
 $labels['addcc'] = 'Lisa koopia';
 $labels['addbcc'] = 'Lisa pimekoopia';
 $labels['addreplyto'] = 'Lisa vastus aadressile';
 $labels['addfollowupto'] = 'Lisa Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Selle kirja saatja soovib saada kinnitust kirja lugemise kohta. Kas soovid kinnituse saata?';
 $labels['receiptread'] = 'Kättesaamiskinnitus (leotud)';
 $labels['yourmessage'] = 'See on sinu saadetud kirja kättesaamiskinnitus';
 $labels['receiptnote'] = 'Märkus: Kättesaamiskinnituse saamine tähendab ainult seda, et saaja on kirja avanud. Pole mingit garantiid, et ta kirja tegelikult luges ja selle sisust aru sai.';
-$labels['name'] = 'Näidatav nimi';
-$labels['firstname'] = 'Eesnimi';
-$labels['surname'] = 'Perekonnanimi';
-$labels['middlename'] = 'Keskmine nimi';
-$labels['nameprefix'] = 'Eesliide';
-$labels['namesuffix'] = 'Järelliide';
-$labels['nickname'] = 'Hüüdnimi';
-$labels['jobtitle'] = 'Töökoht';
-$labels['department'] = 'Osakond';
-$labels['gender'] = 'Sugu';
-$labels['maidenname'] = 'Neiupõlve nimi';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Aadress';
-$labels['street'] = 'Tänav';
-$labels['locality'] = 'Linn';
-$labels['zipcode'] = 'Postiindeks';
-$labels['region'] = 'Piirkond';
-$labels['country'] = 'Riik';
-$labels['birthday'] = 'Sünnipäev';
-$labels['anniversary'] = 'Tähtpäev';
-$labels['website'] = 'Veebileht';
+
+// address boook
+$labels['name']         = 'Näidatav nimi';
+$labels['firstname']    = 'Eesnimi';
+$labels['surname']      = 'Perekonnanimi';
+$labels['middlename']   = 'Keskmine nimi';
+$labels['nameprefix']   = 'Eesliide';
+$labels['namesuffix']   = 'Järelliide';
+$labels['nickname']     = 'Hüüdnimi';
+$labels['jobtitle']     = 'Töökoht';
+$labels['department']   = 'Osakond';
+$labels['gender']       = 'Sugu';
+$labels['maidenname']   = 'Neiupõlve nimi';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Aadress';
+$labels['street']       = 'Tänav';
+$labels['locality']     = 'Linn';
+$labels['zipcode']      = 'Postiindeks';
+$labels['region']       = 'Piirkond';
+$labels['country']      = 'Riik';
+$labels['birthday']     = 'Sünnipäev';
+$labels['anniversary']  = 'Tähtpäev';
+$labels['website']      = 'Veebileht';
 $labels['instantmessenger'] = 'Kiirsuhtlus';
 $labels['notes'] = 'Märkused';
-$labels['male'] = 'mees';
+$labels['male']   = 'mees';
 $labels['female'] = 'naine';
 $labels['manager'] = 'Juht';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Abikaasa';
 $labels['allfields'] = 'Kõik väljad';
 $labels['search'] = 'Otsi';
 $labels['advsearch'] = 'Täpsem otsing';
 $labels['advanced'] = 'Edasijõudnutele';
 $labels['other'] = 'Muu';
-$labels['typeother'] = 'Muu';
-$labels['typehome'] = 'Kodu';
-$labels['typework'] = 'Töö';
-$labels['typemobile'] = 'Mobiil';
-$labels['typemain'] = 'Peamine';
-$labels['typehomefax'] = 'Kodune fax';
-$labels['typeworkfax'] = 'Töö fax';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Piipar';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Veebileht';
+
+$labels['typehome']   = 'Kodu';
+$labels['typework']   = 'Töö';
+$labels['typeother']  = 'Muu';
+$labels['typemobile']  = 'Mobiil';
+$labels['typemain']  = 'Peamine';
+$labels['typehomefax']  = 'Kodune fax';
+$labels['typeworkfax']  = 'Töö fax';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Piipar';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Veebileht';
 $labels['typeblog'] = 'Ajaveeb';
 $labels['typeprofile'] = 'Profiil';
+
 $labels['addfield'] = 'Lisa väli...';
 $labels['addcontact'] = 'Uue kontakti lisamine';
 $labels['editcontact'] = 'Muuda kontakti';
 $labels['contacts'] = 'Kontaktid';
 $labels['contactproperties'] = 'Kontakti omadused';
 $labels['personalinfo'] = 'Isiklik info';
-$labels['edit'] = 'Muuda';
+
+$labels['edit']   = 'Muuda';
 $labels['cancel'] = 'Katkesta';
-$labels['save'] = 'Salvesta';
+$labels['save']   = 'Salvesta';
 $labels['delete'] = 'Kustuta';
 $labels['rename'] = 'Nimeta ümber';
 $labels['addphoto'] = 'Lisa';
 $labels['replacephoto'] = 'Asenda';
 $labels['uploadphoto'] = 'Lisa foto';
-$labels['newcontact'] = 'Uue sissekande loomine';
-$labels['deletecontact'] = 'Kustuta märgistatud kontaktid';
-$labels['composeto'] = 'Kirjuta kiri';
+
+$labels['newcontact']     = 'Uue sissekande loomine';
+$labels['deletecontact']  = 'Kustuta märgistatud kontaktid';
+$labels['composeto']      = 'Kirjuta kiri';
 $labels['contactsfromto'] = 'Kirjed $from kuni $to, kokku $count';
-$labels['print'] = 'Trüki';
-$labels['export'] = 'Ekspordi';
-$labels['exportvcards'] = 'Ekspordi kontaktid vCardi formaadis';
+$labels['print']          = 'Trüki';
+$labels['export']         = 'Ekspordi';
+$labels['exportall']      = 'Ekspordi kõik';
+$labels['exportsel']      = 'Ekspordi valitud';
+$labels['exportvcards']   = 'Ekspordi kontaktid vCardi formaadis';
 $labels['newcontactgroup'] = 'Loo uus kontaktigrupp';
-$labels['grouprename'] = 'Nimeta grupp ümber';
-$labels['groupdelete'] = 'Kustuta grupp';
+$labels['grouprename']    = 'Nimeta grupp ümber';
+$labels['groupdelete']    = 'Kustuta grupp';
 $labels['groupremoveselected'] = 'Eemalda valitud kontaktid grupist';
-$labels['previouspage'] = 'Näita eelmist lehte';
-$labels['firstpage'] = 'Näita esimest komplekti';
-$labels['nextpage'] = 'Näita järgmist lehte';
-$labels['lastpage'] = 'Näita viimast komplekti';
+
+$labels['previouspage']   = 'Näita eelmist lehte';
+$labels['firstpage']      = 'Näita esimest komplekti';
+$labels['nextpage']       = 'Näita järgmist lehte';
+$labels['lastpage']       = 'Näita viimast komplekti';
+
 $labels['group'] = 'Grupp';
 $labels['groups'] = 'Grupid';
 $labels['personaladrbook'] = 'Isiklikud aadressid';
+
 $labels['searchsave'] = 'Salvesta otsing';
 $labels['searchdelete'] = 'Kustuta otsing';
+
 $labels['import'] = 'Impordi';
 $labels['importcontacts'] = 'Impordi kontakte';
 $labels['importfromfile'] = 'Impordi failist:';
 $labels['importtarget'] = 'Lisa uued kontaktid aadressiraamatusse:';
 $labels['importreplace'] = 'Asenda kogu aadressiraamat';
+$labels['importdesc'] = 'Sa saad laadida kontakte olemasolevast aadressiraamatust.<br/>Praegu on võimalik importida <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> või CSV (komaga eraldatud) formaadis andmeid. ';
 $labels['done'] = 'Valmis';
+
+// settings
 $labels['settingsfor'] = 'Kasutajaeelistused kontole';
 $labels['about'] = 'Programmist lähemalt';
 $labels['preferences'] = 'Eelistused';
 $labels['userpreferences'] = 'Kasutaja eelistused';
 $labels['editpreferences'] = 'Muuda kasutaja eelistusi';
+
 $labels['identities'] = 'Identiteedid';
 $labels['manageidentities'] = 'Halda selle konto identiteete';
 $labels['newidentity'] = 'Uus identiteet';
+
 $labels['newitem'] = 'Uus sissekanne';
 $labels['edititem'] = 'Muuda sissekannet';
+
 $labels['preferhtml'] = 'Eelista HTMLi';
 $labels['defaultcharset'] = 'Vaikimisi märgistik';
 $labels['htmlmessage'] = 'HTML kirjad';
+$labels['messagepart'] = 'Osa';
+$labels['digitalsig'] = 'Digitaalne allkiri';
 $labels['dateformat'] = 'Kuupäeva vorming';
 $labels['timeformat'] = 'Aja vorming';
 $labels['prettydate'] = 'Kenad kuupäevad';
-$labels['setdefault'] = 'Muuda vaikeseadeks';
-$labels['autodetect'] = 'Automaatne';
-$labels['language'] = 'Keel';
-$labels['timezone'] = 'Ajavöönd';
-$labels['pagesize'] = 'Ridu lehe kohta';
+$labels['setdefault']  = 'Muuda vaikeseadeks';
+$labels['autodetect']  = 'Automaatne';
+$labels['language']  = 'Keel';
+$labels['timezone']  = 'Ajavöönd';
+$labels['pagesize']  = 'Ridu lehe kohta';
 $labels['signature'] = 'Allkiri';
-$labels['dstactive'] = 'Suveaeg';
+$labels['dstactive']  = 'Suveaeg';
 $labels['showinextwin'] = 'Ava kiri uues aknas';
 $labels['composeextwin'] = 'Koosta uues aknas';
 $labels['htmleditor'] = 'Kasuta HTML redaktorit';
@@ -355,10 +420,11 @@ $labels['showremoteimages'] = 'Näita kirjas kaugelt kaasatud pilte';
 $labels['fromknownsenders'] = 'tuntud saatjatelt';
 $labels['always'] = 'alati';
 $labels['showinlineimages'] = 'Näita manustatud pilte kirja all';
-$labels['autosavedraft'] = 'Salvesta mustandid automaatselt';
-$labels['everynminutes'] = 'iga $n minuti tagant';
-$labels['never'] = 'mitte kunagi';
-$labels['immediately'] = 'otsekohe';
+$labels['autosavedraft']  = 'Salvesta mustandid automaatselt';
+$labels['everynminutes']  = 'iga $n minuti tagant';
+$labels['refreshinterval']  = 'Värskenda (kontrolli uusi kirju, jne.)';
+$labels['never']  = 'mitte kunagi';
+$labels['immediately']  = 'otsekohe';
 $labels['messagesdisplaying'] = 'Kirjade näitamine';
 $labels['messagescomposition'] = 'Kirja koostamine';
 $labels['mimeparamfolding'] = 'Manuste nimed';
@@ -389,12 +455,12 @@ $labels['replysignaturepos'] = 'Vastates või edastades aseta allkiri';
 $labels['belowquote'] = 'tsiteeritu alla';
 $labels['abovequote'] = 'tsiteeritu kohale';
 $labels['insertsignature'] = 'Sisesta allkiri';
-$labels['previewpanemarkread'] = 'Märgi eelvaadatud kirjad loetuks';
-$labels['afternseconds'] = '$n sekundi pärast';
+$labels['previewpanemarkread']  = 'Märgi eelvaadatud kirjad loetuks';
+$labels['afternseconds']  = '$n sekundi pärast';
 $labels['reqmdn'] = 'Nõua alati kättesaamiskinnitust';
 $labels['reqdsn'] = 'Nõua alati kohalejõudmisteavitust';
 $labels['replysamefolder'] = 'Paiguta vastused samasse kausta, millele vastatakse';
-$labels['defaultaddressbook'] = 'Lisa kontaktid valitud aadressiraamatusse';
+$labels['defaultabook'] = 'Vaikimisi aadressiraamat';
 $labels['autocompletesingle'] = 'Automaatlõpetuses jäta alternatiivne e-posti aadress vahele';
 $labels['listnamedisplay'] = 'Näita kontakte kui';
 $labels['spellcheckbeforesend'] = 'Kontrolli õigekirja enne saatmist';
@@ -407,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Kasuta mailto: linkide avamisel';
 $labels['forwardmode'] = 'Kirja edastamine';
 $labels['inline'] = 'kirja sees';
 $labels['asattachment'] = 'manusena';
-$labels['folder'] = 'Kaust';
-$labels['foldername'] = 'Kausta nimi';
-$labels['subscribed'] = 'Näitan';
+
+$labels['folder']  = 'Kaust';
+$labels['folders']  = 'Kaustad';
+$labels['foldername']  = 'Kausta nimi';
+$labels['subscribed']  = 'Näitan';
 $labels['messagecount'] = 'Kirju';
-$labels['create'] = 'Loo';
-$labels['createfolder'] = 'Uue kausta loomine';
-$labels['managefolders'] = 'Halda kaustu';
+$labels['create']  = 'Loo';
+$labels['createfolder']  = 'Uue kausta loomine';
+$labels['managefolders']  = 'Halda kaustu';
 $labels['specialfolders'] = 'Erilised kaustad';
 $labels['properties'] = 'Omadused';
 $labels['folderproperties'] = 'Kausta omadused';
@@ -423,23 +491,29 @@ $labels['info'] = 'Teave';
 $labels['getfoldersize'] = 'Kliki kausta suuruse teadasaamiseks';
 $labels['changesubscription'] = 'Kliki kausta tellimuste muutmiseks';
 $labels['foldertype'] = 'Kausta tüüp';
-$labels['personalfolder'] = 'Isiklik kaust';
-$labels['otherfolder'] = 'Teiste kasutajate kaust';
-$labels['sharedfolder'] = 'Avalik kaust';
+$labels['personalfolder']  = 'Isiklik kaust';
+$labels['otherfolder']  = 'Teiste kasutajate kaust';
+$labels['sharedfolder']  = 'Avalik kaust';
+
 $labels['sortby'] = 'Järjesta';
-$labels['sortasc'] = 'Järjesta kasvavalt';
+$labels['sortasc']  = 'Järjesta kasvavalt';
 $labels['sortdesc'] = 'Järjesta kahanevalt';
 $labels['undo'] = 'Võta tagasi';
+
 $labels['installedplugins'] = 'Paigaldatud pluginad';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versioon';
 $labels['source'] = 'Allikas';
 $labels['license'] = 'Litsents';
 $labels['support'] = 'Küsi abi';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KiB';
 $labels['MB'] = 'MiB';
 $labels['GB'] = 'GiB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'inglise';
 $labels['westerneuropean'] = 'Lääne-Euroopa';
@@ -459,3 +533,4 @@ $labels['japanese'] = 'jaapani';
 $labels['korean'] = 'korea';
 $labels['chinese'] = 'hiina';
 
+?>
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 5a7916fb3..653b48be5 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ilmnes tõrge!';
-$messages['loginfailed'] = 'Sisselogimine ebaõnnestus';
+$messages['errortitle']  = 'Ilmnes tõrge!';
+$messages['loginfailed']  = 'Sisselogimine ebaõnnestus';
 $messages['cookiesdisabled'] = 'Sinu veebilehitseja ei võta präänikuid vastu';
 $messages['sessionerror'] = 'Sinu seanss on aegunud või vigane';
 $messages['storageerror'] = 'Ei õnnestunud IMAP serveriga ühendust luua';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Lubamatu serveri nimi.';
 $messages['nomessagesfound'] = 'Postkast paistab tühi olevat';
 $messages['loggedout'] = 'Sinu seanss on edukalt lõpetatud. Nägemiseni!';
 $messages['mailboxempty'] = 'Postkast on tühi';
+$messages['refreshing'] = 'Värskendamine…';
 $messages['loading'] = 'Laadin...';
 $messages['uploading'] = 'Laadin faili üles...';
 $messages['uploadingmany'] = 'Failide üleslaadimine...';
@@ -56,11 +60,11 @@ $messages['errormoving'] = 'Ei suutnud seda kirja liigutada';
 $messages['errorcopying'] = 'Kirju ei õnnestunud kopeerida';
 $messages['errordeleting'] = 'Ei suutnud seda kirja kustutada';
 $messages['errormarking'] = 'Kirja märkimine nurjus';
-$messages['deletecontactconfirm'] = 'Soovid valitud kontaktid kustutada?';
-$messages['deletegroupconfirm'] = 'Soovid valitud grupi kustutada?';
+$messages['deletecontactconfirm']  = 'Soovid valitud kontaktid kustutada?';
+$messages['deletegroupconfirm']  = 'Soovid valitud grupi kustutada?';
 $messages['deletemessagesconfirm'] = 'Soovid valitud kirja(d) kustutada?';
-$messages['deletefolderconfirm'] = 'Soovid selle kataloogi kindlasti kustutada?';
-$messages['purgefolderconfirm'] = 'Soovid sellest kaustast kõik kirjad kustutada?';
+$messages['deletefolderconfirm']  = 'Soovid selle kataloogi kindlasti kustutada?';
+$messages['purgefolderconfirm']  = 'Soovid sellest kaustast kõik kirjad kustutada?';
 $messages['contactdeleting'] = 'Kontakti(de) kustutamine…';
 $messages['groupdeleting'] = 'Grupi kustutamine…';
 $messages['folderdeleting'] = 'Kustutan kausta...';
@@ -69,11 +73,11 @@ $messages['foldersubscribing'] = 'Tellin kausta...';
 $messages['folderunsubscribing'] = 'Peatan kausta tellimuse...';
 $messages['formincomplete'] = 'Vormi kõik väljad ei ole täidetud';
 $messages['noemailwarning'] = 'Palun sisesta toimiv e-posti aadress';
-$messages['nonamewarning'] = 'Palun sisesta nimi';
+$messages['nonamewarning']  = 'Palun sisesta nimi';
 $messages['nopagesizewarning'] = 'Palun sisesta lehekülje suurus';
 $messages['nosenderwarning'] = 'Palun sisesta saatja e-posti aadress';
 $messages['norecipientwarning'] = 'Palun sisesta vähemalt üks adressaat';
-$messages['nosubjectwarning'] = 'Väli „Pealkiri“ on tühi. Soovid selle ära täita?';
+$messages['nosubjectwarning']  = 'Väli „Pealkiri“ on tühi. Soovid selle ära täita?';
 $messages['nobodywarning'] = 'Saadan selle kirja ilma tekstita?';
 $messages['notsentwarning'] = 'Kirja saatmine nurjus. Soovid selle ära visata?';
 $messages['noldapserver'] = 'Palun vali otsinguks LDAPi server';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Kontaktide lisamine gruppi õnnestus';
 $messages['contactremovedfromgroup'] = 'Kontaktide eemaldamine grupist õnnestus';
 $messages['nogroupassignmentschanged'] = 'Gruppide ülesandeid ei muudetud';
 $messages['importwait'] = 'Impordin, palun oota...';
+$messages['importformaterror'] = 'Import nurjus! Laaditud fail ei sisalda sobilikke andmeid.';
 $messages['importconfirm'] = '<b>Edukalt imporditud $inserted kontakti, $skipped olemasolevat sissekannet vahele jäetud</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b> $skipped olemasolevat kirjet jäeti vahele</b>';
 $messages['opnotpermitted'] = 'Tegevus pole lubatud!';
@@ -158,4 +163,7 @@ $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 24ab8465c..aad2bb9ba 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eu_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Asier Iturralde Sarasola                                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Ongi etorri $product';
-$labels['username'] = 'Erabiltzailea';
-$labels['password'] = 'Pasahitza';
-$labels['server'] = 'Zerbitzaria';
-$labels['login'] = 'Saio hasiera';
-$labels['logout'] = 'Irten';
-$labels['mail'] = 'ePosta';
+
+// login page
+$labels['welcome']   = 'Ongi etorri $product';
+$labels['username']  = 'Erabiltzailea';
+$labels['password']  = 'Pasahitza';
+$labels['server']    = 'Zerbitzaria';
+$labels['login']     = 'Saio hasiera';
+
+// taskbar
+$labels['logout']   = 'Irten';
+$labels['mail']     = 'ePosta';
 $labels['settings'] = 'Ezarpen Pertsonalak';
 $labels['addressbook'] = 'Helbide Liburua';
-$labels['inbox'] = 'Sarrera';
+
+// mailbox names
+$labels['inbox']  = 'Sarrera';
 $labels['drafts'] = 'Zirriborroak';
-$labels['sent'] = 'Bidalitakoak';
-$labels['trash'] = 'Zakarrontzia';
-$labels['junk'] = 'Zabor-posta';
+$labels['sent']   = 'Bidalitakoak';
+$labels['trash']  = 'Zakarrontzia';
+$labels['junk']   = 'Zabor-posta';
+
+// message listing
 $labels['subject'] = 'Gaia';
-$labels['from'] = 'Nork';
-$labels['to'] = 'Nori';
-$labels['cc'] = 'Kopia';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Nork';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Nori';
+$labels['cc']      = 'Kopia';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Erantzun-Honi';
 $labels['followupto'] = 'Jarraipena honi';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamaina';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamaina';
 $labels['priority'] = 'Lehentasuna';
 $labels['organization'] = 'Erakundea';
 $labels['readstatus'] = 'Irakurketaren egoera';
 $labels['listoptions'] = 'Zerrendaren aukerak...';
+
 $labels['mailboxlist'] = 'Karpetak';
-$labels['folders'] = 'Karpetak';
 $labels['messagesfromto'] = '$from -tik $to -ra $count mezuetatik';
 $labels['threadsfromto'] = '$from -etik $to -rako gaiak (guztira $count)';
 $labels['messagenrof'] = '$nr mezua $count -tik';
 $labels['fromtoshort'] = '$from - $to , guztira $count';
-$labels['copy'] = 'Kopia';
-$labels['move'] = 'Mugitu';
-$labels['moveto'] = 'mugitu hona...';
+
+$labels['copy']     = 'Kopia';
+$labels['move']     = 'Mugitu';
+$labels['moveto']   = 'mugitu hona...';
 $labels['download'] = 'deskargatu';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Fitxategi Izena';
 $labels['filesize'] = 'Fitxategi Tamaina';
+
 $labels['addtoaddressbook'] = 'Helbide liburura gehitu';
+
+// weekdays short
 $labels['sun'] = 'Iga';
 $labels['mon'] = 'Al';
 $labels['tue'] = 'As';
@@ -61,155 +80,323 @@ $labels['wed'] = 'Azt';
 $labels['thu'] = 'Og';
 $labels['fri'] = 'Or';
 $labels['sat'] = 'Lar';
-$labels['sunday'] = 'Igandea';
-$labels['monday'] = 'Astelehena';
-$labels['tuesday'] = 'Asteartea';
+
+// weekdays long
+$labels['sunday']    = 'Igandea';
+$labels['monday']    = 'Astelehena';
+$labels['tuesday']   = 'Asteartea';
 $labels['wednesday'] = 'Asteazkena';
-$labels['thursday'] = 'Osteguna';
-$labels['friday'] = 'Ostirala';
-$labels['saturday'] = 'Larunbata';
-$labels['jan'] = 'Urt';
-$labels['feb'] = 'Ots';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Api';
-$labels['may'] = 'Maiatza';
-$labels['longmay'] = 'Maiatza';
-$labels['jun'] = 'Eka';
-$labels['jul'] = 'Uzt';
-$labels['aug'] = 'Abu';
-$labels['sep'] = 'Ira';
-$labels['oct'] = 'Urr';
-$labels['nov'] = 'Aza';
-$labels['dec'] = 'Abe';
-$labels['longjan'] = 'Urtarrila';
-$labels['longfeb'] = 'Otsaila';
-$labels['longmar'] = 'Martxoa';
-$labels['longapr'] = 'Apirila';
-$labels['longjun'] = 'Ekaina';
-$labels['longjul'] = 'Uztaila';
-$labels['longaug'] = 'Abuztua';
-$labels['longsep'] = 'Iraila';
-$labels['longoct'] = 'Urria';
-$labels['longnov'] = 'Azaroa';
-$labels['longdec'] = 'Abendua';
+$labels['thursday']  = 'Osteguna';
+$labels['friday']    = 'Ostirala';
+$labels['saturday']  = 'Larunbata';
+
+// months short
+$labels['jan']	= 'Urt';
+$labels['feb']	= 'Ots';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Api';
+$labels['may']	= 'Maiatza';
+$labels['jun']	= 'Eka';
+$labels['jul'] 	= 'Uzt';
+$labels['aug']	= 'Abu';
+$labels['sep']	= 'Ira';
+$labels['oct']	= 'Urr';
+$labels['nov']	= 'Aza';
+$labels['dec']	= 'Abe';
+
+// months long
+$labels['longjan']	= 'Urtarrila';
+$labels['longfeb']	= 'Otsaila';
+$labels['longmar']	= 'Martxoa';
+$labels['longapr']	= 'Apirila';
+$labels['longmay']	= 'Maiatza';
+$labels['longjun']	= 'Ekaina';
+$labels['longjul']	= 'Uztaila';
+$labels['longaug']	= 'Abuztua';
+$labels['longsep']	= 'Iraila';
+$labels['longoct']	= 'Urria';
+$labels['longnov']	= 'Azaroa';
+$labels['longdec']	= 'Abendua';
+
 $labels['today'] = 'Gaur';
-$labels['refresh'] = 'Eguneratu';
-$labels['checkmail'] = 'Mezu berrien bila arakatu';
-$labels['compose'] = 'Mezu bat sortu';
-$labels['writenewmessage'] = 'Mezu berri bat sortu';
-$labels['reply'] = 'Erantzun';
-$labels['replytomessage'] = 'Mezuari erantzun';
+
+// toolbar buttons
+$labels['refresh']          = 'Eguneratu';
+$labels['checkmail']        = 'Mezu berrien bila arakatu';
+$labels['compose']          = 'Mezu bat sortu';
+$labels['writenewmessage']  = 'Mezu berri bat sortu';
+$labels['reply']            = 'Erantzun';
+$labels['replytomessage']   = 'Mezuari erantzun';
 $labels['replytoallmessage'] = 'Bidaltzaile eta hartzaile guztiei erantzun';
-$labels['replyall'] = 'Guztiei erantzun';
-$labels['replylist'] = 'Erantzun zerrenda';
-$labels['forward'] = 'Berbidali';
+$labels['replyall']         = 'Guztiei erantzun';
+$labels['replylist']        = 'Erantzun zerrenda';
+$labels['forward']          = 'Berbidali';
+$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Erantsi gisa berbidali';
-$labels['forwardmessage'] = 'Mezua Birbidali';
-$labels['deletemessage'] = 'Mezua ezabatu';
+$labels['forwardmessage']   = 'Mezua Birbidali';
+$labels['deletemessage']    = 'Mezua ezabatu';
 $labels['movemessagetotrash'] = 'Mezua zakarrontzira mugitu';
-$labels['printmessage'] = 'Mezu hau inprimatu';
-$labels['previousmessage'] = 'Aurreko mezua ikusi';
-$labels['firstmessage'] = 'Lehenengo mezua ikusi';
-$labels['nextmessage'] = 'Hurrengo mezua ikusi';
-$labels['lastmessage'] = 'Azken mezua ikusi';
-$labels['backtolist'] = 'Mezu zerrendara itzuli';
-$labels['viewsource'] = 'Jatorria bistarazi';
-$labels['mark'] = 'Markatu';
-$labels['markmessages'] = 'Markatu mezuak';
-$labels['markread'] = 'Irakurria bezala';
-$labels['markunread'] = 'Ez-irakurria bezala';
-$labels['markflagged'] = 'Markatua bezala';
-$labels['markunflagged'] = 'Ez-markatua bezala';
-$labels['moreactions'] = 'Ekintza gehiago...';
-$labels['more'] = 'Gehiago';
-$labels['back'] = 'Atzera';
-$labels['options'] = 'Aukerak';
+$labels['printmessage']     = 'Mezu hau inprimatu';
+$labels['previousmessage']  = 'Aurreko mezua ikusi';
+$labels['firstmessage']     = 'Lehenengo mezua ikusi';
+$labels['nextmessage']      = 'Hurrengo mezua ikusi';
+$labels['lastmessage']      = 'Azken mezua ikusi';
+$labels['backtolist']       = 'Mezu zerrendara itzuli';
+$labels['viewsource']       = 'Jatorria bistarazi';
+$labels['mark']             = 'Markatu';
+$labels['markmessages']     = 'Markatu mezuak';
+$labels['markread']         = 'Irakurria bezala';
+$labels['markunread']       = 'Ez-irakurria bezala';
+$labels['markflagged']      = 'Markatua bezala';
+$labels['markunflagged']    = 'Ez-markatua bezala';
+$labels['moreactions']      = 'Ekintza gehiago...';
+$labels['more']             = 'Gehiago';
+$labels['back']             = 'Atzera';
+$labels['options']          = 'Aukerak';
+
 $labels['select'] = 'Hautatu';
 $labels['all'] = 'Denak';
 $labels['none'] = 'Bat ere ez';
-$labels['nonesort'] = 'Bat ere ez';
 $labels['currpage'] = 'Uneko orrialdea';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['flagged'] = 'Banderaduna';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Bat ere ez';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Trinkotu';
 $labels['empty'] = 'Hustu';
+
 $labels['quota'] = 'Disko erabilera';
-$labels['unknown'] = 'ezezaguna';
-$labels['unlimited'] = 'mugagabea';
-$labels['quicksearch'] = 'Bilaketa azkarra';
-$labels['resetsearch'] = 'Bilaketa berrabiarazi';
-$labels['sendmessage'] = 'Mezua orain bidali';
-$labels['savemessage'] = 'Zirriborro hau gorde';
-$labels['addattachment'] = 'Fitxategia erantsi';
-$labels['charset'] = 'Karaktere jokoa';
-$labels['editortype'] = 'Editore mota';
-$labels['returnreceipt'] = 'Bidaltzaileari itzuli';
+$labels['unknown']  = 'ezezaguna';
+$labels['unlimited']  = 'mugagabea';
+
+$labels['quicksearch']  = 'Bilaketa azkarra';
+$labels['resetsearch']  = 'Bilaketa berrabiarazi';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Mezua orain bidali';
+$labels['savemessage']    = 'Zirriborro hau gorde';
+$labels['addattachment']  = 'Fitxategia erantsi';
+$labels['charset']        = 'Karaktere jokoa';
+$labels['editortype']     = 'Editore mota';
+$labels['returnreceipt']  = 'Bidaltzaileari itzuli';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Egiaztaketa ortografikoa';
 $labels['resumeediting'] = 'Editatzen jarraitu';
-$labels['revertto'] = 'Itzuli hona';
+$labels['revertto']      = 'Itzuli hona';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Eranskinak';
 $labels['upload'] = 'Igo';
-$labels['close'] = 'Itxi';
-$labels['low'] = 'Baxua';
-$labels['lowest'] = 'Baxuena';
-$labels['normal'] = 'Normala';
-$labels['high'] = 'Altua';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Itxi';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Baxua';
+$labels['lowest']  = 'Baxuena';
+$labels['normal']  = 'Normala';
+$labels['high']    = 'Altua';
 $labels['highest'] = 'Altuena';
-$labels['nosubject'] = '(gairik gabea)';
+
+$labels['nosubject']  = '(gairik gabea)';
 $labels['showimages'] = 'Irudiak bistarazi';
 $labels['alwaysshow'] = 'Beti ikusi $sender -en irudiak';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testu laua';
 $labels['savesentmessagein'] = 'Gorde mezua hemen';
 $labels['dontsave'] = 'ez gorde';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Gehitu Cc (kopia)';
 $labels['addbcc'] = 'Gehitu Bcc (kopia ezkutua)';
 $labels['addreplyto'] = 'Gehitu erantzun-honi';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Mezu honen bidaltzaileak mezua irakurtzen duzunean jakinaraztea eskatu du. Bidaltzailea ohartu nahi duzu?';
 $labels['receiptread'] = 'Itzulketa agiria (irakurria)';
 $labels['yourmessage'] = 'Hau zure mezuaren Itzulketa Agiria da';
 $labels['receiptnote'] = 'Oharra: Agiri honek hartzailearen ordenagailuan mezua ikusi dala adierazten du besterik gabe. Honek ez du esan nahi hartzaileak mezua irakurri edo/eta ulertu duenik:';
-$labels['name'] = 'Izena bistarazi';
-$labels['firstname'] = 'Izena';
-$labels['surname'] = 'Abizena';
-$labels['email'] = 'ePosta';
+
+// address boook
+$labels['name']         = 'Izena bistarazi';
+$labels['firstname']    = 'Izena';
+$labels['surname']      = 'Abizena';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'ePosta';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Txartel berria gehitu';
 $labels['editcontact'] = 'Txartela editatu';
-$labels['edit'] = 'Editatu';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Editatu';
 $labels['cancel'] = 'Utzi';
-$labels['save'] = 'Gorde';
+$labels['save']   = 'Gorde';
 $labels['delete'] = 'Ezabatu';
-$labels['newcontact'] = 'Helbide liburu txartel berria sortu';
-$labels['deletecontact'] = 'Aukeraturiko txartelak ezabatu';
-$labels['composeto'] = 'Bidali mezua honi:';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Helbide liburu txartel berria sortu';
+$labels['deletecontact']  = 'Aukeraturiko txartelak ezabatu';
+$labels['composeto']      = 'Bidali mezua honi:';
 $labels['contactsfromto'] = '$from -tik $to -ra $count txarteletatik';
-$labels['print'] = 'Inprimatu';
-$labels['export'] = 'Esportatu';
-$labels['previouspage'] = 'Aurreko sorta ikusi';
-$labels['firstpage'] = 'Lehenengo sorta ikusi';
-$labels['nextpage'] = 'Hurrengo sorta ikusi';
-$labels['lastpage'] = 'Azken sorta ikusi';
+$labels['print']          = 'Inprimatu';
+$labels['export']         = 'Esportatu';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Aurreko sorta ikusi';
+$labels['firstpage']      = 'Lehenengo sorta ikusi';
+$labels['nextpage']       = 'Hurrengo sorta ikusi';
+$labels['lastpage']       = 'Azken sorta ikusi';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Taldeak';
 $labels['personaladrbook'] = 'Helbide pertsonalak';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Honen ezarpenak:';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Hobespenak';
 $labels['userpreferences'] = 'Erabiltzaile hobespenak';
 $labels['editpreferences'] = 'Erabiltzaile hobespenak editatu';
+
 $labels['identities'] = 'Identitateak';
 $labels['manageidentities'] = 'Kontu honetako identitateak kudeatu';
 $labels['newidentity'] = 'Identitate berria';
+
 $labels['newitem'] = 'Elementu berria';
 $labels['edititem'] = 'Elementua Editatu';
+
 $labels['preferhtml'] = 'HTML nahiago';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Mezua';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Data politak';
-$labels['setdefault'] = 'Lehenespenak ezarri';
-$labels['language'] = 'Hizkuntza';
-$labels['timezone'] = 'Ordu zonaldea';
-$labels['pagesize'] = 'Lerro orrialdeko';
+$labels['setdefault']  = 'Lehenespenak ezarri';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Hizkuntza';
+$labels['timezone']  = 'Ordu zonaldea';
+$labels['pagesize']  = 'Lerro orrialdeko';
 $labels['signature'] = 'Sinadura';
-$labels['dstactive'] = 'Eguneko gordeketak';
+$labels['dstactive']  = 'Eguneko gordeketak';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML mezuak sortu';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML sinadura';
 $labels['previewpane'] = 'Aurrebista panela ikusi';
 $labels['skin'] = 'Azal-interfazea';
@@ -221,23 +408,129 @@ $labels['mailboxview'] = 'Postakutxatilaren ikuspegia';
 $labels['mdnrequests'] = 'Bidaltzailearen jakinarazpena';
 $labels['askuser'] = 'galdetu erabiltzaileari';
 $labels['autosend'] = 'bidali automatikoki';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ezikusi';
 $labels['readwhendeleted'] = 'Markatu mezua irakurrita bezala ezabatzerakoan';
 $labels['flagfordeletion'] = 'Markatu mezua ezabatzeko ezabatu beharrean';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
 $labels['showinlineimages'] = 'Erakutsi erantzitako irudiak mezuaren azpian';
-$labels['autosavedraft'] = 'Zirriborroa automatikoki gorde';
-$labels['never'] = 'inoiz ez';
+$labels['autosavedraft']  = 'Zirriborroa automatikoki gorde';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'inoiz ez';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Mezuak ikusi';
 $labels['messagescomposition'] = 'Mezuak sortu';
-$labels['folder'] = 'Karpeta';
-$labels['foldername'] = 'Karpeta izena';
-$labels['subscribed'] = 'Harpideturik';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Karpeta';
+$labels['folders']  = 'Karpetak';
+$labels['foldername']  = 'Karpeta izena';
+$labels['subscribed']  = 'Harpideturik';
 $labels['messagecount'] = 'Mezuak';
-$labels['create'] = 'Sortu';
-$labels['createfolder'] = 'Karpeta berria sortu';
-$labels['managefolders'] = 'Karpeta kudeaketa';
+$labels['create']  = 'Sortu';
+$labels['createfolder']  = 'Karpeta berria sortu';
+$labels['managefolders']  = 'Karpeta kudeaketa';
 $labels['specialfolders'] = 'Karpeta bereziak';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Honela ordenatu';
-$labels['sortasc'] = 'Goraka ordenatu';
+$labels['sortasc']  = 'Goraka ordenatu';
 $labels['sortdesc'] = 'Beheraka ordenatu';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index cbfe908bb..118f53ff6 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eu_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Saio sarrerak huts egin du';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Saio sarrerak huts egin du';
 $messages['cookiesdisabled'] = 'Zure nabigatzaileak ez ditu cookie-ak onartzen';
 $messages['sessionerror'] = 'Zure saioa baliogabea da edo iraungita dago';
 $messages['storageerror'] = 'Huts IMAP zerbitzarira konektatzean';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Ez da mezurik aurkitu posta kutxa honetan';
 $messages['loggedout'] = 'Saioa behar bezala amaitu duzu. Agur!';
 $messages['mailboxempty'] = 'Posta kutxa hutsik dago';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Kargatzen...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Datuak kargatzen...';
 $messages['checkingmail'] = 'Mezu berrien bila arakatzen...';
 $messages['sendingmessage'] = 'Mezua bidaltzen...';
@@ -32,35 +46,54 @@ $messages['messagesaved'] = 'Mezua zirriborroetan gordea';
 $messages['successfullysaved'] = 'Behar bezala gorde da';
 $messages['addedsuccessfully'] = 'Txartela behar bezala gehitu da helbide liburura';
 $messages['contactexists'] = 'ePosta honetako txartel bat badago dagoeneko';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Zure pribazitatea mantentzeko urruneko irudiak blokeatu egin dira.';
 $messages['encryptedmessage'] = 'Hau enkriptaturiko mezu bat da eta ezin da bistarazi. Barkatu!';
 $messages['nocontactsfound'] = 'Ez da txartelik aurkitu';
 $messages['contactnotfound'] = 'Eskatutako txartela ez da aurkitu';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Huts mezua bidaltzerakoan';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
 $messages['errorsavingsent'] = 'Errorea gertatu da bidalitako mezua gordetzean';
 $messages['errorsaving'] = 'Errore bat gertatu da gordetzean';
 $messages['errormoving'] = 'Ezin da mezua mugitu';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Ezin da mezua ezabatu';
-$messages['deletecontactconfirm'] = 'Benetan hautaturiko kontaktuak ezabatu nahi dituzula?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Benetan hautaturiko kontaktuak ezabatu nahi dituzula?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Benetan hautaturiko mezuak ezabatu nahi dituzula?';
-$messages['deletefolderconfirm'] = 'Benetan Karpeta hau ezabatu nahi duzu?';
-$messages['purgefolderconfirm'] = 'Benetan karpeta honetako mezu guziak ezabatu nahi dituzu?';
+$messages['deletefolderconfirm']  = 'Benetan Karpeta hau ezabatu nahi duzu?';
+$messages['purgefolderconfirm']  = 'Benetan karpeta honetako mezu guziak ezabatu nahi dituzu?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Inprimakia ez guztiz bete';
 $messages['noemailwarning'] = 'Mesedez idatzi baliozko eposta helbide bat';
-$messages['nonamewarning'] = 'Mesedez izen bat idatzi';
+$messages['nonamewarning']  = 'Mesedez izen bat idatzi';
 $messages['nopagesizewarning'] = 'Mesedez paper tamaina idatzi';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Mesedez behintzat hartzaile bat idatzi';
-$messages['nosubjectwarning'] = '"Gaia" eremua hutsik dago. Bat idatzi nahi al duzu?';
+$messages['nosubjectwarning']  = '"Gaia" eremua hutsik dago. Bat idatzi nahi al duzu?';
 $messages['nobodywarning'] = 'Testu gabeko mezu hau bidali?';
 $messages['notsentwarning'] = 'Mezua ez da bidali. Mezua ezeztatu nahi al duzu?';
 $messages['noldapserver'] = 'Mesedez hautatu bilaketa egiteko LDAP zerbitzari bat';
 $messages['nosearchname'] = 'Mesedez idatzi kontaktu izen bat edo eposta helbide bat';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr mezu aurkiturik';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Bilaketak ez du emaitzarik itzuli';
 $messages['searching'] = 'Bilatzen...';
 $messages['checking'] = 'Arakatzen...';
 $messages['nospellerrors'] = 'Ez da ortografia errorerik aurkitu';
 $messages['folderdeleted'] = 'Karpeta behar bezala ezabatu da';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Behar bezala ezabatu da';
 $messages['converting'] = 'Mezuaren formatua ezabatzen';
 $messages['messageopenerror'] = 'Ezin da zerbitzaritik mezua kargatu';
@@ -71,8 +104,66 @@ $messages['copyerror'] = 'Ezin da helbiderik kopiatu';
 $messages['sourceisreadonly'] = 'Helbide iturburua irakurtzeko soilik da';
 $messages['errorsavingcontact'] = 'Ezin da kontaktuaren helbidea gorde';
 $messages['movingmessage'] = 'Mezua mugitzen...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Ondo bidalia irakurritako agiria';
 $messages['errorsendingreceipt'] = 'Ezin da agiria bidali';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Ezin da izaera hau ezabatu, zure bakarra da';
 $messages['forbiddencharacter'] = 'Karpeta izenak debekatutako karaktereak ditu';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 09f672134..ae38105db 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_AF/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'به اين پروژه خوش امديد';
-$labels['username'] = 'نام کاربر';
-$labels['password'] = 'شفر';
-$labels['server'] = 'سرور';
-$labels['login'] = 'داخل شدن';
-$labels['logout'] = 'خروج';
-$labels['mail'] = 'ايميل';
+
+// login page
+$labels['welcome']   = 'به اين پروژه خوش امديد';
+$labels['username']  = 'نام کاربر';
+$labels['password']  = 'شفر';
+$labels['server']    = 'سرور';
+$labels['login']     = 'داخل شدن';
+
+// taskbar
+$labels['logout']   = 'خروج';
+$labels['mail']     = 'ايميل';
 $labels['settings'] = 'تنظیمات شخصی';
 $labels['addressbook'] = 'کتاب ادرس';
-$labels['inbox'] = 'نامه های ارسالي';
+
+// mailbox names
+$labels['inbox']  = 'نامه های ارسالي';
 $labels['drafts'] = 'نامه های ناتکمیل';
-$labels['sent'] = 'ارسال شده';
-$labels['trash'] = 'اشغال دانی';
-$labels['junk'] = 'بیکاره';
+$labels['sent']   = 'ارسال شده';
+$labels['trash']  = 'اشغال دانی';
+$labels['junk']   = 'بیکاره';
+
+// message listing
 $labels['subject'] = 'مضمون';
-$labels['from'] = 'ارسال کننده';
-$labels['to'] = 'ګيرينده';
-$labels['cc'] = 'تکثیر';
-$labels['bcc'] = 'تکثیر پنهان';
+$labels['from']    = 'ارسال کننده';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'ګيرينده';
+$labels['cc']      = 'تکثیر';
+$labels['bcc']     = 'تکثیر پنهان';
 $labels['replyto'] = 'جواب نامه';
-$labels['date'] = 'تاريخ';
-$labels['size'] = 'اندازه';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'تاريخ';
+$labels['size']    = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'تنظیمات';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'پوشه ها';
-$labels['folders'] = 'پوشه ها';
 $labels['messagesfromto'] = 'از  مقدار پيغام به مقدار حساب شده';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'از شمار پيغام های حساب شده';
-$labels['copy'] = 'تکثیر';
-$labels['moveto'] = 'انتقال بدهید به ...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'تکثیر';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'انتقال بدهید به ...';
 $labels['download'] = 'داونلود کردن';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'نام فايل';
 $labels['filesize'] = 'اندازه فايل';
+
 $labels['addtoaddressbook'] = 'در کتاب ادرس علاوه نماييد';
+
+// weekdays short
 $labels['sun'] = 'يکشنپبه';
 $labels['mon'] = 'دوشنبه';
 $labels['tue'] = 'سه شنبه';
@@ -55,154 +80,323 @@ $labels['wed'] = 'چهارشنبه';
 $labels['thu'] = 'پنج شنبه';
 $labels['fri'] = 'جمعه';
 $labels['sat'] = 'شنبه';
-$labels['sunday'] = 'يکشنبه';
-$labels['monday'] = 'دوشنبه';
-$labels['tuesday'] = 'سه شنبه';
+
+// weekdays long
+$labels['sunday']    = 'يکشنبه';
+$labels['monday']    = 'دوشنبه';
+$labels['tuesday']   = 'سه شنبه';
 $labels['wednesday'] = 'چهارشنبه';
-$labels['thursday'] = 'پنج شنبه';
-$labels['friday'] = 'جمعه';
-$labels['saturday'] = 'شنبه';
-$labels['jan'] = 'جنوری';
-$labels['feb'] = 'فبروری';
-$labels['mar'] = 'مارچ';
-$labels['apr'] = 'اپریل';
-$labels['may'] = 'می';
-$labels['longmay'] = 'می';
-$labels['jun'] = 'جون';
-$labels['jul'] = 'جولایی';
-$labels['aug'] = 'آگست';
-$labels['sep'] = 'سپتمبر';
-$labels['oct'] = 'اکتوبر';
-$labels['nov'] = 'نومبر';
-$labels['dec'] = 'دسمبر';
-$labels['longjan'] = 'جنوری';
-$labels['longfeb'] = 'فبروری';
-$labels['longmar'] = 'مارچ';
-$labels['longapr'] = 'اپریل';
-$labels['longjun'] = 'جون';
-$labels['longjul'] = 'جولایی';
-$labels['longaug'] = 'آگست';
-$labels['longsep'] = 'سپتمبر';
-$labels['longoct'] = 'اکتوبر';
-$labels['longnov'] = 'نومبر';
-$labels['longdec'] = 'دسمبر';
+$labels['thursday']  = 'پنج شنبه';
+$labels['friday']    = 'جمعه';
+$labels['saturday']  = 'شنبه';
+
+// months short
+$labels['jan']	= 'جنوری';
+$labels['feb']	= 'فبروری';
+$labels['mar']	= 'مارچ';
+$labels['apr']	= 'اپریل';
+$labels['may']	= 'می';
+$labels['jun']	= 'جون';
+$labels['jul'] 	= 'جولایی';
+$labels['aug']	= 'آگست';
+$labels['sep']	= 'سپتمبر';
+$labels['oct']	= 'اکتوبر';
+$labels['nov']	= 'نومبر';
+$labels['dec']	= 'دسمبر';
+
+// months long
+$labels['longjan']	= 'جنوری';
+$labels['longfeb']	= 'فبروری';
+$labels['longmar']	= 'مارچ';
+$labels['longapr']	= 'اپریل';
+$labels['longmay']	= 'می';
+$labels['longjun']	= 'جون';
+$labels['longjul']	= 'جولایی';
+$labels['longaug']	= 'آگست';
+$labels['longsep']	= 'سپتمبر';
+$labels['longoct']	= 'اکتوبر';
+$labels['longnov']	= 'نومبر';
+$labels['longdec']	= 'دسمبر';
+
 $labels['today'] = 'امروز';
-$labels['checkmail'] = 'بررسي کردن پيغام های جديد';
-$labels['compose'] = 'نوشتن پیام حدید';
-$labels['writenewmessage'] = 'ساختن پيغام جديد';
-$labels['replytomessage'] = 'جواب دادن به پيغام';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'بررسي کردن پيغام های جديد';
+$labels['compose']          = 'نوشتن پیام حدید';
+$labels['writenewmessage']  = 'ساختن پيغام جديد';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'جواب دادن به پيغام';
 $labels['replytoallmessage'] = 'به فرستنده و تمام گيرينده ها جواب بدهيد';
-$labels['forwardmessage'] = 'فرستادن این پیام به دیگران / فارورد';
-$labels['deletemessage'] = 'حذف کردن پيغام';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'فرستادن این پیام به دیگران / فارورد';
+$labels['deletemessage']    = 'حذف کردن پيغام';
 $labels['movemessagetotrash'] = 'پيغام را به اشيآيي حذف شده منتقل نماييد';
-$labels['printmessage'] = 'اين پيغام را چاپ کنيد';
-$labels['previousmessage'] = 'پيغام قبلي را نشان دهيد';
-$labels['firstmessage'] = 'پيغام اولي را نشان دهيد';
-$labels['nextmessage'] = 'پيغام بعدي رانشان دهيد';
-$labels['lastmessage'] = 'پيغام اخير را نشان دهيد';
-$labels['backtolist'] = 'بازگشتن به لست پيغام';
-$labels['viewsource'] = 'منبع / کود را نشان دهيد';
-$labels['markmessages'] = 'پيغام ها را نشاني کنيد';
-$labels['markread'] = 'مانند خوانده شده';
-$labels['markunread'] = 'مانند خوانده نشده';
-$labels['markflagged'] = 'مانند نشانی شده';
-$labels['markunflagged'] = 'مانند نشانی ناشده';
+$labels['printmessage']     = 'اين پيغام را چاپ کنيد';
+$labels['previousmessage']  = 'پيغام قبلي را نشان دهيد';
+$labels['firstmessage']     = 'پيغام اولي را نشان دهيد';
+$labels['nextmessage']      = 'پيغام بعدي رانشان دهيد';
+$labels['lastmessage']      = 'پيغام اخير را نشان دهيد';
+$labels['backtolist']       = 'بازگشتن به لست پيغام';
+$labels['viewsource']       = 'منبع / کود را نشان دهيد';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'پيغام ها را نشاني کنيد';
+$labels['markread']         = 'مانند خوانده شده';
+$labels['markunread']       = 'مانند خوانده نشده';
+$labels['markflagged']      = 'مانند نشانی شده';
+$labels['markunflagged']    = 'مانند نشانی ناشده';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'انتخاب کردن';
 $labels['all'] = 'تمام';
 $labels['none'] = 'هيچ کدام';
-$labels['nonesort'] = 'هيچ کدام';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
 $labels['filter'] = 'تصفیه کردن';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'هيچ کدام';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'خلاصه';
 $labels['empty'] = 'خالي';
+
 $labels['quota'] = '‌طريقه استعمال ديسک';
-$labels['unknown'] = 'نامعلوم';
-$labels['unlimited'] = 'نامعين/ نامحدود';
-$labels['quicksearch'] = 'جستجوی سریع';
-$labels['resetsearch'] = 'بازنشاندن جستجو';
+$labels['unknown']  = 'نامعلوم';
+$labels['unlimited']  = 'نامعين/ نامحدود';
+
+$labels['quicksearch']  = 'جستجوی سریع';
+$labels['resetsearch']  = 'بازنشاندن جستجو';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
-$labels['sendmessage'] = 'پيغام را همين حالا ارسال کنيد';
-$labels['savemessage'] = 'این پیش نویس را حفظ نمایید';
-$labels['addattachment'] = 'ضميمه نمودن يک فايل';
-$labels['charset'] = 'ست کرکتر ها';
-$labels['editortype'] = 'روش تصحیح کننده / نوشتاری';
-$labels['returnreceipt'] = 'رسید برای مراجعت نامه';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'پيغام را همين حالا ارسال کنيد';
+$labels['savemessage']    = 'این پیش نویس را حفظ نمایید';
+$labels['addattachment']  = 'ضميمه نمودن يک فايل';
+$labels['charset']        = 'ست کرکتر ها';
+$labels['editortype']     = 'روش تصحیح کننده / نوشتاری';
+$labels['returnreceipt']  = 'رسید برای مراجعت نامه';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'املا را بررسي کنيد';
 $labels['resumeediting'] = 'ادامه / بازگشت به تصحیی کردن / نوشتن';
-$labels['revertto'] = 'رجوع کردن به';
+$labels['revertto']      = 'رجوع کردن به';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ضميمه ها';
 $labels['upload'] = 'اپلود کردن';
-$labels['close'] = 'بستن';
-$labels['low'] = 'کم';
-$labels['lowest'] = 'کمترین';
-$labels['normal'] = 'عادی';
-$labels['high'] = 'عالي';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'بستن';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'کم';
+$labels['lowest']  = 'کمترین';
+$labels['normal']  = 'عادی';
+$labels['high']    = 'عالي';
 $labels['highest'] = 'عاليترين';
-$labels['nosubject'] = 'مضمون ندارد';
+
+$labels['nosubject']  = 'مضمون ندارد';
 $labels['showimages'] = 'نمايش دادن تصاوير';
 $labels['alwaysshow'] = 'همیشه نشان بده تصاویر را از این فرسیتنده﷼';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ایچ تی ام ایل';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'پیام ارسال شده را ذخیره کن در';
 $labels['dontsave'] = 'ذخیره نکنید';
 $labels['maxuploadsize'] = '$sizeزیاد ترین اندازه اجازه داده شده فایل عبارت است از';
+
 $labels['addcc'] = 'نسخیه دوم  را علاوه کنید';
 $labels['addbcc'] = 'نسخه پنهان را علاوه کنید';
 $labels['addreplyto'] = 'علاوه کردن';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'فرستانده این پیام خواهش نموده زمانیکه شما نامه را خواندید براش آگاهی داده شود آيا شما ميخواهيد که فرستنده را آګاه سازيد';
 $labels['receiptread'] = 'بازگشت رسید (خوانده شده)';
 $labels['yourmessage'] = 'برای پيغام شما اين يک رسید بازگشت است';
 $labels['receiptnote'] = 'يادداشت : اين رسيد شما را فقط اګاه ميسازد که پيغام به کامپیوتر گیرنده نمایش داده شده است  هیچ گارنتی وجود ندارد که گیرنده پیام این پیام را خوانده و یا مطالب آن را درک کرده باشد.';
-$labels['name'] = 'نشان دادن نام';
-$labels['firstname'] = 'اسم/ نام';
-$labels['surname'] = 'اسم فاميلي / تخلص';
-$labels['email'] = 'ايميل';
+
+// address boook
+$labels['name']         = 'نشان دادن نام';
+$labels['firstname']    = 'اسم/ نام';
+$labels['surname']      = 'اسم فاميلي / تخلص';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'ايميل';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'آدرس جديد را علاوه کنيد';
 $labels['editcontact'] = 'آدرس جدید را تصحیح کنید';
-$labels['edit'] = 'تصحيح کردن';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'تصحيح کردن';
 $labels['cancel'] = 'لغو کردن/ حذف کردن';
-$labels['save'] = 'حفظ کردن';
+$labels['save']   = 'حفظ کردن';
 $labels['delete'] = 'حذف کردن';
-$labels['newcontact'] = 'کارت تماس جديد را بسازيد';
-$labels['deletecontact'] = 'آدرس های انتخاب شده را حذف کنيد';
-$labels['composeto'] = 'ايمیل را نوشته کنيد به';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'کارت تماس جديد را بسازيد';
+$labels['deletecontact']  = 'آدرس های انتخاب شده را حذف کنيد';
+$labels['composeto']      = 'ايمیل را نوشته کنيد به';
 $labels['contactsfromto'] = 'از$count$to به $from آدرس ها از';
-$labels['print'] = 'چاپ کردن';
-$labels['export'] = 'صادر کردن';
-$labels['exportvcards'] = 'صادر نماییدVcardآدرس ها را به فرمت';
-$labels['previouspage'] = 'بسته قبلي را نشان دهيد';
-$labels['firstpage'] = 'بسته اولي را نشان دهيد';
-$labels['nextpage'] = 'بسته بعدي را نشان دهيد';
-$labels['lastpage'] = 'بسته اخير را نشان دهيد';
+$labels['print']          = 'چاپ کردن';
+$labels['export']         = 'صادر کردن';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'صادر نماییدVcardآدرس ها را به فرمت';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'بسته قبلي را نشان دهيد';
+$labels['firstpage']      = 'بسته اولي را نشان دهيد';
+$labels['nextpage']       = 'بسته بعدي را نشان دهيد';
+$labels['lastpage']       = 'بسته اخير را نشان دهيد';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'گروه ها';
 $labels['personaladrbook'] = 'ادرس های شخصي';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'آدرس ها را وارد نمایید';
 $labels['importfromfile'] = 'از یک فایل وارد نمایید';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'تمام کتاب آدرس ها را عوض نمایید';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'اجرا شد';
+
+// settings
 $labels['settingsfor'] = 'تنظیمات برای';
+$labels['about'] = 'About';
 $labels['preferences'] = 'ترجيحات';
 $labels['userpreferences'] = 'ترجيحات کاربر';
 $labels['editpreferences'] = 'تصحيح کردن ترجيحات  کاربر';
+
 $labels['identities'] = 'شناخت ها';
 $labels['manageidentities'] = 'اداره کردن شناسای ها برای اين آدرس';
 $labels['newidentity'] = 'شناخت جديد';
+
 $labels['newitem'] = 'فقره جديد';
 $labels['edititem'] = 'تصحيح کردن فقره';
+
 $labels['preferhtml'] = 'نشان دادن ايچ ټي ام ايل';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'پيغام ايچ ټي‌ام ايل';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'تاريخ های مهم';
-$labels['setdefault'] = 'بطور همیشگی انتخاب نمایید';
-$labels['autodetect'] = 'اتومات';
-$labels['language'] = 'لسان';
-$labels['timezone'] = 'ناحيه زمانی';
-$labels['pagesize'] = 'تعداد سطر ها در صفحه';
+$labels['setdefault']  = 'بطور همیشگی انتخاب نمایید';
+$labels['autodetect']  = 'اتومات';
+$labels['language']  = 'لسان';
+$labels['timezone']  = 'ناحيه زمانی';
+$labels['pagesize']  = 'تعداد سطر ها در صفحه';
 $labels['signature'] = 'امضا';
-$labels['dstactive'] = 'Daylight saving time';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'پيغام ايچ ټي ام ايل رانوشته کنيد';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'امضای حساب ایمیل بشکل ایچ تی ام ال';
 $labels['previewpane'] = 'چوکات پیشنما را نشان دهید';
 $labels['skin'] = 'تمپلیت محیط کاربری';
@@ -214,39 +408,129 @@ $labels['mailboxview'] = 'طرز نمایش صندوق پستی';
 $labels['mdnrequests'] = 'آگاهی های ارسال کننده';
 $labels['askuser'] = 'از کاربر بپرسید';
 $labels['autosend'] = 'پیام را بطور خودکار روان کنید';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'رد کردن';
 $labels['readwhendeleted'] = 'در هنگام حفظ پیام را خوانده شده نشانی کنید';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'پیام های حذف شده را نمایش ندهید';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'نامه های از آدرس های شناخته شده';
 $labels['always'] = 'همیشه';
 $labels['showinlineimages'] = 'تصاویر ضمیمه شده را در پایین پیام نشان دهید.';
-$labels['autosavedraft'] = 'بصورت خودکار پیش نويس را حفظ کنيد';
-$labels['everynminutes'] = 'دقیفه$n هر';
-$labels['never'] = 'هیچگاه';
+$labels['autosavedraft']  = 'بصورت خودکار پیش نويس را حفظ کنيد';
+$labels['everynminutes']  = 'دقیفه$n هر';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'هیچگاه';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'نمایش دادن پیام ها';
 $labels['messagescomposition'] = 'ایجاد کردن پیام جدید';
 $labels['mimeparamfolding'] = 'نام های ضمیمه ها';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (دیگر ها)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'انتخاب های پیشرفته';
 $labels['focusonnewmessage'] = 'فوکس دادن پینجره مرورگر به پیام جدید';
 $labels['checkallfolders'] = 'تمام پوشه ها را بخاطر پیام های جدید بررسی کنید';
-$labels['folder'] = 'پوشه';
-$labels['foldername'] = 'نام پوشه';
-$labels['subscribed'] = 'مشترک';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'پوشه';
+$labels['folders']  = 'پوشه ها';
+$labels['foldername']  = 'نام پوشه';
+$labels['subscribed']  = 'مشترک';
 $labels['messagecount'] = 'پيغام ها';
-$labels['create'] = 'ایجاد کردن';
-$labels['createfolder'] = 'ایجاد پوشه جدید';
-$labels['managefolders'] = 'اداره کردن پوشه ها';
+$labels['create']  = 'ایجاد کردن';
+$labels['createfolder']  = 'ایجاد پوشه جدید';
+$labels['managefolders']  = 'اداره کردن پوشه ها';
 $labels['specialfolders'] = 'پوشه های مخصوص';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'فهرست کردن توسط';
-$labels['sortasc'] = 'فهرست کردن از طرف بالا به پايين';
+$labels['sortasc']  = 'فهرست کردن از طرف بالا به پايين';
 $labels['sortdesc'] = 'فهرست کردن از طرف پايين به بالا';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'بایت';
 $labels['KB'] = 'کیلو بایت';
 $labels['MB'] = 'میگا بایت';
 $labels['GB'] = 'گیگا بایت';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index db3373958..aa479b9c6 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_AF/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'داخل شدن به سيستم موفق نه شد';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'داخل شدن به سيستم موفق نه شد';
 $messages['cookiesdisabled'] = 'جستجوگر شما  cookies را قبول نميکند';
 $messages['sessionerror'] = 'جلسه شما وجود ندارد و يا هم از زمان معين آن گذشته است';
 $messages['storageerror'] = 'وصل شدن به آیمیپ سرور موفق نشد';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
 $messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ';
 $messages['mailboxempty'] = 'صندوق پستي خالي است';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'در حال باز شدن  ...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'در حال بار کردن دیتا';
 $messages['checkingmail'] = 'پيغام های جديد را بررسي ميکند';
 $messages['sendingmessage'] = 'پيغام ها را ارسال ميکند';
@@ -32,39 +46,54 @@ $messages['messagesaved'] = 'پيغام را به پیش نويس حفظ کرد'
 $messages['successfullysaved'] = 'حفظ پیام موفقانه صورت گرفت';
 $messages['addedsuccessfully'] = 'آدرس بصورت مکمل در کتاب ادرس علاوه شد';
 $messages['contactexists'] = 'يک آدرس همرا اين ايميل ادرس قبلاً وجود دارد';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'برای حفظ استقلال پيغام شما، تصاویر اجنبی این پیام بلاک شده اند';
 $messages['encryptedmessage'] = 'اين يک پيغام مخفي است و اشکار شده نميتواند   معذرت ميخواهيم';
 $messages['nocontactsfound'] = 'هيچ آدرسی دريافت نه شد';
 $messages['contactnotfound'] = 'آدرس خواسته شده دريافت نه شد';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'فرستادن پيغام موفق نه شد';
 $messages['senttooquickly'] = 'ثانیه منتظر باشید$secلطفا مدت  قبل از ارسال این پیام';
 $messages['errorsavingsent'] = 'در جريان حفظ کردن پیام ارسال شده يکاشتباه به وجود امد';
 $messages['errorsaving'] = 'در جريان حفظ کردن يکاشتباه به وجود امد';
 $messages['errormoving'] = 'پيغام نقل مکان شده نتوانست';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'پيغام حذف شده نتوانست';
-$messages['deletecontactconfirm'] = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟';
-$messages['deletefolderconfirm'] = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟';
-$messages['purgefolderconfirm'] = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟';
+$messages['deletefolderconfirm']  = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟';
+$messages['purgefolderconfirm']  = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'در حال حذف پوشه';
 $messages['foldermoving'] = 'در حال انتقال پوشه';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است';
 $messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد';
-$messages['nonamewarning'] = 'لطفاً يک نام را داخل کنيد';
+$messages['nonamewarning']  = 'لطفاً يک نام را داخل کنيد';
 $messages['nopagesizewarning'] = 'لطفاً اندازه يک صفحه را داخل کنيد';
 $messages['nosenderwarning'] = 'لطفاً ایمیل آدرس ارسال کننده را داخل کنید';
 $messages['norecipientwarning'] = 'لطفاً کم از کم يک آدرس گيرينده را نوشته / داخل کنيد';
-$messages['nosubjectwarning'] = 'بخش مضمون خالي است  آیا میخواهید که حالا یکی آنها را درج نمایید؟.';
+$messages['nosubjectwarning']  = 'بخش مضمون خالي است  آیا میخواهید که حالا یکی آنها را درج نمایید؟.';
 $messages['nobodywarning'] = 'اين پيغام را بدون متن بفرستیم؟';
 $messages['notsentwarning'] = 'پيغام ارسال نه شده است   آیا میخواهید که از این نامه صرف نظر نمایید';
 $messages['noldapserver'] = 'لطفاً يک ايل دپ سرور را بخاطر جستجو انتخاب کنيد';
 $messages['nosearchname'] = 'لطفاً يک نام تماس و يا هم يک ايميل ادرس را داخل کنيد';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr پیام دریافت شد';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'جستجو گر موفق به دریافت هیچ گونه اثری نشد';
 $messages['searching'] = 'در حال جستجو';
 $messages['checking'] = 'در حال بررسی';
 $messages['nospellerrors'] = 'هيچ اشتباه املايي را دريافت نه کرد';
 $messages['folderdeleted'] = 'پوشه موفقانه از بين رفت/ حذف گرديد';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'موفقانه حذف شد';
 $messages['converting'] = 'در حال از بین بردن شکل دهی و ساختار (فرمت)';
 $messages['messageopenerror'] = 'پيغام از سرور جريان کرده نتوانست';
@@ -75,16 +104,66 @@ $messages['copyerror'] = 'هيچ يک از تماس ها را کاپي کرده
 $messages['sourceisreadonly'] = 'اجازه نمامه کود / منبع این آدرس قفط خواندنی است';
 $messages['errorsavingcontact'] = 'ادرس این پیام را حفظکرده نتوانست';
 $messages['movingmessage'] = 'ذر حال انتقال پیام...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'یک رسید برای ارسال کننده این پیام فرستاده شد.';
 $messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'شما این شناخت نامه را حذف کرده نمیتوانید. این آخرین شناخت نامه شما است.';
 $messages['forbiddencharacter'] = 'نام پوشه دارای یک کرکتر ممنوعه است.';
 $messages['selectimportfile'] = 'لطفاً یک فایل را برای آپلود کردن انتخاب نمایید.';
 $messages['addresswriterror'] = 'کتابچه آدرس انتخاب شده دارای اجازه نامه نوشتاری نیست.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'در حال وارد کردن لطفا صبر کنید.';
-$messages['importerror'] = 'وارد نمودن (آدرس ها / فایل ها) موفق نشد. نیستvCard فایل آپلود شده فایل صحیح';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'اجازه این عملکرد را ندارید';
 $messages['nofromaddress'] = 'بخش ایمیل آدرس در شناخت نامه انتخاب شده مفقود است.';
 $messages['editorwarning'] = 'استفاده از تصحیح کننده متن ساده تمام فرمت و ساختار داده شده را از بین خواهد برد. آیا میخواهید که ادامه بدهید.';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index da4a06761..518c6742b 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'به $product خوش آمدید';
-$labels['username'] = 'نام‌کاربری';
-$labels['password'] = 'گذرواژه';
-$labels['server'] = 'سرور';
-$labels['login'] = 'ورود';
-$labels['logout'] = 'خروج';
-$labels['mail'] = 'نامه';
+
+// login page
+$labels['welcome']   = 'به $product خوش آمدید';
+$labels['username']  = 'نام‌کاربری';
+$labels['password']  = 'گذرواژه';
+$labels['server']    = 'سرور';
+$labels['login']     = 'ورود';
+
+// taskbar
+$labels['logout']   = 'برون‌رفت';
+$labels['mail']     = 'نامه';
 $labels['settings'] = 'تنظیمات';
 $labels['addressbook'] = 'دفتر نشانی';
-$labels['inbox'] = 'صندوق ورودی';
+
+// mailbox names
+$labels['inbox']  = 'صندوق ورودی';
 $labels['drafts'] = 'پیش‌نویس‌ها';
-$labels['sent'] = 'ارسال شده';
-$labels['trash'] = 'زباله‌دان';
-$labels['junk'] = 'بنجل';
+$labels['sent']   = 'ارسال شده';
+$labels['trash']  = 'زباله‌دان';
+$labels['junk']   = 'بنجل';
+
+// message listing
 $labels['subject'] = 'موضوع';
-$labels['from'] = 'از';
-$labels['to'] = 'به';
-$labels['cc'] = 'رونوشت';
-$labels['bcc'] = 'رونوشت مخفی';
+$labels['from']    = 'از';
+$labels['sender']  = 'فرستنده';
+$labels['to']      = 'به';
+$labels['cc']      = 'رونوشت';
+$labels['bcc']     = 'رونوشت مخفی';
 $labels['replyto'] = 'پاسخ-به';
 $labels['followupto'] = 'پیگیری-در';
-$labels['date'] = 'تاریخ';
-$labels['size'] = 'اندازه';
+$labels['date']    = 'تاریخ';
+$labels['size']    = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'سازمان';
 $labels['readstatus'] = 'وضعیت خوانده شدن';
 $labels['listoptions'] = 'فهرست گزینه‌ها...';
+
 $labels['mailboxlist'] = 'پوشه‌ها';
-$labels['folders'] = 'پوشه‌ها';
 $labels['messagesfromto'] = 'پیغام‌ها $from تا $to از $count';
 $labels['threadsfromto'] = 'رشته‌ها $from تا $to از $count';
 $labels['messagenrof'] = 'پیغام $nr از $count';
-$labels['fromtoshort'] = '$from - $to از $cound';
-$labels['copy'] = 'رونوشت';
-$labels['move'] = 'انتقال';
-$labels['moveto'] = 'انتقال به...';
+$labels['fromtoshort'] = '$from - $to از $count';
+
+$labels['copy']     = 'رونوشت';
+$labels['move']     = 'انتقال';
+$labels['moveto']   = 'انتقال به...';
 $labels['download'] = 'بارگیری';
 $labels['showattachment'] = 'نمایش';
 $labels['showanyway'] = 'نمایش آن در هر صورت';
+
 $labels['filename'] = 'نام پرونده';
 $labels['filesize'] = 'اندازه پرونده';
+
 $labels['addtoaddressbook'] = 'افزودن به دفتر نشانی‌ها';
+
+// weekdays short
 $labels['sun'] = '۱ش';
 $labels['mon'] = '۲ش';
 $labels['tue'] = '۳ش';
@@ -63,74 +80,83 @@ $labels['wed'] = '۴ش';
 $labels['thu'] = '۵ش';
 $labels['fri'] = 'جم';
 $labels['sat'] = 'ش';
-$labels['sunday'] = 'یک‌شنبه';
-$labels['monday'] = 'دوشنبه';
-$labels['tuesday'] = 'سه‌شنبه';
+
+// weekdays long
+$labels['sunday']    = 'یک‌شنبه';
+$labels['monday']    = 'دوشنبه';
+$labels['tuesday']   = 'سه‌شنبه';
 $labels['wednesday'] = 'چهارشنبه';
-$labels['thursday'] = 'پنج‌شنبه';
-$labels['friday'] = 'جمعه';
-$labels['saturday'] = 'شنبه';
-$labels['jan'] = 'ژان';
-$labels['feb'] = 'فور';
-$labels['mar'] = 'مار';
-$labels['apr'] = 'آور';
-$labels['may'] = 'مه';
-$labels['longmay'] = 'مه';
-$labels['jun'] = 'ژون';
-$labels['jul'] = 'ژوی';
-$labels['aug'] = 'اوت';
-$labels['sep'] = 'سپت';
-$labels['oct'] = 'اُکت';
-$labels['nov'] = 'نوا';
-$labels['dec'] = 'دسا';
-$labels['longjan'] = 'ژانویه';
-$labels['longfeb'] = 'فوریه';
-$labels['longmar'] = 'مارس';
-$labels['longapr'] = 'آوریل';
-$labels['longjun'] = 'ژوئن';
-$labels['longjul'] = 'جولای';
-$labels['longaug'] = 'آگوست';
-$labels['longsep'] = 'سپتامبر';
-$labels['longoct'] = 'اکتبر';
-$labels['longnov'] = 'نوامبر';
-$labels['longdec'] = 'دسامبر';
+$labels['thursday']  = 'پنج‌شنبه';
+$labels['friday']    = 'جمعه';
+$labels['saturday']  = 'شنبه';
+
+// months short
+$labels['jan']	= 'ژان';
+$labels['feb']	= 'فور';
+$labels['mar']	= 'مار';
+$labels['apr']	= 'آور';
+$labels['may']	= 'مه';
+$labels['jun']	= 'ژون';
+$labels['jul'] 	= 'ژوی';
+$labels['aug']	= 'اوت';
+$labels['sep']	= 'سپت';
+$labels['oct']	= 'اُکت';
+$labels['nov']	= 'نوا';
+$labels['dec']	= 'دسا';
+
+// months long
+$labels['longjan']	= 'ژانویه';
+$labels['longfeb']	= 'فوریه';
+$labels['longmar']	= 'مارس';
+$labels['longapr']	= 'آوریل';
+$labels['longmay']	= 'مه';
+$labels['longjun']	= 'ژوئن';
+$labels['longjul']	= 'جولای';
+$labels['longaug']	= 'آگوست';
+$labels['longsep']	= 'سپتامبر';
+$labels['longoct']	= 'اکتبر';
+$labels['longnov']	= 'نوامبر';
+$labels['longdec']	= 'دسامبر';
+
 $labels['today'] = 'امروز';
-$labels['refresh'] = 'نوسازی';
-$labels['checkmail'] = 'بررسی پیغام‌های جدید';
-$labels['compose'] = 'نوشتن پیغام';
-$labels['writenewmessage'] = 'ایجاد پیغام جدید';
-$labels['reply'] = 'پاسخ';
-$labels['replytomessage'] = 'پاسخ به فرستنده';
+
+// toolbar buttons
+$labels['refresh']          = 'نوسازی';
+$labels['checkmail']        = 'بررسی پیغام‌های جدید';
+$labels['compose']          = 'نوشتن پیغام';
+$labels['writenewmessage']  = 'ایجاد پیغام جدید';
+$labels['reply']            = 'پاسخ';
+$labels['replytomessage']   = 'پاسخ به فرستنده';
 $labels['replytoallmessage'] = 'پاسخ به فهرست یا به فرستنده و تمام گیرنده‌ها';
-$labels['replyall'] = 'پاسخ به همه';
-$labels['replylist'] = 'پاسخ به فهرست';
-$labels['forward'] = 'ارجاع';
-$labels['forwardinline'] = 'ارجاع خطی';
+$labels['replyall']         = 'پاسخ به همه';
+$labels['replylist']        = 'پاسخ به فهرست';
+$labels['forward']          = 'ارجاع';
+$labels['forwardinline']    = 'ارجاع خطی';
 $labels['forwardattachment'] = 'ارجاع به صورت پیوست';
-$labels['forwardmessage'] = 'ارجاع پیغام';
-$labels['deletemessage'] = 'حذف پیغام';
+$labels['forwardmessage']   = 'ارجاع پیغام';
+$labels['deletemessage']    = 'حذف پیغام';
 $labels['movemessagetotrash'] = 'انتقال پیغام به زباله‌دان';
-$labels['printmessage'] = 'چاپ این پیغام';
-$labels['previousmessage'] = 'نمایش پیغام قبلی';
-$labels['firstmessage'] = 'نمایش اولین  پیغام';
-$labels['nextmessage'] = 'نمایش پیغام بعدی';
-$labels['lastmessage'] = 'نمایش آخرین پیغام';
-$labels['backtolist'] = 'بازگشت به فهرست پیغام';
-$labels['viewsource'] = 'نمایش منبع';
-$labels['mark'] = 'نشانه‌گذاری';
-$labels['markmessages'] = 'نشانه‌گذاری پیغام‌ها';
-$labels['markread'] = 'به عنوان خوانده‌شده';
-$labels['markunread'] = 'به عنوان خوانده‌نشده';
-$labels['markflagged'] = 'به عنوان نشانه‌گذاری شده';
-$labels['markunflagged'] = 'به عنوان نشانه‌گذاری نشده';
-$labels['moreactions'] = 'کارهای دیگر...';
-$labels['more'] = 'بيشتر';
-$labels['back'] = 'بازگشت';
-$labels['options'] = 'تنظیمات';
+$labels['printmessage']     = 'چاپ این پیغام';
+$labels['previousmessage']  = 'نمایش پیغام قبلی';
+$labels['firstmessage']     = 'نمایش اولین  پیغام';
+$labels['nextmessage']      = 'نمایش پیغام بعدی';
+$labels['lastmessage']      = 'نمایش آخرین پیغام';
+$labels['backtolist']       = 'بازگشت به فهرست پیغام';
+$labels['viewsource']       = 'نمایش منبع';
+$labels['mark']             = 'نشانه‌گذاری';
+$labels['markmessages']     = 'نشانه‌گذاری پیغام‌ها';
+$labels['markread']         = 'به عنوان خوانده‌شده';
+$labels['markunread']       = 'به عنوان خوانده‌نشده';
+$labels['markflagged']      = 'به عنوان نشانه‌گذاری شده';
+$labels['markunflagged']    = 'به عنوان نشانه‌گذاری نشده';
+$labels['moreactions']      = 'کارهای دیگر...';
+$labels['more']             = 'بيشتر';
+$labels['back']             = 'بازگشت';
+$labels['options']          = 'تنظیمات';
+
 $labels['select'] = 'انتخاب';
 $labels['all'] = 'همه';
 $labels['none'] = 'هیچ‌کدام';
-$labels['nonesort'] = 'هیچ‌کدام';
 $labels['currpage'] = 'صفحه جاری';
 $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'باز کردن همه';
 $labels['expand-unread'] = 'بازکردن خوانده نشده‌ها';
 $labels['collapse-all'] = 'جمع کردن همه';
 $labels['threaded'] = 'رشته شده';
+
 $labels['autoexpand_threads'] = 'باز کردن رشته‌های پیغام';
 $labels['do_expand'] = 'همه رشته‌ها';
 $labels['expand_only_unread'] = 'فقط با پیغام‌های خوانده نشده';
-$labels['fromto'] = 'فرستنده/گیرنده';
+$labels['fromto'] = 'از/به';
 $labels['flag'] = 'پرچم';
 $labels['attachment'] = 'پیوست';
+$labels['nonesort'] = 'هیچ‌کدام';
 $labels['sentdate'] = 'تاریخ ارسال';
 $labels['arrival'] = 'تاریخ ورود';
 $labels['asc'] = 'صعودی';
@@ -159,182 +187,220 @@ $labels['listcolumns'] = 'ستون‌های فهرست';
 $labels['listsorting'] = 'ستون مرتب‌سازی';
 $labels['listorder'] = 'ترتیب مرتب‌سازی';
 $labels['listmode'] = 'نوع مشاهده فهرست';
+
 $labels['folderactions'] = 'اعمال پوشه...';
 $labels['compact'] = 'فشرده';
 $labels['empty'] = 'خالی';
+
 $labels['quota'] = 'فضای استفاده شده';
-$labels['unknown'] = 'ناشناخته';
-$labels['unlimited'] = 'نامحدود';
-$labels['quicksearch'] = 'جستجوی سریع';
-$labels['resetsearch'] = 'جستجوی دوباره';
-$labels['searchmod'] = 'اصلاحات جستجو';
-$labels['msgtext'] = 'کل پیغام';
+$labels['unknown']  = 'ناشناخته';
+$labels['unlimited']  = 'نامحدود';
+
+$labels['quicksearch']  = 'جستجوی سریع';
+$labels['resetsearch']  = 'جستجوی دوباره';
+$labels['searchmod']  = 'اصلاحات جستجو';
+$labels['msgtext']  = 'کل پیغام';
+$labels['body']  = 'بدنه';
+
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
-$labels['editasnew'] = 'ویرایش به عنوان جدید';
-$labels['send'] = 'ارسال';
-$labels['sendmessage'] = 'ارسال پیغام';
-$labels['savemessage'] = 'ذخیره به عنوان پیش‌نویس';
-$labels['addattachment'] = 'پیوست کردن یک پرونده';
-$labels['charset'] = 'مجموعه‌نمایه';
-$labels['editortype'] = 'نوع ویرایش‌گر';
-$labels['returnreceipt'] = 'رسید دریافت';
-$labels['dsn'] = 'اعلام وضعیت دریافت';
+
+// message compose
+$labels['editasnew']      = 'ویرایش به عنوان جدید';
+$labels['send']           = 'ارسال';
+$labels['sendmessage']    = 'ارسال پیغام';
+$labels['savemessage']    = 'ذخیره به عنوان پیش‌نویس';
+$labels['addattachment']  = 'پیوست کردن یک پرونده';
+$labels['charset']        = 'مجموعه‌نمایه';
+$labels['editortype']     = 'نوع ویرایش‌گر';
+$labels['returnreceipt']  = 'رسید دریافت';
+$labels['dsn']            = 'اعلام وضعیت دریافت';
 $labels['mailreplyintro'] = 'در $date، $sender نوشته است:';
 $labels['originalmessage'] = 'پیغام اصلی';
-$labels['editidents'] = 'ویرایش شنانه‌ها';
-$labels['spellcheck'] = 'املاء';
+
+$labels['editidents']    = 'ویرایش شناسه‌ها';
+$labels['spellcheck']    = 'املاء';
 $labels['checkspelling'] = 'بررسی املایی';
 $labels['resumeediting'] = 'ادامه‌ی ویرایش';
-$labels['revertto'] = 'برگرداندن به';
+$labels['revertto']      = 'برگرداندن به';
+
 $labels['attach'] = 'پیوست کردن';
 $labels['attachments'] = 'پیوست‌ها';
 $labels['upload'] = 'بارگذاری';
 $labels['uploadprogress'] = '$percent ($current از$total)';
-$labels['close'] = 'بستن';
-$labels['messageoptions'] = 'گزینه‌های پیغام...';
-$labels['low'] = 'کم';
-$labels['lowest'] = 'کم‌ترین';
-$labels['normal'] = 'معمولی';
-$labels['high'] = 'زیاد';
+$labels['close']  = 'بستن';
+$labels['messageoptions']  = 'گزینه‌های پیغام...';
+
+$labels['low']     = 'کم';
+$labels['lowest']  = 'کم‌ترین';
+$labels['normal']  = 'معمولی';
+$labels['high']    = 'زیاد';
 $labels['highest'] = 'بیش‌ترین';
-$labels['nosubject'] = '(بدون موضوع)';
+
+$labels['nosubject']  = '(بدون موضوع)';
 $labels['showimages'] = 'نمایش عکس‌ها';
 $labels['alwaysshow'] = 'همیشه عکس‌های دریافتی از $sender را نمایش داده شود';
-$labels['isdraft'] = 'این یک پیغام پیش‌نویس است.';
-$labels['andnmore'] = '$nr بیشتر...';
+$labels['isdraft']    = 'این یک پیغام پیش‌نویس است.';
+$labels['andnmore']   = '$nr بیشتر...';
 $labels['togglemoreheaders'] = 'نمایش سربرگ‌های بیشتر پیغام';
+$labels['togglefullheaders'] = 'تعویض سربرگ‌های پیغام خام';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'ذخیره پیغام ارسالی در';
 $labels['dontsave'] = 'ذخیره نکن';
-$labels['maxuploadsize'] = 'حجم فایل حداکثر تا میزان $size می‌باشد';
+$labels['maxuploadsize'] = 'حجم پرونده حداکثر تا میزان $size می‌باشد';
+
 $labels['addcc'] = 'افزودن رونوشت';
 $labels['addbcc'] = 'افزودن رونوشت مخفی';
 $labels['addreplyto'] = 'افزودن پاسخ-به';
 $labels['addfollowupto'] = 'افزودن پیگیری-به';
-$labels['mdnrequest'] = 'فرستندهٔ این پیغام خواسته است که وقتی شما این پیغام را می‌خوانید، آگاه شود. آیا مایلید فرستنده را آگاه کنید؟';
+
+// mdn
+$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'] = 'وب سایت';
+
+// address boook
+$labels['name']         = 'نمایش نام';
+$labels['firstname']    = 'نام';
+$labels['surname']      = 'نام خانوادگی';
+$labels['middlename']   = 'نام وسط';
+$labels['nameprefix']   = 'پیشوند';
+$labels['namesuffix']   = 'پسوند';
+$labels['nickname']     = 'نام مستعار';
+$labels['jobtitle']     = 'عنوان شغل';
+$labels['department']   = 'بخش';
+$labels['gender']       = 'جنسیت';
+$labels['maidenname']   = 'نام خانوادگی زن قبل از ازدواج';
+$labels['email']        = 'پست‌الکترونیکی';
+$labels['phone']        = 'تلفن';
+$labels['address']      = 'نشانی';
+$labels['street']       = 'خیابان';
+$labels['locality']     = 'شهر';
+$labels['zipcode']      = 'کدپستی';
+$labels['region']       = 'ایالت/استان';
+$labels['country']      = 'کشور';
+$labels['birthday']     = 'زادروز';
+$labels['anniversary']  = 'سالگرد';
+$labels['website']      = 'وب‌سایت';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'یادداشت‌ها';
-$labels['male'] = 'مرد';
+$labels['male']   = 'مرد';
 $labels['female'] = 'زن';
 $labels['manager'] = 'مدیر';
 $labels['assistant'] = 'دستیار';
-$labels['typeassistant'] = 'دستیار';
 $labels['spouse'] = 'همسر';
 $labels['allfields'] = 'همه زمینه‌ها';
 $labels['search'] = 'جستجو';
 $labels['advsearch'] = 'جستجوی پیشرفته';
 $labels['advanced'] = 'پیشرفته';
 $labels['other'] = 'سایر';
-$labels['typeother'] = 'سایر';
-$labels['typehome'] = 'منزل';
-$labels['typework'] = 'کار';
-$labels['typemobile'] = 'تلفن همراه';
-$labels['typemain'] = 'اصلی';
-$labels['typehomefax'] = 'فکس خانگی';
-$labels['typeworkfax'] = 'فکس کاری';
-$labels['typecar'] = 'ماشین';
-$labels['typepager'] = 'پیجر';
-$labels['typevideo'] = 'ویدئو';
-$labels['typehomepage'] = 'صفحه خانگی';
+
+$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['addcontact'] = 'افزودن تماس جدید';
 $labels['editcontact'] = 'ویرایش تماس';
 $labels['contacts'] = 'تماس‌ها';
 $labels['contactproperties'] = 'خصوصیات تماس';
 $labels['personalinfo'] = 'اطلاعات شخصی';
-$labels['edit'] = 'ویرایش';
+
+$labels['edit']   = 'ویرایش';
 $labels['cancel'] = 'لغو';
-$labels['save'] = 'ذخیره';
+$labels['save']   = 'ذخیره';
 $labels['delete'] = 'حذف';
 $labels['rename'] = 'تغییر نام';
 $labels['addphoto'] = 'افزودن';
 $labels['replacephoto'] = 'جایگزینی';
 $labels['uploadphoto'] = 'بارگذاری تصویر';
-$labels['newcontact'] = 'ایجاد کارت تماس جدید';
-$labels['deletecontact'] = 'حذف تماس‌های انتخاب شده';
-$labels['composeto'] = 'نوشتن پیغام به';
+
+$labels['newcontact']     = 'ایجاد کارت تماس جدید';
+$labels['deletecontact']  = 'حذف تماس‌های انتخاب شده';
+$labels['composeto']      = 'نوشتن پیغام به';
 $labels['contactsfromto'] = 'تماس‌های $from تا $to از $count';
-$labels['print'] = 'چاپ';
-$labels['export'] = 'صدور';
-$labels['exportvcards'] = 'صدور اطلاعات تماس‌ها با فرمت Vcard';
+$labels['print']          = 'چاپ';
+$labels['export']         = 'صدور';
+$labels['exportall']      = 'خارج کردن همه';
+$labels['exportsel']      = 'خارج کردن انتخاب شده‌ها';
+$labels['exportvcards']   = 'صدور اطلاعات تماس‌ها با فرمت vCard';
 $labels['newcontactgroup'] = 'افزودن گروه تماس جدید';
-$labels['grouprename'] = 'تغییر نام گروه';
-$labels['groupdelete'] = 'حذف گروه';
+$labels['grouprename']    = 'تغییر نام گروه';
+$labels['groupdelete']    = 'حذف گروه';
 $labels['groupremoveselected'] = 'حذف نشانی‌های انتخاب شده از گروه';
-$labels['previouspage'] = 'نمایش صفحه قبلی';
-$labels['firstpage'] = 'نمایش صفحه اول';
-$labels['nextpage'] = 'نمایش صفحه بعدی';
-$labels['lastpage'] = 'نمایش صفحه آخر';
+
+$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['importtarget'] = 'افزودن تماس‌های جدید به دفتر نشانی:';
 $labels['importreplace'] = 'جایگیزینی کامل دفتر نشانی';
+$labels['importdesc'] = 'شما می‌توانید تماس‌ها را از یک دفتر نشانی موجود بارگذاری نمایید.<br/> هم اکنون ما وارد کردن آدرس‌ها را از <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> یا قالب داده CVS (جدا شده با کاما) پشتیبانی می‌کنیم.';
 $labels['done'] = 'انجام شد';
+
+// settings
 $labels['settingsfor'] = 'تنظیمات برای';
 $labels['about'] = 'درباره';
 $labels['preferences'] = 'ترجیحات';
 $labels['userpreferences'] = 'ترجیحات کاربر';
 $labels['editpreferences'] = 'ویرایش ترجیحات کاربر';
+
 $labels['identities'] = 'شناسه‌ها';
 $labels['manageidentities'] = 'مدیریت شناسه‌ها برای این حساب';
 $labels['newidentity'] = 'شناسه جدید';
+
 $labels['newitem'] = 'مورد جدید';
 $labels['edititem'] = 'ویرایش مورد';
+
 $labels['preferhtml'] = 'HTML نمایش';
 $labels['defaultcharset'] = 'مجموعه نمایه پیش‌فرض';
 $labels['htmlmessage'] = 'HTML پیغام';
+$labels['messagepart'] = 'قسمت';
+$labels['digitalsig'] = 'امضای دیجیتال';
 $labels['dateformat'] = 'قالب تاریخ';
 $labels['timeformat'] = 'قالب زمان';
 $labels['prettydate'] = 'تاریخ‌های زیبا';
-$labels['setdefault'] = 'پیش‌فرض کن';
-$labels['autodetect'] = 'خودکار';
-$labels['language'] = 'زبان';
-$labels['timezone'] = 'محدوده‌ی زمانی';
-$labels['pagesize'] = 'سطر در صفحه';
+$labels['setdefault']  = 'پیش‌فرض کن';
+$labels['autodetect']  = 'خودکار';
+$labels['language']  = 'زبان';
+$labels['timezone']  = 'محدوده‌ی زمانی';
+$labels['pagesize']  = 'سطر در صفحه';
 $labels['signature'] = 'امضاء';
-$labels['dstactive'] = 'ساعت تابستانی';
+$labels['dstactive']  = 'ساعت تابستانی';
+$labels['showinextwin'] = 'نمایش پیغام در پنجره جدید';
 $labels['composeextwin'] = 'نوشتن پیغام  در پنجره جدید';
 $labels['htmleditor'] = 'HTML ‌نوشتن پیغام‌های';
 $labels['htmlonreply'] = 'فقط در پاسخ به پیغام HTML';
+$labels['htmlonreplyandforward'] = 'در بازگردانی یا پاسخ به پیغام‌های HTML';
 $labels['htmlsignature'] = 'HTML امضای';
 $labels['previewpane'] = 'نمایش قاب پیش‌نمایش';
 $labels['skin'] = 'پوسته ظاهری';
-$labels['logoutclear'] = 'تمیز کردن زباله دان در هنگام خروچ';
+$labels['logoutclear'] = 'تمیز کردن زباله دان هنگام برون‌رفت';
 $labels['logoutcompact'] = 'فشرده‌سازی صندوق در هنگام خروچ';
 $labels['uisettings'] = 'محیط کاربری';
 $labels['serversettings'] = 'تنظیمات سرور';
@@ -349,15 +415,16 @@ $labels['readwhendeleted'] = 'در هنگام پاک کردن، پیغام را
 $labels['flagfordeletion'] = 'پیغام را به جای پاک کردن، با پرچم نشانه‌گذاری کن';
 $labels['skipdeleted'] = 'پیغام‌های حذف شده را نمایش نده';
 $labels['deletealways'] = 'اگر انتقال پیغام به زباله‌دان ناموفق بود، آن‌ها را حذف کن';
-$labels['deletejunk'] = 'حذف مستقیم پیغام‌ها در Junk';
-$labels['showremoteimages'] = 'تصاویر لینک شده را نمایش بده';
+$labels['deletejunk'] = 'حذف مستقیم پیغام‌های زباله';
+$labels['showremoteimages'] = 'تصاویر پیوند شده را نمایش بده';
 $labels['fromknownsenders'] = 'از فرستنده شناس';
 $labels['always'] = 'همواره';
 $labels['showinlineimages'] = 'نمایش عکس‌های پیوست شده در پایین پیغام';
-$labels['autosavedraft'] = 'ذخیره‌ی خودکار پیش‌نویس';
-$labels['everynminutes'] = 'در هر $n دقیقه';
-$labels['never'] = 'هرگز';
-$labels['immediately'] = 'بلافاصله';
+$labels['autosavedraft']  = 'ذخیره‌ی خودکار پیش‌نویس';
+$labels['everynminutes']  = 'در هر $n دقیقه';
+$labels['refreshinterval']  = 'تازه کردن (بررسی برای پیغام‌های جدید، مثلا)';
+$labels['never']  = 'هرگز';
+$labels['immediately']  = 'بلافاصله';
 $labels['messagesdisplaying'] = 'نمایش دادن پیغام‌ها';
 $labels['messagescomposition'] = 'نوشتن پیغام‌ها';
 $labels['mimeparamfolding'] = 'عناوین پیوستی';
@@ -371,12 +438,13 @@ $labels['checkallfolders'] = 'همه پوشه‌ها را برای مشاهده
 $labels['displaynext'] = 'بعد از انتقال/حذف پیغام، پیغام بعدی نمایش داده شود';
 $labels['defaultfont'] = 'فونت پیش فرض برای پیغام HTML';
 $labels['mainoptions'] = 'گزینه‌های اصلی';
-$labels['browseroptions'] = 'گزینه‌ های مرورگر';
+$labels['browseroptions'] = 'گزینه‌‌های مرورگر';
 $labels['section'] = 'بخش';
-$labels['maintenance'] = 'نگهداری';
+$labels['maintenance'] = 'نگهداشت';
 $labels['newmessage'] = 'پیغام جدید';
 $labels['signatureoptions'] = 'گزینه‌های امضاء';
 $labels['whenreplying'] = 'هنگام پاسخ';
+$labels['replyempty'] = 'نقل قول نکردن پیغام اصلی';
 $labels['replytopposting'] = 'شروع پیغام جدید بالای اصلی';
 $labels['replybottomposting'] = 'شروع پیغام جدید پایین اصلی';
 $labels['replyremovesignature'] = 'هنگام پاسخ امضاء اصلی را از پیغام پاک کن';
@@ -387,11 +455,12 @@ $labels['replysignaturepos'] = 'هنگام پاسخ یا ارجاع امضاء �
 $labels['belowquote'] = 'زیر نقل‌قول';
 $labels['abovequote'] = 'بالای نقل‌قول';
 $labels['insertsignature'] = 'درج امضاء';
-$labels['previewpanemarkread'] = 'نشانه‌گذاری پیغام‌های پیش مرور شده به عنوان خوانده شده';
-$labels['afternseconds'] = 'بعد از $s ثانیه';
+$labels['previewpanemarkread']  = 'نشانه‌گذاری پیغام‌های پیش مرور شده به عنوان خوانده شده';
+$labels['afternseconds']  = 'بعد از $s ثانیه';
 $labels['reqmdn'] = 'درخواست همیشگی رسید برگشت';
 $labels['reqdsn'] = 'درخواست همیشگی تذکر وضعیت تحویل';
 $labels['replysamefolder'] = 'پاسخ‌ها را در پوشه‌ای پیغام‌هایی که باید پاسخ داده شود گرفته بده.';
+$labels['defaultabook'] = 'دفترچه آدرس پیش‌فرض';
 $labels['autocompletesingle'] = 'رد کردن نشانی‌های پست الکترونیک دیگر در تکمیل خودکار';
 $labels['listnamedisplay'] = 'فهرست تماس‌ها به عنوان';
 $labels['spellcheckbeforesend'] = 'بررسی املایی قبل از ارسال پیغام';
@@ -401,14 +470,18 @@ $labels['spellcheckignorenums'] = 'نادیده گرفتن کلمات دارای
 $labels['spellcheckignorecaps'] = 'نادیده گرفتن کلمات با حروف بزرگ';
 $labels['addtodict'] = 'اضافه کردن به واژه‌نامه';
 $labels['mailtoprotohandler'] = 'ثبت نگه‌دارنده پروتوکل برای mailto: پیوندها';
+$labels['forwardmode'] = 'بازگردانی پیغام';
 $labels['inline'] = 'خطی';
-$labels['folder'] = 'پوشه';
-$labels['foldername'] = 'نام پوشه';
-$labels['subscribed'] = 'مشترک شد';
+$labels['asattachment'] = 'به عنوان پیوست';
+
+$labels['folder']  = 'پوشه';
+$labels['folders']  = 'پوشه‌ها';
+$labels['foldername']  = 'نام پوشه';
+$labels['subscribed']  = 'مشترک شد';
 $labels['messagecount'] = 'پیغام‌ها';
-$labels['create'] = 'ایجاد';
-$labels['createfolder'] = 'ایجاد پوشه‌ی جدید';
-$labels['managefolders'] = 'مدیریت پوشه‌ها';
+$labels['create']  = 'ایجاد';
+$labels['createfolder']  = 'ایجاد پوشه‌ی جدید';
+$labels['managefolders']  = 'مدیریت پوشه‌ها';
 $labels['specialfolders'] = 'پوشه‌های ویژه';
 $labels['properties'] = 'خصوصیات';
 $labels['folderproperties'] = 'خصوصیات پوشه';
@@ -418,22 +491,29 @@ $labels['info'] = 'اطلاعات';
 $labels['getfoldersize'] = 'برای فهمیدن حجم پوشه کلیک کنید';
 $labels['changesubscription'] = 'برای تغییر اشتراک کلیک کنید';
 $labels['foldertype'] = 'نوع پوشه';
-$labels['personalfolder'] = 'پوشه خصوصی';
-$labels['otherfolder'] = 'پوشه کاربران دیگر';
-$labels['sharedfolder'] = 'پوشه عمومی';
+$labels['personalfolder']  = 'پوشه خصوصی';
+$labels['otherfolder']  = 'پوشه کاربران دیگر';
+$labels['sharedfolder']  = 'پوشه عمومی';
+
 $labels['sortby'] = 'مرتب‌سازی بر اساس';
-$labels['sortasc'] = 'مرتب‌سازی صعودی';
+$labels['sortasc']  = 'مرتب‌سازی صعودی';
 $labels['sortdesc'] = 'مرتب‌سازی نزولی';
 $labels['undo'] = 'برگردان';
+
+$labels['installedplugins'] = 'افزونه‌های نصب شده';
 $labels['plugin'] = 'افزونه';
-$labels['version'] = 'نسخه‌';
+$labels['version'] = 'نسخه';
 $labels['source'] = 'منبع';
 $labels['license'] = 'گواهینامه';
-$labels['support'] = 'گرفتن پشتیبانی';
+$labels['support'] = 'پشتیبانی';
+
+// units
 $labels['B'] = 'بایت';
 $labels['KB'] = 'کیلوبایت';
 $labels['MB'] = 'مگابایت';
 $labels['GB'] = 'گیگابایت';
+
+// character sets
 $labels['unicode'] = 'یونیکد';
 $labels['english'] = 'انگلیسی';
 $labels['westerneuropean'] = 'اروپای غربی';
@@ -453,3 +533,4 @@ $labels['japanese'] = 'ژاپنی';
 $labels['korean'] = 'کره‌ای';
 $labels['chinese'] = 'چینی';
 
+?>
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index 640876d1d..5db68b005 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'خطایی رخ داد!';
-$messages['loginfailed'] = 'ورود ناموفق بود.';
+$messages['errortitle']  = 'خطایی رخ داد!';
+$messages['loginfailed']  = 'ورود ناموفق بود.';
 $messages['cookiesdisabled'] = 'مرورگر شما کوکی‌ها را قبول نمی‌کند.';
 $messages['sessionerror'] = 'نشست شما معتبر نیست، یا منقضی شده است.';
 $messages['storageerror'] = 'اتصال به سرور انباره ناموفق بود.';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'ناتوان در انتقال پیغام(ها).';
 $messages['errorcopying'] = 'ناتوان در رونوشت پیغام(ها).';
 $messages['errordeleting'] = 'ناتوان در حذف پیغام(ها).';
 $messages['errormarking'] = 'ناتوان در نشانه گذاری پیغام(ها).';
-$messages['deletecontactconfirm'] = 'آیا واقعاً می‌خواهید تماس(های) انتخاب شده را حذف کنید؟';
-$messages['deletegroupconfirm'] = 'آیا واقعا می‌خواهید گروه انتخاب شده را حذف کنید؟';
+$messages['deletecontactconfirm']  = 'آیا واقعاً می‌خواهید تماس(های) انتخاب شده را حذف کنید؟';
+$messages['deletegroupconfirm']  = 'آیا واقعا می‌خواهید گروه انتخاب شده را حذف کنید؟';
 $messages['deletemessagesconfirm'] = 'آیا واقعاً می‌خواهید پیغام(های) انتخاب شده را حذف کنید؟';
-$messages['deletefolderconfirm'] = 'آیا واقعاً می‌خواهید این پوشه را حذف کنید؟';
-$messages['purgefolderconfirm'] = 'آیا واقعاً می‌خواهید همه‌ی پیغام‌های داخل این پوشه را حذف کنید؟';
+$messages['deletefolderconfirm']  = 'آیا واقعاً می‌خواهید این پوشه را حذف کنید؟';
+$messages['purgefolderconfirm']  = 'آیا واقعاً می‌خواهید همه‌ی پیغام‌های داخل این پوشه را حذف کنید؟';
 $messages['contactdeleting'] = 'حذف تماس(ها)...';
 $messages['groupdeleting'] = 'حذف گروه...';
 $messages['folderdeleting'] = 'حذف پوشه...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'اشتراک پوشه...';
 $messages['folderunsubscribing'] = 'لغو اشتراک پوشه...';
 $messages['formincomplete'] = 'فرم کاملاً پر نشده بود.';
 $messages['noemailwarning'] = 'لطفا یک نشانی پست الکترونیکی معتبر وارد کنید.';
-$messages['nonamewarning'] = 'لطفا یک نام وارد کنید.';
+$messages['nonamewarning']  = 'لطفا یک نام وارد کنید.';
 $messages['nopagesizewarning'] = 'لطفا اندازه ی صفحه را وارد کنید.';
 $messages['nosenderwarning'] = 'لطفا آدرس پست الکترونیکی فرستنده را وارد کنید.';
 $messages['norecipientwarning'] = 'لطفاً حداقل یک گیرنده وارد کنید.';
-$messages['nosubjectwarning'] = 'قسمت "موضوع" خالی است. آیا می‌خواهید اکنون وارد کنید؟';
+$messages['nosubjectwarning']  = 'قسمت "موضوع" خالی است. آیا می‌خواهید اکنون وارد کنید؟';
 $messages['nobodywarning'] = 'این پیغام بدون متن ارسال شود؟';
 $messages['notsentwarning'] = 'پیغام ارسال نشده است. آیا می‌خواهید پیغام را از بین ببرید؟';
 $messages['noldapserver'] = 'برای جست و جو انتخاب کنید LDAP لطفا یک سرور.';
@@ -160,4 +163,7 @@ $messages['invalidimageformat'] = 'فرمت تصویر نامعتبر.';
 $messages['mispellingsfound'] = 'خطای املایی در پیغام شناسایی شد.';
 $messages['parentnotwritable'] = 'ناتوانی در ایجاد/انتقال پوشه به پوشه والد انتخاب شده. بدون حق دسترسی.';
 $messages['messagetoobig'] = 'بخش پیغام برای اجرای آن خیلی بزرگ است.';
+$messages['attachmentvalidationerror'] = 'هشدار! این پیوست مشکوک است زیرا نوع آن با نوعی که در پیغام اشاره شده مطابقت ندارد. اگر شما فرستنده را تایید نمی‌کنید، شما نباید آن را در مرورگر باز نمایید زیرا ممکن است که شامل محتوای مخرب باشد.<br/><br/><em>مورد انتظار: $expected; یافت شده: $detected</em>';
+$messages['noscriptwarning'] = 'هشدار: این برنامه به جاوااسکریپت نیاز دارد! برای استفاده از این لطفا جاوااسکریپت را در تنظیمات مرورگر خود فعال نمایید.';
 
+?>
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index c64662dd5..62c2d6b07 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Tervetuloa $product -käyttäjäksi';
-$labels['username'] = 'Käyttäjätunnus';
-$labels['password'] = 'Salasana';
-$labels['server'] = 'Palvelin';
-$labels['login'] = 'Kirjaudu';
-$labels['logout'] = 'Kirjaudu ulos';
-$labels['mail'] = 'Sähköposti';
+
+// login page
+$labels['welcome']   = 'Tervetuloa $product -käyttäjäksi';
+$labels['username']  = 'Käyttäjätunnus';
+$labels['password']  = 'Salasana';
+$labels['server']    = 'Palvelin';
+$labels['login']     = 'Kirjaudu';
+
+// taskbar
+$labels['logout']   = 'Kirjaudu ulos';
+$labels['mail']     = 'Sähköposti';
 $labels['settings'] = 'Asetukset';
 $labels['addressbook'] = 'Osoitekirja';
-$labels['inbox'] = 'Saapuneet';
+
+// mailbox names
+$labels['inbox']  = 'Saapuneet';
 $labels['drafts'] = 'Luonnokset';
-$labels['sent'] = 'Lähetetyt';
-$labels['trash'] = 'Roskakori';
-$labels['junk'] = 'Roskaposti';
+$labels['sent']   = 'Lähetetyt';
+$labels['trash']  = 'Roskakori';
+$labels['junk']   = 'Roskaposti';
+
+// message listing
 $labels['subject'] = 'Aihe';
-$labels['from'] = 'Lähettäjä';
-$labels['to'] = 'Vastaanottaja';
-$labels['cc'] = 'Kopio';
-$labels['bcc'] = 'Piilokopio';
+$labels['from']    = 'Lähettäjä';
+$labels['sender']  = 'Lähettäjä';
+$labels['to']      = 'Vastaanottaja';
+$labels['cc']      = 'Kopio';
+$labels['bcc']     = 'Piilokopio';
 $labels['replyto'] = 'Vastaus osoitteeseen';
 $labels['followupto'] = 'Keskustelunsiirto';
-$labels['date'] = 'Päiväys';
-$labels['size'] = 'Koko';
+$labels['date']    = 'Päiväys';
+$labels['size']    = 'Koko';
 $labels['priority'] = 'Tärkeys';
 $labels['organization'] = 'Organisaatio';
 $labels['readstatus'] = 'Luettu';
 $labels['listoptions'] = 'Listaa valinnat...';
+
 $labels['mailboxlist'] = 'Kansiot';
-$labels['folders'] = 'Kansiot';
 $labels['messagesfromto'] = 'Viestit $from-$to/$count';
 $labels['threadsfromto'] = 'Viestiketjut $from-$to/$count';
 $labels['messagenrof'] = 'Viesti $nr/$count';
 $labels['fromtoshort'] = '$from - $to (yhteensä $count)';
-$labels['copy'] = 'Kopioi';
-$labels['move'] = 'Siirrä';
-$labels['moveto'] = 'siirrä kansioon...';
+
+$labels['copy']     = 'Kopioi';
+$labels['move']     = 'Siirrä';
+$labels['moveto']   = 'siirrä kansioon...';
 $labels['download'] = 'lataa';
+$labels['showattachment'] = 'Näytä';
+$labels['showanyway'] = 'Näytä silti';
+
 $labels['filename'] = 'Tiedoston nimi';
 $labels['filesize'] = 'Tiedoston koko';
+
 $labels['addtoaddressbook'] = 'Lisää osoitekirjaan';
+
+// weekdays short
 $labels['sun'] = 'Su';
 $labels['mon'] = 'Ma';
 $labels['tue'] = 'Ti';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Ke';
 $labels['thu'] = 'To';
 $labels['fri'] = 'Pe';
 $labels['sat'] = 'La';
-$labels['sunday'] = 'Sunnuntai';
-$labels['monday'] = 'Maanantai';
-$labels['tuesday'] = 'Tiistai';
+
+// weekdays long
+$labels['sunday']    = 'Sunnuntai';
+$labels['monday']    = 'Maanantai';
+$labels['tuesday']   = 'Tiistai';
 $labels['wednesday'] = 'Keskiviikko';
-$labels['thursday'] = 'Torstai';
-$labels['friday'] = 'Perjantai';
-$labels['saturday'] = 'Lauantai';
-$labels['jan'] = 'Tammi';
-$labels['feb'] = 'Helmi';
-$labels['mar'] = 'Maalis';
-$labels['apr'] = 'Huhti';
-$labels['may'] = 'Touko';
-$labels['longmay'] = 'Touko';
-$labels['jun'] = 'Kesä';
-$labels['jul'] = 'Heinä';
-$labels['aug'] = 'Elo';
-$labels['sep'] = 'Syys';
-$labels['oct'] = 'Loka';
-$labels['nov'] = 'Marras';
-$labels['dec'] = 'Joulu';
-$labels['longjan'] = 'Tammikuu';
-$labels['longfeb'] = 'Helmikuu';
-$labels['longmar'] = 'Maaliskuu';
-$labels['longapr'] = 'Huhtikuu';
-$labels['longjun'] = 'Kesäkuu';
-$labels['longjul'] = 'Heinäkuu';
-$labels['longaug'] = 'Elokuu';
-$labels['longsep'] = 'Syyskuu';
-$labels['longoct'] = 'Lokakuu';
-$labels['longnov'] = 'Marraskuu';
-$labels['longdec'] = 'Joulukuu';
+$labels['thursday']  = 'Torstai';
+$labels['friday']    = 'Perjantai';
+$labels['saturday']  = 'Lauantai';
+
+// months short
+$labels['jan']	= 'Tammi';
+$labels['feb']	= 'Helmi';
+$labels['mar']	= 'Maalis';
+$labels['apr']	= 'Huhti';
+$labels['may']	= 'Touko';
+$labels['jun']	= 'Kesä';
+$labels['jul'] 	= 'Heinä';
+$labels['aug']	= 'Elo';
+$labels['sep']	= 'Syys';
+$labels['oct']	= 'Loka';
+$labels['nov']	= 'Marras';
+$labels['dec']	= 'Joulu';
+
+// months long
+$labels['longjan']	= 'Tammikuu';
+$labels['longfeb']	= 'Helmikuu';
+$labels['longmar']	= 'Maaliskuu';
+$labels['longapr']	= 'Huhtikuu';
+$labels['longmay']	= 'Touko';
+$labels['longjun']	= 'Kesäkuu';
+$labels['longjul']	= 'Heinäkuu';
+$labels['longaug']	= 'Elokuu';
+$labels['longsep']	= 'Syyskuu';
+$labels['longoct']	= 'Lokakuu';
+$labels['longnov']	= 'Marraskuu';
+$labels['longdec']	= 'Joulukuu';
+
 $labels['today'] = 'Tänään';
-$labels['refresh'] = 'Päivitä';
-$labels['checkmail'] = 'Tarkista saapuneet viestit';
-$labels['compose'] = 'Viestin kirjoitus';
-$labels['writenewmessage'] = 'Kirjoita uusi viesti';
-$labels['reply'] = 'Vastaa';
-$labels['replytomessage'] = 'Vastaa viestiin';
+
+// toolbar buttons
+$labels['refresh']          = 'Päivitä';
+$labels['checkmail']        = 'Tarkista saapuneet viestit';
+$labels['compose']          = 'Viestin kirjoitus';
+$labels['writenewmessage']  = 'Kirjoita uusi viesti';
+$labels['reply']            = 'Vastaa';
+$labels['replytomessage']   = 'Vastaa viestiin';
 $labels['replytoallmessage'] = 'Vastaa kaikille';
-$labels['replyall'] = 'Vastaa kaikille';
-$labels['replylist'] = 'Vastaa listalle';
-$labels['forward'] = 'Välitä eteenpäin';
-$labels['forwardinline'] = 'Välitä viesti';
+$labels['replyall']         = 'Vastaa kaikille';
+$labels['replylist']        = 'Vastaa listalle';
+$labels['forward']          = 'Välitä eteenpäin';
+$labels['forwardinline']    = 'Välitä viesti';
 $labels['forwardattachment'] = 'Välitä viesti liitteenä';
-$labels['forwardmessage'] = 'Välitä viesti';
-$labels['deletemessage'] = 'Poista viesti';
+$labels['forwardmessage']   = 'Välitä viesti';
+$labels['deletemessage']    = 'Poista viesti';
 $labels['movemessagetotrash'] = 'Siirrä viesti roskakoriin';
-$labels['printmessage'] = 'Tulosta viesti';
-$labels['previousmessage'] = 'Näytä edellinen viesti';
-$labels['firstmessage'] = 'Näytä ensimmäinen viesti';
-$labels['nextmessage'] = 'Näytä edellinen viesti';
-$labels['lastmessage'] = 'Näytä viimeinen viesti';
-$labels['backtolist'] = 'Takaisin viesteihin';
-$labels['viewsource'] = 'Näytä lähdekoodi';
-$labels['mark'] = 'Merkitse';
-$labels['markmessages'] = 'Merkitse viestit';
-$labels['markread'] = 'luetuiksi';
-$labels['markunread'] = 'ei-luetuiksi';
-$labels['markflagged'] = 'korostetuiksi';
-$labels['markunflagged'] = 'ei-korostetuiksi';
-$labels['moreactions'] = 'Lisää toimintoja...';
-$labels['more'] = 'Lisää';
-$labels['back'] = 'Takaisin';
-$labels['options'] = 'Asetukset';
+$labels['printmessage']     = 'Tulosta viesti';
+$labels['previousmessage']  = 'Näytä edellinen viesti';
+$labels['firstmessage']     = 'Näytä ensimmäinen viesti';
+$labels['nextmessage']      = 'Näytä edellinen viesti';
+$labels['lastmessage']      = 'Näytä viimeinen viesti';
+$labels['backtolist']       = 'Takaisin viesteihin';
+$labels['viewsource']       = 'Näytä lähdekoodi';
+$labels['mark']             = 'Merkitse';
+$labels['markmessages']     = 'Merkitse viestit';
+$labels['markread']         = 'luetuiksi';
+$labels['markunread']       = 'ei-luetuiksi';
+$labels['markflagged']      = 'korostetuiksi';
+$labels['markunflagged']    = 'ei-korostetuiksi';
+$labels['moreactions']      = 'Lisää toimintoja...';
+$labels['more']             = 'Lisää';
+$labels['back']             = 'Takaisin';
+$labels['options']          = 'Asetukset';
+
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
 $labels['none'] = 'Ei mikään';
-$labels['nonesort'] = 'Ei mikään';
 $labels['currpage'] = 'Nykyinen sivu';
 $labels['unread'] = 'Lukemattomat';
 $labels['flagged'] = 'Korostettu';
 $labels['unanswered'] = 'Vastaamaton';
 $labels['deleted'] = 'Poistettu';
+$labels['undeleted'] = 'Ei poistettu';
 $labels['invert'] = 'Käännä';
 $labels['filter'] = 'Suodin';
 $labels['list'] = 'Listaus';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'Laajenna kaikki';
 $labels['expand-unread'] = 'Laajenna lukemattomat';
 $labels['collapse-all'] = 'Kutista kaikki';
 $labels['threaded'] = 'Säikeet';
+
 $labels['autoexpand_threads'] = 'Laajenna viestiketjut automaattisesti';
 $labels['do_expand'] = 'kaikki viestiketjut';
 $labels['expand_only_unread'] = 'vain ne joissa lukemattomia viestejä';
 $labels['fromto'] = 'Lähettäjä/Vastaanottaja';
 $labels['flag'] = 'Merkitse';
 $labels['attachment'] = 'Liite';
+$labels['nonesort'] = 'Ei mikään';
 $labels['sentdate'] = 'Lähetysaika';
 $labels['arrival'] = 'Saapumisaika';
 $labels['asc'] = 'nouseva';
@@ -156,174 +187,216 @@ $labels['listcolumns'] = 'Näkyvät kentät';
 $labels['listsorting'] = 'Lajittelu kenttä';
 $labels['listorder'] = 'Lajittelu järjestys';
 $labels['listmode'] = 'Listausnäkymä';
+
 $labels['folderactions'] = 'Kansiotoiminnot...';
 $labels['compact'] = 'Tiivistä';
 $labels['empty'] = 'Tyhjennä';
+
 $labels['quota'] = 'Levytila';
-$labels['unknown'] = 'tuntematon';
-$labels['unlimited'] = 'rajoittamaton';
-$labels['quicksearch'] = 'Pikahaku';
-$labels['resetsearch'] = 'Nollaa haku';
-$labels['searchmod'] = 'Hakukriteerit';
-$labels['msgtext'] = 'Koko viesti';
+$labels['unknown']  = 'tuntematon';
+$labels['unlimited']  = 'rajoittamaton';
+
+$labels['quicksearch']  = 'Pikahaku';
+$labels['resetsearch']  = 'Nollaa haku';
+$labels['searchmod']  = 'Hakukriteerit';
+$labels['msgtext']  = 'Koko viesti';
+$labels['body']  = 'Runko';
+
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
-$labels['editasnew'] = 'Muokkaa uutena';
-$labels['sendmessage'] = 'Lähetä viesti';
-$labels['savemessage'] = 'Tallenna tämä luonnos';
-$labels['addattachment'] = 'Liitetiedosto';
-$labels['charset'] = 'Merkistö';
-$labels['editortype'] = 'Editorin tyyppi';
-$labels['returnreceipt'] = 'Perillesaapumisilmoitus';
-$labels['dsn'] = 'Toimituksen tilailmoitus';
+
+// message compose
+$labels['editasnew']      = 'Muokkaa uutena';
+$labels['send']           = 'Lähetä';
+$labels['sendmessage']    = 'Lähetä viesti';
+$labels['savemessage']    = 'Tallenna tämä luonnos';
+$labels['addattachment']  = 'Liitetiedosto';
+$labels['charset']        = 'Merkistö';
+$labels['editortype']     = 'Editorin tyyppi';
+$labels['returnreceipt']  = 'Perillesaapumisilmoitus';
+$labels['dsn']            = 'Toimituksen tilailmoitus';
 $labels['mailreplyintro'] = '$sender kirjoitti $date:';
 $labels['originalmessage'] = 'Alkuperäinen viesti';
-$labels['editidents'] = 'Muokkaa identiteettejä';
-$labels['spellcheck'] = 'Oikeinkirjoitus';
+
+$labels['editidents']    = 'Muokkaa identiteettejä';
+$labels['spellcheck']    = 'Oikeinkirjoitus';
 $labels['checkspelling'] = 'Tarkista oikeinkirjoitus';
 $labels['resumeediting'] = 'Jatka muokkausta';
-$labels['revertto'] = 'Muuta takaisin';
+$labels['revertto']      = 'Muuta takaisin';
+
 $labels['attach'] = 'Liitä';
 $labels['attachments'] = 'Liitetiedostot';
 $labels['upload'] = 'Lisää';
 $labels['uploadprogress'] = '$percent ($current, yhteensä $total)';
-$labels['close'] = 'Sulje';
-$labels['messageoptions'] = 'Viestin asetukset...';
-$labels['low'] = 'Matala';
-$labels['lowest'] = 'Matalin';
-$labels['normal'] = 'Normaali';
-$labels['high'] = 'Korkea';
+$labels['close']  = 'Sulje';
+$labels['messageoptions']  = 'Viestin asetukset...';
+
+$labels['low']     = 'Matala';
+$labels['lowest']  = 'Matalin';
+$labels['normal']  = 'Normaali';
+$labels['high']    = 'Korkea';
 $labels['highest'] = 'Korkein';
-$labels['nosubject'] = '(ei otsikkoa)';
+
+$labels['nosubject']  = '(ei otsikkoa)';
 $labels['showimages'] = 'Näytä kuvat';
 $labels['alwaysshow'] = 'Näytä aina lähettäjältä $sender saapuneet kuvat';
-$labels['isdraft'] = 'Tämä on luonnosviesti.';
+$labels['isdraft']    = 'Tämä on luonnosviesti.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Näytä lisää viestiotsakkeita';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Tavallinen teksti';
 $labels['savesentmessagein'] = 'Tallenna lähetetty viesti kansioon';
 $labels['dontsave'] = 'Älä tallenna';
 $labels['maxuploadsize'] = 'Suurin sallittu tiedostokoko on $size';
+
 $labels['addcc'] = 'Lisää kopio';
 $labels['addbcc'] = 'Lisää piilokopio';
 $labels['addreplyto'] = 'Lisää vastausosoite';
 $labels['addfollowupto'] = 'Lisää keskustelunsiirto';
+
+// mdn
 $labels['mdnrequest'] = 'Viestin lähettäjä on pyytänyt kuittauksen siitä että olet lukenut viestin. Haluatko lähettää kuittauksen?';
 $labels['receiptread'] = 'Lukukuittaus';
 $labels['yourmessage'] = 'Tämä viesti on kuittaus lähettämällesi viestille';
 $labels['receiptnote'] = 'Huom! Kuittaus tarkoittaa vain sitä, että viesti on avattu vastaanottajan tietokoneella. Se ei tarkoita että vastaanottaja on myös lukenut tai ymmärtänyt viestin.';
-$labels['name'] = 'Näkyvä nimi';
-$labels['firstname'] = 'Etunimi';
-$labels['surname'] = 'Sukunimi';
-$labels['middlename'] = 'Toinen nimi';
-$labels['nameprefix'] = 'Etuliite';
-$labels['namesuffix'] = 'Jälkiliite';
-$labels['nickname'] = 'Lempinimi';
-$labels['jobtitle'] = 'Titteli';
-$labels['department'] = 'Osasto';
-$labels['gender'] = 'Sukupuoli';
-$labels['maidenname'] = 'Tyttönimi';
-$labels['email'] = 'Sähköposti';
-$labels['phone'] = 'Puhelin';
-$labels['address'] = 'Osoite';
-$labels['street'] = 'Katu';
-$labels['locality'] = 'Kaupunki';
-$labels['zipcode'] = 'Postinumero';
-$labels['region'] = 'Osavaltio tai lääni';
-$labels['country'] = 'Maa';
-$labels['birthday'] = 'Syntymäpäivä';
-$labels['anniversary'] = 'Vuosipäivä';
-$labels['website'] = 'Verkkosivu';
+
+// address boook
+$labels['name']         = 'Näkyvä nimi';
+$labels['firstname']    = 'Etunimi';
+$labels['surname']      = 'Sukunimi';
+$labels['middlename']   = 'Toinen nimi';
+$labels['nameprefix']   = 'Etuliite';
+$labels['namesuffix']   = 'Jälkiliite';
+$labels['nickname']     = 'Lempinimi';
+$labels['jobtitle']     = 'Titteli';
+$labels['department']   = 'Osasto';
+$labels['gender']       = 'Sukupuoli';
+$labels['maidenname']   = 'Tyttönimi';
+$labels['email']        = 'Sähköposti';
+$labels['phone']        = 'Puhelin';
+$labels['address']      = 'Osoite';
+$labels['street']       = 'Katu';
+$labels['locality']     = 'Kaupunki';
+$labels['zipcode']      = 'Postinumero';
+$labels['region']       = 'Osavaltio tai lääni';
+$labels['country']      = 'Maa';
+$labels['birthday']     = 'Syntymäpäivä';
+$labels['anniversary']  = 'Vuosipäivä';
+$labels['website']      = 'Verkkosivu';
 $labels['instantmessenger'] = 'Pikaviestin';
 $labels['notes'] = 'Muistiinpanot';
-$labels['male'] = 'mies';
+$labels['male']   = 'mies';
 $labels['female'] = 'nainen';
 $labels['manager'] = 'Päällikkö';
 $labels['assistant'] = 'Avustaja';
-$labels['typeassistant'] = 'Avustaja';
 $labels['spouse'] = 'Puoliso';
 $labels['allfields'] = 'Kaikki kentät';
 $labels['search'] = 'Haku';
 $labels['advsearch'] = 'Tarkennettu haku';
 $labels['advanced'] = 'Lisäasetukset';
 $labels['other'] = 'Muu';
-$labels['typeother'] = 'Muu';
-$labels['typehome'] = 'Koti';
-$labels['typework'] = 'Työ';
-$labels['typemobile'] = 'Matkapuhelin';
-$labels['typemain'] = 'Oma';
-$labels['typehomefax'] = 'Kotifaksi';
-$labels['typeworkfax'] = 'Työfaksi';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Hakulaite';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Kotisivu';
+
+$labels['typehome']   = 'Koti';
+$labels['typework']   = 'Työ';
+$labels['typeother']  = 'Muu';
+$labels['typemobile']  = 'Matkapuhelin';
+$labels['typemain']  = 'Oma';
+$labels['typehomefax']  = 'Kotifaksi';
+$labels['typeworkfax']  = 'Työfaksi';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Hakulaite';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Avustaja';
+$labels['typehomepage']  = 'Kotisivu';
 $labels['typeblog'] = 'Blogi';
 $labels['typeprofile'] = 'Profiili';
+
 $labels['addfield'] = 'Lisää kenttä...';
 $labels['addcontact'] = 'Lisää uusi yhteystieto';
 $labels['editcontact'] = 'Muokkaa yhteystietoa';
 $labels['contacts'] = 'Yhteystiedot';
 $labels['contactproperties'] = 'Yhteystiedon ominaisuudet';
 $labels['personalinfo'] = 'Henkilökohtaiset tiedot';
-$labels['edit'] = 'Muokkaa';
+
+$labels['edit']   = 'Muokkaa';
 $labels['cancel'] = 'Peruuta';
-$labels['save'] = 'Tallenna';
+$labels['save']   = 'Tallenna';
 $labels['delete'] = 'Poista';
 $labels['rename'] = 'Nimeä uudelleen';
 $labels['addphoto'] = 'Lisää';
 $labels['replacephoto'] = 'Korvaa';
 $labels['uploadphoto'] = 'Lähetä kuva';
-$labels['newcontact'] = 'Luo uusi yhteystieto';
-$labels['deletecontact'] = 'Poista valitut yhteystiedot';
-$labels['composeto'] = 'Kirjoita viesti yhteystiedolle';
+
+$labels['newcontact']     = 'Luo uusi yhteystieto';
+$labels['deletecontact']  = 'Poista valitut yhteystiedot';
+$labels['composeto']      = 'Kirjoita viesti yhteystiedolle';
 $labels['contactsfromto'] = 'Yhteystiedot $from-$to/$count';
-$labels['print'] = 'Tulosta';
-$labels['export'] = 'Vie (export)';
-$labels['exportvcards'] = 'Vie yhteystiedot vCard-muodossa';
+$labels['print']          = 'Tulosta';
+$labels['export']         = 'Vie (export)';
+$labels['exportall']      = 'Vie kaikki';
+$labels['exportsel']      = 'Vie valitut';
+$labels['exportvcards']   = 'Vie yhteystiedot vCard-muodossa';
 $labels['newcontactgroup'] = 'Luo uusi yhteystietoryhmä';
-$labels['grouprename'] = 'Nimeä ryhmä uudelleen';
-$labels['groupdelete'] = 'Poista ryhmä';
+$labels['grouprename']    = 'Nimeä ryhmä uudelleen';
+$labels['groupdelete']    = 'Poista ryhmä';
 $labels['groupremoveselected'] = 'Poista valitut yhteystiedot ryhmästä';
-$labels['previouspage'] = 'Näytä edellinen luettelo';
-$labels['firstpage'] = 'Näytä ensimmäinen luettelo';
-$labels['nextpage'] = 'Näytä seuraava luettelo';
-$labels['lastpage'] = 'Näytä viimeinen luettelo';
+
+$labels['previouspage']   = 'Näytä edellinen luettelo';
+$labels['firstpage']      = 'Näytä ensimmäinen luettelo';
+$labels['nextpage']       = 'Näytä seuraava luettelo';
+$labels['lastpage']       = 'Näytä viimeinen luettelo';
+
 $labels['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
 $labels['personaladrbook'] = 'Henkilökohtaiset osoitteet';
+
 $labels['searchsave'] = 'Tallenna haku';
 $labels['searchdelete'] = 'Poista haku';
+
 $labels['import'] = 'Tuo';
 $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
 $labels['importtarget'] = 'Lisää uudet yhteystiedot osoitekirjaan:';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Valmis';
+
+// settings
 $labels['settingsfor'] = 'Asetukset';
 $labels['about'] = 'Tietoja';
 $labels['preferences'] = 'Asetukset';
 $labels['userpreferences'] = 'Käyttäjän asetukset';
 $labels['editpreferences'] = 'Muokkaa käyttäjän asetuksia';
+
 $labels['identities'] = 'Identiteetit';
 $labels['manageidentities'] = 'Muokkaa tunnuksen identiteettejä';
 $labels['newidentity'] = 'Uusi identiteetti';
+
 $labels['newitem'] = 'Uusi';
 $labels['edititem'] = 'Muokkaa';
+
 $labels['preferhtml'] = 'Käytä HTML:aa';
 $labels['defaultcharset'] = 'Oletusmerkistökoodaus';
 $labels['htmlmessage'] = 'HTML-viesti';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digitaalinen allekirjoitus';
 $labels['dateformat'] = 'Päiväyksen muoto';
 $labels['timeformat'] = 'Ajan muoto';
 $labels['prettydate'] = 'Nätit päiväykset';
-$labels['setdefault'] = 'Aseta vakioksi';
-$labels['autodetect'] = 'Automaattinen';
-$labels['language'] = 'Kieli';
-$labels['timezone'] = 'Aikavyöhyke';
-$labels['pagesize'] = 'Rivejä sivulla';
+$labels['setdefault']  = 'Aseta vakioksi';
+$labels['autodetect']  = 'Automaattinen';
+$labels['language']  = 'Kieli';
+$labels['timezone']  = 'Aikavyöhyke';
+$labels['pagesize']  = 'Rivejä sivulla';
 $labels['signature'] = 'Allekirjoitus';
-$labels['dstactive'] = 'Kesäaika';
+$labels['dstactive']  = 'Kesäaika';
+$labels['showinextwin'] = 'Avaa viesti uudessa ikkunassa';
+$labels['composeextwin'] = 'Lähetä viesti uudessa ikkunassa';
 $labels['htmleditor'] = 'Kirjoita HTML-muodossa';
 $labels['htmlonreply'] = 'Vain vastatessa HTML-viesteihin';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML-allekirjoitus';
 $labels['previewpane'] = 'Näytä esikatselulehti';
 $labels['skin'] = 'Käyttöliittymän teema';
@@ -347,10 +420,11 @@ $labels['showremoteimages'] = 'Näytä ulkopuoliset kuvat viestissä';
 $labels['fromknownsenders'] = 'tunnetuilta lähettäjiltä';
 $labels['always'] = 'aina';
 $labels['showinlineimages'] = 'Näytä liitekuvat viestin jälkeen';
-$labels['autosavedraft'] = 'Tallenna luonnos automaattisesti';
-$labels['everynminutes'] = 'joka $n. minuutti';
-$labels['never'] = 'ei koskaan';
-$labels['immediately'] = 'välittömästi';
+$labels['autosavedraft']  = 'Tallenna luonnos automaattisesti';
+$labels['everynminutes']  = 'joka $n. minuutti';
+$labels['refreshinterval']  = 'Päivitä (tarkista uudet viestit jne.)';
+$labels['never']  = 'ei koskaan';
+$labels['immediately']  = 'välittömästi';
 $labels['messagesdisplaying'] = 'Viestien näyttäminen';
 $labels['messagescomposition'] = 'Viestien kirjoittaminen';
 $labels['mimeparamfolding'] = 'Liitetiedostojen nimet';
@@ -370,6 +444,7 @@ $labels['maintenance'] = 'Huolto';
 $labels['newmessage'] = 'Uusi viesti';
 $labels['signatureoptions'] = 'Allekirjoituksen asetukset';
 $labels['whenreplying'] = 'Vastattaessa';
+$labels['replyempty'] = 'älä lainaa alkuperäistä viestiä';
 $labels['replytopposting'] = 'aloita uusi viesti alkuperäisen yläpuolelle';
 $labels['replybottomposting'] = 'aloita uusi viesti alkuperäisen alapuolelle';
 $labels['replyremovesignature'] = 'Vastattaessa poista alkuperäinen allekirjoitus viestistä';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = 'Vastattaessa tai välitettäessä laita allekirj
 $labels['belowquote'] = 'lainauksen alle';
 $labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
-$labels['previewpanemarkread'] = 'Merkitse esikatsellut viestit luetuiksi';
-$labels['afternseconds'] = '$n sekunnin jälkeen';
+$labels['previewpanemarkread']  = 'Merkitse esikatsellut viestit luetuiksi';
+$labels['afternseconds']  = '$n sekunnin jälkeen';
 $labels['reqmdn'] = 'Pyydä aina kuittausviestiä';
 $labels['reqdsn'] = 'Pyydä aina toimituksen tilailmoitus';
 $labels['replysamefolder'] = 'Laita vastaukseni samaan hakemistoon alkuperäisen viestin kanssa';
-$labels['defaultaddressbook'] = 'Lisää uudet kontaktit valittuun osoitekirjaan';
+$labels['defaultabook'] = 'Oletusarvoinen osoitekirja';
 $labels['autocompletesingle'] = 'Älä huomioi vaihtoehtoisia sähköpostiosoitteita automaattisessa täydennyksessä';
 $labels['listnamedisplay'] = 'Listaa yhteystiedot';
 $labels['spellcheckbeforesend'] = 'Tarkista oikeinkirjoitus ennen viestin lähetystä';
@@ -395,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Jätä huomiotta sanat, joissa on numeroita';
 $labels['spellcheckignorecaps'] = 'Jätä huomiotta sanat, joissa kaikki kirjaimet on isoja';
 $labels['addtodict'] = 'Lisää sanakirjaan';
 $labels['mailtoprotohandler'] = 'Rekisteröi mailto:-linkkien protokollakäsitteljä';
-$labels['folder'] = 'Kansio';
-$labels['foldername'] = 'Kansion nimi';
-$labels['subscribed'] = 'Näytetään';
+$labels['forwardmode'] = 'Viestin välitys';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'liitteenä';
+
+$labels['folder']  = 'Kansio';
+$labels['folders']  = 'Kansiot';
+$labels['foldername']  = 'Kansion nimi';
+$labels['subscribed']  = 'Näytetään';
 $labels['messagecount'] = 'Viestejä';
-$labels['create'] = 'Luo uusi';
-$labels['createfolder'] = 'Luo uusi kansio';
-$labels['managefolders'] = 'Kansioiden hallinta';
+$labels['create']  = 'Luo uusi';
+$labels['createfolder']  = 'Luo uusi kansio';
+$labels['managefolders']  = 'Kansioiden hallinta';
 $labels['specialfolders'] = 'Erikoiskansiot';
 $labels['properties'] = 'Ominaisuudet';
 $labels['folderproperties'] = 'Kansion ominaisuudet';
@@ -411,22 +491,29 @@ $labels['info'] = 'Tietoja';
 $labels['getfoldersize'] = 'Napsauta saadaksesi kansion koon';
 $labels['changesubscription'] = 'Klikkaa muuttaaksesi tilausta';
 $labels['foldertype'] = 'Kansion tyyppi';
-$labels['personalfolder'] = 'Yksityinen kansio';
-$labels['otherfolder'] = 'Toisen käyttäjän kansio';
-$labels['sharedfolder'] = 'Julkinen kansio';
+$labels['personalfolder']  = 'Yksityinen kansio';
+$labels['otherfolder']  = 'Toisen käyttäjän kansio';
+$labels['sharedfolder']  = 'Julkinen kansio';
+
 $labels['sortby'] = 'Järjestä';
-$labels['sortasc'] = 'Järjestä nousevasti (a-ö)';
+$labels['sortasc']  = 'Järjestä nousevasti (a-ö)';
 $labels['sortdesc'] = 'Järjestä laskevasti (ö-a)';
 $labels['undo'] = 'Kumoa';
+
+$labels['installedplugins'] = 'Asennetut lisäosat';
 $labels['plugin'] = 'Liitännäinen';
 $labels['version'] = 'Versio';
 $labels['source'] = 'Lähde';
 $labels['license'] = 'Lisenssi';
 $labels['support'] = 'Hanki tukea';
+
+// units
 $labels['B'] = 't';
 $labels['KB'] = 'Kt';
 $labels['MB'] = 'Mt';
 $labels['GB'] = 'Gt';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Englantilainen';
 $labels['westerneuropean'] = 'Länsieurooppalainen';
@@ -446,3 +533,4 @@ $labels['japanese'] = 'Japanilainen';
 $labels['korean'] = 'Korealainen';
 $labels['chinese'] = 'Kiinalainen';
 
+?>
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index cfaa623b2..adcb36607 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Virhe havaittu.';
-$messages['loginfailed'] = 'Sisäänkirjautuminen epäonnistui';
+$messages['errortitle']  = 'Virhe havaittu.';
+$messages['loginfailed']  = 'Sisäänkirjautuminen epäonnistui';
 $messages['cookiesdisabled'] = 'Selaimesi ei hyväksy evästeitä';
 $messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole enää voimassa';
 $messages['storageerror'] = 'Yhteys IMAP-palvelimeen epäonnistui';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = 'Pyyntö aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
 $messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
+$messages['invalidhost'] = 'Virheellinen palvelinnimi.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
 $messages['loggedout'] = 'Sinut on kirjattu ulos järjestelmästä.';
 $messages['mailboxempty'] = 'Kansio on tyhjä';
+$messages['refreshing'] = 'Päivitetään...';
 $messages['loading'] = 'Ladataan...';
 $messages['uploading'] = 'Ladataan tiedostoa palvelimelle...';
 $messages['uploadingmany'] = 'Ladataan tiedostoja...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = 'Viestiä ei voitu siirtää';
 $messages['errorcopying'] = 'Viestiä ei voitu kopioida';
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
 $messages['errormarking'] = 'Viestiä ei voitu merkiä';
-$messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut yhteystiedot?';
-$messages['deletegroupconfirm'] = 'Haluatko varmasti poistaa valitun ryhmän?';
+$messages['deletecontactconfirm']  = 'Haluatko varmasti poistaa valitut yhteystiedot?';
+$messages['deletegroupconfirm']  = 'Haluatko varmasti poistaa valitun ryhmän?';
 $messages['deletemessagesconfirm'] = 'Haluatko varmasti poistaa valitut viestit?';
-$messages['deletefolderconfirm'] = 'Haluatko varmasti poistaa kansion?';
-$messages['purgefolderconfirm'] = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
+$messages['deletefolderconfirm']  = 'Haluatko varmasti poistaa kansion?';
+$messages['purgefolderconfirm']  = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
 $messages['contactdeleting'] = 'Poistetaan yhteystietoja...';
 $messages['groupdeleting'] = 'Poistetaan ryhmää...';
 $messages['folderdeleting'] = 'Poistetaan kansiota...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Tilataan kansio...';
 $messages['folderunsubscribing'] = 'Perutaan kansio tilaus...';
 $messages['formincomplete'] = 'Lomakkeen tiedot olivat puutteelliset';
 $messages['noemailwarning'] = 'Anna sähköpostiosoite';
-$messages['nonamewarning'] = 'Anna nimi';
+$messages['nonamewarning']  = 'Anna nimi';
 $messages['nopagesizewarning'] = 'Anna sivukoko';
 $messages['nosenderwarning'] = 'Anna lähettäjän sähköpostiosoite';
 $messages['norecipientwarning'] = 'Anna ainakin yksi vastaanottaja';
-$messages['nosubjectwarning'] = '"Otsikko"-kenttä on tyhjä. Haluatko kirjoittaa viestillesi otsikon?';
+$messages['nosubjectwarning']  = '"Otsikko"-kenttä on tyhjä. Haluatko kirjoittaa viestillesi otsikon?';
 $messages['nobodywarning'] = 'Lähetetäänkö viesti ilman tekstiä?';
 $messages['notsentwarning'] = 'Viestiä ei lähetetty. Haluatko poistaa viestin?';
 $messages['noldapserver'] = 'Valitse LDAP-palvelin';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
 $messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
 $messages['contactaddedtogroup'] = 'Yhteystiedot lisätty ryhmään';
 $messages['contactremovedfromgroup'] = 'Yhteystiedot poistettu ryhmästä';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Tuodaan, odota...';
-$messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard-muodossa.';
+$messages['importformaterror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole kelvollinen tuontitiedosto.';
 $messages['importconfirm'] = '<b>$inserted yhteystietoa tuotu onnistuneesti</b>';
 $messages['importconfirmskipped'] = '<b>Ohitettu $skipped  olemassa olevaa merkintää</b>';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
@@ -157,4 +163,7 @@ $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'] = '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'] = 'Varoitus: Tämä verkkopohjainen sähköpostipalvelu vaatii Javascriptin toimiakseen. Ota Javascript käyttöön selaimesi asetuksista.';
 
+?>
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index b608b1626..29e2c028b 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Sébastien BLAISOT <sebastien@blaisot.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienvenue sur $product';
-$labels['username'] = 'Utilisateur';
-$labels['password'] = 'Mot de passe';
-$labels['server'] = 'Serveur';
-$labels['login'] = 'Connexion';
-$labels['logout'] = 'Quitter';
-$labels['mail'] = 'Courriel';
+
+// login page
+$labels['welcome']   = 'Bienvenue sur $product';
+$labels['username']  = 'Utilisateur';
+$labels['password']  = 'Mot de passe';
+$labels['server']    = 'Serveur';
+$labels['login']     = 'Connexion';
+
+// taskbar
+$labels['logout']   = 'Quitter';
+$labels['mail']     = 'Courriel';
 $labels['settings'] = 'Préférences';
 $labels['addressbook'] = 'Carnet d\'adresses';
-$labels['inbox'] = 'Messages reçus';
+
+// mailbox names
+$labels['inbox']  = 'Messages reçus';
 $labels['drafts'] = 'Brouillons';
-$labels['sent'] = 'Messages envoyés';
-$labels['trash'] = 'Corbeille';
-$labels['junk'] = 'Indésirables';
+$labels['sent']   = 'Messages envoyés';
+$labels['trash']  = 'Corbeille';
+$labels['junk']   = 'Indésirables';
+
+// message listing
 $labels['subject'] = 'Objet';
-$labels['from'] = 'De';
-$labels['to'] = 'À';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Cci';
+$labels['from']    = 'De';
+$labels['sender']  = 'Expéditeur';
+$labels['to']      = 'À';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Cci';
 $labels['replyto'] = 'Répondre à';
 $labels['followupto'] = 'Faire suivre à';
-$labels['date'] = 'Date';
-$labels['size'] = 'Taille';
+$labels['date']    = 'Date';
+$labels['size']    = 'Taille';
 $labels['priority'] = 'Priorité';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Statut de lecture';
 $labels['listoptions'] = 'Lister les options...';
+
 $labels['mailboxlist'] = 'Dossiers';
-$labels['folders'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages de $from à $to sur $count';
 $labels['threadsfromto'] = 'Fil de $from à $to sur $count';
 $labels['messagenrof'] = 'Message $nr sur $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-$labels['copy'] = 'Copier';
-$labels['move'] = 'Déplacer';
-$labels['moveto'] = 'Déplacer vers...';
+
+$labels['copy']     = 'Copier';
+$labels['move']     = 'Déplacer';
+$labels['moveto']   = 'Déplacer vers...';
 $labels['download'] = 'Télécharger';
 $labels['showattachment'] = 'Afficher';
 $labels['showanyway'] = 'Afficher quand même';
+
 $labels['filename'] = 'Nom du fichier';
 $labels['filesize'] = 'Taille du fichier';
+
 $labels['addtoaddressbook'] = 'Ajouter au carnet d\'adresses';
+
+// weekdays short
 $labels['sun'] = 'Dim';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Jeu';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sam';
-$labels['sunday'] = 'Dimanche';
-$labels['monday'] = 'Lundi';
-$labels['tuesday'] = 'Mardi';
+
+// weekdays long
+$labels['sunday']    = 'Dimanche';
+$labels['monday']    = 'Lundi';
+$labels['tuesday']   = 'Mardi';
 $labels['wednesday'] = 'Mercredi';
-$labels['thursday'] = 'Jeudi';
-$labels['friday'] = 'Vendredi';
-$labels['saturday'] = 'Samedi';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Fév';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Avr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aoû';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Déc';
-$labels['longjan'] = 'Janvier';
-$labels['longfeb'] = 'Février';
-$labels['longmar'] = 'Mars';
-$labels['longapr'] = 'Avril';
-$labels['longjun'] = 'Juin';
-$labels['longjul'] = 'Juillet';
-$labels['longaug'] = 'Août';
-$labels['longsep'] = 'Septembre';
-$labels['longoct'] = 'Octobre';
-$labels['longnov'] = 'Novembre';
-$labels['longdec'] = 'Décembre';
+$labels['thursday']  = 'Jeudi';
+$labels['friday']    = 'Vendredi';
+$labels['saturday']  = 'Samedi';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Fév';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Avr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aoû';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Déc';
+
+// months long
+$labels['longjan']	= 'Janvier';
+$labels['longfeb']	= 'Février';
+$labels['longmar']	= 'Mars';
+$labels['longapr']	= 'Avril';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juin';
+$labels['longjul']	= 'Juillet';
+$labels['longaug']	= 'Août';
+$labels['longsep']	= 'Septembre';
+$labels['longoct']	= 'Octobre';
+$labels['longnov']	= 'Novembre';
+$labels['longdec']	= 'Décembre';
+
 $labels['today'] = 'Aujourd\'hui';
-$labels['refresh'] = 'Actualiser';
-$labels['checkmail'] = 'Vérification des nouveaux messages';
-$labels['compose'] = 'Composer un nouveau message';
-$labels['writenewmessage'] = 'Écrire un nouveau message';
-$labels['reply'] = 'Répondre';
-$labels['replytomessage'] = 'Répondre au message';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualiser';
+$labels['checkmail']        = 'Vérification des nouveaux messages';
+$labels['compose']          = 'Composer un nouveau message';
+$labels['writenewmessage']  = 'Écrire un nouveau message';
+$labels['reply']            = 'Répondre';
+$labels['replytomessage']   = 'Répondre au message';
 $labels['replytoallmessage'] = 'Répondre à tous';
-$labels['replyall'] = 'Répondre à tous';
-$labels['replylist'] = 'Répondre à la liste';
-$labels['forward'] = 'Transférer';
-$labels['forwardinline'] = 'Transférer dans le corps du message';
+$labels['replyall']         = 'Répondre à tous';
+$labels['replylist']        = 'Répondre à la liste';
+$labels['forward']          = 'Transférer';
+$labels['forwardinline']    = 'Transférer dans le corps du message';
 $labels['forwardattachment'] = 'Transférer en pièce-jointe';
-$labels['forwardmessage'] = 'Transmettre le message';
-$labels['deletemessage'] = 'Supprimer le message';
+$labels['forwardmessage']   = 'Transmettre le message';
+$labels['deletemessage']    = 'Supprimer le message';
 $labels['movemessagetotrash'] = 'Déplacer le message dans la corbeille';
-$labels['printmessage'] = 'Imprimer ce message';
-$labels['previousmessage'] = 'Voir le message précédent';
-$labels['firstmessage'] = 'Voir le premier message';
-$labels['nextmessage'] = 'Voir le message suivant';
-$labels['lastmessage'] = 'Voir le dernier message';
-$labels['backtolist'] = 'Retourner à la liste des messages';
-$labels['viewsource'] = 'Voir le source';
-$labels['mark'] = 'Marquer';
-$labels['markmessages'] = 'Marquer les messages';
-$labels['markread'] = 'Comme lus';
-$labels['markunread'] = 'Comme non lus';
-$labels['markflagged'] = 'Comme suivi';
-$labels['markunflagged'] = 'Comme non-suivi';
-$labels['moreactions'] = 'Plus d\'actions...';
-$labels['more'] = 'Plus';
-$labels['back'] = 'Retour';
-$labels['options'] = 'Paramètres';
+$labels['printmessage']     = 'Imprimer ce message';
+$labels['previousmessage']  = 'Voir le message précédent';
+$labels['firstmessage']     = 'Voir le premier message';
+$labels['nextmessage']      = 'Voir le message suivant';
+$labels['lastmessage']      = 'Voir le dernier message';
+$labels['backtolist']       = 'Retourner à la liste des messages';
+$labels['viewsource']       = 'Voir le source';
+$labels['mark']             = 'Marquer';
+$labels['markmessages']     = 'Marquer les messages';
+$labels['markread']         = 'Comme lus';
+$labels['markunread']       = 'Comme non lus';
+$labels['markflagged']      = 'Comme suivi';
+$labels['markunflagged']    = 'Comme non-suivi';
+$labels['moreactions']      = 'Plus d\'actions...';
+$labels['more']             = 'Plus';
+$labels['back']             = 'Retour';
+$labels['options']          = 'Paramètres';
+
 $labels['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
-$labels['nonesort'] = 'Aucun';
 $labels['currpage'] = 'Page courante';
 $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marqué';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Afficher Tous';
 $labels['expand-unread'] = 'Afficher Non-lus';
 $labels['collapse-all'] = 'Fermer Tous';
 $labels['threaded'] = 'Par sujet';
+
 $labels['autoexpand_threads'] = 'Développer les sujets';
 $labels['do_expand'] = 'Tous les sujets';
 $labels['expand_only_unread'] = 'uniquement avec des messages non-lus';
 $labels['fromto'] = 'Expéditeur/Destinataire';
 $labels['flag'] = 'Drapeau';
 $labels['attachment'] = 'Pièce jointe';
+$labels['nonesort'] = 'Aucun';
 $labels['sentdate'] = 'Date d\'envoi';
 $labels['arrival'] = 'Date d\'arrivée';
 $labels['asc'] = 'Ascendant';
@@ -159,176 +187,211 @@ $labels['listcolumns'] = 'Lister les colonnes';
 $labels['listsorting'] = 'Colonne de tri';
 $labels['listorder'] = 'Ordre de tri';
 $labels['listmode'] = 'Mode d\'affichage de la liste';
+
 $labels['folderactions'] = 'Actions du dossier';
 $labels['compact'] = 'Compacter';
 $labels['empty'] = 'Vider';
+
 $labels['quota'] = 'Occupation disque';
-$labels['unknown'] = 'inconnue';
-$labels['unlimited'] = 'illimitée';
-$labels['quicksearch'] = 'Recherche rapide';
-$labels['resetsearch'] = 'Réinitialiser la recherche';
-$labels['searchmod'] = 'Portée de la recherche';
-$labels['msgtext'] = 'Message entier';
+$labels['unknown']  = 'inconnue';
+$labels['unlimited']  = 'illimitée';
+
+$labels['quicksearch']  = 'Recherche rapide';
+$labels['resetsearch']  = 'Réinitialiser la recherche';
+$labels['searchmod']  = 'Portée de la recherche';
+$labels['msgtext']  = 'Message entier';
+$labels['body']  = 'Corps';
+
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
-$labels['editasnew'] = 'Éditer en tant que nouveau message';
-$labels['send'] = 'Envoyer';
-$labels['sendmessage'] = 'Envoyer';
-$labels['savemessage'] = 'Enregistrer';
-$labels['addattachment'] = 'Joindre un fichier';
-$labels['charset'] = 'Encodage';
-$labels['editortype'] = 'Type d\'éditeur';
-$labels['returnreceipt'] = 'Accusé de réception';
-$labels['dsn'] = 'Notification d\'état de distribution';
+
+// message compose
+$labels['editasnew']      = 'Éditer en tant que nouveau message';
+$labels['send']           = 'Envoyer';
+$labels['sendmessage']    = 'Envoyer';
+$labels['savemessage']    = 'Enregistrer';
+$labels['addattachment']  = 'Joindre un fichier';
+$labels['charset']        = 'Encodage';
+$labels['editortype']     = 'Type d\'éditeur';
+$labels['returnreceipt']  = 'Accusé de réception';
+$labels['dsn']            = 'Notification d\'état de distribution';
 $labels['mailreplyintro'] = 'Le $date, $sender a écrit :';
 $labels['originalmessage'] = 'Message original';
-$labels['editidents'] = 'Modifier les identités';
-$labels['spellcheck'] = 'Vérifier l\'orthographe';
+
+$labels['editidents']    = 'Modifier les identités';
+$labels['spellcheck']    = 'Vérifier l\'orthographe';
 $labels['checkspelling'] = 'Vérifier l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
-$labels['revertto'] = 'Revenir à';
+$labels['revertto']      = 'Revenir à';
+
 $labels['attach'] = 'Joindre';
 $labels['attachments'] = 'Fichiers joints';
 $labels['upload'] = 'Joindre';
 $labels['uploadprogress'] = '$percent ($current sur $total)';
-$labels['close'] = 'Fermer';
-$labels['messageoptions'] = 'Options du message';
-$labels['low'] = 'Basse';
-$labels['lowest'] = 'La plus basse';
-$labels['normal'] = 'Normale';
-$labels['high'] = 'Élevée';
+$labels['close']  = 'Fermer';
+$labels['messageoptions']  = 'Options du message';
+
+$labels['low']     = 'Basse';
+$labels['lowest']  = 'La plus basse';
+$labels['normal']  = 'Normale';
+$labels['high']    = 'Élevée';
 $labels['highest'] = 'La plus élevée';
-$labels['nosubject'] = '(pas de sujet)';
+
+$labels['nosubject']  = '(pas de sujet)';
 $labels['showimages'] = 'Afficher les images';
 $labels['alwaysshow'] = 'Toujours afficher les images de $sender';
-$labels['isdraft'] = 'Ceci est un brouillon.';
-$labels['andnmore'] = 'Plus de $nr...';
+$labels['isdraft']    = 'Ceci est un brouillon.';
+$labels['andnmore']   = 'Plus de $nr...';
 $labels['togglemoreheaders'] = 'Afficher plus d\'en-têtes du message';
 $labels['togglefullheaders'] = 'Afficher/Cacher l\'entête du message';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'texte brut';
 $labels['savesentmessagein'] = 'Enregistrer le message envoyé dans';
 $labels['dontsave'] = 'ne pas enregistrer';
 $labels['maxuploadsize'] = 'La taille maximum autorisée pour un fichier est $size';
+
 $labels['addcc'] = 'Ajouter Cc';
 $labels['addbcc'] = 'Ajouter Cci';
 $labels['addreplyto'] = 'Ajouter Répondre à';
 $labels['addfollowupto'] = 'Ajouter Faire suivre à';
+
+// mdn
 $labels['mdnrequest'] = 'L\'expéditeur de ce message a demandé d\'être prévenu quand vous lirez ce message. Souhaitez-vous prévenir l\'expéditeur ?';
 $labels['receiptread'] = 'Accusé de réception (lu)';
 $labels['yourmessage'] = 'Ceci est un accusé de réception pour votre message';
 $labels['receiptnote'] = 'Note : Cet accusé de réception indique seulement que le message a été affiché sur l\'ordinateur du destinataire. Il n\'y a aucune garantie que le destinataire a lu ou compris le contenu du message.';
-$labels['name'] = 'Nom à afficher';
-$labels['firstname'] = 'Prénom';
-$labels['surname'] = 'Nom';
-$labels['middlename'] = 'Nom du milieu (US)';
-$labels['nameprefix'] = 'Préfixe';
-$labels['namesuffix'] = 'Suffixe';
-$labels['nickname'] = 'Surnom';
-$labels['jobtitle'] = 'Fonction';
-$labels['department'] = 'Département';
-$labels['gender'] = 'Sexe';
-$labels['maidenname'] = 'Nom de naissance';
-$labels['email'] = 'Courriel';
-$labels['phone'] = 'Téléphone';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Rue';
-$labels['locality'] = 'Ville';
-$labels['zipcode'] = 'Code postal';
-$labels['region'] = 'Région';
-$labels['country'] = 'Pays';
-$labels['birthday'] = 'Date de naissance';
-$labels['anniversary'] = 'Anniversaire';
-$labels['website'] = 'Site Web';
+
+// address boook
+$labels['name']         = 'Nom à afficher';
+$labels['firstname']    = 'Prénom';
+$labels['surname']      = 'Nom';
+$labels['middlename']   = 'Nom du milieu (US)';
+$labels['nameprefix']   = 'Préfixe';
+$labels['namesuffix']   = 'Suffixe';
+$labels['nickname']     = 'Surnom';
+$labels['jobtitle']     = 'Fonction';
+$labels['department']   = 'Département';
+$labels['gender']       = 'Sexe';
+$labels['maidenname']   = 'Nom de naissance';
+$labels['email']        = 'Courriel';
+$labels['phone']        = 'Téléphone';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Rue';
+$labels['locality']     = 'Ville';
+$labels['zipcode']      = 'Code postal';
+$labels['region']       = 'Région';
+$labels['country']      = 'Pays';
+$labels['birthday']     = 'Date de naissance';
+$labels['anniversary']  = 'Anniversaire';
+$labels['website']      = 'Site Web';
 $labels['instantmessenger'] = 'Messagerie instantanée';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'Homme';
+$labels['male']   = 'Homme';
 $labels['female'] = 'Femme';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistante';
-$labels['typeassistant'] = 'Assistante';
 $labels['spouse'] = 'Épouse';
 $labels['allfields'] = 'Tous les champs';
 $labels['search'] = 'Rechercher';
 $labels['advsearch'] = 'Recherche avancée';
 $labels['advanced'] = 'Détails';
 $labels['other'] = 'Autre';
-$labels['typeother'] = 'Autre';
-$labels['typehome'] = 'Domicile';
-$labels['typework'] = 'Travail';
-$labels['typemobile'] = 'Mobile';
-$labels['typemain'] = 'Principale';
-$labels['typehomefax'] = 'Fax personnel';
-$labels['typeworkfax'] = 'Fax professionnel';
-$labels['typecar'] = 'Voiture';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Vidéo';
-$labels['typehomepage'] = 'Accueil';
+
+$labels['typehome']   = 'Domicile';
+$labels['typework']   = 'Travail';
+$labels['typeother']  = 'Autre';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Principale';
+$labels['typehomefax']  = 'Fax personnel';
+$labels['typeworkfax']  = 'Fax professionnel';
+$labels['typecar']  = 'Voiture';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Vidéo';
+$labels['typeassistant']  = 'Assistante';
+$labels['typehomepage']  = 'Accueil';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Ajouter un champ...';
 $labels['addcontact'] = 'Ajouter le contact sélectionné à votre Carnet d\'adresses';
 $labels['editcontact'] = 'Modifier le contact';
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Propriétés du contact';
 $labels['personalinfo'] = 'Informations personnelles';
-$labels['edit'] = 'Modifier';
+
+$labels['edit']   = 'Modifier';
 $labels['cancel'] = 'Annuler';
-$labels['save'] = 'Enregistrer';
+$labels['save']   = 'Enregistrer';
 $labels['delete'] = 'Supprimer';
 $labels['rename'] = 'Renommer';
 $labels['addphoto'] = 'Ajouter';
 $labels['replacephoto'] = 'Remplacer';
 $labels['uploadphoto'] = 'Envoyer une photo';
-$labels['newcontact'] = 'Créer un nouveau contact';
-$labels['deletecontact'] = 'Supprimer les contacts sélectionnés';
-$labels['composeto'] = 'Écrire un message à';
+
+$labels['newcontact']     = 'Créer un nouveau contact';
+$labels['deletecontact']  = 'Supprimer les contacts sélectionnés';
+$labels['composeto']      = 'Écrire un message à';
 $labels['contactsfromto'] = 'Contacts de $from à $to sur $count';
-$labels['print'] = 'Imprimer';
-$labels['export'] = 'Exporter';
-$labels['exportvcards'] = 'Exporter les contacts au format vCard';
+$labels['print']          = 'Imprimer';
+$labels['export']         = 'Exporter';
+$labels['exportall']      = 'Exporter tout';
+$labels['exportsel']      = 'Exporter la sélection';
+$labels['exportvcards']   = 'Exporter les contacts au format vCard';
 $labels['newcontactgroup'] = 'Créer un nouveau groupe de contacts';
-$labels['grouprename'] = 'Renommer le groupe';
-$labels['groupdelete'] = 'Supprimer le groupe';
+$labels['grouprename']    = 'Renommer le groupe';
+$labels['groupdelete']    = 'Supprimer le groupe';
 $labels['groupremoveselected'] = 'Retiré les contacts sélectionnés du groupe';
-$labels['previouspage'] = 'Montrer page précédente';
-$labels['firstpage'] = 'Voir la première page';
-$labels['nextpage'] = 'Montrer page suivante';
-$labels['lastpage'] = 'Voir la dernière page';
+
+$labels['previouspage']   = 'Montrer page précédente';
+$labels['firstpage']      = 'Voir la première page';
+$labels['nextpage']       = 'Montrer page suivante';
+$labels['lastpage']       = 'Voir la dernière page';
+
 $labels['group'] = 'Groupe';
 $labels['groups'] = 'Groupes';
 $labels['personaladrbook'] = 'Adresses personnelles';
+
 $labels['searchsave'] = 'Enregistrer la recherche';
 $labels['searchdelete'] = 'Supprimer la recherche';
+
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer les contacts';
 $labels['importfromfile'] = 'Importer depuis un fichier :';
 $labels['importtarget'] = 'Ajouter de nouveaux contact au carnet d’adresse :';
 $labels['importreplace'] = 'Remplacer le carnet d\'adresse entier';
+$labels['importdesc'] = 'Vous pouvez télécharger des contacts à partir d\'un carnet d\'adresses existant.<br/>Nous supportons actuellement l\'importation d\'adresses à partir des format de données <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (comma -séparés).';
 $labels['done'] = 'Terminé';
+
+// settings
 $labels['settingsfor'] = 'Paramètres pour';
 $labels['about'] = 'A propos';
 $labels['preferences'] = 'Préférences';
 $labels['userpreferences'] = 'Préférences utilisateur';
 $labels['editpreferences'] = 'Modifier les préférences utilisateur';
+
 $labels['identities'] = 'Identités';
 $labels['manageidentities'] = 'Gérer les identités pour ce compte';
 $labels['newidentity'] = 'Nouvelle identité';
+
 $labels['newitem'] = 'Nouvel élément';
 $labels['edititem'] = 'Modifier l\'élément';
+
 $labels['preferhtml'] = 'Afficher en HTML';
 $labels['defaultcharset'] = 'Encodage par défaut';
 $labels['htmlmessage'] = 'Message en HTML';
+$labels['messagepart'] = 'Partie';
+$labels['digitalsig'] = 'Signature numérique';
 $labels['dateformat'] = 'Format de la date';
 $labels['timeformat'] = 'Format de l\'heure';
 $labels['prettydate'] = 'Affichage court des dates';
-$labels['setdefault'] = 'Paramètres par défaut';
-$labels['autodetect'] = 'Automatique';
-$labels['language'] = 'Langue';
-$labels['timezone'] = 'Fuseau horaire';
-$labels['pagesize'] = 'Nombre de lignes par page';
+$labels['setdefault']  = 'Paramètres par défaut';
+$labels['autodetect']  = 'Automatique';
+$labels['language']  = 'Langue';
+$labels['timezone']  = 'Fuseau horaire';
+$labels['pagesize']  = 'Nombre de lignes par page';
 $labels['signature'] = 'Signature';
-$labels['dstactive'] = 'Heure d\'été';
+$labels['dstactive']  = 'Heure d\'été';
 $labels['showinextwin'] = 'Ouvrir le message dans une nouvelle fenêtre';
 $labels['composeextwin'] = 'Écrire dans une nouvelle fenêtre';
 $labels['htmleditor'] = 'Composer un message au format HTML';
@@ -357,11 +420,11 @@ $labels['showremoteimages'] = 'Afficher les images distantes';
 $labels['fromknownsenders'] = 'venant d\'expéditeurs connus';
 $labels['always'] = 'toujours';
 $labels['showinlineimages'] = 'Afficher les images attachées après le message';
-$labels['autosavedraft'] = 'Enregistrement automatique des brouillons';
-$labels['everynminutes'] = 'toutes les $n minute(s)';
-$labels['refreshinterval'] = 'Rafraîchir (Vérifier les nouveaux messages, etc.)';
-$labels['never'] = 'jamais';
-$labels['immediately'] = 'Immédiatement';
+$labels['autosavedraft']  = 'Enregistrement automatique des brouillons';
+$labels['everynminutes']  = 'toutes les $n minute(s)';
+$labels['refreshinterval']  = 'Rafraîchir (Vérifier les nouveaux messages, etc.)';
+$labels['never']  = 'jamais';
+$labels['immediately']  = 'Immédiatement';
 $labels['messagesdisplaying'] = 'Affichage des messages';
 $labels['messagescomposition'] = 'Écriture des messages';
 $labels['mimeparamfolding'] = 'Nom du fichier attaché';
@@ -392,8 +455,8 @@ $labels['replysignaturepos'] = 'En répondant ou en transférant, placer la sign
 $labels['belowquote'] = 'en-dessous de la citation';
 $labels['abovequote'] = 'au-dessus de la citation';
 $labels['insertsignature'] = 'Insérer la signature';
-$labels['previewpanemarkread'] = 'Marquer les messages prévisualisés comme lus';
-$labels['afternseconds'] = 'après $n secondes';
+$labels['previewpanemarkread']  = 'Marquer les messages prévisualisés comme lus';
+$labels['afternseconds']  = 'après $n secondes';
 $labels['reqmdn'] = 'Toujours demander un avis de réception';
 $labels['reqdsn'] = 'Toujours demander une notification d\'état de distribution';
 $labels['replysamefolder'] = 'Placer les réponses dans le dossier du message auquel il est répondu';
@@ -410,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Enregistrer le gestionnaire de protocole pour l
 $labels['forwardmode'] = 'Transfert des messages';
 $labels['inline'] = 'dans le corps';
 $labels['asattachment'] = 'en pièce jointe';
-$labels['folder'] = 'Dossier';
-$labels['foldername'] = 'Nom du dossier';
-$labels['subscribed'] = 'Abonné';
+
+$labels['folder']  = 'Dossier';
+$labels['folders']  = 'Dossiers';
+$labels['foldername']  = 'Nom du dossier';
+$labels['subscribed']  = 'Abonné';
 $labels['messagecount'] = 'Messages';
-$labels['create'] = 'Créer';
-$labels['createfolder'] = 'Créer un nouveau dossier';
-$labels['managefolders'] = 'Organiser les dossiers';
+$labels['create']  = 'Créer';
+$labels['createfolder']  = 'Créer un nouveau dossier';
+$labels['managefolders']  = 'Organiser les dossiers';
 $labels['specialfolders'] = 'Dossiers spéciaux';
 $labels['properties'] = 'Propriétés';
 $labels['folderproperties'] = 'Propriétés du dossier';
@@ -426,23 +491,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Cliquer pour obtenir la taille de dossier';
 $labels['changesubscription'] = 'Cliquer pour modifier l\'inscription';
 $labels['foldertype'] = 'Type de répertoire';
-$labels['personalfolder'] = 'Répertoire privé';
-$labels['otherfolder'] = 'Répertoire d\'autres utilisateurs';
-$labels['sharedfolder'] = 'Répertoire public';
+$labels['personalfolder']  = 'Répertoire privé';
+$labels['otherfolder']  = 'Répertoire d\'autres utilisateurs';
+$labels['sharedfolder']  = 'Répertoire public';
+
 $labels['sortby'] = 'Trier par';
-$labels['sortasc'] = 'Tri ascendant';
+$labels['sortasc']  = 'Tri ascendant';
 $labels['sortdesc'] = 'Tri descendant';
 $labels['undo'] = 'Annuler';
+
 $labels['installedplugins'] = 'Extensions installées';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'Source';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Support';
+
+// units
 $labels['B'] = 'o';
 $labels['KB'] = 'ko';
 $labels['MB'] = 'Mo';
 $labels['GB'] = 'Go';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglais';
 $labels['westerneuropean'] = 'Europe de l\'Ouest';
@@ -462,3 +533,4 @@ $labels['japanese'] = 'Japonais';
 $labels['korean'] = 'Coréen';
 $labels['chinese'] = 'Chinois';
 
+?>
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index b1fe1c362..bd3fd2094 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Sébastien BLAISOT <sebastien@blaisot.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Une erreur est survenue !';
-$messages['loginfailed'] = 'L\'authentification a échoué';
+$messages['errortitle']  = 'Une erreur est survenue !';
+$messages['loginfailed']  = 'L\'authentification a échoué';
 $messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les cookies';
 $messages['sessionerror'] = 'Votre session est invalide ou a expiré';
 $messages['storageerror'] = 'Erreur de connexion au serveur IMAP';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Impossible de déplacer le message';
 $messages['errorcopying'] = 'La copie de ce(s) message(s) a échoué.';
 $messages['errordeleting'] = 'Impossible d\'effacer le message';
 $messages['errormarking'] = 'Impossible de marquer le message';
-$messages['deletecontactconfirm'] = 'Êtes-vous sûr de vouloir supprimer le(s) contact(s) sélectionné(s) ?';
-$messages['deletegroupconfirm'] = 'Êtes-vous sûr de vouloir supprimer le groupe sélectionné ?';
+$messages['deletecontactconfirm']  = 'Êtes-vous sûr de vouloir supprimer le(s) contact(s) sélectionné(s) ?';
+$messages['deletegroupconfirm']  = 'Êtes-vous sûr de vouloir supprimer le groupe sélectionné ?';
 $messages['deletemessagesconfirm'] = 'Êtes-vous sûr de vouloir supprimer le(s) message(s) sélectionné(s) ?';
-$messages['deletefolderconfirm'] = 'Êtes-vous sûr de vouloir supprimer ce dossier ?';
-$messages['purgefolderconfirm'] = 'Êtes-vous sûr de vouloir supprimer tous les messages de ce dossier ?';
+$messages['deletefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer ce dossier ?';
+$messages['purgefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer tous les messages de ce dossier ?';
 $messages['contactdeleting'] = 'Suppression de contact(s)...';
 $messages['groupdeleting'] = 'Suppression du groupe ...';
 $messages['folderdeleting'] = 'Suppression du dossier...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Inscription du dossier...';
 $messages['folderunsubscribing'] = 'Désinscription du dossier...';
 $messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli';
 $messages['noemailwarning'] = 'Veuillez spécifier un courriel valide';
-$messages['nonamewarning'] = 'Veuillez fournir un nom';
+$messages['nonamewarning']  = 'Veuillez fournir un nom';
 $messages['nopagesizewarning'] = 'Veuillez indiquer une taille de page';
 $messages['nosenderwarning'] = 'Veuillez renseigner l\'adresse d\'expéditeur';
 $messages['norecipientwarning'] = 'Veuillez ajouter au moins un destinataire';
-$messages['nosubjectwarning'] = 'Le champ «Objet» est vide. Souhaitez-vous le renseigner maintenant ?';
+$messages['nosubjectwarning']  = 'Le champ «Objet» est vide. Souhaitez-vous le renseigner maintenant ?';
 $messages['nobodywarning'] = 'Envoyer ce message sans texte ?';
 $messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message ?';
 $messages['noldapserver'] = 'Choisissez un serveur LDAP pour la recherche';
@@ -160,5 +163,7 @@ $messages['invalidimageformat'] = 'Format d\'image invalide';
 $messages['mispellingsfound'] = 'Des fautes d\'orthographe ont été détectées dans le message.';
 $messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent sélectionné. Aucun droit d\'accès.';
 $messages['messagetoobig'] = 'Le message est trop gros pour être traité.';
+$messages['attachmentvalidationerror'] = 'ATTENTION ! Cette pièce jointe est suspecte car son type ne correspond pas au type déclaré dans ce message. Si vous ne faites pas confiance à l\'expéditeur, vous ne devriez pas l\'ouvrir dans le navigateur, car il peut contenir des contenus malveillants.<br/><br/><em>Attendu : $expected; trouvé : $detected</em>';
 $messages['noscriptwarning'] = 'Atention : Ce service de webmail nécessite Javascript ! Pour pouvoir l\'utiliser, merci d\'activer Javascript dans les préférences de votre navigateur.';
 
+?>
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index c92c2d9b0..cd6154626 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -2,45 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fy_NL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['username'] = 'Brûkersnamme';
-$labels['password'] = 'Wachtwurd';
-$labels['server'] = 'Server';
-$labels['login'] = 'Ynlogge';
-$labels['logout'] = 'Ôfmelde';
-$labels['mail'] = 'Mail';
+
+// login page
+$labels['welcome']   = 'Welcome to $product';
+$labels['username']  = 'Brûkersnamme';
+$labels['password']  = 'Wachtwurd';
+$labels['server']    = 'Server';
+$labels['login']     = 'Ynlogge';
+
+// taskbar
+$labels['logout']   = 'Ôfmelde';
+$labels['mail']     = 'Mail';
 $labels['settings'] = 'Ynstellingen';
 $labels['addressbook'] = 'Adresboek';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'Konsepten';
-$labels['sent'] = 'Stjoerd';
-$labels['trash'] = 'Jiskefet';
+$labels['sent']   = 'Stjoerd';
+$labels['trash']  = 'Jiskefet';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Ûnderwerp';
-$labels['from'] = 'Fan';
-$labels['to'] = 'Oan';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Fan';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Oan';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Antwurd oan';
 $labels['followupto'] = 'Oanslutend oan';
-$labels['date'] = 'Datum';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Size';
+$labels['priority'] = 'Priority';
 $labels['organization'] = 'Organisaasje';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Mappen';
-$labels['folders'] = 'Mappen';
-$labels['copy'] = 'Kopieare';
-$labels['move'] = 'Ferplaatse';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr of $count';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Kopieare';
+$labels['move']     = 'Ferplaatse';
+$labels['moveto']   = 'Move to...';
 $labels['download'] = 'Delhelje';
 $labels['showattachment'] = 'Toane';
+$labels['showanyway'] = 'Show it anyway';
+
+$labels['filename'] = 'File name';
 $labels['filesize'] = 'Triemgrutte';
+
+$labels['addtoaddressbook'] = 'Add to address book';
+
+// weekdays short
 $labels['sun'] = 'sne';
 $labels['mon'] = 'moa';
 $labels['tue'] = 'tii';
@@ -48,38 +80,457 @@ $labels['wed'] = 'woa';
 $labels['thu'] = 'toa';
 $labels['fri'] = 'fre';
 $labels['sat'] = 'sno';
-$labels['sunday'] = 'snein';
-$labels['monday'] = 'moandei';
-$labels['tuesday'] = 'tiisdei';
+
+// weekdays long
+$labels['sunday']    = 'snein';
+$labels['monday']    = 'moandei';
+$labels['tuesday']   = 'tiisdei';
 $labels['wednesday'] = 'woansdei';
-$labels['thursday'] = 'tongersdei';
-$labels['friday'] = 'freed';
-$labels['saturday'] = 'sneon';
-$labels['jan'] = 'jan';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mrt';
-$labels['apr'] = 'apr';
-$labels['may'] = 'maaie';
-$labels['longmay'] = 'maaie';
-$labels['jun'] = 'jun';
-$labels['jul'] = 'jul';
-$labels['aug'] = 'aug';
-$labels['sep'] = 'sep';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'des';
-$labels['longjan'] = 'jannewaris';
-$labels['longfeb'] = 'febrewaris';
-$labels['longmar'] = 'maart';
-$labels['longapr'] = 'april';
-$labels['longjun'] = 'juny';
-$labels['longjul'] = 'july';
-$labels['longaug'] = 'augustus';
-$labels['longsep'] = 'septimber';
-$labels['longoct'] = 'oktober';
-$labels['longnov'] = 'novimber';
-$labels['longdec'] = 'desimber';
+$labels['thursday']  = 'tongersdei';
+$labels['friday']    = 'freed';
+$labels['saturday']  = 'sneon';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mrt';
+$labels['apr']	= 'apr';
+$labels['may']	= 'maaie';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'des';
+
+// months long
+$labels['longjan']	= 'jannewaris';
+$labels['longfeb']	= 'febrewaris';
+$labels['longmar']	= 'maart';
+$labels['longapr']	= 'april';
+$labels['longmay']	= 'maaie';
+$labels['longjun']	= 'juny';
+$labels['longjul']	= 'july';
+$labels['longaug']	= 'augustus';
+$labels['longsep']	= 'septimber';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'novimber';
+$labels['longdec']	= 'desimber';
+
 $labels['today'] = 'Hjoed';
-$labels['refresh'] = 'Ferfarskje';
-$labels['reply'] = 'Beäntwurdzje';
 
+// toolbar buttons
+$labels['refresh']          = 'Ferfarskje';
+$labels['checkmail']        = 'Check for new messages';
+$labels['compose']          = 'Compose';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'Beäntwurdzje';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Delete message';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Print this message';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
+$labels['select'] = 'Select';
+$labels['all'] = 'All';
+$labels['none'] = 'None';
+$labels['currpage'] = 'Current page';
+$labels['unread'] = 'Unread';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'None';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
+$labels['compact'] = 'Compact';
+$labels['empty'] = 'Empty';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'unknown';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send message';
+$labels['savemessage']    = 'Save as draft';
+$labels['addattachment']  = 'Attach a file';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
+$labels['checkspelling'] = 'Check spelling';
+$labels['resumeediting'] = 'Resume editing';
+$labels['revertto']      = 'Revert to';
+
+$labels['attach'] = 'Attach';
+$labels['attachments'] = 'Attachments';
+$labels['upload'] = 'Upload';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Close';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
+$labels['highest'] = 'Highest';
+
+$labels['nosubject']  = '(no subject)';
+$labels['showimages'] = 'Display images';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Plain text';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'First Name';
+$labels['surname']      = 'Last Name';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Email';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
+$labels['addcontact'] = 'Add new contact';
+$labels['editcontact'] = 'Edit contact';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Edit';
+$labels['cancel'] = 'Cancel';
+$labels['save']   = 'Save';
+$labels['delete'] = 'Delete';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
+$labels['settingsfor'] = 'Settings for';
+$labels['about'] = 'About';
+$labels['preferences'] = 'Preferences';
+$labels['userpreferences'] = 'User preferences';
+$labels['editpreferences'] = 'Edit user preferences';
+
+$labels['identities'] = 'Identities';
+$labels['manageidentities'] = 'Manage identities for this account';
+$labels['newidentity'] = 'New identity';
+
+$labels['newitem'] = 'New item';
+$labels['edititem'] = 'Edit item';
+
+$labels['preferhtml'] = 'Display HTML';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Language';
+$labels['timezone']  = 'Time zone';
+$labels['pagesize']  = 'Rows per page';
+$labels['signature'] = 'Signature';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
+$labels['htmleditor'] = 'Compose HTML messages';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlsignature'] = 'HTML signature';
+$labels['previewpane'] = 'Show preview pane';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'never';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Mappen';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 14a5cd1b4..795295eb2 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -2,53 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ga_IE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Fáilte go $product';
-$labels['username'] = 'Úsáideoir';
-$labels['password'] = 'Pasfhocal';
-$labels['server'] = 'Freastalaí';
-$labels['login'] = 'Logáil isteach';
-$labels['logout'] = 'Logáil amach';
-$labels['mail'] = 'Postas';
+
+// login page
+$labels['welcome']   = 'Fáilte go $product';
+$labels['username']  = 'Úsáideoir';
+$labels['password']  = 'Pasfhocal';
+$labels['server']    = 'Freastalaí';
+$labels['login']     = 'Logáil isteach';
+
+// taskbar
+$labels['logout']   = 'Logáil amach';
+$labels['mail']     = 'Postas';
 $labels['settings'] = 'Socruithe Pearsanta';
 $labels['addressbook'] = 'Leabhair Seoltaí';
-$labels['inbox'] = 'Isteach';
+
+// mailbox names
+$labels['inbox']  = 'Isteach';
 $labels['drafts'] = 'Dréachtaí';
-$labels['sent'] = 'Amach';
-$labels['trash'] = 'Bosca bruscair';
-$labels['junk'] = 'Dramhaíl';
+$labels['sent']   = 'Amach';
+$labels['trash']  = 'Bosca bruscair';
+$labels['junk']   = 'Dramhaíl';
+
+// message listing
 $labels['subject'] = 'Ábhair';
-$labels['from'] = 'Seolaí';
-$labels['to'] = 'Faighteoir';
-$labels['cc'] = 'Cóipeáil';
-$labels['bcc'] = 'Cóip cheilte';
+$labels['from']    = 'Seolaí';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Faighteoir';
+$labels['cc']      = 'Cóipeáil';
+$labels['bcc']     = 'Cóip cheilte';
 $labels['replyto'] = 'Freagair go';
-$labels['date'] = 'Dáta';
-$labels['size'] = 'Méid';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Dáta';
+$labels['size']    = 'Méid';
 $labels['priority'] = 'Tosaíocht';
 $labels['organization'] = 'Eagraíocht';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Fillteán';
-$labels['folders'] = 'Fillteán';
 $labels['messagesfromto'] = 'Teachtaireachta as $from go $to as $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Teachtaireacht $nr as $count';
-$labels['copy'] = 'Cóipeáil';
-$labels['move'] = 'Bog';
-$labels['moveto'] = 'bog go...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Cóipeáil';
+$labels['move']     = 'Bog';
+$labels['moveto']   = 'bog go...';
 $labels['download'] = 'síos-luchtú';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Comhad';
 $labels['filesize'] = 'Toirt';
+
 $labels['addtoaddressbook'] = 'Sábháil i mo leabhair seoltaí';
+
+// weekdays short
 $labels['sun'] = 'Do';
 $labels['mon'] = 'Lu';
 $labels['tue'] = 'Mh';
@@ -56,136 +80,457 @@ $labels['wed'] = 'Ch';
 $labels['thu'] = 'Dé';
 $labels['fri'] = 'Ao';
 $labels['sat'] = 'Sa';
-$labels['sunday'] = 'Domhnach';
-$labels['monday'] = 'An Luan';
-$labels['tuesday'] = 'An Mháirt';
+
+// weekdays long
+$labels['sunday']    = 'Domhnach';
+$labels['monday']    = 'An Luan';
+$labels['tuesday']   = 'An Mháirt';
 $labels['wednesday'] = 'An Chéadaoin';
-$labels['thursday'] = 'An Déardaoin';
-$labels['friday'] = 'Aoine';
-$labels['saturday'] = 'An Satharn';
-$labels['jan'] = 'Ean';
-$labels['feb'] = 'Fea';
-$labels['mar'] = 'Már';
-$labels['apr'] = 'Aib';
-$labels['may'] = 'Bea';
-$labels['longmay'] = 'Bea';
-$labels['jun'] = 'Mei';
-$labels['jul'] = 'Iúi';
-$labels['aug'] = 'Lún';
-$labels['nov'] = 'Sam';
-$labels['dec'] = 'Nol';
-$labels['longjan'] = 'Eanáir';
-$labels['longfeb'] = 'Feabhra';
-$labels['longmar'] = 'Márta';
-$labels['longapr'] = 'Aibreán';
-$labels['longjun'] = 'Meitheamh';
-$labels['longjul'] = 'Iúil';
-$labels['longaug'] = 'Lúnasa';
-$labels['longsep'] = 'Meán Fómhair';
-$labels['longoct'] = 'Deireadh Fómhair';
-$labels['longnov'] = 'Samhain';
-$labels['longdec'] = 'Nollag';
+$labels['thursday']  = 'An Déardaoin';
+$labels['friday']    = 'Aoine';
+$labels['saturday']  = 'An Satharn';
+
+// months short
+$labels['jan']	= 'Ean';
+$labels['feb']	= 'Fea';
+$labels['mar']	= 'Már';
+$labels['apr']	= 'Aib';
+$labels['may']	= 'Bea';
+$labels['jun']	= 'Mei';
+$labels['jul'] 	= 'Iúi';
+$labels['aug']	= 'Lún';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Sam';
+$labels['dec']	= 'Nol';
+
+// months long
+$labels['longjan']	= 'Eanáir';
+$labels['longfeb']	= 'Feabhra';
+$labels['longmar']	= 'Márta';
+$labels['longapr']	= 'Aibreán';
+$labels['longmay']	= 'Bea';
+$labels['longjun']	= 'Meitheamh';
+$labels['longjul']	= 'Iúil';
+$labels['longaug']	= 'Lúnasa';
+$labels['longsep']	= 'Meán Fómhair';
+$labels['longoct']	= 'Deireadh Fómhair';
+$labels['longnov']	= 'Samhain';
+$labels['longdec']	= 'Nollag';
+
 $labels['today'] = 'Inniu';
-$labels['checkmail'] = 'Seiceáil chun teachtaireacht nua';
-$labels['compose'] = 'Scríobh teachtaireacht';
-$labels['writenewmessage'] = 'Scríobh teachtaireacht nua';
-$labels['replytomessage'] = 'Scríobh freagra chun an seolaí';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Seiceáil chun teachtaireacht nua';
+$labels['compose']          = 'Scríobh teachtaireacht';
+$labels['writenewmessage']  = 'Scríobh teachtaireacht nua';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Scríobh freagra chun an seolaí';
 $labels['replytoallmessage'] = 'Scríobh freagra chun an seolaí agus na faighteoir';
-$labels['replyall'] = 'Freagra gach';
-$labels['forwardmessage'] = 'Seol ar aghaidh an teachtaireacht';
-$labels['deletemessage'] = 'Chuir an teachtaireacht i mo bosca bruscair';
-$labels['printmessage'] = 'Priontáil an teachtaireacht seo';
-$labels['previousmessage'] = 'Taispeáin an teachtaireacht roimhe seo';
-$labels['firstmessage'] = 'Taispeáin an cead teachtaireacht';
-$labels['nextmessage'] = 'Taispeáin an teachtaireacht ina dhiaidh sin';
-$labels['lastmessage'] = 'Taispeáin an teachtaireacht deireanach';
-$labels['backtolist'] = 'Téigh ar ais go dtí an liosta teachtaireachta';
-$labels['viewsource'] = 'Éiriú bunchód';
+$labels['replyall']         = 'Freagra gach';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Seol ar aghaidh an teachtaireacht';
+$labels['deletemessage']    = 'Chuir an teachtaireacht i mo bosca bruscair';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Priontáil an teachtaireacht seo';
+$labels['previousmessage']  = 'Taispeáin an teachtaireacht roimhe seo';
+$labels['firstmessage']     = 'Taispeáin an cead teachtaireacht';
+$labels['nextmessage']      = 'Taispeáin an teachtaireacht ina dhiaidh sin';
+$labels['lastmessage']      = 'Taispeáin an teachtaireacht deireanach';
+$labels['backtolist']       = 'Téigh ar ais go dtí an liosta teachtaireachta';
+$labels['viewsource']       = 'Éiriú bunchód';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Togh';
 $labels['all'] = 'An uile';
 $labels['none'] = 'Aon cheann';
-$labels['nonesort'] = 'Aon cheann';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na rudaí nach bhuil corraithe';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Aon cheann';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Comhbhrúigh';
 $labels['empty'] = 'Folmhaigh';
+
 $labels['quota'] = 'Toilleadh diosca atá athláimhe';
-$labels['unknown'] = 'gan aithne';
-$labels['unlimited'] = 'gan teorainn';
-$labels['quicksearch'] = 'Mearcuardaigh';
-$labels['resetsearch'] = 'Athshocraigh an cuardach';
-$labels['sendmessage'] = 'Seol mo teachtaireacht láithreach bonn';
-$labels['savemessage'] = 'Sábháil an dréachta seo';
-$labels['addattachment'] = 'Suimigh Iatán';
-$labels['charset'] = 'Foireann carachtar';
-$labels['editortype'] = 'Sort eagarthóir';
-$labels['returnreceipt'] = 'Admháil léite';
+$labels['unknown']  = 'gan aithne';
+$labels['unlimited']  = 'gan teorainn';
+
+$labels['quicksearch']  = 'Mearcuardaigh';
+$labels['resetsearch']  = 'Athshocraigh an cuardach';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Seol mo teachtaireacht láithreach bonn';
+$labels['savemessage']    = 'Sábháil an dréachta seo';
+$labels['addattachment']  = 'Suimigh Iatán';
+$labels['charset']        = 'Foireann carachtar';
+$labels['editortype']     = 'Sort eagarthóir';
+$labels['returnreceipt']  = 'Admháil léite';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Fiosrú ar mo litriú';
 $labels['resumeediting'] = 'Athdhúisigh eagarthóireacht';
-$labels['revertto'] = 'Filleadh ar';
+$labels['revertto']      = 'Filleadh ar';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Iatání';
 $labels['upload'] = 'Aistriú suas';
-$labels['close'] = 'Dún';
-$labels['low'] = 'Íseal';
-$labels['lowest'] = 'Is Ísle';
-$labels['normal'] = 'Gnách';
-$labels['high'] = 'Ard';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Dún';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Íseal';
+$labels['lowest']  = 'Is Ísle';
+$labels['normal']  = 'Gnách';
+$labels['high']    = 'Ard';
 $labels['highest'] = 'Is Airde';
-$labels['nosubject'] = '(Níl aon Ábhair)';
+
+$labels['nosubject']  = '(Níl aon Ábhair)';
 $labels['showimages'] = 'Taispeáin na híomhánna';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Téacs amháin';
-$labels['name'] = 'Leasainm';
-$labels['firstname'] = 'Ainm baiste';
-$labels['surname'] = 'Sloinne';
-$labels['email'] = 'Ríomhphost';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Leasainm';
+$labels['firstname']    = 'Ainm baiste';
+$labels['surname']      = 'Sloinne';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Ríomhphost';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Sábháil duine nua';
 $labels['editcontact'] = 'Chuir chara in eagar';
-$labels['edit'] = 'Athraigh';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Athraigh';
 $labels['cancel'] = 'Cealaigh';
-$labels['save'] = 'Sábháil';
+$labels['save']   = 'Sábháil';
 $labels['delete'] = 'Scrios';
-$labels['newcontact'] = 'Scríobh carta teagmháil nua';
-$labels['deletecontact'] = 'Scrios na daoine seo';
-$labels['composeto'] = 'Scríobh teachtaireacht go';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Scríobh carta teagmháil nua';
+$labels['deletecontact']  = 'Scrios na daoine seo';
+$labels['composeto']      = 'Scríobh teachtaireacht go';
 $labels['contactsfromto'] = 'Daoine as $from to $to as $count';
-$labels['print'] = 'Priontáil';
-$labels['export'] = 'Easportáil';
-$labels['previouspage'] = 'Taispeáin an foireann roimhe seo';
-$labels['firstpage'] = 'Taispeáin an céad foireann';
-$labels['nextpage'] = 'Taispeáin an foireann ina dhiaidh sin';
-$labels['lastpage'] = 'Taispeáin an foireann deireanach';
+$labels['print']          = 'Priontáil';
+$labels['export']         = 'Easportáil';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Taispeáin an foireann roimhe seo';
+$labels['firstpage']      = 'Taispeáin an céad foireann';
+$labels['nextpage']       = 'Taispeáin an foireann ina dhiaidh sin';
+$labels['lastpage']       = 'Taispeáin an foireann deireanach';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grúpaí';
 $labels['personaladrbook'] = 'Seoltaí Pearsanta';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Socruithe chun';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Tosaíocht';
 $labels['userpreferences'] = 'Tosaíocht Pearsanta';
 $labels['editpreferences'] = 'Athraigh tosaíocht pearsanta';
+
 $labels['identities'] = 'Céannachtaí';
 $labels['manageidentities'] = 'Stiúir céannachtaí i cuntas seo';
 $labels['newidentity'] = 'Céannacht nua';
+
 $labels['newitem'] = 'Mír nua';
 $labels['edititem'] = 'Athraigh mhír';
+
 $labels['preferhtml'] = 'Taispeáin an HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Teachtaireacht HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Dátaí Dheas';
-$labels['setdefault'] = 'Socraigh an réamhshocraithe';
-$labels['language'] = 'Teanga';
-$labels['timezone'] = 'Crios ama';
-$labels['pagesize'] = 'Rónna in aghaidh gach leathanach';
+$labels['setdefault']  = 'Socraigh an réamhshocraithe';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Teanga';
+$labels['timezone']  = 'Crios ama';
+$labels['pagesize']  = 'Rónna in aghaidh gach leathanach';
 $labels['signature'] = 'Mana clabhsúir';
-$labels['dstactive'] = 'Laethúil um shamhradh';
+$labels['dstactive']  = 'Laethúil um shamhradh';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Scríobh teachtaireachta HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Mana clabhsúir HTML';
 $labels['previewpane'] = 'Taispeáin an pána réamhamharc';
-$labels['autosavedraft'] = 'Sábháil dréachta go huathoibríoch';
-$labels['never'] = 'riamh';
-$labels['folder'] = 'Fillteán';
-$labels['foldername'] = 'Ainm fillteán';
-$labels['subscribed'] = 'Síntiú';
-$labels['create'] = 'Cruthaigh';
-$labels['createfolder'] = 'Cruthaigh fillteán nua';
-$labels['managefolders'] = 'Stiúir na fillteán';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Sábháil dréachta go huathoibríoch';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'riamh';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Fillteán';
+$labels['folders']  = 'Fillteán';
+$labels['foldername']  = 'Ainm fillteán';
+$labels['subscribed']  = 'Síntiú';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Cruthaigh';
+$labels['createfolder']  = 'Cruthaigh fillteán nua';
+$labels['managefolders']  = 'Stiúir na fillteán';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Sórtáil trí';
-$labels['sortasc'] = 'Sórtáil in ord méadaitheach';
+$labels['sortasc']  = 'Sórtáil in ord méadaitheach';
 $labels['sortdesc'] = 'Sórtáil in ord neartaitheach';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 986385496..140b88639 100755
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ga_IE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Theip an iarraidh chun logáil tú isteach';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Theip an iarraidh chun logáil tú isteach';
 $messages['cookiesdisabled'] = 'Níor glac do sracléitheoir an fianán seisiúin';
 $messages['sessionerror'] = 'Tá an seisiúin neamhbhailí nó as feidhm';
 $messages['storageerror'] = 'Theip an iarraidh chun nasc go dtí an freastalaí Prótacal Rochtana Teachtaireachtaí Idirlín (IMAP)';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Ní bhfuair mé aon teachtaireacht i bosca postas seo';
 $messages['loggedout'] = 'D\'éirigh tú logáil amach. Slán Leat!';
 $messages['mailboxempty'] = 'Tá an bosca postas folamh';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Fan nóiméad, ag lódáil...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ag lódáil sonraí...';
 $messages['checkingmail'] = 'Ag seiceáil chun teachtaireacht nua...';
 $messages['sendingmessage'] = 'Ag seol mo teachtaireacht láithreach bonn...';
@@ -32,34 +46,54 @@ $messages['messagesaved'] = 'Sábháil mé an teachtaireacht i dréachtaí';
 $messages['successfullysaved'] = 'D\'éirigh mé agus sábháil mé';
 $messages['addedsuccessfully'] = 'D\'éirigh mé agus shábháil mé duine nua go dtí an Leabhair Seoltaí';
 $messages['contactexists'] = 'Tá duine i do Leabhair Seoltaí agus tá an seoladh ríomhphost seo aige';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Chun do príobháide a cosain, choiscinn na híomhánna san teachtaireacht seo';
 $messages['encryptedmessage'] = 'Tá an teachtaireacht seo i criptiúchán, Níl an cumas agam chun é a tionscail';
 $messages['nocontactsfound'] = 'Ní raibh aon buine san Leabhair Seoltaí seo';
 $messages['contactnotfound'] = 'Ní bhfuair mé an duine seo';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Theip an iarraidh chun an teachtaireacht a seol';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Theip mé agus ní shábháil';
 $messages['errormoving'] = 'Theip mé agus ní bog an teachtaireacht';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Theip mé agus níor scrios me an teachtaireacht';
-$messages['deletecontactconfirm'] = 'Ar mhaith leat scrios na daoine seo?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ar mhaith leat scrios na daoine seo?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ar mhaith leat scrios na teachtaireacht seo?';
-$messages['deletefolderconfirm'] = 'Ar mhaith leat scrios an fillteán seo?';
-$messages['purgefolderconfirm'] = 'Ar mhaith leat scrios gach teachtaireacht san fillteán seo?';
+$messages['deletefolderconfirm']  = 'Ar mhaith leat scrios an fillteán seo?';
+$messages['purgefolderconfirm']  = 'Ar mhaith leat scrios gach teachtaireacht san fillteán seo?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Níor chríochnaigh tú an foirm';
 $messages['noemailwarning'] = 'Abair liom seoladh ríomhphost nach bfhuil neamhbhaillí';
-$messages['nonamewarning'] = 'Abair liom do ainm';
+$messages['nonamewarning']  = 'Abair liom do ainm';
 $messages['nopagesizewarning'] = 'Abair liom saghas leathanaigh';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Abair liom faighteoir amhain ar a laghad';
-$messages['nosubjectwarning'] = 'Níl aon ábhair ar an teachtaireacht, ba mhaith tú déarfaidh mé ábair?';
+$messages['nosubjectwarning']  = 'Níl aon ábhair ar an teachtaireacht, ba mhaith tú déarfaidh mé ábair?';
 $messages['nobodywarning'] = 'Níl aon teacs san teachtaireacht, ba mhaith tú déarfaidh mé teachtaireacht ar bith?';
 $messages['notsentwarning'] = 'Theip an iarraidh chun an teachtaireacht a seo. ba mhaith tú scrios do teachtaireacht?';
 $messages['noldapserver'] = 'Abair liom eolaire LDAP chun é a cuardaigh';
 $messages['nosearchname'] = 'Abair liom ainm duine nó seoladh ríomhphost';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'Fuair mé $n teachtaireacht';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Ní bhfuair mé aon rud as an ceist seo';
 $messages['searching'] = 'Ag tástáil...';
 $messages['checking'] = 'Bím ag dhéanamh na mhaoirseachtí...';
 $messages['nospellerrors'] = 'Ní bhfuair mé aon earráidí i teachtaireacht seo';
 $messages['folderdeleted'] = 'D\'éirigh mé, Scrios mé an fillteán';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'D\'éirigh mé, Scrios mé';
 $messages['converting'] = 'Scrios mé formáidithe as an teachtaireacht seo';
 $messages['messageopenerror'] = 'Theip orm chun an teachtaireacht seo a tarrtháil as an freastalaí';
@@ -69,4 +103,67 @@ $messages['copysuccess'] = 'D\'éirigh mé agus chuir mé $nr seolagh i do Leabh
 $messages['copyerror'] = 'Theip mé agus níor dfhag mé aon seolagh';
 $messages['sourceisreadonly'] = 'Tá an foinse seolaigh seo inléite amháin';
 $messages['errorsavingcontact'] = 'Theip mé, Níl an cumas agam an seolagh seo a sábháil';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 976590ba8..3c5b60026 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -2,57 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvido a $product';
-$labels['username'] = 'Nome de usuario';
-$labels['password'] = 'Contrasinal';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Acceder';
-$labels['logout'] = 'Saír';
-$labels['mail'] = 'Caixa de entrada';
+
+// login page
+$labels['welcome']   = 'Benvido a $product';
+$labels['username']  = 'Nome de usuario';
+$labels['password']  = 'Contrasinal';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Acceder';
+
+// taskbar
+$labels['logout']   = 'Saír';
+$labels['mail']     = 'Caixa de entrada';
 $labels['settings'] = 'Axustes persoais';
 $labels['addressbook'] = 'Caderno de enderezos';
-$labels['inbox'] = 'Caixa de entrada';
+
+// mailbox names
+$labels['inbox']  = 'Caixa de entrada';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Cubo do lixo';
-$labels['junk'] = 'Correo lixo';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Cubo do lixo';
+$labels['junk']   = 'Correo lixo';
+
+// message listing
 $labels['subject'] = 'Asunto';
-$labels['from'] = 'Remitente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Copia (Cc)';
-$labels['bcc'] = 'Copia oculta (Cco)';
+$labels['from']    = 'Remitente';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Copia (Cc)';
+$labels['bcc']     = 'Copia oculta (Cco)';
 $labels['replyto'] = 'Respostar a (Reply-To)';
 $labels['followupto'] = 'Respostar a todos (Followup-To)';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamaño';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Estado da lectura';
 $labels['listoptions'] = 'Opcións de lista...';
+
 $labels['mailboxlist'] = 'Cartafoles';
-$labels['folders'] = 'Cartafoles';
 $labels['messagesfromto'] = 'Mensaxes da $from á $to de $count';
 $labels['threadsfromto'] = 'Fíos do $from ao $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nome de ficheiro';
 $labels['filesize'] = 'Tamaño de ficheiro';
+
 $labels['addtoaddressbook'] = 'Engadir ao caderno de enderezos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -60,77 +80,89 @@ $labels['wed'] = 'Mér';
 $labels['thu'] = 'Xov';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Luns';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Luns';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Mércores';
-$labels['thursday'] = 'Xoves';
-$labels['friday'] = 'Venres';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Xan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Maio';
-$labels['longmay'] = 'Maio';
-$labels['jun'] = 'Xuñ';
-$labels['jul'] = 'Xul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Out';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Xaneiro';
-$labels['longfeb'] = 'Febreiro';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Xuño';
-$labels['longjul'] = 'Xullo';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Setembro';
-$labels['longoct'] = 'Outubro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Decembro';
+$labels['thursday']  = 'Xoves';
+$labels['friday']    = 'Venres';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Xan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Maio';
+$labels['jun']	= 'Xuñ';
+$labels['jul'] 	= 'Xul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Out';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Xaneiro';
+$labels['longfeb']	= 'Febreiro';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Maio';
+$labels['longjun']	= 'Xuño';
+$labels['longjul']	= 'Xullo';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Setembro';
+$labels['longoct']	= 'Outubro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Decembro';
+
 $labels['today'] = 'Hoxe';
-$labels['refresh'] = 'Actualizar';
-$labels['checkmail'] = 'Procurar novas mensaxes';
-$labels['compose'] = 'Redactar unha mensaxe';
-$labels['writenewmessage'] = 'Redactar unha mensaxe nova';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Respostar a mensaxe';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizar';
+$labels['checkmail']        = 'Procurar novas mensaxes';
+$labels['compose']          = 'Redactar unha mensaxe';
+$labels['writenewmessage']  = 'Redactar unha mensaxe nova';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Respostar a mensaxe';
 $labels['replytoallmessage'] = 'Respostar á lista ou ao remitente e a tódolos destinatarios';
-$labels['replyall'] = 'Respostar a todos';
-$labels['replylist'] = 'Respostar á lista de correo';
-$labels['forwardinline'] = 'Reenviar inserido';
+$labels['replyall']         = 'Respostar a todos';
+$labels['replylist']        = 'Respostar á lista de correo';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Reenviar inserido';
 $labels['forwardattachment'] = 'Reenviar como anexo';
-$labels['forwardmessage'] = 'Reenviar a mensaxe';
-$labels['deletemessage'] = 'Eliminar a mensaxe';
+$labels['forwardmessage']   = 'Reenviar a mensaxe';
+$labels['deletemessage']    = 'Eliminar a mensaxe';
 $labels['movemessagetotrash'] = 'Mover a mensaxe ao cubo do lixo';
-$labels['printmessage'] = 'Imprimir esta mensaxe';
-$labels['previousmessage'] = 'Amosar a mensaxe anterior';
-$labels['firstmessage'] = 'Amosar a primeira mensaxe';
-$labels['nextmessage'] = 'Amosar a seguinte mensaxe';
-$labels['lastmessage'] = 'Amosar a última mensaxe';
-$labels['backtolist'] = 'Voltar á lista de mensaxes';
-$labels['viewsource'] = 'Ver código fonte';
-$labels['markmessages'] = 'Marcar mensaxes';
-$labels['markread'] = 'Como lidas';
-$labels['markunread'] = 'Como non lidas';
-$labels['markflagged'] = 'Como marcadas';
-$labels['markunflagged'] = 'Como non marcadas';
-$labels['moreactions'] = 'Máis accións...';
-$labels['more'] = 'Máis';
-$labels['back'] = 'Atrás';
-$labels['options'] = 'Opcións';
+$labels['printmessage']     = 'Imprimir esta mensaxe';
+$labels['previousmessage']  = 'Amosar a mensaxe anterior';
+$labels['firstmessage']     = 'Amosar a primeira mensaxe';
+$labels['nextmessage']      = 'Amosar a seguinte mensaxe';
+$labels['lastmessage']      = 'Amosar a última mensaxe';
+$labels['backtolist']       = 'Voltar á lista de mensaxes';
+$labels['viewsource']       = 'Ver código fonte';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Marcar mensaxes';
+$labels['markread']         = 'Como lidas';
+$labels['markunread']       = 'Como non lidas';
+$labels['markflagged']      = 'Como marcadas';
+$labels['markunflagged']    = 'Como non marcadas';
+$labels['moreactions']      = 'Máis accións...';
+$labels['more']             = 'Máis';
+$labels['back']             = 'Atrás';
+$labels['options']          = 'Opcións';
+
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Ningunha';
-$labels['nonesort'] = 'Ningunha';
 $labels['currpage'] = 'Páxina actual';
 $labels['unread'] = 'Non lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Non respostadas';
 $labels['deleted'] = 'Marcadas como eliminadas';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -139,12 +171,14 @@ $labels['expand-all'] = 'Expandir todos';
 $labels['expand-unread'] = 'Expandir os non lidos';
 $labels['collapse-all'] = 'Contraer todos';
 $labels['threaded'] = 'Agrupar conversas';
+
 $labels['autoexpand_threads'] = 'Expandir os fíos de mensaxes';
 $labels['do_expand'] = 'tódolos fíos';
 $labels['expand_only_unread'] = 'só con mensaxes non lidas';
 $labels['fromto'] = 'Remitente/Destinatario';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Anexo';
+$labels['nonesort'] = 'Ningunha';
 $labels['sentdate'] = 'Data de envío';
 $labels['arrival'] = 'Data de chegada';
 $labels['asc'] = 'ascendente';
@@ -153,171 +187,216 @@ $labels['listcolumns'] = 'Enumerar columnas';
 $labels['listsorting'] = 'Ordenar pola columna';
 $labels['listorder'] = 'Ordenación';
 $labels['listmode'] = 'Modo de vista da lista';
+
 $labels['folderactions'] = 'Accións cos cartafoles';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Baleirar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'descoñecido';
-$labels['unlimited'] = 'ilimitado';
-$labels['quicksearch'] = 'Busca rápida';
-$labels['resetsearch'] = 'Restablecer a busca';
-$labels['searchmod'] = 'Modificadores de busca';
-$labels['msgtext'] = 'Mensaxe enteira';
+$labels['unknown']  = 'descoñecido';
+$labels['unlimited']  = 'ilimitado';
+
+$labels['quicksearch']  = 'Busca rápida';
+$labels['resetsearch']  = 'Restablecer a busca';
+$labels['searchmod']  = 'Modificadores de busca';
+$labels['msgtext']  = 'Mensaxe enteira';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
-$labels['editasnew'] = 'Editar como nova';
-$labels['sendmessage'] = 'Enviar a mensaxe agora';
-$labels['savemessage'] = 'Gardar a mensaxe como borrador';
-$labels['addattachment'] = 'Anexar un ficheiro';
-$labels['charset'] = 'Codificación';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Notificación da entrega';
-$labels['dsn'] = 'Notificación do estado de envío (DSN)';
+
+// message compose
+$labels['editasnew']      = 'Editar como nova';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Enviar a mensaxe agora';
+$labels['savemessage']    = 'Gardar a mensaxe como borrador';
+$labels['addattachment']  = 'Anexar un ficheiro';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Notificación da entrega';
+$labels['dsn']            = 'Notificación do estado de envío (DSN)';
 $labels['mailreplyintro'] = 'O $date, $sender escribiu:';
 $labels['originalmessage'] = 'Mensaxe orixinal';
-$labels['editidents'] = 'Modificar identidades';
+
+$labels['editidents']    = 'Modificar identidades';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Revisar a ortografía';
 $labels['resumeediting'] = 'Voltar á edición';
-$labels['revertto'] = 'Voltar a';
+$labels['revertto']      = 'Voltar a';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Ficheiros anexos';
 $labels['upload'] = 'Cargar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Pechar';
-$labels['messageoptions'] = 'Opcións da mensaxe...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'A máis baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Pechar';
+$labels['messageoptions']  = 'Opcións da mensaxe...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'A máis baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'A máis alta';
-$labels['nosubject'] = '(Sen asunto)';
+
+$labels['nosubject']  = '(Sen asunto)';
 $labels['showimages'] = 'Amosar as imaxes';
 $labels['alwaysshow'] = 'Amosar sempre as imaxes nas mensaxes de $sender';
-$labels['isdraft'] = 'Esta mensaxe é un borrador';
+$labels['isdraft']    = 'Esta mensaxe é un borrador';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Só texto';
 $labels['savesentmessagein'] = 'Gardar a mensaxe enviada en';
 $labels['dontsave'] = 'non gardar';
 $labels['maxuploadsize'] = 'O tamaño máximo permitido por ficheiro é de $size';
+
 $labels['addcc'] = 'Engadir copia (CC)';
 $labels['addbcc'] = 'Engadir copia oculta (BCC)';
 $labels['addreplyto'] = 'Engadir respostar a (Reply-To)';
 $labels['addfollowupto'] = 'Engadir respostar a todos (Followup-To)';
+
+// mdn
 $labels['mdnrequest'] = 'O remitente desta mensaxe pediu ser notificado cando vostede a lea. Quere notificar ao remitente?';
 $labels['receiptread'] = 'Notificación da entrega da mensaxe (lectura)';
 $labels['yourmessage'] = 'Esta é unha notificación da entrega da súa mensaxe';
 $labels['receiptnote'] = 'Nota: Esta notificación só confirma que a mensaxe se abriu no computador do destinatario. Non asegura que o destinatario a lera ou entendera o seu contido.';
-$labels['name'] = 'Nome completo';
-$labels['firstname'] = 'Nome';
-$labels['surname'] = 'Apelidos';
-$labels['middlename'] = 'Segundo nome';
-$labels['nameprefix'] = 'Prefixo';
-$labels['namesuffix'] = 'Sufixo';
-$labels['nickname'] = 'Alcume';
-$labels['jobtitle'] = 'Titulación';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Xénero';
-$labels['maidenname'] = 'Nome de solteira';
-$labels['email'] = 'Correo Electrónico';
-$labels['phone'] = 'Teléfono';
-$labels['address'] = 'Enderezo';
-$labels['street'] = 'Rúa';
-$labels['locality'] = 'Poboación';
-$labels['zipcode'] = 'Código postal';
-$labels['region'] = 'Provincia';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Aniversario';
-$labels['anniversary'] = 'Aniversario';
-$labels['website'] = 'Sitio web';
+
+// address boook
+$labels['name']         = 'Nome completo';
+$labels['firstname']    = 'Nome';
+$labels['surname']      = 'Apelidos';
+$labels['middlename']   = 'Segundo nome';
+$labels['nameprefix']   = 'Prefixo';
+$labels['namesuffix']   = 'Sufixo';
+$labels['nickname']     = 'Alcume';
+$labels['jobtitle']     = 'Titulación';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Xénero';
+$labels['maidenname']   = 'Nome de solteira';
+$labels['email']        = 'Correo Electrónico';
+$labels['phone']        = 'Teléfono';
+$labels['address']      = 'Enderezo';
+$labels['street']       = 'Rúa';
+$labels['locality']     = 'Poboación';
+$labels['zipcode']      = 'Código postal';
+$labels['region']       = 'Provincia';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Aniversario';
+$labels['anniversary']  = 'Aniversario';
+$labels['website']      = 'Sitio web';
 $labels['instantmessenger'] = 'Mensaxería instantánea';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'home';
+$labels['male']   = 'home';
 $labels['female'] = 'muller';
 $labels['manager'] = 'Xerente';
 $labels['assistant'] = 'Asistente';
-$labels['typeassistant'] = 'Asistente';
 $labels['spouse'] = 'Cónxuxe';
 $labels['allfields'] = 'Tódolos campos';
 $labels['search'] = 'Procurar';
 $labels['advsearch'] = 'Procura avanzada';
 $labels['advanced'] = 'Avanzado';
 $labels['other'] = 'Outro';
-$labels['typeother'] = 'Outro';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Traballo';
-$labels['typemobile'] = 'Móbil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax da casa';
-$labels['typeworkfax'] = 'Fax do traballo';
-$labels['typecar'] = 'Coche';
-$labels['typepager'] = 'Buscapersonas';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Páxina principal';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Traballo';
+$labels['typeother']  = 'Outro';
+$labels['typemobile']  = 'Móbil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax da casa';
+$labels['typeworkfax']  = 'Fax do traballo';
+$labels['typecar']  = 'Coche';
+$labels['typepager']  = 'Buscapersonas';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Asistente';
+$labels['typehomepage']  = 'Páxina principal';
 $labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Engadir campo';
 $labels['addcontact'] = 'Engadir novo contacto';
 $labels['editcontact'] = 'Modificar este contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades do contacto';
 $labels['personalinfo'] = 'Información persoal';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Gardar';
+$labels['save']   = 'Gardar';
 $labels['delete'] = 'Eliminar';
 $labels['rename'] = 'Mudar o nome';
 $labels['addphoto'] = 'Engadir';
 $labels['replacephoto'] = 'Substituír';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact'] = 'Novo contacto';
-$labels['deletecontact'] = 'Eliminar os contactos seleccionados';
-$labels['composeto'] = 'Redactar mensaxe para';
+
+$labels['newcontact']     = 'Novo contacto';
+$labels['deletecontact']  = 'Eliminar os contactos seleccionados';
+$labels['composeto']      = 'Redactar mensaxe para';
 $labels['contactsfromto'] = 'Contactos do $from ao $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar os contactos en formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exportar os contactos en formato vCard';
 $labels['newcontactgroup'] = 'Crear novo grupo de contactos';
-$labels['grouprename'] = 'Mudar o nome do grupo';
-$labels['groupdelete'] = 'Borrar o grupo';
-$labels['previouspage'] = 'Amosar o grupo anterior';
-$labels['firstpage'] = 'Amosar o primeiro grupo';
-$labels['nextpage'] = 'Amosar o seguinte grupo';
-$labels['lastpage'] = 'Amosar o último grupo';
+$labels['grouprename']    = 'Mudar o nome do grupo';
+$labels['groupdelete']    = 'Borrar o grupo';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Amosar o grupo anterior';
+$labels['firstpage']      = 'Amosar o primeiro grupo';
+$labels['nextpage']       = 'Amosar o seguinte grupo';
+$labels['lastpage']       = 'Amosar o último grupo';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Enderezos persoais';
+
 $labels['searchsave'] = 'Gardar procura';
 $labels['searchdelete'] = 'Eliminar procura';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde ficheiro:';
 $labels['importtarget'] = 'Engadir contactos ao caderno de enderezos:';
 $labels['importreplace'] = 'Substituír completamente o caderno de enderezos';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Rematado';
+
+// settings
 $labels['settingsfor'] = 'Axustes de';
 $labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Administrar as identidades desta conta';
 $labels['newidentity'] = 'Nova identidade';
+
 $labels['newitem'] = 'Novo';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Prefiro HTML';
 $labels['defaultcharset'] = 'Xogo de caracteres por omisión';
 $labels['htmlmessage'] = 'Mensaxe HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Data decorada';
-$labels['setdefault'] = 'Usar como predeterminada';
-$labels['autodetect'] = 'Detectar automáticamente';
-$labels['language'] = 'Linguaxe';
-$labels['timezone'] = 'Zona horaria';
-$labels['pagesize'] = 'Liñas por páxina';
+$labels['setdefault']  = 'Usar como predeterminada';
+$labels['autodetect']  = 'Detectar automáticamente';
+$labels['language']  = 'Linguaxe';
+$labels['timezone']  = 'Zona horaria';
+$labels['pagesize']  = 'Liñas por páxina';
 $labels['signature'] = 'Sinatura';
-$labels['dstactive'] = 'Cambio de hora según horario de verán';
+$labels['dstactive']  = 'Cambio de hora según horario de verán';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Redactar mensaxes HTML';
 $labels['htmlonreply'] = 'só cando se resposte a unha mensaxe HTML';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Sinatura HTML';
 $labels['previewpane'] = 'Amosar previsualización';
 $labels['skin'] = 'Aspecto da interface';
@@ -336,14 +415,16 @@ $labels['readwhendeleted'] = 'Marcar a mensaxe como lida ao eliminar';
 $labels['flagfordeletion'] = 'Marcar a mensaxe para eliminar no canto de eliminar';
 $labels['skipdeleted'] = 'Non amosar as mensaxes marcadas como eliminadas';
 $labels['deletealways'] = 'Eliminar as mensaxes aínda que non se poidan gardar no cubo do lixo';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Amosar as imaxes remotas';
 $labels['fromknownsenders'] = 'de remitentes coñecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Amosar as imaxes anexas baixo a mensaxe';
-$labels['autosavedraft'] = 'Gardar borrador automáticamente';
-$labels['everynminutes'] = 'cada $n minuto(s)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'de inmediato';
+$labels['autosavedraft']  = 'Gardar borrador automáticamente';
+$labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'de inmediato';
 $labels['messagesdisplaying'] = 'Visualización das mensaxes';
 $labels['messagescomposition'] = 'Composición das mensaxes';
 $labels['mimeparamfolding'] = 'Nomes dos ficheiros anexos';
@@ -363,6 +444,7 @@ $labels['maintenance'] = 'Mantemento';
 $labels['newmessage'] = 'Mensaxes novas';
 $labels['signatureoptions'] = 'Opcións da firma';
 $labels['whenreplying'] = 'Ao respostar';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'comezar a nova mensaxe enriba da orixinal';
 $labels['replybottomposting'] = 'comezar a nova mensaxe embaixo da orixinal';
 $labels['replyremovesignature'] = 'Eliminar a firma do remitente ao respostar';
@@ -373,26 +455,33 @@ $labels['replysignaturepos'] = 'Ao respostar ou reenviar colocar a firma';
 $labels['belowquote'] = 'embaixo do texto citado';
 $labels['abovequote'] = 'enriba do texto citado';
 $labels['insertsignature'] = 'Engadir firma';
-$labels['previewpanemarkread'] = 'Marcar como lidas as mensaxes previsualizadas';
-$labels['afternseconds'] = 'logo de $n segundos';
+$labels['previewpanemarkread']  = 'Marcar como lidas as mensaxes previsualizadas';
+$labels['afternseconds']  = 'logo de $n segundos';
 $labels['reqmdn'] = 'Solicitar sempre unha notificación da entrega';
 $labels['reqdsn'] = 'Solicitar sempre unha notificación do estado de envío';
 $labels['replysamefolder'] = 'Deixar as respostas no cartafol onde está a mensaxe á que se responde';
-$labels['defaultaddressbook'] = 'Engadir contactos ao caderno de enderezos seleccionado';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Ignorar as direccións alternativas no autocompletado';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'Revisar a ortografía antes de enviar unha mensaxe';
 $labels['spellcheckoptions'] = 'Opción da revisión ortográfica';
 $labels['spellcheckignoresyms'] = 'Ignorar as palabras con símbolos';
 $labels['spellcheckignorenums'] = 'Ignorar as palabras con números';
 $labels['spellcheckignorecaps'] = 'Ignorar as palabras escritas en maiúsculas';
 $labels['addtodict'] = 'Engadir ao diccionario';
-$labels['folder'] = 'Cartafol';
-$labels['foldername'] = 'Nome do cartafol';
-$labels['subscribed'] = 'Subscrito';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Cartafol';
+$labels['folders']  = 'Cartafoles';
+$labels['foldername']  = 'Nome do cartafol';
+$labels['subscribed']  = 'Subscrito';
 $labels['messagecount'] = 'Mensaxes';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear un novo cartafol';
-$labels['managefolders'] = 'Xestionar cartafoles';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear un novo cartafol';
+$labels['managefolders']  = 'Xestionar cartafoles';
 $labels['specialfolders'] = 'Cartafoles especiais';
 $labels['properties'] = 'Propiedades';
 $labels['folderproperties'] = 'Propiedades do cartafol';
@@ -402,22 +491,29 @@ $labels['info'] = 'Información';
 $labels['getfoldersize'] = 'Prema para calcular o tamaño do cartafol';
 $labels['changesubscription'] = 'Prema para trocar a subscrición';
 $labels['foldertype'] = 'Tipo do cartafol';
-$labels['personalfolder'] = 'Cartafol privado';
-$labels['otherfolder'] = 'Cartafol de outro usuario';
-$labels['sharedfolder'] = 'Cartafol público';
+$labels['personalfolder']  = 'Cartafol privado';
+$labels['otherfolder']  = 'Cartafol de outro usuario';
+$labels['sharedfolder']  = 'Cartafol público';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orde ascendente';
+$labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
 $labels['undo'] = 'Desfacer';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Complemento';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licenza';
 $labels['support'] = 'Obter axuda';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KiB';
 $labels['MB'] = 'MiB';
 $labels['GB'] = 'GiB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglés';
 $labels['westerneuropean'] = 'Europeo Occidental';
@@ -437,3 +533,4 @@ $labels['japanese'] = 'Xaponés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinés';
 
+?>
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 5eb9a7359..6f230bc89 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'O contrasinal ou o nome de usuario son incorrectos.';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'O contrasinal ou o nome de usuario son incorrectos.';
 $messages['cookiesdisabled'] = 'O seu navegador non acepta galletas.';
 $messages['sessionerror'] = 'A súa sesión non é válida ou expirou.';
 $messages['storageerror'] = 'Fallou a conexión co servidor IMAP.';
 $messages['servererror'] = 'Erro do servidor!';
 $messages['servererrormsg'] = 'Erro do servidor: $msg';
 $messages['dberror'] = 'Erro na base de datos!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Non foi posible realizar a operación. O cartafol é de só lectura.';
 $messages['errornoperm'] = 'Non foi posible realizar a operación. Permiso denegado.';
 $messages['invalidrequest'] = 'Petición inválida!. Non se gardou ningún dato.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Non se atoparon mensaxes nesta caixa de correo.';
 $messages['loggedout'] = 'Rematou correctamente a súa sesión. Ata logo!';
 $messages['mailboxempty'] = 'A caixa de correo está vacía.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Cargando ficheiro...';
 $messages['uploadingmany'] = 'Cargando ficheiros...';
@@ -54,11 +60,11 @@ $messages['errormoving'] = 'Non foi posible mover a(s) mensaxe(s).';
 $messages['errorcopying'] = 'Non foi posible copiar a(s) mensaxe(s).';
 $messages['errordeleting'] = 'Non foi posible eliminar a(s) mensaxe(s).';
 $messages['errormarking'] = 'Non foi posible marcar a(s) mensaxe(s).';
-$messages['deletecontactconfirm'] = 'Quere eliminar o(s) contacto(s) seleccionado(s)?';
-$messages['deletegroupconfirm'] = 'Quere eliminar o grupo seleccionado?';
+$messages['deletecontactconfirm']  = 'Quere eliminar o(s) contacto(s) seleccionado(s)?';
+$messages['deletegroupconfirm']  = 'Quere eliminar o grupo seleccionado?';
 $messages['deletemessagesconfirm'] = 'Quere eliminar a(s) mensaxe(s) seleccionadas?';
-$messages['deletefolderconfirm'] = 'Quere eliminar este cartafol?';
-$messages['purgefolderconfirm'] = 'Quere eliminar tódalas mensaxes neste cartafol?';
+$messages['deletefolderconfirm']  = 'Quere eliminar este cartafol?';
+$messages['purgefolderconfirm']  = 'Quere eliminar tódalas mensaxes neste cartafol?';
 $messages['contactdeleting'] = 'Eliminando o(s) contacto(s)...';
 $messages['groupdeleting'] = 'Eliminando o grupo...';
 $messages['folderdeleting'] = 'Eliminando o cartafol...';
@@ -67,11 +73,11 @@ $messages['foldersubscribing'] = 'Subscribindo o cartafol...';
 $messages['folderunsubscribing'] = 'Desubscribindo o cartafol...';
 $messages['formincomplete'] = 'Non se cumprimentou completamente o formulario.';
 $messages['noemailwarning'] = 'Por favor, introduza un enderezo de correo electrónico válido.';
-$messages['nonamewarning'] = 'Por favor, introduza un nome.';
+$messages['nonamewarning']  = 'Por favor, introduza un nome.';
 $messages['nopagesizewarning'] = 'Por favor, introduza un tamaño de páxina.';
 $messages['nosenderwarning'] = 'Por favor, introduza o enderezo de correo electrónico do remitente.';
 $messages['norecipientwarning'] = 'Por favor, introduza polo menos un destinatario.';
-$messages['nosubjectwarning'] = 'O campo "Asunto" está baleiro. Desexa completalo?';
+$messages['nosubjectwarning']  = 'O campo "Asunto" está baleiro. Desexa completalo?';
 $messages['nobodywarning'] = 'Quere enviar esta mensaxe sen texto?';
 $messages['notsentwarning'] = 'A mensaxe non se enviou. Quere descartala?';
 $messages['noldapserver'] = 'Por favor, elixa un servidor LDAP para buscar.';
@@ -106,14 +112,16 @@ $messages['addingmember'] = 'Engadindo o(s) contacto(s) ao grupo...';
 $messages['removingmember'] = 'Eliminando o(s) contacto(s) do grupo...';
 $messages['receiptsent'] = 'A notificación da entrega enviouse correctamente.';
 $messages['errorsendingreceipt'] = 'Non foi posible enviar a notificación da entrega.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Non pode eliminar esta identidade, é a última.';
 $messages['forbiddencharacter'] = 'O nome do cartafol contén un carácter non válido.';
 $messages['selectimportfile'] = 'Por favor, escolla un ficheiro para cargar.';
 $messages['addresswriterror'] = 'Non se pode escribir no caderno de enderezos que escolleu.';
 $messages['contactaddedtogroup'] = 'Engadiuse correctamente o contacto a este grupo.';
 $messages['contactremovedfromgroup'] = 'Suprimiuse correctamente o contacto deste grupo.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'A importar. Por favor, agarde...';
-$messages['importerror'] = 'Produciuse un erro na importación. O ficheiro que cargou non é un vCard correcto.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Importáronse correctamente $inserted contactos. Ignoráronse $skipped contactos que xa existían</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Ignoráronse $skipped existing entradas</b>';
 $messages['opnotpermitted'] = 'Operación non permitida!';
@@ -154,4 +162,8 @@ $messages['foldercreated'] = 'O cartafol creouse correctamente.';
 $messages['invalidimageformat'] = 'O formato da imaxe non é válido.';
 $messages['mispellingsfound'] = 'Atopáronse erros ortográficos na mensaxe.';
 $messages['parentnotwritable'] = 'Non foi posible crear/mover o cartafol no cartafol padre escollido porque non ten permisos.';
+$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/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 22a163cd6..8cf6101f5 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'ברוך בואך אל $product';
-$labels['username'] = 'שם משתמש';
-$labels['password'] = 'סיסמה';
-$labels['server'] = 'שרת';
-$labels['login'] = 'כניסה';
-$labels['logout'] = 'יציאה';
-$labels['mail'] = 'רשימת הודעות';
+
+// login page
+$labels['welcome']   = 'ברוך בואך אל $product';
+$labels['username']  = 'שם משתמש';
+$labels['password']  = 'סיסמה';
+$labels['server']    = 'שרת';
+$labels['login']     = 'כניסה';
+
+// taskbar
+$labels['logout']   = 'יציאה';
+$labels['mail']     = 'רשימת הודעות';
 $labels['settings'] = 'הגדרות אישיות';
 $labels['addressbook'] = 'פנקס כתובות';
-$labels['inbox'] = 'נכנס';
+
+// mailbox names
+$labels['inbox']  = 'נכנס';
 $labels['drafts'] = 'טיוטות';
-$labels['sent'] = 'נשלח';
-$labels['trash'] = 'אשפה';
-$labels['junk'] = 'זבל';
+$labels['sent']   = 'נשלח';
+$labels['trash']  = 'אשפה';
+$labels['junk']   = 'זבל';
+
+// message listing
 $labels['subject'] = 'נושא';
-$labels['from'] = 'מאת';
-$labels['to'] = 'אל';
-$labels['cc'] = 'לידיעה';
-$labels['bcc'] = 'מכותב מוסתר';
+$labels['from']    = 'מאת';
+$labels['sender']  = 'השולח';
+$labels['to']      = 'אל';
+$labels['cc']      = 'לידיעה';
+$labels['bcc']     = 'מכותב מוסתר';
 $labels['replyto'] = 'כתובת למענה';
 $labels['followupto'] = 'כתובת להעברת הודעה';
-$labels['date'] = 'תאריך';
-$labels['size'] = 'גודל';
+$labels['date']    = 'תאריך';
+$labels['size']    = 'גודל';
 $labels['priority'] = 'עדיפות';
 $labels['organization'] = 'ארגון';
 $labels['readstatus'] = 'נקרא';
 $labels['listoptions'] = 'הצגת אפשרויות...';
+
 $labels['mailboxlist'] = 'תיקיות';
-$labels['folders'] = 'תיקיות';
 $labels['messagesfromto'] = 'הודעות $from עד $to מתוך $count';
 $labels['threadsfromto'] = 'שרשור $from עד $to מתוך $count';
 $labels['messagenrof'] = 'הודעה $nr מתוך $count';
 $labels['fromtoshort'] = '$from – $to מתוך $count';
-$labels['copy'] = 'העתק';
-$labels['move'] = 'העבר';
-$labels['moveto'] = 'תיוק ב...';
+
+$labels['copy']     = 'העתק';
+$labels['move']     = 'העבר';
+$labels['moveto']   = 'תיוק ב...';
 $labels['download'] = 'הורדה';
+$labels['showattachment'] = 'הצגה';
+$labels['showanyway'] = 'להציג בכל מקרה';
+
 $labels['filename'] = 'שם קובץ';
 $labels['filesize'] = 'גודל קובץ';
+
 $labels['addtoaddressbook'] = 'הוספה לפנקס כתובות';
+
+// weekdays short
 $labels['sun'] = 'יום א';
 $labels['mon'] = 'יום ב';
 $labels['tue'] = 'יום ג';
@@ -61,74 +80,83 @@ $labels['wed'] = 'יום ד';
 $labels['thu'] = 'יום ה';
 $labels['fri'] = 'יום ו';
 $labels['sat'] = 'יום ש';
-$labels['sunday'] = 'ראשון';
-$labels['monday'] = 'שני';
-$labels['tuesday'] = 'שלישי';
+
+// weekdays long
+$labels['sunday']    = 'ראשון';
+$labels['monday']    = 'שני';
+$labels['tuesday']   = 'שלישי';
 $labels['wednesday'] = 'רביעי';
-$labels['thursday'] = 'חמישי';
-$labels['friday'] = 'ששי';
-$labels['saturday'] = 'שבת';
-$labels['jan'] = 'ינו';
-$labels['feb'] = 'פבר';
-$labels['mar'] = 'מרץ';
-$labels['apr'] = 'אפר';
-$labels['may'] = 'מאי';
-$labels['longmay'] = 'מאי';
-$labels['jun'] = 'יונ';
-$labels['jul'] = 'יול';
-$labels['aug'] = 'אוג';
-$labels['sep'] = 'ספט';
-$labels['oct'] = 'אוק';
-$labels['nov'] = 'נוב';
-$labels['dec'] = 'דצמ';
-$labels['longjan'] = 'ינואר';
-$labels['longfeb'] = 'פברואר';
-$labels['longmar'] = 'מרץ';
-$labels['longapr'] = 'אפריל';
-$labels['longjun'] = 'יוני';
-$labels['longjul'] = 'יולי';
-$labels['longaug'] = 'אוגוסט';
-$labels['longsep'] = 'ספטמבר';
-$labels['longoct'] = 'אוקטובר';
-$labels['longnov'] = 'נובמבר';
-$labels['longdec'] = 'דצמבר';
+$labels['thursday']  = 'חמישי';
+$labels['friday']    = 'ששי';
+$labels['saturday']  = 'שבת';
+
+// months short
+$labels['jan']	= 'ינו';
+$labels['feb']	= 'פבר';
+$labels['mar']	= 'מרץ';
+$labels['apr']	= 'אפר';
+$labels['may']	= 'מאי';
+$labels['jun']	= 'יונ';
+$labels['jul'] 	= 'יול';
+$labels['aug']	= 'אוג';
+$labels['sep']	= 'ספט';
+$labels['oct']	= 'אוק';
+$labels['nov']	= 'נוב';
+$labels['dec']	= 'דצמ';
+
+// months long
+$labels['longjan']	= 'ינואר';
+$labels['longfeb']	= 'פברואר';
+$labels['longmar']	= 'מרץ';
+$labels['longapr']	= 'אפריל';
+$labels['longmay']	= 'מאי';
+$labels['longjun']	= 'יוני';
+$labels['longjul']	= 'יולי';
+$labels['longaug']	= 'אוגוסט';
+$labels['longsep']	= 'ספטמבר';
+$labels['longoct']	= 'אוקטובר';
+$labels['longnov']	= 'נובמבר';
+$labels['longdec']	= 'דצמבר';
+
 $labels['today'] = 'היום';
-$labels['refresh'] = 'רענון';
-$labels['checkmail'] = 'משיכת הודעות חדשות';
-$labels['compose'] = 'כתיבת הודעה';
-$labels['writenewmessage'] = 'יצירת הודעה חדשה';
-$labels['reply'] = 'תגובה';
-$labels['replytomessage'] = 'מענה לשולח';
+
+// toolbar buttons
+$labels['refresh']          = 'רענון';
+$labels['checkmail']        = 'משיכת הודעות חדשות';
+$labels['compose']          = 'כתיבת הודעה';
+$labels['writenewmessage']  = 'יצירת הודעה חדשה';
+$labels['reply']            = 'תגובה';
+$labels['replytomessage']   = 'מענה לשולח';
 $labels['replytoallmessage'] = 'מענה לשולח ולכל הנמענים';
-$labels['replyall'] = 'מענה לכולם';
-$labels['replylist'] = 'מענה לרשימת תפוצה';
-$labels['forward'] = 'העברה';
-$labels['forwardinline'] = 'העבר בגוף ההודעה';
+$labels['replyall']         = 'מענה לכולם';
+$labels['replylist']        = 'מענה לרשימת תפוצה';
+$labels['forward']          = 'העברה';
+$labels['forwardinline']    = 'העבר בגוף ההודעה';
 $labels['forwardattachment'] = 'העבר כקובץ מצורף';
-$labels['forwardmessage'] = 'העבר הודעה';
-$labels['deletemessage'] = 'מחיקה';
+$labels['forwardmessage']   = 'העבר הודעה';
+$labels['deletemessage']    = 'מחיקה';
 $labels['movemessagetotrash'] = 'השלכה לאשפה';
-$labels['printmessage'] = 'הדפסה';
-$labels['previousmessage'] = 'הצגת הודעה קודמת';
-$labels['firstmessage'] = 'הצגת ההודעה הראשונה';
-$labels['nextmessage'] = 'הצגת ההודעה הבאה';
-$labels['lastmessage'] = 'הצגת ההודעה האחרונה';
-$labels['backtolist'] = 'חזרה אל רשימת ההודעות';
-$labels['viewsource'] = 'הצגת קוד מקור';
-$labels['mark'] = 'סימון';
-$labels['markmessages'] = 'סימון הודעות';
-$labels['markread'] = 'כנקראו';
-$labels['markunread'] = 'כלא נקראו';
-$labels['markflagged'] = 'כמסומן';
-$labels['markunflagged'] = 'כלא מסומן';
-$labels['moreactions'] = 'פעולות נוספות...';
-$labels['more'] = 'עוד';
-$labels['back'] = 'חזרה';
-$labels['options'] = 'אפשרויות';
+$labels['printmessage']     = 'הדפסה';
+$labels['previousmessage']  = 'הצגת הודעה קודמת';
+$labels['firstmessage']     = 'הצגת ההודעה הראשונה';
+$labels['nextmessage']      = 'הצגת ההודעה הבאה';
+$labels['lastmessage']      = 'הצגת ההודעה האחרונה';
+$labels['backtolist']       = 'חזרה אל רשימת ההודעות';
+$labels['viewsource']       = 'הצגת קוד מקור';
+$labels['mark']             = 'סימון';
+$labels['markmessages']     = 'סימון הודעות';
+$labels['markread']         = 'כנקראו';
+$labels['markunread']       = 'כלא נקראו';
+$labels['markflagged']      = 'כמסומן';
+$labels['markunflagged']    = 'כלא מסומן';
+$labels['moreactions']      = 'פעולות נוספות...';
+$labels['more']             = 'עוד';
+$labels['back']             = 'חזרה';
+$labels['options']          = 'אפשרויות';
+
 $labels['select'] = 'בחירה';
 $labels['all'] = 'הכל';
 $labels['none'] = 'כלום';
-$labels['nonesort'] = 'כלום';
 $labels['currpage'] = 'דף נוכחי';
 $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
@@ -143,12 +171,14 @@ $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'] = 'בסדר עולה';
@@ -157,176 +187,213 @@ $labels['listcolumns'] = 'רשימת עמודות';
 $labels['listsorting'] = 'המיון לפי העמודה';
 $labels['listorder'] = 'סדר מיון';
 $labels['listmode'] = 'אופן הצגת רשימה';
+
 $labels['folderactions'] = 'פעולות על תיקים';
 $labels['compact'] = 'פינוי שטח לא מנוצל';
 $labels['empty'] = 'ריקון';
+
 $labels['quota'] = 'ניצול קיבולת';
-$labels['unknown'] = 'לא ידוע';
-$labels['unlimited'] = 'ללא הגבלה';
-$labels['quicksearch'] = 'חיפוש מהיר';
-$labels['resetsearch'] = 'ניקוי תיבת החיפוש';
-$labels['searchmod'] = 'מאפייני חיפוש';
-$labels['msgtext'] = 'כל ההודעה';
+$labels['unknown']  = 'לא ידוע';
+$labels['unlimited']  = 'ללא הגבלה';
+
+$labels['quicksearch']  = 'חיפוש מהיר';
+$labels['resetsearch']  = 'ניקוי תיבת החיפוש';
+$labels['searchmod']  = 'מאפייני חיפוש';
+$labels['msgtext']  = 'כל ההודעה';
+$labels['body']  = 'גוף ההודעה';
+
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
-$labels['editasnew'] = 'עריכת ההודעה כחדשה';
-$labels['send'] = 'שלח';
-$labels['sendmessage'] = 'משלוח מיידי';
-$labels['savemessage'] = 'שמירת טיוטה';
-$labels['addattachment'] = 'צירוף קובץ';
-$labels['charset'] = 'קידוד';
-$labels['editortype'] = 'סוג עורך';
-$labels['returnreceipt'] = 'אישור קבלה';
-$labels['dsn'] = 'הודעה על מצב המסירה';
+
+// message compose
+$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['editidents']    = 'עריכת זהויות';
+$labels['spellcheck']    = 'איות';
 $labels['checkspelling'] = 'בדיקת איות';
 $labels['resumeediting'] = 'המשך עריכה';
-$labels['revertto'] = 'חזור למצב קודם';
+$labels['revertto']      = 'חזור למצב קודם';
+
 $labels['attach'] = 'צירוף';
 $labels['attachments'] = 'קבצים מצורפים';
 $labels['upload'] = 'העלאה';
 $labels['uploadprogress'] = '( $total  מתוך  $current )  $percent';
-$labels['close'] = 'סגירה';
-$labels['messageoptions'] = 'אפשרויות הודעה...';
-$labels['low'] = 'נמוך';
-$labels['lowest'] = 'נמוך ביותר';
-$labels['normal'] = 'רגיל';
-$labels['high'] = 'גבוה';
+$labels['close']  = 'סגירה';
+$labels['messageoptions']  = 'אפשרויות הודעה...';
+
+$labels['low']     = 'נמוך';
+$labels['lowest']  = 'נמוך ביותר';
+$labels['normal']  = 'רגיל';
+$labels['high']    = 'גבוה';
 $labels['highest'] = 'גבוה ביותר';
-$labels['nosubject'] = '(ללא נושא)';
+
+$labels['nosubject']  = '(ללא נושא)';
 $labels['showimages'] = 'הצגת תמונות';
 $labels['alwaysshow'] = '$sender תמיד להציג תמונות מאת';
-$labels['isdraft'] = 'זו טיוטה של הודעה';
-$labels['andnmore'] = 'עוד  $nr';
+$labels['isdraft']    = 'זו טיוטה של הודעה';
+$labels['andnmore']   = 'עוד  $nr';
 $labels['togglemoreheaders'] = 'הראה נתוני מערכת נוספים של ההודעה';
 $labels['togglefullheaders'] = 'הראה / בטל צפיה בנתוני מערכת של ההודעה';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ללא עיצוב';
 $labels['savesentmessagein'] = 'היכן לשמור ההודעה?';
 $labels['dontsave'] = 'ללא שמירה';
 $labels['maxuploadsize'] = 'גודל מקסימלי לקובץ הוא  $size';
+
 $labels['addcc'] = 'הוספת מכותב לידיעה';
 $labels['addbcc'] = 'הוספת מכותב נסתר';
 $labels['addreplyto'] = 'הוספת כתובת למענה';
 $labels['addfollowupto'] = 'הוספת כתובת להעברת הודעה';
+
+// mdn
 $labels['mdnrequest'] = 'השולח ביקש לדעת אם ההודעה נקראה. האם להודיע לשולח?';
 $labels['receiptread'] = 'אישור קבלה (נקרא)';
 $labels['yourmessage'] = 'אישור קבלה להודעתך';
 $labels['receiptnote'] = 'הערה: האישור אינו מבטיח שהנמען קרא או הבין את תוכן ההודעה.';
-$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'] = 'אתר אינטרנט';
+
+// address boook
+$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'] = 'כינוי בצ\'ט';
 $labels['notes'] = 'הערות';
-$labels['male'] = 'זכר';
+$labels['male']   = 'זכר';
 $labels['female'] = 'נקבה';
 $labels['manager'] = 'מנהל/ת';
 $labels['assistant'] = 'עוזר/ת';
-$labels['typeassistant'] = 'עוזר/ת';
 $labels['spouse'] = 'בן/בת זוג';
 $labels['allfields'] = 'כל השדות';
 $labels['search'] = 'חיפוש';
 $labels['advsearch'] = 'חיםוש מתקדם';
 $labels['advanced'] = 'מתקדם';
 $labels['other'] = 'אחר';
-$labels['typeother'] = 'אחר';
-$labels['typehome'] = 'בית';
-$labels['typework'] = 'עבודה';
-$labels['typemobile'] = 'נייד';
-$labels['typemain'] = 'עיקרי';
-$labels['typehomefax'] = 'פקס בית';
-$labels['typeworkfax'] = 'פקס עבודה';
-$labels['typecar'] = 'מכונית';
-$labels['typepager'] = 'זימונית';
-$labels['typevideo'] = 'וידאו';
-$labels['typehomepage'] = 'דף הבית';
+
+$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['addcontact'] = 'הוספת איש קשר';
 $labels['editcontact'] = 'עריכת איש קשר';
 $labels['contacts'] = 'אנשי קשר';
 $labels['contactproperties'] = 'מאפייני איש קשר';
 $labels['personalinfo'] = 'מידע אישי';
-$labels['edit'] = 'עריכה';
+
+$labels['edit']   = 'עריכה';
 $labels['cancel'] = 'ביטול';
-$labels['save'] = 'שמירה';
+$labels['save']   = 'שמירה';
 $labels['delete'] = 'מחיקה';
 $labels['rename'] = 'שינוי שם';
 $labels['addphoto'] = 'הוספה';
 $labels['replacephoto'] = 'החלפה';
 $labels['uploadphoto'] = 'העלאת תמונה';
-$labels['newcontact'] = 'איש קשר חדש';
-$labels['deletecontact'] = 'מחיקת אנשי קשר מסומנים';
-$labels['composeto'] = 'יצירת הודעה אל';
+
+$labels['newcontact']     = 'איש קשר חדש';
+$labels['deletecontact']  = 'מחיקת אנשי קשר מסומנים';
+$labels['composeto']      = 'יצירת הודעה אל';
 $labels['contactsfromto'] = 'אנשי קשר $from עד $to מתוך $count';
-$labels['print'] = 'הדפסה';
-$labels['export'] = 'ייצוא';
-$labels['exportvcards'] = 'ייצוא אנשי קשר בפורמט  vCard';
+$labels['print']          = 'הדפסה';
+$labels['export']         = 'ייצוא';
+$labels['exportall']      = 'יצוא של כל הרשומות';
+$labels['exportsel']      = 'צוא של רשומות נבחרות';
+$labels['exportvcards']   = 'ייצוא אנשי קשר בפורמט  vCard';
 $labels['newcontactgroup'] = 'יצירת קבוצה חדשה של אנשי קשר';
-$labels['grouprename'] = 'שינוי שם קבוצה';
-$labels['groupdelete'] = 'מחיקת קבוצה';
+$labels['grouprename']    = 'שינוי שם קבוצה';
+$labels['groupdelete']    = 'מחיקת קבוצה';
 $labels['groupremoveselected'] = 'אנשי הקשר שנבחרו יוסרו מהקבוצה';
-$labels['previouspage'] = 'הצגת הקבוצה הקודמת';
-$labels['firstpage'] = 'הצגת הקבוצה הראשונה';
-$labels['nextpage'] = 'הצגת הקבוצה הבאה';
-$labels['lastpage'] = 'הצגת הקבוצה האחרונה';
+
+$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['importtarget'] = 'הוספת אנשי קשר לספר הכתובות';
 $labels['importreplace'] = 'החלפת כל פנקס הכתובות';
+$labels['importdesc'] = 'ניתן לטעון אנשי קשר מקובץ חיצוני. אנו תומכים בקבצים הערוכים בצורה של 
+ <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  או 
+ CSV המופרד על ידי פסיקים.';
 $labels['done'] = 'בוצע';
+
+// settings
 $labels['settingsfor'] = 'הגדרות עבור';
 $labels['about'] = 'אודות';
 $labels['preferences'] = 'העדפות';
 $labels['userpreferences'] = 'העדפות משתמש';
 $labels['editpreferences'] = 'עריכה של העדפות משתמש';
+
 $labels['identities'] = 'זהויות';
 $labels['manageidentities'] = 'ניהול זהויות לחשבון זה';
 $labels['newidentity'] = 'זהות חדשה';
+
 $labels['newitem'] = 'רשומה חדשה';
 $labels['edititem'] = 'עריכת רשומה';
+
 $labels['preferhtml'] = 'הצגת HTML';
 $labels['defaultcharset'] = 'ברירת מחדל של תווים';
 $labels['htmlmessage'] = 'תוכן HTML';
+$labels['messagepart'] = 'גוף ההודעה';
+$labels['digitalsig'] = 'חתימה דיגיטלית';
 $labels['dateformat'] = 'פורמט התאריך';
 $labels['timeformat'] = 'פורמט השעה';
 $labels['prettydate'] = 'תאריכים מעוצבים';
-$labels['setdefault'] = 'קביעה כברירת מחדל';
-$labels['autodetect'] = 'אוטומטי';
-$labels['language'] = 'שפה';
-$labels['timezone'] = 'איזור זמן';
-$labels['pagesize'] = 'מספר שורות בדף';
+$labels['setdefault']  = 'קביעה כברירת מחדל';
+$labels['autodetect']  = 'אוטומטי';
+$labels['language']  = 'שפה';
+$labels['timezone']  = 'איזור זמן';
+$labels['pagesize']  = 'מספר שורות בדף';
 $labels['signature'] = 'חתימה';
-$labels['dstactive'] = 'שעון קיץ';
+$labels['dstactive']  = 'שעון קיץ';
 $labels['showinextwin'] = 'צפיה בהודעה בחלון חדש';
 $labels['composeextwin'] = 'יצירת הודעה בחלון חדש';
 $labels['htmleditor'] = 'יצירת הודעה מעוצבת';
@@ -355,10 +422,11 @@ $labels['showremoteimages'] = 'הצגת תמונות משרת מרוחק בגו�
 $labels['fromknownsenders'] = 'משולחים מוכרים';
 $labels['always'] = 'תמיד';
 $labels['showinlineimages'] = 'הצגת תמונות מצורפות בתחתית ההודעה';
-$labels['autosavedraft'] = 'שמירה אוטומטית של טיוטה';
-$labels['everynminutes'] = 'כל $n דקות';
-$labels['never'] = 'אף פעם';
-$labels['immediately'] = 'מיידית';
+$labels['autosavedraft']  = 'שמירה אוטומטית של טיוטה';
+$labels['everynminutes']  = 'כל $n דקות';
+$labels['refreshinterval']  = 'רענון (בדיקת קיום של הודעות חדשות וכו\')';
+$labels['never']  = 'אף פעם';
+$labels['immediately']  = 'מיידית';
 $labels['messagesdisplaying'] = 'הצגת הודעות';
 $labels['messagescomposition'] = 'כתיבת הודעות';
 $labels['mimeparamfolding'] = 'שמות קבצים מצורפים';
@@ -389,12 +457,12 @@ $labels['replysignaturepos'] = 'במענה או בהעברת הודעה, החת�
 $labels['belowquote'] = 'בסוף ההודעה המקורית';
 $labels['abovequote'] = 'בתחילת ההודעה המקורית';
 $labels['insertsignature'] = 'שיבוץ חתימה';
-$labels['previewpanemarkread'] = 'סימון הודעה שנצפתה כנקראה';
-$labels['afternseconds'] = 'לאחר $n שניות';
+$labels['previewpanemarkread']  = 'סימון הודעה שנצפתה כנקראה';
+$labels['afternseconds']  = 'לאחר $n שניות';
 $labels['reqmdn'] = 'תמיד יש לדרוש אישור קבלה';
 $labels['reqdsn'] = 'תמיד לבקש הודעה על מצב המסירה';
 $labels['replysamefolder'] = 'המענה ישמר בתיקיה של ההודעה המקורית';
-$labels['defaultaddressbook'] = 'הוספת אנשי קשר לספר הכתובות שנבחר';
+$labels['defaultabook'] = 'ברירת המחדל של רשימת כתובות';
 $labels['autocompletesingle'] = 'לדלג על כתובת דואר חילופית בעת שימוש בהשלמה אוטומטית של הקלדה';
 $labels['listnamedisplay'] = 'הצגת איש הקשר בתור';
 $labels['spellcheckbeforesend'] = 'בדיקת איות לפני המשלוח';
@@ -407,13 +475,15 @@ $labels['mailtoprotohandler'] = 'קביעת הפרוטוקול לטיפול בק
 $labels['forwardmode'] = 'הפנית הודעות';
 $labels['inline'] = 'חלק מההודעה';
 $labels['asattachment'] = 'כצרופה';
-$labels['folder'] = 'תיק';
-$labels['foldername'] = 'שם תיק';
-$labels['subscribed'] = 'מנוי';
+
+$labels['folder']  = 'תיק';
+$labels['folders']  = 'תיקיות';
+$labels['foldername']  = 'שם תיק';
+$labels['subscribed']  = 'מנוי';
 $labels['messagecount'] = 'הודעות';
-$labels['create'] = 'יצירה';
-$labels['createfolder'] = 'יצירת תיק חדש';
-$labels['managefolders'] = 'ניהול תיקים';
+$labels['create']  = 'יצירה';
+$labels['createfolder']  = 'יצירת תיק חדש';
+$labels['managefolders']  = 'ניהול תיקים';
 $labels['specialfolders'] = 'תיקים מיוחדים';
 $labels['properties'] = 'מאפיינים';
 $labels['folderproperties'] = 'מאפייני תיק';
@@ -423,23 +493,29 @@ $labels['info'] = 'מידע';
 $labels['getfoldersize'] = 'הקשה להצגה של גודל תיק';
 $labels['changesubscription'] = 'הקשה לשינוי הרשמה';
 $labels['foldertype'] = 'סוג תיקיה';
-$labels['personalfolder'] = 'תיקיה פרטית';
-$labels['otherfolder'] = 'תיקית משתמש נוספת';
-$labels['sharedfolder'] = 'תיקיה ציבורית';
+$labels['personalfolder']  = 'תיקיה פרטית';
+$labels['otherfolder']  = 'תיקית משתמש נוספת';
+$labels['sharedfolder']  = 'תיקיה ציבורית';
+
 $labels['sortby'] = 'מיון לפי';
-$labels['sortasc'] = 'מיון בסדר עולה';
+$labels['sortasc']  = 'מיון בסדר עולה';
 $labels['sortdesc'] = 'מיון בסדר יורד';
 $labels['undo'] = 'ביטול שינוי';
+
 $labels['installedplugins'] = 'תוספים מותקנים';
 $labels['plugin'] = 'תוסף תוכנה';
 $labels['version'] = 'גירסה';
 $labels['source'] = 'מקור';
 $labels['license'] = 'רשיון';
 $labels['support'] = 'קבלת תמיכה';
+
+// units
 $labels['B'] = 'בייט';
 $labels['KB'] = 'ק"ב';
 $labels['MB'] = 'מ"ב';
 $labels['GB'] = 'ג"ב';
+
+// character sets
 $labels['unicode'] = 'יוניקוד';
 $labels['english'] = 'אנגלית';
 $labels['westerneuropean'] = 'מערב אירופי';
@@ -459,3 +535,4 @@ $labels['japanese'] = 'יפני';
 $labels['korean'] = 'קוריאני';
 $labels['chinese'] = 'סיני';
 
+?>
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 4d669b462..be4ef2824 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'קרתה שגיאה !';
-$messages['loginfailed'] = 'הכניסה נכשלה';
+$messages['errortitle']  = 'קרתה שגיאה !';
+$messages['loginfailed']  = 'הכניסה נכשלה';
 $messages['cookiesdisabled'] = 'הדפדפן אינו מקבל עוגיות';
 $messages['sessionerror'] = 'כניסתך למערכת אינה חוקית או שפג תוקפה';
 $messages['storageerror'] = 'הקשר לשרת הדואר נכשל';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'שם שרת לא חוקי';
 $messages['nomessagesfound'] = 'לא נמצאו הודעות בתיבה זו';
 $messages['loggedout'] = 'הקשר הסתיים. להתראות!';
 $messages['mailboxempty'] = 'רשימת ההודעות ריקה';
+$messages['refreshing'] = 'מרענן...';
 $messages['loading'] = 'טעינה...';
 $messages['uploading'] = 'קובץ עולה...';
 $messages['uploadingmany'] = 'מעלה קבצים...';
@@ -56,11 +60,11 @@ $messages['errormoving'] = 'לא ניתן לתייק את ההודעה';
 $messages['errorcopying'] = 'העתקת ההודעות נכשלה';
 $messages['errordeleting'] = 'לא ניתן למחוק את ההודעה';
 $messages['errormarking'] = 'לא ניתן לסמן ההודעה';
-$messages['deletecontactconfirm'] = 'האם למחוק את איש הקשר?';
-$messages['deletegroupconfirm'] = 'האם אכן ברצונך למחוק את הקבוצה שנבחרה?';
+$messages['deletecontactconfirm']  = 'האם למחוק את איש הקשר?';
+$messages['deletegroupconfirm']  = 'האם אכן ברצונך למחוק את הקבוצה שנבחרה?';
 $messages['deletemessagesconfirm'] = 'האם למחוק את ההודעות המסומנות?';
-$messages['deletefolderconfirm'] = 'האם למחוק תיק זה?';
-$messages['purgefolderconfirm'] = 'האם למחוק את כל ההודעות בתיק זה?';
+$messages['deletefolderconfirm']  = 'האם למחוק תיק זה?';
+$messages['purgefolderconfirm']  = 'האם למחוק את כל ההודעות בתיק זה?';
 $messages['contactdeleting'] = 'אנשי קשר נמחקים...';
 $messages['groupdeleting'] = 'מחיקת קבוצה...';
 $messages['folderdeleting'] = 'התיקיה נמחקת...';
@@ -69,11 +73,11 @@ $messages['foldersubscribing'] = 'התיק נרשם...';
 $messages['folderunsubscribing'] = 'רישום התיק בוטל...';
 $messages['formincomplete'] = 'לא הוזנו כל השדות בטופס זה';
 $messages['noemailwarning'] = 'נא להוסיף כתובת דוא"ל חוקית';
-$messages['nonamewarning'] = 'נא להוסיף שם';
+$messages['nonamewarning']  = 'נא להוסיף שם';
 $messages['nopagesizewarning'] = 'נא להוסיף גודל דף';
 $messages['nosenderwarning'] = 'נא להוסיף כתובת השולח';
 $messages['norecipientwarning'] = 'נא להוסיף לפחות נמען אחד';
-$messages['nosubjectwarning'] = 'שורת הנושא ריקה. האם ברצונך להוסיף נושא כעת?';
+$messages['nosubjectwarning']  = 'שורת הנושא ריקה. האם ברצונך להוסיף נושא כעת?';
 $messages['nobodywarning'] = 'האם לשלוח הודעה ללא תוכן?';
 $messages['notsentwarning'] = 'ההודעה לא נשלחה. האם לבטל?';
 $messages['noldapserver'] = 'נא לבחור שרת כתובות לחיפוש';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'אנשי הקשר נוספו בהצלחה ל
 $messages['contactremovedfromgroup'] = 'אנשי הקשר הוסרו בהצלחה מהקבוצה';
 $messages['nogroupassignmentschanged'] = 'לא השתנו הגדרות קבוצה';
 $messages['importwait'] = 'ייבוא, נא להמתין..';
+$messages['importformaterror'] = 'היבוא נכשל ! הקובץ שהועלה אינו מתאים.';
 $messages['importconfirm'] = '<b>יובאו $inserted אנשי קשר, $skipped היו קיימים </b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>  דילוג של $skipped נתונים קיימים <b>';
 $messages['opnotpermitted'] = 'פעולה אסורה!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'פורמט תמונה לא חוקי';
 $messages['mispellingsfound'] = 'התגלו שגיאות כתיב בהודעה';
 $messages['parentnotwritable'] = 'לא ניתן ליצור/להעביר תיקיה לתוך תיקית האב שנבחרה. אין הרשאה לגישה.';
 $messages['messagetoobig'] = 'ההודעה גדולה מעבר ליכולת העיבוד של התוכנה';
+$messages['attachmentvalidationerror'] = 'זהירות ! הצרופה חשודה כי אינה מהסוג שצוין בהודעה. אם לא ניתן לבטוח בשולח אזי להמנע מלפתוח את הקובץ בדפדפן כי הקובץ יכול להכיל קוד זדוני.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = 'זהירות! תוכנה זו דורשת שימוש בג\'אווהסקריפט! כדי להשתמש בכלי, יש לבחור באפשרות זו בהגדרות הדפדפן.';
 
+?>
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 74e4b74cd..8188b8eca 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -2,54 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product में स्वागत है';
-$labels['username'] = 'यूसरनाम';
-$labels['password'] = 'पासवर्ड';
-$labels['server'] = 'सर्वर';
-$labels['login'] = 'लॉगिन';
-$labels['logout'] = 'लॉगआऊट';
-$labels['mail'] = 'ई-मेल';
+
+// login page
+$labels['welcome']   = '$product में स्वागत है';
+$labels['username']  = 'यूसरनाम';
+$labels['password']  = 'पासवर्ड';
+$labels['server']    = 'सर्वर';
+$labels['login']     = 'लॉगिन';
+
+// taskbar
+$labels['logout']   = 'लॉगआऊट';
+$labels['mail']     = 'ई-मेल';
 $labels['settings'] = 'निजी सैटिंग';
 $labels['addressbook'] = 'पता खाता';
-$labels['inbox'] = 'इनबॉक्स';
+
+// mailbox names
+$labels['inbox']  = 'इनबॉक्स';
 $labels['drafts'] = 'ड्राफ़ट';
-$labels['sent'] = 'भेजा गया';
-$labels['trash'] = 'रद्दी';
-$labels['junk'] = 'स्पैम';
+$labels['sent']   = 'भेजा गया';
+$labels['trash']  = 'रद्दी';
+$labels['junk']   = 'स्पैम';
+
+// message listing
 $labels['subject'] = 'विशय';
-$labels['from'] = 'भेजने वाला';
-$labels['to'] = 'पाने वाला';
-$labels['cc'] = 'कार्बन';
-$labels['bcc'] = 'अंधा कार्बन';
+$labels['from']    = 'भेजने वाला';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'पाने वाला';
+$labels['cc']      = 'कार्बन';
+$labels['bcc']     = 'अंधा कार्बन';
 $labels['replyto'] = 'जवाब यहाँ';
 $labels['followupto'] = 'को- फॉलोअप';
-$labels['date'] = 'तारीख';
-$labels['size'] = 'माप';
+$labels['date']    = 'तारीख';
+$labels['size']    = 'माप';
 $labels['priority'] = 'मेल की महत्वपूर्णता';
 $labels['organization'] = 'संस्था';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'फ़ोल्डर';
-$labels['folders'] = 'फ़ोल्डर';
 $labels['messagesfromto'] = '$from से ले कर $to, $count मेल में से';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count में से';
-$labels['copy'] = 'कार्बन';
-$labels['move'] = 'स्थानांतरित करें';
-$labels['moveto'] = 'खीस्काऐं...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'कार्बन';
+$labels['move']     = 'स्थानांतरित करें';
+$labels['moveto']   = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'फ़ाईल नाम';
 $labels['filesize'] = 'फ़ाईल माप';
+
 $labels['addtoaddressbook'] = 'पता खाते में जोडें';
+
+// weekdays short
 $labels['sun'] = 'रवि';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंग';
@@ -57,134 +80,457 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनि';
-$labels['sunday'] = 'रविवार';
-$labels['monday'] = 'सोमवार';
-$labels['tuesday'] = 'मंगलवार';
+
+// weekdays long
+$labels['sunday']    = 'रविवार';
+$labels['monday']    = 'सोमवार';
+$labels['tuesday']   = 'मंगलवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday'] = 'गुरुवार';
-$labels['friday'] = 'शुक्रवार';
-$labels['saturday'] = 'शनिवार';
-$labels['jan'] = 'जनवरी';
-$labels['feb'] = 'फ़रवरी';
-$labels['mar'] = 'मार्च';
-$labels['apr'] = 'अप्रेल';
-$labels['may'] = 'मई';
-$labels['longmay'] = 'मई';
-$labels['jun'] = 'जून';
-$labels['jul'] = 'जुलाई';
-$labels['longjan'] = 'जनवरी';
-$labels['longfeb'] = 'फ़रवरी';
-$labels['longmar'] = 'मार्च';
-$labels['longapr'] = 'अप्रैल';
-$labels['longjun'] = 'जून';
-$labels['longjul'] = 'जुलाई';
-$labels['longaug'] = 'अगस्त';
-$labels['longsep'] = 'सितंबर';
-$labels['longoct'] = 'अक्टूबर';
-$labels['longnov'] = 'नवम्बर';
-$labels['longdec'] = 'दिसंबर';
+$labels['thursday']  = 'गुरुवार';
+$labels['friday']    = 'शुक्रवार';
+$labels['saturday']  = 'शनिवार';
+
+// months short
+$labels['jan']	= 'जनवरी';
+$labels['feb']	= 'फ़रवरी';
+$labels['mar']	= 'मार्च';
+$labels['apr']	= 'अप्रेल';
+$labels['may']	= 'मई';
+$labels['jun']	= 'जून';
+$labels['jul'] 	= 'जुलाई';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'जनवरी';
+$labels['longfeb']	= 'फ़रवरी';
+$labels['longmar']	= 'मार्च';
+$labels['longapr']	= 'अप्रैल';
+$labels['longmay']	= 'मई';
+$labels['longjun']	= 'जून';
+$labels['longjul']	= 'जुलाई';
+$labels['longaug']	= 'अगस्त';
+$labels['longsep']	= 'सितंबर';
+$labels['longoct']	= 'अक्टूबर';
+$labels['longnov']	= 'नवम्बर';
+$labels['longdec']	= 'दिसंबर';
+
 $labels['today'] = 'आज';
-$labels['refresh'] = 'ताज़ा करें';
-$labels['checkmail'] = 'नये मेल लाऐं';
-$labels['compose'] = 'मेल लिखें';
-$labels['writenewmessage'] = 'मेल लिखें';
-$labels['reply'] = 'जवाब';
-$labels['replytomessage'] = 'मेल का जवाब दें';
+
+// toolbar buttons
+$labels['refresh']          = 'ताज़ा करें';
+$labels['checkmail']        = 'नये मेल लाऐं';
+$labels['compose']          = 'मेल लिखें';
+$labels['writenewmessage']  = 'मेल लिखें';
+$labels['reply']            = 'जवाब';
+$labels['replytomessage']   = 'मेल का जवाब दें';
 $labels['replytoallmessage'] = 'सभी को जवाब लिखें';
-$labels['forward'] = 'अग्रेषित करें';
-$labels['forwardmessage'] = 'आगे भेजें';
-$labels['deletemessage'] = 'रद्द करें';
-$labels['printmessage'] = 'मेल छापें';
-$labels['previousmessage'] = 'पीछे के मेल दिखाऐं';
-$labels['firstmessage'] = 'पहला मेल दिखाऐं';
-$labels['nextmessage'] = 'अगला मेल दिखाऐं';
-$labels['lastmessage'] = 'आखीरी मेल दिखाऐं';
-$labels['backtolist'] = 'मेल सूची देखें';
-$labels['viewsource'] = 'सोर्स दिखाऐं';
-$labels['mark'] = 'चिह्नित';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'अग्रेषित करें';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'आगे भेजें';
+$labels['deletemessage']    = 'रद्द करें';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'मेल छापें';
+$labels['previousmessage']  = 'पीछे के मेल दिखाऐं';
+$labels['firstmessage']     = 'पहला मेल दिखाऐं';
+$labels['nextmessage']      = 'अगला मेल दिखाऐं';
+$labels['lastmessage']      = 'आखीरी मेल दिखाऐं';
+$labels['backtolist']       = 'मेल सूची देखें';
+$labels['viewsource']       = 'सोर्स दिखाऐं';
+$labels['mark']             = 'चिह्नित';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'चुनें';
 $labels['all'] = 'सभी';
 $labels['none'] = 'कोई नहीं';
-$labels['nonesort'] = 'कोई नहीं';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'अनदेखी';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'कोई नहीं';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'छोटा करें';
 $labels['empty'] = 'मेल रद्दी में डालें';
+
 $labels['quota'] = 'डिस्क उपयोग';
-$labels['unknown'] = 'अज्ञात';
-$labels['unlimited'] = 'असीम';
-$labels['quicksearch'] = 'तेज़ खोज';
-$labels['resetsearch'] = 'खोज खाली करें';
-$labels['sendmessage'] = 'मेल भेजें';
-$labels['savemessage'] = 'ड्राफ़ट सहेजें';
-$labels['addattachment'] = 'फ़ाईल जोडें';
-$labels['charset'] = 'कैरेक्टर सैट';
-$labels['editortype'] = 'सम्पादक प्राकार';
-$labels['returnreceipt'] = 'मेल रसीद';
+$labels['unknown']  = 'अज्ञात';
+$labels['unlimited']  = 'असीम';
+
+$labels['quicksearch']  = 'तेज़ खोज';
+$labels['resetsearch']  = 'खोज खाली करें';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'मेल भेजें';
+$labels['savemessage']    = 'ड्राफ़ट सहेजें';
+$labels['addattachment']  = 'फ़ाईल जोडें';
+$labels['charset']        = 'कैरेक्टर सैट';
+$labels['editortype']     = 'सम्पादक प्राकार';
+$labels['returnreceipt']  = 'मेल रसीद';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'स्पैलिंग जाँचें';
 $labels['resumeediting'] = 'सम्पादन फिर शुरू करें';
-$labels['revertto'] = 'पहले की स्थिती पर जाऐं';
+$labels['revertto']      = 'पहले की स्थिती पर जाऐं';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'जुडे फाईल';
 $labels['upload'] = 'अपलोड';
-$labels['close'] = 'बंद';
-$labels['low'] = 'कम';
-$labels['lowest'] = 'सबसे कम';
-$labels['normal'] = 'साधारण';
-$labels['high'] = 'उच्च';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'बंद';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'कम';
+$labels['lowest']  = 'सबसे कम';
+$labels['normal']  = 'साधारण';
+$labels['high']    = 'उच्च';
 $labels['highest'] = 'उच्चतम';
-$labels['nosubject'] = '(कोई विशय नहीं)';
+
+$labels['nosubject']  = '(कोई विशय नहीं)';
 $labels['showimages'] = 'चित्र दिखाऐं';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
 $labels['plaintoggle'] = 'सादा पाठ';
-$labels['name'] = 'दिखने वाला नाम';
-$labels['firstname'] = 'पहला नाम';
-$labels['surname'] = 'उपनाम';
-$labels['email'] = 'मेल';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'दिखने वाला नाम';
+$labels['firstname']    = 'पहला नाम';
+$labels['surname']      = 'उपनाम';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'मेल';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नया पता जोडें';
 $labels['editcontact'] = 'पता सम्पाद';
-$labels['edit'] = 'सम्पाद';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'सम्पाद';
 $labels['cancel'] = 'रद्द';
-$labels['save'] = 'सहेज';
+$labels['save']   = 'सहेज';
 $labels['delete'] = 'मिटा';
-$labels['newcontact'] = 'नया पता कार्ड बनाऐं';
-$labels['deletecontact'] = 'चुने पते मिटाऐं';
-$labels['composeto'] = 'को मेल भेजें';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'नया पता कार्ड बनाऐं';
+$labels['deletecontact']  = 'चुने पते मिटाऐं';
+$labels['composeto']      = 'को मेल भेजें';
 $labels['contactsfromto'] = '$from से ले कर $to, $count पते में से';
-$labels['print'] = 'छापें';
-$labels['export'] = 'ऐक्स्पोर्ट';
-$labels['previouspage'] = 'इससे पहले के बन्डल को दिखाऐं';
-$labels['firstpage'] = 'पहला बन्डल दिखाऐं';
-$labels['nextpage'] = 'अगला बन्डल दिखाऐं';
-$labels['lastpage'] = 'आखिरी बन्डल दिखाऐं';
+$labels['print']          = 'छापें';
+$labels['export']         = 'ऐक्स्पोर्ट';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'इससे पहले के बन्डल को दिखाऐं';
+$labels['firstpage']      = 'पहला बन्डल दिखाऐं';
+$labels['nextpage']       = 'अगला बन्डल दिखाऐं';
+$labels['lastpage']       = 'आखिरी बन्डल दिखाऐं';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'इनके विन्यास:';
+$labels['about'] = 'About';
 $labels['preferences'] = 'पसंद';
 $labels['userpreferences'] = 'यूसर पसंद';
 $labels['editpreferences'] = 'यूसर पसंद सम्पादें';
+
 $labels['identities'] = 'पहचान';
 $labels['manageidentities'] = 'इस खाते के पहचान व्यवस्थित करें';
 $labels['newidentity'] = 'नया पहचान';
+
 $labels['newitem'] = 'नया चीज़';
 $labels['edititem'] = 'चीज़ सम्पादें';
+
 $labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) दिखाऐं';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूप मेल करें';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'सुनदर तारीखें';
-$labels['setdefault'] = 'तयशुदा चुनें';
-$labels['language'] = 'भाषा';
-$labels['timezone'] = 'समय क्षेत्र';
-$labels['pagesize'] = 'हर पन्ने पर इतने';
+$labels['setdefault']  = 'तयशुदा चुनें';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'भाषा';
+$labels['timezone']  = 'समय क्षेत्र';
+$labels['pagesize']  = 'हर पन्ने पर इतने';
 $labels['signature'] = 'दस्तखत';
-$labels['dstactive'] = 'रौशनी बचाव';
+$labels['dstactive']  = 'रौशनी बचाव';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'मेल ऐच-टी-ऐम-एल (HTML) मे लिखें';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) दस्तखत';
 $labels['previewpane'] = 'झलक पट्टी दिखाऐं';
-$labels['autosavedraft'] = 'ड्राफ़ट अपने आप सहेजते जाऐं';
-$labels['never'] = 'कभी नहाीं';
-$labels['folder'] = 'फ़ोल्डर';
-$labels['foldername'] = 'फ़ोल्डर नाम';
-$labels['subscribed'] = 'सबस्क्राईब किया गया';
-$labels['create'] = 'बनाऐं';
-$labels['createfolder'] = 'फ़ोलडर बनाऐं';
-$labels['managefolders'] = 'फ़ोलडर को व्यवस्थित करें';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'ड्राफ़ट अपने आप सहेजते जाऐं';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'कभी नहाीं';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'फ़ोल्डर';
+$labels['folders']  = 'फ़ोल्डर';
+$labels['foldername']  = 'फ़ोल्डर नाम';
+$labels['subscribed']  = 'सबस्क्राईब किया गया';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'बनाऐं';
+$labels['createfolder']  = 'फ़ोलडर बनाऐं';
+$labels['managefolders']  = 'फ़ोलडर को व्यवस्थित करें';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'ऐसे तय करें';
-$labels['sortasc'] = 'पहले से आखीरी तय करें';
+$labels['sortasc']  = 'पहले से आखीरी तय करें';
 $labels['sortdesc'] = 'आखीरी से पहले तय करें';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 13714330e..328dbe00e 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi_IN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'लॉगिन नहीं हो पाया';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'लॉगिन नहीं हो पाया';
 $messages['cookiesdisabled'] = 'आपका ब्राऊसर कुकी स्वीकार नहीं कर रहा है';
 $messages['sessionerror'] = 'सत्र समाप्त या अवैद्य';
 $messages['storageerror'] = 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'इस मेलबॉक्स में कोई मेल नहीं है';
 $messages['loggedout'] = 'सत्र समाप्त. टा टा!';
 $messages['mailboxempty'] = 'मेलबॉक्स खाली है';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'लोड हो रहा है';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'डाटा लोड हो रहा है...';
 $messages['checkingmail'] = 'क्या नया मेल है?...';
 $messages['sendingmessage'] = 'मेल भेजा जा रहा है...';
@@ -32,36 +46,124 @@ $messages['messagesaved'] = 'मेल ड्राफ़्ट फोल्ड�
 $messages['successfullysaved'] = 'सहेजा गया है';
 $messages['addedsuccessfully'] = 'पता खाते में पता जोडा गया है';
 $messages['contactexists'] = 'इस ई-मेल पता से एक पता पेहले से है';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'आप के प्राईवेसी के लिये और स्पैम से बचने के लिये इस मेल में सदूर चित्र नहीं दिखाये गये हैं।';
 $messages['encryptedmessage'] = 'माफ़ कीजिये, यह मेल कूट रूप में है, इस कारण दिखाया नहीं जा सकता।';
 $messages['nocontactsfound'] = 'कोई पता नहीं मिला';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'मेल नहीं भिज पाया';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'सहेजते-सहेजते गडबड हो गया';
 $messages['errormoving'] = 'मेल खिस्का नहीं';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'मेल मिटा नहीं';
-$messages['deletecontactconfirm'] = 'चुने गये पते को सचमुच मिटाना है ?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'चुने गये पते को सचमुच मिटाना है ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'चुने गये मेल को सचमुच मिटाना है ?';
-$messages['deletefolderconfirm'] = 'फ़ोल्डर को सचमुच मिटाऐं ?';
-$messages['purgefolderconfirm'] = 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
+$messages['deletefolderconfirm']  = 'फ़ोल्डर को सचमुच मिटाऐं ?';
+$messages['purgefolderconfirm']  = 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फ़ॉर्म पूरी तरह से भरा नहीं';
 $messages['noemailwarning'] = 'वैद्य मेल पता भरें';
-$messages['nonamewarning'] = 'नाम भरें';
+$messages['nonamewarning']  = 'नाम भरें';
 $messages['nopagesizewarning'] = 'पन्ना माप भरें';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कम-से-कम एक पाने वाले का पता भरें';
-$messages['nosubjectwarning'] = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
+$messages['nosubjectwarning']  = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
 $messages['nobodywarning'] = 'बिना कुछ लिखे मेल भेजें?';
 $messages['notsentwarning'] = 'मेल भिजा नहीं. मेल रद्द करें ?';
 $messages['noldapserver'] = 'खोज के लिये एक ऐलडैप सर्वर चुनें';
 $messages['nosearchname'] = 'पता या पते का नाम भरें';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr मेल मिले';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'खोज असफ़ल';
 $messages['searching'] = 'खोजा रहे हैं...';
 $messages['checking'] = 'चाँचा चा रहा है...';
 $messages['nospellerrors'] = 'कोई स्पैलिंग गलती नहीं मिली';
 $messages['folderdeleted'] = 'फ़ोल्डर मिट गया';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'मिट गया';
 $messages['converting'] = 'मेल से फ़ॉर्मैटिंग निकाला जा रहा है...';
 $messages['messageopenerror'] = 'सर्वर से मेल लोड नहीं हो पाया';
 $messages['fileuploaderror'] = 'फ़ाईल अपलोड नहीं हो पाया';
 $messages['filesizeerror'] = 'अपलोड के लिये फ़ाईल हद $size से बड़ा है';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 5ea86d96a..d7b1b2041 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -2,57 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Dobrodošli na $product';
-$labels['username'] = 'Korisničko ime';
-$labels['password'] = 'Lozinka';
-$labels['server'] = 'Poslužitelj';
-$labels['login'] = 'Prijava';
-$labels['logout'] = 'Odjava';
-$labels['mail'] = 'Pošta';
+
+// login page
+$labels['welcome']   = 'Dobrodošli na $product';
+$labels['username']  = 'Korisničko ime';
+$labels['password']  = 'Lozinka';
+$labels['server']    = 'Poslužitelj';
+$labels['login']     = 'Prijava';
+
+// taskbar
+$labels['logout']   = 'Odjava';
+$labels['mail']     = 'Pošta';
 $labels['settings'] = 'Postavke';
 $labels['addressbook'] = 'Imenik';
-$labels['inbox'] = 'Pristigla pošta';
+
+// mailbox names
+$labels['inbox']  = 'Pristigla pošta';
 $labels['drafts'] = 'Predlošci';
-$labels['sent'] = 'Poslano';
-$labels['trash'] = 'Smeće';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Poslano';
+$labels['trash']  = 'Smeće';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Naslov';
-$labels['from'] = 'Od';
-$labels['to'] = 'Za';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Od';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Za';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Odgovori';
 $labels['followupto'] = 'Nastavi-na';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Veličina';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Pročitano';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Mape';
-$labels['folders'] = 'Mape';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
 $labels['fromtoshort'] = '$from - $to od $count';
-$labels['copy'] = 'Kopiraj';
-$labels['move'] = 'Premjesti';
-$labels['moveto'] = 'Premjesti u...';
+
+$labels['copy']     = 'Kopiraj';
+$labels['move']     = 'Premjesti';
+$labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi (download)';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Veličina datoteke';
+
 $labels['addtoaddressbook'] = 'Dodaj u imenik';
+
+// weekdays short
 $labels['sun'] = 'Ned';
 $labels['mon'] = 'Pon';
 $labels['tue'] = 'Uto';
@@ -60,79 +80,89 @@ $labels['wed'] = 'Sri';
 $labels['thu'] = 'Čet';
 $labels['fri'] = 'Pet';
 $labels['sat'] = 'Sub';
-$labels['sunday'] = 'Nedjelja';
-$labels['monday'] = 'Ponedjeljak';
-$labels['tuesday'] = 'Utorak';
+
+// weekdays long
+$labels['sunday']    = 'Nedjelja';
+$labels['monday']    = 'Ponedjeljak';
+$labels['tuesday']   = 'Utorak';
 $labels['wednesday'] = 'Srijeda';
-$labels['thursday'] = 'Četvrtak';
-$labels['friday'] = 'Petak';
-$labels['saturday'] = 'Subota';
-$labels['jan'] = 'Sij';
-$labels['feb'] = 'Velj';
-$labels['mar'] = 'Ožu';
-$labels['apr'] = 'Tra';
-$labels['may'] = 'Svibanj';
-$labels['longmay'] = 'Svibanj';
-$labels['jun'] = 'Lip';
-$labels['jul'] = 'Srp';
-$labels['aug'] = 'Kol';
-$labels['sep'] = 'Ruj';
-$labels['oct'] = 'Lis';
-$labels['nov'] = 'Stu';
-$labels['dec'] = 'Pro';
-$labels['longjan'] = 'Siječanj';
-$labels['longfeb'] = 'Veljača';
-$labels['longmar'] = 'Ožujak';
-$labels['longapr'] = 'Travanj';
-$labels['longjun'] = 'Lipanj';
-$labels['longjul'] = 'Srpanj';
-$labels['longaug'] = 'Kolovoz';
-$labels['longsep'] = 'Rujan';
-$labels['longoct'] = 'Listopad';
-$labels['longnov'] = 'Studeni';
-$labels['longdec'] = 'Prosinac';
+$labels['thursday']  = 'Četvrtak';
+$labels['friday']    = 'Petak';
+$labels['saturday']  = 'Subota';
+
+// months short
+$labels['jan']	= 'Sij';
+$labels['feb']	= 'Velj';
+$labels['mar']	= 'Ožu';
+$labels['apr']	= 'Tra';
+$labels['may']	= 'Svibanj';
+$labels['jun']	= 'Lip';
+$labels['jul'] 	= 'Srp';
+$labels['aug']	= 'Kol';
+$labels['sep']	= 'Ruj';
+$labels['oct']	= 'Lis';
+$labels['nov']	= 'Stu';
+$labels['dec']	= 'Pro';
+
+// months long
+$labels['longjan']	= 'Siječanj';
+$labels['longfeb']	= 'Veljača';
+$labels['longmar']	= 'Ožujak';
+$labels['longapr']	= 'Travanj';
+$labels['longmay']	= 'Svibanj';
+$labels['longjun']	= 'Lipanj';
+$labels['longjul']	= 'Srpanj';
+$labels['longaug']	= 'Kolovoz';
+$labels['longsep']	= 'Rujan';
+$labels['longoct']	= 'Listopad';
+$labels['longnov']	= 'Studeni';
+$labels['longdec']	= 'Prosinac';
+
 $labels['today'] = 'Danas';
-$labels['refresh'] = 'Osvježi';
-$labels['checkmail'] = 'Provjera novih poruka';
-$labels['compose'] = 'Nova poruka';
-$labels['writenewmessage'] = 'Stvori novu poruku';
-$labels['reply'] = 'Odgovori';
-$labels['replytomessage'] = 'Odgovori na poruku';
+
+// toolbar buttons
+$labels['refresh']          = 'Osvježi';
+$labels['checkmail']        = 'Provjera novih poruka';
+$labels['compose']          = 'Nova poruka';
+$labels['writenewmessage']  = 'Stvori novu poruku';
+$labels['reply']            = 'Odgovori';
+$labels['replytomessage']   = 'Odgovori na poruku';
 $labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primateljima';
-$labels['replyall'] = 'Odgovori svima';
-$labels['replylist'] = 'Odgovori listi';
-$labels['forward'] = 'Proslijedi';
-$labels['forwardinline'] = 'Proslijedi citirano';
+$labels['replyall']         = 'Odgovori svima';
+$labels['replylist']        = 'Odgovori listi';
+$labels['forward']          = 'Proslijedi';
+$labels['forwardinline']    = 'Proslijedi citirano';
 $labels['forwardattachment'] = 'Proslijedi kao privitak';
-$labels['forwardmessage'] = 'Prosljedi poruku';
-$labels['deletemessage'] = 'Obriši poruku';
+$labels['forwardmessage']   = 'Prosljedi poruku';
+$labels['deletemessage']    = 'Obriši poruku';
 $labels['movemessagetotrash'] = 'Preseli poruke u smeće';
-$labels['printmessage'] = 'Ispiši ovu poruku';
-$labels['previousmessage'] = 'Prikaži prethodnu poruku';
-$labels['firstmessage'] = 'Prikaži prvu poruku';
-$labels['nextmessage'] = 'Prikaži slijedeću poruku';
-$labels['lastmessage'] = 'Prikaži zadnju poruku';
-$labels['backtolist'] = 'Povratak na listu poruka';
-$labels['viewsource'] = 'Prikaži poruku u izvornom obliku';
-$labels['mark'] = 'Označi';
-$labels['markmessages'] = 'Označi poruke';
-$labels['markread'] = 'Kao pročitano';
-$labels['markunread'] = 'Kao nepročitano';
-$labels['markflagged'] = 'Kao označenu';
-$labels['markunflagged'] = 'Kao neoznačenu';
-$labels['moreactions'] = 'Više akcija';
-$labels['more'] = 'Više';
-$labels['back'] = 'Natrag';
-$labels['options'] = 'Postavke';
+$labels['printmessage']     = 'Ispiši ovu poruku';
+$labels['previousmessage']  = 'Prikaži prethodnu poruku';
+$labels['firstmessage']     = 'Prikaži prvu poruku';
+$labels['nextmessage']      = 'Prikaži slijedeću poruku';
+$labels['lastmessage']      = 'Prikaži zadnju poruku';
+$labels['backtolist']       = 'Povratak na listu poruka';
+$labels['viewsource']       = 'Prikaži poruku u izvornom obliku';
+$labels['mark']             = 'Označi';
+$labels['markmessages']     = 'Označi poruke';
+$labels['markread']         = 'Kao pročitano';
+$labels['markunread']       = 'Kao nepročitano';
+$labels['markflagged']      = 'Kao označenu';
+$labels['markunflagged']    = 'Kao neoznačenu';
+$labels['moreactions']      = 'Više akcija';
+$labels['more']             = 'Više';
+$labels['back']             = 'Natrag';
+$labels['options']          = 'Postavke';
+
 $labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
-$labels['nonesort'] = 'Ništa';
 $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Označene';
 $labels['unanswered'] = 'Neodgovrene';
 $labels['deleted'] = 'Obrisano';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Obrni';
 $labels['filter'] = 'Filtriraj';
 $labels['list'] = 'Lista';
@@ -141,12 +171,14 @@ $labels['expand-all'] = 'Proširi sve';
 $labels['expand-unread'] = 'Proširi nepročitane';
 $labels['collapse-all'] = 'Zatvori sve';
 $labels['threaded'] = 'Tematski prikaz';
+
 $labels['autoexpand_threads'] = 'Proširi teme poruka';
 $labels['do_expand'] = 'Sve teme';
 $labels['expand_only_unread'] = 'samo s nepročitanim porukama';
 $labels['fromto'] = 'Pošiljatelj/Primatelj';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Privitak';
+$labels['nonesort'] = 'Ništa';
 $labels['sentdate'] = 'Datum slanja';
 $labels['arrival'] = 'Datum primanja';
 $labels['asc'] = 'uzlazno';
@@ -155,172 +187,216 @@ $labels['listcolumns'] = 'Kolone';
 $labels['listsorting'] = 'Sortirajuća kolona';
 $labels['listorder'] = 'Sortirajući redoslijed';
 $labels['listmode'] = 'Model pregleda listi';
+
 $labels['folderactions'] = 'Akcije mapa';
 $labels['compact'] = 'Kompresiranje';
 $labels['empty'] = 'Isprazni';
+
 $labels['quota'] = 'Kvota';
-$labels['unknown'] = 'nepoznato';
-$labels['unlimited'] = 'beskonačna';
-$labels['quicksearch'] = 'Brza pretraga';
-$labels['resetsearch'] = 'Prikaži sve poruke';
-$labels['searchmod'] = 'Postavke pretrage';
-$labels['msgtext'] = 'Cijela poruka';
+$labels['unknown']  = 'nepoznato';
+$labels['unlimited']  = 'beskonačna';
+
+$labels['quicksearch']  = 'Brza pretraga';
+$labels['resetsearch']  = 'Prikaži sve poruke';
+$labels['searchmod']  = 'Postavke pretrage';
+$labels['msgtext']  = 'Cijela poruka';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['editasnew'] = 'Uredi kao novo';
-$labels['sendmessage'] = 'Pošalji poruku';
-$labels['savemessage'] = 'Spremi u \'Predlošci\'';
-$labels['addattachment'] = 'Priloži datoteku';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Tip editora';
-$labels['returnreceipt'] = 'Potvrda o primitku poruke';
-$labels['dsn'] = 'Potvrda o poslanoj poruci';
+
+// message compose
+$labels['editasnew']      = 'Uredi kao novo';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Pošalji poruku';
+$labels['savemessage']    = 'Spremi u \'Predlošci\'';
+$labels['addattachment']  = 'Priloži datoteku';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Tip editora';
+$labels['returnreceipt']  = 'Potvrda o primitku poruke';
+$labels['dsn']            = 'Potvrda o poslanoj poruci';
 $labels['mailreplyintro'] = 'Dana $date, $sender je napisao(la):';
 $labels['originalmessage'] = 'Izvorna Poruka';
-$labels['editidents'] = 'Promijeni identitete';
-$labels['spellcheck'] = 'Piši';
+
+$labels['editidents']    = 'Promijeni identitete';
+$labels['spellcheck']    = 'Piši';
 $labels['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Povratak u pisanje';
-$labels['revertto'] = 'Vrati na';
+$labels['revertto']      = 'Vrati na';
+
 $labels['attach'] = 'Priloži';
 $labels['attachments'] = 'Privitci (Attachments)';
 $labels['upload'] = 'Dodaj';
 $labels['uploadprogress'] = '$percent ($current od $total)';
-$labels['close'] = 'Zatvori';
-$labels['messageoptions'] = 'Opcije poruka...';
-$labels['low'] = 'Nizak';
-$labels['lowest'] = 'Najniži';
-$labels['normal'] = 'Srednji';
-$labels['high'] = 'Visok';
+$labels['close']  = 'Zatvori';
+$labels['messageoptions']  = 'Opcije poruka...';
+
+$labels['low']     = 'Nizak';
+$labels['lowest']  = 'Najniži';
+$labels['normal']  = 'Srednji';
+$labels['high']    = 'Visok';
 $labels['highest'] = 'Najviši';
-$labels['nosubject'] = '(bez naslova)';
+
+$labels['nosubject']  = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
-$labels['isdraft'] = 'Ova poruka je skica (draft)';
+$labels['isdraft']    = 'Ova poruka je skica (draft)';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Samo tekst';
 $labels['savesentmessagein'] = 'Spremi poslane poruke u';
 $labels['dontsave'] = 'ne spremaj';
 $labels['maxuploadsize'] = 'Maksimalna dozvoljena velicina datoteke je $size';
+
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj Odgovori-na';
 $labels['addfollowupto'] = 'Dodaj Nastavak-na';
+
+// mdn
 $labels['mdnrequest'] = 'Pošiljaoc ove poruke je tražio da bude obaviješten o njenom primitku. Želite li obavijestiti pošiljaoca?';
 $labels['receiptread'] = 'Vrati potvrdu (pročitano)';
 $labels['yourmessage'] = 'Ovo je vraćena potvrda vaše poruke';
 $labels['receiptnote'] = 'Info: Ova poruka samo potvrđuje da se poruka prikazala na računalu primaoca. Nema garancije da je primaoc pročitao ili razumio sadržaj poruke.';
-$labels['name'] = 'Puno ime';
-$labels['firstname'] = 'Ime';
-$labels['surname'] = 'Prezime';
-$labels['middlename'] = 'Srednje ime';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Sufiks';
-$labels['nickname'] = 'Nadimak';
-$labels['jobtitle'] = 'Titula';
-$labels['department'] = 'Odjel';
-$labels['gender'] = 'Rod';
-$labels['maidenname'] = 'Djevojačko ime';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Grad';
-$labels['zipcode'] = 'Poštanski broj';
-$labels['region'] = 'Oblast';
-$labels['country'] = 'Zemlja';
-$labels['birthday'] = 'Rođendan';
-$labels['anniversary'] = 'Jubilej';
-$labels['website'] = 'Web stranica';
+
+// address boook
+$labels['name']         = 'Puno ime';
+$labels['firstname']    = 'Ime';
+$labels['surname']      = 'Prezime';
+$labels['middlename']   = 'Srednje ime';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Sufiks';
+$labels['nickname']     = 'Nadimak';
+$labels['jobtitle']     = 'Titula';
+$labels['department']   = 'Odjel';
+$labels['gender']       = 'Rod';
+$labels['maidenname']   = 'Djevojačko ime';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Grad';
+$labels['zipcode']      = 'Poštanski broj';
+$labels['region']       = 'Oblast';
+$labels['country']      = 'Zemlja';
+$labels['birthday']     = 'Rođendan';
+$labels['anniversary']  = 'Jubilej';
+$labels['website']      = 'Web stranica';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Bilješke';
-$labels['male'] = 'muško';
+$labels['male']   = 'muško';
 $labels['female'] = 'žensko';
 $labels['manager'] = 'Menadžer';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Suprug/a';
 $labels['allfields'] = 'Sva polja';
 $labels['search'] = 'Pretraga';
 $labels['advsearch'] = 'Napredna Pretraga';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-$labels['typeother'] = 'Ostalo';
-$labels['typehome'] = 'Kućni broj';
-$labels['typework'] = 'Poslovni broj';
-$labels['typemobile'] = 'Mobitel';
-$labels['typemain'] = 'Glavni broj';
-$labels['typehomefax'] = 'Fax kuća';
-$labels['typeworkfax'] = 'Fax posao';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pejdžer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Početna stranica';
+
+$labels['typehome']   = 'Kućni broj';
+$labels['typework']   = 'Poslovni broj';
+$labels['typeother']  = 'Ostalo';
+$labels['typemobile']  = 'Mobitel';
+$labels['typemain']  = 'Glavni broj';
+$labels['typehomefax']  = 'Fax kuća';
+$labels['typeworkfax']  = 'Fax posao';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pejdžer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Početna stranica';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Izmjeni kontakt';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Svojstva kontakta';
 $labels['personalinfo'] = 'Osobni podaci';
-$labels['edit'] = 'Izmjeni';
+
+$labels['edit']   = 'Izmjeni';
 $labels['cancel'] = 'Odustani';
-$labels['save'] = 'Spremi';
+$labels['save']   = 'Spremi';
 $labels['delete'] = 'Obriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Smijeniti';
-$labels['newcontact'] = 'Dodaj novi kontakt';
-$labels['deletecontact'] = 'Obriši odabrane kontakte';
-$labels['composeto'] = 'Napiši mail...';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Dodaj novi kontakt';
+$labels['deletecontact']  = 'Obriši odabrane kontakte';
+$labels['composeto']      = 'Napiši mail...';
 $labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
-$labels['print'] = 'Print';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Napravi novu kontaktnu grupu';
-$labels['grouprename'] = 'Promijeni ime grupe';
-$labels['groupdelete'] = 'Izbriši grupu';
-$labels['previouspage'] = 'Prethodna strana';
-$labels['firstpage'] = 'Prva strana';
-$labels['nextpage'] = 'Slijedeća strana';
-$labels['lastpage'] = 'Zadnja strana';
+$labels['grouprename']    = 'Promijeni ime grupe';
+$labels['groupdelete']    = 'Izbriši grupu';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Prethodna strana';
+$labels['firstpage']      = 'Prva strana';
+$labels['nextpage']       = 'Slijedeća strana';
+$labels['lastpage']       = 'Zadnja strana';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['personaladrbook'] = 'Privatna adresa';
+
 $labels['searchsave'] = 'Pohrani pretragu';
 $labels['searchdelete'] = 'Obriši pretragu';
+
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakta';
 $labels['importfromfile'] = 'Uvezi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove kontakte u imenik:';
 $labels['importreplace'] = 'Prepiši cijeli adresar';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Završeno';
+
+// settings
 $labels['settingsfor'] = 'Postavke za';
 $labels['about'] = 'O programu';
 $labels['preferences'] = 'Postavke';
 $labels['userpreferences'] = 'Korisničke postavke';
 $labels['editpreferences'] = 'Izmjena postavki';
+
 $labels['identities'] = 'Identiteti';
 $labels['manageidentities'] = 'Podesi identitete za ovaj nalog';
 $labels['newidentity'] = 'Dodaj identitet';
+
 $labels['newitem'] = 'Novo';
 $labels['edititem'] = 'Uredi';
+
 $labels['preferhtml'] = 'HTML format u prednosti';
 $labels['defaultcharset'] = 'Zadani skup znakova';
 $labels['htmlmessage'] = 'HTML format poruke';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Format datuma';
 $labels['timeformat'] = 'Format vremena';
 $labels['prettydate'] = 'Formatiran datum';
-$labels['setdefault'] = 'Postavi predodređeno';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Jezik';
-$labels['timezone'] = 'Vremenska zona';
-$labels['pagesize'] = 'Redova po stranici';
+$labels['setdefault']  = 'Postavi predodređeno';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Jezik';
+$labels['timezone']  = 'Vremenska zona';
+$labels['pagesize']  = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
-$labels['dstactive'] = 'Automatska promjena vremena';
+$labels['dstactive']  = 'Automatska promjena vremena';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Sastavi HTML poruke';
 $labels['htmlonreply'] = 'odgovor samo na HTML poruke';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML potpis';
 $labels['previewpane'] = 'Prikaži područje pregleda';
 $labels['skin'] = 'Tema izgleda';
@@ -339,14 +415,16 @@ $labels['readwhendeleted'] = 'Označi poruku kao pročitanu pri brisanju';
 $labels['flagfordeletion'] = 'Označi poruku za brisanje umjesto brisanja';
 $labels['skipdeleted'] = 'Ne prikazivaj pobrisane poruke';
 $labels['deletealways'] = 'Ukoliko premještanje poruka u mapu otpad ne uspije, izbrši poruku';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Prikaži slike s interneta';
 $labels['fromknownsenders'] = 'od poznatih pošiljatelja';
 $labels['always'] = 'uvijek';
 $labels['showinlineimages'] = 'Prikaži slike ispod poruke';
-$labels['autosavedraft'] = 'Automatski spremi draft';
-$labels['everynminutes'] = 'svakih $n minuta';
-$labels['never'] = 'nikada';
-$labels['immediately'] = 'odmah';
+$labels['autosavedraft']  = 'Automatski spremi draft';
+$labels['everynminutes']  = 'svakih $n minuta';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nikada';
+$labels['immediately']  = 'odmah';
 $labels['messagesdisplaying'] = 'Prikazujem poruke';
 $labels['messagescomposition'] = 'Komponiram poruke';
 $labels['mimeparamfolding'] = 'Nazivi privitaka';
@@ -360,11 +438,13 @@ $labels['checkallfolders'] = 'Provjeri nove poruke u svim mapama';
 $labels['displaynext'] = 'Nakon brisanja/micanja poruke, prikaži slijedeću';
 $labels['defaultfont'] = 'Predodređeni font HTML poruke';
 $labels['mainoptions'] = 'Glavne postavke';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Sekcija';
 $labels['maintenance'] = 'Održavanje';
 $labels['newmessage'] = 'Nova poruka';
 $labels['signatureoptions'] = 'Postavke potpisa';
 $labels['whenreplying'] = 'Prilikom odgovora';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'započni novu poruku iznad originala';
 $labels['replybottomposting'] = 'započni novu poruku ispod originala';
 $labels['replyremovesignature'] = 'Kod odgovaranja, makni originalni potpis iz poruke';
@@ -375,26 +455,33 @@ $labels['replysignaturepos'] = 'Kod downloada ili proslijeđivanja postavi potpi
 $labels['belowquote'] = 'ispod citata';
 $labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
-$labels['previewpanemarkread'] = 'Obilježi pregledane poruke kao pročitane';
-$labels['afternseconds'] = 'nakon $n sekundi';
+$labels['previewpanemarkread']  = 'Obilježi pregledane poruke kao pročitane';
+$labels['afternseconds']  = 'nakon $n sekundi';
 $labels['reqmdn'] = 'Uvijek zatraži potvrdu o primitku poruke';
 $labels['reqdsn'] = 'Uvijek zatraži potvrdu o slanju poruke';
 $labels['replysamefolder'] = 'Spremi odgovore u mapu gdje se nalazi poruka';
-$labels['defaultaddressbook'] = 'Dodaj nove kontakte u odabrani imenik';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Preskoči alternativne email adrese u autocomplete prijedlozima';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'Provjeri pravopis prije slanja poruke';
 $labels['spellcheckoptions'] = 'Postavke provjere pravopisa';
 $labels['spellcheckignoresyms'] = 'Ignoriraj riječi koje sadrže simbole';
 $labels['spellcheckignorenums'] = 'Ignoriraj riječi koje sadrže brojeve';
 $labels['spellcheckignorecaps'] = 'Ignoriraj riječi sa sa svim velikim slovima';
 $labels['addtodict'] = 'Dodaj u rječnik';
-$labels['folder'] = 'Mapa';
-$labels['foldername'] = 'Ime mape';
-$labels['subscribed'] = 'Pretplata';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Mapa';
+$labels['folders']  = 'Mape';
+$labels['foldername']  = 'Ime mape';
+$labels['subscribed']  = 'Pretplata';
 $labels['messagecount'] = 'Poruke';
-$labels['create'] = 'Napravi';
-$labels['createfolder'] = 'Napravi novu mapu';
-$labels['managefolders'] = 'Podesi mapu';
+$labels['create']  = 'Napravi';
+$labels['createfolder']  = 'Napravi novu mapu';
+$labels['managefolders']  = 'Podesi mapu';
 $labels['specialfolders'] = 'Specijalna mapa';
 $labels['properties'] = 'Svojstva';
 $labels['folderproperties'] = 'Svojstva mape';
@@ -404,22 +491,29 @@ $labels['info'] = 'Informacija';
 $labels['getfoldersize'] = 'Kliknite da biste dobili veličinu mape';
 $labels['changesubscription'] = 'Kliknite da biste promjenili pretplatu';
 $labels['foldertype'] = 'Vrsta mape';
-$labels['personalfolder'] = 'Privatna mapa';
-$labels['otherfolder'] = 'Mapa drugih korisnika';
-$labels['sharedfolder'] = 'Javna mapa';
+$labels['personalfolder']  = 'Privatna mapa';
+$labels['otherfolder']  = 'Mapa drugih korisnika';
+$labels['sharedfolder']  = 'Javna mapa';
+
 $labels['sortby'] = 'Sortiraj po';
-$labels['sortasc'] = 'Sortiraj rastućim nizom';
+$labels['sortasc']  = 'Sortiraj rastućim nizom';
 $labels['sortdesc'] = 'Sortiraj opadajućim nizom';
 $labels['undo'] = 'Poništi';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Inačica';
 $labels['source'] = 'Izvor';
 $labels['license'] = 'Licenca';
 $labels['support'] = 'Podrška';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engleski';
 $labels['westerneuropean'] = 'Zapadno Evropski';
@@ -439,3 +533,4 @@ $labels['japanese'] = 'Japanski';
 $labels['korean'] = 'Korejski';
 $labels['chinese'] = 'Kineski';
 
+?>
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index 354365db8..c3a4f1779 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Prijava neuspješna';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Prijava neuspješna';
 $messages['cookiesdisabled'] = 'Vaš Web preglednik ne podržava kolačiće (cookies)';
 $messages['sessionerror'] = 'Morate se ponovno ulogirati';
 $messages['storageerror'] = 'Neuspješna veza na IMAP server';
 $messages['servererror'] = 'Greška poslužitelja';
 $messages['servererrormsg'] = 'Greška na serveru: $msg';
 $messages['dberror'] = 'Greška baze podataka!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Nemoguća izvedba operacije. Mapa je samo za čitanje.';
 $messages['errornoperm'] = 'Nemoguća izvedba operacije. Dozvola odbijena.';
 $messages['invalidrequest'] = 'Nepravilan zahtijev! Podaci nisu spremljeni.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nema poruka u sandučiću';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Zbogom!';
 $messages['mailboxempty'] = 'Sandučuć je prazan';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Učitavanje...';
 $messages['uploading'] = 'Prenosim datoteku...';
 $messages['uploadingmany'] = 'Prenosim datoteke...';
@@ -54,11 +60,11 @@ $messages['errormoving'] = 'Greška pri premještanju poruke';
 $messages['errorcopying'] = 'Greška pri kopiranju poruke';
 $messages['errordeleting'] = 'Greška pri brisanju poruke';
 $messages['errormarking'] = 'Nije moguće označiti poruku';
-$messages['deletecontactconfirm'] = 'Želite li obrisati izabrane kontakte?';
-$messages['deletegroupconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu?';
+$messages['deletecontactconfirm']  = 'Želite li obrisati izabrane kontakte?';
+$messages['deletegroupconfirm']  = 'Jeste li sigurni da želite obrisati odabranu grupu?';
 $messages['deletemessagesconfirm'] = 'Sigurno želite obrisati odabrane poruke?';
-$messages['deletefolderconfirm'] = 'Želite li obrisati ovu mapu?';
-$messages['purgefolderconfirm'] = 'Želite li obrisati sve poruke u mapi?';
+$messages['deletefolderconfirm']  = 'Želite li obrisati ovu mapu?';
+$messages['purgefolderconfirm']  = 'Želite li obrisati sve poruke u mapi?';
 $messages['contactdeleting'] = 'Brišem kontakt(e)...';
 $messages['groupdeleting'] = 'Brišem grupu...';
 $messages['folderdeleting'] = 'Brišem mapu...';
@@ -67,11 +73,11 @@ $messages['foldersubscribing'] = 'Pretplata na mapu...';
 $messages['folderunsubscribing'] = 'Poništavanje pretplate na mapu...';
 $messages['formincomplete'] = 'Obrazac nije u cjelosti popunjen';
 $messages['noemailwarning'] = 'Unesite valjanu e-mail adresu';
-$messages['nonamewarning'] = 'Unesite ime';
+$messages['nonamewarning']  = 'Unesite ime';
 $messages['nopagesizewarning'] = 'Unesite veličinu stranice';
 $messages['nosenderwarning'] = 'Unesite e-mail adresu pošiljatelja';
 $messages['norecipientwarning'] = 'Unesite primatelja (ZA)';
-$messages['nosubjectwarning'] = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
+$messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['notsentwarning'] = 'Poruka nije poslana. Želite li odbaciti ovu poruku?';
 $messages['noldapserver'] = 'Unesite LDAP poslužitelj za pretragu';
@@ -113,8 +119,9 @@ $messages['selectimportfile'] = 'Odaberite datoteku za prijenos';
 $messages['addresswriterror'] = 'U odabrani adresar nije moguće zapisivat...';
 $messages['contactaddedtogroup'] = 'Kontakti uspješno dodani ovoj grupi';
 $messages['contactremovedfromgroup'] = 'Kontakti uspješno izbrisani iz ove grupe';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Uvozim, molimo sačekajte...';
-$messages['importerror'] = 'Greška pri uvozu! Datoteka ne sadrži pravilan vCard format.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Uspješno je uvezeno $inserted kontakt(a), preskočeno $skipped već postojećih</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočeno $skipped postojećih unosa</b>';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
@@ -156,4 +163,7 @@ $messages['invalidimageformat'] = 'Format slike nije ispravan.';
 $messages['mispellingsfound'] = 'Greške pravopisa su pronađene u poruci.';
 $messages['parentnotwritable'] = 'Nije moguće stvoriti/pomaknuti mapu u odabranu mapu. Nemate prava pristupa.';
 $messages['messagetoobig'] = 'Dio poruke je prevelik za procesiranje.';
+$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/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 0208206e2..f0bfaea8b 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Üdvözli a $product';
-$labels['username'] = 'Felhasználónév';
-$labels['password'] = 'Jelszó';
-$labels['server'] = 'Szerver';
-$labels['login'] = 'Bejelentkezés';
-$labels['logout'] = 'Kijelentkezés';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Üdvözli a $product';
+$labels['username']  = 'Felhasználónév';
+$labels['password']  = 'Jelszó';
+$labels['server']    = 'Szerver';
+$labels['login']     = 'Bejelentkezés';
+
+// taskbar
+$labels['logout']   = 'Kijelentkezés';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Beállítások';
 $labels['addressbook'] = 'Címjegyzék';
-$labels['inbox'] = 'Érkezett levelek';
+
+// mailbox names
+$labels['inbox']  = 'Érkezett levelek';
 $labels['drafts'] = 'Piszkozatok';
-$labels['sent'] = 'Küldött levelek';
-$labels['trash'] = 'Törölt elemek';
-$labels['junk'] = 'Kéretlen levelek';
+$labels['sent']   = 'Küldött levelek';
+$labels['trash']  = 'Törölt elemek';
+$labels['junk']   = 'Kéretlen levelek';
+
+// message listing
 $labels['subject'] = 'Tárgy';
-$labels['from'] = 'Feladó';
-$labels['to'] = 'Címzett';
-$labels['cc'] = 'Másolat';
-$labels['bcc'] = 'Titkos másolat';
+$labels['from']    = 'Feladó';
+$labels['sender']  = 'Feladó';
+$labels['to']      = 'Címzett';
+$labels['cc']      = 'Másolat';
+$labels['bcc']     = 'Titkos másolat';
 $labels['replyto'] = 'Válaszcím';
 $labels['followupto'] = 'Hírcsoport válasz';
-$labels['date'] = 'Dátum';
-$labels['size'] = 'Méret';
+$labels['date']    = 'Dátum';
+$labels['size']    = 'Méret';
 $labels['priority'] = 'Sürgősség';
 $labels['organization'] = 'Szervezet';
 $labels['readstatus'] = 'Olvasott';
 $labels['listoptions'] = 'Üzenetlista beállítások...';
+
 $labels['mailboxlist'] = 'Mappák';
-$labels['folders'] = 'Mappák';
 $labels['messagesfromto'] = 'Üzenetek: $from - $to / $count';
 $labels['threadsfromto'] = 'Témák ($from - $to, összesen $count)';
 $labels['messagenrof'] = '$nr / $count üzenet';
 $labels['fromtoshort'] = '$from – $to / $count';
-$labels['copy'] = 'Másolás';
-$labels['move'] = 'Áthelyezés';
-$labels['moveto'] = 'Áthelyezés...';
+
+$labels['copy']     = 'Másolás';
+$labels['move']     = 'Áthelyezés';
+$labels['moveto']   = 'Áthelyezés...';
 $labels['download'] = 'letöltés';
 $labels['showattachment'] = 'Megjelenítés';
 $labels['showanyway'] = 'Megjelnités mindenképpen';
+
 $labels['filename'] = 'Fájl neve';
 $labels['filesize'] = 'Fájl mérete';
+
 $labels['addtoaddressbook'] = 'Hozzáadás a címjegyzékhez';
+
+// weekdays short
 $labels['sun'] = 'Vas';
 $labels['mon'] = 'Hét';
 $labels['tue'] = 'Kedd';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Szer';
 $labels['thu'] = 'Csüt';
 $labels['fri'] = 'Pén';
 $labels['sat'] = 'Szom';
-$labels['sunday'] = 'Vasárnap';
-$labels['monday'] = 'Hétfő';
-$labels['tuesday'] = 'Kedd';
+
+// weekdays long
+$labels['sunday']    = 'Vasárnap';
+$labels['monday']    = 'Hétfő';
+$labels['tuesday']   = 'Kedd';
 $labels['wednesday'] = 'Szerda';
-$labels['thursday'] = 'Csütörtök';
-$labels['friday'] = 'Péntek';
-$labels['saturday'] = 'Szombat';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Febr';
-$labels['mar'] = 'Márc';
-$labels['apr'] = 'Ápr';
-$labels['may'] = 'Május';
-$labels['longmay'] = 'Május';
-$labels['jun'] = 'Jún';
-$labels['jul'] = 'Júl';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Szept';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Január';
-$labels['longfeb'] = 'Február';
-$labels['longmar'] = 'Március';
-$labels['longapr'] = 'Április';
-$labels['longjun'] = 'Június';
-$labels['longjul'] = 'Július';
-$labels['longaug'] = 'Augusztus';
-$labels['longsep'] = 'Szeptember';
-$labels['longoct'] = 'Október';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Csütörtök';
+$labels['friday']    = 'Péntek';
+$labels['saturday']  = 'Szombat';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Febr';
+$labels['mar']	= 'Márc';
+$labels['apr']	= 'Ápr';
+$labels['may']	= 'Május';
+$labels['jun']	= 'Jún';
+$labels['jul'] 	= 'Júl';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Szept';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Január';
+$labels['longfeb']	= 'Február';
+$labels['longmar']	= 'Március';
+$labels['longapr']	= 'Április';
+$labels['longmay']	= 'Május';
+$labels['longjun']	= 'Június';
+$labels['longjul']	= 'Július';
+$labels['longaug']	= 'Augusztus';
+$labels['longsep']	= 'Szeptember';
+$labels['longoct']	= 'Október';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Ma';
-$labels['refresh'] = 'Frissítés';
-$labels['checkmail'] = 'Új üzenetek ellenőrzése';
-$labels['compose'] = 'Üzenet létrehozása';
-$labels['writenewmessage'] = 'Új üzenet';
-$labels['reply'] = 'Válasz';
-$labels['replytomessage'] = 'Válasz';
+
+// toolbar buttons
+$labels['refresh']          = 'Frissítés';
+$labels['checkmail']        = 'Új üzenetek ellenőrzése';
+$labels['compose']          = 'Üzenet létrehozása';
+$labels['writenewmessage']  = 'Új üzenet';
+$labels['reply']            = 'Válasz';
+$labels['replytomessage']   = 'Válasz';
 $labels['replytoallmessage'] = 'Válasz a listának vagy a feladónak és az összes címzettnek';
-$labels['replyall'] = 'Válasz mindenkinek';
-$labels['replylist'] = 'Válasz a listának';
-$labels['forward'] = 'Továbbítás';
-$labels['forwardinline'] = 'Továbbítás beágyazva';
+$labels['replyall']         = 'Válasz mindenkinek';
+$labels['replylist']        = 'Válasz a listának';
+$labels['forward']          = 'Továbbítás';
+$labels['forwardinline']    = 'Továbbítás beágyazva';
 $labels['forwardattachment'] = 'Továbbítás csatolmányként';
-$labels['forwardmessage'] = 'Továbbítás';
-$labels['deletemessage'] = 'Törlés';
+$labels['forwardmessage']   = 'Továbbítás';
+$labels['deletemessage']    = 'Törlés';
 $labels['movemessagetotrash'] = 'Üzenet törlése';
-$labels['printmessage'] = 'Nyomtatás';
-$labels['previousmessage'] = 'Előző levél mutatása';
-$labels['firstmessage'] = 'Első levél mutatása';
-$labels['nextmessage'] = 'Következő levél mutatása';
-$labels['lastmessage'] = 'Utolsó levél mutatása';
-$labels['backtolist'] = 'Vissza az üzenetekhez';
-$labels['viewsource'] = 'Forrás megtekintése';
-$labels['mark'] = 'Jelölés';
-$labels['markmessages'] = 'Üzenetek megjelölése';
-$labels['markread'] = 'Olvasottként';
-$labels['markunread'] = 'Olvasatlanként';
-$labels['markflagged'] = 'Jelöltként';
-$labels['markunflagged'] = 'Jelöletlenként';
-$labels['moreactions'] = 'További műveletek...';
-$labels['more'] = 'Még egy';
-$labels['back'] = 'Vissza';
-$labels['options'] = 'Beállítások';
+$labels['printmessage']     = 'Nyomtatás';
+$labels['previousmessage']  = 'Előző levél mutatása';
+$labels['firstmessage']     = 'Első levél mutatása';
+$labels['nextmessage']      = 'Következő levél mutatása';
+$labels['lastmessage']      = 'Utolsó levél mutatása';
+$labels['backtolist']       = 'Vissza az üzenetekhez';
+$labels['viewsource']       = 'Forrás megtekintése';
+$labels['mark']             = 'Jelölés';
+$labels['markmessages']     = 'Üzenetek megjelölése';
+$labels['markread']         = 'Olvasottként';
+$labels['markunread']       = 'Olvasatlanként';
+$labels['markflagged']      = 'Jelöltként';
+$labels['markunflagged']    = 'Jelöletlenként';
+$labels['moreactions']      = 'További műveletek...';
+$labels['more']             = 'Még egy';
+$labels['back']             = 'Vissza';
+$labels['options']          = 'Beállítások';
+
 $labels['select'] = 'Kijelölés';
 $labels['all'] = 'Összes';
 $labels['none'] = 'Nincs';
-$labels['nonesort'] = 'Nincs';
 $labels['currpage'] = 'Aktuális oldal';
 $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelölt';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Összes kibontása';
 $labels['expand-unread'] = 'Olvasatlanok kibontása';
 $labels['collapse-all'] = 'Összes összecsukása';
 $labels['threaded'] = 'Téma nézet';
+
 $labels['autoexpand_threads'] = 'Témák kibontása';
 $labels['do_expand'] = 'minden téma';
 $labels['expand_only_unread'] = 'csak ahol van olvasatlan üzenet';
 $labels['fromto'] = 'Feladó/Címzett';
 $labels['flag'] = 'Megjelölés';
 $labels['attachment'] = 'Csatolmány';
+$labels['nonesort'] = 'Nincs';
 $labels['sentdate'] = 'Feladva';
 $labels['arrival'] = 'Kézbesítve';
 $labels['asc'] = 'Emelkedő';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Oszlopok listája';
 $labels['listsorting'] = 'Rendezés oszlopa';
 $labels['listorder'] = 'Rendezés sorrendje';
 $labels['listmode'] = 'Megjelenítési mód';
+
 $labels['folderactions'] = 'Mappaműveletek...';
 $labels['compact'] = 'Tömörítés';
 $labels['empty'] = 'Kiürítés';
+
 $labels['quota'] = 'Helyfoglalás';
-$labels['unknown'] = 'ismeretlen';
-$labels['unlimited'] = 'korlátlan';
-$labels['quicksearch'] = 'Gyorskeresés';
-$labels['resetsearch'] = 'Alapállapot';
-$labels['searchmod'] = 'Keresési opciók';
-$labels['msgtext'] = 'Teljes üzenet';
+$labels['unknown']  = 'ismeretlen';
+$labels['unlimited']  = 'korlátlan';
+
+$labels['quicksearch']  = 'Gyorskeresés';
+$labels['resetsearch']  = 'Alapállapot';
+$labels['searchmod']  = 'Keresési opciók';
+$labels['msgtext']  = 'Teljes üzenet';
+$labels['body']  = 'Törzs';
+
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
-$labels['editasnew'] = 'Szerkesztés újként';
-$labels['send'] = 'Küldés';
-$labels['sendmessage'] = 'Üzenet küldése';
-$labels['savemessage'] = 'Vázlat mentése';
-$labels['addattachment'] = 'Fájl csatolása';
-$labels['charset'] = 'Karakterkészlet';
-$labels['editortype'] = 'Szerkesztő típusa';
-$labels['returnreceipt'] = 'Olvasási visszaigazolás';
-$labels['dsn'] = 'Kézbesítési visszaigazolás';
+
+// message compose
+$labels['editasnew']      = 'Szerkesztés újként';
+$labels['send']           = 'Küldés';
+$labels['sendmessage']    = 'Üzenet küldése';
+$labels['savemessage']    = 'Vázlat mentése';
+$labels['addattachment']  = 'Fájl csatolása';
+$labels['charset']        = 'Karakterkészlet';
+$labels['editortype']     = 'Szerkesztő típusa';
+$labels['returnreceipt']  = 'Olvasási visszaigazolás';
+$labels['dsn']            = 'Kézbesítési visszaigazolás';
 $labels['mailreplyintro'] = '$date időpontban $sender ezt írta:';
 $labels['originalmessage'] = 'Eredeti üzenet';
-$labels['editidents'] = 'Azonosítók szerkesztése';
-$labels['spellcheck'] = 'Helyesírás ellenőrzés';
+
+$labels['editidents']    = 'Azonosítók szerkesztése';
+$labels['spellcheck']    = 'Helyesírás ellenőrzés';
 $labels['checkspelling'] = 'Helyesírás-ellenőrzés';
 $labels['resumeediting'] = 'Helyesírás-ellenőrzés vége';
-$labels['revertto'] = 'Visszaállítás erre';
+$labels['revertto']      = 'Visszaállítás erre';
+
 $labels['attach'] = 'Csatolás';
 $labels['attachments'] = 'Csatolmányok';
 $labels['upload'] = 'Feltöltés';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = 'Bezárás';
-$labels['messageoptions'] = 'Üzenetbeállítások...';
-$labels['low'] = 'Alacsony';
-$labels['lowest'] = 'Legkisebb';
-$labels['normal'] = 'Normál';
-$labels['high'] = 'Magas';
+$labels['close']  = 'Bezárás';
+$labels['messageoptions']  = 'Üzenetbeállítások...';
+
+$labels['low']     = 'Alacsony';
+$labels['lowest']  = 'Legkisebb';
+$labels['normal']  = 'Normál';
+$labels['high']    = 'Magas';
 $labels['highest'] = 'Legmagasabb';
-$labels['nosubject'] = '(nincs tárgy)';
+
+$labels['nosubject']  = '(nincs tárgy)';
 $labels['showimages'] = 'Képek megjelenítése';
 $labels['alwaysshow'] = 'Képek megjelenítése mindig, ha a feladó $sender';
-$labels['isdraft'] = 'TRANSLATE!';
-$labels['andnmore'] = 'további $nr...';
+$labels['isdraft']    = 'TRANSLATE!';
+$labels['andnmore']   = 'további $nr...';
 $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';
 $labels['plaintoggle'] = 'Egyszerű szöveg';
 $labels['savesentmessagein'] = 'Elküldött üzenet mentése ide';
 $labels['dontsave'] = 'nincs mentés';
 $labels['maxuploadsize'] = 'A maximális feltölthető fájl mérete $size';
+
 $labels['addcc'] = 'Cc (Másolati cím) hozzáadása';
 $labels['addbcc'] = 'Bcc (titkos másolati cím) hozzáadása';
 $labels['addreplyto'] = 'Válaszcím hozzáadása';
 $labels['addfollowupto'] = 'Hírcsoport válasz hozzáadása';
+
+// mdn
 $labels['mdnrequest'] = 'Az üzenet küldője értesítést kér arról, hogy elolvasta a levelet. El legyen küldve az olvasási visszaigazolás?';
 $labels['receiptread'] = 'Olvasási visszaigazolás (olvasott)';
 $labels['yourmessage'] = 'Ez az üzenete olvasási visszaigazolása';
 $labels['receiptnote'] = 'Megjegyzés: Ez az olvasási visszaigazolás csak azt igazolja, hogy az üzenet megjelenítésre került a címzett számítógépén. Nincs rá garancia, hogy a címzett elolvasta volna az üzenetet illetve megértette volna annak tartalmát.';
-$labels['name'] = 'Megjelenített név';
-$labels['firstname'] = 'Keresztnév';
-$labels['surname'] = 'Vezetéknév';
-$labels['middlename'] = 'Második keresztnév';
-$labels['nameprefix'] = 'Név-előtag';
-$labels['namesuffix'] = 'Név-utótag';
-$labels['nickname'] = 'Becenév';
-$labels['jobtitle'] = 'Beosztás';
-$labels['department'] = 'Részleg';
-$labels['gender'] = 'Nem';
-$labels['maidenname'] = 'Leánykori név';
-$labels['email'] = 'E-mail cím';
-$labels['phone'] = 'Telefonszám';
-$labels['address'] = 'Lakcím';
-$labels['street'] = 'Utca';
-$labels['locality'] = 'Város';
-$labels['zipcode'] = 'Irányítószám';
-$labels['region'] = 'Régió';
-$labels['country'] = 'Ország';
-$labels['birthday'] = 'Születésnap';
-$labels['anniversary'] = 'Évforduló';
-$labels['website'] = 'Weboldal';
+
+// address boook
+$labels['name']         = 'Megjelenített név';
+$labels['firstname']    = 'Keresztnév';
+$labels['surname']      = 'Vezetéknév';
+$labels['middlename']   = 'Második keresztnév';
+$labels['nameprefix']   = 'Név-előtag';
+$labels['namesuffix']   = 'Név-utótag';
+$labels['nickname']     = 'Becenév';
+$labels['jobtitle']     = 'Beosztás';
+$labels['department']   = 'Részleg';
+$labels['gender']       = 'Nem';
+$labels['maidenname']   = 'Leánykori név';
+$labels['email']        = 'E-mail cím';
+$labels['phone']        = 'Telefonszám';
+$labels['address']      = 'Lakcím';
+$labels['street']       = 'Utca';
+$labels['locality']     = 'Város';
+$labels['zipcode']      = 'Irányítószám';
+$labels['region']       = 'Régió';
+$labels['country']      = 'Ország';
+$labels['birthday']     = 'Születésnap';
+$labels['anniversary']  = 'Évforduló';
+$labels['website']      = 'Weboldal';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Megjegyzések';
-$labels['male'] = 'férfi';
+$labels['male']   = 'férfi';
 $labels['female'] = 'nő';
 $labels['manager'] = 'Menedzser';
 $labels['assistant'] = 'Asszisztens';
-$labels['typeassistant'] = 'Asszisztens';
 $labels['spouse'] = 'Házastárs';
 $labels['allfields'] = 'Összes mező';
 $labels['search'] = 'Keresés';
 $labels['advsearch'] = 'Részletes keresés';
 $labels['advanced'] = 'Haladó';
 $labels['other'] = 'Egyéb';
-$labels['typeother'] = 'Egyéb';
-$labels['typehome'] = 'Otthon';
-$labels['typework'] = 'Munkahely';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Vezetékes';
-$labels['typehomefax'] = 'Otthoni fax';
-$labels['typeworkfax'] = 'Munkahelyi fax';
-$labels['typecar'] = 'Gépkocsi';
-$labels['typepager'] = 'Személyhívó';
-$labels['typevideo'] = 'Videó';
-$labels['typehomepage'] = 'Weboldal';
+
+$labels['typehome']   = 'Otthon';
+$labels['typework']   = 'Munkahely';
+$labels['typeother']  = 'Egyéb';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Vezetékes';
+$labels['typehomefax']  = 'Otthoni fax';
+$labels['typeworkfax']  = 'Munkahelyi fax';
+$labels['typecar']  = 'Gépkocsi';
+$labels['typepager']  = 'Személyhívó';
+$labels['typevideo']  = 'Videó';
+$labels['typeassistant']  = 'Asszisztens';
+$labels['typehomepage']  = 'Weboldal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Új mező hozzáadása...';
 $labels['addcontact'] = 'Új kapcsolat hozzáadása';
 $labels['editcontact'] = 'Kapcsolat szerkesztése';
 $labels['contacts'] = 'Kapcsolatok';
 $labels['contactproperties'] = 'Kapcsolat tulajdonságai';
 $labels['personalinfo'] = 'Személyes adatok';
-$labels['edit'] = 'Szerkesztés';
+
+$labels['edit']   = 'Szerkesztés';
 $labels['cancel'] = 'Mégsem';
-$labels['save'] = 'Mentés';
+$labels['save']   = 'Mentés';
 $labels['delete'] = 'Törlés';
 $labels['rename'] = 'Átnevezés';
 $labels['addphoto'] = 'Kép hozzáadása';
 $labels['replacephoto'] = 'Kép cseréje';
 $labels['uploadphoto'] = 'Fotó feltöltése';
-$labels['newcontact'] = 'Új kapcsolat létrehozása';
-$labels['deletecontact'] = 'Kijelölt kapcsolatok törlése';
-$labels['composeto'] = 'E-mail küldése erre a címre';
+
+$labels['newcontact']     = 'Új kapcsolat létrehozása';
+$labels['deletecontact']  = 'Kijelölt kapcsolatok törlése';
+$labels['composeto']      = 'E-mail küldése erre a címre';
 $labels['contactsfromto'] = 'Kapcsolatok: $from - $to / $count';
-$labels['print'] = 'Nyomtatás';
-$labels['export'] = 'Exportálás';
-$labels['exportvcards'] = 'Kapcsolatok exportálása vCard formátumban';
+$labels['print']          = 'Nyomtatás';
+$labels['export']         = 'Exportálás';
+$labels['exportall']      = 'Összes exportálása';
+$labels['exportsel']      = 'Kijelöltek exportálása';
+$labels['exportvcards']   = 'Kapcsolatok exportálása vCard formátumban';
 $labels['newcontactgroup'] = 'Új csoport';
-$labels['grouprename'] = 'Csoport átnevezése';
-$labels['groupdelete'] = 'Csoport törlése';
+$labels['grouprename']    = 'Csoport átnevezése';
+$labels['groupdelete']    = 'Csoport törlése';
 $labels['groupremoveselected'] = 'A kijelölt partnerek törlése a csopotból';
-$labels['previouspage'] = 'Előző oldal';
-$labels['firstpage'] = 'Első oldal';
-$labels['nextpage'] = 'Következő oldal';
-$labels['lastpage'] = 'Utolsó oldal';
+
+$labels['previouspage']   = 'Előző oldal';
+$labels['firstpage']      = 'Első oldal';
+$labels['nextpage']       = 'Következő oldal';
+$labels['lastpage']       = 'Utolsó oldal';
+
 $labels['group'] = 'Csoport';
 $labels['groups'] = 'Csoportok';
 $labels['personaladrbook'] = 'Személyes címjegyzék';
+
 $labels['searchsave'] = 'Keresés mentése';
 $labels['searchdelete'] = 'Keresés törlése';
+
 $labels['import'] = 'Importálás';
 $labels['importcontacts'] = 'Kapcsolatok importálása';
 $labels['importfromfile'] = 'Importálás fájlból:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Kapcsolatok hozzáadása a címjegyzékhez:';
 $labels['importreplace'] = 'A teljes címjegyzék cseréje';
 $labels['importdesc'] = 'Feltölthetsz partnereket egyébb már létező címjegyzékekből. <br/>Jelenleg a következő két tipusú címjegyzékek importálása lehetséges  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> és a CSV (comma-separated/vesszővel tagolt) formátum.';
 $labels['done'] = 'Kész';
+
+// settings
 $labels['settingsfor'] = 'Beállítás';
 $labels['about'] = 'Névjegy';
 $labels['preferences'] = 'Beállítások';
 $labels['userpreferences'] = 'Felhasználói beállítások';
 $labels['editpreferences'] = 'Felhasználói beállítások szerkesztése';
+
 $labels['identities'] = 'Azonosítók';
 $labels['manageidentities'] = 'Hozzáférés azonosítóinak kezelése';
 $labels['newidentity'] = 'Új azonosító';
+
 $labels['newitem'] = 'Új elem';
 $labels['edititem'] = 'Elem szerkesztése';
+
 $labels['preferhtml'] = 'HTML megjelenítés';
 $labels['defaultcharset'] = 'Alapértelmezett karakterkódolás';
 $labels['htmlmessage'] = 'HTML üzenet';
+$labels['messagepart'] = 'Rész';
+$labels['digitalsig'] = 'Digitális aláírás';
 $labels['dateformat'] = 'Dátumformátum';
 $labels['timeformat'] = 'Időformátum';
 $labels['prettydate'] = 'Rövid dátumok';
-$labels['setdefault'] = 'Beállítás alapértelmezettnek';
-$labels['autodetect'] = 'Automatikus';
-$labels['language'] = 'Nyelv';
-$labels['timezone'] = 'Időzóna';
-$labels['pagesize'] = 'Sorok száma egy oldalon';
+$labels['setdefault']  = 'Beállítás alapértelmezettnek';
+$labels['autodetect']  = 'Automatikus';
+$labels['language']  = 'Nyelv';
+$labels['timezone']  = 'Időzóna';
+$labels['pagesize']  = 'Sorok száma egy oldalon';
 $labels['signature'] = 'Aláírás';
-$labels['dstactive'] = 'Nyári időszámítás';
+$labels['dstactive']  = 'Nyári időszámítás';
 $labels['showinextwin'] = 'Az üzenet megnyitása egy új ablakban';
 $labels['composeextwin'] = 'Űzenet írása új ablakban';
 $labels['htmleditor'] = 'HTML üzenet írása';
@@ -353,16 +415,16 @@ $labels['readwhendeleted'] = 'Üzenet olvasottként jelölése törléskor';
 $labels['flagfordeletion'] = 'Üzenet törlendőnek jelölése törlés helyett';
 $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'] = 'Közvetlen törlése az üzeneteknek a levélszemét mappában';
+$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['fromknownsenders'] = 'csak ismert feladóktól';
 $labels['always'] = 'mindig';
 $labels['showinlineimages'] = 'Csatolt képek megjelenítése az üzenet alatt';
-$labels['autosavedraft'] = 'Piszkozat automatikus mentése';
-$labels['everynminutes'] = 'minden $n percben';
-$labels['refreshinterval'] = 'Frissítés ( új üzenetek keresése, stb )';
-$labels['never'] = 'soha';
-$labels['immediately'] = 'azonnal';
+$labels['autosavedraft']  = 'Piszkozat automatikus mentése';
+$labels['everynminutes']  = 'minden $n percben';
+$labels['refreshinterval']  = 'Frissítés ( új üzenetek keresése, stb )';
+$labels['never']  = 'soha';
+$labels['immediately']  = 'azonnal';
 $labels['messagesdisplaying'] = 'Üzenetek megjelenítése';
 $labels['messagescomposition'] = 'Üzenetek írása';
 $labels['mimeparamfolding'] = 'Csatolt állományok nevei';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Válasznál és továbbításnál kerüljön az
 $labels['belowquote'] = 'az idézett szöveg alá';
 $labels['abovequote'] = 'az idézett szöveg fölé';
 $labels['insertsignature'] = 'Aláírás beillesztése';
-$labels['previewpanemarkread'] = 'Előnézetben megjelent üzenetek megjelölése olvasottként';
-$labels['afternseconds'] = '$n másodperc elteltével';
+$labels['previewpanemarkread']  = 'Előnézetben megjelent üzenetek megjelölése olvasottként';
+$labels['afternseconds']  = '$n másodperc elteltével';
 $labels['reqmdn'] = 'Olvasási visszaigazolás megkövetelése';
 $labels['reqdsn'] = 'Kézbesítési visszaigazolás megkövetelése';
 $labels['replysamefolder'] = 'Válaszok azonos mappába helyezése';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Beállítás a mailto: linkek kezelőjeként';
 $labels['forwardmode'] = 'Üzenet továbbítás';
 $labels['inline'] = 'beágyazott';
 $labels['asattachment'] = 'csatolmányként';
-$labels['folder'] = 'Mappa';
-$labels['foldername'] = 'Mappa neve';
-$labels['subscribed'] = 'Feliratkozva';
+
+$labels['folder']  = 'Mappa';
+$labels['folders']  = 'Mappák';
+$labels['foldername']  = 'Mappa neve';
+$labels['subscribed']  = 'Feliratkozva';
 $labels['messagecount'] = 'Üzenet';
-$labels['create'] = 'Létrehozás';
-$labels['createfolder'] = 'Új mappa létrehozása';
-$labels['managefolders'] = 'Mappák kezelése';
+$labels['create']  = 'Létrehozás';
+$labels['createfolder']  = 'Új mappa létrehozása';
+$labels['managefolders']  = 'Mappák kezelése';
 $labels['specialfolders'] = 'Különleges mappák';
 $labels['properties'] = 'Tulajdonságok';
 $labels['folderproperties'] = 'Mappa tulajdonságai';
@@ -427,23 +491,29 @@ $labels['info'] = 'Információk';
 $labels['getfoldersize'] = 'Mappa mérete';
 $labels['changesubscription'] = 'Feliratkozás megváltoztatása';
 $labels['foldertype'] = 'Mappa típusa';
-$labels['personalfolder'] = 'Privát mappa';
-$labels['otherfolder'] = 'Más felhasználó(k) mappája';
-$labels['sharedfolder'] = 'Megosztott mappa';
+$labels['personalfolder']  = 'Privát mappa';
+$labels['otherfolder']  = 'Más felhasználó(k) mappája';
+$labels['sharedfolder']  = 'Megosztott mappa';
+
 $labels['sortby'] = 'Rendezés';
-$labels['sortasc'] = 'növekvő';
+$labels['sortasc']  = 'növekvő';
 $labels['sortdesc'] = 'csökkenő';
 $labels['undo'] = 'Visszavonás';
+
 $labels['installedplugins'] = 'Telepített bővítmények';
 $labels['plugin'] = 'Bővítmény';
 $labels['version'] = 'Verzió';
 $labels['source'] = 'Forrás';
 $labels['license'] = 'Licensz';
 $labels['support'] = 'Támogatás';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angol';
 $labels['westerneuropean'] = 'Nyugat-európai';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japán';
 $labels['korean'] = 'Koreai';
 $labels['chinese'] = 'Kínai';
 
+?>
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index c5afacf41..ee3e8a9a5 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Hiba történt';
-$messages['loginfailed'] = 'Sikertelen bejelentkezés.';
+$messages['errortitle']  = 'Hiba történt';
+$messages['loginfailed']  = 'Sikertelen bejelentkezés.';
 $messages['cookiesdisabled'] = 'A böngésző nem támogatja a sütik használatát';
 $messages['sessionerror'] = 'Érvénytelen vagy lejárt munkamenet';
 $messages['storageerror'] = 'Nem sikerült csatlakozni az IMAP szerverhez';
@@ -57,11 +60,11 @@ $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['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['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?';
-$messages['deletefolderconfirm'] = 'Biztos, hogy törölni szeretné ezt a mappát?';
-$messages['purgefolderconfirm'] = 'Biztos benne, hogy az összes üzenet törölhető?';
+$messages['deletefolderconfirm']  = 'Biztos, hogy törölni szeretné ezt a mappát?';
+$messages['purgefolderconfirm']  = 'Biztos benne, hogy az összes üzenet törölhető?';
 $messages['contactdeleting'] = 'Kapcsolat(ok) törlése...';
 $messages['groupdeleting'] = 'Csoport törlése...';
 $messages['folderdeleting'] = 'Mappa törlése...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Feliratkozás a mappára...';
 $messages['folderunsubscribing'] = 'Leiratkozás a mappáról...';
 $messages['formincomplete'] = 'Az űrlap hiányosan lett kitöltve';
 $messages['noemailwarning'] = 'Adjon meg egy valós e-mail címet';
-$messages['nonamewarning'] = 'Adjon meg egy nevet';
+$messages['nonamewarning']  = 'Adjon meg egy nevet';
 $messages['nopagesizewarning'] = 'Adja meg a papír méretét';
 $messages['nosenderwarning'] = 'Kérem adja meg a feladó e-mail címét';
 $messages['norecipientwarning'] = 'Legalább egy címzettet adjon meg';
-$messages['nosubjectwarning'] = 'A Tárgy mező üres. Szeretné most kitölteni?';
+$messages['nosubjectwarning']  = 'A Tárgy mező üres. Szeretné most kitölteni?';
 $messages['nobodywarning'] = 'Elküldi az üzenetet üresen?';
 $messages['notsentwarning'] = 'Az üzenet még nem lett elküldve. Eldobja az üzenetet?';
 $messages['noldapserver'] = 'Adjon meg egy LDAP szervert a kereséshez';
@@ -163,3 +166,4 @@ $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.';
 
+?>
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 56bf946d9..45086785a 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -2,61 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['preferences'] = 'Նախընտրանքներ';
-$labels['userpreferences'] = 'Օգտվողի նախընտրանքներ';
-$labels['editpreferences'] = 'Խմբագրել օգտվողի նախընտրանքները';
-$labels['welcome'] = 'Բարի գալուստ $product';
-$labels['username'] = 'Օգտվող';
-$labels['password'] = 'Գաղտնաբառ';
-$labels['server'] = 'Սերվեր';
-$labels['login'] = 'Մուտք';
-$labels['logout'] = 'Ելք';
-$labels['mail'] = 'Էլ–փոստ';
+
+// login page
+$labels['welcome']   = 'Բարի գալուստ $product';
+$labels['username']  = 'Օգտվող';
+$labels['password']  = 'Գաղտնաբառ';
+$labels['server']    = 'Սերվեր';
+$labels['login']     = 'Մուտք';
+
+// taskbar
+$labels['logout']   = 'Ելք';
+$labels['mail']     = 'Էլ–փոստ';
 $labels['settings'] = 'Նախասիրություններ';
 $labels['addressbook'] = 'Հասցեներ';
-$labels['inbox'] = 'Փոստարկղ';
+
+// mailbox names
+$labels['inbox']  = 'Փոստարկղ';
 $labels['drafts'] = 'Սևագրեր';
-$labels['sent'] = 'Ուղարկված';
-$labels['trash'] = 'Աղբարկղ';
-$labels['junk'] = 'Թափոն';
+$labels['sent']   = 'Ուղարկված';
+$labels['trash']  = 'Աղբարկղ';
+$labels['junk']   = 'Թափոն';
+
+// message listing
 $labels['subject'] = 'Վերնագիր';
-$labels['from'] = 'Ուղարկող';
-$labels['to'] = 'Ստացող';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Ուղարկող';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Ստացող';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
 $labels['followupto'] = 'Ի հավելում';
-$labels['date'] = 'Ամսաթիվ';
-$labels['size'] = 'Չափ';
+$labels['date']    = 'Ամսաթիվ';
+$labels['size']    = 'Չափ';
 $labels['priority'] = 'Առավելություն';
 $labels['organization'] = 'Կազմակերպություն';
 $labels['readstatus'] = 'Ընթերցման կարգավիճակ';
 $labels['listoptions'] = 'Ցուցակի ընտրանքներ…';
+
 $labels['mailboxlist'] = 'Դարակներ';
-$labels['folders'] = 'Դարակներ';
 $labels['messagesfromto'] = 'Նամակներ $from–ից $to–ը եղած $count–ից';
 $labels['threadsfromto'] = 'Թեմաներ $from-ից $to ընդհանուր $count-ից';
 $labels['messagenrof'] = 'Նամակ $nr եղած $count–ից';
 $labels['fromtoshort'] = '$from-ից $to ընդհանուր $count-ից';
-$labels['copy'] = 'Cc';
-$labels['move'] = 'Տեղափոխել';
-$labels['moveto'] = 'Տեղափոխել...';
+
+$labels['copy']     = 'Cc';
+$labels['move']     = 'Տեղափոխել';
+$labels['moveto']   = 'Տեղափոխել...';
 $labels['download'] = 'Քաշել';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Ֆայլի անուն';
 $labels['filesize'] = 'Ֆայլի չափ';
+
 $labels['addtoaddressbook'] = 'Հիշել հասցեն';
+
+// weekdays short
 $labels['sun'] = 'Կիր';
 $labels['mon'] = 'Երկ';
 $labels['tue'] = 'Երք';
@@ -64,79 +80,89 @@ $labels['wed'] = 'Չրք';
 $labels['thu'] = 'Հնգ';
 $labels['fri'] = 'Ուրբ';
 $labels['sat'] = 'Շբթ';
-$labels['sunday'] = 'Կիրակի';
-$labels['monday'] = 'Երկուշաբթի';
-$labels['tuesday'] = 'Երեքշաբթի';
+
+// weekdays long
+$labels['sunday']    = 'Կիրակի';
+$labels['monday']    = 'Երկուշաբթի';
+$labels['tuesday']   = 'Երեքշաբթի';
 $labels['wednesday'] = 'Չորեքշաբթի';
-$labels['thursday'] = 'Հինգշաբթի';
-$labels['friday'] = 'Ուրբաթ';
-$labels['saturday'] = 'Շաբաթ';
-$labels['jan'] = 'Հնվ';
-$labels['feb'] = 'Փետ';
-$labels['mar'] = 'Մար';
-$labels['apr'] = 'Ապր';
-$labels['may'] = 'Մայիս';
-$labels['longmay'] = 'Մայիս';
-$labels['jun'] = 'Հուս';
-$labels['jul'] = 'Հուլ';
-$labels['aug'] = 'Օգս';
-$labels['sep'] = 'Սեպ';
-$labels['oct'] = 'Հոկ';
-$labels['nov'] = 'Նոյ';
-$labels['dec'] = 'Դեկ';
-$labels['longjan'] = 'Հունվար';
-$labels['longfeb'] = 'Փետրվար';
-$labels['longmar'] = 'Մարտ';
-$labels['longapr'] = 'Ապրիլ';
-$labels['longjun'] = 'Հունիս';
-$labels['longjul'] = 'Հուլիս';
-$labels['longaug'] = 'Օգոստոս';
-$labels['longsep'] = 'Սեպտեմբեր';
-$labels['longoct'] = 'Հոկտեմբեր';
-$labels['longnov'] = 'Նոյեմբեր';
-$labels['longdec'] = 'Դեկտեմբեր';
+$labels['thursday']  = 'Հինգշաբթի';
+$labels['friday']    = 'Ուրբաթ';
+$labels['saturday']  = 'Շաբաթ';
+
+// months short
+$labels['jan']	= 'Հնվ';
+$labels['feb']	= 'Փետ';
+$labels['mar']	= 'Մար';
+$labels['apr']	= 'Ապր';
+$labels['may']	= 'Մայիս';
+$labels['jun']	= 'Հուս';
+$labels['jul'] 	= 'Հուլ';
+$labels['aug']	= 'Օգս';
+$labels['sep']	= 'Սեպ';
+$labels['oct']	= 'Հոկ';
+$labels['nov']	= 'Նոյ';
+$labels['dec']	= 'Դեկ';
+
+// months long
+$labels['longjan']	= 'Հունվար';
+$labels['longfeb']	= 'Փետրվար';
+$labels['longmar']	= 'Մարտ';
+$labels['longapr']	= 'Ապրիլ';
+$labels['longmay']	= 'Մայիս';
+$labels['longjun']	= 'Հունիս';
+$labels['longjul']	= 'Հուլիս';
+$labels['longaug']	= 'Օգոստոս';
+$labels['longsep']	= 'Սեպտեմբեր';
+$labels['longoct']	= 'Հոկտեմբեր';
+$labels['longnov']	= 'Նոյեմբեր';
+$labels['longdec']	= 'Դեկտեմբեր';
+
 $labels['today'] = 'Այսօր';
-$labels['refresh'] = 'Թարմացնել';
-$labels['checkmail'] = 'Ստուգել նոր նամակները';
-$labels['compose'] = 'Գրել նամակ';
-$labels['writenewmessage'] = 'Նոր նամակ';
-$labels['reply'] = 'Պատասխանել';
-$labels['replytomessage'] = 'Պատասխանել նամակին';
+
+// toolbar buttons
+$labels['refresh']          = 'Թարմացնել';
+$labels['checkmail']        = 'Ստուգել նոր նամակները';
+$labels['compose']          = 'Գրել նամակ';
+$labels['writenewmessage']  = 'Նոր նամակ';
+$labels['reply']            = 'Պատասխանել';
+$labels['replytomessage']   = 'Պատասխանել նամակին';
 $labels['replytoallmessage'] = 'Պատասխանել բոլորին';
-$labels['replyall'] = 'Պատասխանել բոլորին';
-$labels['replylist'] = 'Պատասխանել ցուցակին';
-$labels['forward'] = 'Առաջ';
-$labels['forwardinline'] = 'Փոխանցել նամակի մեջ';
+$labels['replyall']         = 'Պատասխանել բոլորին';
+$labels['replylist']        = 'Պատասխանել ցուցակին';
+$labels['forward']          = 'Առաջ';
+$labels['forwardinline']    = 'Փոխանցել նամակի մեջ';
 $labels['forwardattachment'] = 'Փոխանցել կցված';
-$labels['forwardmessage'] = 'Փոխանցել նամակը';
-$labels['deletemessage'] = 'Ջնջել նամակը';
+$labels['forwardmessage']   = 'Փոխանցել նամակը';
+$labels['deletemessage']    = 'Ջնջել նամակը';
 $labels['movemessagetotrash'] = 'Գցել աղբարկղը';
-$labels['printmessage'] = 'Տպել';
-$labels['previousmessage'] = 'Ցուցադրել նախորդ նամակը';
-$labels['firstmessage'] = 'Ցուցադրել առաջին նամակը';
-$labels['nextmessage'] = 'Ցուցադրել հաջորդ նամակը';
-$labels['lastmessage'] = 'Ցուցադրել վերջին նամակը';
-$labels['backtolist'] = 'Վերադառնալ նամակների ցուցակ';
-$labels['viewsource'] = 'Ցուցադրել նամակի կոդը';
-$labels['mark'] = 'Նշել';
-$labels['markmessages'] = 'Նշել նամակները';
-$labels['markread'] = 'որպես կարդացած';
-$labels['markunread'] = 'որպես չկարդացած';
-$labels['markflagged'] = 'որպես նշված';
-$labels['markunflagged'] = 'որպես չնշված';
-$labels['moreactions'] = 'Հավելյալ գործողություններ…';
-$labels['more'] = 'Ավելին';
-$labels['back'] = 'Ետ';
-$labels['options'] = 'Ընտրանքներ';
+$labels['printmessage']     = 'Տպել';
+$labels['previousmessage']  = 'Ցուցադրել նախորդ նամակը';
+$labels['firstmessage']     = 'Ցուցադրել առաջին նամակը';
+$labels['nextmessage']      = 'Ցուցադրել հաջորդ նամակը';
+$labels['lastmessage']      = 'Ցուցադրել վերջին նամակը';
+$labels['backtolist']       = 'Վերադառնալ նամակների ցուցակ';
+$labels['viewsource']       = 'Ցուցադրել նամակի կոդը';
+$labels['mark']             = 'Նշել';
+$labels['markmessages']     = 'Նշել նամակները';
+$labels['markread']         = 'որպես կարդացած';
+$labels['markunread']       = 'որպես չկարդացած';
+$labels['markflagged']      = 'որպես նշված';
+$labels['markunflagged']    = 'որպես չնշված';
+$labels['moreactions']      = 'Հավելյալ գործողություններ…';
+$labels['more']             = 'Ավելին';
+$labels['back']             = 'Ետ';
+$labels['options']          = 'Ընտրանքներ';
+
 $labels['select'] = 'Նշել';
 $labels['all'] = 'Բոլորը';
 $labels['none'] = 'Չնշել';
-$labels['nonesort'] = 'Չնշել';
 $labels['currpage'] = 'Առկա էջ';
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
 $labels['deleted'] = 'Ջնջված';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Փոխատեղել';
 $labels['filter'] = 'Զտիչ';
 $labels['list'] = 'Ցուցակ';
@@ -145,12 +171,14 @@ $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'] = 'ըստ աճման';
@@ -159,171 +187,216 @@ $labels['listcolumns'] = 'Ցուցակի սյունյակներ';
 $labels['listsorting'] = 'Տեսակավորման սյունյակ';
 $labels['listorder'] = 'Տեսակավորման կարգը';
 $labels['listmode'] = 'Ցուցակով տեսքի տարբերակը';
+
 $labels['folderactions'] = 'Պանակի գործողություններ…';
 $labels['compact'] = 'Սեղմել';
 $labels['empty'] = 'Դատարկել';
+
 $labels['quota'] = 'Դիսկային տարածք';
-$labels['unknown'] = 'անհայտ';
-$labels['unlimited'] = 'անսահմանափակ';
-$labels['quicksearch'] = 'Արագ որոնում';
-$labels['resetsearch'] = 'Վերսկսել որոնումը';
-$labels['searchmod'] = 'Որոնման փոփոխիչներ';
-$labels['msgtext'] = 'Ողջ հաղորդագրությունը';
+$labels['unknown']  = 'անհայտ';
+$labels['unlimited']  = 'անսահմանափակ';
+
+$labels['quicksearch']  = 'Արագ որոնում';
+$labels['resetsearch']  = 'Վերսկսել որոնումը';
+$labels['searchmod']  = 'Որոնման փոփոխիչներ';
+$labels['msgtext']  = 'Ողջ հաղորդագրությունը';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['emlsave'] = 'Ներբեռնել (.eml)';
-$labels['editasnew'] = 'Խմբագրել որպես նոր';
-$labels['sendmessage'] = 'Ուղարկել';
-$labels['savemessage'] = 'Հիշել որպես սևագիր';
-$labels['addattachment'] = 'Կցել ֆայլ';
-$labels['charset'] = 'Տառաշար';
-$labels['editortype'] = 'Խմբագրի տիպը';
-$labels['returnreceipt'] = 'Ստացման հավաստագիր';
-$labels['dsn'] = 'Առաքման կարգավիճակի ծանուցում';
+
+// message compose
+$labels['editasnew']      = 'Խմբագրել որպես նոր';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Ուղարկել';
+$labels['savemessage']    = 'Հիշել որպես սևագիր';
+$labels['addattachment']  = 'Կցել ֆայլ';
+$labels['charset']        = 'Տառաշար';
+$labels['editortype']     = 'Խմբագրի տիպը';
+$labels['returnreceipt']  = 'Ստացման հավաստագիր';
+$labels['dsn']            = 'Առաքման կարգավիճակի ծանուցում';
 $labels['mailreplyintro'] = '$date-ին, $sender-ը գրեց.';
 $labels['originalmessage'] = 'Առաջին հաղորդագրությունը';
-$labels['editidents'] = 'Խմբագրել ինքնությունները';
-$labels['spellcheck'] = 'Տառասխալներ';
+
+$labels['editidents']    = 'Խմբագրել ինքնությունները';
+$labels['spellcheck']    = 'Տառասխալներ';
 $labels['checkspelling'] = 'Ստուգել ուղագրությունը';
 $labels['resumeediting'] = 'Շարունակել խմբագրումը';
-$labels['revertto'] = 'Վերականգնել';
+$labels['revertto']      = 'Վերականգնել';
+
 $labels['attach'] = 'Կցել';
 $labels['attachments'] = 'Կցումներ';
 $labels['upload'] = 'Բեռնել';
 $labels['uploadprogress'] = '$percent ($current $total-ից)';
-$labels['close'] = 'Փակել';
-$labels['messageoptions'] = 'Հաղորդագրության ընտրանքներ…';
-$labels['low'] = 'Ցածր';
-$labels['lowest'] = 'Նվազագույն';
-$labels['normal'] = 'Նորմալ';
-$labels['high'] = 'Կարևոր';
+$labels['close']  = 'Փակել';
+$labels['messageoptions']  = 'Հաղորդագրության ընտրանքներ…';
+
+$labels['low']     = 'Ցածր';
+$labels['lowest']  = 'Նվազագույն';
+$labels['normal']  = 'Նորմալ';
+$labels['high']    = 'Կարևոր';
 $labels['highest'] = 'Կարևորագույն';
-$labels['nosubject'] = '(առանց վերնագրի)';
+
+$labels['nosubject']  = '(առանց վերնագրի)';
 $labels['showimages'] = 'Ցուցադրել նկարները';
 $labels['alwaysshow'] = 'Միշտ ցուցադրել պատկերները $sender–ից';
-$labels['isdraft'] = 'Սա հաղորդագրության սևագիր է';
+$labels['isdraft']    = 'Սա հաղորդագրության սևագիր է';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Պարզ տեքստ';
 $labels['savesentmessagein'] = 'Գրանցել ուղարկված նամակը';
 $labels['dontsave'] = 'Չ՛գրանցել';
 $labels['maxuploadsize'] = 'Առավելագույն թույլատրելի ֆայլի չափը $size է';
+
 $labels['addcc'] = 'Ավելացնել Cc';
 $labels['addbcc'] = 'Ավելացնել Bcc';
 $labels['addreplyto'] = 'Ավելացնել Reply-To';
 $labels['addfollowupto'] = 'Ավելացնել հավելում';
+
+// mdn
 $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'] = 'Կայք';
+
+// address boook
+$labels['name']         = 'Մականուն';
+$labels['firstname']    = 'Անուն';
+$labels['surname']      = 'Ազգանուն';
+$labels['middlename']   = 'Միջին անուն';
+$labels['nameprefix']   = 'Նախածանց';
+$labels['namesuffix']   = 'Վերջածանց';
+$labels['nickname']     = 'Մականուն';
+$labels['jobtitle']     = 'Պաշտոն';
+$labels['department']   = 'Բաժանմունք';
+$labels['gender']       = 'Սեռ';
+$labels['maidenname']   = 'Մինչամուսնական ազգանուն';
+$labels['email']        = 'Էկ–փոստ';
+$labels['phone']        = 'Հեռախոս';
+$labels['address']      = 'Հասցե';
+$labels['street']       = 'Փողոց';
+$labels['locality']     = 'Քաղաք';
+$labels['zipcode']      = 'Փոստային կոդ';
+$labels['region']       = 'Մարզ';
+$labels['country']      = 'Երկիր';
+$labels['birthday']     = 'Ծննդյան օր';
+$labels['anniversary']  = 'Տարեդարձ';
+$labels['website']      = 'Կայք';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Նշումներ';
-$labels['male'] = 'արական';
+$labels['male']   = 'արական';
 $labels['female'] = 'իգական';
 $labels['manager'] = 'Մենեջեր';
 $labels['assistant'] = 'Օգնական';
-$labels['typeassistant'] = 'Օգնական';
 $labels['spouse'] = 'ամուսին';
 $labels['allfields'] = 'Բոլոր դաշտերը';
 $labels['search'] = 'Որոնում';
 $labels['advsearch'] = 'Խորացված որոնում';
 $labels['advanced'] = 'Խորացված';
 $labels['other'] = 'Այլ';
-$labels['typeother'] = 'Այլ';
-$labels['typehome'] = 'Տուն';
-$labels['typework'] = 'Աշխատանք';
-$labels['typemobile'] = 'Բջջային';
-$labels['typemain'] = 'Գլխավոր';
-$labels['typehomefax'] = 'Տան ֆաքս';
-$labels['typeworkfax'] = 'Աշտանանքային ֆաքս';
-$labels['typecar'] = 'Մեքենա';
-$labels['typepager'] = 'Փեյջեր';
-$labels['typevideo'] = 'Տեսանյութ';
-$labels['typehomepage'] = 'Սկիզբ';
+
+$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['addcontact'] = 'Գրանցել նշած հասցեն';
 $labels['editcontact'] = 'Խմբագրել հասցեն';
 $labels['contacts'] = 'Կապորդներ';
 $labels['contactproperties'] = 'Կապորդի հատկանիշներ';
 $labels['personalinfo'] = 'Անձնական տվյալներ';
-$labels['edit'] = 'Խմբագրել';
+
+$labels['edit']   = 'Խմբագրել';
 $labels['cancel'] = 'Թարգել';
-$labels['save'] = 'Հիշել';
+$labels['save']   = 'Հիշել';
 $labels['delete'] = 'Ջնջել';
 $labels['rename'] = 'Վերանվանել';
 $labels['addphoto'] = 'Ավելացնել';
 $labels['replacephoto'] = 'Փոխարինել';
 $labels['uploadphoto'] = 'Վերբեռնել լուսանկար';
-$labels['newcontact'] = 'Ստեղծել նոր հասցեքարտ';
-$labels['deletecontact'] = 'Ջնջել նշած նամակները';
-$labels['composeto'] = 'Գրել նամակ';
+
+$labels['newcontact']     = 'Ստեղծել նոր հասցեքարտ';
+$labels['deletecontact']  = 'Ջնջել նշած նամակները';
+$labels['composeto']      = 'Գրել նամակ';
 $labels['contactsfromto'] = 'Հասցեներ $from–ից $to–ը եղած $count–ից';
-$labels['print'] = 'Տպել';
-$labels['export'] = 'Արտահանել';
-$labels['exportvcards'] = 'Արտահանել հասցեները vCard չափաձևով';
+$labels['print']          = 'Տպել';
+$labels['export']         = 'Արտահանել';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Արտահանել հասցեները vCard չափաձևով';
 $labels['newcontactgroup'] = 'Ստեղծել կապորդների նոր խումբ';
-$labels['grouprename'] = 'Վերանվանել խումբը';
-$labels['groupdelete'] = 'Ջնջել խումբը';
+$labels['grouprename']    = 'Վերանվանել խումբը';
+$labels['groupdelete']    = 'Ջնջել խումբը';
 $labels['groupremoveselected'] = 'Հեռացնել նշված անձանց խմբից';
-$labels['previouspage'] = 'Ցուցադրել նախորդ էջը';
-$labels['firstpage'] = 'Ցուցադրել առաջին էջը';
-$labels['nextpage'] = 'Ցուցադրել հաջորդ էջը';
-$labels['lastpage'] = 'Ցուցադրել վերջին էջը';
+
+$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['importtarget'] = 'Ավելացնել նոր կապորդներ հասցեագրքում';
 $labels['importreplace'] = 'Փոխել ողջ հասցեագիրքը';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Ավարտված է';
+
+// settings
 $labels['settingsfor'] = 'Նախասիրություններ';
 $labels['about'] = 'Նկարագիր';
+$labels['preferences'] = 'Նախընտրանքներ';
+$labels['userpreferences'] = 'Օգտվողի նախընտրանքներ';
+$labels['editpreferences'] = 'Խմբագրել օգտվողի նախընտրանքները';
+
 $labels['identities'] = 'Անձիք';
 $labels['manageidentities'] = 'Կարգավորել անձանց';
 $labels['newidentity'] = 'Նոր անձ';
+
 $labels['newitem'] = 'Նոր իր';
 $labels['edititem'] = 'Խմբագրել իրը';
+
 $labels['preferhtml'] = 'Գերադասել HTML';
 $labels['defaultcharset'] = 'Լռելյալ տառաշար';
 $labels['htmlmessage'] = 'HTML նամակ';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Ամսաթվի ձևաչափ';
 $labels['timeformat'] = 'Ժամանակի ձևաչափ';
 $labels['prettydate'] = 'Պարզ ամսաթվեր';
-$labels['setdefault'] = 'Հիմնական';
-$labels['autodetect'] = 'Ավտո';
-$labels['language'] = 'Լեզու';
-$labels['timezone'] = 'Ժամային գոտի';
-$labels['pagesize'] = 'Տողեր առ էջ';
+$labels['setdefault']  = 'Հիմնական';
+$labels['autodetect']  = 'Ավտո';
+$labels['language']  = 'Լեզու';
+$labels['timezone']  = 'Ժամային գոտի';
+$labels['pagesize']  = 'Տողեր առ էջ';
 $labels['signature'] = 'Ստորագրություն';
-$labels['dstactive'] = 'Ամառային ժամանակ';
+$labels['dstactive']  = 'Ամառային ժամանակ';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Ստեղծել HTML նամակներ';
 $labels['htmlonreply'] = 'միայն HTML հաղորդագրությանը պատասխանելիս';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ստորագրություն';
 $labels['previewpane'] = 'Ցուցադրել պատուհանը';
 $labels['skin'] = 'Տեսքի տարբերակ';
@@ -347,10 +420,11 @@ $labels['showremoteimages'] = 'Ցույց տալ հեռակա պատկերներ
 $labels['fromknownsenders'] = 'հայտնի հասցեատերերից';
 $labels['always'] = 'միշտ';
 $labels['showinlineimages'] = 'Ցուցադրել կցված պատկերները հաղորդագրության տակ';
-$labels['autosavedraft'] = 'Սևագրի ավտոմատ գրանցում';
-$labels['everynminutes'] = 'ամեն $n րոպեն';
-$labels['never'] = 'երբեք';
-$labels['immediately'] = 'անմիջապես';
+$labels['autosavedraft']  = 'Սևագրի ավտոմատ գրանցում';
+$labels['everynminutes']  = 'ամեն $n րոպեն';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'երբեք';
+$labels['immediately']  = 'անմիջապես';
 $labels['messagesdisplaying'] = 'նամակները ցուցադրելիս';
 $labels['messagescomposition'] = 'նամակ գրելիս';
 $labels['mimeparamfolding'] = 'Կցորդների անուններ';
@@ -370,6 +444,7 @@ $labels['maintenance'] = 'Սպասարկում';
 $labels['newmessage'] = 'Նոր հաղորդագրություն';
 $labels['signatureoptions'] = 'Ստորագրության ընտրանքներ';
 $labels['whenreplying'] = 'Պատասխանելիս';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'սկսել նոր հաղորդագրությունը վերևից';
 $labels['replybottomposting'] = 'սկսել նոր հաղորդագրությունը ներքևից';
 $labels['replyremovesignature'] = 'Պատասխանելիս հեռացնել հաղորդագրությունից նախորդ ստորագրությունը';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = 'Ավելացնել ստորագրություն�
 $labels['belowquote'] = 'Մեջբերման ներքևում';
 $labels['abovequote'] = 'Մեջբերման վերևում';
 $labels['insertsignature'] = 'Ներդնել ստորագրությունը';
-$labels['previewpanemarkread'] = 'Նշել նախադիտված հաղորդագրությունները որպես ընթերցված';
-$labels['afternseconds'] = '$n վարկյան հետո';
+$labels['previewpanemarkread']  = 'Նշել նախադիտված հաղորդագրությունները որպես ընթերցված';
+$labels['afternseconds']  = '$n վարկյան հետո';
 $labels['reqmdn'] = 'Միշտ պատվիրել ստացական';
 $labels['reqdsn'] = 'Միշտ պատվիրել առաքման կարգավիճակի ծանուցում';
 $labels['replysamefolder'] = 'Հաղորդագրության պատասխանները պահել նույն պանակում';
-$labels['defaultaddressbook'] = 'Ավելացնել նոր կապորդներ նշված հասցեագրքին';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Ավտոլրացման ժամանակ բացառել այլընտրանքային էլփոստի հասցեները';
 $labels['listnamedisplay'] = 'Ցուցադրել կապորդները որպես';
 $labels['spellcheckbeforesend'] = 'Ստուգել տառասխալները հաղորդագրությունը ուղարկելուց առաջ';
@@ -395,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Անտեսել թվերով բառերը';
 $labels['spellcheckignorecaps'] = 'Անտեսել լրիվ մեծատառ բառերը';
 $labels['addtodict'] = 'Ավելացնել բառարանում';
 $labels['mailtoprotohandler'] = 'mailto: հղումների սպասարկող';
-$labels['folder'] = 'Դարակ';
-$labels['foldername'] = 'Դարակի անուն';
-$labels['subscribed'] = 'Բաժանորդագրված';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Դարակ';
+$labels['folders']  = 'Դարակներ';
+$labels['foldername']  = 'Դարակի անուն';
+$labels['subscribed']  = 'Բաժանորդագրված';
 $labels['messagecount'] = 'Նամակներ';
-$labels['create'] = 'Ստեղծել';
-$labels['createfolder'] = 'Բացել նոր դարակ';
-$labels['managefolders'] = 'Կարգավորել դարակները';
+$labels['create']  = 'Ստեղծել';
+$labels['createfolder']  = 'Բացել նոր դարակ';
+$labels['managefolders']  = 'Կարգավորել դարակները';
 $labels['specialfolders'] = 'Հատուկ դարակներ';
 $labels['properties'] = 'Հատկանիշներ';
 $labels['folderproperties'] = 'Պանակի հատկանիշներ';
@@ -411,22 +491,29 @@ $labels['info'] = 'Տեղեկություն';
 $labels['getfoldersize'] = 'Հպել պանակի չափը իմանալու համար';
 $labels['changesubscription'] = 'Հպել բաժանորդագրությունը փոխելու համար';
 $labels['foldertype'] = 'Պանակի տեսակ';
-$labels['personalfolder'] = 'Անձնական պանակ';
-$labels['otherfolder'] = 'Այլ օգտվողի պանակ';
-$labels['sharedfolder'] = 'Հանրային պանակ';
+$labels['personalfolder']  = 'Անձնական պանակ';
+$labels['otherfolder']  = 'Այլ օգտվողի պանակ';
+$labels['sharedfolder']  = 'Հանրային պանակ';
+
 $labels['sortby'] = 'Դասավորել';
-$labels['sortasc'] = 'ըստ աճման';
+$labels['sortasc']  = 'ըստ աճման';
 $labels['sortdesc'] = 'ըստ նվազման';
 $labels['undo'] = 'Ետարկել';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Խրիչ';
 $labels['version'] = 'Տարբերակ';
 $labels['source'] = 'Աղբյուր';
 $labels['license'] = 'Արտոնագիր';
 $labels['support'] = 'Ստանալ օգնություն';
+
+// units
 $labels['B'] = 'Բ';
 $labels['KB'] = 'ԿԲ';
 $labels['MB'] = 'ՄԲ';
 $labels['GB'] = 'ԳԲ';
+
+// character sets
 $labels['unicode'] = 'Յունիկոդ';
 $labels['english'] = 'Անգլերեն';
 $labels['westerneuropean'] = 'Արևմտա-Եվրոպական';
@@ -446,3 +533,4 @@ $labels['japanese'] = 'Ճապոնական';
 $labels['korean'] = 'Կորեական';
 $labels['chinese'] = 'Չինական';
 
+?>
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index dfb886c15..bbb083a21 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -2,21 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loading'] = 'Բեռնում...';
-$messages['errortitle'] = 'Սխա՛լ';
-$messages['loginfailed'] = 'Մուտքը ձախողվեց';
+$messages['errortitle']  = 'Սխա՛լ';
+$messages['loginfailed']  = 'Մուտքը ձախողվեց';
 $messages['cookiesdisabled'] = 'Сookies–ների ապահովվումը բացակայում է';
 $messages['sessionerror'] = 'Անվավեր կամ ժամկետանց սեսիա';
 $messages['storageerror'] = 'IMAP սերվերի հետ կապը ձախողվեց';
@@ -27,9 +29,12 @@ $messages['requesttimedout'] = 'Հարցման թույլատրելի ժաման
 $messages['errorreadonly'] = 'Գործողությունը անհնար է։ Պանակը միայն ընթերցման համար է։';
 $messages['errornoperm'] = 'Գործողության կատարման իրավունքը մերժված է։';
 $messages['invalidrequest'] = 'Սխալ հարցում, ապարդյուն։';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Այս փոստարկղում նամակներ չկան';
 $messages['loggedout'] = 'Դուք բարեհաջող ավարտեցիք աշխատանքը։ Ցտեսություն…';
 $messages['mailboxempty'] = 'Փոստարկղը դատարկ է';
+$messages['refreshing'] = 'Refreshing...';
+$messages['loading'] = 'Բեռնում...';
 $messages['uploading'] = 'Ֆայլի վերբեռնում…';
 $messages['uploadingmany'] = 'Վերբեռնվում են ֆայլերը…';
 $messages['loadingdata'] = 'Տվյալների բեռնավորում…';
@@ -55,11 +60,11 @@ $messages['errormoving'] = 'Նամակի տեղափոխման ձախողում';
 $messages['errorcopying'] = 'Հաղորդագրության պատճենումը ձախողվեց։';
 $messages['errordeleting'] = 'Նամակի ջնջման ձախողում';
 $messages['errormarking'] = 'Հաղորդագրության նշումը ձախողվեց։';
-$messages['deletecontactconfirm'] = 'Ուզու՞մ էք ջնջել նշված անձերին';
-$messages['deletegroupconfirm'] = 'Դուք իսկապե՞ս ուզում եք ջնջել նշված խումբը։';
+$messages['deletecontactconfirm']  = 'Ուզու՞մ էք ջնջել նշված անձերին';
+$messages['deletegroupconfirm']  = 'Դուք իսկապե՞ս ուզում եք ջնջել նշված խումբը։';
 $messages['deletemessagesconfirm'] = 'Ուզու՞մ էք ջնջել նշված նամակները';
-$messages['deletefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակը';
-$messages['purgefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակի բոլոր նամակները';
+$messages['deletefolderconfirm']  = 'Ուզու՞մ էք ջնջել այս դարակը';
+$messages['purgefolderconfirm']  = 'Ուզու՞մ էք ջնջել այս դարակի բոլոր նամակները';
 $messages['contactdeleting'] = 'Անձի ջնջում…';
 $messages['groupdeleting'] = 'Խմբի ջնջում…';
 $messages['folderdeleting'] = 'Դարակը ջնջվում է…';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Պանակի բաժանորդագրում…';
 $messages['folderunsubscribing'] = 'Պանակի ապաբաժանորդագրում…';
 $messages['formincomplete'] = 'Ձևը թերի է լրացված';
 $messages['noemailwarning'] = 'Մուտքագրեք ճիշտ էլ. հասցե';
-$messages['nonamewarning'] = 'Մուտքագրեք անուն';
+$messages['nonamewarning']  = 'Մուտքագրեք անուն';
 $messages['nopagesizewarning'] = 'Մուտքագրեք էջի չափս';
 $messages['nosenderwarning'] = 'Մուտքագրեք հասցեատիրոջ հասցեն';
 $messages['norecipientwarning'] = 'Մուտքագրեք նվազագույնը մեկ հասցեատեր';
-$messages['nosubjectwarning'] = 'Վերնագիր բացակայում է, ցանկանո՞ւմ եք լրացնել';
+$messages['nosubjectwarning']  = 'Վերնագիր բացակայում է, ցանկանո՞ւմ եք լրացնել';
 $messages['nobodywarning'] = 'Ուղարկե՞լ այս նամակը դատարկ';
 $messages['notsentwarning'] = 'Նամակն ուղարկված չէ։ Ջնջե՞լ Ձեր նամակը';
 $messages['noldapserver'] = 'Ընտրեք ldap սերվեր որոնման համար';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = 'Ընտրեք ուղարկվող ֆայլը';
 $messages['addresswriterror'] = 'Ընտրված հասցեագիրքը ենթակա չէ փոփոխման';
 $messages['contactaddedtogroup'] = 'Անձինք բարեհաջող ավելացվեցին խմբին։';
 $messages['contactremovedfromgroup'] = 'Անձինք բարեհաջող հանվեցին խմբից։';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Ներկրումն ընթացքի մեջ է...';
-$messages['importerror'] = 'Ներկրումը խափանվեց։ Ներկրված ֆայլը vCard չափաձևի չէ։';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '$inserted նոր ներկրված հասցեներ, $skipped արդեն առկա հասցեներ՝ <p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Բաց թողնվեց $skipped առկա գրառում</b>';
 $messages['opnotpermitted'] = 'Գործողությունը անթույլատրելի է։';
@@ -157,4 +163,7 @@ $messages['invalidimageformat'] = 'Պատկերի սխալ ձևաչափ։';
 $messages['mispellingsfound'] = 'Հաղորդագրության մեջ կան տառասխալներ։';
 $messages['parentnotwritable'] = 'Նշված պանակի մեջ պանակի ստեղծումը կամ տեղափոխումը անհնար է անբավարար իրավունքների պատճառով։';
 $messages['messagetoobig'] = 'Հաղորդագրության մասը չափազանց մեծ է սպասարկման համար։';
+$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/ia/labels.inc b/program/localization/ia/labels.inc
index cae533fe1..fcf5634ff 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -2,48 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvenite a $product';
-$labels['username'] = 'Nomine de usator';
-$labels['password'] = 'Contrasigno';
-$labels['server'] = 'Servitor';
-$labels['login'] = 'Apertura de session';
-$labels['logout'] = 'Clauder session';
-$labels['mail'] = 'E-posta';
+
+// login page
+$labels['welcome']   = 'Benvenite a $product';
+$labels['username']  = 'Nomine de usator';
+$labels['password']  = 'Contrasigno';
+$labels['server']    = 'Servitor';
+$labels['login']     = 'Apertura de session';
+
+// taskbar
+$labels['logout']   = 'Clauder session';
+$labels['mail']     = 'E-posta';
 $labels['settings'] = 'Configurationes';
 $labels['addressbook'] = 'Adressario';
-$labels['inbox'] = 'Cassa de entrata';
-$labels['sent'] = 'Inviate';
+
+// mailbox names
+$labels['inbox']  = 'Cassa de entrata';
+$labels['drafts'] = 'Drafts';
+$labels['sent']   = 'Inviate';
+$labels['trash']  = 'Trash';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Subjecto';
-$labels['from'] = 'Ex';
-$labels['to'] = 'A';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Ex';
+$labels['sender']  = 'Expeditor';
+$labels['to']      = 'A';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder a';
-$labels['date'] = 'Data';
-$labels['size'] = 'Dimension';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Data';
+$labels['size']    = 'Dimension';
 $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organisation';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Dossieres';
-$labels['folders'] = 'Dossieres';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr de $count';
+$labels['fromtoshort'] = '$from – $to de $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a';
 $labels['download'] = 'Discargar';
+$labels['showattachment'] = 'Monstrar';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nomine de file';
 $labels['filesize'] = 'Dimension del file';
+
 $labels['addtoaddressbook'] = 'Adder al adressario';
+
+// weekdays short
 $labels['sun'] = 'dom';
 $labels['mon'] = 'lun';
 $labels['tue'] = 'mar';
@@ -51,233 +80,457 @@ $labels['wed'] = 'mer';
 $labels['thu'] = 'jov';
 $labels['fri'] = 'ven';
 $labels['sat'] = 'sab';
-$labels['sunday'] = 'Dominica';
-$labels['monday'] = 'Lunedi';
-$labels['tuesday'] = 'Martedi';
+
+// weekdays long
+$labels['sunday']    = 'Dominica';
+$labels['monday']    = 'Lunedi';
+$labels['tuesday']   = 'Martedi';
 $labels['wednesday'] = 'Mercuridi';
-$labels['thursday'] = 'Jovedi';
-$labels['friday'] = 'Venerdi';
-$labels['saturday'] = 'Sabbato';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'januario';
-$labels['longfeb'] = 'Februario';
-$labels['longmar'] = 'Martio';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Augusto';
-$labels['longsep'] = 'Septembre';
-$labels['longoct'] = 'Octobre';
-$labels['longnov'] = 'Novembre';
-$labels['longdec'] = 'Decembre';
+$labels['thursday']  = 'Jovedi';
+$labels['friday']    = 'Venerdi';
+$labels['saturday']  = 'Sabbato';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'januario';
+$labels['longfeb']	= 'Februario';
+$labels['longmar']	= 'Martio';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Augusto';
+$labels['longsep']	= 'Septembre';
+$labels['longoct']	= 'Octobre';
+$labels['longnov']	= 'Novembre';
+$labels['longdec']	= 'Decembre';
+
 $labels['today'] = 'Hodie';
-$labels['refresh'] = 'Refrescar';
-$labels['checkmail'] = 'Verificar nove messages';
-$labels['writenewmessage'] = 'Crear un nove message';
-$labels['reply'] = 'Responder';
-$labels['replyall'] = 'Responder a totes';
-$labels['replylist'] = 'Responder a lista';
-$labels['deletemessage'] = 'Deler messsage';
-$labels['printmessage'] = 'Imprimer iste message';
-$labels['viewsource'] = 'Monstrar fonte';
-$labels['mark'] = 'Marcar';
-$labels['markmessages'] = 'Marcar messages';
-$labels['more'] = 'Plus';
-$labels['back'] = 'Retornar';
-$labels['options'] = 'Optiones';
+
+// toolbar buttons
+$labels['refresh']          = 'Refrescar';
+$labels['checkmail']        = 'Verificar nove messages';
+$labels['compose']          = 'Componer';
+$labels['writenewmessage']  = 'Crear un nove message';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Responder a totes';
+$labels['replylist']        = 'Responder a lista';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Deler messsage';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Imprimer iste message';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Monstrar fonte';
+$labels['mark']             = 'Marcar';
+$labels['markmessages']     = 'Marcar messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'Plus';
+$labels['back']             = 'Retornar';
+$labels['options']          = 'Optiones';
+
 $labels['select'] = 'Seliger';
 $labels['all'] = 'Totes';
 $labels['none'] = 'Necun';
-$labels['nonesort'] = 'Necun';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Non legite';
 $labels['flagged'] = 'Marcate';
+$labels['unanswered'] = 'Unanswered';
 $labels['deleted'] = 'Delete';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtro';
 $labels['list'] = 'Lista';
 $labels['threads'] = 'Topicos';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
 $labels['flag'] = 'Marcar';
 $labels['attachment'] = 'Attachamento';
+$labels['nonesort'] = 'Necun';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'Actiones de dossier...';
 $labels['compact'] = 'Compacte';
 $labels['empty'] = 'Vacue';
-$labels['unknown'] = 'incognite';
-$labels['quicksearch'] = 'Cerca rapide';
-$labels['resetsearch'] = 'Reinitialisar cerca';
-$labels['msgtext'] = 'Message complete';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'incognite';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Cerca rapide';
+$labels['resetsearch']  = 'Reinitialisar cerca';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Message complete';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Aperir in nove fenestra';
-$labels['editasnew'] = 'Modificar como nove';
-$labels['sendmessage'] = 'Inviar message';
-$labels['savemessage'] = 'Salveguardar como version provisori';
-$labels['addattachment'] = 'Attachar un file';
-$labels['charset'] = 'Insimul de Characteres';
-$labels['editortype'] = 'Typo de editor';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Modificar como nove';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Inviar message';
+$labels['savemessage']    = 'Salveguardar como version provisori';
+$labels['addattachment']  = 'Attachar un file';
+$labels['charset']        = 'Insimul de Characteres';
+$labels['editortype']     = 'Typo de editor';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Message original';
-$labels['editidents'] = 'Modificar identitates';
-$labels['spellcheck'] = 'Orthographia';
+
+$labels['editidents']    = 'Modificar identitates';
+$labels['spellcheck']    = 'Orthographia';
 $labels['checkspelling'] = 'Verificar orthographia';
+$labels['resumeediting'] = 'Resume editing';
+$labels['revertto']      = 'Revert to';
+
 $labels['attach'] = 'Attachar';
 $labels['attachments'] = 'Attachamentos';
 $labels['upload'] = 'Incargar';
-$labels['close'] = 'Clauder';
-$labels['messageoptions'] = 'Optiones de message...';
-$labels['low'] = 'Basse';
-$labels['lowest'] = 'Minimal';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alte';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Clauder';
+$labels['messageoptions']  = 'Optiones de message...';
+
+$labels['low']     = 'Basse';
+$labels['lowest']  = 'Minimal';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alte';
 $labels['highest'] = 'Maximal';
-$labels['nosubject'] = '(sin subjecto)';
+
+$labels['nosubject']  = '(sin subjecto)';
 $labels['showimages'] = 'Monstrar imagines';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
+$labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto plan';
 $labels['savesentmessagein'] = 'Salveguardar message inviate in';
 $labels['dontsave'] = 'non salveguardar';
 $labels['maxuploadsize'] = 'Le dimension maximal de iste file es $size';
+
 $labels['addcc'] = 'Adder Cc';
 $labels['addbcc'] = 'Adder Bcc';
-$labels['name'] = 'Monstrar nomine';
-$labels['firstname'] = 'Nomine';
-$labels['surname'] = 'Nomine de familia';
-$labels['nameprefix'] = 'Prefixo';
-$labels['nickname'] = 'Pseudonymo';
-$labels['department'] = 'Departimento';
-$labels['gender'] = 'Sexo:';
-$labels['email'] = 'E-posta';
-$labels['phone'] = 'Telephono';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Strata';
-$labels['locality'] = 'Citate';
-$labels['zipcode'] = 'Codice postal';
-$labels['region'] = 'Provincia o stato';
-$labels['country'] = 'Pais';
-$labels['birthday'] = 'Anniversario de nativitate';
-$labels['anniversary'] = 'Anniversario';
-$labels['website'] = 'Sito web';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Monstrar nomine';
+$labels['firstname']    = 'Nomine';
+$labels['surname']      = 'Nomine de familia';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefixo';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Pseudonymo';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Departimento';
+$labels['gender']       = 'Sexo:';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'E-posta';
+$labels['phone']        = 'Telephono';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Strata';
+$labels['locality']     = 'Citate';
+$labels['zipcode']      = 'Codice postal';
+$labels['region']       = 'Provincia o stato';
+$labels['country']      = 'Pais';
+$labels['birthday']     = 'Anniversario de nativitate';
+$labels['anniversary']  = 'Anniversario';
+$labels['website']      = 'Sito web';
 $labels['instantmessenger'] = 'MI';
 $labels['notes'] = 'Notas';
-$labels['male'] = 'masculin';
+$labels['male']   = 'masculin';
 $labels['female'] = 'feminin';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Sposo/a';
 $labels['allfields'] = 'Omne campos';
 $labels['search'] = 'Cercar';
 $labels['advsearch'] = 'Cerca avantiate';
 $labels['advanced'] = 'Avantiate';
 $labels['other'] = 'Altere';
-$labels['typeother'] = 'Altere';
-$labels['typehome'] = 'Domo';
-$labels['typework'] = 'Labor';
-$labels['typemobile'] = 'Mobile';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax de domo';
-$labels['typeworkfax'] = 'Fax de labor';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Pagina principal';
+
+$labels['typehome']   = 'Domo';
+$labels['typework']   = 'Labor';
+$labels['typeother']  = 'Altere';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax de domo';
+$labels['typeworkfax']  = 'Fax de labor';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Pagina principal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profilo';
+
 $labels['addfield'] = 'Adder campo...';
 $labels['addcontact'] = 'Adder nove contacto';
 $labels['editcontact'] = 'Modificar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Proprietates de contacto';
 $labels['personalinfo'] = 'Information personal';
-$labels['edit'] = 'Modificar';
+
+$labels['edit']   = 'Modificar';
 $labels['cancel'] = 'Cancellar';
-$labels['save'] = 'Salveguardar';
+$labels['save']   = 'Salveguardar';
 $labels['delete'] = 'Deler';
 $labels['rename'] = 'Renominar';
 $labels['addphoto'] = 'Adder';
 $labels['replacephoto'] = 'Reimplaciar';
-$labels['newcontact'] = 'Crear un nove carta de contacto';
-$labels['deletecontact'] = 'Deler contactos seligite';
-$labels['print'] = 'Imprimer';
-$labels['export'] = 'Exportar';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Crear un nove carta de contacto';
+$labels['deletecontact']  = 'Deler contactos seligite';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Imprimer';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Crear un nove gruppo de contacto';
-$labels['grouprename'] = 'Renominar gruppo';
-$labels['groupdelete'] = 'Deler gruppo';
+$labels['grouprename']    = 'Renominar gruppo';
+$labels['groupdelete']    = 'Deler gruppo';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
 $labels['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppos';
 $labels['personaladrbook'] = 'Adresses personal';
+
 $labels['searchsave'] = 'Salveguardar cerca';
 $labels['searchdelete'] = 'Deler cerca';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar ex file:';
 $labels['importtarget'] = 'Adder nove contactos al adressario';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Facite';
+
+// settings
 $labels['settingsfor'] = 'Configurationes pro';
 $labels['about'] = 'A proposito';
 $labels['preferences'] = 'Preferentias';
 $labels['userpreferences'] = 'Preferentias de usator';
 $labels['editpreferences'] = 'Modificar preferentias de usator';
+
 $labels['identities'] = 'Identitates';
+$labels['manageidentities'] = 'Manage identities for this account';
 $labels['newidentity'] = 'Nove identitate';
+
 $labels['newitem'] = 'Nove elemento';
 $labels['edititem'] = 'Modificar elemento';
+
 $labels['preferhtml'] = 'Monstrar HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Message HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formato de data';
 $labels['timeformat'] = 'Formato de tempore';
-$labels['setdefault'] = 'Fixar predeterminate';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Lingua';
-$labels['timezone'] = 'Fuso horari';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Fixar predeterminate';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Lingua';
+$labels['timezone']  = 'Fuso horari';
+$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'Signatura';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
+$labels['htmleditor'] = 'Compose HTML messages';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Signatura HTML';
+$labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Apparentia de interfacie';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
 $labels['uisettings'] = 'Interfacie de usator';
 $labels['serversettings'] = 'Configurationes de servitor';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignorar';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'sempre';
-$labels['everynminutes'] = 'cata $n minuta(s)';
-$labels['never'] = 'nunquam';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'cata $n minuta(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nunquam';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Inviar me_ssages';
+$labels['messagescomposition'] = 'Composing Messages';
 $labels['mimeparamfolding'] = 'Nomines de attachamento';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Optiones avantiate';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Optiones principal';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Mantenimento';
 $labels['newmessage'] = 'Nove message';
 $labels['signatureoptions'] = 'Optiones de signatura';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
 $labels['autoaddsignature'] = 'Automaticamente inserta signatura';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insertar signatura';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
 $labels['spellcheckoptions'] = 'Optiones de verification orthographic';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'Adder al dictionario';
-$labels['folder'] = 'Dossier';
-$labels['foldername'] = 'Nomine de dossier';
-$labels['subscribed'] = 'Subscribite';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Dossier';
+$labels['folders']  = 'Dossieres';
+$labels['foldername']  = 'Nomine de dossier';
+$labels['subscribed']  = 'Subscribite';
 $labels['messagecount'] = 'Messages';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear un nove dossier';
-$labels['managefolders'] = 'Gerer le dossieres';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear un nove dossier';
+$labels['managefolders']  = 'Gerer le dossieres';
+$labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'Proprietates';
 $labels['folderproperties'] = 'Proprietates de dossier';
+$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'Location';
 $labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'Typo de dossier';
-$labels['personalfolder'] = 'Dossier private';
-$labels['sharedfolder'] = 'Dossier public';
+$labels['personalfolder']  = 'Dossier private';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Dossier public';
+
 $labels['sortby'] = 'Ordinar per';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licentia';
 $labels['support'] = 'Obtener supporte';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglese';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
 $labels['japanese'] = 'Japonese';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ia/messages.inc b/program/localization/ia/messages.inc
index c08aca3f3..fca8404b2 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -2,40 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/messages.inc                                          |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Initio de session fallite';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Initio de session fallite';
+$messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
+$messages['sessionerror'] = 'Your session is invalid or expired.';
+$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'Error de servitor!';
+$messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'Error de base de datos!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
+$messages['nomessagesfound'] = 'No messages found in this mailbox.';
+$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
+$messages['mailboxempty'] = 'Mailbox is empty.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Cargante ...';
+$messages['uploading'] = 'Uploading file...';
 $messages['uploadingmany'] = 'Incargante files...';
 $messages['loadingdata'] = 'Cargante datos...';
+$messages['checkingmail'] = 'Checking for new messages...';
 $messages['sendingmessage'] = 'Inviante message...';
+$messages['messagesent'] = 'Message sent successfully.';
+$messages['savingmessage'] = 'Saving message...';
+$messages['messagesaved'] = 'Message saved to Drafts.';
 $messages['successfullysaved'] = 'Salveguardate con successo.';
+$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
+$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
+$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
+$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
 $messages['nocontactsfound'] = 'Nulle contactos trovate.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Falleva in inviar le message.';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
+$messages['errorsaving'] = 'An error occured while saving.';
 $messages['errormoving'] = 'Non pote mover le message(s)';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Il non pote deler le message(s).';
-$messages['nonamewarning'] = 'Per favor inserta nomine.';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
+$messages['formincomplete'] = 'The form was not completely filled out.';
+$messages['noemailwarning'] = 'Please enter a valid email address.';
+$messages['nonamewarning']  = 'Per favor inserta nomine.';
+$messages['nopagesizewarning'] = 'Please enter a page size.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
+$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['notsentwarning'] = 'Message has not been sent. Do you want to discard your 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 trovate.';
 $messages['contactsearchsuccessful'] = '$nr contactos trovate.';
+$messages['searchnomatch'] = 'Search returned no matches.';
 $messages['searching'] = 'Cercante...';
 $messages['checking'] = 'A verificar...';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Folder successfully deleted.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Delete con successo.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
 $messages['fileuploaderror'] = 'Incargamento de file falleva.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
 $messages['selectimportfile'] = 'Per favor tu selige le file a incargar.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Adresse de e-mail invalide: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'Le nomine non pote esser vacue.';
 $messages['nametoolong'] = 'Le nomine es troppo longe.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index ce388581e..ae7b5a502 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Selamat datang di $product';
-$labels['username'] = 'Username';
-$labels['password'] = 'Password';
-$labels['server'] = 'Server';
-$labels['login'] = 'Masuk';
-$labels['logout'] = 'Keluar';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Selamat datang di $product';
+$labels['username']  = 'Username';
+$labels['password']  = 'Password';
+$labels['server']    = 'Server';
+$labels['login']     = 'Masuk';
+
+// taskbar
+$labels['logout']   = 'Keluar';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Pengaturan Pribadi';
 $labels['addressbook'] = 'Buku Alamat';
-$labels['inbox'] = 'Kotak Masuk';
+
+// mailbox names
+$labels['inbox']  = 'Kotak Masuk';
 $labels['drafts'] = 'Daftar tunggu';
-$labels['sent'] = 'Terkirim';
-$labels['trash'] = 'Surat Terhapus';
-$labels['junk'] = 'Sampah';
+$labels['sent']   = 'Terkirim';
+$labels['trash']  = 'Surat Terhapus';
+$labels['junk']   = 'Sampah';
+
+// message listing
 $labels['subject'] = 'Judul';
-$labels['from'] = 'Pengirim';
-$labels['to'] = 'Penerima';
-$labels['cc'] = 'Lampiran';
-$labels['bcc'] = 'Lampiran tersembunyi';
+$labels['from']    = 'Pengirim';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Penerima';
+$labels['cc']      = 'Lampiran';
+$labels['bcc']     = 'Lampiran tersembunyi';
 $labels['replyto'] = 'Balas kepada';
 $labels['followupto'] = 'Surat Tindak Lanjut Untuk';
-$labels['date'] = 'Tanggal';
-$labels['size'] = 'Ukuran';
+$labels['date']    = 'Tanggal';
+$labels['size']    = 'Ukuran';
 $labels['priority'] = 'Prioritas';
 $labels['organization'] = 'Organisasi';
 $labels['readstatus'] = 'Status Terbaca';
 $labels['listoptions'] = 'Daftar Pilihan...';
+
 $labels['mailboxlist'] = 'Semua Folder';
-$labels['folders'] = 'Semua Folder';
 $labels['messagesfromto'] = 'Pesan ke $from sampai $to dari $count';
 $labels['threadsfromto'] = 'Untaian ke $from sampai $to dari $count';
 $labels['messagenrof'] = 'Pesan $nr sebanyak $count';
 $labels['fromtoshort'] = '$from - $to dari $count';
-$labels['copy'] = 'Salin';
-$labels['move'] = 'Pindahkan';
-$labels['moveto'] = 'Pindahkan ke...';
+
+$labels['copy']     = 'Salin';
+$labels['move']     = 'Pindahkan';
+$labels['moveto']   = 'Pindahkan ke...';
 $labels['download'] = 'Unduh';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nama berkas';
 $labels['filesize'] = 'Ukuran berkas';
+
 $labels['addtoaddressbook'] = 'Tambah ke Buku Tamu';
+
+// weekdays short
 $labels['sun'] = 'Min';
 $labels['mon'] = 'Sen';
 $labels['tue'] = 'Sel';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Rab';
 $labels['thu'] = 'Kam';
 $labels['fri'] = 'Jum';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Minggu';
-$labels['monday'] = 'Senin';
-$labels['tuesday'] = 'Selasa';
+
+// weekdays long
+$labels['sunday']    = 'Minggu';
+$labels['monday']    = 'Senin';
+$labels['tuesday']   = 'Selasa';
 $labels['wednesday'] = 'Rabu';
-$labels['thursday'] = 'Kamis';
-$labels['friday'] = 'Jumat';
-$labels['saturday'] = 'Sabtu';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ags';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Des';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'Maret';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Agustus';
-$labels['longsep'] = 'Spetember';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Desember';
+$labels['thursday']  = 'Kamis';
+$labels['friday']    = 'Jumat';
+$labels['saturday']  = 'Sabtu';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mei';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ags';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Des';
+
+// months long
+$labels['longjan']	= 'Januari';
+$labels['longfeb']	= 'Februari';
+$labels['longmar']	= 'Maret';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mei';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'Agustus';
+$labels['longsep']	= 'Spetember';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Desember';
+
 $labels['today'] = 'Hari ini';
-$labels['refresh'] = 'Segarkan';
-$labels['checkmail'] = 'Periksa pesan baru';
-$labels['compose'] = 'Tulis sebuah pesan';
-$labels['writenewmessage'] = 'Buat pesan baru';
-$labels['reply'] = 'Balas';
-$labels['replytomessage'] = 'Balas pesan';
+
+// toolbar buttons
+$labels['refresh']          = 'Segarkan';
+$labels['checkmail']        = 'Periksa pesan baru';
+$labels['compose']          = 'Tulis sebuah pesan';
+$labels['writenewmessage']  = 'Buat pesan baru';
+$labels['reply']            = 'Balas';
+$labels['replytomessage']   = 'Balas pesan';
 $labels['replytoallmessage'] = 'Balas ke pengirim dan yang lain';
-$labels['replyall'] = 'Balas ke semua';
-$labels['replylist'] = 'Balas ke milis';
-$labels['forward'] = 'Teruskan';
-$labels['forwardinline'] = 'Teruskan bersama surat';
+$labels['replyall']         = 'Balas ke semua';
+$labels['replylist']        = 'Balas ke milis';
+$labels['forward']          = 'Teruskan';
+$labels['forwardinline']    = 'Teruskan bersama surat';
 $labels['forwardattachment'] = 'Teruskan sebagai sisipan';
-$labels['forwardmessage'] = 'Teruskan pesan';
-$labels['deletemessage'] = 'Hapus pesan';
+$labels['forwardmessage']   = 'Teruskan pesan';
+$labels['deletemessage']    = 'Hapus pesan';
 $labels['movemessagetotrash'] = 'Pindahkan pesan ke tong sampah';
-$labels['printmessage'] = 'Cetak pesan ini';
-$labels['previousmessage'] = 'Perlihatkan pesan sebelumnya';
-$labels['firstmessage'] = 'Perlihatkan pesan pertama';
-$labels['nextmessage'] = 'Perlihatkan pesan berikutnya';
-$labels['lastmessage'] = 'Perlihatkan pesan terakhir';
-$labels['backtolist'] = 'Kembali ke daftar pesan';
-$labels['viewsource'] = 'Perlihatkan kode sumber';
-$labels['mark'] = 'Tandai';
-$labels['markmessages'] = 'Tandai Pesan';
-$labels['markread'] = 'Terbaca';
-$labels['markunread'] = 'Belum Terbaca';
-$labels['markflagged'] = 'Sudah ditandai';
-$labels['markunflagged'] = 'Belum ditandai';
-$labels['moreactions'] = 'Tindakan lain..';
-$labels['more'] = 'Selebihnya';
-$labels['back'] = 'Kembali';
-$labels['options'] = 'Pilihan';
+$labels['printmessage']     = 'Cetak pesan ini';
+$labels['previousmessage']  = 'Perlihatkan pesan sebelumnya';
+$labels['firstmessage']     = 'Perlihatkan pesan pertama';
+$labels['nextmessage']      = 'Perlihatkan pesan berikutnya';
+$labels['lastmessage']      = 'Perlihatkan pesan terakhir';
+$labels['backtolist']       = 'Kembali ke daftar pesan';
+$labels['viewsource']       = 'Perlihatkan kode sumber';
+$labels['mark']             = 'Tandai';
+$labels['markmessages']     = 'Tandai Pesan';
+$labels['markread']         = 'Terbaca';
+$labels['markunread']       = 'Belum Terbaca';
+$labels['markflagged']      = 'Sudah ditandai';
+$labels['markunflagged']    = 'Belum ditandai';
+$labels['moreactions']      = 'Tindakan lain..';
+$labels['more']             = 'Selebihnya';
+$labels['back']             = 'Kembali';
+$labels['options']          = 'Pilihan';
+
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tidak ada';
-$labels['nonesort'] = 'Tidak ada';
 $labels['currpage'] = 'Halaman sekarang';
 $labels['unread'] = 'Belum terbaca';
 $labels['flagged'] = 'Ditandai';
 $labels['unanswered'] = 'Belum terjawab';
 $labels['deleted'] = 'Terhapus';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Sebaliknya';
 $labels['filter'] = 'Penyaringan';
 $labels['list'] = 'Daftar';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'Bentangkan Semua';
 $labels['expand-unread'] = 'Bentangkan yang Belum Terbaca';
 $labels['collapse-all'] = 'Lipat Semua';
 $labels['threaded'] = 'Teruntai';
+
 $labels['autoexpand_threads'] = 'Bentangkan pesan teruntai';
 $labels['do_expand'] = 'semua untaian';
 $labels['expand_only_unread'] = 'hanya pesan yang belum terbaca';
 $labels['fromto'] = 'Pengirim/Penerima';
 $labels['flag'] = 'Bendera';
 $labels['attachment'] = 'Lampiran';
+$labels['nonesort'] = 'Tidak ada';
 $labels['sentdate'] = 'Tanggal kirim';
 $labels['arrival'] = 'Tanggal masuk';
 $labels['asc'] = 'menaik';
@@ -156,174 +187,216 @@ $labels['listcolumns'] = 'Perlihatkan kolom';
 $labels['listsorting'] = 'Mengurutkan kolom';
 $labels['listorder'] = 'Mengurutkan susunan';
 $labels['listmode'] = 'Perlihatkan mode tinjauan';
+
 $labels['folderactions'] = 'Tindakan pada map';
 $labels['compact'] = 'Rampingkan';
 $labels['empty'] = 'Kosong';
+
 $labels['quota'] = 'Penggunaan kandar';
-$labels['unknown'] = 'Tidak dikenal';
-$labels['unlimited'] = 'Tidak terbatas';
-$labels['quicksearch'] = 'Pencarian cepat';
-$labels['resetsearch'] = 'Atur ulang pencarian';
-$labels['searchmod'] = 'Peubah pencarian';
-$labels['msgtext'] = 'Seluruh pesan';
+$labels['unknown']  = 'Tidak dikenal';
+$labels['unlimited']  = 'Tidak terbatas';
+
+$labels['quicksearch']  = 'Pencarian cepat';
+$labels['resetsearch']  = 'Atur ulang pencarian';
+$labels['searchmod']  = 'Peubah pencarian';
+$labels['msgtext']  = 'Seluruh pesan';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
-$labels['editasnew'] = 'Sunting sebagai pesan baru';
-$labels['sendmessage'] = 'Kirim pesan sekarang';
-$labels['savemessage'] = 'Simpan konsep surat  ini';
-$labels['addattachment'] = 'Sisipkan sebuah berkas';
-$labels['charset'] = 'Set karakter';
-$labels['editortype'] = 'Tipe penyunting';
-$labels['returnreceipt'] = 'Tanda terima kembali';
-$labels['dsn'] = 'Pemberitahuan status terkirim';
+
+// message compose
+$labels['editasnew']      = 'Sunting sebagai pesan baru';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Kirim pesan sekarang';
+$labels['savemessage']    = 'Simpan konsep surat  ini';
+$labels['addattachment']  = 'Sisipkan sebuah berkas';
+$labels['charset']        = 'Set karakter';
+$labels['editortype']     = 'Tipe penyunting';
+$labels['returnreceipt']  = 'Tanda terima kembali';
+$labels['dsn']            = 'Pemberitahuan status terkirim';
 $labels['mailreplyintro'] = 'Pada $date, $sender menulis:';
 $labels['originalmessage'] = 'Pesan Sebenarnya';
-$labels['editidents'] = 'Ubah identitas';
-$labels['spellcheck'] = 'Ejaan';
+
+$labels['editidents']    = 'Ubah identitas';
+$labels['spellcheck']    = 'Ejaan';
 $labels['checkspelling'] = 'Pemeriksaan ejaan';
 $labels['resumeediting'] = 'Lanjutkan menyunting';
-$labels['revertto'] = 'Balikkan ke';
+$labels['revertto']      = 'Balikkan ke';
+
 $labels['attach'] = 'Lampirkan';
 $labels['attachments'] = 'Sisipan';
 $labels['upload'] = 'Unggah';
 $labels['uploadprogress'] = '$percent ($current dari $total)';
-$labels['close'] = 'Tutup';
-$labels['messageoptions'] = 'Pilihan pesan...';
-$labels['low'] = 'Rendah';
-$labels['lowest'] = 'Paling Rendah';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Tinggi';
+$labels['close']  = 'Tutup';
+$labels['messageoptions']  = 'Pilihan pesan...';
+
+$labels['low']     = 'Rendah';
+$labels['lowest']  = 'Paling Rendah';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Tinggi';
 $labels['highest'] = 'Paling tinggi';
-$labels['nosubject'] = '(tanpa judul)';
+
+$labels['nosubject']  = '(tanpa judul)';
 $labels['showimages'] = 'Tampilkan gambar';
 $labels['alwaysshow'] = 'Selalu tampilkan gambar dari $sender';
-$labels['isdraft'] = 'Ini adalah konsep surat.';
+$labels['isdraft']    = 'Ini adalah konsep surat.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Teks murni';
 $labels['savesentmessagein'] = 'Simpan pesan terkirim di';
 $labels['dontsave'] = 'Jangan disimpan';
 $labels['maxuploadsize'] = 'Ukuran file maksimal adalah $size';
+
 $labels['addcc'] = 'Tambah Cc';
 $labels['addbcc'] = 'Tambah Bcc';
 $labels['addreplyto'] = 'Tambah Balas Ke';
 $labels['addfollowupto'] = 'Tambahkan Tindak-Lanjut-Ke';
+
+// mdn
 $labels['mdnrequest'] = 'Pengirim pesan ini telah meminta untuk diberitahu ketika Anda membaca pesan ini. Apakah anda ingin memberitahu pengirim?';
 $labels['receiptread'] = 'Tanda Terima (baca)';
 $labels['yourmessage'] = 'Ini adalah Tanda Terima untuk pesan Anda';
 $labels['receiptnote'] = 'Catatan: Tanda Terima ini hanya mengesahkan bahwa pesan telah diperlihatkan pada komputer penerima. Tidak ada jaminan bahwa penerima telah membaca atau mengerti isi pesan.';
-$labels['name'] = 'Tampilkan nama';
-$labels['firstname'] = 'Nama depan';
-$labels['surname'] = 'Nama belakang';
-$labels['middlename'] = 'Nama tengah';
-$labels['nameprefix'] = 'awalan';
-$labels['namesuffix'] = 'sisipan';
-$labels['nickname'] = 'nama kecil';
-$labels['jobtitle'] = 'Jabatan';
-$labels['department'] = 'Departemen';
-$labels['gender'] = 'Jenis kelamin';
-$labels['maidenname'] = 'Nama asli';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telepon';
-$labels['address'] = 'Alamat';
-$labels['street'] = 'Jalan';
-$labels['locality'] = 'Kota';
-$labels['zipcode'] = 'Kode pos';
-$labels['region'] = 'Kecamatan';
-$labels['country'] = 'Negara Bagian';
-$labels['birthday'] = 'Tanggal lahir';
-$labels['anniversary'] = 'Hari jadi';
-$labels['website'] = 'Laman web';
+
+// address boook
+$labels['name']         = 'Tampilkan nama';
+$labels['firstname']    = 'Nama depan';
+$labels['surname']      = 'Nama belakang';
+$labels['middlename']   = 'Nama tengah';
+$labels['nameprefix']   = 'awalan';
+$labels['namesuffix']   = 'sisipan';
+$labels['nickname']     = 'nama kecil';
+$labels['jobtitle']     = 'Jabatan';
+$labels['department']   = 'Departemen';
+$labels['gender']       = 'Jenis kelamin';
+$labels['maidenname']   = 'Nama asli';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telepon';
+$labels['address']      = 'Alamat';
+$labels['street']       = 'Jalan';
+$labels['locality']     = 'Kota';
+$labels['zipcode']      = 'Kode pos';
+$labels['region']       = 'Kecamatan';
+$labels['country']      = 'Negara Bagian';
+$labels['birthday']     = 'Tanggal lahir';
+$labels['anniversary']  = 'Hari jadi';
+$labels['website']      = 'Laman web';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Catatan';
-$labels['male'] = 'pria';
+$labels['male']   = 'pria';
 $labels['female'] = 'wanita';
 $labels['manager'] = 'Menejer';
 $labels['assistant'] = 'Asisten';
-$labels['typeassistant'] = 'Asisten';
 $labels['spouse'] = 'Suami/Istri';
 $labels['allfields'] = 'Semua isian';
 $labels['search'] = 'Cari';
 $labels['advsearch'] = 'Pencarian Lebih Lanjut';
 $labels['advanced'] = 'Tingkat lanjut';
 $labels['other'] = 'Lainnya';
-$labels['typeother'] = 'Lainnya';
-$labels['typehome'] = 'Rumah';
-$labels['typework'] = 'Kantor';
-$labels['typemobile'] = 'HP';
-$labels['typemain'] = 'Utama';
-$labels['typehomefax'] = 'Faks Rumah';
-$labels['typeworkfax'] = 'Faks Kantor';
-$labels['typecar'] = 'Mobil';
-$labels['typepager'] = 'Pejer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Laman Web';
+
+$labels['typehome']   = 'Rumah';
+$labels['typework']   = 'Kantor';
+$labels['typeother']  = 'Lainnya';
+$labels['typemobile']  = 'HP';
+$labels['typemain']  = 'Utama';
+$labels['typehomefax']  = 'Faks Rumah';
+$labels['typeworkfax']  = 'Faks Kantor';
+$labels['typecar']  = 'Mobil';
+$labels['typepager']  = 'Pejer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asisten';
+$labels['typehomepage']  = 'Laman Web';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Tambah kolom isian';
 $labels['addcontact'] = 'Tambah kontak baru';
 $labels['editcontact'] = 'Ubah kontak';
 $labels['contacts'] = 'Daftar kontak';
 $labels['contactproperties'] = 'Properti kontak';
 $labels['personalinfo'] = 'Informasi pribadi';
-$labels['edit'] = 'Ubah';
+
+$labels['edit']   = 'Ubah';
 $labels['cancel'] = 'Batal';
-$labels['save'] = 'Simpan';
+$labels['save']   = 'Simpan';
 $labels['delete'] = 'Hapus';
 $labels['rename'] = 'Ganti nama';
 $labels['addphoto'] = 'Tambah';
 $labels['replacephoto'] = 'Ganti';
 $labels['uploadphoto'] = 'UNggah foto';
-$labels['newcontact'] = 'Buat kartu kontak baru';
-$labels['deletecontact'] = 'Hapus kontak terpilih';
-$labels['composeto'] = 'Tulis surat kepada';
+
+$labels['newcontact']     = 'Buat kartu kontak baru';
+$labels['deletecontact']  = 'Hapus kontak terpilih';
+$labels['composeto']      = 'Tulis surat kepada';
 $labels['contactsfromto'] = 'Kontak $from sampai $to dari $count';
-$labels['print'] = 'Cetak';
-$labels['export'] = 'Ekspor';
-$labels['exportvcards'] = 'Ekspor kontak dalam format vCard';
+$labels['print']          = 'Cetak';
+$labels['export']         = 'Ekspor';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Ekspor kontak dalam format vCard';
 $labels['newcontactgroup'] = 'Buat Grup baru';
-$labels['grouprename'] = 'Ganti nama grup';
-$labels['groupdelete'] = 'Hapus grup';
+$labels['grouprename']    = 'Ganti nama grup';
+$labels['groupdelete']    = 'Hapus grup';
 $labels['groupremoveselected'] = 'Hapus kontak terpilih dari grup';
-$labels['previouspage'] = 'Perlihatkan himpunan sebelumnya';
-$labels['firstpage'] = 'Perlihatkan himpunan pertama';
-$labels['nextpage'] = 'Perlihatkan himpunan selanjutnya';
-$labels['lastpage'] = 'Perlihatkan himpunan terakhir';
+
+$labels['previouspage']   = 'Perlihatkan himpunan sebelumnya';
+$labels['firstpage']      = 'Perlihatkan himpunan pertama';
+$labels['nextpage']       = 'Perlihatkan himpunan selanjutnya';
+$labels['lastpage']       = 'Perlihatkan himpunan terakhir';
+
 $labels['group'] = 'Kelompok';
 $labels['groups'] = 'Kelompok';
 $labels['personaladrbook'] = 'Alamat pribadi';
+
 $labels['searchsave'] = 'Simpan pencarian';
 $labels['searchdelete'] = 'Hapus pencarian';
+
 $labels['import'] = 'Impor';
 $labels['importcontacts'] = 'Impor kontak';
 $labels['importfromfile'] = 'Impor dari berkas:';
 $labels['importtarget'] = 'Tambahkan kontak baru ke buku alamat:';
 $labels['importreplace'] = 'Ganti seluruh buku alamat';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Selesai';
+
+// settings
 $labels['settingsfor'] = 'Pengaturan untuk';
 $labels['about'] = 'Informasi program';
 $labels['preferences'] = 'Pilihan';
 $labels['userpreferences'] = 'Pilihan pengguna';
 $labels['editpreferences'] = 'Ubah pilihan pengguna';
+
 $labels['identities'] = 'Identitas';
 $labels['manageidentities'] = 'Atur identitas untuk akun ini';
 $labels['newidentity'] = 'Identitas baru';
+
 $labels['newitem'] = 'Item baru';
 $labels['edititem'] = 'Ubah item';
+
 $labels['preferhtml'] = 'Lebih suka HTML';
 $labels['defaultcharset'] = 'Default Character';
 $labels['htmlmessage'] = 'Pesan HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Format tanggal';
 $labels['timeformat'] = 'Format waktu';
 $labels['prettydate'] = 'Tanggal Cantik';
-$labels['setdefault'] = 'Pengaturan Awal';
-$labels['autodetect'] = 'Otomatis';
-$labels['language'] = 'Bahasa';
-$labels['timezone'] = 'Daerah Waktu';
-$labels['pagesize'] = 'Baris per halaman';
+$labels['setdefault']  = 'Pengaturan Awal';
+$labels['autodetect']  = 'Otomatis';
+$labels['language']  = 'Bahasa';
+$labels['timezone']  = 'Daerah Waktu';
+$labels['pagesize']  = 'Baris per halaman';
 $labels['signature'] = 'Tanda tangan';
-$labels['dstactive'] = 'Waktu Musim Panas';
+$labels['dstactive']  = 'Waktu Musim Panas';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Tulis pesan HTML';
 $labels['htmlonreply'] = 'balasan untuk pesan HTML saja';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Tandatangan HTML';
 $labels['previewpane'] = 'Unjuk pratinjau';
 $labels['skin'] = 'Tampilan antarmuka';
@@ -347,10 +420,11 @@ $labels['showremoteimages'] = 'Tampilkan remote inline images';
 $labels['fromknownsenders'] = 'dari pengirim yang dikenal';
 $labels['always'] = 'selalu';
 $labels['showinlineimages'] = 'Tampilkan gambar terlampir dibawah pesan';
-$labels['autosavedraft'] = 'Otomatis menyimpan pesan tertunda';
-$labels['everynminutes'] = 'setiap $n menit';
-$labels['never'] = 'tidak pernah';
-$labels['immediately'] = 'secepatnya';
+$labels['autosavedraft']  = 'Otomatis menyimpan pesan tertunda';
+$labels['everynminutes']  = 'setiap $n menit';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'tidak pernah';
+$labels['immediately']  = 'secepatnya';
 $labels['messagesdisplaying'] = 'Penampilan Pesan';
 $labels['messagescomposition'] = 'Pengaturan Pesan';
 $labels['mimeparamfolding'] = 'Nama lampiran';
@@ -370,6 +444,7 @@ $labels['maintenance'] = 'Perbaikan';
 $labels['newmessage'] = 'Pesan baru';
 $labels['signatureoptions'] = 'Opsi tanda tangan';
 $labels['whenreplying'] = 'Ketika membalas';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'Tulis pesan baru diatas pesan asli';
 $labels['replybottomposting'] = 'Tulis pesan baru dibawah pesan asli';
 $labels['replyremovesignature'] = 'ketika membalas pesan hapus tanda tangan dari pesan';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = 'ketika membalas atau meneruskan pesan tambahkan
 $labels['belowquote'] = 'Dibawah kutipan';
 $labels['abovequote'] = 'Diatas kutipan';
 $labels['insertsignature'] = 'Isi tanda tangan';
-$labels['previewpanemarkread'] = 'Tandai pesan yang sudah dilihat';
-$labels['afternseconds'] = 'setelah $n detik';
+$labels['previewpanemarkread']  = 'Tandai pesan yang sudah dilihat';
+$labels['afternseconds']  = 'setelah $n detik';
 $labels['reqmdn'] = 'Selalu meminta tanda terima kembali';
 $labels['reqdsn'] = 'Selalu meminta pemberitahuan status terkirim';
 $labels['replysamefolder'] = 'Taruh balasan di folder yang sama dengan pesan yang dibalas';
-$labels['defaultaddressbook'] = 'Tambahkan kontak baru ke buku alamat terpilih';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Lewatkan alamat email alternatif pada pelengkapan otomatis';
 $labels['listnamedisplay'] = 'Daftar kontak sebagai';
 $labels['spellcheckbeforesend'] = 'Periksa ejaan sebelum mengirimkan pesan';
@@ -395,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Abaikan kata-kata yang bernomor';
 $labels['spellcheckignorecaps'] = 'Abaikan kata-kata dengan huruf besar semua';
 $labels['addtodict'] = 'Tambahkan ke kamus';
 $labels['mailtoprotohandler'] = 'Daftarkan pengampu protokol untuk link mailto:';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Nama folder';
-$labels['subscribed'] = 'Subscribed';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Semua Folder';
+$labels['foldername']  = 'Nama folder';
+$labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Pesan-pesan';
-$labels['create'] = 'Buat';
-$labels['createfolder'] = 'Buat folder baru';
-$labels['managefolders'] = 'Atur folder';
+$labels['create']  = 'Buat';
+$labels['createfolder']  = 'Buat folder baru';
+$labels['managefolders']  = 'Atur folder';
 $labels['specialfolders'] = 'Folder Khusus';
 $labels['properties'] = 'Atribut';
 $labels['folderproperties'] = 'Atribut folder';
@@ -411,22 +491,29 @@ $labels['info'] = 'Informasi';
 $labels['getfoldersize'] = 'Klik untuk mendapatkan ukuran folder';
 $labels['changesubscription'] = 'Klik untuk mengubah langganan';
 $labels['foldertype'] = 'Jenis folder';
-$labels['personalfolder'] = 'Folder pribadi';
-$labels['otherfolder'] = 'Folder lain';
-$labels['sharedfolder'] = 'Folder publik';
+$labels['personalfolder']  = 'Folder pribadi';
+$labels['otherfolder']  = 'Folder lain';
+$labels['sharedfolder']  = 'Folder publik';
+
 $labels['sortby'] = 'Urut berdasarkan';
-$labels['sortasc'] = 'Urut menaik';
+$labels['sortasc']  = 'Urut menaik';
 $labels['sortdesc'] = 'Urut menurun';
 $labels['undo'] = 'Batalkan';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Pengaya';
 $labels['version'] = 'Versi';
 $labels['source'] = 'Sumber';
 $labels['license'] = 'Lisensi';
 $labels['support'] = 'Dukungan';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inggris';
 $labels['westerneuropean'] = 'Eropa Barat';
@@ -446,3 +533,4 @@ $labels['japanese'] = 'Jepang';
 $labels['korean'] = 'Korea';
 $labels['chinese'] = 'Cina';
 
+?>
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index 7ed20754c..7d0d879a2 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -2,33 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Terjadi galat!';
-$messages['loginfailed'] = 'Gagal masuk';
+$messages['errortitle']  = 'Terjadi galat!';
+$messages['loginfailed']  = 'Gagal masuk';
 $messages['cookiesdisabled'] = 'Browser Anda tidak menerima cookies';
 $messages['sessionerror'] = 'Session Anda invalid atau kadaluwarsa';
 $messages['storageerror'] = 'Koneksi ke IMAP server gagal';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'Basis data Error!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Tidak bisa melakukan operasi. Folder hanya bisa dibaca';
 $messages['errornoperm'] = 'Tidak bisa melakukan operasi. Ijin ditolak';
 $messages['invalidrequest'] = 'Permintaan tidak valid! Tidak ada data yang tersimpan.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Surat tidak ditemukan di kotak masuk ini';
 $messages['loggedout'] = 'Anda berhasil mengakhiri session. Selamat Tinggal!';
 $messages['mailboxempty'] = 'Kotak masuk kosong';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Memuat...';
 $messages['uploading'] = 'Menggungah berkas ...';
 $messages['uploadingmany'] = 'Mengunggah berkas-berkas...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = 'Pesan tidak bisa dipindahkan';
 $messages['errorcopying'] = 'Pesan tidak dapat disalin';
 $messages['errordeleting'] = 'Pesan tidak bisa dihapus';
 $messages['errormarking'] = 'Tidak dapat menandai pesan';
-$messages['deletecontactconfirm'] = 'Apakah anda yakin untuk menghapus kontak terpilih?';
-$messages['deletegroupconfirm'] = 'Yakinkah Anda ingin menhapus grup terpilih?';
+$messages['deletecontactconfirm']  = 'Apakah anda yakin untuk menghapus kontak terpilih?';
+$messages['deletegroupconfirm']  = 'Yakinkah Anda ingin menhapus grup terpilih?';
 $messages['deletemessagesconfirm'] = 'Yakin menghapus pesan terpilih?';
-$messages['deletefolderconfirm'] = 'Apakah anda benar-benar ingin menghapus map ini?';
-$messages['purgefolderconfirm'] = 'Yakin menghapus semua pesan pada map ini?';
+$messages['deletefolderconfirm']  = 'Apakah anda benar-benar ingin menghapus map ini?';
+$messages['purgefolderconfirm']  = 'Yakin menghapus semua pesan pada map ini?';
 $messages['contactdeleting'] = 'Menghapus kontak...';
 $messages['groupdeleting'] = 'Menghapus grup...';
 $messages['folderdeleting'] = 'Menghapus map...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Melanggankan folder';
 $messages['folderunsubscribing'] = 'Berhenti melanggankan folder';
 $messages['formincomplete'] = 'Isian tidak terisi semua';
 $messages['noemailwarning'] = 'Tolong masukkan alamat email yang valid';
-$messages['nonamewarning'] = 'Tolong masukkan nama';
+$messages['nonamewarning']  = 'Tolong masukkan nama';
 $messages['nopagesizewarning'] = 'Tolong masukkan ukuran halaman';
 $messages['nosenderwarning'] = 'Mohon memasukkan alamat e-mail pengirim';
 $messages['norecipientwarning'] = 'Tolong masukkan sedikitnya satu penerima';
-$messages['nosubjectwarning'] = '"Judul" kosong. Isi judul sekarang?';
+$messages['nosubjectwarning']  = '"Judul" kosong. Isi judul sekarang?';
 $messages['nobodywarning'] = 'Kirim pesan ini tanpa teks?';
 $messages['notsentwarning'] = 'Pesan belum terkirim. Buang pesan Anda?';
 $messages['noldapserver'] = 'Tolong pilih server LDAP untuk pencarian';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = 'Mohon pilih sebuah berkas untuk diunggah';
 $messages['addresswriterror'] = 'Buku alamat terpilih tidak dapat ditulisi';
 $messages['contactaddedtogroup'] = 'Berhasil menambahkan kontak kedalam grup ini';
 $messages['contactremovedfromgroup'] = 'Berhasil menghapus kontak dari grup ini';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Sedang mengimpor, harap menunggu...';
-$messages['importerror'] = 'Gagal mengimpor! Berkas terunggah bukan berkas vCard yang valid';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Berhasil mengimpor $inserted kontak, $skipped entri dilewati</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>$skipped entri yang sudah ada dilewatkan</b>';
 $messages['opnotpermitted'] = 'Operasi tidak diperbolehkan!';
@@ -157,4 +163,7 @@ $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'] = '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/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index d768050fe..33dc7b6d2 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -2,57 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/is_IS/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkomin í $product';
-$labels['username'] = 'Netfang';
-$labels['password'] = 'Lykilorð';
-$labels['server'] = 'Póstþjónn';
-$labels['login'] = 'Innskrá';
-$labels['logout'] = 'Útskrá';
-$labels['mail'] = 'Tölvupóstur';
+
+// login page
+$labels['welcome']   = 'Velkomin í $product';
+$labels['username']  = 'Netfang';
+$labels['password']  = 'Lykilorð';
+$labels['server']    = 'Póstþjónn';
+$labels['login']     = 'Innskrá';
+
+// taskbar
+$labels['logout']   = 'Útskrá';
+$labels['mail']     = 'Tölvupóstur';
 $labels['settings'] = 'Stillingar';
 $labels['addressbook'] = 'Nafnaskrá';
-$labels['inbox'] = 'Innhólf';
+
+// mailbox names
+$labels['inbox']  = 'Innhólf';
 $labels['drafts'] = 'Drög';
-$labels['sent'] = 'Sent';
-$labels['trash'] = 'Rusl';
-$labels['junk'] = 'Ruslpóstur';
+$labels['sent']   = 'Sent';
+$labels['trash']  = 'Rusl';
+$labels['junk']   = 'Ruslpóstur';
+
+// message listing
 $labels['subject'] = 'Titill';
-$labels['from'] = 'Frá';
-$labels['to'] = 'Til';
-$labels['cc'] = 'Afrit';
-$labels['bcc'] = 'Blint afrit';
+$labels['from']    = 'Frá';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Til';
+$labels['cc']      = 'Afrit';
+$labels['bcc']     = 'Blint afrit';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Svar við';
-$labels['date'] = 'Dagsetning';
-$labels['size'] = 'Stærð';
+$labels['date']    = 'Dagsetning';
+$labels['size']    = 'Stærð';
 $labels['priority'] = 'Forgangur';
 $labels['organization'] = 'Stofnun';
 $labels['readstatus'] = 'Lesmerking';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Möppur';
-$labels['folders'] = 'Möppur';
 $labels['messagesfromto'] = 'Skeyti $from til $to af $count';
 $labels['threadsfromto'] = 'Þræðir $from til $to af $count';
 $labels['messagenrof'] = 'Skeyti $nr af $count';
 $labels['fromtoshort'] = '$from - $to af $count';
-$labels['copy'] = 'Afrit';
-$labels['move'] = 'Færa';
-$labels['moveto'] = 'Færa í...';
+
+$labels['copy']     = 'Afrit';
+$labels['move']     = 'Færa';
+$labels['moveto']   = 'Færa í...';
 $labels['download'] = 'Hlaða niður';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Skráarheiti';
 $labels['filesize'] = 'Skráarstærð';
+
 $labels['addtoaddressbook'] = 'Bæta í nafnaskrá';
+
+// weekdays short
 $labels['sun'] = 'sunn.';
 $labels['mon'] = 'mán.';
 $labels['tue'] = 'þrið.';
@@ -60,79 +80,89 @@ $labels['wed'] = 'miðv.';
 $labels['thu'] = 'fimm.';
 $labels['fri'] = 'föst.';
 $labels['sat'] = 'laug.';
-$labels['sunday'] = 'sunnudagur';
-$labels['monday'] = 'mánudagur';
-$labels['tuesday'] = 'þriðjudagur';
+
+// weekdays long
+$labels['sunday']    = 'sunnudagur';
+$labels['monday']    = 'mánudagur';
+$labels['tuesday']   = 'þriðjudagur';
 $labels['wednesday'] = 'miðvikudagur';
-$labels['thursday'] = 'fimmtudagur';
-$labels['friday'] = 'föstudagur';
-$labels['saturday'] = 'laugardagur';
-$labels['jan'] = 'jan';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'apr';
-$labels['may'] = 'maí';
-$labels['longmay'] = 'maí';
-$labels['jun'] = 'jún';
-$labels['jul'] = 'júl';
-$labels['aug'] = 'ágú';
-$labels['sep'] = 'sep';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nóv';
-$labels['dec'] = 'des';
-$labels['longjan'] = 'janúar';
-$labels['longfeb'] = 'febrúar';
-$labels['longmar'] = 'mars';
-$labels['longapr'] = 'apríl';
-$labels['longjun'] = 'júní';
-$labels['longjul'] = 'júlí';
-$labels['longaug'] = 'ágúst';
-$labels['longsep'] = 'september';
-$labels['longoct'] = 'október';
-$labels['longnov'] = 'nóvember';
-$labels['longdec'] = 'desember';
+$labels['thursday']  = 'fimmtudagur';
+$labels['friday']    = 'föstudagur';
+$labels['saturday']  = 'laugardagur';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'apr';
+$labels['may']	= 'maí';
+$labels['jun']	= 'jún';
+$labels['jul'] 	= 'júl';
+$labels['aug']	= 'ágú';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nóv';
+$labels['dec']	= 'des';
+
+// months long
+$labels['longjan']	= 'janúar';
+$labels['longfeb']	= 'febrúar';
+$labels['longmar']	= 'mars';
+$labels['longapr']	= 'apríl';
+$labels['longmay']	= 'maí';
+$labels['longjun']	= 'júní';
+$labels['longjul']	= 'júlí';
+$labels['longaug']	= 'ágúst';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'október';
+$labels['longnov']	= 'nóvember';
+$labels['longdec']	= 'desember';
+
 $labels['today'] = 'Í dag';
-$labels['refresh'] = 'Endurhlaða';
-$labels['checkmail'] = 'Gá að nýjum skeytum';
-$labels['compose'] = 'Semja skeyti';
-$labels['writenewmessage'] = 'Búa til nýtt skeyti';
-$labels['reply'] = 'Svara';
-$labels['replytomessage'] = 'Svara skeyti';
+
+// toolbar buttons
+$labels['refresh']          = 'Endurhlaða';
+$labels['checkmail']        = 'Gá að nýjum skeytum';
+$labels['compose']          = 'Semja skeyti';
+$labels['writenewmessage']  = 'Búa til nýtt skeyti';
+$labels['reply']            = 'Svara';
+$labels['replytomessage']   = 'Svara skeyti';
 $labels['replytoallmessage'] = 'Svar til lista eða sendanda og allra viðtakenda';
-$labels['replyall'] = 'Svara öllum';
-$labels['replylist'] = 'Svar til lista';
-$labels['forward'] = 'Áframsenda';
-$labels['forwardinline'] = 'Áframsenda innan skeytis';
+$labels['replyall']         = 'Svara öllum';
+$labels['replylist']        = 'Svar til lista';
+$labels['forward']          = 'Áframsenda';
+$labels['forwardinline']    = 'Áframsenda innan skeytis';
 $labels['forwardattachment'] = 'Áframsenda sem viðhengi';
-$labels['forwardmessage'] = 'Áframsenda skeyti';
-$labels['deletemessage'] = 'Eyða skeyti';
+$labels['forwardmessage']   = 'Áframsenda skeyti';
+$labels['deletemessage']    = 'Eyða skeyti';
 $labels['movemessagetotrash'] = 'Færa skeyti í ruslið';
-$labels['printmessage'] = 'Prenta skeyti';
-$labels['previousmessage'] = 'Sýna fyrra skeyti';
-$labels['firstmessage'] = 'Sýna fyrsta skeyti';
-$labels['nextmessage'] = 'Sýna næsta skeyti';
-$labels['lastmessage'] = 'Sýna síðasta skeyti';
-$labels['backtolist'] = 'Til baka í skeytalista';
-$labels['viewsource'] = 'Skoða kóða';
-$labels['mark'] = 'Merki';
-$labels['markmessages'] = 'Merkja skeyti';
-$labels['markread'] = 'Sem lesin';
-$labels['markunread'] = 'Sem ólesin';
-$labels['markflagged'] = 'Sem flögguð';
-$labels['markunflagged'] = 'Sem óflögguð';
-$labels['moreactions'] = 'Fleiri aðgerðir...';
-$labels['more'] = 'Meira';
-$labels['back'] = 'Til baka';
-$labels['options'] = 'Valkostir';
+$labels['printmessage']     = 'Prenta skeyti';
+$labels['previousmessage']  = 'Sýna fyrra skeyti';
+$labels['firstmessage']     = 'Sýna fyrsta skeyti';
+$labels['nextmessage']      = 'Sýna næsta skeyti';
+$labels['lastmessage']      = 'Sýna síðasta skeyti';
+$labels['backtolist']       = 'Til baka í skeytalista';
+$labels['viewsource']       = 'Skoða kóða';
+$labels['mark']             = 'Merki';
+$labels['markmessages']     = 'Merkja skeyti';
+$labels['markread']         = 'Sem lesin';
+$labels['markunread']       = 'Sem ólesin';
+$labels['markflagged']      = 'Sem flögguð';
+$labels['markunflagged']    = 'Sem óflögguð';
+$labels['moreactions']      = 'Fleiri aðgerðir...';
+$labels['more']             = 'Meira';
+$labels['back']             = 'Til baka';
+$labels['options']          = 'Valkostir';
+
 $labels['select'] = 'Velja';
 $labels['all'] = 'Allt';
 $labels['none'] = 'Ekkert';
-$labels['nonesort'] = 'Ekkert';
 $labels['currpage'] = 'Núverandi síða';
 $labels['unread'] = 'Ólesið';
 $labels['flagged'] = 'Flaggað';
 $labels['unanswered'] = 'Ósvarað';
 $labels['deleted'] = 'Eytt';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Umhverfa';
 $labels['filter'] = 'Sía';
 $labels['list'] = 'Listi';
@@ -141,12 +171,14 @@ $labels['expand-all'] = 'Þenja allt út';
 $labels['expand-unread'] = 'Þenja ólesið';
 $labels['collapse-all'] = 'Fella allt saman';
 $labels['threaded'] = 'Þrætt';
+
 $labels['autoexpand_threads'] = 'Þenja skeytaþræði út';
 $labels['do_expand'] = 'allir þræðir';
 $labels['expand_only_unread'] = 'aðeins ólesin skeyti';
 $labels['fromto'] = 'Frá/Til';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Viðhengi';
+$labels['nonesort'] = 'Ekkert';
 $labels['sentdate'] = 'Sendingardagur';
 $labels['arrival'] = 'Komudagur';
 $labels['asc'] = 'hækkandi';
@@ -155,172 +187,216 @@ $labels['listcolumns'] = 'Listadálkar';
 $labels['listsorting'] = 'Röðunardálkur';
 $labels['listorder'] = 'Röðun';
 $labels['listmode'] = 'Listayfirlit';
+
 $labels['folderactions'] = 'Möppuaðgerðir...';
 $labels['compact'] = 'Pakka';
 $labels['empty'] = 'Tæma';
+
 $labels['quota'] = 'Gagnamagn';
-$labels['unknown'] = 'óþekkt';
-$labels['unlimited'] = 'ótakmarkað';
-$labels['quicksearch'] = 'Flýtileit';
-$labels['resetsearch'] = 'Tæma leit';
-$labels['searchmod'] = 'Leitarskilyrði';
-$labels['msgtext'] = 'Allt skeytið';
+$labels['unknown']  = 'óþekkt';
+$labels['unlimited']  = 'ótakmarkað';
+
+$labels['quicksearch']  = 'Flýtileit';
+$labels['resetsearch']  = 'Tæma leit';
+$labels['searchmod']  = 'Leitarskilyrði';
+$labels['msgtext']  = 'Allt skeytið';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Opna í nýjum glugga';
 $labels['emlsave'] = 'Niðurhlaða (.eml)';
-$labels['editasnew'] = 'Breyta sem nýju';
-$labels['sendmessage'] = 'Senda skeytið núna';
-$labels['savemessage'] = 'Vista drög';
-$labels['addattachment'] = 'Hengja við';
-$labels['charset'] = 'Stafasett';
-$labels['editortype'] = 'Gerð ritils';
-$labels['returnreceipt'] = 'Kvittun við lestur';
-$labels['dsn'] = 'Afhendingarstaða';
+
+// message compose
+$labels['editasnew']      = 'Breyta sem nýju';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Senda skeytið núna';
+$labels['savemessage']    = 'Vista drög';
+$labels['addattachment']  = 'Hengja við';
+$labels['charset']        = 'Stafasett';
+$labels['editortype']     = 'Gerð ritils';
+$labels['returnreceipt']  = 'Kvittun við lestur';
+$labels['dsn']            = 'Afhendingarstaða';
 $labels['mailreplyintro'] = 'Þann $date, $sender reit:';
 $labels['originalmessage'] = 'Upprunalegt skeyti';
-$labels['editidents'] = 'Breyta sjálfum';
-$labels['spellcheck'] = 'Stafsetning';
+
+$labels['editidents']    = 'Breyta sjálfum';
+$labels['spellcheck']    = 'Stafsetning';
 $labels['checkspelling'] = 'Athuga stafsetningu';
 $labels['resumeediting'] = 'Aftur í ritham';
-$labels['revertto'] = 'Hverfa til';
+$labels['revertto']      = 'Hverfa til';
+
 $labels['attach'] = 'Viðhengi';
 $labels['attachments'] = 'Viðhengi';
 $labels['upload'] = 'Hlaða upp';
 $labels['uploadprogress'] = '$percent ($current af $total)';
-$labels['close'] = 'Loka';
-$labels['messageoptions'] = 'Skeytisvalmöguleikar...';
-$labels['low'] = 'Lágt';
-$labels['lowest'] = 'Lægst';
-$labels['normal'] = 'Venjulegt';
-$labels['high'] = 'Hátt';
+$labels['close']  = 'Loka';
+$labels['messageoptions']  = 'Skeytisvalmöguleikar...';
+
+$labels['low']     = 'Lágt';
+$labels['lowest']  = 'Lægst';
+$labels['normal']  = 'Venjulegt';
+$labels['high']    = 'Hátt';
 $labels['highest'] = 'Hæst';
-$labels['nosubject'] = '(án titils)';
+
+$labels['nosubject']  = '(án titils)';
 $labels['showimages'] = 'Sýna myndir';
 $labels['alwaysshow'] = 'Sýna alltaf myndir frá $sender';
-$labels['isdraft'] = 'Þetta eru drög að skeyti';
+$labels['isdraft']    = 'Þetta eru drög að skeyti';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Venjulegur texti';
 $labels['savesentmessagein'] = 'Vista send skeyti í';
 $labels['dontsave'] = 'ekki vista';
 $labels['maxuploadsize'] = 'Leyfileg hámarksstærð skjals er $size';
+
 $labels['addcc'] = 'Bæta við Cc';
 $labels['addbcc'] = 'Bæta við Bcc';
 $labels['addreplyto'] = 'Bæta við Reply-To';
 $labels['addfollowupto'] = 'Nýtt svar við';
+
+// mdn
 $labels['mdnrequest'] = 'Sendandi þessa skeytið hefur óskað þess að þú látir vita að þú hafir lesið þetta skeyti. Viltu láta hann vita?';
 $labels['receiptread'] = 'Kvittun (lesa)';
 $labels['yourmessage'] = 'Þetta er kvittun fyrir skeytið';
 $labels['receiptnote'] = 'ATH: Þessi kvittun segir aðeins til um að skeytið kom upp á skjánum á viðtakanda. Það er engin sönnun um að hann hafi lesið eða skilið innihaldið.';
-$labels['name'] = 'Skjánafn';
-$labels['firstname'] = 'Eiginnafn';
-$labels['surname'] = 'Eftirnafn';
-$labels['middlename'] = 'Millinafn';
-$labels['nameprefix'] = 'Forskeyti';
-$labels['namesuffix'] = 'Viðskeyti';
-$labels['nickname'] = 'Stuttnefni';
-$labels['jobtitle'] = 'Starfstitill';
-$labels['department'] = 'Deild';
-$labels['gender'] = 'Kyn';
-$labels['maidenname'] = 'Ættarnafn móður';
-$labels['email'] = 'Netfang';
-$labels['phone'] = 'Sími';
-$labels['address'] = 'Heimilisfang';
-$labels['street'] = 'Götuheiti';
-$labels['locality'] = 'Staður';
-$labels['zipcode'] = 'Póstnúmer';
-$labels['region'] = 'Ríki/Fylki';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Afmælisdagur';
-$labels['anniversary'] = 'Afmæli';
-$labels['website'] = 'Vefur';
+
+// address boook
+$labels['name']         = 'Skjánafn';
+$labels['firstname']    = 'Eiginnafn';
+$labels['surname']      = 'Eftirnafn';
+$labels['middlename']   = 'Millinafn';
+$labels['nameprefix']   = 'Forskeyti';
+$labels['namesuffix']   = 'Viðskeyti';
+$labels['nickname']     = 'Stuttnefni';
+$labels['jobtitle']     = 'Starfstitill';
+$labels['department']   = 'Deild';
+$labels['gender']       = 'Kyn';
+$labels['maidenname']   = 'Ættarnafn móður';
+$labels['email']        = 'Netfang';
+$labels['phone']        = 'Sími';
+$labels['address']      = 'Heimilisfang';
+$labels['street']       = 'Götuheiti';
+$labels['locality']     = 'Staður';
+$labels['zipcode']      = 'Póstnúmer';
+$labels['region']       = 'Ríki/Fylki';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Afmælisdagur';
+$labels['anniversary']  = 'Afmæli';
+$labels['website']      = 'Vefur';
 $labels['instantmessenger'] = 'Spjall';
 $labels['notes'] = 'Glósur';
-$labels['male'] = 'karlkyns';
+$labels['male']   = 'karlkyns';
 $labels['female'] = 'kvenkyns';
 $labels['manager'] = 'Stjórnandi';
 $labels['assistant'] = 'Aðstoðarmaður';
-$labels['typeassistant'] = 'Aðstoðarmaður';
 $labels['spouse'] = 'Maki';
 $labels['allfields'] = 'Öll svæði';
 $labels['search'] = 'Leit';
 $labels['advsearch'] = 'Ítarleg leit';
 $labels['advanced'] = 'Flóknari stillingar';
 $labels['other'] = 'Annað';
-$labels['typeother'] = 'Annað';
-$labels['typehome'] = 'Heimamappa';
-$labels['typework'] = 'Vinnusími';
-$labels['typemobile'] = 'Farsími';
-$labels['typemain'] = 'Aðalstillingar';
-$labels['typehomefax'] = 'Heimafax';
-$labels['typeworkfax'] = 'Vinnufax';
-$labels['typecar'] = 'Bíll';
-$labels['typepager'] = 'Friðþjófur';
-$labels['typevideo'] = 'Myndband';
-$labels['typehomepage'] = 'Vefur';
+
+$labels['typehome']   = 'Heimamappa';
+$labels['typework']   = 'Vinnusími';
+$labels['typeother']  = 'Annað';
+$labels['typemobile']  = 'Farsími';
+$labels['typemain']  = 'Aðalstillingar';
+$labels['typehomefax']  = 'Heimafax';
+$labels['typeworkfax']  = 'Vinnufax';
+$labels['typecar']  = 'Bíll';
+$labels['typepager']  = 'Friðþjófur';
+$labels['typevideo']  = 'Myndband';
+$labels['typeassistant']  = 'Aðstoðarmaður';
+$labels['typehomepage']  = 'Vefur';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Mannlýsing';
+
 $labels['addfield'] = 'Bæta við svæði...';
 $labels['addcontact'] = 'Nýr tengiliður';
 $labels['editcontact'] = 'Lagfæra';
 $labels['contacts'] = 'Tengiliðir';
 $labels['contactproperties'] = 'Eiginleikar';
 $labels['personalinfo'] = 'Persónulegar upplýsingar';
-$labels['edit'] = 'Breyta';
+
+$labels['edit']   = 'Breyta';
 $labels['cancel'] = 'Hætta við';
-$labels['save'] = 'Vista';
+$labels['save']   = 'Vista';
 $labels['delete'] = 'Eyða';
 $labels['rename'] = 'Endurnefna';
 $labels['addphoto'] = 'Bæta við';
 $labels['replacephoto'] = 'Skipta út';
-$labels['newcontact'] = 'Búa til nýtt nafnspjald';
-$labels['deletecontact'] = 'Eyða völdum tengiliðum';
-$labels['composeto'] = 'Skrifa skeyti til';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Búa til nýtt nafnspjald';
+$labels['deletecontact']  = 'Eyða völdum tengiliðum';
+$labels['composeto']      = 'Skrifa skeyti til';
 $labels['contactsfromto'] = 'Netföng $from til $to af $count';
-$labels['print'] = 'Prenta';
-$labels['export'] = 'Flytja út';
-$labels['exportvcards'] = 'Flytja út nafnspjöld á vCard formi';
+$labels['print']          = 'Prenta';
+$labels['export']         = 'Flytja út';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Flytja út nafnspjöld á vCard formi';
 $labels['newcontactgroup'] = 'Nýr tengiliðahópur';
-$labels['grouprename'] = 'Breyta nafni hóps';
-$labels['groupdelete'] = 'Fjarlægja hóp';
-$labels['previouspage'] = 'Sýna fyrri síðu';
-$labels['firstpage'] = 'Sýna fyrstu síðu';
-$labels['nextpage'] = 'Sýna næstu síðu';
-$labels['lastpage'] = 'Sýna síðustu síðu';
+$labels['grouprename']    = 'Breyta nafni hóps';
+$labels['groupdelete']    = 'Fjarlægja hóp';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Sýna fyrri síðu';
+$labels['firstpage']      = 'Sýna fyrstu síðu';
+$labels['nextpage']       = 'Sýna næstu síðu';
+$labels['lastpage']       = 'Sýna síðustu síðu';
+
 $labels['group'] = 'Hópur';
 $labels['groups'] = 'Hópar';
 $labels['personaladrbook'] = 'Persónuleg heimilisföng';
+
 $labels['searchsave'] = 'Vista leit';
 $labels['searchdelete'] = 'Eyða leit';
+
 $labels['import'] = 'Flytja inn';
 $labels['importcontacts'] = 'Flytja inn nafnspjöld';
 $labels['importfromfile'] = 'Flytja inn af skrá';
 $labels['importtarget'] = 'Bæta nýjum tengiliðum við:';
 $labels['importreplace'] = 'Skipta út allri netfangaskránni';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Búið';
+
+// settings
 $labels['settingsfor'] = 'Stillingar fyrir';
 $labels['about'] = 'Um forritið';
 $labels['preferences'] = 'Stillingar';
 $labels['userpreferences'] = 'Notendastillingar';
 $labels['editpreferences'] = 'Breyta notendastillingum';
+
 $labels['identities'] = 'Auðkenni';
 $labels['manageidentities'] = 'Stjórna auðkennum þessa reiknings';
 $labels['newidentity'] = 'Nýtt auðkenni';
+
 $labels['newitem'] = 'Nýtt';
 $labels['edititem'] = 'Breyta';
+
 $labels['preferhtml'] = 'Vil HTML';
 $labels['defaultcharset'] = 'Venjulegt stafasett';
 $labels['htmlmessage'] = 'HTML skeyti';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Snið dagsetningar';
 $labels['timeformat'] = 'Tímasnið';
 $labels['prettydate'] = 'Fallegar dagsetningar';
-$labels['setdefault'] = 'Gera sjálfgilt';
-$labels['autodetect'] = 'Sjálfvirkt';
-$labels['language'] = 'Tungumál';
-$labels['timezone'] = 'Tímabelti';
-$labels['pagesize'] = 'Línur á síðu';
+$labels['setdefault']  = 'Gera sjálfgilt';
+$labels['autodetect']  = 'Sjálfvirkt';
+$labels['language']  = 'Tungumál';
+$labels['timezone']  = 'Tímabelti';
+$labels['pagesize']  = 'Línur á síðu';
 $labels['signature'] = 'Undirskrift';
-$labels['dstactive'] = 'Sumar-/vetratími';
+$labels['dstactive']  = 'Sumar-/vetratími';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Skrifa HTML-skeyti';
 $labels['htmlonreply'] = 'sem svar við HTML-skeytum aðeins';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML-undirskrift';
 $labels['previewpane'] = 'Sýna forskoðunarglugga';
 $labels['skin'] = 'Sniðmát á viðmóti';
@@ -339,14 +415,16 @@ $labels['readwhendeleted'] = 'Merkja skeyti sem lesið þegar því er hent';
 $labels['flagfordeletion'] = 'Merkja skeyti til eyðingar í stað þess að eyða';
 $labels['skipdeleted'] = 'Ekki sýna eydd skeyti';
 $labels['deletealways'] = 'Ef ekki er hægt að setja skeytið í ruslafötuna, henda þeim';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Sýna myndir annarsstaðar frá';
 $labels['fromknownsenders'] = 'frá þekktum sendendum';
 $labels['always'] = 'alltaf';
 $labels['showinlineimages'] = 'Sýna viðhangandi myndir fyrir neðan skeytið';
-$labels['autosavedraft'] = 'Vista sjálfkrafa sem drög';
-$labels['everynminutes'] = '$n mínútu fresti';
-$labels['never'] = 'aldrei';
-$labels['immediately'] = 'samstundis';
+$labels['autosavedraft']  = 'Vista sjálfkrafa sem drög';
+$labels['everynminutes']  = '$n mínútu fresti';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'aldrei';
+$labels['immediately']  = 'samstundis';
 $labels['messagesdisplaying'] = 'Sýni skeyti';
 $labels['messagescomposition'] = 'Semja skeyti';
 $labels['mimeparamfolding'] = 'Nafn á viðhengjum';
@@ -360,11 +438,13 @@ $labels['checkallfolders'] = 'Athuga ný skeyti í öllum möppum';
 $labels['displaynext'] = 'Að eyðingu/færslu lokinni sýna næsta skeyti';
 $labels['defaultfont'] = 'Sjálfgefið letur HTML-skeyta';
 $labels['mainoptions'] = 'Aðalstillingar';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Hluti';
 $labels['maintenance'] = 'Viðhald';
 $labels['newmessage'] = 'Nýtt skeyti';
 $labels['signatureoptions'] = 'Valkostir undirskriftar';
 $labels['whenreplying'] = 'Þegar svarað';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'hefja nýtt skeyti fyrir ofan eldra';
 $labels['replybottomposting'] = 'hefja nýtt skeyti undir eldra';
 $labels['replyremovesignature'] = 'Þegar svarað fjarlægja upphaflega undirskrift úr skeyti';
@@ -375,12 +455,12 @@ $labels['replysignaturepos'] = 'Þegar skeytum er svarað eða áframsend setja
 $labels['belowquote'] = 'undir tilvitnun';
 $labels['abovequote'] = 'fyrir ofan tilvitnun';
 $labels['insertsignature'] = 'Bæta undirskrift við';
-$labels['previewpanemarkread'] = 'Merka forskoðuð skeyti sem lesin';
-$labels['afternseconds'] = 'eftir $n sekúndur';
+$labels['previewpanemarkread']  = 'Merka forskoðuð skeyti sem lesin';
+$labels['afternseconds']  = 'eftir $n sekúndur';
 $labels['reqmdn'] = 'Biðja ávallt um kvittun';
 $labels['reqdsn'] = 'Biðja ávallt um sendingarstöðu';
 $labels['replysamefolder'] = 'Setja svarskeyti í möppu sem upphaflegt skeyti er í';
-$labels['defaultaddressbook'] = 'Bæta nýjum tengiliðum við valda netfangaskrá';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Sleppa aukanetföngum í sjálfklárun';
 $labels['listnamedisplay'] = 'Lista tengiliði sem';
 $labels['spellcheckbeforesend'] = 'Athuga stafsetningu áður en skeyti er sent';
@@ -389,13 +469,19 @@ $labels['spellcheckignoresyms'] = 'Hunsa orð með merki';
 $labels['spellcheckignorenums'] = 'Hunsa orð með tölum';
 $labels['spellcheckignorecaps'] = 'Hunsa orð sem eru í hástöfum';
 $labels['addtodict'] = 'Bæta við orðalista';
-$labels['folder'] = 'Mappa';
-$labels['foldername'] = 'Nafn möppu';
-$labels['subscribed'] = 'Valin';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Mappa';
+$labels['folders']  = 'Möppur';
+$labels['foldername']  = 'Nafn möppu';
+$labels['subscribed']  = 'Valin';
 $labels['messagecount'] = 'Skeyti';
-$labels['create'] = 'Búa til';
-$labels['createfolder'] = 'Búa til nýja möppu';
-$labels['managefolders'] = 'Sýsla með möppur';
+$labels['create']  = 'Búa til';
+$labels['createfolder']  = 'Búa til nýja möppu';
+$labels['managefolders']  = 'Sýsla með möppur';
 $labels['specialfolders'] = 'Sérstakar möppur';
 $labels['properties'] = 'Eiginleikar';
 $labels['folderproperties'] = 'Eiginleikar möppu';
@@ -405,22 +491,29 @@ $labels['info'] = 'Upplýsingar';
 $labels['getfoldersize'] = 'Smelltu til að sjá stærð möppu';
 $labels['changesubscription'] = 'Smelltu til að breyta áskrift';
 $labels['foldertype'] = 'Möpputegund';
-$labels['personalfolder'] = 'Einkamappa';
-$labels['otherfolder'] = 'Möppur annara notenda';
-$labels['sharedfolder'] = 'Opin mappa';
+$labels['personalfolder']  = 'Einkamappa';
+$labels['otherfolder']  = 'Möppur annara notenda';
+$labels['sharedfolder']  = 'Opin mappa';
+
 $labels['sortby'] = 'Raða eftir';
-$labels['sortasc'] = 'Raða vaxandi';
+$labels['sortasc']  = 'Raða vaxandi';
 $labels['sortdesc'] = 'Raða minnkandi';
 $labels['undo'] = 'Taka til baka';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Viðbætur';
 $labels['version'] = 'Útgáfa';
 $labels['source'] = 'Uppruni';
 $labels['license'] = 'Notkunarleyfi';
 $labels['support'] = 'Fá aðstoð';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Enska';
 $labels['westerneuropean'] = 'Vesturevrópskt';
@@ -440,3 +533,4 @@ $labels['japanese'] = 'Japanskt';
 $labels['korean'] = 'Kóreska';
 $labels['chinese'] = 'Kínverska';
 
+?>
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index 5705e55cb..530e8008f 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -2,58 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/is_IS/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Innskráning mistókst';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Innskráning mistókst';
 $messages['cookiesdisabled'] = 'Vafrinn þinn vill ekki taka við kökum (cookies)';
 $messages['sessionerror'] = 'Innskráningin þín ógild eða útrunnin';
 $messages['storageerror'] = 'Tengin við IMAP-miðlara mistókst';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Engin skeyti eru í þessu pósthólfi';
 $messages['loggedout'] = 'Þú hefur útskráðst. Bless!';
 $messages['mailboxempty'] = 'Pósthólfið er tómt';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Hleð...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Hleð gögn...';
 $messages['checkingmail'] = 'Gái að nýjum skeytum...';
+$messages['sendingmessage'] = 'Sending message...';
 $messages['messagesent'] = 'Skeyti var sent';
 $messages['savingmessage'] = 'Vista skeyti...';
 $messages['messagesaved'] = 'Skeytið vistað í Drög';
 $messages['successfullysaved'] = 'Vistun heppnaðist!';
 $messages['addedsuccessfully'] = 'Netfangi var bætt í netfangaskrá';
 $messages['contactexists'] = 'Þetta netfang er þegar skráð í netfangaskrána';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Til verndar hafa allar myndir í þessu skeyti verið blokkaðar.';
 $messages['encryptedmessage'] = 'Þetta er dulkóðað skeyti og því miður er ekki hægt að birta það';
 $messages['nocontactsfound'] = 'Engin netföng';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Sending misheppnaðist';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Villa kom upp þegar var verið að vista';
 $messages['errormoving'] = 'Gat ekki fært skeytið';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Gat ekki eytt skeytinu';
-$messages['deletecontactconfirm'] = 'Ertu viss um að þú viljir eyða völdum netföngum?';
-$messages['deletefolderconfirm'] = 'Ertu viss um að vilja eyða þessari möppu?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ertu viss um að þú viljir eyða völdum netföngum?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Ertu viss um að vilja eyða þessari möppu?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Formið var ekki fyllt út að fullu';
 $messages['noemailwarning'] = 'Sláðu inn gildt netfang';
-$messages['nonamewarning'] = 'Sláðu inn nafn';
+$messages['nonamewarning']  = 'Sláðu inn nafn';
 $messages['nopagesizewarning'] = 'Sláðu inn síðustærð';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Í það minnsta einn viðtakandi verður að vera';
-$messages['nosubjectwarning'] = 'Efnislínan er tóm. Viltu slá eitthvað inn í hana?';
+$messages['nosubjectwarning']  = 'Efnislínan er tóm. Viltu slá eitthvað inn í hana?';
 $messages['nobodywarning'] = 'Viltu senda tómt skeyti?';
 $messages['notsentwarning'] = 'Skeytið hefur ekki verið send. Viltu henda skeytinu?';
 $messages['noldapserver'] = 'Please select an ldap server to search';
 $messages['nosearchname'] = 'Sláðu inn nafn eða netfang';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr skeyti fundust';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Leit skilaði engu';
 $messages['searching'] = 'Leita...';
 $messages['checking'] = 'Gái...';
 $messages['nospellerrors'] = 'Engar innsláttarvillur fundust';
 $messages['folderdeleted'] = 'Möppu var eytt';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
+$messages['fileuploaderror'] = 'File upload failed.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 3d78df5c7..2f8442f18 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvenuto in $product';
-$labels['username'] = 'Utente';
-$labels['password'] = 'Password';
-$labels['server'] = 'Server';
-$labels['login'] = 'Entra';
-$labels['logout'] = 'Esci';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Benvenuto in $product';
+$labels['username']  = 'Utente';
+$labels['password']  = 'Password';
+$labels['server']    = 'Server';
+$labels['login']     = 'Entra';
+
+// taskbar
+$labels['logout']   = 'Esci';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Impostazioni';
 $labels['addressbook'] = 'Rubrica';
-$labels['inbox'] = 'Posta in arrivo';
+
+// mailbox names
+$labels['inbox']  = 'Posta in arrivo';
 $labels['drafts'] = 'Bozze';
-$labels['sent'] = 'Inviata';
-$labels['trash'] = 'Cestino';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Inviata';
+$labels['trash']  = 'Cestino';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Oggetto';
-$labels['from'] = 'Mittente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Mittente';
+$labels['sender']  = 'Mittente';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Rispondi a';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Dimensione';
+$labels['date']    = 'Data';
+$labels['size']    = 'Dimensione';
 $labels['priority'] = 'Priorità';
 $labels['organization'] = 'Società';
 $labels['readstatus'] = 'Visualizza lo stato';
 $labels['listoptions'] = 'Elenco opzioni...';
+
 $labels['mailboxlist'] = 'Cartelle';
-$labels['folders'] = 'Cartelle';
 $labels['messagesfromto'] = 'Messaggi da $from a $to di $count';
 $labels['threadsfromto'] = 'Thread da $from a $to di $count';
 $labels['messagenrof'] = 'Messaggio $nr di $count';
 $labels['fromtoshort'] = '$from – $to di $count';
-$labels['copy'] = 'Copia';
-$labels['move'] = 'Sposta';
-$labels['moveto'] = 'Sposta in...';
+
+$labels['copy']     = 'Copia';
+$labels['move']     = 'Sposta';
+$labels['moveto']   = 'Sposta in...';
 $labels['download'] = 'Download';
+$labels['showattachment'] = 'Visualizza';
+$labels['showanyway'] = 'Visualizza comunque';
+
 $labels['filename'] = 'Nome file';
 $labels['filesize'] = 'Dimensione file';
+
 $labels['addtoaddressbook'] = 'Aggiungi alla rubrica';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -61,74 +80,83 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Gio';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Domenica';
-$labels['monday'] = 'Lunedì';
-$labels['tuesday'] = 'Martedì';
+
+// weekdays long
+$labels['sunday']    = 'Domenica';
+$labels['monday']    = 'Lunedì';
+$labels['tuesday']   = 'Martedì';
 $labels['wednesday'] = 'Mercoledì';
-$labels['thursday'] = 'Giovedì';
-$labels['friday'] = 'Venerdì';
-$labels['saturday'] = 'Sabato';
-$labels['jan'] = 'Gen';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maggio';
-$labels['longmay'] = 'Maggio';
-$labels['jun'] = 'Giu';
-$labels['jul'] = 'Lug';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Ott';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dic';
-$labels['longjan'] = 'Gennaio';
-$labels['longfeb'] = 'Febbraio';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Aprile';
-$labels['longjun'] = 'Giugno';
-$labels['longjul'] = 'Luglio';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Settembre';
-$labels['longoct'] = 'Ottobre';
-$labels['longnov'] = 'Novembre';
-$labels['longdec'] = 'Dicembre';
+$labels['thursday']  = 'Giovedì';
+$labels['friday']    = 'Venerdì';
+$labels['saturday']  = 'Sabato';
+
+// months short
+$labels['jan']	= 'Gen';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maggio';
+$labels['jun']	= 'Giu';
+$labels['jul'] 	= 'Lug';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Ott';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dic';
+
+// months long
+$labels['longjan']	= 'Gennaio';
+$labels['longfeb']	= 'Febbraio';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Aprile';
+$labels['longmay']	= 'Maggio';
+$labels['longjun']	= 'Giugno';
+$labels['longjul']	= 'Luglio';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Settembre';
+$labels['longoct']	= 'Ottobre';
+$labels['longnov']	= 'Novembre';
+$labels['longdec']	= 'Dicembre';
+
 $labels['today'] = 'Oggi';
-$labels['refresh'] = 'Aggiorna';
-$labels['checkmail'] = 'Controlla nuovi messaggi';
-$labels['compose'] = 'Scrivi un messaggio';
-$labels['writenewmessage'] = 'Scrivi un nuovo messaggio';
-$labels['reply'] = 'Rispondi';
-$labels['replytomessage'] = 'Rispondi al mittente';
+
+// toolbar buttons
+$labels['refresh']          = 'Aggiorna';
+$labels['checkmail']        = 'Controlla nuovi messaggi';
+$labels['compose']          = 'Scrivi un messaggio';
+$labels['writenewmessage']  = 'Scrivi un nuovo messaggio';
+$labels['reply']            = 'Rispondi';
+$labels['replytomessage']   = 'Rispondi al mittente';
 $labels['replytoallmessage'] = 'Rispondi al mittente e ai destinatari';
-$labels['replyall'] = 'Rispondi a tutti';
-$labels['replylist'] = 'Rispondi alla mailing list';
-$labels['forward'] = 'Inoltra';
-$labels['forwardinline'] = 'Inoltra come messaggio';
+$labels['replyall']         = 'Rispondi a tutti';
+$labels['replylist']        = 'Rispondi alla mailing list';
+$labels['forward']          = 'Inoltra';
+$labels['forwardinline']    = 'Inoltra come messaggio';
 $labels['forwardattachment'] = 'Inoltre come allegato';
-$labels['forwardmessage'] = 'Inoltra il messaggio';
-$labels['deletemessage'] = 'Elimina il messaggio';
+$labels['forwardmessage']   = 'Inoltra il messaggio';
+$labels['deletemessage']    = 'Elimina il messaggio';
 $labels['movemessagetotrash'] = 'Sposta il messaggio nel cestino';
-$labels['printmessage'] = 'Stampa il messaggio';
-$labels['previousmessage'] = 'Visualizza il messaggio precedente';
-$labels['firstmessage'] = 'Visualizza il primo messaggio';
-$labels['nextmessage'] = 'Visualizza il messaggio successivo';
-$labels['lastmessage'] = 'Visualizza l\'ultimo messaggio';
-$labels['backtolist'] = 'Torna alla lista messaggi';
-$labels['viewsource'] = 'Visualizza sorgente messaggio';
-$labels['mark'] = 'Contrassegna';
-$labels['markmessages'] = 'Marca i messaggi';
-$labels['markread'] = 'Letti';
-$labels['markunread'] = 'Non letti';
-$labels['markflagged'] = 'Contrassegnato';
-$labels['markunflagged'] = 'Non contrassegnato';
-$labels['moreactions'] = 'Altre operazioni...';
-$labels['more'] = 'Di più';
-$labels['back'] = 'Indietro';
-$labels['options'] = 'Opzioni';
+$labels['printmessage']     = 'Stampa il messaggio';
+$labels['previousmessage']  = 'Visualizza il messaggio precedente';
+$labels['firstmessage']     = 'Visualizza il primo messaggio';
+$labels['nextmessage']      = 'Visualizza il messaggio successivo';
+$labels['lastmessage']      = 'Visualizza l\'ultimo messaggio';
+$labels['backtolist']       = 'Torna alla lista messaggi';
+$labels['viewsource']       = 'Visualizza sorgente messaggio';
+$labels['mark']             = 'Contrassegna';
+$labels['markmessages']     = 'Marca i messaggi';
+$labels['markread']         = 'Letti';
+$labels['markunread']       = 'Non letti';
+$labels['markflagged']      = 'Contrassegnato';
+$labels['markunflagged']    = 'Non contrassegnato';
+$labels['moreactions']      = 'Altre operazioni...';
+$labels['more']             = 'Di più';
+$labels['back']             = 'Indietro';
+$labels['options']          = 'Opzioni';
+
 $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
-$labels['nonesort'] = 'Nessuno';
 $labels['currpage'] = 'Pagina corrente';
 $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnato';
@@ -143,12 +171,14 @@ $labels['expand-all'] = 'Espandi tutto';
 $labels['expand-unread'] = 'Espandi non letti';
 $labels['collapse-all'] = 'Richiudi tutti';
 $labels['threaded'] = 'Per argomenti';
+
 $labels['autoexpand_threads'] = 'Espandi';
 $labels['do_expand'] = 'tutti i thread';
 $labels['expand_only_unread'] = 'solo con messaggi non letti';
 $labels['fromto'] = 'Mittente/Destinatario';
 $labels['flag'] = 'Contrassegnato';
 $labels['attachment'] = 'Allegato';
+$labels['nonesort'] = 'Nessuno';
 $labels['sentdate'] = 'Data d\'invio';
 $labels['arrival'] = 'Data di arrivo';
 $labels['asc'] = 'Ascendente';
@@ -157,175 +187,211 @@ $labels['listcolumns'] = 'Elenco Colonne';
 $labels['listsorting'] = 'Ordina per';
 $labels['listorder'] = 'Ordinamento';
 $labels['listmode'] = 'Modalità di visualizzazione';
+
 $labels['folderactions'] = 'Operazioni cartella';
 $labels['compact'] = 'Compatta';
 $labels['empty'] = 'Svuota';
+
 $labels['quota'] = 'Spazio utilizzato';
-$labels['unknown'] = 'sconosciuto';
-$labels['unlimited'] = 'illimitato';
-$labels['quicksearch'] = 'Ricerca veloce';
-$labels['resetsearch'] = 'Annulla ricerca';
-$labels['searchmod'] = 'Ambito di ricerca';
-$labels['msgtext'] = 'Intero messaggio';
+$labels['unknown']  = 'sconosciuto';
+$labels['unlimited']  = 'illimitato';
+
+$labels['quicksearch']  = 'Ricerca veloce';
+$labels['resetsearch']  = 'Annulla ricerca';
+$labels['searchmod']  = 'Ambito di ricerca';
+$labels['msgtext']  = 'Intero messaggio';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
-$labels['editasnew'] = 'Modifica come nuovo';
-$labels['send'] = 'Invia';
-$labels['sendmessage'] = 'Invia il messaggio adesso';
-$labels['savemessage'] = 'Salva come bozza';
-$labels['addattachment'] = 'Allega un file';
-$labels['charset'] = 'Set di caratteri';
-$labels['editortype'] = 'Tipo editor';
-$labels['returnreceipt'] = 'Ricevuta di ritorno';
-$labels['dsn'] = 'Notifica di consegna';
+
+// message compose
+$labels['editasnew']      = 'Modifica come nuovo';
+$labels['send']           = 'Invia';
+$labels['sendmessage']    = 'Invia il messaggio adesso';
+$labels['savemessage']    = 'Salva come bozza';
+$labels['addattachment']  = 'Allega un file';
+$labels['charset']        = 'Set di caratteri';
+$labels['editortype']     = 'Tipo editor';
+$labels['returnreceipt']  = 'Ricevuta di ritorno';
+$labels['dsn']            = 'Notifica di consegna';
 $labels['mailreplyintro'] = 'Il $date $sender ha scritto:';
 $labels['originalmessage'] = 'Messaggio originale';
-$labels['editidents'] = 'Modifica identità';
-$labels['spellcheck'] = 'Controllo ortografico';
+
+$labels['editidents']    = 'Modifica identità';
+$labels['spellcheck']    = 'Controllo ortografico';
 $labels['checkspelling'] = 'Controlla ortografia';
 $labels['resumeediting'] = 'Torna al messaggio';
-$labels['revertto'] = 'Ripristina';
+$labels['revertto']      = 'Ripristina';
+
 $labels['attach'] = 'Allega';
 $labels['attachments'] = 'Allegati';
 $labels['upload'] = 'Aggiungi';
 $labels['uploadprogress'] = '$percent ($current di $total)';
-$labels['close'] = 'Chiudi';
-$labels['messageoptions'] = 'Opzioni messaggi...';
-$labels['low'] = 'Bassa';
-$labels['lowest'] = 'Molto bassa';
-$labels['normal'] = 'Normale';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Chiudi';
+$labels['messageoptions']  = 'Opzioni messaggi...';
+
+$labels['low']     = 'Bassa';
+$labels['lowest']  = 'Molto bassa';
+$labels['normal']  = 'Normale';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Molto alta';
-$labels['nosubject'] = '(nessun oggetto)';
+
+$labels['nosubject']  = '(nessun oggetto)';
 $labels['showimages'] = 'Visualizza immagini';
 $labels['alwaysshow'] = 'Mostra sempre immagini da $sender';
-$labels['isdraft'] = 'Questa è una bozza.';
-$labels['andnmore'] = 'ancora $nr...';
+$labels['isdraft']    = 'Questa è una bozza.';
+$labels['andnmore']   = 'ancora $nr...';
 $labels['togglemoreheaders'] = 'Mostra più intestazioni dei messaggi';
+$labels['togglefullheaders'] = 'Visualizza header raw';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testo semplice';
 $labels['savesentmessagein'] = 'Salva i messaggi inviati in';
 $labels['dontsave'] = 'non salvare';
 $labels['maxuploadsize'] = 'La dimensione massima consentita è $size';
+
 $labels['addcc'] = 'Aggiungi Cc';
 $labels['addbcc'] = 'Aggiungi Bcc';
 $labels['addreplyto'] = 'Aggiungi Rispondi a';
 $labels['addfollowupto'] = 'Aggiungi Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Il mittente ha richiesto di ricevere una notifica dell\'avvenuta lettura del messaggio. Si desidera inviare tale notifica?';
 $labels['receiptread'] = 'Ricevuta di ritorno (letto)';
 $labels['yourmessage'] = 'Questa è la ricevuta di ritorno del messaggio inviato';
 $labels['receiptnote'] = 'Nota: questa Ricevuta di ritorno attesta solamente che il messaggio è stato visualizzato nel computer del destinatario. Non c\'è pertanto alcuna garanzia che il destinatario abbia letto o compreso il suo contenuto.';
-$labels['name'] = 'Nome visualizzato';
-$labels['firstname'] = 'Nome';
-$labels['surname'] = 'Cognome';
-$labels['middlename'] = 'Secondo nome';
-$labels['nameprefix'] = 'Prefisso';
-$labels['namesuffix'] = 'Suffisso';
-$labels['nickname'] = 'Soprannome';
-$labels['jobtitle'] = 'Titolo';
-$labels['department'] = 'Dipartimento';
-$labels['gender'] = 'Sesso';
-$labels['maidenname'] = 'Cognome da nubile';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefono';
-$labels['address'] = 'Indirizzo';
-$labels['street'] = 'Via';
-$labels['locality'] = 'Città';
-$labels['zipcode'] = 'CAP';
-$labels['region'] = 'Regione';
-$labels['country'] = 'Stato';
-$labels['birthday'] = 'Compleanno';
-$labels['anniversary'] = 'Anniversario';
-$labels['website'] = 'Sito web';
+
+// address boook
+$labels['name']         = 'Nome visualizzato';
+$labels['firstname']    = 'Nome';
+$labels['surname']      = 'Cognome';
+$labels['middlename']   = 'Secondo nome';
+$labels['nameprefix']   = 'Prefisso';
+$labels['namesuffix']   = 'Suffisso';
+$labels['nickname']     = 'Soprannome';
+$labels['jobtitle']     = 'Titolo';
+$labels['department']   = 'Dipartimento';
+$labels['gender']       = 'Sesso';
+$labels['maidenname']   = 'Cognome da nubile';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefono';
+$labels['address']      = 'Indirizzo';
+$labels['street']       = 'Via';
+$labels['locality']     = 'Città';
+$labels['zipcode']      = 'CAP';
+$labels['region']       = 'Regione';
+$labels['country']      = 'Stato';
+$labels['birthday']     = 'Compleanno';
+$labels['anniversary']  = 'Anniversario';
+$labels['website']      = 'Sito web';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Note';
-$labels['male'] = 'maschio';
+$labels['male']   = 'maschio';
 $labels['female'] = 'femmina';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Coniuge';
 $labels['allfields'] = 'Tutti i campi';
 $labels['search'] = 'Ricerca';
 $labels['advsearch'] = 'Ricerca avanzata';
 $labels['advanced'] = 'Opzioni avanzate';
 $labels['other'] = 'Altro';
-$labels['typeother'] = 'Altro';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Lavoro';
-$labels['typemobile'] = 'Cellulare';
-$labels['typemain'] = 'Principale';
-$labels['typehomefax'] = 'Fax casa';
-$labels['typeworkfax'] = 'Fax lavoro';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Teledrin';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Home page';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Lavoro';
+$labels['typeother']  = 'Altro';
+$labels['typemobile']  = 'Cellulare';
+$labels['typemain']  = 'Principale';
+$labels['typehomefax']  = 'Fax casa';
+$labels['typeworkfax']  = 'Fax lavoro';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Teledrin';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Home page';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profilo';
+
 $labels['addfield'] = 'Aggiungi campo...';
 $labels['addcontact'] = 'Aggiungi contatto alla rubrica';
 $labels['editcontact'] = 'Modifica contatto';
 $labels['contacts'] = 'Contatti';
 $labels['contactproperties'] = 'Proprietà contatto';
 $labels['personalinfo'] = 'Informazioni personali';
-$labels['edit'] = 'Modifica';
+
+$labels['edit']   = 'Modifica';
 $labels['cancel'] = 'Annulla';
-$labels['save'] = 'Salva';
+$labels['save']   = 'Salva';
 $labels['delete'] = 'Elimina';
 $labels['rename'] = 'Rinomina';
 $labels['addphoto'] = 'Aggiungi';
 $labels['replacephoto'] = 'Sostituisci';
 $labels['uploadphoto'] = 'Carica foto';
-$labels['newcontact'] = 'Crea un nuovo contatto';
-$labels['deletecontact'] = 'Elimina i contatti selezionati';
-$labels['composeto'] = 'Invia email a';
+
+$labels['newcontact']     = 'Crea un nuovo contatto';
+$labels['deletecontact']  = 'Elimina i contatti selezionati';
+$labels['composeto']      = 'Invia email a';
 $labels['contactsfromto'] = 'Contatti da $from a $to di $count';
-$labels['print'] = 'Stampa';
-$labels['export'] = 'Esporta';
-$labels['exportvcards'] = 'Esporta i contatti in formato vCard';
+$labels['print']          = 'Stampa';
+$labels['export']         = 'Esporta';
+$labels['exportall']      = 'Esporta tutto';
+$labels['exportsel']      = 'Esporta selezionati';
+$labels['exportvcards']   = 'Esporta i contatti in formato vCard';
 $labels['newcontactgroup'] = 'Crea un nuovo gruppo';
-$labels['grouprename'] = 'Rinomina il gruppo';
-$labels['groupdelete'] = 'Cancella il gruppo';
+$labels['grouprename']    = 'Rinomina il gruppo';
+$labels['groupdelete']    = 'Cancella il gruppo';
 $labels['groupremoveselected'] = 'Rimuovi i contatti selezionati dal gruppo';
-$labels['previouspage'] = 'Pagina precedente';
-$labels['firstpage'] = 'Prima pagina';
-$labels['nextpage'] = 'Pagina successiva';
-$labels['lastpage'] = 'Ultima pagina';
+
+$labels['previouspage']   = 'Pagina precedente';
+$labels['firstpage']      = 'Prima pagina';
+$labels['nextpage']       = 'Pagina successiva';
+$labels['lastpage']       = 'Ultima pagina';
+
 $labels['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppi';
 $labels['personaladrbook'] = 'Rubrica Personale';
+
 $labels['searchsave'] = 'Salva ricerca';
 $labels['searchdelete'] = 'Elimina ricerca';
+
 $labels['import'] = 'Importa';
 $labels['importcontacts'] = 'Importa contatti';
 $labels['importfromfile'] = 'Importa da file:';
 $labels['importtarget'] = 'Aggiungi nuovi contattu alla rubrica:';
 $labels['importreplace'] = 'Sostituisci l\'intera rubrica';
+$labels['importdesc'] = 'Puoi caricare i contatti da una rubrica esistente.<br/>Attualmente si possono importare contatti in formato  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (comma-separated).';
 $labels['done'] = 'Fatto';
+
+// settings
 $labels['settingsfor'] = 'Impostazioni per';
 $labels['about'] = 'Informazioni';
 $labels['preferences'] = 'Preferenze';
 $labels['userpreferences'] = 'Preferenze utente';
 $labels['editpreferences'] = 'Modifica le preferenze per l\'utente';
+
 $labels['identities'] = 'Identità';
 $labels['manageidentities'] = 'Gestisci le identità per questo account';
 $labels['newidentity'] = 'Nuova identità';
+
 $labels['newitem'] = 'Nuovo elemento';
 $labels['edititem'] = 'Modifica elemento';
+
 $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Set di caratteri predefinito';
 $labels['htmlmessage'] = 'Messaggio HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Firma digitale';
 $labels['dateformat'] = 'Formato data';
 $labels['timeformat'] = 'Formato orario';
 $labels['prettydate'] = 'Date più leggibili';
-$labels['setdefault'] = 'Imposta predefinita';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Lingua';
-$labels['timezone'] = 'Fuso orario';
-$labels['pagesize'] = 'Righe per pagina';
+$labels['setdefault']  = 'Imposta predefinita';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Lingua';
+$labels['timezone']  = 'Fuso orario';
+$labels['pagesize']  = 'Righe per pagina';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Gestione ora legale';
+$labels['dstactive']  = 'Gestione ora legale';
 $labels['showinextwin'] = 'Apri il messaggio in una nuova finestra';
 $labels['composeextwin'] = 'Crea messaggio in una nuova finestra';
 $labels['htmleditor'] = 'Scrivi i messaggi in HTML';
@@ -354,10 +420,11 @@ $labels['showremoteimages'] = 'Mostra immagini remote contenute nel messaggio';
 $labels['fromknownsenders'] = 'da mittenti conosciuti';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra immagini allegate sotto il messaggio';
-$labels['autosavedraft'] = 'Salva le bozze automaticamente';
-$labels['everynminutes'] = 'ogni $n minuto(i)';
-$labels['never'] = 'mai';
-$labels['immediately'] = 'immediatamente';
+$labels['autosavedraft']  = 'Salva le bozze automaticamente';
+$labels['everynminutes']  = 'ogni $n minuto(i)';
+$labels['refreshinterval']  = 'Aggiorna (controlla nuovi messaggi, ecc.)';
+$labels['never']  = 'mai';
+$labels['immediately']  = 'immediatamente';
 $labels['messagesdisplaying'] = 'Visualizzazione Messaggi';
 $labels['messagescomposition'] = 'Composizione Messaggi';
 $labels['mimeparamfolding'] = 'Nomi allegati';
@@ -388,12 +455,12 @@ $labels['replysignaturepos'] = 'In risposta o inoltro, posiziona la firma';
 $labels['belowquote'] = 'sotto la citazione';
 $labels['abovequote'] = 'sopra la citazione';
 $labels['insertsignature'] = 'Inserisci firma';
-$labels['previewpanemarkread'] = 'Segna i messagi in anteprima come letti';
-$labels['afternseconds'] = 'dopo $n secondi';
+$labels['previewpanemarkread']  = 'Segna i messagi in anteprima come letti';
+$labels['afternseconds']  = 'dopo $n secondi';
 $labels['reqmdn'] = 'Richiedi sempre la ricevuta di ritorno';
 $labels['reqdsn'] = 'Richiedi sempre la notifica di consegna';
 $labels['replysamefolder'] = 'Salva risposta nella cartella del messaggio a cui si risponde';
-$labels['defaultaddressbook'] = 'Aggiungi nuovi contatti alla rubrica selezionata';
+$labels['defaultabook'] = 'Rubrica predefinita';
 $labels['autocompletesingle'] = 'Non considerare gli indirizzi secondari nell\'autocompletamento';
 $labels['listnamedisplay'] = 'Elenca contatti come';
 $labels['spellcheckbeforesend'] = 'Esegui il controllo ortografico prima di inviare un messaggio';
@@ -406,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Registra gestore per mailto:';
 $labels['forwardmode'] = 'Inoltro messaggi';
 $labels['inline'] = 'In linea';
 $labels['asattachment'] = 'come allegato';
-$labels['folder'] = 'Cartella';
-$labels['foldername'] = 'Nome cartella';
-$labels['subscribed'] = 'Sottoscritta';
+
+$labels['folder']  = 'Cartella';
+$labels['folders']  = 'Cartelle';
+$labels['foldername']  = 'Nome cartella';
+$labels['subscribed']  = 'Sottoscritta';
 $labels['messagecount'] = 'Messaggi';
-$labels['create'] = 'Crea';
-$labels['createfolder'] = 'Crea nuova cartella';
-$labels['managefolders'] = 'Gestione cartelle';
+$labels['create']  = 'Crea';
+$labels['createfolder']  = 'Crea nuova cartella';
+$labels['managefolders']  = 'Gestione cartelle';
 $labels['specialfolders'] = 'Cartelle Speciali';
 $labels['properties'] = 'Proprietà';
 $labels['folderproperties'] = 'Proprietà cartella';
@@ -422,22 +491,29 @@ $labels['info'] = 'Informazioni';
 $labels['getfoldersize'] = 'Click per la dimensione della cartella';
 $labels['changesubscription'] = 'Click per cambiare sottoscrizione';
 $labels['foldertype'] = 'Tipo di cartella';
-$labels['personalfolder'] = 'Cartella privata';
-$labels['otherfolder'] = 'Cartella di un altro utente';
-$labels['sharedfolder'] = 'Cartella pubblica';
+$labels['personalfolder']  = 'Cartella privata';
+$labels['otherfolder']  = 'Cartella di un altro utente';
+$labels['sharedfolder']  = 'Cartella pubblica';
+
 $labels['sortby'] = 'Ordina per';
-$labels['sortasc'] = 'Ordinamento crescente';
+$labels['sortasc']  = 'Ordinamento crescente';
 $labels['sortdesc'] = 'Ordinamento decrescente';
 $labels['undo'] = 'Annulla';
+
+$labels['installedplugins'] = 'Plugin Installati';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versione';
 $labels['source'] = 'Sorgente';
 $labels['license'] = 'Licenza';
 $labels['support'] = 'Ottieni supporto';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglese';
 $labels['westerneuropean'] = 'Europa occidentale';
@@ -457,3 +533,4 @@ $labels['japanese'] = 'Giapponese';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Cinese';
 
+?>
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index b1b972676..66c248e74 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'C\'è stato qualche errore';
-$messages['loginfailed'] = 'Impossibile accedere. Utente o password non corretti';
+$messages['errortitle']  = 'C\'è stato qualche errore';
+$messages['loginfailed']  = 'Impossibile accedere. Utente o password non corretti';
 $messages['cookiesdisabled'] = 'Il tuo browser non accetta i cookies';
 $messages['sessionerror'] = 'Sessione non valida o scaduta';
 $messages['storageerror'] = 'Impossibile connettersi al server IMAP';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Nome del server non valido.';
 $messages['nomessagesfound'] = 'Nessun messaggio trovato in questa cartella';
 $messages['loggedout'] = 'Sessione chiusa correttamente. Arrivederci!';
 $messages['mailboxempty'] = 'La casella è vuota';
+$messages['refreshing'] = 'Aggiornamento...';
 $messages['loading'] = 'Caricamento...';
 $messages['uploading'] = 'Caricamento file...';
 $messages['uploadingmany'] = 'Caricamento file...';
@@ -56,11 +60,11 @@ $messages['errormoving'] = 'Impossibile spostare il messaggio';
 $messages['errorcopying'] = 'Impossibile copiare il messaggio';
 $messages['errordeleting'] = 'Impossibile eliminare il messaggio';
 $messages['errormarking'] = 'Impossibile segnare il messaggio';
-$messages['deletecontactconfirm'] = 'Sei sicuro di voler eliminare i contatti selezionati?';
-$messages['deletegroupconfirm'] = 'Sei sicuro di voler eliminare i gruppi selezionati?';
+$messages['deletecontactconfirm']  = 'Sei sicuro di voler eliminare i contatti selezionati?';
+$messages['deletegroupconfirm']  = 'Sei sicuro di voler eliminare i gruppi selezionati?';
 $messages['deletemessagesconfirm'] = 'Sei sicuro di voler eliminare i messaggi selezionati?';
-$messages['deletefolderconfirm'] = 'Sei sicuro di voler eliminare la cartella selezionata?';
-$messages['purgefolderconfirm'] = 'Sei sicuro di voler eliminare tutti i messaggi in questa cartella?';
+$messages['deletefolderconfirm']  = 'Sei sicuro di voler eliminare la cartella selezionata?';
+$messages['purgefolderconfirm']  = 'Sei sicuro di voler eliminare tutti i messaggi in questa cartella?';
 $messages['contactdeleting'] = 'Eliminazione contatti...';
 $messages['groupdeleting'] = 'Eliminazione gruppo...';
 $messages['folderdeleting'] = 'Eliminazione cartella...';
@@ -69,11 +73,11 @@ $messages['foldersubscribing'] = 'Sottoscrizione cartella...';
 $messages['folderunsubscribing'] = 'Cancellazione sottoscrizzione cartella...';
 $messages['formincomplete'] = 'Per favore, compila tutti i campi';
 $messages['noemailwarning'] = 'Per favore, immetti un indirizzo e-mail valido';
-$messages['nonamewarning'] = 'Per favore, immetti un nome';
+$messages['nonamewarning']  = 'Per favore, immetti un nome';
 $messages['nopagesizewarning'] = 'Per favore, immetti il numero di righe per pagina';
 $messages['nosenderwarning'] = 'Per favore, inserisci l\'indirizzo e-mail del mittente';
 $messages['norecipientwarning'] = 'Per favore, immetti almeno un destinatario';
-$messages['nosubjectwarning'] = 'L\'oggetto è vuoto. Vuoi inserirlo adesso?';
+$messages['nosubjectwarning']  = 'L\'oggetto è vuoto. Vuoi inserirlo adesso?';
 $messages['nobodywarning'] = 'Inviare il messaggio senza testo?';
 $messages['notsentwarning'] = 'Il messaggio non è stato inviato. Vuoi annullare questo messaggio?';
 $messages['noldapserver'] = 'Per favore, scegli un server LDAP in cui ricercare';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Contatto aggiunto con successo al gruppo';
 $messages['contactremovedfromgroup'] = 'Contatto rimosso con successo dal gruppo';
 $messages['nogroupassignmentschanged'] = 'Nessun assegnamento del gruppo è stato cambiato.';
 $messages['importwait'] = 'Importazione in corso, attendere...';
+$messages['importformaterror'] = 'Importazione fallita! Il file caricato non è un file valido per l\'importazione.';
 $messages['importconfirm'] = '<b>$inserted contatti importati con successo</p>';
 $messages['importconfirmskipped'] = '<b>$skipped ignorati perché esistono già</b>';
 $messages['opnotpermitted'] = 'Operazione non consentita!';
@@ -158,4 +163,7 @@ $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.';
 
+?>
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index bdefe85b7..46f6fad28 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$productにようこそ';
-$labels['username'] = 'ユーザー名';
-$labels['password'] = 'パスワード';
-$labels['server'] = 'サーバー';
-$labels['login'] = 'ログイン';
-$labels['logout'] = 'ログアウト';
-$labels['mail'] = '電子メール';
+
+// login page
+$labels['welcome']   = '$productにようこそ';
+$labels['username']  = 'ユーザー名';
+$labels['password']  = 'パスワード';
+$labels['server']    = 'サーバー';
+$labels['login']     = 'ログイン';
+
+// taskbar
+$labels['logout']   = 'ログアウト';
+$labels['mail']     = '電子メール';
 $labels['settings'] = '設定';
 $labels['addressbook'] = 'アドレス帳';
-$labels['inbox'] = '受信箱';
+
+// mailbox names
+$labels['inbox']  = '受信箱';
 $labels['drafts'] = '下書き';
-$labels['sent'] = '送信済み';
-$labels['trash'] = 'ごみ箱';
-$labels['junk'] = '迷惑メール';
+$labels['sent']   = '送信済み';
+$labels['trash']  = 'ごみ箱';
+$labels['junk']   = '迷惑メール';
+
+// message listing
 $labels['subject'] = '件名';
-$labels['from'] = '発信者';
-$labels['to'] = '宛先';
-$labels['cc'] = '写し(Cc)';
-$labels['bcc'] = '隠した写し(Bcc)';
+$labels['from']    = '発信者';
+$labels['sender']  = '送信者';
+$labels['to']      = '宛先';
+$labels['cc']      = '写し(Cc)';
+$labels['bcc']     = '隠した写し(Bcc)';
 $labels['replyto'] = '返信先';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = '日付';
-$labels['size'] = '大きさ';
+$labels['date']    = '日付';
+$labels['size']    = '大きさ';
 $labels['priority'] = '優先度';
 $labels['organization'] = '企業名';
 $labels['readstatus'] = '閲覧の状態';
 $labels['listoptions'] = '一覧のオプション...';
+
 $labels['mailboxlist'] = 'フォルダー';
-$labels['folders'] = 'フォルダー';
 $labels['messagesfromto'] = '$count通の$from通目から$to通目のメッセージ';
 $labels['threadsfromto'] = '$count通の$from通目から$to通目のスレッド';
 $labels['messagenrof'] = '$count通の$nr通目のメッセージ';
 $labels['fromtoshort'] = '$count通の$from通目から$to通目';
-$labels['copy'] = 'コピー';
-$labels['move'] = '移動';
-$labels['moveto'] = 'フォルダーに移動';
+
+$labels['copy']     = 'コピー';
+$labels['move']     = '移動';
+$labels['moveto']   = 'フォルダーに移動';
 $labels['download'] = 'ダウンロード';
 $labels['showattachment'] = '表示';
 $labels['showanyway'] = 'とにかく表示';
+
 $labels['filename'] = 'ファイル名';
 $labels['filesize'] = 'ファイルの大きさ';
+
 $labels['addtoaddressbook'] = 'アドレス帳に追加';
+
+// weekdays short
 $labels['sun'] = '日';
 $labels['mon'] = '月';
 $labels['tue'] = '火';
@@ -63,74 +80,83 @@ $labels['wed'] = '水';
 $labels['thu'] = '木';
 $labels['fri'] = '金';
 $labels['sat'] = '土';
-$labels['sunday'] = '日曜日';
-$labels['monday'] = '月曜日';
-$labels['tuesday'] = '火曜日';
+
+// weekdays long
+$labels['sunday']    = '日曜日';
+$labels['monday']    = '月曜日';
+$labels['tuesday']   = '火曜日';
 $labels['wednesday'] = '水曜日';
-$labels['thursday'] = '木曜日';
-$labels['friday'] = '金曜日';
-$labels['saturday'] = '土曜日';
-$labels['jan'] = '1月';
-$labels['feb'] = '2月';
-$labels['mar'] = '3月';
-$labels['apr'] = '4月';
-$labels['may'] = '5月';
-$labels['longmay'] = '5月';
-$labels['jun'] = '6月';
-$labels['jul'] = '7月';
-$labels['aug'] = '8月';
-$labels['sep'] = '9月';
-$labels['oct'] = '10月';
-$labels['nov'] = '11月';
-$labels['dec'] = '12月';
-$labels['longjan'] = '1月';
-$labels['longfeb'] = '2月';
-$labels['longmar'] = '3月';
-$labels['longapr'] = '4月';
-$labels['longjun'] = '6月';
-$labels['longjul'] = '7月';
-$labels['longaug'] = '8月';
-$labels['longsep'] = '9月';
-$labels['longoct'] = '10月';
-$labels['longnov'] = '11月';
-$labels['longdec'] = '12月';
+$labels['thursday']  = '木曜日';
+$labels['friday']    = '金曜日';
+$labels['saturday']  = '土曜日';
+
+// months short
+$labels['jan']	= '1月';
+$labels['feb']	= '2月';
+$labels['mar']	= '3月';
+$labels['apr']	= '4月';
+$labels['may']	= '5月';
+$labels['jun']	= '6月';
+$labels['jul'] 	= '7月';
+$labels['aug']	= '8月';
+$labels['sep']	= '9月';
+$labels['oct']	= '10月';
+$labels['nov']	= '11月';
+$labels['dec']	= '12月';
+
+// months long
+$labels['longjan']	= '1月';
+$labels['longfeb']	= '2月';
+$labels['longmar']	= '3月';
+$labels['longapr']	= '4月';
+$labels['longmay']	= '5月';
+$labels['longjun']	= '6月';
+$labels['longjul']	= '7月';
+$labels['longaug']	= '8月';
+$labels['longsep']	= '9月';
+$labels['longoct']	= '10月';
+$labels['longnov']	= '11月';
+$labels['longdec']	= '12月';
+
 $labels['today'] = '今日';
-$labels['refresh'] = '再読込み';
-$labels['checkmail'] = '新しく届いたメッセージを確認';
-$labels['compose'] = 'メッセージの作成';
-$labels['writenewmessage'] = '新しいメッセージを作成';
-$labels['reply'] = '返信';
-$labels['replytomessage'] = '送信者に返信';
+
+// toolbar buttons
+$labels['refresh']          = '再読込み';
+$labels['checkmail']        = '新しく届いたメッセージを確認';
+$labels['compose']          = 'メッセージの作成';
+$labels['writenewmessage']  = '新しいメッセージを作成';
+$labels['reply']            = '返信';
+$labels['replytomessage']   = '送信者に返信';
 $labels['replytoallmessage'] = 'メーリングリスト、または送信者とすべての宛先に返信';
-$labels['replyall'] = '全員に返信';
-$labels['replylist'] = 'メーリングリストに返信';
-$labels['forward'] = '転送';
-$labels['forwardinline'] = '本文に挿入して転送';
+$labels['replyall']         = '全員に返信';
+$labels['replylist']        = 'メーリングリストに返信';
+$labels['forward']          = '転送';
+$labels['forwardinline']    = '本文に挿入して転送';
 $labels['forwardattachment'] = '添付ファイルとして転送';
-$labels['forwardmessage'] = 'メッセージを転送';
-$labels['deletemessage'] = 'メッセージを削除';
+$labels['forwardmessage']   = 'メッセージを転送';
+$labels['deletemessage']    = 'メッセージを削除';
 $labels['movemessagetotrash'] = 'ごみ箱に移動';
-$labels['printmessage'] = 'メッセージを印刷';
-$labels['previousmessage'] = '前のメッセージを表示';
-$labels['firstmessage'] = '最初のメッセージを表示';
-$labels['nextmessage'] = '次のメッセージを表示';
-$labels['lastmessage'] = '最後のメッセージを表示';
-$labels['backtolist'] = 'メッセージの一覧に戻る';
-$labels['viewsource'] = 'ソースを表示';
-$labels['mark'] = 'マーク';
-$labels['markmessages'] = 'マークを付ける';
-$labels['markread'] = '既読に設定';
-$labels['markunread'] = '未読に設定';
-$labels['markflagged'] = 'フラグを設定';
-$labels['markunflagged'] = 'フラグを解除';
-$labels['moreactions'] = 'その他の操作...';
-$labels['more'] = '続く';
-$labels['back'] = '戻る';
-$labels['options'] = 'オプション';
+$labels['printmessage']     = 'メッセージを印刷';
+$labels['previousmessage']  = '前のメッセージを表示';
+$labels['firstmessage']     = '最初のメッセージを表示';
+$labels['nextmessage']      = '次のメッセージを表示';
+$labels['lastmessage']      = '最後のメッセージを表示';
+$labels['backtolist']       = 'メッセージの一覧に戻る';
+$labels['viewsource']       = 'ソースを表示';
+$labels['mark']             = 'マーク';
+$labels['markmessages']     = 'マークを付ける';
+$labels['markread']         = '既読に設定';
+$labels['markunread']       = '未読に設定';
+$labels['markflagged']      = 'フラグを設定';
+$labels['markunflagged']    = 'フラグを解除';
+$labels['moreactions']      = 'その他の操作...';
+$labels['more']             = '続く';
+$labels['back']             = '戻る';
+$labels['options']          = 'オプション';
+
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
-$labels['nonesort'] = 'なし';
 $labels['currpage'] = '現在のページ';
 $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグ付き';
@@ -145,12 +171,14 @@ $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'] = '昇順';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = '列を一覧';
 $labels['listsorting'] = '並べ替える列';
 $labels['listorder'] = '並べ替える順序';
 $labels['listmode'] = '一覧表示モード';
+
 $labels['folderactions'] = 'フォルダーの操作...';
 $labels['compact'] = '圧縮';
 $labels['empty'] = '空';
+
 $labels['quota'] = 'ディスクの使用状況';
-$labels['unknown'] = '不明';
-$labels['unlimited'] = '無制限';
-$labels['quicksearch'] = '高速検索';
-$labels['resetsearch'] = '検索を解除';
-$labels['searchmod'] = '検索の条件';
-$labels['msgtext'] = 'メッセージ全体';
+$labels['unknown']  = '不明';
+$labels['unlimited']  = '無制限';
+
+$labels['quicksearch']  = '高速検索';
+$labels['resetsearch']  = '検索を解除';
+$labels['searchmod']  = '検索の条件';
+$labels['msgtext']  = 'メッセージ全体';
+$labels['body']  = '本文';
+
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
-$labels['editasnew'] = '新しいメッセージとして編集';
-$labels['send'] = '送信';
-$labels['sendmessage'] = 'メッセージを送信';
-$labels['savemessage'] = '下書きとして保存';
-$labels['addattachment'] = 'ファイルを添付';
-$labels['charset'] = '文字セット';
-$labels['editortype'] = 'エディターの種類';
-$labels['returnreceipt'] = '開封確認';
-$labels['dsn'] = '配送状態通知';
+
+// message compose
+$labels['editasnew']      = '新しいメッセージとして編集';
+$labels['send']           = '送信';
+$labels['sendmessage']    = 'メッセージを送信';
+$labels['savemessage']    = '下書きとして保存';
+$labels['addattachment']  = 'ファイルを添付';
+$labels['charset']        = '文字セット';
+$labels['editortype']     = 'エディターの種類';
+$labels['returnreceipt']  = '開封確認';
+$labels['dsn']            = '配送状態通知';
 $labels['mailreplyintro'] = '$date に $sender さんは書きました:';
 $labels['originalmessage'] = '元のメッセージ';
-$labels['editidents'] = '識別情報を編集';
-$labels['spellcheck'] = 'スペル';
+
+$labels['editidents']    = '識別情報を編集';
+$labels['spellcheck']    = 'スペル';
 $labels['checkspelling'] = 'スペルチェック';
 $labels['resumeediting'] = '編集を再開';
-$labels['revertto'] = '元に戻す';
+$labels['revertto']      = '元に戻す';
+
 $labels['attach'] = '添付';
 $labels['attachments'] = '添付ファイル';
 $labels['upload'] = 'アップロード';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = '閉じる';
-$labels['messageoptions'] = 'メッセージのオプション...';
-$labels['low'] = '低';
-$labels['lowest'] = '最低';
-$labels['normal'] = '通常';
-$labels['high'] = '高';
+$labels['close']  = '閉じる';
+$labels['messageoptions']  = 'メッセージのオプション...';
+
+$labels['low']     = '低';
+$labels['lowest']  = '最低';
+$labels['normal']  = '通常';
+$labels['high']    = '高';
 $labels['highest'] = '最高';
-$labels['nosubject'] = '(件名なし)';
+
+$labels['nosubject']  = '(件名なし)';
 $labels['showimages'] = '画像を表示';
 $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
-$labels['isdraft'] = 'これは下書きのメッセージです。';
-$labels['andnmore'] = 'さらに$nr件...';
+$labels['isdraft']    = 'これは下書きのメッセージです。';
+$labels['andnmore']   = 'さらに$nr件...';
 $labels['togglemoreheaders'] = 'さらにメッセージのヘッダーを表示';
 $labels['togglefullheaders'] = 'メッセージヘッダーの生の表示と切り替え';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'テキスト';
 $labels['savesentmessagein'] = '送信したメッセージの保存先';
 $labels['dontsave'] = '保存しない';
 $labels['maxuploadsize'] = '添付可能なファイルは最大で$sizeです。';
+
 $labels['addcc'] = '写し(Cc)を追加';
 $labels['addbcc'] = '隠した写し(Bcc)を追加';
 $labels['addreplyto'] = '返信先(Reply-To)を追加';
 $labels['addfollowupto'] = 'フォロー先(Followup-Toを追加';
+
+// mdn
 $labels['mdnrequest'] = 'このメッセージを読んだときに、送信者が通知を受けたいと依頼しています。開封確認の通知を送信しますか?';
 $labels['receiptread'] = '開封確認(表示済み)';
 $labels['yourmessage'] = 'これはあなたが送信したメッセージに対する開封確認です。';
 $labels['receiptnote'] = '注意: この開封確認は、メッセージが宛先のコンピューターで表示されたことだけを知らせるものです。受信者がメッセージを読んだり、内容を理解したと保証するものではありません。';
-$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'] = 'ウェブサイト';
+
+// address boook
+$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'] = 'インスタントメッセージ';
 $labels['notes'] = '注釈';
-$labels['male'] = '男性';
+$labels['male']   = '男性';
 $labels['female'] = '女性';
 $labels['manager'] = '管理者';
 $labels['assistant'] = 'アシスタント';
-$labels['typeassistant'] = 'アシスタント';
 $labels['spouse'] = '配偶者';
 $labels['allfields'] = 'すべての項目';
 $labels['search'] = '検索';
 $labels['advsearch'] = '高度な検索';
 $labels['advanced'] = '高度';
 $labels['other'] = 'その他';
-$labels['typeother'] = 'その他';
-$labels['typehome'] = '自宅';
-$labels['typework'] = '職場';
-$labels['typemobile'] = 'モバイル';
-$labels['typemain'] = '主回線';
-$labels['typehomefax'] = '自宅ファクス';
-$labels['typeworkfax'] = '職場のFax';
-$labels['typecar'] = '車';
-$labels['typepager'] = 'ページャー(ポケットベル)';
-$labels['typevideo'] = '動画';
-$labels['typehomepage'] = 'ホームページ';
+
+$labels['typehome']   = '自宅';
+$labels['typework']   = '職場';
+$labels['typeother']  = 'その他';
+$labels['typemobile']  = 'モバイル';
+$labels['typemain']  = '主回線';
+$labels['typehomefax']  = '自宅ファクス';
+$labels['typeworkfax']  = '職場のFax';
+$labels['typecar']  = '車';
+$labels['typepager']  = 'ページャー(ポケットベル)';
+$labels['typevideo']  = '動画';
+$labels['typeassistant']  = 'アシスタント';
+$labels['typehomepage']  = 'ホームページ';
 $labels['typeblog'] = 'ブログ';
 $labels['typeprofile'] = 'プロフィール';
+
 $labels['addfield'] = '項目を追加...';
 $labels['addcontact'] = '新しい連絡先を追加';
 $labels['editcontact'] = '連絡先を編集';
 $labels['contacts'] = '連絡先';
 $labels['contactproperties'] = '連絡先の属性';
 $labels['personalinfo'] = '個人情報';
-$labels['edit'] = '編集';
+
+$labels['edit']   = '編集';
 $labels['cancel'] = '取り消し';
-$labels['save'] = '保存';
+$labels['save']   = '保存';
 $labels['delete'] = '削除';
 $labels['rename'] = '名前を変更';
 $labels['addphoto'] = '追加';
 $labels['replacephoto'] = '置き換え';
 $labels['uploadphoto'] = '写真をアップロード';
-$labels['newcontact'] = '新しい連絡先カードを作成';
-$labels['deletecontact'] = '選択した連絡先を削除';
-$labels['composeto'] = 'この連絡先宛にメッセージを作成';
+
+$labels['newcontact']     = '新しい連絡先カードを作成';
+$labels['deletecontact']  = '選択した連絡先を削除';
+$labels['composeto']      = 'この連絡先宛にメッセージを作成';
 $labels['contactsfromto'] = '$count件の連絡先の$from件目から$to件目';
-$labels['print'] = '印刷';
-$labels['export'] = 'エクスポート';
-$labels['exportvcards'] = 'vCard形式でエクスポート';
+$labels['print']          = '印刷';
+$labels['export']         = 'エクスポート';
+$labels['exportall']      = 'すべてエクスポート';
+$labels['exportsel']      = '選択した連絡先をエクスポート';
+$labels['exportvcards']   = 'vCard形式でエクスポート';
 $labels['newcontactgroup'] = '連絡先グループを新しく作成';
-$labels['grouprename'] = 'グループ名を変更';
-$labels['groupdelete'] = 'グループを削除';
+$labels['grouprename']    = 'グループ名を変更';
+$labels['groupdelete']    = 'グループを削除';
 $labels['groupremoveselected'] = '選択した連絡先をグループから削除';
-$labels['previouspage'] = '前のページを表示';
-$labels['firstpage'] = '最初のページを表示';
-$labels['nextpage'] = '次のページを表示';
-$labels['lastpage'] = '最後のページを表示';
+
+$labels['previouspage']   = '前のページを表示';
+$labels['firstpage']      = '最初のページを表示';
+$labels['nextpage']       = '次のページを表示';
+$labels['lastpage']       = '最後のページを表示';
+
 $labels['group'] = 'グループ';
 $labels['groups'] = 'グループ';
 $labels['personaladrbook'] = '個人の住所';
+
 $labels['searchsave'] = '検索情報を保存';
 $labels['searchdelete'] = '検索情報を削除';
+
 $labels['import'] = 'インポート';
 $labels['importcontacts'] = '連絡先をインポート';
 $labels['importfromfile'] = 'ファイルからインポート';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'アドレス帳に新しい連絡先の追加:';
 $labels['importreplace'] = 'アドレス帳全体と置き換え';
 $labels['importdesc'] = '連絡先を既存のアドレス帳からアップロードできます。<br />現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a>またはCSV(コンマ区切り)のデータ形式からアドレスのインポートをサポートしています。';
 $labels['done'] = '完了';
+
+// settings
 $labels['settingsfor'] = '次の設定:';
 $labels['about'] = 'このプログラムについて';
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = 'ユーザー設定';
 $labels['editpreferences'] = 'ユーザー設定を変更';
+
 $labels['identities'] = '識別情報';
 $labels['manageidentities'] = 'このアカウントの識別情報を管理';
 $labels['newidentity'] = '新しい識別情報';
+
 $labels['newitem'] = '新しい項目';
 $labels['edititem'] = '項目の編集';
+
 $labels['preferhtml'] = 'HTMLを表示';
 $labels['defaultcharset'] = '初期設定の文字セット';
 $labels['htmlmessage'] = 'HTMLメッセージ';
+$labels['messagepart'] = 'パート';
+$labels['digitalsig'] = 'デジタル署名';
 $labels['dateformat'] = '日付の書式';
 $labels['timeformat'] = '時刻の書式';
 $labels['prettydate'] = '短い日付で表示';
-$labels['setdefault'] = '初期値を設定';
-$labels['autodetect'] = '自動識別';
-$labels['language'] = '言語';
-$labels['timezone'] = 'タイムゾーン';
-$labels['pagesize'] = '1ページの表示件数';
+$labels['setdefault']  = '初期値を設定';
+$labels['autodetect']  = '自動識別';
+$labels['language']  = '言語';
+$labels['timezone']  = 'タイムゾーン';
+$labels['pagesize']  = '1ページの表示件数';
 $labels['signature'] = '署名';
-$labels['dstactive'] = 'サマータイムを適用';
+$labels['dstactive']  = 'サマータイムを適用';
 $labels['showinextwin'] = '新しいウィンドウでメッセージを表示';
 $labels['composeextwin'] = '新しいウィンドウでメッセージを作成';
 $labels['htmleditor'] = '作成時にHTMLメッセージを使用';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = '外部のインライン画像を表示';
 $labels['fromknownsenders'] = '送信者が知人の場合';
 $labels['always'] = '常時';
 $labels['showinlineimages'] = 'メッセージに添付された画像を下に表示';
-$labels['autosavedraft'] = '自動的に下書きを保存';
-$labels['everynminutes'] = '$n分毎';
-$labels['refreshinterval'] = '再表示 (新しいメッセージの確認等)';
-$labels['never'] = 'しない';
-$labels['immediately'] = '即時';
+$labels['autosavedraft']  = '自動的に下書きを保存';
+$labels['everynminutes']  = '$n分毎';
+$labels['refreshinterval']  = '再表示 (新しいメッセージの確認等)';
+$labels['never']  = 'しない';
+$labels['immediately']  = '即時';
 $labels['messagesdisplaying'] = 'メッセージの表示';
 $labels['messagescomposition'] = 'メッセージの作成';
 $labels['mimeparamfolding'] = '添付ファイルの名前';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = '返信や転送で署名を挿入する位置';
 $labels['belowquote'] = '引用の後';
 $labels['abovequote'] = '引用の前';
 $labels['insertsignature'] = '署名を挿入';
-$labels['previewpanemarkread'] = 'プレビューしたメッセージを既読に設定';
-$labels['afternseconds'] = '$n秒後';
+$labels['previewpanemarkread']  = 'プレビューしたメッセージを既読に設定';
+$labels['afternseconds']  = '$n秒後';
 $labels['reqmdn'] = '常に開封確認通知を要求';
 $labels['reqdsn'] = '常に配送状態通知を要求';
 $labels['replysamefolder'] = '返信したメッセージを元のメールと同じフォルダに保存';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'mailto: のリンクを扱うプロトコル処
 $labels['forwardmode'] = 'メッセージの転送形式';
 $labels['inline'] = 'インライン';
 $labels['asattachment'] = '添付ファイル';
-$labels['folder'] = 'フォルダー';
-$labels['foldername'] = 'フォルダー名';
-$labels['subscribed'] = '購読済み';
+
+$labels['folder']  = 'フォルダー';
+$labels['folders']  = 'フォルダー';
+$labels['foldername']  = 'フォルダー名';
+$labels['subscribed']  = '購読済み';
 $labels['messagecount'] = 'メッセージ';
-$labels['create'] = '作成';
-$labels['createfolder'] = '新しいフォルダーを作成';
-$labels['managefolders'] = 'フォルダーを管理';
+$labels['create']  = '作成';
+$labels['createfolder']  = '新しいフォルダーを作成';
+$labels['managefolders']  = 'フォルダーを管理';
 $labels['specialfolders'] = '特殊なフォルダー';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = 'フォルダーの属性';
@@ -427,23 +491,29 @@ $labels['info'] = '情報';
 $labels['getfoldersize'] = 'クリックしてフォルダーの大きさを取得';
 $labels['changesubscription'] = 'クリックして購読状態を変更';
 $labels['foldertype'] = 'フォルダーの種類';
-$labels['personalfolder'] = '個人フォルダー';
-$labels['otherfolder'] = '他のユーザーのフォルダー';
-$labels['sharedfolder'] = '公開フォルダー';
+$labels['personalfolder']  = '個人フォルダー';
+$labels['otherfolder']  = '他のユーザーのフォルダー';
+$labels['sharedfolder']  = '公開フォルダー';
+
 $labels['sortby'] = '並べ替え';
-$labels['sortasc'] = '昇順で並べ替え';
+$labels['sortasc']  = '昇順で並べ替え';
 $labels['sortdesc'] = '降順で並べ替え';
 $labels['undo'] = '取り消し';
+
 $labels['installedplugins'] = 'インストールしているプラグイン';
 $labels['plugin'] = 'プラグイン';
 $labels['version'] = 'バージョン';
 $labels['source'] = 'ソース';
 $labels['license'] = 'ライセンス';
 $labels['support'] = 'サポートを得る';
+
+// units
 $labels['B'] = 'バイト';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = '英語';
 $labels['westerneuropean'] = '西ヨーロッパ言語';
@@ -463,3 +533,4 @@ $labels['japanese'] = '日本語';
 $labels['korean'] = '韓国語';
 $labels['chinese'] = '中国語';
 
+?>
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index b465e9f54..6c6008a55 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'エラーが発生しました!';
-$messages['loginfailed'] = 'ログインできませんでした。';
+$messages['errortitle']  = 'エラーが発生しました!';
+$messages['loginfailed']  = 'ログインできませんでした。';
 $messages['cookiesdisabled'] = 'ブラウザーがCookieを受け付けません。';
 $messages['sessionerror'] = 'セッションが正しくないか期限が切れています。';
 $messages['storageerror'] = 'IMAP サーバーへの接続に失敗しました。';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'メッセージを移動できません。';
 $messages['errorcopying'] = 'メッセージをコピーできません。';
 $messages['errordeleting'] = 'メッセージを削除できません。';
 $messages['errormarking'] = 'メッセージにマークを設定できません。';
-$messages['deletecontactconfirm'] = '選択した連絡先を本当に削除しますか?';
-$messages['deletegroupconfirm'] = 'このグループを本当に削除しますか?';
+$messages['deletecontactconfirm']  = '選択した連絡先を本当に削除しますか?';
+$messages['deletegroupconfirm']  = 'このグループを本当に削除しますか?';
 $messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
-$messages['deletefolderconfirm'] = 'このフォルダーを本当に削除しますか?';
-$messages['purgefolderconfirm'] = 'このフォルダーのすべてのメールを本当に削除しますか?';
+$messages['deletefolderconfirm']  = 'このフォルダーを本当に削除しますか?';
+$messages['purgefolderconfirm']  = 'このフォルダーのすべてのメールを本当に削除しますか?';
 $messages['contactdeleting'] = '連絡先を削除中...';
 $messages['groupdeleting'] = 'グループを削除中...';
 $messages['folderdeleting'] = 'フォルダーを削除中...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'フォルダーを購読中...';
 $messages['folderunsubscribing'] = 'フォルダーの購読を解除中...';
 $messages['formincomplete'] = 'フォームに未記入の項目があります。';
 $messages['noemailwarning'] = '正しい電子メールアドレスを入力してください。';
-$messages['nonamewarning'] = '名前を入力してください。';
+$messages['nonamewarning']  = '名前を入力してください。';
 $messages['nopagesizewarning'] = 'ページのサイズを入力してください。';
 $messages['nosenderwarning'] = '送信者の電子メールアドレスを入力してください。';
 $messages['norecipientwarning'] = '少なくとも1つ宛先を入力してください。';
-$messages['nosubjectwarning'] = '件名(Subject)の欄が空です。今、入力しますか?';
+$messages['nosubjectwarning']  = '件名(Subject)の欄が空です。今、入力しますか?';
 $messages['nobodywarning'] = '本文の無いメッセージを送信しますか?';
 $messages['notsentwarning'] = 'メッセージを送信しませんでした。このメッセージを破棄しますか。';
 $messages['noldapserver'] = '検索するLDAPサーバーを選択してください。';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'その処理をするにはメッセージ部分�
 $messages['attachmentvalidationerror'] = '警告!  この添付ファイルはメッセージの宣言と一致しない種類という理由のため疑わしいです。送信者を信頼できないなら、悪意のある内容を含んでいるかもしれないのでブラウザーで開いてはなりません。<br/><br/><em>予測した種類: $expected; 発見した種類: $found</em>';
 $messages['noscriptwarning'] = '警告: このウェブメールサービスにはJavascriptが必要です!  使用するにはJavascriptをブラウザーの設定で有効にしてください。';
 
+?>
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 1bd9ccb3f..9b06db839 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ka_GE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'მოგესალმებათ $product';
-$labels['username'] = 'მომხმარებელი';
-$labels['password'] = 'პაროლი';
-$labels['server'] = 'სერვერი';
-$labels['login'] = 'შესვლა';
-$labels['logout'] = 'გამოსვლა';
-$labels['mail'] = 'ელფოსტა';
+
+// login page
+$labels['welcome']   = 'მოგესალმებათ $product';
+$labels['username']  = 'მომხმარებელი';
+$labels['password']  = 'პაროლი';
+$labels['server']    = 'სერვერი';
+$labels['login']     = 'შესვლა';
+
+// taskbar
+$labels['logout']   = 'გამოსვლა';
+$labels['mail']     = 'ელფოსტა';
 $labels['settings'] = 'პარამეტრები';
 $labels['addressbook'] = 'მისამართები';
-$labels['inbox'] = 'მიღებული';
+
+// mailbox names
+$labels['inbox']  = 'მიღებული';
 $labels['drafts'] = 'დროებითი';
-$labels['sent'] = 'გაგზავნილი';
-$labels['trash'] = 'წაშლილი';
-$labels['junk'] = 'სპამი';
+$labels['sent']   = 'გაგზავნილი';
+$labels['trash']  = 'წაშლილი';
+$labels['junk']   = 'სპამი';
+
+// message listing
 $labels['subject'] = 'სათაური';
-$labels['from'] = 'გამგზავნი';
-$labels['to'] = 'ვის';
-$labels['cc'] = 'ასლი';
-$labels['bcc'] = 'ფარული';
+$labels['from']    = 'გამგზავნი';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'ვის';
+$labels['cc']      = 'ასლი';
+$labels['bcc']     = 'ფარული';
 $labels['replyto'] = 'პასუხი';
-$labels['date'] = 'თარიღი';
-$labels['size'] = 'ზომა';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'თარიღი';
+$labels['size']    = 'ზომა';
 $labels['priority'] = 'პრიორიტეტი';
 $labels['organization'] = 'ორგანიზაცია';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'საქაღალდეები';
-$labels['folders'] = 'საქაღალდეები';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'შეტყობინება $nr დან $count';
-$labels['copy'] = 'ასლი';
-$labels['move'] = 'გადატანა';
-$labels['moveto'] = 'გადატანა...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'ასლი';
+$labels['move']     = 'გადატანა';
+$labels['moveto']   = 'გადატანა...';
 $labels['download'] = 'გადმოწერა';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ფაილის სახელი';
 $labels['filesize'] = 'ფაილის ზომა';
+
 $labels['addtoaddressbook'] = 'მისამართებში დამატება';
+
+// weekdays short
 $labels['sun'] = 'კვი';
 $labels['mon'] = 'ორშ';
 $labels['tue'] = 'სამ';
@@ -55,218 +80,323 @@ $labels['wed'] = 'ოთხ';
 $labels['thu'] = 'ხუთ';
 $labels['fri'] = 'პარ';
 $labels['sat'] = 'შაბ';
-$labels['sunday'] = 'კვირა';
-$labels['monday'] = 'ორშაბათი';
-$labels['tuesday'] = 'სამშაბათი';
+
+// weekdays long
+$labels['sunday']    = 'კვირა';
+$labels['monday']    = 'ორშაბათი';
+$labels['tuesday']   = 'სამშაბათი';
 $labels['wednesday'] = 'ოთხშაბათი';
-$labels['thursday'] = 'ხუთშაბათი';
-$labels['friday'] = 'პარასკევი';
-$labels['saturday'] = 'შაბათი';
-$labels['jan'] = 'იან';
-$labels['feb'] = 'თებ';
-$labels['mar'] = 'მარ';
-$labels['apr'] = 'აპრ';
-$labels['may'] = 'მაისი';
-$labels['longmay'] = 'მაისი';
-$labels['jun'] = 'ივნ';
-$labels['jul'] = 'ივლ';
-$labels['aug'] = 'აგვ';
-$labels['sep'] = 'სექ';
-$labels['oct'] = 'ოქტ';
-$labels['nov'] = 'ნოე';
-$labels['dec'] = 'დეკ';
-$labels['longjan'] = 'იანვარი';
-$labels['longfeb'] = 'თებერვალი';
-$labels['longmar'] = 'მარტი';
-$labels['longapr'] = 'აპრილი';
-$labels['longjun'] = 'ივნისი';
-$labels['longjul'] = 'ივლისი';
-$labels['longaug'] = 'აგვისტო';
-$labels['longsep'] = 'სექტემბერი';
-$labels['longoct'] = 'ოქტომბერი';
-$labels['longnov'] = 'ნოემბერი';
-$labels['longdec'] = 'დეკემბერი';
+$labels['thursday']  = 'ხუთშაბათი';
+$labels['friday']    = 'პარასკევი';
+$labels['saturday']  = 'შაბათი';
+
+// months short
+$labels['jan']	= 'იან';
+$labels['feb']	= 'თებ';
+$labels['mar']	= 'მარ';
+$labels['apr']	= 'აპრ';
+$labels['may']	= 'მაისი';
+$labels['jun']	= 'ივნ';
+$labels['jul'] 	= 'ივლ';
+$labels['aug']	= 'აგვ';
+$labels['sep']	= 'სექ';
+$labels['oct']	= 'ოქტ';
+$labels['nov']	= 'ნოე';
+$labels['dec']	= 'დეკ';
+
+// months long
+$labels['longjan']	= 'იანვარი';
+$labels['longfeb']	= 'თებერვალი';
+$labels['longmar']	= 'მარტი';
+$labels['longapr']	= 'აპრილი';
+$labels['longmay']	= 'მაისი';
+$labels['longjun']	= 'ივნისი';
+$labels['longjul']	= 'ივლისი';
+$labels['longaug']	= 'აგვისტო';
+$labels['longsep']	= 'სექტემბერი';
+$labels['longoct']	= 'ოქტომბერი';
+$labels['longnov']	= 'ნოემბერი';
+$labels['longdec']	= 'დეკემბერი';
+
 $labels['today'] = 'დღეს';
-$labels['checkmail'] = 'შემოწმება ახალ შეტყობინებაზე';
-$labels['compose'] = 'შეტყობინების დაწერა';
-$labels['writenewmessage'] = 'ახალი შეტყობინება';
-$labels['replytomessage'] = 'პასუხი';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'შემოწმება ახალ შეტყობინებაზე';
+$labels['compose']          = 'შეტყობინების დაწერა';
+$labels['writenewmessage']  = 'ახალი შეტყობინება';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'პასუხი';
 $labels['replytoallmessage'] = 'პასუხი ყველას';
-$labels['forwardmessage'] = 'გადაგზავნა';
-$labels['deletemessage'] = 'წაშლა';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'გადაგზავნა';
+$labels['deletemessage']    = 'წაშლა';
 $labels['movemessagetotrash'] = 'შეტყობინების წაშლილებში გადატანა';
-$labels['printmessage'] = 'შეტყობინების ამობეჭვდა';
-$labels['previousmessage'] = 'წინა შეტყობინების ნახვა';
-$labels['firstmessage'] = 'პირველი შეტყობინების ნახვა';
-$labels['nextmessage'] = 'შემდეგი შეტყობინების ნახვა';
-$labels['lastmessage'] = 'ბოლო შეტყობინების ნახვა';
-$labels['backtolist'] = 'უკან ჩამონათვალში';
-$labels['viewsource'] = 'შიგთავსი';
-$labels['markmessages'] = 'მონიშნეთ შეტყობინებები';
-$labels['markread'] = 'როგორც წაკითხული';
-$labels['markunread'] = 'როგორც წაუკითხავი';
-$labels['markflagged'] = 'როგორც მონიშნული';
-$labels['markunflagged'] = 'როგორც მოუნიშნავი';
-$labels['moreactions'] = 'მეტი მოქმედება...';
+$labels['printmessage']     = 'შეტყობინების ამობეჭვდა';
+$labels['previousmessage']  = 'წინა შეტყობინების ნახვა';
+$labels['firstmessage']     = 'პირველი შეტყობინების ნახვა';
+$labels['nextmessage']      = 'შემდეგი შეტყობინების ნახვა';
+$labels['lastmessage']      = 'ბოლო შეტყობინების ნახვა';
+$labels['backtolist']       = 'უკან ჩამონათვალში';
+$labels['viewsource']       = 'შიგთავსი';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'მონიშნეთ შეტყობინებები';
+$labels['markread']         = 'როგორც წაკითხული';
+$labels['markunread']       = 'როგორც წაუკითხავი';
+$labels['markflagged']      = 'როგორც მონიშნული';
+$labels['markunflagged']    = 'როგორც მოუნიშნავი';
+$labels['moreactions']      = 'მეტი მოქმედება...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'მონიშვნა';
 $labels['all'] = 'ყველა';
 $labels['none'] = 'არცერთი';
-$labels['nonesort'] = 'არცერთი';
 $labels['currpage'] = 'მიმდინარე გვერდი';
 $labels['unread'] = 'წაუკითხავი';
 $labels['flagged'] = 'მონიშნული';
 $labels['unanswered'] = 'უპასუხო';
 $labels['deleted'] = 'წაშლილი';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'შებრუნებული';
 $labels['filter'] = 'ფილტრი';
 $labels['list'] = 'სია';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'ყველას გაშლა';
 $labels['expand-unread'] = 'წაუკითხავის გაშლა';
 $labels['collapse-all'] = 'ყველას დაკეცვა';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'ვისგან/ვის';
 $labels['flag'] = 'დროშა';
 $labels['attachment'] = 'მიმაგრებული ფაილი';
+$labels['nonesort'] = 'არცერთი';
 $labels['sentdate'] = 'გაგზავნის თარიღი';
+$labels['arrival'] = 'Arrival date';
 $labels['asc'] = 'ზრდადობით';
 $labels['desc'] = 'კლებადობით';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'დალაგება';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'შეკუმშვა';
 $labels['empty'] = 'გაცარიელება';
+
 $labels['quota'] = 'შეზღუდვა';
-$labels['unknown'] = 'უცნობი';
-$labels['unlimited'] = 'შეუზღუდავი';
-$labels['quicksearch'] = 'სწრაფი ძიება';
-$labels['resetsearch'] = 'ძიების გასუფთავება';
-$labels['searchmod'] = 'ძებნის ვარიანტები';
-$labels['msgtext'] = 'ყველა შეტყობინება';
+$labels['unknown']  = 'უცნობი';
+$labels['unlimited']  = 'შეუზღუდავი';
+
+$labels['quicksearch']  = 'სწრაფი ძიება';
+$labels['resetsearch']  = 'ძიების გასუფთავება';
+$labels['searchmod']  = 'ძებნის ვარიანტები';
+$labels['msgtext']  = 'ყველა შეტყობინება';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
-$labels['editasnew'] = 'რედაქტირება როგორც ახლის';
-$labels['sendmessage'] = 'შეტყობინების გაგზავნა';
-$labels['savemessage'] = 'დროებით შენახვა';
-$labels['addattachment'] = 'ფაილის ატვირთვა';
-$labels['charset'] = 'კოდირება';
-$labels['editortype'] = 'რედაქტორი';
-$labels['returnreceipt'] = 'პასუხის მოთხოვნა';
+
+// message compose
+$labels['editasnew']      = 'რედაქტირება როგორც ახლის';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'შეტყობინების გაგზავნა';
+$labels['savemessage']    = 'დროებით შენახვა';
+$labels['addattachment']  = 'ფაილის ატვირთვა';
+$labels['charset']        = 'კოდირება';
+$labels['editortype']     = 'რედაქტორი';
+$labels['returnreceipt']  = 'პასუხის მოთხოვნა';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ორთოგრაფიული შემოწმება';
 $labels['resumeediting'] = 'რედაქტირების გაგრძელება';
-$labels['revertto'] = 'გაუქმება';
+$labels['revertto']      = 'გაუქმება';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'გზავნილები';
 $labels['upload'] = 'ატვირთვა';
-$labels['close'] = 'დახურვა';
-$labels['low'] = 'დაბალი';
-$labels['lowest'] = 'უდაბლესი';
-$labels['normal'] = 'საშუალო';
-$labels['high'] = 'მაღალი';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'დახურვა';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'დაბალი';
+$labels['lowest']  = 'უდაბლესი';
+$labels['normal']  = 'საშუალო';
+$labels['high']    = 'მაღალი';
 $labels['highest'] = 'უმაღლესი';
-$labels['nosubject'] = '(უსათაურო)';
+
+$labels['nosubject']  = '(უსათაურო)';
 $labels['showimages'] = 'გამოსახულების ჩვენება';
 $labels['alwaysshow'] = 'ყოველთვის გამოაჩინე სურათები $sender –გან';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ტექსტური';
 $labels['savesentmessagein'] = 'შეინახე შეტყობინება';
 $labels['dontsave'] = 'არ შეინახო';
 $labels['maxuploadsize'] = 'მაქსიმალური დაშვებული ფაილის ზომა $size';
+
 $labels['addcc'] = 'დაამატე კოპიო';
 $labels['addbcc'] = 'დაამატე ფარული კოპიო';
 $labels['addreplyto'] = 'დაამატე გამომგზავნი';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'გამომგზავნს სურს შეიტყოს წერილის მიღება. გსურთ შეატყობინოთ გამომგზავნს?';
 $labels['receiptread'] = 'გზავნილის დაბრუნება';
 $labels['yourmessage'] = 'ეს არის მიღების დასტური თქვენს შეტყობინებაზე';
 $labels['receiptnote'] = 'განმარტება: ეს ნიშნავს რომ ადრესატმა მიიღო შეტყობინება. მაგრამ, არ ნიშნავს რომ წაიკითხა ან გაიგო ტექსტი';
-$labels['name'] = 'სრული სახელი';
-$labels['firstname'] = 'სახელი';
-$labels['surname'] = 'გვარი';
-$labels['department'] = 'დეპარტამენტი';
-$labels['gender'] = 'სქესი';
-$labels['email'] = 'ელ–ფოსტა';
-$labels['phone'] = 'ტელეფონი';
-$labels['address'] = 'მისამართი';
-$labels['street'] = 'ქუჩა';
-$labels['locality'] = 'ქალაქი';
-$labels['zipcode'] = 'ZIP კოდი';
-$labels['region'] = 'შტატი/პროვინცია';
-$labels['country'] = 'ქვეყანა';
-$labels['birthday'] = 'დაბადების დღე';
-$labels['website'] = 'ვებგვერდი';
-$labels['male'] = 'მამრობითი';
+
+// address boook
+$labels['name']         = 'სრული სახელი';
+$labels['firstname']    = 'სახელი';
+$labels['surname']      = 'გვარი';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'დეპარტამენტი';
+$labels['gender']       = 'სქესი';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'ელ–ფოსტა';
+$labels['phone']        = 'ტელეფონი';
+$labels['address']      = 'მისამართი';
+$labels['street']       = 'ქუჩა';
+$labels['locality']     = 'ქალაქი';
+$labels['zipcode']      = 'ZIP კოდი';
+$labels['region']       = 'შტატი/პროვინცია';
+$labels['country']      = 'ქვეყანა';
+$labels['birthday']     = 'დაბადების დღე';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'ვებგვერდი';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'მამრობითი';
 $labels['female'] = 'მდედრობით';
 $labels['manager'] = 'მენეჯერი';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'ყველა ველი';
 $labels['search'] = 'ძებნა';
 $labels['advsearch'] = 'გაფართოებული ძებნა';
+$labels['advanced'] = 'Advanced';
 $labels['other'] = 'სხვა';
-$labels['typeother'] = 'სხვა';
-$labels['typehome'] = 'სახლი';
-$labels['typework'] = 'სამსახური';
-$labels['typemobile'] = 'მობილური';
-$labels['typemain'] = 'ძირითადი';
-$labels['typehomefax'] = 'სახლის ფაქსი';
-$labels['typeworkfax'] = 'სამსახურის ფაქსი';
-$labels['typecar'] = 'მანქანა';
-$labels['typepager'] = 'პეიჯერი';
-$labels['typevideo'] = 'ვიდეო';
+
+$labels['typehome']   = 'სახლი';
+$labels['typework']   = 'სამსახური';
+$labels['typeother']  = 'სხვა';
+$labels['typemobile']  = 'მობილური';
+$labels['typemain']  = 'ძირითადი';
+$labels['typehomefax']  = 'სახლის ფაქსი';
+$labels['typeworkfax']  = 'სამსახურის ფაქსი';
+$labels['typecar']  = 'მანქანა';
+$labels['typepager']  = 'პეიჯერი';
+$labels['typevideo']  = 'ვიდეო';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'ბლოგი';
 $labels['typeprofile'] = 'პროფილი';
+
 $labels['addfield'] = 'ველის დამატება...';
 $labels['addcontact'] = 'კონტაქტებში დამატება';
 $labels['editcontact'] = 'კონტაქტის რედაქტირება';
 $labels['contacts'] = 'კონტაქტები';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'პირადი ინფორმაცია';
-$labels['edit'] = 'რედაქტირება';
+
+$labels['edit']   = 'რედაქტირება';
 $labels['cancel'] = 'გაუქმება';
-$labels['save'] = 'შენახვა';
+$labels['save']   = 'შენახვა';
 $labels['delete'] = 'წაშლა';
 $labels['rename'] = 'გადარქმევა';
 $labels['addphoto'] = 'დამატება';
 $labels['replacephoto'] = 'გამოცვლა';
-$labels['newcontact'] = 'კონტაქტის შექმნა';
-$labels['deletecontact'] = 'მონიშნელი კონტაქტის წაშლა';
-$labels['composeto'] = 'ფოსტის გაგზავნა შერჩეულ ადრესატებთან';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'კონტაქტის შექმნა';
+$labels['deletecontact']  = 'მონიშნელი კონტაქტის წაშლა';
+$labels['composeto']      = 'ფოსტის გაგზავნა შერჩეულ ადრესატებთან';
 $labels['contactsfromto'] = 'კონტაქტები $from დან $to ში $count';
-$labels['print'] = 'დაბეჭვდა';
-$labels['export'] = 'ექსპორტი';
-$labels['exportvcards'] = 'კონტაქტების ექსპორტი vCard ფორმატში';
+$labels['print']          = 'დაბეჭვდა';
+$labels['export']         = 'ექსპორტი';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'კონტაქტების ექსპორტი vCard ფორმატში';
 $labels['newcontactgroup'] = 'ახალი საკონტაქტო ჯგუფის შექმნა';
-$labels['grouprename'] = 'ჯგუფის სახელის შეცვლა';
-$labels['groupdelete'] = 'ჯგუფის წაშლა';
-$labels['previouspage'] = 'წინას ჩვენება';
-$labels['firstpage'] = 'პირველის ჩვენება';
-$labels['nextpage'] = 'შემდეგის ჩვენება';
-$labels['lastpage'] = 'ბოლოს ჩვენება';
+$labels['grouprename']    = 'ჯგუფის სახელის შეცვლა';
+$labels['groupdelete']    = 'ჯგუფის წაშლა';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$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['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'ჩაანაცვლეთ არსებული მისამართები';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'დასრულებულია';
+
+// settings
 $labels['settingsfor'] = 'პარამეტრები';
+$labels['about'] = 'About';
 $labels['preferences'] = 'პარამეტრები';
 $labels['userpreferences'] = 'მომხმარებლის პარამეტრები';
 $labels['editpreferences'] = 'მომხმარებლის პარამეტრების რედაქტირება';
+
 $labels['identities'] = 'პროფილები';
 $labels['manageidentities'] = 'პროფილების მართვა';
 $labels['newidentity'] = 'ახალი პროფილი';
+
 $labels['newitem'] = 'ახალი';
 $labels['edititem'] = 'რედაქტირება';
+
 $labels['preferhtml'] = 'როგორც HTML';
 $labels['defaultcharset'] = 'ნაგულისხმები სიმბოლოთა ნაკრები';
 $labels['htmlmessage'] = 'HTML შეტყობინება';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'თარიღის ფორმატი';
 $labels['timeformat'] = 'დროის ფორმატი';
 $labels['prettydate'] = 'კარგი თარიღები';
-$labels['setdefault'] = 'როგორც ზოგაგად';
-$labels['autodetect'] = 'ავტომატური';
-$labels['language'] = 'ენა';
-$labels['timezone'] = 'დროითი ზონა';
-$labels['pagesize'] = 'სტრიქონი გვერდზე';
+$labels['setdefault']  = 'როგორც ზოგაგად';
+$labels['autodetect']  = 'ავტომატური';
+$labels['language']  = 'ენა';
+$labels['timezone']  = 'დროითი ზონა';
+$labels['pagesize']  = 'სტრიქონი გვერდზე';
 $labels['signature'] = 'ხელმოწერა';
-$labels['dstactive'] = 'დროის გადაყვანა';
+$labels['dstactive']  = 'დროის გადაყვანა';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'შეტყობინების შექმნა HTML –ში';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ხელმოწერა';
 $labels['previewpane'] = 'ჩვენება';
 $labels['skin'] = 'ინტერფეისი';
@@ -278,18 +408,23 @@ $labels['mailboxview'] = 'საფოსტო ყუთის ჩვენე�
 $labels['mdnrequests'] = 'მგზავნელის შეტყობინებები';
 $labels['askuser'] = 'ჰკითხე მომხმარებელს';
 $labels['autosend'] = 'გაგზავნე ავტომატურად';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'იგნორირება';
 $labels['readwhendeleted'] = 'მონიშნე გზავნილი წაკითხულად წაშლის დროს';
 $labels['flagfordeletion'] = 'აღნიშნეთ გზავნილები როგორც წასაშლელი წაშლის ნაცვლად';
 $labels['skipdeleted'] = 'არ გამოაჩინო წაშლილი გზავნილები';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'გამოაჩინე მოშორებული სურათები';
 $labels['fromknownsenders'] = 'ნაცნობი მგზავნელებისგან';
 $labels['always'] = 'ყოველთვის';
 $labels['showinlineimages'] = 'ატვირთული სურათები გამოაჩინე გზავნილის ქვემოთ';
-$labels['autosavedraft'] = 'ავტომატური შენახვა';
-$labels['everynminutes'] = 'ყოველ $n წუთში';
-$labels['never'] = 'არასდროს';
-$labels['immediately'] = 'დაუყონებლივ';
+$labels['autosavedraft']  = 'ავტომატური შენახვა';
+$labels['everynminutes']  = 'ყოველ $n წუთში';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'არასდროს';
+$labels['immediately']  = 'დაუყონებლივ';
 $labels['messagesdisplaying'] = 'გამოაჩინე შეტყობინებები';
 $labels['messagescomposition'] = 'შეტყობინებების შექმნა';
 $labels['mimeparamfolding'] = 'ბმულის სახელები';
@@ -301,12 +436,15 @@ $labels['advancedoptions'] = 'დამატებითი პარამე�
 $labels['focusonnewmessage'] = 'ფოკუსირება ახალ შეტყობინებებზე';
 $labels['checkallfolders'] = 'შეამოწმე ყველა საქაღალდე ახალ შეტყობინებაზე';
 $labels['displaynext'] = 'შეტყობინების წაშლის ან გადატანის შემდეგ გამოჩნდეს შემდეგი შეტყობინება';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'ძირითადი პარამეტრები';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'განყოფილება';
 $labels['maintenance'] = 'მომსახურება';
 $labels['newmessage'] = 'ახალი შეტყობინება';
 $labels['signatureoptions'] = 'ხელმოწერის ოფციები';
 $labels['whenreplying'] = 'პასუხის შემთხვევაში';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'დაიწყოს ახალი შეტყობინება ორიგინალის ზემოთ';
 $labels['replybottomposting'] = 'დაიწყოს ახალი შეტყობინება ორიგინალის ქვემოთ';
 $labels['replyremovesignature'] = 'წაიშალოს ხელმოწერა პასუხის შემთხვევაში';
@@ -317,39 +455,77 @@ $labels['replysignaturepos'] = 'მხოლოდ პასუხის ან
 $labels['belowquote'] = 'ციტატის შემდეგ';
 $labels['abovequote'] = 'ციტატამდე';
 $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
-$labels['afternseconds'] = '$n წამის შემდეგ';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = '$n წამის შემდეგ';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'ლექსიკონში დამატება';
-$labels['folder'] = 'საქაღალდე';
-$labels['foldername'] = 'საქაღალდის დასახელება';
-$labels['subscribed'] = 'გამოწერილია';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'საქაღალდე';
+$labels['folders']  = 'საქაღალდეები';
+$labels['foldername']  = 'საქაღალდის დასახელება';
+$labels['subscribed']  = 'გამოწერილია';
 $labels['messagecount'] = 'შეტყობინებები';
-$labels['create'] = 'შექმნა';
-$labels['createfolder'] = 'საქაღალდის შექმნა';
-$labels['managefolders'] = 'საქაღალდეების მართვა';
+$labels['create']  = 'შექმნა';
+$labels['createfolder']  = 'საქაღალდის შექმნა';
+$labels['managefolders']  = 'საქაღალდეების მართვა';
 $labels['specialfolders'] = 'სპეციალური საქაღალდე';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'მდებარეობა';
 $labels['info'] = 'ინფორმაცია';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'დასტის ტიპი';
-$labels['personalfolder'] = 'კერძო დასტა';
-$labels['sharedfolder'] = 'საჯარო დასტა';
+$labels['personalfolder']  = 'კერძო დასტა';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'საჯარო დასტა';
+
 $labels['sortby'] = 'დალაგება';
-$labels['sortasc'] = 'დალაგება ზრდადობით';
+$labels['sortasc']  = 'დალაგება ზრდადობით';
 $labels['sortdesc'] = 'დალაგება კლებადობით';
 $labels['undo'] = 'დაბრუნება';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'ბტ';
 $labels['KB'] = 'კბტ';
 $labels['MB'] = 'მბტ';
 $labels['GB'] = 'გბტ';
+
+// character sets
 $labels['unicode'] = 'უნიკოდი';
 $labels['english'] = 'ინსგლისური';
 $labels['westerneuropean'] = 'დასავლურევროპული';
 $labels['easterneuropean'] = 'აღმოსავლეთევროპული';
+$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'ბალტიური';
 $labels['cyrillic'] = 'კირილიცა';
 $labels['arabic'] = 'არაბული';
 $labels['greek'] = 'ბერძნული';
 $labels['hebrew'] = 'ებრაული';
 $labels['turkish'] = 'თურქული';
+$labels['nordic'] = 'Nordic';
 $labels['thai'] = 'ტაი';
 $labels['celtic'] = 'კელტური';
 $labels['vietnamese'] = 'ვიეტნამური';
@@ -357,3 +533,4 @@ $labels['japanese'] = 'იაპონური';
 $labels['korean'] = 'კორეული';
 $labels['chinese'] = 'ჩინური';
 
+?>
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 16d73bf2a..7ad0b665b 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -2,31 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ka_GE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'შესვლა შეუძლებელია';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'შესვლა შეუძლებელია';
 $messages['cookiesdisabled'] = 'თქვენი ბროუზერი კუკიებს არ პასუხობს';
 $messages['sessionerror'] = 'თქვენი სესია არის მცდარი ან ვადაგასული';
 $messages['storageerror'] = 'IMAP სერვერთან დაკავშირება შეუძლებელია';
 $messages['servererror'] = 'შეცდომა სერვერზე!';
 $messages['servererrormsg'] = 'სერვერის შეცდომა: $msg';
 $messages['dberror'] = 'მონაცემთა ბაზის შეცდომა!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'მოქმედების შესრულება შეუძლებალია. წვდომა აკრძალულია.';
 $messages['invalidrequest'] = 'არასწორი მოთხოვნა! მონაცემების შენახვა არ მოხერხდა.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'არ არის ახალი შეტყობინება';
 $messages['loggedout'] = 'წარმატებით დაიხურა თქვენი სესია';
 $messages['mailboxempty'] = 'საფოსტო ყუთი ცარიელია';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'იტვირთება...';
 $messages['uploading'] = 'ფაილი იტვირთება...';
 $messages['uploadingmany'] = 'ფაილების ატვირთვა...';
@@ -39,31 +46,38 @@ $messages['messagesaved'] = 'შეტყობინების დროე�
 $messages['successfullysaved'] = 'წარმატებით შეინახა';
 $messages['addedsuccessfully'] = 'კონტაქტი წარმატებით დაემატა მისამართებში';
 $messages['contactexists'] = 'კონტაქტი ამ მისამართზე უკვე არსებობს';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'უსაფრთხოების მიზნით სურათების ჩვენება შეზღუდულია';
 $messages['encryptedmessage'] = 'შეტყობინება დაშიფრულია და სამწუხაროდ ჩვენება შეუძლებელია';
 $messages['nocontactsfound'] = 'კონტაქტი ვერ მოიძებნა';
 $messages['contactnotfound'] = 'მოთხოვნილი კონტაქტი ვერ მოიძებნა';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'შეტყობინება ვერ გაიგზავნა';
 $messages['senttooquickly'] = 'გთხოვთ მოიცადოთ $sec წამი. სანამ იგზავნება შეტყობინება';
 $messages['errorsavingsent'] = 'შეცდომა სანამ ინახება გაგზავნილი შეტყობინება';
 $messages['errorsaving'] = 'შენახვის დროს მოხდა შეცდომა';
 $messages['errormoving'] = 'შეტყობინების გადატანა შეუძლებელია';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'შეტყობინების წაშლა შეუძლებელია';
 $messages['errormarking'] = 'შეტყობინების მონიშვნა შეუძლებელია';
-$messages['deletecontactconfirm'] = 'ნამდვილად გსურთ მონიშნული კონტაქტების წაშლა?';
+$messages['deletecontactconfirm']  = 'ნამდვილად გსურთ მონიშნული კონტაქტების წაშლა?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'ნამდვილად გსურთ მონიშნული შეტყობინებების წაშლა?';
-$messages['deletefolderconfirm'] = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
-$messages['purgefolderconfirm'] = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
+$messages['deletefolderconfirm']  = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
+$messages['purgefolderconfirm']  = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
 $messages['groupdeleting'] = 'ჯგუფის წაშლა...';
 $messages['folderdeleting'] = 'საქაღალდის წაშლა...';
 $messages['foldermoving'] = 'საქაღალდის გადატანა...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'ყველა ველი არ არის შევსებული';
 $messages['noemailwarning'] = 'მიუთითეთ სწორი ელ–ფოსტის მისამართი';
-$messages['nonamewarning'] = 'მიუთითეთ სახელი';
+$messages['nonamewarning']  = 'მიუთითეთ სახელი';
 $messages['nopagesizewarning'] = 'მიუთითეთ ფურცლის ზომა';
 $messages['nosenderwarning'] = 'გთხოვთ შეიტანოთ მგზავნელის ელ–ფოსტის მისამართი';
 $messages['norecipientwarning'] = 'მიუთითეთ მიმღები';
-$messages['nosubjectwarning'] = 'გსურთ თუ არა შეტყობინების გაგზავნა უსათაუროდ?';
+$messages['nosubjectwarning']  = 'გსურთ თუ არა შეტყობინების გაგზავნა უსათაუროდ?';
 $messages['nobodywarning'] = 'გსურთ თუ არა შეტყობინების გაგზავნა უტექსტოდ?';
 $messages['notsentwarning'] = 'შეტყობინება ვერ იქნა გაგზავნილი. გსურთ თუ არა გზავნილის გაუქმება?';
 $messages['noldapserver'] = 'მიუთითეთ LDAP სერვერი ძიებისთვის';
@@ -76,6 +90,10 @@ $messages['searching'] = 'ძიება...';
 $messages['checking'] = 'შემოწმება...';
 $messages['nospellerrors'] = 'ორთოგრაფიული შეცდომა არ არის';
 $messages['folderdeleted'] = 'საქაღალდე წარმატებით წაიშალა';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'წარმატებით წაიშალა';
 $messages['converting'] = 'შეტყობინების ფორმატირების გაუქმება...';
 $messages['messageopenerror'] = 'შეტყობინება ვერ ჩაიტვირთა სერვერიდან';
@@ -86,15 +104,26 @@ $messages['copyerror'] = 'ვერცერთი მისამართი �
 $messages['sourceisreadonly'] = 'აღნიშნული მისამართის მხოლოდ წაკითხვაა შესაძლებელი';
 $messages['errorsavingcontact'] = 'საკონტაქტო მისამართის შენახვა შეუძლებელია';
 $messages['movingmessage'] = 'შეტყობინების გადატანა...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'წარმატებით გაიგზავნა';
 $messages['errorsendingreceipt'] = 'არ გაიგზავნა';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'წაშლა შეუძლებელია, ის თქვენთვის ერთადერთია';
 $messages['forbiddencharacter'] = 'საქაღალდის სახელი შეიცავს აკრძალულ სიმბოლოებს';
 $messages['selectimportfile'] = 'გთხოვთ მონიშნოთ ფაილი ასატვირთად';
 $messages['addresswriterror'] = 'მონიშნულ მისამართებში ჩაწერა შეუძლებელია';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'გთხოვთ მოიცადოთ, მიმდინარეობს შემოტანა';
-$messages['importerror'] = 'შემოტანა გაუქმდა! ატვირთული ფაილის ფორმატი არ ემთხვევა დასაშვებ vCard ფორმატს';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>წარმატებით დასრულდა $inserted კონტაქტების შემოტანა, $skipped არსებულის გამოტოვება</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'ოპერაცია შეზღუდულია';
 $messages['nofromaddress'] = 'ელ–ფოსტის მისამართი გამოტოვებულია';
 $messages['editorwarning'] = 'რედაქტორის გადართვა ტექსტურ რეჟიმში გამოიწვევს არსებული ტექსტის ფორმატის დაკარგვას. გსურთ გაგრძელება?';
@@ -106,16 +135,35 @@ $messages['smtptoerror'] = 'SMTP Error ($code): ვერ დაემატა
 $messages['smtprecipientserror'] = 'SMTP Error: მიმღებთა ჩამონათვალის დამუშავება ვერ მოხერხდა';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'ელ-ფოსტის მისამართი არასწორია $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
 $messages['contactdeleted'] = 'კონტაქტ(ებ)ი წარმატებით წაიშალა.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
 $messages['contactrestored'] = 'კონრაქტ(ებ)ი წარმატებით აღდგა,';
 $messages['groupdeleted'] = 'ჯგუფი წარმატებით წაიშალა.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
 $messages['groupcreated'] = 'ჯგუფი წარმატებით შეიქმნა.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = 'შეტყობინებები წარმატებით წაიშალა.';
 $messages['messagemoved'] = 'შეტყობინებები გადატანილია წარმატებით.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
 $messages['messagemarked'] = 'შეტყობინებები წარმატებით მოინიშნა.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'სახელი არ შეიძლება იყოს ცარიელი.';
 $messages['nametoolong'] = 'სახელი ძალიან მოკლეა.';
 $messages['folderupdated'] = 'დასტა წარმატებით განახლდა.';
 $messages['foldercreated'] = 'დასტა წარმატებით შეიქმნა.';
 $messages['invalidimageformat'] = 'გამოსახულების ფორმატი არასწორია.';
+$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/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 7ae9631bd..0f7d85dd8 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -2,56 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product សូមស្វាគមន៍';
-$labels['username'] = 'ឈ្មោះអ្នកប្រើ';
-$labels['password'] = 'ពាក្យសំងាត់';
-$labels['server'] = 'ម៉ាស៊ីនមេ';
-$labels['login'] = 'ពិនិត្យចូល';
-$labels['logout'] = 'ពិនិត្យចេញ';
-$labels['mail'] = 'អ៊ីមែល';
+
+// login page
+$labels['welcome']   = '$product សូមស្វាគមន៍';
+$labels['username']  = 'ឈ្មោះអ្នកប្រើ';
+$labels['password']  = 'ពាក្យសំងាត់';
+$labels['server']    = 'ម៉ាស៊ីនមេ';
+$labels['login']     = 'ពិនិត្យចូល';
+
+// taskbar
+$labels['logout']   = 'ពិនិត្យចេញ';
+$labels['mail']     = 'អ៊ីមែល';
 $labels['settings'] = 'កំនត់ការប្រើប្រាស់';
 $labels['addressbook'] = 'សៀវភៅអាសយដ្ឋាន';
-$labels['inbox'] = 'ប្រអប់សំបុត្រ';
+
+// mailbox names
+$labels['inbox']  = 'ប្រអប់សំបុត្រ';
 $labels['drafts'] = 'សំបុត្រពង្រៀង';
-$labels['sent'] = 'សំបុត្រដែលបានបញ្ជូន';
-$labels['trash'] = 'ធុងសំរាម';
-$labels['junk'] = 'សំបុត្រមិនល្អ';
+$labels['sent']   = 'សំបុត្រដែលបានបញ្ជូន';
+$labels['trash']  = 'ធុងសំរាម';
+$labels['junk']   = 'សំបុត្រមិនល្អ';
+
+// message listing
 $labels['subject'] = 'ចំណងជើង';
-$labels['from'] = 'អ្នកផ្ញើ';
-$labels['to'] = 'អ្នកទទួល';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'អ្នកផ្ញើ';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'អ្នកទទួល';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'ឆ្លើយតបទៅកាន់';
 $labels['followupto'] = 'ឆ្លើយតបទៅកាន់ក្រុម';
-$labels['date'] = 'កាលបរិច្ឆេត';
-$labels['size'] = 'ទំហំ';
+$labels['date']    = 'កាលបរិច្ឆេត';
+$labels['size']    = 'ទំហំ';
 $labels['priority'] = 'អទិភាព';
 $labels['organization'] = 'អង្គភាព';
 $labels['readstatus'] = 'ស្ថានភាពនៃការអាន';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'ថតទាំងអស់';
-$labels['folders'] = 'ថតទាំងអស់';
 $labels['messagesfromto'] = 'សំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['threadsfromto'] = 'បន្តុំសំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['messagenrof'] = 'សំបុត្រ $nr នៃ $count';
-$labels['copy'] = 'ចំលង';
-$labels['move'] = 'ផ្ទេរ';
-$labels['moveto'] = 'ផ្ទេរទៅ';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'ចំលង';
+$labels['move']     = 'ផ្ទេរ';
+$labels['moveto']   = 'ផ្ទេរទៅ';
 $labels['download'] = 'ទាញយក';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ឈ្មោះឯកសារ';
 $labels['filesize'] = 'ទំហំឯកសារ';
+
 $labels['addtoaddressbook'] = 'រក្សាទុកក្នុងសៀវភៅអាសយដ្ឋាន';
+
+// weekdays short
 $labels['sun'] = 'អាទិត្យ';
 $labels['mon'] = 'ច័ន្ទ';
 $labels['tue'] = 'អង្គារ';
@@ -59,69 +80,89 @@ $labels['wed'] = 'ពុធ';
 $labels['thu'] = 'ព្រហស្បតិ៍';
 $labels['fri'] = 'សុក្រ';
 $labels['sat'] = 'សៅរ៍';
-$labels['sunday'] = 'អាទិត្យ';
-$labels['monday'] = 'ច័ន្ទ';
-$labels['tuesday'] = 'អង្គារ';
+
+// weekdays long
+$labels['sunday']    = 'អាទិត្យ';
+$labels['monday']    = 'ច័ន្ទ';
+$labels['tuesday']   = 'អង្គារ';
 $labels['wednesday'] = 'ពុធ';
-$labels['thursday'] = 'ព្រហស្បតិ៍';
-$labels['friday'] = 'សុក្រ';
-$labels['saturday'] = 'សៅរ៍';
-$labels['jan'] = 'មករា';
-$labels['feb'] = 'កុម្ភះ';
-$labels['mar'] = 'មិនា';
-$labels['apr'] = 'មេសា';
-$labels['may'] = 'ឧសភា';
-$labels['longmay'] = 'ឧសភា';
-$labels['jun'] = 'មិថុនា';
-$labels['jul'] = 'កក្កដា';
-$labels['aug'] = 'សីហា';
-$labels['sep'] = 'កញ្ញា';
-$labels['oct'] = 'តុលា';
-$labels['nov'] = 'វិច្ឆិកា';
-$labels['dec'] = 'ធ្នូ';
-$labels['longjan'] = 'មករា';
-$labels['longfeb'] = 'កុម្ភះ';
-$labels['longmar'] = 'មិនា';
-$labels['longapr'] = 'មេសា';
-$labels['longjun'] = 'មិថុនា';
-$labels['longjul'] = 'កក្កដា';
-$labels['longaug'] = 'សីហា';
-$labels['longsep'] = 'កញ្ញា';
-$labels['longoct'] = 'តុលា';
-$labels['longnov'] = 'វិច្ឆិកា';
-$labels['longdec'] = 'ធ្នូ';
+$labels['thursday']  = 'ព្រហស្បតិ៍';
+$labels['friday']    = 'សុក្រ';
+$labels['saturday']  = 'សៅរ៍';
+
+// months short
+$labels['jan']	= 'មករា';
+$labels['feb']	= 'កុម្ភះ';
+$labels['mar']	= 'មិនា';
+$labels['apr']	= 'មេសា';
+$labels['may']	= 'ឧសភា';
+$labels['jun']	= 'មិថុនា';
+$labels['jul'] 	= 'កក្កដា';
+$labels['aug']	= 'សីហា';
+$labels['sep']	= 'កញ្ញា';
+$labels['oct']	= 'តុលា';
+$labels['nov']	= 'វិច្ឆិកា';
+$labels['dec']	= 'ធ្នូ';
+
+// months long
+$labels['longjan']	= 'មករា';
+$labels['longfeb']	= 'កុម្ភះ';
+$labels['longmar']	= 'មិនា';
+$labels['longapr']	= 'មេសា';
+$labels['longmay']	= 'ឧសភា';
+$labels['longjun']	= 'មិថុនា';
+$labels['longjul']	= 'កក្កដា';
+$labels['longaug']	= 'សីហា';
+$labels['longsep']	= 'កញ្ញា';
+$labels['longoct']	= 'តុលា';
+$labels['longnov']	= 'វិច្ឆិកា';
+$labels['longdec']	= 'ធ្នូ';
+
 $labels['today'] = 'ថ្ងៃនេះ';
-$labels['checkmail'] = 'ពិនិត្យសំបុត្រថ្មី';
-$labels['compose'] = 'សរសេរសំបុត្រថ្មី';
-$labels['writenewmessage'] = 'សរសេរសំបុត្រថ្មី';
-$labels['replytomessage'] = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'ពិនិត្យសំបុត្រថ្មី';
+$labels['compose']          = 'សរសេរសំបុត្រថ្មី';
+$labels['writenewmessage']  = 'សរសេរសំបុត្រថ្មី';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
 $labels['replytoallmessage'] = 'ឆ្លើយតបទៅ អ្នកទទួលទាំងអស់និង ក្រុម ឬ អ្នកផ្ញើ';
-$labels['replyall'] = 'ឆ្លើយតបទៅទាំងអស់គ្នា';
-$labels['replylist'] = 'ឆ្លើយតបទៅក្រុម';
-$labels['forwardmessage'] = 'ផ្ញើសំបុត្របន្តរ';
-$labels['deletemessage'] = 'លុបសំបុត្រចោល';
+$labels['replyall']         = 'ឆ្លើយតបទៅទាំងអស់គ្នា';
+$labels['replylist']        = 'ឆ្លើយតបទៅក្រុម';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'ផ្ញើសំបុត្របន្តរ';
+$labels['deletemessage']    = 'លុបសំបុត្រចោល';
 $labels['movemessagetotrash'] = 'ផ្ទេរសំបុត្រទៅក្នុងធុងសំរាម';
-$labels['printmessage'] = 'បោះពុម្ភសំបុត្រ';
-$labels['previousmessage'] = 'បង្ហាញសំបុត្រចាស់';
-$labels['firstmessage'] = 'បង្ហាញសំបុត្រដំបូង';
-$labels['nextmessage'] = 'បង្ហាញសំបុត្របន្ទាប់';
-$labels['lastmessage'] = 'បង្ហាញសំបុត្រចុងក្រោយ';
-$labels['backtolist'] = 'ត្រលប់ទៅកាន់ក្រុមសំបុត្រ';
-$labels['viewsource'] = 'បង្ហាញ Source របស់សំបុត្រ';
-$labels['markmessages'] = 'កំណត់សំគាល់សំបុត្រ';
-$labels['markread'] = 'កំណត់ថាបានអានរួច';
-$labels['markunread'] = 'កំណត់ថាមិនទាន់បានអាន';
-$labels['markflagged'] = 'កំណត់សំគាល់ដោយផ្កាយ';
-$labels['markunflagged'] = 'លុបកំណត់សំគាល់ដោយផ្កាយ';
+$labels['printmessage']     = 'បោះពុម្ភសំបុត្រ';
+$labels['previousmessage']  = 'បង្ហាញសំបុត្រចាស់';
+$labels['firstmessage']     = 'បង្ហាញសំបុត្រដំបូង';
+$labels['nextmessage']      = 'បង្ហាញសំបុត្របន្ទាប់';
+$labels['lastmessage']      = 'បង្ហាញសំបុត្រចុងក្រោយ';
+$labels['backtolist']       = 'ត្រលប់ទៅកាន់ក្រុមសំបុត្រ';
+$labels['viewsource']       = 'បង្ហាញ Source របស់សំបុត្រ';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'កំណត់សំគាល់សំបុត្រ';
+$labels['markread']         = 'កំណត់ថាបានអានរួច';
+$labels['markunread']       = 'កំណត់ថាមិនទាន់បានអាន';
+$labels['markflagged']      = 'កំណត់សំគាល់ដោយផ្កាយ';
+$labels['markunflagged']    = 'លុបកំណត់សំគាល់ដោយផ្កាយ';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'ជ្រើសរើស';
 $labels['all'] = 'ទាំងអស់';
 $labels['none'] = 'មិនតំរៀប';
-$labels['nonesort'] = 'មិនតំរៀប';
 $labels['currpage'] = 'ទំព័រនេះ';
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
 $labels['unanswered'] = 'មិនទាន់ឆ្លើយតប';
 $labels['deleted'] = 'បានលុបរួច';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'បញ្ច្រស់';
 $labels['filter'] = 'លក្ខខ័ណ្ឌ';
 $labels['list'] = 'តារាង';
@@ -130,12 +171,14 @@ $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'] = 'តាមលំដាប់ចុះ';
@@ -144,149 +187,216 @@ $labels['listcolumns'] = 'តារាងជួរឈ';
 $labels['listsorting'] = 'តំរៀបជួរឈ';
 $labels['listorder'] = 'លំដាប់នៃការតំរៀប';
 $labels['listmode'] = 'បង្ហាញជាតារាង';
+
 $labels['folderactions'] = 'មុខងារថត';
 $labels['compact'] = 'បង្រួម';
 $labels['empty'] = 'ទទេរ';
+
 $labels['quota'] = 'ទំហំសំបុត្រទាំងអស់ដែលមាន';
-$labels['unknown'] = 'មិនស្គាល់';
-$labels['unlimited'] = 'គ្មានកំនត់';
-$labels['quicksearch'] = 'ស្វែងរក';
-$labels['resetsearch'] = 'កំណត់លក្ខខ័ណ្ឌស្វែងរកជាថ្មី';
-$labels['searchmod'] = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
-$labels['msgtext'] = 'សំបុត្រទាំងមូល';
+$labels['unknown']  = 'មិនស្គាល់';
+$labels['unlimited']  = 'គ្មានកំនត់';
+
+$labels['quicksearch']  = 'ស្វែងរក';
+$labels['resetsearch']  = 'កំណត់លក្ខខ័ណ្ឌស្វែងរកជាថ្មី';
+$labels['searchmod']  = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
+$labels['msgtext']  = 'សំបុត្រទាំងមូល';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
-$labels['editasnew'] = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
-$labels['sendmessage'] = 'ផ្ញើសំបុត្រនេះ';
-$labels['savemessage'] = 'រក្សាទុកសំបុត្រពង្រៀង';
-$labels['addattachment'] = 'ឯកសារភ្ជាប់';
-$labels['charset'] = 'ប្រភេទអក្សរ';
-$labels['editortype'] = 'ប្រភេទ Editor';
-$labels['returnreceipt'] = 'អត្ថបទបញ្ជាក់ពីការត្រឡប់';
-$labels['dsn'] = 'ប្រាប់អំពីស្ថានភាពផ្ញើ';
-$labels['editidents'] = 'ផ្លាស់ប្តូរអត្តសញ្ញាណ';
+
+// message compose
+$labels['editasnew']      = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'ផ្ញើសំបុត្រនេះ';
+$labels['savemessage']    = 'រក្សាទុកសំបុត្រពង្រៀង';
+$labels['addattachment']  = 'ឯកសារភ្ជាប់';
+$labels['charset']        = 'ប្រភេទអក្សរ';
+$labels['editortype']     = 'ប្រភេទ Editor';
+$labels['returnreceipt']  = 'អត្ថបទបញ្ជាក់ពីការត្រឡប់';
+$labels['dsn']            = 'ប្រាប់អំពីស្ថានភាពផ្ញើ';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'ផ្លាស់ប្តូរអត្តសញ្ញាណ';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ពិនិត្យអក្ខរាវិរុទ្ធ';
 $labels['resumeediting'] = 'បន្តរការកែតំរូវ';
-$labels['revertto'] = 'ត្រលប់ទៅ';
+$labels['revertto']      = 'ត្រលប់ទៅ';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ឯកសារភ្ជាប់';
 $labels['upload'] = 'ភ្ជាប់ឯកសារ';
-$labels['close'] = 'បិទ';
-$labels['messageoptions'] = 'កំណត់ជំរើសរបស់សំបុត្រ';
-$labels['low'] = 'ទាប';
-$labels['lowest'] = 'ទាបបំផុត';
-$labels['normal'] = 'ធម្មតា';
-$labels['high'] = 'ខ្ពស់';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'បិទ';
+$labels['messageoptions']  = 'កំណត់ជំរើសរបស់សំបុត្រ';
+
+$labels['low']     = 'ទាប';
+$labels['lowest']  = 'ទាបបំផុត';
+$labels['normal']  = 'ធម្មតា';
+$labels['high']    = 'ខ្ពស់';
 $labels['highest'] = 'ខ្ពស់បំផុត';
-$labels['nosubject'] = '(គ្មានចំណងជើង)';
+
+$labels['nosubject']  = '(គ្មានចំណងជើង)';
 $labels['showimages'] = 'បង្ហាញរូបភាព';
 $labels['alwaysshow'] = 'បង្ហាញជានិច្ចរាល់រូបភាពបញ្ជូនពី$sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'អត្ថបទ HTML';
 $labels['plaintoggle'] = 'អត្ថបទធម្មតា';
 $labels['savesentmessagein'] = 'រក្សាសំបុត្រដែលបានផ្ញើក្នុង';
 $labels['dontsave'] = 'មិនរក្សាទុក';
 $labels['maxuploadsize'] = 'ទំហំឯកសារធំបំផុតដែលអាចភ្ជាប់បានគឺ$size';
+
 $labels['addcc'] = 'បន្ថែម Cc';
 $labels['addbcc'] = 'បន្ថែម Bcc';
 $labels['addreplyto'] = 'បន្ថែម Reply-To';
 $labels['addfollowupto'] = 'បន្ថែម Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
 $labels['receiptread'] = 'អត្ថបទផ្ញើត្រលប់ (បានអាន)';
 $labels['yourmessage'] = 'នេះគឺជាអត្ថបទផ្ញើត្រលប់សំរាប់សំបុត្ររបស់លោកអ្នក។';
-$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['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'ឈ្មោះសំរាប់បង្ហាញ';
+$labels['firstname']    = 'នាមត្រកូល';
+$labels['surname']      = 'នាមខ្លួន';
+$labels['middlename']   = 'ឈ្មោះកណ្តាល';
+$labels['nameprefix']   = 'ពាក្យពីមុខឈ្មោះ';
+$labels['namesuffix']   = 'ពាក្យពីក្រោយឈ្មោះ';
+$labels['nickname']     = 'ឈ្មោះហៅក្រៅ';
+$labels['jobtitle']     = 'ឈ្មោះការងារ';
+$labels['department']   = 'នាយកដ្ឋាន';
+$labels['gender']       = 'ភេទ';
+$labels['maidenname']   = 'ឈ្មោះពីកំណើត';
+$labels['email']        = 'អ៊ីមែល';
+$labels['phone']        = 'ទូរស័ព្ទ';
+$labels['address']      = 'អាសយដ្ឋាន';
+$labels['street']       = 'ផ្លូវ';
+$labels['locality']     = 'ទីក្រុង';
+$labels['zipcode']      = 'លេខប៉ុស្តិ៍';
+$labels['region']       = 'តំបន់';
+$labels['country']      = 'ប្រទេស';
+$labels['birthday']     = 'ថ្ងៃខួបកំណើត';
+$labels['anniversary']  = 'ខួប';
+$labels['website']      = 'គេហទំព័រ';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'កំណត់ហេតុ';
-$labels['male'] = 'ប្រុស';
+$labels['male']   = 'ប្រុស';
 $labels['female'] = 'ស្រី';
 $labels['manager'] = 'នាយក';
 $labels['assistant'] = 'ជំនួយការ';
-$labels['typeassistant'] = 'ជំនួយការ';
 $labels['spouse'] = 'គ្រួសារ';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
 $labels['other'] = 'ផ្សេងពីនេះ';
-$labels['typeother'] = 'ផ្សេងពីនេះ';
-$labels['typehome'] = 'គេហដ្ឋាន';
-$labels['typework'] = 'កន្លែងធ្វើការ';
-$labels['typemobile'] = 'ទូរស័ព្ទដៃ';
-$labels['typemain'] = 'ចំបង';
-$labels['typehomefax'] = 'ទូរសារនៅគេហដ្ឋាន';
-$labels['typeworkfax'] = 'ទូរសារនៅកន្លែងធ្វើការ';
-$labels['typecar'] = 'រថយន្ត';
-$labels['typepager'] = 'ឧបករណ៍ផ្តល់សារ';
-$labels['typevideo'] = 'វីដេអូរ';
+
+$labels['typehome']   = 'គេហដ្ឋាន';
+$labels['typework']   = 'កន្លែងធ្វើការ';
+$labels['typeother']  = 'ផ្សេងពីនេះ';
+$labels['typemobile']  = 'ទូរស័ព្ទដៃ';
+$labels['typemain']  = 'ចំបង';
+$labels['typehomefax']  = 'ទូរសារនៅគេហដ្ឋាន';
+$labels['typeworkfax']  = 'ទូរសារនៅកន្លែងធ្វើការ';
+$labels['typecar']  = 'រថយន្ត';
+$labels['typepager']  = 'ឧបករណ៍ផ្តល់សារ';
+$labels['typevideo']  = 'វីដេអូរ';
+$labels['typeassistant']  = 'ជំនួយការ';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
 $labels['addfield'] = 'បន្ថែម';
 $labels['addcontact'] = 'បន្ថែមអាសយដ្ឋានទាក់ទង';
 $labels['editcontact'] = 'កែប្រែអាសយដ្ឋានទាក់ទង';
 $labels['contacts'] = 'អាសយដ្ឋានទាក់ទងទាំងអស់';
 $labels['contactproperties'] = 'ព័ត៌មានអំពីទំនាក់ទំនង';
 $labels['personalinfo'] = 'ព័ត៌មានផ្ទាល់ខ្លួន';
-$labels['edit'] = 'កែតំរូវ';
+
+$labels['edit']   = 'កែតំរូវ';
 $labels['cancel'] = 'លះបង់';
-$labels['save'] = 'រក្សាទុក';
+$labels['save']   = 'រក្សាទុក';
 $labels['delete'] = 'លុបចោល';
 $labels['rename'] = 'ប្តូរឈ្មោះ';
 $labels['addphoto'] = 'បន្ថែមរូបថត';
 $labels['replacephoto'] = 'លុបរូបថត';
-$labels['newcontact'] = 'បង្កើតអាសយដ្ឋានទាក់ទងថ្មី';
-$labels['deletecontact'] = 'លុបអាសយដ្ឋានទាក់ទងដែលបានជ្រើសរើស';
-$labels['composeto'] = 'ផ្ញើសំបុត្រទៅ';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'បង្កើតអាសយដ្ឋានទាក់ទងថ្មី';
+$labels['deletecontact']  = 'លុបអាសយដ្ឋានទាក់ទងដែលបានជ្រើសរើស';
+$labels['composeto']      = 'ផ្ញើសំបុត្រទៅ';
 $labels['contactsfromto'] = 'អាសយដ្ឋានទាក់ទង $from ដល់ $to នៃ$count';
-$labels['print'] = 'បោះពុម្ភ';
-$labels['export'] = 'ទាញនិងរក្សាទុក';
-$labels['exportvcards'] = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទvCard';
+$labels['print']          = 'បោះពុម្ភ';
+$labels['export']         = 'ទាញនិងរក្សាទុក';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទvCard';
 $labels['newcontactgroup'] = 'បង្កើតក្រុមអាសយដ្ឋានថ្មី';
-$labels['previouspage'] = 'ទំព័រមុន';
-$labels['firstpage'] = 'ទំព័រដំបូង';
-$labels['nextpage'] = 'ទំព័របន្ទាប់';
-$labels['lastpage'] = 'ទំព័រចុងក្រោយ';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'ទំព័រមុន';
+$labels['firstpage']      = 'ទំព័រដំបូង';
+$labels['nextpage']       = 'ទំព័របន្ទាប់';
+$labels['lastpage']       = 'ទំព័រចុងក្រោយ';
+
 $labels['group'] = 'ក្រុម';
 $labels['groups'] = 'ក្រុម';
 $labels['personaladrbook'] = 'អាសយដ្ឋានផ្ទាល់ខ្លួន';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'បញ្ចូល';
 $labels['importcontacts'] = 'បញ្ចូលអាសយដ្ឋាន';
 $labels['importfromfile'] = 'បញ្ចូលពី ឯកសារ';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'ផ្លាស់ប្តូរអាសយដ្ឋានទាំងអស់';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'ចប់រួចរាល់';
+
+// settings
 $labels['settingsfor'] = 'កំណត់សំរាប់';
+$labels['about'] = 'About';
 $labels['preferences'] = 'កំណត់តាមការចូលចិត្ត';
 $labels['userpreferences'] = 'កំណត់តាមការចូលចិត្តរបស់អ្នកប្រើ';
 $labels['editpreferences'] = 'ផ្លាស់ប្តូរការចូលចិត្តរបស់អ្នកប្រើ';
+
 $labels['identities'] = 'អត្តសញ្ញាណ';
 $labels['manageidentities'] = 'គ្រប់គ្រងអត្តសញ្ញាណ';
 $labels['newidentity'] = 'អត្តសញ្ញាណថ្មី';
+
 $labels['newitem'] = 'វត្ថុថ្មី';
 $labels['edititem'] = 'កែប្រែវត្ថុ';
+
 $labels['preferhtml'] = 'បង្ហាញជា HTML';
 $labels['defaultcharset'] = 'លេខកូតអក្សរមានស្រាប់';
 $labels['htmlmessage'] = 'សំបុត្រប្រភេទ HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'កាលបរិច្ឆេតងាយស្រួលមើល';
-$labels['setdefault'] = 'កំណត់ទុក';
-$labels['autodetect'] = 'ស្វ័យប្រវត្តិ';
-$labels['language'] = 'ភាសា';
-$labels['timezone'] = 'ម៉ោង';
-$labels['pagesize'] = 'ចំនួនសំបុត្រក្នុងមួយទំព័រ';
+$labels['setdefault']  = 'កំណត់ទុក';
+$labels['autodetect']  = 'ស្វ័យប្រវត្តិ';
+$labels['language']  = 'ភាសា';
+$labels['timezone']  = 'ម៉ោង';
+$labels['pagesize']  = 'ចំនួនសំបុត្រក្នុងមួយទំព័រ';
 $labels['signature'] = 'ហត្ថលេខា';
-$labels['dstactive'] = 'ម៉ោងវស្សានរដូវ';
+$labels['dstactive']  = 'ម៉ោងវស្សានរដូវ';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'សរសេរសំបុត្រតាមបែប HTML';
 $labels['htmlonreply'] = 'ឆ្លើយតបសំបុត្រតាមបែប HTML';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ហត្ថលេខាតាមបែប HTML';
 $labels['previewpane'] = 'បង្ហាញប្រអប់សំរាប់មើលសំបុត្រ';
 $labels['skin'] = 'ការរចនាទំព័រ';
@@ -305,14 +415,16 @@ $labels['readwhendeleted'] = 'កំណត់សំបុត្រថាបា�
 $labels['flagfordeletion'] = 'កំណត់សញ្ញាផ្កាយអោយសំបុត្រថាបានលុបដោយមិនចាំបាច់លុបជាក់ស្តែង';
 $labels['skipdeleted'] = 'មិនបង្ហាញសំបុត្រដែលបានលុប';
 $labels['deletealways'] = 'លុបសំបុត្រចោលប្រសិនជាមិនអាចផ្ទេសំបុត្រនោះទៅធុងសំរាមបាន';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'បង្ហាញរូបភាពដែលគេផ្ញើមក';
 $labels['fromknownsenders'] = 'ពីអ្នកផ្ញើដែលស្គាល់';
 $labels['always'] = 'គ្រប់ពេល';
 $labels['showinlineimages'] = 'បង្ហាញរូបភាពនៅក្រោមអត្ថបទសំបុត្រ';
-$labels['autosavedraft'] = 'រក្សាទុកសំបុត្រពង្រៀងដោយស្វ័យប្រវត្តិ';
-$labels['everynminutes'] = 'រៀងរាល់ $n នាទី';
-$labels['never'] = 'មិនដែល';
-$labels['immediately'] = 'ភ្លាមៗ';
+$labels['autosavedraft']  = 'រក្សាទុកសំបុត្រពង្រៀងដោយស្វ័យប្រវត្តិ';
+$labels['everynminutes']  = 'រៀងរាល់ $n នាទី';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'មិនដែល';
+$labels['immediately']  = 'ភ្លាមៗ';
 $labels['messagesdisplaying'] = 'កំពុងបង្ហាញសំបុត្រ';
 $labels['messagescomposition'] = 'កំពុងសរសេរសំបុត្រ';
 $labels['mimeparamfolding'] = 'ឈ្មោះឯកសារភ្ជាប់';
@@ -324,12 +436,15 @@ $labels['advancedoptions'] = 'ការកំណត់ពឹស្តារ';
 $labels['focusonnewmessage'] = 'ផ្តោតលើវីនដូវដែលកំពុងសរសេរសំបុត្រថ្មី';
 $labels['checkallfolders'] = 'ពិនិត្យសំបុត្រថ្មីនៅគ្រប់ថតទាំងអស់';
 $labels['displaynext'] = 'បន្ទាប់ពីសំបុត្រត្រូវបានលុប​ឬផ្ទេរបង្ហាញសំបុត្របន្ទាប់';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'ជំរើសដែលជាគោល';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'ផ្នែក';
 $labels['maintenance'] = 'ការថែរក្សា';
 $labels['newmessage'] = 'សំបុត្រថ្មី';
 $labels['signatureoptions'] = 'កំណត់ហត្ថលេខា';
 $labels['whenreplying'] = 'នៅពេលកំពុងឆ្លើយតប';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'ចាប់ផ្តើម​សរសេរ​ពី​លើ​សំបុត្រ​ដើម';
 $labels['replybottomposting'] = 'ចាប់ផ្តើមសរសេរពីក្រោមសំបុត្រដើម';
 $labels['replyremovesignature'] = 'នៅ​ពេល​ឆ្លើយ​តប​លុប​ហត្ថលេខា​ចេញ​ពីសំបុត្រ';
@@ -340,18 +455,33 @@ $labels['replysignaturepos'] = 'បញ្ចូលហត្តលេខានៅ
 $labels['belowquote'] = 'ពីក្រោមសម្រង់អត្ថបទ';
 $labels['abovequote'] = 'ពីលើសម្រង់អត្ថបទ';
 $labels['insertsignature'] = 'បញ្ចូលហត្តលេខា';
-$labels['previewpanemarkread'] = 'កំណត់សំបុត្រ​ដែល​បាន​បង្ហាញ​​ជា​សំបុត្របាន​អាន​រួច';
-$labels['afternseconds'] = 'ក្រោយពី $n វិនាទី';
+$labels['previewpanemarkread']  = 'កំណត់សំបុត្រ​ដែល​បាន​បង្ហាញ​​ជា​សំបុត្របាន​អាន​រួច';
+$labels['afternseconds']  = 'ក្រោយពី $n វិនាទី';
 $labels['reqmdn'] = 'ក្រោយពី $n វិនាទី';
 $labels['reqdsn'] = 'ក្រោយពី $n វិនាទី';
 $labels['replysamefolder'] = 'ក្រោយពី $n វិនាទី';
-$labels['folder'] = 'ថត';
-$labels['foldername'] = 'ឈ្មោះថត';
-$labels['subscribed'] = 'កំណត់យកមកប្រើ';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'ថត';
+$labels['folders']  = 'ថតទាំងអស់';
+$labels['foldername']  = 'ឈ្មោះថត';
+$labels['subscribed']  = 'កំណត់យកមកប្រើ';
 $labels['messagecount'] = 'សំបុត្រ';
-$labels['create'] = 'បង្កើត';
-$labels['createfolder'] = 'បង្កើតថតថ្មី';
-$labels['managefolders'] = 'រៀបចំថត';
+$labels['create']  = 'បង្កើត';
+$labels['createfolder']  = 'បង្កើតថតថ្មី';
+$labels['managefolders']  = 'រៀបចំថត';
 $labels['specialfolders'] = 'ថតពិសេស';
 $labels['properties'] = 'ព័ត៌មាន';
 $labels['folderproperties'] = 'ព័ត៌មានអំពីថត';
@@ -360,13 +490,30 @@ $labels['location'] = 'ទីកន្លែង';
 $labels['info'] = 'ព័ត៌មាន';
 $labels['getfoldersize'] = 'ទំហំថត';
 $labels['changesubscription'] = 'ផ្លាស់ប្តូរការជាវ';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'តំរៀបតាម';
-$labels['sortasc'] = 'តំរៀបតាមលំដាប់ចុះ';
+$labels['sortasc']  = 'តំរៀបតាមលំដាប់ចុះ';
 $labels['sortdesc'] = 'តំរៀបតាមលំដាប់ឡើង';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'យូនីកូដ';
 $labels['english'] = 'ភាសាអង់គ្លេស';
 $labels['westerneuropean'] = 'អឺរ៉ុបខាងលិច';
@@ -386,3 +533,4 @@ $labels['japanese'] = 'ភាសាជប៉ុន';
 $labels['korean'] = 'ភាសាកូរ៉េ';
 $labels['chinese'] = 'ភាសាចិន';
 
+?>
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index 9984cc554..c9ede486e 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -2,33 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ការពិនិត្យចូលមិនបានសំរេចព្រោះមានបញ្ហាកើតឡើង';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'ការពិនិត្យចូលមិនបានសំរេចព្រោះមានបញ្ហាកើតឡើង';
 $messages['cookiesdisabled'] = 'កម្មវិធីមើលគេហទំព័រនេះមិនទទួលយកCookies';
 $messages['sessionerror'] = 'Session មិនត្រឹមត្រូវ ឬហួសកំណត់';
 $messages['storageerror'] = 'មិនអាចភ្ជាប់ទៅកាន់ម៉ាស៊ីនIMAP';
 $messages['servererror'] = 'មានបញ្ហានៅម៉ាស៊ីនមេ';
 $messages['servererrormsg'] = 'បញ្ហា: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះថតនេះត្រូវបានគេកំណត់សំរាប់តែមើល';
 $messages['errornoperm'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះមិនមានសិទ្ទគ្រប់គ្រាន់';
 $messages['invalidrequest'] = 'មិនអាចរក្សាទុកទិន្នន័យបានពីព្រោះមានបញ្ហានៅពេលបញ្ជូនទិន្នន័យ';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ពុំមានសំបុត្រក្នុងប្រអប់សំបុត្រនេះទេ';
 $messages['loggedout'] = 'អ្នកបានពិនិត្យចេញដោយជោគជ័យ។';
 $messages['mailboxempty'] = 'ប្រអប់សំបុត្រទទេ';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'កំពុងដំណើរការ...';
 $messages['uploading'] = 'កំពុងបញ្ជូនឯកសារ...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'កំពុងបើកឯកសារ...';
 $messages['checkingmail'] = 'កំពុងស្វែងរកមើលសំបុត្រថ្មី៝...';
 $messages['sendingmessage'] = 'កំពុងផ្ញើសំបុត្រ...';
@@ -38,10 +46,12 @@ $messages['messagesaved'] = 'សំបុត្រត្រូវបានរក
 $messages['successfullysaved'] = 'រក្សាទុកដោយជោគជ័យ';
 $messages['addedsuccessfully'] = 'អាសយដ្ឋានត្រូវបានរក្សាទុកដោយជោគជ័យ';
 $messages['contactexists'] = 'ព័ត៌មានទាក់ទងដែលមានអ៊ីមែលនេះមានក្នុងសៀវភៅអាសយដ្ឋានរួចហើយ';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'រូបភាពដែលមានក្នុងសំបុត្រនេះត្រូវបានបិទដើម្បីរក្សាសុវត្ថភាព';
 $messages['encryptedmessage'] = 'លោកអ្នកមិនអាចមើលសំបុត្រនេះបានទេពីព្រោះសំបុត្រនេះជាសំបុត្រសំងាត់';
 $messages['nocontactsfound'] = 'ពុំមានអាសយដ្ឋានទាក់ទងទេ';
 $messages['contactnotfound'] = 'អាសយដ្ឋានទាក់ទងដែលលោកអ្នកចង់រកពុំមានឡើយ';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'មិនអាចផ្ញើសំបុត្របាន';
 $messages['senttooquickly'] = 'សូមរងចាំ $sec វិនាទីមុននឹងផ្ញើសំបុត្រនេះ';
 $messages['errorsavingsent'] = 'មានបញ្ហាកើតឡើងនៅពេលកំពុងរក្សាទុកសំបុត្រដែលបានផ្ញើរួច';
@@ -50,26 +60,31 @@ $messages['errormoving'] = 'មិនអាចផ្ទេរសំបុត្�
 $messages['errorcopying'] = 'មិនអាចចំលងសំបុត្របាន';
 $messages['errordeleting'] = 'មិនអាចលុបសំបុត្រចោលបាន';
 $messages['errormarking'] = 'មិនអាចកំណត់ចំណាំលើសំបុត្របាន';
-$messages['deletecontactconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបព័ត៌មានទំនាក់ទំនងនេះមែនទេ?';
+$messages['deletecontactconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបព័ត៌មានទំនាក់ទំនងនេះមែនទេ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រនេះមែនទេ?';
-$messages['deletefolderconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
-$messages['purgefolderconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រទាំងអស់នៅក្នុងថតនេះមែនទេ?';
+$messages['deletefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
+$messages['purgefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រទាំងអស់នៅក្នុងថតនេះមែនទេ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'កំពុងលុបថតសំរាប់ទុកឯកសារ...';
 $messages['foldermoving'] = 'កំពុងផ្ទេរថតសំរាប់ទុកឯកសារ...';
 $messages['foldersubscribing'] = 'កំពុងកំណត់ប្រើថតសំរាប់ទុកឯកសារ...';
 $messages['folderunsubscribing'] = 'កំពុងកំណត់មិនប្រើថតសំរាប់ទុកឯកសារ...';
 $messages['formincomplete'] = 'សូមបំពេញទិន្នន័យអោយបានគ្រប់';
 $messages['noemailwarning'] = 'អ៊ីមែលត្រឹមត្រូវ';
-$messages['nonamewarning'] = 'សូមសរសេរឈ្មោះរបស់អ្នក';
+$messages['nonamewarning']  = 'សូមសរសេរឈ្មោះរបស់អ្នក';
 $messages['nopagesizewarning'] = 'សូមកំណត់ទំហំទំព័រ';
 $messages['nosenderwarning'] = 'សូមសរសេរអ៊ីមែលរបស់អ្នកផ្ញើ';
 $messages['norecipientwarning'] = 'សូមសរសេរអ្នកទទួលយ៉ាងហោចណាស់ម្នាក់';
-$messages['nosubjectwarning'] = 'សំបុត្រគ្មានចំណងជើងតើអ្នកចង់សរសេរចំណងជើងនៅពេលនេះទេ?';
+$messages['nosubjectwarning']  = 'សំបុត្រគ្មានចំណងជើងតើអ្នកចង់សរសេរចំណងជើងនៅពេលនេះទេ?';
 $messages['nobodywarning'] = 'តើលោកអ្នកចង់ផ្ញើសំបុត្រដែលគ្មានតួអត្ថបទសំបុត្រទេ?';
 $messages['notsentwarning'] = 'សំបុត្រនេះមិនទាន់បានផ្ញើទេ។ តើលោកអ្នកចង់លុបចោលទេ?';
 $messages['noldapserver'] = 'សូមកំណត់ម៉ាស៊ីន LDAPដើម្បីស្វែងរក';
 $messages['nosearchname'] = 'សូមបំពេញឈ្មោះទំនាក់ទំនង ឬអាសយដ្ឋានអ៊ីមែល';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'រកឃើញសំបុត្រចំនួន $nr';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'រកមិនឃើញអ្វីទាំងអស់';
 $messages['searching'] = 'កំពុងស្វែងរក...';
 $messages['checking'] = 'កំពុងពិនិត្យរក...';
@@ -90,21 +105,29 @@ $messages['sourceisreadonly'] = 'លោកអ្នកមានសិទ្ធ�
 $messages['errorsavingcontact'] = 'មិនអាចរក្សាអាសយដ្ឋានបានទេ';
 $messages['movingmessage'] = 'កំពុកផ្តេរសំបុត្រ...';
 $messages['copyingmessage'] = 'កំពុងចំលងសំបុត្រ...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
 $messages['deletingmessage'] = 'កំពុងលុបសំបុត្រ...';
 $messages['markingmessage'] = 'កំពុងកំណត់សំគាល់សំបុត្រ...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'បានបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអានបានសំរេច';
 $messages['errorsendingreceipt'] = 'មិនអាចបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអាន ទេ';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'លោកអ្នកមិនអាចលុបអត្តសញ្ញាណនេះទេព្រោះវានៅសល់ចុងក្រោយគេ';
 $messages['forbiddencharacter'] = 'ឈ្មោះថតនេះមានអក្សរដែលត្រូវហាមឃាត់';
 $messages['selectimportfile'] = 'សូមជ្រើសរើសឯកសារដើម្បីបញ្ជូនភ្ជាប់';
 $messages['addresswriterror'] = 'សៀវភៅអាសយដ្ឋាននោះមិនអាចសរសេរចូលបានទេ';
 $messages['contactaddedtogroup'] = 'បានដាក់ពត៌មានទំនាក់ទំនងចូលក្នុងក្រុមនេះដោយជោគជ័យ';
 $messages['contactremovedfromgroup'] = 'បានលុបពត៌មានទំនាក់ទំនងចេញពីក្រុមនេះដោយជោគជ័យ';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'សូមមេត្តារង់ចាំកំពុងទាញទិន្នន័យចូល ...';
-$messages['importerror'] = 'ការទាញចូលមិនបានសំរេច!ឯកសារដែលជ្រើសរើសនោះមិនមែនជាប្រភេទឯកសារvCard ទេ ។';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>ព័ត៌មានទំនាក់ទំនង $insertedបានបញ្ចូលដោយជោគជ័យ,ហើយបានរំលងចោលពត៌មានដែលមានស្រាប់$skipped </b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'ប្រតិ្តបត្តិការត្រូវបានគេហាមឃាត់!';
 $messages['nofromaddress'] = 'ខ្វះអាសយដ្ឋានអ៊ីមែលក្នុងអត្តសញ្ណាណមួយនេះ';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code):មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេ';
 $messages['smtpautherror'] = 'SMTP Error ($code):ព័ត៌មានគនីយមិនត្រឹមត្រូវ';
 $messages['smtpfromerror'] = 'SMTP Error ($code):មិនអាចកំនត់អ្នកផ្ញើ "$from" ($msg)';
@@ -117,17 +140,30 @@ $messages['maxgroupmembersreached'] = 'ចំនួនក្រុមលើស�
 $messages['internalerror'] = 'មានបញ្ហាខាងម៉ាស៊ីនមេ ។សូមព្យាយាមម្តងទៀត!';
 $messages['contactdelerror'] = 'មិនអាចលុបអាសយដ្ឋានទំនាក់ទំនង';
 $messages['contactdeleted'] = 'អាសយដ្ឋានទំនាក់ទំនងត្រូវបានលុបដោយជោគជ័យ';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
 $messages['groupdeleted'] = 'លុបក្រុមបានដោយជោគជ័យ';
 $messages['grouprenamed'] = 'ប្តូរឈ្មោះក្រុមបានដោយជោគជ័យ';
 $messages['groupcreated'] = 'បង្កើតក្រុមបានដោយជោគជ័យ';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = 'លុបសំបុត្របានដោយជោគជ័យ';
 $messages['messagemoved'] = 'ផ្ទេរសំបុត្របានដោយជោគជ័យ';
 $messages['messagecopied'] = 'ចំលងសំបុត្របានដោយជោគជ័យ';
 $messages['messagemarked'] = 'កំណត់សំគាល់សំបុត្របានដោយជោគជ័យ';
 $messages['autocompletechars'] = 'សូមសរសេរអក្សរយ៉ាងតិច $minដើម្បីបង្ហាយដោយស្វ័យប្រវត្តិ';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'សូមសរសេរឈ្មោះ';
 $messages['nametoolong'] = 'ឈ្មោះវែងពេក';
 $messages['folderupdated'] = 'ផ្លាស់ប្តូរថតបានដោយជោគជ័យ';
 $messages['foldercreated'] = 'បង្កើតថតបានដោយជោគជ័យ';
 $messages['invalidimageformat'] = 'ប្រភេទរូបភាពមិនត្រឹមត្រូវ';
+$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/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 3f8ba0576..504fd908e 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -2,54 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product에 오신 것을 환영합니다';
-$labels['username'] = '사용자명';
-$labels['password'] = '비밀번호';
-$labels['server'] = '서버';
-$labels['login'] = '로그인';
-$labels['logout'] = '로그아웃';
-$labels['mail'] = '이메일';
+
+// login page
+$labels['welcome']   = '$product에 오신 것을 환영합니다';
+$labels['username']  = '사용자명';
+$labels['password']  = '비밀번호';
+$labels['server']    = '서버';
+$labels['login']     = '로그인';
+
+// taskbar
+$labels['logout']   = '로그아웃';
+$labels['mail']     = '이메일';
 $labels['settings'] = '개인 설정';
 $labels['addressbook'] = '주소록';
-$labels['inbox'] = '받은편지함';
+
+// mailbox names
+$labels['inbox']  = '받은편지함';
 $labels['drafts'] = '임시저장';
-$labels['sent'] = '보낸편지함';
-$labels['trash'] = '휴지통';
-$labels['junk'] = '정크메일';
+$labels['sent']   = '보낸편지함';
+$labels['trash']  = '휴지통';
+$labels['junk']   = '정크메일';
+
+// message listing
 $labels['subject'] = '제목';
-$labels['from'] = '보내는 사람';
-$labels['to'] = '받는 사람';
-$labels['cc'] = '참조';
-$labels['bcc'] = '숨은 참조';
+$labels['from']    = '보내는 사람';
+$labels['sender']  = 'Sender';
+$labels['to']      = '받는 사람';
+$labels['cc']      = '참조';
+$labels['bcc']     = '숨은 참조';
 $labels['replyto'] = '회신 주소';
-$labels['date'] = '날짜';
-$labels['size'] = '크기';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = '날짜';
+$labels['size']    = '크기';
 $labels['priority'] = '우선순위';
 $labels['organization'] = '기관';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = '폴더';
-$labels['folders'] = '폴더';
 $labels['messagesfromto'] = '$count 개 중 $from 에서 $to 번 메시지';
 $labels['threadsfromto'] = '$from 에서 $to 까지 $count 개의 쓰레드';
 $labels['messagenrof'] = '$count 개 중 $nr 번 메시지';
-$labels['copy'] = '참조';
-$labels['move'] = '이동';
-$labels['moveto'] = '이동...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = '참조';
+$labels['move']     = '이동';
+$labels['moveto']   = '이동...';
 $labels['download'] = '다운로드';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = '파일 이름';
 $labels['filesize'] = '파일 크기';
+
 $labels['addtoaddressbook'] = '주소록에 추가';
+
+// weekdays short
 $labels['sun'] = '일';
 $labels['mon'] = '월';
 $labels['tue'] = '화';
@@ -57,255 +80,323 @@ $labels['wed'] = '수';
 $labels['thu'] = '목';
 $labels['fri'] = '금';
 $labels['sat'] = '토';
-$labels['sunday'] = '일요일';
-$labels['monday'] = '월요일';
-$labels['tuesday'] = '화요일';
+
+// weekdays long
+$labels['sunday']    = '일요일';
+$labels['monday']    = '월요일';
+$labels['tuesday']   = '화요일';
 $labels['wednesday'] = '수요일';
-$labels['thursday'] = '목요일';
-$labels['friday'] = '금요일';
-$labels['saturday'] = '토요일';
-$labels['jan'] = '1월';
-$labels['feb'] = '2월';
-$labels['mar'] = '3월';
-$labels['apr'] = '4월';
-$labels['may'] = '5월';
-$labels['longmay'] = '5월';
-$labels['jun'] = '6월';
-$labels['jul'] = '7월';
-$labels['aug'] = '8월';
-$labels['sep'] = '9월';
-$labels['oct'] = '10월';
-$labels['nov'] = '11월';
-$labels['dec'] = '12월';
-$labels['longjan'] = '1월';
-$labels['longfeb'] = '2월';
-$labels['longmar'] = '3월';
-$labels['longapr'] = '4월';
-$labels['longjun'] = '6월';
-$labels['longjul'] = '7월';
-$labels['longaug'] = '8월';
-$labels['longsep'] = '9월';
-$labels['longoct'] = '10월';
-$labels['longnov'] = '11월';
-$labels['longdec'] = '12월';
+$labels['thursday']  = '목요일';
+$labels['friday']    = '금요일';
+$labels['saturday']  = '토요일';
+
+// months short
+$labels['jan']	= '1월';
+$labels['feb']	= '2월';
+$labels['mar']	= '3월';
+$labels['apr']	= '4월';
+$labels['may']	= '5월';
+$labels['jun']	= '6월';
+$labels['jul'] 	= '7월';
+$labels['aug']	= '8월';
+$labels['sep']	= '9월';
+$labels['oct']	= '10월';
+$labels['nov']	= '11월';
+$labels['dec']	= '12월';
+
+// months long
+$labels['longjan']	= '1월';
+$labels['longfeb']	= '2월';
+$labels['longmar']	= '3월';
+$labels['longapr']	= '4월';
+$labels['longmay']	= '5월';
+$labels['longjun']	= '6월';
+$labels['longjul']	= '7월';
+$labels['longaug']	= '8월';
+$labels['longsep']	= '9월';
+$labels['longoct']	= '10월';
+$labels['longnov']	= '11월';
+$labels['longdec']	= '12월';
+
 $labels['today'] = '오늘';
-$labels['refresh'] = '새로 고침';
-$labels['checkmail'] = '새 메일 확인';
-$labels['compose'] = '메일 쓰기';
-$labels['writenewmessage'] = '새 메일 작성';
-$labels['reply'] = '회신';
-$labels['replytomessage'] = '회신 작성';
+
+// toolbar buttons
+$labels['refresh']          = '새로 고침';
+$labels['checkmail']        = '새 메일 확인';
+$labels['compose']          = '메일 쓰기';
+$labels['writenewmessage']  = '새 메일 작성';
+$labels['reply']            = '회신';
+$labels['replytomessage']   = '회신 작성';
 $labels['replytoallmessage'] = '보낸이와 모든 수신자에게 회신';
-$labels['replyall'] = '전체 회신';
-$labels['replylist'] = '회신 목록';
-$labels['forward'] = '전달';
-$labels['forwardinline'] = '전달';
+$labels['replyall']         = '전체 회신';
+$labels['replylist']        = '회신 목록';
+$labels['forward']          = '전달';
+$labels['forwardinline']    = '전달';
 $labels['forwardattachment'] = '메일을 첨부파일로 전달';
-$labels['forwardmessage'] = '메일 전달';
-$labels['deletemessage'] = '메일 삭제';
+$labels['forwardmessage']   = '메일 전달';
+$labels['deletemessage']    = '메일 삭제';
 $labels['movemessagetotrash'] = '메일 휴지통으로 이동';
-$labels['printmessage'] = '메일 인쇄';
-$labels['previousmessage'] = '이전 메일 보기';
-$labels['firstmessage'] = '처음 메일 보기';
-$labels['nextmessage'] = '다음 메일 보기';
-$labels['lastmessage'] = '마지막 메일 보기';
-$labels['backtolist'] = '메일 목록으로';
-$labels['viewsource'] = '소스 보기';
-$labels['mark'] = '표시';
-$labels['markmessages'] = '메시지 표시';
-$labels['markread'] = '읽은 것으로 표시';
-$labels['markunread'] = '읽지 않은 것으로 표시';
-$labels['markflagged'] = '깃발 달기';
-$labels['markunflagged'] = '깃발 내리기';
-$labels['moreactions'] = '이외의 동작...';
-$labels['more'] = '더보기';
-$labels['back'] = '뒤로';
-$labels['options'] = '선택 사항';
+$labels['printmessage']     = '메일 인쇄';
+$labels['previousmessage']  = '이전 메일 보기';
+$labels['firstmessage']     = '처음 메일 보기';
+$labels['nextmessage']      = '다음 메일 보기';
+$labels['lastmessage']      = '마지막 메일 보기';
+$labels['backtolist']       = '메일 목록으로';
+$labels['viewsource']       = '소스 보기';
+$labels['mark']             = '표시';
+$labels['markmessages']     = '메시지 표시';
+$labels['markread']         = '읽은 것으로 표시';
+$labels['markunread']       = '읽지 않은 것으로 표시';
+$labels['markflagged']      = '깃발 달기';
+$labels['markunflagged']    = '깃발 내리기';
+$labels['moreactions']      = '이외의 동작...';
+$labels['more']             = '더보기';
+$labels['back']             = '뒤로';
+$labels['options']          = '선택 사항';
+
 $labels['select'] = '선택';
 $labels['all'] = '모두';
 $labels['none'] = '없음';
-$labels['nonesort'] = '없음';
 $labels['currpage'] = '현재 페이지';
 $labels['unread'] = '읽지 않음';
 $labels['flagged'] = '깃발';
 $labels['unanswered'] = '답장하지 않음';
 $labels['deleted'] = '삭제됨';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = '반전';
 $labels['filter'] = '필터';
 $labels['list'] = '리스트';
 $labels['threads'] = '쓰레드';
 $labels['expand-all'] = '모두 확장';
+$labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = '모두 접기';
 $labels['threaded'] = '그룹화됨';
+
 $labels['autoexpand_threads'] = '모든 메시지 확장';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
 $labels['flag'] = '표시';
 $labels['attachment'] = '첨부';
+$labels['nonesort'] = '없음';
 $labels['sentdate'] = '보낸 날짜';
 $labels['arrival'] = '수신 날짜';
 $labels['asc'] = '오름차순';
 $labels['desc'] = '내림차순';
+$labels['listcolumns'] = 'List columns';
 $labels['listsorting'] = '정렬';
 $labels['listorder'] = '정렬 순서';
+$labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = '폴더 명령';
 $labels['compact'] = '간단하게';
 $labels['empty'] = '비우기';
+
 $labels['quota'] = '디스크 사용';
-$labels['unknown'] = '알수 없음';
-$labels['unlimited'] = '제한 없음';
-$labels['quicksearch'] = '빨리 찾기';
-$labels['resetsearch'] = '찾기 리셋';
-$labels['msgtext'] = '전체 메시지';
+$labels['unknown']  = '알수 없음';
+$labels['unlimited']  = '제한 없음';
+
+$labels['quicksearch']  = '빨리 찾기';
+$labels['resetsearch']  = '찾기 리셋';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = '전체 메시지';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = '새 창에서 열기';
 $labels['emlsave'] = '다운로드 (.eml)';
-$labels['sendmessage'] = '메일 지금 보냄';
-$labels['savemessage'] = '드래프트 저장';
-$labels['addattachment'] = '파일 첨부';
-$labels['charset'] = '문자셋';
-$labels['editortype'] = '편집기 형태';
-$labels['returnreceipt'] = '수신 확인 요청하기';
-$labels['dsn'] = '전송상태 메일 받기';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = '메일 지금 보냄';
+$labels['savemessage']    = '드래프트 저장';
+$labels['addattachment']  = '파일 첨부';
+$labels['charset']        = '문자셋';
+$labels['editortype']     = '편집기 형태';
+$labels['returnreceipt']  = '수신 확인 요청하기';
+$labels['dsn']            = '전송상태 메일 받기';
 $labels['mailreplyintro'] = '$date에, $sender가 작성:';
 $labels['originalmessage'] = '원본 메세지';
-$labels['spellcheck'] = '맞춤법';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = '맞춤법';
 $labels['checkspelling'] = '스펠링 체크';
 $labels['resumeediting'] = '편집 계속';
-$labels['revertto'] = '돌아감';
+$labels['revertto']      = '돌아감';
+
 $labels['attach'] = '첨부';
 $labels['attachments'] = '첨부 파일';
 $labels['upload'] = '업로드';
 $labels['uploadprogress'] = '$percent ($total 에서 $current)';
-$labels['close'] = '닫기';
-$labels['messageoptions'] = '메시지 옵션(들)...';
-$labels['low'] = '낮음';
-$labels['lowest'] = '가장 낮음';
-$labels['normal'] = '보통';
-$labels['high'] = '높음';
+$labels['close']  = '닫기';
+$labels['messageoptions']  = '메시지 옵션(들)...';
+
+$labels['low']     = '낮음';
+$labels['lowest']  = '가장 낮음';
+$labels['normal']  = '보통';
+$labels['high']    = '높음';
 $labels['highest'] = '가장 높음';
-$labels['nosubject'] = '(제목 없음)';
+
+$labels['nosubject']  = '(제목 없음)';
 $labels['showimages'] = '이미지 표시';
 $labels['alwaysshow'] = '$sender 에서 온 이미지 항상 보기';
-$labels['isdraft'] = '이 메시지는 임시 보관 메시지 입니다.';
+$labels['isdraft']    = '이 메시지는 임시 보관 메시지 입니다.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '일반 텍스트';
 $labels['savesentmessagein'] = '보낸 메시지를 다음에 저장';
 $labels['dontsave'] = '저장하지 않음';
 $labels['maxuploadsize'] = '최대 파일 크기는 $size 입니다';
+
 $labels['addcc'] = '참조 넣기';
 $labels['addbcc'] = '숨은참조 넣기';
 $labels['addreplyto'] = '회신주소 넣기';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $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'] = '웹사이트';
+
+// address boook
+$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'] = '메신져';
 $labels['notes'] = '노트';
-$labels['male'] = '남성';
+$labels['male']   = '남성';
 $labels['female'] = '여성';
 $labels['manager'] = '관리자';
 $labels['assistant'] = '도우미';
-$labels['typeassistant'] = '도우미';
 $labels['spouse'] = '배우자';
 $labels['allfields'] = '친구 전체';
 $labels['search'] = '검색';
 $labels['advsearch'] = '상세 검색';
 $labels['advanced'] = '고급 설정';
 $labels['other'] = '그 외';
-$labels['typeother'] = '그 외';
-$labels['typehome'] = '홈';
-$labels['typework'] = '직장';
-$labels['typemobile'] = '휴대폰';
-$labels['typemain'] = '주';
-$labels['typehomefax'] = '팩스(집)';
-$labels['typeworkfax'] = '팩스(직장)';
-$labels['typecar'] = '자동차';
-$labels['typepager'] = '호출기';
-$labels['typevideo'] = '동영상';
-$labels['typehomepage'] = '홈 페이지';
+
+$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['addcontact'] = '새 연락처 추가';
 $labels['editcontact'] = '연락처 편집';
 $labels['contacts'] = '연락처';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = '개인 정보';
-$labels['edit'] = '편집';
+
+$labels['edit']   = '편집';
 $labels['cancel'] = '취소';
-$labels['save'] = '저장';
+$labels['save']   = '저장';
 $labels['delete'] = '삭제';
 $labels['rename'] = '이름 변경';
 $labels['addphoto'] = '추가';
 $labels['replacephoto'] = '바꾸기';
 $labels['uploadphoto'] = '사진 올리기';
-$labels['newcontact'] = '새 연락처 카드 만들기';
-$labels['deletecontact'] = '선택한 연락처 삭제';
-$labels['composeto'] = '새 메일 작성';
+
+$labels['newcontact']     = '새 연락처 카드 만들기';
+$labels['deletecontact']  = '선택한 연락처 삭제';
+$labels['composeto']      = '새 메일 작성';
 $labels['contactsfromto'] = '$from 에서 $to 로의 연락처 $count 개';
-$labels['print'] = '인쇄';
-$labels['export'] = '내보내기';
-$labels['exportvcards'] = '연락처를 vCard 포맷으로 내보내기';
+$labels['print']          = '인쇄';
+$labels['export']         = '내보내기';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = '연락처를 vCard 포맷으로 내보내기';
 $labels['newcontactgroup'] = '새로운 연락처 그룹 생성';
-$labels['grouprename'] = '그룹 이름 바꾸기';
-$labels['groupdelete'] = '그룹 삭제';
+$labels['grouprename']    = '그룹 이름 바꾸기';
+$labels['groupdelete']    = '그룹 삭제';
 $labels['groupremoveselected'] = '그룹에서 선택한 연락처 제거';
-$labels['previouspage'] = '이전 세트 보기';
-$labels['firstpage'] = '처음 세트 보기';
-$labels['nextpage'] = '다음 세트 보기';
-$labels['lastpage'] = '마지막 세트 보기';
+
+$labels['previouspage']   = '이전 세트 보기';
+$labels['firstpage']      = '처음 세트 보기';
+$labels['nextpage']       = '다음 세트 보기';
+$labels['lastpage']       = '마지막 세트 보기';
+
 $labels['group'] = '그룹';
 $labels['groups'] = '그룹';
 $labels['personaladrbook'] = '개인 주소';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
 $labels['importfromfile'] = '파일에서 가져오기';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = '전체 주소록을 바꿈';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = '완료';
+
+// settings
 $labels['settingsfor'] = '설정';
 $labels['about'] = '이것은...';
 $labels['preferences'] = '환경 설정';
 $labels['userpreferences'] = '사용자 환경';
 $labels['editpreferences'] = '사용자 환경 편집';
+
 $labels['identities'] = '신원';
 $labels['manageidentities'] = '이 계정의 신원 관리';
 $labels['newidentity'] = '새 신원';
+
 $labels['newitem'] = '새 아이템';
 $labels['edititem'] = '아이템 편집';
+
 $labels['preferhtml'] = 'HTML 보이기';
 $labels['defaultcharset'] = '기본 문자 세트';
 $labels['htmlmessage'] = 'HTML 메시지';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = '날짜 형식';
 $labels['timeformat'] = '시간 형식';
 $labels['prettydate'] = '날짜 형식';
-$labels['setdefault'] = '기본으로 설정';
-$labels['autodetect'] = '자동';
-$labels['language'] = '언어';
-$labels['timezone'] = '시간대';
-$labels['pagesize'] = '페이지당 줄 수';
+$labels['setdefault']  = '기본으로 설정';
+$labels['autodetect']  = '자동';
+$labels['language']  = '언어';
+$labels['timezone']  = '시간대';
+$labels['pagesize']  = '페이지당 줄 수';
 $labels['signature'] = '서명';
-$labels['dstactive'] = '서머타임';
+$labels['dstactive']  = '서머타임';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML 메일 쓰기';
 $labels['htmlonreply'] = 'HTML 메시지에 회신할 때에 만';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML 서명';
 $labels['previewpane'] = '미리 보기 창 보기';
 $labels['skin'] = '인터페이스 스킨';
@@ -317,6 +408,8 @@ $labels['mailboxview'] = '메일 상자 보기';
 $labels['mdnrequests'] = '수신 확인';
 $labels['askuser'] = '사용자에게 묻기';
 $labels['autosend'] = '자동으로 보내기';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = '무시';
 $labels['readwhendeleted'] = '삭제할 때 메시지를 읽은 것으로 표시';
 $labels['flagfordeletion'] = '지우는 대신 지울 메시지에 깃발 달기';
@@ -327,10 +420,11 @@ $labels['showremoteimages'] = '원격 이미지 보이기';
 $labels['fromknownsenders'] = '아는 발신인에게서만';
 $labels['always'] = '항상';
 $labels['showinlineimages'] = '메시지 아래에 첨부 이미지 보이기';
-$labels['autosavedraft'] = '드래프트 자동 저장';
-$labels['everynminutes'] = '$n 분마다';
-$labels['never'] = '하지 않음';
-$labels['immediately'] = '즉시';
+$labels['autosavedraft']  = '드래프트 자동 저장';
+$labels['everynminutes']  = '$n 분마다';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = '하지 않음';
+$labels['immediately']  = '즉시';
 $labels['messagesdisplaying'] = '메시지 표시 중';
 $labels['messagescomposition'] = '메시지 작성 중';
 $labels['mimeparamfolding'] = '첨부 파일 이름';
@@ -349,55 +443,94 @@ $labels['section'] = '섹션';
 $labels['maintenance'] = '유지 관리';
 $labels['newmessage'] = '새 메시지';
 $labels['signatureoptions'] = '서명 옵션';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
 $labels['autoaddsignature'] = '자동으로 서명 추가';
 $labels['newmessageonly'] = '새로운 메시지만';
 $labels['replyandforwardonly'] = '회신이나 전달 메시지 만';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = '서명 삽입';
-$labels['previewpanemarkread'] = '미리 읽힘 메시지를 읽음으로 표시';
-$labels['afternseconds'] = '$n 초 이후';
+$labels['previewpanemarkread']  = '미리 읽힘 메시지를 읽음으로 표시';
+$labels['afternseconds']  = '$n 초 이후';
 $labels['reqmdn'] = '항상 수신확인 요청 하기';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = '메시지를 보내기 전에 맞춤법 확인';
 $labels['spellcheckoptions'] = '맞춤법 확인 옵션';
 $labels['spellcheckignoresyms'] = '심볼이 포함된 단어 무시하기';
 $labels['spellcheckignorenums'] = '숫자가 포함된 단어 무시하기';
 $labels['spellcheckignorecaps'] = '대문자가 포함된 단어 무시하기';
 $labels['addtodict'] = '사전에 추가';
-$labels['folder'] = '폴더';
-$labels['foldername'] = '폴더 이름';
-$labels['subscribed'] = '가입됨';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = '폴더';
+$labels['folders']  = '폴더';
+$labels['foldername']  = '폴더 이름';
+$labels['subscribed']  = '가입됨';
 $labels['messagecount'] = '메시지';
-$labels['create'] = '만들기';
-$labels['createfolder'] = '새 폴더 만들기';
-$labels['managefolders'] = '폴더 관리';
+$labels['create']  = '만들기';
+$labels['createfolder']  = '새 폴더 만들기';
+$labels['managefolders']  = '폴더 관리';
 $labels['specialfolders'] = '특수 폴더';
 $labels['properties'] = '등록 정보';
 $labels['folderproperties'] = '폴더 등록 정보';
 $labels['parentfolder'] = '상위 폴더';
+$labels['location'] = 'Location';
 $labels['info'] = '정보';
 $labels['getfoldersize'] = '폴더의 사이즈를 알아보려면 클릭';
 $labels['changesubscription'] = '구독을 변경하려면 클릭';
 $labels['foldertype'] = '폴더 타입';
-$labels['personalfolder'] = '개인 폴더';
-$labels['otherfolder'] = '다른 사용자의 폴더';
-$labels['sharedfolder'] = '공개 폴더';
+$labels['personalfolder']  = '개인 폴더';
+$labels['otherfolder']  = '다른 사용자의 폴더';
+$labels['sharedfolder']  = '공개 폴더';
+
 $labels['sortby'] = '정렬';
-$labels['sortasc'] = '오름차순으로 정렬';
+$labels['sortasc']  = '오름차순으로 정렬';
 $labels['sortdesc'] = '내림차순으로 정렬';
 $labels['undo'] = '실행 취소';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = '플러그인';
 $labels['version'] = '버전';
+$labels['source'] = 'Source';
 $labels['license'] = '라이센스';
 $labels['support'] = '지원 받기';
+
+// units
 $labels['B'] = '바이트';
 $labels['KB'] = '킬로바이트';
 $labels['MB'] = '메가바이트';
 $labels['GB'] = '기가바이트';
+
+// character sets
 $labels['unicode'] = '유니코드(단일 코드,다국적 지원코드)';
 $labels['english'] = '영어';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
 $labels['turkish'] = '터키어';
+$labels['nordic'] = 'Nordic';
 $labels['thai'] = '태국어';
+$labels['celtic'] = 'Celtic';
 $labels['vietnamese'] = '베트남어';
 $labels['japanese'] = '일본어';
 $labels['korean'] = '한국어';
 $labels['chinese'] = '중국어';
 
+?>
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index c1936dbd0..d2572b30b 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '에러가 발생!';
-$messages['loginfailed'] = '로그인이 실패하였습니다.';
+$messages['errortitle']  = '에러가 발생!';
+$messages['loginfailed']  = '로그인이 실패하였습니다.';
 $messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다';
 $messages['sessionerror'] = '세션이 유효하지 않거나 종료되었습니다';
 $messages['storageerror'] = 'IMAP 서버 연결 실패';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = '요청 시간 초과';
 $messages['errorreadonly'] = '명령을 수행할 수 없습니다. 읽기전용 폴더.';
 $messages['errornoperm'] = '명령을 수행할 수 없습니다. 권한이 거부 됨.';
 $messages['invalidrequest'] = '잘못된 요청! 데이터는 저장되지 않았음.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '이 메일함에 메일이 없습니다';
 $messages['loggedout'] = '세션을 성공적으로 종료하였습니다. 안녕히 가십시오!';
 $messages['mailboxempty'] = '메일함이 비어있습니다';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = '불러오는 중...';
 $messages['uploading'] = '하나의 파일 올리기...';
 $messages['uploadingmany'] = '여러 파일 올리기...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = '메일을 옮길 수 없습니다';
 $messages['errorcopying'] = '메시지(들)를 복사할 수 없습니다.';
 $messages['errordeleting'] = '메일을 지울 수 없습니다';
 $messages['errormarking'] = '메시지(들)에 표시할 수 없습니다.';
-$messages['deletecontactconfirm'] = '정말 선택한 연락처들을 삭제하시겠습니까?';
-$messages['deletegroupconfirm'] = '정말로 선택한 그룹을 삭제하는 것을 원하십니까?';
+$messages['deletecontactconfirm']  = '정말 선택한 연락처들을 삭제하시겠습니까?';
+$messages['deletegroupconfirm']  = '정말로 선택한 그룹을 삭제하는 것을 원하십니까?';
 $messages['deletemessagesconfirm'] = '정말 선택한 메일들을 삭제하시겠습니까?';
-$messages['deletefolderconfirm'] = '정말 이 폴더를 삭제하시겠습니까?';
-$messages['purgefolderconfirm'] = '정말 이 폴더의 모든 메일을 삭제하시겠습니까?';
+$messages['deletefolderconfirm']  = '정말 이 폴더를 삭제하시겠습니까?';
+$messages['purgefolderconfirm']  = '정말 이 폴더의 모든 메일을 삭제하시겠습니까?';
 $messages['contactdeleting'] = '연락처(들) 삭제 중...';
 $messages['groupdeleting'] = '그룹 삭제 중...';
 $messages['folderdeleting'] = '폴더 지우는 중...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = '폴더의 구독을 활성화 하는 중...';
 $messages['folderunsubscribing'] = '폴더의 구독을 취소하는 중...';
 $messages['formincomplete'] = '양식을 완전히 채우지 않았습니다';
 $messages['noemailwarning'] = '유효한 이메일 주소를 넣어주십시오';
-$messages['nonamewarning'] = '이름을 넣어주십시오';
+$messages['nonamewarning']  = '이름을 넣어주십시오';
 $messages['nopagesizewarning'] = '페이지 크기를 넣어주십시오';
 $messages['nosenderwarning'] = '발신자 이메일 주소를 넣어주십시오';
 $messages['norecipientwarning'] = '적어도 한 개 이상의 수신 주소를 넣어주십시오';
-$messages['nosubjectwarning'] = '"제목"이 없습니다. 제목을 넣으시겠습니까?';
+$messages['nosubjectwarning']  = '"제목"이 없습니다. 제목을 넣으시겠습니까?';
 $messages['nobodywarning'] = '텍스트 없이 메일을 보낼까요?';
 $messages['notsentwarning'] = '메일을 보내지 않았습니다. 메일을 버리시겠습니까?';
 $messages['noldapserver'] = '검색할 LDAP 서버를 선택하세요';
@@ -107,15 +112,18 @@ $messages['addingmember'] = '그룹에 연락처(들)을 추가 중...';
 $messages['removingmember'] = '그룹으로 부터 연락처를 삭제 중...';
 $messages['receiptsent'] = '메일 읽음 확인을 보냈습니다';
 $messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없습니다';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = '이 정보는 마지막 남은 것이므로 지울 수 없습니다';
 $messages['forbiddencharacter'] = '폴더 이름에 쓸 수 없는 문자가 포함되어 있습니다';
 $messages['selectimportfile'] = '업로드할 파일을 선택하세요';
 $messages['addresswriterror'] = '선택한 주소록은 쓸 수 없습니다';
 $messages['contactaddedtogroup'] = '이 그룹에 연락처를 성공적으로 추가 함.';
 $messages['contactremovedfromgroup'] = '이 그룹으로 부터 연락처를 성공적으로 제거 함.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = '가져오는 중, 기다리세요...';
-$messages['importerror'] = '가져오기 실패! 업로드한 파일이 유효한 vCard 파일이 아닙니다.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져왔고, $skipped 존재하는 항목은 건너뛰었습니다.</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = '작업이 허가되지 않았습니다!';
 $messages['nofromaddress'] = '선택한 신원에 이메일 주소가 없음';
 $messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 서식이 사라집니다. 계속할까요?';
@@ -137,11 +145,16 @@ $messages['contactrestored'] = '연락처(들)이 성공적으로 복구 됨.';
 $messages['groupdeleted'] = '그룹이 성공적으로 삭제 됨.';
 $messages['grouprenamed'] = '그룹명이 성공적으로 변경 됨.';
 $messages['groupcreated'] = '그룹이 성공적으로 생성 됨.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = '메시지(들)이 성공적으로 삭제 됨.';
 $messages['messagemoved'] = '메시지(들)을 성공적으로 이동 함.';
 $messages['messagecopied'] = '메시지(들)을 성공적으로 복사 함.';
 $messages['messagemarked'] = '메시지(들)에 성공적으로 표시 함.';
 $messages['autocompletechars'] = '자동 완성을 위해서 적어도 $min 글자를 입력하세요.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = '이름이 비워져서는 안됩니다.';
 $messages['nametoolong'] = '이름이 너무 깁니다.';
 $messages['folderupdated'] = '폴더를 성공적으로 갱신 함.';
@@ -149,4 +162,8 @@ $messages['foldercreated'] = '폴더를 성공적으로 생성 함.';
 $messages['invalidimageformat'] = '올바른 이미지 포멧이 아님.';
 $messages['mispellingsfound'] = '메시지에서 맞춤법 오류를 감지 하였음.';
 $messages['parentnotwritable'] = '선택한 부모 폴더에 폴더를 생성하거나 이동할 수 없음. 접근 권한이 없음.';
+$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/ku/labels.inc b/program/localization/ku/labels.inc
index a6de26f94..0193484a9 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bixêr hatî $product \'ê';
-$labels['username'] = 'Bikarhêner';
-$labels['password'] = 'Nasnav';
-$labels['server'] = 'Pêşkêşkar';
-$labels['login'] = 'Têkevê';
-$labels['logout'] = 'Derkeve';
-$labels['mail'] = 'E-Peyam';
+
+// login page
+$labels['welcome']   = 'Bixêr hatî $product \'ê';
+$labels['username']  = 'Bikarhêner';
+$labels['password']  = 'Nasnav';
+$labels['server']    = 'Pêşkêşkar';
+$labels['login']     = 'Têkevê';
+
+// taskbar
+$labels['logout']   = 'Derkeve';
+$labels['mail']     = 'E-Peyam';
 $labels['settings'] = 'Mîhengên Takekesî';
 $labels['addressbook'] = 'Lênûska Navnîşanan';
-$labels['inbox'] = 'Hatî';
+
+// mailbox names
+$labels['inbox']  = 'Hatî';
 $labels['drafts'] = 'Hilanînî';
-$labels['sent'] = 'Şandî';
-$labels['trash'] = 'Çop';
-$labels['junk'] = 'Biikêrnehatî';
+$labels['sent']   = 'Şandî';
+$labels['trash']  = 'Çop';
+$labels['junk']   = 'Biikêrnehatî';
+
+// message listing
 $labels['subject'] = 'Mijar';
-$labels['from'] = 'Şandyar';
-$labels['to'] = 'Standyar';
-$labels['cc'] = 'Kopiya Karbon';
-$labels['bcc'] = 'Kopiya karbon a Veşartî';
+$labels['from']    = 'Şandyar';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Standyar';
+$labels['cc']      = 'Kopiya Karbon';
+$labels['bcc']     = 'Kopiya karbon a Veşartî';
 $labels['replyto'] = 'Navnîşanên Standyar';
-$labels['date'] = 'Dîrok';
-$labels['size'] = 'Mezinahî';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Dîrok';
+$labels['size']    = 'Mezinahî';
 $labels['priority'] = 'Girîngî';
 $labels['organization'] = 'Sazî';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Peldank';
-$labels['folders'] = 'Peldank';
 $labels['messagesfromto'] = 'Peyam $count ên di navbera $from - $to';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr a peyama $count';
-$labels['copy'] = 'Kopiya Karbon';
-$labels['moveto'] = 'bibe...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Kopiya Karbon';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'bibe...';
 $labels['download'] = 'daxe';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Navê pelê';
 $labels['filesize'] = 'Mezinahiya pelê';
+
 $labels['addtoaddressbook'] = 'Têxe lênûska navnîşanan';
+
+// weekdays short
 $labels['sun'] = 'Yş';
 $labels['mon'] = 'Dş';
 $labels['tue'] = 'Sş';
@@ -55,125 +80,457 @@ $labels['wed'] = 'Çş';
 $labels['thu'] = 'Pş';
 $labels['fri'] = 'În';
 $labels['sat'] = 'Şe';
-$labels['sunday'] = 'Yekşem';
-$labels['monday'] = 'Duşem';
-$labels['tuesday'] = 'Sêşem';
+
+// weekdays long
+$labels['sunday']    = 'Yekşem';
+$labels['monday']    = 'Duşem';
+$labels['tuesday']   = 'Sêşem';
 $labels['wednesday'] = 'Çarşem';
-$labels['thursday'] = 'Pêncşem';
-$labels['friday'] = 'În';
-$labels['saturday'] = 'Şemî';
+$labels['thursday']  = 'Pêncşem';
+$labels['friday']    = 'În';
+$labels['saturday']  = 'Şemî';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Îro';
-$labels['checkmail'] = 'Li peyamên nû venihêre';
-$labels['compose'] = 'Peyamekê biafirîne';
-$labels['writenewmessage'] = 'Peyameke nû biafirîne';
-$labels['replytomessage'] = 'Bersivê bide peyamê';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Li peyamên nû venihêre';
+$labels['compose']          = 'Peyamekê biafirîne';
+$labels['writenewmessage']  = 'Peyameke nû biafirîne';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Bersivê bide peyamê';
 $labels['replytoallmessage'] = 'Bersivê ji bo hemû kesên ku ev peyan standine bişîne';
-$labels['forwardmessage'] = 'Bersivê bide peyamê';
-$labels['deletemessage'] = 'Peyamê jê bibe';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Bersivê bide peyamê';
+$labels['deletemessage']    = 'Peyamê jê bibe';
 $labels['movemessagetotrash'] = 'Peyamê dake çopê';
-$labels['printmessage'] = 'Vê peyamê çap bike';
-$labels['previousmessage'] = 'Peyama berê nîşan bide';
-$labels['firstmessage'] = 'Peyama yekemîn nîşan bide';
-$labels['nextmessage'] = 'Peyama di rêzê de nîşan bide';
-$labels['lastmessage'] = 'Peyama dawî nîşan bide';
-$labels['backtolist'] = 'Vegere lîsteya peyaman';
-$labels['viewsource'] = 'Çavkaniyê nîşan bide';
-$labels['markmessages'] = 'Peyamê nîşan bike';
-$labels['markread'] = 'Wekî xwendî';
-$labels['markunread'] = 'Wekî nexwendî';
+$labels['printmessage']     = 'Vê peyamê çap bike';
+$labels['previousmessage']  = 'Peyama berê nîşan bide';
+$labels['firstmessage']     = 'Peyama yekemîn nîşan bide';
+$labels['nextmessage']      = 'Peyama di rêzê de nîşan bide';
+$labels['lastmessage']      = 'Peyama dawî nîşan bide';
+$labels['backtolist']       = 'Vegere lîsteya peyaman';
+$labels['viewsource']       = 'Çavkaniyê nîşan bide';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Peyamê nîşan bike';
+$labels['markread']         = 'Wekî xwendî';
+$labels['markunread']       = 'Wekî nexwendî';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Hilbijêre';
 $labels['all'] = 'Hemû';
 $labels['none'] = 'Ne yek jî';
-$labels['nonesort'] = 'Ne yek jî';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Nexwendî';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Ne yek jî';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Vala Bike';
+
 $labels['quota'] = 'Bikaranîna dîskê';
-$labels['unknown'] = 'nayê zanîn';
-$labels['unlimited'] = 'bêsînor';
-$labels['quicksearch'] = 'Lêgerîna bilez';
-$labels['resetsearch'] = 'Lêgerînê reset bike';
-$labels['sendmessage'] = 'Peyamê niha bişîne';
-$labels['savemessage'] = 'Hilîne';
-$labels['addattachment'] = 'Pelekê lê zêde bike';
-$labels['charset'] = 'Curetîp';
-$labels['editortype'] = 'Cureyê serastkat';
-$labels['returnreceipt'] = 'Rapora Vegerînê';
+$labels['unknown']  = 'nayê zanîn';
+$labels['unlimited']  = 'bêsînor';
+
+$labels['quicksearch']  = 'Lêgerîna bilez';
+$labels['resetsearch']  = 'Lêgerînê reset bike';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Peyamê niha bişîne';
+$labels['savemessage']    = 'Hilîne';
+$labels['addattachment']  = 'Pelekê lê zêde bike';
+$labels['charset']        = 'Curetîp';
+$labels['editortype']     = 'Cureyê serastkat';
+$labels['returnreceipt']  = 'Rapora Vegerînê';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Kontrola rastnivîsê';
 $labels['resumeediting'] = 'Serastkirinê bidomîne';
-$labels['revertto'] = 'Şûnde bîne';
+$labels['revertto']      = 'Şûnde bîne';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Pêvek';
 $labels['upload'] = 'Bar bike';
-$labels['close'] = 'Bigire';
-$labels['low'] = 'Nizm';
-$labels['lowest'] = 'Nizmtirîn';
-$labels['normal'] = 'Asayî';
-$labels['high'] = 'Bilind';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Bigire';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Nizm';
+$labels['lowest']  = 'Nizmtirîn';
+$labels['normal']  = 'Asayî';
+$labels['high']    = 'Bilind';
 $labels['highest'] = 'Bilintirîn';
-$labels['nosubject'] = '(bê mijar)';
+
+$labels['nosubject']  = '(bê mijar)';
 $labels['showimages'] = 'Xuyakirina wêneyan';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Deqa tazî';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Cc Têxê';
 $labels['addbcc'] = 'Bcc Têxê';
 $labels['addreplyto'] = 'Bibersivîne têxê';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Şandyara/ê vê peyamê xwest dema ku te peyam vekir, jê re hişyarî here. Dixwazî jê re hişyarî here?';
 $labels['receiptread'] = 'Rapora Vegerînê (xwendî)';
 $labels['yourmessage'] = 'Ev rapora vegerîna peyama te ye';
 $labels['receiptnote'] = 'Nîşe: Ev dide zanîn ka peyama te şand hat xwendin an na. Naveroka peyamê bi mîgogerî nayê zanîn.';
-$labels['name'] = 'Navê xuya dibe';
-$labels['firstname'] = 'Nav';
-$labels['surname'] = 'Paşnav';
-$labels['email'] = 'E-Peyam';
+
+// address boook
+$labels['name']         = 'Navê xuya dibe';
+$labels['firstname']    = 'Nav';
+$labels['surname']      = 'Paşnav';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'E-Peyam';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Têkiliyeke nû têxê';
 $labels['editcontact'] = 'Têkiliyê serast bike';
-$labels['edit'] = 'Serast bike';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Serast bike';
 $labels['cancel'] = 'Betal';
-$labels['save'] = 'Tomar bike';
+$labels['save']   = 'Tomar bike';
 $labels['delete'] = 'Jê Bibe';
-$labels['newcontact'] = 'kardeke nû a têkiliyê biafirîne';
-$labels['deletecontact'] = 'Têkiliyên hilbijartî jê bibe';
-$labels['composeto'] = 'Ji têkiliya hilbijartî re peyam bişîne';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'kardeke nû a têkiliyê biafirîne';
+$labels['deletecontact']  = 'Têkiliyên hilbijartî jê bibe';
+$labels['composeto']      = 'Ji têkiliya hilbijartî re peyam bişîne';
 $labels['contactsfromto'] = 'Têkiliyên $count ên di navbera $from - $to de';
-$labels['print'] = 'çap bike';
-$labels['export'] = 'Derxe';
-$labels['previouspage'] = 'Seta berê nîşan bide';
-$labels['firstpage'] = 'Seta yekemîn nîşan bide';
-$labels['nextpage'] = 'Seta di rêzê de nîşan bide';
-$labels['lastpage'] = 'Seta dawî nîşan bide';
+$labels['print']          = 'çap bike';
+$labels['export']         = 'Derxe';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Seta berê nîşan bide';
+$labels['firstpage']      = 'Seta yekemîn nîşan bide';
+$labels['nextpage']       = 'Seta di rêzê de nîşan bide';
+$labels['lastpage']       = 'Seta dawî nîşan bide';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Kom';
 $labels['personaladrbook'] = 'Navnîşanên Takekesî';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Mîheng ji bo';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Vebijêrk';
 $labels['userpreferences'] = 'Vebijêrkên bikarhêner';
 $labels['editpreferences'] = 'Vebijêrkên bikarhêner serast bike';
+
 $labels['identities'] = 'Nasname';
 $labels['manageidentities'] = 'Nasnameyên vê hesabê serast bike';
 $labels['newidentity'] = 'Nasnameya nû';
+
 $labels['newitem'] = 'Parçeya nû';
 $labels['edititem'] = 'Parçeyê serast bike';
+
 $labels['preferhtml'] = 'Wekî HTML nîşan bide';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Peyama HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Kurtenivîsa Dîrokê';
-$labels['setdefault'] = 'Wekî standard tomar bike';
-$labels['language'] = 'Ziman';
-$labels['timezone'] = 'Herêma demê';
-$labels['pagesize'] = 'Hejmara peyamên her rûpelekê';
+$labels['setdefault']  = 'Wekî standard tomar bike';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Ziman';
+$labels['timezone']  = 'Herêma demê';
+$labels['pagesize']  = 'Hejmara peyamên her rûpelekê';
 $labels['signature'] = 'Şanenav';
-$labels['dstactive'] = 'Demjimêra havînî';
+$labels['dstactive']  = 'Demjimêra havînî';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Peyameke HTML biafirîne';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Şanenava HTML';
 $labels['previewpane'] = 'Panela berê nîşan bide';
-$labels['autosavedraft'] = 'Xweber hilîne';
-$labels['never'] = 'qet';
-$labels['folder'] = 'Peldank';
-$labels['foldername'] = 'Navê peldankê';
-$labels['subscribed'] = 'Ni şanenav';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Xweber hilîne';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'qet';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Peldank';
+$labels['folders']  = 'Peldank';
+$labels['foldername']  = 'Navê peldankê';
+$labels['subscribed']  = 'Ni şanenav';
 $labels['messagecount'] = 'Peyam';
-$labels['create'] = 'Biafirîne';
-$labels['createfolder'] = 'Peldankeke nû biafirîne';
-$labels['managefolders'] = 'Rêveberiya peldankan';
+$labels['create']  = 'Biafirîne';
+$labels['createfolder']  = 'Peldankeke nû biafirîne';
+$labels['managefolders']  = 'Rêveberiya peldankan';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Şêweyê rêzkirinê';
-$labels['sortasc'] = 'Wekî zêde dibe';
+$labels['sortasc']  = 'Wekî zêde dibe';
 $labels['sortdesc'] = 'Wekî kêm dibe';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index e35260cc1..6783209a3 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Têketin têk çû';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Têketin têk çû';
 $messages['cookiesdisabled'] = 'Geroka te destûrê nade çerezan';
 $messages['sessionerror'] = 'Danişîna te çewt e an jî bi dawî bûye';
 $messages['storageerror'] = 'Girêdana pêşkêşkara IMAP têk çû';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Di vê peyamdankê de tu peyam nehat dîtin';
 $messages['loggedout'] = 'Te danişînî bi dawî anî. Oxir be!';
 $messages['mailboxempty'] = 'Peyamdank vala ye';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Tê barkirin...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Dane tên barkirin...';
 $messages['checkingmail'] = 'Li peyamên nû vedinihêre...';
 $messages['sendingmessage'] = 'Peyamê dişîne...';
@@ -32,34 +46,54 @@ $messages['messagesaved'] = 'Peyam di Hilanînî de hat hilanîn';
 $messages['successfullysaved'] = 'Hat hilanîn';
 $messages['addedsuccessfully'] = 'Têkilî li navnîşanan hat zêdekirin';
 $messages['contactexists'] = 'Têkiliyeke bi vê navnîşanê jixwe heye';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Ji bo ewlekariya te wêneyên cuda yên vê peyamê hatin astenkirin.';
 $messages['encryptedmessage'] = 'Ev peyamenek şîfrekirî ye, bibore, nayê vekirin!';
 $messages['nocontactsfound'] = 'Tu têkiliyek nehat dîtin';
 $messages['contactnotfound'] = 'Têkiliya dihat xwestin nehat dîtin';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Peyam nehat şandin';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Di tomarkirinê de çewtiyek derket';
 $messages['errormoving'] = 'Ciyê peyamê nehat guherandin';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Peyam nehat jêbirin';
-$messages['deletecontactconfirm'] = 'Ji dil dixwazî têkiliya/ên nîşankirî jê bibî?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ji dil dixwazî têkiliya/ên nîşankirî jê bibî?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ji dil dixwazî peya/ên nîşankirî jê bibî?';
-$messages['deletefolderconfirm'] = 'Ji dil dixwazî vê peldankê jê bibî?';
-$messages['purgefolderconfirm'] = 'Ji dil dixwazî hemû peyamên di vê peldankê de jê bibî?';
+$messages['deletefolderconfirm']  = 'Ji dil dixwazî vê peldankê jê bibî?';
+$messages['purgefolderconfirm']  = 'Ji dil dixwazî hemû peyamên di vê peldankê de jê bibî?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Form bi temamî nehat tijekirin';
 $messages['noemailwarning'] = 'Tika ye, navnîşaneke rast têkevê';
-$messages['nonamewarning'] = 'Tika ye, navekî têkevê';
+$messages['nonamewarning']  = 'Tika ye, navekî têkevê';
 $messages['nopagesizewarning'] = 'Tika ye, mezinahiyeke pelê têkevê';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Tika ye, herî kêm standyarekê têkevê';
-$messages['nosubjectwarning'] = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî lê binivîsî?';
+$messages['nosubjectwarning']  = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî lê binivîsî?';
 $messages['nobodywarning'] = 'Peyamê bê nivîs bişeyînî?';
 $messages['notsentwarning'] = 'Peyam nehat şandin. Dixwazî peyamê pişTgo bikî?';
 $messages['noldapserver'] = 'Tika ye, ji bo lêgerînê pêşkêşkareke Idap têkevê';
 $messages['nosearchname'] = 'Tika ye, nav an jî navnîşaneke têkiliyê têkevê';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr peyam hat(in) dîtin';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Di lêgerînê de tu tişt nehat dîtin';
 $messages['searching'] = 'Digere...';
 $messages['checking'] = 'Vedinihêre...';
 $messages['nospellerrors'] = 'Tu şaşiyeke rastnivîsê nehat dîtin';
 $messages['folderdeleted'] = 'Peldank hat jêbirin';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Hat jêbirin';
 $messages['converting'] = 'Formatkirin ji peyamê tê birin...';
 $messages['messageopenerror'] = 'Peyam ji pêşkêşkar nehat barkirin';
@@ -70,7 +104,66 @@ $messages['copyerror'] = 'Tu navnîşan nehat jibergirtin';
 $messages['sourceisreadonly'] = 'Çavkaniya vê navnîşanê tenê-xwendin e';
 $messages['errorsavingcontact'] = 'Navnîşana têkiliyê nehat barkirin';
 $messages['movingmessage'] = 'Ciyê peyamê tê guhertin...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Rapora şandina serkeftî';
 $messages['errorsendingreceipt'] = 'Rapor nehat şandin';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Nikarî vê nasnameyê jê bibî. Ew ya dawî ye.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 039ac8581..2a161824f 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Sveiki! Čia $product';
-$labels['username'] = 'Naudotojo vardas';
-$labels['password'] = 'Slaptažodis';
-$labels['server'] = 'Serveris';
-$labels['login'] = 'Prisijungti';
-$labels['logout'] = 'Atsijungti';
-$labels['mail'] = 'El. paštas';
+
+// login page
+$labels['welcome']   = 'Sveiki! Čia $product';
+$labels['username']  = 'Naudotojo vardas';
+$labels['password']  = 'Slaptažodis';
+$labels['server']    = 'Serveris';
+$labels['login']     = 'Prisijungti';
+
+// taskbar
+$labels['logout']   = 'Atsijungti';
+$labels['mail']     = 'El. paštas';
 $labels['settings'] = 'Nuostatos';
 $labels['addressbook'] = 'Adresų knyga';
-$labels['inbox'] = 'Gauti laiškai';
+
+// mailbox names
+$labels['inbox']  = 'Gauti laiškai';
 $labels['drafts'] = 'Juodraščiai';
-$labels['sent'] = 'Išsiųsti laiškai';
-$labels['trash'] = 'Šiukšlinė';
-$labels['junk'] = 'Brukalas';
+$labels['sent']   = 'Išsiųsti laiškai';
+$labels['trash']  = 'Šiukšlinė';
+$labels['junk']   = 'Brukalas';
+
+// message listing
 $labels['subject'] = 'Tema';
-$labels['from'] = 'Siuntėjas';
-$labels['to'] = 'Gavėjas';
-$labels['cc'] = 'Kopija';
-$labels['bcc'] = 'Slaptoji kopija';
+$labels['from']    = 'Siuntėjas';
+$labels['sender']  = 'Siuntėjas';
+$labels['to']      = 'Gavėjas';
+$labels['cc']      = 'Kopija';
+$labels['bcc']     = 'Slaptoji kopija';
 $labels['replyto'] = 'Atsakymą gaus';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Dydis';
+$labels['date']    = 'Data';
+$labels['size']    = 'Dydis';
 $labels['priority'] = 'Prioritetas';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Neskaitytas';
 $labels['listoptions'] = 'Sąrašo nuostatos…';
+
 $labels['mailboxlist'] = 'Aplankai';
-$labels['folders'] = 'Aplankai';
 $labels['messagesfromto'] = 'Laiškai nuo $from iki $to iš $count';
 $labels['threadsfromto'] = 'Gijos nuo $from iki $to iš $count';
 $labels['messagenrof'] = 'Laiškas $nr iš $count';
 $labels['fromtoshort'] = '$from – $to iš $count';
-$labels['copy'] = 'Kopijuoti';
-$labels['move'] = 'Perkelti';
-$labels['moveto'] = 'Perkelti į…';
+
+$labels['copy']     = 'Kopijuoti';
+$labels['move']     = 'Perkelti';
+$labels['moveto']   = 'Perkelti į…';
 $labels['download'] = 'Parsisiųsti';
+$labels['showattachment'] = 'Rodyti';
+$labels['showanyway'] = 'Vistiek rodyti';
+
 $labels['filename'] = 'Failo vardas';
 $labels['filesize'] = 'Failo dydis';
+
 $labels['addtoaddressbook'] = 'Įtraukti į adresų knygą';
+
+// weekdays short
 $labels['sun'] = 'Sek';
 $labels['mon'] = 'Pir';
 $labels['tue'] = 'Ant';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Tre';
 $labels['thu'] = 'Ket';
 $labels['fri'] = 'Pen';
 $labels['sat'] = 'Šeš';
-$labels['sunday'] = 'Sekmadienis';
-$labels['monday'] = 'Pirmadienis';
-$labels['tuesday'] = 'Antradienis';
+
+// weekdays long
+$labels['sunday']    = 'Sekmadienis';
+$labels['monday']    = 'Pirmadienis';
+$labels['tuesday']   = 'Antradienis';
 $labels['wednesday'] = 'Trečiadienis';
-$labels['thursday'] = 'Ketvirtadienis';
-$labels['friday'] = 'Penktadienis';
-$labels['saturday'] = 'Šeštadienis';
-$labels['jan'] = 'Sau';
-$labels['feb'] = 'Vas';
-$labels['mar'] = 'Kov';
-$labels['apr'] = 'Bal';
-$labels['may'] = 'Gegužė';
-$labels['longmay'] = 'Gegužė';
-$labels['jun'] = 'Bir';
-$labels['jul'] = 'Lie';
-$labels['aug'] = 'Rgp';
-$labels['sep'] = 'Rgs';
-$labels['oct'] = 'Spl';
-$labels['nov'] = 'Lap';
-$labels['dec'] = 'Grd';
-$labels['longjan'] = 'Sausis';
-$labels['longfeb'] = 'Vasaris';
-$labels['longmar'] = 'Kovas';
-$labels['longapr'] = 'Balandis';
-$labels['longjun'] = 'Biržėlis';
-$labels['longjul'] = 'Liepa';
-$labels['longaug'] = 'Rugpjūtis';
-$labels['longsep'] = 'Rugsėjis';
-$labels['longoct'] = 'Spalis';
-$labels['longnov'] = 'Lapkritis';
-$labels['longdec'] = 'Gruodis';
+$labels['thursday']  = 'Ketvirtadienis';
+$labels['friday']    = 'Penktadienis';
+$labels['saturday']  = 'Šeštadienis';
+
+// months short
+$labels['jan']	= 'Sau';
+$labels['feb']	= 'Vas';
+$labels['mar']	= 'Kov';
+$labels['apr']	= 'Bal';
+$labels['may']	= 'Gegužė';
+$labels['jun']	= 'Bir';
+$labels['jul'] 	= 'Lie';
+$labels['aug']	= 'Rgp';
+$labels['sep']	= 'Rgs';
+$labels['oct']	= 'Spl';
+$labels['nov']	= 'Lap';
+$labels['dec']	= 'Grd';
+
+// months long
+$labels['longjan']	= 'Sausis';
+$labels['longfeb']	= 'Vasaris';
+$labels['longmar']	= 'Kovas';
+$labels['longapr']	= 'Balandis';
+$labels['longmay']	= 'Gegužė';
+$labels['longjun']	= 'Biržėlis';
+$labels['longjul']	= 'Liepa';
+$labels['longaug']	= 'Rugpjūtis';
+$labels['longsep']	= 'Rugsėjis';
+$labels['longoct']	= 'Spalis';
+$labels['longnov']	= 'Lapkritis';
+$labels['longdec']	= 'Gruodis';
+
 $labels['today'] = 'Šiandien';
-$labels['refresh'] = 'Atnaujinti';
-$labels['checkmail'] = 'Tikrinti, ar yra naujų laiškų';
-$labels['compose'] = 'Rašyti naują laišką';
-$labels['writenewmessage'] = 'Rašyti naują laišką';
-$labels['reply'] = 'Atsakyti';
-$labels['replytomessage'] = 'Atsakyti siuntėjui';
+
+// toolbar buttons
+$labels['refresh']          = 'Atnaujinti';
+$labels['checkmail']        = 'Tikrinti, ar yra naujų laiškų';
+$labels['compose']          = 'Rašyti naują laišką';
+$labels['writenewmessage']  = 'Rašyti naują laišką';
+$labels['reply']            = 'Atsakyti';
+$labels['replytomessage']   = 'Atsakyti siuntėjui';
 $labels['replytoallmessage'] = 'Atsakyti el. pašto grupei arba laiško siuntėjui ir visiems jo gavėjams';
-$labels['replyall'] = 'Atsakyti visiems';
-$labels['replylist'] = 'Atsakyti el. pašto grupei';
-$labels['forward'] = 'Persiųsti';
-$labels['forwardinline'] = 'Persiųsti cituojant';
+$labels['replyall']         = 'Atsakyti visiems';
+$labels['replylist']        = 'Atsakyti el. pašto grupei';
+$labels['forward']          = 'Persiųsti';
+$labels['forwardinline']    = 'Persiųsti cituojant';
 $labels['forwardattachment'] = 'Persiųsti priedu';
-$labels['forwardmessage'] = 'Persiųsti laišką';
-$labels['deletemessage'] = 'Pašalinti laišką';
+$labels['forwardmessage']   = 'Persiųsti laišką';
+$labels['deletemessage']    = 'Pašalinti laišką';
 $labels['movemessagetotrash'] = 'Perkelti laišką į šiukšlinę';
-$labels['printmessage'] = 'Atspausdinti laišką';
-$labels['previousmessage'] = 'Rodyti ankstesnį laišką';
-$labels['firstmessage'] = 'Rodyti pirmąjį laišką';
-$labels['nextmessage'] = 'Rodyti tolesnį laišką';
-$labels['lastmessage'] = 'Rodyti paskutinį laišką';
-$labels['backtolist'] = 'Grižti į laiškų sarašą';
-$labels['viewsource'] = 'Rodyti pirminį tekstą';
-$labels['mark'] = 'Pažymėti';
-$labels['markmessages'] = 'Pažymėti laiškus';
-$labels['markread'] = 'Kaip skaitytus';
-$labels['markunread'] = 'Kaip neskaitytus';
-$labels['markflagged'] = 'Pažymėti gairele';
-$labels['markunflagged'] = 'Pašalinti gairelę';
-$labels['moreactions'] = 'Kiti veiksmai…';
-$labels['more'] = 'Daugiau';
-$labels['back'] = 'Grįžti';
-$labels['options'] = 'Nuostatos';
+$labels['printmessage']     = 'Atspausdinti laišką';
+$labels['previousmessage']  = 'Rodyti ankstesnį laišką';
+$labels['firstmessage']     = 'Rodyti pirmąjį laišką';
+$labels['nextmessage']      = 'Rodyti tolesnį laišką';
+$labels['lastmessage']      = 'Rodyti paskutinį laišką';
+$labels['backtolist']       = 'Grižti į laiškų sarašą';
+$labels['viewsource']       = 'Rodyti pirminį tekstą';
+$labels['mark']             = 'Pažymėti';
+$labels['markmessages']     = 'Pažymėti laiškus';
+$labels['markread']         = 'Kaip skaitytus';
+$labels['markunread']       = 'Kaip neskaitytus';
+$labels['markflagged']      = 'Pažymėti gairele';
+$labels['markunflagged']    = 'Pašalinti gairelę';
+$labels['moreactions']      = 'Kiti veiksmai…';
+$labels['more']             = 'Daugiau';
+$labels['back']             = 'Grįžti';
+$labels['options']          = 'Nuostatos';
+
 $labels['select'] = 'Pažymėti';
 $labels['all'] = 'visus';
 $labels['none'] = 'Nerūšiuoti';
-$labels['nonesort'] = 'Nerūšiuoti';
 $labels['currpage'] = 'matomus šiame puslapyje';
 $labels['unread'] = 'neskaitytus';
 $labels['flagged'] = 'su gairele';
 $labels['unanswered'] = 'neatsakytus';
 $labels['deleted'] = 'pašalintus';
+$labels['undeleted'] = 'Neištrintas';
 $labels['invert'] = 'invertuoti';
 $labels['filter'] = 'Rodyti';
 $labels['list'] = 'Sąrašas';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'išskleisti visas';
 $labels['expand-unread'] = 'išskleisti turinčias neskaitytų laiškų';
 $labels['collapse-all'] = 'suskleisti visas';
 $labels['threaded'] = 'Rodyti gijas';
+
 $labels['autoexpand_threads'] = 'Išskleisti gijas';
 $labels['do_expand'] = 'visas';
 $labels['expand_only_unread'] = 'tik turinčias neskaitytų laiškų';
 $labels['fromto'] = 'Siuntėjas/Gavėjas';
 $labels['flag'] = 'Gairelė';
 $labels['attachment'] = 'Priedas';
+$labels['nonesort'] = 'Nerūšiuoti';
 $labels['sentdate'] = 'Išsiuntimo laikas';
 $labels['arrival'] = 'Gavimo laikas';
 $labels['asc'] = 'didėjančiai';
@@ -156,174 +187,216 @@ $labels['listcolumns'] = 'Stulpelių sąrašas';
 $labels['listsorting'] = 'Stulpelis rikiavimui';
 $labels['listorder'] = 'Rikiavimo tvarka';
 $labels['listmode'] = 'Sąrašo rodymo veiksena';
+
 $labels['folderactions'] = 'Veiksmai su aplankais…';
 $labels['compact'] = 'Suglaudinti';
 $labels['empty'] = 'Ištuštinti';
+
 $labels['quota'] = 'Disko naudojimas';
-$labels['unknown'] = 'nežinomas';
-$labels['unlimited'] = 'neribotas';
-$labels['quicksearch'] = 'Sparčioji paieška';
-$labels['resetsearch'] = 'Atšaukti paiešką';
-$labels['searchmod'] = 'Paieškos modifikatoriai';
-$labels['msgtext'] = 'Visas laiškas';
+$labels['unknown']  = 'nežinomas';
+$labels['unlimited']  = 'neribotas';
+
+$labels['quicksearch']  = 'Sparčioji paieška';
+$labels['resetsearch']  = 'Atšaukti paiešką';
+$labels['searchmod']  = 'Paieškos modifikatoriai';
+$labels['msgtext']  = 'Visas laiškas';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
-$labels['editasnew'] = 'Redaguoti kaip naują';
-$labels['sendmessage'] = 'Išsiųsti laiską';
-$labels['savemessage'] = 'Išsaugoti šį juodraštį';
-$labels['addattachment'] = 'Pridėti failą';
-$labels['charset'] = 'Koduotė';
-$labels['editortype'] = 'Laiško tipas';
-$labels['returnreceipt'] = 'Prašyti pristatymo pažymos';
-$labels['dsn'] = 'Laiško pristatymo pažyma';
+
+// message compose
+$labels['editasnew']      = 'Redaguoti kaip naują';
+$labels['send']           = 'Siųsti';
+$labels['sendmessage']    = 'Išsiųsti laiską';
+$labels['savemessage']    = 'Išsaugoti šį juodraštį';
+$labels['addattachment']  = 'Pridėti failą';
+$labels['charset']        = 'Koduotė';
+$labels['editortype']     = 'Laiško tipas';
+$labels['returnreceipt']  = 'Prašyti pristatymo pažymos';
+$labels['dsn']            = 'Laiško pristatymo pažyma';
 $labels['mailreplyintro'] = '$date, $sender rašė:';
 $labels['originalmessage'] = 'Originalus laiškas';
-$labels['editidents'] = 'Tvarkyti tapatybes';
-$labels['spellcheck'] = 'Tikrinti rašybą';
+
+$labels['editidents']    = 'Tvarkyti tapatybes';
+$labels['spellcheck']    = 'Tikrinti rašybą';
 $labels['checkspelling'] = 'Tikrinti rašybą';
 $labels['resumeediting'] = 'Tęsti redagavimą';
-$labels['revertto'] = 'Atstatyti į';
+$labels['revertto']      = 'Atstatyti į';
+
 $labels['attach'] = 'Pridėti failą';
 $labels['attachments'] = 'Pridėti failai';
 $labels['upload'] = 'Įkelti';
 $labels['uploadprogress'] = '$percent ($current iš $total)';
-$labels['close'] = 'Užverti';
-$labels['messageoptions'] = 'Laiško savybės…';
-$labels['low'] = 'Žemas';
-$labels['lowest'] = 'Žemiausias';
-$labels['normal'] = 'Normalus';
-$labels['high'] = 'Aukštas';
+$labels['close']  = 'Užverti';
+$labels['messageoptions']  = 'Laiško savybės…';
+
+$labels['low']     = 'Žemas';
+$labels['lowest']  = 'Žemiausias';
+$labels['normal']  = 'Normalus';
+$labels['high']    = 'Aukštas';
 $labels['highest'] = 'Aukščiausias';
-$labels['nosubject'] = '(tema nenurodyta)';
+
+$labels['nosubject']  = '(tema nenurodyta)';
 $labels['showimages'] = 'Rodyti paveikslėlius';
 $labels['alwaysshow'] = 'Visada rodyti paveikslėlius $sender laiškuose';
-$labels['isdraft'] = 'Tai – laiško juodraštis.';
+$labels['isdraft']    = 'Tai – laiško juodraštis.';
+$labels['andnmore']   = '$nr daugiau...';
+$labels['togglemoreheaders'] = 'Rodyti daugiau antraščių';
+$labels['togglefullheaders'] = 'Įjungti/išjungti neapdorotas laiškų antraštes';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Grynasis tekstas';
 $labels['savesentmessagein'] = 'Išsiųstus laiškus įrašyti į';
 $labels['dontsave'] = 'neįrašyti';
 $labels['maxuploadsize'] = 'Maksimalus leistinas failo dydis yra $size';
+
 $labels['addcc'] = 'Pridėti Cc';
 $labels['addbcc'] = 'Pridėti Bcc';
 $labels['addreplyto'] = 'Pridėti Reply-To';
 $labels['addfollowupto'] = 'Pridėti Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Šio laiško siuntėjas paprašė patvirtinti, kad jūs jį perskaitėte. Ar išsiųsti tai patvirtinančią pažymą?';
 $labels['receiptread'] = 'Patvirtinimas (laiškas perskaitytas)';
 $labels['yourmessage'] = 'Tai – pažyma, patvirtinanti, jog buvo perskaitytas Jūsų laiškas';
 $labels['receiptnote'] = 'Pastaba: šia pažyma patvirtinamas tik faktas, jog laiškas buvo parodytas gavėjui. Ja negarantuojama, jog gavėjas perskaitė ir suprato laiško turinį.';
-$labels['name'] = 'Rodomas vardas';
-$labels['firstname'] = 'Vardas';
-$labels['surname'] = 'Pavardė';
-$labels['middlename'] = 'Kiti vardai';
-$labels['nameprefix'] = 'Titulas';
-$labels['namesuffix'] = 'Sufiksas';
-$labels['nickname'] = 'Pravardė';
-$labels['jobtitle'] = 'Pareigos';
-$labels['department'] = 'Padalinys';
-$labels['gender'] = 'Lytis';
-$labels['maidenname'] = 'Mergautinė pavardė';
-$labels['email'] = 'El. paštas';
-$labels['phone'] = 'Telefono numeris';
-$labels['address'] = 'Adresas';
-$labels['street'] = 'Gatvė, namas ir butas';
-$labels['locality'] = 'Miestas';
-$labels['zipcode'] = 'Pašto kodas';
-$labels['region'] = 'Regionas';
-$labels['country'] = 'Valstybė';
-$labels['birthday'] = 'Gimimo data';
-$labels['anniversary'] = 'Jubiliejus';
-$labels['website'] = 'Svetainė';
+
+// address boook
+$labels['name']         = 'Rodomas vardas';
+$labels['firstname']    = 'Vardas';
+$labels['surname']      = 'Pavardė';
+$labels['middlename']   = 'Kiti vardai';
+$labels['nameprefix']   = 'Titulas';
+$labels['namesuffix']   = 'Sufiksas';
+$labels['nickname']     = 'Pravardė';
+$labels['jobtitle']     = 'Pareigos';
+$labels['department']   = 'Padalinys';
+$labels['gender']       = 'Lytis';
+$labels['maidenname']   = 'Mergautinė pavardė';
+$labels['email']        = 'El. paštas';
+$labels['phone']        = 'Telefono numeris';
+$labels['address']      = 'Adresas';
+$labels['street']       = 'Gatvė, namas ir butas';
+$labels['locality']     = 'Miestas';
+$labels['zipcode']      = 'Pašto kodas';
+$labels['region']       = 'Regionas';
+$labels['country']      = 'Valstybė';
+$labels['birthday']     = 'Gimimo data';
+$labels['anniversary']  = 'Jubiliejus';
+$labels['website']      = 'Svetainė';
 $labels['instantmessenger'] = 'Tikralaikiai pokalbiai';
 $labels['notes'] = 'Pastabos';
-$labels['male'] = 'vyras';
+$labels['male']   = 'vyras';
 $labels['female'] = 'moteris';
 $labels['manager'] = 'Vadybininkas(-ė)';
 $labels['assistant'] = 'Padėjėjo(-os)';
-$labels['typeassistant'] = 'Padėjėjo(-os)';
 $labels['spouse'] = 'Sutuoktinis';
 $labels['allfields'] = 'Visi laukai';
 $labels['search'] = 'Paieška';
 $labels['advsearch'] = 'Išplėstinė paieška';
 $labels['advanced'] = 'Išsamiau';
 $labels['other'] = 'Kitas';
-$labels['typeother'] = 'Kitas';
-$labels['typehome'] = 'Namų';
-$labels['typework'] = 'Darbo';
-$labels['typemobile'] = 'Mobilusis';
-$labels['typemain'] = 'Pagrindinis';
-$labels['typehomefax'] = 'Namų faksas';
-$labels['typeworkfax'] = 'Darbo faksas';
-$labels['typecar'] = 'Automobilyje';
-$labels['typepager'] = 'Pranešimų gaviklis';
-$labels['typevideo'] = 'Vaizdo';
-$labels['typehomepage'] = 'Tinklalapis';
+
+$labels['typehome']   = 'Namų';
+$labels['typework']   = 'Darbo';
+$labels['typeother']  = 'Kitas';
+$labels['typemobile']  = 'Mobilusis';
+$labels['typemain']  = 'Pagrindinis';
+$labels['typehomefax']  = 'Namų faksas';
+$labels['typeworkfax']  = 'Darbo faksas';
+$labels['typecar']  = 'Automobilyje';
+$labels['typepager']  = 'Pranešimų gaviklis';
+$labels['typevideo']  = 'Vaizdo';
+$labels['typeassistant']  = 'Padėjėjo(-os)';
+$labels['typehomepage']  = 'Tinklalapis';
 $labels['typeblog'] = 'Tinklaraštis';
 $labels['typeprofile'] = 'Profilis';
+
 $labels['addfield'] = 'Pridėti lauką…';
 $labels['addcontact'] = 'Pridėti adresatą';
 $labels['editcontact'] = 'Taisyti adresatą';
 $labels['contacts'] = 'Adresatai';
 $labels['contactproperties'] = 'Adresato savybės';
 $labels['personalinfo'] = 'Asmeniniai duomenys';
-$labels['edit'] = 'Redaguoti';
+
+$labels['edit']   = 'Redaguoti';
 $labels['cancel'] = 'Atsisakyti';
-$labels['save'] = 'Įrašyti';
+$labels['save']   = 'Įrašyti';
 $labels['delete'] = 'Pašalinti';
 $labels['rename'] = 'Pervardinti';
 $labels['addphoto'] = 'Pridėti';
 $labels['replacephoto'] = 'Pakeisti';
 $labels['uploadphoto'] = 'Įkelti nuotrauką';
-$labels['newcontact'] = 'Sukurti naują adresatą';
-$labels['deletecontact'] = 'Ištrinti pažymėtus adresatus';
-$labels['composeto'] = 'Rašyti laišką';
+
+$labels['newcontact']     = 'Sukurti naują adresatą';
+$labels['deletecontact']  = 'Ištrinti pažymėtus adresatus';
+$labels['composeto']      = 'Rašyti laišką';
 $labels['contactsfromto'] = 'Adresatai nuo $from iki $to iš $count';
-$labels['print'] = 'Spausdinti';
-$labels['export'] = 'Eksportuoti';
-$labels['exportvcards'] = 'Eksportuoti adresatus  „vCard“ formatu';
+$labels['print']          = 'Spausdinti';
+$labels['export']         = 'Eksportuoti';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Eksportuoti adresatus  „vCard“ formatu';
 $labels['newcontactgroup'] = 'Kurti adresatų grupę';
-$labels['grouprename'] = 'Pervardinti grupę';
-$labels['groupdelete'] = 'Pašalinti grupę';
+$labels['grouprename']    = 'Pervardinti grupę';
+$labels['groupdelete']    = 'Pašalinti grupę';
 $labels['groupremoveselected'] = 'Pašalinti pažymėtus adresatus iš grupės';
-$labels['previouspage'] = 'Rodyti ankstesnį puslapį';
-$labels['firstpage'] = 'Rodyti pirmąjį puslapį';
-$labels['nextpage'] = 'Rodyti tolesnį puslapį';
-$labels['lastpage'] = 'Rodyti paskutinį puslapį';
+
+$labels['previouspage']   = 'Rodyti ankstesnį puslapį';
+$labels['firstpage']      = 'Rodyti pirmąjį puslapį';
+$labels['nextpage']       = 'Rodyti tolesnį puslapį';
+$labels['lastpage']       = 'Rodyti paskutinį puslapį';
+
 $labels['group'] = 'Grupė';
 $labels['groups'] = 'Grupės';
 $labels['personaladrbook'] = 'Asmeniniai adresai';
+
 $labels['searchsave'] = 'Įrašyti kaip radinių aplanką';
 $labels['searchdelete'] = 'Pašalinti radinių aplanką';
+
 $labels['import'] = 'Importuoti';
 $labels['importcontacts'] = 'Importuoti adresatus';
 $labels['importfromfile'] = 'Importuoti iš failo:';
 $labels['importtarget'] = 'Pridėti naujus adresatus į adresų knygą:';
 $labels['importreplace'] = 'Perrašyti visą adresų knygą';
+$labels['importdesc'] = 'Galite įkelti kontaktus iš jau turimos adresų knygos. <br/>Šiuo metu galima importuoti kontaktus iš <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> arba CSV (comma-separated) duomenų formatų.';
 $labels['done'] = 'Baigta';
+
+// settings
 $labels['settingsfor'] = 'Nuostatos';
 $labels['about'] = 'Apie';
 $labels['preferences'] = 'Nuostatos';
 $labels['userpreferences'] = 'Naudotojo nuostatos';
 $labels['editpreferences'] = 'Keisti naudotojo nuostatas';
+
 $labels['identities'] = 'Tapatybės';
 $labels['manageidentities'] = 'Tvarkyti šios paskyros tapatybes';
 $labels['newidentity'] = 'Nauja tapatybė';
+
 $labels['newitem'] = 'Naujas elementas';
 $labels['edititem'] = 'Redaguoti elementą';
+
 $labels['preferhtml'] = 'Rodyti HTML';
 $labels['defaultcharset'] = 'Numatytoji koduotė';
 $labels['htmlmessage'] = 'HTML laiškas';
+$labels['messagepart'] = 'Dalis';
+$labels['digitalsig'] = 'Skaitmeninis parašas';
 $labels['dateformat'] = 'Datos formatas';
 $labels['timeformat'] = 'Laiko formatas';
 $labels['prettydate'] = 'Dailios datos';
-$labels['setdefault'] = 'Laikyti numatytąja';
-$labels['autodetect'] = 'Aptikti automatiškai';
-$labels['language'] = 'Kalba';
-$labels['timezone'] = 'Laiko juosta';
-$labels['pagesize'] = 'Eilučių skaičius puslapyje';
+$labels['setdefault']  = 'Laikyti numatytąja';
+$labels['autodetect']  = 'Aptikti automatiškai';
+$labels['language']  = 'Kalba';
+$labels['timezone']  = 'Laiko juosta';
+$labels['pagesize']  = 'Eilučių skaičius puslapyje';
 $labels['signature'] = 'Parašas';
-$labels['dstactive'] = 'Vasaros laikas skiriasi';
+$labels['dstactive']  = 'Vasaros laikas skiriasi';
+$labels['showinextwin'] = 'Atidaryti pranešimą naujame lange';
+$labels['composeextwin'] = 'Rašyti naujame lange';
 $labels['htmleditor'] = 'Laiškus kurti HTML formatu';
 $labels['htmlonreply'] = 'tik atsakymus į HTML formato laiškus';
+$labels['htmlonreplyandforward'] = 'atsakant į HTML laišką arba jį persiunčiant';
 $labels['htmlsignature'] = 'HTML parašas';
 $labels['previewpane'] = 'Rodyti laiško peržiūros polangį';
 $labels['skin'] = 'Grafinis apvalkalas';
@@ -347,10 +420,11 @@ $labels['showremoteimages'] = 'Įkelti paveikslėlius iš interneto serverių';
 $labels['fromknownsenders'] = 'tik žinomų siuntėjų laiškuose';
 $labels['always'] = 'visada';
 $labels['showinlineimages'] = 'Rodyti pridėtus paveikslėlius žemiau laiško';
-$labels['autosavedraft'] = 'Automatiškai įrašyti juodraščius';
-$labels['everynminutes'] = 'kas $n min.';
-$labels['never'] = 'niekada';
-$labels['immediately'] = 'nedelsiant';
+$labels['autosavedraft']  = 'Automatiškai įrašyti juodraščius';
+$labels['everynminutes']  = 'kas $n min.';
+$labels['refreshinterval']  = 'Atnaujinti (patikrinti, ar nėra naujų laiškų ir pan.)';
+$labels['never']  = 'niekada';
+$labels['immediately']  = 'nedelsiant';
 $labels['messagesdisplaying'] = 'Laiškų rodymas';
 $labels['messagescomposition'] = 'Laiškų rašymas';
 $labels['mimeparamfolding'] = 'Prisegtų failų vardų kodavimas';
@@ -370,6 +444,7 @@ $labels['maintenance'] = 'Priežiūra';
 $labels['newmessage'] = 'Naujas laiškas';
 $labels['signatureoptions'] = 'Parašo nuostatos';
 $labels['whenreplying'] = 'Kuriant atsakymą';
+$labels['replyempty'] = 'necituoti originalaus laiško';
 $labels['replytopposting'] = 'rašyti atsakymą virš cituojamo laiško';
 $labels['replybottomposting'] = 'rašyti atsakymą po cituojamu laišku';
 $labels['replyremovesignature'] = 'Pašalinti cituojamame laiške esantį parašą';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = 'Atsakant ir persiunčiant laiškus, parašą pri
 $labels['belowquote'] = 'po citata';
 $labels['abovequote'] = 'virš citatos';
 $labels['insertsignature'] = 'Pridėti parašą';
-$labels['previewpanemarkread'] = 'Peržiūros polangyje parodytus laiškus žymėti skaitytais';
-$labels['afternseconds'] = 'praėjus $n sek.';
+$labels['previewpanemarkread']  = 'Peržiūros polangyje parodytus laiškus žymėti skaitytais';
+$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';
 $labels['replysamefolder'] = 'Atsakymus talpinti į tą patį aplanką, kuriame yra pirminis laiškas';
-$labels['defaultaddressbook'] = 'Pridėti naujus adresatus į pasirinktąją adresų knygą';
+$labels['defaultabook'] = 'Numatytoji adresų knyga';
 $labels['autocompletesingle'] = 'Užbaigiant adresus, praleisti antrinius';
 $labels['listnamedisplay'] = 'Rodyti adresatus kaip';
 $labels['spellcheckbeforesend'] = 'Tikrinti rašybą prieš išsiunčiant laišką';
@@ -395,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Nepaisyti žodžių su skaitmenimis';
 $labels['spellcheckignorecaps'] = 'Nepaisyti žodžių vien iš didžiųjų raidžių';
 $labels['addtodict'] = 'Įtraukti į žodyną';
 $labels['mailtoprotohandler'] = 'Užregistruoti svetainę kaip dirbančią su „mailto:“ saitais';
-$labels['folder'] = 'Aplankas';
-$labels['foldername'] = 'Aplanko vardas';
-$labels['subscribed'] = 'Užsakytas';
+$labels['forwardmode'] = 'Laiškų persiuntimo būdas';
+$labels['inline'] = 'kaip citatą';
+$labels['asattachment'] = 'kaip priedas';
+
+$labels['folder']  = 'Aplankas';
+$labels['folders']  = 'Aplankai';
+$labels['foldername']  = 'Aplanko vardas';
+$labels['subscribed']  = 'Užsakytas';
 $labels['messagecount'] = 'Laiškai';
-$labels['create'] = 'Sukurti';
-$labels['createfolder'] = 'Sukurti naują aplanką';
-$labels['managefolders'] = 'Tvarkyti aplankus';
+$labels['create']  = 'Sukurti';
+$labels['createfolder']  = 'Sukurti naują aplanką';
+$labels['managefolders']  = 'Tvarkyti aplankus';
 $labels['specialfolders'] = 'Specialieji aplankai';
 $labels['properties'] = 'Savybės';
 $labels['folderproperties'] = 'Aplanko savybės';
@@ -411,22 +491,29 @@ $labels['info'] = 'Informacija';
 $labels['getfoldersize'] = 'Spustelėkite, norėdami sužinoti aplanko dydį';
 $labels['changesubscription'] = 'Spustelėkite, norėdami keisti prenumeratos nuostatas';
 $labels['foldertype'] = 'Aplanko tipas';
-$labels['personalfolder'] = 'Asmeninis aplankas';
-$labels['otherfolder'] = 'Kito naudotojo aplankas';
-$labels['sharedfolder'] = 'Viešas aplankas';
+$labels['personalfolder']  = 'Asmeninis aplankas';
+$labels['otherfolder']  = 'Kito naudotojo aplankas';
+$labels['sharedfolder']  = 'Viešas aplankas';
+
 $labels['sortby'] = 'Rikiuoti pagal';
-$labels['sortasc'] = 'Rikiuoti didėjančiai';
+$labels['sortasc']  = 'Rikiuoti didėjančiai';
 $labels['sortdesc'] = 'Rikiuoti mažėjančiai';
 $labels['undo'] = 'Atšaukti';
+
+$labels['installedplugins'] = 'Įdiegti įskiepiai';
 $labels['plugin'] = 'Papildinys';
 $labels['version'] = 'Versija';
 $labels['source'] = 'Šaltinis';
 $labels['license'] = 'Licencija';
 $labels['support'] = 'Gauti pagalbos';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unikodas';
 $labels['english'] = 'Anglų';
 $labels['westerneuropean'] = 'Vakarų Europos';
@@ -446,3 +533,4 @@ $labels['japanese'] = 'Japonų';
 $labels['korean'] = 'Korėjiečių';
 $labels['chinese'] = 'Kinų';
 
+?>
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index b83ffcfe4..6a8e00239 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Įvyko klaida!';
-$messages['loginfailed'] = 'Prisijungti nepavyko.';
+$messages['errortitle']  = 'Įvyko klaida!';
+$messages['loginfailed']  = 'Prisijungti nepavyko.';
 $messages['cookiesdisabled'] = 'Jūsų naršyklė nepriima slapukų.';
 $messages['sessionerror'] = 'Jūsų sesija negaliojanti.';
 $messages['storageerror'] = 'Nepavyko prisijungti prie IMAP serverio.';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = 'Baigėsi užklausai skirtas laikas';
 $messages['errorreadonly'] = 'Nepavyko atlikti veiksmo – aplankas prieinamas tik skaitymui.';
 $messages['errornoperm'] = 'Nepavyko atlikti veiksmo – nepakanka teisių.';
 $messages['invalidrequest'] = 'Netinkama užklausa! Duomenys neišsaugoti.';
+$messages['invalidhost'] = 'Negalimas serverio vardas.';
 $messages['nomessagesfound'] = 'Šioje pašto dėžutėje laiškų nėra.';
 $messages['loggedout'] = 'Jūs sėkmingai atsijungėte. Iki kito karto!';
 $messages['mailboxempty'] = 'Pašto dėžutė tuščia.';
+$messages['refreshing'] = 'Atnaujinama…';
 $messages['loading'] = 'Įkeliama…';
 $messages['uploading'] = 'Įkeliamas failas…';
 $messages['uploadingmany'] = 'Įkeliami failai…';
@@ -55,11 +60,11 @@ $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['deletecontactconfirm'] = 'Ar tikrai pašalinti pažymėtą(-us) adresatą(-us)?';
-$messages['deletegroupconfirm'] = 'Ar tikrai pašalinti pažymėtą grupę?';
+$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)?';
-$messages['deletefolderconfirm'] = 'Ar tikrai pašalinti šį aplanką?';
-$messages['purgefolderconfirm'] = 'Ar tikrai pašalinti visus šiame aplanke esančius laiškus?';
+$messages['deletefolderconfirm']  = 'Ar tikrai pašalinti šį aplanką?';
+$messages['purgefolderconfirm']  = 'Ar tikrai pašalinti visus šiame aplanke esančius laiškus?';
 $messages['contactdeleting'] = 'Adresatas(-ai) šalinamas(-i)…';
 $messages['groupdeleting'] = 'Grupė šalinama…';
 $messages['folderdeleting'] = 'Aplankas šalinamas…';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Aplankas prenumeruojamas…';
 $messages['folderunsubscribing'] = 'Atsisakoma aplanko prenumeratos…';
 $messages['formincomplete'] = 'Forma nepilnai užpildyta.';
 $messages['noemailwarning'] = 'Prašom įvesti teisingą el. pašto adresą.';
-$messages['nonamewarning'] = 'Prašom įvesti vardą.';
+$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['norecipientwarning'] = 'Prašom įvesti bent vieną gavėją.';
-$messages['nosubjectwarning'] = 'Temos laukelis tuščias. Ar norite temą įvesti dabar?';
+$messages['nosubjectwarning']  = 'Temos laukelis tuščias. Ar norite temą įvesti dabar?';
 $messages['nobodywarning'] = 'Išsiųsti šį laišką be teksto?';
 $messages['notsentwarning'] = 'Laiškas neišsiųstas. Ar jūs tikrai norite jo atsikratyti?';
 $messages['noldapserver'] = 'Prašome pasirinkti LDAP serverį paieškai.';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = 'Parinkite norimą įkelti failą.';
 $messages['addresswriterror'] = 'Pasirinktoji adresų knyga prieinama tik skaitymui.';
 $messages['contactaddedtogroup'] = 'Adresatai sėkmingai įtraukti į šią grupę.';
 $messages['contactremovedfromgroup'] = 'Adresatai sėkmingai pašalinti iš šios grupės.';
+$messages['nogroupassignmentschanged'] = 'Grupių priskyrimai nepakeisti.';
 $messages['importwait'] = 'Importuojama, prašome palaukti…';
-$messages['importerror'] = 'Importavimas nepavyko! Įkeltasis failas nėra „vCard“ formato.';
+$messages['importformaterror'] = 'Importas nepavyko! Įkeltasis failas nėra tinkamas importavimui duomenų failas.';
 $messages['importconfirm'] = '<b>Sėkmingai importuoti $inserted adresatai(-ų)</b>';
 $messages['importconfirmskipped'] = '<b>Praleisti $skipped jau egzistuojantys adresatai(-ų)</b>';
 $messages['opnotpermitted'] = 'Veiksmas neleistinas!';
@@ -157,4 +163,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['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.';
 
+?>
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index 4c83528f6..5e47b1a29 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -2,56 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Esiet laipni lūgti $product';
-$labels['username'] = 'Lietotājvārds';
-$labels['password'] = 'Parole';
-$labels['server'] = 'Serveris';
-$labels['login'] = 'Pieslēgties';
-$labels['logout'] = 'Atslēgties';
-$labels['mail'] = 'E-pasts';
+
+// login page
+$labels['welcome']   = 'Esiet laipni lūgti $product';
+$labels['username']  = 'Lietotājvārds';
+$labels['password']  = 'Parole';
+$labels['server']    = 'Serveris';
+$labels['login']     = 'Pieslēgties';
+
+// taskbar
+$labels['logout']   = 'Atslēgties';
+$labels['mail']     = 'E-pasts';
 $labels['settings'] = 'Personīgie iestatījumi';
 $labels['addressbook'] = 'Adrešu grāmata';
-$labels['inbox'] = 'Ienākošās';
+
+// mailbox names
+$labels['inbox']  = 'Ienākošās';
 $labels['drafts'] = 'Uzmetumi';
-$labels['sent'] = 'Nosūtītās';
-$labels['trash'] = 'Miskaste';
-$labels['junk'] = 'Mēstules';
+$labels['sent']   = 'Nosūtītās';
+$labels['trash']  = 'Miskaste';
+$labels['junk']   = 'Mēstules';
+
+// message listing
 $labels['subject'] = 'Temats';
-$labels['from'] = 'No';
-$labels['to'] = 'Kam';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'No';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Kam';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Datums';
-$labels['size'] = 'Izmērs';
+$labels['date']    = 'Datums';
+$labels['size']    = 'Izmērs';
 $labels['priority'] = 'Prioritāte';
 $labels['organization'] = 'Uzņēmums';
 $labels['readstatus'] = 'Izlasīšanas statuss';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Mapes';
-$labels['folders'] = 'Mapes';
 $labels['messagesfromto'] = 'Vēstules $from līdz $to no $count';
 $labels['threadsfromto'] = 'Vijumi $from līdz $to no $count';
 $labels['messagenrof'] = '$nr. vēstule  no $count';
-$labels['copy'] = 'Kopēt';
-$labels['move'] = 'Pārvietot';
-$labels['moveto'] = 'pārvietot uz...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Kopēt';
+$labels['move']     = 'Pārvietot';
+$labels['moveto']   = 'pārvietot uz...';
 $labels['download'] = 'lejupielādēt';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Faila nosaukums';
 $labels['filesize'] = 'Faila izmērs';
+
 $labels['addtoaddressbook'] = 'Pievienot adrešu grāmatai';
+
+// weekdays short
 $labels['sun'] = 'Sv';
 $labels['mon'] = 'P';
 $labels['tue'] = 'O';
@@ -59,72 +80,89 @@ $labels['wed'] = 'T';
 $labels['thu'] = 'C';
 $labels['fri'] = 'P';
 $labels['sat'] = 'Se';
-$labels['sunday'] = 'Svētdiena';
-$labels['monday'] = 'Pirmdiena';
-$labels['tuesday'] = 'Otrdiena';
+
+// weekdays long
+$labels['sunday']    = 'Svētdiena';
+$labels['monday']    = 'Pirmdiena';
+$labels['tuesday']   = 'Otrdiena';
 $labels['wednesday'] = 'Trešdiena';
-$labels['thursday'] = 'Ceturtdiena';
-$labels['friday'] = 'Piektdiena';
-$labels['saturday'] = 'Sestdiena';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maijs';
-$labels['longmay'] = 'Maijs';
-$labels['jun'] = 'Jūn';
-$labels['jul'] = 'Jūl';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Janvāris';
-$labels['longfeb'] = 'Februāris';
-$labels['longmar'] = 'Marts';
-$labels['longapr'] = 'Aprīlis';
-$labels['longjun'] = 'Jūnijs';
-$labels['longjul'] = 'Jūlijs';
-$labels['longaug'] = 'Augusts';
-$labels['longsep'] = 'Septembris';
-$labels['longoct'] = 'Oktobris';
-$labels['longnov'] = 'Novembris';
-$labels['longdec'] = 'Decembris';
+$labels['thursday']  = 'Ceturtdiena';
+$labels['friday']    = 'Piektdiena';
+$labels['saturday']  = 'Sestdiena';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maijs';
+$labels['jun']	= 'Jūn';
+$labels['jul'] 	= 'Jūl';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Janvāris';
+$labels['longfeb']	= 'Februāris';
+$labels['longmar']	= 'Marts';
+$labels['longapr']	= 'Aprīlis';
+$labels['longmay']	= 'Maijs';
+$labels['longjun']	= 'Jūnijs';
+$labels['longjul']	= 'Jūlijs';
+$labels['longaug']	= 'Augusts';
+$labels['longsep']	= 'Septembris';
+$labels['longoct']	= 'Oktobris';
+$labels['longnov']	= 'Novembris';
+$labels['longdec']	= 'Decembris';
+
 $labels['today'] = 'Šodien';
-$labels['checkmail'] = 'Pārbaudīt pastu';
-$labels['compose'] = 'Rakstīt vēstuli';
-$labels['writenewmessage'] = 'Rakstīt jaunu vēstuli';
-$labels['replytomessage'] = 'Atbildēt';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Pārbaudīt pastu';
+$labels['compose']          = 'Rakstīt vēstuli';
+$labels['writenewmessage']  = 'Rakstīt jaunu vēstuli';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Atbildēt';
 $labels['replytoallmessage'] = 'Atbildēt sūtītājam un visiem saņēmējiem';
-$labels['replyall'] = 'Atbildēt visiem';
-$labels['replylist'] = 'Atbildēt listei';
-$labels['forwardinline'] = 'Pārsūtīt iekļaujot vēstulē';
+$labels['replyall']         = 'Atbildēt visiem';
+$labels['replylist']        = 'Atbildēt listei';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Pārsūtīt iekļaujot vēstulē';
 $labels['forwardattachment'] = 'Pārsūtīt kā pielikumu';
-$labels['forwardmessage'] = 'Pārsūtīt vēstuli';
-$labels['deletemessage'] = 'Dzēst vēstuli';
+$labels['forwardmessage']   = 'Pārsūtīt vēstuli';
+$labels['deletemessage']    = 'Dzēst vēstuli';
 $labels['movemessagetotrash'] = 'Pārvietot vēstuli uz miskasti';
-$labels['printmessage'] = 'izdrukāt';
-$labels['previousmessage'] = 'Parādīt iepriekšējo vēstuli';
-$labels['firstmessage'] = 'Parādīt pirmo vēstuli';
-$labels['nextmessage'] = 'Parādīt nākamo vēstuli';
-$labels['lastmessage'] = 'Parādīt pēdējo vēstuli';
-$labels['backtolist'] = 'Atpakaļ uz vēstuļu sarakstu';
-$labels['viewsource'] = 'parādīt pirmtekstu';
-$labels['markmessages'] = 'Marķēt vēstules kā:';
-$labels['markread'] = 'lasītas';
-$labels['markunread'] = 'nelasītas';
-$labels['markflagged'] = 'iezīmētas';
-$labels['markunflagged'] = 'neiezīmētas';
-$labels['moreactions'] = 'Citas darbības...';
+$labels['printmessage']     = 'izdrukāt';
+$labels['previousmessage']  = 'Parādīt iepriekšējo vēstuli';
+$labels['firstmessage']     = 'Parādīt pirmo vēstuli';
+$labels['nextmessage']      = 'Parādīt nākamo vēstuli';
+$labels['lastmessage']      = 'Parādīt pēdējo vēstuli';
+$labels['backtolist']       = 'Atpakaļ uz vēstuļu sarakstu';
+$labels['viewsource']       = 'parādīt pirmtekstu';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Marķēt vēstules kā:';
+$labels['markread']         = 'lasītas';
+$labels['markunread']       = 'nelasītas';
+$labels['markflagged']      = 'iezīmētas';
+$labels['markunflagged']    = 'neiezīmētas';
+$labels['moreactions']      = 'Citas darbības...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Iezīmēt';
 $labels['all'] = 'visas';
 $labels['none'] = 'Neviens';
-$labels['nonesort'] = 'Neviens';
 $labels['currpage'] = 'Pašreizējā lapa';
 $labels['unread'] = 'nelasītās';
 $labels['flagged'] = 'iezīmētās';
 $labels['unanswered'] = 'neatbildētās';
 $labels['deleted'] = 'dzēstās';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'invertēt';
 $labels['filter'] = 'Filtrēt';
 $labels['list'] = 'Saraksts';
@@ -133,12 +171,14 @@ $labels['expand-all'] = 'Izvērst visus';
 $labels['expand-unread'] = 'Izvērst neizlasītos';
 $labels['collapse-all'] = 'Savērst visu';
 $labels['threaded'] = 'Savīts';
+
 $labels['autoexpand_threads'] = 'Izvērst vēstuļu vijumus';
 $labels['do_expand'] = 'visiem vijumiem';
 $labels['expand_only_unread'] = 'tikai tad, ja ir neizlasītas vēstules';
 $labels['fromto'] = 'Sūtītājs/Saņēmējs';
 $labels['flag'] = 'Iezīmēts';
 $labels['attachment'] = 'Pielikums';
+$labels['nonesort'] = 'Neviens';
 $labels['sentdate'] = 'Nosūtīšanas datums';
 $labels['arrival'] = 'Pienākšanas datums';
 $labels['asc'] = 'augoša';
@@ -147,169 +187,216 @@ $labels['listcolumns'] = 'Saraksta kolonnas';
 $labels['listsorting'] = 'Kārtot pēc kolonnas';
 $labels['listorder'] = 'Kārtošanas secība';
 $labels['listmode'] = 'Saraksta režīms';
+
 $labels['folderactions'] = 'Darbības ar mapēm...';
 $labels['compact'] = 'saspiest';
 $labels['empty'] = 'iztukšot';
+
 $labels['quota'] = 'Kvota';
-$labels['unknown'] = 'nezināms';
-$labels['unlimited'] = 'neierobežots';
-$labels['quicksearch'] = 'Ārtā meklēšana';
-$labels['resetsearch'] = 'Atstatīt meklēšanu';
-$labels['searchmod'] = 'Meklēt laukos:';
-$labels['msgtext'] = 'Vēstules tekstā';
+$labels['unknown']  = 'nezināms';
+$labels['unlimited']  = 'neierobežots';
+
+$labels['quicksearch']  = 'Ārtā meklēšana';
+$labels['resetsearch']  = 'Atstatīt meklēšanu';
+$labels['searchmod']  = 'Meklēt laukos:';
+$labels['msgtext']  = 'Vēstules tekstā';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
-$labels['editasnew'] = 'rediģēt kā jaunu';
-$labels['sendmessage'] = 'Sūtīt vēstuli';
-$labels['savemessage'] = 'Saglabāt uzmetumu';
-$labels['addattachment'] = 'Pievienot failu';
-$labels['charset'] = 'Rakstzīmju kopa';
-$labels['editortype'] = 'Redaktora tips';
-$labels['returnreceipt'] = 'Saņemšanas apstiprinājums';
-$labels['dsn'] = 'Atskaite par piegādi';
+
+// message compose
+$labels['editasnew']      = 'rediģēt kā jaunu';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Sūtīt vēstuli';
+$labels['savemessage']    = 'Saglabāt uzmetumu';
+$labels['addattachment']  = 'Pievienot failu';
+$labels['charset']        = 'Rakstzīmju kopa';
+$labels['editortype']     = 'Redaktora tips';
+$labels['returnreceipt']  = 'Saņemšanas apstiprinājums';
+$labels['dsn']            = 'Atskaite par piegādi';
 $labels['mailreplyintro'] = '$sender @ $date rakstīja:';
 $labels['originalmessage'] = 'Sākotnējā vēstule';
-$labels['editidents'] = 'Rediģēt identitātes';
+
+$labels['editidents']    = 'Rediģēt identitātes';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Pārbaudīt pareizrakstību';
 $labels['resumeediting'] = 'Turpināt rediģēšanu';
-$labels['revertto'] = 'Atgriezt uz';
+$labels['revertto']      = 'Atgriezt uz';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Pielikumi';
 $labels['upload'] = 'Augšupielādēt';
 $labels['uploadprogress'] = '$percent ($current no $total)';
-$labels['close'] = 'Aizvērt';
-$labels['messageoptions'] = 'Vēstuļu iestatījumi...';
-$labels['low'] = 'Zema';
-$labels['lowest'] = 'Zemākā';
-$labels['normal'] = 'Normāla';
-$labels['high'] = 'Augsta';
+$labels['close']  = 'Aizvērt';
+$labels['messageoptions']  = 'Vēstuļu iestatījumi...';
+
+$labels['low']     = 'Zema';
+$labels['lowest']  = 'Zemākā';
+$labels['normal']  = 'Normāla';
+$labels['high']    = 'Augsta';
 $labels['highest'] = 'Augstākā';
-$labels['nosubject'] = '(no subject)';
+
+$labels['nosubject']  = '(no subject)';
 $labels['showimages'] = 'Rādīt attēlus';
 $labels['alwaysshow'] = 'Vienmēr rādīt attēlus no $sender';
-$labels['isdraft'] = 'Šis ir melnraksts.';
+$labels['isdraft']    = 'Šis ir melnraksts.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Vienkāršs teksts';
 $labels['savesentmessagein'] = 'Saglabāt nosūtīto vēstuli mapē';
 $labels['dontsave'] = 'nesaglabāt';
 $labels['maxuploadsize'] = 'Maksimālais atļautais faila izmērs ir $size';
+
 $labels['addcc'] = 'Pievienot Cc';
 $labels['addbcc'] = 'Pievienot Bcc';
 $labels['addreplyto'] = 'Pievienot Reply-To';
 $labels['addfollowupto'] = 'Pievienot Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Šīs vēstules sūtītājs vēlas redzēt vēstules saņemšanas apstiprinājumu. Vai jūs vēlaties nosūtīt apstiprinājumu?';
 $labels['receiptread'] = 'Saņemšanas apstiprinājums';
 $labels['yourmessage'] = 'Šīs ir jūsu vēstules saņemšanas apstiprinājums';
 $labels['receiptnote'] = 'Piezīme: Šīs apsiprinājums nozīmē tikai to, ka vēstule tika parādīta uz saņēmāja datora. Tas nenozīmē, ka saņēmējs ir izlasījis vai izpratis vēstules saturu.';
-$labels['name'] = 'Uzrādītais vārds';
-$labels['firstname'] = 'Vārds';
-$labels['surname'] = 'Uzvārds';
-$labels['middlename'] = 'Otrais vārds';
-$labels['nameprefix'] = 'Prefikss';
-$labels['namesuffix'] = 'Sufikss';
-$labels['nickname'] = 'Iesauka (nick)';
-$labels['jobtitle'] = 'Amats';
-$labels['department'] = 'Nodaļa';
-$labels['gender'] = 'Dzimums';
-$labels['maidenname'] = 'Pirmslaulību uzvārds';
-$labels['email'] = 'E-pasts';
-$labels['phone'] = 'Tālrunis';
-$labels['address'] = 'Adrese';
-$labels['street'] = 'Iela';
-$labels['locality'] = 'Pilsēta';
-$labels['zipcode'] = 'Pasta kods';
-$labels['region'] = 'Novads';
-$labels['country'] = 'Pilsēta';
-$labels['birthday'] = 'Dzimšanas diena';
-$labels['anniversary'] = 'Gadadiena';
-$labels['website'] = 'Web lapa';
+
+// address boook
+$labels['name']         = 'Uzrādītais vārds';
+$labels['firstname']    = 'Vārds';
+$labels['surname']      = 'Uzvārds';
+$labels['middlename']   = 'Otrais vārds';
+$labels['nameprefix']   = 'Prefikss';
+$labels['namesuffix']   = 'Sufikss';
+$labels['nickname']     = 'Iesauka (nick)';
+$labels['jobtitle']     = 'Amats';
+$labels['department']   = 'Nodaļa';
+$labels['gender']       = 'Dzimums';
+$labels['maidenname']   = 'Pirmslaulību uzvārds';
+$labels['email']        = 'E-pasts';
+$labels['phone']        = 'Tālrunis';
+$labels['address']      = 'Adrese';
+$labels['street']       = 'Iela';
+$labels['locality']     = 'Pilsēta';
+$labels['zipcode']      = 'Pasta kods';
+$labels['region']       = 'Novads';
+$labels['country']      = 'Pilsēta';
+$labels['birthday']     = 'Dzimšanas diena';
+$labels['anniversary']  = 'Gadadiena';
+$labels['website']      = 'Web lapa';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Piezīmes';
-$labels['male'] = 'vīrietis';
+$labels['male']   = 'vīrietis';
 $labels['female'] = 'sieviete';
 $labels['manager'] = 'Menedžeris';
 $labels['assistant'] = 'Asistents';
-$labels['typeassistant'] = 'Asistents';
 $labels['spouse'] = 'Laulātais draugs';
 $labels['allfields'] = 'Visi lauki';
 $labels['search'] = 'Meklēt';
 $labels['advsearch'] = 'Paplašinātā meklēšana';
+$labels['advanced'] = 'Advanced';
 $labels['other'] = 'Cits';
-$labels['typeother'] = 'Cits';
-$labels['typehome'] = 'Mājas';
-$labels['typework'] = 'Darbs';
-$labels['typemobile'] = 'Mobilais tālrunis';
-$labels['typemain'] = 'Galvenais';
-$labels['typehomefax'] = 'Mājas Fax';
-$labels['typeworkfax'] = 'Darba Fax';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Peidžeris';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Web lapa';
+
+$labels['typehome']   = 'Mājas';
+$labels['typework']   = 'Darbs';
+$labels['typeother']  = 'Cits';
+$labels['typemobile']  = 'Mobilais tālrunis';
+$labels['typemain']  = 'Galvenais';
+$labels['typehomefax']  = 'Mājas Fax';
+$labels['typeworkfax']  = 'Darba Fax';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Peidžeris';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistents';
+$labels['typehomepage']  = 'Web lapa';
 $labels['typeblog'] = 'Blogs';
 $labels['typeprofile'] = 'Profils';
+
 $labels['addfield'] = 'Pievienot lauku...';
 $labels['addcontact'] = 'Pievienot iezīmēto ierakstu adrešu grāmatai';
 $labels['editcontact'] = 'Rediģēt adrešu grāmatas ierakstu';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Kontakta īpašības';
 $labels['personalinfo'] = 'Personiskā informācija';
-$labels['edit'] = 'Rediģēt';
+
+$labels['edit']   = 'Rediģēt';
 $labels['cancel'] = 'Atcelt';
-$labels['save'] = 'Saglabāt';
+$labels['save']   = 'Saglabāt';
 $labels['delete'] = 'Dzēst';
 $labels['rename'] = 'Pārdēvēt';
 $labels['addphoto'] = 'Pievienot';
 $labels['replacephoto'] = 'Aizvietot';
-$labels['newcontact'] = 'Izveidot jaunu ierakstu';
-$labels['deletecontact'] = 'Dzēst iezīmētos ierakstus';
-$labels['composeto'] = 'Rakstīt vēstuli';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Izveidot jaunu ierakstu';
+$labels['deletecontact']  = 'Dzēst iezīmētos ierakstus';
+$labels['composeto']      = 'Rakstīt vēstuli';
 $labels['contactsfromto'] = 'Ieraksti $from līdz $to no $count';
-$labels['print'] = 'Drukāt';
-$labels['export'] = 'Eksportēt';
-$labels['exportvcards'] = 'Eksportēt kontaktus vCard formātā';
+$labels['print']          = 'Drukāt';
+$labels['export']         = 'Eksportēt';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Eksportēt kontaktus vCard formātā';
 $labels['newcontactgroup'] = 'Izveidot jaunu kontaktu grupu';
-$labels['grouprename'] = 'Pārdēvēt grupu';
-$labels['groupdelete'] = 'Izdzēst grupu';
-$labels['previouspage'] = 'Parādīt iepriekšējo kopu';
-$labels['firstpage'] = 'Parādīt pirmo kopu';
-$labels['nextpage'] = 'Parādīt nākamo kopu';
-$labels['lastpage'] = 'Parādīt pēdējo kopu';
+$labels['grouprename']    = 'Pārdēvēt grupu';
+$labels['groupdelete']    = 'Izdzēst grupu';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Parādīt iepriekšējo kopu';
+$labels['firstpage']      = 'Parādīt pirmo kopu';
+$labels['nextpage']       = 'Parādīt nākamo kopu';
+$labels['lastpage']       = 'Parādīt pēdējo kopu';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupas';
 $labels['personaladrbook'] = 'Personīgās adreses';
+
 $labels['searchsave'] = 'Saglabāt meklēšanas pieprasījumu';
 $labels['searchdelete'] = 'Dzēst saglabāto meklēšanas pieprasījumu';
+
 $labels['import'] = 'Importēt';
 $labels['importcontacts'] = 'Importēt kontaktus';
 $labels['importfromfile'] = 'Importēt no faila:';
 $labels['importtarget'] = 'Pievienot jaunus kontaktus adrešu grāmatai';
 $labels['importreplace'] = 'Aizvietot visu adrešu grāmatu';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Pabeigts';
+
+// settings
 $labels['settingsfor'] = 'Iestatījumi';
 $labels['about'] = 'Par';
 $labels['preferences'] = 'Iestatījumi';
 $labels['userpreferences'] = 'Lietotāja preferences';
 $labels['editpreferences'] = 'Rediģēt lietotāja preferences';
+
 $labels['identities'] = 'Identitātes';
 $labels['manageidentities'] = 'Rediģēt šī konta identitātes';
 $labels['newidentity'] = 'Jauna identitāte';
+
 $labels['newitem'] = 'Jauns';
 $labels['edititem'] = 'Rediģēt';
+
 $labels['preferhtml'] = 'Dot priekšroku HTML formatētām vēstulēm';
 $labels['defaultcharset'] = 'Noklusētā rakstzīmju kopa';
 $labels['htmlmessage'] = 'HTML vēstule';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Datuma formāts';
 $labels['timeformat'] = 'Laika formāts';
 $labels['prettydate'] = 'Formatēt datumus';
-$labels['setdefault'] = 'Uzlikt kā noklusēto';
-$labels['autodetect'] = 'Automātiski';
-$labels['language'] = 'Valoda';
-$labels['timezone'] = 'Laika zona';
-$labels['pagesize'] = 'Rindas lapā';
+$labels['setdefault']  = 'Uzlikt kā noklusēto';
+$labels['autodetect']  = 'Automātiski';
+$labels['language']  = 'Valoda';
+$labels['timezone']  = 'Laika zona';
+$labels['pagesize']  = 'Rindas lapā';
 $labels['signature'] = 'Paraksts';
-$labels['dstactive'] = 'Vasaras/ziemas laiks';
+$labels['dstactive']  = 'Vasaras/ziemas laiks';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Rakstīt HTML vēstules';
 $labels['htmlonreply'] = 'tikai atbildot uz HTML formatētām vēstulēm';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML paraksts';
 $labels['previewpane'] = 'Rādīt priekšskatījuma paneli';
 $labels['skin'] = 'Interfeisa izskats';
@@ -328,14 +415,16 @@ $labels['readwhendeleted'] = 'Atzīmēt dzēstās vēstules kā izlasītas';
 $labels['flagfordeletion'] = 'Dzēšot marķēt vēstules kā dzēstas, bet nedzēst';
 $labels['skipdeleted'] = 'Nerādīt dzēstās vēstules';
 $labels['deletealways'] = 'Izdzēst vēstules, ja tās neizdodas pārvietot uz miskasti';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Rādīt attēlus, kas atrodas uz cita servera';
 $labels['fromknownsenders'] = 'no zināmiem sūtītājiem';
 $labels['always'] = 'vienmēr';
 $labels['showinlineimages'] = 'Rādīt pielikuma attēlus zem vēstules';
-$labels['autosavedraft'] = 'Automātiski saglabāt uzmetumu';
-$labels['everynminutes'] = 'ik pa $n minūti(ēm)';
-$labels['never'] = 'nekad';
-$labels['immediately'] = 'nekavējoties';
+$labels['autosavedraft']  = 'Automātiski saglabāt uzmetumu';
+$labels['everynminutes']  = 'ik pa $n minūti(ēm)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nekad';
+$labels['immediately']  = 'nekavējoties';
 $labels['messagesdisplaying'] = 'Vēstuļu attēlošana';
 $labels['messagescomposition'] = 'Vēstuļu rakstīšana';
 $labels['mimeparamfolding'] = 'Pielikumu nosaukumi';
@@ -349,11 +438,13 @@ $labels['checkallfolders'] = 'Pārbaudīt visas mapes pēc jaunām vēstulēm';
 $labels['displaynext'] = 'Rādīt nākamo vēstuli pēc dzēšanas/pārvietošanas';
 $labels['defaultfont'] = 'Noklusētais fonts vēstulei HTML formātā';
 $labels['mainoptions'] = 'Galvenie iestatījumi';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Kategorija';
 $labels['maintenance'] = 'Uzturēšana';
 $labels['newmessage'] = 'Vēstuļu pienākšana';
 $labels['signatureoptions'] = 'Paraksta iestatījumi';
 $labels['whenreplying'] = 'Atbildot';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'sākt jaunu vēstuli virs oriģināla';
 $labels['replybottomposting'] = 'sākt jaunu vēstuli zem oriģināla';
 $labels['replyremovesignature'] = 'Atbildot izņemt oriģinālo parakstu no vēstules';
@@ -364,26 +455,33 @@ $labels['replysignaturepos'] = 'Atbildot vai pārsūtot ievietot parakstu';
 $labels['belowquote'] = 'zem citāta';
 $labels['abovequote'] = 'virs citāta';
 $labels['insertsignature'] = 'Ievietot parakstu';
-$labels['previewpanemarkread'] = 'Atzīmēt priekšskatītās vēstules kā lasītas';
-$labels['afternseconds'] = 'pēc $n sekundēm';
+$labels['previewpanemarkread']  = 'Atzīmēt priekšskatītās vēstules kā lasītas';
+$labels['afternseconds']  = 'pēc $n sekundēm';
 $labels['reqmdn'] = 'Vienmēr pieprasīt atskati par vēstules izlasīšanu';
 $labels['reqdsn'] = 'Vienmēr pieprasīt atskati par vēstules piegādāšanu saņēmēja serverim';
 $labels['replysamefolder'] = 'Glabāt atbildes tajā pašā mapē, kurā ir vēstule, uz kuru tika atbildēts';
-$labels['defaultaddressbook'] = 'Pievienot jaunus kontaktus atzīmētajai adrešu grāmatai';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Automātiski aizpildot, izlaist alternatīvās e-pasta adreses';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'Pārbaudīt pareizrakstību pirms vēstules nosūtīšanas';
 $labels['spellcheckoptions'] = 'Pareizrakstības iestatījumi';
 $labels['spellcheckignoresyms'] = 'Ignorēt vārdus, kuri satur simbolus';
 $labels['spellcheckignorenums'] = 'Ignorēt vārdus, kuri satur skaitļus';
 $labels['spellcheckignorecaps'] = 'Ignorēt vārdus, kuri rakstīti ar lielajiem burtiem';
 $labels['addtodict'] = 'Pievienot vārdnīcai';
-$labels['folder'] = 'Mapi';
-$labels['foldername'] = 'Mapes nosaukums';
-$labels['subscribed'] = 'Abonēta';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Mapi';
+$labels['folders']  = 'Mapes';
+$labels['foldername']  = 'Mapes nosaukums';
+$labels['subscribed']  = 'Abonēta';
 $labels['messagecount'] = 'Vēstules';
-$labels['create'] = 'Izveidot';
-$labels['createfolder'] = 'Izveidot jaunu mapi';
-$labels['managefolders'] = 'Rediģēt mapes';
+$labels['create']  = 'Izveidot';
+$labels['createfolder']  = 'Izveidot jaunu mapi';
+$labels['managefolders']  = 'Rediģēt mapes';
 $labels['specialfolders'] = 'Īpašās mapes';
 $labels['properties'] = 'Īpašības';
 $labels['folderproperties'] = 'Mapes īpašības';
@@ -393,22 +491,29 @@ $labels['info'] = 'Informācija';
 $labels['getfoldersize'] = 'Uzklikšķiniet, lai uzzinātu mapes izmēru';
 $labels['changesubscription'] = 'Uzklikšķiniet, lai mainītu abonēšanu';
 $labels['foldertype'] = 'Mapes veids';
-$labels['personalfolder'] = 'Privāta mape';
-$labels['otherfolder'] = 'Cita lietotāja mape';
-$labels['sharedfolder'] = 'Publiska mape';
+$labels['personalfolder']  = 'Privāta mape';
+$labels['otherfolder']  = 'Cita lietotāja mape';
+$labels['sharedfolder']  = 'Publiska mape';
+
 $labels['sortby'] = 'Kārtot pēc';
-$labels['sortasc'] = 'Kārtot augošā secībā';
+$labels['sortasc']  = 'Kārtot augošā secībā';
 $labels['sortdesc'] = 'Kārtot dilstošā secībā';
 $labels['undo'] = 'Atsaukt';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Spraudnis';
 $labels['version'] = 'Versija';
 $labels['source'] = 'Oriģināls';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Atbalsts';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'kB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unikoda';
 $labels['english'] = 'Angļu';
 $labels['westerneuropean'] = 'Rietumeiropas';
@@ -428,3 +533,4 @@ $labels['japanese'] = 'Japāņu';
 $labels['korean'] = 'Korejiešu';
 $labels['chinese'] = 'Ķīniešu';
 
+?>
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index e42998dd9..d65976fa2 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Neizdevās pieslēgties';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Neizdevās pieslēgties';
 $messages['cookiesdisabled'] = 'Jūsu pārlūkprogramma neatbalsta sīkdatnes (cookies)';
 $messages['sessionerror'] = 'Jūsu sessija ir beigusies';
 $messages['storageerror'] = 'Neizdevās pieslēgties IMAP serverim';
 $messages['servererror'] = 'Servera kļūme.';
 $messages['servererrormsg'] = 'Servera kļūda: $msg';
 $messages['dberror'] = 'Datubāzes kļūda!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Neizdevās veikt darbību: Mape ir tikai lasāma (read only).';
 $messages['errornoperm'] = 'Neizdevās veikt darbību: Piekļuve liegta.';
 $messages['invalidrequest'] = 'Nederīgs pieprasījums. Dati netika saglabāti.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Šajā pastkastē nav vēstuļu';
 $messages['loggedout'] = 'Jūs esat veiksmīgi atslēdzies no sistēmas';
 $messages['mailboxempty'] = 'Pastkaste tukša';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Notiek ielāde...';
 $messages['uploading'] = 'Notiek faila augšupielāde...';
 $messages['uploadingmany'] = 'Augšupielādē failus...';
@@ -54,11 +60,11 @@ $messages['errormoving'] = 'Vēstule netika pārvietota';
 $messages['errorcopying'] = 'Neizdevās pārkopēt vēstules.';
 $messages['errordeleting'] = 'Vēstule netika dzēsta';
 $messages['errormarking'] = 'Nebija iespējams iezīmēt vēstuli';
-$messages['deletecontactconfirm'] = 'Vai tiešām vēlaties dzēst iezīmēto(ās) kontaktpersonas?';
-$messages['deletegroupconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto grupu?';
+$messages['deletecontactconfirm']  = 'Vai tiešām vēlaties dzēst iezīmēto(ā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ēto(ās) vēstules?';
-$messages['deletefolderconfirm'] = 'Vai tiešām vēlaties dzēst šo mapi?';
-$messages['purgefolderconfirm'] = 'Vai tiešām vēlaties dzēst visas vēstules, kas atrodas šajā mapē?';
+$messages['deletefolderconfirm']  = 'Vai tiešām vēlaties dzēst šo mapi?';
+$messages['purgefolderconfirm']  = 'Vai tiešām vēlaties dzēst visas vēstules, kas atrodas šajā mapē?';
 $messages['contactdeleting'] = 'Kontakts(-i) tiek dzēsti...';
 $messages['groupdeleting'] = 'Dzēš grupu...';
 $messages['folderdeleting'] = 'Dzēš mapi...';
@@ -67,11 +73,11 @@ $messages['foldersubscribing'] = 'Pieslēdz mapi...';
 $messages['folderunsubscribing'] = 'Atslēdz mapi...';
 $messages['formincomplete'] = 'Formulārs nav pilnībā aizpildīts';
 $messages['noemailwarning'] = 'Lūdzu ievadiet pareizu e-pasta adresi';
-$messages['nonamewarning'] = 'Lūdzu ievadiet vārdu';
+$messages['nonamewarning']  = 'Lūdzu ievadiet vārdu';
 $messages['nopagesizewarning'] = 'Lūdzu ievadiet lapas izmēru';
 $messages['nosenderwarning'] = 'Lūdzu ievadiet saņēmēja e-pasta adresi';
 $messages['norecipientwarning'] = 'Lūdzu ievadiet vismaz vienu saņēmēju';
-$messages['nosubjectwarning'] = 'Lauks "temats" ir tukšs. Vai vēlaties to aizpildīt tagad?';
+$messages['nosubjectwarning']  = 'Lauks "temats" ir tukšs. Vai vēlaties to aizpildīt tagad?';
 $messages['nobodywarning'] = 'Sūtīt vēstuli bez satura teksta?';
 $messages['notsentwarning'] = 'Vēstule netika nosūtīta. Vai tiešām vēlaties atcelt vēstules rakstīsanu?';
 $messages['noldapserver'] = 'Lūdzu izvēlaties LDAP serveri';
@@ -113,8 +119,9 @@ $messages['selectimportfile'] = 'Lūdzu izvēlieties failu, ko vēlaties augšup
 $messages['addresswriterror'] = 'Izvēlētās adrešu grāmatas datus nevar labot';
 $messages['contactaddedtogroup'] = 'Kontakti tika veiksmīgi pievienoti šai grupai.';
 $messages['contactremovedfromgroup'] = 'Kontakti tika veiksmīgi atvienoti no šīs grupas.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Importēju, lūdzu uzgaidiet...';
-$messages['importerror'] = 'Imports neizdevās! Augšupielādētais fails nav korekts vCard fails';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Veiksmīgi ieimportēti $inserted kontakti, netika importēti $skipped esoši ieraksti</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Izlaida $skipped jau eksistējošus ierakstus</b>';
 $messages['opnotpermitted'] = 'Darbība nav atļauta!';
@@ -156,4 +163,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 uz atzīmēto virsmapi. Nav piekļuves tiesību.';
 $messages['messagetoobig'] = 'Vēstule ir pārāk liela, lai to varētu apstrādāt.';
+$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/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 81aa13927..247cc334d 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mk_MK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добредојдовте во $product';
-$labels['username'] = 'Корисничко име';
-$labels['password'] = 'Лозинка';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Најава';
-$labels['logout'] = 'Одјава';
-$labels['mail'] = 'Е-пошта';
+
+// login page
+$labels['welcome']   = 'Добредојдовте во $product';
+$labels['username']  = 'Корисничко име';
+$labels['password']  = 'Лозинка';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Најава';
+
+// taskbar
+$labels['logout']   = 'Одјава';
+$labels['mail']     = 'Е-пошта';
 $labels['settings'] = 'Нагодувања';
 $labels['addressbook'] = 'Именик';
-$labels['inbox'] = 'Примени';
+
+// mailbox names
+$labels['inbox']  = 'Примени';
 $labels['drafts'] = 'Непратени';
-$labels['sent'] = 'Пратени';
-$labels['trash'] = 'Корпа';
-$labels['junk'] = 'Ѓубре';
+$labels['sent']   = 'Пратени';
+$labels['trash']  = 'Корпа';
+$labels['junk']   = 'Ѓубре';
+
+// message listing
 $labels['subject'] = 'Наслов';
-$labels['from'] = 'Праќач';
-$labels['to'] = 'Примач';
-$labels['cc'] = 'Копирај';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Праќач';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Примач';
+$labels['cc']      = 'Копирај';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Препрати на';
-$labels['date'] = 'Датум';
-$labels['size'] = 'Големина';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Датум';
+$labels['size']    = 'Големина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Писма од $from до $to од $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Писмо $nr од $count';
-$labels['copy'] = 'Копирај';
-$labels['moveto'] = 'Премести во...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Копирај';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'Премести во...';
 $labels['download'] = 'Преземи';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Име на податотеката';
 $labels['filesize'] = 'Големина на податотеката';
+
 $labels['addtoaddressbook'] = 'Додај во именик';
+
+// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Вто';
@@ -55,160 +80,323 @@ $labels['wed'] = 'Сре';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Саб';
-$labels['sunday'] = 'Недела';
-$labels['monday'] = 'Понеделник';
-$labels['tuesday'] = 'Вторник';
+
+// weekdays long
+$labels['sunday']    = 'Недела';
+$labels['monday']    = 'Понеделник';
+$labels['tuesday']   = 'Вторник';
 $labels['wednesday'] = 'Среда';
-$labels['thursday'] = 'Четврток';
-$labels['friday'] = 'Петок';
-$labels['saturday'] = 'Сабота';
-$labels['jan'] = 'Јан';
-$labels['feb'] = 'Фев';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Мај';
-$labels['longmay'] = 'Мај';
-$labels['jun'] = 'Јун';
-$labels['jul'] = 'Јул';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сеп';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Ное';
-$labels['dec'] = 'Дек';
-$labels['longjan'] = 'Јануари';
-$labels['longfeb'] = 'Февруари';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Април';
-$labels['longjun'] = 'Јуни';
-$labels['longjul'] = 'Јули';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Септември';
-$labels['longoct'] = 'Октомври';
-$labels['longnov'] = 'Ноември';
-$labels['longdec'] = 'Декември';
+$labels['thursday']  = 'Четврток';
+$labels['friday']    = 'Петок';
+$labels['saturday']  = 'Сабота';
+
+// months short
+$labels['jan']	= 'Јан';
+$labels['feb']	= 'Фев';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Мај';
+$labels['jun']	= 'Јун';
+$labels['jul'] 	= 'Јул';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сеп';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Ное';
+$labels['dec']	= 'Дек';
+
+// months long
+$labels['longjan']	= 'Јануари';
+$labels['longfeb']	= 'Февруари';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Април';
+$labels['longmay']	= 'Мај';
+$labels['longjun']	= 'Јуни';
+$labels['longjul']	= 'Јули';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Септември';
+$labels['longoct']	= 'Октомври';
+$labels['longnov']	= 'Ноември';
+$labels['longdec']	= 'Декември';
+
 $labels['today'] = 'Денес';
-$labels['checkmail'] = 'Провери пошта';
-$labels['compose'] = 'Пиши ново писмо';
-$labels['writenewmessage'] = 'Ново писмо';
-$labels['replytomessage'] = 'Одговори на испраќачот';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Провери пошта';
+$labels['compose']          = 'Пиши ново писмо';
+$labels['writenewmessage']  = 'Ново писмо';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Одговори на испраќачот';
 $labels['replytoallmessage'] = 'Одговори на испраќачот и сите примачи';
-$labels['forwardmessage'] = 'Препрати писмо';
-$labels['deletemessage'] = 'Избриши писмо';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Препрати писмо';
+$labels['deletemessage']    = 'Избриши писмо';
 $labels['movemessagetotrash'] = 'Премести ги писмата во Корпа';
-$labels['printmessage'] = 'Испечати писмо';
-$labels['previousmessage'] = 'Прикажи го претходното писмо';
-$labels['firstmessage'] = 'Прикажи го првото писмо';
-$labels['nextmessage'] = 'Прикажи го следното писмо';
-$labels['lastmessage'] = 'Прикажи го последното писмо';
-$labels['backtolist'] = 'Назад кон листа на писма';
-$labels['viewsource'] = 'Покажи го изворот на писмото';
-$labels['markmessages'] = 'Обележи ги писмата';
-$labels['markread'] = 'Како прочитани';
-$labels['markunread'] = 'Како непрочитани';
-$labels['markflagged'] = 'Како обележано';
-$labels['markunflagged'] = 'Како необележано';
+$labels['printmessage']     = 'Испечати писмо';
+$labels['previousmessage']  = 'Прикажи го претходното писмо';
+$labels['firstmessage']     = 'Прикажи го првото писмо';
+$labels['nextmessage']      = 'Прикажи го следното писмо';
+$labels['lastmessage']      = 'Прикажи го последното писмо';
+$labels['backtolist']       = 'Назад кон листа на писма';
+$labels['viewsource']       = 'Покажи го изворот на писмото';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Обележи ги писмата';
+$labels['markread']         = 'Како прочитани';
+$labels['markunread']       = 'Како непрочитани';
+$labels['markflagged']      = 'Како обележано';
+$labels['markunflagged']    = 'Како необележано';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Одбери';
 $labels['all'] = 'Сите';
 $labels['none'] = 'Ниедно';
-$labels['nonesort'] = 'Ниедно';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Непрочитани';
 $labels['flagged'] = 'Обележано';
 $labels['unanswered'] = 'Неодговорено';
 $labels['deleted'] = 'Избришано';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Обратно';
 $labels['filter'] = 'Филтер';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Ниедно';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Компактно';
 $labels['empty'] = 'Испразни';
+
 $labels['quota'] = 'Искористен простор';
-$labels['unknown'] = 'непознато';
-$labels['unlimited'] = 'неограничено';
-$labels['quicksearch'] = 'Брзо пребарување';
-$labels['resetsearch'] = 'Ново пребарување';
-$labels['searchmod'] = 'Модификатори на пребарувањето';
-$labels['msgtext'] = 'Цело писмо';
+$labels['unknown']  = 'непознато';
+$labels['unlimited']  = 'неограничено';
+
+$labels['quicksearch']  = 'Брзо пребарување';
+$labels['resetsearch']  = 'Ново пребарување';
+$labels['searchmod']  = 'Модификатори на пребарувањето';
+$labels['msgtext']  = 'Цело писмо';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
-$labels['editasnew'] = 'Уреди како ново';
-$labels['sendmessage'] = 'Испрати сега';
-$labels['savemessage'] = 'Зачувај го писмото во Непратени';
-$labels['addattachment'] = 'Приложи податотека';
-$labels['charset'] = 'Збир од знаци';
-$labels['editortype'] = 'Тип на уредник';
-$labels['returnreceipt'] = 'Врати';
+
+// message compose
+$labels['editasnew']      = 'Уреди како ново';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Испрати сега';
+$labels['savemessage']    = 'Зачувај го писмото во Непратени';
+$labels['addattachment']  = 'Приложи податотека';
+$labels['charset']        = 'Збир од знаци';
+$labels['editortype']     = 'Тип на уредник';
+$labels['returnreceipt']  = 'Врати';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Провери правопис';
 $labels['resumeediting'] = 'Продолжи со уредување';
-$labels['revertto'] = 'Врати на';
+$labels['revertto']      = 'Врати на';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Приложено';
 $labels['upload'] = 'Подигни';
-$labels['close'] = 'Затвори';
-$labels['low'] = 'Низок';
-$labels['lowest'] = 'Најнизок';
-$labels['normal'] = 'Нормален';
-$labels['high'] = 'Висок';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Затвори';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Низок';
+$labels['lowest']  = 'Најнизок';
+$labels['normal']  = 'Нормален';
+$labels['high']    = 'Висок';
 $labels['highest'] = 'Највисок';
-$labels['nosubject'] = '(без наслов)';
+
+$labels['nosubject']  = '(без наслов)';
 $labels['showimages'] = 'Прикажи слики';
 $labels['alwaysshow'] = 'Секогаш прикажувај ги сликите од $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Обичен текст';
 $labels['savesentmessagein'] = 'Сними го пратеното писмо во';
 $labels['dontsave'] = 'не зачувувај';
 $labels['maxuploadsize'] = 'Максималната дозволена големина за податотеката е $size';
+
 $labels['addcc'] = 'Додај Cc';
 $labels['addbcc'] = 'Додај Bcc';
 $labels['addreplyto'] = 'Додај Одговори-на';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Праќачот на оваа порака сака да биде известен кога ќе го прочитате писмото. Дали сакате да го известите?';
 $labels['receiptread'] = 'Извести (прочитано)';
 $labels['yourmessage'] = 'Ова е известување за вашата порака';
 $labels['receiptnote'] = 'Напомена: Ова известување само потврдува дека писмото кое сте го пратиле е отворено. Не е гаранција дека примачот го прочитал или разбрал истото.';
-$labels['name'] = 'Име за приказ';
-$labels['firstname'] = 'Име';
-$labels['surname'] = 'Презиме';
-$labels['email'] = 'Е-пошта';
+
+// address boook
+$labels['name']         = 'Име за приказ';
+$labels['firstname']    = 'Име';
+$labels['surname']      = 'Презиме';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Е-пошта';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Додај нов контакт';
 $labels['editcontact'] = 'Уреди контакт';
-$labels['edit'] = 'Уреди';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Уреди';
 $labels['cancel'] = 'Откажи';
-$labels['save'] = 'Зачувај';
+$labels['save']   = 'Зачувај';
 $labels['delete'] = 'Избриши';
-$labels['newcontact'] = 'Додај ново име';
-$labels['deletecontact'] = 'Избриши ги следните имиња';
-$labels['composeto'] = 'Напиши порака за';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Додај ново име';
+$labels['deletecontact']  = 'Избриши ги следните имиња';
+$labels['composeto']      = 'Напиши порака за';
 $labels['contactsfromto'] = 'Имиња од $from до $to од $count';
-$labels['print'] = 'Испечати';
-$labels['export'] = 'Извези како';
-$labels['exportvcards'] = 'Извези ги контактите во vCard формат';
-$labels['previouspage'] = 'Прикажи претходна страна';
-$labels['firstpage'] = 'Прикажи ја првата страна';
-$labels['nextpage'] = 'Прикажи ја следната страна';
-$labels['lastpage'] = 'Прикажи ја последната страна';
+$labels['print']          = 'Испечати';
+$labels['export']         = 'Извези како';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Извези ги контактите во vCard формат';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Прикажи претходна страна';
+$labels['firstpage']      = 'Прикажи ја првата страна';
+$labels['nextpage']       = 'Прикажи ја следната страна';
+$labels['lastpage']       = 'Прикажи ја последната страна';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Групи';
 $labels['personaladrbook'] = 'Лични адреси';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Увези';
 $labels['importcontacts'] = 'Увези контакти';
 $labels['importfromfile'] = 'Увези од податотека:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Замени го целиот именик';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Завршено';
+
+// settings
 $labels['settingsfor'] = 'Нагодувања за';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Нагодувања';
 $labels['userpreferences'] = 'Кориснички нагодувања';
 $labels['editpreferences'] = 'Промени кориснички нагодувања';
+
 $labels['identities'] = 'Идентитети';
 $labels['manageidentities'] = 'Организирај ги идентитетите за овој корисник';
 $labels['newidentity'] = 'Нов идентитет';
+
 $labels['newitem'] = 'Нов објект';
 $labels['edititem'] = 'Промени објект';
+
 $labels['preferhtml'] = 'Прикажи во HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML писмо';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Убави датуми';
-$labels['setdefault'] = 'Постави за основно';
-$labels['autodetect'] = 'Автоматски';
-$labels['language'] = 'Јазик';
-$labels['timezone'] = 'Часовна зона';
-$labels['pagesize'] = 'Редови по страна';
+$labels['setdefault']  = 'Постави за основно';
+$labels['autodetect']  = 'Автоматски';
+$labels['language']  = 'Јазик';
+$labels['timezone']  = 'Часовна зона';
+$labels['pagesize']  = 'Редови по страна';
 $labels['signature'] = 'Потпис';
-$labels['dstactive'] = 'Промени на времето';
+$labels['dstactive']  = 'Промени на времето';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Пиши HTML порака';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML потпис';
 $labels['previewpane'] = 'Прикажи прозорец за преглед';
 $labels['skin'] = 'Модел на изгледот';
@@ -220,33 +408,43 @@ $labels['mailboxview'] = 'Приказ на поштенското сандач�
 $labels['mdnrequests'] = 'Известувања за праќачот';
 $labels['askuser'] = 'прашај го корисникот';
 $labels['autosend'] = 'испрати автоматски';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'игнорирај';
 $labels['readwhendeleted'] = 'Обележи го писмото како прочитано при бришење';
 $labels['flagfordeletion'] = 'Обележи го писмото за бришење наместо да го избришеш';
 $labels['skipdeleted'] = 'Не ги прикажувај избришаните писма';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Прикажи вметнати слики';
 $labels['fromknownsenders'] = 'од познати праќачи';
 $labels['always'] = 'секогаш';
 $labels['showinlineimages'] = 'Прикажи приложени слики под писмото';
-$labels['autosavedraft'] = 'Авоматски зачувувај во Непратени';
-$labels['everynminutes'] = 'секои $n минути';
-$labels['never'] = 'никогаш';
+$labels['autosavedraft']  = 'Авоматски зачувувај во Непратени';
+$labels['everynminutes']  = 'секои $n минути';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'никогаш';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Прикажување на писма';
 $labels['messagescomposition'] = 'Пишување на писма';
 $labels['mimeparamfolding'] = 'Име на прикачените податотеки';
 $labels['2231folding'] = 'Полн RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Полн RFC 2047 (друго)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Напредни можности';
 $labels['focusonnewmessage'] = 'Фокусирај го прозорецот на прелистувачот на новото писмо';
 $labels['checkallfolders'] = 'Провери ги сите папки за нови писма';
 $labels['displaynext'] = 'По бришење/преместување на писмото прикажи го следното писмо';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Главни можности';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Заглавие';
 $labels['maintenance'] = 'Одржување';
 $labels['newmessage'] = 'Ново писмо';
 $labels['signatureoptions'] = 'Можности за потписот';
 $labels['whenreplying'] = 'При одговарање';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'новото писмо започни го над оригиналот';
 $labels['replybottomposting'] = 'новото писмо започни го под оригиналот';
 $labels['replyremovesignature'] = 'При одговарање отстрани го изворниот потпис од писмото';
@@ -257,19 +455,82 @@ $labels['replysignaturepos'] = 'При одговарање или препра�
 $labels['belowquote'] = 'под цитираното';
 $labels['abovequote'] = 'над цитираното';
 $labels['insertsignature'] = 'Вметни потпис';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Име на папката';
-$labels['subscribed'] = 'Претплатен';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Име на папката';
+$labels['subscribed']  = 'Претплатен';
 $labels['messagecount'] = 'Пораки';
-$labels['create'] = 'Создај';
-$labels['createfolder'] = 'Создај нова папка';
-$labels['managefolders'] = 'Организирање на папки';
+$labels['create']  = 'Создај';
+$labels['createfolder']  = 'Создај нова папка';
+$labels['managefolders']  = 'Организирање на папки';
 $labels['specialfolders'] = 'Специјални папки';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Сортирај по';
-$labels['sortasc'] = 'Сортирај нагорно';
+$labels['sortasc']  = 'Сортирај нагорно';
 $labels['sortdesc'] = 'Сортирај надолно';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 65f83e366..c14370b14 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -2,30 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mk_MK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Најавата не успеа';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Најавата не успеа';
 $messages['cookiesdisabled'] = 'Вашиот прелистувач не прифаќа колачиња';
 $messages['sessionerror'] = 'Сесијата е неважечка или е истечена';
 $messages['storageerror'] = 'Поврзувањето со IMAP не успеа';
 $messages['servererror'] = 'Грешка во серверот!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
 $messages['invalidrequest'] = 'Неважечко барање! Податоците не се зачувани.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Немате писма во ова сандаче';
 $messages['loggedout'] = 'Успешно се одјавивте. Ви благодариме и довидување!';
 $messages['mailboxempty'] = 'Поштенското сандаче е празно.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Вчитувам...';
 $messages['uploading'] = 'Ја подигам податотеката...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ги вчитувам податоците...';
 $messages['checkingmail'] = 'Проверувам нова пошта...';
 $messages['sendingmessage'] = 'Ја испраќам пораката...';
@@ -35,41 +46,54 @@ $messages['messagesaved'] = 'Пораката е зачувана во Непр�
 $messages['successfullysaved'] = 'Успешно зачувано';
 $messages['addedsuccessfully'] = 'Името е успешно додадено во Именикот';
 $messages['contactexists'] = 'Веќе постои име со зададената Е-поштенска адреса';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'За да се заштити вашата приватност, сликите во оваа порака не се прикажани.';
 $messages['encryptedmessage'] = 'Оваа порака е кодирана и не може да се прикаже. Жалиме!';
 $messages['nocontactsfound'] = 'Нема пронајдено имиња.';
 $messages['contactnotfound'] = 'Бараното име не е пронајдено';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Не упеав да го испратам писмото';
 $messages['senttooquickly'] = 'Почекајте $sec секунда/и пред да го испратите писмото';
 $messages['errorsavingsent'] = 'Грешка при зачувувањето на пратеното писмо';
 $messages['errorsaving'] = 'Грешка при зачувувањето';
 $messages['errormoving'] = 'Не можев да го преместам писмото';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Не можев да го избришам писмото';
 $messages['errormarking'] = 'Не можев да го обележам писмото';
-$messages['deletecontactconfirm'] = 'Дали сте сигурни дека сакате да го избришете одбраното(те) име(ња)?';
+$messages['deletecontactconfirm']  = 'Дали сте сигурни дека сакате да го избришете одбраното(те) име(ња)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Дали сте сигурни дека сакате да го(и) избришете обележаниот(те) писмо(а)?';
-$messages['deletefolderconfirm'] = 'Дали сте сигурни дека сакате да ја избришете оваа папка?';
-$messages['purgefolderconfirm'] = 'Дали сте сигурни дека сакате да ги избршете сите писма во оваа папка?';
+$messages['deletefolderconfirm']  = 'Дали сте сигурни дека сакате да ја избришете оваа папка?';
+$messages['purgefolderconfirm']  = 'Дали сте сигурни дека сакате да ги избршете сите писма во оваа папка?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Ја бришам папката...';
 $messages['foldermoving'] = 'Ја преместувам папката...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Имате изоставено непополнети информации';
 $messages['noemailwarning'] = 'Внесете валидна е-поштенска адреса';
-$messages['nonamewarning'] = 'Внесете име';
+$messages['nonamewarning']  = 'Внесете име';
 $messages['nopagesizewarning'] = 'Внесете големина на страницата';
 $messages['nosenderwarning'] = 'Внесете адреса на праќачот';
 $messages['norecipientwarning'] = 'Внесете барем еден примач';
-$messages['nosubjectwarning'] = 'Немате внесено „Наслов“. Дали сакате да внесете?';
+$messages['nosubjectwarning']  = 'Немате внесено „Наслов“. Дали сакате да внесете?';
 $messages['nobodywarning'] = 'Писмото нема текст во него. Дали сакате да го испратите?';
 $messages['notsentwarning'] = 'Писмото не е пратено. Дали сакате да го отфрлите?';
 $messages['noldapserver'] = 'Изберете LDAP сервер за пребарување';
 $messages['nosearchname'] = 'Внесете име или е-поштенска адреса';
 $messages['notuploadedwarning'] = 'Сè уште нема подигнати прилози. Почекајте или откажете го подигањето';
 $messages['searchsuccessful'] = 'Пронајадени се $nr пораки';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Пребарувањето не даде резлутати';
 $messages['searching'] = 'Пребарувам....';
 $messages['checking'] = 'Проверувам...';
 $messages['nospellerrors'] = 'Нема грешки во спелувањето';
 $messages['folderdeleted'] = 'Папката е успешно избришана';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Успешно избришано';
 $messages['converting'] = 'Форматирањето на писмото е отстрането...';
 $messages['messageopenerror'] = 'Не можев да го вчитам писното од серверот';
@@ -80,15 +104,26 @@ $messages['copyerror'] = 'Не можам да ги копирам адреси�
 $messages['sourceisreadonly'] = 'Изворот на оваа адреса неможе да се промени';
 $messages['errorsavingcontact'] = 'Името неможе да се сними';
 $messages['movingmessage'] = 'Пораката се преместува...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Известувањето е успешно пратено';
 $messages['errorsendingreceipt'] = 'Известувањето не е пратено';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Овој идентитет неможе да се избрише, тој е последниот.';
 $messages['forbiddencharacter'] = 'Името на папката содржи несоодветен формат';
 $messages['selectimportfile'] = 'Изберете ја податотеката која сакате да ја прикачите';
 $messages['addresswriterror'] = 'Одбраниот именик не може да се менува';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Убезувам,, почекајте...';
-$messages['importerror'] = 'Увезувањето не неуспешно! Прикачената податотека не е важечки vCard документ.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Успешно се увезени $inserted имиња, $skipped веќе постојат и се прескокнати</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Операцијата не е дозволена';
 $messages['nofromaddress'] = 'Не е внесена е-пошта во одберениот идентитет';
 $messages['editorwarning'] = 'Префрлањето на уредникот на обичен текст ќе резултира со губење на целото форматирање на текстот. Дали сакате да продолжите?';
@@ -100,4 +135,35 @@ $messages['smtptoerror'] = 'SMTP грешка ($code): Не успеав да г
 $messages['smtprecipientserror'] = 'SMTP грешка: Не успеав да ја испарсирам листата на примачи';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Неправилна поштенска адреса: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 0cab9c231..5644f1599 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -2,47 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: midhun <orisis47@gmail.com>                                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product ലേയ്ക്ക് സ്വാഗതം';
-$labels['username'] = 'ഉപയോക്തൃനാമം';
-$labels['password'] = 'രഹസ്യവാക്ക്';
-$labels['server'] = 'സേവകന്‍';
-$labels['login'] = 'പ്രവേശിക്കുക';
-$labels['logout'] = 'പുറത്ത് കടക്കുക';
-$labels['mail'] = 'തപാല്‍';
+
+// login page
+$labels['welcome']   = '$product ലേയ്ക്ക് സ്വാഗതം';
+$labels['username']  = 'ഉപയോക്തൃനാമം';
+$labels['password']  = 'രഹസ്യവാക്ക്';
+$labels['server']    = 'സേവകന്‍';
+$labels['login']     = 'പ്രവേശിക്കുക';
+
+// taskbar
+$labels['logout']   = 'പുറത്ത് കടക്കുക';
+$labels['mail']     = 'തപാല്‍';
 $labels['settings'] = 'ക്രമീകരണങ്ങള്‍';
 $labels['addressbook'] = 'വിലാസ പുസ്തകം';
-$labels['inbox'] = 'ഇന്‍ബോക്സ്';
+
+// mailbox names
+$labels['inbox']  = 'ഇന്‍ബോക്സ്';
 $labels['drafts'] = 'പൂര്‍ത്തിയാകാത്തവ';
-$labels['sent'] = 'അയച്ചവ';
-$labels['trash'] = 'ചവറ്റുകുട്ട';
-$labels['junk'] = 'ആവശ്യമില്ലാത്തവ';
+$labels['sent']   = 'അയച്ചവ';
+$labels['trash']  = 'ചവറ്റുകുട്ട';
+$labels['junk']   = 'ആവശ്യമില്ലാത്തവ';
+
+// message listing
 $labels['subject'] = 'വിഷയം';
-$labels['from'] = 'പ്രേഷിതന്‍';
-$labels['to'] = 'സ്വീകര്‍ത്താവ്';
-$labels['date'] = 'തീയതി';
-$labels['size'] = 'വലിപ്പം';
+$labels['from']    = 'പ്രേഷിതന്‍';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'സ്വീകര്‍ത്താവ്';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
+$labels['replyto'] = 'Reply-To';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'തീയതി';
+$labels['size']    = 'വലിപ്പം';
 $labels['priority'] = 'മുന്‍ഗണന';
+$labels['organization'] = 'Organization';
 $labels['readstatus'] = 'അവസ്ഥ വായിക്കുക';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'ഫോള്‍ഡറുകള്‍';
-$labels['folders'] = 'ഫോള്‍ഡറുകള്‍';
-$labels['copy'] = 'പകര്‍ത്തുക';
-$labels['move'] = 'നീക്കുക';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr of $count';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'പകര്‍ത്തുക';
+$labels['move']     = 'നീക്കുക';
+$labels['moveto']   = 'Move to...';
 $labels['download'] = 'ഡൗണ്‍ലോഡ്';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ഫയല്‍ നാമം';
 $labels['filesize'] = 'ഫയലിന്റെ വലിപ്പം';
+
 $labels['addtoaddressbook'] = 'മേല്‍വിലാസങ്ങളില്‍ ചേര്‍ക്കുക.';
+
+// weekdays short
 $labels['sun'] = 'ഞാ';
 $labels['mon'] = 'തി';
 $labels['tue'] = 'ചൊ';
@@ -50,215 +80,445 @@ $labels['wed'] = 'ബു';
 $labels['thu'] = 'വ്യാ';
 $labels['fri'] = 'വെ';
 $labels['sat'] = 'ശ';
-$labels['sunday'] = 'ഞായര്‍';
-$labels['monday'] = 'തിങ്കള്‍';
-$labels['tuesday'] = 'ചൊവ്വ';
+
+// weekdays long
+$labels['sunday']    = 'ഞായര്‍';
+$labels['monday']    = 'തിങ്കള്‍';
+$labels['tuesday']   = 'ചൊവ്വ';
 $labels['wednesday'] = 'ബുധന്‍';
-$labels['thursday'] = 'വ്യാഴം';
-$labels['friday'] = 'വെള്ളി';
-$labels['saturday'] = 'ശനി';
-$labels['jan'] = 'ജനു';
-$labels['feb'] = 'ഫെബ്';
-$labels['mar'] = 'മാര്‍';
-$labels['apr'] = 'ഏപ്ര';
-$labels['may'] = 'മെ';
-$labels['longmay'] = 'മെ';
-$labels['jun'] = 'ജൂണ്‍';
-$labels['jul'] = 'ജൂലൈ';
-$labels['aug'] = 'ആഗസ്റ്റ്';
-$labels['sep'] = 'സെപ്റ്റംബര്‍';
-$labels['oct'] = 'ഒക്ടോബര്‍';
-$labels['nov'] = 'നവംബര്‍';
-$labels['dec'] = 'ഡിസംബര്‍';
-$labels['longjan'] = 'ജനുവരി';
-$labels['longfeb'] = 'ഫെബ്രുവരി';
-$labels['longmar'] = 'മാര്‍ച്ച്';
-$labels['longapr'] = 'ഏപ്രില്‍';
-$labels['longjun'] = 'ജൂണ്‍';
-$labels['longjul'] = 'ജൂലൈ';
-$labels['longaug'] = 'ആഗസ്റ്റ്';
-$labels['longsep'] = 'സെപ്തംബ‌ര്‍';
-$labels['longoct'] = 'ഒക്ടോബര്‍';
-$labels['longnov'] = 'നവംബ‌ര്‍';
-$labels['longdec'] = 'ഡിസംബ‌ര്‍';
+$labels['thursday']  = 'വ്യാഴം';
+$labels['friday']    = 'വെള്ളി';
+$labels['saturday']  = 'ശനി';
+
+// months short
+$labels['jan']	= 'ജനു';
+$labels['feb']	= 'ഫെബ്';
+$labels['mar']	= 'മാര്‍';
+$labels['apr']	= 'ഏപ്ര';
+$labels['may']	= 'മെ';
+$labels['jun']	= 'ജൂണ്‍';
+$labels['jul'] 	= 'ജൂലൈ';
+$labels['aug']	= 'ആഗസ്റ്റ്';
+$labels['sep']	= 'സെപ്റ്റംബര്‍';
+$labels['oct']	= 'ഒക്ടോബര്‍';
+$labels['nov']	= 'നവംബര്‍';
+$labels['dec']	= 'ഡിസംബര്‍';
+
+// months long
+$labels['longjan']	= 'ജനുവരി';
+$labels['longfeb']	= 'ഫെബ്രുവരി';
+$labels['longmar']	= 'മാര്‍ച്ച്';
+$labels['longapr']	= 'ഏപ്രില്‍';
+$labels['longmay']	= 'മെ';
+$labels['longjun']	= 'ജൂണ്‍';
+$labels['longjul']	= 'ജൂലൈ';
+$labels['longaug']	= 'ആഗസ്റ്റ്';
+$labels['longsep']	= 'സെപ്തംബ‌ര്‍';
+$labels['longoct']	= 'ഒക്ടോബര്‍';
+$labels['longnov']	= 'നവംബ‌ര്‍';
+$labels['longdec']	= 'ഡിസംബ‌ര്‍';
+
 $labels['today'] = 'ഇന്ന്';
-$labels['refresh'] = 'പുതുക്കുക';
-$labels['checkmail'] = 'പുതിയ സന്ദേശത്തിനായി തിരയുക';
-$labels['compose'] = 'രചന';
-$labels['reply'] = 'മറുപടി';
-$labels['forward'] = 'കൈമാറുക';
-$labels['forwardmessage'] = 'സന്ദേശം കൈമാറുക';
-$labels['deletemessage'] = 'സന്ദേശം മായ്ക്കുക';
+
+// toolbar buttons
+$labels['refresh']          = 'പുതുക്കുക';
+$labels['checkmail']        = 'പുതിയ സന്ദേശത്തിനായി തിരയുക';
+$labels['compose']          = 'രചന';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'മറുപടി';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'കൈമാറുക';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'സന്ദേശം കൈമാറുക';
+$labels['deletemessage']    = 'സന്ദേശം മായ്ക്കുക';
 $labels['movemessagetotrash'] = 'സന്ദേശം ചവറ്റുകുട്ടയിലേക്ക് നീക്കുക';
-$labels['printmessage'] = 'ഈ സന്ദേശം അച്ചടിക്കുക';
-$labels['previousmessage'] = 'മുന്‍പുളള സന്ദേശം കാണിക്കുക.';
-$labels['firstmessage'] = 'ആദ്യത്തെ സന്ദേശം കാണിക്കുക.';
-$labels['nextmessage'] = 'അടുത്ത സന്ദേശം കാണിക്കുക.';
-$labels['lastmessage'] = 'അവസാനത്തെ സന്ദേശം കാണിക്കുക.';
-$labels['viewsource'] = 'ഉറവിടം കാണിക്കുക.';
-$labels['mark'] = 'അടയാളപ്പെടുത്തു';
-$labels['markmessages'] = 'സന്തേശങ്ങള്‍ അടയാളപ്പെടുത്തു';
-$labels['markread'] = 'വായിച്ചതായി';
-$labels['markunread'] = 'വായിക്കാത്തതായി';
-$labels['moreactions'] = 'കൂടുതല്‍ ചെയ്തികള്‍...';
-$labels['more'] = 'കൂടുതല്‍';
-$labels['back'] = 'പിന്നോട്ട്';
-$labels['options'] = 'ഐച്ഛികങ്ങള്‍‌';
+$labels['printmessage']     = 'ഈ സന്ദേശം അച്ചടിക്കുക';
+$labels['previousmessage']  = 'മുന്‍പുളള സന്ദേശം കാണിക്കുക.';
+$labels['firstmessage']     = 'ആദ്യത്തെ സന്ദേശം കാണിക്കുക.';
+$labels['nextmessage']      = 'അടുത്ത സന്ദേശം കാണിക്കുക.';
+$labels['lastmessage']      = 'അവസാനത്തെ സന്ദേശം കാണിക്കുക.';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'ഉറവിടം കാണിക്കുക.';
+$labels['mark']             = 'അടയാളപ്പെടുത്തു';
+$labels['markmessages']     = 'സന്തേശങ്ങള്‍ അടയാളപ്പെടുത്തു';
+$labels['markread']         = 'വായിച്ചതായി';
+$labels['markunread']       = 'വായിക്കാത്തതായി';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'കൂടുതല്‍ ചെയ്തികള്‍...';
+$labels['more']             = 'കൂടുതല്‍';
+$labels['back']             = 'പിന്നോട്ട്';
+$labels['options']          = 'ഐച്ഛികങ്ങള്‍‌';
+
 $labels['select'] = 'തെരഞ്ഞെടുക്കുക';
 $labels['all'] = 'എല്ലാം';
 $labels['none'] = 'ഒന്നുമില്ല';
-$labels['nonesort'] = 'ഒന്നുമില്ല';
 $labels['currpage'] = 'നിലവിലുളള പേജ്';
 $labels['unread'] = 'വായിക്കാത്തത്';
 $labels['flagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['unanswered'] = 'മറുപടി കൊടുക്കാത്ത';
 $labels['deleted'] = 'മായ്ച്ചവ';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'തലതിരിക്കുക';
 $labels['filter'] = 'അരിപ്പ';
 $labels['list'] = 'പട്ടിക';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'എല്ലാം വികസിപ്പിക്കുക';
 $labels['expand-unread'] = 'വായിക്കാത്തവ വികസിപ്പിക്കുക';
 $labels['collapse-all'] = 'എല്ലാം അടയ്ക്കുക';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'എവിടുന്ന് /എങ്ങൊട്ടു';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'ഒന്നുമില്ല';
 $labels['sentdate'] = 'അയച്ച തീയതി';
 $labels['arrival'] = 'വന്ന തീയതി';
 $labels['asc'] = 'ആരോഹണം';
 $labels['desc'] = 'അവരോഹണം';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'തരംതിരിക്കണ്ട രീതി';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'ചുരുക്കു';
 $labels['empty'] = 'ശൂന്യം';
+
 $labels['quota'] = 'ഡിസ്ക്ക് ഉപയോഗം';
-$labels['unknown'] = 'അറിയാത്ത';
-$labels['unlimited'] = 'പരിമിതികളില്ലാത്ത';
-$labels['quicksearch'] = 'പെട്ടെന്ന് തെരയു';
-$labels['msgtext'] = 'മുഴുവന്‍ സന്ദേശവും';
+$labels['unknown']  = 'അറിയാത്ത';
+$labels['unlimited']  = 'പരിമിതികളില്ലാത്ത';
+
+$labels['quicksearch']  = 'പെട്ടെന്ന് തെരയു';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'മുഴുവന്‍ സന്ദേശവും';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
-$labels['editasnew'] = 'പുതിയതായി തിരുത്തുക';
-$labels['sendmessage'] = 'സന്ദേശം അയയ്ക്കുക';
-$labels['savemessage'] = 'പൂര്‍ത്തിയാകാത്തവ ആയി സൂക്ഷിക്കുക';
-$labels['addattachment'] = 'ഒരു ഫയല്‍ മെയിലിനൊപ്പം ചേര്‍ക്കുക';
-$labels['editortype'] = 'തിരുത്തല്‍ രീതി';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'പുതിയതായി തിരുത്തുക';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'സന്ദേശം അയയ്ക്കുക';
+$labels['savemessage']    = 'പൂര്‍ത്തിയാകാത്തവ ആയി സൂക്ഷിക്കുക';
+$labels['addattachment']  = 'ഒരു ഫയല്‍ മെയിലിനൊപ്പം ചേര്‍ക്കുക';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'തിരുത്തല്‍ രീതി';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'യഥാര്‍ഥ സന്ദേശം';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'അക്ഷരത്തെറ്റു് പരിശോധിക്കുക';
 $labels['resumeediting'] = 'തിരുത്തല്‍ തുടരുക';
+$labels['revertto']      = 'Revert to';
+
 $labels['attach'] = 'സംയോജിപ്പിക്കു';
 $labels['attachments'] = 'അറ്റാച്ച്മെന്റുകള്‍';
 $labels['upload'] = 'അപ്‌ലോഡ് ചെയ്യുക';
-$labels['close'] = 'അടയ്ക്കുക';
-$labels['messageoptions'] = 'സന്ദേശ ​ഐച്ഛികങ്ങള്‍...';
-$labels['low'] = 'കുറഞ്ഞ';
-$labels['lowest'] = 'ഏറ്റവും കുറഞ്ഞ';
-$labels['normal'] = 'സാധാരണ';
-$labels['high'] = 'കൂടിയ';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'അടയ്ക്കുക';
+$labels['messageoptions']  = 'സന്ദേശ ​ഐച്ഛികങ്ങള്‍...';
+
+$labels['low']     = 'കുറഞ്ഞ';
+$labels['lowest']  = 'ഏറ്റവും കുറഞ്ഞ';
+$labels['normal']  = 'സാധാരണ';
+$labels['high']    = 'കൂടിയ';
 $labels['highest'] = 'ഏറ്റവും കൂടിയത്';
-$labels['nosubject'] = '(വിഷയം ഇല്ല)';
+
+$labels['nosubject']  = '(വിഷയം ഇല്ല)';
 $labels['showimages'] = 'ചിത്രങ്ങള്‍ കാണിക്കുക';
-$labels['isdraft'] = 'ഇതൊരു കരടുരൂപമാണ്.';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'ഇതൊരു കരടുരൂപമാണ്.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Plain text';
+$labels['savesentmessagein'] = 'Save sent message in';
 $labels['dontsave'] = 'സുക്ഷിക്കരുത്';
 $labels['maxuploadsize'] = '$size ആണ് പരമാവധി  ഫയല്‍ വലിപ്പം';
-$labels['firstname'] = 'ആദ്യ നാമം';
-$labels['surname'] = 'അവസാന നാമം';
-$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['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'ആദ്യ നാമം';
+$labels['surname']      = 'അവസാന നാമം';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'ചെല്ലപേര്';
+$labels['jobtitle']     = 'ജോലിയുടെ പേര്';
+$labels['department']   = 'വകുപ്പ്';
+$labels['gender']       = 'ലിംഗം';
+$labels['maidenname']   = 'കന്യകാനാമം';
+$labels['email']        = 'ഇമെയില്‍';
+$labels['phone']        = 'ഫോണ്‍';
+$labels['address']      = 'മേല്‍വിലാസം';
+$labels['street']       = 'തെരുവ്';
+$labels['locality']     = 'നഗരം';
+$labels['zipcode']      = 'പിന്‍ കോഡ്';
+$labels['region']       = 'സംസ്ഥാനം / പ്രദേശം';
+$labels['country']      = 'രാജ്യം';
+$labels['birthday']     = 'പിറന്നാള്‍';
+$labels['anniversary']  = 'വാര്‍ഷികം';
+$labels['website']      = 'വെബ്സൈറ്റ്';
+$labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'കുറിപ്പുകള്‍';
-$labels['male'] = 'പുരുഷന്‍';
+$labels['male']   = 'പുരുഷന്‍';
 $labels['female'] = 'സ്‌ത്രീ';
 $labels['manager'] = 'പരിപാലകന്‍';
 $labels['assistant'] = 'സഹായി';
-$labels['typeassistant'] = 'സഹായി';
 $labels['spouse'] = 'ഭാര്യ/ഭര്‍ത്താവ്';
+$labels['allfields'] = 'All fields';
 $labels['search'] = 'തെരയുക';
 $labels['advsearch'] = 'വിപുലമായ തിരച്ചില്‍';
 $labels['advanced'] = 'സങ്കീര്‍ണ്ണം';
 $labels['other'] = 'മറ്റുള്ളത്';
-$labels['typeother'] = 'മറ്റുള്ളത്';
-$labels['typehome'] = 'ആസ്ഥാനം';
-$labels['typework'] = 'ജോലി';
-$labels['typemobile'] = 'മോബൈല്‍';
-$labels['typemain'] = 'പ്രധാനപ്പെട്ട';
-$labels['typehomefax'] = 'വീട്ടിലെ ഫാക്സ്';
-$labels['typeworkfax'] = 'കാര്യാലയത്തിലെ ഫാക്സ്';
-$labels['typecar'] = 'കാര്‍';
-$labels['typepager'] = 'പേജര്‍';
-$labels['typevideo'] = 'ചലച്ചിത്രം';
-$labels['typehomepage'] = 'ഹോം പേജ്';
+
+$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'] = 'Add field...';
+$labels['addcontact'] = 'Add new contact';
+$labels['editcontact'] = 'Edit contact';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'സ്വകാര്യ വിവരങ്ങള്‍';
-$labels['edit'] = 'തിരുത്തുക';
+
+$labels['edit']   = 'തിരുത്തുക';
 $labels['cancel'] = 'റദ്ദാക്കുക';
-$labels['save'] = 'സൂക്ഷിക്കുക';
+$labels['save']   = 'സൂക്ഷിക്കുക';
 $labels['delete'] = 'നീക്കം ചെയ്യുക';
 $labels['rename'] = 'പേരുമാറ്റുക';
 $labels['addphoto'] = 'ചേര്‍ക്കുക';
 $labels['replacephoto'] = 'പകരം വയ്ക്കുക';
-$labels['print'] = 'അച്ചടി';
-$labels['export'] = 'പുറത്തെടുക്കുക';
-$labels['grouprename'] = 'കുട്ടത്തിന്റെ പേര് മാറ്റുക';
-$labels['groupdelete'] = 'കൂട്ടം മായ്ക്കുക';
-$labels['previouspage'] = 'മുമ്പുളള താള്‍ കാണിയ്ക്കുക';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'അച്ചടി';
+$labels['export']         = 'പുറത്തെടുക്കുക';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'കുട്ടത്തിന്റെ പേര് മാറ്റുക';
+$labels['groupdelete']    = 'കൂട്ടം മായ്ക്കുക';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'മുമ്പുളള താള്‍ കാണിയ്ക്കുക';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
 $labels['group'] = 'കൂട്ടം';
 $labels['groups'] = 'കൂട്ടങ്ങള്‍';
 $labels['personaladrbook'] = 'സ്വകാര്യ വിലാസങ്ങള്‍';
+
 $labels['searchsave'] = 'തിരയല്‍ സൂക്ഷിക്കുക';
 $labels['searchdelete'] = 'തിരയല്‍ നീക്കംചെയ്യുക';
+
 $labels['import'] = 'പ്രോഗ്രമ്മിലേക്ക് എടുക്കുക';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'പൂര്‍ത്തീകരിച്ചു';
+
+// settings
+$labels['settingsfor'] = 'Settings for';
 $labels['about'] = 'വിവരം';
+$labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'ഉപയൊക്ത മുന്‍ഗണനകള്‍';
+$labels['editpreferences'] = 'Edit user preferences';
+
+$labels['identities'] = 'Identities';
+$labels['manageidentities'] = 'Manage identities for this account';
+$labels['newidentity'] = 'New identity';
+
+$labels['newitem'] = 'New item';
+$labels['edititem'] = 'Edit item';
+
 $labels['preferhtml'] = 'HTML കാണിക്കുക';
-$labels['language'] = 'ഭാഷ';
-$labels['timezone'] = 'സമയ മേഖല';
-$labels['pagesize'] = 'ഒരു താളിലെ വരികള്‍';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'ഭാഷ';
+$labels['timezone']  = 'സമയ മേഖല';
+$labels['pagesize']  = 'ഒരു താളിലെ വരികള്‍';
 $labels['signature'] = 'ഒപ്പ്';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML സന്ദേശങ്ങള്‍ രചിക്കുക';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlsignature'] = 'HTML signature';
+$labels['previewpane'] = 'Show preview pane';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
 $labels['serversettings'] = 'സേവകന്റെ ക്രമീകരണങ്ങള്‍';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'എന്നൊടു ചോദിക്കുക';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'അവഗണിക്കുക';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'എപ്പോഴും';
-$labels['never'] = 'ഒരിക്കലുമില്ല';
-$labels['immediately'] = 'ഉടനടി';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'ഒരിക്കലുമില്ല';
+$labels['immediately']  = 'ഉടനടി';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (തണ്ടര്‍ബേട് )';
 $labels['miscfolding'] = 'Full RFC 2231 ( മൈക്രൊസൊഫ്റ്റ് ഔട്ട്ലൂക്കു് )';
 $labels['2047folding'] = 'Full RFC 2047 (മറ്റുള്ളവ)';
 $labels['force7bit'] = '8-bit അക്ഷരങ്ങള്‍ക്കു "MIME encoding" ഉപയോഗിക്കുക';
 $labels['advancedoptions'] = 'വിപുലീക്രിതമായ ക്രമീകരണങ്ങള്‍';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
 $labels['defaultfont'] = 'HTML സന്ദേശത്തിന്റെ തനതായ ലിപി';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'വിഭാഗം';
+$labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'പുതിയ സന്ദേശം';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'പുതിയ സന്ദേശം മാത്രം';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
 $labels['belowquote'] = 'ഉദ്ധാരണത്തിനു താഴെ';
-$labels['afternseconds'] = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
 $labels['spellcheckignorenums'] = 'അക്കങ്ങള്‍ ഉള്ള വാക്കുകളെ അവഗണിക്കുക';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'നിഘണ്ടുവില്‍ ചേര്‍ക്കുക';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'ഫോള്‍ഡറുകള്‍';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
+$labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'സവിശേഷതകള്‍';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
 $labels['info'] = 'വിവരം';
 $labels['getfoldersize'] = 'അറയുടെ വലുപ്പം അരിയാന്‍ ക്ലിക്ക് ചെയ്യുക';
-$labels['personalfolder'] = 'സ്വകാര്യ അറ';
-$labels['sharedfolder'] = 'പൊതു - അറ';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'സ്വകാര്യ അറ';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'പൊതു - അറ';
+
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
 $labels['support'] = 'സഹായം തേടുക';
+
+// units
+$labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'യൂണിക്കോഡ്';
 $labels['english'] = 'ഇംഗ്ലീഷ്';
 $labels['westerneuropean'] = 'പടിഞ്ഞാറന്‍ യൂറോപ്യന്‍';
 $labels['easterneuropean'] = 'കിഴക്കന്‍ യൂറോപ്യന്‍';
+$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'ബാള്‍ട്ടിക്ക്';
 $labels['cyrillic'] = 'സിറില്ലിക്ക്';
 $labels['arabic'] = 'അറബിക്ക്';
@@ -273,3 +533,4 @@ $labels['japanese'] = 'ജാപ്പനീസ്';
 $labels['korean'] = 'കൊറിയന്‍';
 $labels['chinese'] = 'ചൈനീസ്‌';
 
+?>
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index 3e4b4d5da..85dc43d77 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -2,25 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_ML/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'തങ്കളുടെ ബ്രവു്സര്‍ കുക്കീസ് സ്വീകരിക്കുന്നതല്ല';
+$messages['sessionerror'] = 'Your session is invalid or expired.';
+$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'സര്‍വര്‍ പിഴവ് !';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'പ്രവര്‍ത്തനം തടസപ്പെട്ടു . അനുമതി നിഷേധിക്കപെട്ടിരിക്കുന്നു';
 $messages['invalidrequest'] = 'അസാധുവായ അപേക്ഷ ! ഒരു രേഖയും സൂക്ഷിച്ചിട്ടില്ല';
+$messages['invalidhost'] = 'Invalid server name.';
+$messages['nomessagesfound'] = 'No messages found in this mailbox.';
+$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
+$messages['mailboxempty'] = 'Mailbox is empty.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'തുറക്കുന്നു...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
+$messages['loadingdata'] = 'Loading data...';
 $messages['checkingmail'] = 'പുതിയ സന്ദേസങ്ങള്‍കുവേണ്ടി തിരയുന്നു...';
 $messages['sendingmessage'] = 'സന്ദേശം അയക്കുന്നു...';
+$messages['messagesent'] = 'Message sent successfully.';
+$messages['savingmessage'] = 'Saving message...';
+$messages['messagesaved'] = 'Message saved to Drafts.';
+$messages['successfullysaved'] = 'Successfully saved.';
+$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
+$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
+$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
+$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
+$messages['nocontactsfound'] = 'No contacts found.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'സന്ദേശം അയക്കാന്‍ സാധിച്ചില്ല.';
 $messages['senttooquickly'] = 'സന്ദേശം അയക്കുന്നതിനു മുന്പു ദയവായ്  $sec കാത്തിരിക്കൂ';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
+$messages['errorsaving'] = 'An error occured while saving.';
+$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['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
+$messages['formincomplete'] = 'The form was not completely filled out.';
+$messages['noemailwarning'] = 'Please enter a valid email address.';
+$messages['nonamewarning']  = 'Please enter a name.';
+$messages['nopagesizewarning'] = 'Please enter a page size.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
+$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['notsentwarning'] = 'Message has not been sent. Do you want to discard your 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.';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
+$messages['searchnomatch'] = 'Search returned no matches.';
+$messages['searching'] = 'Searching...';
+$messages['checking'] = 'Checking...';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Folder successfully deleted.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
+$messages['fileuploaderror'] = 'File upload failed.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 83e05001a..1a02a7e2d 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -2,56 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product वरती स्वागत आहे';
-$labels['username'] = 'वापरकर्त्याचे नाव(तुमचे इमेल)';
-$labels['password'] = 'परवलीचा शब्द';
-$labels['server'] = 'सर्व्हर';
-$labels['login'] = 'प्रवेश';
-$labels['logout'] = 'बाहेर जा';
-$labels['mail'] = 'इ-मेल';
+
+// login page
+$labels['welcome']   = '$product वरती स्वागत आहे';
+$labels['username']  = 'वापरकर्त्याचे नाव(तुमचे इमेल)';
+$labels['password']  = 'परवलीचा शब्द';
+$labels['server']    = 'सर्व्हर';
+$labels['login']     = 'प्रवेश';
+
+// taskbar
+$labels['logout']   = 'बाहेर जा';
+$labels['mail']     = 'इ-मेल';
 $labels['settings'] = 'तुमची पसंती';
 $labels['addressbook'] = 'पत्ता नोंदवही';
-$labels['inbox'] = 'आलेले संदेश';
+
+// mailbox names
+$labels['inbox']  = 'आलेले संदेश';
 $labels['drafts'] = 'मसुदा';
-$labels['sent'] = 'पाठवलेले';
-$labels['trash'] = 'कचरा पेटी';
-$labels['junk'] = 'नको असलेले कचरा संदेश';
+$labels['sent']   = 'पाठवलेले';
+$labels['trash']  = 'कचरा पेटी';
+$labels['junk']   = 'नको असलेले कचरा संदेश';
+
+// message listing
 $labels['subject'] = 'विषय';
-$labels['from'] = 'प्रेषक';
-$labels['to'] = 'प्रती';
-$labels['cc'] = 'प्रत';
-$labels['bcc'] = 'गुप्त प्रत';
+$labels['from']    = 'प्रेषक';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'प्रती';
+$labels['cc']      = 'प्रत';
+$labels['bcc']     = 'गुप्त प्रत';
 $labels['replyto'] = 'यास उत्तर द्या';
-$labels['date'] = 'दिनांक';
-$labels['size'] = 'आकार';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'दिनांक';
+$labels['size']    = 'आकार';
 $labels['priority'] = 'प्राधान्य';
 $labels['organization'] = 'संस्था';
 $labels['readstatus'] = 'वाचन स्थिती';
 $labels['listoptions'] = 'विकल्प सूची';
+
 $labels['mailboxlist'] = 'फोल्डर्स';
-$labels['folders'] = 'फोल्डर्स';
 $labels['messagesfromto'] = 'संदेश $from कडून $to साठी $count वा';
 $labels['threadsfromto'] = 'धागे $from कडून $to साठी $count वा';
 $labels['messagenrof'] = 'Message $nr of $count';
-$labels['copy'] = 'नक्‍कल';
-$labels['move'] = 'हलवा';
-$labels['moveto'] = 'या फोल्डरमधे ठेवा';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'नक्‍कल';
+$labels['move']     = 'हलवा';
+$labels['moveto']   = 'या फोल्डरमधे ठेवा';
 $labels['download'] = 'उतरवून घ्या';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'फाईलचे नाव';
 $labels['filesize'] = 'फाईलचा आकार';
+
 $labels['addtoaddressbook'] = 'पत्ता नोंदवहीत नोंदवा';
+
+// weekdays short
 $labels['sun'] = 'रवी';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगळ';
@@ -59,75 +80,89 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनी';
-$labels['sunday'] = 'रविवार';
-$labels['monday'] = 'सोमवार';
-$labels['tuesday'] = 'मंगळवार';
+
+// weekdays long
+$labels['sunday']    = 'रविवार';
+$labels['monday']    = 'सोमवार';
+$labels['tuesday']   = 'मंगळवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday'] = 'गुरुवार';
-$labels['friday'] = 'शुक्रवार';
-$labels['saturday'] = 'शनीवार';
-$labels['jan'] = 'जाने';
-$labels['feb'] = 'फेब्';
-$labels['mar'] = 'मार्च';
-$labels['apr'] = 'एप्रिल';
-$labels['may'] = 'मे';
-$labels['longmay'] = 'मे';
-$labels['jun'] = 'जून';
-$labels['jul'] = 'जुलै';
-$labels['aug'] = 'ऑगस्ट';
-$labels['sep'] = 'सप्टें';
-$labels['oct'] = 'ऑक्टो';
-$labels['nov'] = 'नोव्हें';
-$labels['dec'] = 'डिसें';
-$labels['longjan'] = 'जानेवारी';
-$labels['longfeb'] = 'फेब्रूवारी';
-$labels['longmar'] = 'मार्च';
-$labels['longapr'] = 'एप्रिल';
-$labels['longjun'] = 'जून';
-$labels['longjul'] = 'जुलै';
-$labels['longaug'] = 'ऑगस्ट';
-$labels['longsep'] = 'सप्टेंबर';
-$labels['longoct'] = 'ऑक्टोबर';
-$labels['longnov'] = 'नोव्हेंबर';
-$labels['longdec'] = 'डिसेंबर';
+$labels['thursday']  = 'गुरुवार';
+$labels['friday']    = 'शुक्रवार';
+$labels['saturday']  = 'शनीवार';
+
+// months short
+$labels['jan']	= 'जाने';
+$labels['feb']	= 'फेब्';
+$labels['mar']	= 'मार्च';
+$labels['apr']	= 'एप्रिल';
+$labels['may']	= 'मे';
+$labels['jun']	= 'जून';
+$labels['jul'] 	= 'जुलै';
+$labels['aug']	= 'ऑगस्ट';
+$labels['sep']	= 'सप्टें';
+$labels['oct']	= 'ऑक्टो';
+$labels['nov']	= 'नोव्हें';
+$labels['dec']	= 'डिसें';
+
+// months long
+$labels['longjan']	= 'जानेवारी';
+$labels['longfeb']	= 'फेब्रूवारी';
+$labels['longmar']	= 'मार्च';
+$labels['longapr']	= 'एप्रिल';
+$labels['longmay']	= 'मे';
+$labels['longjun']	= 'जून';
+$labels['longjul']	= 'जुलै';
+$labels['longaug']	= 'ऑगस्ट';
+$labels['longsep']	= 'सप्टेंबर';
+$labels['longoct']	= 'ऑक्टोबर';
+$labels['longnov']	= 'नोव्हेंबर';
+$labels['longdec']	= 'डिसेंबर';
+
 $labels['today'] = 'आज';
-$labels['refresh'] = 'अद्ययावत करा';
-$labels['checkmail'] = 'नवीन संदेश आले आहेत का पहा';
-$labels['compose'] = 'नवीन संदेश तयार करा';
-$labels['writenewmessage'] = 'नवीन संदेश तयार करा';
-$labels['reply'] = 'उत्तर दया';
-$labels['replytomessage'] = 'पाठवणार्‍याला उत्तर द्या';
+
+// toolbar buttons
+$labels['refresh']          = 'अद्ययावत करा';
+$labels['checkmail']        = 'नवीन संदेश आले आहेत का पहा';
+$labels['compose']          = 'नवीन संदेश तयार करा';
+$labels['writenewmessage']  = 'नवीन संदेश तयार करा';
+$labels['reply']            = 'उत्तर दया';
+$labels['replytomessage']   = 'पाठवणार्‍याला उत्तर द्या';
 $labels['replytoallmessage'] = 'पाठवणार्‍याला आणि प्रत केलेल्या सर्वांना संदेश पाठवा';
-$labels['replyall'] = 'सर्वांना उत्तर दया';
-$labels['forwardmessage'] = 'हा संदेश पुढे पाठवा';
-$labels['deletemessage'] = 'संदेश काढून टाका';
+$labels['replyall']         = 'सर्वांना उत्तर दया';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'हा संदेश पुढे पाठवा';
+$labels['deletemessage']    = 'संदेश काढून टाका';
 $labels['movemessagetotrash'] = 'संदेश कचरापेटीत टाका';
-$labels['printmessage'] = 'हा संदेश छापा';
-$labels['previousmessage'] = 'आधिचा संदेश दाखवा';
-$labels['firstmessage'] = 'पहिला संदेश दाखवा';
-$labels['nextmessage'] = 'नंतरचा संदेश दाखवा';
-$labels['lastmessage'] = 'शेवटचा संदेश दाखवा';
-$labels['backtolist'] = 'संदेशांच्या यादीकडे परत चला';
-$labels['viewsource'] = 'मूळ संदेशाचा प्रोग्राम कोड दाखवा';
-$labels['mark'] = 'खूण';
-$labels['markmessages'] = 'संदेशांना खूण करा';
-$labels['markread'] = 'वाचलेला म्हणून खूण करा';
-$labels['markunread'] = 'न वाचलेला म्हणून खूण करा';
-$labels['markflagged'] = 'खूण लावलेला म्हणून खूण करा';
-$labels['markunflagged'] = 'खूण काढलेला म्हणून खूण करा';
-$labels['moreactions'] = 'अधिक कृती..';
-$labels['more'] = 'अधिक';
-$labels['back'] = 'मागे';
-$labels['options'] = 'पर्याय';
+$labels['printmessage']     = 'हा संदेश छापा';
+$labels['previousmessage']  = 'आधिचा संदेश दाखवा';
+$labels['firstmessage']     = 'पहिला संदेश दाखवा';
+$labels['nextmessage']      = 'नंतरचा संदेश दाखवा';
+$labels['lastmessage']      = 'शेवटचा संदेश दाखवा';
+$labels['backtolist']       = 'संदेशांच्या यादीकडे परत चला';
+$labels['viewsource']       = 'मूळ संदेशाचा प्रोग्राम कोड दाखवा';
+$labels['mark']             = 'खूण';
+$labels['markmessages']     = 'संदेशांना खूण करा';
+$labels['markread']         = 'वाचलेला म्हणून खूण करा';
+$labels['markunread']       = 'न वाचलेला म्हणून खूण करा';
+$labels['markflagged']      = 'खूण लावलेला म्हणून खूण करा';
+$labels['markunflagged']    = 'खूण काढलेला म्हणून खूण करा';
+$labels['moreactions']      = 'अधिक कृती..';
+$labels['more']             = 'अधिक';
+$labels['back']             = 'मागे';
+$labels['options']          = 'पर्याय';
+
 $labels['select'] = 'निवडा';
 $labels['all'] = 'सर्व';
 $labels['none'] = 'कोणताही नाही';
-$labels['nonesort'] = 'कोणताही नाही';
 $labels['currpage'] = 'सध्‍याचे पान';
 $labels['unread'] = 'न वाचलेले';
 $labels['flagged'] = 'खूण लावलेले';
 $labels['unanswered'] = 'उत्तर न दिलेले';
 $labels['deleted'] = 'काढून टाकलेला(ले)';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'उलट करा';
 $labels['filter'] = 'गाळणी';
 $labels['list'] = 'यादी';
@@ -136,12 +171,14 @@ $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'] = 'चढत्‍या क्रमाने';
@@ -150,150 +187,216 @@ $labels['listcolumns'] = 'सुची स्‍तंभ';
 $labels['listsorting'] = 'स्‍तंभ वर्गीकरण';
 $labels['listorder'] = 'वर्गीकरण क्रम';
 $labels['listmode'] = 'यादी दर्शक पध्‍दत';
+
 $labels['folderactions'] = 'फोल्डर कृती..';
 $labels['compact'] = 'छोटा';
 $labels['empty'] = 'रिकामा';
+
 $labels['quota'] = 'डिस्कचा वापर';
-$labels['unknown'] = 'माहित नसलेला';
-$labels['unlimited'] = 'अमर्याद';
-$labels['quicksearch'] = 'चटकन शोध';
-$labels['resetsearch'] = 'परत शोध';
-$labels['searchmod'] = 'बदलकर्त्‍यांना शोधा';
-$labels['msgtext'] = 'संपूर्ण संदेश';
+$labels['unknown']  = 'माहित नसलेला';
+$labels['unlimited']  = 'अमर्याद';
+
+$labels['quicksearch']  = 'चटकन शोध';
+$labels['resetsearch']  = 'परत शोध';
+$labels['searchmod']  = 'बदलकर्त्‍यांना शोधा';
+$labels['msgtext']  = 'संपूर्ण संदेश';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
-$labels['editasnew'] = 'नवीन आहे असा संपादित करा';
-$labels['sendmessage'] = 'आत्ता पाठवा';
-$labels['savemessage'] = 'हा मसूदा साठवून ठेवा';
-$labels['addattachment'] = 'फाईल सोबत जोडा';
-$labels['charset'] = 'कॅरेक्टर सेट';
-$labels['editortype'] = 'संपादकाचा प्रकार';
-$labels['returnreceipt'] = 'पोच पावती';
-$labels['dsn'] = 'पोच स्थिती निर्देशक';
+
+// message compose
+$labels['editasnew']      = 'नवीन आहे असा संपादित करा';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'आत्ता पाठवा';
+$labels['savemessage']    = 'हा मसूदा साठवून ठेवा';
+$labels['addattachment']  = 'फाईल सोबत जोडा';
+$labels['charset']        = 'कॅरेक्टर सेट';
+$labels['editortype']     = 'संपादकाचा प्रकार';
+$labels['returnreceipt']  = 'पोच पावती';
+$labels['dsn']            = 'पोच स्थिती निर्देशक';
 $labels['mailreplyintro'] = '$date या दिवशी $sender ने लिहीले :';
 $labels['originalmessage'] = 'खरा संदेश';
-$labels['editidents'] = 'ओळख संपादित करा';
-$labels['spellcheck'] = 'लिखाण';
+
+$labels['editidents']    = 'ओळख संपादित करा';
+$labels['spellcheck']    = 'लिखाण';
 $labels['checkspelling'] = 'शुध्द लेखन';
 $labels['resumeediting'] = 'परत संदेश संपादित करा';
-$labels['revertto'] = 'परत जा';
+$labels['revertto']      = 'परत जा';
+
 $labels['attach'] = 'जोडा';
 $labels['attachments'] = 'जोडलेल्या';
 $labels['upload'] = 'चढवा';
-$labels['close'] = 'बंद';
-$labels['messageoptions'] = 'संदेश पर्याय..';
-$labels['low'] = 'कमी';
-$labels['lowest'] = 'कमित कमी';
-$labels['normal'] = 'नेहमी प्रमाणे';
-$labels['high'] = 'तातडीचे';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'बंद';
+$labels['messageoptions']  = 'संदेश पर्याय..';
+
+$labels['low']     = 'कमी';
+$labels['lowest']  = 'कमित कमी';
+$labels['normal']  = 'नेहमी प्रमाणे';
+$labels['high']    = 'तातडीचे';
 $labels['highest'] = 'अतिशय तातडीचे';
-$labels['nosubject'] = '(विषय नाही)';
+
+$labels['nosubject']  = '(विषय नाही)';
 $labels['showimages'] = 'चित्र दाखवा';
 $labels['alwaysshow'] = '$sender कडून आलेल्या संदेशातील चित्रे नेहमी दाखवा';
-$labels['isdraft'] = 'हा मसुदा संदेश आहे';
+$labels['isdraft']    = 'हा मसुदा संदेश आहे';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'एच टी एम एल';
 $labels['plaintoggle'] = 'साधे लिखाण';
 $labels['savesentmessagein'] = 'पाठवलेला संदेश या फोल्डरमधे ठेवा';
 $labels['dontsave'] = 'संदेश साठवू नका';
 $labels['maxuploadsize'] = 'जास्‍तीत जास्‍त फाइलचा आकार $size असू शकतो';
+
 $labels['addcc'] = 'प्रत करा';
 $labels['addbcc'] = 'गुप्त प्रत करा';
 $labels['addreplyto'] = 'आणखी लोकांना संदेश पाठवा';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'हा संदेश पाठवणार्‍याने हा संदेश तुम्ही वाचल्यावर कळवावयाला सांगितले आहे. तुम्हाला असे कळवणे चालेल ना?';
 $labels['receiptread'] = 'पोच पावती (संदेश वाचला)';
 $labels['yourmessage'] = 'ही तुमच्या संदेशाची पोच पावती आहे.';
 $labels['receiptnote'] = 'सूचना: ही पोच पावती तुम्ही ज्यांना  संदेश पाठवला त्यांच्या संगणकावर दिसला एवढेच सांगते. तुम्ही ज्यांना हा संदेश पाठवला, त्यांनी तो वाचला, आणि त्यांना तो नक्की समजला हे मात्र सांगत नाही.';
-$labels['name'] = 'टोपणनाव';
-$labels['firstname'] = 'नाव';
-$labels['surname'] = 'आडनाव';
-$labels['middlename'] = 'मधले नाव';
-$labels['nickname'] = 'टोपणनाव';
-$labels['jobtitle'] = 'कामाचे शिर्षक';
-$labels['department'] = 'विभाग';
-$labels['gender'] = 'लिंग';
-$labels['email'] = 'इ-मेल्';
-$labels['phone'] = 'दूरध्वनी';
-$labels['address'] = 'पत्ता';
-$labels['street'] = 'रस्ता';
-$labels['locality'] = 'शहर';
-$labels['region'] = 'राज्य / संस्थान';
-$labels['country'] = 'देश';
-$labels['birthday'] = 'वाढदिवस';
-$labels['website'] = 'संकेतस्थळ';
+
+// address boook
+$labels['name']         = 'टोपणनाव';
+$labels['firstname']    = 'नाव';
+$labels['surname']      = 'आडनाव';
+$labels['middlename']   = 'मधले नाव';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'टोपणनाव';
+$labels['jobtitle']     = 'कामाचे शिर्षक';
+$labels['department']   = 'विभाग';
+$labels['gender']       = 'लिंग';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'इ-मेल्';
+$labels['phone']        = 'दूरध्वनी';
+$labels['address']      = 'पत्ता';
+$labels['street']       = 'रस्ता';
+$labels['locality']     = 'शहर';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'राज्य / संस्थान';
+$labels['country']      = 'देश';
+$labels['birthday']     = 'वाढदिवस';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'संकेतस्थळ';
+$labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'टिपा';
-$labels['male'] = 'पुरूष';
+$labels['male']   = 'पुरूष';
 $labels['female'] = 'स्त्री';
 $labels['manager'] = 'व्यवस्थापक';
 $labels['assistant'] = 'सहाय्यक';
-$labels['typeassistant'] = 'सहाय्यक';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
 $labels['search'] = 'शोध';
 $labels['advsearch'] = 'प्रगत शोध';
 $labels['advanced'] = 'आधुनिक';
 $labels['other'] = 'इतर';
-$labels['typeother'] = 'इतर';
-$labels['typehome'] = 'मुख्यपृष्ठ';
-$labels['typework'] = 'काम';
-$labels['typemobile'] = 'भ्रमणध्वनी';
-$labels['typemain'] = 'मुख्य';
-$labels['typevideo'] = 'चलचित्र';
-$labels['typehomepage'] = 'मुख्य पृष्ठ';
+
+$labels['typehome']   = 'मुख्यपृष्ठ';
+$labels['typework']   = 'काम';
+$labels['typeother']  = 'इतर';
+$labels['typemobile']  = 'भ्रमणध्वनी';
+$labels['typemain']  = 'मुख्य';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'चलचित्र';
+$labels['typeassistant']  = 'सहाय्यक';
+$labels['typehomepage']  = 'मुख्य पृष्ठ';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नवीन पत्ता नोंदवहीत ठेवा';
 $labels['editcontact'] = 'नोंदवहीतील पत्ता सुधारा';
 $labels['contacts'] = 'संपर्क';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'वैयक्तिक माहिती';
-$labels['edit'] = 'संदेश तयार करा';
+
+$labels['edit']   = 'संदेश तयार करा';
 $labels['cancel'] = 'रद्द करा';
-$labels['save'] = 'ठेवून द्या';
+$labels['save']   = 'ठेवून द्या';
 $labels['delete'] = 'काढून टाका';
 $labels['rename'] = 'दूसरे नाव द्या';
 $labels['addphoto'] = 'समावेश करा';
 $labels['replacephoto'] = 'बदला';
-$labels['newcontact'] = 'नोंदवहीत नवीन संपर्क लिहिण्यासाठी';
-$labels['deletecontact'] = 'खूण केलेले सर्व संपर्काचे पत्ते काढून टाका';
-$labels['composeto'] = 'साठी नवीन संदेश तयार करा';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'नोंदवहीत नवीन संपर्क लिहिण्यासाठी';
+$labels['deletecontact']  = 'खूण केलेले सर्व संपर्काचे पत्ते काढून टाका';
+$labels['composeto']      = 'साठी नवीन संदेश तयार करा';
 $labels['contactsfromto'] = '$from पासून ते $to पर्यंत $count पैकी';
-$labels['print'] = 'छापा';
-$labels['export'] = 'निर्यात करा';
-$labels['exportvcards'] = 'व्ही कार्ड स्वरुपात पत्ते निर्यात करा';
+$labels['print']          = 'छापा';
+$labels['export']         = 'निर्यात करा';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'व्ही कार्ड स्वरुपात पत्ते निर्यात करा';
 $labels['newcontactgroup'] = 'नवीन पत्‍त्‍यांचा गट बनवा';
-$labels['groupdelete'] = 'गट नष्ट करा';
-$labels['previouspage'] = 'आधिचा संच दाखवा';
-$labels['firstpage'] = 'पहिला संच दाखवा';
-$labels['nextpage'] = 'नंतरचा संच दाखवा';
-$labels['lastpage'] = 'शेवटचा संच दाखवा';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'गट नष्ट करा';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$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['importtarget'] = 'नवीन पत्ता नोंदवहीत नोंदवा';
 $labels['importreplace'] = 'संपूर्ण पत्ता नोंदवही बदला';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'झाले';
+
+// settings
 $labels['settingsfor'] = 'साठी सेटिंग्ज';
 $labels['about'] = 'च्या विषयी';
 $labels['preferences'] = 'तुमची पसंती';
 $labels['userpreferences'] = 'वापरकर्त्याची पसंती';
 $labels['editpreferences'] = 'वापरकर्त्याची पसंती सुधारा';
+
 $labels['identities'] = 'ओळख';
 $labels['manageidentities'] = 'या खात्यासाठी ओळखींचे नियोजन करा';
 $labels['newidentity'] = 'नवीन ओळख';
+
 $labels['newitem'] = 'नवीन प्रकार';
 $labels['edititem'] = 'प्रकार सुधारा';
+
 $labels['preferhtml'] = 'एच टी एम एल दाखवा';
 $labels['defaultcharset'] = 'नेहमीचा अक्षर संच';
 $labels['htmlmessage'] = 'एच टी एम एल संदेश';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'विशेष दिवस';
-$labels['setdefault'] = 'हा नेहमीसाठी वापरा';
-$labels['autodetect'] = 'स्वयंचलित';
-$labels['language'] = 'भाषा';
-$labels['timezone'] = 'वेळ  क्षेत्र';
-$labels['pagesize'] = 'प्रत्येक पानावरील ओळी';
+$labels['setdefault']  = 'हा नेहमीसाठी वापरा';
+$labels['autodetect']  = 'स्वयंचलित';
+$labels['language']  = 'भाषा';
+$labels['timezone']  = 'वेळ  क्षेत्र';
+$labels['pagesize']  = 'प्रत्येक पानावरील ओळी';
 $labels['signature'] = 'सही';
-$labels['dstactive'] = 'दिवसाची वेळ';
+$labels['dstactive']  = 'दिवसाची वेळ';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'एच टी एम एल संदेश तयारा करा';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'एच टी एम एल सही';
 $labels['previewpane'] = 'प्रक्रियापूर्व तावदान दाखवा';
 $labels['skin'] = 'दृष्य गोष्टी';
@@ -305,19 +408,23 @@ $labels['mailboxview'] = 'टपालपेटी पहाणे';
 $labels['mdnrequests'] = 'पाठवणार्‍याच्या सूचना';
 $labels['askuser'] = 'वापरकर्त्याला विचारा';
 $labels['autosend'] = 'स्वयंचलित (आपोआप पाठवणे)';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'दुर्लक्ष करा';
 $labels['readwhendeleted'] = 'काढून टाकल्यावर संदेश वाचला असे दाखवा';
 $labels['flagfordeletion'] = 'संदेश काढून टाकण्या ऎवजी संदेश काढून टाकण्यासाठी आहे अशी खूण करा';
 $labels['skipdeleted'] = 'काढून टाकलेले संदेश दाखवू नका';
 $labels['deletealways'] = 'जर संदेश कचरापेटीत गेले नाहीत तर काढून टाका';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'संदेशातील चित्रे दाखवा';
 $labels['fromknownsenders'] = 'माहितीतील पाठवणार्‍याकडून संदेश';
 $labels['always'] = 'नेहमी';
 $labels['showinlineimages'] = 'सोबत जोडलेली चित्रे संदेशाच्या खाली दाखवा';
-$labels['autosavedraft'] = 'मसूदा आपोआप जतन करा';
-$labels['everynminutes'] = 'प्रत्येक $n मिनिटांनी';
-$labels['never'] = 'कधीच नाही';
-$labels['immediately'] = 'ताबडतोब';
+$labels['autosavedraft']  = 'मसूदा आपोआप जतन करा';
+$labels['everynminutes']  = 'प्रत्येक $n मिनिटांनी';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'कधीच नाही';
+$labels['immediately']  = 'ताबडतोब';
 $labels['messagesdisplaying'] = 'संदेश दाखवा';
 $labels['messagescomposition'] = 'संदेश तयार करा';
 $labels['mimeparamfolding'] = 'सोबत दिलेल्या फाईल्सची नावे';
@@ -329,12 +436,15 @@ $labels['advancedoptions'] = 'अधिक पर्याय';
 $labels['focusonnewmessage'] = 'ब्राऊझर खिडकी नवीन संदेशावर केंद्रित करा';
 $labels['checkallfolders'] = 'सर्व फोल्डरमधे नवीन संदेश शोधा';
 $labels['displaynext'] = 'संदेश काढल्‍यानंतर किंवा हलवल्‍यानंतर पुढचा संदेश दाखवा';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'मुख्‍य पर्याय';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'भाग';
 $labels['maintenance'] = 'देखभाल';
 $labels['newmessage'] = 'नवीन संदेश';
 $labels['signatureoptions'] = 'सही पर्याय';
 $labels['whenreplying'] = 'उत्‍तर देताना';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'नवीन संदेश मुळ संदेशाच्‍या वर चालू करा';
 $labels['replybottomposting'] = 'नवीन संदेश मुळ संदेशाच्‍या खाली चालू करा';
 $labels['replyremovesignature'] = 'उत्‍तर देताना मुळ सही संदेशातून काढून टाका';
@@ -345,25 +455,65 @@ $labels['replysignaturepos'] = 'उत्‍तर देताना किं�
 $labels['belowquote'] = 'उतारया खाली';
 $labels['abovequote'] = 'उतारयाच्‍या वर';
 $labels['insertsignature'] = 'सही मध्‍ये टाका';
-$labels['previewpanemarkread'] = 'प्रदर्शित संदेश पाहीले अशी खुण करा';
-$labels['afternseconds'] = '$n क्षणानंतर';
+$labels['previewpanemarkread']  = 'प्रदर्शित संदेश पाहीले अशी खुण करा';
+$labels['afternseconds']  = '$n क्षणानंतर';
 $labels['reqmdn'] = 'नेहमी पोचपावतीची विनंती करा';
 $labels['reqdsn'] = 'नेहमी पोचपावती स्थिती निर्देशाची विनंती करा';
-$labels['folder'] = 'फोल्डर';
-$labels['foldername'] = 'फोल्डरचे नाव';
-$labels['subscribed'] = 'वर्गणिदार होणे';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'फोल्डर';
+$labels['folders']  = 'फोल्डर्स';
+$labels['foldername']  = 'फोल्डरचे नाव';
+$labels['subscribed']  = 'वर्गणिदार होणे';
 $labels['messagecount'] = 'संदेश';
-$labels['create'] = 'तयार करा';
-$labels['createfolder'] = 'नवीन फोल्डर तयार करा';
-$labels['managefolders'] = 'फोल्डर्सचे नियोजन करा';
+$labels['create']  = 'तयार करा';
+$labels['createfolder']  = 'नवीन फोल्डर तयार करा';
+$labels['managefolders']  = 'फोल्डर्सचे नियोजन करा';
 $labels['specialfolders'] = 'विषेश फोल्डर';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'ने वर्गवारी करा';
-$labels['sortasc'] = 'चढत्या क्रमाने';
+$labels['sortasc']  = 'चढत्या क्रमाने';
 $labels['sortdesc'] = 'उतरत्या क्रमाने';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'बाइट';
 $labels['KB'] = 'केबी';
 $labels['MB'] = 'एमबी';
 $labels['GB'] = 'जीबी';
+
+// character sets
 $labels['unicode'] = 'युनिकोड';
 $labels['english'] = 'इंग्रजी';
 $labels['westerneuropean'] = 'पश्चिम युरोपियन';
@@ -383,3 +533,4 @@ $labels['japanese'] = 'जपानी';
 $labels['korean'] = 'कोरियन';
 $labels['chinese'] = 'चिनी';
 
+?>
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 5945ef1e6..98edd7efd 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -2,35 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'काहीतरी चूक झाली';
-$messages['loginfailed'] = 'प्रवेश करता आला नाही';
+$messages['errortitle']  = 'काहीतरी चूक झाली';
+$messages['loginfailed']  = 'प्रवेश करता आला नाही';
 $messages['cookiesdisabled'] = 'तुमचा ब्राऊझर कुकीज घेऊ शकत नाही';
 $messages['sessionerror'] = 'तुम्ही प्रवेश केल्यानंतर बराच वेळ काही न करता गेला म्हणून तुमचा कालावधी संपला किंवा तुमच्या कालावधीच्या नोंदेत काही चूक झाली आहे.';
 $messages['storageerror'] = 'आयमॅप सर्व्हरशी संपर्क होवू शकला नाही.';
 $messages['servererror'] = 'सर्व्‍हर चूक !';
 $messages['servererrormsg'] = 'सर्व्हर चूक : $msg';
 $messages['dberror'] = 'माहितीसाठा चूक !';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'कृती करण्यास असमर्थ, फोल्डर फक्त बघण्यासाठी';
 $messages['errornoperm'] = 'कृती करण्यास असमर्थ, परवानगी अमान्य';
 $messages['invalidrequest'] = 'अवैध विनंती! माहिती साठवलेली नाही.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'या खात्यामधे कोणताही संदेश आलेला नाही';
 $messages['loggedout'] = 'तुम्ही यशस्वीरित्या खाते बंद केले आहे . राम राम !';
 $messages['mailboxempty'] = 'खात्यात कोणताही संदेश नाही';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'संदेश आणत आहे';
 $messages['uploading'] = 'फाईल चढवली जात आहे...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'माहिती आणत आहे';
 $messages['checkingmail'] = 'नवीन संदेश आले आहेत का हे पहात आहे';
 $messages['sendingmessage'] = 'संदेश पाठवत आहे';
@@ -45,6 +51,7 @@ $messages['blockedimages'] = 'तुमची गोपनीयता पाळ
 $messages['encryptedmessage'] = 'हा गुप्त व सांकेतिक संदेश आहे. तो तुम्हाला असा दाखवता येणार नाही.';
 $messages['nocontactsfound'] = 'कोणताच पत्ता नोंदवहीत नाही.';
 $messages['contactnotfound'] = 'या नावाचा कोणताच पत्ता नोंदवहीत नाही.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'संदेश पाठवता आला नाही.';
 $messages['senttooquickly'] = 'कृपया हा संदेश पाठवण्यापूर्वी $sec थांबा';
 $messages['errorsavingsent'] = 'पाठवलेला संदेश ठेवून देतांना काहीतरी चूक झाली.';
@@ -53,31 +60,38 @@ $messages['errormoving'] = 'संदेश तेथे ठेवता आल�
 $messages['errorcopying'] = 'संदेशांची नक्‍कल करता आली नाही';
 $messages['errordeleting'] = 'संदेश काढून टाकता आला नाही.';
 $messages['errormarking'] = 'संदेशांवर खूण करता आली नाही.';
-$messages['deletecontactconfirm'] = 'खूण केलेले सर्व पत्ते खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
-$messages['deletegroupconfirm'] = 'निवडलेला गट तुम्हाला नक्की नष्ट करायचा आहे का?';
+$messages['deletecontactconfirm']  = 'खूण केलेले सर्व पत्ते खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
+$messages['deletegroupconfirm']  = 'निवडलेला गट तुम्हाला नक्की नष्ट करायचा आहे का?';
 $messages['deletemessagesconfirm'] = 'खूण केलेले सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
-$messages['deletefolderconfirm'] = 'हा फोल्डर खरोखरच तुम्हाला काढून टाकायचा आहेत का?';
-$messages['purgefolderconfirm'] = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
+$messages['deletefolderconfirm']  = 'हा फोल्डर खरोखरच तुम्हाला काढून टाकायचा आहेत का?';
+$messages['purgefolderconfirm']  = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'फोल्डर काढून टाकत आहे';
 $messages['foldermoving'] = 'फोल्डर हलवत आहे.';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फॉर्म पूर्णपणे भरलेला  नाही.';
 $messages['noemailwarning'] = 'योग्य, बरोबर, आणि वैध इमेल पत्ता द्या.';
-$messages['nonamewarning'] = 'नाव द्या';
+$messages['nonamewarning']  = 'नाव द्या';
 $messages['nopagesizewarning'] = 'पानाचा आकार द्या';
 $messages['nosenderwarning'] = 'पाठवणार्‍याचा इमेल पत्ता द्या';
 $messages['norecipientwarning'] = 'किमान एकतरी पत्ता द्या ज्यांना तुम्हाला संदेश पाठवावयाचा आहे.';
-$messages['nosubjectwarning'] = 'विषय दिलेला नाही. तुम्हाला विषय द्यायचा आहे का?';
+$messages['nosubjectwarning']  = 'विषय दिलेला नाही. तुम्हाला विषय द्यायचा आहे का?';
 $messages['nobodywarning'] = 'संदेशामधे कोणताही मजकूर नाही. तुम्हाला तसाच संदेश पाठवावयाचा आहे का?';
 $messages['notsentwarning'] = 'संदेश पाठवला गेला नाही. तुम्हाला हा संदेश रद्द करायचा आहे का?';
 $messages['noldapserver'] = 'शोधण्यासाठी ldap सर्व्हर निवडा';
 $messages['nosearchname'] = 'कृपया ज्यांना तुम्हाला संदेश पाठवावयाचा आहे त्यांचे नाव किंवा इमेल पत्ता द्या.';
 $messages['notuploadedwarning'] = 'सर्व फाईल अजून चढवल्‍या गेलेल्‍या नाहीत. कृपया वाट पहा किंवा मागे फिरा';
 $messages['searchsuccessful'] = '$nr संदेष मिळाले.';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'शोध घेतल्यानंतर एकही संदेश मिळाला नाही';
 $messages['searching'] = 'शोधत आहे......';
 $messages['checking'] = 'तपासत आहे.....';
 $messages['nospellerrors'] = 'शुध्दलेखनाची चूक सापडली नाही';
 $messages['folderdeleted'] = 'फोल्डर यशस्वी रित्या काढून टाकण्यात आला आहे.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
 $messages['folderpurged'] = 'फोल्डर यशस्वीरीत्या रिकामा केला';
 $messages['folderexpunged'] = 'फोल्डर यशस्वीरीत्या संक्षिप्त केला';
 $messages['deletedsuccessfully'] = 'यशस्वी रित्या काढून टाकण्यात आला आहे.';
@@ -91,6 +105,11 @@ $messages['sourceisreadonly'] = 'पत्ता फक्त वाचण्य
 $messages['errorsavingcontact'] = 'पत्ता नोंदवहीत ठेवता आला नाही.';
 $messages['movingmessage'] = 'संदेश हलवत आहे..';
 $messages['copyingmessage'] = 'संदेशाची नक्‍कल करत आहे...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'पोचपावती यशस्वीरित्या पाठवण्यात आली आहे.';
 $messages['errorsendingreceipt'] = 'पोचपावती पाठवता आली नाही.';
 $messages['deleteidentityconfirm'] = 'तुम्हाला ही ओळख नक्की नष्ट करायची आहे का?';
@@ -100,9 +119,11 @@ $messages['selectimportfile'] = 'चढवण्यासाठी फाईल
 $messages['addresswriterror'] = 'निवडलेल्या पत्ता नोंदवहीत नोंद करता येत नाही.';
 $messages['contactaddedtogroup'] = 'पत्‍ते यशस्‍वीरित्‍या हया गटात वाढवण्‍यात आले.';
 $messages['contactremovedfromgroup'] = 'पत्‍ते यशस्‍वीरित्‍या हया गटातून काढून टाकले.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'आयात करत आहे, कृपया वाट पहा.....';
-$messages['importerror'] = 'आयात झाली नाही. आयात करत असलेली फाईल व्हीकार्ड प्रकाराची नाही';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>$inserted पत्ते यशस्वीरित्या आयात केल, $skipped आधिच असलेल्या नोंदी केल्या नाहीत</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'ही क्रिया करण्यास परवानगी नाही.';
 $messages['nofromaddress'] = 'निवडलेल्या खात्यात इमेल पत्ता दिलेला नाही.';
 $messages['editorwarning'] = 'टेक्स्ट संपादन निवडल्यास संदेशाचे दृष्य स्वरुप बदलून जाईल. तुम्हाला असेच करायचे आहे ना?';
@@ -117,4 +138,32 @@ $messages['emailformaterror'] = 'अवैध ईमेल पत्‍ता :
 $messages['toomanyrecipients'] = 'खूप जास्‍त प्राप्‍तकर्ते. प्राप्‍तकर्त्‍यांची संख्‍या $max पर्यंत कमी करा';
 $messages['maxgroupmembersreached'] = 'गट सभासद संख्‍या $max पेक्षा जास्‍त झाली आहे';
 $messages['internalerror'] = 'अंतर्गत चूक झाली. कृपया परत प्रयत्‍न करा.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 51e5073b8..ada834483 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ms_MY/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: nawawi                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Selamat datang ke $product';
-$labels['username'] = 'Nama Pengguna';
-$labels['password'] = 'Katalaluan';
-$labels['server'] = 'Pelayan';
-$labels['login'] = 'Log Masuk';
-$labels['logout'] = 'Log Keluar';
-$labels['mail'] = 'Mel';
+
+// login page
+$labels['welcome']   = 'Selamat datang ke $product';
+$labels['username']  = 'Nama Pengguna';
+$labels['password']  = 'Katalaluan';
+$labels['server']    = 'Pelayan';
+$labels['login']     = 'Log Masuk';
+
+// taskbar
+$labels['logout']   = 'Log Keluar';
+$labels['mail']     = 'Mel';
 $labels['settings'] = 'Tetapan';
 $labels['addressbook'] = 'Buku Alamat';
-$labels['inbox'] = 'Peti Masuk';
+
+// mailbox names
+$labels['inbox']  = 'Peti Masuk';
 $labels['drafts'] = 'Draf';
-$labels['sent'] = 'Hantar';
-$labels['trash'] = 'Tong Sampah';
-$labels['junk'] = 'Junk';
+$labels['sent']   = 'Hantar';
+$labels['trash']  = 'Tong Sampah';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Subjek';
-$labels['from'] = 'Daripada';
-$labels['to'] = 'Kepada';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Daripada';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Kepada';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Balasan Kepada';
 $labels['followupto'] = 'Susulan Ke';
-$labels['date'] = 'Tarikh';
-$labels['size'] = 'Saiz';
+$labels['date']    = 'Tarikh';
+$labels['size']    = 'Saiz';
 $labels['priority'] = 'Prioriti';
 $labels['organization'] = 'Organisasi';
 $labels['readstatus'] = 'Status baca';
 $labels['listoptions'] = 'Senarai pilihan';
+
 $labels['mailboxlist'] = 'Folder';
-$labels['folders'] = 'Folder';
 $labels['messagesfromto'] = 'Mesej $from ke $to dari $count';
 $labels['threadsfromto'] = 'Urutan $from ke $to dari $count';
 $labels['messagenrof'] = 'Mesej $nr dari $count';
 $labels['fromtoshort'] = '$from - $to dari $count';
-$labels['copy'] = 'Salin';
-$labels['move'] = 'Alih';
-$labels['moveto'] = 'Alih ke...';
+
+$labels['copy']     = 'Salin';
+$labels['move']     = 'Alih';
+$labels['moveto']   = 'Alih ke...';
 $labels['download'] = 'Muat Turun';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nama Fail';
 $labels['filesize'] = 'Saiz Fail';
+
 $labels['addtoaddressbook'] = 'Tambah ke buku alamat';
+
+// weekdays short
 $labels['sun'] = 'Aha';
 $labels['mon'] = 'Isn';
 $labels['tue'] = 'Sel';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Rab';
 $labels['thu'] = 'Kha';
 $labels['fri'] = 'Jum';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Ahad';
-$labels['monday'] = 'Isnin';
-$labels['tuesday'] = 'Selasa';
+
+// weekdays long
+$labels['sunday']    = 'Ahad';
+$labels['monday']    = 'Isnin';
+$labels['tuesday']   = 'Selasa';
 $labels['wednesday'] = 'Rabu';
-$labels['thursday'] = 'Khamis';
-$labels['friday'] = 'Jumaat';
-$labels['saturday'] = 'Sabtu';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mac';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ogo';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dis';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'March';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Jun';
-$labels['longjul'] = 'Julai';
-$labels['longaug'] = 'Ogos';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Disember';
+$labels['thursday']  = 'Khamis';
+$labels['friday']    = 'Jumaat';
+$labels['saturday']  = 'Sabtu';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mac';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mei';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ogo';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dis';
+
+// months long
+$labels['longjan']	= 'Januari';
+$labels['longfeb']	= 'Februari';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mei';
+$labels['longjun']	= 'Jun';
+$labels['longjul']	= 'Julai';
+$labels['longaug']	= 'Ogos';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Disember';
+
 $labels['today'] = 'Hari Ini';
-$labels['refresh'] = 'Refresh';
-$labels['checkmail'] = 'Semak mesej baru';
-$labels['compose'] = 'Karang mesej';
-$labels['writenewmessage'] = 'Cipta mesej baru';
-$labels['reply'] = 'Balas';
-$labels['replytomessage'] = 'Balas mesej';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Semak mesej baru';
+$labels['compose']          = 'Karang mesej';
+$labels['writenewmessage']  = 'Cipta mesej baru';
+$labels['reply']            = 'Balas';
+$labels['replytomessage']   = 'Balas mesej';
 $labels['replytoallmessage'] = 'Balas kepada penghantar dan semua penerima';
-$labels['replyall'] = 'Balas semua';
-$labels['replylist'] = 'Senarai balas';
-$labels['forward'] = 'Majukan';
-$labels['forwardinline'] = 'Majukan dalam mesej';
+$labels['replyall']         = 'Balas semua';
+$labels['replylist']        = 'Senarai balas';
+$labels['forward']          = 'Majukan';
+$labels['forwardinline']    = 'Majukan dalam mesej';
 $labels['forwardattachment'] = 'Majukan sebagai lampiran';
-$labels['forwardmessage'] = 'Marakan mesej';
-$labels['deletemessage'] = 'Pindah mesej ke sampah';
+$labels['forwardmessage']   = 'Marakan mesej';
+$labels['deletemessage']    = 'Pindah mesej ke sampah';
 $labels['movemessagetotrash'] = 'Pindah mesej ke Tong Sampah';
-$labels['printmessage'] = 'Cetak mesej ini';
-$labels['previousmessage'] = 'Papar mesej sebelumnya';
-$labels['firstmessage'] = 'Papar mesej pertama';
-$labels['nextmessage'] = 'Papat mesej seterusnya';
-$labels['lastmessage'] = 'Papat mesej terakhir';
-$labels['backtolist'] = 'Kembali ke senarai mesej';
-$labels['viewsource'] = 'Papar sumber';
-$labels['mark'] = 'Tanda';
-$labels['markmessages'] = 'Tanda mesej';
-$labels['markread'] = 'Sebagai Dibaca';
-$labels['markunread'] = 'Sebagai Tidak dibaca';
-$labels['markflagged'] = 'Seperti  ditanda';
-$labels['markunflagged'] = 'Seperti tidak ditanda';
-$labels['moreactions'] = 'Tindakan lanjut..';
-$labels['more'] = 'Seterusnya';
-$labels['back'] = 'Kembali';
-$labels['options'] = 'Opsyen';
+$labels['printmessage']     = 'Cetak mesej ini';
+$labels['previousmessage']  = 'Papar mesej sebelumnya';
+$labels['firstmessage']     = 'Papar mesej pertama';
+$labels['nextmessage']      = 'Papat mesej seterusnya';
+$labels['lastmessage']      = 'Papat mesej terakhir';
+$labels['backtolist']       = 'Kembali ke senarai mesej';
+$labels['viewsource']       = 'Papar sumber';
+$labels['mark']             = 'Tanda';
+$labels['markmessages']     = 'Tanda mesej';
+$labels['markread']         = 'Sebagai Dibaca';
+$labels['markunread']       = 'Sebagai Tidak dibaca';
+$labels['markflagged']      = 'Seperti  ditanda';
+$labels['markunflagged']    = 'Seperti tidak ditanda';
+$labels['moreactions']      = 'Tindakan lanjut..';
+$labels['more']             = 'Seterusnya';
+$labels['back']             = 'Kembali';
+$labels['options']          = 'Opsyen';
+
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tiada';
-$labels['nonesort'] = 'Tiada';
 $labels['currpage'] = 'Muka terkini';
 $labels['unread'] = 'Belum dibaca';
 $labels['flagged'] = 'Ditanda';
 $labels['unanswered'] = 'Belum dijawab';
 $labels['deleted'] = 'Telah dipadam';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Songsangkan';
 $labels['filter'] = 'Tapis';
 $labels['list'] = 'Senarai';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'Buka Semua';
 $labels['expand-unread'] = 'Buka yang belum dibaca';
 $labels['collapse-all'] = 'Tutup Semua';
 $labels['threaded'] = 'Telah urutan';
+
 $labels['autoexpand_threads'] = 'Buka mesej mengikut urutan';
 $labels['do_expand'] = 'Kesemua urutan';
 $labels['expand_only_unread'] = 'hanya dengan mesej yang belum dibaca';
 $labels['fromto'] = 'Daripada/Kepada';
 $labels['flag'] = 'Tanda';
 $labels['attachment'] = 'Lampiran';
+$labels['nonesort'] = 'Tiada';
 $labels['sentdate'] = 'Tarikh dihantar';
 $labels['arrival'] = 'Tarikh terima';
 $labels['asc'] = 'menaik';
@@ -156,104 +187,219 @@ $labels['listcolumns'] = 'Senarai ruang';
 $labels['listsorting'] = 'pengisihan ruang';
 $labels['listorder'] = 'Urutan pengisihan';
 $labels['listmode'] = 'Mod senarai paparan';
+
 $labels['folderactions'] = 'Aksi folder';
 $labels['compact'] = 'Kompak';
 $labels['empty'] = 'Kosong';
+
 $labels['quota'] = 'Penggunaan cakera';
-$labels['unknown'] = 'tidak diketahui';
-$labels['unlimited'] = 'Tidak terhad';
-$labels['quicksearch'] = 'Carian pantas';
-$labels['resetsearch'] = 'Set semula carian';
-$labels['searchmod'] = 'Pengubah carian';
-$labels['msgtext'] = 'Keseluruhan mesej';
+$labels['unknown']  = 'tidak diketahui';
+$labels['unlimited']  = 'Tidak terhad';
+
+$labels['quicksearch']  = 'Carian pantas';
+$labels['resetsearch']  = 'Set semula carian';
+$labels['searchmod']  = 'Pengubah carian';
+$labels['msgtext']  = 'Keseluruhan mesej';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
-$labels['editasnew'] = 'Ubah seperti baharu';
-$labels['sendmessage'] = 'Hantar mesej';
-$labels['savemessage'] = 'Simapan sebagai draf';
-$labels['addattachment'] = 'Lampir fail';
-$labels['charset'] = 'Set aksara';
-$labels['editortype'] = 'Jenis Editor';
-$labels['returnreceipt'] = 'Penerimaan semula';
-$labels['dsn'] = 'Status pemberitahuan penghantaran';
+
+// message compose
+$labels['editasnew']      = 'Ubah seperti baharu';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Hantar mesej';
+$labels['savemessage']    = 'Simapan sebagai draf';
+$labels['addattachment']  = 'Lampir fail';
+$labels['charset']        = 'Set aksara';
+$labels['editortype']     = 'Jenis Editor';
+$labels['returnreceipt']  = 'Penerimaan semula';
+$labels['dsn']            = 'Status pemberitahuan penghantaran';
 $labels['mailreplyintro'] = 'Pada $date, $sender menulis';
 $labels['originalmessage'] = 'Mesej Asal';
-$labels['editidents'] = 'Ubah identiti';
-$labels['spellcheck'] = 'Eja';
+
+$labels['editidents']    = 'Ubah identiti';
+$labels['spellcheck']    = 'Eja';
 $labels['checkspelling'] = 'Semak ejaan';
 $labels['resumeediting'] = 'Sambung pengeditan';
-$labels['revertto'] = 'Kembali kepada';
+$labels['revertto']      = 'Kembali kepada';
+
 $labels['attach'] = 'Lampirkan';
 $labels['attachments'] = 'Lampiran';
 $labels['upload'] = 'Muat naik';
 $labels['uploadprogress'] = '$percent ($current dari $total)';
-$labels['close'] = 'Tutup';
-$labels['messageoptions'] = 'Opsyen mesej';
-$labels['low'] = 'Rendah';
-$labels['lowest'] = 'Paling Rendah';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Tinggi';
+$labels['close']  = 'Tutup';
+$labels['messageoptions']  = 'Opsyen mesej';
+
+$labels['low']     = 'Rendah';
+$labels['lowest']  = 'Paling Rendah';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Tinggi';
 $labels['highest'] = 'Paling Tinggi';
-$labels['nosubject'] = '(tiada subjek)';
+
+$labels['nosubject']  = '(tiada subjek)';
 $labels['showimages'] = 'Papar imej';
 $labels['alwaysshow'] = 'selalu paparkan imej dari $sender';
-$labels['isdraft'] = 'Ini adalah draf mesej';
+$labels['isdraft']    = 'Ini adalah draf mesej';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Teks kosong';
 $labels['savesentmessagein'] = 'Simpan mesej yang telah dihantar dalam';
 $labels['dontsave'] = 'Jangan simpan';
 $labels['maxuploadsize'] = 'maksimum saiz fail yang dibenarkan ialah $size';
+
 $labels['addcc'] = 'Tambah Cc';
 $labels['addbcc'] = 'Tambah Bcc';
 $labels['addreplyto'] = 'Tambah Reply-To';
 $labels['addfollowupto'] = 'Tambah Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Pengirim mesej ini mahu diberitahu apabila anda membaca mesej ini. Adakah anda ingin memberitahu pengirim?';
 $labels['receiptread'] = 'Balas Resip (dibaca)';
 $labels['yourmessage'] = 'Ini adalah Resip Balasan untuk mesej anda';
 $labels['receiptnote'] = 'Perhatian: Resip ini hanya untuk memberitahu yang mesej ini telah dipaparkan di komputer penerima. Tidak ada jaminan yang penerima telah membaca atau memahami kandungan mesej.';
-$labels['name'] = 'Nama paparan';
-$labels['firstname'] = 'Nama pertama';
-$labels['surname'] = 'Nama akhir';
-$labels['email'] = 'E-Mel';
+
+// address boook
+$labels['name']         = 'Nama paparan';
+$labels['firstname']    = 'Nama pertama';
+$labels['surname']      = 'Nama akhir';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'E-Mel';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Tambah kontek baru';
 $labels['editcontact'] = 'Ubahsuai Kontek';
-$labels['edit'] = 'Sunting';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Sunting';
 $labels['cancel'] = 'Batal';
-$labels['save'] = 'Simpan';
+$labels['save']   = 'Simpan';
 $labels['delete'] = 'Padam';
-$labels['newcontact'] = 'Cipta kad kontek baru';
-$labels['deletecontact'] = 'Hapus kontek yang dipilih';
-$labels['composeto'] = 'Karang mel kepada';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Cipta kad kontek baru';
+$labels['deletecontact']  = 'Hapus kontek yang dipilih';
+$labels['composeto']      = 'Karang mel kepada';
 $labels['contactsfromto'] = 'Kontek $from ke $to dari $count';
-$labels['print'] = 'Cetak';
-$labels['export'] = 'Eksport';
-$labels['previouspage'] = 'Papar set sebelumnya';
-$labels['firstpage'] = 'Papar set pertama';
-$labels['nextpage'] = 'Papar set seterusnya';
-$labels['lastpage'] = 'Papar set akhir';
+$labels['print']          = 'Cetak';
+$labels['export']         = 'Eksport';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Papar set sebelumnya';
+$labels['firstpage']      = 'Papar set pertama';
+$labels['nextpage']       = 'Papar set seterusnya';
+$labels['lastpage']       = 'Papar set akhir';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Kumpulan';
 $labels['personaladrbook'] = 'Alamat-alamat Peribadi';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Tetapan bagi';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Keutamaan';
 $labels['userpreferences'] = 'Keutamaan pengguna';
 $labels['editpreferences'] = 'Sunting keutamaan pengguna';
+
 $labels['identities'] = 'Identiti';
 $labels['manageidentities'] = 'Urus identiti bagi akaun ini';
 $labels['newidentity'] = 'Identiti baru';
+
 $labels['newitem'] = 'Butiran baru';
 $labels['edititem'] = 'Ubahsuai butiran';
+
 $labels['preferhtml'] = 'Papar HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mesej HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Tarikh-tarikh cantik';
-$labels['setdefault'] = 'Tetap asal';
-$labels['language'] = 'Bahasa';
-$labels['timezone'] = 'Zon Masa';
-$labels['pagesize'] = 'Baris setiap muka';
+$labels['setdefault']  = 'Tetap asal';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Bahasa';
+$labels['timezone']  = 'Zon Masa';
+$labels['pagesize']  = 'Baris setiap muka';
 $labels['signature'] = 'Tandatangan';
-$labels['dstactive'] = 'Simpanan siang hari';
+$labels['dstactive']  = 'Simpanan siang hari';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Karang mesej HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Tandatangan HTML';
 $labels['previewpane'] = 'Pamer ruang previu';
+$labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Kosongkan Tong sampah ketika keluar';
 $labels['logoutcompact'] = 'Padatkan Inbox ketika keluar';
 $labels['uisettings'] = 'Antaramuka Pengguna';
@@ -262,19 +408,129 @@ $labels['mailboxview'] = 'Pandangan kotak Mel';
 $labels['mdnrequests'] = 'Pemberitahuan Pengirim';
 $labels['askuser'] = 'Tanya pengguna';
 $labels['autosend'] = 'Hantar automatik';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'Biarkan';
 $labels['readwhendeleted'] = 'Tanda mesej sebagai dibaca ketika hapus';
 $labels['flagfordeletion'] = 'Tanda mesej untuk pembuangan (tidak delete terus)';
-$labels['autosavedraft'] = 'Simpan draf dengan automatik';
-$labels['never'] = 'tidak pernah';
-$labels['folder'] = 'Kabinet Fail';
-$labels['foldername'] = 'Nama Kabinet Fail';
-$labels['subscribed'] = 'Dilanggan';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Simpan draf dengan automatik';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'tidak pernah';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Kabinet Fail';
+$labels['folders']  = 'Folder';
+$labels['foldername']  = 'Nama Kabinet Fail';
+$labels['subscribed']  = 'Dilanggan';
 $labels['messagecount'] = 'Mesej-mesej';
-$labels['create'] = 'Cipta';
-$labels['createfolder'] = 'Cipta kabinet fail baru';
-$labels['managefolders'] = 'Urus kabinet fail';
+$labels['create']  = 'Cipta';
+$labels['createfolder']  = 'Cipta kabinet fail baru';
+$labels['managefolders']  = 'Urus kabinet fail';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Susun dengan';
-$labels['sortasc'] = 'Susun menaik';
+$labels['sortasc']  = 'Susun menaik';
 $labels['sortdesc'] = 'Susun menurun';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 3cf4b5a41..0cddd6749 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ms_MY/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: abuyop <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Log masuk gagal';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Log masuk gagal';
 $messages['cookiesdisabled'] = 'Pelayar anda tidak menerima cookies';
 $messages['sessionerror'] = 'Sesi anda tidak sah atau telah tamat';
 $messages['storageerror'] = 'Sambungan ke pelayan IMAP gagal';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Tiada mesej dijumpai dalam kotak mel ini';
 $messages['loggedout'] = 'Sesi anda telah tamat. Selamat tinggal!';
 $messages['mailboxempty'] = 'Kotak mail kosong';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Memuat...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Memuat data...';
 $messages['checkingmail'] = 'Menyemak mesej baru...';
 $messages['sendingmessage'] = 'Menghantar mesej...';
@@ -32,34 +46,54 @@ $messages['messagesaved'] = 'Mesej disimpan dalam Draf';
 $messages['successfullysaved'] = 'Berjaya disimpan';
 $messages['addedsuccessfully'] = 'Kontek berjaya disimpan ke dalam buku alamat';
 $messages['contactexists'] = 'Kontek dengan alamat emel ini sudah wujud';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Untuk melindungi kebesasan peribadi anda, imej jauh dihalang dalam mesej ini.';
 $messages['encryptedmessage'] = 'Ini adalah mesej yang di\'encrypted\' dan tidak boleh dipamerkan. Maaf!';
 $messages['nocontactsfound'] = 'Tiada kontek dijumpai';
 $messages['contactnotfound'] = 'Kontek yang diminta tidak dijumpai';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Gagal menghantar mesej';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Terdapat ralat ketika menyimpan';
 $messages['errormoving'] = 'Tidak boleh pindah mesej';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Tidak boleh hapus mesej';
-$messages['deletecontactconfirm'] = 'Adakah anda ingin hapuskan kontek yang dipilih?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Adakah anda ingin hapuskan kontek yang dipilih?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Adakah anda ingin hapuskan mesej yang dipilih?';
-$messages['deletefolderconfirm'] = 'Adakah anda ingin hapuskan kabinet fail ini?';
-$messages['purgefolderconfirm'] = 'Adakah anda ingin hapuskan semua mesej dalam kabinet fail ini?';
+$messages['deletefolderconfirm']  = 'Adakah anda ingin hapuskan kabinet fail ini?';
+$messages['purgefolderconfirm']  = 'Adakah anda ingin hapuskan semua mesej dalam kabinet fail ini?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Borang tidak diisi dengan lengkap';
 $messages['noemailwarning'] = 'Sila masukkan alamat emel yang sah';
-$messages['nonamewarning'] = 'Sila masukkan nama';
+$messages['nonamewarning']  = 'Sila masukkan nama';
 $messages['nopagesizewarning'] = 'Sila masukkan saiz halaman';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Sila masukkan sekurang-kurangnya satu penerima';
-$messages['nosubjectwarning'] = 'Ruang "Subjek" kosong. Adakah anda ingin masukkannya sekarang?';
+$messages['nosubjectwarning']  = 'Ruang "Subjek" kosong. Adakah anda ingin masukkannya sekarang?';
 $messages['nobodywarning'] = 'Hantar mesej ini tanpa teks?';
 $messages['notsentwarning'] = 'Mesej tidak dihantar. Adakah anda ingin menyingkir mesej anda?';
 $messages['noldapserver'] = 'Sila pilih satu pelayan ldap untuk carian';
 $messages['nosearchname'] = 'Sila masukkan nama kontek atau alamat emel';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr mesej dijumpai';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Carian tiada padanan';
 $messages['searching'] = 'Menggelintar...';
 $messages['checking'] = 'Menyemak...';
 $messages['nospellerrors'] = 'Tiada kesalah ejaan dijumpai';
 $messages['folderdeleted'] = 'Kabinet fail berjaya dihapuskan';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Berjaya dihapuskan';
 $messages['converting'] = 'Singkir format dari mesej...';
 $messages['messageopenerror'] = 'Tidak boleh muat mesej dari server';
@@ -70,7 +104,66 @@ $messages['copyerror'] = 'Tidak boleh salin apa-apa alamat';
 $messages['sourceisreadonly'] = 'Sumber alamat ini adalah untuk bacaan sahaja';
 $messages['errorsavingcontact'] = 'Tidak boleh simmpan alamat kontek';
 $messages['movingmessage'] = 'Memindah mesej...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Berjaya menghantar resip bacaan';
 $messages['errorsendingreceipt'] = 'Tidak dapat menghantar resip';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Anda tidak boleh membuang identiti ini, ia milik anda yang terakhir.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 2ee9a6c33..ecbe8545e 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NO/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkommen til $product';
-$labels['username'] = 'Brukernavn';
-$labels['password'] = 'Passord';
-$labels['server'] = 'Tjener';
-$labels['login'] = 'Logg inn';
-$labels['logout'] = 'Logg ut';
-$labels['mail'] = 'E-post';
+
+// login page
+$labels['welcome']   = 'Velkommen til $product';
+$labels['username']  = 'Brukernavn';
+$labels['password']  = 'Passord';
+$labels['server']    = 'Tjener';
+$labels['login']     = 'Logg inn';
+
+// taskbar
+$labels['logout']   = 'Logg ut';
+$labels['mail']     = 'E-post';
 $labels['settings'] = 'Innstillinger';
 $labels['addressbook'] = 'Adressebok';
-$labels['inbox'] = 'Innboks';
+
+// mailbox names
+$labels['inbox']  = 'Innboks';
 $labels['drafts'] = 'Kladd';
-$labels['sent'] = 'Sendt';
-$labels['trash'] = 'Slettet';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Sendt';
+$labels['trash']  = 'Slettet';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Emne';
-$labels['from'] = 'Avsender';
-$labels['to'] = 'Mottaker';
-$labels['cc'] = 'Kopi til';
-$labels['bcc'] = 'Blindkopi til';
+$labels['from']    = 'Avsender';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Mottaker';
+$labels['cc']      = 'Kopi til';
+$labels['bcc']     = 'Blindkopi til';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Oppfølging til';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Størrelse';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Størrelse';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
 $labels['readstatus'] = 'Lese status';
 $labels['listoptions'] = 'List muligheter';
+
 $labels['mailboxlist'] = 'Mapper';
-$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Meldinger $from til $to av $count';
 $labels['threadsfromto'] = 'Tråder $from til $to av $count';
 $labels['messagenrof'] = 'Melding $nr av $count';
 $labels['fromtoshort'] = '$from – $to av $count';
-$labels['copy'] = 'Kopier';
-$labels['move'] = 'Flytt';
-$labels['moveto'] = 'flytt til...';
+
+$labels['copy']     = 'Kopier';
+$labels['move']     = 'Flytt';
+$labels['moveto']   = 'flytt til...';
 $labels['download'] = 'last ned';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
+
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
+
 $labels['addtoaddressbook'] = 'Legg til i adressebok';
+
+// weekdays short
 $labels['sun'] = 'Søn';
 $labels['mon'] = 'Man';
 $labels['tue'] = 'Tir';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
-$labels['sunday'] = 'Søndag';
-$labels['monday'] = 'Mandag';
-$labels['tuesday'] = 'Tirsdag';
+
+// weekdays long
+$labels['sunday']    = 'Søndag';
+$labels['monday']    = 'Mandag';
+$labels['tuesday']   = 'Tirsdag';
 $labels['wednesday'] = 'Onsdag';
-$labels['thursday'] = 'Torsdag';
-$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'Lørdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Des';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Mars';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Desember';
+$labels['thursday']  = 'Torsdag';
+$labels['friday']    = 'Fredag';
+$labels['saturday']  = 'Lørdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Des';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Mars';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Desember';
+
 $labels['today'] = 'I dag';
-$labels['refresh'] = 'Oppdater';
-$labels['checkmail'] = 'Se etter nye meldinger';
-$labels['compose'] = 'Skriv ny e-post';
-$labels['writenewmessage'] = 'Opprett ny e-post';
-$labels['reply'] = 'Svar';
-$labels['replytomessage'] = 'Svar på denne e-posten';
+
+// toolbar buttons
+$labels['refresh']          = 'Oppdater';
+$labels['checkmail']        = 'Se etter nye meldinger';
+$labels['compose']          = 'Skriv ny e-post';
+$labels['writenewmessage']  = 'Opprett ny e-post';
+$labels['reply']            = 'Svar';
+$labels['replytomessage']   = 'Svar på denne e-posten';
 $labels['replytoallmessage'] = 'Svar til alle mottakere';
-$labels['replyall'] = 'Svar alle';
-$labels['replylist'] = 'Svarliste';
-$labels['forward'] = 'Videresend';
-$labels['forwardinline'] = 'Videresend i melding';
+$labels['replyall']         = 'Svar alle';
+$labels['replylist']        = 'Svarliste';
+$labels['forward']          = 'Videresend';
+$labels['forwardinline']    = 'Videresend i melding';
 $labels['forwardattachment'] = 'Vidresend som vedlegg';
-$labels['forwardmessage'] = 'Videresend denne e-posten';
-$labels['deletemessage'] = 'Slett e-posten';
+$labels['forwardmessage']   = 'Videresend denne e-posten';
+$labels['deletemessage']    = 'Slett e-posten';
 $labels['movemessagetotrash'] = 'Flytt e-posten til søppel';
-$labels['printmessage'] = 'Skriv ut denne e-posten';
-$labels['previousmessage'] = 'Vis forrige melding';
-$labels['firstmessage'] = 'Vis første melding';
-$labels['nextmessage'] = 'Vis neste melding';
-$labels['lastmessage'] = 'Vis siste melding';
-$labels['backtolist'] = 'Tilbake til e-postlisten';
-$labels['viewsource'] = 'Vis kilde';
-$labels['mark'] = 'Merke';
-$labels['markmessages'] = 'Merk meldinger';
-$labels['markread'] = 'som lest';
-$labels['markunread'] = 'som ulest';
-$labels['markflagged'] = 'som flagget';
-$labels['markunflagged'] = 'som uflagget';
-$labels['moreactions'] = 'Flere handlinger …';
-$labels['more'] = 'Mer';
-$labels['back'] = 'Tilbake';
-$labels['options'] = 'Alternativer';
+$labels['printmessage']     = 'Skriv ut denne e-posten';
+$labels['previousmessage']  = 'Vis forrige melding';
+$labels['firstmessage']     = 'Vis første melding';
+$labels['nextmessage']      = 'Vis neste melding';
+$labels['lastmessage']      = 'Vis siste melding';
+$labels['backtolist']       = 'Tilbake til e-postlisten';
+$labels['viewsource']       = 'Vis kilde';
+$labels['mark']             = 'Merke';
+$labels['markmessages']     = 'Merk meldinger';
+$labels['markread']         = 'som lest';
+$labels['markunread']       = 'som ulest';
+$labels['markflagged']      = 'som flagget';
+$labels['markunflagged']    = 'som uflagget';
+$labels['moreactions']      = 'Flere handlinger …';
+$labels['more']             = 'Mer';
+$labels['back']             = 'Tilbake';
+$labels['options']          = 'Alternativer';
+
 $labels['select'] = 'Velg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Gjeldende side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Utvid alle';
 $labels['expand-unread'] = 'Utvid uleste';
 $labels['collapse-all'] = 'Skjul alle';
 $labels['threaded'] = 'Trådet';
+
 $labels['autoexpand_threads'] = 'Utvid tråder';
 $labels['do_expand'] = 'alle tråder';
 $labels['expand_only_unread'] = 'kun med uleste meldinger';
 $labels['fromto'] = 'Avsender/Mottaker';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Vedlegg';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Dato sendt';
 $labels['arrival'] = 'Dato mottatt';
 $labels['asc'] = 'stigende';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Listekolonner';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorteringsrekkefølge';
 $labels['listmode'] = 'Listevisningsmodus';
+
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
+
 $labels['quota'] = 'Plassforbruk';
-$labels['unknown'] = 'ukjent';
-$labels['unlimited'] = 'ubegrenset';
-$labels['quicksearch'] = 'Hurtigsøk';
-$labels['resetsearch'] = 'Nullstill søk';
-$labels['searchmod'] = 'Søke felt';
-$labels['msgtext'] = 'Hele meldingen';
+$labels['unknown']  = 'ukjent';
+$labels['unlimited']  = 'ubegrenset';
+
+$labels['quicksearch']  = 'Hurtigsøk';
+$labels['resetsearch']  = 'Nullstill søk';
+$labels['searchmod']  = 'Søke felt';
+$labels['msgtext']  = 'Hele meldingen';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['editasnew'] = 'Rediger som ny';
-$labels['send'] = 'Send.';
-$labels['sendmessage'] = 'Send e-posten';
-$labels['savemessage'] = 'Lagre kladd';
-$labels['addattachment'] = 'Vedlegg';
-$labels['charset'] = 'Tegnsett';
-$labels['editortype'] = 'Format';
-$labels['returnreceipt'] = 'Be om kvittering';
-$labels['dsn'] = 'Leveringsstatus notifikasjon';
+
+// message compose
+$labels['editasnew']      = 'Rediger som ny';
+$labels['send']           = 'Send.';
+$labels['sendmessage']    = 'Send e-posten';
+$labels['savemessage']    = 'Lagre kladd';
+$labels['addattachment']  = 'Vedlegg';
+$labels['charset']        = 'Tegnsett';
+$labels['editortype']     = 'Format';
+$labels['returnreceipt']  = 'Be om kvittering';
+$labels['dsn']            = 'Leveringsstatus notifikasjon';
 $labels['mailreplyintro'] = 'Den $date, skrev $sender:';
 $labels['originalmessage'] = 'Opprinnelig melding';
-$labels['editidents'] = 'Endre identiteter';
-$labels['spellcheck'] = 'Stavekontroll';
+
+$labels['editidents']    = 'Endre identiteter';
+$labels['spellcheck']    = 'Stavekontroll';
 $labels['checkspelling'] = 'Stavekontroll';
 $labels['resumeediting'] = 'Fortsett redigering';
-$labels['revertto'] = 'Tilbake til';
+$labels['revertto']      = 'Tilbake til';
+
 $labels['attach'] = 'Legg ved';
 $labels['attachments'] = 'Vedlegg';
 $labels['upload'] = 'Last opp';
 $labels['uploadprogress'] = '$percent ($current fra $total)';
-$labels['close'] = 'Lukk';
-$labels['messageoptions'] = 'Meldingsalternativer...';
-$labels['low'] = 'Lav';
-$labels['lowest'] = 'Lavest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Høy';
+$labels['close']  = 'Lukk';
+$labels['messageoptions']  = 'Meldingsalternativer...';
+
+$labels['low']     = 'Lav';
+$labels['lowest']  = 'Lavest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Høy';
 $labels['highest'] = 'Høyest';
-$labels['nosubject'] = '(intet emne)';
+
+$labels['nosubject']  = '(intet emne)';
 $labels['showimages'] = 'Vis bilder';
 $labels['alwaysshow'] = 'Vis alltid bilder fra $sender';
-$labels['isdraft'] = 'Dette er en kladd.';
-$labels['andnmore'] = '$nr flere ...';
+$labels['isdraft']    = 'Dette er en kladd.';
+$labels['andnmore']   = '$nr flere ...';
 $labels['togglemoreheaders'] = 'Vis flere meldings-headere';
 $labels['togglefullheaders'] = 'Veksle visning av meldingens headere i råformat';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Ren tekst';
 $labels['savesentmessagein'] = 'Lagre sendt melding i';
 $labels['dontsave'] = 'ikke lagre';
 $labels['maxuploadsize'] = 'Maksimalt tillatt filstørrelse er $size';
+
 $labels['addcc'] = 'Legg til kopiadressat (Cc)';
 $labels['addbcc'] = 'Legg til blindkopiadressat (Bcc)';
 $labels['addreplyto'] = 'Legg til svar til (Reply-To)';
 $labels['addfollowupto'] = 'Legg til oppfølging';
+
+// mdn
 $labels['mdnrequest'] = 'Senderen av denne meldingen har bedt om å bli gjort oppmerksom på at denne meldingen er lest. Ønsker du å sende denne bekreftelsen?';
 $labels['receiptread'] = 'Kvittering (lest)';
 $labels['yourmessage'] = 'Dette er en kvittering for at din e-post er mottatt';
 $labels['receiptnote'] = 'Merknad: Denne kvitteringen bekrefter bare at e-posten ble vist hos mottakeren. Det er ingen garanti for at mottakeren har lest eller forstått innholdet i e-posten.';
-$labels['name'] = 'Visningsnavn';
-$labels['firstname'] = 'Fornavn';
-$labels['surname'] = 'Etternavn';
-$labels['middlename'] = 'Mellom Navn';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Kallenavn';
-$labels['jobtitle'] = 'Jobb Tittel';
-$labels['department'] = 'Avdeling';
-$labels['gender'] = 'Kjønn';
-$labels['maidenname'] = 'Pikenavn';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Gate';
-$labels['locality'] = 'Sted';
-$labels['zipcode'] = 'Postkode';
-$labels['region'] = 'Stat/provins';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Fødselsdag';
-$labels['anniversary'] = 'Merkedag';
-$labels['website'] = 'Nettsted';
+
+// address boook
+$labels['name']         = 'Visningsnavn';
+$labels['firstname']    = 'Fornavn';
+$labels['surname']      = 'Etternavn';
+$labels['middlename']   = 'Mellom Navn';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Kallenavn';
+$labels['jobtitle']     = 'Jobb Tittel';
+$labels['department']   = 'Avdeling';
+$labels['gender']       = 'Kjønn';
+$labels['maidenname']   = 'Pikenavn';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Gate';
+$labels['locality']     = 'Sted';
+$labels['zipcode']      = 'Postkode';
+$labels['region']       = 'Stat/provins';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Fødselsdag';
+$labels['anniversary']  = 'Merkedag';
+$labels['website']      = 'Nettsted';
 $labels['instantmessenger'] = 'Lynmelding';
 $labels['notes'] = 'Notater';
-$labels['male'] = 'Mann';
+$labels['male']   = 'Mann';
 $labels['female'] = 'Kvinne';
 $labels['manager'] = 'Leder';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Ektefelle';
 $labels['allfields'] = 'Alle felter';
 $labels['search'] = 'Søk';
 $labels['advsearch'] = 'Avansert søk';
 $labels['advanced'] = 'Avansert';
 $labels['other'] = 'Annet';
-$labels['typeother'] = 'Annet';
-$labels['typehome'] = 'Hjem';
-$labels['typework'] = 'Jobb';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hoved';
-$labels['typehomefax'] = 'Hjemmefaks';
-$labels['typeworkfax'] = 'Faks på arbeid';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsøker';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Hjemmeside';
+
+$labels['typehome']   = 'Hjem';
+$labels['typework']   = 'Jobb';
+$labels['typeother']  = 'Annet';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hoved';
+$labels['typehomefax']  = 'Hjemmefaks';
+$labels['typeworkfax']  = 'Faks på arbeid';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsøker';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Hjemmeside';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Legg til felt ...';
 $labels['addcontact'] = 'Legg til ny kontakt';
 $labels['editcontact'] = 'Rediger kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Egenskaper';
 $labels['personalinfo'] = 'Personlig informasjon';
-$labels['edit'] = 'Rediger';
+
+$labels['edit']   = 'Rediger';
 $labels['cancel'] = 'Avbryt';
-$labels['save'] = 'Lagre';
+$labels['save']   = 'Lagre';
 $labels['delete'] = 'Slett';
 $labels['rename'] = 'Gi nytt navn';
 $labels['addphoto'] = 'Legg til';
 $labels['replacephoto'] = 'Erstatt';
 $labels['uploadphoto'] = 'Last opp bilde';
-$labels['newcontact'] = 'Opprett ny kontakt';
-$labels['deletecontact'] = 'Slett valgte kontakter';
-$labels['composeto'] = 'Skriv e-post til';
+
+$labels['newcontact']     = 'Opprett ny kontakt';
+$labels['deletecontact']  = 'Slett valgte kontakter';
+$labels['composeto']      = 'Skriv e-post til';
 $labels['contactsfromto'] = 'Kontakter $from til $to av $count';
-$labels['print'] = 'Skriv ut';
-$labels['export'] = 'Eksporter';
-$labels['exportvcards'] = 'Eksporter kontakter i vCard-format';
+$labels['print']          = 'Skriv ut';
+$labels['export']         = 'Eksporter';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Eksporter kontakter i vCard-format';
 $labels['newcontactgroup'] = 'Opprett ny kontaktgruppe';
-$labels['grouprename'] = 'Endre navn på gruppe';
-$labels['groupdelete'] = 'Slett gruppe';
+$labels['grouprename']    = 'Endre navn på gruppe';
+$labels['groupdelete']    = 'Slett gruppe';
 $labels['groupremoveselected'] = 'Fjern valgte kontakter fra gruppe';
-$labels['previouspage'] = 'Vis forrige sett';
-$labels['firstpage'] = 'Vis første sett';
-$labels['nextpage'] = 'Vis neste sett';
-$labels['lastpage'] = 'Vis siste sett';
+
+$labels['previouspage']   = 'Vis forrige sett';
+$labels['firstpage']      = 'Vis første sett';
+$labels['nextpage']       = 'Vis neste sett';
+$labels['lastpage']       = 'Vis siste sett';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Egne adresser';
+
 $labels['searchsave'] = 'Lagre søk';
 $labels['searchdelete'] = 'Slett søk';
+
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer kontakter';
 $labels['importfromfile'] = 'Importer fra fil:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Legg til kontakter i adresseboka:';
 $labels['importreplace'] = 'Erstatt hele adresseboken';
 $labels['importdesc'] = 'Du kan laste opp kontakter fra en eksisterende adressebok.<br/>Vi støtter adressebøker i <a href="http://no.wikipedia.org/wiki/VCard">vCard</a> eller CSV (kommaseparert) .';
 $labels['done'] = 'Fullført';
+
+// settings
 $labels['settingsfor'] = 'Innstillinger for';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Oppsett';
 $labels['userpreferences'] = 'Brukeroppsett';
 $labels['editpreferences'] = 'Rediger brukeroppsett';
+
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Administrer identitetene for denne kontoen';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Nytt punkt';
 $labels['edititem'] = 'Rediger punkt';
+
 $labels['preferhtml'] = 'Foretrekk HTML';
 $labels['defaultcharset'] = 'Standard tegnsett';
 $labels['htmlmessage'] = 'HTML-melding';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datoformat';
 $labels['timeformat'] = 'Tidsformat';
 $labels['prettydate'] = 'Pen datovisning';
-$labels['setdefault'] = 'Sett som standard';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Språk';
-$labels['timezone'] = 'Tidssone';
-$labels['pagesize'] = 'Linjer per side';
+$labels['setdefault']  = 'Sett som standard';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Språk';
+$labels['timezone']  = 'Tidssone';
+$labels['pagesize']  = 'Linjer per side';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommertid';
+$labels['dstactive']  = 'Sommertid';
 $labels['showinextwin'] = 'Åpne melding i nytt vindu';
 $labels['composeextwin'] = 'Skriv i nytt vindu';
 $labels['htmleditor'] = 'Bruk HTML-editor';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Vis bilder fra eksterne servere i meldinger';
 $labels['fromknownsenders'] = 'fra kjente avsendere';
 $labels['always'] = 'alltid';
 $labels['showinlineimages'] = 'Vis vedlagte bilder nedenfor meldingen';
-$labels['autosavedraft'] = 'Autolagring av utkast';
-$labels['everynminutes'] = 'hvert $n minutt';
-$labels['refreshinterval'] = 'Oppdater (sjekk for nye meldinger etc.)';
-$labels['never'] = 'Aldri';
-$labels['immediately'] = 'umiddelbart';
+$labels['autosavedraft']  = 'Autolagring av utkast';
+$labels['everynminutes']  = 'hvert $n minutt';
+$labels['refreshinterval']  = 'Oppdater (sjekk for nye meldinger etc.)';
+$labels['never']  = 'Aldri';
+$labels['immediately']  = 'umiddelbart';
 $labels['messagesdisplaying'] = 'Visning av meldinger';
 $labels['messagescomposition'] = 'Skriving av meldinger';
 $labels['mimeparamfolding'] = 'Vedleggsnavn';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Plassering av signatur ved svar eller videresend
 $labels['belowquote'] = 'over sitert melding';
 $labels['abovequote'] = 'under sitert melding';
 $labels['insertsignature'] = 'Sett inn signatur';
-$labels['previewpanemarkread'] = 'Merk forhåndsviste meldinger som lest';
-$labels['afternseconds'] = 'etter $n sekunder';
+$labels['previewpanemarkread']  = 'Merk forhåndsviste meldinger som lest';
+$labels['afternseconds']  = 'etter $n sekunder';
 $labels['reqmdn'] = 'Alltid be om svarkvittering';
 $labels['reqdsn'] = 'Alltid be om leveringsstatus';
 $labels['replysamefolder'] = 'Legg svar i mappen til meldingen det svares på';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Registrer protokollhåndtering for mailto-lenke
 $labels['forwardmode'] = 'Meldinger videresendes';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
-$labels['folder'] = 'Mappe';
-$labels['foldername'] = 'Mappenavn';
-$labels['subscribed'] = 'Abonnere';
+
+$labels['folder']  = 'Mappe';
+$labels['folders']  = 'Mapper';
+$labels['foldername']  = 'Mappenavn';
+$labels['subscribed']  = 'Abonnere';
 $labels['messagecount'] = 'Meldinger';
-$labels['create'] = 'Opprett';
-$labels['createfolder'] = 'Lag ny mappe';
-$labels['managefolders'] = 'Rediger mapper';
+$labels['create']  = 'Opprett';
+$labels['createfolder']  = 'Lag ny mappe';
+$labels['managefolders']  = 'Rediger mapper';
 $labels['specialfolders'] = 'Spesielle mapper';
 $labels['properties'] = 'Egenskaper';
 $labels['folderproperties'] = 'Egenskaper for mappe';
@@ -427,23 +491,29 @@ $labels['info'] = 'Informasjon';
 $labels['getfoldersize'] = 'Klikk for å få mappestørrelse';
 $labels['changesubscription'] = 'Klikk for å endre abonnement';
 $labels['foldertype'] = 'Mappetype';
-$labels['personalfolder'] = 'Privat mappe';
-$labels['otherfolder'] = 'Annen brukers mappe';
-$labels['sharedfolder'] = 'Offentlig mappe';
+$labels['personalfolder']  = 'Privat mappe';
+$labels['otherfolder']  = 'Annen brukers mappe';
+$labels['sharedfolder']  = 'Offentlig mappe';
+
 $labels['sortby'] = 'Sorter etter';
-$labels['sortasc'] = 'Eldste først';
+$labels['sortasc']  = 'Eldste først';
 $labels['sortdesc'] = 'Nyeste først';
 $labels['undo'] = 'Angre';
+
 $labels['installedplugins'] = 'Installerte tillegg';
 $labels['plugin'] = 'Tilleggsmodul';
 $labels['version'] = 'Versjon';
 $labels['source'] = 'Kildekode';
 $labels['license'] = 'Lisensvilkår';
 $labels['support'] = 'Få hjelp';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Vesteuropeisk';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 9bc66a0c0..939d1da76 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NO/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Det oppsto en feil!';
-$messages['loginfailed'] = 'Pålogging mislyktes';
+$messages['errortitle']  = 'Det oppsto en feil!';
+$messages['loginfailed']  = 'Pålogging mislyktes';
 $messages['cookiesdisabled'] = 'Nettleseren din tillater ikke informasjonskapsler (cookies)';
 $messages['sessionerror'] = 'Din nettlesertilkobling er ugyldig eller utløpt';
 $messages['storageerror'] = 'Tilkobling til IMAP-tjener mislyktes.';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Kunne ikke flytte meldingen(e)';
 $messages['errorcopying'] = 'Kunne ikke kopiere meldingen(e)';
 $messages['errordeleting'] = 'Kunne ikke slette meldingen(e)';
 $messages['errormarking'] = 'Kunne ikke markere meldingen(e)';
-$messages['deletecontactconfirm'] = 'Vil du virkelig slette valgte kontakt(er)?';
-$messages['deletegroupconfirm'] = 'Vil du virkelig slette den valgte gruppa?';
+$messages['deletecontactconfirm']  = 'Vil du virkelig slette valgte kontakt(er)?';
+$messages['deletegroupconfirm']  = 'Vil du virkelig slette den valgte gruppa?';
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette de(n) valgte meldingen(e)?';
-$messages['deletefolderconfirm'] = 'Vil du virkelig slette denne mappen?';
-$messages['purgefolderconfirm'] = 'Vil du virkelig slette alle meldingene i denne mappen?';
+$messages['deletefolderconfirm']  = 'Vil du virkelig slette denne mappen?';
+$messages['purgefolderconfirm']  = 'Vil du virkelig slette alle meldingene i denne mappen?';
 $messages['contactdeleting'] = 'Sletter kontakt(er) ...';
 $messages['groupdeleting'] = 'Sletter gruppe ...';
 $messages['folderdeleting'] = 'Sletter mappe...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Abonnerer på mappe ...';
 $messages['folderunsubscribing'] = 'Avslutter mappeabonnement ...';
 $messages['formincomplete'] = 'Skjemaet var ikke fullstendig fylt ut';
 $messages['noemailwarning'] = 'Vennligst oppgi en gyldig epostadresse.';
-$messages['nonamewarning'] = 'Angi et navn';
+$messages['nonamewarning']  = 'Angi et navn';
 $messages['nopagesizewarning'] = 'Angi sidestørrelsen';
 $messages['nosenderwarning'] = 'Vennligst angi avsenderadresse';
 $messages['norecipientwarning'] = 'Skriv inn minst én mottaker';
-$messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skrive det inn nå?';
+$messages['nosubjectwarning']  = 'Emnefeltet er tomt. Vil du skrive det inn nå?';
 $messages['nobodywarning'] = 'Send denne meldingen uten tekst?';
 $messages['notsentwarning'] = 'E-posten er ikke sendt. Er du sikker på at du vil avbryte skrivingen?';
 $messages['noldapserver'] = 'Velg LDAP-tjener å søke i';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'Meldingsdelen er for stor til at den kan prosesser
 $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/labels.inc b/program/localization/ne_NP/labels.inc
index d06a03792..4b62e942b 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -2,57 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ne_NP/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Prasanna Singh                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product मा स्वागत छ';
-$labels['username'] = 'प्रयोगकर्ताको नाम';
-$labels['password'] = 'प्रवेश शब्द';
-$labels['server'] = 'सर्भर';
-$labels['login'] = 'लगइन गर्नुहोस्';
-$labels['logout'] = 'लगआउट गर्नुहोस्';
-$labels['mail'] = 'ई-मेल';
+
+// login page
+$labels['welcome']   = '$product मा स्वागत छ';
+$labels['username']  = 'प्रयोगकर्ताको नाम';
+$labels['password']  = 'प्रवेश शब्द';
+$labels['server']    = 'सर्भर';
+$labels['login']     = 'लगइन गर्नुहोस्';
+
+// taskbar
+$labels['logout']   = 'लगआउट गर्नुहोस्';
+$labels['mail']     = 'ई-मेल';
 $labels['settings'] = 'व्यक्तिगत रोजाईहरु';
 $labels['addressbook'] = 'ठेगाना पुस्तिका';
-$labels['inbox'] = 'प्राप्ति मञ्जूषा';
+
+// mailbox names
+$labels['inbox']  = 'प्राप्ति मञ्जूषा';
 $labels['drafts'] = 'ड्राफ्टहरू';
-$labels['sent'] = 'पठईएका मेलहरु';
-$labels['trash'] = 'रद्दी टोकरी';
-$labels['junk'] = 'स्पाम';
+$labels['sent']   = 'पठईएका मेलहरु';
+$labels['trash']  = 'रद्दी टोकरी';
+$labels['junk']   = 'स्पाम';
+
+// message listing
 $labels['subject'] = 'विषय';
-$labels['from'] = 'प्रेषक';
-$labels['to'] = 'प्रापक';
-$labels['cc'] = 'बोधार्थ';
-$labels['bcc'] = 'गुप्त बोधार्थ';
+$labels['from']    = 'प्रेषक';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'प्रापक';
+$labels['cc']      = 'बोधार्थ';
+$labels['bcc']     = 'गुप्त बोधार्थ';
 $labels['replyto'] = 'लाई-जवाफ';
 $labels['followupto'] = 'यसलाई अनुसरण गर्नुहोस्';
-$labels['date'] = 'तारिख';
-$labels['size'] = 'नाप';
+$labels['date']    = 'तारिख';
+$labels['size']    = 'नाप';
 $labels['priority'] = 'प्राथमिकता';
 $labels['organization'] = 'संस्था';
 $labels['readstatus'] = 'पढेको अवस्था';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'फोल्डरहरु';
-$labels['folders'] = 'फोल्डरहरु';
 $labels['messagesfromto'] = 'मेलहरु $from बाट $to सम्म, $count मध्यबाट';
 $labels['threadsfromto'] = 'थ्रेडहरु $from बाट $to सम्म, $count मध्यबाट';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count मध्यबाट';
 $labels['fromtoshort'] = '$from - $to, $count मध्यबाट';
-$labels['copy'] = 'प्रतिलिपि गर्नुहोस्';
-$labels['move'] = 'सार्नुहोस';
-$labels['moveto'] = 'यहाँ सार्नुहोस';
+
+$labels['copy']     = 'प्रतिलिपि गर्नुहोस्';
+$labels['move']     = 'सार्नुहोस';
+$labels['moveto']   = 'यहाँ सार्नुहोस';
 $labels['download'] = 'डाऊनलोड';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'फाईलको नाम';
 $labels['filesize'] = 'फाईलको नाप';
+
 $labels['addtoaddressbook'] = 'ठेगाना पुस्तिकामा भर्नुहोस';
+
+// weekdays short
 $labels['sun'] = 'आइत';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगल';
@@ -60,150 +80,457 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'विहि';
 $labels['fri'] = 'शुक';
 $labels['sat'] = 'शनि';
-$labels['sunday'] = 'आइतवार';
-$labels['monday'] = 'सोमवार';
-$labels['tuesday'] = 'मंगलवार';
+
+// weekdays long
+$labels['sunday']    = 'आइतवार';
+$labels['monday']    = 'सोमवार';
+$labels['tuesday']   = 'मंगलवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday'] = 'विहिवार';
-$labels['friday'] = 'शुक्रवार';
-$labels['saturday'] = 'शनिवार';
-$labels['jan'] = 'जनवरी';
-$labels['feb'] = 'फेब्रुवरी';
-$labels['mar'] = 'मार्च';
-$labels['apr'] = 'अप्रिल';
-$labels['may'] = 'मई';
-$labels['longmay'] = 'मई';
-$labels['jun'] = 'जुन';
-$labels['jul'] = 'जुलाई';
-$labels['aug'] = 'अगस्ट';
-$labels['sep'] = 'सेप्टेम्बर';
-$labels['oct'] = 'अक्टोबर';
-$labels['nov'] = 'नोभेम्बर';
-$labels['dec'] = 'डिसेम्बर';
-$labels['longjan'] = 'जनवरी';
-$labels['longfeb'] = 'फेब्रुवरी';
-$labels['longmar'] = 'मार्च';
-$labels['longapr'] = 'अप्रिल';
-$labels['longjun'] = 'जुन';
-$labels['longjul'] = 'जुलाई';
-$labels['longaug'] = 'अगस्ट';
-$labels['longsep'] = 'सेप्टेम्बर';
-$labels['longoct'] = 'अक्टोबर';
-$labels['longnov'] = 'नोभेम्बर';
-$labels['longdec'] = 'डिसेम्बर';
+$labels['thursday']  = 'विहिवार';
+$labels['friday']    = 'शुक्रवार';
+$labels['saturday']  = 'शनिवार';
+
+// months short
+$labels['jan']	= 'जनवरी';
+$labels['feb']	= 'फेब्रुवरी';
+$labels['mar']	= 'मार्च';
+$labels['apr']	= 'अप्रिल';
+$labels['may']	= 'मई';
+$labels['jun']	= 'जुन';
+$labels['jul'] 	= 'जुलाई';
+$labels['aug']	= 'अगस्ट';
+$labels['sep']	= 'सेप्टेम्बर';
+$labels['oct']	= 'अक्टोबर';
+$labels['nov']	= 'नोभेम्बर';
+$labels['dec']	= 'डिसेम्बर';
+
+// months long
+$labels['longjan']	= 'जनवरी';
+$labels['longfeb']	= 'फेब्रुवरी';
+$labels['longmar']	= 'मार्च';
+$labels['longapr']	= 'अप्रिल';
+$labels['longmay']	= 'मई';
+$labels['longjun']	= 'जुन';
+$labels['longjul']	= 'जुलाई';
+$labels['longaug']	= 'अगस्ट';
+$labels['longsep']	= 'सेप्टेम्बर';
+$labels['longoct']	= 'अक्टोबर';
+$labels['longnov']	= 'नोभेम्बर';
+$labels['longdec']	= 'डिसेम्बर';
+
 $labels['today'] = 'आज';
-$labels['refresh'] = 'ताजा पार्नुहोस्';
-$labels['checkmail'] = 'नया मेल खोज्नुहोस';
-$labels['compose'] = 'रचना गर्नुहोस्';
-$labels['writenewmessage'] = 'नया मेल लेख्नुहोस';
-$labels['reply'] = 'जवाफ दिनुहोस्';
-$labels['replytomessage'] = 'प्रेषकलाई जवाफ दिनुहोस';
+
+// toolbar buttons
+$labels['refresh']          = 'ताजा पार्नुहोस्';
+$labels['checkmail']        = 'नया मेल खोज्नुहोस';
+$labels['compose']          = 'रचना गर्नुहोस्';
+$labels['writenewmessage']  = 'नया मेल लेख्नुहोस';
+$labels['reply']            = 'जवाफ दिनुहोस्';
+$labels['replytomessage']   = 'प्रेषकलाई जवाफ दिनुहोस';
 $labels['replytoallmessage'] = 'प्रेषक लगायत सबैलाई जवाफ दिनुहोस';
-$labels['replyall'] = 'सबैलाई जवाफ दिनुहोस';
-$labels['replylist'] = 'जवाफ तालिका';
-$labels['forward'] = 'फरवार्ड गर्नुहोस्';
-$labels['forwardinline'] = 'आन्तरिक पंक्तिमा फरवार्ड गर्नुहोस';
+$labels['replyall']         = 'सबैलाई जवाफ दिनुहोस';
+$labels['replylist']        = 'जवाफ तालिका';
+$labels['forward']          = 'फरवार्ड गर्नुहोस्';
+$labels['forwardinline']    = 'आन्तरिक पंक्तिमा फरवार्ड गर्नुहोस';
 $labels['forwardattachment'] = 'एट्याचमेन्ट जसरी फरवार्ड गर्नुहोस';
-$labels['forwardmessage'] = 'मेल अगाडि पठाउनुहोस';
-$labels['deletemessage'] = 'रद्दी टोकरीमा हाल्नुहोस';
+$labels['forwardmessage']   = 'मेल अगाडि पठाउनुहोस';
+$labels['deletemessage']    = 'रद्दी टोकरीमा हाल्नुहोस';
 $labels['movemessagetotrash'] = 'सन्देशलाई रद्दी टोकरीमा सार्नुहोस';
-$labels['printmessage'] = 'यो सन्देशलाई मुद्रण गर्नुहोस्';
-$labels['previousmessage'] = 'पछाडिको सन्देश देखाउनुहोस';
-$labels['firstmessage'] = 'पहलो सन्देश देखाउनुहोस';
-$labels['nextmessage'] = 'अगाडिको सन्देश देखाउनुहोस';
-$labels['lastmessage'] = 'अन्तिम सन्देश देखाउनुहोस';
-$labels['backtolist'] = 'सन्देश सूची देखाउनुहोस';
-$labels['viewsource'] = 'श्रोत देखाउनुहोस';
-$labels['mark'] = 'चिन्ह लगाउनुहोस्';
-$labels['markmessages'] = 'सन्देशमा चिन्ह लगाउनुहोस्';
-$labels['more'] = 'अझ धेरै';
-$labels['back'] = 'पछाडि';
-$labels['options'] = 'विकल्पहरू';
+$labels['printmessage']     = 'यो सन्देशलाई मुद्रण गर्नुहोस्';
+$labels['previousmessage']  = 'पछाडिको सन्देश देखाउनुहोस';
+$labels['firstmessage']     = 'पहलो सन्देश देखाउनुहोस';
+$labels['nextmessage']      = 'अगाडिको सन्देश देखाउनुहोस';
+$labels['lastmessage']      = 'अन्तिम सन्देश देखाउनुहोस';
+$labels['backtolist']       = 'सन्देश सूची देखाउनुहोस';
+$labels['viewsource']       = 'श्रोत देखाउनुहोस';
+$labels['mark']             = 'चिन्ह लगाउनुहोस्';
+$labels['markmessages']     = 'सन्देशमा चिन्ह लगाउनुहोस्';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'अझ धेरै';
+$labels['back']             = 'पछाडि';
+$labels['options']          = 'विकल्पहरू';
+
 $labels['select'] = 'चयन गर्नुहोस्';
 $labels['all'] = 'सबै';
 $labels['none'] = 'हैन';
-$labels['nonesort'] = 'हैन';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'नपढिएका |';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'हैन';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'छोटो गर्नुहोस';
 $labels['empty'] = 'खाली गर्ने';
+
 $labels['quota'] = 'डिस्कको उपभोग';
-$labels['unknown'] = 'अज्ञात';
-$labels['unlimited'] = 'अनगिन्ति';
-$labels['quicksearch'] = 'स्फुर्ति खोज';
-$labels['resetsearch'] = 'पन: खोज';
-$labels['sendmessage'] = 'तुरुन्तै मेल पठाउनुहोस';
-$labels['savemessage'] = 'ड्राफ्ट जोगाउनुहोस';
-$labels['addattachment'] = 'फाइल टाँस्नुहोस';
-$labels['charset'] = 'क्यारेक्टर सेट';
-$labels['editortype'] = 'सम्पादकको प्रकार';
-$labels['returnreceipt'] = 'फिर्ति रसीद';
+$labels['unknown']  = 'अज्ञात';
+$labels['unlimited']  = 'अनगिन्ति';
+
+$labels['quicksearch']  = 'स्फुर्ति खोज';
+$labels['resetsearch']  = 'पन: खोज';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'तुरुन्तै मेल पठाउनुहोस';
+$labels['savemessage']    = 'ड्राफ्ट जोगाउनुहोस';
+$labels['addattachment']  = 'फाइल टाँस्नुहोस';
+$labels['charset']        = 'क्यारेक्टर सेट';
+$labels['editortype']     = 'सम्पादकको प्रकार';
+$labels['returnreceipt']  = 'फिर्ति रसीद';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'हिज्जे जाँच';
 $labels['resumeediting'] = 'पुन: सम्पादन गर्नुहोस';
-$labels['revertto'] = 'पहिलेको स्थितीमा जानुहोस';
+$labels['revertto']      = 'पहिलेको स्थितीमा जानुहोस';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'टाँसिएका फाईलहरु';
 $labels['upload'] = 'अपलोड';
-$labels['close'] = 'बन्द';
-$labels['low'] = 'कम';
-$labels['lowest'] = 'सबै भन्दा कम';
-$labels['normal'] = 'साधारण';
-$labels['high'] = 'उच्च';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'बन्द';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'कम';
+$labels['lowest']  = 'सबै भन्दा कम';
+$labels['normal']  = 'साधारण';
+$labels['high']    = 'उच्च';
 $labels['highest'] = 'उच्चतम';
-$labels['nosubject'] = '(बिना विषयको)';
+
+$labels['nosubject']  = '(बिना विषयको)';
 $labels['showimages'] = 'चित्र देखाउनुहोस';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
 $labels['plaintoggle'] = 'सादा अक्षर';
-$labels['name'] = 'देखाउने नाम';
-$labels['firstname'] = 'पहिलो नाम';
-$labels['surname'] = 'थर';
-$labels['email'] = 'ई-मेल';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'देखाउने नाम';
+$labels['firstname']    = 'पहिलो नाम';
+$labels['surname']      = 'थर';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'ई-मेल';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नया सम्पर्क जोड्नुहोस';
 $labels['editcontact'] = 'सम्पर्क सच्याउनुहोस';
-$labels['edit'] = 'सच्याउनुहोस';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'सच्याउनुहोस';
 $labels['cancel'] = 'खारेज गर्नुहोस';
-$labels['save'] = 'जोगाउनुहोस';
+$labels['save']   = 'जोगाउनुहोस';
 $labels['delete'] = 'मेटाउनुहोस';
-$labels['newcontact'] = 'नया सम्पर्क कार्ड बनाउनुहोस';
-$labels['deletecontact'] = 'छानिएका सम्पर्कहरु मेटाउनुहोस';
-$labels['composeto'] = 'मेल लेखी पठाउनुहोस';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'नया सम्पर्क कार्ड बनाउनुहोस';
+$labels['deletecontact']  = 'छानिएका सम्पर्कहरु मेटाउनुहोस';
+$labels['composeto']      = 'मेल लेखी पठाउनुहोस';
 $labels['contactsfromto'] = 'सम्पर्कहरु $from बाट $to सम्म, $count मध्यबाट';
-$labels['print'] = 'छाप्नुहोस';
-$labels['export'] = 'ऐक्स्पोर्ट गर्नुहोस';
-$labels['previouspage'] = 'पहिलेको सेट देखाउनुहोस';
-$labels['firstpage'] = 'पहिलो सेट देखाउनुहोस';
-$labels['nextpage'] = 'अर्को सेट देखाउनुहोस';
-$labels['lastpage'] = 'अन्तिम सेट देखाउनुहोस';
+$labels['print']          = 'छाप्नुहोस';
+$labels['export']         = 'ऐक्स्पोर्ट गर्नुहोस';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'पहिलेको सेट देखाउनुहोस';
+$labels['firstpage']      = 'पहिलो सेट देखाउनुहोस';
+$labels['nextpage']       = 'अर्को सेट देखाउनुहोस';
+$labels['lastpage']       = 'अन्तिम सेट देखाउनुहोस';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'समूहहरु';
 $labels['personaladrbook'] = 'व्यक्तिगत ठेगानाहरु';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'तय';
+$labels['about'] = 'About';
 $labels['preferences'] = 'रोजाइहरु';
 $labels['userpreferences'] = 'यूसरका रोजाइहरु';
 $labels['editpreferences'] = 'यूसरका रोजाइहर सम्पादन गर्नुहोस';
+
 $labels['identities'] = 'पहिचानहरु';
 $labels['manageidentities'] = 'यो खाताको पहिचानहरको व्यवस्था गर्नुहोस';
 $labels['newidentity'] = 'नया पहिचान';
+
 $labels['newitem'] = 'नया प्रकार';
 $labels['edititem'] = 'प्रकार सम्पादन गर्नुहोस';
+
 $labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) देखाउनुहोस';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूपका मेल';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'सुन्दर तारिख';
-$labels['setdefault'] = 'तय गर्नुहोस';
-$labels['language'] = 'भाषा';
-$labels['timezone'] = 'समय क्षेत्र';
-$labels['pagesize'] = 'हरेक पन्नामा यति';
+$labels['setdefault']  = 'तय गर्नुहोस';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'भाषा';
+$labels['timezone']  = 'समय क्षेत्र';
+$labels['pagesize']  = 'हरेक पन्नामा यति';
 $labels['signature'] = 'हस्ताक्षर';
-$labels['dstactive'] = 'प्रकाश बचाव';
+$labels['dstactive']  = 'प्रकाश बचाव';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'ऐच-टी-ऐम-एल (HTML) मेल लखन गर्नुहोस';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) हस्ताक्षर';
 $labels['previewpane'] = 'पूर्व दृष्य देखाउनुहोस';
-$labels['autosavedraft'] = 'स्वत ड्राफ्ट जोगाउनुहोस';
-$labels['never'] = 'काहिलै नहुने';
-$labels['folder'] = 'फोल्डर';
-$labels['foldername'] = 'फोल्डरको नाम';
-$labels['subscribed'] = 'सबस्क्राईब गरियो';
-$labels['create'] = 'बनाउनुहोस';
-$labels['createfolder'] = 'नया फोलडर बनाउनुहोस';
-$labels['managefolders'] = 'फोलडर व्यवस्थित गर्नुहोस';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'स्वत ड्राफ्ट जोगाउनुहोस';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'काहिलै नहुने';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'फोल्डर';
+$labels['folders']  = 'फोल्डरहरु';
+$labels['foldername']  = 'फोल्डरको नाम';
+$labels['subscribed']  = 'सबस्क्राईब गरियो';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'बनाउनुहोस';
+$labels['createfolder']  = 'नया फोलडर बनाउनुहोस';
+$labels['managefolders']  = 'फोलडर व्यवस्थित गर्नुहोस';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'यसरी तय गर्नुहोस';
-$labels['sortasc'] = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';
+$labels['sortasc']  = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';
 $labels['sortdesc'] = 'अन्तिम देखि पहिलो सम्म तय गर्नुहोस';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index e61759363..0c764ba8a 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ne_NP/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'लागईन हुन पाएन';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'लागईन हुन पाएन';
 $messages['cookiesdisabled'] = 'तपाईको ब्राऊसरले कुकी स्वीकार गारिरहेको छैन';
 $messages['sessionerror'] = 'सत्र समाप्त वा अवैद्य';
 $messages['storageerror'] = 'सर्वर संग सम्पर्क हुन पाएन';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'यो मेलबक्स मा कुनै मेल छैन';
 $messages['loggedout'] = 'सत्र समाप्त । नमास्कार!';
 $messages['mailboxempty'] = 'मेल बक्स खाली छ';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'लोड भईरहेको छ...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'डाटा लोड भईरहेको छै...';
 $messages['checkingmail'] = 'नया मेलको खोजी भईरहेको छ...';
 $messages['sendingmessage'] = 'मेल पठाईदै रहेको छ...';
@@ -32,34 +46,54 @@ $messages['messagesaved'] = 'मेल ड्राफ्ट फोल्डर�
 $messages['successfullysaved'] = 'सफल्तापूर्वक जोगाईयो';
 $messages['addedsuccessfully'] = 'सम्पर्क पुस्तिकामा सफल्तापूर्वक सम्पर्क प्रविष्ट गारियो';
 $messages['contactexists'] = 'यो ई-मेल पहिलै लिईसकिएको छ';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'तपाईको प्राईवेसी को लागि तथा अन्य स्पामबाट बच्नकोलागि यो मेलमा चित्रहुरु देखाईएका छैनन्।';
 $messages['encryptedmessage'] = 'माफ गर्नुहोसे, यो मेल ईन्क्रिफ्ट गरिएको रूपमा छ, त्यसैले देखाउन सकिदैन!';
 $messages['nocontactsfound'] = 'कुनै सम्पर्क भेटिएन';
 $messages['contactnotfound'] = 'अनुरोध गारिएको सम्पर्क भेटिएन';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'मेल पठाउन सकिएन';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'जोगाउदा-जोगाउदै गडबड भायो';
 $messages['errormoving'] = 'मेल सार्न सकिएन';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'मेल मेटाउन सकिएन';
-$messages['deletecontactconfirm'] = 'तापाईले छान्नुभएको सम्पर्कहरु, साँचै मेट्न चहानुहुन्छ?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'तापाईले छान्नुभएको सम्पर्कहरु, साँचै मेट्न चहानुहुन्छ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'तापाईले छान्नु भएको मेलहरु, साँचै मेट्न चहानुहुन्छ?';
-$messages['deletefolderconfirm'] = 'तापाईले साँचै यो फोल्डर मेट्न चहानु हुन्छ?';
-$messages['purgefolderconfirm'] = 'तापाईले साँचै यो फोल्डरमा भएका सबै मेलहरु मेट्न चहानुहुन्छ?';
+$messages['deletefolderconfirm']  = 'तापाईले साँचै यो फोल्डर मेट्न चहानु हुन्छ?';
+$messages['purgefolderconfirm']  = 'तापाईले साँचै यो फोल्डरमा भएका सबै मेलहरु मेट्न चहानुहुन्छ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फर्म पूर्ण रुपमा भरिएको छैन';
 $messages['noemailwarning'] = 'कृपया वैद्य ई-मेल भर्नुहोस';
-$messages['nonamewarning'] = 'कृपया नाम भर्नुहोस';
+$messages['nonamewarning']  = 'कृपया नाम भर्नुहोस';
 $messages['nopagesizewarning'] = 'कृपया पन्नाको नाप भर्नुहोस';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कृपया कम-से-कम एउटा प्रापकको विवरण भर्नुहोस';
-$messages['nosubjectwarning'] = 'मेलको कुनै विषय तोकिएको छैनै। केहि तोक्न चहानुहुन्छ ?';
+$messages['nosubjectwarning']  = 'मेलको कुनै विषय तोकिएको छैनै। केहि तोक्न चहानुहुन्छ ?';
 $messages['nobodywarning'] = 'बिना केहि लेखि पठाउने?';
 $messages['notsentwarning'] = 'मेल पठएको छैन.. मेल रद्द गर्न चहानुहुन्छ?';
 $messages['noldapserver'] = 'कृपया खोजको निम्ति एउटा ऐलडाप सर्वर छान्नहोस';
 $messages['nosearchname'] = 'कृपया सम्पर्कको नाम या ई-मेल भर्नुहोस';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr मेलहरु पाइयो';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'खोज असफल रहयो';
 $messages['searching'] = 'खोजि भईरहेको छ...';
 $messages['checking'] = 'जाँच भईरहेको छ...';
 $messages['nospellerrors'] = 'कुनै गलत हिज्जे फेला परेनन्';
 $messages['folderdeleted'] = 'फोल्डर सफल्तापूर्वक मेटियो';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'सफल्तापूर्वक मेटियो';
 $messages['converting'] = 'मेलबाट फोर्माटिङ हटाईदै छ...';
 $messages['messageopenerror'] = 'सर्वरबाट मेल लोड हुन सकेन';
@@ -69,4 +103,67 @@ $messages['copysuccess'] = 'सफल्तापूर्वक $nr ठेग�
 $messages['copyerror'] = 'कुनै पनि ठेगानाहरु उतार्न सकिएन';
 $messages['sourceisreadonly'] = 'यो ठेगाना को श्रोत पढ्नको लागि मात्र उपलब्ध छ';
 $messages['errorsavingcontact'] = 'स्मपर्कको ठेगाना जोगाउन सकिएन';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 5691f025d..fd74ce4f1 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -2,56 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_BE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Welkom bij $product';
-$labels['username'] = 'Gebruikersnaam';
-$labels['password'] = 'Wachtwoord';
-$labels['server'] = 'Server';
-$labels['login'] = 'Aanmelden';
-$labels['logout'] = 'Afmelden';
-$labels['mail'] = 'Berichten';
+
+// login page
+$labels['welcome']   = 'Welkom bij $product';
+$labels['username']  = 'Gebruikersnaam';
+$labels['password']  = 'Wachtwoord';
+$labels['server']    = 'Server';
+$labels['login']     = 'Aanmelden';
+
+// taskbar
+$labels['logout']   = 'Afmelden';
+$labels['mail']     = 'Berichten';
 $labels['settings'] = 'Instellingen';
 $labels['addressbook'] = 'Contactpersonen';
-$labels['inbox'] = 'Postvak IN';
+
+// mailbox names
+$labels['inbox']  = 'Postvak IN';
 $labels['drafts'] = 'Concepten';
-$labels['sent'] = 'Verzonden berichten';
-$labels['trash'] = 'Prullenbak';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Verzonden berichten';
+$labels['trash']  = 'Prullenbak';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Onderwerp';
-$labels['from'] = 'Van';
-$labels['to'] = 'Aan';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Van';
+$labels['sender']  = 'Afzender';
+$labels['to']      = 'Aan';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Antwoorden aan';
 $labels['followupto'] = 'Followup aan';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Grootte';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Grootte';
 $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
+$labels['listoptions'] = 'Lijstopties...';
+
 $labels['mailboxlist'] = 'Mappen';
-$labels['folders'] = 'Mappen';
 $labels['messagesfromto'] = 'Berichten $from - $to van $count';
-$labels['threadsfromto'] = 'Conversatie $from - $to van $count';
+$labels['threadsfromto'] = 'Conversaties $from - $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
-$labels['copy'] = 'Kopieer';
-$labels['move'] = 'Verplaats';
-$labels['moveto'] = 'Verplaats naar...';
+$labels['fromtoshort'] = '$from - $to van $count';
+
+$labels['copy']     = 'Kopieer';
+$labels['move']     = 'Verplaats';
+$labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Downloaden';
+$labels['showattachment'] = 'Weergeven';
+$labels['showanyway'] = 'Toch weergeven';
+
 $labels['filename'] = 'Bestandsnaam';
 $labels['filesize'] = 'Bestandsgrootte';
+
 $labels['addtoaddressbook'] = 'Voeg toe aan lijst met contactpersonen';
+
+// weekdays short
 $labels['sun'] = 'Zo';
 $labels['mon'] = 'Ma';
 $labels['tue'] = 'Di';
@@ -59,69 +80,89 @@ $labels['wed'] = 'Wo';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Vr';
 $labels['sat'] = 'Za';
-$labels['sunday'] = 'Zondag';
-$labels['monday'] = 'Maandag';
-$labels['tuesday'] = 'Dinsdag';
+
+// weekdays long
+$labels['sunday']    = 'Zondag';
+$labels['monday']    = 'Maandag';
+$labels['tuesday']   = 'Dinsdag';
 $labels['wednesday'] = 'Woensdag';
-$labels['thursday'] = 'Donderdag';
-$labels['friday'] = 'Vrijdag';
-$labels['saturday'] = 'Zaterdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mrt';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'Maart';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Augustus';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Donderdag';
+$labels['friday']    = 'Vrijdag';
+$labels['saturday']  = 'Zaterdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mrt';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mei';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januari';
+$labels['longfeb']	= 'Februari';
+$labels['longmar']	= 'Maart';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mei';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'Augustus';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Vandaag';
-$labels['checkmail'] = 'Controleer op nieuwe berichten';
-$labels['compose'] = 'Nieuw bericht opstellen';
-$labels['writenewmessage'] = 'Nieuw bericht';
-$labels['replytomessage'] = 'Beantwoorden';
-$labels['replytoallmessage'] = 'Allen beantwoorden';
-$labels['replyall'] = 'Allen beantwoorden';
-$labels['replylist'] = 'Lijst beantwoorden';
-$labels['forwardmessage'] = 'Doorsturen';
-$labels['deletemessage'] = 'Dit bericht verwijderen';
+
+// toolbar buttons
+$labels['refresh']          = 'Vernieuwen';
+$labels['checkmail']        = 'Controleer op nieuwe berichten';
+$labels['compose']          = 'Nieuw bericht opstellen';
+$labels['writenewmessage']  = 'Nieuw bericht';
+$labels['reply']            = 'Beantwoorden';
+$labels['replytomessage']   = 'Beantwoorden aan afzender';
+$labels['replytoallmessage'] = 'Antwoorden naar lijst of naar afzender en alle ontvangers';
+$labels['replyall']         = 'Allen beantwoorden';
+$labels['replylist']        = 'Lijst beantwoorden';
+$labels['forward']          = 'Doorsturen';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Doorsturen als bijlage';
+$labels['forwardmessage']   = 'Bericht doorsturen';
+$labels['deletemessage']    = 'Dit bericht verwijderen';
 $labels['movemessagetotrash'] = 'Verplaats bericht naar verwijderde items';
-$labels['printmessage'] = 'Afdrukken';
-$labels['previousmessage'] = 'Vorig bericht';
-$labels['firstmessage'] = 'Eerste bericht';
-$labels['nextmessage'] = 'Volgende bericht';
-$labels['lastmessage'] = 'Laatste bericht';
-$labels['backtolist'] = 'Terug naar berichtenlijst';
-$labels['viewsource'] = 'Broncode bericht weergeven';
-$labels['markmessages'] = 'Markeer berichten';
-$labels['markread'] = 'Als gelezen';
-$labels['markunread'] = 'Als ongelezen';
-$labels['markflagged'] = 'Selecteren';
-$labels['markunflagged'] = 'Niet Selecteren';
+$labels['printmessage']     = 'Afdrukken';
+$labels['previousmessage']  = 'Vorig bericht';
+$labels['firstmessage']     = 'Eerste bericht';
+$labels['nextmessage']      = 'Volgende bericht';
+$labels['lastmessage']      = 'Laatste bericht';
+$labels['backtolist']       = 'Terug naar berichtenlijst';
+$labels['viewsource']       = 'Broncode bericht weergeven';
+$labels['mark']             = 'Markeren';
+$labels['markmessages']     = 'Markeer berichten';
+$labels['markread']         = 'Als gelezen';
+$labels['markunread']       = 'Als ongelezen';
+$labels['markflagged']      = 'Selecteren';
+$labels['markunflagged']    = 'Niet Selecteren';
+$labels['moreactions']      = 'Meer acties...';
+$labels['more']             = 'Meer';
+$labels['back']             = 'Terug';
+$labels['options']          = 'Opties';
+
 $labels['select'] = 'Selecteren';
-$labels['all'] = 'Alles';
+$labels['all'] = 'Alle';
 $labels['none'] = 'Geen';
-$labels['nonesort'] = 'Geen';
 $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
 $labels['deleted'] = 'Verwijderd';
+$labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
@@ -130,12 +171,14 @@ $labels['expand-all'] = 'Alles uitklappen';
 $labels['expand-unread'] = 'Ongelezen uitklappen';
 $labels['collapse-all'] = 'Alles inklappen';
 $labels['threaded'] = 'Conversaties';
+
 $labels['autoexpand_threads'] = 'Klap alle conversaties uit';
 $labels['do_expand'] = 'alle conversaties';
 $labels['expand_only_unread'] = 'alleen met ongelezen berichten';
 $labels['fromto'] = 'Afzender/Ontvanger';
 $labels['flag'] = 'Markeer';
 $labels['attachment'] = 'Bijlage';
+$labels['nonesort'] = 'Geen';
 $labels['sentdate'] = 'Verzenddatum';
 $labels['arrival'] = 'Ontvangstdatum';
 $labels['asc'] = 'oplopend';
@@ -144,110 +187,216 @@ $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteerkolom';
 $labels['listorder'] = 'Sorteervolgorde';
 $labels['listmode'] = 'Lijstweergave mode';
+
 $labels['folderactions'] = 'Acties voor map...';
 $labels['compact'] = 'Comprimeren';
 $labels['empty'] = 'Legen';
+
 $labels['quota'] = 'Gebruikte schijfruimte';
-$labels['unknown'] = 'onbekend';
-$labels['unlimited'] = 'ongelimiteerd';
-$labels['quicksearch'] = 'Snelzoeken';
-$labels['resetsearch'] = 'Zoek opnieuw';
-$labels['searchmod'] = 'Zoekopties';
-$labels['msgtext'] = 'Volledig bericht';
+$labels['unknown']  = 'onbekend';
+$labels['unlimited']  = 'onbeperkt';
+
+$labels['quicksearch']  = 'Snelzoeken';
+$labels['resetsearch']  = 'Zoek opnieuw';
+$labels['searchmod']  = 'Zoekopties';
+$labels['msgtext']  = 'Volledig bericht';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['editasnew'] = 'Als nieuw bewerken';
-$labels['sendmessage'] = 'Verzenden';
-$labels['savemessage'] = 'Bewaar als concept';
-$labels['addattachment'] = 'Bestand toevoegen als bijlage';
-$labels['charset'] = 'Karakterset';
-$labels['editortype'] = 'Opmaak';
-$labels['returnreceipt'] = 'Ontvangstbevestiging';
-$labels['dsn'] = 'Delivery Status Notification';
-$labels['editidents'] = 'Bewerk identiteiten';
+
+// message compose
+$labels['editasnew']      = 'Als nieuw bewerken';
+$labels['send']           = 'Verzenden';
+$labels['sendmessage']    = 'Bericht verzenden';
+$labels['savemessage']    = 'Bewaar als concept';
+$labels['addattachment']  = 'Bestand toevoegen als bijlage';
+$labels['charset']        = 'Karakterset';
+$labels['editortype']     = 'Opmaak';
+$labels['returnreceipt']  = 'Ontvangstbevestiging';
+$labels['dsn']            = 'Delivery Status Notification';
+$labels['mailreplyintro'] = 'Op $date, schreef $sender:';
+$labels['originalmessage'] = 'Orgineel bericht';
+
+$labels['editidents']    = 'Bewerk identiteiten';
+$labels['spellcheck']    = 'Spellen';
 $labels['checkspelling'] = 'Controleer spelling';
 $labels['resumeediting'] = 'Hervat bewerken';
-$labels['revertto'] = 'Ongedaan maken';
+$labels['revertto']      = 'Ongedaan maken';
+
+$labels['attach'] = 'Bijvoegen';
 $labels['attachments'] = 'Bijlagen';
-$labels['upload'] = 'Toevoegen';
-$labels['close'] = 'Sluiten';
-$labels['messageoptions'] = 'Opties voor bericht...';
-$labels['low'] = 'Laag';
-$labels['lowest'] = 'Laagste';
-$labels['normal'] = 'Normaal';
-$labels['high'] = 'Hoog';
+$labels['upload'] = 'Uploaden';
+$labels['uploadprogress'] = '$percent ($current van $total)';
+$labels['close']  = 'Sluiten';
+$labels['messageoptions']  = 'Opties voor bericht...';
+
+$labels['low']     = 'Laag';
+$labels['lowest']  = 'Laagste';
+$labels['normal']  = 'Normaal';
+$labels['high']    = 'Hoog';
 $labels['highest'] = 'Hoogste';
-$labels['nosubject'] = '(geen onderwerp)';
+
+$labels['nosubject']  = '(geen onderwerp)';
 $labels['showimages'] = 'Toon afbeeldingen';
 $labels['alwaysshow'] = 'Afbeeldingen van $sender altijd tonen';
+$labels['isdraft']    = 'Dit is een concept bericht.';
+$labels['andnmore']   = '$nr meer...';
+$labels['togglemoreheaders'] = 'Toon meer berichthoofden';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Platte tekst';
 $labels['savesentmessagein'] = 'Bewaar verzonden bericht in';
 $labels['dontsave'] = 'niet bewaren';
 $labels['maxuploadsize'] = 'Maximum toegestane bestandsgrootte is $size';
+
 $labels['addcc'] = 'Cc toevoegen';
 $labels['addbcc'] = 'Bcc toevoegen';
 $labels['addreplyto'] = 'Antwoorden aan toevoegen';
 $labels['addfollowupto'] = 'Followup aan toevoegen';
+
+// mdn
 $labels['mdnrequest'] = 'De afzender heeft een ontvangstbevestiging gevraagd. Wilt u deze versturen?';
 $labels['receiptread'] = 'Ontvangstbevestiging (gelezen)';
 $labels['yourmessage'] = 'Dir is een onvangstbevestiging voor uw bericht';
 $labels['receiptnote'] = 'Opmerking: deze ontvangstbevestiging houdt enkel in dat het bericht was weergegeven bij de ontvanger. Er is geen garantie dat de ontvanger het bericht daadwerkelijk heeft gelezen en/of begrepen.';
-$labels['name'] = 'Naam';
-$labels['firstname'] = 'Voornaam';
-$labels['surname'] = 'Achternaam';
-$labels['email'] = 'E-mailadres';
+
+// address boook
+$labels['name']         = 'Naam';
+$labels['firstname']    = 'Voornaam';
+$labels['surname']      = 'Achternaam';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'E-mailadres';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Geselecteerde contactpersoon toevoegen';
 $labels['editcontact'] = 'Contactpersoon bewerken';
 $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Eigenschappen van contactpersoon';
-$labels['edit'] = 'Bewerken';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Bewerken';
 $labels['cancel'] = 'Annuleren';
-$labels['save'] = 'Opslaan';
+$labels['save']   = 'Opslaan';
 $labels['delete'] = 'Verwijderen';
 $labels['rename'] = 'Hernoemen';
-$labels['newcontact'] = 'Contactpersoon toevoegen';
-$labels['deletecontact'] = 'Verwijder geselecteerde contactpersonen';
-$labels['composeto'] = 'Mail sturen aan';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Contactpersoon toevoegen';
+$labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
+$labels['composeto']      = 'Mail sturen aan';
 $labels['contactsfromto'] = 'Contactpersonen $from - $to van $count';
-$labels['print'] = 'Afdrukken';
-$labels['export'] = 'Exporteren';
-$labels['exportvcards'] = 'Exporteer contactpersonen in vCard formaat';
+$labels['print']          = 'Afdrukken';
+$labels['export']         = 'Exporteren';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exporteer contactpersonen in vCard formaat';
 $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
-$labels['previouspage'] = 'Toon vorige';
-$labels['firstpage'] = 'Toon eerste';
-$labels['nextpage'] = 'Toon volgende';
-$labels['lastpage'] = 'Toon laatste';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Toon vorige';
+$labels['firstpage']      = 'Toon eerste';
+$labels['nextpage']       = 'Toon volgende';
+$labels['lastpage']       = 'Toon laatste';
+
 $labels['group'] = 'Groep';
 $labels['groups'] = 'Groepen';
 $labels['personaladrbook'] = 'Personlijke adressen';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Importeer';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Vervang het complete adresboek';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Klaar';
+
+// settings
 $labels['settingsfor'] = 'Instellingen voor';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Voorkeuren';
 $labels['userpreferences'] = 'Gebruikersvoorkeuren';
 $labels['editpreferences'] = 'Gebruikersvoorkeuren bewerken';
+
 $labels['identities'] = 'Identiteiten';
 $labels['manageidentities'] = 'Beheer de identiteiten voor deze gebruiker';
 $labels['newidentity'] = 'Nieuwe identiteit';
+
 $labels['newitem'] = 'Nieuw';
 $labels['edititem'] = 'Bewerken';
+
 $labels['preferhtml'] = 'Gebruik HTML-opmaak';
 $labels['defaultcharset'] = 'Standaard karakterset';
 $labels['htmlmessage'] = 'HTML-bericht';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Uitgebreide datumweergave';
-$labels['setdefault'] = 'Als standaard instellen';
-$labels['autodetect'] = 'Automatisch';
-$labels['language'] = 'Taal';
-$labels['timezone'] = 'Tijdzone';
-$labels['pagesize'] = 'Berichten per pagina';
+$labels['setdefault']  = 'Als standaard instellen';
+$labels['autodetect']  = 'Automatisch';
+$labels['language']  = 'Taal';
+$labels['timezone']  = 'Tijdzone';
+$labels['pagesize']  = 'Berichten per pagina';
 $labels['signature'] = 'Handtekening';
-$labels['dstactive'] = 'Zomer/wintertijd';
+$labels['dstactive']  = 'Zomer/wintertijd';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML berichten opmaken';
 $labels['htmlonreply'] = 'enkel bij beantwoorden van een HTML bericht';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML handtekening';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Opmaakprofiel';
@@ -266,14 +415,16 @@ $labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
 $labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Geef externe toegevoegde berichten weer';
 $labels['fromknownsenders'] = 'Van bekende afzenders';
 $labels['always'] = 'altijd';
 $labels['showinlineimages'] = 'Toon bijgevoegde afbeeldingen onder het bericht';
-$labels['autosavedraft'] = 'Automatisch als concept opslaan';
-$labels['everynminutes'] = 'elke $n minuten';
-$labels['never'] = 'nooit';
-$labels['immediately'] = 'onmiddellijk';
+$labels['autosavedraft']  = 'Automatisch als concept opslaan';
+$labels['everynminutes']  = 'elke $n minuten';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nooit';
+$labels['immediately']  = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichten weergave';
 $labels['messagescomposition'] = 'Berichten aanmaken';
 $labels['mimeparamfolding'] = 'Namen van bijlagen';
@@ -285,12 +436,15 @@ $labels['advancedoptions'] = 'Geavanceerde opties';
 $labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
 $labels['checkallfolders'] = 'Controleer alle mappen op nieuwe berichten';
 $labels['displaynext'] = 'Na verplaatsen/verwijderen het volgende bericht tonen';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Hoofdopties';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Sectie';
 $labels['maintenance'] = 'Onderhoud';
 $labels['newmessage'] = 'Nieuw bericht';
 $labels['signatureoptions'] = 'Opties voor handtekening';
 $labels['whenreplying'] = 'Bij beantwoorden';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'begin bericht boven het origineel';
 $labels['replybottomposting'] = 'begin bericht onder het origineel';
 $labels['replyremovesignature'] = 'Verwijder handtekening uit het origneel bij beantwoorden';
@@ -301,18 +455,33 @@ $labels['replysignaturepos'] = 'Ondertekening plaatsen bij beantwoorden of doors
 $labels['belowquote'] = 'onder het citaat';
 $labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Handtekening invoegen';
-$labels['previewpanemarkread'] = 'Markeer voorbeeldbericht als gelezen';
-$labels['afternseconds'] = 'Na $n seconden';
+$labels['previewpanemarkread']  = 'Markeer voorbeeldbericht als gelezen';
+$labels['afternseconds']  = 'Na $n seconden';
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd een Delivery Status Notification';
 $labels['replysamefolder'] = 'Plaats antwoorden in de map van het beantwoorde bericht';
-$labels['folder'] = 'Map';
-$labels['foldername'] = 'Naam';
-$labels['subscribed'] = 'Geabonneerd';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Map';
+$labels['folders']  = 'Mappen';
+$labels['foldername']  = 'Naam';
+$labels['subscribed']  = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
-$labels['create'] = 'Aanmaken';
-$labels['createfolder'] = 'Nieuwe map aanmaken';
-$labels['managefolders'] = 'Mappen beheren';
+$labels['create']  = 'Aanmaken';
+$labels['createfolder']  = 'Nieuwe map aanmaken';
+$labels['managefolders']  = 'Mappen beheren';
 $labels['specialfolders'] = 'Speciale mappen';
 $labels['properties'] = 'Eigenschappen';
 $labels['folderproperties'] = 'Eigenschappen van map';
@@ -321,13 +490,30 @@ $labels['location'] = 'Locatie';
 $labels['info'] = 'Informatie';
 $labels['getfoldersize'] = 'Klik voor de grootte van de map';
 $labels['changesubscription'] = 'Klik voor abonnement te wijzigen';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Sorteren op';
-$labels['sortasc'] = 'Oplopend sorteren';
+$labels['sortasc']  = 'Oplopend sorteren';
 $labels['sortdesc'] = 'Aflopend sorteren';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engels';
 $labels['westerneuropean'] = 'West-Europees';
@@ -347,3 +533,4 @@ $labels['japanese'] = 'Japans';
 $labels['korean'] = 'Koreaans';
 $labels['chinese'] = 'Chinees';
 
+?>
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index d0d705392..7e61c97c8 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_BE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Aanmelden mislukt...';
+$messages['errortitle']  = 'Er is een fout opgetreden!';
+$messages['loginfailed']  = 'Aanmelden mislukt...';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies...';
 $messages['sessionerror'] = 'Sessie is reeds beëindigd of is ongeldig...';
 $messages['storageerror'] = 'Kon geen verbinding maken met de IMAP server...';
 $messages['servererror'] = 'Server fout!';
 $messages['servererrormsg'] = 'Server fout: $msg';
 $messages['dberror'] = 'Database Fout!';
-$messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen';
-$messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd';
+$messages['requesttimedout'] = 'Aanvraag verlopen';
+$messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen.';
+$messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
+$messages['invalidhost'] = 'Ongeldige server.';
 $messages['nomessagesfound'] = 'Er zijn geen berichten in deze map...';
 $messages['loggedout'] = 'U bent nu afgemeld. Tot ziens!';
 $messages['mailboxempty'] = 'Mailbox is leeg...';
+$messages['refreshing'] = 'Bezig met vernieuwen...';
 $messages['loading'] = 'Bezig met ophalen gegevens...';
 $messages['uploading'] = 'Bezig met uploaden...';
 $messages['uploadingmany'] = 'Bestanden worden geüpload...';
@@ -36,67 +42,67 @@ $messages['checkingmail'] = 'Controleer op nieuwe berichten...';
 $messages['sendingmessage'] = 'Bericht wordt verstuurd...';
 $messages['messagesent'] = 'Het bericht is verzonden...';
 $messages['savingmessage'] = 'Bericht wordt bewaard...';
-$messages['messagesaved'] = 'Bericht bewaard in Concepten';
+$messages['messagesaved'] = 'Bericht bewaard in Concepten.';
 $messages['successfullysaved'] = 'Succesvol opgeslagen...';
 $messages['addedsuccessfully'] = 'Contactpersoon is toegevoegd...';
 $messages['contactexists'] = 'Er bestaat reeds een contactpersoon met dit e-mailadres...';
 $messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.';
-$messages['blockedimages'] = 'Om uw privacy te beschermen worden de afbeeldingen in dit bericht niet getoond...';
-$messages['encryptedmessage'] = 'Dit bericht is geëncrypteerd en kan niet worden weergegeven, sorry...';
+$messages['blockedimages'] = 'Om uw privacy te beschermen worden de afbeeldingen in dit bericht niet getoond.';
+$messages['encryptedmessage'] = 'Dit bericht is geëncrypteerd en kan niet worden weergegeven, sorry!';
 $messages['nocontactsfound'] = 'Geen contactpersonen gevonden...';
-$messages['contactnotfound'] = 'De gevraagde contactpersoon was niet gevonden';
+$messages['contactnotfound'] = 'De gevraagde contactpersoon was niet gevonden.';
 $messages['contactsearchonly'] = 'Voer enkele zoektermen in om de contactpersonen te zoeken.';
 $messages['sendingfailed'] = 'Kon het bericht niet versturen...';
-$messages['senttooquickly'] = 'U moet $sec seconden wachten om het bericht te versturen.';
-$messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht';
+$messages['senttooquickly'] = 'U moet $sec second(en) wachten om het bericht te versturen.';
+$messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht.';
 $messages['errorsaving'] = 'Er is een fout opgetreden bij het opslaan van het bericht...';
 $messages['errormoving'] = 'Kon de bericht(en) niet verplaatsen...';
 $messages['errorcopying'] = 'Kon de bericht(en) niet kopiëren';
 $messages['errordeleting'] = 'Kon de bericht(en) niet verwijderen...';
 $messages['errormarking'] = 'Kon de bericht(en) niet markeren...';
-$messages['deletecontactconfirm'] = 'Bent u zeker dat u de geselecteerde contactpers(o)on(en) wilt verwijderen?';
-$messages['deletegroupconfirm'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
+$messages['deletecontactconfirm']  = 'Bent u zeker dat u de geselecteerde contactpers(o)on(en) wilt verwijderen?';
+$messages['deletegroupconfirm']  = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
 $messages['deletemessagesconfirm'] = 'Bent u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
-$messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
-$messages['purgefolderconfirm'] = 'Bent u zeker dat u alle berichten in deze map wilt verwijderen?';
+$messages['deletefolderconfirm']  = 'Weet u zeker dat u deze map wilt verwijderen?';
+$messages['purgefolderconfirm']  = 'Bent u zeker dat u alle berichten in deze map wilt verwijderen?';
 $messages['contactdeleting'] = 'Bezig met verwijderen één of meer contactpersonen...';
 $messages['groupdeleting'] = 'Groep wordt verwijderd...';
 $messages['folderdeleting'] = 'Map verwijderen...';
 $messages['foldermoving'] = 'Map verplaatsen...';
 $messages['foldersubscribing'] = 'Bezig met abonneren op map...';
 $messages['folderunsubscribing'] = 'Abonnement op map wordt opgezegd...';
-$messages['formincomplete'] = 'Het formulier is niet volledig ingevuld...';
-$messages['noemailwarning'] = 'Geef een geldig e-mailadres op...';
-$messages['nonamewarning'] = 'Geef een naam op...';
-$messages['nopagesizewarning'] = 'Geef een geldig aantal berichten per pagina op...';
-$messages['nosenderwarning'] = 'Geef een e-mailadres van de afzender op';
-$messages['norecipientwarning'] = 'Geef minstens één bestemmeling op...';
-$messages['nosubjectwarning'] = 'Geen onderwerp opgegeven. Wenst u alsnog een onderwerp te geven?';
+$messages['formincomplete'] = 'Het formulier is niet volledig ingevuld.';
+$messages['noemailwarning'] = 'Geef een geldig e-mailadres op.';
+$messages['nonamewarning']  = 'Geef een naam op.';
+$messages['nopagesizewarning'] = 'Geef een geldig aantal berichten per pagina op.';
+$messages['nosenderwarning'] = 'Geef een e-mailadres van de afzender 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['notsentwarning'] = 'Het bericht is niet verzonden. Wilt u het bericht verwijderen?';
-$messages['noldapserver'] = 'Kies een LDAP server waarop gezocht moet worden...';
-$messages['nosearchname'] = 'Geen een contacpersoon of e-mailadres op...';
+$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';
+$messages['searchsuccessful'] = '$nr berichten gevonden.';
 $messages['contactsearchsuccessful'] = '$nr contactpersonen gevonden.';
-$messages['searchnomatch'] = 'Zoekopdracht leverde geen resultaten';
+$messages['searchnomatch'] = 'Zoekopdracht leverde geen resultaten.';
 $messages['searching'] = 'Bezig met zoeken...';
 $messages['checking'] = 'Bezig met controleren...';
-$messages['nospellerrors'] = 'Geen spelfouten gevonden';
-$messages['folderdeleted'] = 'Map met succes verwijderd';
+$messages['nospellerrors'] = 'Geen spelfouten gevonden.';
+$messages['folderdeleted'] = 'Map met succes verwijderd.';
 $messages['foldersubscribed'] = 'Folder succesvol geabonneerd.';
 $messages['folderunsubscribed'] = 'Folder succesvol uitgeschreven.';
 $messages['folderpurged'] = 'Folder met succes geleegd.';
-$messages['folderexpunged'] = 'Map met succes geleegd';
-$messages['deletedsuccessfully'] = 'Succesvol verwijderd';
+$messages['folderexpunged'] = 'Map met succes geleegd.';
+$messages['deletedsuccessfully'] = 'Succesvol verwijderd.';
 $messages['converting'] = 'Opmaak van het bericht wordt gewist...';
-$messages['messageopenerror'] = 'Kon het bericht niet ophalen van de server';
-$messages['fileuploaderror'] = 'Bestandupload mislukt';
-$messages['filesizeerror'] = 'Het bestand overschrijdt de maximum grootte van $size';
-$messages['copysuccess'] = '$nr adressen met succes gekopieerd';
-$messages['copyerror'] = 'Kon de adressen niet kopiëren';
-$messages['sourceisreadonly'] = 'Het adres kan niet worden opgeslagen';
-$messages['errorsavingcontact'] = 'Kon de contactpersoon niet bewaren';
+$messages['messageopenerror'] = 'Kon het bericht niet ophalen van de server.';
+$messages['fileuploaderror'] = 'Bestandsupload mislukt.';
+$messages['filesizeerror'] = 'Het bestand overschrijdt de maximum grootte van $size.';
+$messages['copysuccess'] = '$nr adressen met succes gekopieerd.';
+$messages['copyerror'] = 'Kon de adressen niet kopiëren.';
+$messages['sourceisreadonly'] = 'Het adres kan niet worden opgeslagen.';
+$messages['errorsavingcontact'] = 'Kon de contactpersoon niet bewaren.';
 $messages['movingmessage'] = 'Bericht wordt verplaatst...';
 $messages['copyingmessage'] = 'Bericht wordt gekopieerd...';
 $messages['copyingcontact'] = 'Kopiëren contactpersonen...';
@@ -104,55 +110,60 @@ $messages['deletingmessage'] = 'Bericht wordt verwijderd...';
 $messages['markingmessage'] = 'Bericht wordt gemarkeerd...';
 $messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
 $messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
-$messages['receiptsent'] = 'Ontvangstbevestiging verstuurd';
-$messages['errorsendingreceipt'] = 'Kon de ontvangstbevestigign niet versturen';
+$messages['receiptsent'] = 'Ontvangstbevestiging verstuurd.';
+$messages['errorsendingreceipt'] = 'Kon de ontvangstbevestigign niet versturen.';
+$messages['deleteidentityconfirm'] = 'Bent u zeker dat u deze identiteit wilt verwijderen?';
 $messages['nodeletelastidentity'] = 'U kunt dit laatste afzendadres niet verwijderen.';
-$messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan';
-$messages['selectimportfile'] = 'Selecteer een bestand om te uploaden';
-$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen-lezen';
-$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan de groep';
-$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de groep';
-$messages['importwait'] = 'Importeren, even geduld...';
-$messages['importerror'] = 'Importeren mislukt! Het verstuurde bestand is geen geldig vCard bestand.';
-$messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd, en $skipped bestaande overgeslagen</b>:<p><em>$names</em></p>';
+$messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan.';
+$messages['selectimportfile'] = 'Selecteer een bestand om te uploaden.';
+$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen-lezen.';
+$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan de groep.';
+$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de groep.';
+$messages['nogroupassignmentschanged'] = 'Geen groepslidmaatschap gewijzigd.';
+$messages['importwait'] = 'Bezig met importeren, even geduld...';
+$messages['importformaterror'] = 'Importeren mislukt! Het geüploade bestand is geen importeerbaar bestand.';
+$messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
 $messages['opnotpermitted'] = 'Deze actie is niet toegestaan!';
-$messages['nofromaddress'] = 'Er is geen e-mailadres in de geselecteerde identiteit';
-$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet je zeker dat je verder wil gaan?';
+$messages['nofromaddress'] = 'De geselecteerde identiteit bevat geen emailadres.';
+$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
 $messages['httpreceivedencrypterror'] = 'Er is een fatale fout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
-$messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt';
-$messages['smtpautherror'] = 'SMTP Fout ($code): Authenticatie mislukt';
-$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg)';
-$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken';
+$messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt.';
+$messages['smtpautherror'] = 'SMTP Fout ($code): Authenticatie mislukt.';
+$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg).';
+$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken.';
 $messages['smtperror'] = 'SMTP Fout: $msg';
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
-$messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max';
-$messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max';
-$messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals';
-$messages['contactdelerror'] = 'Kon contactpersoon niet verwijderen';
-$messages['contactdeleted'] = 'Contactpersoon succesvol verwijderd';
-$messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden';
+$messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max.';
+$messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max.';
+$messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals.';
+$messages['contactdelerror'] = 'Kon contactpersoon niet verwijderen.';
+$messages['contactdeleted'] = 'Contactpersoon succesvol verwijderd.';
+$messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden.';
 $messages['contactrestored'] = 'Contactpersonen succesvol hersteld.';
-$messages['groupdeleted'] = 'Groep succesvol verwijderd';
-$messages['grouprenamed'] = 'Groep succesvol hernoemd';
-$messages['groupcreated'] = 'Groep succesvol aangemaakt';
+$messages['groupdeleted'] = 'Groep succesvol verwijderd.';
+$messages['grouprenamed'] = 'Groep succesvol hernoemd.';
+$messages['groupcreated'] = 'Groep succesvol aangemaakt.';
 $messages['savedsearchdeleted'] = 'Opgeslagen zoekopdracht successvol verwijderd.';
 $messages['savedsearchdeleteerror'] = 'Opgeslagen zoekopdracht kon niet worden verwijderd.';
 $messages['savedsearchcreated'] = 'Zoekopdracht successvol opgeslagen.';
 $messages['savedsearchcreateerror'] = 'Zoekopdracht kon niet worden opgeslagen.';
-$messages['messagedeleted'] = 'Bericht(en) succesvol verwijderd';
-$messages['messagemoved'] = 'Bericht(en) succesvol verplaatst';
-$messages['messagecopied'] = 'Bericht(en) succesvol gekopieerd';
-$messages['messagemarked'] = 'Bericht(en) succesvol gemarkeerd';
-$messages['autocompletechars'] = 'Geef ten minste $min karakters voor auto aanvullen';
+$messages['messagedeleted'] = 'Bericht(en) succesvol verwijderd.';
+$messages['messagemoved'] = 'Bericht(en) succesvol verplaatst.';
+$messages['messagecopied'] = 'Bericht(en) succesvol gekopieerd.';
+$messages['messagemarked'] = 'Bericht(en) succesvol gemarkeerd.';
+$messages['autocompletechars'] = 'Geef ten minste $min karakters voor auto-aanvullen.';
 $messages['autocompletemore'] = 'Meerdere resultaten gevonden. Verfijn uw zoekopdracht.';
-$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn';
-$messages['nametoolong'] = 'Naam is te lang';
-$messages['folderupdated'] = 'Map succesvol geüpdatet';
-$messages['foldercreated'] = 'Map succesvol aangemaakt';
-$messages['invalidimageformat'] = 'Geen geldig afbeeldingsformaat';
-$messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht';
+$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn.';
+$messages['nametoolong'] = 'Naam is te lang.';
+$messages['folderupdated'] = 'Map succesvol bijgewerkt.';
+$messages['foldercreated'] = 'Map succesvol aangemaakt.';
+$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.';
 
+?>
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 5e2b1e39d..abe96a90f 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Welkom bij $product';
-$labels['username'] = 'Gebruikersnaam';
-$labels['password'] = 'Wachtwoord';
-$labels['server'] = 'Server';
-$labels['login'] = 'Inloggen';
-$labels['logout'] = 'Uitloggen';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Welkom bij $product';
+$labels['username']  = 'Gebruikersnaam';
+$labels['password']  = 'Wachtwoord';
+$labels['server']    = 'Server';
+$labels['login']     = 'Inloggen';
+
+// taskbar
+$labels['logout']   = 'Uitloggen';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Instellingen';
 $labels['addressbook'] = 'Adresboek';
-$labels['inbox'] = 'Postvak IN';
+
+// mailbox names
+$labels['inbox']  = 'Postvak In';
 $labels['drafts'] = 'Concepten';
-$labels['sent'] = 'Verzonden';
-$labels['trash'] = 'Prullenbak';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Verzonden';
+$labels['trash']  = 'Prullenbak';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Onderwerp';
-$labels['from'] = 'Afzender';
-$labels['to'] = 'Ontvanger';
-$labels['cc'] = 'Kopie';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Afzender';
+$labels['sender']  = 'Afzender';
+$labels['to']      = 'Ontvanger';
+$labels['cc']      = 'Kopie';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Antwoord-aan';
 $labels['followupto'] = 'Followup-Aan';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Grootte';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Grootte';
 $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
 $labels['listoptions'] = 'Lijstopties...';
+
 $labels['mailboxlist'] = 'Mappen';
-$labels['folders'] = 'Mappen';
 $labels['messagesfromto'] = 'Bericht $from t/m $to van $count';
 $labels['threadsfromto'] = 'Conversatie $from t/m $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
 $labels['fromtoshort'] = '$from – $to van $count';
-$labels['copy'] = 'Kopiëren';
-$labels['move'] = 'Verplaats';
-$labels['moveto'] = 'Verplaats naar...';
+
+$labels['copy']     = 'Kopiëren';
+$labels['move']     = 'Verplaats';
+$labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Download';
 $labels['showattachment'] = 'Toon';
 $labels['showanyway'] = 'Laat toch zien';
+
 $labels['filename'] = 'Bestandsnaam';
 $labels['filesize'] = 'Bestandsgrootte';
+
 $labels['addtoaddressbook'] = 'Toevoegen aan adresboek';
+
+// weekdays short
 $labels['sun'] = 'Zo';
 $labels['mon'] = 'Ma';
 $labels['tue'] = 'Di';
@@ -63,81 +80,90 @@ $labels['wed'] = 'Wo';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Vr';
 $labels['sat'] = 'Za';
-$labels['sunday'] = 'Zondag';
-$labels['monday'] = 'Maandag';
-$labels['tuesday'] = 'Dinsdag';
-$labels['wednesday'] = 'Woensdag';
-$labels['thursday'] = 'Donderdag';
-$labels['friday'] = 'Vrijdag';
-$labels['saturday'] = 'Zaterdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mrt';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'Maart';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Augustus';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+
+// weekdays long
+$labels['sunday']    = 'zondag';
+$labels['monday']    = 'maandag';
+$labels['tuesday']   = 'dinsdag';
+$labels['wednesday'] = 'woensdag';
+$labels['thursday']  = 'donderdag';
+$labels['friday']    = 'vrijdag';
+$labels['saturday']  = 'zaterdag';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mrt';
+$labels['apr']	= 'apr';
+$labels['may']	= 'mei';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dec';
+
+// months long
+$labels['longjan']	= 'januari';
+$labels['longfeb']	= 'februari';
+$labels['longmar']	= 'maart';
+$labels['longapr']	= 'april';
+$labels['longmay']	= 'mei';
+$labels['longjun']	= 'juni';
+$labels['longjul']	= 'juli';
+$labels['longaug']	= 'augustus';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'november';
+$labels['longdec']	= 'december';
+
 $labels['today'] = 'Vandaag';
-$labels['refresh'] = 'Vernieuwen';
-$labels['checkmail'] = 'Controleer op nieuwe berichten';
-$labels['compose'] = 'Nieuw bericht aanmaken';
-$labels['writenewmessage'] = 'Maak een nieuw bericht';
-$labels['reply'] = 'Beantwoorden';
-$labels['replytomessage'] = 'Beantwoord het bericht';
+
+// toolbar buttons
+$labels['refresh']          = 'Vernieuwen';
+$labels['checkmail']        = 'Controleer op nieuwe berichten';
+$labels['compose']          = 'Opstellen';
+$labels['writenewmessage']  = 'Maak een nieuw bericht';
+$labels['reply']            = 'Beantwoorden';
+$labels['replytomessage']   = 'Beantwoord het bericht';
 $labels['replytoallmessage'] = 'Beantwoord lijst of afzender en alle ontvangers';
-$labels['replyall'] = 'Beantwoord alle ontvangers';
-$labels['replylist'] = 'Beantwoord lijst';
-$labels['forward'] = 'Doorsturen';
-$labels['forwardinline'] = 'Doorsturen in bericht';
+$labels['replyall']         = 'Beantwoord alle ontvangers';
+$labels['replylist']        = 'Beantwoord lijst';
+$labels['forward']          = 'Doorsturen';
+$labels['forwardinline']    = 'Doorsturen in bericht';
 $labels['forwardattachment'] = 'Doorsturen als bijlage';
-$labels['forwardmessage'] = 'Bericht doorsturen';
-$labels['deletemessage'] = 'Verwijder het bericht';
+$labels['forwardmessage']   = 'Bericht doorsturen';
+$labels['deletemessage']    = 'Verwijder het bericht';
 $labels['movemessagetotrash'] = 'Verplaats het bericht naar de prullenbak';
-$labels['printmessage'] = 'Dit bericht afdrukken';
-$labels['previousmessage'] = 'Toon het vorige bericht';
-$labels['firstmessage'] = 'Toon het eerste bericht';
-$labels['nextmessage'] = 'Toon het volgende bericht';
-$labels['lastmessage'] = 'Toon het laatste bericht';
-$labels['backtolist'] = 'Terug naar berichtenoverzicht';
-$labels['viewsource'] = 'Toon bron';
-$labels['mark'] = 'Markeren';
-$labels['markmessages'] = 'Markeer berichten';
-$labels['markread'] = 'Gelezen';
-$labels['markunread'] = 'Ongelezen';
-$labels['markflagged'] = 'Selecteren';
-$labels['markunflagged'] = 'Niet selecteren';
-$labels['moreactions'] = 'Meer acties';
-$labels['more'] = 'Meer';
-$labels['back'] = 'Terug';
-$labels['options'] = 'Opties';
+$labels['printmessage']     = 'Dit bericht afdrukken';
+$labels['previousmessage']  = 'Toon het vorige bericht';
+$labels['firstmessage']     = 'Toon het eerste bericht';
+$labels['nextmessage']      = 'Toon het volgende bericht';
+$labels['lastmessage']      = 'Toon het laatste bericht';
+$labels['backtolist']       = 'Terug naar berichtenoverzicht';
+$labels['viewsource']       = 'Toon bron';
+$labels['mark']             = 'Markeren';
+$labels['markmessages']     = 'Markeer berichten';
+$labels['markread']         = 'Gelezen';
+$labels['markunread']       = 'Ongelezen';
+$labels['markflagged']      = 'Gemarkeerd';
+$labels['markunflagged']    = 'Niet-gemarkeerd';
+$labels['moreactions']      = 'Meer acties...';
+$labels['more']             = 'Meer';
+$labels['back']             = 'Terug';
+$labels['options']          = 'Opties';
+
 $labels['select'] = 'Selecteer';
 $labels['all'] = 'Allemaal';
 $labels['none'] = 'Geen';
-$labels['nonesort'] = 'Geen';
 $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
-$labels['flagged'] = 'Geselecteerd';
+$labels['flagged'] = 'Gemarkeerd';
 $labels['unanswered'] = 'Onbeantwoord';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
-$labels['invert'] = 'Selectie omdraaien';
+$labels['invert'] = 'Selectie omkeren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
 $labels['threads'] = 'Conversaties';
@@ -145,191 +171,227 @@ $labels['expand-all'] = 'Alles uitklappen';
 $labels['expand-unread'] = 'Ongelezen uitklappen';
 $labels['collapse-all'] = 'Alles inklappen';
 $labels['threaded'] = 'Conversaties';
+
 $labels['autoexpand_threads'] = 'Klap alle conversaties uit';
 $labels['do_expand'] = 'alle conversaties';
 $labels['expand_only_unread'] = 'alleen met ongelezen berichten';
 $labels['fromto'] = 'Afzender/Ontvanger';
 $labels['flag'] = 'Markeer';
 $labels['attachment'] = 'Bijlage';
-$labels['sentdate'] = 'Verzend datum';
-$labels['arrival'] = 'Aankomst datum';
+$labels['nonesort'] = 'Geen';
+$labels['sentdate'] = 'Verzenddatum';
+$labels['arrival'] = 'Ontvangstdatum';
 $labels['asc'] = 'oplopend';
 $labels['desc'] = 'aflopend';
 $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteer op kolom';
 $labels['listorder'] = 'Sorteervolgorde';
-$labels['listmode'] = 'Weergavemodus';
-$labels['folderactions'] = 'Acties voor map...';
+$labels['listmode'] = 'Lijstweergave';
+
+$labels['folderactions'] = 'Mapacties...';
 $labels['compact'] = 'Opschonen';
 $labels['empty'] = 'Legen';
-$labels['quota'] = 'Mailbox quotum';
-$labels['unknown'] = 'onbekend';
-$labels['unlimited'] = 'onbeperkt';
-$labels['quicksearch'] = 'Snel zoeken';
-$labels['resetsearch'] = 'Reset zoekopdracht';
-$labels['searchmod'] = 'Zoekopties';
-$labels['msgtext'] = 'Gehele bericht';
+
+$labels['quota'] = 'Opslagverbruik';
+$labels['unknown']  = 'onbekend';
+$labels['unlimited']  = 'onbeperkt';
+
+$labels['quicksearch']  = 'Snel zoeken';
+$labels['resetsearch']  = 'Wis zoekopdracht';
+$labels['searchmod']  = 'Zoekopties';
+$labels['msgtext']  = 'Gehele bericht';
+$labels['body']  = 'Inhoud';
+
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['editasnew'] = 'Als nieuw bewerken';
-$labels['send'] = 'Verzenden';
-$labels['sendmessage'] = 'Verstuur het bericht nu';
-$labels['savemessage'] = 'Bewaar als concept';
-$labels['addattachment'] = 'Voeg een bijlage toe';
-$labels['charset'] = 'Tekenset';
-$labels['editortype'] = 'Opmaak';
-$labels['returnreceipt'] = 'Ontvangstbevestiging';
-$labels['dsn'] = 'Afleveringsbericht (DSN)';
+
+// message compose
+$labels['editasnew']      = 'Als nieuw bewerken';
+$labels['send']           = 'Verzenden';
+$labels['sendmessage']    = 'Verstuur bericht';
+$labels['savemessage']    = 'Bewaar als concept';
+$labels['addattachment']  = 'Bijlage toevoegen';
+$labels['charset']        = 'Tekenset';
+$labels['editortype']     = 'Soort tekstverwerker';
+$labels['returnreceipt']  = 'Ontvangstbevestiging';
+$labels['dsn']            = 'Afleveringsbericht (DSN)';
 $labels['mailreplyintro'] = '$sender schreef op $date:';
-$labels['originalmessage'] = 'Originele bericht';
-$labels['editidents'] = 'Bewerk identiteiten';
-$labels['spellcheck'] = 'Spelling';
+$labels['originalmessage'] = 'Oorspronkelijke bericht';
+
+$labels['editidents']    = 'Identiteiten bewerken';
+$labels['spellcheck']    = 'Spelling';
 $labels['checkspelling'] = 'Controleer spelling';
 $labels['resumeediting'] = 'Doorgaan met opstellen';
-$labels['revertto'] = 'Wijzig terug in';
+$labels['revertto']      = 'Terugwijzigen in';
+
 $labels['attach'] = 'Bijvoegen';
 $labels['attachments'] = 'Bijlagen';
 $labels['upload'] = 'Toevoegen';
 $labels['uploadprogress'] = '$percent ($current van $total)';
-$labels['close'] = 'Sluit';
-$labels['messageoptions'] = 'Acties voor bericht...';
-$labels['low'] = 'Laag';
-$labels['lowest'] = 'Laagste';
-$labels['normal'] = 'Normaal';
-$labels['high'] = 'Hoog';
+$labels['close']  = 'Sluit';
+$labels['messageoptions']  = 'Berichtopties...';
+
+$labels['low']     = 'Laag';
+$labels['lowest']  = 'Laagste';
+$labels['normal']  = 'Normaal';
+$labels['high']    = 'Hoog';
 $labels['highest'] = 'Hoogste';
-$labels['nosubject'] = '(geen onderwerp)';
+
+$labels['nosubject']  = '(geen onderwerp)';
 $labels['showimages'] = 'Toon afbeeldingen';
 $labels['alwaysshow'] = 'Afbeeldingen van $sender altijd tonen';
-$labels['isdraft'] = 'Dit is een concept.';
-$labels['andnmore'] = '$nr meer...';
+$labels['isdraft']    = 'Dit is een conceptbericht.';
+$labels['andnmore']   = '$nr meer...';
 $labels['togglemoreheaders'] = 'Toon meer berichtheaders';
 $labels['togglefullheaders'] = 'Originele berichtheaders aan/uit';
-$labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Gewone tekst';
+
+$labels['htmltoggle'] = 'Opgemaakt (HTML)';
+$labels['plaintoggle'] = 'Platte tekst';
 $labels['savesentmessagein'] = 'Bewaar verzonden bericht in';
 $labels['dontsave'] = 'niet bewaren';
 $labels['maxuploadsize'] = 'Maximum toegestane bestandsgrootte is $size';
+
 $labels['addcc'] = 'Cc toevoegen';
 $labels['addbcc'] = 'Bcc toevoegen';
 $labels['addreplyto'] = 'Antwoord-aan toevoegen';
-$labels['addfollowupto'] = 'Mail-Followup-Aan toevoegen';
+$labels['addfollowupto'] = 'Followup-To toevoegen';
+
+// mdn
 $labels['mdnrequest'] = 'De afzender van dit bericht heeft gevraagd een melding te ontvangen wanneer u dit bericht heeft gelezen. Wilt u deze melding verzenden?';
 $labels['receiptread'] = 'Ontvangstbevestiging (gelezen)';
 $labels['yourmessage'] = 'Dit is een ontvangstbevestiging voor uw bericht';
 $labels['receiptnote'] = 'Let op: Dit bevestigt alleen dat uw bericht bij de geadresseerde is weergegeven. Er is geen garantie dat de geadresseerde het bericht daadwerkelijk heeft gelezen of de inhoud ervan heeft begrepen.';
-$labels['name'] = 'Naam';
-$labels['firstname'] = 'Voornaam';
-$labels['surname'] = 'Achternaam';
-$labels['middlename'] = 'Tweede naam';
-$labels['nameprefix'] = 'Initialen';
-$labels['namesuffix'] = 'Aanhef';
-$labels['nickname'] = 'Bijnaam';
-$labels['jobtitle'] = 'Functietitel';
-$labels['department'] = 'Afdeling';
-$labels['gender'] = 'Geslacht';
-$labels['maidenname'] = 'Meisjesnaam';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefoon';
-$labels['address'] = 'Adres';
-$labels['street'] = 'Straat';
-$labels['locality'] = 'Stad';
-$labels['zipcode'] = 'Postcode';
-$labels['region'] = 'Provincie/staat';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Geboortedag';
-$labels['anniversary'] = 'Verjaardag';
-$labels['website'] = 'Website';
+
+// address boook
+$labels['name']         = 'Weergavenaam';
+$labels['firstname']    = 'Voornaam';
+$labels['surname']      = 'Achternaam';
+$labels['middlename']   = 'Tweede naam';
+$labels['nameprefix']   = 'Voorvoegsel';
+$labels['namesuffix']   = 'Achtervoegsel';
+$labels['nickname']     = 'Bijnaam';
+$labels['jobtitle']     = 'Functietitel';
+$labels['department']   = 'Afdeling';
+$labels['gender']       = 'Geslacht';
+$labels['maidenname']   = 'Meisjesnaam';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefoon';
+$labels['address']      = 'Adres';
+$labels['street']       = 'Straat';
+$labels['locality']     = 'Stad';
+$labels['zipcode']      = 'Postcode';
+$labels['region']       = 'Provincie/staat';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Geboortedatum';
+$labels['anniversary']  = 'Gedenkdatum';
+$labels['website']      = 'Website';
 $labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notities';
-$labels['male'] = 'Man';
+$labels['notes'] = 'Opmerkingen';
+$labels['male']   = 'Man';
 $labels['female'] = 'Vrouw';
-$labels['manager'] = 'Manager';
+$labels['manager'] = 'Leidinggevende';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Echtgenoot';
 $labels['allfields'] = 'Alle velden';
 $labels['search'] = 'Zoeken';
 $labels['advsearch'] = 'Geavanceerd zoeken';
 $labels['advanced'] = 'Geavanceerd';
 $labels['other'] = 'Anders';
-$labels['typeother'] = 'Anders';
-$labels['typehome'] = 'Thuis';
-$labels['typework'] = 'Werk';
-$labels['typemobile'] = 'Mobiel';
-$labels['typemain'] = 'Belangrijkste';
-$labels['typehomefax'] = 'Fax Thuis';
-$labels['typeworkfax'] = 'Fax Werk';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pieper';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Website';
-$labels['typeblog'] = 'Blog';
+
+$labels['typehome']   = 'Thuis';
+$labels['typework']   = 'Werk';
+$labels['typeother']  = 'Anders';
+$labels['typemobile']  = 'Mobiel';
+$labels['typemain']  = 'Belangrijkste';
+$labels['typehomefax']  = 'Fax thuis';
+$labels['typeworkfax']  = 'Fax werk';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pieper';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Website';
+$labels['typeblog'] = 'Weblog';
 $labels['typeprofile'] = 'Profiel';
+
 $labels['addfield'] = 'Veld toevoegen...';
 $labels['addcontact'] = 'Nieuwe contactpersoon toevoegen';
 $labels['editcontact'] = 'Contactpersoon wijzigen';
 $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Gegevens van contactpersoon';
 $labels['personalinfo'] = 'Persoonlijke informatie';
-$labels['edit'] = 'Wijzig';
+
+$labels['edit']   = 'Wijzig';
 $labels['cancel'] = 'Annuleren';
-$labels['save'] = 'Opslaan';
+$labels['save']   = 'Opslaan';
 $labels['delete'] = 'Verwijder';
-$labels['rename'] = 'Hernoem';
+$labels['rename'] = 'Hernoemen';
 $labels['addphoto'] = 'Toevoegen';
 $labels['replacephoto'] = 'Vervangen';
-$labels['uploadphoto'] = 'Upload foto';
-$labels['newcontact'] = 'Voeg een nieuwe contactpersoon toe';
-$labels['deletecontact'] = 'Verwijder geselecteerde contactpersonen';
-$labels['composeto'] = 'Stuur een bericht naar';
+$labels['uploadphoto'] = 'Foto uploaden';
+
+$labels['newcontact']     = 'Voeg een nieuwe contactpersoon toe';
+$labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
+$labels['composeto']      = 'Stuur een bericht naar';
 $labels['contactsfromto'] = 'Contactpersonen $from t/m $to van $count';
-$labels['print'] = 'Afdrukken';
-$labels['export'] = 'Exporteren';
-$labels['exportvcards'] = 'Exporteer contactpersonen in vCard-formaat';
+$labels['print']          = 'Afdrukken';
+$labels['export']         = 'Exporteren';
+$labels['exportall']      = 'Alles exporteren';
+$labels['exportsel']      = 'Selectie exporteren';
+$labels['exportvcards']   = 'Exporteer contactpersonen in vCard-formaat';
 $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
-$labels['grouprename'] = 'Groep hernoemen';
-$labels['groupdelete'] = 'Groep verwijderen';
+$labels['grouprename']    = 'Groep hernoemen';
+$labels['groupdelete']    = 'Groep verwijderen';
 $labels['groupremoveselected'] = 'Verwijder geselecteerde contactpersonen van groep';
-$labels['previouspage'] = 'Vorige pagina';
-$labels['firstpage'] = 'Eerste pagina';
-$labels['nextpage'] = 'Volgende pagina';
-$labels['lastpage'] = 'Laatste pagina';
+
+$labels['previouspage']   = 'Vorige pagina';
+$labels['firstpage']      = 'Eerste pagina';
+$labels['nextpage']       = 'Volgende pagina';
+$labels['lastpage']       = 'Laatste pagina';
+
 $labels['group'] = 'Groep';
 $labels['groups'] = 'Groepen';
 $labels['personaladrbook'] = 'Persoonlijk adresboek';
+
 $labels['searchsave'] = 'Zoekopdracht opslaan';
 $labels['searchdelete'] = 'Zoekopdracht verwijderen';
-$labels['import'] = 'Importeer';
+
+$labels['import'] = 'Importeren';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
 $labels['importtarget'] = 'Voeg nieuwe contactpersonen toe aan adresboek:';
 $labels['importreplace'] = 'Vervang het complete adresboek';
 $labels['importdesc'] = 'U kunt contactpersonen uploaden van een bestaand adresboek<br/>Momenteel wordt het importeren van adresboeken in <a href="http://en.wikipedia.org/wiki/VCard">vCard-formaat</a> of CSV-formaat (kommagescheiden tekstbestand) ondersteund.';
 $labels['done'] = 'Klaar';
+
+// settings
 $labels['settingsfor'] = 'Instellingen voor';
 $labels['about'] = 'Over';
 $labels['preferences'] = 'Instellingen';
 $labels['userpreferences'] = 'Gebruikersinstellingen';
 $labels['editpreferences'] = 'Wijzig gebruikersinstellingen';
+
 $labels['identities'] = 'Identiteiten';
 $labels['manageidentities'] = 'Beheer identiteiten voor dit account';
 $labels['newidentity'] = 'Identiteit toevoegen';
+
 $labels['newitem'] = 'Nieuw item';
 $labels['edititem'] = 'Wijzig item';
-$labels['preferhtml'] = 'Toon HTML';
+
+$labels['preferhtml'] = 'Toon berichten in HTML-opmaak';
 $labels['defaultcharset'] = 'Standaard tekenset';
 $labels['htmlmessage'] = 'HTML-bericht';
+$labels['messagepart'] = 'Gedeelte';
+$labels['digitalsig'] = 'Digitale handtekening';
 $labels['dateformat'] = 'Datumnotatie';
 $labels['timeformat'] = 'Tijdweergave';
 $labels['prettydate'] = 'Leesbare datums';
-$labels['setdefault'] = 'Stel in als standaard';
-$labels['autodetect'] = 'Automatisch';
-$labels['language'] = 'Taal';
-$labels['timezone'] = 'Tijdzone';
-$labels['pagesize'] = 'Aantal berichten per pagina';
+$labels['setdefault']  = 'Stel in als standaard';
+$labels['autodetect']  = 'Automatisch';
+$labels['language']  = 'Taal';
+$labels['timezone']  = 'Tijdzone';
+$labels['pagesize']  = 'Aantal berichten per pagina';
 $labels['signature'] = 'Ondertekening';
-$labels['dstactive'] = 'Zomertijd';
+$labels['dstactive']  = 'Zomertijd';
 $labels['showinextwin'] = 'Bericht in een nieuw venster openen';
 $labels['composeextwin'] = 'In een nieuw venster bewerken';
 $labels['htmleditor'] = 'Berichten opstellen in HTML-opmaak';
@@ -339,32 +401,32 @@ $labels['htmlsignature'] = 'HTML-ondertekening';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Interfacestijl';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
-$labels['logoutcompact'] = 'Postvak IN opschonen bij uitloggen';
+$labels['logoutcompact'] = 'Postvak In opschonen bij uitloggen';
 $labels['uisettings'] = 'Gebruikersinterface';
 $labels['serversettings'] = 'Serverinstellingen';
 $labels['mailboxview'] = 'Mailboxweergave';
 $labels['mdnrequests'] = 'Ontvangstmeldingen';
 $labels['askuser'] = 'altijd aan mij vragen';
 $labels['autosend'] = 'stuur automatisch';
-$labels['autosendknown'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen, voor anderen aan mij vragen';
-$labels['autosendknownignore'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen,  voor anderen negeren';
+$labels['autosendknown'] = 'stuur automatisch naar mijn contactpersonen,  anders vragen';
+$labels['autosendknownignore'] = 'stuur automatisch naar mijn contactpersonen,  anders negeren';
 $labels['ignore'] = 'negeren';
 $labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
-$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
+$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als \'te verwijderen\' markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
 $labels['deletejunk'] = 'Verwijder direct berichten in Spam';
-$labels['showremoteimages'] = 'Afbeeldingen op afstand weergeven';
+$labels['showremoteimages'] = 'Externe afbeeldingen weergeven';
 $labels['fromknownsenders'] = 'van bekende afzenders';
 $labels['always'] = 'altijd';
 $labels['showinlineimages'] = 'Bijgevoegde afbeeldingen onder het bericht weergeven';
-$labels['autosavedraft'] = 'Concept automatisch opslaan';
-$labels['everynminutes'] = 'iedere $n minuten';
-$labels['refreshinterval'] = 'Vernieuwen (controleer op nieuwe berichten, etc.)';
-$labels['never'] = 'nooit';
-$labels['immediately'] = 'onmiddellijk';
+$labels['autosavedraft']  = 'Concept automatisch opslaan';
+$labels['everynminutes']  = 'iedere $n minuten';
+$labels['refreshinterval']  = 'Vernieuwen (controleer op nieuwe berichten, etc.)';
+$labels['never']  = 'nooit';
+$labels['immediately']  = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichtenweergave';
-$labels['messagescomposition'] = 'Berichten aanmaken';
+$labels['messagescomposition'] = 'Berichten opstellen';
 $labels['mimeparamfolding'] = 'Namen van bijlagen';
 $labels['2231folding'] = 'Volledig RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorstu
 $labels['belowquote'] = 'onder het citaat';
 $labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Ondertekening invoegen';
-$labels['previewpanemarkread'] = 'Markeer voorbeeldberichten als gelezen';
-$labels['afternseconds'] = 'Na $n seconden';
+$labels['previewpanemarkread']  = 'Markeer voorbeeldberichten als gelezen';
+$labels['afternseconds']  = 'na $n seconden';
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd om een afleveringsbericht';
 $labels['replysamefolder'] = 'Bewaar reacties in de map van het beantwoorde bericht';
@@ -411,39 +473,47 @@ $labels['mailtoprotohandler'] = 'Registreer protocolhandler voor mailto: links';
 $labels['forwardmode'] = 'Berichten doorsturen';
 $labels['inline'] = 'invoegen';
 $labels['asattachment'] = 'als bijlage';
-$labels['folder'] = 'Map';
-$labels['foldername'] = 'Mapnaam';
-$labels['subscribed'] = 'Geabonneerd';
+
+$labels['folder']  = 'Map';
+$labels['folders']  = 'Mappen';
+$labels['foldername']  = 'Mapnaam';
+$labels['subscribed']  = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
-$labels['create'] = 'Nieuw';
-$labels['createfolder'] = 'Maak nieuwe map';
-$labels['managefolders'] = 'Beheer mappen';
+$labels['create']  = 'Nieuw';
+$labels['createfolder']  = 'Nieuwe map maken';
+$labels['managefolders']  = 'Beheer mappen';
 $labels['specialfolders'] = 'Speciale mappen';
 $labels['properties'] = 'Eigenschappen';
-$labels['folderproperties'] = 'Map eigenschappen';
+$labels['folderproperties'] = 'Mapeigenschappen';
 $labels['parentfolder'] = 'Bovenliggende map';
 $labels['location'] = 'Locatie';
 $labels['info'] = 'Informatie';
 $labels['getfoldersize'] = 'Klik om de omvang van de map te berekenen';
-$labels['changesubscription'] = 'Klik voor het wijzigen van de inschrijving';
+$labels['changesubscription'] = 'Klik om abonnering te wijzigen';
 $labels['foldertype'] = 'Maptype';
-$labels['personalfolder'] = 'Privé map';
-$labels['otherfolder'] = 'Map van andere gebruiker';
-$labels['sharedfolder'] = 'Publieke map';
+$labels['personalfolder']  = 'Privémap';
+$labels['otherfolder']  = 'Map van andere gebruiker';
+$labels['sharedfolder']  = 'Publieke map';
+
 $labels['sortby'] = 'Sorteer op';
-$labels['sortasc'] = 'Sorteer oplopend';
+$labels['sortasc']  = 'Sorteer oplopend';
 $labels['sortdesc'] = 'Sorteer aflopend';
 $labels['undo'] = 'Ongedaan maken';
+
 $labels['installedplugins'] = 'Geïnstalleerde plug-ins';
 $labels['plugin'] = 'Invoegtoepassing';
 $labels['version'] = 'Versie';
 $labels['source'] = 'Broncode';
 $labels['license'] = 'Licentie';
 $labels['support'] = 'Hulp nodig?';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engels';
 $labels['westerneuropean'] = 'West-Europees';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japans';
 $labels['korean'] = 'Koreaans';
 $labels['chinese'] = 'Chinees';
 
+?>
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index fe050adc3..05a362104 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Er is een fout opgetreden!';
-$messages['loginfailed'] = 'Aanmelden mislukt.';
+$messages['errortitle']  = 'Er is een fout opgetreden!';
+$messages['loginfailed']  = 'Aanmelden mislukt.';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies.';
 $messages['sessionerror'] = 'Uw sessie is verlopen of ongeldig.';
 $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
@@ -23,7 +26,7 @@ $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
 $messages['dberror'] = 'Databasefout!';
 $messages['requesttimedout'] = 'Wachttijd verzoek overschreden';
-$messages['errorreadonly'] = 'Niet in staat om de bewerking uit te voeren. Map is alleen-lezen.';
+$messages['errorreadonly'] = 'De bewerking kan niet uitgevoerd worden. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige servernaam.';
@@ -36,18 +39,18 @@ $messages['uploading'] = 'Bestand wordt geüpload...';
 $messages['uploadingmany'] = 'Bestanden worden geüpload...';
 $messages['loadingdata'] = 'Gegevens worden geladen...';
 $messages['checkingmail'] = 'Controleren op nieuwe berichten...';
-$messages['sendingmessage'] = 'Bericht versturen...';
+$messages['sendingmessage'] = 'Bericht wordt verstuurd...';
 $messages['messagesent'] = 'Bericht succesvol verstuurd.';
 $messages['savingmessage'] = 'Bericht wordt opgeslagen...';
 $messages['messagesaved'] = 'Bericht opgeslagen in Concepten.';
 $messages['successfullysaved'] = 'Succesvol opgeslagen.';
-$messages['addedsuccessfully'] = 'Contact is succesvol toegevoegd aan het adresboek.';
+$messages['addedsuccessfully'] = 'Contactpersoon succesvol toegevoegd aan het adresboek.';
 $messages['contactexists'] = 'Er bestaat al een contactpersoon met dit e-mailadres.';
 $messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.';
 $messages['blockedimages'] = 'Om uw privacy te beschermen zijn externe afbeeldingen geblokkeerd in dit bericht.';
-$messages['encryptedmessage'] = 'Dit is een gecodeerd bericht en kan niet weergegeven worden. Excuses!';
+$messages['encryptedmessage'] = 'Dit is een versleuteld bericht en kan niet weergegeven worden. Excuses!';
 $messages['nocontactsfound'] = 'Geen contactpersonen gevonden.';
-$messages['contactnotfound'] = 'Contactpersoon niet gevonden.';
+$messages['contactnotfound'] = 'Opgevraagde contactpersoon niet gevonden.';
 $messages['contactsearchonly'] = 'Voer enkele zoektermen in om contactpersonen te zoeken';
 $messages['sendingfailed'] = 'Verzenden van bericht is mislukt.';
 $messages['senttooquickly'] = 'Wacht alstublieft $sec seconde(n) voordat u dit bericht verstuurt.';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Kan bericht(en) niet verplaatsen.';
 $messages['errorcopying'] = 'Kan bericht(en) niet kopiëren.';
 $messages['errordeleting'] = 'Kan bericht(en) niet verwijderen.';
 $messages['errormarking'] = 'Kan bericht(en) niet markeren.';
-$messages['deletecontactconfirm'] = 'Weet u zeker dat u de geselecteerde contact(en) wilt verwijderen?';
-$messages['deletegroupconfirm'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
+$messages['deletecontactconfirm']  = 'Weet u zeker dat u de geselecteerde contact(en) wilt verwijderen?';
+$messages['deletegroupconfirm']  = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
 $messages['deletemessagesconfirm'] = 'Weet u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
-$messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
-$messages['purgefolderconfirm'] = 'Weet u zeker dat u alle berichten in deze map wilt verwijderen?';
+$messages['deletefolderconfirm']  = 'Weet u zeker dat u deze map wilt verwijderen?';
+$messages['purgefolderconfirm']  = 'Weet u zeker dat u alle berichten in deze map wilt verwijderen?';
 $messages['contactdeleting'] = 'Bezig met verwijderen van contact(en)...';
 $messages['groupdeleting'] = 'Groep wordt verwijderd...';
 $messages['folderdeleting'] = 'Map wordt verwijderd...';
@@ -70,13 +73,13 @@ $messages['foldersubscribing'] = 'Bezig met abonneren op map...';
 $messages['folderunsubscribing'] = 'Abonnement op map wordt opgezegd...';
 $messages['formincomplete'] = 'Het formulier was niet volledig ingevuld.';
 $messages['noemailwarning'] = 'Geef een geldig e-mailadres op.';
-$messages['nonamewarning'] = 'Vul een naam in.';
+$messages['nonamewarning']  = 'Vul een naam in.';
 $messages['nopagesizewarning'] = 'Geef een paginagrootte op.';
 $messages['nosenderwarning'] = 'Geef een e-mailadres van de afzender op.';
 $messages['norecipientwarning'] = 'Geef tenminste één ontvanger op.';
-$messages['nosubjectwarning'] = 'Het \'Onderwerp\' veld is leeg. Wilt u nu alsnog een onderwerp opgeven?';
+$messages['nosubjectwarning']  = 'U heeft geen onderwerp ingevoerd. Wilt u nu een onderwerp opgeven?';
 $messages['nobodywarning'] = 'Dit bericht zonder inhoud versturen?';
-$messages['notsentwarning'] = 'Bericht is niet verstuurd. Weet u zeker dat u het niet wilt bewaren?';
+$messages['notsentwarning'] = 'Het bericht is niet verstuurd. Wilt u uw bericht weggooien?';
 $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.';
@@ -86,11 +89,11 @@ $messages['searchnomatch'] = 'Zoekopdracht heeft geen resultaten opgeleverd.';
 $messages['searching'] = 'Zoeken...';
 $messages['checking'] = 'Controleren...';
 $messages['nospellerrors'] = 'Geen spelfouten gevonden.';
-$messages['folderdeleted'] = 'Map successvol verwijderd.';
+$messages['folderdeleted'] = 'Map succesvol verwijderd.';
 $messages['foldersubscribed'] = 'Succesvol geabonneerd op map.';
 $messages['folderunsubscribed'] = 'Abonnement op map succesvol opgezegd.';
-$messages['folderpurged'] = 'Folder met succes geleegd.';
-$messages['folderexpunged'] = 'Folder succesvol geleegd.';
+$messages['folderpurged'] = 'Map succesvol leeggemaakt.';
+$messages['folderexpunged'] = 'Map succesvol opgeschoond.';
 $messages['deletedsuccessfully'] = 'Met succes verwijderd.';
 $messages['converting'] = 'Opmaak van bericht verwijderen...';
 $messages['messageopenerror'] = 'Kan het bericht niet van de server laden.';
@@ -98,68 +101,69 @@ $messages['fileuploaderror'] = 'Bestand uploaden mislukt.';
 $messages['filesizeerror'] = 'Het bestand overschrijdt de maximale grootte van $size.';
 $messages['copysuccess'] = '$nr adressen succesvol gekopieerd.';
 $messages['copyerror'] = 'Kan geen adressen kopiëren.';
-$messages['sourceisreadonly'] = 'Het adres is alleen-lezen.';
-$messages['errorsavingcontact'] = 'Kan het ontvanger-adres niet opslaan.';
+$messages['sourceisreadonly'] = 'Deze adresbron is alleen-lezen.';
+$messages['errorsavingcontact'] = 'Kan contactpersoon niet opslaan.';
 $messages['movingmessage'] = 'Bericht(en) verplaatsen...';
 $messages['copyingmessage'] = 'Bericht(en) kopiëren...';
 $messages['copyingcontact'] = 'Contact(en) kopiëren...';
 $messages['deletingmessage'] = 'Bericht(en) verwijderen...';
 $messages['markingmessage'] = 'Bericht(en) markeren...';
-$messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
-$messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
+$messages['addingmember'] = 'Contactpersonen worden toegevoegd aan groep...';
+$messages['removingmember'] = 'Contactpersonen worden verwijderd uit groep...';
 $messages['receiptsent'] = 'Ontvangstbevestiging is verstuurd.';
 $messages['errorsendingreceipt'] = 'Kan de ontvangstbevestiging niet versturen.';
 $messages['deleteidentityconfirm'] = 'Weet u zeker dat u deze identiteit wilt verwijderen?';
 $messages['nodeletelastidentity'] = 'U kunt uw enige identiteit niet verwijderen.';
 $messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan.';
-$messages['selectimportfile'] = 'Selecteer een bestand om de uploaden.';
-$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen lezen.';
-$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan de groep.';
-$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de groep.';
+$messages['selectimportfile'] = 'Selecteer een bestand om te uploaden.';
+$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen-lezen.';
+$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan deze groep.';
+$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd van deze groep.';
 $messages['nogroupassignmentschanged'] = 'Geen groepstoewijzingen aangepast.';
 $messages['importwait'] = 'Importeren, even geduld...';
 $messages['importformaterror'] = 'Importeren mislukt! Het geüploade bestand is geen geldig importbestand.';
-$messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd, en $skipped bestaande overgeslagen</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>$inserted contactpersonen succesvol geïmporteerd</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
-$messages['opnotpermitted'] = 'Deze verrichting is niet toegestaan!';
-$messages['nofromaddress'] = 'Het e-mailadres mist in de geselecteerde identiteit.';
-$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
-$messages['httpreceivedencrypterror'] = 'Er is een fatale fout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
-$messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt.';
-$messages['smtpautherror'] = 'SMTP Fout ($code): Autenticatie mislukt.';
-$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg).';
-$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken.';
-$messages['smtperror'] = 'SMTP Fout: $msg';
+$messages['opnotpermitted'] = 'Deze bewerking is niet toegestaan!';
+$messages['nofromaddress'] = 'Het e-mailadres ontbreekt in de geselecteerde identiteit.';
+$messages['editorwarning'] = 'Door het overschakelen naar de platte-tekstverwerker gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
+$messages['httpreceivedencrypterror'] = 'Er is een onherstelbare configuratiefout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
+$messages['smtpconnerror'] = 'SMTP-fout ($code): Verbinding met server mislukt.';
+$messages['smtpautherror'] = 'SMTP-fout ($code): Authenticatie mislukt.';
+$messages['smtpfromerror'] = 'SMTP-fout ($code): Afzender "$from" kan niet ingesteld worden ($msg).';
+$messages['smtptoerror'] = 'SMTP-fout ($code): Ontvanger "$to" kan niet toegevoegd worden ($msg).';
+$messages['smtprecipientserror'] = 'SMTP-fout: Lijst met ontvangers kan niet verwerkt worden.';
+$messages['smtperror'] = 'SMTP-fout: $msg';
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
-$messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max.';
-$messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max.';
+$messages['toomanyrecipients'] = 'Te veel ontvangers. Reduceer het aantal ontvangers tot $max.';
+$messages['maxgroupmembersreached'] = 'Het aantal groepsleden overschrijdt het maximale aantal van $max.';
 $messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals.';
-$messages['contactdelerror'] = 'Kon contact(en) niet verwijderen.';
+$messages['contactdelerror'] = 'Contact(en) konden niet verwijderd worden.';
 $messages['contactdeleted'] = 'Contact(en) succesvol verwijderd.';
-$messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden';
-$messages['contactrestored'] = 'Contactpersonen succesvol hersteld.';
+$messages['contactrestoreerror'] = 'Verwijderde contact(en) konden niet hersteld worden.';
+$messages['contactrestored'] = 'Contact(en) succesvol hersteld.';
 $messages['groupdeleted'] = 'Groep succesvol verwijderd.';
 $messages['grouprenamed'] = 'Groep succesvol hernoemd.';
 $messages['groupcreated'] = 'Groep succesvol aangemaakt.';
-$messages['savedsearchdeleted'] = 'Opgeslagen zoekopdracht successvol verwijderd.';
+$messages['savedsearchdeleted'] = 'Opgeslagen zoekopdracht succesvol verwijderd.';
 $messages['savedsearchdeleteerror'] = 'Opgeslagen zoekopdracht kon niet worden verwijderd.';
-$messages['savedsearchcreated'] = 'Zoekopdracht successvol opgeslagen.';
+$messages['savedsearchcreated'] = 'Zoekopdracht succesvol opgeslagen.';
 $messages['savedsearchcreateerror'] = 'Zoekopdracht kon niet worden opgeslagen.';
 $messages['messagedeleted'] = 'Bericht(en) succesvol verwijderd.';
 $messages['messagemoved'] = 'Bericht(en) succesvol verplaatst.';
 $messages['messagecopied'] = 'Bericht(en) succesvol gekopieerd.';
 $messages['messagemarked'] = 'Bericht(en) succesvol gemarkeerd.';
-$messages['autocompletechars'] = 'Voer ten minste $min karakters in voor automatisch aanvullen.';
+$messages['autocompletechars'] = 'Voer tenminste $min karakters in voor automatisch aanvullen.';
 $messages['autocompletemore'] = 'Meerdere resultaten gevonden. Verfijn uw zoekopdracht.';
-$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn';
-$messages['nametoolong'] = 'Naam is te lang';
-$messages['folderupdated'] = 'Map succesvol bijgewerkt';
-$messages['foldercreated'] = 'Map succesvol aangemaakt';
-$messages['invalidimageformat'] = 'Geen geldig afbeeldings formaat';
-$messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht';
-$messages['parentnotwritable'] = 'U heeft niet voldoende rechten een map te maken / verplaatsen in deze map.';
+$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn.';
+$messages['nametoolong'] = 'Naam is te lang.';
+$messages['folderupdated'] = 'Map succesvol bijgewerkt.';
+$messages['foldercreated'] = 'Map succesvol aangemaakt.';
+$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 wanneer u gebruik wilt maken van deze webmail.';
+$messages['noscriptwarning'] = 'Waarschuwing: deze webmailapplicatie vereist Javascript! U dient Javascript in te schakelen in uw browserinstellingen wanneer u gebruik wilt maken van deze applicatie.';
 
+?>
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 3454a7a88..725919d14 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NO/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkomen til $product';
-$labels['username'] = 'Brukarnamn';
-$labels['password'] = 'Passord';
-$labels['server'] = 'Tenar';
-$labels['login'] = 'Logg inn';
-$labels['logout'] = 'Logg ut';
-$labels['mail'] = 'E-post';
+
+// login page
+$labels['welcome']   = 'Velkomen til $product';
+$labels['username']  = 'Brukarnamn';
+$labels['password']  = 'Passord';
+$labels['server']    = 'Tenar';
+$labels['login']     = 'Logg inn';
+
+// taskbar
+$labels['logout']   = 'Logg ut';
+$labels['mail']     = 'E-post';
 $labels['settings'] = 'Personlege innstillingar';
 $labels['addressbook'] = 'Adressebok';
-$labels['inbox'] = 'Innboks';
+
+// mailbox names
+$labels['inbox']  = 'Innboks';
 $labels['drafts'] = 'Kladd';
-$labels['sent'] = 'Sendt';
-$labels['trash'] = 'Sletta';
-$labels['junk'] = 'Søppel';
+$labels['sent']   = 'Sendt';
+$labels['trash']  = 'Sletta';
+$labels['junk']   = 'Søppel';
+
+// message listing
 $labels['subject'] = 'Emne';
-$labels['from'] = 'Frå';
-$labels['to'] = 'Til';
-$labels['cc'] = 'Kopi til';
-$labels['bcc'] = 'Blindkopi til';
+$labels['from']    = 'Frå';
+$labels['sender']  = 'Avsendar';
+$labels['to']      = 'Til';
+$labels['cc']      = 'Kopi til';
+$labels['bcc']     = 'Blindkopi til';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Oppfølging til';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Storleik';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Storleik';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
 $labels['readstatus'] = 'Lesestatus';
 $labels['listoptions'] = 'Listeinnstillingar …';
+
 $labels['mailboxlist'] = 'Mapper';
-$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Melding $from til $to av $count';
 $labels['threadsfromto'] = 'Tråd $from til $to ($count stk)';
 $labels['messagenrof'] = 'Melding $nr av $count';
 $labels['fromtoshort'] = '$from-$to av $count';
-$labels['copy'] = 'Kopier';
-$labels['move'] = 'Flytt';
-$labels['moveto'] = 'flytt til …';
+
+$labels['copy']     = 'Kopier';
+$labels['move']     = 'Flytt';
+$labels['moveto']   = 'flytt til …';
 $labels['download'] = 'Last ned';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
+
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorleik';
+
 $labels['addtoaddressbook'] = 'Legg til i adressebok';
+
+// weekdays short
 $labels['sun'] = 'Sun';
 $labels['mon'] = 'Mån';
 $labels['tue'] = 'Tys';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lau';
-$labels['sunday'] = 'Sundag';
-$labels['monday'] = 'Måndag';
-$labels['tuesday'] = 'Tysdag';
+
+// weekdays long
+$labels['sunday']    = 'Sundag';
+$labels['monday']    = 'Måndag';
+$labels['tuesday']   = 'Tysdag';
 $labels['wednesday'] = 'Onsdag';
-$labels['thursday'] = 'Torsdag';
-$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'Laurdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Des';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Mars';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Desember';
+$labels['thursday']  = 'Torsdag';
+$labels['friday']    = 'Fredag';
+$labels['saturday']  = 'Laurdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Des';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Mars';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Desember';
+
 $labels['today'] = 'I dag';
-$labels['refresh'] = 'Frisk opp att';
-$labels['checkmail'] = 'Sjå etter nye meldingar';
-$labels['compose'] = 'Skriv ei melding';
-$labels['writenewmessage'] = 'Skriv ei ny melding';
-$labels['reply'] = 'Svar';
-$labels['replytomessage'] = 'Svar til avsendar';
+
+// toolbar buttons
+$labels['refresh']          = 'Frisk opp att';
+$labels['checkmail']        = 'Sjå etter nye meldingar';
+$labels['compose']          = 'Skriv ei melding';
+$labels['writenewmessage']  = 'Skriv ei ny melding';
+$labels['reply']            = 'Svar';
+$labels['replytomessage']   = 'Svar til avsendar';
 $labels['replytoallmessage'] = 'Svar til avsendar og alle mottakarar';
-$labels['replyall'] = 'Svar til alle';
-$labels['replylist'] = 'Svar til liste';
-$labels['forward'] = 'Vidaresend';
-$labels['forwardinline'] = 'Send vidare innbygd';
+$labels['replyall']         = 'Svar til alle';
+$labels['replylist']        = 'Svar til liste';
+$labels['forward']          = 'Vidaresend';
+$labels['forwardinline']    = 'Send vidare innbygd';
 $labels['forwardattachment'] = 'Vidresend som vedlegg';
-$labels['forwardmessage'] = 'Vidaresend meldinga';
-$labels['deletemessage'] = 'Slett meldinga';
+$labels['forwardmessage']   = 'Vidaresend meldinga';
+$labels['deletemessage']    = 'Slett meldinga';
 $labels['movemessagetotrash'] = 'Flytt meldinga til «sletta»';
-$labels['printmessage'] = 'Skriv ut meldinga';
-$labels['previousmessage'] = 'Vis førre melding';
-$labels['firstmessage'] = 'Vis den første meldinga';
-$labels['nextmessage'] = 'Vis den neste meldinga';
-$labels['lastmessage'] = 'Vis den siste meldinga';
-$labels['backtolist'] = 'Tilbake til meldingslista';
-$labels['viewsource'] = 'Vis kjelde';
-$labels['mark'] = 'Merke';
-$labels['markmessages'] = 'Marker meldingar';
-$labels['markread'] = 'Som lese';
-$labels['markunread'] = 'Som ulese';
-$labels['markflagged'] = 'Som flagga';
-$labels['markunflagged'] = 'Som uflagga';
-$labels['moreactions'] = 'Fleire handlingar';
-$labels['more'] = 'Meir';
-$labels['back'] = 'Tilbake';
-$labels['options'] = 'Innstillingar';
+$labels['printmessage']     = 'Skriv ut meldinga';
+$labels['previousmessage']  = 'Vis førre melding';
+$labels['firstmessage']     = 'Vis den første meldinga';
+$labels['nextmessage']      = 'Vis den neste meldinga';
+$labels['lastmessage']      = 'Vis den siste meldinga';
+$labels['backtolist']       = 'Tilbake til meldingslista';
+$labels['viewsource']       = 'Vis kjelde';
+$labels['mark']             = 'Merke';
+$labels['markmessages']     = 'Marker meldingar';
+$labels['markread']         = 'Som lese';
+$labels['markunread']       = 'Som ulese';
+$labels['markflagged']      = 'Som flagga';
+$labels['markunflagged']    = 'Som uflagga';
+$labels['moreactions']      = 'Fleire handlingar';
+$labels['more']             = 'Meir';
+$labels['back']             = 'Tilbake';
+$labels['options']          = 'Innstillingar';
+
 $labels['select'] = 'Vel';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Gjeldande side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Utvid alle';
 $labels['expand-unread'] = 'Utvid ulesne';
 $labels['collapse-all'] = 'Slå saman alle';
 $labels['threaded'] = 'Tråda';
+
 $labels['autoexpand_threads'] = 'Utvid eposttråder';
 $labels['do_expand'] = 'alle tråder';
 $labels['expand_only_unread'] = 'berre med ulesne epostar';
 $labels['fromto'] = 'Sendar/Mottakar';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Vedlegg';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Sendtdato';
 $labels['arrival'] = 'Mottaksdato';
 $labels['asc'] = 'Alfabetisk';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Vis kolonner';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorteringsveg';
 $labels['listmode'] = 'Listevisningmodus';
+
 $labels['folderactions'] = 'Mappehandlingar';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Tom';
+
 $labels['quota'] = 'Plassbruk';
-$labels['unknown'] = 'ukjend';
-$labels['unlimited'] = 'ubegrensa';
-$labels['quicksearch'] = 'Snøggsøk';
-$labels['resetsearch'] = 'Tilbakestill søk';
-$labels['searchmod'] = 'Søkeutsagn';
-$labels['msgtext'] = 'Heile eposten';
+$labels['unknown']  = 'ukjend';
+$labels['unlimited']  = 'ubegrensa';
+
+$labels['quicksearch']  = 'Snøggsøk';
+$labels['resetsearch']  = 'Tilbakestill søk';
+$labels['searchmod']  = 'Søkeutsagn';
+$labels['msgtext']  = 'Heile eposten';
+$labels['body']  = 'Meldingstekst';
+
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['editasnew'] = 'Rediger som ny';
-$labels['send'] = 'Send';
-$labels['sendmessage'] = 'Send meldinga no';
-$labels['savemessage'] = 'Lagra kladd';
-$labels['addattachment'] = 'Legg ved ei fil';
-$labels['charset'] = 'Teiknkoding';
-$labels['editortype'] = 'Redigeringstype';
-$labels['returnreceipt'] = 'Epost-er-lest-kvittering';
-$labels['dsn'] = 'Leveringsstatus';
+
+// message compose
+$labels['editasnew']      = 'Rediger som ny';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send meldinga no';
+$labels['savemessage']    = 'Lagra kladd';
+$labels['addattachment']  = 'Legg ved ei fil';
+$labels['charset']        = 'Teiknkoding';
+$labels['editortype']     = 'Redigeringstype';
+$labels['returnreceipt']  = 'Epost-er-lest-kvittering';
+$labels['dsn']            = 'Leveringsstatus';
 $labels['mailreplyintro'] = 'Den $date skreiv $sender:';
 $labels['originalmessage'] = 'Opphavleg melding';
-$labels['editidents'] = 'Redigere identitetar';
-$labels['spellcheck'] = 'Stavekontroll';
+
+$labels['editidents']    = 'Redigere identitetar';
+$labels['spellcheck']    = 'Stavekontroll';
 $labels['checkspelling'] = 'Stavekontroll';
 $labels['resumeediting'] = 'Hald fram redigering';
-$labels['revertto'] = 'Tilbakestill til';
+$labels['revertto']      = 'Tilbakestill til';
+
 $labels['attach'] = 'Legg ved';
 $labels['attachments'] = 'Vedlegg';
 $labels['upload'] = 'Last opp';
 $labels['uploadprogress'] = '$percent ($current frå $total)';
-$labels['close'] = 'Steng';
-$labels['messageoptions'] = 'Meldingsalternativ';
-$labels['low'] = 'Låg';
-$labels['lowest'] = 'Lågast';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Høg';
+$labels['close']  = 'Steng';
+$labels['messageoptions']  = 'Meldingsalternativ';
+
+$labels['low']     = 'Låg';
+$labels['lowest']  = 'Lågast';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Høg';
 $labels['highest'] = 'Høgast';
-$labels['nosubject'] = '(ingen emne)';
+
+$labels['nosubject']  = '(ingen emne)';
 $labels['showimages'] = 'Vis bilete';
 $labels['alwaysshow'] = 'Alltid vis bilete frå $sender';
-$labels['isdraft'] = 'Dette er ein kladd.';
-$labels['andnmore'] = '$nr fleire …';
+$labels['isdraft']    = 'Dette er ein kladd.';
+$labels['andnmore']   = '$nr fleire …';
 $labels['togglemoreheaders'] = 'Vis fleire meldingshovud';
 $labels['togglefullheaders'] = 'Veksle vising av meldinga sine headere i råformat';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Vanleg tekst';
 $labels['savesentmessagein'] = 'Lagra sendt epost i';
 $labels['dontsave'] = 'Ikkje lagra';
 $labels['maxuploadsize'] = 'Maksimalt tillatte storleik på filar er $size';
+
 $labels['addcc'] = 'Legg til kopi';
 $labels['addbcc'] = 'Legg til blindkopi';
 $labels['addreplyto'] = 'Legg til svaradressa';
 $labels['addfollowupto'] = 'Legg til oppfylgjing';
+
+// mdn
 $labels['mdnrequest'] = 'Sendaren av denne meldinga ynskjer å få kvittering når du har lest meldinga. Ynskjer du å senda denne kvitteringa?';
 $labels['receiptread'] = 'Svarkvittering (eposten-er-lest-kvittering)';
 $labels['yourmessage'] = 'Dette er ein retur-kvittering for meldinga di.';
 $labels['receiptnote'] = 'Hugs: Denne kvitteringa seier berre at meldinga di vart vist på mottakar sin datamaskin. Det er ingen garanti for at mottakaren faktisk har lese eller forstått innhaldet i meldinga.';
-$labels['name'] = 'Visingsnamn';
-$labels['firstname'] = 'Førenamn';
-$labels['surname'] = 'Etternamn';
-$labels['middlename'] = 'Mellomnamn';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Kallenamn';
-$labels['jobtitle'] = 'Jobbtittel';
-$labels['department'] = 'Avdeling';
-$labels['gender'] = 'Kjønn';
-$labels['maidenname'] = 'Pikenamn';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Gate';
-$labels['locality'] = 'By';
-$labels['zipcode'] = 'Postnummer';
-$labels['region'] = 'Stat/provins';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Fødselsdag';
-$labels['anniversary'] = 'Bryllaupsdag';
-$labels['website'] = 'Internettside';
+
+// address boook
+$labels['name']         = 'Visingsnamn';
+$labels['firstname']    = 'Førenamn';
+$labels['surname']      = 'Etternamn';
+$labels['middlename']   = 'Mellomnamn';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Kallenamn';
+$labels['jobtitle']     = 'Jobbtittel';
+$labels['department']   = 'Avdeling';
+$labels['gender']       = 'Kjønn';
+$labels['maidenname']   = 'Pikenamn';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Gate';
+$labels['locality']     = 'By';
+$labels['zipcode']      = 'Postnummer';
+$labels['region']       = 'Stat/provins';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Fødselsdag';
+$labels['anniversary']  = 'Bryllaupsdag';
+$labels['website']      = 'Internettside';
 $labels['instantmessenger'] = 'Lynmelding';
 $labels['notes'] = 'Notatar';
-$labels['male'] = 'Mann';
+$labels['male']   = 'Mann';
 $labels['female'] = 'Kvinne';
 $labels['manager'] = 'Leiar';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Ektefelle';
 $labels['allfields'] = 'Alle felt';
 $labels['search'] = 'Søk';
 $labels['advsearch'] = 'Avansert søk';
 $labels['advanced'] = 'Avansert';
 $labels['other'] = 'Andre';
-$labels['typeother'] = 'Andre';
-$labels['typehome'] = 'Heim';
-$labels['typework'] = 'Jobb';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hovud';
-$labels['typehomefax'] = 'Heimefax';
-$labels['typeworkfax'] = 'Jobbfax';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsøkjar';
-$labels['typevideo'] = 'VIdeo';
-$labels['typehomepage'] = 'Heimeside';
+
+$labels['typehome']   = 'Heim';
+$labels['typework']   = 'Jobb';
+$labels['typeother']  = 'Andre';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hovud';
+$labels['typehomefax']  = 'Heimefax';
+$labels['typeworkfax']  = 'Jobbfax';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsøkjar';
+$labels['typevideo']  = 'VIdeo';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Heimeside';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Legg til felt...';
 $labels['addcontact'] = 'Legg til ny kontakt';
 $labels['editcontact'] = 'Redigere kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Eigenskapar';
 $labels['personalinfo'] = 'Personleg informasjon';
-$labels['edit'] = 'Redigere';
+
+$labels['edit']   = 'Redigere';
 $labels['cancel'] = 'Avbryt';
-$labels['save'] = 'Lagre';
+$labels['save']   = 'Lagre';
 $labels['delete'] = 'Slette';
 $labels['rename'] = 'Gi nytt namn';
 $labels['addphoto'] = 'Legg til';
 $labels['replacephoto'] = 'Erstatt';
 $labels['uploadphoto'] = 'Last opp bilete';
-$labels['newcontact'] = 'Opprett nytt kontaktkort';
-$labels['deletecontact'] = 'Slett valde kontaktar';
-$labels['composeto'] = 'Ny melding til';
+
+$labels['newcontact']     = 'Opprett nytt kontaktkort';
+$labels['deletecontact']  = 'Slett valde kontaktar';
+$labels['composeto']      = 'Ny melding til';
 $labels['contactsfromto'] = 'Kontaktar $from til $to av $count';
-$labels['print'] = 'Skriv ut';
-$labels['export'] = 'Eksport';
-$labels['exportvcards'] = 'Eksporter kontaktar i vCard-format';
+$labels['print']          = 'Skriv ut';
+$labels['export']         = 'Eksport';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Eksporter kontaktar i vCard-format';
 $labels['newcontactgroup'] = 'Lag ny kontaktgruppe';
-$labels['grouprename'] = 'Endre namn på gruppe';
-$labels['groupdelete'] = 'Slett gruppe';
+$labels['grouprename']    = 'Endre namn på gruppe';
+$labels['groupdelete']    = 'Slett gruppe';
 $labels['groupremoveselected'] = 'Fjern valde kontaktar frå gruppe';
-$labels['previouspage'] = 'Førre side';
-$labels['firstpage'] = 'Første side';
-$labels['nextpage'] = 'Neste side';
-$labels['lastpage'] = 'Siste side';
+
+$labels['previouspage']   = 'Førre side';
+$labels['firstpage']      = 'Første side';
+$labels['nextpage']       = 'Neste side';
+$labels['lastpage']       = 'Siste side';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppar';
 $labels['personaladrbook'] = 'Personlege adresser';
+
 $labels['searchsave'] = 'Lagre søk';
 $labels['searchdelete'] = 'Slett søk';
+
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer kontaktar';
 $labels['importfromfile'] = 'Importer frå fil:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Legg til kontakter i adresseboka';
 $labels['importreplace'] = 'Byt ut heile adresseboka';
 $labels['importdesc'] = 'Du kan laste opp kontaktar frå ei eksisterande adressebok.<br/>Vi støttar adressebøker i formata <a href="http://no.wikipedia.org/wiki/VCard">vCard</a> og CSV (kommaseparert).';
 $labels['done'] = 'Ferdig';
+
+// settings
 $labels['settingsfor'] = 'Innstillingar for';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Innstillingar';
 $labels['userpreferences'] = 'Brukarinnstillingar';
 $labels['editpreferences'] = 'Redigere brukarinnstillingar';
+
 $labels['identities'] = 'Identitetar';
 $labels['manageidentities'] = 'Administrere identitetar for denne kontoen';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Nytt element';
 $labels['edititem'] = 'Redigere element';
+
 $labels['preferhtml'] = 'Føretrekk HTML';
 $labels['defaultcharset'] = 'Standard karaktersett (charset)';
 $labels['htmlmessage'] = 'HTML-melding';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datoformat';
 $labels['timeformat'] = 'Tidsformat';
 $labels['prettydate'] = 'Pene datoar';
-$labels['setdefault'] = 'Set som standard';
-$labels['autodetect'] = 'Automatisk';
-$labels['language'] = 'Språk';
-$labels['timezone'] = 'Tidssone';
-$labels['pagesize'] = 'Rader pr side';
+$labels['setdefault']  = 'Set som standard';
+$labels['autodetect']  = 'Automatisk';
+$labels['language']  = 'Språk';
+$labels['timezone']  = 'Tidssone';
+$labels['pagesize']  = 'Rader pr side';
 $labels['signature'] = 'Signartur';
-$labels['dstactive'] = 'Sumartid';
+$labels['dstactive']  = 'Sumartid';
 $labels['showinextwin'] = 'Opna melding i nytt vindauge';
 $labels['composeextwin'] = 'Skriv i nytt vindauge';
 $labels['htmleditor'] = 'Lag HTML-meldingar';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Vis eksterne bilete';
 $labels['fromknownsenders'] = 'frå kjende sendarar';
 $labels['always'] = 'alltid';
 $labels['showinlineimages'] = 'Vis vedlagte bilete under meldinga';
-$labels['autosavedraft'] = 'Lagra kladd automatisk';
-$labels['everynminutes'] = 'kvart $n minutt';
-$labels['refreshinterval'] = 'Oppdater (sjekk for nye meldingar osv.)';
-$labels['never'] = 'aldri';
-$labels['immediately'] = 'med ein gong';
+$labels['autosavedraft']  = 'Lagra kladd automatisk';
+$labels['everynminutes']  = 'kvart $n minutt';
+$labels['refreshinterval']  = 'Oppdater (sjekk for nye meldingar osv.)';
+$labels['never']  = 'aldri';
+$labels['immediately']  = 'med ein gong';
 $labels['messagesdisplaying'] = 'Meldingar som viser';
 $labels['messagescomposition'] = 'Meldingar sin komposisjon';
 $labels['mimeparamfolding'] = 'Vedleggsnamn';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Når du svarar eller sender vidare, plasser sign
 $labels['belowquote'] = 'nedanfor siteringa';
 $labels['abovequote'] = 'oppanfor siteringa';
 $labels['insertsignature'] = 'Sett inn signatur';
-$labels['previewpanemarkread'] = 'Merk forehandsviste epostar som leste';
-$labels['afternseconds'] = 'etter $n sekund';
+$labels['previewpanemarkread']  = 'Merk forehandsviste epostar som leste';
+$labels['afternseconds']  = 'etter $n sekund';
 $labels['reqmdn'] = 'Alltid be om svarkvittering';
 $labels['reqdsn'] = 'Alltid be om leveringsstatus';
 $labels['replysamefolder'] = 'Legg svar i mappa til meldinga det vert svara på';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Registrer protokollhandsaming for mailto-lenkje
 $labels['forwardmode'] = 'Meldingar vidaresendast';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
-$labels['folder'] = 'Mappe';
-$labels['foldername'] = 'Mappenamn';
-$labels['subscribed'] = 'Abonnert';
+
+$labels['folder']  = 'Mappe';
+$labels['folders']  = 'Mapper';
+$labels['foldername']  = 'Mappenamn';
+$labels['subscribed']  = 'Abonnert';
 $labels['messagecount'] = 'Meldingar';
-$labels['create'] = 'Opprette';
-$labels['createfolder'] = 'Opprett ny mappe';
-$labels['managefolders'] = 'Mappehandsaming';
+$labels['create']  = 'Opprette';
+$labels['createfolder']  = 'Opprett ny mappe';
+$labels['managefolders']  = 'Mappehandsaming';
 $labels['specialfolders'] = 'Spesialmapper';
 $labels['properties'] = 'Eigenskapar';
 $labels['folderproperties'] = 'Eigenskapar for mappe';
@@ -427,23 +491,29 @@ $labels['info'] = 'Informasjon';
 $labels['getfoldersize'] = 'Klikk for å få mappestørrelse';
 $labels['changesubscription'] = 'Klikk for å endre abonnement';
 $labels['foldertype'] = 'Mappetype';
-$labels['personalfolder'] = 'Privat mappe';
-$labels['otherfolder'] = 'Annan brukar si mappe';
-$labels['sharedfolder'] = 'Offentleg mappe';
+$labels['personalfolder']  = 'Privat mappe';
+$labels['otherfolder']  = 'Annan brukar si mappe';
+$labels['sharedfolder']  = 'Offentleg mappe';
+
 $labels['sortby'] = 'Sorter etter';
-$labels['sortasc'] = 'Sorter stigande';
+$labels['sortasc']  = 'Sorter stigande';
 $labels['sortdesc'] = 'Sorter søkkjande';
 $labels['undo'] = 'Gjer om';
+
 $labels['installedplugins'] = 'Installerte tillegg';
 $labels['plugin'] = 'Tilleggsmodul';
 $labels['version'] = 'Versjon';
 $labels['source'] = 'Kjelde';
 $labels['license'] = 'Lisens';
 $labels['support'] = 'Få hjelp';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'UNicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Vest-europesik';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index dbfc396db..e82beaf93 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NO/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Noko gjekk feil.';
-$messages['loginfailed'] = 'Feil ved innlogging.';
+$messages['errortitle']  = 'Noko gjekk feil.';
+$messages['loginfailed']  = 'Feil ved innlogging.';
 $messages['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies).';
 $messages['sessionerror'] = 'Økta di er ugyldig eller har gått ut på tid.';
 $messages['storageerror'] = 'Tilkoplinga til lagringstenaren vart mislukka.';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Klarte ikkje flytte meldinga(r).';
 $messages['errorcopying'] = 'Klarte ikkje kopiera meldinga(r).';
 $messages['errordeleting'] = 'Klarte ikkje sletta meldinga(r).';
 $messages['errormarking'] = 'Klarte ikkje markera meldinga(r).';
-$messages['deletecontactconfirm'] = 'Sletta kontakt(ar)?';
-$messages['deletegroupconfirm'] = 'Vil du sletta den valde gruppa?';
+$messages['deletecontactconfirm']  = 'Sletta kontakt(ar)?';
+$messages['deletegroupconfirm']  = 'Vil du sletta den valde gruppa?';
 $messages['deletemessagesconfirm'] = 'Sletta melding(ar)?';
-$messages['deletefolderconfirm'] = 'Sletta mappa?';
-$messages['purgefolderconfirm'] = 'Sletta alle meldingane i denne mappa?';
+$messages['deletefolderconfirm']  = 'Sletta mappa?';
+$messages['purgefolderconfirm']  = 'Sletta alle meldingane i denne mappa?';
 $messages['contactdeleting'] = 'Slettar kontakt(ar) …';
 $messages['groupdeleting'] = 'Slettar gruppe …';
 $messages['folderdeleting'] = 'Slettar mappe …';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Abonnerer på mappe …';
 $messages['folderunsubscribing'] = 'Avsluttar mappeabonnement …';
 $messages['formincomplete'] = 'Skjemaet var ikkje fullstendig fylt ut.';
 $messages['noemailwarning'] = 'Skriv ei gyldig e-postadresse.';
-$messages['nonamewarning'] = 'Skriv eit namn.';
+$messages['nonamewarning']  = 'Skriv eit namn.';
 $messages['nopagesizewarning'] = 'Oppgje sidestorleik.';
 $messages['nosenderwarning'] = 'Skriv inn avsendar si e-postadresse';
 $messages['norecipientwarning'] = 'Skriv minst ein mottakar.';
-$messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skriva eitt emne no?';
+$messages['nosubjectwarning']  = 'Emnefeltet er tomt. Vil du skriva eitt emne no?';
 $messages['nobodywarning'] = 'Senda meldinga utan tekst?';
 $messages['notsentwarning'] = 'Meldinga er ikkje sendt. Vil du kasta ho?';
 $messages['noldapserver'] = 'Vel LDAP-tenar å søkja i.';
@@ -163,3 +166,4 @@ $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 9f090400e..47a00f645 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -2,59 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Witamy w $product';
-$labels['username'] = 'Nazwa';
-$labels['password'] = 'Hasło';
-$labels['server'] = 'Serwer';
-$labels['login'] = 'Zaloguj';
-$labels['logout'] = 'Wyloguj';
-$labels['mail'] = 'Poczta';
+
+// login page
+$labels['welcome']   = 'Witamy w $product';
+$labels['username']  = 'Nazwa';
+$labels['password']  = 'Hasło';
+$labels['server']    = 'Serwer';
+$labels['login']     = 'Zaloguj';
+
+// taskbar
+$labels['logout']   = 'Wyloguj';
+$labels['mail']     = 'Poczta';
 $labels['settings'] = 'Ustawienia';
 $labels['addressbook'] = 'Książka adresowa';
-$labels['inbox'] = 'Odebrane';
+
+// mailbox names
+$labels['inbox']  = 'Odebrane';
 $labels['drafts'] = 'Kopie robocze';
-$labels['sent'] = 'Wysłane';
-$labels['trash'] = 'Kosz';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Wysłane';
+$labels['trash']  = 'Kosz';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Temat';
-$labels['from'] = 'Od';
-$labels['to'] = 'Do';
-$labels['cc'] = 'Kopia';
-$labels['bcc'] = 'Ukryta kopia';
+$labels['from']    = 'Od';
+$labels['sender']  = 'Nadawca';
+$labels['to']      = 'Do';
+$labels['cc']      = 'Kopia';
+$labels['bcc']     = 'Ukryta kopia';
 $labels['replyto'] = 'Odpowiedź do';
 $labels['followupto'] = 'Kontynuacja do';
-$labels['date'] = 'Data';
-$labels['size'] = 'Rozmiar';
+$labels['date']    = 'Data';
+$labels['size']    = 'Rozmiar';
 $labels['priority'] = 'Priorytet';
 $labels['organization'] = 'Organizacja';
 $labels['readstatus'] = 'Przeczytano';
 $labels['listoptions'] = 'Opcje listy...';
+
 $labels['mailboxlist'] = 'Foldery';
-$labels['folders'] = 'Foldery';
 $labels['messagesfromto'] = 'Wiadomości od $from do $to z $count';
 $labels['threadsfromto'] = 'Wątki od $from do $to z $count';
 $labels['messagenrof'] = 'Wiadomość $nr z $count';
 $labels['fromtoshort'] = '$from - $to z $count';
-$labels['copy'] = 'Kopiuj';
-$labels['move'] = 'Przenieś';
-$labels['moveto'] = 'Przenieś do...';
+
+$labels['copy']     = 'Kopiuj';
+$labels['move']     = 'Przenieś';
+$labels['moveto']   = 'Przenieś do...';
 $labels['download'] = 'Pobierz';
 $labels['showattachment'] = 'Pokaż';
+$labels['showanyway'] = 'Pokaż';
+
 $labels['filename'] = 'Nazwa pliku';
 $labels['filesize'] = 'Rozmiar pliku';
+
 $labels['addtoaddressbook'] = 'Dodaj do książki adresowej';
+
+// weekdays short
 $labels['sun'] = 'Nd';
 $labels['mon'] = 'Pn';
 $labels['tue'] = 'Wt';
@@ -62,74 +80,83 @@ $labels['wed'] = 'Śr';
 $labels['thu'] = 'Czw';
 $labels['fri'] = 'Pt';
 $labels['sat'] = 'Sb';
-$labels['sunday'] = 'Niedziela';
-$labels['monday'] = 'Poniedziałek';
-$labels['tuesday'] = 'Wtorek';
+
+// weekdays long
+$labels['sunday']    = 'Niedziela';
+$labels['monday']    = 'Poniedziałek';
+$labels['tuesday']   = 'Wtorek';
 $labels['wednesday'] = 'Środa';
-$labels['thursday'] = 'Czwartek';
-$labels['friday'] = 'Piątek';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'sty';
-$labels['feb'] = 'lut';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'Kwi';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Cze';
-$labels['jul'] = 'Lip';
-$labels['aug'] = 'Sie';
-$labels['sep'] = 'Wrz';
-$labels['oct'] = 'Paź';
-$labels['nov'] = 'Lis';
-$labels['dec'] = 'Gru';
-$labels['longjan'] = 'styczeń';
-$labels['longfeb'] = 'luty';
-$labels['longmar'] = 'marzec';
-$labels['longapr'] = 'kwiecień';
-$labels['longjun'] = 'czerwiec';
-$labels['longjul'] = 'lipiec';
-$labels['longaug'] = 'sierpień';
-$labels['longsep'] = 'wrzesień';
-$labels['longoct'] = 'październik';
-$labels['longnov'] = 'listopad';
-$labels['longdec'] = 'grudzień';
+$labels['thursday']  = 'Czwartek';
+$labels['friday']    = 'Piątek';
+$labels['saturday']  = 'Sobota';
+
+// months short
+$labels['jan']	= 'sty';
+$labels['feb']	= 'lut';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'Kwi';
+$labels['may']	= 'Maj';
+$labels['jun']	= 'Cze';
+$labels['jul'] 	= 'Lip';
+$labels['aug']	= 'Sie';
+$labels['sep']	= 'Wrz';
+$labels['oct']	= 'Paź';
+$labels['nov']	= 'Lis';
+$labels['dec']	= 'Gru';
+
+// months long
+$labels['longjan']	= 'styczeń';
+$labels['longfeb']	= 'luty';
+$labels['longmar']	= 'marzec';
+$labels['longapr']	= 'kwiecień';
+$labels['longmay']	= 'Maj';
+$labels['longjun']	= 'czerwiec';
+$labels['longjul']	= 'lipiec';
+$labels['longaug']	= 'sierpień';
+$labels['longsep']	= 'wrzesień';
+$labels['longoct']	= 'październik';
+$labels['longnov']	= 'listopad';
+$labels['longdec']	= 'grudzień';
+
 $labels['today'] = 'Dzisiaj';
-$labels['refresh'] = 'Odśwież';
-$labels['checkmail'] = 'Sprawdź skrzynkę';
-$labels['compose'] = 'Utwórz';
-$labels['writenewmessage'] = 'Utwórz nową wiadomość';
-$labels['reply'] = 'Odpowiedz';
-$labels['replytomessage'] = 'Odpowiedz nadawcy';
+
+// toolbar buttons
+$labels['refresh']          = 'Odśwież';
+$labels['checkmail']        = 'Sprawdź skrzynkę';
+$labels['compose']          = 'Utwórz';
+$labels['writenewmessage']  = 'Utwórz nową wiadomość';
+$labels['reply']            = 'Odpowiedz';
+$labels['replytomessage']   = 'Odpowiedz nadawcy';
 $labels['replytoallmessage'] = 'Odpowiedz wszystkim';
-$labels['replyall'] = 'Odpowiedz wszystkim';
-$labels['replylist'] = 'Odpowiedz na listę';
-$labels['forward'] = 'Przekaż';
-$labels['forwardinline'] = 'Prześlij w treści';
+$labels['replyall']         = 'Odpowiedz wszystkim';
+$labels['replylist']        = 'Odpowiedz na listę';
+$labels['forward']          = 'Przekaż';
+$labels['forwardinline']    = 'Prześlij w treści';
 $labels['forwardattachment'] = 'Prześlij jako załącznik';
-$labels['forwardmessage'] = 'Prześlij dalej';
-$labels['deletemessage'] = 'Usuń wiadomości';
+$labels['forwardmessage']   = 'Prześlij dalej';
+$labels['deletemessage']    = 'Usuń wiadomości';
 $labels['movemessagetotrash'] = 'Przenieś wiadomości do Kosza';
-$labels['printmessage'] = 'Drukuj wiadomość';
-$labels['previousmessage'] = 'Poprzednia wiadomość';
-$labels['firstmessage'] = 'Pierwsza wiadomość';
-$labels['nextmessage'] = 'Następna wiadomość';
-$labels['lastmessage'] = 'Ostatnia wiadomość';
-$labels['backtolist'] = 'Pokaż listę wiadomości';
-$labels['viewsource'] = 'Pokaż źródło';
-$labels['mark'] = 'Oznacz';
-$labels['markmessages'] = 'Oznacz wiadomości';
-$labels['markread'] = 'Jako przeczytane';
-$labels['markunread'] = 'Jako nieprzeczytane';
-$labels['markflagged'] = 'Jako oflagowane';
-$labels['markunflagged'] = 'Jako nieoflagowane';
-$labels['moreactions'] = 'Więcej akcji...';
-$labels['more'] = 'Więcej';
-$labels['back'] = 'Wstecz';
-$labels['options'] = 'Ustawienia';
+$labels['printmessage']     = 'Drukuj wiadomość';
+$labels['previousmessage']  = 'Poprzednia wiadomość';
+$labels['firstmessage']     = 'Pierwsza wiadomość';
+$labels['nextmessage']      = 'Następna wiadomość';
+$labels['lastmessage']      = 'Ostatnia wiadomość';
+$labels['backtolist']       = 'Pokaż listę wiadomości';
+$labels['viewsource']       = 'Pokaż źródło';
+$labels['mark']             = 'Oznacz';
+$labels['markmessages']     = 'Oznacz wiadomości';
+$labels['markread']         = 'Jako przeczytane';
+$labels['markunread']       = 'Jako nieprzeczytane';
+$labels['markflagged']      = 'Jako oflagowane';
+$labels['markunflagged']    = 'Jako nieoflagowane';
+$labels['moreactions']      = 'Więcej akcji...';
+$labels['more']             = 'Więcej';
+$labels['back']             = 'Wstecz';
+$labels['options']          = 'Ustawienia';
+
 $labels['select'] = 'Zaznacz';
 $labels['all'] = 'Wszystkie';
 $labels['none'] = 'Brak';
-$labels['nonesort'] = 'Brak';
 $labels['currpage'] = 'Bieżąca strona';
 $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';
@@ -144,12 +171,14 @@ $labels['expand-all'] = 'Rozwiń wszystkie';
 $labels['expand-unread'] = 'Rozwiń nieprzeczytane';
 $labels['collapse-all'] = 'Zwiń wszystkie';
 $labels['threaded'] = 'Powątkowane';
+
 $labels['autoexpand_threads'] = 'Rozwijaj wątki';
 $labels['do_expand'] = 'wszystkie';
 $labels['expand_only_unread'] = 'tylko nieprzeczytane';
 $labels['fromto'] = 'Od/Do';
 $labels['flag'] = 'Flaga';
 $labels['attachment'] = 'Załącznik';
+$labels['nonesort'] = 'Brak';
 $labels['sentdate'] = 'Data wysyłki';
 $labels['arrival'] = 'Data odbioru';
 $labels['asc'] = 'rosnąco';
@@ -158,147 +187,174 @@ $labels['listcolumns'] = 'Kolumny';
 $labels['listsorting'] = 'Porządek sortowania';
 $labels['listorder'] = 'Kierunek sortowania';
 $labels['listmode'] = 'Typ listy';
+
 $labels['folderactions'] = 'Działania na folderach...';
 $labels['compact'] = 'Porządkuj';
 $labels['empty'] = 'Opróżnij';
+
 $labels['quota'] = 'Użyte miejsce';
-$labels['unknown'] = 'nieznane';
-$labels['unlimited'] = 'bez limitu';
-$labels['quicksearch'] = 'Szybkie wyszukiwanie';
-$labels['resetsearch'] = 'Wyczyść filtr';
-$labels['searchmod'] = 'Parametry wyszukiwania';
-$labels['msgtext'] = 'Cała wiadomość';
+$labels['unknown']  = 'nieznane';
+$labels['unlimited']  = 'bez limitu';
+
+$labels['quicksearch']  = 'Szybkie wyszukiwanie';
+$labels['resetsearch']  = 'Wyczyść filtr';
+$labels['searchmod']  = 'Parametry wyszukiwania';
+$labels['msgtext']  = 'Cała wiadomość';
+$labels['body']  = 'Treść';
+
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
-$labels['editasnew'] = 'Edytuj jako nową';
-$labels['send'] = 'Wyślij';
-$labels['sendmessage'] = 'Wyślij teraz';
-$labels['savemessage'] = 'Zapisz kopię roboczą';
-$labels['addattachment'] = 'Dołącz plik';
-$labels['charset'] = 'Kodowanie znaków';
-$labels['editortype'] = 'Typ edytora';
-$labels['returnreceipt'] = 'Potwierdzenie odbioru';
-$labels['dsn'] = 'Status dostarczenia (DSN)';
+
+// message compose
+$labels['editasnew']      = 'Edytuj jako nową';
+$labels['send']           = 'Wyślij';
+$labels['sendmessage']    = 'Wyślij teraz';
+$labels['savemessage']    = 'Zapisz kopię roboczą';
+$labels['addattachment']  = 'Dołącz plik';
+$labels['charset']        = 'Kodowanie znaków';
+$labels['editortype']     = 'Typ edytora';
+$labels['returnreceipt']  = 'Potwierdzenie odbioru';
+$labels['dsn']            = 'Status dostarczenia (DSN)';
 $labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):';
 $labels['originalmessage'] = 'Wiadomość oryginalna';
-$labels['editidents'] = 'Edytuj tożsamości';
-$labels['spellcheck'] = 'Pisownia';
+
+$labels['editidents']    = 'Edytuj tożsamości';
+$labels['spellcheck']    = 'Pisownia';
 $labels['checkspelling'] = 'Sprawdź pisownię';
 $labels['resumeediting'] = 'Zakończ sprawdzanie pisowni';
-$labels['revertto'] = 'Powróć do';
+$labels['revertto']      = 'Powróć do';
+
 $labels['attach'] = 'Załącz';
 $labels['attachments'] = 'Załączniki';
 $labels['upload'] = 'Prześlij';
 $labels['uploadprogress'] = '$percent ($current z $total)';
-$labels['close'] = 'Zamknij';
-$labels['messageoptions'] = 'Opcje wiadomości...';
-$labels['low'] = 'Bardzo niski';
-$labels['lowest'] = 'Niski';
-$labels['normal'] = 'Normalny';
-$labels['high'] = 'Wysoki';
+$labels['close']  = 'Zamknij';
+$labels['messageoptions']  = 'Opcje wiadomości...';
+
+$labels['low']     = 'Bardzo niski';
+$labels['lowest']  = 'Niski';
+$labels['normal']  = 'Normalny';
+$labels['high']    = 'Wysoki';
 $labels['highest'] = 'Bardzo wysoki';
-$labels['nosubject'] = '(brak tematu)';
+
+$labels['nosubject']  = '(brak tematu)';
 $labels['showimages'] = 'Wyświetl obrazki';
 $labels['alwaysshow'] = 'Zawsze wyświetlaj obrazki od $sender';
-$labels['isdraft'] = 'To jest kopia robocza wiadomości.';
-$labels['andnmore'] = '$nr więcej...';
+$labels['isdraft']    = 'To jest kopia robocza wiadomości.';
+$labels['andnmore']   = '$nr więcej...';
 $labels['togglemoreheaders'] = 'Pokaż więcej nagłówków wiadomości';
 $labels['togglefullheaders'] = 'Przełącz podgląd nagłówków wiadomości';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Zwykły tekst';
 $labels['savesentmessagein'] = 'Zapisz wiadomość w';
 $labels['dontsave'] = 'nie zapisuj';
 $labels['maxuploadsize'] = 'Maksymalny rozmiar pliku to $size';
+
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj Reply-To';
 $labels['addfollowupto'] = 'Dodaj Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Nadawca zażądał potwierdzenia przeczytania tej wiadomości. Czy chcesz go powiadomić?';
 $labels['receiptread'] = 'Potwierdzenie otrzymania';
 $labels['yourmessage'] = 'To jest potwierdzenie dostarczenia Twojej wiadomości';
 $labels['receiptnote'] = 'Uwaga: To potwierdzenie dostarczenia wiadomości oznacza tylko, że wiadomość została wyświetlona na komputerze adresata. Nie ma żadnej gwarancji, że odbiorca przeczytał czy też zrozumiał treść wiadomości.';
-$labels['name'] = 'Nazwa';
-$labels['firstname'] = 'Imię';
-$labels['surname'] = 'Nazwisko';
-$labels['middlename'] = 'Drugie imię';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Sufiks';
-$labels['nickname'] = 'Pseudonim';
-$labels['jobtitle'] = 'Zawód';
-$labels['department'] = 'Oddział';
-$labels['gender'] = 'Płeć';
-$labels['maidenname'] = 'N. panieńskie';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adres';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Miasto';
-$labels['zipcode'] = 'Kod';
-$labels['region'] = 'Region';
-$labels['country'] = 'Kraj';
-$labels['birthday'] = 'Urodziny';
-$labels['anniversary'] = 'Jubileusz';
-$labels['website'] = 'Strona internetowa';
+
+// address boook
+$labels['name']         = 'Nazwa';
+$labels['firstname']    = 'Imię';
+$labels['surname']      = 'Nazwisko';
+$labels['middlename']   = 'Drugie imię';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Sufiks';
+$labels['nickname']     = 'Pseudonim';
+$labels['jobtitle']     = 'Zawód';
+$labels['department']   = 'Oddział';
+$labels['gender']       = 'Płeć';
+$labels['maidenname']   = 'N. panieńskie';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adres';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Miasto';
+$labels['zipcode']      = 'Kod';
+$labels['region']       = 'Region';
+$labels['country']      = 'Kraj';
+$labels['birthday']     = 'Urodziny';
+$labels['anniversary']  = 'Jubileusz';
+$labels['website']      = 'Strona internetowa';
 $labels['instantmessenger'] = 'Komunikator';
 $labels['notes'] = 'Notatki';
-$labels['male'] = 'mężczyzna';
+$labels['male']   = 'mężczyzna';
 $labels['female'] = 'kobieta';
 $labels['manager'] = 'Kierownik';
 $labels['assistant'] = 'Asystent';
-$labels['typeassistant'] = 'Asystent';
 $labels['spouse'] = 'Małżonek';
 $labels['allfields'] = 'Wszystkie pola';
 $labels['search'] = 'Szukaj';
 $labels['advsearch'] = 'Wyszukiwanie zaawansowane';
 $labels['advanced'] = 'Zaawansowane';
 $labels['other'] = 'Inne';
-$labels['typeother'] = 'Inne';
-$labels['typehome'] = 'Dom';
-$labels['typework'] = 'Praca';
-$labels['typemobile'] = 'Komórkowy';
-$labels['typemain'] = 'Główny';
-$labels['typehomefax'] = 'Fax domowy';
-$labels['typeworkfax'] = 'Fax firmowy';
-$labels['typecar'] = 'Samochód';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Wideo';
-$labels['typehomepage'] = 'Strona domowa';
+
+$labels['typehome']   = 'Dom';
+$labels['typework']   = 'Praca';
+$labels['typeother']  = 'Inne';
+$labels['typemobile']  = 'Komórkowy';
+$labels['typemain']  = 'Główny';
+$labels['typehomefax']  = 'Fax domowy';
+$labels['typeworkfax']  = 'Fax firmowy';
+$labels['typecar']  = 'Samochód';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Wideo';
+$labels['typeassistant']  = 'Asystent';
+$labels['typehomepage']  = 'Strona domowa';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj pole...';
 $labels['addcontact'] = 'Dodaj nowy kontakt do książki adresowej';
 $labels['editcontact'] = 'Edytuj kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Właściwości';
 $labels['personalinfo'] = 'Informacje osobiste';
-$labels['edit'] = 'Edytuj';
+
+$labels['edit']   = 'Edytuj';
 $labels['cancel'] = 'Anuluj';
-$labels['save'] = 'Zapisz';
+$labels['save']   = 'Zapisz';
 $labels['delete'] = 'Usuń';
 $labels['rename'] = 'Zmień nazwę';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamień';
 $labels['uploadphoto'] = 'Wyślij zdjęcie';
-$labels['newcontact'] = 'Dodaj nowy kontakt';
-$labels['deletecontact'] = 'Usuń zaznaczone kontakty';
-$labels['composeto'] = 'Utwórz wiadomość do wybranych kontaktów';
+
+$labels['newcontact']     = 'Dodaj nowy kontakt';
+$labels['deletecontact']  = 'Usuń zaznaczone kontakty';
+$labels['composeto']      = 'Utwórz wiadomość do wybranych kontaktów';
 $labels['contactsfromto'] = 'Kontakty od $from do $to z $count';
-$labels['print'] = 'Drukuj';
-$labels['export'] = 'Eksportuj';
-$labels['exportvcards'] = 'Eksport kontaktów w formacie vCard';
+$labels['print']          = 'Drukuj';
+$labels['export']         = 'Eksportuj';
+$labels['exportall']      = 'Eksportuj wszystkie';
+$labels['exportsel']      = 'Eksportuj zaznaczone';
+$labels['exportvcards']   = 'Eksport kontaktów w formacie vCard';
 $labels['newcontactgroup'] = 'Utwórz nową grupę';
-$labels['grouprename'] = 'Zmień nazwę grupy';
-$labels['groupdelete'] = 'Usuń grupę';
+$labels['grouprename']    = 'Zmień nazwę grupy';
+$labels['groupdelete']    = 'Usuń grupę';
 $labels['groupremoveselected'] = 'Usuń wybrane kontakty z grupy';
-$labels['previouspage'] = 'Poprzednia strona';
-$labels['firstpage'] = 'Pierwsza strona';
-$labels['nextpage'] = 'Następna strona';
-$labels['lastpage'] = 'Ostatnia strona';
+
+$labels['previouspage']   = 'Poprzednia strona';
+$labels['firstpage']      = 'Pierwsza strona';
+$labels['nextpage']       = 'Następna strona';
+$labels['lastpage']       = 'Ostatnia strona';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupy';
 $labels['personaladrbook'] = 'Kontakty osobiste';
+
 $labels['searchsave'] = 'Zapisz wyszukiwanie';
 $labels['searchdelete'] = 'Usuń wyszukiwanie';
+
 $labels['import'] = 'Importuj';
 $labels['importcontacts'] = 'Import kontaktów';
 $labels['importfromfile'] = 'Import z pliku:';
@@ -306,29 +362,36 @@ $labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
 $labels['importreplace'] = 'Zastąp całą książkę adresową';
 $labels['importdesc'] = 'Import kontaktów z isniejącej książki adresowej.<br/>Obecnie obsługiwany jest import w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> lub CSV (pola oddzielone przecinkiem).';
 $labels['done'] = 'Wykonane';
+
+// settings
 $labels['settingsfor'] = 'Ustawienia dla';
 $labels['about'] = 'O programie';
 $labels['preferences'] = 'Preferencje';
 $labels['userpreferences'] = 'Preferencje użytkownika';
 $labels['editpreferences'] = 'Edytuj preferencje';
+
 $labels['identities'] = 'Tożsamości';
 $labels['manageidentities'] = 'Zarządzaj tożsamościami';
 $labels['newidentity'] = 'Nowa tożsamość';
+
 $labels['newitem'] = 'Nowy';
 $labels['edititem'] = 'Edytuj';
+
 $labels['preferhtml'] = 'Domyślny HTML';
 $labels['defaultcharset'] = 'Domyślny zestaw znaków';
 $labels['htmlmessage'] = 'Wiadomość HTML';
+$labels['messagepart'] = 'Część';
+$labels['digitalsig'] = 'Podpis cyfrowy';
 $labels['dateformat'] = 'Format daty';
 $labels['timeformat'] = 'Format czasu';
 $labels['prettydate'] = 'Ładne daty';
-$labels['setdefault'] = 'Domyślna';
-$labels['autodetect'] = '- wybór automatyczny -';
-$labels['language'] = 'Język';
-$labels['timezone'] = 'Strefa czasowa';
-$labels['pagesize'] = 'Liczba wierszy na stronie';
+$labels['setdefault']  = 'Domyślna';
+$labels['autodetect']  = '- wybór automatyczny -';
+$labels['language']  = 'Język';
+$labels['timezone']  = 'Strefa czasowa';
+$labels['pagesize']  = 'Liczba wierszy na stronie';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Czas letni';
+$labels['dstactive']  = 'Czas letni';
 $labels['showinextwin'] = 'Otwórz wiadomość w nowym oknie';
 $labels['composeextwin'] = 'Twórz w nowym oknie';
 $labels['htmleditor'] = 'Twórz wiadomości HTML';
@@ -357,11 +420,11 @@ $labels['showremoteimages'] = 'Wyświetlaj obrazki w wiadomościach';
 $labels['fromknownsenders'] = 'od znanych nadawców';
 $labels['always'] = 'zawsze';
 $labels['showinlineimages'] = 'Wyświetlaj załączone obrazki pod treścią wiadomości';
-$labels['autosavedraft'] = 'Automatycznie zapisuj tworzoną wiadomość';
-$labels['everynminutes'] = 'co $n minut(y)';
-$labels['refreshinterval'] = 'Odświeżanie (sprawdzanie nowych wiadomości, etc.)';
-$labels['never'] = 'nigdy';
-$labels['immediately'] = 'natychmiast';
+$labels['autosavedraft']  = 'Automatycznie zapisuj tworzoną wiadomość';
+$labels['everynminutes']  = 'co $n minut(y)';
+$labels['refreshinterval']  = 'Odświeżanie (sprawdzanie nowych wiadomości, etc.)';
+$labels['never']  = 'nigdy';
+$labels['immediately']  = 'natychmiast';
 $labels['messagesdisplaying'] = 'Wyświetlanie wiadomości';
 $labels['messagescomposition'] = 'Tworzenie wiadomości';
 $labels['mimeparamfolding'] = 'Stosuj nazwy załączników zgodne z';
@@ -392,11 +455,12 @@ $labels['replysignaturepos'] = 'Podczas odpowiedzi wstaw podpis';
 $labels['belowquote'] = 'poniżej cytowanej treści';
 $labels['abovequote'] = 'ponad cytowaną treścią';
 $labels['insertsignature'] = 'Wstaw podpis';
-$labels['previewpanemarkread'] = 'Oznacz podglądane wiadomości jako przeczytane';
-$labels['afternseconds'] = 'po $n sekundach';
+$labels['previewpanemarkread']  = 'Oznacz podglądane wiadomości jako przeczytane';
+$labels['afternseconds']  = 'po $n sekundach';
 $labels['reqmdn'] = 'Zawsze żądaj potwierdzenia odbioru';
 $labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
 $labels['replysamefolder'] = 'Umieszczaj odpowiedzi w folderze wiadomości, na którą odpowiadam';
+$labels['defaultabook'] = 'Domyślna książka adresowa';
 $labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
 $labels['listnamedisplay'] = 'Wyświetl kontakty jako';
 $labels['spellcheckbeforesend'] = 'Przed wysłaniem wiadomości sprawdzaj pisownię';
@@ -409,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Zainstaluj obsługę linków mailto:';
 $labels['forwardmode'] = 'Przekazywanie wiadomości';
 $labels['inline'] = 'w treści';
 $labels['asattachment'] = 'jako załącznik';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Nazwa folderu';
-$labels['subscribed'] = 'Zasubskrybowany';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Foldery';
+$labels['foldername']  = 'Nazwa folderu';
+$labels['subscribed']  = 'Zasubskrybowany';
 $labels['messagecount'] = 'Wiadomości';
-$labels['create'] = 'Utwórz';
-$labels['createfolder'] = 'Utwórz nowy folder';
-$labels['managefolders'] = 'Zarządzaj folderami';
+$labels['create']  = 'Utwórz';
+$labels['createfolder']  = 'Utwórz nowy folder';
+$labels['managefolders']  = 'Zarządzaj folderami';
 $labels['specialfolders'] = 'Foldery specjalne';
 $labels['properties'] = 'Właściwości';
 $labels['folderproperties'] = 'Właściwości folderu';
@@ -425,23 +491,29 @@ $labels['info'] = 'Informacje';
 $labels['getfoldersize'] = 'Kliknij aby pobrać rozmiar folderu';
 $labels['changesubscription'] = 'Kliknij aby zmienić subskrypcję';
 $labels['foldertype'] = 'Typ folderu';
-$labels['personalfolder'] = 'Folder prywatny';
-$labels['otherfolder'] = 'Folder innego użytkownika';
-$labels['sharedfolder'] = 'Folder współdzielony';
+$labels['personalfolder']  = 'Folder prywatny';
+$labels['otherfolder']  = 'Folder innego użytkownika';
+$labels['sharedfolder']  = 'Folder współdzielony';
+
 $labels['sortby'] = 'Sortuj wg';
-$labels['sortasc'] = 'Rosnąco';
+$labels['sortasc']  = 'Rosnąco';
 $labels['sortdesc'] = 'Malejąco';
 $labels['undo'] = 'Cofnij';
+
 $labels['installedplugins'] = 'Zainstalowane wtyczki';
 $labels['plugin'] = 'Wtyczka';
 $labels['version'] = 'Wersja';
 $labels['source'] = 'Źródła';
 $labels['license'] = 'Licencja';
 $labels['support'] = 'Wsparcie techniczne';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'uniwersalny';
 $labels['english'] = 'angielski';
 $labels['westerneuropean'] = 'zachodnioeuropejski';
@@ -461,3 +533,4 @@ $labels['japanese'] = 'japoński';
 $labels['korean'] = 'koreański';
 $labels['chinese'] = 'chiński';
 
+?>
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 8e7e0b239..68e33fa1b 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Wystąpił błąd!';
-$messages['loginfailed'] = 'Błąd logowania!';
+$messages['errortitle']  = 'Wystąpił błąd!';
+$messages['loginfailed']  = 'Błąd logowania!';
 $messages['cookiesdisabled'] = 'Twoja przeglądarka nie obsługuje ciasteczek!';
 $messages['sessionerror'] = 'Błąd sesji bądź sesja wygasła!';
 $messages['storageerror'] = 'Błąd połączenia z serwerem!';
@@ -57,11 +60,11 @@ $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['deletecontactconfirm'] = 'Czy na pewno chcesz usunąć wybrane kontakty?';
-$messages['deletegroupconfirm'] = 'Czy na pewno chcesz usunąć wybraną grupę?';
+$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?';
-$messages['deletefolderconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
-$messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?';
+$messages['deletefolderconfirm']  = 'Czy na pewno chcesz usunąć wybrany folder?';
+$messages['purgefolderconfirm']  = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?';
 $messages['contactdeleting'] = 'Usuwanie kontaktów...';
 $messages['groupdeleting'] = 'Usuwanie grupy...';
 $messages['folderdeleting'] = 'Usuwanie folderu...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Subskrybowanie folderu...';
 $messages['folderunsubscribing'] = 'Odsubskrybowanie folderu...';
 $messages['formincomplete'] = 'Uzupełnij formularz!';
 $messages['noemailwarning'] = 'Podaj poprawny adres e-mail!';
-$messages['nonamewarning'] = 'Podaj nazwę!';
+$messages['nonamewarning']  = 'Podaj nazwę!';
 $messages['nopagesizewarning'] = 'Podaj poprawną wartość!';
 $messages['nosenderwarning'] = 'Podaj adres nadawcy!';
 $messages['norecipientwarning'] = 'Podaj co najmniej jednego odbiorcę!';
-$messages['nosubjectwarning'] = 'Nie podano tematu wiadomości. Czy chcesz go teraz uzupełnić?';
+$messages['nosubjectwarning']  = 'Nie podano tematu wiadomości. Czy chcesz go teraz uzupełnić?';
 $messages['nobodywarning'] = 'Ta wiadomość jest pusta, czy mimo to chcesz ją wysłać?';
 $messages['notsentwarning'] = 'Wiadomość nie została wysłana. Czy chcesz usunąć tę wiadomość?';
 $messages['noldapserver'] = 'Wybierz serwer LDAP!';
@@ -160,4 +163,7 @@ $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, bo może zawierać złośliwe oprogramowanie.<br/><br/><em>Spodziwany: $expected; znaleziono: $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.';
 
+?>
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 33c2e00fa..93943947a 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ps/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product ته ښه راغلاست';
-$labels['username'] = 'کارن نوم';
-$labels['password'] = 'پټنوم';
-$labels['server'] = 'برابرونکی';
-$labels['login'] = 'ننوتون';
-$labels['logout'] = 'وتون';
-$labels['mail'] = 'برېښناليک';
+
+// login page
+$labels['welcome']   = '$product ته ښه راغلاست';
+$labels['username']  = 'کارن نوم';
+$labels['password']  = 'پټنوم';
+$labels['server']    = 'برابرونکی';
+$labels['login']     = 'ننوتون';
+
+// taskbar
+$labels['logout']   = 'وتون';
+$labels['mail']     = 'برېښناليک';
 $labels['settings'] = 'ځاني برابرونې';
 $labels['addressbook'] = 'پتې کتاب';
-$labels['inbox'] = 'راغلي ليکونه';
+
+// mailbox names
+$labels['inbox']  = 'راغلي ليکونه';
 $labels['drafts'] = 'بارليک';
-$labels['sent'] = 'لېږل شوي ليکونه';
-$labels['trash'] = 'کثافت دانۍ';
-$labels['junk'] = 'جنک';
+$labels['sent']   = 'لېږل شوي ليکونه';
+$labels['trash']  = 'کثافت دانۍ';
+$labels['junk']   = 'جنک';
+
+// message listing
 $labels['subject'] = 'مضمون';
-$labels['from'] = 'استوونکی';
-$labels['to'] = 'ترلاسه کوونکی';
-$labels['cc'] = 'لمېسل';
-$labels['bcc'] = 'پټليکی';
+$labels['from']    = 'استوونکی';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'ترلاسه کوونکی';
+$labels['cc']      = 'لمېسل';
+$labels['bcc']     = 'پټليکی';
 $labels['replyto'] = 'ځوابول';
-$labels['date'] = 'نېټه';
-$labels['size'] = 'کچه';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'نېټه';
+$labels['size']    = 'کچه';
 $labels['priority'] = 'لومړيتوب';
 $labels['organization'] = 'ټولنه';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'پوښۍ';
-$labels['folders'] = 'پوښۍ';
 $labels['messagesfromto'] = 'له ټاکلي استوزو څخه ټاکلي شمېرل شوو استوزو ته';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'له $nr ځخه استوزو $count استوزو ته';
-$labels['copy'] = 'لمېسل';
-$labels['moveto'] = 'ته خوځوي';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'لمېسل';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'ته خوځوي';
 $labels['download'] = 'ښکته کول';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'فايل نوم';
 $labels['filesize'] = 'فايل کچه';
+
 $labels['addtoaddressbook'] = 'د پتو کتاب ته يې ورزيات کړئ';
+
+// weekdays short
 $labels['sun'] = 'يوه نۍ';
 $labels['mon'] = 'دوه نۍ';
 $labels['tue'] = 'درې نۍ';
@@ -55,154 +80,323 @@ $labels['wed'] = 'څلورنۍ';
 $labels['thu'] = 'پنځنۍ';
 $labels['fri'] = 'جمعه';
 $labels['sat'] = 'نۍ';
-$labels['sunday'] = 'يوه نۍ';
-$labels['monday'] = 'دوه نۍ';
-$labels['tuesday'] = 'درې نۍ';
+
+// weekdays long
+$labels['sunday']    = 'يوه نۍ';
+$labels['monday']    = 'دوه نۍ';
+$labels['tuesday']   = 'درې نۍ';
 $labels['wednesday'] = 'منځنۍ';
-$labels['thursday'] = 'پنځنۍ';
-$labels['friday'] = 'جمعه';
-$labels['saturday'] = 'نۍ';
-$labels['jan'] = 'حنوري';
-$labels['feb'] = 'فبروري';
-$labels['mar'] = 'مارچ';
-$labels['apr'] = 'اپريل';
-$labels['may'] = 'مئ';
-$labels['longmay'] = 'مئ';
-$labels['jun'] = 'جون';
-$labels['jul'] = 'جولاي';
-$labels['aug'] = 'اګست';
-$labels['sep'] = 'سپتمپر';
-$labels['oct'] = 'اکتوبر';
-$labels['nov'] = 'نومبر';
-$labels['dec'] = 'ډسمبر';
-$labels['longjan'] = 'جنوري';
-$labels['longfeb'] = 'فبروري';
-$labels['longmar'] = 'مارچ';
-$labels['longapr'] = 'اپريل';
-$labels['longjun'] = 'جون';
-$labels['longjul'] = 'جولای';
-$labels['longaug'] = 'اګست';
-$labels['longsep'] = 'سپتمبر';
-$labels['longoct'] = 'اکتوبر';
-$labels['longnov'] = 'نومبر';
-$labels['longdec'] = 'ډسمبر';
+$labels['thursday']  = 'پنځنۍ';
+$labels['friday']    = 'جمعه';
+$labels['saturday']  = 'نۍ';
+
+// months short
+$labels['jan']	= 'حنوري';
+$labels['feb']	= 'فبروري';
+$labels['mar']	= 'مارچ';
+$labels['apr']	= 'اپريل';
+$labels['may']	= 'مئ';
+$labels['jun']	= 'جون';
+$labels['jul'] 	= 'جولاي';
+$labels['aug']	= 'اګست';
+$labels['sep']	= 'سپتمپر';
+$labels['oct']	= 'اکتوبر';
+$labels['nov']	= 'نومبر';
+$labels['dec']	= 'ډسمبر';
+
+// months long
+$labels['longjan']	= 'جنوري';
+$labels['longfeb']	= 'فبروري';
+$labels['longmar']	= 'مارچ';
+$labels['longapr']	= 'اپريل';
+$labels['longmay']	= 'مئ';
+$labels['longjun']	= 'جون';
+$labels['longjul']	= 'جولای';
+$labels['longaug']	= 'اګست';
+$labels['longsep']	= 'سپتمبر';
+$labels['longoct']	= 'اکتوبر';
+$labels['longnov']	= 'نومبر';
+$labels['longdec']	= 'ډسمبر';
+
 $labels['today'] = 'نن';
-$labels['checkmail'] = 'نوي استوزي وګوره';
-$labels['compose'] = 'استوزه وليکه';
-$labels['writenewmessage'] = 'نوي استوزي جوړول';
-$labels['replytomessage'] = 'استوونکي ته ځواب ورکړئ';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'نوي استوزي وګوره';
+$labels['compose']          = 'استوزه وليکه';
+$labels['writenewmessage']  = 'نوي استوزي جوړول';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'استوونکي ته ځواب ورکړئ';
 $labels['replytoallmessage'] = 'استوونکي او ټولو ترلاسه کوونکو ته ځواب لېږل';
-$labels['forwardmessage'] = 'استوزه بل ته استول';
-$labels['deletemessage'] = 'استوزه ړنګول';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'استوزه بل ته استول';
+$labels['deletemessage']    = 'استوزه ړنګول';
 $labels['movemessagetotrash'] = 'استوزه کثافت داني ته واستوه';
-$labels['printmessage'] = 'دا استوزه چاپ کړه';
-$labels['previousmessage'] = 'پخوانۍ استوزه وښيه';
-$labels['firstmessage'] = 'لومړی استوزه وښيه';
-$labels['nextmessage'] = 'ورپسې استوزه وښيه';
-$labels['lastmessage'] = 'پای /آخري استوزه وښيه';
-$labels['backtolist'] = 'بيرته د استوزو لست ته';
-$labels['viewsource'] = 'سرچينه وښيه';
-$labels['markmessages'] = 'استوزي په نښه کړئ';
-$labels['markread'] = 'لوستل شوي په توګه';
-$labels['markunread'] = 'د نالوستل شوي په توګه';
-$labels['markflagged'] = 'د بي کاره په توګه';
-$labels['markunflagged'] = 'د کارونې په توګه';
+$labels['printmessage']     = 'دا استوزه چاپ کړه';
+$labels['previousmessage']  = 'پخوانۍ استوزه وښيه';
+$labels['firstmessage']     = 'لومړی استوزه وښيه';
+$labels['nextmessage']      = 'ورپسې استوزه وښيه';
+$labels['lastmessage']      = 'پای /آخري استوزه وښيه';
+$labels['backtolist']       = 'بيرته د استوزو لست ته';
+$labels['viewsource']       = 'سرچينه وښيه';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'استوزي په نښه کړئ';
+$labels['markread']         = 'لوستل شوي په توګه';
+$labels['markunread']       = 'د نالوستل شوي په توګه';
+$labels['markflagged']      = 'د بي کاره په توګه';
+$labels['markunflagged']    = 'د کارونې په توګه';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'ټاکل';
 $labels['all'] = 'ټول';
 $labels['none'] = 'هېڅ';
-$labels['nonesort'] = 'هېڅ';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'نالوستي';
 $labels['flagged'] = 'بې کاره';
 $labels['unanswered'] = 'ناځواب شوي';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
 $labels['filter'] = 'چڼول';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'هېڅ';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'کېښکلی';
 $labels['empty'] = 'تش';
+
 $labels['quota'] = 'ټيکلي لارښود';
-$labels['unknown'] = 'نامعلوم';
-$labels['unlimited'] = 'بي کچه';
-$labels['quicksearch'] = 'ژر پلټنه';
-$labels['resetsearch'] = 'د پلټنې بياسمون';
+$labels['unknown']  = 'نامعلوم';
+$labels['unlimited']  = 'بي کچه';
+
+$labels['quicksearch']  = 'ژر پلټنه';
+$labels['resetsearch']  = 'د پلټنې بياسمون';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
-$labels['sendmessage'] = 'اوس يې واستوه';
-$labels['savemessage'] = 'دا ګارليک خوندي کړه';
-$labels['addattachment'] = 'يو فايل ونښلوه';
-$labels['charset'] = 'چيرست';
-$labels['editortype'] = 'د ټايب سمونګر';
-$labels['returnreceipt'] = 'د رسليک راګرځېدل';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'اوس يې واستوه';
+$labels['savemessage']    = 'دا ګارليک خوندي کړه';
+$labels['addattachment']  = 'يو فايل ونښلوه';
+$labels['charset']        = 'چيرست';
+$labels['editortype']     = 'د ټايب سمونګر';
+$labels['returnreceipt']  = 'د رسليک راګرځېدل';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ليکدود کتنه';
 $labels['resumeediting'] = 'کارمخينې سمونه';
-$labels['revertto'] = 'ته بېرته اړول';
+$labels['revertto']      = 'ته بېرته اړول';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'نښلني';
 $labels['upload'] = 'پورته کول';
-$labels['close'] = 'بندول';
-$labels['low'] = 'ټيټ';
-$labels['lowest'] = 'خورا ټيټ';
-$labels['normal'] = 'نورمال';
-$labels['high'] = 'لوړ';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'بندول';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'ټيټ';
+$labels['lowest']  = 'خورا ټيټ';
+$labels['normal']  = 'نورمال';
+$labels['high']    = 'لوړ';
 $labels['highest'] = 'خورا لوړ';
-$labels['nosubject'] = 'هېڅ موضوع';
+
+$labels['nosubject']  = 'هېڅ موضوع';
 $labels['showimages'] = 'انځورونه وښيه';
 $labels['alwaysshow'] = 'تل له $استوونکي څخه انځورونه وښيه';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ايچ ټی ايمل ال';
 $labels['plaintoggle'] = 'ساده متن';
 $labels['savesentmessagein'] = 'استول شوي استوزه په خوندي کړه';
 $labels['dontsave'] = 'مه ساته';
 $labels['maxuploadsize'] = 'لږترلږه د اجازه شوي فايل کچه $وي';
+
 $labels['addcc'] = 'څرګندليک';
 $labels['addbcc'] = 'پټليک';
 $labels['addreplyto'] = 'ته ورزيات کړه';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'ددې استوزي استوونکی پوښتي چېد استوزي لوستلو سره سم تاسې خبر کړي،.    غواړئ چې استوونکی خبرشي؟';
 $labels['receiptread'] = 'رسليک راګرځېدل (لوستل';
 $labels['yourmessage'] = 'دا رسليک راګرځېدل ستاسې استوزي لپاره دی';
 $labels['receiptnote'] = 'يادونه: دا رسليک تاسې ته يوازې ددې خبرتيا درکوي چې کله استوزی د ترلاسه کوونکي په کمپيوټر کې څرګند شي،  ددې هيڅ ډاډګيرنه نشته چې ترلاسه کوونکي د  استوزي متن لوستی او يا پرې پوه شوی دی';
-$labels['name'] = 'نوم ښوونه';
-$labels['firstname'] = 'نوم';
-$labels['surname'] = 'کورنی نوم';
-$labels['email'] = 'برېښناليک';
+
+// address boook
+$labels['name']         = 'نوم ښوونه';
+$labels['firstname']    = 'نوم';
+$labels['surname']      = 'کورنی نوم';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'برېښناليک';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'نوی اړيکلوری ورزيات کړه';
 $labels['editcontact'] = 'اړيکلوري سمون';
-$labels['edit'] = 'سمون';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'سمون';
 $labels['cancel'] = 'لري کول';
-$labels['save'] = 'ساتل';
+$labels['save']   = 'ساتل';
 $labels['delete'] = 'ړنګول';
-$labels['newcontact'] = 'نوي اړيکلوري کارټ جوړ کړه';
-$labels['deletecontact'] = 'ټاکل شوي اړيکلوري ړنګ کړه';
-$labels['composeto'] = 'ته ليک وليکه';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'نوي اړيکلوري کارټ جوړ کړه';
+$labels['deletecontact']  = 'ټاکل شوي اړيکلوري ړنګ کړه';
+$labels['composeto']      = 'ته ليک وليکه';
 $labels['contactsfromto'] = 'له دومره اړيکلورو څخه دومره شمېرل شوي Contacts $from to $to of $count';
-$labels['print'] = 'چاپ';
-$labels['export'] = 'بهرول';
-$labels['exportvcards'] = 'اړيکلوري د ويکارډ په بڼه واستوئ';
-$labels['previouspage'] = 'پخوانی غونډ وښيه';
-$labels['firstpage'] = 'لومړی غونډ وښيه';
-$labels['nextpage'] = 'ورپسې غونډ وښيه';
-$labels['lastpage'] = 'پای غونډ وښيه';
+$labels['print']          = 'چاپ';
+$labels['export']         = 'بهرول';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'اړيکلوري د ويکارډ په بڼه واستوئ';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'پخوانی غونډ وښيه';
+$labels['firstpage']      = 'لومړی غونډ وښيه';
+$labels['nextpage']       = 'ورپسې غونډ وښيه';
+$labels['lastpage']       = 'پای غونډ وښيه';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'ډلې';
 $labels['personaladrbook'] = 'ځاني پتې';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'رانقلول';
 $labels['importcontacts'] = 'اړيکلوري نقل کړئ';
 $labels['importfromfile'] = 'له فايل څخه رانقل کړئ';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'ټول ادرس کتاب بدل کړئ';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'ترسره شو';
+
+// settings
 $labels['settingsfor'] = 'لپاره برابرونې';
+$labels['about'] = 'About';
 $labels['preferences'] = 'غورونې';
 $labels['userpreferences'] = 'کارن غورونې';
 $labels['editpreferences'] = 'د کارن غورونو سمون';
+
 $labels['identities'] = 'پېژندنې';
 $labels['manageidentities'] = 'ددې حساب پېژندنو برابرول';
 $labels['newidentity'] = 'نوي پېژندنه';
+
 $labels['newitem'] = 'نوی توک';
 $labels['edititem'] = 'توک سمون';
+
 $labels['preferhtml'] = 'ايچ ټي ام ايل ښوون';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ايچ ټي ام ايل استوزه';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'په زړه پورې نېټې';
-$labels['setdefault'] = 'تلوالي برابرول';
-$labels['autodetect'] = 'په خپلواکه توګه';
-$labels['language'] = 'ژبه';
-$labels['timezone'] = 'سيميز وخت';
-$labels['pagesize'] = 'په هر مخ پرتې کښې';
+$labels['setdefault']  = 'تلوالي برابرول';
+$labels['autodetect']  = 'په خپلواکه توګه';
+$labels['language']  = 'ژبه';
+$labels['timezone']  = 'سيميز وخت';
+$labels['pagesize']  = 'په هر مخ پرتې کښې';
 $labels['signature'] = 'لاسليک';
-$labels['dstactive'] = 'ورځنيو کارونو لنډيز ساتل';
+$labels['dstactive']  = 'ورځنيو کارونو لنډيز ساتل';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'ايچ ټي‌ام ايل استوزي وليکه';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ايچ ټي ام ايل لاسليک';
 $labels['previewpane'] = 'پخوانی چوکاټ وښييه';
 $labels['skin'] = 'انټرفيس بڼه';
@@ -214,39 +408,129 @@ $labels['mailboxview'] = 'ليکبکس ښکار کړه';
 $labels['mdnrequests'] = 'د استوونکي خبرتياوې';
 $labels['askuser'] = 'له کاروونکي څخه وپوښته';
 $labels['autosend'] = 'په خپلواکه توګه واستوه';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'لرې کړه';
 $labels['readwhendeleted'] = 'په ړنګ شوو کې استوزي د لوستل شوي  په توګه په نښه کړه';
 $labels['flagfordeletion'] = 'استوزه د ړنګ شوي پرځای بېکاره کړه';
 $labels['skipdeleted'] = 'ړنګ شوي استوزي مه ښکاره کوه';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'انځورونه له لري په ليکه کې ښکاره کړه';
 $labels['fromknownsenders'] = 'له اشنا استوونکو څخه';
 $labels['always'] = 'تل';
 $labels['showinlineimages'] = 'نښلول شوي انځورونه تر استوزې لاندې ښکاره کړه';
-$labels['autosavedraft'] = 'بارليک په خپل سري توګه  خوندي‌کړه';
-$labels['everynminutes'] = 'هر ه ګڼه په دقيقو کې';
-$labels['never'] = 'هېڅ';
+$labels['autosavedraft']  = 'بارليک په خپل سري توګه  خوندي‌کړه';
+$labels['everynminutes']  = 'هر ه ګڼه په دقيقو کې';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'هېڅ';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'استوزي ښيي';
 $labels['messagescomposition'] = 'استوزي ليکي';
 $labels['mimeparamfolding'] = 'د نښلول شوو نومونه';
 $labels['2231folding'] = 'بشپړ RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (نور)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'پرمختللي لارې';
 $labels['focusonnewmessage'] = 'فوکاس براوسر کړکۍ په نوي استوزي کې';
 $labels['checkallfolders'] = 'په ټولو پوښيو کې نوي استوزي وګورئ';
-$labels['folder'] = 'پوښۍ';
-$labels['foldername'] = 'پوښۍ نوم';
-$labels['subscribed'] = 'ګډ شو';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'پوښۍ';
+$labels['folders']  = 'پوښۍ';
+$labels['foldername']  = 'پوښۍ نوم';
+$labels['subscribed']  = 'ګډ شو';
 $labels['messagecount'] = 'استوزي';
-$labels['create'] = 'جوړول، رامنځ ته کول';
-$labels['createfolder'] = 'نوې پوښۍ جوړ کړه';
-$labels['managefolders'] = 'پوښيو څارل';
+$labels['create']  = 'جوړول، رامنځ ته کول';
+$labels['createfolder']  = 'نوې پوښۍ جوړ کړه';
+$labels['managefolders']  = 'پوښيو څارل';
 $labels['specialfolders'] = 'ځانګړي پوښۍۍ';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'اڼل';
-$labels['sortasc'] = 'له پورته نه ښکته خوا ته برابرول';
+$labels['sortasc']  = 'له پورته نه ښکته خوا ته برابرول';
 $labels['sortdesc'] = 'له ښکته نه پورته خوا ته برابرول';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'بي';
 $labels['KB'] = 'کي بي';
 $labels['MB'] = 'ام بي';
 $labels['GB'] = 'جي بي';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index d4b5da62c..c133b8c0e 100755
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ps/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ننوتنه په بري سره ترسره نه شوه';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'ننوتنه په بري سره ترسره نه شوه';
 $messages['cookiesdisabled'] = 'ستاسو لټوني ککوړي ونه منل';
 $messages['sessionerror'] = 'ستاسې ناسته ناباوري يا له مينځه تللې ده';
 $messages['storageerror'] = 'له ای ميپ سرور سره پيوستون په بري سره ترسره نه شو';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ليکبکس کې هېڅ استوزي ونه مونده';
 $messages['loggedout'] = 'تاسې له ناستې څخه په بشپړه توګه وويستل شوئ الله په امان';
 $messages['mailboxempty'] = 'ليکبکس تش دی';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'د کار په حال کې';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'اومتوک د کار په حال کې';
 $messages['checkingmail'] = 'نوي استوزي ګوري';
 $messages['sendingmessage'] = 'استوزه استوي.';
@@ -32,39 +46,54 @@ $messages['messagesaved'] = 'استوزه په بارليک کې خوندي شو
 $messages['successfullysaved'] = 'په بري‌سره خوندي شوه';
 $messages['addedsuccessfully'] = 'اړيکلوری په بري سره پتې کتاب ته ور زيات شو';
 $messages['contactexists'] = 'يو اړيکلوری له دې برېښناليک پتې سره شتون لري';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'ستاسو د پټتيآ خوندي کېدو لپاره ، له لري انځورنه په دې استوزي‌کې بند کړئ';
 $messages['encryptedmessage'] = 'دا يوه پټه استوزه ده او نه څرګندېږي. بښنه غواړو';
 $messages['nocontactsfound'] = 'هېڅ اړيکلوری يې ونه موند';
 $messages['contactnotfound'] = 'وړاندی شوی اړيکلوری ونه مونده';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'استوزي استونه په بري سره پای ته ونه رسېده';
 $messages['senttooquickly'] = 'مهرباني وکړئ $صبر وکړئ د دې استوزې له لېږلو مخکې';
 $messages['errorsavingsent'] = 'دخوندي کولو او لېږلو پر  مهال يوه تيروتنه رامنځ ته شوه';
 $messages['errorsaving'] = 'دخوندي کولو پر  مهال يوه تيروتنه رامنځ ته شوه';
 $messages['errormoving'] = 'استوزه ونه خوځول شوه';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'استوزه ړنګه نه شوه';
-$messages['deletecontactconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوی اړيکلوری ړنګ کړئ؟';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'په رښتيا سره غواړئ چې ټاکل شوی اړيکلوری ړنګ کړئ؟';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوي استوزي‌ړنګ کړئ؟';
-$messages['deletefolderconfirm'] = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
-$messages['purgefolderconfirm'] = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزي‌ړنګ کړئ؟';
+$messages['deletefolderconfirm']  = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
+$messages['purgefolderconfirm']  = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزي‌ړنګ کړئ؟';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'پوښۍ ړنګوي';
 $messages['foldermoving'] = 'پوښۍ خوځوي';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'دا پورمه بشپړه ډکه شوې نه ده';
 $messages['noemailwarning'] = 'مهرباني وکړئ د يوه شته برېښناليک پته ورځای کړئ';
-$messages['nonamewarning'] = 'مهرباني‌وکړئ يو نوم وليکئ';
+$messages['nonamewarning']  = 'مهرباني‌وکړئ يو نوم وليکئ';
 $messages['nopagesizewarning'] = 'مهرباني‌وکړئ د پاڼې کچه ورکړئ';
 $messages['nosenderwarning'] = 'مهرباني وکړئ د استول شوي برېښناليک پته وليکئ';
 $messages['norecipientwarning'] = 'مهرباني‌وکړئ لږ تر لږه يو ترلاسه کوونکی وليکئ';
-$messages['nosubjectwarning'] = 'د مضمون ډګر تش دی يا تاسو غواړئ چې همدا اوس يو له هغو څخه وليکئ';
+$messages['nosubjectwarning']  = 'د مضمون ډګر تش دی يا تاسو غواړئ چې همدا اوس يو له هغو څخه وليکئ';
 $messages['nobodywarning'] = 'دا استوزه پرته له متن څخه استوئ؟';
 $messages['notsentwarning'] = 'استوزه نه ده لېږل شوې. غواړئ چې استوزه مو لرې وغورځوئ';
 $messages['noldapserver'] = 'مهرباني وکړئ يو ال ډپ سرور د پلټلو لپاره وټاکئ';
 $messages['nosearchname'] = 'مهرباني وکړئ  د يو اړيکلوري‌نوم يا برېښناليک پته وليکئ';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'استوزي ومونده$';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'د پلټلو بيا راګرځېدل هېڅ سمون ونه خوړه';
 $messages['searching'] = 'پلټي';
 $messages['checking'] = 'ګوري';
 $messages['nospellerrors'] = 'هېڅ ليکدودي‌تيروتنه ونه مونده';
 $messages['folderdeleted'] = 'پوښۍ په بشپړه توګه ړنګه شوه';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'په بشپړه توګه ړنګ شول';
 $messages['converting'] = 'له استوزي څخه بڼې ړنګېږي';
 $messages['messageopenerror'] = 'له سرور څخه استوزي پرمخ نه شي تلی';
@@ -75,16 +104,66 @@ $messages['copyerror'] = 'هېڅ يوه پته يې کاپي‌نه شوای ک�
 $messages['sourceisreadonly'] = 'ددې پتې يوازې سرچينه لوستل کېږي';
 $messages['errorsavingcontact'] = 'د پتې اړيکلوری يې خوندي‌نه شو کړای';
 $messages['movingmessage'] = 'استوزه خوځوي';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'يو لوستل شوی رسليک په بشپړه توګه واستول شو';
 $messages['errorsendingreceipt'] = 'رسليک يې ونه شوای ليږلی';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'تاسې نه شئ کولی چې دا پېژندنه ړنګه کړئ، داستاسو اخرنی پيژندنه ده';
 $messages['forbiddencharacter'] = 'د پوښۍ نوم له فوربايډن تورو څخه جوړ دی';
 $messages['selectimportfile'] = 'مهرباني وکړئ‌يو فايل د پورته کولو لپاره وټاکئ';
 $messages['addresswriterror'] = 'ټاکل شوی پتې کتاب د بياليکلو نه دی';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'نقلوي...صبر وکړئ';
-$messages['importerror'] = 'نقلول په بري سره ترسره نه شول پورته شوی فايل شته ویکارډ فايل نه دی';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>په بشپړه توګه نقل شو $اړيکلوري داخل شول, $شته تيرشوي انټاير څخه تيرشول</b>:<p><em>$نومونه</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'چار اجازه نه لري';
 $messages['nofromaddress'] = 'په ټاکل شوي پيژندنه کې برېښناليک پتې له لاسه ورکړي';
 $messages['editorwarning'] = 'که د متن بڼو له منځه تللو ګواښ وي نو د متن سمون پرانيزئ. غواړئ چې دوام ورکړئ';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 9f3715704..1d28088a3 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bem-vindo ao $product';
-$labels['username'] = 'Usuário';
-$labels['password'] = 'Senha';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Sair';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Bem-vindo ao $product';
+$labels['username']  = 'Usuário';
+$labels['password']  = 'Senha';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Sair';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Configurações';
 $labels['addressbook'] = 'Catálogo de endereços';
-$labels['inbox'] = 'Caixa de entrada';
+
+// mailbox names
+$labels['inbox']  = 'Caixa de entrada';
 $labels['drafts'] = 'Rascunhos';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Lixeira';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Lixeira';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Assunto';
-$labels['from'] = 'De';
-$labels['to'] = 'Para';
-$labels['cc'] = 'Cópia';
-$labels['bcc'] = 'Cópia Oculta (Cco)';
+$labels['from']    = 'De';
+$labels['sender']  = 'Remetente';
+$labels['to']      = 'Para';
+$labels['cc']      = 'Cópia';
+$labels['bcc']     = 'Cópia Oculta (Cco)';
 $labels['replyto'] = 'Responder para';
 $labels['followupto'] = 'Encaminhar para';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamanho';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamanho';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Status de leitura';
 $labels['listoptions'] = 'Lista de opções...';
+
 $labels['mailboxlist'] = 'Pastas';
-$labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens $from - $to de $count';
 $labels['threadsfromto'] = 'Tópicos $from - $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 $labels['fromtoshort'] = '$from - $to de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover para...';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover para...';
 $labels['download'] = 'Baixar';
 $labels['showattachment'] = 'Exibir';
 $labels['showanyway'] = 'Exibir mesmo assim';
+
 $labels['filename'] = 'Nome do arquivo';
 $labels['filesize'] = 'Tamanho';
+
 $labels['addtoaddressbook'] = 'Incluir no catálogo de endereços';
+
+// weekdays short
 $labels['sun'] = 'Dom.';
 $labels['mon'] = 'Seg.';
 $labels['tue'] = 'Ter.';
@@ -63,94 +80,105 @@ $labels['wed'] = 'Qua.';
 $labels['thu'] = 'Qui.';
 $labels['fri'] = 'Sex.';
 $labels['sat'] = 'Sáb.';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Segunda-feira';
-$labels['tuesday'] = 'Terça-feira';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Segunda-feira';
+$labels['tuesday']   = 'Terça-feira';
 $labels['wednesday'] = 'Quarta-feira';
-$labels['thursday'] = 'Quinta-feira';
-$labels['friday'] = 'Sexta-feira';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Jan.';
-$labels['feb'] = 'Fev.';
-$labels['mar'] = 'Mar.';
-$labels['apr'] = 'Abr.';
-$labels['may'] = 'Mai.';
-$labels['longmay'] = 'Mai.';
-$labels['jun'] = 'Jun.';
-$labels['jul'] = 'Jul.';
-$labels['aug'] = 'Ago.';
-$labels['sep'] = 'Set.';
-$labels['oct'] = 'Out.';
-$labels['nov'] = 'Nov.';
-$labels['dec'] = 'Dez.';
-$labels['longjan'] = 'Janeiro';
-$labels['longfeb'] = 'Fevereiro';
-$labels['longmar'] = 'Março';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junho';
-$labels['longjul'] = 'Julho';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Setembro';
-$labels['longoct'] = 'Outubro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Dezembro';
+$labels['thursday']  = 'Quinta-feira';
+$labels['friday']    = 'Sexta-feira';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Jan.';
+$labels['feb']	= 'Fev.';
+$labels['mar']	= 'Mar.';
+$labels['apr']	= 'Abr.';
+$labels['may']	= 'Mai.';
+$labels['jun']	= 'Jun.';
+$labels['jul'] 	= 'Jul.';
+$labels['aug']	= 'Ago.';
+$labels['sep']	= 'Set.';
+$labels['oct']	= 'Out.';
+$labels['nov']	= 'Nov.';
+$labels['dec']	= 'Dez.';
+
+// months long
+$labels['longjan']	= 'Janeiro';
+$labels['longfeb']	= 'Fevereiro';
+$labels['longmar']	= 'Março';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Maio';
+$labels['longjun']	= 'Junho';
+$labels['longjul']	= 'Julho';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Setembro';
+$labels['longoct']	= 'Outubro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Dezembro';
+
 $labels['today'] = 'Hoje';
-$labels['refresh'] = 'Atualizar';
-$labels['checkmail'] = 'Verificar se há novas mensagens';
-$labels['compose'] = 'Criar email';
-$labels['writenewmessage'] = 'Criar nova mensagem';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Responder para o remetente';
+
+// toolbar buttons
+$labels['refresh']          = 'Atualizar';
+$labels['checkmail']        = 'Verificar se há novas mensagens';
+$labels['compose']          = 'Criar email';
+$labels['writenewmessage']  = 'Criar nova mensagem';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Responder para o remetente';
 $labels['replytoallmessage'] = 'Responder para o remetente e todos destinatários';
-$labels['replyall'] = 'Responder a todos';
-$labels['replylist'] = 'Responder para a lista';
-$labels['forward'] = 'Encaminhar';
-$labels['forwardinline'] = 'Encaminhar junto ao corpo da mensagem';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Responder para a lista';
+$labels['forward']          = 'Encaminhar';
+$labels['forwardinline']    = 'Encaminhar junto ao corpo da mensagem';
 $labels['forwardattachment'] = 'Encaminhar como anexo';
-$labels['forwardmessage'] = 'Encaminhar a mensagem';
-$labels['deletemessage'] = 'Excluir a mensagem';
+$labels['forwardmessage']   = 'Encaminhar a mensagem';
+$labels['deletemessage']    = 'Excluir a mensagem';
 $labels['movemessagetotrash'] = 'Mover a mensagem para a Lixeira';
-$labels['printmessage'] = 'Imprimir a mensagem';
-$labels['previousmessage'] = 'Mensagem Anterior';
-$labels['firstmessage'] = 'Primeira Mensagem';
-$labels['nextmessage'] = 'Próxima Mensagem';
-$labels['lastmessage'] = 'Última Mensagem';
-$labels['backtolist'] = 'Voltar para a lista de mensagens';
-$labels['viewsource'] = 'Exibir código-fonte';
-$labels['mark'] = 'Marcar';
-$labels['markmessages'] = 'Marcar mensagens';
-$labels['markread'] = 'como lidas';
-$labels['markunread'] = 'como não lidas';
-$labels['markflagged'] = 'Como sinalizadas';
-$labels['markunflagged'] = 'Como não sinalizadas';
-$labels['moreactions'] = 'Mais ações...';
-$labels['more'] = 'Mais';
-$labels['back'] = 'Voltar';
-$labels['options'] = 'Opções';
+$labels['printmessage']     = 'Imprimir a mensagem';
+$labels['previousmessage']  = 'Mensagem Anterior';
+$labels['firstmessage']     = 'Primeira Mensagem';
+$labels['nextmessage']      = 'Próxima Mensagem';
+$labels['lastmessage']      = 'Última Mensagem';
+$labels['backtolist']       = 'Voltar para a lista de mensagens';
+$labels['viewsource']       = 'Exibir código-fonte';
+$labels['mark']             = 'Marcar';
+$labels['markmessages']     = 'Marcar mensagens';
+$labels['markread']         = 'Como lidas';
+$labels['markunread']       = 'Como não lidas';
+$labels['markflagged']      = 'Como sinalizadas';
+$labels['markunflagged']    = 'Como não sinalizadas';
+$labels['moreactions']      = 'Mais ações...';
+$labels['more']             = 'Mais';
+$labels['back']             = 'Voltar';
+$labels['options']          = 'Opções';
+
 $labels['select'] = 'Selecionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
-$labels['nonesort'] = 'Nenhuma';
 $labels['currpage'] = 'Página atual';
 $labels['unread'] = 'Não lidas';
-$labels['flagged'] = 'Marcada';
-$labels['unanswered'] = 'Não respondida';
-$labels['deleted'] = 'Excluída';
-$labels['undeleted'] = 'Não excluída';
+$labels['flagged'] = 'Marcadas';
+$labels['unanswered'] = 'Não respondidas';
+$labels['deleted'] = 'Excluídas';
+$labels['undeleted'] = 'Não excluídas';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
-$labels['threads'] = 'Tópicos';
+$labels['threads'] = 'Agrupamento por assunto';
 $labels['expand-all'] = 'Expandir Tudo';
 $labels['expand-unread'] = 'Expandir Não Lidas';
 $labels['collapse-all'] = 'Recolher Tudo';
 $labels['threaded'] = 'Agrupado';
+
 $labels['autoexpand_threads'] = 'Expandir mensagens agrupadas';
-$labels['do_expand'] = 'todos os tópicos';
+$labels['do_expand'] = 'todos os grupos';
 $labels['expand_only_unread'] = 'somente com mensagem(s) não lidas';
 $labels['fromto'] = 'De/Para';
 $labels['flag'] = 'Sinalizador';
 $labels['attachment'] = 'Anexo';
+$labels['nonesort'] = 'Nenhuma';
 $labels['sentdate'] = 'Data de envio';
 $labels['arrival'] = 'Data de recebimento';
 $labels['asc'] = 'crescente';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Coluna para ordenação';
 $labels['listorder'] = 'Ordem da classificação';
 $labels['listmode'] = 'Visualização em lista';
+
 $labels['folderactions'] = 'Ações para as pastas...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Esvaziar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'desconhecido';
-$labels['unlimited'] = 'ilimitado';
-$labels['quicksearch'] = 'Pesquisa rápida';
-$labels['resetsearch'] = 'Limpar';
-$labels['searchmod'] = 'Opções da pesquisa';
-$labels['msgtext'] = 'Mensagem inteira';
+$labels['unknown']  = 'desconhecido';
+$labels['unlimited']  = 'ilimitado';
+
+$labels['quicksearch']  = 'Pesquisa rápida';
+$labels['resetsearch']  = 'Limpar pesquisa';
+$labels['searchmod']  = 'Opções da pesquisa';
+$labels['msgtext']  = 'Mensagem inteira';
+$labels['body']  = 'Conteúdo';
+
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
-$labels['editasnew'] = 'Editar como novo';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Enviar agora';
-$labels['savemessage'] = 'Salvar como Rascunho';
-$labels['addattachment'] = 'Anexar um arquivo';
-$labels['charset'] = 'Codificação';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Confirmação de recebimento';
-$labels['dsn'] = 'Recibo de entrega';
+
+// message compose
+$labels['editasnew']      = 'Editar como novo';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Enviar agora';
+$labels['savemessage']    = 'Salvar como rascunho';
+$labels['addattachment']  = 'Anexar um arquivo';
+$labels['charset']        = 'Codificação';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Confirmação de recebimento';
+$labels['dsn']            = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem original';
-$labels['editidents'] = 'Editar identidades';
-$labels['spellcheck'] = 'Revisar';
+
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Revisar';
 $labels['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
-$labels['revertto'] = 'Reverter para';
+$labels['revertto']      = 'Reverter para';
+
 $labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Enviar arquivo';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Fechar';
-$labels['messageoptions'] = 'Opções da mensagem...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'Mais baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Fechar';
+$labels['messageoptions']  = 'Opções da mensagem...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'Mais baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Mais alta';
-$labels['nosubject'] = '(sem assunto)';
+
+$labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 $labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
-$labels['isdraft'] = 'Esta é uma mensagem de rascunho.';
-$labels['andnmore'] = '$nr mais...';
+$labels['isdraft']    = 'Esta é uma mensagem salva como rascunho.';
+$labels['andnmore']   = '$nr mais...';
 $labels['togglemoreheaders'] = 'Exibir informações adicionais da mensagem (cabeçalhos)';
 $labels['togglefullheaders'] = 'Exibir cabeçalho original da mensagem';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto simples';
 $labels['savesentmessagein'] = 'Salvar mensagens enviadas em';
 $labels['dontsave'] = 'não salvar';
 $labels['maxuploadsize'] = 'Tamanho máximo permitido do arquivo é $size';
+
 $labels['addcc'] = 'Adicionar Cópia';
 $labels['addbcc'] = 'Adicionar Cópia Oculta';
-$labels['addreplyto'] = 'Adicionar Responder para';
-$labels['addfollowupto'] = 'Adicionar Encaminhar para';
+$labels['addreplyto'] = 'Adicionar Endereço de Resposta';
+$labels['addfollowupto'] = 'Adicionar Endereço de Encaminhamento';
+
+// mdn
 $labels['mdnrequest'] = 'O remetente desta mensagem deseja ser notificado quando você ler esta mensagem. Você permite o envio desta notificação?';
 $labels['receiptread'] = 'Confirmação de Leitura (exibida)';
 $labels['yourmessage'] = 'Esta é uma confirmação de leitura da sua mensagem';
 $labels['receiptnote'] = 'Nota: Esta confirmação de leitura somente informa que a mensagem foi aberta no computador do destinatário. Não há garantia que o destinatário tenha lido ou compreendido o conteúdo da mensagem.';
-$labels['name'] = 'Nome de exibição';
-$labels['firstname'] = 'Primeiro Nome';
-$labels['surname'] = 'Sobrenome';
-$labels['middlename'] = 'Segundo Nome';
-$labels['nameprefix'] = 'Prefixo';
-$labels['namesuffix'] = 'Sufixo';
-$labels['nickname'] = 'Apelido';
-$labels['jobtitle'] = 'Ocupação';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Sexo';
-$labels['maidenname'] = 'Nome de solteira';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefone';
-$labels['address'] = 'Endereço';
-$labels['street'] = 'Rua';
-$labels['locality'] = 'Cidade';
-$labels['zipcode'] = 'CEP';
-$labels['region'] = 'Estado';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Data de nascimento';
-$labels['anniversary'] = 'Aniversário';
-$labels['website'] = 'Site';
+
+// address boook
+$labels['name']         = 'Nome de exibição';
+$labels['firstname']    = 'Primeiro Nome';
+$labels['surname']      = 'Sobrenome';
+$labels['middlename']   = 'Segundo Nome';
+$labels['nameprefix']   = 'Prefixo';
+$labels['namesuffix']   = 'Sufixo';
+$labels['nickname']     = 'Apelido';
+$labels['jobtitle']     = 'Ocupação';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
+$labels['maidenname']   = 'Nome de solteira';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefone';
+$labels['address']      = 'Endereço';
+$labels['street']       = 'Rua';
+$labels['locality']     = 'Cidade';
+$labels['zipcode']      = 'CEP';
+$labels['region']       = 'Estado';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Data de nascimento';
+$labels['anniversary']  = 'Aniversário';
+$labels['website']      = 'Site';
 $labels['instantmessenger'] = 'Mensagem instantânea (IM)';
 $labels['notes'] = 'Anotações';
-$labels['male'] = 'masculino';
+$labels['male']   = 'masculino';
 $labels['female'] = 'feminino';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa Avançada';
 $labels['advanced'] = 'Avançado';
 $labels['other'] = 'Outro';
-$labels['typeother'] = 'Outro';
-$labels['typehome'] = 'Residencial';
-$labels['typework'] = 'Trabalho';
-$labels['typemobile'] = 'Celular';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax Residencial';
-$labels['typeworkfax'] = 'Fax do Trabalho';
-$labels['typecar'] = 'Carro';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Página pessoal';
+
+$labels['typehome']   = 'Residencial';
+$labels['typework']   = 'Trabalho';
+$labels['typeother']  = 'Outro';
+$labels['typemobile']  = 'Celular';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax Residencial';
+$labels['typeworkfax']  = 'Fax do Trabalho';
+$labels['typecar']  = 'Carro';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Página pessoal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Adicionar campo...';
 $labels['addcontact'] = 'Adicionar novo contato';
 $labels['editcontact'] = 'Editar contato';
 $labels['contacts'] = 'Contatos';
 $labels['contactproperties'] = 'Propriedades do contato';
 $labels['personalinfo'] = 'Informações pessoais';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Salvar';
+$labels['save']   = 'Salvar';
 $labels['delete'] = 'Excluir';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
 $labels['uploadphoto'] = 'Enviar foto';
-$labels['newcontact'] = 'Criar novo contato';
-$labels['deletecontact'] = 'Exclui os contatos selecionados';
-$labels['composeto'] = 'Compor mensagem para';
+
+$labels['newcontact']     = 'Criar novo contato';
+$labels['deletecontact']  = 'Exclui os contatos selecionados';
+$labels['composeto']      = 'Compor mensagem para';
 $labels['contactsfromto'] = 'Contatos $from - $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar os contatos em formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Exportar todos';
+$labels['exportsel']      = 'Exportar selecionados';
+$labels['exportvcards']   = 'Exportar os contatos em formato vCard';
 $labels['newcontactgroup'] = 'Criar novo grupo de contatos';
-$labels['grouprename'] = 'Renomear grupo';
-$labels['groupdelete'] = 'Excluir grupo';
+$labels['grouprename']    = 'Renomear grupo';
+$labels['groupdelete']    = 'Excluir grupo';
 $labels['groupremoveselected'] = 'Remover os contatos selecionados do grupo';
-$labels['previouspage'] = 'Página Anterior';
-$labels['firstpage'] = 'Primeira Página';
-$labels['nextpage'] = 'Próxima Página';
-$labels['lastpage'] = 'Última Página';
+
+$labels['previouspage']   = 'Página Anterior';
+$labels['firstpage']      = 'Primeira Página';
+$labels['nextpage']       = 'Próxima Página';
+$labels['lastpage']       = 'Última Página';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Endereços pessoais';
+
 $labels['searchsave'] = 'Salvar pesquisa';
 $labels['searchdelete'] = 'Excluir pesquisa';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contatos';
 $labels['importfromfile'] = 'Importar do arquivo:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Adicionar novos contatos ao catálogo de endereços:'
 $labels['importreplace'] = 'Substituir o catálogo de endereços atual';
 $labels['importdesc'] = 'Você pode enviar contatos de um catálogo de endereços existente.<br/>Os contatos devem ser enviados no formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por vírgula).';
 $labels['done'] = 'Concluído';
+
+// settings
 $labels['settingsfor'] = 'Configurações para';
 $labels['about'] = 'Sobre';
 $labels['preferences'] = 'Preferências';
 $labels['userpreferences'] = 'Preferências do usuário';
 $labels['editpreferences'] = 'Editar preferências do usuário';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gerenciar identidades desta conta';
 $labels['newidentity'] = 'Nova identidade';
+
 $labels['newitem'] = 'Novo item';
 $labels['edititem'] = 'Editar item';
+
 $labels['preferhtml'] = 'Exibir em HTML';
 $labels['defaultcharset'] = 'Conjunto padrão de caracteres';
 $labels['htmlmessage'] = 'Mensagem HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Assinatura Digital';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Exibir datas amigáveis';
-$labels['setdefault'] = 'Definir como padrão';
-$labels['autodetect'] = 'Automático';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Fuso horário';
-$labels['pagesize'] = 'Mensagens por página';
+$labels['setdefault']  = 'Definir como padrão';
+$labels['autodetect']  = 'Automático';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Fuso horário';
+$labels['pagesize']  = 'Mensagens por página';
 $labels['signature'] = 'Assinatura';
-$labels['dstactive'] = 'Horário de verão';
+$labels['dstactive']  = 'Horário de verão';
 $labels['showinextwin'] = 'Abrir mensagem em uma nova janela';
 $labels['composeextwin'] = 'Compor em uma nova janela';
 $labels['htmleditor'] = 'Criar mensagens em HTML';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Exibir imagens externas';
 $labels['fromknownsenders'] = 'de remetentes conhecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Exibir imagens anexadas abaixo da mensagem';
-$labels['autosavedraft'] = 'Salvar rascunho automaticamente';
-$labels['everynminutes'] = 'a cada $n minuto(s)';
-$labels['refreshinterval'] = 'Atualização (verificação de novas mensagens, etc.)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'imediatamente';
+$labels['autosavedraft']  = 'Salvar rascunho automaticamente';
+$labels['everynminutes']  = 'a cada $n minuto(s)';
+$labels['refreshinterval']  = 'Atualização (verificação de novas mensagens, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'imediatamente';
 $labels['messagesdisplaying'] = 'Exibição de mensagens';
 $labels['messagescomposition'] = 'Redigir mensagens';
 $labels['mimeparamfolding'] = 'Nomes de anexos';
@@ -376,10 +438,10 @@ $labels['checkallfolders'] = 'Verificar se há novas mensagens em todas as pasta
 $labels['displaynext'] = 'Exibir a mensagem seguinte após excluir/mover uma mensagem';
 $labels['defaultfont'] = 'Fonte padrão para mensagens HTML';
 $labels['mainoptions'] = 'Opções Principais';
-$labels['browseroptions'] = 'Opções de navegação';
+$labels['browseroptions'] = 'Opções do navegador';
 $labels['section'] = 'Seção';
 $labels['maintenance'] = 'Manutenção';
-$labels['newmessage'] = 'Nova mensagem';
+$labels['newmessage'] = 'Nova Mensagem';
 $labels['signatureoptions'] = 'Opções de Assinatura';
 $labels['whenreplying'] = 'Quando responder';
 $labels['replyempty'] = 'Não incluir a mensagem original';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Inserir assinatura ao responder ou encaminhar';
 $labels['belowquote'] = 'abaixo da citação';
 $labels['abovequote'] = 'acima da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
-$labels['previewpanemarkread'] = 'Marcar mensagens pré-visualizadas como lidas';
-$labels['afternseconds'] = 'depois de $n segundos';
+$labels['previewpanemarkread']  = 'Marcar mensagens pré-visualizadas como lidas';
+$labels['afternseconds']  = 'depois de $n segundos';
 $labels['reqmdn'] = 'Sempre pedir confirmação de leitura';
 $labels['reqdsn'] = 'Sempre pedir confirmação de entrega';
 $labels['replysamefolder'] = 'Colocar as respostas na mesma pasta da mensagem original';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Associar links de e-mail (mailto:) para envio d
 $labels['forwardmode'] = 'Encaminhamento de mensagens';
 $labels['inline'] = 'Em linha (no corpo da mensagem)';
 $labels['asattachment'] = 'como anexo';
-$labels['folder'] = 'Pasta';
-$labels['foldername'] = 'Nome da pasta';
-$labels['subscribed'] = 'Inscrito';
+
+$labels['folder']  = 'Pasta';
+$labels['folders']  = 'Pastas';
+$labels['foldername']  = 'Nome da pasta';
+$labels['subscribed']  = 'Inscrito';
 $labels['messagecount'] = 'Mensagens';
-$labels['create'] = 'Criar';
-$labels['createfolder'] = 'Criar nova pasta';
-$labels['managefolders'] = 'Gerenciar pastas';
+$labels['create']  = 'Criar';
+$labels['createfolder']  = 'Criar nova pasta';
+$labels['managefolders']  = 'Gerenciar pastas';
 $labels['specialfolders'] = 'Pastas especiais';
 $labels['properties'] = 'Propriedades';
 $labels['folderproperties'] = 'Propriedades da pasta';
@@ -427,23 +491,29 @@ $labels['info'] = 'Informação';
 $labels['getfoldersize'] = 'Exibir o tamanho da pasta';
 $labels['changesubscription'] = 'Clique para ativar/desativar';
 $labels['foldertype'] = 'Tipo de Pasta';
-$labels['personalfolder'] = 'Pasta Particular';
-$labels['otherfolder'] = 'Pasta de outro Usuário';
-$labels['sharedfolder'] = 'Pasta Pública';
+$labels['personalfolder']  = 'Pasta Particular';
+$labels['otherfolder']  = 'Pasta de outro Usuário';
+$labels['sharedfolder']  = 'Pasta Pública';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Ascendente';
+$labels['sortasc']  = 'Ascendente';
 $labels['sortdesc'] = 'Descendente';
 $labels['undo'] = 'Desfazer';
+
 $labels['installedplugins'] = 'Plugins instalados';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versão';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licença';
 $labels['support'] = 'Obter suporte';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglês';
 $labels['westerneuropean'] = 'Oeste Europeu';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
 
+?>
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 05be7e629..f734c7fbd 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ocorreu um erro!';
-$messages['loginfailed'] = 'Falha no login';
+$messages['errortitle']  = 'Ocorreu um erro!';
+$messages['loginfailed']  = 'Falha no login';
 $messages['cookiesdisabled'] = 'Seu navegador não aceita cookies';
 $messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou';
 $messages['storageerror'] = 'Falha na conexão com o servidor. Verifique se informou os dados corretamente.';
@@ -41,7 +44,7 @@ $messages['messagesent'] = 'Mensagem enviada com sucesso';
 $messages['savingmessage'] = 'Salvando Mensagem...';
 $messages['messagesaved'] = 'Mensagem salva em Rascunhos';
 $messages['successfullysaved'] = 'Salvo com sucesso';
-$messages['addedsuccessfully'] = 'Contato incluído com sucesso.';
+$messages['addedsuccessfully'] = 'Contato incluído com sucesso no catálogo de endereços.';
 $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.';
@@ -57,11 +60,11 @@ $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['deletecontactconfirm'] = 'Deseja realmente excluir o(s) contato(s) selecionado(s)?';
-$messages['deletegroupconfirm'] = 'Deseja realmente excluir o grupo selecionado?';
+$messages['deletecontactconfirm']  = 'Deseja realmente excluir o(s) contato(s) selecionado(s)?';
+$messages['deletegroupconfirm']  = 'Deseja realmente excluir o grupo selecionado?';
 $messages['deletemessagesconfirm'] = 'Deseja realmente excluir a(s) mensagem(s) selecionada(s)?';
-$messages['deletefolderconfirm'] = 'Deseja realmente excluir esta pasta?';
-$messages['purgefolderconfirm'] = 'Deseja realmente excluir todas mensagens desta pasta?';
+$messages['deletefolderconfirm']  = 'Deseja realmente excluir esta pasta?';
+$messages['purgefolderconfirm']  = 'Deseja realmente excluir todas mensagens desta pasta?';
 $messages['contactdeleting'] = 'Excluindo contato(s)...';
 $messages['groupdeleting'] = 'Excluindo grupo...';
 $messages['folderdeleting'] = 'Excluindo pasta...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Ativando pasta...';
 $messages['folderunsubscribing'] = 'Desativando pasta...';
 $messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
 $messages['noemailwarning'] = 'Por favor, informe um endereço de e-mail válido';
-$messages['nonamewarning'] = 'Por favor, informe o nome';
+$messages['nonamewarning']  = 'Por favor, informe o nome';
 $messages['nopagesizewarning'] = 'Por favor, informe o tamanho da página';
 $messages['nosenderwarning'] = 'Por favor, informe o e-mail do remetente';
 $messages['norecipientwarning'] = 'Por favor, informe pelo menos um destinatário';
-$messages['nosubjectwarning'] = 'O campo "Assunto" está vazio. Deseja incluí-lo agora?';
+$messages['nosubjectwarning']  = 'O campo "Assunto" está vazio. Deseja incluí-lo agora?';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem não foi enviada. Deseja descartar sua mensagem?';
 $messages['noldapserver'] = 'Por favor, selecione um servidor LDAP para a pesquisa';
@@ -163,3 +166,4 @@ $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['noscriptwarning'] = 'Aviso: Este webmail utiliza Javascript, habilite-o nas configurações de seu navegador.';
 
+?>
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index abc815bcb..20105a348 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bem-vindo ao $product';
-$labels['username'] = 'Utilizador';
-$labels['password'] = 'Palavra-passe';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Sair';
-$labels['mail'] = 'Mensagens';
+
+// login page
+$labels['welcome']   = 'Bem-vindo ao $product';
+$labels['username']  = 'Utilizador';
+$labels['password']  = 'Palavra-passe';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Sair';
+$labels['mail']     = 'Mensagens';
 $labels['settings'] = 'Definições';
 $labels['addressbook'] = 'Contactos';
-$labels['inbox'] = 'A Receber';
+
+// mailbox names
+$labels['inbox']  = 'A Receber';
 $labels['drafts'] = 'Rascunhos';
-$labels['sent'] = 'Itens Enviados';
-$labels['trash'] = 'Reciclagem';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Itens Enviados';
+$labels['trash']  = 'Reciclagem';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Assunto';
-$labels['from'] = 'Remetente';
-$labels['to'] = 'Para';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Remetente';
+$labels['sender']  = 'Remetente';
+$labels['to']      = 'Para';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder para';
 $labels['followupto'] = 'Reencaminhar-Para';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamanho';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamanho';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Estado de leitura';
 $labels['listoptions'] = 'Lista de opções...';
+
 $labels['mailboxlist'] = 'Pastas';
-$labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens de $from a $to de $count';
 $labels['threadsfromto'] = 'Tópicos de $from a $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'mover para...';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'mover para...';
 $labels['download'] = 'descarregar';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar na mesma';
+
 $labels['filename'] = 'Ficheiro';
 $labels['filesize'] = 'Tamanho';
+
 $labels['addtoaddressbook'] = 'Adicionar à lista de contactos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Seg';
 $labels['tue'] = 'Ter';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Qua';
 $labels['thu'] = 'Qui';
 $labels['fri'] = 'Sex';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Segunda-feira';
-$labels['tuesday'] = 'Terça-feira';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Segunda-feira';
+$labels['tuesday']   = 'Terça-feira';
 $labels['wednesday'] = 'Quarta-feira';
-$labels['thursday'] = 'Quinta-feira';
-$labels['friday'] = 'Sexta-feira';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Fev';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Maio';
-$labels['longmay'] = 'Maio';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Out';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dez';
-$labels['longjan'] = 'Janeiro';
-$labels['longfeb'] = 'Fevereiro';
-$labels['longmar'] = 'Março';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junho';
-$labels['longjul'] = 'Julho';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Setembro';
-$labels['longoct'] = 'Outubro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Dezembro';
+$labels['thursday']  = 'Quinta-feira';
+$labels['friday']    = 'Sexta-feira';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Fev';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Maio';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Out';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dez';
+
+// months long
+$labels['longjan']	= 'Janeiro';
+$labels['longfeb']	= 'Fevereiro';
+$labels['longmar']	= 'Março';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Maio';
+$labels['longjun']	= 'Junho';
+$labels['longjul']	= 'Julho';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Setembro';
+$labels['longoct']	= 'Outubro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Dezembro';
+
 $labels['today'] = 'Hoje';
-$labels['refresh'] = 'Actualizar';
-$labels['checkmail'] = 'Verificar existência de novas mensagens';
-$labels['compose'] = 'Nova mensagem';
-$labels['writenewmessage'] = 'Criar nova mensagem';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Responder';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizar';
+$labels['checkmail']        = 'Verificar existência de novas mensagens';
+$labels['compose']          = 'Nova mensagem';
+$labels['writenewmessage']  = 'Criar nova mensagem';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Responder';
 $labels['replytoallmessage'] = 'Responder a todos';
-$labels['replyall'] = 'Responder a todos';
-$labels['replylist'] = 'Lista de resposta';
-$labels['forward'] = 'Reencaminhar';
-$labels['forwardinline'] = 'Reencaminhar';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Lista de resposta';
+$labels['forward']          = 'Reencaminhar';
+$labels['forwardinline']    = 'Reencaminhar';
 $labels['forwardattachment'] = 'Reencaminhar como anexo';
-$labels['forwardmessage'] = 'Reencaminhar';
-$labels['deletemessage'] = 'Eliminar';
+$labels['forwardmessage']   = 'Reencaminhar';
+$labels['deletemessage']    = 'Eliminar';
 $labels['movemessagetotrash'] = 'Mover para reciclagem';
-$labels['printmessage'] = 'Imprimir';
-$labels['previousmessage'] = 'Mensagem anterior';
-$labels['firstmessage'] = 'Primeira mensagem';
-$labels['nextmessage'] = 'Próxima mensagem';
-$labels['lastmessage'] = 'Última mensagem';
-$labels['backtolist'] = 'Voltar';
-$labels['viewsource'] = 'Mostrar código fonte';
-$labels['mark'] = 'Marcar';
-$labels['markmessages'] = 'Marcar mensagens';
-$labels['markread'] = 'Como lida(s)';
-$labels['markunread'] = 'Como não lida(s)';
-$labels['markflagged'] = 'Com sinalização';
-$labels['markunflagged'] = 'Sem sinalização';
-$labels['moreactions'] = 'Mais acções...';
-$labels['more'] = 'Mais';
-$labels['back'] = 'Voltar';
-$labels['options'] = 'Opções';
+$labels['printmessage']     = 'Imprimir';
+$labels['previousmessage']  = 'Mensagem anterior';
+$labels['firstmessage']     = 'Primeira mensagem';
+$labels['nextmessage']      = 'Próxima mensagem';
+$labels['lastmessage']      = 'Última mensagem';
+$labels['backtolist']       = 'Voltar';
+$labels['viewsource']       = 'Mostrar código fonte';
+$labels['mark']             = 'Marcar';
+$labels['markmessages']     = 'Marcar mensagens';
+$labels['markread']         = 'Como lida(s)';
+$labels['markunread']       = 'Como não lida(s)';
+$labels['markflagged']      = 'Com sinalização';
+$labels['markunflagged']    = 'Sem sinalização';
+$labels['moreactions']      = 'Mais acções...';
+$labels['more']             = 'Mais';
+$labels['back']             = 'Voltar';
+$labels['options']          = 'Opções';
+
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhum';
-$labels['nonesort'] = 'Nenhum';
 $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Sinalizadas';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Expandir tudo';
 $labels['expand-unread'] = 'Expandir não lidas';
 $labels['collapse-all'] = 'Recolher tudo';
 $labels['threaded'] = 'Agrupar tópicos';
+
 $labels['autoexpand_threads'] = 'Expandir tópicos das mensagens';
 $labels['do_expand'] = 'todos os tópicos';
 $labels['expand_only_unread'] = 'só com mensagens não lidas';
 $labels['fromto'] = 'Remetente/Destinatário';
 $labels['flag'] = 'Sinalizador';
 $labels['attachment'] = 'Anexo';
+$labels['nonesort'] = 'Nenhum';
 $labels['sentdate'] = 'Data de envio';
 $labels['arrival'] = 'Data de recepção';
 $labels['asc'] = 'Ascendente';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenação';
 $labels['listmode'] = 'Modo de visualização';
+
 $labels['folderactions'] = 'Acções para pastas...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Esvaziar';
+
 $labels['quota'] = 'Espaço utilizado';
-$labels['unknown'] = 'desconhecido';
-$labels['unlimited'] = 'ilimitado';
-$labels['quicksearch'] = 'Pesquisa rápida';
-$labels['resetsearch'] = 'Limpar pesquisa';
-$labels['searchmod'] = 'Pesquisar em';
-$labels['msgtext'] = 'Mensagem completa';
+$labels['unknown']  = 'desconhecido';
+$labels['unlimited']  = 'ilimitado';
+
+$labels['quicksearch']  = 'Pesquisa rápida';
+$labels['resetsearch']  = 'Limpar pesquisa';
+$labels['searchmod']  = 'Pesquisar em';
+$labels['msgtext']  = 'Mensagem completa';
+$labels['body']  = 'Corpo';
+
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
-$labels['editasnew'] = 'Editar como nova';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Enviar';
-$labels['savemessage'] = 'Guardar como rascunho';
-$labels['addattachment'] = 'Adicionar anexo';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Recibo de leitura';
-$labels['dsn'] = 'Recibo de entrega';
+
+// message compose
+$labels['editasnew']      = 'Editar como nova';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Enviar';
+$labels['savemessage']    = 'Guardar como rascunho';
+$labels['addattachment']  = 'Adicionar anexo';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Recibo de leitura';
+$labels['dsn']            = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem Original';
-$labels['editidents'] = 'Editar entidades';
-$labels['spellcheck'] = 'Corrector Ortográfico';
+
+$labels['editidents']    = 'Editar entidades';
+$labels['spellcheck']    = 'Corrector Ortográfico';
 $labels['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
-$labels['revertto'] = 'Reverter para';
+$labels['revertto']      = 'Reverter para';
+
 $labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Carregar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Fechar';
-$labels['messageoptions'] = 'Opções de mensagens...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'Muito baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Fechar';
+$labels['messageoptions']  = 'Opções de mensagens...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'Muito baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Muito alta';
-$labels['nosubject'] = '(sem assunto)';
+
+$labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Mostrar imagens';
 $labels['alwaysshow'] = 'Mostrar sempre imagens a partir de $sender';
-$labels['isdraft'] = 'Esta é uma mensagem de rascunho.';
-$labels['andnmore'] = '$nr mais...';
+$labels['isdraft']    = 'Esta é uma mensagem de rascunho.';
+$labels['andnmore']   = '$nr mais...';
 $labels['togglemoreheaders'] = 'Mostrar cabeçalhos adicionais da mensagem';
 $labels['togglefullheaders'] = 'Mostrar cabeçalho original da mensagem';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto simples';
 $labels['savesentmessagein'] = 'Guardar mensagem enviada em';
 $labels['dontsave'] = 'não guardar';
 $labels['maxuploadsize'] = 'Tamanho máximo permitido do ficheiro é $size';
+
 $labels['addcc'] = 'Adicionar Cc';
 $labels['addbcc'] = 'Adicionar Bcc';
 $labels['addreplyto'] = 'Adicionar Responder para';
 $labels['addfollowupto'] = 'Adicionar Reencaminhar para';
+
+// mdn
 $labels['mdnrequest'] = 'O remetente desta mensagem pediu para ser notificado quando esta mensagem fosse lida. Deseja enviar uma notificação?';
 $labels['receiptread'] = 'Recibo de leitura';
 $labels['yourmessage'] = 'Isto é um recibo de leitura da sua mensagem';
 $labels['receiptnote'] = 'Nota: este recibo apenas indica que a mensagem foi aberta pelo destinatário. Não garante que a mensagem foi lida ou compreendida.';
-$labels['name'] = 'Nome completo';
-$labels['firstname'] = 'Primeiro nome';
-$labels['surname'] = 'Apelido';
-$labels['middlename'] = 'Outros nomes/apelidos';
-$labels['nameprefix'] = 'Título';
-$labels['namesuffix'] = 'Sufixo';
-$labels['nickname'] = 'Alcunha';
-$labels['jobtitle'] = 'Cargo';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Género';
-$labels['maidenname'] = 'Nome solteiro';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefone';
-$labels['address'] = 'Endereço';
-$labels['street'] = 'Rua';
-$labels['locality'] = 'Cidade';
-$labels['zipcode'] = 'Código postal';
-$labels['region'] = 'Localidade';
-$labels['country'] = 'Pais';
-$labels['birthday'] = 'Data de nascimento';
-$labels['anniversary'] = 'Aniversário';
-$labels['website'] = 'Página web';
+
+// address boook
+$labels['name']         = 'Nome completo';
+$labels['firstname']    = 'Primeiro nome';
+$labels['surname']      = 'Apelido';
+$labels['middlename']   = 'Outros nomes/apelidos';
+$labels['nameprefix']   = 'Título';
+$labels['namesuffix']   = 'Sufixo';
+$labels['nickname']     = 'Alcunha';
+$labels['jobtitle']     = 'Cargo';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Género';
+$labels['maidenname']   = 'Nome solteiro';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefone';
+$labels['address']      = 'Endereço';
+$labels['street']       = 'Rua';
+$labels['locality']     = 'Cidade';
+$labels['zipcode']      = 'Código postal';
+$labels['region']       = 'Localidade';
+$labels['country']      = 'Pais';
+$labels['birthday']     = 'Data de nascimento';
+$labels['anniversary']  = 'Aniversário';
+$labels['website']      = 'Página web';
 $labels['instantmessenger'] = 'Endereço IM';
 $labels['notes'] = 'Notas';
-$labels['male'] = 'masculino';
+$labels['male']   = 'masculino';
 $labels['female'] = 'feminino';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa avançada';
 $labels['advanced'] = 'Pesquisa avançada';
 $labels['other'] = 'Outro';
-$labels['typeother'] = 'Outro';
-$labels['typehome'] = 'Residência';
-$labels['typework'] = 'Empresa';
-$labels['typemobile'] = 'Telemóvel';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax da residência';
-$labels['typeworkfax'] = 'Fax da empresa';
-$labels['typecar'] = 'Carro';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Página Inicial';
+
+$labels['typehome']   = 'Residência';
+$labels['typework']   = 'Empresa';
+$labels['typeother']  = 'Outro';
+$labels['typemobile']  = 'Telemóvel';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax da residência';
+$labels['typeworkfax']  = 'Fax da empresa';
+$labels['typecar']  = 'Carro';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Página Inicial';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Adicionar campo...';
 $labels['addcontact'] = 'Criar novo contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Dados do contacto';
 $labels['personalinfo'] = 'Informação pessoal';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
 $labels['uploadphoto'] = 'Carregar foto';
-$labels['newcontact'] = 'Criar novo contacto';
-$labels['deletecontact'] = 'Eliminar contacto(s) seleccionado(s)';
-$labels['composeto'] = 'Nova mensagem para';
+
+$labels['newcontact']     = 'Criar novo contacto';
+$labels['deletecontact']  = 'Eliminar contacto(s) seleccionado(s)';
+$labels['composeto']      = 'Nova mensagem para';
 $labels['contactsfromto'] = 'Contactos $from - $to of $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar contactos no formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Exportar todos';
+$labels['exportsel']      = 'Exportar selecionados';
+$labels['exportvcards']   = 'Exportar contactos no formato vCard';
 $labels['newcontactgroup'] = 'Criar novo grupo de contactos';
-$labels['grouprename'] = 'Renomear grupo';
-$labels['groupdelete'] = 'Eliminar grupo';
+$labels['grouprename']    = 'Renomear grupo';
+$labels['groupdelete']    = 'Eliminar grupo';
 $labels['groupremoveselected'] = 'Remover o(s) contacto(s) seleccionado(s) do grupo';
-$labels['previouspage'] = 'Página anterior';
-$labels['firstpage'] = 'Primeira página';
-$labels['nextpage'] = 'Página seguinte';
-$labels['lastpage'] = 'Última página';
+
+$labels['previouspage']   = 'Página anterior';
+$labels['firstpage']      = 'Primeira página';
+$labels['nextpage']       = 'Página seguinte';
+$labels['lastpage']       = 'Última página';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Endereços pessoais';
+
 $labels['searchsave'] = 'Guardar pesquisa';
 $labels['searchdelete'] = 'Eliminar pesquisa';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importação de contactos';
 $labels['importfromfile'] = 'Importar do ficheiro:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Adicionar novo contacto ao livro de endereços:';
 $labels['importreplace'] = 'Substituir todo o livro de endereços.';
 $labels['importdesc'] = 'Pode enviar/carregar contactos de um livro de endereços existente.<br/>Neste momento suportamos a importação nos seguintes formatos: <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por vírgula).';
 $labels['done'] = 'Terminado';
+
+// settings
 $labels['settingsfor'] = 'Configurações para';
 $labels['about'] = 'Acerca';
 $labels['preferences'] = 'Preferências';
 $labels['userpreferences'] = 'Preferências do utilizador';
 $labels['editpreferences'] = 'Editar preferências do utilizador';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gerir identidades para esta conta';
 $labels['newidentity'] = 'Nova identidade';
+
 $labels['newitem'] = 'Novo item';
 $labels['edititem'] = 'Editar item';
+
 $labels['preferhtml'] = 'Mostrar mensagens em HTML';
 $labels['defaultcharset'] = 'Conjunto de caracteres predefinido';
 $labels['htmlmessage'] = 'Mensagem em HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Assinatura Digital';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Formatar datas';
-$labels['setdefault'] = 'Marcar como predefinido';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Fuso horário';
-$labels['pagesize'] = 'Linhas por página';
+$labels['setdefault']  = 'Marcar como predefinido';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Fuso horário';
+$labels['pagesize']  = 'Linhas por página';
 $labels['signature'] = 'Assinatura';
-$labels['dstactive'] = 'Horário de verão';
+$labels['dstactive']  = 'Horário de verão';
 $labels['showinextwin'] = 'Abrir mensagem numa nova janela';
 $labels['composeextwin'] = 'Compor numa nova janela';
 $labels['htmleditor'] = 'Escrever mensagens em HTML';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Mostrar imagens externas';
 $labels['fromknownsenders'] = 'de remetentes conhecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostrar imagens anexadas abaixo da mensagem';
-$labels['autosavedraft'] = 'Guardar rascunho automaticamente';
-$labels['everynminutes'] = 'a cada $n minuto(s)';
-$labels['refreshinterval'] = 'Actualizar (verificar por novas mensagens, etc.)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'imediatamente';
+$labels['autosavedraft']  = 'Guardar rascunho automaticamente';
+$labels['everynminutes']  = 'a cada $n minuto(s)';
+$labels['refreshinterval']  = 'Actualizar (verificar por novas mensagens, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'imediatamente';
 $labels['messagesdisplaying'] = 'Visualização de mensagens';
 $labels['messagescomposition'] = 'Composição de mensagens';
 $labels['mimeparamfolding'] = 'Nome dos anexos';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Ao responder ou reencaminhar colocar assinatura'
 $labels['belowquote'] = 'depois da citação';
 $labels['abovequote'] = 'antes da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
-$labels['previewpanemarkread'] = 'Marcar mensagem como lida';
-$labels['afternseconds'] = 'após $n segundos';
+$labels['previewpanemarkread']  = 'Marcar mensagem como lida';
+$labels['afternseconds']  = 'após $n segundos';
 $labels['reqmdn'] = 'Pedir sempre um recibo de leitura';
 $labels['reqdsn'] = 'Pedir sempre um recibo de entrega';
 $labels['replysamefolder'] = 'Guardar respostas na mesma pasta da mensagem original';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Registar manipulador de protocolo para mailto:
 $labels['forwardmode'] = 'Reencaminhamento de mensagens';
 $labels['inline'] = 'em linha';
 $labels['asattachment'] = 'como anexo';
-$labels['folder'] = 'Pasta';
-$labels['foldername'] = 'Nome da pasta';
-$labels['subscribed'] = 'Subscrita';
+
+$labels['folder']  = 'Pasta';
+$labels['folders']  = 'Pastas';
+$labels['foldername']  = 'Nome da pasta';
+$labels['subscribed']  = 'Subscrita';
 $labels['messagecount'] = 'Mensagens';
-$labels['create'] = 'Criar';
-$labels['createfolder'] = 'Criar nova pasta';
-$labels['managefolders'] = 'Gerir pastas';
+$labels['create']  = 'Criar';
+$labels['createfolder']  = 'Criar nova pasta';
+$labels['managefolders']  = 'Gerir pastas';
 $labels['specialfolders'] = 'Pastas especiais (predefinidas)';
 $labels['properties'] = 'Propriedades';
 $labels['folderproperties'] = 'Propriedades da pasta';
@@ -427,23 +491,29 @@ $labels['info'] = 'Informação';
 $labels['getfoldersize'] = 'Clique para obter o tamanho da pasta';
 $labels['changesubscription'] = 'Clique para alterar a subscrição';
 $labels['foldertype'] = 'Tipo de pasta';
-$labels['personalfolder'] = 'Pasta privada';
-$labels['otherfolder'] = 'Outro tipo de pasta';
-$labels['sharedfolder'] = 'Pasta pública';
+$labels['personalfolder']  = 'Pasta privada';
+$labels['otherfolder']  = 'Outro tipo de pasta';
+$labels['sharedfolder']  = 'Pasta pública';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Ordenação Ascendente';
+$labels['sortasc']  = 'Ordenação Ascendente';
 $labels['sortdesc'] = 'Ordenação Descendente';
 $labels['undo'] = 'Anular';
+
 $labels['installedplugins'] = 'Plugins instalados';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versão';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licença';
 $labels['support'] = 'Obter suporte';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglês';
 $labels['westerneuropean'] = 'Europa Ocidental';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
 
+?>
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index 87e04ef6b..638b0fcdd 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ocorreu um erro!';
-$messages['loginfailed'] = 'O utilizador ou palavra-passe que introduziu não correspondem.';
+$messages['errortitle']  = 'Ocorreu um erro!';
+$messages['loginfailed']  = 'O utilizador ou palavra-passe que introduziu não correspondem.';
 $messages['cookiesdisabled'] = 'O seu navegador não suporta cookies';
 $messages['sessionerror'] = 'A sua sessão é inválida ou expirou.';
 $messages['storageerror'] = 'A ligação ao servidor IMAP falhou';
@@ -57,11 +60,11 @@ $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['deletecontactconfirm'] = 'Deseja realmente eliminar o(s) contacto(s) seleccionado(s)?';
-$messages['deletegroupconfirm'] = 'Tem a certeza que pretende eliminar o grupo seleccionado?';
+$messages['deletecontactconfirm']  = 'Deseja realmente eliminar o(s) contacto(s) seleccionado(s)?';
+$messages['deletegroupconfirm']  = 'Tem a certeza que pretende eliminar o grupo seleccionado?';
 $messages['deletemessagesconfirm'] = 'Deseja realmente eliminar a(s) mensagem(ns) seleccionada(s)?';
-$messages['deletefolderconfirm'] = 'Deseja realmente eliminar esta pasta?';
-$messages['purgefolderconfirm'] = 'Deseja realmente eliminar todas mensagens desta pasta?';
+$messages['deletefolderconfirm']  = 'Deseja realmente eliminar esta pasta?';
+$messages['purgefolderconfirm']  = 'Deseja realmente eliminar todas mensagens desta pasta?';
 $messages['contactdeleting'] = 'A eliminar contacto(s)...';
 $messages['groupdeleting'] = 'A eliminar grupo...';
 $messages['folderdeleting'] = 'A eliminar pasta...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'A subscrever pasta...';
 $messages['folderunsubscribing'] = 'A cancelar subscrição da pasta...';
 $messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
 $messages['noemailwarning'] = 'Por favor, introduza um endereço de e-mail válido.';
-$messages['nonamewarning'] = 'Por favor, escreva um nome.';
+$messages['nonamewarning']  = 'Por favor, escreva um nome.';
 $messages['nopagesizewarning'] = 'Por favor, escreva o tamanho da página';
 $messages['nosenderwarning'] = 'Por favor, introsuza o endereço de e-mail do remetente';
 $messages['norecipientwarning'] = 'Por favor, insira pelo menos um destinatário';
-$messages['nosubjectwarning'] = 'O campo "Assunto" não foi preenchido. Deseja incluí-lo agora?';
+$messages['nosubjectwarning']  = 'O campo "Assunto" não foi preenchido. Deseja incluí-lo agora?';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem não foi enviada, deseja apagá-la?';
 $messages['noldapserver'] = 'Seleccione um servidor LDAP para efectuar a pesquisa';
@@ -163,3 +166,4 @@ $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['noscriptwarning'] = 'Aviso: Este serviço de webmail utiliza Javascript! Para o poder utilizar, active o Javascript nas definições do seu navegador.';
 
+?>
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index d41103aec..00ec11f13 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bine aţi venit la $product';
-$labels['username'] = 'Utilizator';
-$labels['password'] = 'Parolă';
-$labels['server'] = 'Server';
-$labels['login'] = 'Autentificare';
-$labels['logout'] = 'Deconectare';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Bine aţi venit la $product';
+$labels['username']  = 'Utilizator';
+$labels['password']  = 'Parolă';
+$labels['server']    = 'Server';
+$labels['login']     = 'Autentificare';
+
+// taskbar
+$labels['logout']   = 'Deconectare';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Setări personale';
 $labels['addressbook'] = 'Agendă';
-$labels['inbox'] = 'Primite';
+
+// mailbox names
+$labels['inbox']  = 'Primite';
 $labels['drafts'] = 'Ciorne';
-$labels['sent'] = 'Trimise';
-$labels['trash'] = 'Gunoi';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Trimise';
+$labels['trash']  = 'Gunoi';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Subiect';
-$labels['from'] = 'Expeditor';
-$labels['to'] = 'Destinatar';
-$labels['cc'] = 'Copie (CC)';
-$labels['bcc'] = 'Copie oarbă (BCC)';
+$labels['from']    = 'Expeditor';
+$labels['sender']  = 'Expeditor';
+$labels['to']      = 'Destinatar';
+$labels['cc']      = 'Copie (CC)';
+$labels['bcc']     = 'Copie oarbă (BCC)';
 $labels['replyto'] = 'Răspunde la';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Mărime';
+$labels['date']    = 'Data';
+$labels['size']    = 'Mărime';
 $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organizaţie';
 $labels['readstatus'] = 'Starea de citit';
 $labels['listoptions'] = 'Listează opţiunile...';
+
 $labels['mailboxlist'] = 'Dosare';
-$labels['folders'] = 'Dosare';
 $labels['messagesfromto'] = 'Mesaje de la $from până la $to din $count';
 $labels['threadsfromto'] = 'Grupuri de la $from până la $to din $count';
 $labels['messagenrof'] = '$nr mesaje din $count';
 $labels['fromtoshort'] = '$from - $to din $count';
-$labels['copy'] = 'Copiază';
-$labels['move'] = 'Mută';
-$labels['moveto'] = 'Mută in...';
+
+$labels['copy']     = 'Copiază';
+$labels['move']     = 'Mută';
+$labels['moveto']   = 'Mută in...';
 $labels['download'] = 'Descarcă';
+$labels['showattachment'] = 'Arată';
+$labels['showanyway'] = 'Arată oricum';
+
 $labels['filename'] = 'Nume fişier';
 $labels['filesize'] = 'Mărime fişier';
+
 $labels['addtoaddressbook'] = 'Adaugă în agendă';
+
+// weekdays short
 $labels['sun'] = 'Dum';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -61,79 +80,89 @@ $labels['wed'] = 'Mie';
 $labels['thu'] = 'Joi';
 $labels['fri'] = 'Vin';
 $labels['sat'] = 'Sâm';
-$labels['sunday'] = 'Duminică';
-$labels['monday'] = 'Luni';
-$labels['tuesday'] = 'Marţi';
+
+// weekdays long
+$labels['sunday']    = 'Duminică';
+$labels['monday']    = 'Luni';
+$labels['tuesday']   = 'Marţi';
 $labels['wednesday'] = 'Miercuri';
-$labels['thursday'] = 'Joi';
-$labels['friday'] = 'Vineri';
-$labels['saturday'] = 'Sâmbătă';
-$labels['jan'] = 'Ian';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Iun';
-$labels['jul'] = 'Iul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Noi';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Ianuarie';
-$labels['longfeb'] = 'Februarie';
-$labels['longmar'] = 'Martie';
-$labels['longapr'] = 'Aprilie';
-$labels['longjun'] = 'Iunie';
-$labels['longjul'] = 'Iulie';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'Septembrie';
-$labels['longoct'] = 'Octombrie';
-$labels['longnov'] = 'Noiembrie';
-$labels['longdec'] = 'Decembrie';
+$labels['thursday']  = 'Joi';
+$labels['friday']    = 'Vineri';
+$labels['saturday']  = 'Sâmbătă';
+
+// months short
+$labels['jan']	= 'Ian';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Iun';
+$labels['jul'] 	= 'Iul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Noi';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Ianuarie';
+$labels['longfeb']	= 'Februarie';
+$labels['longmar']	= 'Martie';
+$labels['longapr']	= 'Aprilie';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Iunie';
+$labels['longjul']	= 'Iulie';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'Septembrie';
+$labels['longoct']	= 'Octombrie';
+$labels['longnov']	= 'Noiembrie';
+$labels['longdec']	= 'Decembrie';
+
 $labels['today'] = 'Astăzi';
-$labels['refresh'] = 'Actualizează';
-$labels['checkmail'] = 'Verifică mesaje noi';
-$labels['compose'] = 'Scrie un mesaj';
-$labels['writenewmessage'] = 'Scrie mesaj nou';
-$labels['reply'] = 'Răspunde';
-$labels['replytomessage'] = 'Răspunde la mesaj';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizează';
+$labels['checkmail']        = 'Verifică mesaje noi';
+$labels['compose']          = 'Scrie un mesaj';
+$labels['writenewmessage']  = 'Scrie mesaj nou';
+$labels['reply']            = 'Răspunde';
+$labels['replytomessage']   = 'Răspunde la mesaj';
 $labels['replytoallmessage'] = 'Răspunde la toţi';
-$labels['replyall'] = 'Răspunde la toţi';
-$labels['replylist'] = 'Lista de răspuns';
-$labels['forward'] = 'Înaintează';
-$labels['forwardinline'] = 'Înaintează ca citat';
+$labels['replyall']         = 'Răspunde la toţi';
+$labels['replylist']        = 'Lista de răspuns';
+$labels['forward']          = 'Înaintează';
+$labels['forwardinline']    = 'Înaintează ca citat';
 $labels['forwardattachment'] = 'Înaintează ca ataşament';
-$labels['forwardmessage'] = 'Trimite mesajul mai departe';
-$labels['deletemessage'] = 'Trimite mesajul la gunoi';
+$labels['forwardmessage']   = 'Trimite mesajul mai departe';
+$labels['deletemessage']    = 'Trimite mesajul la gunoi';
 $labels['movemessagetotrash'] = 'Mută mesajul la gunoi';
-$labels['printmessage'] = 'Listează mesajul';
-$labels['previousmessage'] = 'Afişează mesajul anterior';
-$labels['firstmessage'] = 'Afişează primul mesaj';
-$labels['nextmessage'] = 'Afişează următorul mesaj';
-$labels['lastmessage'] = 'Afişează ultimul mesaj';
-$labels['backtolist'] = 'Înapoi la lista cu mesaje';
-$labels['viewsource'] = 'Afişează sursa';
-$labels['mark'] = 'Marchează';
-$labels['markmessages'] = 'Marchează mesajele';
-$labels['markread'] = 'Ca citit';
-$labels['markunread'] = 'Ca necitit';
-$labels['markflagged'] = 'Ca marcat';
-$labels['markunflagged'] = 'Ca nemarcat';
-$labels['moreactions'] = 'Mai multe acțiuni...';
-$labels['more'] = 'Mai multe';
-$labels['back'] = 'Înapoi';
-$labels['options'] = 'Opţiuni';
+$labels['printmessage']     = 'Listează mesajul';
+$labels['previousmessage']  = 'Afişează mesajul anterior';
+$labels['firstmessage']     = 'Afişează primul mesaj';
+$labels['nextmessage']      = 'Afişează următorul mesaj';
+$labels['lastmessage']      = 'Afişează ultimul mesaj';
+$labels['backtolist']       = 'Înapoi la lista cu mesaje';
+$labels['viewsource']       = 'Afişează sursa';
+$labels['mark']             = 'Marchează';
+$labels['markmessages']     = 'Marchează mesajele';
+$labels['markread']         = 'Ca citit';
+$labels['markunread']       = 'Ca necitit';
+$labels['markflagged']      = 'Ca marcat';
+$labels['markunflagged']    = 'Ca nemarcat';
+$labels['moreactions']      = 'Mai multe acțiuni...';
+$labels['more']             = 'Mai multe';
+$labels['back']             = 'Înapoi';
+$labels['options']          = 'Opţiuni';
+
 $labels['select'] = 'Selectează';
 $labels['all'] = 'Toate';
 $labels['none'] = 'Fără sortare';
-$labels['nonesort'] = 'Fără sortare';
 $labels['currpage'] = 'Pagina curentă';
 $labels['unread'] = 'Necitite';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'Fără răspuns';
 $labels['deleted'] = 'Şterse';
+$labels['undeleted'] = 'Nu a fost șters';
 $labels['invert'] = 'Inversează';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listă';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'Extinde toate';
 $labels['expand-unread'] = 'Extinde necitite';
 $labels['collapse-all'] = 'Compactează toate';
 $labels['threaded'] = 'Grupate';
+
 $labels['autoexpand_threads'] = 'Extinde mesajele grupate';
 $labels['do_expand'] = 'toate grupările';
 $labels['expand_only_unread'] = 'doar pe cele cu mesaje necitite';
 $labels['fromto'] = 'Expeditor/Destinatar';
 $labels['flag'] = 'Marcaj';
 $labels['attachment'] = 'Ataşament';
+$labels['nonesort'] = 'Fără sortare';
 $labels['sentdate'] = 'Data trimiterii';
 $labels['arrival'] = 'Data primirii';
 $labels['asc'] = 'ascendent';
@@ -156,173 +187,216 @@ $labels['listcolumns'] = 'Arată coloane';
 $labels['listsorting'] = 'Sortează după';
 $labels['listorder'] = 'Ordinea de sortare';
 $labels['listmode'] = 'Mod de vizualizare';
+
 $labels['folderactions'] = 'Actiuni asupra folder-ului...';
 $labels['compact'] = 'Compactează';
 $labels['empty'] = 'Goleşte';
+
 $labels['quota'] = 'Spaţiu folosit';
-$labels['unknown'] = 'necunoscut';
-$labels['unlimited'] = 'nelimitat';
-$labels['quicksearch'] = 'Căutare rapidă';
-$labels['resetsearch'] = 'Anulează căutarea';
-$labels['searchmod'] = 'Parametrii de căutare';
-$labels['msgtext'] = 'Tot mesajul';
+$labels['unknown']  = 'necunoscut';
+$labels['unlimited']  = 'nelimitat';
+
+$labels['quicksearch']  = 'Căutare rapidă';
+$labels['resetsearch']  = 'Anulează căutarea';
+$labels['searchmod']  = 'Parametrii de căutare';
+$labels['msgtext']  = 'Tot mesajul';
+$labels['body']  = 'Corp';
+
 $labels['openinextwin'] = 'Deschide într-o fereastră nouă';
 $labels['emlsave'] = 'Salvează în format .eml';
-$labels['editasnew'] = 'Editează ca nou';
-$labels['sendmessage'] = 'Trimite mesaj';
-$labels['savemessage'] = 'Salvează această ciornă';
-$labels['addattachment'] = 'Ataşează fişier';
-$labels['charset'] = 'Set de caractere';
-$labels['editortype'] = 'Tip de editor';
-$labels['returnreceipt'] = 'Returnează confirmare de primire';
-$labels['dsn'] = 'Notificare despre starea trimiterii';
+
+// message compose
+$labels['editasnew']      = 'Editează ca nou';
+$labels['send']           = 'Trimite';
+$labels['sendmessage']    = 'Trimite mesaj';
+$labels['savemessage']    = 'Salvează această ciornă';
+$labels['addattachment']  = 'Ataşează fişier';
+$labels['charset']        = 'Set de caractere';
+$labels['editortype']     = 'Tip de editor';
+$labels['returnreceipt']  = 'Returnează confirmare de primire';
+$labels['dsn']            = 'Notificare despre starea trimiterii';
 $labels['mailreplyintro'] = 'În $date, $sender a scris:';
 $labels['originalmessage'] = 'Mesaj original';
-$labels['editidents'] = 'Editează identităţi';
-$labels['spellcheck'] = 'Ortografie';
+
+$labels['editidents']    = 'Editează identităţi';
+$labels['spellcheck']    = 'Ortografie';
 $labels['checkspelling'] = 'Verifică ortografie';
 $labels['resumeediting'] = 'Reia editarea';
-$labels['revertto'] = 'Revino la';
+$labels['revertto']      = 'Revino la';
+
 $labels['attach'] = 'Ataşează';
 $labels['attachments'] = 'Ataşamente';
 $labels['upload'] = 'Încarcă';
 $labels['uploadprogress'] = '$percent ($current din $total)';
-$labels['close'] = 'Închide';
-$labels['messageoptions'] = 'Opţiuni mesaj...';
-$labels['low'] = 'Mică';
-$labels['lowest'] = 'Cea mai mică';
-$labels['normal'] = 'Normală';
-$labels['high'] = 'Mare';
+$labels['close']  = 'Închide';
+$labels['messageoptions']  = 'Opţiuni mesaj...';
+
+$labels['low']     = 'Mică';
+$labels['lowest']  = 'Cea mai mică';
+$labels['normal']  = 'Normală';
+$labels['high']    = 'Mare';
 $labels['highest'] = 'Cea mai mare';
-$labels['nosubject'] = '(fără subiect)';
+
+$labels['nosubject']  = '(fără subiect)';
 $labels['showimages'] = 'Afişează imagini';
 $labels['alwaysshow'] = 'Afişează întotdeauna imaginile de la $sender';
-$labels['isdraft'] = 'Acesta este un mesaj schiţă.';
+$labels['isdraft']    = 'Acesta este un mesaj schiţă.';
+$labels['andnmore']   = '$nr mai multe...';
+$labels['togglemoreheaders'] = 'Arată mai mult din antet';
+$labels['togglefullheaders'] = 'Arată mai puțin din antet';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text simplu';
 $labels['savesentmessagein'] = 'Salvează mesajele în';
 $labels['dontsave'] = 'Nu salva';
 $labels['maxuploadsize'] = 'Mărimea maximă admisă a fişierului este $size';
+
 $labels['addcc'] = 'Adaugă Cc';
 $labels['addbcc'] = 'Adaugă Bcc';
 $labels['addreplyto'] = 'Adaugă Raspunde-La';
 $labels['addfollowupto'] = 'Adaugă Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Expeditorul acestui mesaj a solicitat să fie notificat la cititrea mesajului. Doriţi să notificaţi expeditorul?';
 $labels['receiptread'] = 'Returnează confirmare (citit)';
 $labels['yourmessage'] = 'Aceasta este o confirmare de primire a mesajului dumneavoastră.';
 $labels['receiptnote'] = 'Notă: Această confirmare doar vă informează că mesajul a fost afişat pe calculatorul destinatarului. Nu există nici o garanţie că destinatarul a citit sau a inţeles conţinutul mesajului.';
-$labels['name'] = 'Numele Contactului';
-$labels['firstname'] = 'Nume';
-$labels['surname'] = 'Prenume';
-$labels['middlename'] = 'Iniţiala tatălui';
-$labels['nameprefix'] = 'Prefix';
-$labels['namesuffix'] = 'Sufix';
-$labels['nickname'] = 'Poreclă';
-$labels['jobtitle'] = 'Funcția';
-$labels['department'] = 'Departament';
-$labels['gender'] = 'Sex';
-$labels['maidenname'] = 'Nume de fată';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresă';
-$labels['street'] = 'Stradă';
-$labels['locality'] = 'Oraș';
-$labels['zipcode'] = 'Cod poştal';
-$labels['region'] = 'Stat/Judeţ';
-$labels['country'] = 'Țară';
-$labels['birthday'] = 'Ziua de naştere:';
-$labels['anniversary'] = 'Aniversare';
-$labels['website'] = 'Pagină web';
+
+// address boook
+$labels['name']         = 'Numele Contactului';
+$labels['firstname']    = 'Nume';
+$labels['surname']      = 'Prenume';
+$labels['middlename']   = 'Iniţiala tatălui';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Sufix';
+$labels['nickname']     = 'Poreclă';
+$labels['jobtitle']     = 'Funcția';
+$labels['department']   = 'Departament';
+$labels['gender']       = 'Sex';
+$labels['maidenname']   = 'Nume de fată';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresă';
+$labels['street']       = 'Stradă';
+$labels['locality']     = 'Oraș';
+$labels['zipcode']      = 'Cod poştal';
+$labels['region']       = 'Stat/Judeţ';
+$labels['country']      = 'Țară';
+$labels['birthday']     = 'Ziua de naştere:';
+$labels['anniversary']  = 'Aniversare';
+$labels['website']      = 'Pagină web';
 $labels['instantmessenger'] = 'IM (Mesaj Instant)';
 $labels['notes'] = 'Notițe';
-$labels['male'] = 'masculin';
+$labels['male']   = 'masculin';
 $labels['female'] = 'feminin';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Soț/soție';
 $labels['allfields'] = 'Toate câmpurile';
 $labels['search'] = 'Căutare';
 $labels['advsearch'] = 'Căutare avansată';
 $labels['advanced'] = 'Avansat';
 $labels['other'] = 'Altele';
-$labels['typeother'] = 'Altele';
-$labels['typehome'] = 'Pagina Principală';
-$labels['typework'] = 'Servici';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax acasă';
-$labels['typeworkfax'] = 'Fax serviciu';
-$labels['typecar'] = 'Mașină';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Pagină de pornire';
+
+$labels['typehome']   = 'Pagina Principală';
+$labels['typework']   = 'Servici';
+$labels['typeother']  = 'Altele';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax acasă';
+$labels['typeworkfax']  = 'Fax serviciu';
+$labels['typecar']  = 'Mașină';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Pagină de pornire';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Adaugă câmp...';
 $labels['addcontact'] = 'Adaugă contactul selectat în agendă';
 $labels['editcontact'] = 'Modifică contact';
 $labels['contacts'] = 'Contacte';
 $labels['contactproperties'] = 'Proprietăţile contactului...';
 $labels['personalinfo'] = 'Informații personale';
-$labels['edit'] = 'Editează';
+
+$labels['edit']   = 'Editează';
 $labels['cancel'] = 'Renunţă';
-$labels['save'] = 'Salvează';
+$labels['save']   = 'Salvează';
 $labels['delete'] = 'Şterge';
 $labels['rename'] = 'Redenumeşte';
 $labels['addphoto'] = 'Adaugă';
 $labels['replacephoto'] = 'Înlocuiește';
 $labels['uploadphoto'] = 'Încarcă poya';
-$labels['newcontact'] = 'Creează contact nou';
-$labels['deletecontact'] = 'Şterge contactul selectat';
-$labels['composeto'] = 'Compune e-mail pentru';
+
+$labels['newcontact']     = 'Creează contact nou';
+$labels['deletecontact']  = 'Şterge contactul selectat';
+$labels['composeto']      = 'Compune e-mail pentru';
 $labels['contactsfromto'] = 'Contacte de la $from până la $to din $count';
-$labels['print'] = 'Listează';
-$labels['export'] = 'Exportă';
-$labels['exportvcards'] = 'Exportă contactele în format vCard';
+$labels['print']          = 'Listează';
+$labels['export']         = 'Exportă';
+$labels['exportall']      = 'Exportă tot';
+$labels['exportsel']      = 'Exportă partea selectată';
+$labels['exportvcards']   = 'Exportă contactele în format vCard';
 $labels['newcontactgroup'] = 'Creează un nou grup de contacte';
-$labels['grouprename'] = 'Redenumește grupul';
-$labels['groupdelete'] = 'Șterge grupul';
-$labels['previouspage'] = 'Pagina anterioară';
-$labels['firstpage'] = 'Arată primul set';
-$labels['nextpage'] = 'Pagina următoare';
-$labels['lastpage'] = 'Arată ultimul set';
+$labels['grouprename']    = 'Redenumește grupul';
+$labels['groupdelete']    = 'Șterge grupul';
+$labels['groupremoveselected'] = 'Șterge contactele selectate din grup';
+
+$labels['previouspage']   = 'Pagina anterioară';
+$labels['firstpage']      = 'Arată primul set';
+$labels['nextpage']       = 'Pagina următoare';
+$labels['lastpage']       = 'Arată ultimul set';
+
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grupuri';
 $labels['personaladrbook'] = 'Adrese personale';
+
 $labels['searchsave'] = 'Salvează căutarea';
 $labels['searchdelete'] = 'Şterge căutarea';
+
 $labels['import'] = 'Importă';
 $labels['importcontacts'] = 'Importă contacte';
 $labels['importfromfile'] = 'Importă din fişier:';
 $labels['importtarget'] = 'Adaugă contactele noi în agenda:';
 $labels['importreplace'] = 'Înlocuieşte întreaga agendă';
+$labels['importdesc'] = 'Puteți încărcat contacte dintr-o agendă existentă.<br/>Momentan este suportat importul în formatul <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> sau în formatul CSV (comma-separated).';
 $labels['done'] = 'Finalizat';
+
+// settings
 $labels['settingsfor'] = 'Setări pentru';
 $labels['about'] = 'Despre';
 $labels['preferences'] = 'Preferinţe';
 $labels['userpreferences'] = 'Preferinţe utilizator';
 $labels['editpreferences'] = 'Modifică preferinţe utilizator';
+
 $labels['identities'] = 'Identităţi';
 $labels['manageidentities'] = 'Administrează identităţi pentru acest cont';
 $labels['newidentity'] = 'Identitate nouă';
+
 $labels['newitem'] = 'Obiect nou';
 $labels['edititem'] = 'Editează obiect';
+
 $labels['preferhtml'] = 'Format HTML';
 $labels['defaultcharset'] = 'Set implicit de caractere';
 $labels['htmlmessage'] = 'Mesaj HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Semnătură digitală';
 $labels['dateformat'] = 'Format dată';
 $labels['timeformat'] = 'Format oră';
 $labels['prettydate'] = 'Dată formatată';
-$labels['setdefault'] = 'Setează implicit';
-$labels['autodetect'] = 'Automat';
-$labels['language'] = 'Limba';
-$labels['timezone'] = 'Fus orar';
-$labels['pagesize'] = 'Rânduri pe pagină';
+$labels['setdefault']  = 'Setează implicit';
+$labels['autodetect']  = 'Automat';
+$labels['language']  = 'Limba';
+$labels['timezone']  = 'Fus orar';
+$labels['pagesize']  = 'Rânduri pe pagină';
 $labels['signature'] = 'Semnătură';
-$labels['dstactive'] = 'Reglare automată oră de vară';
+$labels['dstactive']  = 'Reglare automată oră de vară';
+$labels['showinextwin'] = 'Deschide mesajul în fereastră nouă';
+$labels['composeextwin'] = 'Compune mesajul în fereastră nouă';
 $labels['htmleditor'] = 'Scrie mesaje HTML';
 $labels['htmlonreply'] = 'la răspunsul doar către un mesaj HTML';
+$labels['htmlonreplyandforward'] = 'la trimitere mai departe sau la răspuns la mesaj HTML';
 $labels['htmlsignature'] = 'Semnatură HTML';
 $labels['previewpane'] = 'Previzualizare mail';
 $labels['skin'] = 'Temă interfaţă';
@@ -341,14 +415,16 @@ $labels['readwhendeleted'] = 'Marchează mesajul ca şi citit la ştergere';
 $labels['flagfordeletion'] = 'Marchează mesajul pentru ştergere în loc de a-l şterge direct';
 $labels['skipdeleted'] = 'Nu arăta mesajele şterse';
 $labels['deletealways'] = 'Dacă mutarea mesajelor în coş eşuează, se vor şterge';
+$labels['deletejunk'] = 'Șterge direct mesajele în Junk';
 $labels['showremoteimages'] = 'Arată imaginile care nu fac parte din e-mail';
 $labels['fromknownsenders'] = 'de la expeditori cunoscuţi';
 $labels['always'] = 'întotdeauna';
 $labels['showinlineimages'] = 'Arată imaginile ataşate sub mesaj';
-$labels['autosavedraft'] = 'Salvează ciorna automat';
-$labels['everynminutes'] = 'la fiecare $n minut(e)';
-$labels['never'] = 'niciodată';
-$labels['immediately'] = 'imediat';
+$labels['autosavedraft']  = 'Salvează ciorna automat';
+$labels['everynminutes']  = 'la fiecare $n minut(e)';
+$labels['refreshinterval']  = 'Actualizare (verificare mesaje noi, etc.)';
+$labels['never']  = 'niciodată';
+$labels['immediately']  = 'imediat';
 $labels['messagesdisplaying'] = 'Afişarea mesajelor';
 $labels['messagescomposition'] = 'Compunerea mesajelor';
 $labels['mimeparamfolding'] = 'Nume ataşamente';
@@ -368,6 +444,7 @@ $labels['maintenance'] = 'Mentenanţă';
 $labels['newmessage'] = 'Mesaj nou';
 $labels['signatureoptions'] = 'Opţiuni semnătură';
 $labels['whenreplying'] = 'Când răspundeţi';
+$labels['replyempty'] = 'nu cita mesajul original';
 $labels['replytopposting'] = 'începeţi mesajul nou deasupra originalului';
 $labels['replybottomposting'] = 'începeţi mesajul nou dedesubtul originalului';
 $labels['replyremovesignature'] = 'Când răspundeţi, se şterge semnătura originală din mesaj';
@@ -378,12 +455,12 @@ $labels['replysignaturepos'] = 'Când răspundeţi sau trimiteţi mai departe, s
 $labels['belowquote'] = 'dedesubtul citatului';
 $labels['abovequote'] = 'deasupra citatului';
 $labels['insertsignature'] = 'Introduce o semnătură';
-$labels['previewpanemarkread'] = 'Marchează mesajele previzualizate ca citite';
-$labels['afternseconds'] = 'după $n secunde';
+$labels['previewpanemarkread']  = 'Marchează mesajele previzualizate ca citite';
+$labels['afternseconds']  = 'după $n secunde';
 $labels['reqmdn'] = 'Cere întotdeauna o confirmare de primire';
 $labels['reqdsn'] = 'Cere întotdeauna o notificare a stării de trimitere';
 $labels['replysamefolder'] = 'Pune răspunsurile în folder-ul mesajului la care se răspunde';
-$labels['defaultaddressbook'] = 'Adaugă noile contacte la agenda selectată';
+$labels['defaultabook'] = 'Agenda implicită';
 $labels['autocompletesingle'] = 'Sari peste adresele e-mail alternative la autocompletare';
 $labels['listnamedisplay'] = 'Listează contactele ca';
 $labels['spellcheckbeforesend'] = 'Verifică ortografia înainte de a trimite un mesaj';
@@ -393,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Ignoră cuvintele cu numere';
 $labels['spellcheckignorecaps'] = 'Ignoră cuvintele din litere mari';
 $labels['addtodict'] = 'Adaugă la dicţionar';
 $labels['mailtoprotohandler'] = 'Îregistrează handler protocol pentru mailto: link-uri';
-$labels['folder'] = 'Dosar';
-$labels['foldername'] = 'Nume dosar';
-$labels['subscribed'] = 'Înscris';
+$labels['forwardmode'] = 'Trimitere mai departe mesaj';
+$labels['inline'] = 'într-e linii';
+$labels['asattachment'] = 'ca atașament';
+
+$labels['folder']  = 'Dosar';
+$labels['folders']  = 'Dosare';
+$labels['foldername']  = 'Nume dosar';
+$labels['subscribed']  = 'Înscris';
 $labels['messagecount'] = 'Mesaje';
-$labels['create'] = 'Creează';
-$labels['createfolder'] = 'Creează dosar nou';
-$labels['managefolders'] = 'Administrează dosare';
+$labels['create']  = 'Creează';
+$labels['createfolder']  = 'Creează dosar nou';
+$labels['managefolders']  = 'Administrează dosare';
 $labels['specialfolders'] = 'Dosare speciale';
 $labels['properties'] = 'Proprietăți';
 $labels['folderproperties'] = 'Proprietăţile folder-ului';
@@ -409,22 +491,29 @@ $labels['info'] = 'Informații';
 $labels['getfoldersize'] = 'Click pentru dimensiunea dosarului';
 $labels['changesubscription'] = 'Click pentru a modifica abonarea';
 $labels['foldertype'] = 'Tip dosar';
-$labels['personalfolder'] = 'Dosar privat';
-$labels['otherfolder'] = 'Dosarul altui utilizator';
-$labels['sharedfolder'] = 'Dosar public';
+$labels['personalfolder']  = 'Dosar privat';
+$labels['otherfolder']  = 'Dosarul altui utilizator';
+$labels['sharedfolder']  = 'Dosar public';
+
 $labels['sortby'] = 'Sortează după';
-$labels['sortasc'] = 'Sortează ascendent';
+$labels['sortasc']  = 'Sortează ascendent';
 $labels['sortdesc'] = 'Sortează descendent';
 $labels['undo'] = 'Anulaţi/Revocați';
+
+$labels['installedplugins'] = 'Instalare module';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versiune';
 $labels['source'] = 'Sursă';
 $labels['license'] = 'Licență';
 $labels['support'] = 'Cere asistenţă';
+
+// units
 $labels['B'] = 'O';
 $labels['KB'] = 'KO';
 $labels['MB'] = 'MO';
 $labels['GB'] = 'GO';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Englezesc';
 $labels['westerneuropean'] = 'Europa de Vest';
@@ -444,3 +533,4 @@ $labels['japanese'] = 'Japonez';
 $labels['korean'] = 'Coreean';
 $labels['chinese'] = 'Chinezesc';
 
+?>
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 93fa05f97..68d1ab6a7 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -2,26 +2,30 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Raduta Alex <raduta.alex@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'A avut loc o EROARE!';
-$messages['loginfailed'] = 'Autentificare eşuată';
+$messages['errortitle']  = 'A avut loc o EROARE!';
+$messages['loginfailed']  = 'Autentificare eşuată';
 $messages['cookiesdisabled'] = 'Browserul dumneavoastră nu acceptă cookies';
 $messages['sessionerror'] = 'Sesiunea dumneavoastră este invalidă sau a expirat';
 $messages['storageerror'] = 'Conectarea la serverul IMAP a eşuat';
 $messages['servererror'] = 'Eroare de server!';
 $messages['servererrormsg'] = 'Eroare Server: $msg';
 $messages['dberror'] = 'Eroare bază de date!';
+$messages['requesttimedout'] = 'Timpul alocat cereri a expirat';
 $messages['errorreadonly'] = 'Nu se poate efectua operaţia. Dosarul este doar-citire.';
 $messages['errornoperm'] = 'Nu se poate efectua operaţia. Acces interzis.';
 $messages['invalidrequest'] = 'Solicitare invalidă! Datele nu au fost salvate.';
@@ -29,6 +33,7 @@ $messages['invalidhost'] = 'Hosname invalid';
 $messages['nomessagesfound'] = 'Nu a fost găsit nici un mesaj în această căsuţă poştală';
 $messages['loggedout'] = 'Sesiune încheiată cu succes. La revedere!';
 $messages['mailboxempty'] = 'Căsuţa poştală este goală';
+$messages['refreshing'] = 'Reîmprospătare...';
 $messages['loading'] = 'Se încarcă...';
 $messages['uploading'] = 'Fişierul se încarcă...';
 $messages['uploadingmany'] = 'Încarc fişierele...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = 'Mesajul(e) nu a(u) putut fi mutat(e)';
 $messages['errorcopying'] = 'Mesajul(e) nu a(u) putut fi copiat(e)';
 $messages['errordeleting'] = 'Mesajul(e) nu a(u) putut fi şters(e)';
 $messages['errormarking'] = 'Mesajul(e) nu a(u) putut fi marcat(e)';
-$messages['deletecontactconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi contactul(ele) selectate?';
-$messages['deletegroupconfirm'] = 'Chiar vrei să ştergi grupul selectat?';
+$messages['deletecontactconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi contactul(ele) selectate?';
+$messages['deletegroupconfirm']  = 'Chiar vrei să ştergi grupul selectat?';
 $messages['deletemessagesconfirm'] = 'Chiar doriţi să ştergeţi mesajele selectate ?';
-$messages['deletefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
-$messages['purgefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi toate mesajele din acest dosar?';
+$messages['deletefolderconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
+$messages['purgefolderconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi toate mesajele din acest dosar?';
 $messages['contactdeleting'] = 'Şterg contactul(ele)...';
 $messages['groupdeleting'] = 'Şterg grupul...';
 $messages['folderdeleting'] = 'Se şterge dosarul...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Abonez dosarul...';
 $messages['folderunsubscribing'] = 'Dezabonez dosarul...';
 $messages['formincomplete'] = 'Formularul nu a fost completat corect';
 $messages['noemailwarning'] = 'Vă rugăm să introduceţi o adresă de e-mail validă';
-$messages['nonamewarning'] = 'Vă rugăm să introduceţi un nume';
+$messages['nonamewarning']  = 'Vă rugăm să introduceţi un nume';
 $messages['nopagesizewarning'] = 'Vă rugăm să introduceţi mărimea paginii';
 $messages['nosenderwarning'] = 'Vă rugăm să introduceţi adresa expeditorului';
 $messages['norecipientwarning'] = 'Vă rugăm să introduceţi cel puţin un destinatar';
-$messages['nosubjectwarning'] = 'Mesajul nu are subiect. Vreţi să introduceţi unul acum?';
+$messages['nosubjectwarning']  = 'Mesajul nu are subiect. Vreţi să introduceţi unul acum?';
 $messages['nobodywarning'] = 'Trimiteţi acest mesaj fără text?';
 $messages['notsentwarning'] = 'Mesajul nu a fost trimis. Vreţi să renunţaţi la el?';
 $messages['noldapserver'] = 'Vă rugăm să alegeţi un server ldap pentru căutare';
@@ -114,7 +119,9 @@ $messages['selectimportfile'] = 'Va rugăm să selectaţi fişierul pentru înc�
 $messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată';
 $messages['contactaddedtogroup'] = 'Contactele au fost adăugate cu succes la acest grup';
 $messages['contactremovedfromgroup'] = 'Contactele au fost şterse cu succes din acest grup';
+$messages['nogroupassignmentschanged'] = 'Atribuirile la grupuri nu au fost modificate.';
 $messages['importwait'] = 'Datele sunt importate, vă rugăm să aşteptaţi...';
+$messages['importformaterror'] = 'Importul a eșuat! Fișierul încărcat nu este un fișier valid pentru import de date.';
 $messages['importconfirm'] = 'Contactele $inserted au fost importate cu succes, $skipped intrări au fost ignorate deoarece ele există deja:$names';
 $messages['importconfirmskipped'] = '<b>Am sărit peste $skipped înregistrări</b>';
 $messages['opnotpermitted'] = 'Operaţia nu este permisă!';
@@ -156,4 +163,7 @@ $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 al utiliza vă rugăm activați Javascript în navigator.';
 
+?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 43d673b28..d275812b4 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добро пожаловать в $product!';
-$labels['username'] = 'Имя пользователя';
-$labels['password'] = 'Пароль';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Войти';
-$labels['logout'] = 'Выход';
-$labels['mail'] = 'Почта';
+
+// login page
+$labels['welcome']   = 'Добро пожаловать в $product!';
+$labels['username']  = 'Имя пользователя';
+$labels['password']  = 'Пароль';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Войти';
+
+// taskbar
+$labels['logout']   = 'Выход';
+$labels['mail']     = 'Почта';
 $labels['settings'] = 'Настройки';
 $labels['addressbook'] = 'Контакты';
-$labels['inbox'] = 'Входящие';
+
+// mailbox names
+$labels['inbox']  = 'Входящие';
 $labels['drafts'] = 'Черновики';
-$labels['sent'] = 'Отправленные';
-$labels['trash'] = 'Корзина';
-$labels['junk'] = 'СПАМ';
+$labels['sent']   = 'Отправленные';
+$labels['trash']  = 'Корзина';
+$labels['junk']   = 'СПАМ';
+
+// message listing
 $labels['subject'] = 'Тема';
-$labels['from'] = 'От';
-$labels['to'] = 'Кому';
-$labels['cc'] = 'Копия';
-$labels['bcc'] = 'Скрытая';
+$labels['from']    = 'От';
+$labels['sender']  = 'Отправитель';
+$labels['to']      = 'Кому';
+$labels['cc']      = 'Копия';
+$labels['bcc']     = 'Скрытая';
 $labels['replyto'] = 'Ответить';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Размер';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Размер';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
 $labels['readstatus'] = 'Статус прочтения';
 $labels['listoptions'] = 'Настройки списка...';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Сообщения с $from по $to из $count';
 $labels['threadsfromto'] = 'Обсуждения с $from по $to из $count';
 $labels['messagenrof'] = 'Сообщение $nr из $count';
 $labels['fromtoshort'] = '$from – $to из $count';
-$labels['copy'] = 'Копировать';
-$labels['move'] = 'Переместить';
-$labels['moveto'] = 'Переместить в...';
+
+$labels['copy']     = 'Копировать';
+$labels['move']     = 'Переместить';
+$labels['moveto']   = 'Переместить в...';
 $labels['download'] = 'Загрузить';
 $labels['showattachment'] = 'Показать';
 $labels['showanyway'] = 'Все равно показать';
+
 $labels['filename'] = 'Имя файла';
 $labels['filesize'] = 'Размер файла';
+
 $labels['addtoaddressbook'] = 'Добавить в контакты';
+
+// weekdays short
 $labels['sun'] = 'Вс';
 $labels['mon'] = 'Пн';
 $labels['tue'] = 'Вт';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Ср';
 $labels['thu'] = 'Чт';
 $labels['fri'] = 'Пт';
 $labels['sat'] = 'Сб';
-$labels['sunday'] = 'Воскресенье';
-$labels['monday'] = 'Понедельник';
-$labels['tuesday'] = 'Вторник';
+
+// weekdays long
+$labels['sunday']    = 'Воскресенье';
+$labels['monday']    = 'Понедельник';
+$labels['tuesday']   = 'Вторник';
 $labels['wednesday'] = 'Среда';
-$labels['thursday'] = 'Четверг';
-$labels['friday'] = 'Пятница';
-$labels['saturday'] = 'Суббота';
-$labels['jan'] = 'Янв';
-$labels['feb'] = 'Фев';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Май';
-$labels['longmay'] = 'Май';
-$labels['jun'] = 'Июн';
-$labels['jul'] = 'Июл';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сен';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Ноя';
-$labels['dec'] = 'Дек';
-$labels['longjan'] = 'Январь';
-$labels['longfeb'] = 'Февраль';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Апрель';
-$labels['longjun'] = 'Июнь';
-$labels['longjul'] = 'Июль';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Сентябрь';
-$labels['longoct'] = 'Октябрь';
-$labels['longnov'] = 'Ноябрь';
-$labels['longdec'] = 'Декабрь';
+$labels['thursday']  = 'Четверг';
+$labels['friday']    = 'Пятница';
+$labels['saturday']  = 'Суббота';
+
+// months short
+$labels['jan']	= 'Янв';
+$labels['feb']	= 'Фев';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Май';
+$labels['jun']	= 'Июн';
+$labels['jul'] 	= 'Июл';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сен';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Ноя';
+$labels['dec']	= 'Дек';
+
+// months long
+$labels['longjan']	= 'Январь';
+$labels['longfeb']	= 'Февраль';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Апрель';
+$labels['longmay']	= 'Май';
+$labels['longjun']	= 'Июнь';
+$labels['longjul']	= 'Июль';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Сентябрь';
+$labels['longoct']	= 'Октябрь';
+$labels['longnov']	= 'Ноябрь';
+$labels['longdec']	= 'Декабрь';
+
 $labels['today'] = 'Сегодня';
-$labels['refresh'] = 'Обновить';
-$labels['checkmail'] = 'Доставить почту';
-$labels['compose'] = 'Написать сообщение';
-$labels['writenewmessage'] = 'Новое сообщение';
-$labels['reply'] = 'Ответить';
-$labels['replytomessage'] = 'Ответить';
+
+// toolbar buttons
+$labels['refresh']          = 'Обновить';
+$labels['checkmail']        = 'Доставить почту';
+$labels['compose']          = 'Написать сообщение';
+$labels['writenewmessage']  = 'Новое сообщение';
+$labels['reply']            = 'Ответить';
+$labels['replytomessage']   = 'Ответить';
 $labels['replytoallmessage'] = 'Ответить по списку или отправителю и всем получателям';
-$labels['replyall'] = 'Ответить всем';
-$labels['replylist'] = 'Ответить в список рассылки';
-$labels['forward'] = 'Переслать';
-$labels['forwardinline'] = 'Переслать в теле письма';
+$labels['replyall']         = 'Ответить всем';
+$labels['replylist']        = 'Ответить в список рассылки';
+$labels['forward']          = 'Переслать';
+$labels['forwardinline']    = 'Переслать в теле письма';
 $labels['forwardattachment'] = 'Переслать как вложение';
-$labels['forwardmessage'] = 'Переслать';
-$labels['deletemessage'] = 'В корзину';
+$labels['forwardmessage']   = 'Переслать';
+$labels['deletemessage']    = 'В корзину';
 $labels['movemessagetotrash'] = 'Переместить сообщение в корзину';
-$labels['printmessage'] = 'Печать';
-$labels['previousmessage'] = 'Показать предыдущее сообщение';
-$labels['firstmessage'] = 'Показать первое сообщение';
-$labels['nextmessage'] = 'Показать следующее сообщение';
-$labels['lastmessage'] = 'Показать последнее сообщение';
-$labels['backtolist'] = 'К списку сообщений';
-$labels['viewsource'] = 'Исходный текст';
-$labels['mark'] = 'Пометить';
-$labels['markmessages'] = 'Пометить сообщение';
-$labels['markread'] = 'Как прочитанное';
-$labels['markunread'] = 'Как непрочитанное';
-$labels['markflagged'] = 'Установить флаг';
-$labels['markunflagged'] = 'Снять флаг';
-$labels['moreactions'] = 'Дополнительные действия...';
-$labels['more'] = 'Еще';
-$labels['back'] = 'Назад';
-$labels['options'] = 'Параметры';
+$labels['printmessage']     = 'Печать';
+$labels['previousmessage']  = 'Показать предыдущее сообщение';
+$labels['firstmessage']     = 'Показать первое сообщение';
+$labels['nextmessage']      = 'Показать следующее сообщение';
+$labels['lastmessage']      = 'Показать последнее сообщение';
+$labels['backtolist']       = 'К списку сообщений';
+$labels['viewsource']       = 'Исходный текст';
+$labels['mark']             = 'Пометить';
+$labels['markmessages']     = 'Пометить сообщение';
+$labels['markread']         = 'Как прочитанное';
+$labels['markunread']       = 'Как непрочитанное';
+$labels['markflagged']      = 'Установить флаг';
+$labels['markunflagged']    = 'Снять флаг';
+$labels['moreactions']      = 'Дополнительные действия...';
+$labels['more']             = 'Еще';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Параметры';
+
 $labels['select'] = 'Выбрать';
 $labels['all'] = 'Все';
 $labels['none'] = 'Отсутствует';
-$labels['nonesort'] = 'Отсутствует';
 $labels['currpage'] = 'Текущая страница';
 $labels['unread'] = 'Непрочитанные';
 $labels['flagged'] = 'Помеченные';
@@ -145,12 +171,14 @@ $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'] = 'по возрастанию';
@@ -159,147 +187,174 @@ $labels['listcolumns'] = 'Колонки';
 $labels['listsorting'] = 'Сортировать по';
 $labels['listorder'] = 'Порядок сортировки';
 $labels['listmode'] = 'Режим просмотра';
+
 $labels['folderactions'] = 'Операции над папкой...';
 $labels['compact'] = 'Сжать';
 $labels['empty'] = 'Опустошить';
+
 $labels['quota'] = 'Квота';
-$labels['unknown'] = 'неизвестно';
-$labels['unlimited'] = 'без ограничений';
-$labels['quicksearch'] = 'Быстрый поиск';
-$labels['resetsearch'] = 'Сброс';
-$labels['searchmod'] = 'Варианты поиска';
-$labels['msgtext'] = 'Всё сообщение';
+$labels['unknown']  = 'неизвестно';
+$labels['unlimited']  = 'без ограничений';
+
+$labels['quicksearch']  = 'Быстрый поиск';
+$labels['resetsearch']  = 'Сброс';
+$labels['searchmod']  = 'Варианты поиска';
+$labels['msgtext']  = 'Всё сообщение';
+$labels['body']  = 'Тело письма';
+
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
-$labels['editasnew'] = 'Редактировать как новое';
-$labels['send'] = 'Отправлено';
-$labels['sendmessage'] = 'Отправить сейчас';
-$labels['savemessage'] = 'Сохранить черновик';
-$labels['addattachment'] = 'Добавить вложение';
-$labels['charset'] = 'Кодировка';
-$labels['editortype'] = 'Редактор';
-$labels['returnreceipt'] = 'Запрос ответа';
-$labels['dsn'] = 'Уведомление о состоянии доставки';
+
+// message compose
+$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['editidents']    = 'Изменить данные';
+$labels['spellcheck']    = 'Орфография';
 $labels['checkspelling'] = 'Проверить орфографию';
 $labels['resumeediting'] = 'Продолжить редактирование';
-$labels['revertto'] = 'Отменить правки';
+$labels['revertto']      = 'Отменить правки';
+
 $labels['attach'] = 'Вложить';
 $labels['attachments'] = 'Вложения';
 $labels['upload'] = 'Загрузить';
 $labels['uploadprogress'] = '$percent ($current из $total)';
-$labels['close'] = 'Закрыть';
-$labels['messageoptions'] = 'Настройки сообщений...';
-$labels['low'] = 'Низкий';
-$labels['lowest'] = 'Нижайш.';
-$labels['normal'] = 'Норм.';
-$labels['high'] = 'Высокий';
+$labels['close']  = 'Закрыть';
+$labels['messageoptions']  = 'Настройки сообщений...';
+
+$labels['low']     = 'Низкий';
+$labels['lowest']  = 'Нижайш.';
+$labels['normal']  = 'Норм.';
+$labels['high']    = 'Высокий';
 $labels['highest'] = 'Высоч.';
-$labels['nosubject'] = '(без темы)';
+
+$labels['nosubject']  = '(без темы)';
 $labels['showimages'] = 'Показать изображения';
 $labels['alwaysshow'] = 'Всегда показывать изображенияв письмах от $sender';
-$labels['isdraft'] = 'Это черновик.';
-$labels['andnmore'] = 'ещё $nr...';
+$labels['isdraft']    = 'Это черновик.';
+$labels['andnmore']   = 'ещё $nr...';
 $labels['togglemoreheaders'] = 'Загрузить ещё заголовки сообщений';
 $labels['togglefullheaders'] = 'Показать оригинальные заголовки сообщения';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Текст';
 $labels['savesentmessagein'] = 'Сохранить в';
 $labels['dontsave'] = 'не сохранять';
 $labels['maxuploadsize'] = 'Максимальный размер файла $size';
+
 $labels['addcc'] = 'Копия';
 $labels['addbcc'] = 'Скрытая копия';
 $labels['addreplyto'] = 'Кому ответить';
 $labels['addfollowupto'] = 'Добавить Followup-To';
+
+// mdn
 $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'] = 'E-Mail';
-$labels['phone'] = 'Телефон';
-$labels['address'] = 'Адрес';
-$labels['street'] = 'Улица';
-$labels['locality'] = 'Город';
-$labels['zipcode'] = 'Индекс';
-$labels['region'] = 'Область';
-$labels['country'] = 'Страна';
-$labels['birthday'] = 'День рождения';
-$labels['anniversary'] = 'Годовщина';
-$labels['website'] = 'Веб-сайт';
+
+// address boook
+$labels['name']         = 'Отображаемое имя';
+$labels['firstname']    = 'Имя';
+$labels['surname']      = 'Фамилия';
+$labels['middlename']   = 'Отчество';
+$labels['nameprefix']   = 'Префикс';
+$labels['namesuffix']   = 'Суффикс';
+$labels['nickname']     = 'Прозвище';
+$labels['jobtitle']     = 'Должность';
+$labels['department']   = 'Отдел';
+$labels['gender']       = 'Пол';
+$labels['maidenname']   = 'Девичья фамилия';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Телефон';
+$labels['address']      = 'Адрес';
+$labels['street']       = 'Улица';
+$labels['locality']     = 'Город';
+$labels['zipcode']      = 'Индекс';
+$labels['region']       = 'Область';
+$labels['country']      = 'Страна';
+$labels['birthday']     = 'День рождения';
+$labels['anniversary']  = 'Годовщина';
+$labels['website']      = 'Веб-сайт';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Заметки';
-$labels['male'] = 'мужской';
+$labels['male']   = 'мужской';
 $labels['female'] = 'женский';
 $labels['manager'] = 'Менеджер';
 $labels['assistant'] = 'Помощник';
-$labels['typeassistant'] = 'Помощник';
 $labels['spouse'] = 'Супруг';
 $labels['allfields'] = 'Все поля';
 $labels['search'] = 'Поиск';
 $labels['advsearch'] = 'Расширенный поиск';
 $labels['advanced'] = 'Дополнительно';
 $labels['other'] = 'Другое';
-$labels['typeother'] = 'Другое';
-$labels['typehome'] = 'Дом';
-$labels['typework'] = 'Работа';
-$labels['typemobile'] = 'Мобильный';
-$labels['typemain'] = 'Основной';
-$labels['typehomefax'] = 'Домашний факс';
-$labels['typeworkfax'] = 'Рабочий факс';
-$labels['typecar'] = 'Автомобиль';
-$labels['typepager'] = 'Пэйджер';
-$labels['typevideo'] = 'Видео';
-$labels['typehomepage'] = 'Домашняя страница';
+
+$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['addcontact'] = 'Добавить выбранные контакты в список контактов';
 $labels['editcontact'] = 'Редактировать контакт';
 $labels['contacts'] = 'Контакты';
 $labels['contactproperties'] = 'Свойства контакта';
 $labels['personalinfo'] = 'Личная информация';
-$labels['edit'] = 'Правка';
+
+$labels['edit']   = 'Правка';
 $labels['cancel'] = 'Отмена';
-$labels['save'] = 'Сохранить';
+$labels['save']   = 'Сохранить';
 $labels['delete'] = 'Удалить';
 $labels['rename'] = 'Переименовать';
 $labels['addphoto'] = 'Добавить';
 $labels['replacephoto'] = 'Заменить';
 $labels['uploadphoto'] = 'Загрузить фотографию';
-$labels['newcontact'] = 'Создать новый контакт';
-$labels['deletecontact'] = 'Удалить выбранные контакты';
-$labels['composeto'] = 'Создать сообщение для выбранных контактов';
+
+$labels['newcontact']     = 'Создать новый контакт';
+$labels['deletecontact']  = 'Удалить выбранные контакты';
+$labels['composeto']      = 'Создать сообщение для выбранных контактов';
 $labels['contactsfromto'] = 'Контакты с $from по $to из $count';
-$labels['print'] = 'Печать';
-$labels['export'] = 'Экспорт';
-$labels['exportvcards'] = 'Экспортировать контакты в формате vCard';
+$labels['print']          = 'Печать';
+$labels['export']         = 'Экспорт';
+$labels['exportall']      = 'Экспортировать все';
+$labels['exportsel']      = 'Экспортировать выделенные';
+$labels['exportvcards']   = 'Экспортировать контакты в формате vCard';
 $labels['newcontactgroup'] = 'Создать группу контактов';
-$labels['grouprename'] = 'Переименовать группу';
-$labels['groupdelete'] = 'Удалить группу';
+$labels['grouprename']    = 'Переименовать группу';
+$labels['groupdelete']    = 'Удалить группу';
 $labels['groupremoveselected'] = 'Удалить выбранные контакты из группы';
-$labels['previouspage'] = 'Показать предыдущий';
-$labels['firstpage'] = 'Показать первый';
-$labels['nextpage'] = 'Показать следующий';
-$labels['lastpage'] = 'Показать последний';
+
+$labels['previouspage']   = 'Показать предыдущий';
+$labels['firstpage']      = 'Показать первый';
+$labels['nextpage']       = 'Показать следующий';
+$labels['lastpage']       = 'Показать последний';
+
 $labels['group'] = 'Группа';
 $labels['groups'] = 'Группы';
 $labels['personaladrbook'] = 'Персональные адреса';
+
 $labels['searchsave'] = 'Сохранить запрос';
 $labels['searchdelete'] = 'Удалить запрос';
+
 $labels['import'] = 'Импортировать';
 $labels['importcontacts'] = 'Импортировать контакты';
 $labels['importfromfile'] = 'Импортировать из файла:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Добавить новые контакты в ад�
 $labels['importreplace'] = 'Заменить всю адресную книгу';
 $labels['importdesc'] = 'Вы можете загрузить контакты из существующей адресной книги. <br/>В настоящее время мы поддерживаем импорт адресов в формате визитной карточки <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> или CSV (данные разделённые запятой).';
 $labels['done'] = 'Завершено';
+
+// settings
 $labels['settingsfor'] = 'Настройки для';
 $labels['about'] = 'О программе';
 $labels['preferences'] = 'Настройки';
 $labels['userpreferences'] = 'Настройки пользователя';
 $labels['editpreferences'] = 'Редактировать настройки пользователя';
+
 $labels['identities'] = 'Профили';
 $labels['manageidentities'] = 'Управление профилями';
 $labels['newidentity'] = 'Новый профиль';
+
 $labels['newitem'] = 'Новый';
 $labels['edititem'] = 'Правка';
+
 $labels['preferhtml'] = 'Предпочитать HTML';
 $labels['defaultcharset'] = 'Набор символов по-умолчанию';
 $labels['htmlmessage'] = 'Сообщение HTML';
+$labels['messagepart'] = 'Часть';
+$labels['digitalsig'] = 'Цифровая подпись';
 $labels['dateformat'] = 'Формат даты';
 $labels['timeformat'] = 'Формат времени';
 $labels['prettydate'] = 'Красивые даты';
-$labels['setdefault'] = 'Использовать по умолчанию';
-$labels['autodetect'] = 'Определять автоматически';
-$labels['language'] = 'Язык';
-$labels['timezone'] = 'Часовой пояс';
-$labels['pagesize'] = 'Строк на странице';
+$labels['setdefault']  = 'Использовать по умолчанию';
+$labels['autodetect']  = 'Определять автоматически';
+$labels['language']  = 'Язык';
+$labels['timezone']  = 'Часовой пояс';
+$labels['pagesize']  = 'Строк на странице';
 $labels['signature'] = 'Подпись';
-$labels['dstactive'] = 'Летнее время';
+$labels['dstactive']  = 'Летнее время';
 $labels['showinextwin'] = 'Открыть сообщение в новом окне';
 $labels['composeextwin'] = 'Создать в новом окне';
 $labels['htmleditor'] = 'Создавать сообщения в HTML';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Показывать удаленные изоб�
 $labels['fromknownsenders'] = 'от известных отправителей';
 $labels['always'] = 'всегда';
 $labels['showinlineimages'] = 'Показывать вложенные изображения внизу сообщения';
-$labels['autosavedraft'] = 'Автосохранение черновика';
-$labels['everynminutes'] = 'каждые $n минут';
-$labels['refreshinterval'] = 'Обновить (проверить новые сообщения и т.п.)';
-$labels['never'] = 'никогда';
-$labels['immediately'] = 'немедленно';
+$labels['autosavedraft']  = 'Автосохранение черновика';
+$labels['everynminutes']  = 'каждые $n минут';
+$labels['refreshinterval']  = 'Обновить (проверить новые сообщения и т.п.)';
+$labels['never']  = 'никогда';
+$labels['immediately']  = 'немедленно';
 $labels['messagesdisplaying'] = 'Отображение сообщений';
 $labels['messagescomposition'] = 'Создание сообщений';
 $labels['mimeparamfolding'] = 'Имена вложений';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Прикрепить подпись при от�
 $labels['belowquote'] = 'после цитаты';
 $labels['abovequote'] = 'до цитаты';
 $labels['insertsignature'] = 'Вставить подпись';
-$labels['previewpanemarkread'] = 'Отмечать просмотренные сообщения как прочитанные';
-$labels['afternseconds'] = 'через $n секунд';
+$labels['previewpanemarkread']  = 'Отмечать просмотренные сообщения как прочитанные';
+$labels['afternseconds']  = 'через $n секунд';
 $labels['reqmdn'] = 'Всегда запрашивать уведомление о доставке';
 $labels['reqdsn'] = 'Всегда запрашивать уведомление о состоянии доставки';
 $labels['replysamefolder'] = 'Помещать ответы в ту же папку, где находится оригинал';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Зарегистрировать обработ
 $labels['forwardmode'] = 'Пересылка сообщений';
 $labels['inline'] = 'в тексте';
 $labels['asattachment'] = 'как вложение';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Имя папки';
-$labels['subscribed'] = 'Подписан';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Имя папки';
+$labels['subscribed']  = 'Подписан';
 $labels['messagecount'] = 'Сообщения';
-$labels['create'] = 'Создать';
-$labels['createfolder'] = 'Создать новую папку';
-$labels['managefolders'] = 'Управление папками';
+$labels['create']  = 'Создать';
+$labels['createfolder']  = 'Создать новую папку';
+$labels['managefolders']  = 'Управление папками';
 $labels['specialfolders'] = 'Особые папки';
 $labels['properties'] = 'Свойства';
 $labels['folderproperties'] = 'Свойства папки';
@@ -427,23 +491,29 @@ $labels['info'] = 'Информация';
 $labels['getfoldersize'] = 'Показать размер папки';
 $labels['changesubscription'] = 'Изменить подписку';
 $labels['foldertype'] = 'Тип каталога';
-$labels['personalfolder'] = 'Приватный каталог';
-$labels['otherfolder'] = 'Каталог другого пользователя';
-$labels['sharedfolder'] = 'Совместный каталог';
+$labels['personalfolder']  = 'Приватный каталог';
+$labels['otherfolder']  = 'Каталог другого пользователя';
+$labels['sharedfolder']  = 'Совместный каталог';
+
 $labels['sortby'] = 'Сортировать по';
-$labels['sortasc'] = 'Возрастанию';
+$labels['sortasc']  = 'Возрастанию';
 $labels['sortdesc'] = 'Убыванию';
 $labels['undo'] = 'Отмена';
+
 $labels['installedplugins'] = 'Установленные дополнения';
 $labels['plugin'] = 'Дополнение';
 $labels['version'] = 'Версия';
 $labels['source'] = 'Источник';
 $labels['license'] = 'Лицензия';
 $labels['support'] = 'Поддержка';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Английский';
 $labels['westerneuropean'] = 'Западноевропейский';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Японский';
 $labels['korean'] = 'Корейский';
 $labels['chinese'] = 'Китайский';
 
+?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index e4363d11e..0693887c0 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Произошла ошибка!';
-$messages['loginfailed'] = 'Неудачная попытка входа';
+$messages['errortitle']  = 'Произошла ошибка!';
+$messages['loginfailed']  = 'Неудачная попытка входа';
 $messages['cookiesdisabled'] = 'Ваш броузер не принимает cookie';
 $messages['sessionerror'] = 'Ваша сессия устарела';
 $messages['storageerror'] = 'Неудачное соединение с IMAP сервером';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Не удалось переместить сооб�
 $messages['errorcopying'] = 'Не удалось скопировать сообщение';
 $messages['errordeleting'] = 'Не удалось удалить сообщение';
 $messages['errormarking'] = 'Невозможно пометить сообщение';
-$messages['deletecontactconfirm'] = 'Вы действительно хотите удалить выделенные контакты?';
-$messages['deletegroupconfirm'] = 'Вы действительно хотите удалить группу?';
+$messages['deletecontactconfirm']  = 'Вы действительно хотите удалить выделенные контакты?';
+$messages['deletegroupconfirm']  = 'Вы действительно хотите удалить группу?';
 $messages['deletemessagesconfirm'] = 'Вы действительно хотите удалить выбранные сообщения?';
-$messages['deletefolderconfirm'] = 'Вы действительно хотите удалить эту папку?';
-$messages['purgefolderconfirm'] = 'Вы действительно хотите удалить все сообщения в этой папке?';
+$messages['deletefolderconfirm']  = 'Вы действительно хотите удалить эту папку?';
+$messages['purgefolderconfirm']  = 'Вы действительно хотите удалить все сообщения в этой папке?';
 $messages['contactdeleting'] = 'Удаление контакта(ов)...';
 $messages['groupdeleting'] = 'Удаление группы...';
 $messages['folderdeleting'] = 'Удаление папки...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Подписать папку...';
 $messages['folderunsubscribing'] = 'Отписать папку...';
 $messages['formincomplete'] = 'Заполнены не все поля';
 $messages['noemailwarning'] = 'Пожалуйста, введите корректный адрес электронной почты';
-$messages['nonamewarning'] = 'Пожалуйста, введите имя';
+$messages['nonamewarning']  = 'Пожалуйста, введите имя';
 $messages['nopagesizewarning'] = 'Пожалуйста, введите размер страницы';
 $messages['nosenderwarning'] = 'Пожалуйста, введите адрес электронной почты отправителя';
 $messages['norecipientwarning'] = 'Пожалуйста, введите имя получателя';
-$messages['nosubjectwarning'] = 'Поле Тема не заполнено. Хотите заполнить его сейчас?';
+$messages['nosubjectwarning']  = 'Поле Тема не заполнено. Хотите заполнить его сейчас?';
 $messages['nobodywarning'] = 'Отправить сообщение без текста?';
 $messages['notsentwarning'] = 'Сообщение не было отправлено. Вы хотите отказаться от отправки?';
 $messages['noldapserver'] = 'Пожалуйста, выберите LDAP сервер для поиска';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'Часть сообщения слишком ве�
 $messages['attachmentvalidationerror'] = 'ВНИМАНИЕ! Это приложение является подозрительной, потому что его тип не совпадает с типом, объявленным в сообщении. Если вы не доверяете отправителю, вы не должны открывать его в браузере, поскольку он может содержать вредоносный содержание.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Внимание: Данному сервису веб-почты требуется Javascript! Для того, чтобы его использовать необходимо включить поддержку Javascript в настройках вашего браузера.';
 
+?>
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 533f64d87..3d1dfccdb 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -2,53 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: පසිඳු කාවින්ද <info@pk-soft.tk>       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product වෙත පිළිගනිමු';
-$labels['username'] = 'පරිශීලක නාමය';
-$labels['password'] = 'මුරපදය';
-$labels['server'] = 'පද්ධතිය';
-$labels['login'] = 'පිවිසුම';
-$labels['logout'] = 'පිටවීම';
-$labels['mail'] = 'විද්‍යුත් තැපැල';
+
+// login page
+$labels['welcome']   = '$product වෙත පිළිගනිමු';
+$labels['username']  = 'පරිශීලක නාමය';
+$labels['password']  = 'මුරපදය';
+$labels['server']    = 'පද්ධතිය';
+$labels['login']     = 'පිවිසුම';
+
+// taskbar
+$labels['logout']   = 'පිටවීම';
+$labels['mail']     = 'විද්‍යුත් තැපැල';
 $labels['settings'] = 'සැකසුම්';
 $labels['addressbook'] = 'ලිපින පොත';
-$labels['inbox'] = 'Inbox';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'කටු සටහන්';
-$labels['sent'] = 'යැවූ';
-$labels['trash'] = 'ඉවතලන බඳුන';
-$labels['junk'] = 'සුන්බුන්';
+$labels['sent']   = 'යැවූ';
+$labels['trash']  = 'ඉවතලන බඳුන';
+$labels['junk']   = 'සුන්බුන්';
+
+// message listing
 $labels['subject'] = 'මාතෘකාව';
-$labels['from'] = 'වෙතින්';
-$labels['to'] = 'වෙත';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'වෙතින්';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'වෙත';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'පිළිතුරු සඳහා';
-$labels['date'] = 'දිනය';
-$labels['size'] = 'ප්‍රමාණය';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'දිනය';
+$labels['size']    = 'ප්‍රමාණය';
 $labels['priority'] = 'ප්‍රමුඛත්වය';
 $labels['organization'] = 'සංවිධානය';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'බහාලුම්';
-$labels['folders'] = 'බහාලුම්';
 $labels['messagesfromto'] = '$from වෙතින් $to වෙත පණිවිඩ $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'පණිවිඩ $count න් $nr';
-$labels['copy'] = 'පිටපත් කරන්න';
-$labels['move'] = 'ගෙනයන්න';
-$labels['moveto'] = 'ගෙන යන්න...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'පිටපත් කරන්න';
+$labels['move']     = 'ගෙනයන්න';
+$labels['moveto']   = 'ගෙන යන්න...';
 $labels['download'] = 'බාගත කරන්න';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ගොනුවේ නම';
 $labels['filesize'] = 'ගොනුවේ ප්‍රමාණය';
+
 $labels['addtoaddressbook'] = 'ලිපින පොතට එක් කරන්න';
+
+// weekdays short
 $labels['sun'] = 'ඉ';
 $labels['mon'] = 'ස';
 $labels['tue'] = 'අ';
@@ -56,252 +80,447 @@ $labels['wed'] = 'බ';
 $labels['thu'] = 'බ්‍ර';
 $labels['fri'] = 'සි';
 $labels['sat'] = 'සෙ';
-$labels['sunday'] = 'ඉරිදා';
-$labels['monday'] = 'සඳුදා';
-$labels['tuesday'] = 'අඟහරුවාදා';
+
+// weekdays long
+$labels['sunday']    = 'ඉරිදා';
+$labels['monday']    = 'සඳුදා';
+$labels['tuesday']   = 'අඟහරුවාදා';
 $labels['wednesday'] = 'බදාදා';
-$labels['thursday'] = 'බ්‍රහස්පතින්දා';
-$labels['friday'] = 'සිකුරාදා';
-$labels['saturday'] = 'සෙනසුරාදා';
-$labels['jan'] = 'ජන';
-$labels['feb'] = 'පෙබ';
-$labels['mar'] = 'මාර්';
-$labels['apr'] = 'අප්‍රේ';
-$labels['may'] = 'මැයි';
-$labels['longmay'] = 'මැයි';
-$labels['jun'] = 'ජූනි';
-$labels['jul'] = 'ජූලි';
-$labels['aug'] = 'අගෝ';
-$labels['sep'] = 'සැප්';
-$labels['oct'] = 'ඔක්';
-$labels['nov'] = 'නොවැ';
-$labels['dec'] = 'දෙසැ';
-$labels['longjan'] = 'ජනවාරි';
-$labels['longfeb'] = 'පෙබරවාරි';
-$labels['longmar'] = 'මාර්තු';
-$labels['longapr'] = 'අප්‍රේල්';
-$labels['longjun'] = 'ජූනි';
-$labels['longjul'] = 'ජූලි';
-$labels['longaug'] = 'අගෝස්තු';
-$labels['longsep'] = 'සැප්තැම්බර්';
-$labels['longoct'] = 'ඔක්තෝම්බර්';
-$labels['longnov'] = 'නොවැම්බර්';
-$labels['longdec'] = 'දෙසැම්බර්';
+$labels['thursday']  = 'බ්‍රහස්පතින්දා';
+$labels['friday']    = 'සිකුරාදා';
+$labels['saturday']  = 'සෙනසුරාදා';
+
+// months short
+$labels['jan']	= 'ජන';
+$labels['feb']	= 'පෙබ';
+$labels['mar']	= 'මාර්';
+$labels['apr']	= 'අප්‍රේ';
+$labels['may']	= 'මැයි';
+$labels['jun']	= 'ජූනි';
+$labels['jul'] 	= 'ජූලි';
+$labels['aug']	= 'අගෝ';
+$labels['sep']	= 'සැප්';
+$labels['oct']	= 'ඔක්';
+$labels['nov']	= 'නොවැ';
+$labels['dec']	= 'දෙසැ';
+
+// months long
+$labels['longjan']	= 'ජනවාරි';
+$labels['longfeb']	= 'පෙබරවාරි';
+$labels['longmar']	= 'මාර්තු';
+$labels['longapr']	= 'අප්‍රේල්';
+$labels['longmay']	= 'මැයි';
+$labels['longjun']	= 'ජූනි';
+$labels['longjul']	= 'ජූලි';
+$labels['longaug']	= 'අගෝස්තු';
+$labels['longsep']	= 'සැප්තැම්බර්';
+$labels['longoct']	= 'ඔක්තෝම්බර්';
+$labels['longnov']	= 'නොවැම්බර්';
+$labels['longdec']	= 'දෙසැම්බර්';
+
 $labels['today'] = 'අද';
-$labels['checkmail'] = 'අඵත් පණිවිඩ සඳහා පිරික්සීම';
-$labels['compose'] = 'පණිවිඩයක් සෑදීම';
-$labels['writenewmessage'] = 'අඵත් පණිවිඩයක්';
-$labels['reply'] = 'පිළිතුරු දෙන්න';
-$labels['replytomessage'] = 'පණිවිඩයට පිළිතුරු';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'අඵත් පණිවිඩ සඳහා පිරික්සීම';
+$labels['compose']          = 'පණිවිඩයක් සෑදීම';
+$labels['writenewmessage']  = 'අඵත් පණිවිඩයක්';
+$labels['reply']            = 'පිළිතුරු දෙන්න';
+$labels['replytomessage']   = 'පණිවිඩයට පිළිතුරු';
 $labels['replytoallmessage'] = 'එවන්නාට සහ සැමට පිළිතුරු';
-$labels['forward'] = 'ඉදිරියට';
-$labels['forwardmessage'] = 'පණිවිඩය ඉදිරියට';
-$labels['deletemessage'] = 'පණිවිඩය මකන්න';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'ඉදිරියට';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'පණිවිඩය ඉදිරියට';
+$labels['deletemessage']    = 'පණිවිඩය මකන්න';
 $labels['movemessagetotrash'] = 'පණිවිඩය ලටපට වෙත ගෙන යන්න';
-$labels['printmessage'] = 'මෙම පණිවිඩය මුද්‍රණය කරන්න';
-$labels['previousmessage'] = 'කලින් පණිවිඩය පෙන්නන්න';
-$labels['firstmessage'] = 'පළමුවන පණිවිඩය පෙන්නන්න';
-$labels['nextmessage'] = 'මීළඟ පණිවිඩය පෙන්නන්න';
-$labels['lastmessage'] = 'අවසාන පණිවිඩය පෙන්නන්න';
-$labels['backtolist'] = 'නැවතත් පණිවිඩ ලැයිස්තුවට';
-$labels['viewsource'] = 'මූලාශ්‍රය පෙන්වන්න';
-$labels['mark'] = 'සලකුණු කරන්න';
-$labels['markmessages'] = 'පණිවිඩ සලකුණු කරන්න';
-$labels['markread'] = 'කියවු ලෙස';
-$labels['markunread'] = 'නොකියවු ලෙස';
-$labels['moreactions'] = 'තවත් ක්‍රියා...';
-$labels['more'] = 'තවත්';
-$labels['back'] = 'ආපසු';
-$labels['options'] = 'විකල්ප';
+$labels['printmessage']     = 'මෙම පණිවිඩය මුද්‍රණය කරන්න';
+$labels['previousmessage']  = 'කලින් පණිවිඩය පෙන්නන්න';
+$labels['firstmessage']     = 'පළමුවන පණිවිඩය පෙන්නන්න';
+$labels['nextmessage']      = 'මීළඟ පණිවිඩය පෙන්නන්න';
+$labels['lastmessage']      = 'අවසාන පණිවිඩය පෙන්නන්න';
+$labels['backtolist']       = 'නැවතත් පණිවිඩ ලැයිස්තුවට';
+$labels['viewsource']       = 'මූලාශ්‍රය පෙන්වන්න';
+$labels['mark']             = 'සලකුණු කරන්න';
+$labels['markmessages']     = 'පණිවිඩ සලකුණු කරන්න';
+$labels['markread']         = 'කියවු ලෙස';
+$labels['markunread']       = 'නොකියවු ලෙස';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'තවත් ක්‍රියා...';
+$labels['more']             = 'තවත්';
+$labels['back']             = 'ආපසු';
+$labels['options']          = 'විකල්ප';
+
 $labels['select'] = 'තෝරන්න';
 $labels['all'] = 'සියල්ල';
 $labels['none'] = 'කිසිවක් නැත';
-$labels['nonesort'] = 'කිසිවක් නැත';
 $labels['currpage'] = 'දැනට ඇති පිටුව';
 $labels['unread'] = 'නොකියවූ';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
 $labels['deleted'] = 'මකා දැමූ';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
 $labels['filter'] = 'පෙරන්න';
 $labels['list'] = 'ලැයිස්තුව';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'සියල්ල දිගහරින්න';
+$labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'සියල්ල හකුළන්න';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'වෙතින්/වෙත';
+$labels['flag'] = 'Flag';
 $labels['attachment'] = 'ඇමුණුම';
+$labels['nonesort'] = 'කිසිවක් නැත';
 $labels['sentdate'] = 'යැවූ දිනය';
 $labels['arrival'] = 'ලගාවූ දිනය';
 $labels['asc'] = 'ආරෝහණ';
 $labels['desc'] = 'අවරෝහණ';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'බහාලුම් ක්‍රියා...';
 $labels['compact'] = 'සංයුක්ත';
 $labels['empty'] = 'හිස්';
-$labels['unknown'] = 'නොදනී';
-$labels['unlimited'] = 'අසීමිත';
-$labels['quicksearch'] = 'ඉක්මන් සෙවුම';
-$labels['resetsearch'] = 'සෙවුම යලි පිහිටවීම';
-$labels['msgtext'] = 'සම්පූර්ණ පණිවිඩය';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'නොදනී';
+$labels['unlimited']  = 'අසීමිත';
+
+$labels['quicksearch']  = 'ඉක්මන් සෙවුම';
+$labels['resetsearch']  = 'සෙවුම යලි පිහිටවීම';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'සම්පූර්ණ පණිවිඩය';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'නව කවුළුවක විවෘත කරන්න';
-$labels['sendmessage'] = 'පණිවිඩය යවන්න';
-$labels['savemessage'] = 'කටු සටහනක් ලෙස සුරකින්න';
-$labels['addattachment'] = 'ගොනුවක් අමුණන්න';
-$labels['charset'] = 'අකුරැ කට්ටලය';
-$labels['editortype'] = 'සම්පාදන ආකාරය';
-$labels['returnreceipt'] = 'නැවත ලබන්නා';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'පණිවිඩය යවන්න';
+$labels['savemessage']    = 'කටු සටහනක් ලෙස සුරකින්න';
+$labels['addattachment']  = 'ගොනුවක් අමුණන්න';
+$labels['charset']        = 'අකුරැ කට්ටලය';
+$labels['editortype']     = 'සම්පාදන ආකාරය';
+$labels['returnreceipt']  = 'නැවත ලබන්නා';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'අක්‍ෂර වින්‍යාසය පරික්‍ෂාකරන්න';
 $labels['resumeediting'] = 'සම්පාදන නැවත ඇරඹීම';
-$labels['revertto'] = 'ආපසු ඒම';
+$labels['revertto']      = 'ආපසු ඒම';
+
 $labels['attach'] = 'අමුණන්න';
 $labels['attachments'] = 'ඇමුණුම්';
 $labels['upload'] = 'ඇතුල් කරීම';
-$labels['close'] = 'වසන්න';
-$labels['low'] = 'අඩු';
-$labels['lowest'] = 'අඩුම';
-$labels['normal'] = 'සාමාන්‍ය';
-$labels['high'] = 'ඉහළ';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'වසන්න';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'අඩු';
+$labels['lowest']  = 'අඩුම';
+$labels['normal']  = 'සාමාන්‍ය';
+$labels['high']    = 'ඉහළ';
 $labels['highest'] = 'ඉහළම';
-$labels['nosubject'] = '(මාතෘකාව නොමැත)';
+
+$labels['nosubject']  = '(මාතෘකාව නොමැත)';
 $labels['showimages'] = 'රූප පෙන්වන්න';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'පැහැදිලි අකුරු';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Cc එක් කරන්න';
 $labels['addbcc'] = 'Bcc එක් කරන්න';
 $labels['addreplyto'] = '\'පිළිතුරු සඳහා\' එක් කරන්න';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'මෙම පණිවුඩය එවන්නා ඔබ එය කියවු බව අසයි. එය දැන්වීමට ඔබ කැමතිද?';
 $labels['receiptread'] = 'ලැබීම් ලදුපත (කියවීම)';
 $labels['yourmessage'] = 'මෙය ඔබගේ පණිවුඩයේ ලැබීම් ලදුපතයි';
 $labels['receiptnote'] = 'සටහන: ලැබීම් ලදුපත මගින් මෙම පණිවුඩය කියවූ බව හෝ තේරුම් ගත් බව ගම්‍ය නොවේ. පණිවුඩය ලබන්නාට පෙන්නුම් කල බවටට සාක්ෂියක් පමණි';
-$labels['name'] = 'ප්‍රදර්ශනය වන නම';
-$labels['firstname'] = 'මුල් නම';
-$labels['surname'] = 'අවසන් නම';
-$labels['nickname'] = 'සුරතල් නම';
-$labels['jobtitle'] = 'රැකියා තනතුර';
-$labels['department'] = 'දෙපාර්තමේන්තුව';
-$labels['gender'] = 'ස්ත්‍රි/පුරුෂ භාවය';
-$labels['email'] = 'විද්‍යුත් තැපෑල';
-$labels['phone'] = 'දුරකථනය';
-$labels['address'] = 'ලිපිනය';
-$labels['locality'] = 'නගරය';
-$labels['region'] = 'ප්‍රාන්තය/පළාත';
-$labels['country'] = 'රට';
-$labels['birthday'] = 'උපන්දිනය';
-$labels['anniversary'] = 'සංවත්සරය';
-$labels['website'] = 'වෙබ් අඩවිය';
+
+// address boook
+$labels['name']         = 'ප්‍රදර්ශනය වන නම';
+$labels['firstname']    = 'මුල් නම';
+$labels['surname']      = 'අවසන් නම';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'සුරතල් නම';
+$labels['jobtitle']     = 'රැකියා තනතුර';
+$labels['department']   = 'දෙපාර්තමේන්තුව';
+$labels['gender']       = 'ස්ත්‍රි/පුරුෂ භාවය';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'විද්‍යුත් තැපෑල';
+$labels['phone']        = 'දුරකථනය';
+$labels['address']      = 'ලිපිනය';
+$labels['street']       = 'Street';
+$labels['locality']     = 'නගරය';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'ප්‍රාන්තය/පළාත';
+$labels['country']      = 'රට';
+$labels['birthday']     = 'උපන්දිනය';
+$labels['anniversary']  = 'සංවත්සරය';
+$labels['website']      = 'වෙබ් අඩවිය';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'සටහන්';
-$labels['male'] = 'පුරුෂ';
+$labels['male']   = 'පුරුෂ';
 $labels['female'] = 'ස්ත්‍රී';
 $labels['manager'] = 'කළමණාකරු';
 $labels['assistant'] = 'සහායක';
-$labels['typeassistant'] = 'සහායක';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
 $labels['search'] = 'සොයන්න';
+$labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'සංකීර්ණ‍';
 $labels['other'] = 'වෙනත්';
-$labels['typeother'] = 'වෙනත්';
-$labels['typehome'] = 'නිවස';
-$labels['typework'] = 'රක්ෂාව';
-$labels['typemobile'] = 'ජංගම';
-$labels['typemain'] = 'ප්‍රධාන';
-$labels['typehomefax'] = 'ගෘහස්ථ ෆැක්ස්';
-$labels['typepager'] = 'පේජරය';
-$labels['typevideo'] = 'වීඩියෝ';
+
+$labels['typehome']   = 'නිවස';
+$labels['typework']   = 'රක්ෂාව';
+$labels['typeother']  = 'වෙනත්';
+$labels['typemobile']  = 'ජංගම';
+$labels['typemain']  = 'ප්‍රධාන';
+$labels['typehomefax']  = 'ගෘහස්ථ ෆැක්ස්';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'පේජරය';
+$labels['typevideo']  = 'වීඩියෝ';
+$labels['typeassistant']  = 'සහායක';
+$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'බ්ලොග්';
 $labels['typeprofile'] = 'පැතිකඩ';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'නව සබඳතාවය එක් කරන්න';
 $labels['editcontact'] = 'ලිපිනය වෙනස් කිරීම';
 $labels['contacts'] = 'සබඳතා';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'පුද්ගලික තොරතුරු';
-$labels['edit'] = 'සංස්කරණය';
+
+$labels['edit']   = 'සංස්කරණය';
 $labels['cancel'] = 'අවලංගු කරන්න';
-$labels['save'] = 'සුරකින්න';
+$labels['save']   = 'සුරකින්න';
 $labels['delete'] = 'මකන්න';
 $labels['rename'] = 'නම වෙනස් කරන්න';
 $labels['addphoto'] = 'එක් කරන්න';
-$labels['newcontact'] = 'අඵත් ලිපින පතක් සෑදීම';
-$labels['deletecontact'] = 'තෝරාගත් ලිපින මකාදමන්න';
-$labels['composeto'] = 'පනිවුඩයක් සෑදීම';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'අඵත් ලිපින පතක් සෑදීම';
+$labels['deletecontact']  = 'තෝරාගත් ලිපින මකාදමන්න';
+$labels['composeto']      = 'පනිවුඩයක් සෑදීම';
 $labels['contactsfromto'] = '$from ගෙන් $to ලිපින $count';
-$labels['print'] = 'මුද්‍රණය කරන්න';
-$labels['export'] = 'අපනයනය';
-$labels['previouspage'] = 'පෙර පිටුව පෙන්වන්න';
-$labels['firstpage'] = 'පළමුවන පිටුව පෙන්වන්න';
-$labels['nextpage'] = 'මීළඟ පිටුව පෙන්වන්න';
-$labels['lastpage'] = 'අවසාන පිටුව පෙන්වන්න';
+$labels['print']          = 'මුද්‍රණය කරන්න';
+$labels['export']         = 'අපනයනය';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'පෙර පිටුව පෙන්වන්න';
+$labels['firstpage']      = 'පළමුවන පිටුව පෙන්වන්න';
+$labels['nextpage']       = 'මීළඟ පිටුව පෙන්වන්න';
+$labels['lastpage']       = 'අවසාන පිටුව පෙන්වන්න';
+
 $labels['group'] = 'කණ්ඩායම';
 $labels['groups'] = 'කණ්ඩායම්';
 $labels['personaladrbook'] = 'පුද්ගලික ලිපිනය';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'ආනයනය කරන්න';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'අවසානයි';
+
+// settings
 $labels['settingsfor'] = 'සඳහා සැකසුම්';
 $labels['about'] = 'පිළිබඳ';
 $labels['preferences'] = 'අභිමතය';
 $labels['userpreferences'] = 'පරිශීලක අභිමතය';
 $labels['editpreferences'] = 'පරිශීලක අභිමතය වෙනස් කිරීම්';
+
 $labels['identities'] = 'අනන්‍යතාවන්';
 $labels['manageidentities'] = 'මෙම ගිණුමෙ අනන්නයතාව හැසිරවීම';
 $labels['newidentity'] = 'අඵත් අනන්නයතාව';
+
 $labels['newitem'] = 'අඵත් අයිතම';
 $labels['edititem'] = 'අයිතම වෙනස් කිරීම්';
+
 $labels['preferhtml'] = 'HTML විදහා පෙන්වීම';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML පණිවිඩය';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'සුරුබුහුටි දින';
-$labels['setdefault'] = 'පළමු තත්වයට';
-$labels['autodetect'] = 'ස්වයංක්‍රීය';
-$labels['language'] = 'භාෂාව';
-$labels['timezone'] = 'කාල කලාපය';
+$labels['setdefault']  = 'පළමු තත්වයට';
+$labels['autodetect']  = 'ස්වයංක්‍රීය';
+$labels['language']  = 'භාෂාව';
+$labels['timezone']  = 'කාල කලාපය';
+$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'අත්සන';
-$labels['dstactive'] = 'දිවා එළිය ඉතිරි කිරීම';
+$labels['dstactive']  = 'දිවා එළිය ඉතිරි කිරීම';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML පණිවිඩයක් සෑදීම';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML අත්සන';
 $labels['previewpane'] = 'පූර්වදර්ශන කොටස පෙන්නන්න';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
 $labels['uisettings'] = 'පරිශීලක අතුරුමුහුණත';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'මගෙන් විමසන්න';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'නොසලකා හරින්න';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'සැමවිට';
-$labels['autosavedraft'] = 'ස්වයංක්‍රීයව කටු සටහන සුරකින්න';
-$labels['never'] = 'කිසි විටෙකත් නැති';
-$labels['immediately'] = 'හැකි ඉක්මනින්';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'ස්වයංක්‍රීයව කටු සටහන සුරකින්න';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'කිසි විටෙකත් නැති';
+$labels['immediately']  = 'හැකි ඉක්මනින්';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (වෙනත්)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'අංශය';
 $labels['maintenance'] = 'නඩත්තු කිරීම';
 $labels['newmessage'] = 'අලුත් පණිවිඩයක්';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
 $labels['autoaddsignature'] = 'ස්වයංක්‍රීයව අත්සන ඇතුලත් කරන්න';
 $labels['newmessageonly'] = 'අලුත් පණිවිඩය පමණක්';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'අත්සන ඇතුලත් කරන්න';
-$labels['afternseconds'] = 'තත්පර $nකට පසු';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'තත්පර $nකට පසු';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
 $labels['spellcheckignoresyms'] = 'සලකුණු සහිත වචන නොසලකා හරින්න';
 $labels['spellcheckignorenums'] = 'අංක සහිත වචන නොසලකා හරින්න';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'ශබ්ද කෝෂයට එක් කරන්න';
-$labels['folder'] = 'බහාලුම';
-$labels['foldername'] = 'බහාලුමේ නම';
-$labels['subscribed'] = 'සාමාජික';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'බහාලුම';
+$labels['folders']  = 'බහාලුම්';
+$labels['foldername']  = 'බහාලුමේ නම';
+$labels['subscribed']  = 'සාමාජික';
 $labels['messagecount'] = 'පණිවිඩ';
-$labels['create'] = 'තනන්න';
-$labels['createfolder'] = 'නව බහාලුමක් තනන්න';
-$labels['managefolders'] = 'බහාලුම් කළමනාකරණය කරන්න';
+$labels['create']  = 'තනන්න';
+$labels['createfolder']  = 'නව බහාලුමක් තනන්න';
+$labels['managefolders']  = 'බහාලුම් කළමනාකරණය කරන්න';
 $labels['specialfolders'] = 'විශේෂ බහාලුම්';
 $labels['properties'] = 'වත්කම්';
 $labels['folderproperties'] = 'බහාලුමේ වත්කම්';
+$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'ස්ථානය';
 $labels['info'] = 'තොරතුරු';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'බහාලුම් වර්ගය';
-$labels['personalfolder'] = 'පුද්ගලික බහාලුම';
-$labels['sharedfolder'] = 'පොදු බහාලුම';
+$labels['personalfolder']  = 'පුද්ගලික බහාලුම';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'පොදු බහාලුම';
+
 $labels['sortby'] = 'වර්ග කරන්න';
-$labels['sortasc'] = 'ආරෝහණ වර්ග කිරීම';
+$labels['sortasc']  = 'ආරෝහණ වර්ග කිරීම';
 $labels['sortdesc'] = 'අවරෝහණ වර්ග කිරීම';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'ප්ලගිනය';
 $labels['version'] = 'අනුවාදය';
 $labels['source'] = 'මූලාශ්‍රය';
 $labels['license'] = 'බලපත්‍රය';
 $labels['support'] = 'සහය ලබාගන්න';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'යුනිකේත';
 $labels['english'] = 'ඉංග්‍රීසි';
 $labels['westerneuropean'] = 'බටහිර යුරෝපීය';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'බෝල්ටික්';
+$labels['cyrillic'] = 'Cyrillic';
 $labels['arabic'] = 'අරාබි';
 $labels['greek'] = 'ග්‍රීක';
 $labels['hebrew'] = 'හීබෲ';
@@ -314,3 +533,4 @@ $labels['japanese'] = 'ජපන්';
 $labels['korean'] = 'කොරියානු';
 $labels['chinese'] = 'චීන';
 
+?>
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index 23a701935..b8ecab335 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -2,28 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'දෝෂයක් මතුවිය!';
-$messages['loginfailed'] = 'ඇතුල්වීම අසාර්ථකයි.';
+$messages['errortitle']  = 'දෝෂයක් මතුවිය!';
+$messages['loginfailed']  = 'ඇතුල්වීම අසාර්ථකයි.';
 $messages['cookiesdisabled'] = 'ඔබේ බෞසරය කුකී බාර ගන්නේ නැත';
 $messages['sessionerror'] = 'ඔබේ වාරය අවලංගු හෝ කාලය ඉකුත් වී ඇත';
+$messages['storageerror'] = 'Connection to storage server failed.';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'දත්ත ගබඩාවේ දෝෂය!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ලියුම් පෙට්ටියේ පනිවුඩ නැත';
 $messages['loggedout'] = 'ඔබගේ වාරය සාර්ථකව අවසන් විය. අයුබොවන්!';
 $messages['mailboxempty'] = 'ලියුම් පෙට්ටිය හිස්';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'පූරනය...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'දත්ත පූරනය...';
 $messages['checkingmail'] = 'අලුත් පණිවිඩ පරීක්ෂා කරමින්...';
 $messages['sendingmessage'] = 'පණිවිඩය යවමින්...';
@@ -33,58 +46,124 @@ $messages['messagesaved'] = 'පනිවුඩය කටු සටහනේ ත
 $messages['successfullysaved'] = 'සුරැකීම සාර්ථකයි.';
 $messages['addedsuccessfully'] = 'ලිපිනය සාර්ථකව ලිපින පොතට එකතු කරන ලදී.';
 $messages['contactexists'] = 'ඉහත ලිපිනය සහිත විද්යුත් තැපැල් ලිපිනයක් ලිපින පොතේ ඇත.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'ඔබගෙ පොද්ගලිකත්වය හේතුවෙන්, දුරස්ථ රූප අවහිර කර ඇත.';
 $messages['encryptedmessage'] = 'මෙම පනිවුඩය රහස් කේතනය කර ඇති බැවින් පෙන්විය නොහැක. සමාවන්න!';
 $messages['nocontactsfound'] = 'ලිපින සොයා ගත නොහැක';
 $messages['contactnotfound'] = 'ඉල්ලූ ලිපිනය සොයාගත නොහැක';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'පණිවිඩය යැවීම අසාර්ථකයි.';
 $messages['senttooquickly'] = 'කරුණාකර මෙම පණිවිඩය යැවීමට පෙර තත්පර $secක් රැදී සිටින්න.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'පණිවිඩය සුරැකීමේදී දෝෂයක් මතුවිය.';
 $messages['errormoving'] = 'පනිවුඩය ගෙන යාමට නොහැක';
 $messages['errorcopying'] = 'පණිවිඩ(ය) පිටපත් කල නොහැක.';
 $messages['errordeleting'] = 'පණිවිඩ(ය) මකා දැමීමට නොහැක.';
 $messages['errormarking'] = 'පණිවිඩ(ය) සලකුණු කල නොහැක.';
-$messages['deletecontactconfirm'] = 'තෝරා ඇති ලිපින ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['deletecontactconfirm']  = 'තෝරා ඇති ලිපින ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'තෝරා ඇති පණිවිඩ(ය) ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
-$messages['deletefolderconfirm'] = 'ඔබට මෙම බහාලුම මකා දැමීමට සැබවින්ම වුවමනාද?';
-$messages['purgefolderconfirm'] = 'මෙම බහාලමේ ඇති සියලුම පණිවිඩ ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['deletefolderconfirm']  = 'ඔබට මෙම බහාලුම මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['purgefolderconfirm']  = 'මෙම බහාලමේ ඇති සියලුම පණිවිඩ ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'බහාලුම මකාදමමින්...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'පෝරමය සම්පූර්ණයෙන් පුරවා නොමැත.';
 $messages['noemailwarning'] = 'කරුණාකර වලංගු විද්යුත් ලිපිනයක් ඇතුලත් කරන්න.';
-$messages['nonamewarning'] = 'කරුණාකර නම ඇතුලත් කරන්න.';
+$messages['nonamewarning']  = 'කරුණාකර නම ඇතුලත් කරන්න.';
 $messages['nopagesizewarning'] = 'කරුණාකර පිටුවේ ප්‍රමාණය ඇතුලත් කරන්න.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'කරුණාකර යටත් පිරිසෙයින් එක් ලබන්නෙකු හෝ ඇතුලත් කරන්න';
-$messages['nosubjectwarning'] = '"මාතෘකාව" හිස්. මාතෘකාවක් ඇතුලත් කිරීමට ඔබ කැමතිද?';
+$messages['nosubjectwarning']  = '"මාතෘකාව" හිස්. මාතෘකාවක් ඇතුලත් කිරීමට ඔබ කැමතිද?';
 $messages['nobodywarning'] = 'මෙම හිස් පනිවුඩය යවන්නද?';
 $messages['notsentwarning'] = 'පණිවිඩය යැවීමට නොහැකි විය. ඔබට එය බැහැර කිරීමට වුවමනාද?';
 $messages['noldapserver'] = 'සෙවුම සඳහා කරුණාකර ldap සම්බන්ධතාවයක් තෝරා ගන්න';
 $messages['nosearchname'] = 'කරුණාකර ලිපිනයෙහි නම හෝ විද්යුත් තැපැල් ලිපිනය ඇතුලත් කරන්න';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr පනිවුඩය හමු විය';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'සෙවුමට අදාල ගැලපීමක් නොමැත.';
 $messages['searching'] = 'සොයමින්...';
 $messages['checking'] = 'පරික්‍ෂාකරමින්...';
 $messages['nospellerrors'] = 'වියාකරන දොෂ නොමැත';
 $messages['folderdeleted'] = 'බහාලුම සාර්ථකව මකා දමන ලදී.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'සාර්ථකව මකාදමන ලදී.';
 $messages['converting'] = 'පනිවුඩයෙන් ආකෘතීකරණය ඉවත් කිරීම';
 $messages['messageopenerror'] = 'පනිවුඩය පූරනය කිරීමට නොහැක';
 $messages['fileuploaderror'] = 'ගොනුව ඇතුලත් කිරීමට නොහැක';
 $messages['filesizeerror'] = 'ඇතුලත් කල ගොනුවෙ ප්රමාණය උපරිම අගය $size ඉක්මවා ඇත';
 $messages['copysuccess'] = '$nr ලිපිනය සාර්ථකව පිටපත් කරන ලදී';
+$messages['copyerror'] = 'Could not copy any addresses.';
 $messages['sourceisreadonly'] = 'මෙම ලිපින මූලාශ්රය කියවීම සඳහා පමනි';
 $messages['errorsavingcontact'] = 'ලිපිනය තැන්පත් කීරීමට නොහැක';
 $messages['movingmessage'] = 'පණිවිඩ(ය) ගෙනයමින්...';
 $messages['copyingmessage'] = 'පණිවිඩ(ය) පිටපත් කරමින්...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
 $messages['deletingmessage'] = 'පණිවිඩ(ය) මකා දමමින්...';
 $messages['markingmessage'] = 'පණිවිඩ(ය) සලකුණු කරමින්...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
 $messages['errorsendingreceipt'] = 'කියවීම් භාර ගැනීම යැවීමට නොහැක';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'අවසාන අනන්‍යතාවය මකා දැමිය නොහැක';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'ආනයනය කරමින්, කරුණාකර රැදී සිටින්න...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'අවලංගු විද්‍යුත් තැපැල් ලිපිනය: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = 'පණිවිඩ(ය) මකා දැමීම සාර්ථකයි.';
 $messages['messagemoved'] = 'පණිවිඩ(ය) ගෙනයෑම සාර්ථකයි.';
 $messages['messagecopied'] = 'පණිවිඩ(ය) පිටපත් කිරීම සාර්ථකයි.';
 $messages['messagemarked'] = 'පණිවිඩ(ය) සලකුණු කිරීම සාර්ථකයි.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'නම හිස්ව තැබිය නොහැක.';
 $messages['nametoolong'] = 'නම දිග වැඩිය.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index f21e376f3..702131d7e 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Vitajte v $product';
-$labels['username'] = 'Prihlasovacie meno';
-$labels['password'] = 'Heslo';
-$labels['server'] = 'Server';
-$labels['login'] = 'Prihlásiť';
-$labels['logout'] = 'Odhlásiť';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Vitajte v $product';
+$labels['username']  = 'Prihlasovacie meno';
+$labels['password']  = 'Heslo';
+$labels['server']    = 'Server';
+$labels['login']     = 'Prihlásiť';
+
+// taskbar
+$labels['logout']   = 'Odhlásiť';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Nastavenia';
 $labels['addressbook'] = 'Kontakty';
-$labels['inbox'] = 'Doručená pošta';
+
+// mailbox names
+$labels['inbox']  = 'Doručená pošta';
 $labels['drafts'] = 'Rozpísané';
-$labels['sent'] = 'Odoslané';
-$labels['trash'] = 'Kôš';
-$labels['junk'] = 'Nevyžiadaná pošta';
+$labels['sent']   = 'Odoslané';
+$labels['trash']  = 'Kôš';
+$labels['junk']   = 'Nevyžiadaná pošta';
+
+// message listing
 $labels['subject'] = 'Predmet';
-$labels['from'] = 'Odosielateľ';
-$labels['to'] = 'Adresát';
-$labels['cc'] = 'Kópia';
-$labels['bcc'] = 'Tajná kópia';
+$labels['from']    = 'Odosielateľ';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Adresát';
+$labels['cc']      = 'Kópia';
+$labels['bcc']     = 'Tajná kópia';
 $labels['replyto'] = 'Odpovedať na';
 $labels['followupto'] = 'Pokračovať na';
-$labels['date'] = 'Dátum';
-$labels['size'] = 'Veľkosť';
+$labels['date']    = 'Dátum';
+$labels['size']    = 'Veľkosť';
 $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizácia';
 $labels['readstatus'] = 'Čítať stav';
 $labels['listoptions'] = 'Nastavenia zoznamu...';
+
 $labels['mailboxlist'] = 'Priečinky';
-$labels['folders'] = 'Priečinky';
 $labels['messagesfromto'] = 'Správy od $from do $to z $count';
 $labels['threadsfromto'] = 'Konverzácie od $from do $to z $count';
 $labels['messagenrof'] = 'Správa $nr z $count';
 $labels['fromtoshort'] = '$from – $to z $count';
-$labels['copy'] = 'Kopírovať';
-$labels['move'] = 'Presunúť';
-$labels['moveto'] = 'presunúť do...';
+
+$labels['copy']     = 'Kopírovať';
+$labels['move']     = 'Presunúť';
+$labels['moveto']   = 'presunúť do...';
 $labels['download'] = 'stiahnuť';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Meno súboru';
 $labels['filesize'] = 'Veľkosť súboru';
+
 $labels['addtoaddressbook'] = 'Pridať do adresára';
+
+// weekdays short
 $labels['sun'] = 'Ne';
 $labels['mon'] = 'Po';
 $labels['tue'] = 'Ut';
@@ -61,74 +80,83 @@ $labels['wed'] = 'St';
 $labels['thu'] = 'Št';
 $labels['fri'] = 'Pi';
 $labels['sat'] = 'So';
-$labels['sunday'] = 'Nedeľa';
-$labels['monday'] = 'Pondelok';
-$labels['tuesday'] = 'Utorok';
+
+// weekdays long
+$labels['sunday']    = 'Nedeľa';
+$labels['monday']    = 'Pondelok';
+$labels['tuesday']   = 'Utorok';
 $labels['wednesday'] = 'Streda';
-$labels['thursday'] = 'Štvrtok';
-$labels['friday'] = 'Piatok';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Máj';
-$labels['longmay'] = 'Máj';
-$labels['jun'] = 'Jún';
-$labels['jul'] = 'Júl';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Január';
-$labels['longfeb'] = 'Február';
-$labels['longmar'] = 'Marec';
-$labels['longapr'] = 'Apríl';
-$labels['longjun'] = 'Jún';
-$labels['longjul'] = 'Júl';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Október';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Štvrtok';
+$labels['friday']    = 'Piatok';
+$labels['saturday']  = 'Sobota';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Máj';
+$labels['jun']	= 'Jún';
+$labels['jul'] 	= 'Júl';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Január';
+$labels['longfeb']	= 'Február';
+$labels['longmar']	= 'Marec';
+$labels['longapr']	= 'Apríl';
+$labels['longmay']	= 'Máj';
+$labels['longjun']	= 'Jún';
+$labels['longjul']	= 'Júl';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Október';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Dnes';
-$labels['refresh'] = 'Obnoviť';
-$labels['checkmail'] = 'Skontrolovať nové správy';
-$labels['compose'] = 'Vytvoriť správu';
-$labels['writenewmessage'] = 'Vytvoriť novú správu';
-$labels['reply'] = 'Odpovedať';
-$labels['replytomessage'] = 'Odpovedať';
+
+// toolbar buttons
+$labels['refresh']          = 'Obnoviť';
+$labels['checkmail']        = 'Skontrolovať nové správy';
+$labels['compose']          = 'Vytvoriť správu';
+$labels['writenewmessage']  = 'Vytvoriť novú správu';
+$labels['reply']            = 'Odpovedať';
+$labels['replytomessage']   = 'Odpovedať';
 $labels['replytoallmessage'] = 'Odpovedať všetkým';
-$labels['replyall'] = 'Odpovedať všetkým';
-$labels['replylist'] = 'Zoznam odpovedí';
-$labels['forward'] = 'Dopredu';
-$labels['forwardinline'] = 'Poslať ďalej';
+$labels['replyall']         = 'Odpovedať všetkým';
+$labels['replylist']        = 'Zoznam odpovedí';
+$labels['forward']          = 'Dopredu';
+$labels['forwardinline']    = 'Poslať ďalej';
 $labels['forwardattachment'] = 'Poslať ďalej ako prílohu';
-$labels['forwardmessage'] = 'Poslať ďalej';
-$labels['deletemessage'] = 'Zmazať správu';
+$labels['forwardmessage']   = 'Poslať ďalej';
+$labels['deletemessage']    = 'Zmazať správu';
 $labels['movemessagetotrash'] = 'Presunúť správu do koša';
-$labels['printmessage'] = 'Vytlačiť správu';
-$labels['previousmessage'] = 'Zobraziť predchádzajúcu správu';
-$labels['firstmessage'] = 'Zobraziť prvú správu';
-$labels['nextmessage'] = 'Zobraziť ďalšiu správu';
-$labels['lastmessage'] = 'Zobraziť poslednú správu';
-$labels['backtolist'] = 'Späť na zoznam správ';
-$labels['viewsource'] = 'Ukázať zdroj správy';
-$labels['mark'] = 'Označiť';
-$labels['markmessages'] = 'Označiť správy';
-$labels['markread'] = 'Ako prečítané';
-$labels['markunread'] = 'Ako neprečítané';
-$labels['markflagged'] = 'Ako označené';
-$labels['markunflagged'] = 'Ako neoznačené';
-$labels['moreactions'] = 'Ďalšie akcie...';
-$labels['more'] = 'Ďalšie';
-$labels['back'] = 'Dozadu';
-$labels['options'] = 'Možnosti';
+$labels['printmessage']     = 'Vytlačiť správu';
+$labels['previousmessage']  = 'Zobraziť predchádzajúcu správu';
+$labels['firstmessage']     = 'Zobraziť prvú správu';
+$labels['nextmessage']      = 'Zobraziť ďalšiu správu';
+$labels['lastmessage']      = 'Zobraziť poslednú správu';
+$labels['backtolist']       = 'Späť na zoznam správ';
+$labels['viewsource']       = 'Ukázať zdroj správy';
+$labels['mark']             = 'Označiť';
+$labels['markmessages']     = 'Označiť správy';
+$labels['markread']         = 'Ako prečítané';
+$labels['markunread']       = 'Ako neprečítané';
+$labels['markflagged']      = 'Ako označené';
+$labels['markunflagged']    = 'Ako neoznačené';
+$labels['moreactions']      = 'Ďalšie akcie...';
+$labels['more']             = 'Ďalšie';
+$labels['back']             = 'Dozadu';
+$labels['options']          = 'Možnosti';
+
 $labels['select'] = 'Výber';
 $labels['all'] = 'Všetky';
 $labels['none'] = 'Nič';
-$labels['nonesort'] = 'Nič';
 $labels['currpage'] = 'Aktuálna stránka';
 $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené';
@@ -143,12 +171,14 @@ $labels['expand-all'] = 'Rozbaliť všetko';
 $labels['expand-unread'] = 'Rozbaliť neprečítané';
 $labels['collapse-all'] = 'Zbaliť všetko';
 $labels['threaded'] = 'Spájať do konverzácií';
+
 $labels['autoexpand_threads'] = 'Rozbaliť konverzácie';
 $labels['do_expand'] = 'všetky konverzácie';
 $labels['expand_only_unread'] = 'len s neprečítanými správami';
 $labels['fromto'] = 'Odosielateľ/Príjemca';
 $labels['flag'] = 'Vlajka';
 $labels['attachment'] = 'Príloha';
+$labels['nonesort'] = 'Nič';
 $labels['sentdate'] = 'Dátum odoslania';
 $labels['arrival'] = 'Dátum prijatia';
 $labels['asc'] = 'vzostupne';
@@ -157,176 +187,211 @@ $labels['listcolumns'] = 'Zoznam stĺpcov';
 $labels['listsorting'] = 'Triedenie stĺpcov';
 $labels['listorder'] = 'Usporiadanie';
 $labels['listmode'] = 'Režim zobrazenia zoznamu';
+
 $labels['folderactions'] = 'Akcie so zložkou...';
 $labels['compact'] = 'Zhustiť priečinok';
 $labels['empty'] = 'Vyprázdniť';
+
 $labels['quota'] = 'Zaplnenie schránky';
-$labels['unknown'] = 'neznáme';
-$labels['unlimited'] = 'neobmedzené';
-$labels['quicksearch'] = 'Rýchle vyhľadávanie';
-$labels['resetsearch'] = 'Vyčistiť vyhľadávanie';
-$labels['searchmod'] = 'Parametre hľadanie';
-$labels['msgtext'] = 'Celá správa';
+$labels['unknown']  = 'neznáme';
+$labels['unlimited']  = 'neobmedzené';
+
+$labels['quicksearch']  = 'Rýchle vyhľadávanie';
+$labels['resetsearch']  = 'Vyčistiť vyhľadávanie';
+$labels['searchmod']  = 'Parametre hľadanie';
+$labels['msgtext']  = 'Celá správa';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
-$labels['editasnew'] = 'Upraviť ako novú';
-$labels['send'] = 'Odoslať';
-$labels['sendmessage'] = 'Odoslať správu';
-$labels['savemessage'] = 'Uložiť do rozpísaných';
-$labels['addattachment'] = 'Pridať prílohu';
-$labels['charset'] = 'Znaková sada';
-$labels['editortype'] = 'Typ editora';
-$labels['returnreceipt'] = 'Potvrdenie o doručení';
-$labels['dsn'] = 'Doručenie oznámenia o stave';
+
+// message compose
+$labels['editasnew']      = 'Upraviť ako novú';
+$labels['send']           = 'Odoslať';
+$labels['sendmessage']    = 'Odoslať správu';
+$labels['savemessage']    = 'Uložiť do rozpísaných';
+$labels['addattachment']  = 'Pridať prílohu';
+$labels['charset']        = 'Znaková sada';
+$labels['editortype']     = 'Typ editora';
+$labels['returnreceipt']  = 'Potvrdenie o doručení';
+$labels['dsn']            = 'Doručenie oznámenia o stave';
 $labels['mailreplyintro'] = '$date odosielateľ napísal:';
 $labels['originalmessage'] = 'Pôvodná správa';
-$labels['editidents'] = 'Editovať identity';
-$labels['spellcheck'] = 'Pravopis';
+
+$labels['editidents']    = 'Editovať identity';
+$labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Skontrolovať pravopis';
 $labels['resumeediting'] = 'Pokračovať v úpravách';
-$labels['revertto'] = 'Vrátiť sa na';
+$labels['revertto']      = 'Vrátiť sa na';
+
 $labels['attach'] = 'Priložiť';
 $labels['attachments'] = 'Prílohy';
 $labels['upload'] = 'Nahrať';
 $labels['uploadprogress'] = '$percent ($current z $total)';
-$labels['close'] = 'Zatvoriť';
-$labels['messageoptions'] = 'Nastavenia správy...';
-$labels['low'] = 'Nízka';
-$labels['lowest'] = 'Najnižšia';
-$labels['normal'] = 'Normálna';
-$labels['high'] = 'Vysoká';
+$labels['close']  = 'Zatvoriť';
+$labels['messageoptions']  = 'Nastavenia správy...';
+
+$labels['low']     = 'Nízka';
+$labels['lowest']  = 'Najnižšia';
+$labels['normal']  = 'Normálna';
+$labels['high']    = 'Vysoká';
 $labels['highest'] = 'Najvyššia';
-$labels['nosubject'] = '(bez predmetu)';
+
+$labels['nosubject']  = '(bez predmetu)';
 $labels['showimages'] = 'Ukázať obrázky';
 $labels['alwaysshow'] = 'Vždy zobraziť obrázky od $sender';
-$labels['isdraft'] = 'Toto je rozpísaná správa';
-$labels['andnmore'] = '$nr viac...';
+$labels['isdraft']    = 'Toto je rozpísaná správa';
+$labels['andnmore']   = '$nr viac...';
 $labels['togglemoreheaders'] = 'Zobraziť viac záhlaví správ';
 $labels['togglefullheaders'] = 'Prepnúť zobrazenie nespracovaných záhlaví správ';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Čistý text';
 $labels['savesentmessagein'] = 'Ukladať odoslané správy do';
 $labels['dontsave'] = 'Neukladať';
 $labels['maxuploadsize'] = 'Maximálna povolená veľkosť súboru je $size';
+
 $labels['addcc'] = 'Pridať kópiu';
 $labels['addbcc'] = 'Pridať skrytú kopiu';
 $labels['addreplyto'] = 'Pridať odpoveď';
 $labels['addfollowupto'] = 'Pridať pokračovať na';
+
+// mdn
 $labels['mdnrequest'] = 'Odosielateľ tejto správy chce byť upozornený na to, že ste správu obdržali. Chcete potvrdiť prijatie správy?';
 $labels['receiptread'] = 'Potvrdenie o prijatí správy';
 $labels['yourmessage'] = 'Toto je potvrdenie o prijatí Vašej správy';
 $labels['receiptnote'] = 'Poznámka: Toto potvrdenie negarantuje, že správa bola príjemcom prečítaná a porozumel jej obsahu.';
-$labels['name'] = 'Názov';
-$labels['firstname'] = 'Meno';
-$labels['surname'] = 'Priezvisko';
-$labels['middlename'] = 'Stredné meno';
-$labels['nameprefix'] = 'Titul';
-$labels['namesuffix'] = 'Prípona';
-$labels['nickname'] = 'Prezývka';
-$labels['jobtitle'] = 'Názov práce';
-$labels['department'] = 'Oddelenie';
-$labels['gender'] = 'Pohlavie';
-$labels['maidenname'] = 'Dievčenské meno';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefón';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Mesto';
-$labels['zipcode'] = 'Smerovacie čéslo';
-$labels['region'] = 'Kraj';
-$labels['country'] = 'Krajina';
-$labels['birthday'] = 'Dátum narodenia';
-$labels['anniversary'] = 'Výročie';
-$labels['website'] = 'Web stránka';
+
+// address boook
+$labels['name']         = 'Názov';
+$labels['firstname']    = 'Meno';
+$labels['surname']      = 'Priezvisko';
+$labels['middlename']   = 'Stredné meno';
+$labels['nameprefix']   = 'Titul';
+$labels['namesuffix']   = 'Prípona';
+$labels['nickname']     = 'Prezývka';
+$labels['jobtitle']     = 'Názov práce';
+$labels['department']   = 'Oddelenie';
+$labels['gender']       = 'Pohlavie';
+$labels['maidenname']   = 'Dievčenské meno';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefón';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Mesto';
+$labels['zipcode']      = 'Smerovacie čéslo';
+$labels['region']       = 'Kraj';
+$labels['country']      = 'Krajina';
+$labels['birthday']     = 'Dátum narodenia';
+$labels['anniversary']  = 'Výročie';
+$labels['website']      = 'Web stránka';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Poznámky';
-$labels['male'] = 'muž';
+$labels['male']   = 'muž';
 $labels['female'] = 'žena';
 $labels['manager'] = 'Manažér';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Partner';
 $labels['allfields'] = 'Všetky polia';
 $labels['search'] = 'Hľadať';
 $labels['advsearch'] = 'Rozšírené vyhľadávanie';
 $labels['advanced'] = 'Rozšírené';
 $labels['other'] = 'Ostatné';
-$labels['typeother'] = 'Ostatné';
-$labels['typehome'] = 'Domov';
-$labels['typework'] = 'Práca';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hlavný';
-$labels['typehomefax'] = 'Domáci fax';
-$labels['typeworkfax'] = 'Fax - práca';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Domovská stránka';
+
+$labels['typehome']   = 'Domov';
+$labels['typework']   = 'Práca';
+$labels['typeother']  = 'Ostatné';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hlavný';
+$labels['typehomefax']  = 'Domáci fax';
+$labels['typeworkfax']  = 'Fax - práca';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Domovská stránka';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Pridať položku...';
 $labels['addcontact'] = 'Pridať nový kontakt';
 $labels['editcontact'] = 'Upraviť kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Vlastnosti kontaktu';
 $labels['personalinfo'] = 'Osobné informácie';
-$labels['edit'] = 'Upraviť';
+
+$labels['edit']   = 'Upraviť';
 $labels['cancel'] = 'Zrušiť';
-$labels['save'] = 'Uložiť';
+$labels['save']   = 'Uložiť';
 $labels['delete'] = 'Zmazať';
 $labels['rename'] = 'Premenovať';
 $labels['addphoto'] = 'Pridať';
 $labels['replacephoto'] = 'Nahradiť';
 $labels['uploadphoto'] = 'Nahrať fotku';
-$labels['newcontact'] = 'Vytvoriť nový kontakt';
-$labels['deletecontact'] = 'Zmazať zvolené kontakty';
-$labels['composeto'] = 'Vytvoriť správu pre';
+
+$labels['newcontact']     = 'Vytvoriť nový kontakt';
+$labels['deletecontact']  = 'Zmazať zvolené kontakty';
+$labels['composeto']      = 'Vytvoriť správu pre';
 $labels['contactsfromto'] = 'Kontakty od $from do $to z $count';
-$labels['print'] = 'Tlač';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Exportovať kontakty vo formáte vCard';
+$labels['print']          = 'Tlač';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exportovať kontakty vo formáte vCard';
 $labels['newcontactgroup'] = 'Vytvoriť novú skupinu kontaktov';
-$labels['grouprename'] = 'Premenovať skupinu';
-$labels['groupdelete'] = 'Zmazať skupinu';
+$labels['grouprename']    = 'Premenovať skupinu';
+$labels['groupdelete']    = 'Zmazať skupinu';
 $labels['groupremoveselected'] = 'Odstrániť vybrané kontakty zo skupiny';
-$labels['previouspage'] = 'Predchádzajúca stránka';
-$labels['firstpage'] = 'Prvá stránka';
-$labels['nextpage'] = 'Nasledujúca stránka';
-$labels['lastpage'] = 'Posledná stránka';
+
+$labels['previouspage']   = 'Predchádzajúca stránka';
+$labels['firstpage']      = 'Prvá stránka';
+$labels['nextpage']       = 'Nasledujúca stránka';
+$labels['lastpage']       = 'Posledná stránka';
+
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
 $labels['personaladrbook'] = 'Osobné adresy';
+
 $labels['searchsave'] = 'Uložiť vyhľadávanie';
 $labels['searchdelete'] = 'Zmazať vyhľadávanie';
+
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Importovať kontakty';
 $labels['importfromfile'] = 'Importovať zo súboru:';
 $labels['importtarget'] = 'Pridať nové kontakty do adresára:';
 $labels['importreplace'] = 'Nahradiť celý zoznam kontaktov';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Hotovo';
+
+// settings
 $labels['settingsfor'] = 'Nastavenia pre';
 $labels['about'] = 'O programe';
 $labels['preferences'] = 'Vlastnosti';
 $labels['userpreferences'] = 'Používateľské nastavenia';
 $labels['editpreferences'] = 'Upraviť používateľské nastavenia';
+
 $labels['identities'] = 'Profily';
 $labels['manageidentities'] = 'Spravovať profily pre tento účet';
 $labels['newidentity'] = 'Nový profil';
+
 $labels['newitem'] = 'Nová položka';
 $labels['edititem'] = 'Upraviť položku';
+
 $labels['preferhtml'] = 'Uprednostniť HTML zobrazenie';
 $labels['defaultcharset'] = 'Predvolené kódovanie';
 $labels['htmlmessage'] = 'HTML správa';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formát dátumu';
 $labels['timeformat'] = 'Formát času';
 $labels['prettydate'] = 'Krajší dátum';
-$labels['setdefault'] = 'Obnoviť pôvodné';
-$labels['autodetect'] = 'Automaticky';
-$labels['language'] = 'Jazyk';
-$labels['timezone'] = 'Časová zóna';
-$labels['pagesize'] = 'Riadky na stránku';
+$labels['setdefault']  = 'Obnoviť pôvodné';
+$labels['autodetect']  = 'Automaticky';
+$labels['language']  = 'Jazyk';
+$labels['timezone']  = 'Časová zóna';
+$labels['pagesize']  = 'Riadky na stránku';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Letný čas';
+$labels['dstactive']  = 'Letný čas';
 $labels['showinextwin'] = 'Otvoriť správu v novom okne';
 $labels['composeextwin'] = 'Písať v novom okne';
 $labels['htmleditor'] = 'Vytvoriť HTML správu';
@@ -355,10 +420,11 @@ $labels['showremoteimages'] = 'Zobrazovať obrázky uložené mimo mail';
 $labels['fromknownsenders'] = 'od známych užívateľov';
 $labels['always'] = 'vždy';
 $labels['showinlineimages'] = 'Zobraziť pripojené obrázky pod správou';
-$labels['autosavedraft'] = 'Automaticky uložiť koncept';
-$labels['everynminutes'] = 'každých $n minút';
-$labels['never'] = 'nikdy';
-$labels['immediately'] = 'ihneď';
+$labels['autosavedraft']  = 'Automaticky uložiť koncept';
+$labels['everynminutes']  = 'každých $n minút';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nikdy';
+$labels['immediately']  = 'ihneď';
 $labels['messagesdisplaying'] = 'Zobrazovanie správ';
 $labels['messagescomposition'] = 'Vytváranie správ';
 $labels['mimeparamfolding'] = 'Názvy príloh';
@@ -389,12 +455,12 @@ $labels['replysignaturepos'] = 'Pri odpovedaní alebo preposielanie správy vlo�
 $labels['belowquote'] = 'nad citáciu';
 $labels['abovequote'] = 'pod citáciu';
 $labels['insertsignature'] = 'Vložit podpis';
-$labels['previewpanemarkread'] = 'Označiť zobrazenej správy ako prečítané';
-$labels['afternseconds'] = 'po $n sekundách';
+$labels['previewpanemarkread']  = 'Označiť zobrazenej správy ako prečítané';
+$labels['afternseconds']  = 'po $n sekundách';
 $labels['reqmdn'] = 'Vždy požadovať doručenku';
 $labels['reqdsn'] = 'Vždy vyžadovať potvrdenie o doručení správy';
 $labels['replysamefolder'] = 'Umietniť odpoveď do adresára, kde je umiestnená správa, na ktorú sa odpovedalo';
-$labels['defaultaddressbook'] = 'Pridať nové kontakty do zvoleného adresára';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Vynechať alternatívnu emailovú adresu pri automatickom dopĺňaní';
 $labels['listnamedisplay'] = 'Zobraziť kontakt ako';
 $labels['spellcheckbeforesend'] = 'Skontrolovať pravopis pred odoslaním správy';
@@ -407,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Zaregistrovať handler pre odkazy „mailto:“
 $labels['forwardmode'] = 'Preposielanie správ';
 $labels['inline'] = 'v tele spávy';
 $labels['asattachment'] = 'ako príloha';
-$labels['folder'] = 'Priečinok';
-$labels['foldername'] = 'Názov priečinku';
-$labels['subscribed'] = 'Prihlásený k odberu';
+
+$labels['folder']  = 'Priečinok';
+$labels['folders']  = 'Priečinky';
+$labels['foldername']  = 'Názov priečinku';
+$labels['subscribed']  = 'Prihlásený k odberu';
 $labels['messagecount'] = 'Počet správ';
-$labels['create'] = 'Vytvoriť';
-$labels['createfolder'] = 'Vytvor nový priečinok';
-$labels['managefolders'] = 'Spravovať priečinky';
+$labels['create']  = 'Vytvoriť';
+$labels['createfolder']  = 'Vytvor nový priečinok';
+$labels['managefolders']  = 'Spravovať priečinky';
 $labels['specialfolders'] = 'Špeciálne priečinky';
 $labels['properties'] = 'Vlastnosti';
 $labels['folderproperties'] = 'Vlastnosti adresára';
@@ -423,23 +491,29 @@ $labels['info'] = 'Informácia';
 $labels['getfoldersize'] = 'Kliknúť pre získanie leľkosti adresára';
 $labels['changesubscription'] = 'Kliknúť pre zmenu prihlásenia odberu';
 $labels['foldertype'] = 'Typ priečinka';
-$labels['personalfolder'] = 'Súkromný priečinok';
-$labels['otherfolder'] = 'Iné užívateľove adresáre';
-$labels['sharedfolder'] = 'Verejný adresár';
+$labels['personalfolder']  = 'Súkromný priečinok';
+$labels['otherfolder']  = 'Iné užívateľove adresáre';
+$labels['sharedfolder']  = 'Verejný adresár';
+
 $labels['sortby'] = 'Triediť podľa';
-$labels['sortasc'] = 'Triediť vzostupne';
+$labels['sortasc']  = 'Triediť vzostupne';
 $labels['sortdesc'] = 'Triediť zostupne';
 $labels['undo'] = 'Vrátiť';
+
 $labels['installedplugins'] = 'Nainštalované zásuvné moduly';
 $labels['plugin'] = 'Zásuvný modul';
 $labels['version'] = 'Verzia';
 $labels['source'] = 'Zdroj';
 $labels['license'] = 'Licencia';
 $labels['support'] = 'Získať podporu';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angličtina';
 $labels['westerneuropean'] = 'Západná Európa';
@@ -459,3 +533,4 @@ $labels['japanese'] = 'Japončina';
 $labels['korean'] = 'Korejčina';
 $labels['chinese'] = 'Čínština';
 
+?>
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 2a2f73ec9..f0ee82978 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Vyskytla sa chyba!';
-$messages['loginfailed'] = 'Chybné prihlásenie';
+$messages['errortitle']  = 'Vyskytla sa chyba!';
+$messages['loginfailed']  = 'Chybné prihlásenie';
 $messages['cookiesdisabled'] = 'Váš internetový prehliadač nepodporuje cookies, ktoré sú potrebné pre prihlásenie';
 $messages['sessionerror'] = 'Vaše prihlásenie je neplatné alebo vypršala jeho platnosť';
 $messages['storageerror'] = 'Nepodarilo sa spojiť s IMAP serverom';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Neplatný názov servera';
 $messages['nomessagesfound'] = 'Vo Vašej schránke nie je žiadna správa';
 $messages['loggedout'] = 'Odhlásenie prebehlo úspešne. Dovidenia.';
 $messages['mailboxempty'] = 'Schránka je prázdna';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Načítava sa...';
 $messages['uploading'] = 'Nahrávám súbor...';
 $messages['uploadingmany'] = 'Nahrávam súbory...';
@@ -56,11 +60,11 @@ $messages['errormoving'] = 'Správa sa nedá presunúť';
 $messages['errorcopying'] = 'Správa sa nedá skopírovať';
 $messages['errordeleting'] = 'Správa sa nedá zmazať';
 $messages['errormarking'] = 'Správa sa nedá označiť';
-$messages['deletecontactconfirm'] = 'Ste si istý, že chcete zmazať zvolený(é) kontakt(y)?';
-$messages['deletegroupconfirm'] = 'Skutočne chceš zmazať vybranú skupinu?';
+$messages['deletecontactconfirm']  = 'Ste si istý, že chcete zmazať zvolený(é) kontakt(y)?';
+$messages['deletegroupconfirm']  = 'Skutočne chceš zmazať vybranú skupinu?';
 $messages['deletemessagesconfirm'] = 'Ste si istý, že chcete zmazať zvolenú(é) správu(y)?';
-$messages['deletefolderconfirm'] = 'Ste si istý, že chcete zmazať tento priečinok?';
-$messages['purgefolderconfirm'] = 'Ste si istý, že chcete zmazať všetky správy v tomto priečinku?';
+$messages['deletefolderconfirm']  = 'Ste si istý, že chcete zmazať tento priečinok?';
+$messages['purgefolderconfirm']  = 'Ste si istý, že chcete zmazať všetky správy v tomto priečinku?';
 $messages['contactdeleting'] = 'Mažem kontakt(y)...';
 $messages['groupdeleting'] = 'Mažem skupinu...';
 $messages['folderdeleting'] = 'Odstraňuje sa priečinok ...';
@@ -69,11 +73,11 @@ $messages['foldersubscribing'] = 'Prihlasujem sa k adresáru...';
 $messages['folderunsubscribing'] = 'Odhlasujem sa z adresára...';
 $messages['formincomplete'] = 'Formulár nie je kompletne vyplnený';
 $messages['noemailwarning'] = 'Prosím, vložte platnú emailovú adresu';
-$messages['nonamewarning'] = 'Prosím, zadajte meno';
+$messages['nonamewarning']  = 'Prosím, zadajte meno';
 $messages['nopagesizewarning'] = 'Prosím, zadajte veľkosť strany';
 $messages['nosenderwarning'] = 'Prosím, zadajte adresu odosielateľa';
 $messages['norecipientwarning'] = 'Prosím, vložte aspoň jedného príjemcu';
-$messages['nosubjectwarning'] = 'Predmet správy je prázdny. Chcete ho teraz zadať?';
+$messages['nosubjectwarning']  = 'Predmet správy je prázdny. Chcete ho teraz zadať?';
 $messages['nobodywarning'] = 'Chcete odoslať správu bez textu?';
 $messages['notsentwarning'] = 'Správa nebola odoslaná, chcete ju zrušiť?';
 $messages['noldapserver'] = 'Prosím, zvoľte LDAP server na vyhľadávanie';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Kontakty boli úspešne presunuty do tejto s
 $messages['contactremovedfromgroup'] = 'Kontakty boli úspešne odstráneny z tejto skupiny';
 $messages['nogroupassignmentschanged'] = 'Priradenia do skupín neboli zmenené.';
 $messages['importwait'] = 'Prebieha import, počkajte ...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Úspešne sa načítalo $inserted kontaktov, preskočilo sa $skipped existujúcich záznamov</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočených $skipped existujúcich záznamov</b>';
 $messages['opnotpermitted'] = 'Operácia nie je povolená!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'Zlý formát obrázku';
 $messages['mispellingsfound'] = 'V správe boli nájdené pravopisné chyby';
 $messages['parentnotwritable'] = 'Nemôžem vytvoriť/presunúť adresár do zvoleného nadradeného adresára. Nemáte oprávnenia na zmenu.';
 $messages['messagetoobig'] = 'Časť správy je príliš veľká na spracovanie.';
+$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/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index f220c77f1..a4e2d43e3 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -2,138 +2,167 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Dobrodošli v $product';
-$labels['username'] = 'Uporabniško ime';
-$labels['password'] = 'Geslo';
-$labels['server'] = 'Strežnik';
-$labels['login'] = 'Prijava';
-$labels['logout'] = 'Odjava';
-$labels['mail'] = 'E-Pošta';
+
+// login page
+$labels['welcome']   = 'Dobrodošli v $product';
+$labels['username']  = 'Uporabniško ime';
+$labels['password']  = 'Geslo';
+$labels['server']    = 'Strežnik';
+$labels['login']     = 'Prijava';
+
+// taskbar
+$labels['logout']   = 'Odjava';
+$labels['mail']     = 'E-Pošta';
 $labels['settings'] = 'Osebne nastavitve';
 $labels['addressbook'] = 'Stiki';
-$labels['inbox'] = 'Prejeto';
+
+// mailbox names
+$labels['inbox']  = 'Prejeto';
 $labels['drafts'] = 'Osnutki';
-$labels['sent'] = 'Poslano';
-$labels['trash'] = 'Smeti';
-$labels['junk'] = 'Nezaželena sporočila';
+$labels['sent']   = 'Poslano';
+$labels['trash']  = 'Smeti';
+$labels['junk']   = 'Nezaželena sporočila';
+
+// message listing
 $labels['subject'] = 'Zadeva';
-$labels['from'] = 'Pošiljatelj';
-$labels['to'] = 'Prejemnik';
-$labels['cc'] = 'Kp';
-$labels['bcc'] = 'Skp';
+$labels['from']    = 'Pošiljatelj';
+$labels['sender']  = 'Pošiljatelj';
+$labels['to']      = 'Prejemnik';
+$labels['cc']      = 'Kp';
+$labels['bcc']     = 'Skp';
 $labels['replyto'] = 'Odgovor na';
 $labels['followupto'] = 'Odgovor na';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Velikost';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Velikost';
 $labels['priority'] = 'Prioriteta';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status';
 $labels['listoptions'] = 'Možnosti prikaza...';
+
 $labels['mailboxlist'] = 'Mape';
-$labels['folders'] = 'Mape';
 $labels['messagesfromto'] = 'Sporočila $from do $to od $count';
 $labels['threadsfromto'] = 'Nit $from do $to od $count';
 $labels['messagenrof'] = 'Sporočilo $nr od $count';
 $labels['fromtoshort'] = '$from – $to od $count';
-$labels['copy'] = 'Kopiraj';
-$labels['move'] = 'Premakni';
-$labels['moveto'] = 'Premakni v...';
+
+$labels['copy']     = 'Kopiraj';
+$labels['move']     = 'Premakni';
+$labels['moveto']   = 'Premakni v...';
 $labels['download'] = 'Prenesi';
+$labels['showattachment'] = 'Prikaži';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Velikost datoteke';
+
 $labels['addtoaddressbook'] = 'Dodaj med stike';
-$labels['sun'] = 'Ned';
-$labels['mon'] = 'Pon';
-$labels['tue'] = 'Tor';
-$labels['wed'] = 'Sre';
-$labels['thu'] = 'Čet';
-$labels['fri'] = 'Pet';
-$labels['sat'] = 'Sob';
-$labels['sunday'] = 'Nedelja';
-$labels['monday'] = 'Ponedeljek';
-$labels['tuesday'] = 'Torek';
-$labels['wednesday'] = 'Sreda';
-$labels['thursday'] = 'Četrtek';
-$labels['friday'] = 'Petek';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Avg';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Marec';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Junij';
-$labels['longjul'] = 'Julij';
-$labels['longaug'] = 'Avgust';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+
+// weekdays short
+$labels['sun'] = 'ned';
+$labels['mon'] = 'pon';
+$labels['tue'] = 'tor';
+$labels['wed'] = 'sre';
+$labels['thu'] = 'čet';
+$labels['fri'] = 'pet';
+$labels['sat'] = 'sob';
+
+// weekdays long
+$labels['sunday']    = 'nedelja';
+$labels['monday']    = 'ponedeljek';
+$labels['tuesday']   = 'torek';
+$labels['wednesday'] = 'sreda';
+$labels['thursday']  = 'četrtek';
+$labels['friday']    = 'petek';
+$labels['saturday']  = 'sobota';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'maj';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'avg';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dec';
+
+// months long
+$labels['longjan']	= 'januar';
+$labels['longfeb']	= 'februar';
+$labels['longmar']	= 'marec';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'maj';
+$labels['longjun']	= 'junij';
+$labels['longjul']	= 'julij';
+$labels['longaug']	= 'avgust';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'november';
+$labels['longdec']	= 'december';
+
 $labels['today'] = 'Danes';
-$labels['refresh'] = 'Osveži';
-$labels['checkmail'] = 'Preglej nova sporočila';
-$labels['compose'] = 'Sestavi sporočilo';
-$labels['writenewmessage'] = 'Novo sporočilo';
-$labels['reply'] = 'Odgovori';
-$labels['replytomessage'] = 'Odgovori';
+
+// toolbar buttons
+$labels['refresh']          = 'Osveži';
+$labels['checkmail']        = 'Preglej nova sporočila';
+$labels['compose']          = 'Sestavi sporočilo';
+$labels['writenewmessage']  = 'Novo sporočilo';
+$labels['reply']            = 'Odgovori';
+$labels['replytomessage']   = 'Odgovori';
 $labels['replytoallmessage'] = 'Odgovori listi ali vsem prejemnikom';
-$labels['replyall'] = 'Odgovori vsem';
-$labels['replylist'] = 'Odgovori listi';
-$labels['forward'] = 'Posreduj';
-$labels['forwardinline'] = 'Posreduj medvrstično';
+$labels['replyall']         = 'Odgovori vsem';
+$labels['replylist']        = 'Odgovori listi';
+$labels['forward']          = 'Posreduj';
+$labels['forwardinline']    = 'Posreduj medvrstično';
 $labels['forwardattachment'] = 'Posreduj kot priponko';
-$labels['forwardmessage'] = 'Posreduj';
-$labels['deletemessage'] = 'Izbriši';
+$labels['forwardmessage']   = 'Posreduj';
+$labels['deletemessage']    = 'Izbriši';
 $labels['movemessagetotrash'] = 'Premakni v smeti';
-$labels['printmessage'] = 'Natisni';
-$labels['previousmessage'] = 'Prikaži prejšnje sporočilo';
-$labels['firstmessage'] = 'Prikaži prvo sporočilo';
-$labels['nextmessage'] = 'Prikaži naslednje sporočilo';
-$labels['lastmessage'] = 'Prikaži zadnje sporočilo';
-$labels['backtolist'] = 'Nazaj na seznam sporočil';
-$labels['viewsource'] = 'Prikaži izvirno kodo';
-$labels['mark'] = 'Označi';
-$labels['markmessages'] = 'Označi sporočilo';
-$labels['markread'] = 'Kot prebrano';
-$labels['markunread'] = 'Kot neprebrano';
-$labels['markflagged'] = 'Kot označeno';
-$labels['markunflagged'] = 'Kot neoznačeno';
-$labels['moreactions'] = 'Več možnosti...';
-$labels['more'] = 'Več';
-$labels['back'] = 'Nazaj';
-$labels['options'] = 'Možnosti';
+$labels['printmessage']     = 'Natisni';
+$labels['previousmessage']  = 'Prikaži prejšnje sporočilo';
+$labels['firstmessage']     = 'Prikaži prvo sporočilo';
+$labels['nextmessage']      = 'Prikaži naslednje sporočilo';
+$labels['lastmessage']      = 'Prikaži zadnje sporočilo';
+$labels['backtolist']       = 'Nazaj na seznam sporočil';
+$labels['viewsource']       = 'Prikaži izvirno kodo';
+$labels['mark']             = 'Označi';
+$labels['markmessages']     = 'Označi sporočilo';
+$labels['markread']         = 'Kot prebrano';
+$labels['markunread']       = 'Kot neprebrano';
+$labels['markflagged']      = 'Kot označeno';
+$labels['markunflagged']    = 'Kot neoznačeno';
+$labels['moreactions']      = 'Več možnosti...';
+$labels['more']             = 'Več';
+$labels['back']             = 'Nazaj';
+$labels['options']          = 'Možnosti';
+
 $labels['select'] = 'Izberi';
 $labels['all'] = 'Vse';
 $labels['none'] = 'Brez';
-$labels['nonesort'] = 'Brez';
 $labels['currpage'] = 'Trenutna stran';
 $labels['unread'] = 'Neprebrano';
 $labels['flagged'] = 'Označeno';
 $labels['unanswered'] = 'Neoznačeno';
 $labels['deleted'] = 'Izbrisano';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Zamenjaj';
 $labels['filter'] = 'Prikaži';
 $labels['list'] = 'Seznam';
@@ -142,12 +171,14 @@ $labels['expand-all'] = 'Razširi vse';
 $labels['expand-unread'] = 'Razširi neprebrano';
 $labels['collapse-all'] = 'Zloži vse';
 $labels['threaded'] = 'Nitno';
+
 $labels['autoexpand_threads'] = 'Razširi niti';
 $labels['do_expand'] = 'vse niti';
 $labels['expand_only_unread'] = 'samo niti z neprebranimi sporočili';
 $labels['fromto'] = 'Pošiljatelj/Prejemnik';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Priponka';
+$labels['nonesort'] = 'Brez';
 $labels['sentdate'] = 'Datum pošiljanja';
 $labels['arrival'] = 'Datum prejema';
 $labels['asc'] = 'naraščajoče';
@@ -156,174 +187,216 @@ $labels['listcolumns'] = 'Seznam stolpcev';
 $labels['listsorting'] = 'Urejanje stolpcev';
 $labels['listorder'] = 'Vrstni red';
 $labels['listmode'] = 'Način prikaza seznama';
+
 $labels['folderactions'] = 'Upravljanje map...';
 $labels['compact'] = 'Stisni';
 $labels['empty'] = 'Izprazni';
+
 $labels['quota'] = 'Poraba prostora';
-$labels['unknown'] = 'neznana';
-$labels['unlimited'] = 'neomejena';
-$labels['quicksearch'] = 'Hitri iskalnik';
-$labels['resetsearch'] = 'Prekliči iskanje';
-$labels['searchmod'] = 'Spremembe iskanja';
-$labels['msgtext'] = 'Celotno sporočilo';
+$labels['unknown']  = 'neznana';
+$labels['unlimited']  = 'neomejena';
+
+$labels['quicksearch']  = 'Hitri iskalnik';
+$labels['resetsearch']  = 'Prekliči iskanje';
+$labels['searchmod']  = 'Spremembe iskanja';
+$labels['msgtext']  = 'Celotno sporočilo';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
-$labels['editasnew'] = 'Uredi kot novo';
-$labels['sendmessage'] = 'Pošlji sporočilo';
-$labels['savemessage'] = 'Shrani kot osnutek';
-$labels['addattachment'] = 'Pripni datoteko';
-$labels['charset'] = 'Nabor znakov';
-$labels['editortype'] = 'Vrsta urejevalnika';
-$labels['returnreceipt'] = 'Potrdilo prejemnika';
-$labels['dsn'] = 'Status dostave sporočila';
+
+// message compose
+$labels['editasnew']      = 'Uredi kot novo';
+$labels['send']           = 'Pošlji';
+$labels['sendmessage']    = 'Pošlji sporočilo';
+$labels['savemessage']    = 'Shrani kot osnutek';
+$labels['addattachment']  = 'Pripni datoteko';
+$labels['charset']        = 'Nabor znakov';
+$labels['editortype']     = 'Vrsta urejevalnika';
+$labels['returnreceipt']  = 'Potrdilo prejemnika';
+$labels['dsn']            = 'Status dostave sporočila';
 $labels['mailreplyintro'] = '$date, je $sender napisal';
 $labels['originalmessage'] = 'Izvorno sporočilo';
-$labels['editidents'] = 'Uredi identitete';
-$labels['spellcheck'] = 'Črkovanje';
+
+$labels['editidents']    = 'Uredi identitete';
+$labels['spellcheck']    = 'Črkovanje';
 $labels['checkspelling'] = 'Preglej pravopis';
 $labels['resumeediting'] = 'Nadaljuj z urejanjem';
-$labels['revertto'] = 'Razveljavi';
+$labels['revertto']      = 'Razveljavi';
+
 $labels['attach'] = 'Pripni';
 $labels['attachments'] = 'Priponke';
 $labels['upload'] = 'Naloži';
 $labels['uploadprogress'] = '$percent ($current od $total)';
-$labels['close'] = 'Zapri';
-$labels['messageoptions'] = 'Možnosti';
-$labels['low'] = 'Nizka';
-$labels['lowest'] = 'Najnižja';
-$labels['normal'] = 'Običajna';
-$labels['high'] = 'Visoka';
+$labels['close']  = 'Zapri';
+$labels['messageoptions']  = 'Možnosti';
+
+$labels['low']     = 'Nizka';
+$labels['lowest']  = 'Najnižja';
+$labels['normal']  = 'Običajna';
+$labels['high']    = 'Visoka';
 $labels['highest'] = 'Najvišja';
-$labels['nosubject'] = '(brez naslova)';
+
+$labels['nosubject']  = '(brez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Vedno prikaži slike od $sender';
-$labels['isdraft'] = 'To je osnutek sporočila.';
+$labels['isdraft']    = 'To je osnutek sporočila.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'Obogateno besedilo (HTML)';
 $labels['plaintoggle'] = 'Samo besedilo';
 $labels['savesentmessagein'] = 'Shrani poslana sporočila v';
 $labels['dontsave'] = 'Ne shrani';
 $labels['maxuploadsize'] = 'Največja dovoljena velikost datoteke je $size';
+
 $labels['addcc'] = 'Dodaj Kp';
 $labels['addbcc'] = 'Dodaj Skp';
 $labels['addreplyto'] = 'Dodaj naslov za odgovor';
 $labels['addfollowupto'] = 'Dodaj naslov za odgovor';
+
+// mdn
 $labels['mdnrequest'] = 'Pošiljatelj tega sporočila je zaprosil za potrdilo o branju. Želite o tem obvestiti pošiljatelja?';
 $labels['receiptread'] = 'Potrdilo o branju';
 $labels['yourmessage'] = 'To je potrdilo o branju.';
 $labels['receiptnote'] = 'Pozor: to je samo potrdilo, da je bilo vaše sporočilo prikazano na prejemnikovem računalniku. To še ne pomeni, da je prejemnik prebral ali razumel vsebino vašega sporočila.';
-$labels['name'] = 'Ime za prikaz';
-$labels['firstname'] = 'Ime';
-$labels['surname'] = 'Priimek';
-$labels['middlename'] = 'Drugo ime';
-$labels['nameprefix'] = 'Predpona';
-$labels['namesuffix'] = 'Pripona';
-$labels['nickname'] = 'Vzdevek';
-$labels['jobtitle'] = 'Naziv';
-$labels['department'] = 'Oddelek';
-$labels['gender'] = 'Spol';
-$labels['maidenname'] = 'Dekliški priimek';
-$labels['email'] = 'E-Pošta';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Naslov';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Mesto';
-$labels['zipcode'] = 'Poštna številka';
-$labels['region'] = 'Regija';
-$labels['country'] = 'Država';
-$labels['birthday'] = 'Rojstni dan';
-$labels['anniversary'] = 'Rojstni dan';
-$labels['website'] = 'Spletna stran';
+
+// address boook
+$labels['name']         = 'Ime za prikaz';
+$labels['firstname']    = 'Ime';
+$labels['surname']      = 'Priimek';
+$labels['middlename']   = 'Drugo ime';
+$labels['nameprefix']   = 'Predpona';
+$labels['namesuffix']   = 'Pripona';
+$labels['nickname']     = 'Vzdevek';
+$labels['jobtitle']     = 'Naziv';
+$labels['department']   = 'Oddelek';
+$labels['gender']       = 'Spol';
+$labels['maidenname']   = 'Dekliški priimek';
+$labels['email']        = 'E-Pošta';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Naslov';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Mesto';
+$labels['zipcode']      = 'Poštna številka';
+$labels['region']       = 'Regija';
+$labels['country']      = 'Država';
+$labels['birthday']     = 'Rojstni dan';
+$labels['anniversary']  = 'Rojstni dan';
+$labels['website']      = 'Spletna stran';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Opombe';
-$labels['male'] = 'moški';
+$labels['male']   = 'moški';
 $labels['female'] = 'ženska';
 $labels['manager'] = 'Vodja';
 $labels['assistant'] = 'Pomoč';
-$labels['typeassistant'] = 'Pomoč';
 $labels['spouse'] = 'Zakonec';
 $labels['allfields'] = 'Vsa polja';
 $labels['search'] = 'Iskanje';
 $labels['advsearch'] = 'Napredno iskanje';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-$labels['typeother'] = 'Ostalo';
-$labels['typehome'] = 'Doma';
-$labels['typework'] = 'Služba';
-$labels['typemobile'] = 'Mobilni telefon';
-$labels['typemain'] = 'Osnovno';
-$labels['typehomefax'] = 'Domači fax';
-$labels['typeworkfax'] = 'Službeni fax';
-$labels['typecar'] = 'Avto';
-$labels['typepager'] = 'Pozivnik';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Domača stran';
+
+$labels['typehome']   = 'Doma';
+$labels['typework']   = 'Služba';
+$labels['typeother']  = 'Ostalo';
+$labels['typemobile']  = 'Mobilni telefon';
+$labels['typemain']  = 'Osnovno';
+$labels['typehomefax']  = 'Domači fax';
+$labels['typeworkfax']  = 'Službeni fax';
+$labels['typecar']  = 'Avto';
+$labels['typepager']  = 'Pozivnik';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Pomoč';
+$labels['typehomepage']  = 'Domača stran';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj izbrane stike v imenik';
 $labels['editcontact'] = 'Uredi vizitko';
 $labels['contacts'] = 'Stiki';
 $labels['contactproperties'] = 'Lastnosti stika';
 $labels['personalinfo'] = 'Osebni podatki';
-$labels['edit'] = 'Uredi';
+
+$labels['edit']   = 'Uredi';
 $labels['cancel'] = 'Prekliči';
-$labels['save'] = 'Shrani';
+$labels['save']   = 'Shrani';
 $labels['delete'] = 'Izbriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamenjaj';
 $labels['uploadphoto'] = 'Naloži sliko';
-$labels['newcontact'] = 'Dodaj vizitko';
-$labels['deletecontact'] = 'Izbriši izbrane vizitke';
-$labels['composeto'] = 'Sestavi sporočilo za';
+
+$labels['newcontact']     = 'Dodaj vizitko';
+$labels['deletecontact']  = 'Izbriši izbrane vizitke';
+$labels['composeto']      = 'Sestavi sporočilo za';
 $labels['contactsfromto'] = 'Vizitke $from od $to do $count';
-$labels['print'] = 'Natisni';
-$labels['export'] = 'Izvozi';
-$labels['exportvcards'] = 'Izvozi stike v formatu vCard';
+$labels['print']          = 'Natisni';
+$labels['export']         = 'Izvozi';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Izvozi stike v formatu vCard';
 $labels['newcontactgroup'] = 'Ustvari novo skupino stikov';
-$labels['grouprename'] = 'Preimenuj skupino';
-$labels['groupdelete'] = 'Izbriši skupino';
+$labels['grouprename']    = 'Preimenuj skupino';
+$labels['groupdelete']    = 'Izbriši skupino';
 $labels['groupremoveselected'] = 'Odstrani izbrane stike iz skupine';
-$labels['previouspage'] = 'Prejšnja stran';
-$labels['firstpage'] = 'Prva stran';
-$labels['nextpage'] = 'Naslednja stran';
-$labels['lastpage'] = 'Zadnja stran';
+
+$labels['previouspage']   = 'Prejšnja stran';
+$labels['firstpage']      = 'Prva stran';
+$labels['nextpage']       = 'Naslednja stran';
+$labels['lastpage']       = 'Zadnja stran';
+
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupine';
 $labels['personaladrbook'] = 'Stiki';
+
 $labels['searchsave'] = 'Shrani iskanje';
 $labels['searchdelete'] = 'Izbriši iskanje';
+
 $labels['import'] = 'Uvozi';
 $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove stike v imenik:';
 $labels['importreplace'] = 'Zamenjaj celoten imenik';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Dokončano';
+
+// settings
 $labels['settingsfor'] = 'Nastavitve za';
 $labels['about'] = 'Vizitka';
 $labels['preferences'] = 'Nastavitve';
 $labels['userpreferences'] = 'Uporabniške nastavitve';
 $labels['editpreferences'] = 'Uredi uporabniške nastavitve';
+
 $labels['identities'] = 'Identitete';
 $labels['manageidentities'] = 'Upravljaj identitete za ta račun';
 $labels['newidentity'] = 'Nova identiteta';
+
 $labels['newitem'] = 'Nov predmet';
 $labels['edititem'] = 'Uredi predmet';
+
 $labels['preferhtml'] = 'Prednostno HTML';
 $labels['defaultcharset'] = 'Privzeto kodiranje znakov';
 $labels['htmlmessage'] = 'HTML sporočilo';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Prikaz datuma';
 $labels['timeformat'] = 'Prikaz časa';
 $labels['prettydate'] = 'Bolj čitljivi datumi';
-$labels['setdefault'] = 'Nastavi privzeto';
-$labels['autodetect'] = 'Samodejno';
-$labels['language'] = 'Jezik';
-$labels['timezone'] = 'Časovni pas';
-$labels['pagesize'] = 'Vrstic na stran';
+$labels['setdefault']  = 'Nastavi privzeto';
+$labels['autodetect']  = 'Samodejno';
+$labels['language']  = 'Jezik';
+$labels['timezone']  = 'Časovni pas';
+$labels['pagesize']  = 'Vrstic na stran';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Samodejna nastavitev zimskega/letnega časa';
+$labels['dstactive']  = 'Samodejna nastavitev zimskega/letnega časa';
+$labels['showinextwin'] = 'Odpri v novem oknu';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Sestavi sporočila z obogatenim besedilom';
 $labels['htmlonreply'] = 'le pri odgovoru na sporočila z obogatenim besedilom';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Podpis z obogatenim besedilom';
 $labels['previewpane'] = 'Prikaži predogled';
 $labels['skin'] = 'Tema uporabniškega vmesnika';
@@ -347,10 +420,11 @@ $labels['showremoteimages'] = 'Prikaži medvrstične slike';
 $labels['fromknownsenders'] = 'od znanih pošiljateljev';
 $labels['always'] = 'vedno';
 $labels['showinlineimages'] = 'Prikaži priponke na dnu sporočila';
-$labels['autosavedraft'] = 'Samodejno shrani osnutke';
-$labels['everynminutes'] = '$n minut';
-$labels['never'] = 'nikoli';
-$labels['immediately'] = 'takoj';
+$labels['autosavedraft']  = 'Samodejno shrani osnutke';
+$labels['everynminutes']  = '$n minut';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nikoli';
+$labels['immediately']  = 'takoj';
 $labels['messagesdisplaying'] = 'Prikazovanje sporočil';
 $labels['messagescomposition'] = 'Sestavljanje sporočil';
 $labels['mimeparamfolding'] = 'Imena priponk';
@@ -370,6 +444,7 @@ $labels['maintenance'] = 'Vzdrževanje';
 $labels['newmessage'] = 'Novo sporočilo';
 $labels['signatureoptions'] = 'Nastavitve podpisa';
 $labels['whenreplying'] = 'Pri odgovoru';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'začni z novim sporočilom nad izvornim sporočilom';
 $labels['replybottomposting'] = 'začni z novim sporočilom pod izvornim sporočilom';
 $labels['replyremovesignature'] = 'Pri odgovoru na sporočilo odstrani izvorni podpis iz sporočila';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = 'Pri odgovoru ali posredovanju sporočila vstavi
 $labels['belowquote'] = 'pod citiran tekst';
 $labels['abovequote'] = 'nad citiran tekst';
 $labels['insertsignature'] = 'Vstavi podpis';
-$labels['previewpanemarkread'] = 'Označi predogledana sporočila kot prebrana';
-$labels['afternseconds'] = 'po $n sekundah';
+$labels['previewpanemarkread']  = 'Označi predogledana sporočila kot prebrana';
+$labels['afternseconds']  = 'po $n sekundah';
 $labels['reqmdn'] = 'Vedno zahtevaj povratnico';
 $labels['reqdsn'] = 'Vedno zahtevaj obvestilo o statusu dostave';
 $labels['replysamefolder'] = 'Shrani odgovore na sporočilo v mapo izvornega sporočila';
-$labels['defaultaddressbook'] = 'Dodaj nove stike v izbran imenik';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Preskoči nadomestni e-naslov pri samodejnem dokončanju';
 $labels['listnamedisplay'] = 'Prikaži seznam stikov kot';
 $labels['spellcheckbeforesend'] = 'Preveri črkovanje pred pošiljanjem sporočila';
@@ -395,13 +470,18 @@ $labels['spellcheckignorenums'] = 'Ne upoštevaj besed, ki vsebujejo številke';
 $labels['spellcheckignorecaps'] = 'Ne upoštevaj besed, ki vsebujejo samo velike črke';
 $labels['addtodict'] = 'Dodaj v slovar';
 $labels['mailtoprotohandler'] = 'Registriraj upravljavca protokola za e-naslov: povezave';
-$labels['folder'] = 'Mapa';
-$labels['foldername'] = 'Ime mape';
-$labels['subscribed'] = 'Vpisan';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'Kot priponka';
+
+$labels['folder']  = 'Mapa';
+$labels['folders']  = 'Mape';
+$labels['foldername']  = 'Ime mape';
+$labels['subscribed']  = 'Vpisan';
 $labels['messagecount'] = 'Sporočila';
-$labels['create'] = 'Ustvari';
-$labels['createfolder'] = 'Ustvari novo mapo';
-$labels['managefolders'] = 'Uredi mape';
+$labels['create']  = 'Ustvari';
+$labels['createfolder']  = 'Ustvari novo mapo';
+$labels['managefolders']  = 'Uredi mape';
 $labels['specialfolders'] = 'Posebne mape';
 $labels['properties'] = 'Lastnosti';
 $labels['folderproperties'] = 'Lastnosti mape';
@@ -411,22 +491,29 @@ $labels['info'] = 'Podatki';
 $labels['getfoldersize'] = 'Klikni za prikaz velikosti mape';
 $labels['changesubscription'] = 'Klikni za spremembo prijave mape';
 $labels['foldertype'] = 'Tip mape';
-$labels['personalfolder'] = 'Zasebna mapa';
-$labels['otherfolder'] = 'Mapa drugega uporabnika';
-$labels['sharedfolder'] = 'Javna mapa';
+$labels['personalfolder']  = 'Zasebna mapa';
+$labels['otherfolder']  = 'Mapa drugega uporabnika';
+$labels['sharedfolder']  = 'Javna mapa';
+
 $labels['sortby'] = 'Uredi po';
-$labels['sortasc'] = 'Uredi naraščajoče';
+$labels['sortasc']  = 'Uredi naraščajoče';
 $labels['sortdesc'] = 'Uredi padajoče';
 $labels['undo'] = 'Prekliči';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Vtičnik';
 $labels['version'] = 'Različica';
 $labels['source'] = 'Vir';
 $labels['license'] = 'Licenca';
 $labels['support'] = 'Podpora';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angleško';
 $labels['westerneuropean'] = 'Zahodnoevropsko';
@@ -446,3 +533,4 @@ $labels['japanese'] = 'Japonsko';
 $labels['korean'] = 'Korejsko';
 $labels['chinese'] = 'Kitajsko';
 
+?>
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index a360e952f..3fd113b0d 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Prišlo je do napake!';
-$messages['loginfailed'] = 'Prijava ni uspela';
+$messages['errortitle']  = 'Prišlo je do napake!';
+$messages['loginfailed']  = 'Prijava ni uspela';
 $messages['cookiesdisabled'] = 'Vaš spletni brskalnik ne sprejema piškotkov.';
 $messages['sessionerror'] = 'Seja je neveljavna ali je potekla.';
 $messages['storageerror'] = 'Povezava z IMAP strežnikom je spodletela.';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = 'Zahteva je potekla';
 $messages['errorreadonly'] = 'Operacije ni bilo mogoče izvršiti. Mapa je na voljo samo za branje.';
 $messages['errornoperm'] = 'Operacije ni bilo mogoče izvršiti. Dostop zavrnjen.';
 $messages['invalidrequest'] = 'Neveljavna zahteva. Podatki niso bili shranjeni.';
+$messages['invalidhost'] = 'Nepravilno ime strežnika';
 $messages['nomessagesfound'] = 'V poštnem predalu ni sporočil.';
 $messages['loggedout'] = 'Odjava je bila uspešna.';
 $messages['mailboxempty'] = 'Poštni predal je prazen.';
+$messages['refreshing'] = 'Osvežujem...';
 $messages['loading'] = 'Nalaganje...';
 $messages['uploading'] = 'Prenos dokumenta na strežnik...';
 $messages['uploadingmany'] = 'Nalaganje dokumentov..';
@@ -55,11 +60,11 @@ $messages['errormoving'] = 'Sporočila ni bilo mogoče premakniti.';
 $messages['errorcopying'] = 'Sporočila ni bilo mogoče kopirati.';
 $messages['errordeleting'] = 'Sporočila ni bilo mogoče izbrisati.';
 $messages['errormarking'] = 'Sporočila ni bilo mogoče označiti.';
-$messages['deletecontactconfirm'] = 'Ste prepričani, da želite izbrisati označen(e) stik(e)?';
-$messages['deletegroupconfirm'] = 'Ste prepričani, da želite izbrisati izbrano skupino?';
+$messages['deletecontactconfirm']  = 'Ste prepričani, da želite izbrisati označen(e) stik(e)?';
+$messages['deletegroupconfirm']  = 'Ste prepričani, da želite izbrisati izbrano skupino?';
 $messages['deletemessagesconfirm'] = 'Ste prepričani, da želite izbrisati označeno(a) sporočilo(a)?';
-$messages['deletefolderconfirm'] = 'Ste prepričani, da želite to mapo izbrisati?';
-$messages['purgefolderconfirm'] = 'Ste prepričani, da želite izbrisati vsa sporočila v mapi?';
+$messages['deletefolderconfirm']  = 'Ste prepričani, da želite to mapo izbrisati?';
+$messages['purgefolderconfirm']  = 'Ste prepričani, da želite izbrisati vsa sporočila v mapi?';
 $messages['contactdeleting'] = 'Brisanje stika/ov...';
 $messages['groupdeleting'] = 'Brisanje skupine...';
 $messages['folderdeleting'] = 'Brisanje mape...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Prijavljanje mape...';
 $messages['folderunsubscribing'] = 'Odjavljanje mape...';
 $messages['formincomplete'] = 'Obrazec ni v celoti izpolnjen';
 $messages['noemailwarning'] = 'Vnesite veljaven elektronski naslov';
-$messages['nonamewarning'] = 'Vnesite ime';
+$messages['nonamewarning']  = 'Vnesite ime';
 $messages['nopagesizewarning'] = 'Vnesite velikost strani';
 $messages['nosenderwarning'] = 'Vnesite elektronski naslov pošiljatelja';
 $messages['norecipientwarning'] = 'Vnesite vsaj enega prejemnika sporočila';
-$messages['nosubjectwarning'] = 'Polje "Zadeva" je prazno. Želite dodati tekst v to polje?';
+$messages['nosubjectwarning']  = 'Polje "Zadeva" je prazno. Želite dodati tekst v to polje?';
 $messages['nobodywarning'] = 'Želite poslati sporočilo brez vsebine?';
 $messages['notsentwarning'] = 'Sporočilo ni bilo poslano. Želite zavreči to sporočilo?';
 $messages['noldapserver'] = 'Izberite LDAP strežnik, v katerem želite iskati?';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = 'Izberite datoteko, ki jo želite prenesti';
 $messages['addresswriterror'] = 'Izbran imenik ni zapisljiv';
 $messages['contactaddedtogroup'] = 'Stik je bil uspešno dodan v skupino';
 $messages['contactremovedfromgroup'] = 'Stik je bil uspešno izbrisan iz skupine';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Uvažanje poteka...';
-$messages['importerror'] = 'Uvažanje je spodletelo. Naložena datoteka ni veljavna vCard datoteka.';
+$messages['importformaterror'] = 'Uvoz ni uspel! Uvožena datoteka ni pravega formata.';
 $messages['importconfirm'] = '<b>Uspešno uvoženi $inserted stiki, $skipped stikov že obstaja v imeniku</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočeni že obstoječi vnosi $skipped </b>';
 $messages['opnotpermitted'] = 'Operacija ni dovoljena.';
@@ -157,4 +163,7 @@ $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'] = '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'] = 'Opozorilo: Ta spletna stran zahteva Javascript! Za uporabo jo vključite v nastavitvah vašega brskalnika.';
 
+?>
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index da23fdf4e..aa102670c 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sq_AL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Mirëseerdhe te $product';
-$labels['username'] = 'Përdoruesi';
-$labels['password'] = 'Fjalëkalimi';
-$labels['server'] = 'Serveri';
-$labels['login'] = 'Hyr';
-$labels['logout'] = 'Dil';
-$labels['mail'] = 'Mesazhet';
+
+// login page
+$labels['welcome']   = 'Mirëseerdhe te $product';
+$labels['username']  = 'Përdoruesi';
+$labels['password']  = 'Fjalëkalimi';
+$labels['server']    = 'Serveri';
+$labels['login']     = 'Hyr';
+
+// taskbar
+$labels['logout']   = 'Dil';
+$labels['mail']     = 'Mesazhet';
 $labels['settings'] = 'Konfigurimi Personal';
 $labels['addressbook'] = 'Libri i Adresave';
-$labels['inbox'] = 'Ardhjet';
+
+// mailbox names
+$labels['inbox']  = 'Ardhjet';
 $labels['drafts'] = 'Drafte';
-$labels['sent'] = 'Dërguar';
-$labels['trash'] = 'Fshirë';
-$labels['junk'] = 'Reklama';
+$labels['sent']   = 'Dërguar';
+$labels['trash']  = 'Fshirë';
+$labels['junk']   = 'Reklama';
+
+// message listing
 $labels['subject'] = 'Tema';
-$labels['from'] = 'Dërguesi';
-$labels['to'] = 'Marrësi';
-$labels['cc'] = 'Kopje';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Dërguesi';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Marrësi';
+$labels['cc']      = 'Kopje';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Madhësia';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Data';
+$labels['size']    = 'Madhësia';
 $labels['priority'] = 'Përparësia';
 $labels['organization'] = 'Organizata';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Kutitë';
-$labels['folders'] = 'Kutitë';
 $labels['messagesfromto'] = 'Mesazhet $from në $to nga $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mesazhi $nr nga $count';
-$labels['copy'] = 'Kopje';
-$labels['moveto'] = 'ço te...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Kopje';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'ço te...';
 $labels['download'] = 'shkarko';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Emër skedari';
 $labels['filesize'] = 'Madhësi skedari';
+
 $labels['addtoaddressbook'] = 'Shto në librin e adresave';
+
+// weekdays short
 $labels['sun'] = 'Dje';
 $labels['mon'] = 'Hën';
 $labels['tue'] = 'Mar';
@@ -55,125 +80,457 @@ $labels['wed'] = 'Mër';
 $labels['thu'] = 'Enj';
 $labels['fri'] = 'Pre';
 $labels['sat'] = 'Sht';
-$labels['sunday'] = 'e djelë';
-$labels['monday'] = 'e hënë';
-$labels['tuesday'] = 'e martë';
+
+// weekdays long
+$labels['sunday']    = 'e djelë';
+$labels['monday']    = 'e hënë';
+$labels['tuesday']   = 'e martë';
 $labels['wednesday'] = 'e mërkurë';
-$labels['thursday'] = 'e enjte';
-$labels['friday'] = 'e premte';
-$labels['saturday'] = 'e shtunë';
+$labels['thursday']  = 'e enjte';
+$labels['friday']    = 'e premte';
+$labels['saturday']  = 'e shtunë';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'sot';
-$labels['checkmail'] = 'Shiko për mesazhe të reja';
-$labels['compose'] = 'Shkruaj një mesazh';
-$labels['writenewmessage'] = 'Krijo një mesazh të ri';
-$labels['replytomessage'] = 'Ktheji përgjigje mesazhit';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Shiko për mesazhe të reja';
+$labels['compose']          = 'Shkruaj një mesazh';
+$labels['writenewmessage']  = 'Krijo një mesazh të ri';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Ktheji përgjigje mesazhit';
 $labels['replytoallmessage'] = 'Ktheji përgjigje dërguesit dhe të gjithë marrësve';
-$labels['forwardmessage'] = 'Pasoje mesazhin';
-$labels['deletemessage'] = 'Fshije mesazhin';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Pasoje mesazhin';
+$labels['deletemessage']    = 'Fshije mesazhin';
 $labels['movemessagetotrash'] = 'Hidhe mesazhin në kosh';
-$labels['printmessage'] = 'Shtype këtë mesazh';
-$labels['previousmessage'] = 'Shfaq mesazhin e mëparshëm';
-$labels['firstmessage'] = 'Shfaq mesazhin e parë';
-$labels['nextmessage'] = 'Shfaq mesazhin pasardhës';
-$labels['lastmessage'] = 'Shfaq mesazhin e fundit';
-$labels['backtolist'] = 'Kthehu te lista e mesazheve';
-$labels['viewsource'] = 'Shfaq tekstin';
-$labels['markmessages'] = 'Shëno mesazhet';
-$labels['markread'] = 'Si të lexuara';
-$labels['markunread'] = 'Si të palexuara';
+$labels['printmessage']     = 'Shtype këtë mesazh';
+$labels['previousmessage']  = 'Shfaq mesazhin e mëparshëm';
+$labels['firstmessage']     = 'Shfaq mesazhin e parë';
+$labels['nextmessage']      = 'Shfaq mesazhin pasardhës';
+$labels['lastmessage']      = 'Shfaq mesazhin e fundit';
+$labels['backtolist']       = 'Kthehu te lista e mesazheve';
+$labels['viewsource']       = 'Shfaq tekstin';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Shëno mesazhet';
+$labels['markread']         = 'Si të lexuara';
+$labels['markunread']       = 'Si të palexuara';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Zgjidh';
 $labels['all'] = 'Të gjitha';
 $labels['none'] = 'Asnjë';
-$labels['nonesort'] = 'Asnjë';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Palexuar';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Asnjë';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Zvogëlo';
 $labels['empty'] = 'Boshatis';
+
 $labels['quota'] = 'Përdorimi i diskut';
-$labels['unknown'] = 'i panjohur';
-$labels['unlimited'] = 'i pakufizuar';
-$labels['quicksearch'] = 'Kërkim i shpejtë';
-$labels['resetsearch'] = 'Pastro kërkimin';
-$labels['sendmessage'] = 'Dërgoje mesazhin tani';
-$labels['savemessage'] = 'Ruaje si draft';
-$labels['addattachment'] = 'Bashkangjit një skedar';
-$labels['charset'] = 'Bashkësi shkronjash';
-$labels['editortype'] = 'Lloj editori';
-$labels['returnreceipt'] = 'Njoftim marrje';
+$labels['unknown']  = 'i panjohur';
+$labels['unlimited']  = 'i pakufizuar';
+
+$labels['quicksearch']  = 'Kërkim i shpejtë';
+$labels['resetsearch']  = 'Pastro kërkimin';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Dërgoje mesazhin tani';
+$labels['savemessage']    = 'Ruaje si draft';
+$labels['addattachment']  = 'Bashkangjit një skedar';
+$labels['charset']        = 'Bashkësi shkronjash';
+$labels['editortype']     = 'Lloj editori';
+$labels['returnreceipt']  = 'Njoftim marrje';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Kontroll gabimesh';
 $labels['resumeediting'] = 'Vazhdo editimin';
-$labels['revertto'] = 'Ktheje te';
+$labels['revertto']      = 'Ktheje te';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Bashkangjitjet';
 $labels['upload'] = 'Ngarko';
-$labels['close'] = 'Mbyll';
-$labels['low'] = 'I ulët';
-$labels['lowest'] = 'Më i ulëti';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'I lartë';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Mbyll';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'I ulët';
+$labels['lowest']  = 'Më i ulëti';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'I lartë';
 $labels['highest'] = 'Më i larti';
-$labels['nosubject'] = '(pa subjekt)';
+
+$labels['nosubject']  = '(pa subjekt)';
 $labels['showimages'] = 'Shfaq imazhet';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'TEXT';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Shto Cc';
 $labels['addbcc'] = 'Shto Bcc';
 $labels['addreplyto'] = 'Shto Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Dërguesi i këtij mesazhi ka kërkuar që të njoftohet kur ju të lexoni këtë mesazh. Dëshironi ta njoftoni dërguesin?';
 $labels['receiptread'] = 'Njoftim Leximi';
 $labels['yourmessage'] = 'Ky është një njoftim leximi për mesazhin tuaj';
 $labels['receiptnote'] = 'Shënim: Ky njoftim tregon vetëm që mesazhi u shfaq në kompjuterin e marrësit. Nuk ka siguri që marrësi e ka lexuar ose e ka kuptuar përmbajtjen e mesazhit.';
-$labels['name'] = 'Emri që thirret';
-$labels['firstname'] = 'Emri';
-$labels['surname'] = 'Mbiemri';
-$labels['email'] = 'E-Mail';
+
+// address boook
+$labels['name']         = 'Emri që thirret';
+$labels['firstname']    = 'Emri';
+$labels['surname']      = 'Mbiemri';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Shto një kontakt të ri';
 $labels['editcontact'] = 'Ndrysho kontaktin';
-$labels['edit'] = 'Ndrysho';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Ndrysho';
 $labels['cancel'] = 'Anullo';
-$labels['save'] = 'Ruaj';
+$labels['save']   = 'Ruaj';
 $labels['delete'] = 'Fshi';
-$labels['newcontact'] = 'Krijo nje kartë të re kontakti';
-$labels['deletecontact'] = 'Fshi kontaktet e zgjedhura';
-$labels['composeto'] = 'Shkruaj email për';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Krijo nje kartë të re kontakti';
+$labels['deletecontact']  = 'Fshi kontaktet e zgjedhura';
+$labels['composeto']      = 'Shkruaj email për';
 $labels['contactsfromto'] = 'Kontaktet $from në $to nga $count';
-$labels['print'] = 'Shtyp';
-$labels['export'] = 'Eksporto';
-$labels['previouspage'] = 'Shfaq grupin e mëparshëm';
-$labels['firstpage'] = 'Shfaq grupin e parë';
-$labels['nextpage'] = 'Shfaq grupin tjetër';
-$labels['lastpage'] = 'Shfaq grupin e fundit';
+$labels['print']          = 'Shtyp';
+$labels['export']         = 'Eksporto';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Shfaq grupin e mëparshëm';
+$labels['firstpage']      = 'Shfaq grupin e parë';
+$labels['nextpage']       = 'Shfaq grupin tjetër';
+$labels['lastpage']       = 'Shfaq grupin e fundit';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grupet';
 $labels['personaladrbook'] = 'Adresat Personale';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Konfigurimet për';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferencat';
 $labels['userpreferences'] = 'Preferencat e përdoruesit';
 $labels['editpreferences'] = 'Ndrysho preferencat e përdoruesit';
+
 $labels['identities'] = 'Identitetet';
 $labels['manageidentities'] = 'Manaxho identitetet per këtë llogari';
 $labels['newidentity'] = 'Identitet i ri';
+
 $labels['newitem'] = 'Element i ri';
 $labels['edititem'] = 'Ndrysho element';
+
 $labels['preferhtml'] = 'Shfaq HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mesazh HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Data të këndshme';
-$labels['setdefault'] = 'Bëje identitet kryesor';
-$labels['language'] = 'Gjuha';
-$labels['timezone'] = 'Brezi orar';
-$labels['pagesize'] = 'Rreshtat për faqe';
+$labels['setdefault']  = 'Bëje identitet kryesor';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Gjuha';
+$labels['timezone']  = 'Brezi orar';
+$labels['pagesize']  = 'Rreshtat për faqe';
 $labels['signature'] = 'Nënshkrim';
-$labels['dstactive'] = 'Ndryshim ore';
+$labels['dstactive']  = 'Ndryshim ore';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Shkruaj mesazhe HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Nënshkrimi HTML';
 $labels['previewpane'] = 'Shiko si duket';
-$labels['autosavedraft'] = 'Ruaje automatikisht si draft';
-$labels['never'] = 'kurrë';
-$labels['folder'] = 'Kutia';
-$labels['foldername'] = 'Emër kutie';
-$labels['subscribed'] = 'Regjistruar';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Ruaje automatikisht si draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'kurrë';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$labels['whenreplying'] = 'When replying';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Kutia';
+$labels['folders']  = 'Kutitë';
+$labels['foldername']  = 'Emër kutie';
+$labels['subscribed']  = 'Regjistruar';
 $labels['messagecount'] = 'Mesazhe';
-$labels['create'] = 'Krijo';
-$labels['createfolder'] = 'Krijo kuti të re';
-$labels['managefolders'] = 'Sistemo kutitë';
+$labels['create']  = 'Krijo';
+$labels['createfolder']  = 'Krijo kuti të re';
+$labels['managefolders']  = 'Sistemo kutitë';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Rradhit sipas';
-$labels['sortasc'] = 'Rradhitje rritëse';
+$labels['sortasc']  = 'Rradhitje rritëse';
 $labels['sortdesc'] = 'Rradhitje zbritëse';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index feb3c6e74..46e7197e0 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sq_AL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Hyrja dështoi';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Hyrja dështoi';
 $messages['cookiesdisabled'] = 'Shfletuesi juaj nuk i pranon sheqerkat';
 $messages['sessionerror'] = 'Sesioni juaj është i pavlefshëm ose i ka kaluar afati';
 $messages['storageerror'] = 'Lidhja me serverin IMAP dështoi';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nuk ka mesazhe në këtë kuti postare';
 $messages['loggedout'] = 'Sesionin e mbyllët me sukses. Mirupafshim!';
 $messages['mailboxempty'] = 'Kutia postare është bosh';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Po ngarkohet...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Po ngarkohen të dhëna...';
 $messages['checkingmail'] = 'Po shoh për mesazhe të reja...';
 $messages['sendingmessage'] = 'Po dërgoj mesazhin...';
@@ -32,34 +46,54 @@ $messages['messagesaved'] = 'Mesazhi u ruajt te kutia Drafte';
 $messages['successfullysaved'] = 'U ruajt me sukses';
 $messages['addedsuccessfully'] = 'Kontakti u shtua me sukses në librin e adresave';
 $messages['contactexists'] = 'Këtë adresë e-mail e ka një kontakt tjetër';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Për të mbrojtur fshehtësinë tuaj, imazhet e largëta të këtij mesazhi janë bllokuar.';
 $messages['encryptedmessage'] = 'Ky është një mesazh i koduar dhe nuk mund te shfaqet. Më vjen keq!';
 $messages['nocontactsfound'] = 'Nuk ka kontakte';
 $messages['contactnotfound'] = 'Kontakti që kërkoni nuk gjendet';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Dërgimi i mesazhit dështoi';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Pati nje problem gjatë ruajtjes';
 $messages['errormoving'] = 'Nuk e lëviza dot mesazhin';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Nuk e fshiva dot mesazhin';
-$messages['deletecontactconfirm'] = 'Me të vërtetë doni ti fshini kontaktet e zgjedhura?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Me të vërtetë doni ti fshini kontaktet e zgjedhura?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Me të vërtetë doni ti fshini mesazhet e zgjedhura?';
-$messages['deletefolderconfirm'] = 'Me të vërtetë doni ta fshini këtë kuti?';
-$messages['purgefolderconfirm'] = 'Me të vërtetë doni ti fshini të gjitha mesazhet në këtë kuti?';
+$messages['deletefolderconfirm']  = 'Me të vërtetë doni ta fshini këtë kuti?';
+$messages['purgefolderconfirm']  = 'Me të vërtetë doni ti fshini të gjitha mesazhet në këtë kuti?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Formulari nuk ishte i gjithi i plotësuar';
 $messages['noemailwarning'] = 'Ju lutem jepni një adresë email të rregullt';
-$messages['nonamewarning'] = 'Ju lutem jepni një emër';
+$messages['nonamewarning']  = 'Ju lutem jepni një emër';
 $messages['nopagesizewarning'] = 'Ju lutem jepni nje madhësi për faqen';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Ju lutem shënoni të paktën një marrës';
-$messages['nosubjectwarning'] = 'Fusha e temës është bosh. Dëshironi të shënoni një temë tani?';
+$messages['nosubjectwarning']  = 'Fusha e temës është bosh. Dëshironi të shënoni një temë tani?';
 $messages['nobodywarning'] = 'Ta dërgoj mesazhin pa tekst?';
 $messages['notsentwarning'] = 'Mesazhi nuk u dërgua. Doni ta hidhni poshtë mesazhin?';
 $messages['noldapserver'] = 'Ju lutem jepni një server ldap për të kërkuar';
 $messages['nosearchname'] = 'Ju lutem jepni një adresë email ose një emër kontakti';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'U gjetën $nr mesazhe';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Kërkimi nuk gjeti gjë';
 $messages['searching'] = 'Po kërkoj...';
 $messages['checking'] = 'Po kontrolloj...';
 $messages['nospellerrors'] = 'Nuk u gjetën gabime';
 $messages['folderdeleted'] = 'Kutia u fshi me sukses';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'U fshi me sukses';
 $messages['converting'] = 'Po i heq formatimin mesazhit...';
 $messages['messageopenerror'] = 'Nuk marr dot mesazhe nga serveri';
@@ -70,7 +104,66 @@ $messages['copyerror'] = 'Nuk munda të kopjoj adresat';
 $messages['sourceisreadonly'] = 'Ky burim adrese është vetëm i lexueshëm';
 $messages['errorsavingcontact'] = 'Nuk e ruajta dot adresën e kontaktit';
 $messages['movingmessage'] = 'Po lëviz mesazhin...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'U dërgua me sukses një njoftim leximi';
 $messages['errorsendingreceipt'] = 'Nuk mund të dërgohet njoftimi';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Ju nuk mund ta fshini këtë identitet sepse nuk ju ka mbetur tjetër.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index fb89ca200..1461606eb 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -2,57 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: gpredrag <gavrilovic@gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добродошли на $product';
-$labels['username'] = 'Корисничко име';
-$labels['password'] = 'Лозинка';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Пријава';
-$labels['logout'] = 'Одјава';
-$labels['mail'] = 'Сандуче';
+
+// login page
+$labels['welcome']   = 'Добродошли на $product';
+$labels['username']  = 'Корисничко име';
+$labels['password']  = 'Лозинка';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Пријава';
+
+// taskbar
+$labels['logout']   = 'Одјава';
+$labels['mail']     = 'Сандуче';
 $labels['settings'] = 'Подешавања';
 $labels['addressbook'] = 'Именик';
-$labels['inbox'] = 'Примљене';
+
+// mailbox names
+$labels['inbox']  = 'Примљене';
 $labels['drafts'] = 'U pripremi';
-$labels['sent'] = 'Послате';
-$labels['trash'] = 'Канта';
-$labels['junk'] = 'Смеће';
+$labels['sent']   = 'Послате';
+$labels['trash']  = 'Канта';
+$labels['junk']   = 'Смеће';
+
+// message listing
 $labels['subject'] = 'Наслов';
-$labels['from'] = 'Од';
-$labels['to'] = 'За';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Од';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'За';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Одговори';
-$labels['date'] = 'Датум';
-$labels['size'] = 'Величина';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Датум';
+$labels['size']    = 'Величина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
 $labels['readstatus'] = 'Статус поруке';
 $labels['listoptions'] = 'Излистај опције...';
+
 $labels['mailboxlist'] = 'Фасцикле';
-$labels['folders'] = 'Фасцикле';
 $labels['messagesfromto'] = 'Поруке $from до $to од укупно $count';
 $labels['threadsfromto'] = 'Страница $from до $to од $count';
 $labels['messagenrof'] = 'Порука број $nr од $count';
 $labels['fromtoshort'] = '$from – $to од $count';
-$labels['copy'] = 'Копирај';
-$labels['move'] = 'Пребаци';
-$labels['moveto'] = 'Пребаци у...';
+
+$labels['copy']     = 'Копирај';
+$labels['move']     = 'Пребаци';
+$labels['moveto']   = 'Пребаци у...';
 $labels['download'] = 'Преузми (скидање)';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Име датотекеe';
 $labels['filesize'] = 'Величина датотеке';
+
 $labels['addtoaddressbook'] = 'Додај у именик';
+
+// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Уто';
@@ -60,259 +80,323 @@ $labels['wed'] = 'Сре';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Суб';
-$labels['sunday'] = 'Недеља';
-$labels['monday'] = 'Понедељак';
-$labels['tuesday'] = 'Уторак';
+
+// weekdays long
+$labels['sunday']    = 'Недеља';
+$labels['monday']    = 'Понедељак';
+$labels['tuesday']   = 'Уторак';
 $labels['wednesday'] = 'Среда';
-$labels['thursday'] = 'Четвртак';
-$labels['friday'] = 'Петак';
-$labels['saturday'] = 'Субота';
-$labels['jan'] = 'Јан';
-$labels['feb'] = 'Феб';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Мај';
-$labels['longmay'] = 'Мај';
-$labels['jun'] = 'Јун';
-$labels['jul'] = 'Јул';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сеп';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Нов';
-$labels['dec'] = 'Дец';
-$labels['longjan'] = 'Јануар';
-$labels['longfeb'] = 'Фебруар';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Април';
-$labels['longjun'] = 'Јуни';
-$labels['longjul'] = 'Јули';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Септембар';
-$labels['longoct'] = 'Октобар';
-$labels['longnov'] = 'Новембар';
-$labels['longdec'] = 'Децембар';
+$labels['thursday']  = 'Четвртак';
+$labels['friday']    = 'Петак';
+$labels['saturday']  = 'Субота';
+
+// months short
+$labels['jan']	= 'Јан';
+$labels['feb']	= 'Феб';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Мај';
+$labels['jun']	= 'Јун';
+$labels['jul'] 	= 'Јул';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сеп';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Нов';
+$labels['dec']	= 'Дец';
+
+// months long
+$labels['longjan']	= 'Јануар';
+$labels['longfeb']	= 'Фебруар';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Април';
+$labels['longmay']	= 'Мај';
+$labels['longjun']	= 'Јуни';
+$labels['longjul']	= 'Јули';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Септембар';
+$labels['longoct']	= 'Октобар';
+$labels['longnov']	= 'Новембар';
+$labels['longdec']	= 'Децембар';
+
 $labels['today'] = 'Данас';
-$labels['refresh'] = 'Освежи';
-$labels['checkmail'] = 'Провера нових порука';
-$labels['compose'] = 'Нова порука';
-$labels['writenewmessage'] = 'Нова порука';
-$labels['reply'] = 'Одговори';
-$labels['replytomessage'] = 'Одговори на поруку';
+
+// toolbar buttons
+$labels['refresh']          = 'Освежи';
+$labels['checkmail']        = 'Провера нових порука';
+$labels['compose']          = 'Нова порука';
+$labels['writenewmessage']  = 'Нова порука';
+$labels['reply']            = 'Одговори';
+$labels['replytomessage']   = 'Одговори на поруку';
 $labels['replytoallmessage'] = 'Одговори пошиљаоцу и свим примаоцима';
-$labels['replyall'] = 'Одговори свима';
-$labels['replylist'] = 'Листа за одговоре';
-$labels['forward'] = 'Проследи';
+$labels['replyall']         = 'Одговори свима';
+$labels['replylist']        = 'Листа за одговоре';
+$labels['forward']          = 'Проследи';
+$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Проследи као прилог';
-$labels['forwardmessage'] = 'Проследи поруку';
-$labels['deletemessage'] = 'Избриши поруку';
+$labels['forwardmessage']   = 'Проследи поруку';
+$labels['deletemessage']    = 'Избриши поруку';
 $labels['movemessagetotrash'] = 'Пребаци поруку у канту';
-$labels['printmessage'] = 'Одштампај поруку';
-$labels['previousmessage'] = 'Прикажи претходну поруку';
-$labels['firstmessage'] = 'Прикажи прву поруку';
-$labels['nextmessage'] = 'Прикажи следећу поруку';
-$labels['lastmessage'] = 'Прикажи последњу поруку';
-$labels['backtolist'] = 'Повратак на листу порука';
-$labels['viewsource'] = 'Прикажи поруку у изворном облику';
-$labels['mark'] = 'Означи';
-$labels['markmessages'] = 'Обележи поруке';
-$labels['markread'] = 'Као прочитано';
-$labels['markunread'] = 'Као непрочитано';
-$labels['markflagged'] = 'Као означено';
-$labels['markunflagged'] = 'Као неозначено';
-$labels['moreactions'] = 'Остале радње...';
-$labels['more'] = 'Више';
-$labels['back'] = 'Назад';
-$labels['options'] = 'Опције';
+$labels['printmessage']     = 'Одштампај поруку';
+$labels['previousmessage']  = 'Прикажи претходну поруку';
+$labels['firstmessage']     = 'Прикажи прву поруку';
+$labels['nextmessage']      = 'Прикажи следећу поруку';
+$labels['lastmessage']      = 'Прикажи последњу поруку';
+$labels['backtolist']       = 'Повратак на листу порука';
+$labels['viewsource']       = 'Прикажи поруку у изворном облику';
+$labels['mark']             = 'Означи';
+$labels['markmessages']     = 'Обележи поруке';
+$labels['markread']         = 'Као прочитано';
+$labels['markunread']       = 'Као непрочитано';
+$labels['markflagged']      = 'Као означено';
+$labels['markunflagged']    = 'Као неозначено';
+$labels['moreactions']      = 'Остале радње...';
+$labels['more']             = 'Више';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Опције';
+
 $labels['select'] = 'Одабери';
 $labels['all'] = 'Све';
 $labels['none'] = 'Ништа';
-$labels['nonesort'] = 'Ништа';
 $labels['currpage'] = 'Тренутна страница';
 $labels['unread'] = 'Непрочитане';
 $labels['flagged'] = 'Означено';
 $labels['unanswered'] = 'Неодговорено';
 $labels['deleted'] = 'Обрисано';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Уведи';
 $labels['filter'] = 'Филтер';
 $labels['list'] = 'Листа';
 $labels['threads'] = 'Нити';
 $labels['expand-all'] = 'Прошири све';
+$labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'Сажми све';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
 $labels['expand_only_unread'] = 'само са непрочитаним порукама';
 $labels['fromto'] = 'Од/За';
 $labels['flag'] = 'Застава';
 $labels['attachment'] = 'Прилог';
+$labels['nonesort'] = 'Ништа';
 $labels['sentdate'] = 'Датум послато';
 $labels['arrival'] = 'Датум стигло';
 $labels['asc'] = 'растући';
 $labels['desc'] = 'опадајући';
 $labels['listcolumns'] = 'Лист колона';
 $labels['listsorting'] = 'Сортирање колонe';
+$labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'Лист режим приказивања';
+
 $labels['folderactions'] = 'Поставке фасцикле';
 $labels['compact'] = 'Компакција';
 $labels['empty'] = 'Испразни';
+
 $labels['quota'] = 'Квота';
-$labels['unknown'] = 'непозната';
-$labels['unlimited'] = 'бесконачна';
-$labels['quicksearch'] = 'Брза претрага';
-$labels['resetsearch'] = 'Прикажи све поруке';
-$labels['msgtext'] = 'Цела порука';
+$labels['unknown']  = 'непозната';
+$labels['unlimited']  = 'бесконачна';
+
+$labels['quicksearch']  = 'Брза претрага';
+$labels['resetsearch']  = 'Прикажи све поруке';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Цела порука';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Отвори у новом прозору';
 $labels['emlsave'] = 'Довнлоад (.eml)';
-$labels['editasnew'] = 'Модификуј као ново';
-$labels['sendmessage'] = 'Пошаљи поруку';
-$labels['savemessage'] = 'Сачувај у Снимљене';
-$labels['addattachment'] = 'Приложи датотеку';
-$labels['charset'] = 'Скуп карактера';
-$labels['editortype'] = 'Врста едитора';
-$labels['returnreceipt'] = 'Потврда о приспећу';
-$labels['dsn'] = 'Обавештење о статусу слања поруке';
+
+// message compose
+$labels['editasnew']      = 'Модификуј као ново';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Пошаљи поруку';
+$labels['savemessage']    = 'Сачувај у Снимљене';
+$labels['addattachment']  = 'Приложи датотеку';
+$labels['charset']        = 'Скуп карактера';
+$labels['editortype']     = 'Врста едитора';
+$labels['returnreceipt']  = 'Потврда о приспећу';
+$labels['dsn']            = 'Обавештење о статусу слања поруке';
 $labels['mailreplyintro'] = 'Дана $date, $sender је написао:';
 $labels['originalmessage'] = 'Оригинална порука';
-$labels['editidents'] = 'Модификуј псеудониме';
-$labels['spellcheck'] = 'Провера правописа';
+
+$labels['editidents']    = 'Модификуј псеудониме';
+$labels['spellcheck']    = 'Провера правописа';
 $labels['checkspelling'] = 'Провера правописа';
 $labels['resumeediting'] = 'Повратак у режим писања';
-$labels['revertto'] = 'Врати се на';
+$labels['revertto']      = 'Врати се на';
+
 $labels['attach'] = 'Приложи';
 $labels['attachments'] = 'Прилози';
 $labels['upload'] = 'Додај';
 $labels['uploadprogress'] = '$percent ($current од $total)';
-$labels['close'] = 'Затвори';
-$labels['messageoptions'] = 'Опције поруке';
-$labels['low'] = 'Низак';
-$labels['lowest'] = 'Најнижи';
-$labels['normal'] = 'Средњи';
-$labels['high'] = 'Висок';
+$labels['close']  = 'Затвори';
+$labels['messageoptions']  = 'Опције поруке';
+
+$labels['low']     = 'Низак';
+$labels['lowest']  = 'Најнижи';
+$labels['normal']  = 'Средњи';
+$labels['high']    = 'Висок';
 $labels['highest'] = 'Највиши';
-$labels['nosubject'] = '(без наслова)';
+
+$labels['nosubject']  = '(без наслова)';
 $labels['showimages'] = 'Прикажи слике';
 $labels['alwaysshow'] = 'Увек покажи слике од $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Обичан текст';
 $labels['savesentmessagein'] = 'Послате поруке сачувај у';
 $labels['dontsave'] = 'Не сачувај';
 $labels['maxuploadsize'] = 'Максимална величина податка је $size';
+
 $labels['addcc'] = 'Додај Cc';
 $labels['addbcc'] = 'Додај Bcc';
 $labels['addreplyto'] = 'Додај Одговор-за';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $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'] = 'Вебсајт';
+
+// address boook
+$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'] = 'ИМ';
 $labels['notes'] = 'Белешке';
-$labels['male'] = 'мушко';
+$labels['male']   = 'мушко';
 $labels['female'] = 'женско';
 $labels['manager'] = 'Менаџер';
 $labels['assistant'] = 'Асистент';
-$labels['typeassistant'] = 'Асистент';
 $labels['spouse'] = 'Супружник';
 $labels['allfields'] = 'Сва поља';
 $labels['search'] = 'Тражи';
 $labels['advsearch'] = 'Напредна претрага';
 $labels['advanced'] = 'Напредно';
 $labels['other'] = 'Остало';
-$labels['typeother'] = 'Остало';
-$labels['typehome'] = 'Кућа';
-$labels['typework'] = 'Посао';
-$labels['typemobile'] = 'Мобилни Телефон';
-$labels['typemain'] = 'Главна';
-$labels['typehomefax'] = 'Кућни факс';
-$labels['typeworkfax'] = 'Пословни факс';
-$labels['typecar'] = 'Ауто';
-$labels['typepager'] = 'Пејџер';
-$labels['typevideo'] = 'Видео';
-$labels['typehomepage'] = 'Почетна страница';
+
+$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['addcontact'] = 'Додај нови контакт';
 $labels['editcontact'] = 'Измени контакт';
 $labels['contacts'] = 'Конакти';
 $labels['contactproperties'] = 'Својства контакта';
 $labels['personalinfo'] = 'Личне информације';
-$labels['edit'] = 'Измени';
+
+$labels['edit']   = 'Измени';
 $labels['cancel'] = 'Откажи';
-$labels['save'] = 'Сачувај';
+$labels['save']   = 'Сачувај';
 $labels['delete'] = 'Обриши';
 $labels['rename'] = 'Преименуј';
 $labels['addphoto'] = 'Додај';
 $labels['replacephoto'] = 'Измени';
 $labels['uploadphoto'] = 'Постави фотографију';
-$labels['newcontact'] = 'Додај нови контакт';
-$labels['deletecontact'] = 'Обриши одабране контакте';
-$labels['composeto'] = 'Напиши поруку...';
+
+$labels['newcontact']     = 'Додај нови контакт';
+$labels['deletecontact']  = 'Обриши одабране контакте';
+$labels['composeto']      = 'Напиши поруку...';
 $labels['contactsfromto'] = 'Контакти $from до $to од укупно $count';
-$labels['print'] = 'Штампај';
-$labels['export'] = 'Извези';
-$labels['exportvcards'] = 'Извези конакте у vCard формату';
+$labels['print']          = 'Штампај';
+$labels['export']         = 'Извези';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Извези конакте у vCard формату';
 $labels['newcontactgroup'] = 'Креирај нову контакт групу';
-$labels['grouprename'] = 'Преименуј групу';
-$labels['groupdelete'] = 'Обриши групу';
+$labels['grouprename']    = 'Преименуј групу';
+$labels['groupdelete']    = 'Обриши групу';
 $labels['groupremoveselected'] = 'Избриши изабране контакте из групе';
-$labels['previouspage'] = 'Прикажи претходну страну';
-$labels['firstpage'] = 'Прикажи први скуп';
-$labels['nextpage'] = 'Прикажи следећу страну';
-$labels['lastpage'] = 'Прикажи последњи скуп';
+
+$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['importtarget'] = 'Додај нове контакте у адресар';
 $labels['importreplace'] = 'Измени цели адресар';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Готово';
+
+// settings
 $labels['settingsfor'] = 'Подешавања за';
 $labels['about'] = 'Инфо';
 $labels['preferences'] = 'Подешавања';
 $labels['userpreferences'] = 'Општа подешавања';
 $labels['editpreferences'] = 'Измена општих подешавања';
+
 $labels['identities'] = 'Идентитети';
 $labels['manageidentities'] = 'Подеси идентитете за овај налог';
 $labels['newidentity'] = 'Додај идентитет';
+
 $labels['newitem'] = 'Нова ставка';
 $labels['edititem'] = 'Измена ставке';
+
 $labels['preferhtml'] = 'Предност дај ХТМЛ формату';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ХТМЛ формат поруке';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Формат датума';
 $labels['timeformat'] = 'Формат времена';
 $labels['prettydate'] = 'Форматирани датум';
-$labels['setdefault'] = 'Подеси подразумевано';
-$labels['autodetect'] = 'Аутоматски';
-$labels['language'] = 'Језик';
-$labels['timezone'] = 'Временска зона';
-$labels['pagesize'] = 'Редова по страни';
+$labels['setdefault']  = 'Подеси подразумевано';
+$labels['autodetect']  = 'Аутоматски';
+$labels['language']  = 'Језик';
+$labels['timezone']  = 'Временска зона';
+$labels['pagesize']  = 'Редова по страни';
 $labels['signature'] = 'Потпис';
-$labels['dstactive'] = 'Летње померање времена';
+$labels['dstactive']  = 'Летње померање времена';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Састави HTML поруке';
 $labels['htmlonreply'] = 'само при одговору на HTML поруку';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML потпис';
 $labels['previewpane'] = 'Прикажи панел за преглед';
 $labels['skin'] = 'Интерфејс';
@@ -321,21 +405,33 @@ $labels['logoutcompact'] = 'Компактно сандуче при логов�
 $labels['uisettings'] = 'Кориснички интерфејс';
 $labels['serversettings'] = 'Поставке сервера';
 $labels['mailboxview'] = 'Преглед сандучета';
+$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'питај ме';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'игнорисати';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Не приказуј избрисане поруке';
 $labels['deletealways'] = 'Ако слање поруке у отпад не успе, обришите их';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'увек';
 $labels['showinlineimages'] = 'Покажи приложене слике испод поруке';
-$labels['autosavedraft'] = 'Аутоматски чувај у Снимљене';
-$labels['never'] = 'никад';
-$labels['immediately'] = 'одмах';
+$labels['autosavedraft']  = 'Аутоматски чувај у Снимљене';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'никад';
+$labels['immediately']  = 'одмах';
 $labels['messagesdisplaying'] = 'прикажи поруке';
 $labels['messagescomposition'] = 'састави поруке';
 $labels['mimeparamfolding'] = 'имена прилога';
 $labels['2231folding'] = 'Full RFC 2231 (тхундербирд )';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (други)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Напредне опције';
 $labels['focusonnewmessage'] = 'Фокусирати прозор претраживача на новој поруци';
 $labels['checkallfolders'] = 'Проверите све фасцикле за нове поруке';
@@ -348,6 +444,7 @@ $labels['maintenance'] = 'Поправке';
 $labels['newmessage'] = 'Нова порука';
 $labels['signatureoptions'] = 'Опције потписа';
 $labels['whenreplying'] = 'При одговору';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'Почни нову поруку преко оригинала';
 $labels['replybottomposting'] = 'Почни нову поруку испод оригинала';
 $labels['replyremovesignature'] = 'При одговору одстрани оригинални потпис из поруке';
@@ -358,25 +455,33 @@ $labels['replysignaturepos'] = 'При одговору или прослеђи�
 $labels['belowquote'] = 'испод квоте';
 $labels['abovequote'] = 'изнад квоте';
 $labels['insertsignature'] = 'Убаци потпис';
-$labels['previewpanemarkread'] = 'Прегледану поруку означи као прочитану';
-$labels['afternseconds'] = 'након $n секунди';
+$labels['previewpanemarkread']  = 'Прегледану поруку означи као прочитану';
+$labels['afternseconds']  = 'након $n секунди';
 $labels['reqmdn'] = 'Увек затражи повратну скрипту';
 $labels['reqdsn'] = 'Увек затражи обавештење о статусу слања поруке';
 $labels['replysamefolder'] = 'Сачувај одговоре у фасциклу поруке на коју се одговара';
-$labels['defaultaddressbook'] = 'Додајте нове контакте у изабрани Адресар';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
 $labels['listnamedisplay'] = 'Листи контакате као';
 $labels['spellcheckbeforesend'] = 'Проверите правопис пре слања поруке';
 $labels['spellcheckoptions'] = 'Опције  Провере  правописа';
 $labels['spellcheckignoresyms'] = 'игнориши  речи са симболима';
 $labels['spellcheckignorenums'] = 'игнориши  речи са бројевима';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'Додај у речник';
-$labels['folder'] = 'Фасцикла';
-$labels['foldername'] = 'Име фасцикле';
-$labels['subscribed'] = 'Потписана';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Фасцикла';
+$labels['folders']  = 'Фасцикле';
+$labels['foldername']  = 'Име фасцикле';
+$labels['subscribed']  = 'Потписана';
 $labels['messagecount'] = 'Поруке';
-$labels['create'] = 'Креирај';
-$labels['createfolder'] = 'Креирај нову фасциклу';
-$labels['managefolders'] = 'Подеси фасциклу';
+$labels['create']  = 'Креирај';
+$labels['createfolder']  = 'Креирај нову фасциклу';
+$labels['managefolders']  = 'Подеси фасциклу';
 $labels['specialfolders'] = 'Посебне фасцикле';
 $labels['properties'] = 'Својства';
 $labels['folderproperties'] = 'Својства фасцикле';
@@ -386,22 +491,29 @@ $labels['info'] = 'Информација';
 $labels['getfoldersize'] = 'Кликните за приказ величине фасцикле';
 $labels['changesubscription'] = 'Кликните да бисте променили опис';
 $labels['foldertype'] = 'типа фасцикле';
-$labels['personalfolder'] = 'Приватна фасцикла';
-$labels['otherfolder'] = 'Фасцикла Других Корисникa';
-$labels['sharedfolder'] = 'Јавна фасцикла';
+$labels['personalfolder']  = 'Приватна фасцикла';
+$labels['otherfolder']  = 'Фасцикла Других Корисникa';
+$labels['sharedfolder']  = 'Јавна фасцикла';
+
 $labels['sortby'] = 'Сортирај по';
-$labels['sortasc'] = 'Сортирај растуће';
+$labels['sortasc']  = 'Сортирај растуће';
 $labels['sortdesc'] = 'Сортирај опадајуће';
 $labels['undo'] = 'Унатраг';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Додаци';
 $labels['version'] = 'Верзија';
 $labels['source'] = 'Извор';
 $labels['license'] = 'Лиценца';
 $labels['support'] = 'подршка';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+
+// character sets
 $labels['unicode'] = 'Универзални код';
 $labels['english'] = 'Енглески';
 $labels['westerneuropean'] = 'Западна Европа';
@@ -421,3 +533,4 @@ $labels['japanese'] = 'Јапански';
 $labels['korean'] = 'Кореански';
 $labels['chinese'] = 'Кинески';
 
+?>
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 02669c611..7ffbbd34a 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Данило Шеган                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Дошло је до грешке!';
-$messages['loginfailed'] = 'Неуспешно пријављивање';
+$messages['errortitle']  = 'Дошло је до грешке!';
+$messages['loginfailed']  = 'Неуспешно пријављивање';
 $messages['cookiesdisabled'] = 'Ваш интернет прегледач не подржава колачиће';
 $messages['sessionerror'] = 'Сесија није валидна или је истекла';
 $messages['storageerror'] = 'Неуспешна конекција на IMAP сервер';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Грешка при премештању порук�
 $messages['errorcopying'] = 'Копирање поруке није било успешно';
 $messages['errordeleting'] = 'Грешка при брисању поруке';
 $messages['errormarking'] = 'Маркирање поруке неуспешно';
-$messages['deletecontactconfirm'] = 'Да ли стварно желите да обришете изабране контакте?';
-$messages['deletegroupconfirm'] = 'Да ли заиста желите да обришете изабрану групу?';
+$messages['deletecontactconfirm']  = 'Да ли стварно желите да обришете изабране контакте?';
+$messages['deletegroupconfirm']  = 'Да ли заиста желите да обришете изабрану групу?';
 $messages['deletemessagesconfirm'] = 'Да ли стварно желите да обришете изабране поруке?';
-$messages['deletefolderconfirm'] = 'Да ли заиста желите да обришете изабрану фасциклу?';
-$messages['purgefolderconfirm'] = 'Да ли заиста желите да обришете све поруке у фасцикли?';
+$messages['deletefolderconfirm']  = 'Да ли заиста желите да обришете изабрану фасциклу?';
+$messages['purgefolderconfirm']  = 'Да ли заиста желите да обришете све поруке у фасцикли?';
 $messages['contactdeleting'] = 'Брише контакте...';
 $messages['groupdeleting'] = 'Брише групу...';
 $messages['folderdeleting'] = 'Брисање фасцикле...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'претплаћивање фасцикле...
 $messages['folderunsubscribing'] = 'одјављивање претплате на фасциклу...';
 $messages['formincomplete'] = 'Формулар није у целости попуњен';
 $messages['noemailwarning'] = 'Унесите валидну е-мејл адресу';
-$messages['nonamewarning'] = 'Унесите име';
+$messages['nonamewarning']  = 'Унесите име';
 $messages['nopagesizewarning'] = 'Унесите величину странице';
 $messages['nosenderwarning'] = 'Унесите имејл адресу пошиљаоца';
 $messages['norecipientwarning'] = 'Унесите примаоца/примаоце (За)';
-$messages['nosubjectwarning'] = 'Поље \'Наслов\' је празно. Желите ли да унесете наслов?';
+$messages['nosubjectwarning']  = 'Поље \'Наслов\' је празно. Желите ли да унесете наслов?';
 $messages['nobodywarning'] = 'Да ли желите да пошаљете поруку без текста?';
 $messages['notsentwarning'] = 'Порука није послата. Да ли желите да одбаците ову поруку?';
 $messages['noldapserver'] = 'Унесите LDAP сервер за претрагу';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'Део са поруком је превелик �
 $messages['attachmentvalidationerror'] = 'УПОЗОРЕЊЕ! Овај прилог је сумњив зато што се његов тип не поклапа са типом објављеним у поруци. Уколико немате поверења у пошиљаоца, не отварајте је у прегледачу зато што може садржати злонамерни садржај.<br/><br/><em>Очекивао: $expected; нашао: $detected</em>';
 $messages['noscriptwarning'] = 'Упозорење: ова поштанска услуга захтева Јаваскрипт! Да бисте је користили, укључите Јаваскрипт у подешавањима вашег прегледача.';
 
+?>
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 68e6894bc..5d10334b3 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Välkommen till $product';
-$labels['username'] = 'Användarnamn';
-$labels['password'] = 'Lösenord';
-$labels['server'] = 'Server';
-$labels['login'] = 'Logga in';
-$labels['logout'] = 'Logga ut';
-$labels['mail'] = 'Meddelanden';
+
+// login page
+$labels['welcome']   = 'Välkommen till $product';
+$labels['username']  = 'Användarnamn';
+$labels['password']  = 'Lösenord';
+$labels['server']    = 'Server';
+$labels['login']     = 'Logga in';
+
+// taskbar
+$labels['logout']   = 'Logga ut';
+$labels['mail']     = 'Meddelanden';
 $labels['settings'] = 'Inställningar';
 $labels['addressbook'] = 'Adressbok';
-$labels['inbox'] = 'Inkorg';
+
+// mailbox names
+$labels['inbox']  = 'Inkorg';
 $labels['drafts'] = 'Utkast';
-$labels['sent'] = 'Skickat';
-$labels['trash'] = 'Papperskorg';
-$labels['junk'] = 'Skräp';
+$labels['sent']   = 'Skickat';
+$labels['trash']  = 'Papperskorg';
+$labels['junk']   = 'Skräp';
+
+// message listing
 $labels['subject'] = 'Ämne';
-$labels['from'] = 'Avsändare';
-$labels['to'] = 'Mottagare';
-$labels['cc'] = 'Kopia';
-$labels['bcc'] = 'Dold kopia';
+$labels['from']    = 'Avsändare';
+$labels['sender']  = 'Avsändare';
+$labels['to']      = 'Mottagare';
+$labels['cc']      = 'Kopia';
+$labels['bcc']     = 'Dold kopia';
 $labels['replyto'] = 'Svar till';
 $labels['followupto'] = 'Uppföljning till';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Storlek';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Storlek';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Lässtatus';
 $labels['listoptions'] = 'Listalternativ...';
+
 $labels['mailboxlist'] = 'Kataloger';
-$labels['folders'] = 'Kataloger';
 $labels['messagesfromto'] = 'Meddelande $from till $to av $count';
 $labels['threadsfromto'] = 'Tråd $from till $to av $count';
 $labels['messagenrof'] = 'Meddelande $nr av $count';
 $labels['fromtoshort'] = '$from – $to av $count';
-$labels['copy'] = 'Kopiera';
-$labels['move'] = 'Flytta';
-$labels['moveto'] = 'Flytta till:';
+
+$labels['copy']     = 'Kopiera';
+$labels['move']     = 'Flytta';
+$labels['moveto']   = 'Flytta till:';
 $labels['download'] = 'Ladda ner';
 $labels['showattachment'] = 'Visa';
 $labels['showanyway'] = 'Visa det ändå';
+
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorlek';
+
 $labels['addtoaddressbook'] = 'Lägg till i adressbok';
+
+// weekdays short
 $labels['sun'] = 'sön';
 $labels['mon'] = 'mån';
 $labels['tue'] = 'tis';
@@ -63,74 +80,83 @@ $labels['wed'] = 'ons';
 $labels['thu'] = 'tor';
 $labels['fri'] = 'fre';
 $labels['sat'] = 'lör';
-$labels['sunday'] = 'söndag';
-$labels['monday'] = 'måndag';
-$labels['tuesday'] = 'tisdag';
+
+// weekdays long
+$labels['sunday']    = 'söndag';
+$labels['monday']    = 'måndag';
+$labels['tuesday']   = 'tisdag';
 $labels['wednesday'] = 'onsdag';
-$labels['thursday'] = 'torsdag';
-$labels['friday'] = 'fredag';
-$labels['saturday'] = 'lördag';
-$labels['jan'] = 'jan';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'apr';
-$labels['may'] = 'maj';
-$labels['longmay'] = 'maj';
-$labels['jun'] = 'jun';
-$labels['jul'] = 'jul';
-$labels['aug'] = 'aug';
-$labels['sep'] = 'sep';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'dec';
-$labels['longjan'] = 'januari';
-$labels['longfeb'] = 'februari';
-$labels['longmar'] = 'mars';
-$labels['longapr'] = 'april';
-$labels['longjun'] = 'juni';
-$labels['longjul'] = 'juli';
-$labels['longaug'] = 'augusti';
-$labels['longsep'] = 'september';
-$labels['longoct'] = 'oktober';
-$labels['longnov'] = 'november';
-$labels['longdec'] = 'december';
+$labels['thursday']  = 'torsdag';
+$labels['friday']    = 'fredag';
+$labels['saturday']  = 'lördag';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'apr';
+$labels['may']	= 'maj';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dec';
+
+// months long
+$labels['longjan']	= 'januari';
+$labels['longfeb']	= 'februari';
+$labels['longmar']	= 'mars';
+$labels['longapr']	= 'april';
+$labels['longmay']	= 'maj';
+$labels['longjun']	= 'juni';
+$labels['longjul']	= 'juli';
+$labels['longaug']	= 'augusti';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'november';
+$labels['longdec']	= 'december';
+
 $labels['today'] = 'idag';
-$labels['refresh'] = 'Uppdatera';
-$labels['checkmail'] = 'Hämta nya meddelanden';
-$labels['compose'] = 'Nytt meddelande';
-$labels['writenewmessage'] = 'Nytt meddelande';
-$labels['reply'] = 'Svara';
-$labels['replytomessage'] = 'Svara avsändaren';
+
+// toolbar buttons
+$labels['refresh']          = 'Uppdatera';
+$labels['checkmail']        = 'Hämta nya meddelanden';
+$labels['compose']          = 'Nytt meddelande';
+$labels['writenewmessage']  = 'Nytt meddelande';
+$labels['reply']            = 'Svara';
+$labels['replytomessage']   = 'Svara avsändaren';
 $labels['replytoallmessage'] = 'Svara avsändaren och alla mottagare';
-$labels['replyall'] = 'Svara alla';
-$labels['replylist'] = 'Svara lista';
-$labels['forward'] = 'Vidarebefordra';
-$labels['forwardinline'] = 'Vidarebefordra infogat';
+$labels['replyall']         = 'Svara alla';
+$labels['replylist']        = 'Svara lista';
+$labels['forward']          = 'Vidarebefordra';
+$labels['forwardinline']    = 'Vidarebefordra infogat';
 $labels['forwardattachment'] = 'Vidarebefordra som bilaga';
-$labels['forwardmessage'] = 'Vidarebefordra meddelande';
-$labels['deletemessage'] = 'Ta bort meddelande';
+$labels['forwardmessage']   = 'Vidarebefordra meddelande';
+$labels['deletemessage']    = 'Ta bort meddelande';
 $labels['movemessagetotrash'] = 'Flytta meddelande till papperskorgen';
-$labels['printmessage'] = 'Skriv ut';
-$labels['previousmessage'] = 'Visa föregående meddelande';
-$labels['firstmessage'] = 'Visa första meddelandet';
-$labels['nextmessage'] = 'Visa nästa meddelande';
-$labels['lastmessage'] = 'Visa sista meddelandet';
-$labels['backtolist'] = 'Tillbaka till meddelandelistan';
-$labels['viewsource'] = 'Visa källkod';
-$labels['mark'] = 'Märk';
-$labels['markmessages'] = 'Märk meddelande';
-$labels['markread'] = 'Läst';
-$labels['markunread'] = 'Oläst';
-$labels['markflagged'] = 'Flaggat';
-$labels['markunflagged'] = 'Oflaggat';
-$labels['moreactions'] = 'Ytterligare hantering...';
-$labels['more'] = 'Fler';
-$labels['back'] = 'Tillbaka';
-$labels['options'] = 'Alternativ';
+$labels['printmessage']     = 'Skriv ut';
+$labels['previousmessage']  = 'Visa föregående meddelande';
+$labels['firstmessage']     = 'Visa första meddelandet';
+$labels['nextmessage']      = 'Visa nästa meddelande';
+$labels['lastmessage']      = 'Visa sista meddelandet';
+$labels['backtolist']       = 'Tillbaka till meddelandelistan';
+$labels['viewsource']       = 'Visa källkod';
+$labels['mark']             = 'Märk';
+$labels['markmessages']     = 'Märk meddelande';
+$labels['markread']         = 'Läst';
+$labels['markunread']       = 'Oläst';
+$labels['markflagged']      = 'Flaggat';
+$labels['markunflagged']    = 'Oflaggat';
+$labels['moreactions']      = 'Fler åtgärder';
+$labels['more']             = 'Fler';
+$labels['back']             = 'Tillbaka';
+$labels['options']          = 'Alternativ';
+
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $labels['currpage'] = 'Sida';
 $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Visa alla';
 $labels['expand-unread'] = 'Visa olästa';
 $labels['collapse-all'] = 'Dölj alla';
 $labels['threaded'] = 'Trådat';
+
 $labels['autoexpand_threads'] = 'Visa trådade meddelanden';
 $labels['do_expand'] = 'Alla trådar';
 $labels['expand_only_unread'] = 'Trådar med olästa meddelanden';
 $labels['fromto'] = 'Avsändare/Mottagare';
 $labels['flag'] = 'Flagga';
 $labels['attachment'] = 'Bilaga';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Datum skickat';
 $labels['arrival'] = 'Datum mottaget';
 $labels['asc'] = 'Stigande';
@@ -159,182 +187,216 @@ $labels['listcolumns'] = 'Kolumner';
 $labels['listsorting'] = 'Sortering';
 $labels['listorder'] = 'Ordning';
 $labels['listmode'] = 'Visningsläge';
+
 $labels['folderactions'] = 'Hantera kataloger';
 $labels['compact'] = 'Packa';
 $labels['empty'] = 'Töm';
+
 $labels['quota'] = 'Diskutrymme';
-$labels['unknown'] = 'okänt';
-$labels['unlimited'] = 'obegränsat';
-$labels['quicksearch'] = 'Snabbsök';
-$labels['resetsearch'] = 'Återställ sökning';
-$labels['searchmod'] = 'Sökalternativ';
-$labels['msgtext'] = 'Hela meddelandet';
+$labels['unknown']  = 'okänt';
+$labels['unlimited']  = 'obegränsat';
+
+$labels['quicksearch']  = 'Snabbsök';
+$labels['resetsearch']  = 'Återställ sökning';
+$labels['searchmod']  = 'Sökalternativ';
+$labels['msgtext']  = 'Hela meddelandet';
+$labels['body']  = 'Innehåll';
+
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
-$labels['editasnew'] = 'Redigera som nytt';
-$labels['send'] = 'Skicka';
-$labels['sendmessage'] = 'Skicka meddelande';
-$labels['savemessage'] = 'Spara utkast';
-$labels['addattachment'] = 'Bifoga fil';
-$labels['charset'] = 'Teckenkodning';
-$labels['editortype'] = 'Textredigerare';
-$labels['returnreceipt'] = 'Mottagarkvitto';
-$labels['dsn'] = 'Leveransstatusmeddelande';
+
+// message compose
+$labels['editasnew']      = 'Redigera som nytt';
+$labels['send']           = 'Skicka';
+$labels['sendmessage']    = 'Skicka meddelande';
+$labels['savemessage']    = 'Spara utkast';
+$labels['addattachment']  = 'Bifoga fil';
+$labels['charset']        = 'Teckenkodning';
+$labels['editortype']     = 'Textredigerare';
+$labels['returnreceipt']  = 'Mottagarkvitto';
+$labels['dsn']            = 'Leveransstatusmeddelande';
 $labels['mailreplyintro'] = '$date skrev $sender:';
 $labels['originalmessage'] = 'Ursprungligt meddelande';
-$labels['editidents'] = 'Ändra identiteter';
-$labels['spellcheck'] = 'Rättstava';
+
+$labels['editidents']    = 'Ändra identiteter';
+$labels['spellcheck']    = 'Rättstava';
 $labels['checkspelling'] = 'Kontrollera stavning';
 $labels['resumeediting'] = 'Återuppta redigering';
-$labels['revertto'] = 'Återgå till';
+$labels['revertto']      = 'Återgå till';
+
 $labels['attach'] = 'Bifoga';
 $labels['attachments'] = 'Bilagor';
 $labels['upload'] = 'Bifoga';
 $labels['uploadprogress'] = '$percent ($current av $total)';
-$labels['close'] = 'Stäng';
-$labels['messageoptions'] = 'Meddelandealternativ';
-$labels['low'] = 'Låg';
-$labels['lowest'] = 'Lägst';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Hög';
+$labels['close']  = 'Stäng';
+$labels['messageoptions']  = 'Meddelandealternativ';
+
+$labels['low']     = 'Låg';
+$labels['lowest']  = 'Lägst';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Hög';
 $labels['highest'] = 'Högst';
-$labels['nosubject'] = '(inget ämne)';
+
+$labels['nosubject']  = '(inget ämne)';
 $labels['showimages'] = 'Visa bilder';
 $labels['alwaysshow'] = 'Visa alltid bilder från $sender';
-$labels['isdraft'] = 'Detta meddelande är ett utkast.';
-$labels['andnmore'] = '$nr fler...';
+$labels['isdraft']    = 'Detta meddelande är ett utkast.';
+$labels['andnmore']   = '$nr fler...';
 $labels['togglemoreheaders'] = 'Visa fler meddelandehuvuden';
 $labels['togglefullheaders'] = 'Växla meddelandehuvuden';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text';
 $labels['savesentmessagein'] = 'Spara kopia i';
 $labels['dontsave'] = 'Spara inte';
 $labels['maxuploadsize'] = 'Tillåten filstorlek är $size';
+
 $labels['addcc'] = 'Kopia';
 $labels['addbcc'] = 'Dold kopia';
 $labels['addreplyto'] = 'Svar till';
 $labels['addfollowupto'] = 'Uppföljning till';
+
+// mdn
 $labels['mdnrequest'] = 'Avsändaren har begärt mottagarkvitto för det här meddelandet. Vill du skicka ett mottagarkvitto?';
 $labels['receiptread'] = 'Mottagarkvitto (läst)';
 $labels['yourmessage'] = 'Det här är ett mottagarkvitto för ditt meddelande';
 $labels['receiptnote'] = 'Notera: Mottagarkvittot innebär bara att meddelandet visats på mottagarens dator. Därmed finns ingen garanti att mottagaren har läst och förstått meddelandet.';
-$labels['name'] = 'Namn';
-$labels['firstname'] = 'Förnamn';
-$labels['surname'] = 'Efternamn';
-$labels['middlename'] = 'Mellannamn';
-$labels['nameprefix'] = 'Prefix';
-$labels['namesuffix'] = 'Suffix';
-$labels['nickname'] = 'Smeknamn';
-$labels['jobtitle'] = 'Titel';
-$labels['department'] = 'Avdelning';
-$labels['gender'] = 'Kön';
-$labels['maidenname'] = 'Flicknamn';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adress';
-$labels['street'] = 'Gata';
-$labels['locality'] = 'Ort';
-$labels['zipcode'] = 'Postnummer';
-$labels['region'] = 'Region';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Födelsedag';
-$labels['anniversary'] = 'Årsdag';
-$labels['website'] = 'Webbplats';
+
+// address boook
+$labels['name']         = 'Namn';
+$labels['firstname']    = 'Förnamn';
+$labels['surname']      = 'Efternamn';
+$labels['middlename']   = 'Mellannamn';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Smeknamn';
+$labels['jobtitle']     = 'Titel';
+$labels['department']   = 'Avdelning';
+$labels['gender']       = 'Kön';
+$labels['maidenname']   = 'Flicknamn';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adress';
+$labels['street']       = 'Gata';
+$labels['locality']     = 'Ort';
+$labels['zipcode']      = 'Postnummer';
+$labels['region']       = 'Region';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Födelsedag';
+$labels['anniversary']  = 'Årsdag';
+$labels['website']      = 'Webbplats';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Anteckningar';
-$labels['male'] = 'Man';
+$labels['male']   = 'Man';
 $labels['female'] = 'Kvinna';
 $labels['manager'] = 'Chef';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Make/Maka';
 $labels['allfields'] = 'Alla fält';
 $labels['search'] = 'Sök';
 $labels['advsearch'] = 'Avancerad sökning';
 $labels['advanced'] = 'Avancerad';
 $labels['other'] = 'Annat';
-$labels['typeother'] = 'Annat';
-$labels['typehome'] = 'Hem';
-$labels['typework'] = 'Arbete';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Huvudsakligt';
-$labels['typehomefax'] = 'Fax hem';
-$labels['typeworkfax'] = 'Fax arbete';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsökare';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Webbsida';
+
+$labels['typehome']   = 'Hem';
+$labels['typework']   = 'Arbete';
+$labels['typeother']  = 'Annat';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Huvudsakligt';
+$labels['typehomefax']  = 'Fax hem';
+$labels['typeworkfax']  = 'Fax arbete';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsökare';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Webbsida';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Lägg till fält...';
 $labels['addcontact'] = 'Lägg till ny kontakt';
 $labels['editcontact'] = 'Ändra kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaper';
 $labels['personalinfo'] = 'Personlig information';
-$labels['edit'] = 'Redigera';
+
+$labels['edit']   = 'Redigera';
 $labels['cancel'] = 'Avbryt';
-$labels['save'] = 'Spara';
+$labels['save']   = 'Spara';
 $labels['delete'] = 'Ta bort';
 $labels['rename'] = 'Ändra namn';
 $labels['addphoto'] = 'Lägg till';
 $labels['replacephoto'] = 'Ersätt';
 $labels['uploadphoto'] = 'Ladda upp foto';
-$labels['newcontact'] = 'Ny kontakt';
-$labels['deletecontact'] = 'Ta bort vald kontakt';
-$labels['composeto'] = 'Nytt meddelande till vald kontakt';
+
+$labels['newcontact']     = 'Ny kontakt';
+$labels['deletecontact']  = 'Ta bort vald kontakt';
+$labels['composeto']      = 'Nytt meddelande till';
 $labels['contactsfromto'] = 'Kontakt $from till $to av $count';
-$labels['print'] = 'Skriv ut';
-$labels['export'] = 'Exportera';
-$labels['exportvcards'] = 'Exportera kontakter';
+$labels['print']          = 'Skriv ut';
+$labels['export']         = 'Exportera';
+$labels['exportall']      = 'Exportera alla';
+$labels['exportsel']      = 'Exportera markerade';
+$labels['exportvcards']   = 'Exportera kontakter';
 $labels['newcontactgroup'] = 'Ny kontaktgrupp';
-$labels['grouprename'] = 'Ändra gruppnamn';
-$labels['groupdelete'] = 'Ta bort grupp';
+$labels['grouprename']    = 'Ändra gruppnamn';
+$labels['groupdelete']    = 'Ta bort grupp';
 $labels['groupremoveselected'] = 'Ta bort markerade kontakter från gruppen';
-$labels['previouspage'] = 'Visa föregående sida';
-$labels['firstpage'] = 'Visa första sidan';
-$labels['nextpage'] = 'Visa nästa sida';
-$labels['lastpage'] = 'Visa sista sidan';
+
+$labels['previouspage']   = 'Visa föregående sida';
+$labels['firstpage']      = 'Visa första sidan';
+$labels['nextpage']       = 'Visa nästa sida';
+$labels['lastpage']       = 'Visa sista sidan';
+
 $labels['group'] = 'Grupp';
 $labels['groups'] = 'Kontaktgrupper';
 $labels['personaladrbook'] = 'Personliga adresser';
+
 $labels['searchsave'] = 'Lägg till sökning';
 $labels['searchdelete'] = 'Ta bort sökning';
+
 $labels['import'] = 'Importera';
 $labels['importcontacts'] = 'Importera kontakter';
 $labels['importfromfile'] = 'Importera från fil:';
 $labels['importtarget'] = 'Lägg till nya kontakter till adressbok:';
 $labels['importreplace'] = 'Ersätt samtliga kontakter i adressboken';
-$labels['importdesc'] = 'Du kan läsa in kontakter från en befintlig adressbok.<br/>Programmet stödjer inläsning av kontakter i formatet <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> eller formatet CSV (kommaseparerad data).';
+$labels['importdesc'] = 'Kontakter kan importeras från en befintlig adressbok.<br/>Programmet stödjer inläsning av kontakter i formatet <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> eller formatet CSV (kommaseparerad data).';
 $labels['done'] = 'Klart';
+
+// settings
 $labels['settingsfor'] = 'Inställningar för';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Inställningar';
 $labels['userpreferences'] = 'Användarinställningar';
 $labels['editpreferences'] = 'Ändra användarinställningar';
+
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Hantera identiteter';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Ny information';
 $labels['edititem'] = 'Ändra information';
+
 $labels['preferhtml'] = 'Visa meddelanden i HTML-format';
 $labels['defaultcharset'] = 'Förvald teckenkodning';
 $labels['htmlmessage'] = 'HTML-meddelande';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datumformat';
 $labels['timeformat'] = 'Tidformat';
 $labels['prettydate'] = 'Fina datum';
-$labels['setdefault'] = 'Sätt som standard';
-$labels['autodetect'] = 'Automatiskt';
-$labels['language'] = 'Språk';
-$labels['timezone'] = 'Tidszon';
-$labels['pagesize'] = 'Rader per sida';
+$labels['setdefault']  = 'Sätt som förval';
+$labels['autodetect']  = 'Automatiskt';
+$labels['language']  = 'Språk';
+$labels['timezone']  = 'Tidszon';
+$labels['pagesize']  = 'Rader per sida';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommartid';
+$labels['dstactive']  = 'Sommartid';
 $labels['showinextwin'] = 'Öppna i nytt fönster';
 $labels['composeextwin'] = 'Skriv i nytt fönster';
 $labels['htmleditor'] = 'Skriv meddelanden i HTML-format';
 $labels['htmlonreply'] = 'Endast vid svar på meddelande i HTML-format';
-$labels['htmlonreplyandforward'] = 'vid vidarebefordring eller svar till HTML-meddelande';
+$labels['htmlonreplyandforward'] = 'Vid svar på eller vidarebefordran av meddelande i HTML-format';
 $labels['htmlsignature'] = 'HTML-signatur';
 $labels['previewpane'] = 'Visa meddelandefältet';
 $labels['skin'] = 'Stilmall för användargränssnitt';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Visa externt länkade bilder i meddelande';
 $labels['fromknownsenders'] = 'Från kända avsändare';
 $labels['always'] = 'Alltid';
 $labels['showinlineimages'] = 'Visa bifogade bilder efter meddelande';
-$labels['autosavedraft'] = 'Spara utkast med automatiskt intervall';
-$labels['everynminutes'] = '$n min';
-$labels['refreshinterval'] = 'Uppdatera (hämta nya meddelanden, etc.)';
-$labels['never'] = 'Aldrig';
-$labels['immediately'] = 'Direkt';
+$labels['autosavedraft']  = 'Spara utkast med automatiskt intervall';
+$labels['everynminutes']  = '$n min';
+$labels['refreshinterval']  = 'Uppdatera (hämta nya meddelanden, etc.)';
+$labels['never']  = 'Aldrig';
+$labels['immediately']  = 'Direkt';
 $labels['messagesdisplaying'] = 'Visning av meddelanden';
 $labels['messagescomposition'] = 'Redigering av meddelanden';
 $labels['mimeparamfolding'] = 'Kodning av namn på bifogade filer';
@@ -374,7 +436,7 @@ $labels['advancedoptions'] = 'Avancerade inställningar';
 $labels['focusonnewmessage'] = 'Fokusera webbläsarens fönster vid nytt meddelande';
 $labels['checkallfolders'] = 'Genomsök samtliga kataloger efter nya meddelanden';
 $labels['displaynext'] = 'Visa nästa meddelande efter borttagning/flyttning av meddelande';
-$labels['defaultfont'] = 'Standardtypsnitt i HTML-meddelande';
+$labels['defaultfont'] = 'Förvalt typsnitt i HTML-meddelande';
 $labels['mainoptions'] = 'Huvudalternativ';
 $labels['browseroptions'] = 'Webbläsaralternativ';
 $labels['section'] = 'Avdelning';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Vid svar eller vidarebefordran infoga signatur';
 $labels['belowquote'] = 'Nedanför befintligt meddelande';
 $labels['abovequote'] = 'Ovanför befintligt meddelande';
 $labels['insertsignature'] = 'Infoga signatur';
-$labels['previewpanemarkread'] = 'Märk meddelande som läst vid visning';
-$labels['afternseconds'] = 'Efter $n sekunder';
+$labels['previewpanemarkread']  = 'Märk meddelande som läst vid visning';
+$labels['afternseconds']  = 'Efter $n sekunder';
 $labels['reqmdn'] = 'Begär alltid mottagarkvitto';
 $labels['reqdsn'] = 'Begär alltid leveransstatusmeddelande';
 $labels['replysamefolder'] = 'Placera svar i samma katalog som besvarat meddelande';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Ange program för hantering av mailto-länkar';
 $labels['forwardmode'] = 'Vidarebefordra meddelande';
 $labels['inline'] = 'Infogat';
 $labels['asattachment'] = 'Bilaga';
-$labels['folder'] = 'Katalog';
-$labels['foldername'] = 'Katalognamn';
-$labels['subscribed'] = 'Prenumererad';
+
+$labels['folder']  = 'Katalog';
+$labels['folders']  = 'Kataloger';
+$labels['foldername']  = 'Katalognamn';
+$labels['subscribed']  = 'Prenumererad';
 $labels['messagecount'] = 'Meddelanden';
-$labels['create'] = 'Skapa';
-$labels['createfolder'] = 'Ny katalog';
-$labels['managefolders'] = 'Hantera kataloger';
+$labels['create']  = 'Skapa';
+$labels['createfolder']  = 'Ny katalog';
+$labels['managefolders']  = 'Hantera kataloger';
 $labels['specialfolders'] = 'Speciella kataloger';
 $labels['properties'] = 'Egenskaper';
 $labels['folderproperties'] = 'Katalogegenskaper';
@@ -427,23 +491,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Beräkna katalogstorlek';
 $labels['changesubscription'] = 'Klicka för att ändra prenumeration';
 $labels['foldertype'] = 'Katalogtyp';
-$labels['personalfolder'] = 'Privat katalog';
-$labels['otherfolder'] = 'Annan användares katalog';
-$labels['sharedfolder'] = 'Publik katalog';
+$labels['personalfolder']  = 'Privat katalog';
+$labels['otherfolder']  = 'Annan användares katalog';
+$labels['sharedfolder']  = 'Publik katalog';
+
 $labels['sortby'] = 'Sortera på';
-$labels['sortasc'] = 'Sortera stigande';
+$labels['sortasc']  = 'Sortera stigande';
 $labels['sortdesc'] = 'Sortera fallande';
 $labels['undo'] = 'Ångra';
+
 $labels['installedplugins'] = 'Installerade tillägg';
 $labels['plugin'] = 'Tillägg';
 $labels['version'] = 'Version';
 $labels['source'] = 'Källkod';
 $labels['license'] = 'Licens';
 $labels['support'] = 'Hjälp';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Västeuropeisk';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 297f7cf3c..65ee6827d 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ett fel uppstod!';
-$messages['loginfailed'] = 'Inloggningen misslyckades';
+$messages['errortitle']  = 'Ett fel uppstod!';
+$messages['loginfailed']  = 'Inloggningen misslyckades';
 $messages['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
 $messages['sessionerror'] = 'Din inloggning är felaktig eller har gått ut';
 $messages['storageerror'] = 'Anslutning till IMAP-servern misslyckades';
@@ -57,11 +60,11 @@ $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['deletecontactconfirm'] = 'Vill du verkligen ta bort valda kontakter?';
-$messages['deletegroupconfirm'] = 'Vill du verkligen ta bort den valda gruppen?';
+$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?';
-$messages['deletefolderconfirm'] = 'Vill du verkligen ta bort den här katalogen?';
-$messages['purgefolderconfirm'] = 'Vill du verkligen ta bort alla meddelanden i den här katalogen?';
+$messages['deletefolderconfirm']  = 'Vill du verkligen ta bort den här katalogen?';
+$messages['purgefolderconfirm']  = 'Vill du verkligen ta bort alla meddelanden i den här katalogen?';
 $messages['contactdeleting'] = 'Tar bort kontakt...';
 $messages['groupdeleting'] = 'Tar bort grupp...';
 $messages['folderdeleting'] = 'Tar bort katalog...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Startar prenumeration på katalog...';
 $messages['folderunsubscribing'] = 'Avslutar prenumeration på katalog...';
 $messages['formincomplete'] = 'Formuläret var inte komplett ifyllt';
 $messages['noemailwarning'] = 'Ange en giltig adress';
-$messages['nonamewarning'] = 'Ange ett namn';
+$messages['nonamewarning']  = 'Ange ett namn';
 $messages['nopagesizewarning'] = 'Ange en sidstorlek';
 $messages['nosenderwarning'] = 'Ange en avsändaradress';
 $messages['norecipientwarning'] = 'Ange minst en mottagare';
-$messages['nosubjectwarning'] = 'Ämnesraden är tom. Vill du ange ämne nu?';
+$messages['nosubjectwarning']  = 'Ämnesraden är tom. Vill du ange ämne nu?';
 $messages['nobodywarning'] = 'Skicka det här meddelandet utan text?';
 $messages['notsentwarning'] = 'Meddelandet har inte skickats. Vill du avbryta meddelandet?';
 $messages['noldapserver'] = 'Ange en LDAP-server för att söka';
@@ -118,7 +121,7 @@ $messages['contactaddedtogroup'] = 'Kontakterna har lagts till i gruppen';
 $messages['contactremovedfromgroup'] = 'Kontakterna har tagits bort från gruppen';
 $messages['nogroupassignmentschanged'] = 'Ingen grupptillhörighet ändrades.';
 $messages['importwait'] = 'Importerar, var god vänta...';
-$messages['importformaterror'] = 'Inläsningen misslyckades! Filen har inte korrekt dataformat.';
+$messages['importformaterror'] = 'Importen misslyckades! Filen har inte korrekt dataformat.';
 $messages['importconfirm'] = '<b>Lyckad import av $inserted kontakter</b>';
 $messages['importconfirmskipped'] = '<b>Hoppade över $skipped befintliga poster</b>';
 $messages['opnotpermitted'] = 'Otillåten operation!';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'Denna del av meddelandet är alltför stor för at
 $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['noscriptwarning'] = 'Varning: Denna webbmailtjänst fungerar inte utan Javascript! Aktivera Javascript i webbläsarens inställningar.';
 
+?>
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index ecd971012..d71da6799 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -2,52 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ta_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'நல்வரவு';
-$labels['username'] = 'பயனர்';
-$labels['password'] = 'கடவுச்சொல்';
-$labels['server'] = 'சேவையகம்';
-$labels['login'] = 'நுழை';
-$labels['logout'] = 'வெளியேறு';
-$labels['mail'] = 'மின்னஞ்சல்';
+
+// login page
+$labels['welcome']   = 'நல்வரவு';
+$labels['username']  = 'பயனர்';
+$labels['password']  = 'கடவுச்சொல்';
+$labels['server']    = 'சேவையகம்';
+$labels['login']     = 'நுழை';
+
+// taskbar
+$labels['logout']   = 'வெளியேறு';
+$labels['mail']     = 'மின்னஞ்சல்';
 $labels['settings'] = 'அமைப்புகள்';
 $labels['addressbook'] = 'தொடர்புகள்';
-$labels['inbox'] = 'அகப்பெட்டி';
+
+// mailbox names
+$labels['inbox']  = 'அகப்பெட்டி';
 $labels['drafts'] = 'வரைவுகள்';
-$labels['sent'] = 'அனுப்பிய அஞ்சல்';
-$labels['trash'] = 'குப்பை';
-$labels['junk'] = 'எரிதம்';
+$labels['sent']   = 'அனுப்பிய அஞ்சல்';
+$labels['trash']  = 'குப்பை';
+$labels['junk']   = 'எரிதம்';
+
+// message listing
 $labels['subject'] = 'தலைப்பு';
-$labels['from'] = 'அனுப்புனர்';
-$labels['to'] = 'பெறுனர்';
-$labels['cc'] = 'நகல்';
-$labels['bcc'] = 'மறை நகல்';
+$labels['from']    = 'அனுப்புனர்';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'பெறுனர்';
+$labels['cc']      = 'நகல்';
+$labels['bcc']     = 'மறை நகல்';
 $labels['replyto'] = 'பதிலளி';
-$labels['date'] = 'தேதி';
-$labels['size'] = 'அளவு';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'தேதி';
+$labels['size']    = 'அளவு';
 $labels['priority'] = 'முக்கியத்துவம்';
 $labels['organization'] = 'நிறுவனம்';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'அடைவுகள்';
-$labels['folders'] = 'அடைவுகள்';
 $labels['messagesfromto'] = 'செய்திகள் $countல் $from லிருந்து $to வரை';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$countல் $nr வது செய்தி';
-$labels['copy'] = 'நகல்';
-$labels['moveto'] = 'இதற்கு அனுப்பு...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'நகல்';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'இதற்கு அனுப்பு...';
 $labels['download'] = 'பதிவிறக்கு';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'கோப்பு பெயர்';
 $labels['filesize'] = 'கோப்பு அளவு';
+
 $labels['addtoaddressbook'] = 'தொடர்புகளுக்கு சேர்க்கவும்';
+
+// weekdays short
 $labels['sun'] = 'ஞாயிறு';
 $labels['mon'] = 'திங்கள்';
 $labels['tue'] = 'செவ்வாய்';
@@ -55,160 +80,323 @@ $labels['wed'] = 'புதன்';
 $labels['thu'] = 'வியாழன்';
 $labels['fri'] = 'வெள்ளி';
 $labels['sat'] = 'சனி';
-$labels['sunday'] = 'ஞாயிறு';
-$labels['monday'] = 'திங்கள்';
-$labels['tuesday'] = 'செவ்வாய்';
+
+// weekdays long
+$labels['sunday']    = 'ஞாயிறு';
+$labels['monday']    = 'திங்கள்';
+$labels['tuesday']   = 'செவ்வாய்';
 $labels['wednesday'] = 'புதன்';
-$labels['thursday'] = 'வியாழன்';
-$labels['friday'] = 'வெள்ளி';
-$labels['saturday'] = 'சனி';
-$labels['jan'] = 'சனவரி';
-$labels['feb'] = 'பிப்ரவரி';
-$labels['mar'] = 'மார்ச்';
-$labels['apr'] = 'ஏப்ரல்';
-$labels['may'] = 'மே';
-$labels['longmay'] = 'மே';
-$labels['jun'] = 'சூன்';
-$labels['jul'] = 'சூலை';
-$labels['aug'] = 'ஆகஸ்ட்';
-$labels['sep'] = 'செப்டம்பர்';
-$labels['oct'] = 'அக்டோபர்';
-$labels['nov'] = 'நவம்பர்';
-$labels['dec'] = 'டிசம்பர்';
-$labels['longjan'] = 'சனவரி';
-$labels['longfeb'] = 'பிப்ரவரி';
-$labels['longmar'] = 'மார்ச்';
-$labels['longapr'] = 'ஏப்ரல்';
-$labels['longjun'] = 'சூன்';
-$labels['longjul'] = 'சூலை';
-$labels['longaug'] = 'ஆகஸ்ட்';
-$labels['longsep'] = 'செப்டம்பர்';
-$labels['longoct'] = 'அக்டோபர்';
-$labels['longnov'] = 'நவம்பர்';
-$labels['longdec'] = 'டிசம்பர்';
+$labels['thursday']  = 'வியாழன்';
+$labels['friday']    = 'வெள்ளி';
+$labels['saturday']  = 'சனி';
+
+// months short
+$labels['jan']	= 'சனவரி';
+$labels['feb']	= 'பிப்ரவரி';
+$labels['mar']	= 'மார்ச்';
+$labels['apr']	= 'ஏப்ரல்';
+$labels['may']	= 'மே';
+$labels['jun']	= 'சூன்';
+$labels['jul'] 	= 'சூலை';
+$labels['aug']	= 'ஆகஸ்ட்';
+$labels['sep']	= 'செப்டம்பர்';
+$labels['oct']	= 'அக்டோபர்';
+$labels['nov']	= 'நவம்பர்';
+$labels['dec']	= 'டிசம்பர்';
+
+// months long
+$labels['longjan']	= 'சனவரி';
+$labels['longfeb']	= 'பிப்ரவரி';
+$labels['longmar']	= 'மார்ச்';
+$labels['longapr']	= 'ஏப்ரல்';
+$labels['longmay']	= 'மே';
+$labels['longjun']	= 'சூன்';
+$labels['longjul']	= 'சூலை';
+$labels['longaug']	= 'ஆகஸ்ட்';
+$labels['longsep']	= 'செப்டம்பர்';
+$labels['longoct']	= 'அக்டோபர்';
+$labels['longnov']	= 'நவம்பர்';
+$labels['longdec']	= 'டிசம்பர்';
+
 $labels['today'] = 'இன்று';
-$labels['checkmail'] = 'புது அஞ்சல்களை பார்க்கவும்';
-$labels['compose'] = 'அஞ்சல் எழுது';
-$labels['writenewmessage'] = 'புது அஞ்சல் எழுதவும்';
-$labels['replytomessage'] = 'அனுப்புனருக்கு பதிலளி';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'புது அஞ்சல்களை பார்க்கவும்';
+$labels['compose']          = 'அஞ்சல் எழுது';
+$labels['writenewmessage']  = 'புது அஞ்சல் எழுதவும்';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'அனுப்புனருக்கு பதிலளி';
 $labels['replytoallmessage'] = 'அனுப்புனர் மற்றும் எல்லா பெறுனர்களுக்கும் பதிலளி';
-$labels['forwardmessage'] = 'செய்தியை முன்அனுப்பு';
-$labels['deletemessage'] = 'செய்தியை நீக்கு';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'செய்தியை முன்அனுப்பு';
+$labels['deletemessage']    = 'செய்தியை நீக்கு';
 $labels['movemessagetotrash'] = 'செய்தியை குப்பைக்கு நகர்த்து';
-$labels['printmessage'] = 'செய்தியை அச்சிடவும்';
-$labels['previousmessage'] = 'முந்திய செய்தியை காட்டவும்';
-$labels['firstmessage'] = 'முதல் செய்தியை காட்டவும்';
-$labels['nextmessage'] = 'அடுத்த செய்தியை காட்டு';
-$labels['lastmessage'] = 'கடைசி செய்தியை காட்டு';
-$labels['backtolist'] = 'செய்தி பட்டியலுக்கு செல்லவும்';
-$labels['viewsource'] = 'மூலத்தை காட்டு';
-$labels['markmessages'] = 'செய்திகளை குறியிடு';
-$labels['markread'] = 'படித்ததாக குறியிடு';
-$labels['markunread'] = 'படிக்காததாக குறியிடு';
-$labels['markflagged'] = 'நட்சத்திரமிட்டதாக குறியிடு';
-$labels['markunflagged'] = 'நட்சத்திரமிடாததாக குறியிடு';
+$labels['printmessage']     = 'செய்தியை அச்சிடவும்';
+$labels['previousmessage']  = 'முந்திய செய்தியை காட்டவும்';
+$labels['firstmessage']     = 'முதல் செய்தியை காட்டவும்';
+$labels['nextmessage']      = 'அடுத்த செய்தியை காட்டு';
+$labels['lastmessage']      = 'கடைசி செய்தியை காட்டு';
+$labels['backtolist']       = 'செய்தி பட்டியலுக்கு செல்லவும்';
+$labels['viewsource']       = 'மூலத்தை காட்டு';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'செய்திகளை குறியிடு';
+$labels['markread']         = 'படித்ததாக குறியிடு';
+$labels['markunread']       = 'படிக்காததாக குறியிடு';
+$labels['markflagged']      = 'நட்சத்திரமிட்டதாக குறியிடு';
+$labels['markunflagged']    = 'நட்சத்திரமிடாததாக குறியிடு';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'தேர்ந்தெடு';
 $labels['all'] = 'எல்லாம்';
 $labels['none'] = 'எதுவுமில்லை';
-$labels['nonesort'] = 'எதுவுமில்லை';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'படிக்காதது';
 $labels['flagged'] = 'நட்சத்திரமிட்டது';
 $labels['unanswered'] = 'பதிலளிக்காதது';
 $labels['deleted'] = 'நீக்கியது';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'தலைகீழ்';
 $labels['filter'] = 'வடிப்பான்';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'எதுவுமில்லை';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'குறுகிய';
 $labels['empty'] = 'காலி';
+
 $labels['quota'] = 'பயன்பாட்டு அளவு';
-$labels['unknown'] = 'தெரியாத';
-$labels['unlimited'] = 'அளவில்லா';
-$labels['quicksearch'] = 'விரைவு தேடல்';
-$labels['resetsearch'] = 'தேடலை மறுஅமை';
-$labels['searchmod'] = 'மாற்றிகளை தேடு';
-$labels['msgtext'] = 'முழு செய்தி';
+$labels['unknown']  = 'தெரியாத';
+$labels['unlimited']  = 'அளவில்லா';
+
+$labels['quicksearch']  = 'விரைவு தேடல்';
+$labels['resetsearch']  = 'தேடலை மறுஅமை';
+$labels['searchmod']  = 'மாற்றிகளை தேடு';
+$labels['msgtext']  = 'முழு செய்தி';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
-$labels['editasnew'] = 'புதியதாக திருத்து';
-$labels['sendmessage'] = 'இப்போது அனுப்பு';
-$labels['savemessage'] = 'இந்த வரைவை சேமி';
-$labels['addattachment'] = 'ஒரு கோப்பை இணைக்கவும்';
-$labels['charset'] = 'எழுத்து குறிமுறை';
-$labels['editortype'] = 'திருத்தும் வகை';
-$labels['returnreceipt'] = 'திரும்பு சீட்டு';
+
+// message compose
+$labels['editasnew']      = 'புதியதாக திருத்து';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'இப்போது அனுப்பு';
+$labels['savemessage']    = 'இந்த வரைவை சேமி';
+$labels['addattachment']  = 'ஒரு கோப்பை இணைக்கவும்';
+$labels['charset']        = 'எழுத்து குறிமுறை';
+$labels['editortype']     = 'திருத்தும் வகை';
+$labels['returnreceipt']  = 'திரும்பு சீட்டு';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'எழுத்துப்பிழை சரிபார்';
 $labels['resumeediting'] = 'திருத்துவதை தொடரவும்';
-$labels['revertto'] = 'முந்திய நிலைக்கு திரும்பவும்';
+$labels['revertto']      = 'முந்திய நிலைக்கு திரும்பவும்';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'கோப்பு இணைப்புகள்';
 $labels['upload'] = 'பதிவேற்று';
-$labels['close'] = 'மூடு';
-$labels['low'] = 'குறைந்த';
-$labels['lowest'] = 'மிக குறைந்த';
-$labels['normal'] = 'சாதாரண';
-$labels['high'] = 'அதிக';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'மூடு';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'குறைந்த';
+$labels['lowest']  = 'மிக குறைந்த';
+$labels['normal']  = 'சாதாரண';
+$labels['high']    = 'அதிக';
 $labels['highest'] = 'மிக அதிக';
-$labels['nosubject'] = '(தலைப்பில்லா)';
+
+$labels['nosubject']  = '(தலைப்பில்லா)';
 $labels['showimages'] = 'படங்களை காட்டு';
 $labels['alwaysshow'] = '$-னிடமிருந்து வரும் படங்களை காட்டு';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'எளிய உரை';
 $labels['savesentmessagein'] = 'அனுப்பிய அஞ்சலை இங்கு சேமிக்கவும்';
 $labels['dontsave'] = 'சேமிக்காதே';
 $labels['maxuploadsize'] = 'அனுமதிக்கப்படும் அதிகபட்ச கோப்பு அளவு $';
+
 $labels['addcc'] = 'நகல் சேர்';
 $labels['addbcc'] = 'மறை நகல் சேர்';
 $labels['addreplyto'] = 'பதிலளிக்க வேண்டியவர்களை சேர்';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'இந்த செய்தியின் அனுப்புனர் இதை படித்தவுடன் அறிவிக்கும்படி கேட்டார். அறிவிக்க விரும்புகிறீர்களா ?';
 $labels['receiptread'] = 'திரும்பு சீட்டு (படி)';
 $labels['yourmessage'] = 'இது உங்கள் செய்தியின் திரும்பு சீட்டு';
 $labels['receiptnote'] = 'குறிப்பு: இந்த ஒப்புகை பெறுனரிடம் செய்தியை காட்டியதற்காக வருகிறது. அவர் அதை படித்ததற்கு எந்த உத்திரவாதமும் இல்லை';
-$labels['name'] = 'காட்சி பெயர்';
-$labels['firstname'] = 'முதற் பெயர்';
-$labels['surname'] = 'கடைசி பெயர்';
-$labels['email'] = 'மின்னஞ்சல்';
+
+// address boook
+$labels['name']         = 'காட்சி பெயர்';
+$labels['firstname']    = 'முதற் பெயர்';
+$labels['surname']      = 'கடைசி பெயர்';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'மின்னஞ்சல்';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'புது தொடர்பை சேர்';
 $labels['editcontact'] = 'தொடர்பை திருத்து';
-$labels['edit'] = 'திருத்து';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'திருத்து';
 $labels['cancel'] = 'ரத்து';
-$labels['save'] = 'சேமி';
+$labels['save']   = 'சேமி';
 $labels['delete'] = 'நீக்கு';
-$labels['newcontact'] = 'புது தொடர்பு அட்டையை உருவாக்கு';
-$labels['deletecontact'] = 'தேர்ந்தெடுத்த தொடர்புகளை நீக்கு';
-$labels['composeto'] = 'இவர்-கு அஞ்சல் எழுது';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'புது தொடர்பு அட்டையை உருவாக்கு';
+$labels['deletecontact']  = 'தேர்ந்தெடுத்த தொடர்புகளை நீக்கு';
+$labels['composeto']      = 'இவர்-கு அஞ்சல் எழுது';
 $labels['contactsfromto'] = 'தொடர்புகள் $countல் $from லிருந்து $to வரை';
-$labels['print'] = 'அச்சிடு';
-$labels['export'] = 'ஏற்றுமதி';
-$labels['exportvcards'] = 'தொடர்புகளை vCard வடிவத்தில் ஏற்றுமதி செய்யவும்';
-$labels['previouspage'] = 'முந்திய குழுவை காட்டு';
-$labels['firstpage'] = 'முதல் குழுவை காட்டு';
-$labels['nextpage'] = 'அடுத்த குழுவை காட்டு';
-$labels['lastpage'] = 'கடைசி குழுவை காட்டு';
+$labels['print']          = 'அச்சிடு';
+$labels['export']         = 'ஏற்றுமதி';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'தொடர்புகளை vCard வடிவத்தில் ஏற்றுமதி செய்யவும்';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'முந்திய குழுவை காட்டு';
+$labels['firstpage']      = 'முதல் குழுவை காட்டு';
+$labels['nextpage']       = 'அடுத்த குழுவை காட்டு';
+$labels['lastpage']       = 'கடைசி குழுவை காட்டு';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'குழுக்கள்';
 $labels['personaladrbook'] = 'சுய முகவரி';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'இறக்குமதி';
 $labels['importcontacts'] = 'தொடர்புகளை இறக்குமதி செய்யவும்';
 $labels['importfromfile'] = 'இந்த கோப்பிலிருந்து இறக்குமதி செய்யவும்:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'எல்லா தொடர்புகளையும் மாற்றி அமை';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'முடிந்தது';
+
+// settings
 $labels['settingsfor'] = 'இதற்கான அமைப்புகள்';
+$labels['about'] = 'About';
 $labels['preferences'] = 'விருப்பங்கள்';
 $labels['userpreferences'] = 'பயனர் விருப்பங்கள்';
 $labels['editpreferences'] = 'பயனர் விருப்பங்களை திருத்து';
+
 $labels['identities'] = 'அடையாளங்கள்';
 $labels['manageidentities'] = 'இந்த கணக்கிற்கான அடையாளங்களை நிற்வாகிக்கவும்';
 $labels['newidentity'] = 'புது அடையாளம்';
+
 $labels['newitem'] = 'புது உருப்படி';
 $labels['edititem'] = 'உருப்படியை திருத்து';
+
 $labels['preferhtml'] = 'HTML காட்டு';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML செய்தி';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'நல்ல தேதி';
-$labels['setdefault'] = 'இயல்பை அமை';
-$labels['autodetect'] = 'தானியங்கி';
-$labels['language'] = 'மொழி';
-$labels['timezone'] = 'நேர மண்டலம்';
-$labels['pagesize'] = 'ஒரு பக்கத்திற்கான வரிகள்';
+$labels['setdefault']  = 'இயல்பை அமை';
+$labels['autodetect']  = 'தானியங்கி';
+$labels['language']  = 'மொழி';
+$labels['timezone']  = 'நேர மண்டலம்';
+$labels['pagesize']  = 'ஒரு பக்கத்திற்கான வரிகள்';
 $labels['signature'] = 'கையொப்பம்';
-$labels['dstactive'] = 'பகல் ஒளி சேமிப்பு நேரம்';
+$labels['dstactive']  = 'பகல் ஒளி சேமிப்பு நேரம்';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML செய்திகளை எழுது';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML கையொப்பம்';
 $labels['previewpane'] = 'முந்திய பாத்தியை காட்டு';
 $labels['skin'] = 'முகப்பு தோற்றம்';
@@ -220,33 +408,43 @@ $labels['mailboxview'] = 'அஞ்சல் பெட்டி காட்ச�
 $labels['mdnrequests'] = 'அனுப்புனர் அறிவிப்புகள்';
 $labels['askuser'] = 'பயனரை கேள்';
 $labels['autosend'] = 'தானாக அனுப்பு';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'தவிர்';
 $labels['readwhendeleted'] = 'செய்தியை நீக்கும் போது படித்ததாக குறி';
 $labels['flagfordeletion'] = 'நீக்குவதற்கு பதிலாக நீக்குவதாக நட்சத்திரமிடு';
 $labels['skipdeleted'] = 'நீக்கிய செய்திகளை காட்டாதே';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'தொலை தூர துணை படங்களை காட்டு';
 $labels['fromknownsenders'] = 'தெரிந்த அனுப்புனரிடமிருந்து';
 $labels['always'] = 'எப்போதும்';
 $labels['showinlineimages'] = 'இணைத்த படங்களை செய்திகளுக்கு கீழே காட்டவும்';
-$labels['autosavedraft'] = 'தானாக வரைவுகளை சேமி';
-$labels['everynminutes'] = 'ஒவ்வொரு $n நிமிடங்களுக்கும்';
-$labels['never'] = 'எப்போதுமில்லை';
+$labels['autosavedraft']  = 'தானாக வரைவுகளை சேமி';
+$labels['everynminutes']  = 'ஒவ்வொரு $n நிமிடங்களுக்கும்';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'எப்போதுமில்லை';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'செய்திகளை காட்டுகிறது';
 $labels['messagescomposition'] = 'செய்திகளை எழுதுகிறது';
 $labels['mimeparamfolding'] = 'இணைப்பு பெயர்கள்';
 $labels['2231folding'] = 'முழு RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'முழு RFC 2047 (மற்ற)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'மேம்பட்ட விருப்பங்கள்';
 $labels['focusonnewmessage'] = 'உலாவி சாளரத்தை புது செய்திக்காக கவனி';
 $labels['checkallfolders'] = 'புது செய்திகளுக்காக எல்லா அடைவுகளையும் சரிபார்';
 $labels['displaynext'] = 'செய்தியை நீக்கு/நகர் பிறகு அடுத்த செய்தியை காட்டு';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'முக்கிய விருப்பங்கள்';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'பிரிவு';
 $labels['maintenance'] = 'பராமரிப்பு';
 $labels['newmessage'] = 'புது செய்தி';
 $labels['signatureoptions'] = 'கையொப்ப விருப்பங்கள்';
 $labels['whenreplying'] = 'பதிலளிக்கும் போது';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'புது செய்தியை அசலின் மேல் துவக்கு';
 $labels['replybottomposting'] = 'புது செய்தியை அசலின் கீழ் துவக்கு';
 $labels['replyremovesignature'] = 'பதிலளிக்கும் போது அசல் கையெழுத்தை செய்தியிலிருந்து நீக்கவும்';
@@ -257,19 +455,82 @@ $labels['replysignaturepos'] = 'பதிலளிக்கும் போ�
 $labels['belowquote'] = 'மேற்கோளுக்கு கீழே';
 $labels['abovequote'] = 'மேற்கோளுக்கு மேலே';
 $labels['insertsignature'] = 'கையோப்பமிடு';
-$labels['folder'] = 'அடைவு';
-$labels['foldername'] = 'அடைவு பெயர்';
-$labels['subscribed'] = 'சந்தா';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'அடைவு';
+$labels['folders']  = 'அடைவுகள்';
+$labels['foldername']  = 'அடைவு பெயர்';
+$labels['subscribed']  = 'சந்தா';
 $labels['messagecount'] = 'செய்திகள்';
-$labels['create'] = 'உருவாக்கு';
-$labels['createfolder'] = 'புது அடைவு உருவாக்கு';
-$labels['managefolders'] = 'அடைவுகளை நிற்வகி';
+$labels['create']  = 'உருவாக்கு';
+$labels['createfolder']  = 'புது அடைவு உருவாக்கு';
+$labels['managefolders']  = 'அடைவுகளை நிற்வகி';
 $labels['specialfolders'] = 'சிறப்பு அடைவுகள்';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'வாரியாக அடுக்கு';
-$labels['sortasc'] = 'ஏறு வரிசையாக அடுக்கு';
+$labels['sortasc']  = 'ஏறு வரிசையாக அடுக்கு';
 $labels['sortdesc'] = 'இறங்கு வரிசையாக அடுக்கு';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index 7322542c2..c06765435 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -2,30 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ta_IN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'நுழைவு தோல்வியடைந்தது';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'நுழைவு தோல்வியடைந்தது';
 $messages['cookiesdisabled'] = 'உங்கள் உலாவி நினைவிகளை அனுமதிப்பதில்லை';
 $messages['sessionerror'] = 'உங்கள் அமர்வு செல்லாது அல்லது முடிவுற்றது';
 $messages['storageerror'] = 'IMAP சேவையகத்திற்கான இணைப்பு தோல்வியடைந்தது';
 $messages['servererror'] = 'சேவையக பிழை!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
 $messages['invalidrequest'] = 'செல்லாத வேண்டுகோள்! எந்த தரவும் சேமிக்கப்படவில்லை.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'இந்த தபால் பெட்டியில் எந்த தரவும் சேமிக்கப்படவில்லை';
 $messages['loggedout'] = 'நீங்கள் அமர்வை வெற்றிகரமாக முடித்தீர்கள். வணக்கம்';
 $messages['mailboxempty'] = 'தபால் பெட்டி காலியாக உள்ளது';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'ஏற்றுகிறது...';
 $messages['uploading'] = 'கோப்பை ஏற்றுகிறது...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'தரவை ஏற்றுகிறது...';
 $messages['checkingmail'] = 'புது செய்திகளை சரிபார்க்கிறது...';
 $messages['sendingmessage'] = 'செய்தியை அனுப்புகிறது...';
@@ -35,41 +46,54 @@ $messages['messagesaved'] = 'செய்தி வரைவில் சேம�
 $messages['successfullysaved'] = 'வெற்றிகரமாக சேமிக்கப்பட்டது';
 $messages['addedsuccessfully'] = 'தொடர்பு சேமிக்கப்பட்டது';
 $messages['contactexists'] = 'இந்த மின்னஞ்சல் முகவரியுடன் ஒரு தொடர்பு ஏற்கனவே உள்ளது';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'உங்கள் தனிப்பட்ட தகவலை பாதுகாக்க, தொலை தூரப் படங்கள் இந்த செய்தியில் தடுக்கப்பட்டது';
 $messages['encryptedmessage'] = 'மன்னிக்கவும்! இந்த செய்தி குறிமுறையாக்கப்பட்டது அதனால் காட்ட முடியாது.';
 $messages['nocontactsfound'] = 'எந்த தொடர்புகளும் காணப்படவில்லை';
 $messages['contactnotfound'] = 'நீங்கள் வேண்டிய தொடர்பு காணப்படவில்லை';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'செய்தி அனுப்புவது தோல்வியுற்றது';
 $messages['senttooquickly'] = 'இந்த செய்தி அனுப்புவதற்கு முன்பு தயவு செய்து $sec வினாடி(கள்) காத்திருக்கவும்.';
 $messages['errorsavingsent'] = 'அனுப்பிய அஞ்சலை சேமிக்கும் போது பிழை ஏற்பட்டது';
 $messages['errorsaving'] = 'சேமிக்கும் போது பிழை ஏற்பட்டது';
 $messages['errormoving'] = 'செய்தியை நகர்த்த முடியவில்லை';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'செய்தியை நீக்க முடியவில்லை';
 $messages['errormarking'] = 'செய்தியை நட்சத்திரமிட முடியவில்லை';
-$messages['deletecontactconfirm'] = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளை நீக்க விரும்புகிறீர்களா ?';
+$messages['deletecontactconfirm']  = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளை நீக்க விரும்புகிறீர்களா ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'நீங்கள் தேர்ந்தெடுத்த செய்திகளை நீக்க விரும்புகிறீர்களா ?';
-$messages['deletefolderconfirm'] = 'நீங்கள் இந்த அடைவை நீக்க விரும்புகிறீர்களா ?';
-$messages['purgefolderconfirm'] = 'நீங்கள் இந்த அடைவிலிருக்கும் எல்லா செய்திகளையும் நீக்க விரும்புகிறீர்களா ?';
+$messages['deletefolderconfirm']  = 'நீங்கள் இந்த அடைவை நீக்க விரும்புகிறீர்களா ?';
+$messages['purgefolderconfirm']  = 'நீங்கள் இந்த அடைவிலிருக்கும் எல்லா செய்திகளையும் நீக்க விரும்புகிறீர்களா ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'அடைவை நீக்குகிறது...';
 $messages['foldermoving'] = 'அடைவை நகர்த்துகிறது...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'விண்ணப்பத்தை முழுமையாக நிறைவு செய்யவில்லை';
 $messages['noemailwarning'] = 'தயவு செய்து உண்மையான மின்னஞ்சலை எழுதுங்கள்';
-$messages['nonamewarning'] = 'தயவு செய்து பெயரை எழுதுங்கள்';
+$messages['nonamewarning']  = 'தயவு செய்து பெயரை எழுதுங்கள்';
 $messages['nopagesizewarning'] = 'தயவு செய்து தாழின் அளவை எழுதுங்கள்';
 $messages['nosenderwarning'] = 'தயவு செய்து ஒரு அனுப்புனரின் மின்னஞ்சல் முகவரியாவது எழுதுங்கள்';
 $messages['norecipientwarning'] = 'தயவு செய்து ஒரு பெறுனரையாவது எழுதுங்கள்';
-$messages['nosubjectwarning'] = 'தலைப்பு காலியாக உள்ளது. இப்போது எழுத விரும்புகிறீர்களா?';
+$messages['nosubjectwarning']  = 'தலைப்பு காலியாக உள்ளது. இப்போது எழுத விரும்புகிறீர்களா?';
 $messages['nobodywarning'] = 'உரையில்லாமல் இந்த செய்தியை அனுப்ப வேண்டுமா?';
 $messages['notsentwarning'] = 'செய்தி அனுப்பப்படவில்லை. உங்கள் செய்தியை நிராகரிக்க விரும்புகிறீர்களா?';
 $messages['noldapserver'] = 'தயவு செய்து தேடுவதற்கு Idap சேவையகத்தை தேர்ந்தெடுங்கள்';
 $messages['nosearchname'] = 'தயவு செய்து தொடர்பின் பெயரோ மின்னஞ்சல் முகவரியோ எழுதுங்கள்';
 $messages['notuploadedwarning'] = 'எல்லா இணைப்புகளும் ஏற்றப்படவில்லை. தயவு செய்து காத்திருங்கள் அல்லது ஏற்றத்தை ரத்து செய்யுங்கள்.';
 $messages['searchsuccessful'] = '$nr செய்திகள் கண்டுபிடிக்கப்பட்டது';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'தேடுதல் எந்த பொருத்தத்தையும் அனுப்பவில்லை';
 $messages['searching'] = 'தேடுகிறது...';
 $messages['checking'] = 'சரி பார்க்கிறது...';
 $messages['nospellerrors'] = 'எழுத்து பிழைகள் இல்லை';
 $messages['folderdeleted'] = 'அடைவு வெற்றிகரமாக நீக்கப்பட்டது';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'வெற்றிகரமாக நீக்கப்பட்டது';
 $messages['converting'] = 'வடிவத்தை நீக்குகிறது...';
 $messages['messageopenerror'] = 'சேவையகத்திலிருந்து செய்தியை ஏற்ற முடியவில்லை';
@@ -80,15 +104,26 @@ $messages['copyerror'] = 'எந்த முகவரியையும் ந�
 $messages['sourceisreadonly'] = 'இந்த முகவரியின் மூலத்தை படிக்க மட்டும்தான் முடியும்';
 $messages['errorsavingcontact'] = 'தொடர்பு முகவரியை சேமிக்க முடியவில்லை';
 $messages['movingmessage'] = 'செய்தியை நகர்த்துகிறது...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'படித்த சீட்டு வெற்றிகரமாக அனுப்பப்பட்டது';
 $messages['errorsendingreceipt'] = 'சீட்டை அனுப்ப முடியவில்லை';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'நீங்கள் இந்த அடையாளத்தை நீக்க முடியாது இது தான் கடைசி';
 $messages['forbiddencharacter'] = 'அடைவு பெயரில் தடை செய்யப்பட்ட எழுத்துக்கள் உள்ளது';
 $messages['selectimportfile'] = 'தயவு செய்து ஏற்றுவதற்கு ஒரு கோப்பை தேர்ந்தெடுங்கள்';
 $messages['addresswriterror'] = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளில் எழுத முடியாது';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'ஏற்றுகிறது, தயவு செய்து காத்திருங்கள்...';
-$messages['importerror'] = 'ஏற்றுவது தோல்வியடைந்தது! ஏற்றிய கோப்பு ஒரு செல்லுபடியாகும் vCard கோப்பு இல்லை';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>வெற்றிகரமாக $inserted தொடர்புகள் ஏற்றப்பட்டது, ஏற்கனவே உள்ள $skipped தொடர்புகள் தவிர்க்கப்பட்டது</b>: <p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'பணி அனுமதிக்கப்படவில்லை!';
 $messages['nofromaddress'] = 'நீங்கள் தேர்ந்தெடுத்த அடையாளத்தில் மின்னஞ்சல் இல்லை';
 $messages['editorwarning'] = 'எளிய உரை திருத்திக்கு மாறுவதன் மூலம் எல்லா உரை வடிவங்களும் தொலைந்து போகக் கூடும். தொடர விரும்புகிறீர்களா ?';
@@ -100,4 +135,35 @@ $messages['smtptoerror'] = 'SMTP பிழை ($code): "$to" பெறுனர�
 $messages['smtprecipientserror'] = 'SMTP பிழை : பெறுனர் பட்டியலை பிரிக்க முடியவில்லை';
 $messages['smtperror'] = 'SMTP பிழை: $msg';
 $messages['emailformaterror'] = 'தவறான மின்னஞ்சல் முகவரி: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index aa7e53880..f96bafa66 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -2,54 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/th_TH/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'ยินดีต้อนรับสู่ $product';
-$labels['username'] = 'บัญชีผู้ใช้';
-$labels['password'] = 'รหัสผ่าน';
-$labels['server'] = 'เซิร์ฟเวอร์';
-$labels['login'] = 'เข้าสู่ระบบ';
-$labels['logout'] = 'ออกจากระบบ';
-$labels['mail'] = 'อีเมล์';
+
+// login page
+$labels['welcome']   = 'ยินดีต้อนรับสู่ $product';
+$labels['username']  = 'บัญชีผู้ใช้';
+$labels['password']  = 'รหัสผ่าน';
+$labels['server']    = 'เซิร์ฟเวอร์';
+$labels['login']     = 'เข้าสู่ระบบ';
+
+// taskbar
+$labels['logout']   = 'ออกจากระบบ';
+$labels['mail']     = 'อีเมล์';
 $labels['settings'] = 'ปรับแต่งค่าส่วนตัว';
 $labels['addressbook'] = 'สมุดรายชื่อ';
-$labels['inbox'] = 'กล่องขาเข้า';
+
+// mailbox names
+$labels['inbox']  = 'กล่องขาเข้า';
 $labels['drafts'] = 'กล่องจดหมายร่าง';
-$labels['sent'] = 'กล่องขาออก';
-$labels['trash'] = 'ถังขยะ';
-$labels['junk'] = 'กล่องจดหมายขยะ';
+$labels['sent']   = 'กล่องขาออก';
+$labels['trash']  = 'ถังขยะ';
+$labels['junk']   = 'กล่องจดหมายขยะ';
+
+// message listing
 $labels['subject'] = 'หัวจดหมาย';
-$labels['from'] = 'ผู้ส่ง';
-$labels['to'] = 'ผู้รับ';
-$labels['cc'] = 'คัดลอก';
-$labels['bcc'] = 'แอบสำเนาถึง';
+$labels['from']    = 'ผู้ส่ง';
+$labels['sender']  = 'ผู้ส่ง';
+$labels['to']      = 'ผู้รับ';
+$labels['cc']      = 'คัดลอก';
+$labels['bcc']     = 'แอบสำเนาถึง';
 $labels['replyto'] = 'ตอบกลับ';
-$labels['date'] = 'วันที่';
-$labels['size'] = 'ขนาด';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'วันที่';
+$labels['size']    = 'ขนาด';
 $labels['priority'] = 'ระดับความสำคัญ';
 $labels['organization'] = 'องค์กร';
+$labels['readstatus'] = 'สถานะการเปิดอ่าน';
+$labels['listoptions'] = 'ตัวเลือกการแสดงรายการ';
+
 $labels['mailboxlist'] = 'กล่องจดหมาย';
-$labels['folders'] = 'กล่องจดหมาย';
 $labels['messagesfromto'] = 'จดหมายจาก $from ถึง $to จำนวน $count ฉบับ';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'จดหมายฉบับที่ $nr จาก $count ฉบับ';
-$labels['copy'] = 'คัดลอก';
-$labels['move'] = 'เลื่อน';
-$labels['moveto'] = 'ย้ายไป...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'คัดลอก';
+$labels['move']     = 'เลื่อน';
+$labels['moveto']   = 'ย้ายไป...';
 $labels['download'] = 'ดาวน์โหลด';
 $labels['showattachment'] = 'แสดง';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ชื่อไฟล์';
 $labels['filesize'] = 'ขนาดไฟล์';
+
 $labels['addtoaddressbook'] = 'บันทึกในสมุดรายชื่อ';
+
+// weekdays short
 $labels['sun'] = 'อ';
 $labels['mon'] = 'จ';
 $labels['tue'] = 'อ';
@@ -57,132 +80,457 @@ $labels['wed'] = 'พ';
 $labels['thu'] = 'พฤ';
 $labels['fri'] = 'ศ';
 $labels['sat'] = 'ส';
-$labels['sunday'] = 'วันอาทิตย์';
-$labels['monday'] = 'วันจันทร์';
-$labels['tuesday'] = 'วันอังคาร';
+
+// weekdays long
+$labels['sunday']    = 'วันอาทิตย์';
+$labels['monday']    = 'วันจันทร์';
+$labels['tuesday']   = 'วันอังคาร';
 $labels['wednesday'] = 'วันพุธ';
-$labels['thursday'] = 'วันพฤหัสบดี';
-$labels['friday'] = 'วันศุกร์';
-$labels['saturday'] = 'วันเสาร์';
-$labels['jan'] = 'ม.ค.';
-$labels['feb'] = 'ก.พ.';
-$labels['mar'] = 'มี.ค.';
-$labels['apr'] = 'เม.ย.';
-$labels['may'] = 'พ.ค.';
-$labels['longmay'] = 'พ.ค.';
-$labels['jun'] = 'มิ.ย.';
-$labels['jul'] = 'ก.ค.';
-$labels['aug'] = 'ส.ค.';
-$labels['sep'] = 'ก.ย.';
-$labels['oct'] = 'ต.ค.';
-$labels['nov'] = 'พ.ย.';
-$labels['dec'] = 'ธ.ค.';
-$labels['longjan'] = 'มกราคม';
-$labels['longfeb'] = 'กุมภาพันธ์';
-$labels['longmar'] = 'มีนาคม';
-$labels['longapr'] = 'เมษายน';
-$labels['longjun'] = 'มิถุนายน';
-$labels['longjul'] = 'กรกฎาคม';
-$labels['longaug'] = 'สิงหาคม';
-$labels['longsep'] = 'กันยายน';
-$labels['longoct'] = 'ตุลาคม';
-$labels['longnov'] = 'พฤศจิกายน';
-$labels['longdec'] = 'ธันวาคม';
+$labels['thursday']  = 'วันพฤหัสบดี';
+$labels['friday']    = 'วันศุกร์';
+$labels['saturday']  = 'วันเสาร์';
+
+// months short
+$labels['jan']	= 'ม.ค.';
+$labels['feb']	= 'ก.พ.';
+$labels['mar']	= 'มี.ค.';
+$labels['apr']	= 'เม.ย.';
+$labels['may']	= 'พ.ค.';
+$labels['jun']	= 'มิ.ย.';
+$labels['jul'] 	= 'ก.ค.';
+$labels['aug']	= 'ส.ค.';
+$labels['sep']	= 'ก.ย.';
+$labels['oct']	= 'ต.ค.';
+$labels['nov']	= 'พ.ย.';
+$labels['dec']	= 'ธ.ค.';
+
+// months long
+$labels['longjan']	= 'มกราคม';
+$labels['longfeb']	= 'กุมภาพันธ์';
+$labels['longmar']	= 'มีนาคม';
+$labels['longapr']	= 'เมษายน';
+$labels['longmay']	= 'พ.ค.';
+$labels['longjun']	= 'มิถุนายน';
+$labels['longjul']	= 'กรกฎาคม';
+$labels['longaug']	= 'สิงหาคม';
+$labels['longsep']	= 'กันยายน';
+$labels['longoct']	= 'ตุลาคม';
+$labels['longnov']	= 'พฤศจิกายน';
+$labels['longdec']	= 'ธันวาคม';
+
 $labels['today'] = 'วันนี้';
-$labels['checkmail'] = 'ตรวจสอบจดหมายใหม่';
-$labels['compose'] = 'เขียนจดหมายใหม่';
-$labels['writenewmessage'] = 'สร้างจดหมายใหม่';
-$labels['replytomessage'] = 'ตอบกลับจดหมาย';
+
+// toolbar buttons
+$labels['refresh']          = 'รีเฟรช';
+$labels['checkmail']        = 'ตรวจสอบจดหมายใหม่';
+$labels['compose']          = 'เขียนจดหมายใหม่';
+$labels['writenewmessage']  = 'สร้างจดหมายใหม่';
+$labels['reply']            = 'ตอบกลับ';
+$labels['replytomessage']   = 'ตอบกลับจดหมาย';
 $labels['replytoallmessage'] = 'ตอบกลับถึงทุกคนในจดหมาย';
-$labels['forwardmessage'] = 'ส่งต่อจดหมาย';
-$labels['deletemessage'] = 'ลบจดหมาย';
-$labels['printmessage'] = 'พิมพ์จดหมาย';
-$labels['previousmessage'] = 'แสดงจดหมายฉบับที่แล้ว';
-$labels['firstmessage'] = 'แสดงจดหมายฉบับแรก';
-$labels['nextmessage'] = 'แสดงจดหมายฉบับต่อไป';
-$labels['lastmessage'] = 'แสดงจดหมายฉบับล่าสุด';
-$labels['backtolist'] = 'กลับไปยังรายการจดหมาย';
-$labels['viewsource'] = 'แสดง source';
+$labels['replyall']         = 'ตอบกลับทั้งหมด';
+$labels['replylist']        = 'รายชื่อตอบกลับ';
+$labels['forward']          = 'ส่งต่อ';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'ส่งต่อเป็นไฟล์แนบ';
+$labels['forwardmessage']   = 'ส่งต่อจดหมาย';
+$labels['deletemessage']    = 'ลบจดหมาย';
+$labels['movemessagetotrash'] = 'ย้ายข้อความไปไว้ในถังขยะ';
+$labels['printmessage']     = 'พิมพ์จดหมาย';
+$labels['previousmessage']  = 'แสดงจดหมายฉบับที่แล้ว';
+$labels['firstmessage']     = 'แสดงจดหมายฉบับแรก';
+$labels['nextmessage']      = 'แสดงจดหมายฉบับต่อไป';
+$labels['lastmessage']      = 'แสดงจดหมายฉบับล่าสุด';
+$labels['backtolist']       = 'กลับไปยังรายการจดหมาย';
+$labels['viewsource']       = 'แสดง source';
+$labels['mark']             = 'ทำเครื่องหมาย';
+$labels['markmessages']     = 'ทำเครื่องหมายข้อความ';
+$labels['markread']         = 'ว่าอ่านแล้ว';
+$labels['markunread']       = 'ว่ายังไม่ได้อ่าน';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'การกระทำเพิ่มเติม...';
+$labels['more']             = 'เพิ่มเติม';
+$labels['back']             = 'ย้อนกลับ';
+$labels['options']          = 'ตัวเลือก';
+
 $labels['select'] = 'เลือก';
 $labels['all'] = 'ทั้งหมด';
 $labels['none'] = 'ไม่เลือก';
-$labels['nonesort'] = 'ไม่เลือก';
+$labels['currpage'] = 'หน้าปัจจุบัน';
 $labels['unread'] = 'จดหมายที่ไม่ได้อ่าน';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'ยังไม่ได้ตอบ';
+$labels['deleted'] = 'ลบแล้ว';
+$labels['undeleted'] = 'ยังไม่ได้ลบ';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'ตัวกรองข้อมูล';
+$labels['list'] = 'รายการ';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'แสดงทั้งหมด';
+$labels['expand-unread'] = 'แสดงเฉพาะที่ยังไม่ได้อ่าน';
+$labels['collapse-all'] = 'ปิดทั้งหมด';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'จาก/ถึง';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'ไฟล์แนบ';
+$labels['nonesort'] = 'ไม่เลือก';
+$labels['sentdate'] = 'วันที่ส่ง';
+$labels['arrival'] = 'วันที่มาถึง';
+$labels['asc'] = 'เรียงจากน้อยมามาก';
+$labels['desc'] = 'เรีียงจากมากไปน้อย';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'จัดเรียงคอลัมน์';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'แบบย่อ';
 $labels['empty'] = 'ว่างเปล่า';
+
 $labels['quota'] = 'พื้นที่ใช้งาน';
-$labels['unknown'] = 'ไม่ทราบ';
-$labels['unlimited'] = 'ไม่จำกัด';
-$labels['quicksearch'] = 'ค้นหาแบบด่วน';
-$labels['resetsearch'] = 'ล้างการค้นหา';
-$labels['sendmessage'] = 'ส่งจดหมาย';
-$labels['savemessage'] = 'บันทึกฉบับร่าง';
-$labels['addattachment'] = 'แนบไฟล์';
-$labels['charset'] = 'Charset';
-$labels['returnreceipt'] = 'ตอบกลับผู้รับ';
+$labels['unknown']  = 'ไม่ทราบ';
+$labels['unlimited']  = 'ไม่จำกัด';
+
+$labels['quicksearch']  = 'ค้นหาแบบด่วน';
+$labels['resetsearch']  = 'ล้างการค้นหา';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'เนื้อหา';
+
+$labels['openinextwin'] = 'Open in new window';
+$labels['emlsave'] = 'Download (.eml)';
+
+// message compose
+$labels['editasnew']      = 'Edit as new';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'ส่งจดหมาย';
+$labels['savemessage']    = 'บันทึกฉบับร่าง';
+$labels['addattachment']  = 'แนบไฟล์';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'ตอบกลับผู้รับ';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ตรวจสอบคำผิด';
 $labels['resumeediting'] = 'แก้ไขต่อ';
-$labels['revertto'] = 'ย้นกลับไปยัง';
+$labels['revertto']      = 'ย้นกลับไปยัง';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ไฟล์แนบ';
 $labels['upload'] = 'อัพโหลด';
-$labels['close'] = 'ปิด';
-$labels['low'] = 'ต่ำ';
-$labels['lowest'] = 'ต่ำสุด';
-$labels['normal'] = 'ปกติ';
-$labels['high'] = 'สูง';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'ปิด';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'ต่ำ';
+$labels['lowest']  = 'ต่ำสุด';
+$labels['normal']  = 'ปกติ';
+$labels['high']    = 'สูง';
 $labels['highest'] = 'สูงสุด';
-$labels['nosubject'] = '(ไม่มีหัวข้อ)';
+
+$labels['nosubject']  = '(ไม่มีหัวข้อ)';
 $labels['showimages'] = 'แสดงรูป';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
-$labels['name'] = 'ชื่อแสดง';
-$labels['firstname'] = 'ชื่อ';
-$labels['surname'] = 'สกุล';
-$labels['email'] = 'อีเมล์';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'ชื่อแสดง';
+$labels['firstname']    = 'ชื่อ';
+$labels['surname']      = 'สกุล';
+$labels['middlename']   = 'ชื่อกลาง';
+$labels['nameprefix']   = 'คำนำหน้า';
+$labels['namesuffix']   = 'คำต่อท้ายชื่อ';
+$labels['nickname']     = 'ชื่อเล่น';
+$labels['jobtitle']     = 'ตำแหน่งงาน';
+$labels['department']   = 'แผนก';
+$labels['gender']       = 'เพศ';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'อีเมล์';
+$labels['phone']        = 'โทรศัพท์';
+$labels['address']      = 'ที่อยู่';
+$labels['street']       = 'ถนน';
+$labels['locality']     = 'เมือง';
+$labels['zipcode']      = 'รหัสไปรษณีย์';
+$labels['region']       = 'รัฐ/จังหวัด';
+$labels['country']      = 'ประเทศ';
+$labels['birthday']     = 'วันเกิด';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'เว็บไซต์';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'ชาย';
+$labels['female'] = 'หญิง';
+$labels['manager'] = 'ผู้จัดการ';
+$labels['assistant'] = 'ผู้ช่วย';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'ช่องข้อมูลทั้่งหมด';
+$labels['search'] = 'ค้นหา';
+$labels['advsearch'] = 'ค้นหาขั้นสูง';
+$labels['advanced'] = 'ขั้นสูง';
+$labels['other'] = 'อื่นๆ';
+
+$labels['typehome']   = 'บ้าน';
+$labels['typework']   = 'สถานที่ทำงาน';
+$labels['typeother']  = 'อื่นๆ';
+$labels['typemobile']  = 'มือถือ';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'โทรสารที่บ้าน';
+$labels['typeworkfax']  = 'โทรสารที่ทำงาน';
+$labels['typecar']  = 'รถ';
+$labels['typepager']  = 'เพจเจอร์';
+$labels['typevideo']  = 'วีดีโอ';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'โฮมเพจ';
+$labels['typeblog'] = 'บล็อก';
+$labels['typeprofile'] = 'โปรไฟล์';
+
+$labels['addfield'] = 'เพิ่มช่องข้อมูล...';
 $labels['addcontact'] = 'เพิ่มรายชื่อ';
 $labels['editcontact'] = 'แก้ไขรายชื่อ';
-$labels['edit'] = 'แก้ไข';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'แก้ไข';
 $labels['cancel'] = 'ยกเลิก';
-$labels['save'] = 'บันทึก';
+$labels['save']   = 'บันทึก';
 $labels['delete'] = 'ลบ';
-$labels['newcontact'] = 'สร้างรายชื่อใหม่';
-$labels['deletecontact'] = 'ลบรายชื่อที่เลือก';
-$labels['composeto'] = 'เขียนจดหมายถึง';
+$labels['rename'] = 'เปลี่ยนชื่อ';
+$labels['addphoto'] = 'เพิ่ม';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'สร้างรายชื่อใหม่';
+$labels['deletecontact']  = 'ลบรายชื่อที่เลือก';
+$labels['composeto']      = 'เขียนจดหมายถึง';
 $labels['contactsfromto'] = 'รายชื่อ $from ถึง $to จำนวน $count';
-$labels['print'] = 'พิมพ์';
-$labels['export'] = 'ส่งออก';
-$labels['previouspage'] = 'หน้าที่แล้ว';
-$labels['nextpage'] = 'หน้าถัดไป';
+$labels['print']          = 'พิมพ์';
+$labels['export']         = 'ส่งออก';
+$labels['exportall']      = 'ส่งออกทั้งหมด';
+$labels['exportsel']      = 'ส่งออกเฉพาะที่เลือก';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'หน้าที่แล้ว';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'หน้าถัดไป';
+$labels['lastpage']       = 'Show last page';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'ตั้งค่าสำหรับ';
+$labels['about'] = 'About';
 $labels['preferences'] = 'ปรับแต่ง';
 $labels['userpreferences'] = 'ข้อมูลส่วนตัว';
 $labels['editpreferences'] = 'แก้ไขข้อมูลส่วนตัว';
+
 $labels['identities'] = 'ชื่อแสดงตัว';
 $labels['manageidentities'] = 'จัดการชื่อแสดงตัวสำหรับรายชื่อนี้';
 $labels['newidentity'] = 'ชื่อแสดงตัวใหม่';
+
 $labels['newitem'] = 'New item';
 $labels['edititem'] = 'Edit item';
+
 $labels['preferhtml'] = 'อ่านแบบ HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'จดหมาย HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'แสดงวันที่แบบย่อ';
-$labels['setdefault'] = 'ตั้งเป็นค่าใช้งาน';
-$labels['language'] = 'ภาษา';
-$labels['timezone'] = 'เขตเวลา';
-$labels['pagesize'] = 'จำนวนจดหมายต่อหน้า';
+$labels['setdefault']  = 'ตั้งเป็นค่าใช้งาน';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'ภาษา';
+$labels['timezone']  = 'เขตเวลา';
+$labels['pagesize']  = 'จำนวนจดหมายต่อหน้า';
 $labels['signature'] = 'ลายมือชื่อ';
-$labels['dstactive'] = 'Daylight savings';
+$labels['dstactive']  = 'Daylight savings';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'เขียนจดหมายแบบ HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ลายมือชื่อแบบ HTML';
 $labels['previewpane'] = 'แสดงหน้าต่างตัวอย่างแสดงผล';
-$labels['autosavedraft'] = 'บันทึกเป็นจดหมายร่างอัตโนมัติ';
-$labels['never'] = 'ไม่ใช้';
-$labels['folder'] = 'กล่องจดหมาย';
-$labels['foldername'] = 'ชื่อกล่องจดหมาย';
-$labels['subscribed'] = 'ลงชื่อ';
-$labels['create'] = 'สร้าง';
-$labels['createfolder'] = 'สร้างกล่องจดหมาย';
-$labels['managefolders'] = 'จัดการกล่องจดหมาย';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'บันทึกเป็นจดหมายร่างอัตโนมัติ';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'ไม่ใช้';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'ตัวเลือกขั้นสูง';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'ข้อความใหม่';
+$labels['signatureoptions'] = 'ตัวเลือกสำหรับลายเซ็็นต์';
+$labels['whenreplying'] = 'เมื่อตอบกลับ';
+$labels['replyempty'] = 'do not quote the original message';
+$labels['replytopposting'] = 'start new message above the quote';
+$labels['replybottomposting'] = 'start new message below the quote';
+$labels['replyremovesignature'] = 'When replying remove original signature from message';
+$labels['autoaddsignature'] = 'เพิ่มลายเซ็นต์เข้าไปอัตโนมัติ';
+$labels['newmessageonly'] = 'เฉพาะข้อความใหม่เท่านั้น';
+$labels['replyandforwardonly'] = 'ตอบกลับและส่งต่อเท่านั้น';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = 'แทรกลายเซ็นต์';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'เป็นไฟล์แนบ';
+
+$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'] = 'Location';
+$labels['info'] = 'ข้อมูล';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'ประเภทโฟลเดอร์';
+$labels['personalfolder']  = 'โฟลเดอร์ส่วนตัว';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'โฟลเดอร์สาธารณะ';
+
 $labels['sortby'] = 'เรียงตาม';
-$labels['sortasc'] = 'เรียงจากหน้าไปหลัง';
+$labels['sortasc']  = 'เรียงจากหน้าไปหลัง';
 $labels['sortdesc'] = 'เรียงจากหลังไปหน้า';
+$labels['undo'] = 'เลิกทำ';
+
+$labels['installedplugins'] = 'ปลั๊กอินที่ติดตั้ง';
+$labels['plugin'] = 'ปลั๊กอิน';
+$labels['version'] = 'รุ่น';
+$labels['source'] = 'Source';
+$labels['license'] = 'สัญญาอนุญาต';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 5673b031b..1b78b7d60 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/th_TH/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ไม่สามารถเข้าสู่ระบบได้';
+$messages['errortitle']  = 'เกิดข้อผิดพลาดบางประการ!';
+$messages['loginfailed']  = 'ไม่สามารถเข้าสู่ระบบได้';
 $messages['cookiesdisabled'] = 'Browser ของคุณไม่ได้เปิดการใช้งาน Cookie ไว้';
 $messages['sessionerror'] = 'Your session is invalid or expired';
 $messages['storageerror'] = 'ไม่สามารถติดต่อ IMAP Server ได้';
+$messages['servererror'] = 'เกิดข้อผิดพลาดเกี่ยวกับเซิร์ฟเวอร์';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$messages['dberror'] = 'เกิดข้อผิดพลาดเกี่ยวกับฐานข้อมูล';
+$messages['requesttimedout'] = 'Request timed out';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['invalidrequest'] = 'Invalid request! No data was saved.';
+$messages['invalidhost'] = 'ชื่อเซิร์ฟเวอร์ไม่ถูกต้อง';
 $messages['nomessagesfound'] = 'ไม่มีจดหมายในกล่องจดหมายนี้';
 $messages['loggedout'] = 'ทำการออกจากระบบเรียบร้อย';
 $messages['mailboxempty'] = 'กล่องจดหมายนี้ว่างเปล่า';
+$messages['refreshing'] = 'กำลังรีเฟรช...';
 $messages['loading'] = 'Loading...';
+$messages['uploading'] = 'กำลังอัพโหลดไฟล์...';
+$messages['uploadingmany'] = 'กำลังอัพโหลดไฟล์...';
 $messages['loadingdata'] = 'กำลังโหลดข้อมูล...';
 $messages['checkingmail'] = 'กำลังเช็คจดหมายใหม่...';
 $messages['sendingmessage'] = 'กำลังส่งจดหมาย...';
@@ -32,34 +46,54 @@ $messages['messagesaved'] = 'จดหมายถูกบันทึกเป
 $messages['successfullysaved'] = 'บันทึกเรียบร้อยแล้ว';
 $messages['addedsuccessfully'] = 'รายชื่อถูกบันทึกเรียบร้อยแล้ว';
 $messages['contactexists'] = 'อีเมล์นี้มีอยู่แล้ว';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'เพื่อปกป้องความส่วนตัว รูปจากภายนอกในจดหมายนี้จะถูกปิดบังไว้';
 $messages['encryptedmessage'] = 'จดหมายถูกเข้ารหัสไม่สามารถแสดงผลได้';
 $messages['nocontactsfound'] = 'ไม่พบรายชื่อที่ค้นหา';
 $messages['contactnotfound'] = 'ไม่พบรายชื่อที่ค้นหา';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'การส่งจดหมายล้มเหลว';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'เกิดข้อผิดพลาดระหว่างการบันทึก';
 $messages['errormoving'] = 'ไม่สามารถย้ายจดหมายได้';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'ไม่สามารถลบจดหมายได้';
-$messages['deletecontactconfirm'] = 'คุณมั่นใจที่ต้องการลบรายชื่อที่เลือกใช่หรือไม่?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'คุณมั่นใจที่ต้องการลบรายชื่อที่เลือกใช่หรือไม่?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'คุณมั่นใจที่ต้องการลบจดหมายที่เลือกใช่หรือไม่?';
-$messages['deletefolderconfirm'] = 'คุณมั่นใจที่ต้องการลบแฟ้มนี้หรือไม่?';
-$messages['purgefolderconfirm'] = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
+$messages['deletefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบแฟ้มนี้หรือไม่?';
+$messages['purgefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
+$messages['contactdeleting'] = 'กำลังลบรายชื่อผู้ติดต่อ...';
+$messages['groupdeleting'] = 'กำลังลบกลุ่ม...';
+$messages['folderdeleting'] = 'กำลังลบโฟลเดอร์...';
+$messages['foldermoving'] = 'กำลังย้ายโฟลเดอร์...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'ฟอร์มยังไม่ครบถ้วนสมบูรณ์';
 $messages['noemailwarning'] = 'โปรดใส่อีเมล์ให้ถูกต้อง';
-$messages['nonamewarning'] = 'โปรดใส่ชื่อ';
+$messages['nonamewarning']  = 'โปรดใส่ชื่อ';
 $messages['nopagesizewarning'] = 'โปรดใส่จำนวนหน้า';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'โปรดใส่ผู้รับอย่างน้อย 1 ชื่อ';
-$messages['nosubjectwarning'] = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
+$messages['nosubjectwarning']  = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
 $messages['nobodywarning'] = 'คุณต้องการส่งจดหมายโดยไม่มีข้อความใช่หรือไม่?';
 $messages['notsentwarning'] = 'จดหมายยังไม่ถูกส่ง คุณต้องการยกเลิกหรือไม่?';
 $messages['noldapserver'] = 'โปรดเลือก LDAP Server เพื่อค้นหา';
 $messages['nosearchname'] = 'โปรดใสชื่อหรืออีเมล์';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'พบจดหมายจำนวน $nr ฉบับ';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'การค้นหาไม่พบ';
 $messages['searching'] = 'กำลังค้นหา...';
 $messages['checking'] = 'กำลังตรวจสอบ...';
 $messages['nospellerrors'] = 'ไม่พบคำที่สะกดผิด';
 $messages['folderdeleted'] = 'ลบแฟ้มเสร็จสมบูรณ์';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'ลบเสร็จสมบูรณ์';
 $messages['converting'] = 'นำเอาหารจัดรูปแบบในจดหมายออก...';
 $messages['messageopenerror'] = 'ไม่สามารถอ่านจดหมายจาก Server ได้';
@@ -69,4 +103,67 @@ $messages['copysuccess'] = 'คัดลอกจดหมายจำนวน
 $messages['copyerror'] = 'ไม่สามารถคัดลอกได้';
 $messages['sourceisreadonly'] = 'จดหมายนี้เป็นแบบอ่านอย่างเดียว';
 $messages['errorsavingcontact'] = 'ไม่สามารถบันทึกรายชื่อได้';
+$messages['movingmessage'] = 'กำลังย้ายข้อความ...';
+$messages['copyingmessage'] = 'กำลังคัดลอกข้อความ...';
+$messages['copyingcontact'] = 'กำลังคัดลอกรายชื่อผู้ติดต่อ...';
+$messages['deletingmessage'] = 'กำลังลบข้อความ...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'กำลังนำเข้าข้อมูล, โปรดรอสักครู่';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$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['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$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/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index dfac9010e..6937f2a1e 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -2,60 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product, Hoş Geldiniz';
-$labels['username'] = 'Kullanıcı Adı';
-$labels['password'] = 'Parola';
-$labels['server'] = 'Sunucu';
-$labels['login'] = 'Oturum Aç';
-$labels['logout'] = 'Oturumu Kapat';
-$labels['mail'] = 'E-Posta';
+
+// login page
+$labels['welcome']   = '$product, Hoş Geldiniz';
+$labels['username']  = 'Kullanıcı Adı';
+$labels['password']  = 'Parola';
+$labels['server']    = 'Sunucu';
+$labels['login']     = 'Oturum Aç';
+
+// taskbar
+$labels['logout']   = 'Oturumu Kapat';
+$labels['mail']     = 'E-Posta';
 $labels['settings'] = 'Kişisel Ayarlar';
 $labels['addressbook'] = 'Adres Defteri';
-$labels['inbox'] = 'Gelen';
+
+// mailbox names
+$labels['inbox']  = 'Gelen';
 $labels['drafts'] = 'Taslaklar';
-$labels['sent'] = 'Giden';
-$labels['trash'] = 'Çöp';
-$labels['junk'] = 'İstenmeyen';
+$labels['sent']   = 'Giden';
+$labels['trash']  = 'Çöp';
+$labels['junk']   = 'İstenmeyen';
+
+// message listing
 $labels['subject'] = 'Konu';
-$labels['from'] = 'Gönderen';
-$labels['to'] = 'Alıcı';
-$labels['cc'] = 'İlgili Kopyası';
-$labels['bcc'] = 'Gizli Kopya';
+$labels['from']    = 'Gönderen';
+$labels['sender']  = 'Gönderici';
+$labels['to']      = 'Alıcı';
+$labels['cc']      = 'İlgili Kopyası';
+$labels['bcc']     = 'Gizli Kopya';
 $labels['replyto'] = 'Yanıtla';
 $labels['followupto'] = 'Takip adresi';
-$labels['date'] = 'Tarih';
-$labels['size'] = 'Boyut';
+$labels['date']    = 'Tarih';
+$labels['size']    = 'Boyut';
 $labels['priority'] = 'Öncelik';
 $labels['organization'] = 'Kuruluş';
 $labels['readstatus'] = 'Okunma durumu';
 $labels['listoptions'] = 'Seçenekleri listele...';
+
 $labels['mailboxlist'] = 'Klasörler';
-$labels['folders'] = 'Klasörler';
 $labels['messagesfromto'] = 'Postalar: $from - $to , Toplam: $count';
 $labels['threadsfromto'] = 'Postalar: $from - $to, Toplam $count';
 $labels['messagenrof'] = 'Posta: $nr / $count';
 $labels['fromtoshort'] = '$from - $to , Toplam: $count';
-$labels['copy'] = 'Kopyala';
-$labels['move'] = 'Taşı';
-$labels['moveto'] = 'Şuraya taşı...';
+
+$labels['copy']     = 'Kopyala';
+$labels['move']     = 'Taşı';
+$labels['moveto']   = 'Şuraya taşı...';
 $labels['download'] = 'İndir';
 $labels['showattachment'] = 'Göster';
 $labels['showanyway'] = 'Yine de göster';
+
 $labels['filename'] = 'Dosya Adı';
 $labels['filesize'] = 'Dosya Boyutu';
+
 $labels['addtoaddressbook'] = 'Adres Defterine Ekle';
+
+// weekdays short
 $labels['sun'] = 'Paz';
 $labels['mon'] = 'Pzt';
 $labels['tue'] = 'Sal';
@@ -63,74 +80,83 @@ $labels['wed'] = 'Çrş';
 $labels['thu'] = 'Per';
 $labels['fri'] = 'Cum';
 $labels['sat'] = 'Cts';
-$labels['sunday'] = 'Paz';
-$labels['monday'] = 'Pazartesi';
-$labels['tuesday'] = 'Salı';
+
+// weekdays long
+$labels['sunday']    = 'Paz';
+$labels['monday']    = 'Pazartesi';
+$labels['tuesday']   = 'Salı';
 $labels['wednesday'] = 'Çarşamba';
-$labels['thursday'] = 'Perşembe';
-$labels['friday'] = 'Cuma';
-$labels['saturday'] = 'Cumartesi';
-$labels['jan'] = 'Oca';
-$labels['feb'] = 'Şub';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Nis';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'Haz';
-$labels['jul'] = 'Tem';
-$labels['aug'] = 'Ağu';
-$labels['sep'] = 'Eyl';
-$labels['oct'] = 'Eki';
-$labels['nov'] = 'Kas';
-$labels['dec'] = 'Ara';
-$labels['longjan'] = 'Ocak';
-$labels['longfeb'] = 'Şubat';
-$labels['longmar'] = 'Mart';
-$labels['longapr'] = 'Nisan';
-$labels['longjun'] = 'Haziran';
-$labels['longjul'] = 'Temmuz';
-$labels['longaug'] = 'Ağustos';
-$labels['longsep'] = 'Eylül';
-$labels['longoct'] = 'Ekim';
-$labels['longnov'] = 'Kasım';
-$labels['longdec'] = 'Aralık';
+$labels['thursday']  = 'Perşembe';
+$labels['friday']    = 'Cuma';
+$labels['saturday']  = 'Cumartesi';
+
+// months short
+$labels['jan']	= 'Oca';
+$labels['feb']	= 'Şub';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Nis';
+$labels['may']	= 'May';
+$labels['jun']	= 'Haz';
+$labels['jul'] 	= 'Tem';
+$labels['aug']	= 'Ağu';
+$labels['sep']	= 'Eyl';
+$labels['oct']	= 'Eki';
+$labels['nov']	= 'Kas';
+$labels['dec']	= 'Ara';
+
+// months long
+$labels['longjan']	= 'Ocak';
+$labels['longfeb']	= 'Şubat';
+$labels['longmar']	= 'Mart';
+$labels['longapr']	= 'Nisan';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'Haziran';
+$labels['longjul']	= 'Temmuz';
+$labels['longaug']	= 'Ağustos';
+$labels['longsep']	= 'Eylül';
+$labels['longoct']	= 'Ekim';
+$labels['longnov']	= 'Kasım';
+$labels['longdec']	= 'Aralık';
+
 $labels['today'] = 'Bugün';
-$labels['refresh'] = 'Yenile';
-$labels['checkmail'] = 'Yeni Postaları Kontrol Et';
-$labels['compose'] = 'E-Posta Yaz';
-$labels['writenewmessage'] = 'Yeni posta oluştur';
-$labels['reply'] = 'Yanıtla';
-$labels['replytomessage'] = 'Gönderene Yanıt Ver';
+
+// toolbar buttons
+$labels['refresh']          = 'Yenile';
+$labels['checkmail']        = 'Yeni Postaları Kontrol Et';
+$labels['compose']          = 'E-Posta Yaz';
+$labels['writenewmessage']  = 'Yeni posta oluştur';
+$labels['reply']            = 'Yanıtla';
+$labels['replytomessage']   = 'Gönderene Yanıt Ver';
 $labels['replytoallmessage'] = 'Gönderene ve Tüm Alıcılara Yanıt Ver';
-$labels['replyall'] = 'Tümüne Yanıt Ver';
-$labels['replylist'] = 'Listeye Yanıt Ver';
-$labels['forward'] = 'İlet';
-$labels['forwardinline'] = 'Postanın içinde ilet';
+$labels['replyall']         = 'Tümüne Yanıt Ver';
+$labels['replylist']        = 'Listeye Yanıt Ver';
+$labels['forward']          = 'İlet';
+$labels['forwardinline']    = 'Postanın içinde ilet';
 $labels['forwardattachment'] = 'Eklenti Olarak İlet';
-$labels['forwardmessage'] = 'Postayı İlet';
-$labels['deletemessage'] = 'Postayı Sil';
+$labels['forwardmessage']   = 'Postayı İlet';
+$labels['deletemessage']    = 'Postayı Sil';
 $labels['movemessagetotrash'] = 'Postayı Çöpe Taşı';
-$labels['printmessage'] = 'Bu Postayı Yazdır';
-$labels['previousmessage'] = 'Önceki Postayı Göster';
-$labels['firstmessage'] = 'İlk Postayı Göster';
-$labels['nextmessage'] = 'Sonraki Postayı Göster';
-$labels['lastmessage'] = 'Son Postayı Göster';
-$labels['backtolist'] = 'Posta Listesine Dön';
-$labels['viewsource'] = 'Kaynağı Göster';
-$labels['mark'] = 'İşaretle';
-$labels['markmessages'] = 'Postaları İşaretle';
-$labels['markread'] = 'Okunmuş Olarak';
-$labels['markunread'] = 'Okunmamış Olarak';
-$labels['markflagged'] = 'İşaretli Olarak';
-$labels['markunflagged'] = 'İşaretsiz Olarak';
-$labels['moreactions'] = 'Diğer İşlemler';
-$labels['more'] = 'Daha Fazla';
-$labels['back'] = 'Geri';
-$labels['options'] = 'Seçenekler';
+$labels['printmessage']     = 'Bu Postayı Yazdır';
+$labels['previousmessage']  = 'Önceki Postayı Göster';
+$labels['firstmessage']     = 'İlk Postayı Göster';
+$labels['nextmessage']      = 'Sonraki Postayı Göster';
+$labels['lastmessage']      = 'Son Postayı Göster';
+$labels['backtolist']       = 'Posta Listesine Dön';
+$labels['viewsource']       = 'Kaynağı Göster';
+$labels['mark']             = 'İşaretle';
+$labels['markmessages']     = 'Postaları İşaretle';
+$labels['markread']         = 'Okunmuş Olarak';
+$labels['markunread']       = 'Okunmamış Olarak';
+$labels['markflagged']      = 'İşaretli Olarak';
+$labels['markunflagged']    = 'İşaretsiz Olarak';
+$labels['moreactions']      = 'Diğer İşlemler';
+$labels['more']             = 'Daha Fazla';
+$labels['back']             = 'Geri';
+$labels['options']          = 'Seçenekler';
+
 $labels['select'] = 'Seç';
 $labels['all'] = 'Hepsini';
 $labels['none'] = 'Yok';
-$labels['nonesort'] = 'Yok';
 $labels['currpage'] = 'Şimdiki sayfa';
 $labels['unread'] = 'Okunmamışları';
 $labels['flagged'] = 'İşaretlenmişleri';
@@ -145,12 +171,14 @@ $labels['expand-all'] = 'Tümünü genişlet';
 $labels['expand-unread'] = 'Okunmamışları genişlet';
 $labels['collapse-all'] = 'Tümünü daralt';
 $labels['threaded'] = 'Dizilimli';
+
 $labels['autoexpand_threads'] = 'Dizilimleri aç';
 $labels['do_expand'] = 'tüm dizilimler';
 $labels['expand_only_unread'] = 'sadece okunmamış posta içeren dizilimler';
 $labels['fromto'] = 'Gönderici/Alıcı';
 $labels['flag'] = 'İşaret';
 $labels['attachment'] = 'Eklenti';
+$labels['nonesort'] = 'Yok';
 $labels['sentdate'] = 'Gönderim tarihi';
 $labels['arrival'] = 'Alım tarihi';
 $labels['asc'] = 'artan';
@@ -159,147 +187,174 @@ $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['folderactions'] = 'Klasör eylemleri...';
 $labels['compact'] = 'Sıklaştır';
 $labels['empty'] = 'Boşalt';
+
 $labels['quota'] = 'Disk kullanımı';
-$labels['unknown'] = 'bilinmeyen';
-$labels['unlimited'] = 'sınırsız';
-$labels['quicksearch'] = 'Hızlı arama';
-$labels['resetsearch'] = 'Aramayı bitir';
-$labels['searchmod'] = 'Arama detayları';
-$labels['msgtext'] = 'Tüm posta gövdesi';
+$labels['unknown']  = 'bilinmeyen';
+$labels['unlimited']  = 'sınırsız';
+
+$labels['quicksearch']  = 'Hızlı arama';
+$labels['resetsearch']  = 'Aramayı bitir';
+$labels['searchmod']  = 'Arama detayları';
+$labels['msgtext']  = 'Tüm posta gövdesi';
+$labels['body']  = 'Gövde';
+
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
-$labels['editasnew'] = 'Postayı yeni olarak düzenle';
-$labels['send'] = 'Gönder';
-$labels['sendmessage'] = 'Postayı gönder';
-$labels['savemessage'] = 'Taslak olarak kaydet';
-$labels['addattachment'] = 'Dosya ekle';
-$labels['charset'] = 'Karakter kodlaması';
-$labels['editortype'] = 'Düzenleyici';
-$labels['returnreceipt'] = 'Alındı onayı';
-$labels['dsn'] = 'Teslimat durumu bildirisi';
+
+// message compose
+$labels['editasnew']      = 'Postayı yeni olarak düzenle';
+$labels['send']           = 'Gönder';
+$labels['sendmessage']    = 'Postayı gönder';
+$labels['savemessage']    = 'Taslak olarak kaydet';
+$labels['addattachment']  = 'Dosya ekle';
+$labels['charset']        = 'Karakter kodlaması';
+$labels['editortype']     = 'Düzenleyici';
+$labels['returnreceipt']  = 'Alındı onayı';
+$labels['dsn']            = 'Teslimat durumu bildirisi';
 $labels['mailreplyintro'] = '$date, $sender yazmış:';
 $labels['originalmessage'] = 'Özgün ileti';
-$labels['editidents'] = 'Kimlikleri düzenle';
-$labels['spellcheck'] = 'Yazım denetimi';
+
+$labels['editidents']    = 'Kimlikleri düzenle';
+$labels['spellcheck']    = 'Yazım denetimi';
 $labels['checkspelling'] = 'Yazım denetimi yap';
 $labels['resumeediting'] = 'Düzenlemeye devam et';
-$labels['revertto'] = 'Geri çevir:';
+$labels['revertto']      = 'Geri çevir:';
+
 $labels['attach'] = 'Ekle';
 $labels['attachments'] = 'Ekler';
 $labels['upload'] = 'Yükle';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = 'Kapat';
-$labels['messageoptions'] = 'İleti seçenekleri...';
-$labels['low'] = 'Düşük';
-$labels['lowest'] = 'En Düşük';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Yüksek';
+$labels['close']  = 'Kapat';
+$labels['messageoptions']  = 'İleti seçenekleri...';
+
+$labels['low']     = 'Düşük';
+$labels['lowest']  = 'En Düşük';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Yüksek';
 $labels['highest'] = 'En yüksek';
-$labels['nosubject'] = '(Konu Belirtilmemiş)';
+
+$labels['nosubject']  = '(Konu Belirtilmemiş)';
 $labels['showimages'] = 'Resimleri göster';
 $labels['alwaysshow'] = '$sender tarafından gönderilen resimleri her zaman göster';
-$labels['isdraft'] = 'Bu posta taslaktır.';
-$labels['andnmore'] = '$nr daha...';
+$labels['isdraft']    = 'Bu posta taslaktır.';
+$labels['andnmore']   = '$nr daha...';
 $labels['togglemoreheaders'] = 'Daha fazla posta başlığı göster';
 $labels['togglefullheaders'] = 'Posta başlıklarını göster/gizle';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Düz metin';
 $labels['savesentmessagein'] = 'Gönderileni buraya kaydet';
 $labels['dontsave'] = 'kaydetme';
 $labels['maxuploadsize'] = 'İzin verilen en büyük dosya boyutu $size';
+
 $labels['addcc'] = 'İlgili kopyası ekle';
 $labels['addbcc'] = 'Gizli kopya ekle';
 $labels['addreplyto'] = 'Yanıtlama adresi ekle';
 $labels['addfollowupto'] = 'Takip adresi ekle';
+
+// mdn
 $labels['mdnrequest'] = 'Bu postayı gönderen kişi, postayı okuduğunuza dair alındı onayı istedi. Alındı onayını göndermek ister misiniz ?';
 $labels['receiptread'] = 'Alındı Onayı (okundu)';
 $labels['yourmessage'] = 'Bu, postanız için alındı onayıdır';
 $labels['receiptnote'] = 'Not: Bu alındı onayı sadece postanızın alıcının bilgisayarında gösterildiğini belirtir. Alıcının posta içeriğini okuduğunu veya anladığını garantilemez.';
-$labels['name'] = 'Görüntülenen isim';
-$labels['firstname'] = 'Ad';
-$labels['surname'] = 'Soyad';
-$labels['middlename'] = 'Göbek adı';
-$labels['nameprefix'] = 'Ön ek';
-$labels['namesuffix'] = 'Son ek';
-$labels['nickname'] = 'Takma ad';
-$labels['jobtitle'] = 'Ünvan';
-$labels['department'] = 'Bölüm';
-$labels['gender'] = 'Cinsiyet';
-$labels['maidenname'] = 'Eski soyadı';
-$labels['email'] = 'E-Posta';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adres';
-$labels['street'] = 'Sokak';
-$labels['locality'] = 'Şehir';
-$labels['zipcode'] = 'Posta Kodu';
-$labels['region'] = 'Bölge';
-$labels['country'] = 'Ülke';
-$labels['birthday'] = 'Doğum günü';
-$labels['anniversary'] = 'Yıl dönümü';
-$labels['website'] = 'Web sayfası';
+
+// address boook
+$labels['name']         = 'Görüntülenen isim';
+$labels['firstname']    = 'Ad';
+$labels['surname']      = 'Soyad';
+$labels['middlename']   = 'Göbek adı';
+$labels['nameprefix']   = 'Ön ek';
+$labels['namesuffix']   = 'Son ek';
+$labels['nickname']     = 'Takma ad';
+$labels['jobtitle']     = 'Ünvan';
+$labels['department']   = 'Bölüm';
+$labels['gender']       = 'Cinsiyet';
+$labels['maidenname']   = 'Eski soyadı';
+$labels['email']        = 'E-Posta';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adres';
+$labels['street']       = 'Sokak';
+$labels['locality']     = 'Şehir';
+$labels['zipcode']      = 'Posta Kodu';
+$labels['region']       = 'Bölge';
+$labels['country']      = 'Ülke';
+$labels['birthday']     = 'Doğum günü';
+$labels['anniversary']  = 'Yıl dönümü';
+$labels['website']      = 'Web sayfası';
 $labels['instantmessenger'] = 'Anında mesajlaşma';
 $labels['notes'] = 'Notlar';
-$labels['male'] = 'erkek';
+$labels['male']   = 'erkek';
 $labels['female'] = 'kadın';
 $labels['manager'] = 'Yönetici';
 $labels['assistant'] = 'Asistan';
-$labels['typeassistant'] = 'Asistan';
 $labels['spouse'] = 'Eş';
 $labels['allfields'] = 'Tüm alanlar';
 $labels['search'] = 'Ara';
 $labels['advsearch'] = 'Gelişmiş ara';
 $labels['advanced'] = 'Gelişmiş';
 $labels['other'] = 'Diğer';
-$labels['typeother'] = 'Diğer';
-$labels['typehome'] = 'Ev';
-$labels['typework'] = 'İş';
-$labels['typemobile'] = 'Cep telefonu';
-$labels['typemain'] = 'Ana';
-$labels['typehomefax'] = 'Ev Faks';
-$labels['typeworkfax'] = 'İş Faks';
-$labels['typecar'] = 'Araba';
-$labels['typepager'] = 'Çağrı cihazı';
-$labels['typevideo'] = 'Görüntülü';
-$labels['typehomepage'] = 'Ev sayfası';
+
+$labels['typehome']   = 'Ev';
+$labels['typework']   = 'İş';
+$labels['typeother']  = 'Diğer';
+$labels['typemobile']  = 'Cep telefonu';
+$labels['typemain']  = 'Ana';
+$labels['typehomefax']  = 'Ev Faks';
+$labels['typeworkfax']  = 'İş Faks';
+$labels['typecar']  = 'Araba';
+$labels['typepager']  = 'Çağrı cihazı';
+$labels['typevideo']  = 'Görüntülü';
+$labels['typeassistant']  = 'Asistan';
+$labels['typehomepage']  = 'Ev sayfası';
 $labels['typeblog'] = 'Günlük';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Alan ekle...';
 $labels['addcontact'] = 'Adres defterine ekle';
 $labels['editcontact'] = 'Kişiyi düzenle';
 $labels['contacts'] = 'Kişiler';
 $labels['contactproperties'] = 'Kişi özellikleri';
 $labels['personalinfo'] = 'Kişisel bilgiler';
-$labels['edit'] = 'Düzenle';
+
+$labels['edit']   = 'Düzenle';
 $labels['cancel'] = 'İptal';
-$labels['save'] = 'Kaydet';
+$labels['save']   = 'Kaydet';
 $labels['delete'] = 'Sil';
 $labels['rename'] = 'Yeniden adlandır';
 $labels['addphoto'] = 'Ekle';
 $labels['replacephoto'] = 'Değiştir';
 $labels['uploadphoto'] = 'Fotoğraf yükle';
-$labels['newcontact'] = 'Yeni adres kartı ekle';
-$labels['deletecontact'] = 'Seçili kişileri sil';
-$labels['composeto'] = 'Seçili kişiye posta gönder';
+
+$labels['newcontact']     = 'Yeni adres kartı ekle';
+$labels['deletecontact']  = 'Seçili kişileri sil';
+$labels['composeto']      = 'Seçili kişiye posta gönder';
 $labels['contactsfromto'] = 'Kişiler: $from - $to , Toplam: $count';
-$labels['print'] = 'Yazdır';
-$labels['export'] = 'Dışa aktar';
-$labels['exportvcards'] = 'vCard olarak dışa aktar';
+$labels['print']          = 'Yazdır';
+$labels['export']         = 'Dışa aktar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'vCard olarak dışa aktar';
 $labels['newcontactgroup'] = 'Yeni kişi grubu oluştur';
-$labels['grouprename'] = 'Grubu yeniden adlandır';
-$labels['groupdelete'] = 'Grubu sil';
+$labels['grouprename']    = 'Grubu yeniden adlandır';
+$labels['groupdelete']    = 'Grubu sil';
 $labels['groupremoveselected'] = 'Seçili kişileri gruptan sil';
-$labels['previouspage'] = 'Öncekileri göster';
-$labels['firstpage'] = 'İlkini göster';
-$labels['nextpage'] = 'Sonrakileri göster';
-$labels['lastpage'] = 'Sonuncuyu göster';
+
+$labels['previouspage']   = 'Öncekileri göster';
+$labels['firstpage']      = 'İlkini göster';
+$labels['nextpage']       = 'Sonrakileri göster';
+$labels['lastpage']       = 'Sonuncuyu göster';
+
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Gruplar';
 $labels['personaladrbook'] = 'Adresler';
+
 $labels['searchsave'] = 'Aramayı kaydet';
 $labels['searchdelete'] = 'Aramayı sil';
+
 $labels['import'] = 'İçe aktar';
 $labels['importcontacts'] = 'Kişileri içe aktar';
 $labels['importfromfile'] = 'Dosyadan içe aktar:';
@@ -307,29 +362,36 @@ $labels['importtarget'] = 'Yeni kişiler eklenecek adres defteri:';
 $labels['importreplace'] = 'Tüm adres defterinin yerine geçsin';
 $labels['importdesc'] = 'Mevcut bir adres defterinden kişileri yükleyebilirsiniz.<br/> Şu anda <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> veya CSV (virgülle ayrılmış) veri formatları desteklenmektedir.';
 $labels['done'] = 'Tamam';
+
+// settings
 $labels['settingsfor'] = 'Ayarlar';
 $labels['about'] = 'Hakkında';
 $labels['preferences'] = 'Tercihler';
 $labels['userpreferences'] = 'Kullanıcı tercihleri';
 $labels['editpreferences'] = 'Kullanıcı tercihlerini düzenle';
+
 $labels['identities'] = 'Kimlikler';
 $labels['manageidentities'] = 'Bu hesap için kimlikleri düzenle';
 $labels['newidentity'] = 'Yeni kimlik';
+
 $labels['newitem'] = 'Yeni öğe';
 $labels['edititem'] = 'Öğe düzenle';
+
 $labels['preferhtml'] = 'HTML görüntüle';
 $labels['defaultcharset'] = 'Varsayılan Karakter Kümesi';
 $labels['htmlmessage'] = 'HTML Posta';
+$labels['messagepart'] = 'Parça';
+$labels['digitalsig'] = 'Dijital İmza';
 $labels['dateformat'] = 'Tarih biçimi';
 $labels['timeformat'] = 'Zaman biçimi';
 $labels['prettydate'] = 'Tarihi kısaltarak göster';
-$labels['setdefault'] = 'Varsayılan olarak ata';
-$labels['autodetect'] = 'Otomatik';
-$labels['language'] = 'Dil';
-$labels['timezone'] = 'Saat dilimi';
-$labels['pagesize'] = 'Bir sayfadaki satır sayısı';
+$labels['setdefault']  = 'Varsayılan olarak ata';
+$labels['autodetect']  = 'Otomatik';
+$labels['language']  = 'Dil';
+$labels['timezone']  = 'Saat dilimi';
+$labels['pagesize']  = 'Bir sayfadaki satır sayısı';
 $labels['signature'] = 'İmza';
-$labels['dstactive'] = 'Yaz saati uygulaması';
+$labels['dstactive']  = 'Yaz saati uygulaması';
 $labels['showinextwin'] = 'Postayı yeni pencerede aç';
 $labels['composeextwin'] = 'Postayı yeni pencerede yaz';
 $labels['htmleditor'] = 'HTML postaları oluştur';
@@ -358,11 +420,11 @@ $labels['showremoteimages'] = 'Uzaktan yüklenen resimleri göster';
 $labels['fromknownsenders'] = 'bilinen göndericilerden';
 $labels['always'] = 'her zaman';
 $labels['showinlineimages'] = 'Postanın ekindeki resimleri postanın altında göster';
-$labels['autosavedraft'] = 'Taslağı otomatik kaydet:';
-$labels['everynminutes'] = 'her $n dakikada bir';
-$labels['refreshinterval'] = 'Yenile (yeni postaları kontrol et, vb.)';
-$labels['never'] = 'asla';
-$labels['immediately'] = 'hemen';
+$labels['autosavedraft']  = 'Taslağı otomatik kaydet:';
+$labels['everynminutes']  = 'her $n dakikada bir';
+$labels['refreshinterval']  = 'Yenile (yeni postaları kontrol et, vb.)';
+$labels['never']  = 'asla';
+$labels['immediately']  = 'hemen';
 $labels['messagesdisplaying'] = 'Posta Görüntüleme';
 $labels['messagescomposition'] = 'Yeni Posta Oluşturma';
 $labels['mimeparamfolding'] = 'Eklenti isimleri';
@@ -393,8 +455,8 @@ $labels['replysignaturepos'] = 'Yanıtlarken veya yönlendirirken imzayı yerle�
 $labels['belowquote'] = 'alıntının altına';
 $labels['abovequote'] = 'alıntının üstüne';
 $labels['insertsignature'] = 'İmza ekle';
-$labels['previewpanemarkread'] = 'Önzilemede görünen postaları okunmuş işaretle';
-$labels['afternseconds'] = '$n saniye sonra';
+$labels['previewpanemarkread']  = 'Önzilemede görünen postaları okunmuş işaretle';
+$labels['afternseconds']  = '$n saniye sonra';
 $labels['reqmdn'] = 'Her zaman alındı onayı iste';
 $labels['reqdsn'] = 'Her zaman teslimat durumu bildirisi iste';
 $labels['replysamefolder'] = 'Yanıtları, yanıtlanan postanın bulunduğu klasöre kaydet';
@@ -411,13 +473,15 @@ $labels['mailtoprotohandler'] = 'mailto: bağlantıları için protokol işleyic
 $labels['forwardmode'] = 'Posta yönlendirme';
 $labels['inline'] = 'postanın içinde';
 $labels['asattachment'] = 'ek olarak';
-$labels['folder'] = 'Klasör';
-$labels['foldername'] = 'Klasör Adı';
-$labels['subscribed'] = 'Abonelik';
+
+$labels['folder']  = 'Klasör';
+$labels['folders']  = 'Klasörler';
+$labels['foldername']  = 'Klasör Adı';
+$labels['subscribed']  = 'Abonelik';
 $labels['messagecount'] = 'Postalar';
-$labels['create'] = 'Oluştur';
-$labels['createfolder'] = 'Yeni Klasör Oluştur';
-$labels['managefolders'] = 'Klasörleri Düzenle';
+$labels['create']  = 'Oluştur';
+$labels['createfolder']  = 'Yeni Klasör Oluştur';
+$labels['managefolders']  = 'Klasörleri Düzenle';
 $labels['specialfolders'] = 'Özel Klasörler';
 $labels['properties'] = 'Özellikler';
 $labels['folderproperties'] = 'Klasör Özellikleri';
@@ -427,23 +491,29 @@ $labels['info'] = 'Bilgi';
 $labels['getfoldersize'] = 'Klasör büyüklüğünü öğrenmek için tıklayın';
 $labels['changesubscription'] = 'Abonelik durumunu değiştirmek için tıklayın';
 $labels['foldertype'] = 'Klasör Türü';
-$labels['personalfolder'] = 'Kişisel Klasör';
-$labels['otherfolder'] = 'Diğer Kullanıcıların Klasörü';
-$labels['sharedfolder'] = 'Genel Klasör';
+$labels['personalfolder']  = 'Kişisel Klasör';
+$labels['otherfolder']  = 'Diğer Kullanıcıların Klasörü';
+$labels['sharedfolder']  = 'Genel Klasör';
+
 $labels['sortby'] = 'Sırala';
-$labels['sortasc'] = 'Artarak';
+$labels['sortasc']  = 'Artarak';
 $labels['sortdesc'] = 'Azalarak';
 $labels['undo'] = 'Geri al';
+
 $labels['installedplugins'] = 'Yüklü eklentiler';
 $labels['plugin'] = 'Eklenti';
 $labels['version'] = 'Sürüm';
 $labels['source'] = 'Kaynak';
 $labels['license'] = 'Lisans';
 $labels['support'] = 'Destek Al';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'İngilizce';
 $labels['westerneuropean'] = 'Batı Avrupa';
@@ -463,3 +533,4 @@ $labels['japanese'] = 'Japonca';
 $labels['korean'] = 'Korece';
 $labels['chinese'] = 'Çince';
 
+?>
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index a9b4c616a..f3c0919c0 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Bir hata oluştu!';
-$messages['loginfailed'] = 'Giriş Başarısız';
+$messages['errortitle']  = 'Bir hata oluştu!';
+$messages['loginfailed']  = 'Giriş Başarısız';
 $messages['cookiesdisabled'] = 'Tarayıcınız çerezleri kabul etmiyor';
 $messages['sessionerror'] = 'Oturumunuz sona ermiş veya hatalı';
 $messages['storageerror'] = 'IMAP sunucusuna bağlanılamadı';
@@ -57,11 +60,11 @@ $messages['errormoving'] = 'Posta taşınamadı';
 $messages['errorcopying'] = 'Posta kopyalanamadı';
 $messages['errordeleting'] = 'Posta silinemedi';
 $messages['errormarking'] = 'Posta işaretlenemedi';
-$messages['deletecontactconfirm'] = 'Seçili kişileri silmek istediğinizden emin misiniz?';
-$messages['deletegroupconfirm'] = 'Seçili grupları silmek istediğinizden emin misiniz?';
+$messages['deletecontactconfirm']  = 'Seçili kişileri silmek istediğinizden emin misiniz?';
+$messages['deletegroupconfirm']  = 'Seçili grupları silmek istediğinizden emin misiniz?';
 $messages['deletemessagesconfirm'] = 'Seçili postaları silmek istediğinizden emin misiniz?';
-$messages['deletefolderconfirm'] = 'Bu klasörü silmek istediğinizden emin misiniz?';
-$messages['purgefolderconfirm'] = 'Bu klasördeki tüm postaları silmek istediğinizden emin misiniz?';
+$messages['deletefolderconfirm']  = 'Bu klasörü silmek istediğinizden emin misiniz?';
+$messages['purgefolderconfirm']  = 'Bu klasördeki tüm postaları silmek istediğinizden emin misiniz?';
 $messages['contactdeleting'] = 'Kişi(er) siliniyor...';
 $messages['groupdeleting'] = 'Grup siliniyor...';
 $messages['folderdeleting'] = 'Klasör siliniyor...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = 'Klasöre abone olunuyor...';
 $messages['folderunsubscribing'] = 'Klasör aboneliği kaldırılıyor...';
 $messages['formincomplete'] = 'Form tam olarak doldurulmadı';
 $messages['noemailwarning'] = 'Lütfen geçerli bir e-posta adresi girin';
-$messages['nonamewarning'] = 'Lütfen bir isim girin';
+$messages['nonamewarning']  = 'Lütfen bir isim girin';
 $messages['nopagesizewarning'] = 'Lütfen bir sayfa boyutu girin';
 $messages['nosenderwarning'] = 'Lütfen gönderici e-posta adresini girin';
 $messages['norecipientwarning'] = 'Lütfen en az bir alıcı belirtin';
-$messages['nosubjectwarning'] = '"Konu" kutusu boş bırakılmış. Şimdi bir konu belirtmek ister misiniz?';
+$messages['nosubjectwarning']  = '"Konu" kutusu boş bırakılmış. Şimdi bir konu belirtmek ister misiniz?';
 $messages['nobodywarning'] = 'Postayı boş olarak gönder?';
 $messages['notsentwarning'] = 'Posta gönderilmedi. Postanızı iptal etmek istiyor musunuz?';
 $messages['noldapserver'] = 'Lütfen arama için bir LDAP sunucu seçin';
@@ -163,3 +166,4 @@ $messages['messagetoobig'] = 'Bu ileti parçası işlenemeyecek kadar büyük.';
 $messages['attachmentvalidationerror'] = 'UYARI! Bu eklenti mesajda belirtilenden farklı olduğu için şüpheli bulundu. Eğer göndericiye güvenmiyorsanız eki web tarayıcısında açmayın. Şüpheli içerik bulunabilir.';
 $messages['noscriptwarning'] = 'Uyarı: Bu e-posta servisi Javascript gerektirmektedir! Servisi kullanabilmek için lütfen web tarayıcınızın ayarlarından Javascript\'i etkinleştiriniz.';
 
+?>
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index fd46ee5bb..d70718fcc 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -2,56 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Ласкаво просимо до $product';
-$labels['username'] = 'Ім\'я користувача';
-$labels['password'] = 'Пароль';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Увійти';
-$labels['logout'] = 'Вийти';
-$labels['mail'] = 'Пошта';
+
+// login page
+$labels['welcome']   = 'Ласкаво просимо до $product';
+$labels['username']  = 'Ім\'я користувача';
+$labels['password']  = 'Пароль';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Увійти';
+
+// taskbar
+$labels['logout']   = 'Вийти';
+$labels['mail']     = 'Пошта';
 $labels['settings'] = 'Налаштування';
 $labels['addressbook'] = 'Контакти';
-$labels['inbox'] = 'Вхідні';
+
+// mailbox names
+$labels['inbox']  = 'Вхідні';
 $labels['drafts'] = 'Чернетки';
-$labels['sent'] = 'Надіслані';
-$labels['trash'] = 'Кошик';
-$labels['junk'] = 'Спам';
+$labels['sent']   = 'Надіслані';
+$labels['trash']  = 'Кошик';
+$labels['junk']   = 'Спам';
+
+// message listing
 $labels['subject'] = 'Тема';
-$labels['from'] = 'Відправник';
-$labels['to'] = 'Кому';
-$labels['cc'] = 'Копія';
-$labels['bcc'] = 'Прихована';
+$labels['from']    = 'Відправник';
+$labels['sender']  = 'Відправник';
+$labels['to']      = 'Кому';
+$labels['cc']      = 'Копія';
+$labels['bcc']     = 'Прихована';
 $labels['replyto'] = 'Зворотня адреса';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Розмір';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Розмір';
 $labels['priority'] = 'Пріоритет';
 $labels['organization'] = 'Організація';
 $labels['readstatus'] = 'Статус прочитання';
+$labels['listoptions'] = 'Налаштування списку...';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Повідомлення з $from по $to із $count';
 $labels['threadsfromto'] = 'Обговорення з $from по $to із $count';
 $labels['messagenrof'] = 'Лист $nr із $count';
-$labels['copy'] = 'Копіювати';
-$labels['move'] = 'Перемістити';
-$labels['moveto'] = 'Перемістити до...';
+$labels['fromtoshort'] = '$from – $to з $count';
+
+$labels['copy']     = 'Копіювати';
+$labels['move']     = 'Перемістити';
+$labels['moveto']   = 'Перемістити до...';
 $labels['download'] = 'Завантажити';
+$labels['showattachment'] = 'Показати';
+$labels['showanyway'] = 'Все одно показати';
+
 $labels['filename'] = 'Ім\'я файлу';
 $labels['filesize'] = 'Розмір файлу';
+
 $labels['addtoaddressbook'] = 'Додати до контактів';
+
+// weekdays short
 $labels['sun'] = 'Нд';
 $labels['mon'] = 'Пн';
 $labels['tue'] = 'Вт';
@@ -59,72 +80,89 @@ $labels['wed'] = 'Ср';
 $labels['thu'] = 'Чт';
 $labels['fri'] = 'Пт';
 $labels['sat'] = 'Сб';
-$labels['sunday'] = 'Неділя';
-$labels['monday'] = 'Понеділок';
-$labels['tuesday'] = 'Вівторок';
+
+// weekdays long
+$labels['sunday']    = 'Неділя';
+$labels['monday']    = 'Понеділок';
+$labels['tuesday']   = 'Вівторок';
 $labels['wednesday'] = 'Середа';
-$labels['thursday'] = 'Четвер';
-$labels['friday'] = 'П\'ятниця';
-$labels['saturday'] = 'Субота';
-$labels['jan'] = 'січ';
-$labels['feb'] = 'лют';
-$labels['mar'] = 'бер';
-$labels['apr'] = 'квіт';
-$labels['may'] = 'Травень';
-$labels['longmay'] = 'Травень';
-$labels['jun'] = 'чер';
-$labels['jul'] = 'лип';
-$labels['aug'] = 'сер';
-$labels['sep'] = 'вер';
-$labels['oct'] = 'жов';
-$labels['nov'] = 'лис';
-$labels['dec'] = 'гр';
-$labels['longjan'] = 'Січень';
-$labels['longfeb'] = 'Лютий';
-$labels['longmar'] = 'Березень';
-$labels['longapr'] = 'Квітень';
-$labels['longjun'] = 'Червень';
-$labels['longjul'] = 'Липень';
-$labels['longaug'] = 'Серпень';
-$labels['longsep'] = 'Вересень';
-$labels['longoct'] = 'Жовтень';
-$labels['longnov'] = 'Листопад';
-$labels['longdec'] = 'Грудень';
+$labels['thursday']  = 'Четвер';
+$labels['friday']    = 'П\'ятниця';
+$labels['saturday']  = 'Субота';
+
+// months short
+$labels['jan']	= 'січ';
+$labels['feb']	= 'лют';
+$labels['mar']	= 'бер';
+$labels['apr']	= 'квіт';
+$labels['may']	= 'Травень';
+$labels['jun']	= 'чер';
+$labels['jul'] 	= 'лип';
+$labels['aug']	= 'сер';
+$labels['sep']	= 'вер';
+$labels['oct']	= 'жов';
+$labels['nov']	= 'лис';
+$labels['dec']	= 'гр';
+
+// months long
+$labels['longjan']	= 'Січень';
+$labels['longfeb']	= 'Лютий';
+$labels['longmar']	= 'Березень';
+$labels['longapr']	= 'Квітень';
+$labels['longmay']	= 'Травень';
+$labels['longjun']	= 'Червень';
+$labels['longjul']	= 'Липень';
+$labels['longaug']	= 'Серпень';
+$labels['longsep']	= 'Вересень';
+$labels['longoct']	= 'Жовтень';
+$labels['longnov']	= 'Листопад';
+$labels['longdec']	= 'Грудень';
+
 $labels['today'] = 'Сьогодні';
-$labels['checkmail'] = 'Перевірити пошту';
-$labels['compose'] = 'Написати листа';
-$labels['writenewmessage'] = 'Написати листа';
-$labels['replytomessage'] = 'Відповісти відправнику';
+
+// toolbar buttons
+$labels['refresh']          = 'Оновити';
+$labels['checkmail']        = 'Перевірити пошту';
+$labels['compose']          = 'Написати листа';
+$labels['writenewmessage']  = 'Написати листа';
+$labels['reply']            = 'Відповісти';
+$labels['replytomessage']   = 'Відповісти відправнику';
 $labels['replytoallmessage'] = 'Відповісти до листа або відправнику та усім отримувачам';
-$labels['replyall'] = 'Відповісти усім';
-$labels['replylist'] = 'Відповісти до листа';
-$labels['forwardinline'] = 'Переслати у тілі листа';
+$labels['replyall']         = 'Відповісти усім';
+$labels['replylist']        = 'Відповісти до листа';
+$labels['forward']          = 'Переслати';
+$labels['forwardinline']    = 'Переслати у тілі листа';
 $labels['forwardattachment'] = 'Переслати як прикріплення';
-$labels['forwardmessage'] = 'Переслати повідомлення';
-$labels['deletemessage'] = 'У кошик';
+$labels['forwardmessage']   = 'Переслати повідомлення';
+$labels['deletemessage']    = 'У кошик';
 $labels['movemessagetotrash'] = 'Перемістити лист у кошик';
-$labels['printmessage'] = 'Друкувати';
-$labels['previousmessage'] = 'Показати попередній лист';
-$labels['firstmessage'] = 'Показати перший лист';
-$labels['nextmessage'] = 'Показати наступний лист';
-$labels['lastmessage'] = 'Показати останній лист';
-$labels['backtolist'] = 'До переліку листів';
-$labels['viewsource'] = 'Вихідний текст';
-$labels['markmessages'] = 'Позначити листи';
-$labels['markread'] = 'Позначити як прочитане';
-$labels['markunread'] = 'Позначити як непрочитане';
-$labels['markflagged'] = 'Додати зірочку';
-$labels['markunflagged'] = 'Зняти зірочку';
-$labels['moreactions'] = 'Інші дії...';
+$labels['printmessage']     = 'Друкувати';
+$labels['previousmessage']  = 'Показати попередній лист';
+$labels['firstmessage']     = 'Показати перший лист';
+$labels['nextmessage']      = 'Показати наступний лист';
+$labels['lastmessage']      = 'Показати останній лист';
+$labels['backtolist']       = 'До переліку листів';
+$labels['viewsource']       = 'Вихідний текст';
+$labels['mark']             = 'Помітити';
+$labels['markmessages']     = 'Позначити листи';
+$labels['markread']         = 'Позначити як прочитане';
+$labels['markunread']       = 'Позначити як непрочитане';
+$labels['markflagged']      = 'Додати зірочку';
+$labels['markunflagged']    = 'Зняти зірочку';
+$labels['moreactions']      = 'Інші дії...';
+$labels['more']             = 'Ще';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Параметри';
+
 $labels['select'] = 'Вибрати';
 $labels['all'] = 'Всі';
 $labels['none'] = 'Не сортувати';
-$labels['nonesort'] = 'Не сортувати';
 $labels['currpage'] = 'Поточна сторінка';
 $labels['unread'] = 'Непрочитані';
 $labels['flagged'] = 'Із зірочкою';
 $labels['unanswered'] = 'Без відповіді';
 $labels['deleted'] = 'Видалені';
+$labels['undeleted'] = 'Не видалено';
 $labels['invert'] = 'Інвертувати виділення';
 $labels['filter'] = 'Фільтр';
 $labels['list'] = 'Списком';
@@ -133,12 +171,14 @@ $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'] = 'за зростанням';
@@ -147,169 +187,216 @@ $labels['listcolumns'] = 'Атрибути для відображення';
 $labels['listsorting'] = 'Сортувати за атрибутом';
 $labels['listorder'] = 'Порядок сортування';
 $labels['listmode'] = 'Режим перегляду';
+
 $labels['folderactions'] = 'Операції з папкою...';
 $labels['compact'] = 'Стиснути';
 $labels['empty'] = 'Спорожнити';
+
 $labels['quota'] = 'Використано';
-$labels['unknown'] = 'невідомо';
-$labels['unlimited'] = 'без обмеження';
-$labels['quicksearch'] = 'Швидкий пошук';
-$labels['resetsearch'] = 'Очистити пошук';
-$labels['searchmod'] = 'Де шукати';
-$labels['msgtext'] = 'В усьому листі';
+$labels['unknown']  = 'невідомо';
+$labels['unlimited']  = 'без обмеження';
+
+$labels['quicksearch']  = 'Швидкий пошук';
+$labels['resetsearch']  = 'Очистити пошук';
+$labels['searchmod']  = 'Де шукати';
+$labels['msgtext']  = 'В усьому листі';
+$labels['body']  = 'Тіло повідомлення';
+
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
-$labels['editasnew'] = 'Редагувати як новий';
-$labels['sendmessage'] = 'Надіслати зараз';
-$labels['savemessage'] = 'Зберегти чернетку';
-$labels['addattachment'] = 'Вкласти файл';
-$labels['charset'] = 'Кодування';
-$labels['editortype'] = 'Редактор';
-$labels['returnreceipt'] = 'Запит відповіді';
-$labels['dsn'] = 'Повідомлення про доставку';
+
+// message compose
+$labels['editasnew']      = 'Редагувати як новий';
+$labels['send']           = 'Відправлено';
+$labels['sendmessage']    = 'Надіслати зараз';
+$labels['savemessage']    = 'Зберегти чернетку';
+$labels['addattachment']  = 'Вкласти файл';
+$labels['charset']        = 'Кодування';
+$labels['editortype']     = 'Редактор';
+$labels['returnreceipt']  = 'Запит відповіді';
+$labels['dsn']            = 'Повідомлення про доставку';
 $labels['mailreplyintro'] = '$date, $sender написав:';
 $labels['originalmessage'] = 'Оригінальне повідомлення';
-$labels['editidents'] = 'Змінити данні';
+
+$labels['editidents']    = 'Змінити данні';
+$labels['spellcheck']    = 'Орфографія';
 $labels['checkspelling'] = 'Перевірити орфографію';
 $labels['resumeediting'] = 'Продовжити редагування';
-$labels['revertto'] = 'Відмінити редагування';
+$labels['revertto']      = 'Відмінити редагування';
+
+$labels['attach'] = 'Вкласти';
 $labels['attachments'] = 'Вкладені файли';
 $labels['upload'] = 'Вкласти';
 $labels['uploadprogress'] = '$percent ($current з $total)';
-$labels['close'] = 'Закрити';
-$labels['messageoptions'] = 'Налаштування листів';
-$labels['low'] = 'Низький';
-$labels['lowest'] = 'Найнижчий';
-$labels['normal'] = 'Нормальний';
-$labels['high'] = 'Високий';
+$labels['close']  = 'Закрити';
+$labels['messageoptions']  = 'Налаштування листів';
+
+$labels['low']     = 'Низький';
+$labels['lowest']  = 'Найнижчий';
+$labels['normal']  = 'Нормальний';
+$labels['high']    = 'Високий';
 $labels['highest'] = 'Найвищий';
-$labels['nosubject'] = '(без теми)';
+
+$labels['nosubject']  = '(без теми)';
 $labels['showimages'] = 'Показувати зображення';
 $labels['alwaysshow'] = 'Завжди показувати зображення від $sender';
-$labels['isdraft'] = 'Це чернетка.';
+$labels['isdraft']    = 'Це чернетка.';
+$labels['andnmore']   = 'ще $nr...';
+$labels['togglemoreheaders'] = 'Завантажити ще заголовки повідомлень';
+$labels['togglefullheaders'] = 'Показати оригінальні заголовки повідомлення';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Звичайний текст';
 $labels['savesentmessagein'] = 'зберегти надісланого листа в';
 $labels['dontsave'] = 'не зберігати';
 $labels['maxuploadsize'] = 'Максимальний розмір файлу $size';
+
 $labels['addcc'] = 'Додати копію';
 $labels['addbcc'] = 'Додати приховану копію';
 $labels['addreplyto'] = 'Додати зворотню адресу';
 $labels['addfollowupto'] = 'Додати Followup-To';
+
+// mdn
 $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'] = 'Веб-сайт';
+
+// address boook
+$labels['name']         = 'Ім`я для відображення';
+$labels['firstname']    = 'Ім`я';
+$labels['surname']      = 'Прізвище';
+$labels['middlename']   = 'По-батькові';
+$labels['nameprefix']   = 'Префікс';
+$labels['namesuffix']   = 'Суфікс';
+$labels['nickname']     = 'Нікнейм';
+$labels['jobtitle']     = 'Посада';
+$labels['department']   = 'Відділ';
+$labels['gender']       = 'Стать';
+$labels['maidenname']   = 'Дівоче прізвище';
+$labels['email']        = 'Електронна адреса';
+$labels['phone']        = 'Телефон';
+$labels['address']      = 'Адреса';
+$labels['street']       = 'Вулиця';
+$labels['locality']     = 'Місто';
+$labels['zipcode']      = 'Індекс';
+$labels['region']       = 'Область';
+$labels['country']      = 'Страна';
+$labels['birthday']     = 'Дата народження';
+$labels['anniversary']  = 'Ювілей';
+$labels['website']      = 'Веб-сайт';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Примітки';
-$labels['male'] = 'чоловічий';
+$labels['male']   = 'чоловічий';
 $labels['female'] = 'жіночий';
 $labels['manager'] = 'Менеждер';
 $labels['assistant'] = 'Помічник';
-$labels['typeassistant'] = 'Помічник';
 $labels['spouse'] = 'Шлюбний партнер';
 $labels['allfields'] = 'Усі поля';
 $labels['search'] = 'Пошук';
 $labels['advsearch'] = 'Розширений пошук';
+$labels['advanced'] = 'Додатково';
 $labels['other'] = 'Інше';
-$labels['typeother'] = 'Інше';
-$labels['typehome'] = 'Дім';
-$labels['typework'] = 'Робота';
-$labels['typemobile'] = 'Мобільний';
-$labels['typemain'] = 'Основний';
-$labels['typehomefax'] = 'Домашній факс';
-$labels['typeworkfax'] = 'Робочий факс';
-$labels['typecar'] = 'Автомобіль';
-$labels['typepager'] = 'Пейджер';
-$labels['typevideo'] = 'Відео';
-$labels['typehomepage'] = 'Домашня сторінка';
+
+$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['addcontact'] = 'Додати вибрані контакти до списку контактів';
 $labels['editcontact'] = 'Редагувати контакт';
 $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Властивості контакта';
 $labels['personalinfo'] = 'Особова інформація';
-$labels['edit'] = 'Правка';
+
+$labels['edit']   = 'Правка';
 $labels['cancel'] = 'Скасувати';
-$labels['save'] = 'Зберегти';
+$labels['save']   = 'Зберегти';
 $labels['delete'] = 'Видалити';
 $labels['rename'] = 'Перейменувати';
 $labels['addphoto'] = 'Додати';
 $labels['replacephoto'] = 'Замінити';
-$labels['newcontact'] = 'Створити новий контакт';
-$labels['deletecontact'] = 'Видалити вибрані контакти';
-$labels['composeto'] = 'Створити листа для вибранних контактів';
+$labels['uploadphoto'] = 'Завантажити фотографію';
+
+$labels['newcontact']     = 'Створити новий контакт';
+$labels['deletecontact']  = 'Видалити вибрані контакти';
+$labels['composeto']      = 'Створити листа для вибранних контактів';
 $labels['contactsfromto'] = 'Контакти  $from - $to / $count';
-$labels['print'] = 'Друкувати';
-$labels['export'] = 'Експортувати';
-$labels['exportvcards'] = 'Експортувати контакти у формат vCard';
+$labels['print']          = 'Друкувати';
+$labels['export']         = 'Експортувати';
+$labels['exportall']      = 'Експортувати все';
+$labels['exportsel']      = 'Експортувати виділені';
+$labels['exportvcards']   = 'Експортувати контакти у формат vCard';
 $labels['newcontactgroup'] = 'Створити нову групу контактів';
-$labels['grouprename'] = 'Перейменувати групу';
-$labels['groupdelete'] = 'Видалити групу';
-$labels['previouspage'] = 'Попередня сторінка';
-$labels['firstpage'] = 'Перша сторінка';
-$labels['nextpage'] = 'Наступна сторінка';
-$labels['lastpage'] = 'Остання сторінка';
+$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['importtarget'] = 'Додати нові контакти до адресної книги';
 $labels['importreplace'] = 'Замінити всю адресну книгу';
+$labels['importdesc'] = 'Ви можете завантажити контакти з існуючої адресної книги.<br/>В даний час ми підтримуємо імпорт адрес в форматі візитної картки <a href="http://en.wikipedia.org/wiki/VCard"> vCard</ a> або CSV (дані розділені комами).';
 $labels['done'] = 'Готово';
+
+// settings
 $labels['settingsfor'] = 'Налаштування для';
 $labels['about'] = 'Про програму';
 $labels['preferences'] = 'Параметри';
 $labels['userpreferences'] = 'Налаштування користувача';
 $labels['editpreferences'] = 'Редагувати налаштування користувача';
+
 $labels['identities'] = 'Профілі';
 $labels['manageidentities'] = 'Керування профілями';
 $labels['newidentity'] = 'Новий профіль';
+
 $labels['newitem'] = 'Новий';
 $labels['edititem'] = 'Редагувати';
+
 $labels['preferhtml'] = 'Показувати в HTML';
 $labels['defaultcharset'] = 'Кодування за замовчуваннням';
 $labels['htmlmessage'] = 'Лист у HTML';
+$labels['messagepart'] = 'Частина';
+$labels['digitalsig'] = 'Цифровий підпис';
 $labels['dateformat'] = 'Формат дати';
 $labels['timeformat'] = 'Формат часу';
 $labels['prettydate'] = 'Дати у зручному форматі';
-$labels['setdefault'] = 'Встановити за замовчуванням';
-$labels['autodetect'] = 'Визначати автоматично';
-$labels['language'] = 'Мова';
-$labels['timezone'] = 'Часовий пояс';
-$labels['pagesize'] = 'Рядків на сторінці';
+$labels['setdefault']  = 'Встановити за замовчуванням';
+$labels['autodetect']  = 'Визначати автоматично';
+$labels['language']  = 'Мова';
+$labels['timezone']  = 'Часовий пояс';
+$labels['pagesize']  = 'Рядків на сторінці';
 $labels['signature'] = 'Підпис';
-$labels['dstactive'] = 'Літній/зимовий час';
+$labels['dstactive']  = 'Літній/зимовий час';
+$labels['showinextwin'] = 'Відкрити повідомлення в новому вікні';
+$labels['composeextwin'] = 'Створити в новому вікні';
 $labels['htmleditor'] = 'Створювати листи в HTML';
 $labels['htmlonreply'] = 'тільки у відповідь на HTML повідомлення';
+$labels['htmlonreplyandforward'] = 'під час пересилання або відповіді на повідомлення HTML';
 $labels['htmlsignature'] = 'Підпис в HTML';
 $labels['previewpane'] = 'Показати панель перегляду';
 $labels['skin'] = 'Тема';
@@ -328,14 +415,16 @@ $labels['readwhendeleted'] = 'Позначати як прочитане при
 $labels['flagfordeletion'] = 'Позначати для видалення замість видалення';
 $labels['skipdeleted'] = 'Не показувати видалені листи';
 $labels['deletealways'] = 'Видаляти листи при невдалому переміщенні до кошика';
+$labels['deletejunk'] = 'Видаляти повідомлення з папки СПАМ минаючи Корзину';
 $labels['showremoteimages'] = 'Показувати віддалені зображення';
 $labels['fromknownsenders'] = 'від відомих відправників';
 $labels['always'] = 'завжди';
 $labels['showinlineimages'] = 'Показувати вкладені зображення внизу листа';
-$labels['autosavedraft'] = 'Автозбереження чернетки';
-$labels['everynminutes'] = 'кожні $n хвилин';
-$labels['never'] = 'ніколи';
-$labels['immediately'] = 'одразу';
+$labels['autosavedraft']  = 'Автозбереження чернетки';
+$labels['everynminutes']  = 'кожні $n хвилин';
+$labels['refreshinterval']  = 'Оновити (перевірити нові повідомлення, тощо)';
+$labels['never']  = 'ніколи';
+$labels['immediately']  = 'одразу';
 $labels['messagesdisplaying'] = 'Відображення листів';
 $labels['messagescomposition'] = 'Створення листів';
 $labels['mimeparamfolding'] = 'Імена вкладень';
@@ -349,11 +438,13 @@ $labels['checkallfolders'] = 'Перевіряти нові листи у всі
 $labels['displaynext'] = 'Після видалення/переміщення листа відображати наступний';
 $labels['defaultfont'] = 'Шрифт за замовчуванням HTML повідомлення';
 $labels['mainoptions'] = 'Основні налаштування';
+$labels['browseroptions'] = 'Налаштування браузера';
 $labels['section'] = 'Розділ';
 $labels['maintenance'] = 'Додатково';
 $labels['newmessage'] = 'Новий лист';
 $labels['signatureoptions'] = 'Налаштування підпису';
 $labels['whenreplying'] = 'При відповіді';
+$labels['replyempty'] = 'не цитувати оригінальне повідомлення';
 $labels['replytopposting'] = 'починати новий лист перед цитованим';
 $labels['replybottomposting'] = 'починати новий лист після цитованого';
 $labels['replyremovesignature'] = 'При відповіді видаляти первинний підпис з листа';
@@ -364,26 +455,33 @@ $labels['replysignaturepos'] = 'При відповідях чи пересил�
 $labels['belowquote'] = 'після цитати';
 $labels['abovequote'] = 'перед цитатою';
 $labels['insertsignature'] = 'Додати підпис';
-$labels['previewpanemarkread'] = 'Позначити переглянуті листи як прочитані';
-$labels['afternseconds'] = 'через $n секунд';
+$labels['previewpanemarkread']  = 'Позначити переглянуті листи як прочитані';
+$labels['afternseconds']  = 'через $n секунд';
 $labels['reqmdn'] = 'Завжди вимагати повідомлення про доставку';
 $labels['reqdsn'] = 'Завжди вимагати повідомлення про статус доставки';
 $labels['replysamefolder'] = 'Розмістити відповіді у тій же папці, де знаходиться оригінал';
-$labels['defaultaddressbook'] = 'Додати нові контакти до обраної адресної книги';
+$labels['defaultabook'] = 'Адресна книга за замовчуванням';
 $labels['autocompletesingle'] = 'Пропускати додаткові адреси в автозавершенні';
+$labels['listnamedisplay'] = 'Виводити список контактів як';
 $labels['spellcheckbeforesend'] = 'Перевірити орфографію перед відправкою повідомлення';
 $labels['spellcheckoptions'] = 'Налаштування перевірки орфографії';
 $labels['spellcheckignoresyms'] = 'Ігнорувати слова із символами';
 $labels['spellcheckignorenums'] = 'Ігнорувати слова із числами';
 $labels['spellcheckignorecaps'] = 'Ігнорувати слова із великими буквами';
 $labels['addtodict'] = 'Додати до словника';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Назва папки';
-$labels['subscribed'] = 'Підписані';
+$labels['mailtoprotohandler'] = 'Зареєструвати обробник для посилань mailto';
+$labels['forwardmode'] = 'Пересилання повідомлень';
+$labels['inline'] = 'у тексті';
+$labels['asattachment'] = 'як вкладення';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Назва папки';
+$labels['subscribed']  = 'Підписані';
 $labels['messagecount'] = 'Листи';
-$labels['create'] = 'Створити';
-$labels['createfolder'] = 'Створити нову папку';
-$labels['managefolders'] = 'Керування папками';
+$labels['create']  = 'Створити';
+$labels['createfolder']  = 'Створити нову папку';
+$labels['managefolders']  = 'Керування папками';
 $labels['specialfolders'] = 'Особливі папки';
 $labels['properties'] = 'Властивості';
 $labels['folderproperties'] = 'Властивості папки';
@@ -393,22 +491,29 @@ $labels['info'] = 'Інформація';
 $labels['getfoldersize'] = 'Показати розмір папки';
 $labels['changesubscription'] = 'Змінити підписку';
 $labels['foldertype'] = 'Тип каталогу';
-$labels['personalfolder'] = 'Приватний каталог';
-$labels['otherfolder'] = 'Каталог іншого користувача';
-$labels['sharedfolder'] = 'Публічний каталог';
+$labels['personalfolder']  = 'Приватний каталог';
+$labels['otherfolder']  = 'Каталог іншого користувача';
+$labels['sharedfolder']  = 'Публічний каталог';
+
 $labels['sortby'] = 'Відсортувати за';
-$labels['sortasc'] = 'Сортувати за зростанням';
+$labels['sortasc']  = 'Сортувати за зростанням';
 $labels['sortdesc'] = 'Сортувати за спаданням';
 $labels['undo'] = 'Відмінити';
+
+$labels['installedplugins'] = 'Встановлені плагіни';
 $labels['plugin'] = 'Доповнення';
 $labels['version'] = 'Версія';
 $labels['source'] = 'Джерело';
 $labels['license'] = 'Ліцензія';
 $labels['support'] = 'Отримати підтримку';
+
+// units
 $labels['B'] = 'б';
 $labels['KB'] = 'Кб';
 $labels['MB'] = 'Мб';
 $labels['GB'] = 'Гб';
+
+// character sets
 $labels['unicode'] = 'Юнікод';
 $labels['english'] = 'Англійське';
 $labels['westerneuropean'] = 'Західноєвропейське';
@@ -428,3 +533,4 @@ $labels['japanese'] = 'Японське';
 $labels['korean'] = 'Корейське';
 $labels['chinese'] = 'Китайське';
 
+?>
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index d3e90f777..522f1f4fc 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Невдала спроба входу';
+$messages['errortitle']  = 'Виникла помилка!';
+$messages['loginfailed']  = 'Невдала спроба входу';
 $messages['cookiesdisabled'] = 'Ваш переглядач не приймає cookie';
 $messages['sessionerror'] = 'Ваша сесія застаріла';
 $messages['storageerror'] = 'Невдале з`єднання з IMAP сервером';
 $messages['servererror'] = 'Помилка сервера!';
 $messages['servererrormsg'] = 'Помилка сервера: $msg';
 $messages['dberror'] = 'Помилка бази даних!';
+$messages['requesttimedout'] = 'Тайм-аут запиту';
 $messages['errorreadonly'] = 'Неможливо виконати операцію. Папка доступна тільки для читання.';
 $messages['errornoperm'] = 'Неможливо виконати операцію. Доступ заборонено';
 $messages['invalidrequest'] = 'Невірний запит! Дані не збережено.';
+$messages['invalidhost'] = 'Невірне ім\'я серверу.';
 $messages['nomessagesfound'] = 'Листів не знайдено';
 $messages['loggedout'] = 'Вашу сесію завершено. Всього найкращого!';
 $messages['mailboxempty'] = 'Поштова скринька порожня';
+$messages['refreshing'] = 'Оновлення...';
 $messages['loading'] = 'Завантаження...';
 $messages['uploading'] = 'Файл відправляється...';
 $messages['uploadingmany'] = 'Завантаження файлів...';
@@ -54,11 +60,11 @@ $messages['errormoving'] = 'Не вдалося перемістити лист�
 $messages['errorcopying'] = 'Не вдалося зкопіювати листи';
 $messages['errordeleting'] = 'Не вдалося видалити листи';
 $messages['errormarking'] = 'Не вдалося позначити листи';
-$messages['deletecontactconfirm'] = 'Ви дійсно бажаєте видалити вибрані контакти?';
-$messages['deletegroupconfirm'] = 'Ви дійсно хочете видалити обрану групу?';
+$messages['deletecontactconfirm']  = 'Ви дійсно бажаєте видалити вибрані контакти?';
+$messages['deletegroupconfirm']  = 'Ви дійсно хочете видалити обрану групу?';
 $messages['deletemessagesconfirm'] = 'Ви дійсно бажаєте видалити вибрані листи?';
-$messages['deletefolderconfirm'] = 'Ви дійсно бажаєте видалити цю папку?';
-$messages['purgefolderconfirm'] = 'Ви дійсно бажаєте видалити всі листи у цій папці?';
+$messages['deletefolderconfirm']  = 'Ви дійсно бажаєте видалити цю папку?';
+$messages['purgefolderconfirm']  = 'Ви дійсно бажаєте видалити всі листи у цій папці?';
 $messages['contactdeleting'] = 'Видалення контакту(ів)...';
 $messages['groupdeleting'] = 'Видалення групи...';
 $messages['folderdeleting'] = 'Видалення папки...';
@@ -67,11 +73,11 @@ $messages['foldersubscribing'] = 'Підписати папку...';
 $messages['folderunsubscribing'] = 'Відписати папку...';
 $messages['formincomplete'] = 'Заповнено не всі поля';
 $messages['noemailwarning'] = 'Будь ласка, введіть коректну адресу електронної пошти';
-$messages['nonamewarning'] = 'Будь ласка, введіть ім`я';
+$messages['nonamewarning']  = 'Будь ласка, введіть ім`я';
 $messages['nopagesizewarning'] = 'Будь ласка, введіть розмір сторінки';
 $messages['nosenderwarning'] = 'Будь ласка, введіть адресу електронної пошти відправника';
 $messages['norecipientwarning'] = 'Будь ласка, вкажіть принаймні одного отримувача';
-$messages['nosubjectwarning'] = 'Не вказано тему листа. Бажаєте вказати її зараз?';
+$messages['nosubjectwarning']  = 'Не вказано тему листа. Бажаєте вказати її зараз?';
 $messages['nobodywarning'] = 'Відправити листа без тексту?';
 $messages['notsentwarning'] = 'Лист не було відправлено. Ви бажаєте відхилити відправку?';
 $messages['noldapserver'] = 'Будь ласка, виберіть LDAP сервер для пошуку';
@@ -106,14 +112,16 @@ $messages['addingmember'] = 'Додання контакту(ів) до груп
 $messages['removingmember'] = 'Видалення контакту(ів) з групи...';
 $messages['receiptsent'] = 'Повідомлення про прочитання відправлено';
 $messages['errorsendingreceipt'] = 'Не вдалося відправити повідомлення про прочитання';
+$messages['deleteidentityconfirm'] = 'Ви дійсно бажаєте видалити цей профіль?';
 $messages['nodeletelastidentity'] = 'Ви не можете видалити цей профіль, він у Вас останній.';
 $messages['forbiddencharacter'] = 'Ім\'я папки містить заборонені символи';
 $messages['selectimportfile'] = 'Виберіть файл для завантаження';
 $messages['addresswriterror'] = 'Обрана адресна книга недоступна для запису';
 $messages['contactaddedtogroup'] = 'Контакти успішно додано до цієї групи';
 $messages['contactremovedfromgroup'] = 'УКонтакти успішно видалено з цієї групи';
+$messages['nogroupassignmentschanged'] = 'Розподіл за групами не змінено.';
 $messages['importwait'] = 'Імпортування, будь ласка, зачекайте...';
-$messages['importerror'] = 'Імпорт завершився невдало! Завантажений файл не є правильним файлом vCard';
+$messages['importformaterror'] = 'Помилка імпорту! Завантажений файл має невідомий формат даних.';
 $messages['importconfirm'] = '<b>Успішно імпортовано $inserted контактів, пропущено $skipped існуючих</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Пропущені $skipped наявні записи</b>';
 $messages['opnotpermitted'] = 'Дія заборонена!';
@@ -155,4 +163,7 @@ $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/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 1edffbc1d..00d04b46b 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tran Khai Hoang <hanhvansu@yahoo.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Chào bạn đã đến với $product';
-$labels['username'] = 'Tên đăng nhập';
-$labels['password'] = 'Mật khẩu';
-$labels['server'] = 'Máy chủ';
-$labels['login'] = 'Đăng nhập';
-$labels['logout'] = 'Thoát';
-$labels['mail'] = 'Thư';
+
+// login page
+$labels['welcome']   = 'Chào bạn đã đến với $product';
+$labels['username']  = 'Tên đăng nhập';
+$labels['password']  = 'Mật khẩu';
+$labels['server']    = 'Máy chủ';
+$labels['login']     = 'Đăng nhập';
+
+// taskbar
+$labels['logout']   = 'Thoát';
+$labels['mail']     = 'Thư';
 $labels['settings'] = 'Tùy chọn';
 $labels['addressbook'] = 'Sổ địa chỉ';
-$labels['inbox'] = 'Hộp thư';
+
+// mailbox names
+$labels['inbox']  = 'Hộp thư';
 $labels['drafts'] = 'Thư nháp';
-$labels['sent'] = 'Đã gửi';
-$labels['trash'] = 'Sọt rác';
-$labels['junk'] = 'Thư rác';
+$labels['sent']   = 'Đã gửi';
+$labels['trash']  = 'Sọt rác';
+$labels['junk']   = 'Thư rác';
+
+// message listing
 $labels['subject'] = 'Tiêu đề';
-$labels['from'] = 'Người gửi';
-$labels['to'] = 'Người nhận';
-$labels['cc'] = 'Đồng kính gửi';
-$labels['bcc'] = 'Người đồng nhận (ngừoi nhận không thấy email của người khác cùng được nhận thư)';
+$labels['from']    = 'Người gửi';
+$labels['sender']  = 'Người gửi';
+$labels['to']      = 'Người nhận';
+$labels['cc']      = 'Đồng kính gửi';
+$labels['bcc']     = 'Người đồng nhận (ngừoi nhận không thấy email của người khác cùng được nhận thư)';
 $labels['replyto'] = 'Trả lời cho';
 $labels['followupto'] = 'Đánh dấu thư cần theo dõi';
-$labels['date'] = 'Ngày';
-$labels['size'] = 'Dung lượng';
+$labels['date']    = 'Ngày';
+$labels['size']    = 'Dung lượng';
 $labels['priority'] = 'Độ ưu tiên';
 $labels['organization'] = 'Tổ chức';
 $labels['readstatus'] = 'Trạng thái của thư';
 $labels['listoptions'] = 'Danh sách lựa chọn';
+
 $labels['mailboxlist'] = 'Các thư mục';
-$labels['folders'] = 'Các thư mục';
 $labels['messagesfromto'] = 'Thư từ $from đến $to trong tổng số $count';
 $labels['threadsfromto'] = 'Dòng thư từ $from đến $to của tổng số $count';
 $labels['messagenrof'] = 'Thư thứ $nr trong tổng số $count';
 $labels['fromtoshort'] = '$from - $to của $count';
-$labels['copy'] = 'Sao chép';
-$labels['move'] = 'Di Chuyển';
-$labels['moveto'] = 'Di chuyển tới...';
+
+$labels['copy']     = 'Sao chép';
+$labels['move']     = 'Di Chuyển';
+$labels['moveto']   = 'Di chuyển tới...';
 $labels['download'] = 'Tải về';
+$labels['showattachment'] = 'Hiển thị';
+$labels['showanyway'] = 'Tiếp tục hiển thị';
+
 $labels['filename'] = 'Tên tập tin';
 $labels['filesize'] = 'Kích cỡ tập tin';
+
 $labels['addtoaddressbook'] = 'Thêm vào danh bạ';
+
+// weekdays short
 $labels['sun'] = 'Chủ Nhật';
 $labels['mon'] = 'Thứ Hai';
 $labels['tue'] = 'Thứ Ba';
@@ -61,74 +80,83 @@ $labels['wed'] = 'Thứ Tư';
 $labels['thu'] = 'Thứ Năm';
 $labels['fri'] = 'Thứ Sáu';
 $labels['sat'] = 'Thứ Bảy';
-$labels['sunday'] = 'Chủ Nhật';
-$labels['monday'] = 'Thứ Hai';
-$labels['tuesday'] = 'Thứ Ba';
+
+// weekdays long
+$labels['sunday']    = 'Chủ Nhật';
+$labels['monday']    = 'Thứ Hai';
+$labels['tuesday']   = 'Thứ Ba';
 $labels['wednesday'] = 'Thứ Tư';
-$labels['thursday'] = 'Thứ Năm';
-$labels['friday'] = 'Thứ Sáu';
-$labels['saturday'] = 'Thứ Bảy';
-$labels['jan'] = 'Tháng Một';
-$labels['feb'] = 'Tháng Hai';
-$labels['mar'] = 'Tháng Ba';
-$labels['apr'] = 'Tháng Tư';
-$labels['may'] = 'Tháng Năm';
-$labels['longmay'] = 'Tháng Năm';
-$labels['jun'] = 'Tháng Sáu';
-$labels['jul'] = 'Tháng Bảy';
-$labels['aug'] = 'Tháng Tám';
-$labels['sep'] = 'Tháng Chín';
-$labels['oct'] = 'Tháng Mười';
-$labels['nov'] = 'Tháng Mười Một';
-$labels['dec'] = 'Tháng Mười Hai';
-$labels['longjan'] = 'Tháng Một';
-$labels['longfeb'] = 'Tháng Hai';
-$labels['longmar'] = 'Tháng Ba';
-$labels['longapr'] = 'Tháng Tư';
-$labels['longjun'] = 'Tháng Sáu';
-$labels['longjul'] = 'Tháng Bảy';
-$labels['longaug'] = 'Tháng Tám';
-$labels['longsep'] = 'Tháng Chín';
-$labels['longoct'] = 'Tháng Mười';
-$labels['longnov'] = 'Tháng Mười Một';
-$labels['longdec'] = 'Tháng Mười Hai';
+$labels['thursday']  = 'Thứ Năm';
+$labels['friday']    = 'Thứ Sáu';
+$labels['saturday']  = 'Thứ Bảy';
+
+// months short
+$labels['jan']	= 'Tháng Một';
+$labels['feb']	= 'Tháng Hai';
+$labels['mar']	= 'Tháng Ba';
+$labels['apr']	= 'Tháng Tư';
+$labels['may']	= 'Tháng Năm';
+$labels['jun']	= 'Tháng Sáu';
+$labels['jul'] 	= 'Tháng Bảy';
+$labels['aug']	= 'Tháng Tám';
+$labels['sep']	= 'Tháng Chín';
+$labels['oct']	= 'Tháng Mười';
+$labels['nov']	= 'Tháng Mười Một';
+$labels['dec']	= 'Tháng Mười Hai';
+
+// months long
+$labels['longjan']	= 'Tháng Một';
+$labels['longfeb']	= 'Tháng Hai';
+$labels['longmar']	= 'Tháng Ba';
+$labels['longapr']	= 'Tháng Tư';
+$labels['longmay']	= 'Tháng Năm';
+$labels['longjun']	= 'Tháng Sáu';
+$labels['longjul']	= 'Tháng Bảy';
+$labels['longaug']	= 'Tháng Tám';
+$labels['longsep']	= 'Tháng Chín';
+$labels['longoct']	= 'Tháng Mười';
+$labels['longnov']	= 'Tháng Mười Một';
+$labels['longdec']	= 'Tháng Mười Hai';
+
 $labels['today'] = 'Hôm nay';
-$labels['refresh'] = 'Nạp lại';
-$labels['checkmail'] = 'Kiểm tra thư mới';
-$labels['compose'] = 'Soạn thư';
-$labels['writenewmessage'] = 'Viết thư mới';
-$labels['reply'] = 'Trả lời thư';
-$labels['replytomessage'] = 'Trả lời thư người gửi';
+
+// toolbar buttons
+$labels['refresh']          = 'Nạp lại';
+$labels['checkmail']        = 'Kiểm tra thư mới';
+$labels['compose']          = 'Soạn thư';
+$labels['writenewmessage']  = 'Viết thư mới';
+$labels['reply']            = 'Trả lời thư';
+$labels['replytomessage']   = 'Trả lời thư người gửi';
 $labels['replytoallmessage'] = 'Trả lời lại danh sách hoặc tới tất cả người gửi và người nhận của thư này';
-$labels['replyall'] = 'Trả lời tất cả';
-$labels['replylist'] = 'Danh sách trả lời';
-$labels['forward'] = 'Chuyển tiếp';
-$labels['forwardinline'] = 'Chuyển tiếp thư';
+$labels['replyall']         = 'Trả lời tất cả';
+$labels['replylist']        = 'Danh sách trả lời';
+$labels['forward']          = 'Chuyển tiếp';
+$labels['forwardinline']    = 'Chuyển tiếp thư';
 $labels['forwardattachment'] = 'Chuyển tiếp theo phương cách đính kèm';
-$labels['forwardmessage'] = 'Chuyển tiếp thư';
-$labels['deletemessage'] = 'Xóa thư';
+$labels['forwardmessage']   = 'Chuyển tiếp thư';
+$labels['deletemessage']    = 'Xóa thư';
 $labels['movemessagetotrash'] = 'Chuyển thư vào thùng rác';
-$labels['printmessage'] = 'In thư này';
-$labels['previousmessage'] = 'Hiển thị thư trước đó';
-$labels['firstmessage'] = 'Hiển thị thư đầu tiên';
-$labels['nextmessage'] = 'Hiển thị thư tiếp theo';
-$labels['lastmessage'] = 'Hiển thị thư cuối';
-$labels['backtolist'] = 'Quay lại danh sách thư';
-$labels['viewsource'] = 'Hiển thị nguồn';
-$labels['mark'] = 'Đánh dấu';
-$labels['markmessages'] = 'Đánh dấu các thư';
-$labels['markread'] = 'Là đã đọc';
-$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['more'] = 'Thêm';
-$labels['back'] = 'Quay lại';
-$labels['options'] = 'Tuỳ chọn';
+$labels['printmessage']     = 'In thư này';
+$labels['previousmessage']  = 'Hiển thị thư trước đó';
+$labels['firstmessage']     = 'Hiển thị thư đầu tiên';
+$labels['nextmessage']      = 'Hiển thị thư tiếp theo';
+$labels['lastmessage']      = 'Hiển thị thư cuối';
+$labels['backtolist']       = 'Quay lại danh sách thư';
+$labels['viewsource']       = 'Hiển thị nguồn';
+$labels['mark']             = 'Đánh dấu';
+$labels['markmessages']     = 'Đánh dấu các thư';
+$labels['markread']         = 'Là đã đọc';
+$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['more']             = 'Thêm';
+$labels['back']             = 'Quay lại';
+$labels['options']          = 'Tuỳ chọn';
+
 $labels['select'] = 'Lựa chọn';
 $labels['all'] = 'Tất cả';
 $labels['none'] = 'Không có';
-$labels['nonesort'] = 'Không có';
 $labels['currpage'] = 'Trang hiện tại';
 $labels['unread'] = 'Chưa đọc';
 $labels['flagged'] = 'Đã đánh dấu';
@@ -143,12 +171,14 @@ $labels['expand-all'] = 'Mở rộng tất cả';
 $labels['expand-unread'] = 'Mở rộng thư chưa đọc';
 $labels['collapse-all'] = 'Đóng hết';
 $labels['threaded'] = 'Đã nhóm theo chủ đề thư';
+
 $labels['autoexpand_threads'] = 'Mở rộng các chủ đề thư';
 $labels['do_expand'] = 'Tất cả các chủ đề thư';
 $labels['expand_only_unread'] = 'Chỉ với những thư chưa đọc';
 $labels['fromto'] = 'Từ/Đến';
 $labels['flag'] = 'Đánh dấu';
 $labels['attachment'] = 'Đính kèm';
+$labels['nonesort'] = 'Không có';
 $labels['sentdate'] = 'Ngày đã gửi';
 $labels['arrival'] = 'Ngày đến';
 $labels['asc'] = 'Tăng dần';
@@ -157,176 +187,211 @@ $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['folderactions'] = 'Thao tác với thư mục';
 $labels['compact'] = 'Nén';
 $labels['empty'] = 'Trống';
+
 $labels['quota'] = 'Lượng đĩa sử dụng';
-$labels['unknown'] = 'Không rõ';
-$labels['unlimited'] = 'không giới hạn';
-$labels['quicksearch'] = 'Tìm nhanh';
-$labels['resetsearch'] = 'Thiết lập lại tìm kiếm';
-$labels['searchmod'] = 'Tìm kiếm với từ khóa và ký tự đặc biệt [() : " - ]';
-$labels['msgtext'] = 'Toàn bộ thư';
+$labels['unknown']  = 'Không rõ';
+$labels['unlimited']  = 'không giới hạn';
+
+$labels['quicksearch']  = 'Tìm nhanh';
+$labels['resetsearch']  = 'Thiết lập lại tìm kiếm';
+$labels['searchmod']  = 'Tìm kiếm với từ khóa và ký tự đặc biệt [() : " - ]';
+$labels['msgtext']  = 'Toàn bộ thư';
+$labels['body']  = 'Nội dung thư';
+
 $labels['openinextwin'] = 'Mở trong khung cửa mới';
 $labels['emlsave'] = 'Tải về theo định dạng .eml';
-$labels['editasnew'] = 'Sửa như một email mới';
-$labels['send'] = 'Gửi';
-$labels['sendmessage'] = 'Gửi thư';
-$labels['savemessage'] = 'Lưu dạng nháp';
-$labels['addattachment'] = 'Kèm theo tập tin';
-$labels['charset'] = 'Bộ ký tự';
-$labels['editortype'] = 'Loại trình soạn thảo';
-$labels['returnreceipt'] = 'Báo nhận';
-$labels['dsn'] = 'Thông báo trạng thái gửi thư';
+
+// message compose
+$labels['editasnew']      = 'Sửa như một email mới';
+$labels['send']           = 'Gửi';
+$labels['sendmessage']    = 'Gửi thư';
+$labels['savemessage']    = 'Lưu dạng nháp';
+$labels['addattachment']  = 'Kèm theo tập tin';
+$labels['charset']        = 'Bộ ký tự';
+$labels['editortype']     = 'Loại trình soạn thảo';
+$labels['returnreceipt']  = 'Báo nhận';
+$labels['dsn']            = 'Thông báo trạng thái gửi thư';
 $labels['mailreplyintro'] = 'Vào ngày $date, $sender viết:';
 $labels['originalmessage'] = 'Thư gốc';
-$labels['editidents'] = 'Chỉnh sửa nhận diện';
-$labels['spellcheck'] = 'Đánh vần';
+
+$labels['editidents']    = 'Chỉnh sửa nhận diện';
+$labels['spellcheck']    = 'Đánh vần';
 $labels['checkspelling'] = 'Kiểm tra chính tả';
 $labels['resumeediting'] = 'Tiếp tục soạn thảo';
-$labels['revertto'] = 'Trở lại với';
+$labels['revertto']      = 'Trở lại với';
+
 $labels['attach'] = 'Đính kèm';
 $labels['attachments'] = 'Các đính kèm';
 $labels['upload'] = 'Tải lên';
 $labels['uploadprogress'] = '$percent ($current từ $total)';
-$labels['close'] = 'Đóng';
-$labels['messageoptions'] = 'Tùy chọn cho thư...';
-$labels['low'] = 'Thấp';
-$labels['lowest'] = 'Thấp nhất';
-$labels['normal'] = 'Bình thường';
-$labels['high'] = 'Cao';
+$labels['close']  = 'Đóng';
+$labels['messageoptions']  = 'Tùy chọn cho thư...';
+
+$labels['low']     = 'Thấp';
+$labels['lowest']  = 'Thấp nhất';
+$labels['normal']  = 'Bình thường';
+$labels['high']    = 'Cao';
 $labels['highest'] = 'Cao nhất';
-$labels['nosubject'] = '(Không có chủ đề)';
+
+$labels['nosubject']  = '(Không có chủ đề)';
 $labels['showimages'] = 'Hiển thị ảnh';
 $labels['alwaysshow'] = 'Luôn luôn hiển thị ảnh từ $sender';
-$labels['isdraft'] = 'Đây là thư nháp';
-$labels['andnmore'] = 'Thêm $nr';
+$labels['isdraft']    = 'Đây là thư nháp';
+$labels['andnmore']   = 'Thêm $nr';
 $labels['togglemoreheaders'] = 'Hiển thị chi tiết thông tin thư';
 $labels['togglefullheaders'] = 'Mở/đóng chi tiết thông tin thư';
+
 $labels['htmltoggle'] = 'Mã HTML';
 $labels['plaintoggle'] = 'Văn bản thô';
 $labels['savesentmessagein'] = 'Lưu thư đã gửi trong';
 $labels['dontsave'] = 'Không lưu';
 $labels['maxuploadsize'] = 'Dung lượng tập tin tối đa cho phép là $size';
+
 $labels['addcc'] = 'Thêm Cc';
 $labels['addbcc'] = 'Thêm Bcc';
 $labels['addreplyto'] = 'Thêm trả lời tới';
 $labels['addfollowupto'] = 'Thêm sự theo dõi tới';
+
+// mdn
 $labels['mdnrequest'] = 'Người gửi thư này muốn nhận được thông báo khi bạn đọc thư. Bạn có muốn cho người gửi biết thông báo này không?';
 $labels['receiptread'] = 'Biên nhận (đã đọc)';
 $labels['yourmessage'] = 'Đây là sự trả lại xác nhận cho thư của bạn';
 $labels['receiptnote'] = 'Lưu ý: Biên nhận này chỉ báo rằng thư đã được hiển thị trên máy tính của người nhận. Không bảo đảm rằng người nhận đó đã có đọc hoặc hiểu nội dung thư.';
-$labels['name'] = 'Tên hiển thị';
-$labels['firstname'] = 'Tên Gọi';
-$labels['surname'] = 'Tên Họ';
-$labels['middlename'] = 'Tên đệm';
-$labels['nameprefix'] = 'Tiền tố';
-$labels['namesuffix'] = 'Hậu tố';
-$labels['nickname'] = 'Biệt danh';
-$labels['jobtitle'] = 'Chức danh Công việc';
-$labels['department'] = 'Khoa/Ban';
-$labels['gender'] = 'Giới tính';
-$labels['maidenname'] = 'Tên thời con gái';
-$labels['email'] = 'Thư điện tử';
-$labels['phone'] = 'Điện thoại';
-$labels['address'] = 'Địa chỉ';
-$labels['street'] = 'Đường';
-$labels['locality'] = 'Thành phố';
-$labels['zipcode'] = 'Mã bưu điện';
-$labels['region'] = 'Bang/Tỉnh';
-$labels['country'] = 'Quốc gia';
-$labels['birthday'] = 'Ngày sinh';
-$labels['anniversary'] = 'Kỷ niệm';
-$labels['website'] = 'Trang Web';
+
+// address boook
+$labels['name']         = 'Tên hiển thị';
+$labels['firstname']    = 'Tên Gọi';
+$labels['surname']      = 'Tên Họ';
+$labels['middlename']   = 'Tên đệm';
+$labels['nameprefix']   = 'Tiền tố';
+$labels['namesuffix']   = 'Hậu tố';
+$labels['nickname']     = 'Biệt danh';
+$labels['jobtitle']     = 'Chức danh Công việc';
+$labels['department']   = 'Khoa/Ban';
+$labels['gender']       = 'Giới tính';
+$labels['maidenname']   = 'Tên thời con gái';
+$labels['email']        = 'Thư điện tử';
+$labels['phone']        = 'Điện thoại';
+$labels['address']      = 'Địa chỉ';
+$labels['street']       = 'Đường';
+$labels['locality']     = 'Thành phố';
+$labels['zipcode']      = 'Mã bưu điện';
+$labels['region']       = 'Bang/Tỉnh';
+$labels['country']      = 'Quốc gia';
+$labels['birthday']     = 'Ngày sinh';
+$labels['anniversary']  = 'Kỷ niệm';
+$labels['website']      = 'Trang Web';
 $labels['instantmessenger'] = 'Tin nhắn nhanh';
 $labels['notes'] = 'Các ghi chú';
-$labels['male'] = 'Nam';
+$labels['male']   = 'Nam';
 $labels['female'] = 'Nữ';
 $labels['manager'] = 'Người quản lý';
 $labels['assistant'] = 'Trợ lý';
-$labels['typeassistant'] = 'Trợ lý';
 $labels['spouse'] = 'Vợ/Chồng';
 $labels['allfields'] = 'Tất cả các lĩnh vực';
 $labels['search'] = 'Tìm kiếm';
 $labels['advsearch'] = 'Tìm kiếm chi tiết';
 $labels['advanced'] = 'Nâng cao';
 $labels['other'] = 'Loại khác';
-$labels['typeother'] = 'Loại khác';
-$labels['typehome'] = 'Thư mục chính';
-$labels['typework'] = 'Cơ quan';
-$labels['typemobile'] = 'Số di động';
-$labels['typemain'] = 'Chính';
-$labels['typehomefax'] = 'Điện thư ở Nhà';
-$labels['typeworkfax'] = 'Điện thư cơ quan';
-$labels['typecar'] = 'Xe';
-$labels['typepager'] = 'Máy nhắn tin';
-$labels['typevideo'] = 'Phim';
-$labels['typehomepage'] = 'Trang nhà';
+
+$labels['typehome']   = 'Thư mục chính';
+$labels['typework']   = 'Cơ quan';
+$labels['typeother']  = 'Loại khác';
+$labels['typemobile']  = 'Số di động';
+$labels['typemain']  = 'Chính';
+$labels['typehomefax']  = 'Điện thư ở Nhà';
+$labels['typeworkfax']  = 'Điện thư cơ quan';
+$labels['typecar']  = 'Xe';
+$labels['typepager']  = 'Máy nhắn tin';
+$labels['typevideo']  = 'Phim';
+$labels['typeassistant']  = 'Trợ lý';
+$labels['typehomepage']  = 'Trang nhà';
 $labels['typeblog'] = 'Trang nhật ký';
 $labels['typeprofile'] = 'Lý lịch';
+
 $labels['addfield'] = 'Thêm lĩnh vực...';
 $labels['addcontact'] = 'Thêm một liên hệ mới';
 $labels['editcontact'] = 'Sửa liên lạc';
 $labels['contacts'] = 'Danh bạ';
 $labels['contactproperties'] = 'Tính chất của liên hệ';
 $labels['personalinfo'] = 'Thông tin cá nhân';
-$labels['edit'] = 'Chỉnh sửa';
+
+$labels['edit']   = 'Chỉnh sửa';
 $labels['cancel'] = 'Huỷ';
-$labels['save'] = 'Lưu';
+$labels['save']   = 'Lưu';
 $labels['delete'] = 'Xóa';
 $labels['rename'] = 'Đổi tên';
 $labels['addphoto'] = 'Thêm';
 $labels['replacephoto'] = 'Thay thế';
 $labels['uploadphoto'] = 'Tải ảnh lên';
-$labels['newcontact'] = 'Tạo danh bạ mới';
-$labels['deletecontact'] = 'Xoá các liên lạc đã chọn';
-$labels['composeto'] = 'Soạn thư cho';
+
+$labels['newcontact']     = 'Tạo danh bạ mới';
+$labels['deletecontact']  = 'Xoá các liên lạc đã chọn';
+$labels['composeto']      = 'Soạn thư cho';
 $labels['contactsfromto'] = 'Liên hệ từ $from - $to / $count';
-$labels['print'] = 'In ra';
-$labels['export'] = 'Trích xuất';
-$labels['exportvcards'] = 'Tải dữ liệu máy theo định dạng vCard';
+$labels['print']          = 'In ra';
+$labels['export']         = 'Trích xuất';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Tải dữ liệu máy theo định dạng vCard';
 $labels['newcontactgroup'] = 'Tạo nhóm liên lạc mới';
-$labels['grouprename'] = 'Đổi tên nhóm';
-$labels['groupdelete'] = 'Xóa nhóm';
+$labels['grouprename']    = 'Đổi tên nhóm';
+$labels['groupdelete']    = 'Xóa nhóm';
 $labels['groupremoveselected'] = 'Xóa bỏ các liên lạc được chọn từ nhóm';
-$labels['previouspage'] = 'Hiển thị trang trước';
-$labels['firstpage'] = 'Hiển thị trang đầu tiên';
-$labels['nextpage'] = 'Hiển thị trang kế tiếp';
-$labels['lastpage'] = 'Hiển thị trang cuối';
+
+$labels['previouspage']   = 'Hiển thị trang trước';
+$labels['firstpage']      = 'Hiển thị trang đầu tiên';
+$labels['nextpage']       = 'Hiển thị trang kế tiếp';
+$labels['lastpage']       = 'Hiển thị trang cuối';
+
 $labels['group'] = 'Nhóm';
 $labels['groups'] = 'Các nhóm';
 $labels['personaladrbook'] = 'Các địa chỉ cá nhân';
+
 $labels['searchsave'] = 'Lưu tìm kiếm';
 $labels['searchdelete'] = 'Xóa tìm kiếm';
+
 $labels['import'] = 'Nhập';
 $labels['importcontacts'] = 'Nhập liên lạc';
 $labels['importfromfile'] = 'Nhập từ tập tin:';
 $labels['importtarget'] = 'Thêm liên lạc mới vào sổ địa chỉ';
 $labels['importreplace'] = 'Thay thế toàn bộ sổ địa chỉ';
+$labels['importdesc'] = 'Bạn có thể cập nhật các liên hệ từ một sổ địa chỉ có sẵn.<br />Hiện tại, chúng tôi hỗ trợ nhập địa chỉ từ dạng dữ liệu <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> hoặc CSV (dạng thức dữ liệu ngăn cách bằng dấu phẩy)';
 $labels['done'] = 'Hoàn tất';
+
+// settings
 $labels['settingsfor'] = 'Thiết lập cho';
 $labels['about'] = 'Lời ngõ';
 $labels['preferences'] = 'Sở thích';
 $labels['userpreferences'] = 'Sở thích người dùng';
 $labels['editpreferences'] = 'Chỉnh sửa sở thích';
+
 $labels['identities'] = 'Các nhận diện';
 $labels['manageidentities'] = 'Quản lý nhận diện cho trương mục này';
 $labels['newidentity'] = 'Nhận diện mới';
+
 $labels['newitem'] = 'Mục mới';
 $labels['edititem'] = 'Sửa đổi mục';
+
 $labels['preferhtml'] = 'Hiển thị HTML';
 $labels['defaultcharset'] = 'Bộ ký tự mặc định';
 $labels['htmlmessage'] = 'Thư theo định dạng HTML';
+$labels['messagepart'] = 'Một phần';
+$labels['digitalsig'] = 'Chữ ký điện tử';
 $labels['dateformat'] = 'Định dạng ngày tháng';
 $labels['timeformat'] = 'Định dạng thời gian';
 $labels['prettydate'] = 'Ngày tháng đầy đủ';
-$labels['setdefault'] = 'Thiết lập mặc định';
-$labels['autodetect'] = 'Tự động';
-$labels['language'] = 'Ngôn ngữ';
-$labels['timezone'] = 'Múi giờ';
-$labels['pagesize'] = 'Số dòng trên trang';
+$labels['setdefault']  = 'Thiết lập mặc định';
+$labels['autodetect']  = 'Tự động';
+$labels['language']  = 'Ngôn ngữ';
+$labels['timezone']  = 'Múi giờ';
+$labels['pagesize']  = 'Số dòng trên trang';
 $labels['signature'] = 'Chữ ký';
-$labels['dstactive'] = 'Giờ mùa hè';
+$labels['dstactive']  = 'Giờ mùa hè';
 $labels['showinextwin'] = 'Mở thư trong khung mới';
 $labels['composeextwin'] = 'Soạn thư trong khung mới';
 $labels['htmleditor'] = 'Soạn thư dạng HTML';
@@ -355,10 +420,11 @@ $labels['showremoteimages'] = 'Hiển thị ảnh nội tuyến từ xa';
 $labels['fromknownsenders'] = 'Từ người gửi đã biết';
 $labels['always'] = 'luôn luôn';
 $labels['showinlineimages'] = 'Hiển thị ảnh đính kèm phía dưới thư';
-$labels['autosavedraft'] = 'Tự động lưu bản nháp';
-$labels['everynminutes'] = '$n phút một lần';
-$labels['never'] = 'không bao giờ';
-$labels['immediately'] = 'ngay lập tức';
+$labels['autosavedraft']  = 'Tự động lưu bản nháp';
+$labels['everynminutes']  = '$n phút một lần';
+$labels['refreshinterval']  = 'Tải dữ liệu mới (ví dụ: kiểm tra thư mới)';
+$labels['never']  = 'không bao giờ';
+$labels['immediately']  = 'ngay lập tức';
 $labels['messagesdisplaying'] = 'Đang hiển thị thư';
 $labels['messagescomposition'] = 'Đang viết thư';
 $labels['mimeparamfolding'] = 'Tên đính kèm';
@@ -389,11 +455,12 @@ $labels['replysignaturepos'] = 'Khi trả lời hoặc chuyển tiếp thư thê
 $labels['belowquote'] = 'Dưới phần nội dung cũ';
 $labels['abovequote'] = 'trên phần nội dung cũ';
 $labels['insertsignature'] = 'Chèn chữ ký';
-$labels['previewpanemarkread'] = 'Đánh dẫu thư xem thử là đã đọc';
-$labels['afternseconds'] = 'sau $n giây';
+$labels['previewpanemarkread']  = 'Đánh dẫu thư xem thử là đã đọc';
+$labels['afternseconds']  = 'sau $n giây';
 $labels['reqmdn'] = 'Luôn luôn yêu cầu biên nhận khi gửi thư';
 $labels['reqdsn'] = 'Luôn yêu cầu xác nhận trạng thái thư cho người gửi';
 $labels['replysamefolder'] = 'Đưa các thư phản hồi  vào cùng thư mục của thư đang trả lời';
+$labels['defaultabook'] = 'Sổ địa chỉ mặc định';
 $labels['autocompletesingle'] = 'Bỏ qua địa chỉ email thay thế trong năng tự động gõ';
 $labels['listnamedisplay'] = 'Hiện thị danh sách liên lạc như là';
 $labels['spellcheckbeforesend'] = 'Kiểm tra chính tả trước khi gửi thư';
@@ -406,13 +473,15 @@ $labels['mailtoprotohandler'] = 'Xác định cách xử lý giao thức mailto:
 $labels['forwardmode'] = 'Chuyển tiếp thư';
 $labels['inline'] = 'nội tuyến';
 $labels['asattachment'] = 'dạng gửi kèm';
-$labels['folder'] = 'Thư mục';
-$labels['foldername'] = 'Tên thư mục';
-$labels['subscribed'] = 'Đã đăng ký';
+
+$labels['folder']  = 'Thư mục';
+$labels['folders']  = 'Các thư mục';
+$labels['foldername']  = 'Tên thư mục';
+$labels['subscribed']  = 'Đã đăng ký';
 $labels['messagecount'] = 'Các tin nhắn';
-$labels['create'] = 'Tạo';
-$labels['createfolder'] = 'Tạo thư mục mới';
-$labels['managefolders'] = 'Quản lý các thư mục';
+$labels['create']  = 'Tạo';
+$labels['createfolder']  = 'Tạo thư mục mới';
+$labels['managefolders']  = 'Quản lý các thư mục';
 $labels['specialfolders'] = 'Thư mục đặc biệt';
 $labels['properties'] = 'Các thuộc tính';
 $labels['folderproperties'] = 'Thuộc tính thư mục';
@@ -422,22 +491,29 @@ $labels['info'] = 'Thông tin';
 $labels['getfoldersize'] = 'Nhấp chuột để xem kích thước thư mục';
 $labels['changesubscription'] = 'Nhấp chuột để đổi cách đóng góp';
 $labels['foldertype'] = 'Kiểu thư mục';
-$labels['personalfolder'] = 'Thư mục cá nhân';
-$labels['otherfolder'] = 'Thư mục khác của Người dùng';
-$labels['sharedfolder'] = 'Thư mục công khai';
+$labels['personalfolder']  = 'Thư mục cá nhân';
+$labels['otherfolder']  = 'Thư mục khác của Người dùng';
+$labels['sharedfolder']  = 'Thư mục công khai';
+
 $labels['sortby'] = 'Soạn theo';
-$labels['sortasc'] = 'Soạn tăng dần';
+$labels['sortasc']  = 'Soạn tăng dần';
 $labels['sortdesc'] = 'Soạn giảm dần';
 $labels['undo'] = 'Hoàn lại';
+
+$labels['installedplugins'] = 'Các chương trình phụ trợ đã được cài đặt';
 $labels['plugin'] = 'Phần bổ sung';
 $labels['version'] = 'Phiên bản';
 $labels['source'] = 'Nguồn';
 $labels['license'] = 'Bản quyền';
 $labels['support'] = 'Yêu cầu hỗ trợ';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Tiếng Anh';
 $labels['westerneuropean'] = 'Tiếng Tây Âu';
@@ -457,3 +533,4 @@ $labels['japanese'] = 'Tiếng Nhật';
 $labels['korean'] = 'Tiếng Hàn';
 $labels['chinese'] = 'Tiếng Hoa';
 
+?>
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 73435b6e3..1d5f5f84c 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Xuất hiện 1 lỗi';
-$messages['loginfailed'] = 'Không đăng nhập được';
+$messages['errortitle']  = 'Xuất hiện 1 lỗi';
+$messages['loginfailed']  = 'Không đăng nhập được';
 $messages['cookiesdisabled'] = 'Trình duyệt không hỗ trợ cookies';
 $messages['sessionerror'] = 'Phiên làm việc không hợp lệ hoặc đã hết hạn';
 $messages['storageerror'] = 'Không kết nối được với máy chủ IMAP';
@@ -23,13 +26,14 @@ $messages['servererror'] = 'Lỗi máy chủ';
 $messages['servererrormsg'] = 'Lỗi máy chủ';
 $messages['dberror'] = 'Lỗi cơ sở dữ liệu';
 $messages['requesttimedout'] = 'Yêu cầu hết  hạn';
-$messages['errorreadonly'] = 'Không thể thực hiện thao tác. Giữ liệu chỉ cho phép đọc.';
-$messages['errornoperm'] = 'Không thể thực hiện thao tác. Sự cho phép bị từ chối.';
+$messages['errorreadonly'] = 'Không thể thực hiện thao tác. Thư mục chỉ cho phép đọc.';
+$messages['errornoperm'] = 'Bạn không đủ quyền hạn để thực hiện thao tác này.';
 $messages['invalidrequest'] = 'Yêu cầu không hợp lệ! Không có dữ liệu nào được lưu.';
 $messages['invalidhost'] = 'Sai thông tin máy chủ';
 $messages['nomessagesfound'] = 'Không thấy có thư nào trong hộp thư này.';
 $messages['loggedout'] = 'Phiên làm việc đã kết thúc thành công. Hẹn gặp lại!';
 $messages['mailboxempty'] = 'Hộp thư rỗng';
+$messages['refreshing'] = 'Đang tải xuống bản cập nhật mới...';
 $messages['loading'] = 'Đang tải...';
 $messages['uploading'] = 'Đang tải lên tập tin...';
 $messages['uploadingmany'] = 'Đang tải lên các tập tin';
@@ -56,11 +60,11 @@ $messages['errormoving'] = 'Không thể chuyển được thư';
 $messages['errorcopying'] = 'Không thể sao chép thư';
 $messages['errordeleting'] = 'Không thể xóa được thư';
 $messages['errormarking'] = 'Không thể đánh dấu (các) thư';
-$messages['deletecontactconfirm'] = 'Bạn có thực sự muốn xoá liên hệ đã chọn?';
-$messages['deletegroupconfirm'] = 'Bạn có thực sự muốn xóa nhóm đã chọn?';
+$messages['deletecontactconfirm']  = 'Bạn có thực sự muốn xoá liên hệ đã chọn?';
+$messages['deletegroupconfirm']  = 'Bạn có thực sự muốn xóa nhóm đã chọn?';
 $messages['deletemessagesconfirm'] = 'Bạn thực sự có muốn xóa (các) thư đã chọn?';
-$messages['deletefolderconfirm'] = 'Bạn có thực sự muốn xóa giữ liệu này?';
-$messages['purgefolderconfirm'] = 'Bạn có thực sự muốn xóa toàn bộ thư trong giữ liệu này?';
+$messages['deletefolderconfirm']  = 'Bạn có thực sự muốn xóa giữ liệu này?';
+$messages['purgefolderconfirm']  = 'Bạn có thực sự muốn xóa toàn bộ thư trong giữ liệu này?';
 $messages['contactdeleting'] = 'Đang xóa (các) liên lạc...';
 $messages['groupdeleting'] = 'Đang xóa nhóm...';
 $messages['folderdeleting'] = 'Đang xóa giữ liệu...';
@@ -69,11 +73,11 @@ $messages['foldersubscribing'] = 'Nhập vào giữ liệu...';
 $messages['folderunsubscribing'] = 'Không nhập giữ liệu...';
 $messages['formincomplete'] = 'Mẫu đơn chưa được hoàn toàn điền xong.';
 $messages['noemailwarning'] = 'Xin nhập địa chỉ email hợp lệ.';
-$messages['nonamewarning'] = 'Xin nhập tên.';
+$messages['nonamewarning']  = 'Xin nhập tên.';
 $messages['nopagesizewarning'] = 'Xin nhập kích cỡ của trang.';
 $messages['nosenderwarning'] = 'Xin nhập địa chỉ email người gửi';
 $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['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['notsentwarning'] = 'Thư chưa được gửi. Bỏ qua thư đang soạn?';
 $messages['noldapserver'] = 'Chọn máy chủ ldap server để tìm';
@@ -117,12 +121,13 @@ $messages['contactaddedtogroup'] = 'Thêm liên lạc vào nhóm này thành cô
 $messages['contactremovedfromgroup'] = 'Xóa liên lạc khỏi nhóm này thành công';
 $messages['nogroupassignmentschanged'] = 'Không quy nhóm nào đả được thay đổi';
 $messages['importwait'] = 'Đang nhập, xin chờ...';
+$messages['importformaterror'] = 'Nhập dữ liệu lỗi. Tệp tin vừa tải lên không phải tệp dữ liệu chính xác.';
 $messages['importconfirm'] = 'Đã nhập $inserted liên hệ đã chèn vào thành công.';
 $messages['importconfirmskipped'] = 'Đã bỏ qua được $skipped mục tồn tại.';
 $messages['opnotpermitted'] = 'Thao tác không được cho phép!';
 $messages['nofromaddress'] = 'Địa chỉ email mất ở trong nhận dạng đã chọn';
 $messages['editorwarning'] = 'Việc chuyển soạn thảo text gốc sẽ gây ra toàn bộ định dạng text đã có bị mất. Bạn có muốn tiếp tục không?';
-$messages['httpreceivedencrypterror'] = 'Xuất hiện một lỗi cấu hình  tai hại. Hãy liên hệ với ngừoi quản trị ngay. <b> Thư của bạn không thể gửi được </b>';
+$messages['httpreceivedencrypterror'] = 'Xuất hiện một lỗi cấu hình  tai hại. Hãy liên hệ với người quản trị ngay. <b> Thư của bạn không thể gửi được </b>';
 $messages['smtpconnerror'] = 'Lỗi SMTP ($code): Kết nỗi tới máy chủ bị lỗi.';
 $messages['smtpautherror'] = 'Lỗi SMTP ($code): Xác thực thất bại.';
 $messages['smtpfromerror'] = 'Lỗi SMTP ($code):  Không thể bố trí người gửi "$from" ($msg).';
@@ -158,4 +163,7 @@ $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 1de39e491..af2bd7b68 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -2,57 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '欢迎使用 $product';
-$labels['username'] = '用户名';
-$labels['password'] = '密码';
-$labels['server'] = '服务器';
-$labels['login'] = '登录';
-$labels['logout'] = '注销';
-$labels['mail'] = '邮件';
+
+// login page
+$labels['welcome']   = '欢迎使用 $product';
+$labels['username']  = '用户名';
+$labels['password']  = '密码';
+$labels['server']    = '服务器';
+$labels['login']     = '登录';
+
+// taskbar
+$labels['logout']   = '注销';
+$labels['mail']     = '邮件';
 $labels['settings'] = '设置';
 $labels['addressbook'] = '通讯录';
-$labels['inbox'] = '收件箱';
+
+// mailbox names
+$labels['inbox']  = '收件箱';
 $labels['drafts'] = '草稿';
-$labels['sent'] = '已发送';
-$labels['trash'] = '已删除邮件';
-$labels['junk'] = '垃圾邮件';
+$labels['sent']   = '已发送';
+$labels['trash']  = '已删除邮件';
+$labels['junk']   = '垃圾邮件';
+
+// message listing
 $labels['subject'] = '主题';
-$labels['from'] = '发件人';
-$labels['to'] = '收件人';
-$labels['cc'] = '抄送';
-$labels['bcc'] = '密送';
+$labels['from']    = '发件人';
+$labels['sender']  = 'Sender';
+$labels['to']      = '收件人';
+$labels['cc']      = '抄送';
+$labels['bcc']     = '密送';
 $labels['replyto'] = '回复至';
 $labels['followupto'] = '投递组';
-$labels['date'] = '日期';
-$labels['size'] = '大小';
+$labels['date']    = '日期';
+$labels['size']    = '大小';
 $labels['priority'] = '优先级';
 $labels['organization'] = '公司';
 $labels['readstatus'] = '阅读状态';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = '目录管理';
-$labels['folders'] = '目录管理';
 $labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
 $labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
 $labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
 $labels['fromtoshort'] = '自 $from – $to 统计 $count';
-$labels['copy'] = '复制';
-$labels['move'] = '移动';
-$labels['moveto'] = '移动至';
+
+$labels['copy']     = '复制';
+$labels['move']     = '移动';
+$labels['moveto']   = '移动至';
 $labels['download'] = '下载';
+$labels['showattachment'] = '显示';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
+
 $labels['addtoaddressbook'] = '添加至通讯录';
+
+// weekdays short
 $labels['sun'] = '周日';
 $labels['mon'] = '星期一';
 $labels['tue'] = '星期二';
@@ -60,79 +80,89 @@ $labels['wed'] = '星期三';
 $labels['thu'] = '星期四';
 $labels['fri'] = '星期五';
 $labels['sat'] = '星期六';
-$labels['sunday'] = '星期日';
-$labels['monday'] = '星期一';
-$labels['tuesday'] = '星期二';
+
+// weekdays long
+$labels['sunday']    = '星期日';
+$labels['monday']    = '星期一';
+$labels['tuesday']   = '星期二';
 $labels['wednesday'] = '星期三';
-$labels['thursday'] = '星期四';
-$labels['friday'] = '星期五';
-$labels['saturday'] = '星期六';
-$labels['jan'] = '一月';
-$labels['feb'] = '二月';
-$labels['mar'] = '三月';
-$labels['apr'] = '四月';
-$labels['may'] = '五月';
-$labels['longmay'] = '五月';
-$labels['jun'] = '六月';
-$labels['jul'] = '七月';
-$labels['aug'] = '八月';
-$labels['sep'] = '九月';
-$labels['oct'] = '十月';
-$labels['nov'] = '十一月';
-$labels['dec'] = '十二月';
-$labels['longjan'] = '一月';
-$labels['longfeb'] = '二月';
-$labels['longmar'] = '三月';
-$labels['longapr'] = '四月';
-$labels['longjun'] = '六月';
-$labels['longjul'] = '七月';
-$labels['longaug'] = '八月';
-$labels['longsep'] = '九月';
-$labels['longoct'] = '十月';
-$labels['longnov'] = '十一月';
-$labels['longdec'] = '十二月';
+$labels['thursday']  = '星期四';
+$labels['friday']    = '星期五';
+$labels['saturday']  = '星期六';
+
+// months short
+$labels['jan']	= '一月';
+$labels['feb']	= '二月';
+$labels['mar']	= '三月';
+$labels['apr']	= '四月';
+$labels['may']	= '五月';
+$labels['jun']	= '六月';
+$labels['jul'] 	= '七月';
+$labels['aug']	= '八月';
+$labels['sep']	= '九月';
+$labels['oct']	= '十月';
+$labels['nov']	= '十一月';
+$labels['dec']	= '十二月';
+
+// months long
+$labels['longjan']	= '一月';
+$labels['longfeb']	= '二月';
+$labels['longmar']	= '三月';
+$labels['longapr']	= '四月';
+$labels['longmay']	= '五月';
+$labels['longjun']	= '六月';
+$labels['longjul']	= '七月';
+$labels['longaug']	= '八月';
+$labels['longsep']	= '九月';
+$labels['longoct']	= '十月';
+$labels['longnov']	= '十一月';
+$labels['longdec']	= '十二月';
+
 $labels['today'] = '今天';
-$labels['refresh'] = '刷新';
-$labels['checkmail'] = '收取新邮件';
-$labels['compose'] = '写邮件';
-$labels['writenewmessage'] = '写邮件';
-$labels['reply'] = '回复';
-$labels['replytomessage'] = '回复发件人';
+
+// toolbar buttons
+$labels['refresh']          = '刷新';
+$labels['checkmail']        = '收取新邮件';
+$labels['compose']          = '写邮件';
+$labels['writenewmessage']  = '写邮件';
+$labels['reply']            = '回复';
+$labels['replytomessage']   = '回复发件人';
 $labels['replytoallmessage'] = '回复所有';
-$labels['replyall'] = '回复全部';
-$labels['replylist'] = '回复列表';
-$labels['forward'] = '转发';
-$labels['forwardinline'] = '直接转发';
+$labels['replyall']         = '回复全部';
+$labels['replylist']        = '回复列表';
+$labels['forward']          = '转发';
+$labels['forwardinline']    = '直接转发';
 $labels['forwardattachment'] = '以附件转发';
-$labels['forwardmessage'] = '转发邮件';
-$labels['deletemessage'] = '删除邮件';
+$labels['forwardmessage']   = '转发邮件';
+$labels['deletemessage']    = '删除邮件';
 $labels['movemessagetotrash'] = '移动邮件到回收站';
-$labels['printmessage'] = '打印邮件';
-$labels['previousmessage'] = '显示上一封邮件';
-$labels['firstmessage'] = '显示第一封邮件';
-$labels['nextmessage'] = '下一封';
-$labels['lastmessage'] = '最后一封';
-$labels['backtolist'] = '返回邮件列表';
-$labels['viewsource'] = '显示邮件源文件';
-$labels['mark'] = '标记';
-$labels['markmessages'] = '标记邮件';
-$labels['markread'] = '已读';
-$labels['markunread'] = '未读';
-$labels['markflagged'] = '已标记';
-$labels['markunflagged'] = '未标记';
-$labels['moreactions'] = '更多动作...';
-$labels['more'] = '更多';
-$labels['back'] = '后退';
-$labels['options'] = '选项';
+$labels['printmessage']     = '打印邮件';
+$labels['previousmessage']  = '显示上一封邮件';
+$labels['firstmessage']     = '显示第一封邮件';
+$labels['nextmessage']      = '下一封';
+$labels['lastmessage']      = '最后一封';
+$labels['backtolist']       = '返回邮件列表';
+$labels['viewsource']       = '显示邮件源文件';
+$labels['mark']             = '标记';
+$labels['markmessages']     = '标记邮件';
+$labels['markread']         = '已读';
+$labels['markunread']       = '未读';
+$labels['markflagged']      = '已标记';
+$labels['markunflagged']    = '未标记';
+$labels['moreactions']      = '更多动作...';
+$labels['more']             = '更多';
+$labels['back']             = '后退';
+$labels['options']          = '选项';
+
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
-$labels['nonesort'] = '无';
 $labels['currpage'] = '当前页';
 $labels['unread'] = '未读';
 $labels['flagged'] = '已标记';
 $labels['unanswered'] = '未回复';
 $labels['deleted'] = '删除';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = '反选';
 $labels['filter'] = '过滤';
 $labels['list'] = '列表';
@@ -141,12 +171,14 @@ $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'] = '升序';
@@ -155,174 +187,216 @@ $labels['listcolumns'] = '列表列';
 $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
+
 $labels['folderactions'] = '目录操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
+
 $labels['quota'] = '邮箱容量';
-$labels['unknown'] = '未知';
-$labels['unlimited'] = '无限制';
-$labels['quicksearch'] = '快速查找';
-$labels['resetsearch'] = '清空查找内容';
-$labels['searchmod'] = '搜寻模式';
-$labels['msgtext'] = '整个邮件';
+$labels['unknown']  = '未知';
+$labels['unlimited']  = '无限制';
+
+$labels['quicksearch']  = '快速查找';
+$labels['resetsearch']  = '清空查找内容';
+$labels['searchmod']  = '搜寻模式';
+$labels['msgtext']  = '整个邮件';
+$labels['body']  = '正文';
+
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载（.eml）';
-$labels['editasnew'] = '编辑为新邮件';
-$labels['sendmessage'] = '立即发送';
-$labels['savemessage'] = '保存为草稿';
-$labels['addattachment'] = '添加附件';
-$labels['charset'] = '字符集';
-$labels['editortype'] = '编辑器类型';
-$labels['returnreceipt'] = '邮件回执';
-$labels['dsn'] = '投递状态提示';
+
+// message compose
+$labels['editasnew']      = '编辑为新邮件';
+$labels['send']           = '发送';
+$labels['sendmessage']    = '立即发送';
+$labels['savemessage']    = '保存为草稿';
+$labels['addattachment']  = '添加附件';
+$labels['charset']        = '字符集';
+$labels['editortype']     = '编辑器类型';
+$labels['returnreceipt']  = '邮件回执';
+$labels['dsn']            = '投递状态提示';
 $labels['mailreplyintro'] = '于 $date, $sender 回复:';
 $labels['originalmessage'] = '原始信件';
-$labels['editidents'] = '编辑身份';
-$labels['spellcheck'] = '拼写';
+
+$labels['editidents']    = '编辑身份';
+$labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
 $labels['resumeediting'] = '重新编辑';
-$labels['revertto'] = '恢复至';
+$labels['revertto']      = '恢复至';
+
 $labels['attach'] = '附加';
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = '关闭';
-$labels['messageoptions'] = '邮件选项...';
-$labels['low'] = '低';
-$labels['lowest'] = '最低';
-$labels['normal'] = '普通';
-$labels['high'] = '高';
+$labels['close']  = '关闭';
+$labels['messageoptions']  = '邮件选项...';
+
+$labels['low']     = '低';
+$labels['lowest']  = '最低';
+$labels['normal']  = '普通';
+$labels['high']    = '高';
 $labels['highest'] = '最高';
-$labels['nosubject'] = '（无主题）';
+
+$labels['nosubject']  = '（无主题）';
 $labels['showimages'] = '显示图片';
 $labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
-$labels['isdraft'] = '这是邮件草稿';
+$labels['isdraft']    = '这是邮件草稿';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = '显示更多消息头';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '纯文本';
 $labels['savesentmessagein'] = '将已发送邮件保存到';
 $labels['dontsave'] = '不保存';
 $labels['maxuploadsize'] = '允许的最大文件大小是 $size';
+
 $labels['addcc'] = '添加抄送';
 $labels['addbcc'] = '添加密送';
 $labels['addreplyto'] = '添加回复';
 $labels['addfollowupto'] = '添加投递组';
+
+// mdn
 $labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送通知。您是否希望通知发件人？';
 $labels['receiptread'] = '发送回执（已读）';
 $labels['yourmessage'] = '这是您的邮件回执';
 $labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或已理解邮件的内容。';
-$labels['name'] = '显示名称';
-$labels['firstname'] = '名字';
-$labels['surname'] = '姓氏';
-$labels['middlename'] = '中名';
-$labels['nameprefix'] = '前缀';
-$labels['namesuffix'] = '后缀';
-$labels['nickname'] = '昵称';
-$labels['jobtitle'] = '职位';
-$labels['department'] = '部门';
-$labels['gender'] = 'Gender';
-$labels['maidenname'] = '娘家姓';
-$labels['email'] = 'Email';
-$labels['phone'] = '电话';
-$labels['address'] = '地址';
-$labels['street'] = '街道';
-$labels['locality'] = '城市';
-$labels['zipcode'] = '邮编';
-$labels['region'] = '省份';
-$labels['country'] = '国家';
-$labels['birthday'] = '生日';
-$labels['anniversary'] = '纪念日';
-$labels['website'] = '主页';
+
+// address boook
+$labels['name']         = '显示名称';
+$labels['firstname']    = '名字';
+$labels['surname']      = '姓氏';
+$labels['middlename']   = '中名';
+$labels['nameprefix']   = '前缀';
+$labels['namesuffix']   = '后缀';
+$labels['nickname']     = '昵称';
+$labels['jobtitle']     = '职位';
+$labels['department']   = '部门';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = '娘家姓';
+$labels['email']        = 'Email';
+$labels['phone']        = '电话';
+$labels['address']      = '地址';
+$labels['street']       = '街道';
+$labels['locality']     = '城市';
+$labels['zipcode']      = '邮编';
+$labels['region']       = '省份';
+$labels['country']      = '国家';
+$labels['birthday']     = '生日';
+$labels['anniversary']  = '纪念日';
+$labels['website']      = '主页';
 $labels['instantmessenger'] = 'QQ';
 $labels['notes'] = '备注';
-$labels['male'] = '男';
+$labels['male']   = '男';
 $labels['female'] = '女';
 $labels['manager'] = '经理';
 $labels['assistant'] = '助理';
-$labels['typeassistant'] = '助理';
 $labels['spouse'] = '配偶';
 $labels['allfields'] = '所有项目';
 $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
 $labels['advanced'] = '高级选项';
 $labels['other'] = '其他';
-$labels['typeother'] = '其他';
-$labels['typehome'] = '家庭';
-$labels['typework'] = '工作';
-$labels['typemobile'] = '手机';
-$labels['typemain'] = '主';
-$labels['typehomefax'] = '家庭传真';
-$labels['typeworkfax'] = '工作传真';
-$labels['typecar'] = '车牌';
-$labels['typepager'] = '呼机';
-$labels['typevideo'] = '视频';
-$labels['typehomepage'] = '主页';
+
+$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['addcontact'] = '添加联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
 $labels['personalinfo'] = '个人信息';
-$labels['edit'] = '编辑';
+
+$labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
-$labels['save'] = '保存';
+$labels['save']   = '保存';
 $labels['delete'] = '删除';
 $labels['rename'] = '更名';
 $labels['addphoto'] = '上传';
 $labels['replacephoto'] = '覆盖';
 $labels['uploadphoto'] = '上传照片';
-$labels['newcontact'] = '新建联系人';
-$labels['deletecontact'] = '删除选中的联系人';
-$labels['composeto'] = '写信给';
+
+$labels['newcontact']     = '新建联系人';
+$labels['deletecontact']  = '删除选中的联系人';
+$labels['composeto']      = '写信给';
 $labels['contactsfromto'] = '第 $from 到 $to 个联系人，共 $count 个';
-$labels['print'] = '打印';
-$labels['export'] = '导出';
-$labels['exportvcards'] = '以 vCard 格式导出联系人';
+$labels['print']          = '打印';
+$labels['export']         = '导出';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = '以 vCard 格式导出联系人';
 $labels['newcontactgroup'] = '创建新的组';
-$labels['grouprename'] = '重命名组';
-$labels['groupdelete'] = '删除组';
+$labels['grouprename']    = '重命名组';
+$labels['groupdelete']    = '删除组';
 $labels['groupremoveselected'] = '从分组中移除选中的联系人';
-$labels['previouspage'] = '上一页';
-$labels['firstpage'] = '第一页';
-$labels['nextpage'] = '下一页';
-$labels['lastpage'] = '最后一页';
+
+$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['importtarget'] = '增加新联系人到通讯录:';
 $labels['importreplace'] = '替换整个地址簿';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = '完成';
+
+// settings
 $labels['settingsfor'] = '设置';
 $labels['about'] = '关于';
 $labels['preferences'] = '偏好设置';
 $labels['userpreferences'] = '个人偏好';
 $labels['editpreferences'] = '修改个人偏好';
+
 $labels['identities'] = '发件身份';
 $labels['manageidentities'] = '管理此账号的身份';
 $labels['newidentity'] = '添加身份';
+
 $labels['newitem'] = '添加条目';
 $labels['edititem'] = '编辑条目';
+
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = '数字签名';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '时间格式';
 $labels['prettydate'] = '短日期格式';
-$labels['setdefault'] = '设为默认';
-$labels['autodetect'] = '自动';
-$labels['language'] = '语言';
-$labels['timezone'] = '时区';
-$labels['pagesize'] = '每页显示的邮件数量';
+$labels['setdefault']  = '设为默认';
+$labels['autodetect']  = '自动';
+$labels['language']  = '语言';
+$labels['timezone']  = '时区';
+$labels['pagesize']  = '每页显示的邮件数量';
 $labels['signature'] = '签名';
-$labels['dstactive'] = '夏令时';
+$labels['dstactive']  = '夏令时';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = '在新窗口中撰写';
 $labels['htmleditor'] = '使用 HTML 编辑器';
 $labels['htmlonreply'] = '仅当回复HTML邮件';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '使用 HTML 签名';
 $labels['previewpane'] = '显示预览窗口';
 $labels['skin'] = '界面皮肤';
@@ -346,10 +420,11 @@ $labels['showremoteimages'] = '显示内嵌的图片';
 $labels['fromknownsenders'] = '来自已知发件人';
 $labels['always'] = '总是';
 $labels['showinlineimages'] = '在邮件下方显示附件中的图片';
-$labels['autosavedraft'] = '自动保存到草稿箱';
-$labels['everynminutes'] = '每隔 $n 分钟';
-$labels['never'] = '从不';
-$labels['immediately'] = '立即';
+$labels['autosavedraft']  = '自动保存到草稿箱';
+$labels['everynminutes']  = '每隔 $n 分钟';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = '从不';
+$labels['immediately']  = '立即';
 $labels['messagesdisplaying'] = '显示参数';
 $labels['messagescomposition'] = '撰写邮件';
 $labels['mimeparamfolding'] = '附件名';
@@ -369,6 +444,7 @@ $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
 $labels['signatureoptions'] = '签名选项';
 $labels['whenreplying'] = '当回复时';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = '在原文上面开始新邮件';
 $labels['replybottomposting'] = '在原文下面开始新邮件';
 $labels['replyremovesignature'] = '当回复时从邮件移除原始签名';
@@ -379,26 +455,33 @@ $labels['replysignaturepos'] = '当回复或转发时插入签名';
 $labels['belowquote'] = '位于原文下方';
 $labels['abovequote'] = '位于原文上方';
 $labels['insertsignature'] = '插入签名';
-$labels['previewpanemarkread'] = '标记预览邮件为已读';
-$labels['afternseconds'] = '$n 秒之后';
+$labels['previewpanemarkread']  = '标记预览邮件为已读';
+$labels['afternseconds']  = '$n 秒之后';
 $labels['reqmdn'] = '总是要求回执';
 $labels['reqdsn'] = '总是要求投递状态通知';
 $labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
-$labels['defaultaddressbook'] = '增加联系人到所选通讯录';
+$labels['defaultabook'] = '默认地址薄';
 $labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = '发邮件前进行拼写检查';
 $labels['spellcheckoptions'] = '拼写检查选项';
 $labels['spellcheckignoresyms'] = '忽略带符号的单词';
 $labels['spellcheckignorenums'] = '忽略带数字的单词';
 $labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
 $labels['addtodict'] = '添加到字典中';
-$labels['folder'] = '目录管理';
-$labels['foldername'] = '邮件夹名称';
-$labels['subscribed'] = '已订阅';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = '目录管理';
+$labels['folders']  = '目录管理';
+$labels['foldername']  = '邮件夹名称';
+$labels['subscribed']  = '已订阅';
 $labels['messagecount'] = '邮件数量';
-$labels['create'] = '建立';
-$labels['createfolder'] = '建立新邮件夹';
-$labels['managefolders'] = '管理邮件夹';
+$labels['create']  = '建立';
+$labels['createfolder']  = '建立新邮件夹';
+$labels['managefolders']  = '管理邮件夹';
 $labels['specialfolders'] = '定义邮件夹';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = '文件夹属性';
@@ -408,22 +491,29 @@ $labels['info'] = '信息';
 $labels['getfoldersize'] = '获得文件夹容量';
 $labels['changesubscription'] = '更改订阅';
 $labels['foldertype'] = '目录类型';
-$labels['personalfolder'] = '私有目录';
-$labels['otherfolder'] = '他人目录';
-$labels['sharedfolder'] = '共享目录';
+$labels['personalfolder']  = '私有目录';
+$labels['otherfolder']  = '他人目录';
+$labels['sharedfolder']  = '共享目录';
+
 $labels['sortby'] = '排序';
-$labels['sortasc'] = '递增排序';
+$labels['sortasc']  = '递增排序';
 $labels['sortdesc'] = '递减排序';
 $labels['undo'] = '撤销';
+
+$labels['installedplugins'] = '已安装插件';
 $labels['plugin'] = '插件';
 $labels['version'] = '版本';
 $labels['source'] = '源';
 $labels['license'] = '许可协议';
 $labels['support'] = '获取支持';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = '英语';
 $labels['westerneuropean'] = '西欧';
@@ -443,3 +533,4 @@ $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
 $labels['chinese'] = '中文';
 
+?>
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index f15f77997..4c47f833e 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '发生错误！';
-$messages['loginfailed'] = '登录失败。';
+$messages['errortitle']  = '发生错误！';
+$messages['loginfailed']  = '登录失败。';
 $messages['cookiesdisabled'] = '您的浏览器不接受 cookies。';
 $messages['sessionerror'] = '会话已过期。';
 $messages['storageerror'] = '连接到邮件服务器失败。';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = '请求超时';
 $messages['errorreadonly'] = '不可对只读文件夹进行操作。';
 $messages['errornoperm'] = '无权限操作';
 $messages['invalidrequest'] = '无效的请求！数据保存失败。';
+$messages['invalidhost'] = '非法主机名。';
 $messages['nomessagesfound'] = '此邮件夹内无邮件。';
 $messages['loggedout'] = '您已成功注销，再见！';
 $messages['mailboxempty'] = '邮件夹为空';
+$messages['refreshing'] = '刷新中...';
 $messages['loading'] = '正在载入...';
 $messages['uploading'] = '正在上传文件...';
 $messages['uploadingmany'] = '正在上传文件...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = '无法移动邮件。';
 $messages['errorcopying'] = '无法复制邮件。';
 $messages['errordeleting'] = '无法删除邮件。';
 $messages['errormarking'] = '无法标记邮件。';
-$messages['deletecontactconfirm'] = '确定要删除已选中的联系人？';
-$messages['deletegroupconfirm'] = '确定要删除以选中的组?';
+$messages['deletecontactconfirm']  = '确定要删除已选中的联系人？';
+$messages['deletegroupconfirm']  = '确定要删除以选中的组?';
 $messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
-$messages['deletefolderconfirm'] = '确定要删除已选中的邮件夹？';
-$messages['purgefolderconfirm'] = '是否确认要删除当前邮件夹中的所有邮件？';
+$messages['deletefolderconfirm']  = '确定要删除已选中的邮件夹？';
+$messages['purgefolderconfirm']  = '是否确认要删除当前邮件夹中的所有邮件？';
 $messages['contactdeleting'] = '正在删除联系人...';
 $messages['groupdeleting'] = '正在删除组...';
 $messages['folderdeleting'] = '正在删除文件夹...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = '订阅文件夹中...';
 $messages['folderunsubscribing'] = '退订中...';
 $messages['formincomplete'] = '当前表单未填写完整，请完整填写。';
 $messages['noemailwarning'] = '请输入一个有效的邮件地址。';
-$messages['nonamewarning'] = '请输入名字。';
+$messages['nonamewarning']  = '请输入名字。';
 $messages['nopagesizewarning'] = '请输入每页显示的邮件数量';
 $messages['nosenderwarning'] = '请输入发件人地址。';
 $messages['norecipientwarning'] = '至少需要一个收件人。';
-$messages['nosubjectwarning'] = '主题为空。您要输入一个主题吗？';
+$messages['nosubjectwarning']  = '主题为空。您要输入一个主题吗？';
 $messages['nobodywarning'] = '要发送无正文的邮件吗？';
 $messages['notsentwarning'] = '邮件未发送。您确定要离开并舍弃当前邮件吗？';
 $messages['noldapserver'] = '请选择一个LDAP服务器进行查找。';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = '请选择要上传的文件。';
 $messages['addresswriterror'] = '已选择的地址簿不可写。';
 $messages['contactaddedtogroup'] = '成功添加联系人至该分组。';
 $messages['contactremovedfromgroup'] = '成功从该分组移除联系人。';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = '正在导入，请稍后...';
-$messages['importerror'] = '导入失败！所上传的文件不是有效的 vCard 文件。';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>成功导入 $inserted 联系人</b>';
 $messages['importconfirmskipped'] = '<b>跳过已存在的 $skipped 项目</b>';
 $messages['opnotpermitted'] = '不允许的操作!';
@@ -157,4 +163,7 @@ $messages['invalidimageformat'] = '非法的图像类型。';
 $messages['mispellingsfound'] = '检查到拼写错误。';
 $messages['parentnotwritable'] = '无法创建和转移到所选的目录,权限不足。';
 $messages['messagetoobig'] = '由于邮件部分过大无法处理。';
+$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/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index cb4ef77ed..6f2f7ed52 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '歡迎使用 $product';
-$labels['username'] = '使用者名稱';
-$labels['password'] = '使用者密碼';
-$labels['server'] = '伺服器';
-$labels['login'] = '登入';
-$labels['logout'] = '登出';
-$labels['mail'] = '電子郵件';
+
+// login page
+$labels['welcome']   = '歡迎使用 $product';
+$labels['username']  = '使用者名稱';
+$labels['password']  = '使用者密碼';
+$labels['server']    = '伺服器';
+$labels['login']     = '登入';
+
+// taskbar
+$labels['logout']   = '登出';
+$labels['mail']     = '電子郵件';
 $labels['settings'] = '設定';
 $labels['addressbook'] = '通訊錄';
-$labels['inbox'] = '收件匣';
+
+// mailbox names
+$labels['inbox']  = '收件匣';
 $labels['drafts'] = '草稿匣';
-$labels['sent'] = '寄件備份';
-$labels['trash'] = '垃圾桶';
-$labels['junk'] = '垃圾郵件';
+$labels['sent']   = '寄件備份';
+$labels['trash']  = '垃圾桶';
+$labels['junk']   = '垃圾郵件';
+
+// message listing
 $labels['subject'] = '主旨';
-$labels['from'] = '寄件者';
-$labels['to'] = '收件者';
-$labels['cc'] = '副本';
-$labels['bcc'] = '密件副本';
+$labels['from']    = '寄件者';
+$labels['sender']  = '寄件者';
+$labels['to']      = '收件者';
+$labels['cc']      = '副本';
+$labels['bcc']     = '密件副本';
 $labels['replyto'] = '回覆至';
 $labels['followupto'] = '信件跟隨至';
-$labels['date'] = '日期';
-$labels['size'] = '大小';
+$labels['date']    = '日期';
+$labels['size']    = '大小';
 $labels['priority'] = '優先順序';
 $labels['organization'] = '組織';
 $labels['readstatus'] = '讀信狀態';
 $labels['listoptions'] = '列表選項...';
+
 $labels['mailboxlist'] = '資料夾';
-$labels['folders'] = '資料夾';
 $labels['messagesfromto'] = '郵件 $from 至 $to，共有 $count 封郵件';
 $labels['threadsfromto'] = '郵件串 $from 至 $to，共有 $count 個';
 $labels['messagenrof'] = '第 $nr 封郵件，共有 $count 封';
 $labels['fromtoshort'] = '自 $from – $to 統計 $count';
-$labels['copy'] = '複製';
-$labels['move'] = '移動';
-$labels['moveto'] = '移至...';
+
+$labels['copy']     = '複製';
+$labels['move']     = '移動';
+$labels['moveto']   = '移至...';
 $labels['download'] = '下載';
+$labels['showattachment'] = '顯示';
+$labels['showanyway'] = '總是顯示';
+
 $labels['filename'] = '檔案名稱';
 $labels['filesize'] = '檔案大小';
+
 $labels['addtoaddressbook'] = '新增至通訊錄';
+
+// weekdays short
 $labels['sun'] = '週日';
 $labels['mon'] = '週一';
 $labels['tue'] = '週二';
@@ -61,79 +80,89 @@ $labels['wed'] = '週三';
 $labels['thu'] = '週四';
 $labels['fri'] = '週五';
 $labels['sat'] = '週六';
-$labels['sunday'] = '星期日';
-$labels['monday'] = '星期一';
-$labels['tuesday'] = '星期二';
+
+// weekdays long
+$labels['sunday']    = '星期日';
+$labels['monday']    = '星期一';
+$labels['tuesday']   = '星期二';
 $labels['wednesday'] = '星期三';
-$labels['thursday'] = '星期四';
-$labels['friday'] = '星期五';
-$labels['saturday'] = '星期六';
-$labels['jan'] = '一';
-$labels['feb'] = '二';
-$labels['mar'] = '三';
-$labels['apr'] = '四';
-$labels['may'] = '五月';
-$labels['longmay'] = '五月';
-$labels['jun'] = '六';
-$labels['jul'] = '七';
-$labels['aug'] = '八';
-$labels['sep'] = '九';
-$labels['oct'] = '十';
-$labels['nov'] = '十一';
-$labels['dec'] = '十二';
-$labels['longjan'] = '一月';
-$labels['longfeb'] = '二月';
-$labels['longmar'] = '三月';
-$labels['longapr'] = '四月';
-$labels['longjun'] = '六月';
-$labels['longjul'] = '七月';
-$labels['longaug'] = '八月';
-$labels['longsep'] = '九月';
-$labels['longoct'] = '十月';
-$labels['longnov'] = '十一月';
-$labels['longdec'] = '十二月';
+$labels['thursday']  = '星期四';
+$labels['friday']    = '星期五';
+$labels['saturday']  = '星期六';
+
+// months short
+$labels['jan']	= '一';
+$labels['feb']	= '二';
+$labels['mar']	= '三';
+$labels['apr']	= '四';
+$labels['may']	= '五月';
+$labels['jun']	= '六';
+$labels['jul'] 	= '七';
+$labels['aug']	= '八';
+$labels['sep']	= '九';
+$labels['oct']	= '十';
+$labels['nov']	= '十一';
+$labels['dec']	= '十二';
+
+// months long
+$labels['longjan']	= '一月';
+$labels['longfeb']	= '二月';
+$labels['longmar']	= '三月';
+$labels['longapr']	= '四月';
+$labels['longmay']	= '五月';
+$labels['longjun']	= '六月';
+$labels['longjul']	= '七月';
+$labels['longaug']	= '八月';
+$labels['longsep']	= '九月';
+$labels['longoct']	= '十月';
+$labels['longnov']	= '十一月';
+$labels['longdec']	= '十二月';
+
 $labels['today'] = '今日';
-$labels['refresh'] = '重新整理';
-$labels['checkmail'] = '檢查新郵件';
-$labels['compose'] = '撰寫新郵件';
-$labels['writenewmessage'] = '撰寫新郵件';
-$labels['reply'] = '回覆';
-$labels['replytomessage'] = '回覆';
+
+// toolbar buttons
+$labels['refresh']          = '重新整理';
+$labels['checkmail']        = '檢查新郵件';
+$labels['compose']          = '撰寫新郵件';
+$labels['writenewmessage']  = '撰寫新郵件';
+$labels['reply']            = '回覆';
+$labels['replytomessage']   = '回覆';
 $labels['replytoallmessage'] = '全部回覆';
-$labels['replyall'] = '全部回覆';
-$labels['replylist'] = '清單回覆';
-$labels['forward'] = '轉寄';
-$labels['forwardinline'] = '轉寄';
+$labels['replyall']         = '全部回覆';
+$labels['replylist']        = '清單回覆';
+$labels['forward']          = '轉寄';
+$labels['forwardinline']    = '轉寄';
 $labels['forwardattachment'] = '以附件方式轉寄';
-$labels['forwardmessage'] = '轉寄';
-$labels['deletemessage'] = '刪除郵件';
+$labels['forwardmessage']   = '轉寄';
+$labels['deletemessage']    = '刪除郵件';
 $labels['movemessagetotrash'] = '移動郵件至垃圾桶';
-$labels['printmessage'] = '列印此郵件';
-$labels['previousmessage'] = '顯示上一封郵件';
-$labels['firstmessage'] = '顯示第一封郵件';
-$labels['nextmessage'] = '顯示下一封郵件';
-$labels['lastmessage'] = '顯示最後一封郵件';
-$labels['backtolist'] = '回到郵件清單';
-$labels['viewsource'] = '顯示原始郵件';
-$labels['mark'] = '標記';
-$labels['markmessages'] = '標記選取的郵件為';
-$labels['markread'] = '標示為已讀取';
-$labels['markunread'] = '標示為未讀取';
-$labels['markflagged'] = '標上旗標';
-$labels['markunflagged'] = '移除旗標';
-$labels['moreactions'] = '資料夾動作...';
-$labels['more'] = '更多';
-$labels['back'] = '上一頁';
-$labels['options'] = '選項';
+$labels['printmessage']     = '列印此郵件';
+$labels['previousmessage']  = '顯示上一封郵件';
+$labels['firstmessage']     = '顯示第一封郵件';
+$labels['nextmessage']      = '顯示下一封郵件';
+$labels['lastmessage']      = '顯示最後一封郵件';
+$labels['backtolist']       = '回到郵件清單';
+$labels['viewsource']       = '顯示原始郵件';
+$labels['mark']             = '標記';
+$labels['markmessages']     = '標記選取的郵件為';
+$labels['markread']         = '標示為已讀取';
+$labels['markunread']       = '標示為未讀取';
+$labels['markflagged']      = '標上旗標';
+$labels['markunflagged']    = '移除旗標';
+$labels['moreactions']      = '資料夾動作...';
+$labels['more']             = '更多';
+$labels['back']             = '上一頁';
+$labels['options']          = '選項';
+
 $labels['select'] = '選取';
 $labels['all'] = '全部郵件';
 $labels['none'] = '無';
-$labels['nonesort'] = '無';
 $labels['currpage'] = '目前頁面';
 $labels['unread'] = '未讀取的郵件';
 $labels['flagged'] = '已加標記的郵件';
 $labels['unanswered'] = '未回覆的郵件';
 $labels['deleted'] = '已刪除的郵件';
+$labels['undeleted'] = '未刪除的郵件';
 $labels['invert'] = '反選';
 $labels['filter'] = '篩選範圍';
 $labels['list'] = '清單';
@@ -142,12 +171,14 @@ $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'] = '遞增';
@@ -156,174 +187,216 @@ $labels['listcolumns'] = '列出欄位';
 $labels['listsorting'] = '排序欄位';
 $labels['listorder'] = '排序順序';
 $labels['listmode'] = '清單檢視模式';
+
 $labels['folderactions'] = '資料夾動作...';
 $labels['compact'] = '壓縮';
 $labels['empty'] = '清空';
+
 $labels['quota'] = '磁碟使用量';
-$labels['unknown'] = '未知';
-$labels['unlimited'] = '無限制';
-$labels['quicksearch'] = '快速搜尋';
-$labels['resetsearch'] = '重設搜尋';
-$labels['searchmod'] = '修改搜尋';
-$labels['msgtext'] = '整封郵件';
+$labels['unknown']  = '未知';
+$labels['unlimited']  = '無限制';
+
+$labels['quicksearch']  = '快速搜尋';
+$labels['resetsearch']  = '重設搜尋';
+$labels['searchmod']  = '修改搜尋';
+$labels['msgtext']  = '整封郵件';
+$labels['body']  = '內文';
+
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
-$labels['editasnew'] = '以新郵件編輯';
-$labels['sendmessage'] = '立即寄出';
-$labels['savemessage'] = '儲存成草稿';
-$labels['addattachment'] = '增加附件檔案';
-$labels['charset'] = '郵件編碼';
-$labels['editortype'] = '編輯器類型';
-$labels['returnreceipt'] = '要求讀取回條';
-$labels['dsn'] = '傳送狀態通知';
+
+// message compose
+$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['editidents']    = '編輯身份資訊';
+$labels['spellcheck']    = '拼字';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
-$labels['revertto'] = '恢復至';
+$labels['revertto']      = '恢復至';
+
 $labels['attach'] = '附件';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = '關閉';
-$labels['messageoptions'] = '郵件選項...';
-$labels['low'] = '低';
-$labels['lowest'] = '最低';
-$labels['normal'] = '普通';
-$labels['high'] = '高';
+$labels['close']  = '關閉';
+$labels['messageoptions']  = '郵件選項...';
+
+$labels['low']     = '低';
+$labels['lowest']  = '最低';
+$labels['normal']  = '普通';
+$labels['high']    = '高';
 $labels['highest'] = '最高';
-$labels['nosubject'] = '（沒有主旨）';
+
+$labels['nosubject']  = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
-$labels['isdraft'] = '這是一封草稿';
+$labels['isdraft']    = '這是一封草稿';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = '顯示更多的訊息表頭';
+$labels['togglefullheaders'] = '切換原始訊息表頭';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '純文字';
 $labels['savesentmessagein'] = '儲存寄件備份至';
 $labels['dontsave'] = '不要儲存';
 $labels['maxuploadsize'] = '上傳檔案大小限制為 $size';
+
 $labels['addcc'] = '新增副本';
 $labels['addbcc'] = '新增密件副本';
 $labels['addreplyto'] = '新增回覆地址';
 $labels['addfollowupto'] = '新增 信件跟隨至';
+
+// mdn
 $labels['mdnrequest'] = '此郵件的寄件者希望在你閱讀此郵件時受到通知。你想要通知寄件者嗎？';
 $labels['receiptread'] = '郵件回條（已閱讀）';
 $labels['yourmessage'] = '這是你郵件的郵件回條';
 $labels['receiptnote'] = '注意：此回條只能確認收件者的電腦顯示了郵件，並不能保證收件者已閱讀或了解郵件的內容。';
-$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'] = '網站';
+
+// address boook
+$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'] = '即時通訊';
 $labels['notes'] = '註解';
-$labels['male'] = '男';
+$labels['male']   = '男';
 $labels['female'] = '女';
 $labels['manager'] = '經理';
 $labels['assistant'] = '助理';
-$labels['typeassistant'] = '助理';
 $labels['spouse'] = '配偶';
 $labels['allfields'] = '所有欄位';
 $labels['search'] = '搜尋';
 $labels['advsearch'] = '進階搜尋';
 $labels['advanced'] = '進階設定';
 $labels['other'] = '其他';
-$labels['typeother'] = '其他';
-$labels['typehome'] = '住家';
-$labels['typework'] = '工作';
-$labels['typemobile'] = '行動電話';
-$labels['typemain'] = '主要';
-$labels['typehomefax'] = '住家傳真';
-$labels['typeworkfax'] = '工作傳真';
-$labels['typecar'] = '汽車';
-$labels['typepager'] = '傳呼機';
-$labels['typevideo'] = '影片';
-$labels['typehomepage'] = '首頁';
+
+$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['addcontact'] = '新增聯絡人';
 $labels['editcontact'] = '編輯聯絡人';
 $labels['contacts'] = '聯絡人';
 $labels['contactproperties'] = '聯絡人資訊';
 $labels['personalinfo'] = '個人資訊';
-$labels['edit'] = '編輯';
+
+$labels['edit']   = '編輯';
 $labels['cancel'] = '取消';
-$labels['save'] = '儲存';
+$labels['save']   = '儲存';
 $labels['delete'] = '刪除';
 $labels['rename'] = '重新命名';
 $labels['addphoto'] = '新增';
 $labels['replacephoto'] = '取代';
 $labels['uploadphoto'] = '上傳相片';
-$labels['newcontact'] = '建立新聯絡人資料';
-$labels['deletecontact'] = '刪除所選擇的聯絡人';
-$labels['composeto'] = '寄信至所選擇的聯絡人';
+
+$labels['newcontact']     = '建立新聯絡人資料';
+$labels['deletecontact']  = '刪除所選擇的聯絡人';
+$labels['composeto']      = '寄信至所選擇的聯絡人';
 $labels['contactsfromto'] = '聯絡人 $from 至 $to，共有 $count 人';
-$labels['print'] = '列印';
-$labels['export'] = '匯出通訊錄';
-$labels['exportvcards'] = '匯出通訊錄為 vCard 格式';
+$labels['print']          = '列印';
+$labels['export']         = '匯出通訊錄';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = '匯出通訊錄為 vCard 格式';
 $labels['newcontactgroup'] = '新增聯絡人群組';
-$labels['grouprename'] = '重新命名群組';
-$labels['groupdelete'] = '刪除群組';
+$labels['grouprename']    = '重新命名群組';
+$labels['groupdelete']    = '刪除群組';
 $labels['groupremoveselected'] = '從群組中刪除選擇的聯絡人';
-$labels['previouspage'] = '顯示上一頁';
-$labels['firstpage'] = '顯示第一頁';
-$labels['nextpage'] = '顯示下一頁';
-$labels['lastpage'] = '顯示最後一頁';
+
+$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['importtarget'] = '新增連絡人至通訊錄:';
 $labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
+$labels['importdesc'] = '您可以將已存在的資料匯入通訊錄，目前支援匯入 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 與 CSV (逗點分隔)格式資料';
 $labels['done'] = '完成';
+
+// settings
 $labels['settingsfor'] = '設定';
 $labels['about'] = '關於';
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = '個人設定';
 $labels['editpreferences'] = '編輯個人設定';
+
 $labels['identities'] = '身份資訊';
 $labels['manageidentities'] = '管理此帳號的身份資訊';
 $labels['newidentity'] = '新增身份資訊';
+
 $labels['newitem'] = '新增項目';
 $labels['edititem'] = '編輯項目';
+
 $labels['preferhtml'] = '使用 HTML 顯示';
 $labels['defaultcharset'] = '預設編碼';
 $labels['htmlmessage'] = 'HTML 郵件';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = '數位簽章';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '時間格式';
 $labels['prettydate'] = '簡短日期顯示';
-$labels['setdefault'] = '設成預設i值';
-$labels['autodetect'] = '自動選擇';
-$labels['language'] = '語言';
-$labels['timezone'] = '時區';
-$labels['pagesize'] = '每頁郵件數';
+$labels['setdefault']  = '設成預設值';
+$labels['autodetect']  = '自動選擇';
+$labels['language']  = '語言';
+$labels['timezone']  = '時區';
+$labels['pagesize']  = '每頁郵件數';
 $labels['signature'] = '簽名檔';
-$labels['dstactive'] = '日光節約時間';
+$labels['dstactive']  = '日光節約時間';
+$labels['showinextwin'] = '在新視窗中顯示郵件';
+$labels['composeextwin'] = '在新視窗中撰寫郵件';
 $labels['htmleditor'] = '使用 HTML 撰寫郵件';
 $labels['htmlonreply'] = '只有在回覆HTML信件時';
+$labels['htmlonreplyandforward'] = '只有在轉寄或回覆HTML信件時';
 $labels['htmlsignature'] = 'HTML 簽名檔';
 $labels['previewpane'] = '顯示預覽窗格';
 $labels['skin'] = '版面風格';
@@ -347,10 +420,11 @@ $labels['showremoteimages'] = '顯示遠端郵件內文中的圖片';
 $labels['fromknownsenders'] = '從已知的寄件者';
 $labels['always'] = '總是接受';
 $labels['showinlineimages'] = '將附加檔案的圖片顯示於郵件最後';
-$labels['autosavedraft'] = '自動儲存草稿';
-$labels['everynminutes'] = '每 $n 分鐘';
-$labels['never'] = '絕對不要';
-$labels['immediately'] = '馬上';
+$labels['autosavedraft']  = '自動儲存草稿';
+$labels['everynminutes']  = '每 $n 分鐘';
+$labels['refreshinterval']  = '重新整理 (確認是否新郵件)';
+$labels['never']  = '絕對不要';
+$labels['immediately']  = '馬上';
 $labels['messagesdisplaying'] = '郵件顯示設定';
 $labels['messagescomposition'] = '撰寫郵件設定';
 $labels['mimeparamfolding'] = '附加檔案名稱的編碼方式';
@@ -370,6 +444,7 @@ $labels['maintenance'] = '管理';
 $labels['newmessage'] = '新郵件';
 $labels['signatureoptions'] = '簽名檔選項';
 $labels['whenreplying'] = '回覆時';
+$labels['replyempty'] = '不要包含原來的信件內容';
 $labels['replytopposting'] = '在原來的上方開始新訊息';
 $labels['replybottomposting'] = '在原來的下方開始新訊息';
 $labels['replyremovesignature'] = '回覆時移除原有簽名檔';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = '當回覆或轉寄時附上簽名檔';
 $labels['belowquote'] = '引用的下方';
 $labels['abovequote'] = '引用的上方';
 $labels['insertsignature'] = '插入簽名檔';
-$labels['previewpanemarkread'] = '標示已預覽訊息為已讀取';
-$labels['afternseconds'] = '$n 秒之後';
+$labels['previewpanemarkread']  = '標示已預覽訊息為已讀取';
+$labels['afternseconds']  = '$n 秒之後';
 $labels['reqmdn'] = '永遠索取讀取回條';
 $labels['reqdsn'] = '總是要求傳送狀態通知';
 $labels['replysamefolder'] = '將回覆與回覆信件放置於相同資料夾';
-$labels['defaultaddressbook'] = '新增連絡人至指定通訊錄';
+$labels['defaultabook'] = '預設通訊錄';
 $labels['autocompletesingle'] = '在自動完成中略過另一個email';
 $labels['listnamedisplay'] = '標記聯絡人為';
 $labels['spellcheckbeforesend'] = '寄送前執行拼字檢查';
@@ -395,13 +470,18 @@ $labels['spellcheckignorenums'] = '忽略數字';
 $labels['spellcheckignorecaps'] = '忽略大寫字母';
 $labels['addtodict'] = '加入詞典';
 $labels['mailtoprotohandler'] = '註冊mailto:協定處理程式';
-$labels['folder'] = '資料夾';
-$labels['foldername'] = '資料夾名稱';
-$labels['subscribed'] = '顯示';
+$labels['forwardmode'] = '郵件轉寄方式';
+$labels['inline'] = '放入內文';
+$labels['asattachment'] = '當成附件';
+
+$labels['folder']  = '資料夾';
+$labels['folders']  = '資料夾';
+$labels['foldername']  = '資料夾名稱';
+$labels['subscribed']  = '顯示';
 $labels['messagecount'] = '郵件數目';
-$labels['create'] = '建立';
-$labels['createfolder'] = '建立新資料夾';
-$labels['managefolders'] = '管理資料夾';
+$labels['create']  = '建立';
+$labels['createfolder']  = '建立新資料夾';
+$labels['managefolders']  = '管理資料夾';
 $labels['specialfolders'] = '預設資料夾設定';
 $labels['properties'] = '屬性';
 $labels['folderproperties'] = '資料夾屬性';
@@ -411,22 +491,29 @@ $labels['info'] = '資訊';
 $labels['getfoldersize'] = '點擊顯示資料夾大小';
 $labels['changesubscription'] = '點擊以改變訂閱';
 $labels['foldertype'] = '資料夾類型';
-$labels['personalfolder'] = '私人資料夾';
-$labels['otherfolder'] = '其他使用者資料夾';
-$labels['sharedfolder'] = '公用資料夾';
+$labels['personalfolder']  = '私人資料夾';
+$labels['otherfolder']  = '其他使用者資料夾';
+$labels['sharedfolder']  = '公用資料夾';
+
 $labels['sortby'] = '排序';
-$labels['sortasc'] = '遞增排序';
+$labels['sortasc']  = '遞增排序';
 $labels['sortdesc'] = '遞減排序';
 $labels['undo'] = '復原';
+
+$labels['installedplugins'] = '已安裝的插件';
 $labels['plugin'] = '擴充套件';
 $labels['version'] = '版本';
 $labels['source'] = '來源';
 $labels['license'] = '授權許可';
 $labels['support'] = '取得支援';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = '萬國碼';
 $labels['english'] = '英語';
 $labels['westerneuropean'] = '西歐語系';
@@ -446,3 +533,4 @@ $labels['japanese'] = '日本';
 $labels['korean'] = '韓國';
 $labels['chinese'] = '國語';
 
+?>
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 753f6adb6..f0f92c848 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nansen                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '發生錯誤！';
-$messages['loginfailed'] = '登入失敗';
+$messages['errortitle']  = '發生錯誤！';
+$messages['loginfailed']  = '登入失敗';
 $messages['cookiesdisabled'] = '你的瀏覽器不接受 cookies';
 $messages['sessionerror'] = '你的工作階段已失效或過期';
 $messages['storageerror'] = '連線到 IMAP 伺服器失敗';
@@ -57,11 +60,11 @@ $messages['errormoving'] = '無法移動此郵件';
 $messages['errorcopying'] = '無法訊息';
 $messages['errordeleting'] = '無法刪除此郵件';
 $messages['errormarking'] = '無法標上旗標';
-$messages['deletecontactconfirm'] = '你確定要刪除已選擇的聯絡人？';
-$messages['deletegroupconfirm'] = '您確定要刪除選擇的群組嗎?';
+$messages['deletecontactconfirm']  = '你確定要刪除已選擇的聯絡人？';
+$messages['deletegroupconfirm']  = '您確定要刪除選擇的群組嗎?';
 $messages['deletemessagesconfirm'] = '你確定要刪除已選擇的郵件？';
-$messages['deletefolderconfirm'] = '你確定要刪除這個資料夾嗎？';
-$messages['purgefolderconfirm'] = '你確定要刪除這個資料夾裡面所有的郵件嗎？';
+$messages['deletefolderconfirm']  = '你確定要刪除這個資料夾嗎？';
+$messages['purgefolderconfirm']  = '你確定要刪除這個資料夾裡面所有的郵件嗎？';
 $messages['contactdeleting'] = '刪除連絡人...';
 $messages['groupdeleting'] = '刪除存組...';
 $messages['folderdeleting'] = '刪除資料夾中...';
@@ -70,11 +73,11 @@ $messages['foldersubscribing'] = '訂閱資料夾...';
 $messages['folderunsubscribing'] = '取消訂閱資料夾...';
 $messages['formincomplete'] = '這個表單有部分未填，請完整填寫';
 $messages['noemailwarning'] = '請輸入一個有效的電子郵件位址';
-$messages['nonamewarning'] = '請輸入名字';
+$messages['nonamewarning']  = '請輸入名字';
 $messages['nopagesizewarning'] = '請輸入一頁顯示多少郵件';
 $messages['nosenderwarning'] = '請輸入寄件者的電子郵件位址';
 $messages['norecipientwarning'] = '請輸入至少一位收信者';
-$messages['nosubjectwarning'] = '「主旨」欄是空的。你要輸入一個主旨嗎？';
+$messages['nosubjectwarning']  = '「主旨」欄是空的。你要輸入一個主旨嗎？';
 $messages['nobodywarning'] = '要傳送沒有內文的郵件嗎？';
 $messages['notsentwarning'] = '郵件尚未寄出。你確定要離開並且捨棄此郵件？';
 $messages['noldapserver'] = '請選擇一個 LDAP 伺服器進行搜尋';
@@ -116,6 +119,7 @@ $messages['selectimportfile'] = '請選擇一個上傳的檔案';
 $messages['addresswriterror'] = '無法寫入選擇的通訊錄';
 $messages['contactaddedtogroup'] = '成功把聯絡人加入此群組';
 $messages['contactremovedfromgroup'] = '成功把移除此群組中的聯絡人';
+$messages['nogroupassignmentschanged'] = '群組資料沒有異動';
 $messages['importwait'] = '匯入中，請稍候...';
 $messages['importformaterror'] = '匯入失敗！上載的檔案格式不支援';
 $messages['importconfirm'] = '<b>成功匯入 $inserted 筆資料，略過 $skipped 筆已存在的資料</b>：<p><em>$names</em></p>';
@@ -159,4 +163,8 @@ $messages['invalidimageformat'] = '圖片格式錯誤';
 $messages['mispellingsfound'] = '郵件中偵測到拼字錯誤';
 $messages['parentnotwritable'] = '無法建立/移動資料夾至指定的上層目錄 (No access rights)';
 $messages['messagetoobig'] = '郵件太大無法處理';
+$messages['attachmentvalidationerror'] = '警告！這個附件是可疑的，因為它的檔案類型與其宣稱的不同。如果您不能相信寄件者請不要開啟附件，它可能含有惡意的內容。<br /><br />
+<em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = '警告：使用Webmail需要Javascript支援，請檢查您瀏覽器的Javascript設定';
 
+?>